From 04c5517206bedd451c14170eef3e042b02b1afea Mon Sep 17 00:00:00 2001
From: Jean Massucatto <massucattoj@gmail.com>
Date: Fri, 23 Jan 2026 02:57:16 -0300
Subject: [PATCH] fix(dataset-editor): add missing Data type label in
 calculated columns tab (#37165)

---
 .../DatasourceEditor/DatasourceEditor.jsx     |  1 +
 .../tests/DatasourceEditor.test.tsx           | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/superset-frontend/src/components/Datasource/components/DatasourceEditor/DatasourceEditor.jsx b/superset-frontend/src/components/Datasource/components/DatasourceEditor/DatasourceEditor.jsx
index fc220317599..242ab820a92 100644
--- a/superset-frontend/src/components/Datasource/components/DatasourceEditor/DatasourceEditor.jsx
+++ b/superset-frontend/src/components/Datasource/components/DatasourceEditor/DatasourceEditor.jsx
@@ -328,6 +328,7 @@ function ColumnCollectionTable({
                 control={
                   <Select
                     ariaLabel={t('Data type')}
+                    header={<FormLabel>{t('Data type')}</FormLabel>}
                     options={DATA_TYPES}
                     name="type"
                     allowNewOptions
diff --git a/superset-frontend/src/components/Datasource/components/DatasourceEditor/tests/DatasourceEditor.test.tsx b/superset-frontend/src/components/Datasource/components/DatasourceEditor/tests/DatasourceEditor.test.tsx
index bab512914dd..0d8bbc9e19f 100644
--- a/superset-frontend/src/components/Datasource/components/DatasourceEditor/tests/DatasourceEditor.test.tsx
+++ b/superset-frontend/src/components/Datasource/components/DatasourceEditor/tests/DatasourceEditor.test.tsx
@@ -221,6 +221,27 @@ test('can add new columns', async () => {
   });
 });
 
+test('renders Data type label in calculated columns tab', async () => {
+  const testProps = createProps();
+  await asyncRender({
+    ...testProps,
+    datasource: { ...testProps.datasource, table_name: 'Vehicle Sales +' },
+  });
+
+  const calcColsTab = screen.getByTestId('collection-tab-Calculated columns');
+  await userEvent.click(calcColsTab);
+
+  const calcColsPanel = within(
+    await screen.findByRole('tabpanel', { name: /calculated columns/i }),
+  );
+
+  const addBtn = calcColsPanel.getByRole('button', { name: /add item/i });
+  await userEvent.click(addBtn);
+
+  const dataTypeLabels = await calcColsPanel.findAllByText('Data type');
+  expect(dataTypeLabels.length).toBeGreaterThanOrEqual(2);
+});
+
 test('renders isSqla fields', async () => {
   const testProps = createProps();
   await asyncRender({