From c6821cac6fd652cf5912d9b032aa00ef8ccaecd4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 21:39:53 -0800
Subject: [PATCH 1/3] chore(deps-dev): bump prettier from 3.8.0 to 3.8.1 in
 /superset-websocket (#37325)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 superset-websocket/package-lock.json | 14 +++++++-------
 superset-websocket/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/superset-websocket/package-lock.json b/superset-websocket/package-lock.json
index 5b9d4d372c78..55f1bc05f5a3 100644
--- a/superset-websocket/package-lock.json
+++ b/superset-websocket/package-lock.json
@@ -35,7 +35,7 @@
         "eslint-plugin-lodash": "^8.0.0",
         "globals": "^17.0.0",
         "jest": "^29.7.0",
-        "prettier": "^3.8.0",
+        "prettier": "^3.8.1",
         "ts-jest": "^29.4.6",
         "ts-node": "^10.9.2",
         "tscw-config": "^1.1.2",
@@ -5513,9 +5513,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.0.tgz",
-      "integrity": "sha512-yEPsovQfpxYfgWNhCfECjG5AQaO+K3dp6XERmOepyPDVqcJm+bjyCVO3pmU+nAPe0N5dDvekfGezt/EIiRe1TA==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.1.tgz",
+      "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -10667,9 +10667,9 @@
       "dev": true
     },
     "prettier": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.0.tgz",
-      "integrity": "sha512-yEPsovQfpxYfgWNhCfECjG5AQaO+K3dp6XERmOepyPDVqcJm+bjyCVO3pmU+nAPe0N5dDvekfGezt/EIiRe1TA==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.1.tgz",
+      "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==",
       "dev": true
     },
     "pretty-format": {
diff --git a/superset-websocket/package.json b/superset-websocket/package.json
index 514b4f8bf607..eef8e853bb4d 100644
--- a/superset-websocket/package.json
+++ b/superset-websocket/package.json
@@ -43,7 +43,7 @@
     "eslint-plugin-lodash": "^8.0.0",
     "globals": "^17.0.0",
     "jest": "^29.7.0",
-    "prettier": "^3.8.0",
+    "prettier": "^3.8.1",
     "ts-jest": "^29.4.6",
     "ts-node": "^10.9.2",
     "tscw-config": "^1.1.2",

From b1ad54220baf51f8f32985b0675eec096c87a879 Mon Sep 17 00:00:00 2001
From: Dheeraj Bansal <dheerajbansal387@gmail.com>
Date: Fri, 23 Jan 2026 11:26:04 +0530
Subject: [PATCH 2/3] fix: add sans-serif font fallback to fontFamily (Fixes
 #37096) (#37172)

---
 superset/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset/config.py b/superset/config.py
index f6a7b7dfdcab..38f663b9f7b1 100644
--- a/superset/config.py
+++ b/superset/config.py
@@ -921,7 +921,7 @@ class D3TimeFormat(TypedDict, total=False):
         "colorInfo": "#66bcfe",
         # Fonts
         "fontUrls": [],
-        "fontFamily": "Inter, Helvetica, Arial",
+        "fontFamily": "Inter, Helvetica, Arial, sans-serif",
         "fontFamilyCode": "'Fira Code', 'Courier New', monospace",
         # Extra tokens
         "transitionTiming": 0.3,

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 3/3] 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 fc220317599f..242ab820a921 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 bab512914dd8..0d8bbc9e19f6 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({