fix(docker): bind webpack dev server to all interfaces

Change WEBPACK_DEVSERVER_HOST from 127.0.0.1 to 0.0.0.0 to make the
frontend accessible from outside the Docker container. This fixes an
issue where the frontend was only accessible from inside the container.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

.github/workflows/showtime-trigger.yml

@@ -61,17 +61,8 @@ jobs:
             console.log(`📊 Permission level for ${actor}: ${permission.permission}`);
             const authorized = ['write', 'admin'].includes(permission.permission);
 
-            if (!authorized) {
-              console.log(`🚨 Unauthorized user ${actor} - skipping all operations`);
-              core.setOutput('authorized', 'false');
-              return;
-            }
-
-            console.log(`✅ Authorized maintainer: ${actor}`);
-            core.setOutput('authorized', 'true');
-
-            // If this is a synchronize event, check if Showtime is active and set blocked label
-            if (context.eventName === 'pull_request_target' && context.payload.action === 'synchronize') {
+            // If this is a synchronize event from unauthorized user, check if Showtime is active and set blocked label
+            if (!authorized && context.eventName === 'pull_request_target' && context.payload.action === 'synchronize') {
               console.log(`🔒 Synchronize event detected - checking if Showtime is active`);
 
               // Check if PR has any circus tent labels (Showtime is in use)
@@ -99,6 +90,15 @@ jobs:
               }
             }
 
+            if (!authorized) {
+              console.log(`🚨 Unauthorized user ${actor} - skipping all operations`);
+              core.setOutput('authorized', 'false');
+              return;
+            }
+
+            console.log(`✅ Authorized maintainer: ${actor}`);
+            core.setOutput('authorized', 'true');
+
       - name: Install Superset Showtime
         if: steps.auth.outputs.authorized == 'true'
         run: |

.github/workflows/superset-frontend.yml

@@ -143,7 +143,7 @@ jobs:
       - name: tsc
         run: |
           docker run --rm $TAG bash -c \
-          "npm run type"
+          "npm run plugins:build && npm run type"
 
   validate-frontend:
     needs: frontend-build

docker-compose-light.yml

@@ -163,7 +163,7 @@ services:
       # configuring the dev-server to use the host.docker.internal to connect to the backend
       superset: "http://superset-light:8088"
       # Webpack dev server configuration
-      WEBPACK_DEVSERVER_HOST: "${WEBPACK_DEVSERVER_HOST:-127.0.0.1}"
+      WEBPACK_DEVSERVER_HOST: "${WEBPACK_DEVSERVER_HOST:-0.0.0.0}"
       WEBPACK_DEVSERVER_PORT: "${WEBPACK_DEVSERVER_PORT:-9000}"
     ports:
       - "${NODE_PORT:-9001}:9000"  # Parameterized port, accessible on all interfaces

docs/docs/configuration/sql-templating.mdx

@@ -10,8 +10,15 @@ version: 1
 ## Jinja Templates
 
 SQL Lab and Explore supports [Jinja templating](https://jinja.palletsprojects.com/en/2.11.x/) in queries.
-To enable templating, the `ENABLE_TEMPLATE_PROCESSING` [feature flag](/docs/configuration/configuring-superset#feature-flags) needs to be enabled in
-`superset_config.py`. When templating is enabled, python code can be embedded in virtual datasets and
+To enable templating, the `ENABLE_TEMPLATE_PROCESSING` [feature flag](/docs/configuration/configuring-superset#feature-flags) needs to be enabled in `superset_config.py`.
+
+> #### ⚠️ Security Warning
+>
+> While powerful, this feature executes template code on the server. Within the Superset security model, this is **intended functionality**, as users with permissions to edit charts and virtual datasets are considered **trusted users**.
+>
+> If you grant these permissions to untrusted users, this feature can be exploited as a **Server-Side Template Injection (SSTI)** vulnerability. Do not enable `ENABLE_TEMPLATE_PROCESSING` unless you fully understand and accept the associated security risks.
+
+When templating is enabled, python code can be embedded in virtual datasets and
 in Custom SQL in the filter and metric controls in Explore. By default, the following variables are
 made available in the Jinja context:
 

pyproject.toml

@@ -76,7 +76,7 @@ dependencies = [
     "packaging",
     # --------------------------
     # pandas and related (wanting pandas[performance] without numba as it's 100+MB and not needed)
-    "pandas[excel]>=2.0.3, <2.1",
+    "pandas[excel]>=2.0.3, <2.2",
     "bottleneck", # recommended performance dependency for pandas, see https://pandas.pydata.org/docs/getting_started/install.html#performance-dependencies-recommended
     # --------------------------
     "parsedatetime",

requirements/base.txt

@@ -160,6 +160,7 @@ greenlet==3.1.1
     # via
     #   apache-superset (pyproject.toml)
     #   shillelagh
+    #   sqlalchemy
 gunicorn==23.0.0
     # via apache-superset (pyproject.toml)
 h11==0.16.0
@@ -266,7 +267,7 @@ packaging==25.0
     #   limits
     #   marshmallow
     #   shillelagh
-pandas==2.0.3
+pandas==2.1.4
     # via apache-superset (pyproject.toml)
 paramiko==3.5.1
     # via

requirements/development.txt

@@ -331,6 +331,7 @@ greenlet==3.1.1
     #   apache-superset
     #   gevent
     #   shillelagh
+    #   sqlalchemy
 grpcio==1.71.0
     # via
     #   apache-superset
@@ -536,7 +537,7 @@ packaging==25.0
     #   pytest
     #   shillelagh
     #   sqlalchemy-bigquery
-pandas==2.0.3
+pandas==2.1.4
     # via
     #   -c requirements/base-constraint.txt
     #   apache-superset

superset-frontend/cypress-base/cypress/e2e/explore/control.test.ts

@@ -1,193 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-// ***********************************************
-// Tests for setting controls in the UI
-// ***********************************************
-import { interceptChart, setSelectSearchInput } from 'cypress/utils';
-
-describe('Datasource control', () => {
-  const newMetricName = `abc${Date.now()}`;
-
-  it('should allow edit dataset', () => {
-    interceptChart({ legacy: false }).as('chartData');
-
-    cy.visitChartByName('Num Births Trend');
-    cy.verifySliceSuccess({ waitAlias: '@chartData' });
-
-    cy.get('[data-test="datasource-menu-trigger"]').click();
-
-    cy.get('[data-test="edit-dataset"]').click();
-
-    cy.get('[data-test="edit-dataset-tabs"]').within(() => {
-      cy.contains('Metrics').click();
-    });
-    // create new metric
-    cy.get('[data-test="crud-add-table-item"]', { timeout: 10000 }).click();
-    cy.wait(1000);
-    cy.get('.ant-table-body [data-test="textarea-editable-title-input"]')
-      .first()
-      .click();
-
-    cy.get('.ant-table-body [data-test="textarea-editable-title-input"]')
-      .first()
-      .focus();
-    cy.focused().clear({ force: true });
-    cy.focused().type(`${newMetricName}{enter}`, { force: true });
-
-    cy.get('[data-test="datasource-modal-save"]').click();
-    cy.get('.ant-modal-confirm-btns button').contains('OK').click();
-    // select new metric
-    cy.get('[data-test=metrics]')
-      .contains('Drop columns/metrics here or click')
-      .click();
-
-    cy.get('input[aria-label="Select saved metrics"]')
-      .should('exist')
-      .then($input => {
-        setSelectSearchInput($input, newMetricName);
-      });
-
-    // delete metric
-    cy.get('[data-test="datasource-menu-trigger"]').click();
-    cy.get('[data-test="edit-dataset"]').click();
-    cy.get('.ant-modal-content').within(() => {
-      cy.get('[data-test="collection-tab-Metrics"]')
-        .contains('Metrics')
-        .click();
-    });
-    cy.get(`[data-test="textarea-editable-title-input"]`)
-      .contains(newMetricName)
-      .closest('tr')
-      .find('[data-test="crud-delete-icon"]')
-      .click();
-    cy.get('[data-test="datasource-modal-save"]').click();
-    cy.get('.ant-modal-confirm-btns button').contains('OK').click();
-    cy.get('[data-test="metrics"]').contains(newMetricName).should('not.exist');
-  });
-});
-
-describe('Color scheme control', () => {
-  beforeEach(() => {
-    interceptChart({ legacy: false }).as('chartData');
-
-    cy.visitChartByName('Num Births Trend');
-    cy.verifySliceSuccess({ waitAlias: '@chartData' });
-  });
-
-  it('should show color options with and without tooltips', () => {
-    cy.get('#controlSections-tab-CUSTOMIZE').click();
-    cy.get('.ant-select-selection-item .color-scheme-label').contains(
-      'Superset Colors',
-    );
-    cy.get('.ant-select-selection-item .color-scheme-label').trigger(
-      'mouseover',
-    );
-    cy.get('.color-scheme-tooltip').should('be.visible');
-    cy.get('.color-scheme-tooltip').contains('Superset Colors');
-    cy.get('.Control[data-test="color_scheme"]').scrollIntoView();
-    cy.get('.Control[data-test="color_scheme"] input[type="search"]').focus();
-
-    cy.get('.color-scheme-label')
-      .contains('Superset Colors')
-      .trigger('mouseover');
-
-    cy.get('.color-scheme-label')
-      .contains('Superset Colors')
-      .trigger('mouseout');
-
-    cy.focused().type('lyftColors');
-    cy.getBySel('lyftColors').should('exist');
-    cy.getBySel('lyftColors').trigger('mouseover', { force: true });
-    cy.get('.color-scheme-tooltip').should('not.be.visible');
-  });
-});
-describe('VizType control', () => {
-  beforeEach(() => {
-    interceptChart({ legacy: false }).as('tableChartData');
-    interceptChart({ legacy: false }).as('bigNumberChartData');
-  });
-
-  it('Can change vizType', () => {
-    cy.visitChartByName('Daily Totals').then(() => {
-      cy.get('.slice_container').should('be.visible');
-    });
-
-    cy.verifySliceSuccess({ waitAlias: '@tableChartData' });
-
-    cy.contains('View all charts').should('be.visible').click();
-
-    cy.get('.ant-modal-content').within(() => {
-      cy.get('button').contains('KPI').click(); // change categories
-      cy.get('[role="button"]').contains('Big Number').click();
-      cy.get('button').contains('Select').click();
-    });
-
-    cy.get('button[data-test="run-query-button"]').click();
-    cy.verifySliceSuccess({
-      waitAlias: '@bigNumberChartData',
-    });
-  });
-});
-
-describe('Test datatable', () => {
-  beforeEach(() => {
-    interceptChart({ legacy: false }).as('tableChartData');
-    interceptChart({ legacy: false }).as('lineChartData');
-    cy.visitChartByName('Daily Totals');
-  });
-  it('Data Pane opens and loads results', () => {
-    cy.contains('Results').click();
-    cy.get('[data-test="row-count-label"]').contains('26 rows');
-    cy.get('.ant-empty-description').should('not.exist');
-  });
-  it('Datapane loads view samples', () => {
-    cy.intercept(
-      '**/datasource/samples?force=false&datasource_type=table&datasource_id=*',
-    ).as('Samples');
-    cy.contains('Samples').click();
-    cy.wait('@Samples');
-    cy.get('.ant-tabs-tab-active').contains('Samples');
-    cy.get('[data-test="row-count-label"]').contains('1k rows');
-    cy.get('.ant-empty-description').should('not.exist');
-  });
-});
-
-describe('Groupby control', () => {
-  it('Set groupby', () => {
-    interceptChart({ legacy: false }).as('chartData');
-
-    cy.visitChartByName('Num Births Trend');
-    cy.verifySliceSuccess({ waitAlias: '@chartData' });
-
-    cy.get('[data-test=groupby]')
-      .contains('Drop columns here or click')
-      .click();
-    cy.get('[id="adhoc-metric-edit-tabs-tab-simple"]').click();
-
-    cy.get('input[aria-label="Columns and metrics"]', { timeout: 10000 })
-      .should('be.visible')
-      .click();
-    cy.get('input[aria-label="Columns and metrics"]').type('state{enter}');
-
-    cy.get('[data-test="ColumnEdit#save"]').contains('Save').click();
-
-    cy.get('button[data-test="run-query-button"]').click();
-    cy.verifySliceSuccess({ waitAlias: '@chartData' });
-  });
-});

superset-frontend/jest.config.js

@@ -33,6 +33,7 @@ module.exports = {
     '^@superset-ui/([^/]+)$': '<rootDir>/node_modules/@superset-ui/$1/src',
     // mapping @apache-superset/core to local package
     '^@apache-superset/core$': '<rootDir>/packages/superset-core/src',
+    '^@apache-superset/core/(.*)$': '<rootDir>/packages/superset-core/src/$1',
   },
   testEnvironment: '<rootDir>/spec/helpers/jsDomWithFetchAPI.ts',
   modulePathIgnorePatterns: ['<rootDir>/packages/generator-superset'],

superset-frontend/package-lock.json

@@ -54,6 +54,8 @@
         "@visx/scale": "^3.5.0",
         "@visx/tooltip": "^3.0.0",
         "@visx/xychart": "^3.5.1",
+        "ag-grid-community": "34.2.0",
+        "ag-grid-react": "34.2.0",
         "antd": "^5.24.6",
         "chrono-node": "^2.7.8",
         "classnames": "^2.2.5",
@@ -6781,16 +6783,6 @@
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
-    "node_modules/@jest/source-map/node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/@jest/test-result": {
       "version": "30.0.2",
       "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-30.0.2.tgz",
@@ -18723,27 +18715,27 @@
       }
     },
     "node_modules/ag-charts-types": {
-      "version": "12.0.2",
-      "resolved": "https://registry.npmjs.org/ag-charts-types/-/ag-charts-types-12.0.2.tgz",
-      "integrity": "sha512-AWM1Y+XW+9VMmV3AbzdVEnreh/I2C9Pmqpc2iLmtId3Xbvmv7O56DqnuDb9EXjK5uPxmyUerTP+utL13UGcztw==",
+      "version": "12.2.0",
+      "resolved": "https://registry.npmjs.org/ag-charts-types/-/ag-charts-types-12.2.0.tgz",
+      "integrity": "sha512-d2qQrQirt9wP36YW5HPuOvXsiajyiFnr1CTsoCbs02bavPDz7Lk2jHp64+waM4YKgXb3GN7gafbBI9Qgk33BmQ==",
       "license": "MIT"
     },
     "node_modules/ag-grid-community": {
-      "version": "34.0.2",
-      "resolved": "https://registry.npmjs.org/ag-grid-community/-/ag-grid-community-34.0.2.tgz",
-      "integrity": "sha512-hVJp5vrmwHRB10YjfSOVni5YJkO/v+asLjT72S4YnIFSx8lAgyPmByNJgtojk1aJ5h6Up93jTEmGDJeuKiWWLA==",
+      "version": "34.2.0",
+      "resolved": "https://registry.npmjs.org/ag-grid-community/-/ag-grid-community-34.2.0.tgz",
+      "integrity": "sha512-peS7THEMYwpIrwLQHmkRxw/TlOnddD/F5A88RqlBxf8j+WqVYRWMOOhU5TqymGcha7z2oZ8IoL9ROl3gvtdEjg==",
       "license": "MIT",
       "dependencies": {
-        "ag-charts-types": "12.0.2"
+        "ag-charts-types": "12.2.0"
       }
     },
     "node_modules/ag-grid-react": {
-      "version": "34.0.2",
-      "resolved": "https://registry.npmjs.org/ag-grid-react/-/ag-grid-react-34.0.2.tgz",
-      "integrity": "sha512-1KBXkTvwtZiYVlSuDzBkiqfHjZgsATOmpLZdAtdmsCSOOOEWai0F9zHHgBuHfyciAE4nrbQWfojkx8IdnwsKFw==",
+      "version": "34.2.0",
+      "resolved": "https://registry.npmjs.org/ag-grid-react/-/ag-grid-react-34.2.0.tgz",
+      "integrity": "sha512-dLKFw6hz75S0HLuZvtcwjm+gyiI4gXVzHEu7lWNafWAX0mb8DhogEOP5wbzAlsN6iCfi7bK/cgZImZFjenlqwg==",
       "license": "MIT",
       "dependencies": {
-        "ag-grid-community": "34.0.2",
+        "ag-grid-community": "34.2.0",
         "prop-types": "^15.8.1"
       },
       "peerDependencies": {
@@ -20805,6 +20797,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/camel-case": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
@@ -44946,15 +44947,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/parent-module/node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/parse-conflict-json": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-3.0.1.tgz",
@@ -60698,7 +60690,7 @@
     },
     "packages/superset-core": {
       "name": "@apache-superset/core",
-      "version": "0.0.1-rc3",
+      "version": "0.0.1-rc4",
       "license": "ISC",
       "devDependencies": {
         "@babel/cli": "^7.26.4",
@@ -63395,6 +63387,7 @@
       "version": "0.20.3",
       "license": "Apache-2.0",
       "dependencies": {
+        "@apache-superset/core": "*",
         "@react-icons/all-files": "^4.1.0",
         "@types/react": "*",
         "lodash": "^4.17.21"
@@ -63422,14 +63415,15 @@
       "license": "Apache-2.0",
       "dependencies": {
         "@ant-design/icons": "^5.2.6",
+        "@apache-superset/core": "*",
         "@babel/runtime": "^7.28.2",
         "@fontsource/fira-code": "^5.2.6",
         "@fontsource/inter": "^5.2.6",
         "@types/json-bigint": "^1.0.4",
         "@visx/responsive": "^3.12.0",
         "ace-builds": "^1.43.1",
-        "ag-grid-community": "^34.0.2",
-        "ag-grid-react": "34.0.2",
+        "ag-grid-community": "34.2.0",
+        "ag-grid-react": "34.2.0",
         "brace": "^0.11.1",
         "classnames": "^2.2.5",
         "core-js": "^3.38.1",
@@ -65468,6 +65462,7 @@
       },
       "peerDependencies": {
         "@ant-design/icons": "^5.2.6",
+        "@apache-superset/core": "*",
         "@superset-ui/chart-controls": "*",
         "@superset-ui/core": "*",
         "@testing-library/dom": "^8.20.1",
@@ -65519,6 +65514,7 @@
         "lodash": "^4.17.21"
       },
       "peerDependencies": {
+        "@apache-superset/core": "*",
         "@superset-ui/chart-controls": "*",
         "@superset-ui/core": "*",
         "echarts": "*",
@@ -66696,6 +66692,7 @@
       },
       "peerDependencies": {
         "@ant-design/icons": "^5.2.6",
+        "@apache-superset/core": "*",
         "@superset-ui/chart-controls": "*",
         "@superset-ui/core": "*",
         "lodash": "^4.17.11",
@@ -67827,6 +67824,7 @@
       },
       "peerDependencies": {
         "@ant-design/icons": "^5.2.6",
+        "@apache-superset/core": "*",
         "@superset-ui/chart-controls": "*",
         "@superset-ui/core": "*",
         "@testing-library/dom": "^8.20.1",

superset-frontend/package.json

@@ -127,6 +127,8 @@
     "@visx/scale": "^3.5.0",
     "@visx/tooltip": "^3.0.0",
     "@visx/xychart": "^3.5.1",
+    "ag-grid-community": "34.2.0",
+    "ag-grid-react": "34.2.0",
     "antd": "^5.24.6",
     "chrono-node": "^2.7.8",
     "classnames": "^2.2.5",

superset-frontend/packages/generator-superset/generators/plugin-chart/templates/README.erb

@@ -22,19 +22,6 @@ To add the package to Superset, go to the `superset-frontend` subdirectory in yo
 npm i -S ../../<%= packageName %>
 ```
 
-If your Superset plugin exists in the `superset-frontend` directory and you wish to resolve TypeScript errors about `@superset-ui/core` not being resolved correctly, add the following to your `tsconfig.json` file:
-
-```
-"references": [
-  {
-    "path": "../../packages/superset-ui-chart-controls"
-  },
-  {
-    "path": "../../packages/superset-ui-core"
-  }
-]
-```
-
 You may also wish to add the following to the `include` array in `tsconfig.json` to make Superset types available to your plugin:
 
 ```

superset-frontend/packages/generator-superset/generators/plugin-chart/templates/tsconfig.json

@@ -1,44 +1,19 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "allowSyntheticDefaultImports": true,
-    "declaration": true,
-    "declarationDir": "lib",
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "isolatedModules": false,
-    "jsx": "react",
-    "lib": [
-      "dom",
-      "esnext"
-    ],
-    "module": "esnext",
-    "moduleResolution": "node",
-    "noEmitOnError": true,
-    "noImplicitReturns": true,
-    "noUnusedLocals": true,
-    "outDir": "lib",
-    "pretty": true,
-    "removeComments": false,
-    "strict": true,
-    "target": "es2015",
-    "useDefineForClassFields": false,
-    "composite": true,
-    "declarationMap": true,
-    "rootDir": "src",
-    "skipLibCheck": true,
-    "emitDeclarationOnly": true,
-    "resolveJsonModule": true,
-    "types": ["jest"],
-    "typeRoots": [
-      "./node_modules/@types"
-    ]
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
+  "include": ["src/**/*.ts", "src/**/*.tsx", "types/**/*"],
   "exclude": [
-    "lib",
-    "test"
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.test.*",
+    "src/**/*.stories.*"
   ],
-  "include": [
-    "src/**/*",
-    "types/**/*"
+  "references": [
+    { "path": "../../packages/superset-core" },
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
   ]
 }

superset-frontend/packages/superset-core/tsconfig.json

@@ -1,19 +1,9 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "allowSyntheticDefaultImports": true,
-    "declaration": true,
-    "declarationDir": "lib",
-    "outDir": "lib",
-    "strict": true,
-    "rootDir": "src",
-    "jsx": "preserve",
-    "baseUrl": ".",
-    "module": "esnext",
-    "moduleResolution": "node",
-    "skipLibCheck": true,
-    "target": "es2020",
-    "esModuleInterop": true
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
-  "include": ["src/**/*.ts*"],
-  "exclude": ["lib"]
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["src/**/*.test.*", "src/**/*.stories.*"]
 }

superset-frontend/packages/superset-ui-chart-controls/package.json

@@ -24,6 +24,7 @@
     "lib"
   ],
   "dependencies": {
+    "@apache-superset/core": "*",
     "@react-icons/all-files": "^4.1.0",
     "@types/react": "*",
     "lodash": "^4.17.21"

superset-frontend/packages/superset-ui-chart-controls/src/utils/checkColumnType.ts

@@ -17,11 +17,7 @@
  * under the License.
  */
 import { ensureIsArray, GenericDataType, ValueOf } from '@superset-ui/core';
-import {
-  ControlPanelState,
-  isDataset,
-  isQueryResponse,
-} from '@superset-ui/chart-controls';
+import { ControlPanelState, isDataset, isQueryResponse } from '../types';
 
 export function checkColumnType(
   columnName: string,

superset-frontend/packages/superset-ui-chart-controls/test/tsconfig.json

@@ -2,18 +2,8 @@
   "compilerOptions": {
     "composite": false,
     "emitDeclarationOnly": false,
-    "noEmit": true,
     "rootDir": "."
   },
   "extends": "../../../tsconfig.json",
-  "include": [
-    "**/*",
-    "../types/**/*",
-    "../../../types/**/*"
-  ],
-  "references": [
-    {
-      "path": ".."
-    }
-  ]
+  "include": ["**/*", "../types/**/*", "../../../types/**/*"]
 }

superset-frontend/packages/superset-ui-chart-controls/tsconfig.json

@@ -1,22 +1,13 @@
 {
-  "compilerOptions": {
-    "declarationDir": "lib",
-    "outDir": "lib",
-    "rootDir": "src"
-  },
-  "exclude": [
-    "lib",
-    "test"
-  ],
   "extends": "../../tsconfig.json",
-  "include": [
-    "src/**/*",
-    "types/**/*",
-    "../../types/**/*"
-  ],
+  "compilerOptions": {
+    "baseUrl": "../..",
+    "outDir": "lib"
+  },
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["src/**/*.test.*", "src/**/*.stories.*"],
   "references": [
-    {
-      "path": "../superset-ui-core"
-    }
+    { "path": "../superset-core" },
+    { "path": "../superset-ui-core" }
   ]
 }

superset-frontend/packages/superset-ui-core/package.json

@@ -24,14 +24,15 @@
     "lib"
   ],
   "dependencies": {
+    "@apache-superset/core": "*",
     "@ant-design/icons": "^5.2.6",
     "@babel/runtime": "^7.28.2",
     "@fontsource/fira-code": "^5.2.6",
     "@fontsource/inter": "^5.2.6",
     "@types/json-bigint": "^1.0.4",
     "ace-builds": "^1.43.1",
-    "ag-grid-community": "^34.0.2",
-    "ag-grid-react": "34.0.2",
+    "ag-grid-community": "34.2.0",
+    "ag-grid-react": "34.2.0",
     "brace": "^0.11.1",
     "classnames": "^2.2.5",
     "csstype": "^3.1.3",

superset-frontend/packages/superset-ui-core/src/chart/types/matrixify.test.ts

@@ -204,7 +204,8 @@ test('getMatrixifyConfig should handle topn selection mode', () => {
 test('getMatrixifyValidationErrors should return empty array when matrixify is not enabled', () => {
   const formData = {
     viz_type: 'table',
-    matrixify_enabled: false,
+    matrixify_enable_vertical_layout: false,
+    matrixify_enable_horizontal_layout: false,
   } as MatrixifyFormData;
 
   expect(getMatrixifyValidationErrors(formData)).toEqual([]);

superset-frontend/packages/superset-ui-core/src/chart/types/matrixify.ts

@@ -96,9 +96,6 @@ export interface MatrixifyAxisConfig {
  * Complete Matrixify configuration in form data
  */
 export interface MatrixifyFormData {
-  // Enable/disable matrixify functionality
-  matrixify_enabled?: boolean;
-
   // Layout enable controls
   matrixify_enable_vertical_layout?: boolean;
   matrixify_enable_horizontal_layout?: boolean;

superset-frontend/packages/superset-ui-core/src/components/LastUpdated/index.tsx

@@ -19,8 +19,10 @@
 import { useEffect, useState, FunctionComponent } from 'react';
 
 import { t, styled, css, useTheme } from '@superset-ui/core';
-import dayjs from 'dayjs';
+import { Dayjs } from 'dayjs';
 import { extendedDayjs } from '../../utils/dates';
+import 'dayjs/plugin/updateLocale';
+import 'dayjs/plugin/calendar';
 import { Icons } from '../Icons';
 import type { LastUpdatedProps } from './types';
 
@@ -46,9 +48,7 @@ export const LastUpdated: FunctionComponent<LastUpdatedProps> = ({
   update,
 }) => {
   const theme = useTheme();
-  const [timeSince, setTimeSince] = useState<dayjs.Dayjs>(
-    extendedDayjs(updatedAt),
-  );
+  const [timeSince, setTimeSince] = useState<Dayjs>(extendedDayjs(updatedAt));
 
   useEffect(() => {
     setTimeSince(() => extendedDayjs(updatedAt));

superset-frontend/packages/superset-ui-core/src/utils/dates.ts

@@ -43,6 +43,7 @@ dayjs.updateLocale('en', {
 });
 
 export const extendedDayjs = dayjs;
+export type { Dayjs };
 
 export const fDuration = function (
   t1: number,

superset-frontend/packages/superset-ui-core/test/tsconfig.json

@@ -2,14 +2,8 @@
   "compilerOptions": {
     "composite": false,
     "emitDeclarationOnly": false,
-    "noEmit": true,
     "rootDir": "."
   },
   "extends": "../../../tsconfig.json",
-  "include": ["**/*", "../types/**/*", "../../../types/**/*"],
-  "references": [
-    {
-      "path": ".."
-    }
-  ]
+  "include": ["**/*", "../types/**/*", "../../../types/**/*"]
 }

superset-frontend/packages/superset-ui-core/tsconfig.json

@@ -1,24 +1,10 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "declarationDir": "lib",
-    "outDir": "lib",
-    "rootDir": "src",
-    "baseUrl": ".",
-    "paths": {
-      "src/*": ["./src/*"],
-      "@superset-ui/core": ["src"],
-      "@superset-ui/core/*": ["src/*"]
-    }
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
-  "exclude": [
-    "lib",
-    "test"
-  ],
-  "include": [
-    "src/**/*",
-    "spec/**/*",
-    "types/**/*"
-  ],
-  "references": []
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["src/**/*.test.*", "src/**/*.stories.*"],
+  "references": [{ "path": "../superset-core" }]
 }

superset-frontend/packages/superset-ui-core/types/assets.d.ts

@@ -19,3 +19,5 @@
 declare module '*.gif';
 declare module '*.svg';
 declare module '*.png';
+declare module '*.jpg';
+declare module '*.jpeg';

superset-frontend/packages/superset-ui-switchboard/tsconfig.json

@@ -1,18 +1,9 @@
 {
-  "compilerOptions": {
-    "declarationDir": "lib",
-    "outDir": "lib",
-    "rootDir": "src"
-  },
-  "exclude": [
-    "lib",
-    "src/**/*.test.ts"
-  ],
   "extends": "../../tsconfig.json",
-  "include": [
-    "src/**/*",
-    "types/**/*",
-    "../../types/**/*"
-  ],
-  "references": []
+  "compilerOptions": {
+    "baseUrl": "../..",
+    "outDir": "lib"
+  },
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["src/**/*.test.*", "src/**/*.stories.*"]
 }

superset-frontend/plugins/legacy-plugin-chart-calendar/tsconfig.json

@@ -1,14 +1,18 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": "."
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
-  "include": ["src/**/*", "types/**/*"],
-  "exclude": ["lib", "test"],
+  "include": ["src/**/*.ts", "src/**/*.tsx", "types/**/*"],
+  "exclude": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.test.*",
+    "src/**/*.stories.*"
+  ],
   "references": [
+    { "path": "../../packages/superset-core" },
     { "path": "../../packages/superset-ui-core" },
     { "path": "../../packages/superset-ui-chart-controls" }
   ]

superset-frontend/plugins/legacy-plugin-chart-chord/tsconfig.json

@@ -1,14 +1,18 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": "."
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
-  "include": ["src/**/*", "types/**/*"],
-  "exclude": ["lib", "test"],
+  "include": ["src/**/*.ts", "src/**/*.tsx", "types/**/*"],
+  "exclude": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.test.*",
+    "src/**/*.stories.*"
+  ],
   "references": [
+    { "path": "../../packages/superset-core" },
     { "path": "../../packages/superset-ui-core" },
     { "path": "../../packages/superset-ui-chart-controls" }
   ]

superset-frontend/plugins/legacy-plugin-chart-country-map/tsconfig.json

@@ -1,14 +1,18 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": "."
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
-  "include": ["src/**/*", "types/**/*"],
-  "exclude": ["lib", "test"],
+  "include": ["src/**/*.ts", "src/**/*.tsx", "types/**/*"],
+  "exclude": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.test.*",
+    "src/**/*.stories.*"
+  ],
   "references": [
+    { "path": "../../packages/superset-core" },
     { "path": "../../packages/superset-ui-core" },
     { "path": "../../packages/superset-ui-chart-controls" }
   ]

superset-frontend/plugins/legacy-plugin-chart-horizon/tsconfig.json

@@ -1,14 +1,18 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": "."
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
-  "include": ["src/**/*", "types/**/*"],
-  "exclude": ["lib", "test"],
+  "include": ["src/**/*.ts", "src/**/*.tsx", "types/**/*"],
+  "exclude": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.test.*",
+    "src/**/*.stories.*"
+  ],
   "references": [
+    { "path": "../../packages/superset-core" },
     { "path": "../../packages/superset-ui-core" },
     { "path": "../../packages/superset-ui-chart-controls" }
   ]

superset-frontend/plugins/legacy-plugin-chart-map-box/test/tsconfig.json

@@ -2,18 +2,8 @@
   "compilerOptions": {
     "composite": false,
     "emitDeclarationOnly": false,
-    "noEmit": true,
     "rootDir": "."
   },
   "extends": "../../../tsconfig.json",
-  "include": [
-    "**/*",
-    "../types/**/*",
-    "../../../types/**/*"
-  ],
-  "references": [
-    {
-      "path": ".."
-    }
-  ]
+  "include": ["**/*", "../types/**/*", "../../../types/**/*"]
 }

superset-frontend/plugins/legacy-plugin-chart-map-box/tsconfig.json

@@ -1,14 +1,18 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": "."
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
-  "include": ["src/**/*", "types/**/*"],
-  "exclude": ["lib", "test"],
+  "include": ["src/**/*.ts", "src/**/*.tsx", "types/**/*"],
+  "exclude": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.test.*",
+    "src/**/*.stories.*"
+  ],
   "references": [
+    { "path": "../../packages/superset-core" },
     { "path": "../../packages/superset-ui-core" },
     { "path": "../../packages/superset-ui-chart-controls" }
   ]

superset-frontend/plugins/legacy-plugin-chart-paired-t-test/tsconfig.json

@@ -1,14 +1,18 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": "."
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
-  "include": ["src/**/*", "types/**/*"],
-  "exclude": ["lib", "test"],
+  "include": ["src/**/*.ts", "src/**/*.tsx", "types/**/*"],
+  "exclude": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.test.*",
+    "src/**/*.stories.*"
+  ],
   "references": [
+    { "path": "../../packages/superset-core" },
     { "path": "../../packages/superset-ui-core" },
     { "path": "../../packages/superset-ui-chart-controls" }
   ]

superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/tsconfig.json

@@ -1,19 +1,18 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": ".",
-	"paths": {
-      "d3v3": ["./types/d3v3"]
-    }
-
-
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
-  "include": ["src/**/*", "types/**/*"],
-  "exclude": ["lib", "test"],
+  "include": ["src/**/*.ts", "src/**/*.tsx", "types/**/*"],
+  "exclude": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.test.*",
+    "src/**/*.stories.*"
+  ],
   "references": [
+    { "path": "../../packages/superset-core" },
     { "path": "../../packages/superset-ui-core" },
     { "path": "../../packages/superset-ui-chart-controls" }
   ]

superset-frontend/plugins/legacy-plugin-chart-partition/test/tsconfig.json

@@ -2,18 +2,8 @@
   "compilerOptions": {
     "composite": false,
     "emitDeclarationOnly": false,
-    "noEmit": true,
     "rootDir": "."
   },
   "extends": "../../../tsconfig.json",
-  "include": [
-    "**/*",
-    "../types/**/*",
-    "../../../types/**/*"
-  ],
-  "references": [
-    {
-      "path": ".."
-    }
-  ]
+  "include": ["**/*", "../types/**/*", "../../../types/**/*"]
 }

superset-frontend/plugins/legacy-plugin-chart-partition/tsconfig.json

@@ -1,17 +1,18 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": ".",
-    "paths": {
-      "@superset-ui/core/components": ["../../packages/superset-ui-core/src/components"]
-    }
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
-  "include": ["src/**/*", "types/**/*"],
-  "exclude": ["lib", "test"],
+  "include": ["src/**/*.ts", "src/**/*.tsx", "types/**/*"],
+  "exclude": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.test.*",
+    "src/**/*.stories.*"
+  ],
   "references": [
+    { "path": "../../packages/superset-core" },
     { "path": "../../packages/superset-ui-core" },
     { "path": "../../packages/superset-ui-chart-controls" }
   ]

superset-frontend/plugins/legacy-plugin-chart-rose/tsconfig.json

@@ -1,14 +1,18 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": "."
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
-  "include": ["src/**/*", "types/**/*"],
-  "exclude": ["lib", "test"],
+  "include": ["src/**/*.ts", "src/**/*.tsx", "types/**/*"],
+  "exclude": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.test.*",
+    "src/**/*.stories.*"
+  ],
   "references": [
+    { "path": "../../packages/superset-core" },
     { "path": "../../packages/superset-ui-core" },
     { "path": "../../packages/superset-ui-chart-controls" }
   ]

superset-frontend/plugins/legacy-plugin-chart-world-map/tsconfig.json

@@ -1,14 +1,18 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": "."
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
-  "include": ["src/**/*", "types/**/*"],
-  "exclude": ["lib", "test"],
+  "include": ["src/**/*.ts", "src/**/*.tsx", "types/**/*"],
+  "exclude": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.test.*",
+    "src/**/*.stories.*"
+  ],
   "references": [
+    { "path": "../../packages/superset-core" },
     { "path": "../../packages/superset-ui-core" },
     { "path": "../../packages/superset-ui-chart-controls" }
   ]

superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/HandlebarsRenderer.tsx

@@ -18,9 +18,9 @@
  */
 import { useEffect, useState, memo } from 'react';
 import { styled, t } from '@superset-ui/core';
+import { extendedDayjs as dayjs } from '@superset-ui/core/utils/dates';
 import { SafeMarkdown } from '@superset-ui/core/components';
 import Handlebars from 'handlebars';
-import dayjs from 'dayjs';
 import { isPlainObject } from 'lodash';
 
 export interface HandlebarsRendererProps {

superset-frontend/plugins/legacy-preset-chart-deckgl/tsconfig.json

@@ -1,17 +1,13 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": ".",
-    "paths": {
-      "@superset-ui/core/components": ["../../packages/superset-ui-core/src/components"]
-    }
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
   "include": ["src/**/*", "types/**/*"],
-  "exclude": ["lib", "test"],
+  "exclude": ["src/**/*.test.*", "src/**/*.stories.*"],
   "references": [
+    { "path": "../../packages/superset-core" },
     { "path": "../../packages/superset-ui-core" },
     { "path": "../../packages/superset-ui-chart-controls" }
   ]

superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js

@@ -19,7 +19,6 @@
  */
 import { kebabCase, throttle } from 'lodash';
 import d3 from 'd3';
-import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
 import nv from 'nvd3-fork';
 import PropTypes from 'prop-types';
@@ -34,6 +33,7 @@ import {
   t,
   VizType,
 } from '@superset-ui/core';
+import { extendedDayjs as dayjs } from '@superset-ui/core/utils/dates';
 
 import 'nvd3-fork/build/nv.d3.css';
 

superset-frontend/plugins/legacy-preset-chart-nvd3/test/tsconfig.json

@@ -2,18 +2,8 @@
   "compilerOptions": {
     "composite": false,
     "emitDeclarationOnly": false,
-    "noEmit": true,
     "rootDir": "."
   },
   "extends": "../../../tsconfig.json",
-  "include": [
-    "**/*",
-    "../types/**/*",
-    "../../../types/**/*"
-  ],
-  "references": [
-    {
-      "path": ".."
-    }
-  ]
+  "include": ["**/*", "../types/**/*", "../../../types/**/*"]
 }

superset-frontend/plugins/legacy-preset-chart-nvd3/tsconfig.json

@@ -1,14 +1,13 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": "."
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
   "include": ["src/**/*", "types/**/*"],
-  "exclude": ["lib", "test"],
+  "exclude": ["src/**/*.test.*", "src/**/*.stories.*"],
   "references": [
+    { "path": "../../packages/superset-core" },
     { "path": "../../packages/superset-ui-core" },
     { "path": "../../packages/superset-ui-chart-controls" }
   ]

superset-frontend/plugins/plugin-chart-ag-grid-table/package.json

@@ -36,6 +36,7 @@
     "xss": "^1.0.15"
   },
   "peerDependencies": {
+    "@apache-superset/core": "*",
     "@ant-design/icons": "^5.2.6",
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",

superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/useTableTheme.ts

@@ -30,7 +30,7 @@ export const useIsDark = () => {
   return tinycolor(theme.colorBgContainer).isDark();
 };
 
-const useTableTheme = () => {
+const useTableTheme = (): ReturnType<typeof themeQuartz.withPart> => {
   const baseTheme = themeQuartz;
   const isDarkTheme = useIsDark();
   const tableTheme = isDarkTheme

superset-frontend/plugins/plugin-chart-ag-grid-table/tsconfig.json

@@ -1,18 +1,19 @@
 {
-  "compilerOptions": {
-    "declarationDir": "lib",
-    "outDir": "lib",
-    "rootDir": "src"
-  },
-  "exclude": ["lib", "test"],
   "extends": "../../tsconfig.json",
-  "include": ["src/**/*", "types/**/*", "../../types/**/*"],
+  "compilerOptions": {
+    "baseUrl": "../..",
+    "outDir": "lib"
+  },
+  "include": ["src/**/*.ts", "src/**/*.tsx", "types/**/*"],
+  "exclude": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.test.*",
+    "src/**/*.stories.*"
+  ],
   "references": [
-    {
-      "path": "../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../packages/superset-ui-core"
-    }
+    { "path": "../../packages/superset-core" },
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
   ]
 }

superset-frontend/plugins/plugin-chart-cartodiagram/test/tsconfig.json

@@ -2,21 +2,8 @@
   "compilerOptions": {
     "composite": false,
     "emitDeclarationOnly": false,
-    "noEmit": true,
     "rootDir": "."
   },
   "extends": "../../../tsconfig.json",
-  "include": [
-    "**/*",
-    "../types/**/*",
-    "../../../types/**/*"
-  ],
-  "references": [
-    {
-      "path": "../../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../../packages/superset-ui-core"
-    },
-  ]
+  "include": ["**/*", "../types/**/*", "../../../types/**/*"]
 }

superset-frontend/plugins/plugin-chart-cartodiagram/tsconfig.json

@@ -1,14 +1,18 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": "."
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
-  "include": ["src/**/*", "types/**/*"],
-  "exclude": ["lib", "test"],
+  "include": ["src/**/*.ts", "src/**/*.tsx", "types/**/*"],
+  "exclude": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.test.*",
+    "src/**/*.stories.*"
+  ],
   "references": [
+    { "path": "../../packages/superset-core" },
     { "path": "../../packages/superset-ui-core" },
     { "path": "../../packages/superset-ui-chart-controls" }
   ]

superset-frontend/plugins/plugin-chart-echarts/package.json

@@ -30,6 +30,7 @@
     "lodash": "^4.17.21"
   },
   "peerDependencies": {
+    "@apache-superset/core": "*",
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",
     "echarts": "*",

superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/transformProps.ts

@@ -16,8 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import dayjs from 'dayjs';
-import utc from 'dayjs/plugin/utc';
 import { Metric } from '@superset-ui/chart-controls';
 import {
   ChartProps,
@@ -27,6 +25,8 @@ import {
   SimpleAdhocFilter,
   ensureIsArray,
 } from '@superset-ui/core';
+import { extendedDayjs as dayjs } from '@superset-ui/core/utils/dates';
+import 'dayjs/plugin/utc';
 import {
   getComparisonFontSize,
   getHeaderFontSize,
@@ -35,8 +35,6 @@ import {
 
 import { getOriginalLabel } from '../utils';
 
-dayjs.extend(utc);
-
 export const parseMetricValue = (metricValue: number | string | null) => {
   if (typeof metricValue === 'string') {
     const dateObject = dayjs.utc(metricValue, undefined, true);

superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/utils.ts

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
 import {
   getTimeFormatter,
@@ -29,6 +28,7 @@ import {
   SMART_DATE_ID,
   TimeGranularity,
 } from '@superset-ui/core';
+import { extendedDayjs as dayjs } from '@superset-ui/core/utils/dates';
 
 dayjs.extend(utc);
 

superset-frontend/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx

@@ -19,7 +19,6 @@
 import { t } from '@superset-ui/core';
 import {
   ControlPanelConfig,
-  ControlStateMapping,
   ControlSubSectionHeader,
   D3_FORMAT_DOCS,
   D3_FORMAT_OPTIONS,
@@ -197,15 +196,6 @@ const config: ControlPanelConfig = {
       ],
     },
   ],
-  onInit(state: ControlStateMapping) {
-    return {
-      ...state,
-      row_limit: {
-        ...state.row_limit,
-        value: state.row_limit.default,
-      },
-    };
-  },
   formDataOverrides: formData => ({
     ...formData,
     metric: getStandardizedControls().shiftMetric(),

superset-frontend/plugins/plugin-chart-echarts/src/Gantt/transformProps.ts

@@ -33,8 +33,8 @@ import {
   t,
   tooltipHtml,
 } from '@superset-ui/core';
+import { extendedDayjs as dayjs } from '@superset-ui/core/utils/dates';
 import { CallbackDataParams } from 'echarts/types/src/util/types';
-import dayjs from 'dayjs';
 import {
   Cartesian2dCoordSys,
   EchartsGanttChartProps,
@@ -325,6 +325,7 @@ export default function transformProps(chartProps: EchartsGanttChartProps) {
           show: true,
           position: 'start',
           formatter: '{b}',
+          color: theme.colorText,
         },
         data: categoryLines,
       },

superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts

@@ -47,7 +47,10 @@ import {
   isDerivedSeries,
 } from '@superset-ui/chart-controls';
 import type { EChartsCoreOption } from 'echarts/core';
-import type { LineStyleOption } from 'echarts/types/src/util/types';
+import type {
+  LineStyleOption,
+  CallbackDataParams,
+} from 'echarts/types/src/util/types';
 import type { SeriesOption } from 'echarts';
 import {
   EchartsTimeseriesChartProps,
@@ -575,16 +578,31 @@ export default function transformProps(
         const xValue: number = richTooltip
           ? params[0].value[xIndex]
           : params.value[xIndex];
-        const forecastValue: any[] = richTooltip ? params : [params];
+        const forecastValue: CallbackDataParams[] = richTooltip
+          ? params
+          : [params];
         const sortedKeys = extractTooltipKeys(
           forecastValue,
           yIndex,
           richTooltip,
           tooltipSortByMetric,
         );
+        const filteredForecastValue = forecastValue.filter(
+          (item: CallbackDataParams) =>
+            !annotationLayers.some(
+              (annotation: AnnotationLayer) =>
+                item.seriesName === annotation.name,
+            ),
+        );
         const forecastValues: Record<string, ForecastValue> =
           extractForecastValuesFromTooltipParams(forecastValue, isHorizontal);
 
+        const filteredForecastValues: Record<string, ForecastValue> =
+          extractForecastValuesFromTooltipParams(
+            filteredForecastValue,
+            isHorizontal,
+          );
+
         const isForecast = Object.values(forecastValues).some(
           value =>
             value.forecastTrend || value.forecastLower || value.forecastUpper,
@@ -595,7 +613,7 @@ export default function transformProps(
           : (getCustomFormatter(customFormatters, metrics) ?? defaultFormatter);
 
         const rows: string[][] = [];
-        const total = Object.values(forecastValues).reduce(
+        const total = Object.values(filteredForecastValues).reduce(
           (acc, value) =>
             value.observation !== undefined ? acc + value.observation : acc,
           0,
@@ -617,7 +635,16 @@ export default function transformProps(
               seriesName: key,
               formatter,
             });
-            if (showPercentage && value.observation !== undefined) {
+
+            const annotationRow = annotationLayers.some(
+              item => item.name === key,
+            );
+
+            if (
+              showPercentage &&
+              value.observation !== undefined &&
+              !annotationRow
+            ) {
               row.push(
                 percentFormatter.format(value.observation / (total || 1)),
               );

superset-frontend/plugins/plugin-chart-echarts/test/Bubble/transformProps.test.ts

@@ -23,8 +23,7 @@ import {
   SqlaFormData,
   supersetTheme,
 } from '@superset-ui/core';
-import { EchartsBubbleChartProps } from 'plugins/plugin-chart-echarts/src/Bubble/types';
-
+import { EchartsBubbleChartProps } from '../../src/Bubble/types';
 import transformProps, { formatTooltip } from '../../src/Bubble/transformProps';
 
 const defaultFormData: SqlaFormData = {

superset-frontend/plugins/plugin-chart-echarts/test/Gantt/transformProps.test.ts

@@ -257,6 +257,7 @@ describe('Gantt transformProps', () => {
           show: true,
           position: 'start',
           formatter: '{b}',
+          color: 'rgba(0,0,0,0.88)',
         },
         lineStyle: expect.objectContaining({
           color: '#00000000',

superset-frontend/plugins/plugin-chart-echarts/test/tsconfig.json

@@ -2,21 +2,8 @@
   "compilerOptions": {
     "composite": false,
     "emitDeclarationOnly": false,
-    "noEmit": true,
     "rootDir": "."
   },
   "extends": "../../../tsconfig.json",
-  "include": [
-    "**/*",
-    "../types/**/*",
-    "../../../types/**/*"
-  ],
-  "references": [
-    {
-      "path": "../../../packages/superset-ui-chart-controls"
-    },
-    {
-      "path": "../../../packages/superset-ui-core"
-    }
-  ]
+  "include": ["**/*", "../types/**/*", "../../../types/**/*"]
 }

superset-frontend/plugins/plugin-chart-echarts/tsconfig.json

@@ -1,17 +1,18 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": ".",
-    "paths": {
-      "@superset-ui/core/components": ["../../packages/superset-ui-core/src/components"]
-    }
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
-  "include": ["src/**/*", "types/**/*"],
-  "exclude": ["lib", "test"],
+  "include": ["src/**/*.ts", "src/**/*.tsx", "types/**/*"],
+  "exclude": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.test.*",
+    "src/**/*.stories.*"
+  ],
   "references": [
+    { "path": "../../packages/superset-core" },
     { "path": "../../packages/superset-ui-core" },
     { "path": "../../packages/superset-ui-chart-controls" }
   ]

superset-frontend/plugins/plugin-chart-handlebars/src/components/Handlebars/HandlebarsViewer.tsx

@@ -18,8 +18,8 @@
  */
 import { styled, t } from '@superset-ui/core';
 import { SafeMarkdown } from '@superset-ui/core/components';
+import { extendedDayjs as dayjs } from '@superset-ui/core/utils/dates';
 import Handlebars from 'handlebars';
-import dayjs from 'dayjs';
 import { useMemo, useState } from 'react';
 import { isPlainObject } from 'lodash';
 import Helpers from 'just-handlebars-helpers';

superset-frontend/plugins/plugin-chart-handlebars/tsconfig.json

@@ -1,17 +1,18 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": ".",
-    "paths": {
-      "@superset-ui/core/components": ["../../packages/superset-ui-core/src/components"]
-    }
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
-  "include": ["src/**/*", "types/**/*"],
-  "exclude": ["lib", "test"],
+  "include": ["src/**/*.ts", "src/**/*.tsx", "types/**/*"],
+  "exclude": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.test.*",
+    "src/**/*.stories.*"
+  ],
   "references": [
+    { "path": "../../packages/superset-core" },
     { "path": "../../packages/superset-ui-core" },
     { "path": "../../packages/superset-ui-chart-controls" }
   ]

superset-frontend/plugins/plugin-chart-pivot-table/package.json

@@ -27,6 +27,7 @@
     "access": "public"
   },
   "peerDependencies": {
+    "@apache-superset/core": "*",
     "@ant-design/icons": "^5.2.6",
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",

superset-frontend/plugins/plugin-chart-pivot-table/tsconfig.json

@@ -1,14 +1,13 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": "."
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
   "include": ["src/**/*", "types/**/*"],
-  "exclude": ["lib", "test"],
+  "exclude": ["src/**/*.test.*", "src/**/*.stories.*"],
   "references": [
+    { "path": "../../packages/superset-core" },
     { "path": "../../packages/superset-ui-core" },
     { "path": "../../packages/superset-ui-chart-controls" }
   ]

superset-frontend/plugins/plugin-chart-table/package.json

@@ -36,6 +36,7 @@
     "xss": "^1.0.15"
   },
   "peerDependencies": {
+    "@apache-superset/core": "*",
     "@ant-design/icons": "^5.2.6",
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",

superset-frontend/plugins/plugin-chart-table/test/tsconfig.json

@@ -2,18 +2,8 @@
   "compilerOptions": {
     "composite": false,
     "emitDeclarationOnly": false,
-    "noEmit": true,
     "rootDir": "../../../"
   },
   "extends": "../../../tsconfig.json",
-  "include": [
-    "**/*",
-    "../types/**/*",
-    "../../../types/**/*"
-  ],
-  "references": [
-    {
-      "path": ".."
-    }
-  ]
+  "include": ["**/*", "../types/**/*", "../../../types/**/*"]
 }

superset-frontend/plugins/plugin-chart-table/tsconfig.json

@@ -1,17 +1,18 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": ".",
-    "paths": {
-      "@superset-ui/core/components": ["../../packages/superset-ui-core/src/components"]
-    }
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
-  "include": ["src/**/*", "types/**/*"],
-  "exclude": ["lib", "test"],
+  "include": ["src/**/*.ts", "src/**/*.tsx", "types/**/*"],
+  "exclude": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.test.*",
+    "src/**/*.stories.*"
+  ],
   "references": [
+    { "path": "../../packages/superset-core" },
     { "path": "../../packages/superset-ui-core" },
     { "path": "../../packages/superset-ui-chart-controls" }
   ]

superset-frontend/plugins/plugin-chart-word-cloud/test/tsconfig.json

@@ -2,18 +2,8 @@
   "compilerOptions": {
     "composite": false,
     "emitDeclarationOnly": false,
-    "noEmit": true,
     "rootDir": "."
   },
   "extends": "../../../tsconfig.json",
-  "include": [
-    "**/*",
-    "../types/**/*",
-    "../../../types/**/*"
-  ],
-  "references": [
-    {
-      "path": ".."
-    }
-  ]
+  "include": ["**/*", "../types/**/*", "../../../types/**/*"]
 }

superset-frontend/plugins/plugin-chart-word-cloud/tsconfig.json

@@ -1,14 +1,18 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": "."
+    "baseUrl": "../..",
+    "outDir": "lib"
   },
-  "include": ["src/**/*", "types/**/*"],
-  "exclude": ["lib", "test"],
+  "include": ["src/**/*.ts", "src/**/*.tsx", "types/**/*"],
+  "exclude": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.test.*",
+    "src/**/*.stories.*"
+  ],
   "references": [
+    { "path": "../../packages/superset-core" },
     { "path": "../../packages/superset-ui-core" },
     { "path": "../../packages/superset-ui-chart-controls" }
   ]

superset-frontend/src/SqlLab/components/ResultSet/index.tsx

@@ -64,7 +64,8 @@ import {
   SaveDatasetModal,
 } from 'src/SqlLab/components/SaveDatasetModal';
 import { EXPLORE_CHART_DEFAULT, SqlLabRootState } from 'src/SqlLab/types';
-import { generateExploreUrl } from 'src/explore/exploreUtils/formData';
+import { mountExploreUrl } from 'src/explore/exploreUtils';
+import { postFormData } from 'src/explore/exploreUtils/formData';
 import ProgressBar from '@superset-ui/core/components/ProgressBar';
 import { addDangerToast } from 'src/components/MessageToasts/actions';
 import { prepareCopyToClipboardTabularData } from 'src/utils/common';
@@ -77,6 +78,7 @@ import {
   reFetchQueryResults,
   reRunQuery,
 } from 'src/SqlLab/actions/sqlLab';
+import { URL_PARAMS } from 'src/constants';
 import useLogAction from 'src/logger/useLogAction';
 import {
   LOG_ACTIONS_SQLLAB_COPY_RESULT_TO_CLIPBOARD,
@@ -275,13 +277,16 @@ const ResultSet = ({
     const openInNewWindow = clickEvent.metaKey;
     logAction(LOG_ACTIONS_SQLLAB_CREATE_CHART, {});
     if (results?.query_id) {
-      const url = await generateExploreUrl(results.query_id, 'query', {
+      const key = await postFormData(results.query_id, 'query', {
         ...EXPLORE_CHART_DEFAULT,
         datasource: `${results.query_id}__query`,
         ...{
           all_columns: results.columns.map(column => column.column_name),
         },
       });
+      const url = mountExploreUrl(null, {
+        [URL_PARAMS.formDataKey.name]: key,
+      });
       if (openInNewWindow) {
         window.open(url, '_blank', 'noreferrer');
       } else {

superset-frontend/src/SqlLab/components/SaveDatasetModal/index.tsx

@@ -42,8 +42,8 @@ import {
   FeatureFlag,
   isFeatureEnabled,
 } from '@superset-ui/core';
+import { extendedDayjs as dayjs } from '@superset-ui/core/utils/dates';
 import { useSelector, useDispatch } from 'react-redux';
-import dayjs from 'dayjs';
 import rison from 'rison';
 import { createDatasource } from 'src/SqlLab/actions/sqlLab';
 import { addDangerToast } from 'src/components/MessageToasts/actions';

superset-frontend/src/components/Chart/ChartRenderer.test.jsx

@@ -182,7 +182,6 @@ test('should handle matrixify-related form data changes', () => {
   const initialProps = {
     ...requiredProps,
     formData: {
-      matrixify_enabled: false,
       regular_control: 'value1',
     },
     queriesResponse: [{ data: 'current' }],

superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx

@@ -43,7 +43,7 @@ import {
 } from '@superset-ui/core/components';
 import { RootState } from 'src/dashboard/types';
 import { DashboardPageIdContext } from 'src/dashboard/containers/DashboardPage';
-import { generateExploreUrl } from 'src/explore/exploreUtils/formData';
+import { postFormData } from 'src/explore/exploreUtils/formData';
 import { simpleFilterToAdhoc } from 'src/utils/simpleFilterToAdhoc';
 import { useDatasetMetadataBar } from 'src/features/datasets/metadataBar/useDatasetMetadataBar';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
@@ -96,12 +96,11 @@ const ModalFooter = ({ formData, closeModal }: ModalFooterProps) => {
   useEffect(() => {
     // short circuit if the user is embedded as explore is not available
     if (isEmbedded()) return;
-    generateExploreUrl(Number(datasource_id), datasource_type, formData, {
-      chartId: 0,
-      dashboardPageId,
-    })
-      .then(url => {
-        setUrl(url);
+    postFormData(Number(datasource_id), datasource_type, formData, 0)
+      .then(key => {
+        setUrl(
+          `/explore/?form_data_key=${key}&dashboard_page_id=${dashboardPageId}`,
+        );
       })
       .catch(() => {
         addDangerToast(t('Failed to generate chart edit URL'));

superset-frontend/src/components/Chart/DrillDetail/DrillDetailModal.test.tsx

@@ -32,14 +32,6 @@ jest.mock('react-router-dom', () => ({
   }),
 }));
 
-jest.mock('src/explore/exploreUtils', () => ({
-  ...jest.requireActual('src/explore/exploreUtils'),
-  getExploreUrl: jest.fn(
-    ({ formData }) =>
-      `/explore/?dashboard_page_id=&slice_id=${formData.slice_id}`,
-  ),
-}));
-
 const { id: chartId, form_data: formData } = chartQueries[sliceId];
 const { slice_name: chartName } = formData;
 const store = getMockStoreWithNativeFilters();
@@ -51,10 +43,7 @@ const drillToDetailModalState = {
   },
 };
 
-const renderModal = async (
-  overrideState: Record<string, any> = {},
-  dataset?: any,
-) => {
+const renderModal = async (overrideState: Record<string, any> = {}) => {
   const DrillDetailModalWrapper = () => {
     const [showModal, setShowModal] = useState(false);
     return (
@@ -68,7 +57,6 @@ const renderModal = async (
           initialFilters={[]}
           showModal={showModal}
           onHideModal={() => setShowModal(false)}
-          dataset={dataset}
         />
       </>
     );
@@ -92,21 +80,11 @@ test('should render the title', async () => {
   expect(screen.getByText(`Drill to detail: ${chartName}`)).toBeInTheDocument();
 });
 
-test('should not render Explore button when no drill-through chart is configured', async () => {
+test('should render the button', async () => {
   await renderModal();
   expect(
-    screen.queryByRole('button', { name: 'Explore' }),
-  ).not.toBeInTheDocument();
-  expect(screen.getAllByRole('button', { name: 'Close' })).toHaveLength(2);
-});
-
-test('should render Explore button when drill-through chart is configured', async () => {
-  const datasetWithDrillThrough = {
-    drill_through_chart_id: 123,
-    id: 456, // Required for URL generation
-  };
-  await renderModal({}, datasetWithDrillThrough);
-  expect(screen.getByRole('button', { name: 'Explore' })).toBeInTheDocument();
+    screen.getByRole('button', { name: 'Edit chart' }),
+  ).toBeInTheDocument();
   expect(screen.getAllByRole('button', { name: 'Close' })).toHaveLength(2);
 });
 
@@ -117,19 +95,20 @@ test('should close the modal', async () => {
   expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
 });
 
-test('should render "Explore" as disabled without can_explore permission', async () => {
-  const datasetWithDrillThrough = {
-    drill_through_chart_id: 123,
-    id: 456, // Required for URL generation
-  };
-  await renderModal(
-    {
-      user: {
-        ...drillToDetailModalState.user,
-        roles: { Admin: [['invalid_permission', 'Superset']] },
-      },
-    },
-    datasetWithDrillThrough,
+test('should forward to Explore', async () => {
+  await renderModal();
+  userEvent.click(screen.getByRole('button', { name: 'Edit chart' }));
+  expect(mockHistoryPush).toHaveBeenCalledWith(
+    `/explore/?dashboard_page_id=&slice_id=${sliceId}`,
   );
-  expect(screen.getByRole('button', { name: 'Explore' })).toBeDisabled();
+});
+
+test('should render "Edit chart" as disabled without can_explore permission', async () => {
+  await renderModal({
+    user: {
+      ...drillToDetailModalState.user,
+      roles: { Admin: [['invalid_permission', 'Superset']] },
+    },
+  });
+  expect(screen.getByRole('button', { name: 'Edit chart' })).toBeDisabled();
 });

superset-frontend/src/components/Chart/DrillDetail/DrillDetailModal.tsx

@@ -17,7 +17,8 @@
  * under the License.
  */
 
-import { useContext, useMemo, useState } from 'react';
+import { useCallback, useContext, useMemo } from 'react';
+import { useHistory } from 'react-router-dom';
 import {
   BinaryQueryObjectFilterClause,
   css,
@@ -32,46 +33,37 @@ import { isEmbedded } from 'src/dashboard/util/isEmbedded';
 import { Slice } from 'src/types/Chart';
 import { RootState } from 'src/dashboard/types';
 import { findPermission } from 'src/utils/findPermission';
-import { useToasts } from 'src/components/MessageToasts/withToasts';
-import { getFormDataWithDashboardContext } from 'src/explore/controlUtils/getFormDataWithDashboardContext';
-import { useDashboardFormData } from 'src/dashboard/hooks/useDashboardFormData';
-import { generateExploreUrl } from 'src/explore/exploreUtils/formData';
 import { Dataset } from '../types';
 import DrillDetailPane from './DrillDetailPane';
 
 interface ModalFooterProps {
   canExplore: boolean;
   closeModal?: () => void;
-  showEditButton: boolean;
-  onExploreClick?: (event: React.MouseEvent) => void;
-  isGeneratingUrl: boolean;
+  exploreChart: () => void;
 }
 
 const ModalFooter = ({
   canExplore,
   closeModal,
-  showEditButton,
-  onExploreClick,
-  isGeneratingUrl,
+  exploreChart,
 }: ModalFooterProps) => {
   const theme = useTheme();
 
   return (
     <>
-      {!isEmbedded() && showEditButton && (
+      {!isEmbedded() && (
         <Button
           buttonStyle="secondary"
           buttonSize="small"
-          onClick={canExplore ? onExploreClick : undefined}
-          disabled={!canExplore || isGeneratingUrl}
-          loading={isGeneratingUrl}
+          onClick={exploreChart}
+          disabled={!canExplore}
           tooltip={
             !canExplore
-              ? t('You do not have sufficient permissions to explore the chart')
+              ? t('You do not have sufficient permissions to edit the chart')
               : undefined
           }
         >
-          {t('Explore')}
+          {t('Edit chart')}
         </Button>
       )}
       <Button
@@ -107,10 +99,8 @@ export default function DrillDetailModal({
   dataset,
 }: DrillDetailModalProps) {
   const theme = useTheme();
+  const history = useHistory();
   const dashboardPageId = useContext(DashboardPageIdContext);
-  const { addDangerToast } = useToasts();
-  const [isGeneratingUrl, setIsGeneratingUrl] = useState(false);
-
   const { slice_name: chartName } = useSelector(
     (state: { sliceEntities: { slices: Record<number, Slice> } }) =>
       state.sliceEntities?.slices?.[chartId] || {},
@@ -119,65 +109,14 @@ export default function DrillDetailModal({
     findPermission('can_explore', 'Superset', state.user?.roles),
   );
 
-  const showEditButton = Boolean(dataset?.drill_through_chart_id);
-  const dashboardContextFormData = useDashboardFormData(
-    dataset?.drill_through_chart_id,
+  const exploreUrl = useMemo(
+    () => `/explore/?dashboard_page_id=${dashboardPageId}&slice_id=${chartId}`,
+    [chartId, dashboardPageId],
   );
 
-  const drillThroughFormData = useMemo(() => {
-    if (!dataset?.drill_through_chart_id || !dataset?.id) {
-      return null;
-    }
-
-    const drillThroughBaseFormData = {
-      slice_id: dataset.drill_through_chart_id,
-      datasource: `${dataset.id}__table`,
-      viz_type: 'table',
-    };
-
-    return getFormDataWithDashboardContext(
-      drillThroughBaseFormData,
-      dashboardContextFormData,
-      undefined,
-      initialFilters,
-    );
-  }, [
-    dataset?.drill_through_chart_id,
-    dataset?.id,
-    dashboardContextFormData,
-    initialFilters,
-  ]);
-  const handleExploreClick = async (event: React.MouseEvent) => {
-    event.preventDefault();
-
-    if (
-      !dataset?.drill_through_chart_id ||
-      !drillThroughFormData ||
-      !dataset?.id
-    ) {
-      return;
-    }
-
-    setIsGeneratingUrl(true);
-
-    try {
-      const url = await generateExploreUrl(
-        dataset.id,
-        'table',
-        drillThroughFormData,
-        {
-          chartId: dataset.drill_through_chart_id,
-          dashboardPageId,
-        },
-      );
-
-      window.location.href = url;
-    } catch (error) {
-      console.error('Failed to generate chart explore URL:', error);
-      addDangerToast(t('Failed to generate chart explore URL'));
-      setIsGeneratingUrl(false);
-    }
-  };
+  const exploreChart = useCallback(() => {
+    history.push(exploreUrl);
+  }, [exploreUrl, history]);
 
   return (
     <Modal
@@ -192,12 +131,7 @@ export default function DrillDetailModal({
       name={t('Drill to detail: %s', chartName)}
       title={t('Drill to detail: %s', chartName)}
       footer={
-        <ModalFooter
-          canExplore={canExplore}
-          showEditButton={showEditButton}
-          onExploreClick={handleExploreClick}
-          isGeneratingUrl={isGeneratingUrl}
-        />
+        <ModalFooter exploreChart={exploreChart} canExplore={canExplore} />
       }
       responsive
       resizable
@@ -217,7 +151,6 @@ export default function DrillDetailModal({
         formData={formData}
         initialFilters={initialFilters}
         dataset={dataset}
-        drillThroughFormData={drillThroughFormData}
       />
     </Modal>
   );

superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.tsx

@@ -33,7 +33,6 @@ import {
   GenericDataType,
   JsonObject,
   QueryFormData,
-  StatefulChart,
   t,
   useTheme,
 } from '@superset-ui/core';
@@ -41,7 +40,7 @@ import { useResizeDetector } from 'react-resize-detector';
 import BooleanCell from '@superset-ui/core/components/Table/cell-renderers/BooleanCell';
 import NullCell from '@superset-ui/core/components/Table/cell-renderers/NullCell';
 import TimeCell from '@superset-ui/core/components/Table/cell-renderers/TimeCell';
-import { EmptyState, Flex, Loading } from '@superset-ui/core/components';
+import { EmptyState, Loading } from '@superset-ui/core/components';
 import { getDatasourceSamples } from 'src/components/Chart/chartAction';
 import Table, {
   ColumnsType,
@@ -82,12 +81,10 @@ export default function DrillDetailPane({
   formData,
   initialFilters,
   dataset,
-  drillThroughFormData,
 }: {
   formData: QueryFormData;
   initialFilters: BinaryQueryObjectFilterClause[];
   dataset?: Dataset;
-  drillThroughFormData?: QueryFormData | null;
 }) {
   const theme = useTheme();
   const [pageIndex, setPageIndex] = useState(0);
@@ -164,7 +161,7 @@ export default function DrillDetailPane({
           ) : (
             dataset?.verbose_map?.[column] || column
           ),
-        render: (value: any) => {
+        render: value => {
           if (value === true || value === false) {
             return <BooleanCell value={value} />;
           }
@@ -236,10 +233,6 @@ export default function DrillDetailPane({
 
   // Download page of results & trim cache if page not in cache
   useEffect(() => {
-    // Skip table data fetching if we're using a drill-through chart
-    if (dataset?.drill_through_chart_id) {
-      return;
-    }
     if (!responseError && !isLoading && !resultsPages.has(pageIndex)) {
       setIsLoading(true);
       const jsonPayload = getDrillPayload(formData, filters) ?? {};
@@ -289,27 +282,12 @@ export default function DrillDetailPane({
     resultsPages,
   ]);
 
-  const bootstrapping =
-    !dataset?.drill_through_chart_id && !responseError && !resultsPages.size;
+  const bootstrapping = !responseError && !resultsPages.size;
 
   const allowHTML = formData.allow_render_html ?? true;
 
   let tableContent = null;
-
-  // If a drill-through chart is configured, use it instead of the table
-  if (dataset?.drill_through_chart_id && drillThroughFormData) {
-    tableContent = (
-      <Flex vertical style={{ height: '100%' }}>
-        <StatefulChart
-          chartId={dataset.drill_through_chart_id}
-          formDataOverrides={drillThroughFormData}
-          height="100%"
-          width="100%"
-          showLoading
-        />
-      </Flex>
-    );
-  } else if (responseError) {
+  if (responseError) {
     // Render error if page download failed
     tableContent = (
       <pre
@@ -353,7 +331,7 @@ export default function DrillDetailPane({
   return (
     <>
       {!bootstrapping && metadataBarComponent}
-      {!bootstrapping && !dataset?.drill_through_chart_id && (
+      {!bootstrapping && (
         <TableControls
           filters={filters}
           setFilters={setFilters}

superset-frontend/src/components/Chart/types.ts

@@ -24,7 +24,6 @@ export enum DrillByType {
 }
 
 export type Dataset = {
-  id?: number;
   changed_by?: {
     first_name: string;
     last_name: string;
@@ -45,5 +44,4 @@ export type Dataset = {
   drillable_columns?: Column[];
   metrics?: Metric[];
   verbose_map?: Record<string, string>;
-  drill_through_chart_id?: number | null;
 };

superset-frontend/src/components/Datasource/DatasourceModal/index.tsx

@@ -46,7 +46,6 @@ import withToasts from 'src/components/MessageToasts/withToasts';
 import { ErrorMessageWithStackTrace } from 'src/components';
 import type { DatasetObject } from 'src/features/datasets/types';
 import type { DatasourceModalProps } from '../types';
-import { invalidateDatasetDrillCache } from 'src/utils/cachedSupersetGet';
 
 const DatasourceEditor = AsyncEsmComponent(
   () => import('../components/DatasourceEditor'),
@@ -182,7 +181,6 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
       owners: datasource.owners.map(
         (o: Record<string, number>) => o.value || o.id,
       ),
-      drill_through_chart_id: datasource.drill_through_chart_id || null,
     };
     // Handle catalog based on database's allow_multi_catalog setting
     // If multi-catalog is disabled, don't include catalog in payload
@@ -205,10 +203,6 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
       const { json } = await SupersetClient.get({
         endpoint: `/api/v1/dataset/${currentDatasource?.id}`,
       });
-
-      // Invalidate drill info cache to pick up any drill-through config changes
-      invalidateDatasetDrillCache(currentDatasource.id);
-
       addSuccessToast(t('The dataset has been saved'));
       // eslint-disable-next-line no-param-reassign
       json.result.type = 'table';

superset-frontend/src/components/Datasource/components/DatasourceEditor/DatasourceEditor.jsx

@@ -75,7 +75,6 @@ import Fieldset from '../Fieldset';
 import Field from '../Field';
 import { fetchSyncedColumns, updateColumns } from '../../utils';
 import DatasetUsageTab from './components/DatasetUsageTab';
-import ChartSelect from '../Select/ChartSelect';
 
 const extensionsRegistry = getExtensionsRegistry();
 
@@ -1055,25 +1054,6 @@ class DatasourceEditor extends PureComponent {
             }
           />
         )}
-        {this.state.isSqla && (
-          <Field
-            fieldKey="drill_through_chart_id"
-            value={datasource.drill_through_chart_id}
-            onChange={this.onDatasourcePropChange}
-            label={t('Drill-to-details table/chart')}
-            description={t(
-              'Select a chart to display when users drill into this dataset. If not configured, shows all columns in a table.',
-            )}
-            control={
-              <ChartSelect
-                datasetId={datasource.id}
-                placeholder={t('Default (show all columns)')}
-                allowClear
-                ariaLabel={t('Select drill-to-details chart')}
-              />
-            }
-          />
-        )}
         {this.state.isSqla && (
           <Field
             fieldKey="extra"

superset-frontend/src/components/ListView/CardCollection.tsx

@@ -17,7 +17,7 @@
  * under the License.
  */
 import { ReactNode, MouseEvent as ReactMouseEvent } from 'react';
-import { TableInstance, Row } from 'react-table';
+import { TableInstance, Row, UseRowSelectRowProps } from 'react-table';
 import { styled } from '@superset-ui/core';
 import cx from 'classnames';
 
@@ -65,7 +65,7 @@ export default function CardCollection({
 }: CardCollectionProps) {
   function handleClick(
     event: ReactMouseEvent<HTMLDivElement, MouseEvent>,
-    toggleRowSelected: Row['toggleRowSelected'],
+    toggleRowSelected: (value?: boolean) => void,
   ) {
     if (bulkSelectEnabled) {
       event.preventDefault();
@@ -89,11 +89,18 @@ export default function CardCollection({
           return (
             <CardWrapper
               className={cx({
-                'card-selected': bulkSelectEnabled && row.isSelected,
+                'card-selected':
+                  bulkSelectEnabled &&
+                  (row as Row & UseRowSelectRowProps<any>).isSelected,
                 'bulk-select': bulkSelectEnabled,
               })}
               key={row.id}
-              onClick={e => handleClick(e, row.toggleRowSelected)}
+              onClick={e =>
+                handleClick(
+                  e,
+                  (row as Row & UseRowSelectRowProps<any>).toggleRowSelected,
+                )
+              }
               role="none"
             >
               {renderCard({ ...row.original, loading })}

superset-frontend/src/components/ListView/ListView.tsx

@@ -419,7 +419,7 @@ export function ListView<T extends object = any>({
                           cta
                           onClick={() =>
                             action.onSelect(
-                              selectedFlatRows.map(r => r.original),
+                              selectedFlatRows.map((r: any) => r.original),
                             )
                           }
                         >
@@ -475,10 +475,10 @@ export function ListView<T extends object = any>({
                   bulkSelectEnabled={bulkSelectEnabled}
                   selectedFlatRows={selectedFlatRows}
                   toggleRowSelected={(rowId, value) => {
-                    const row = rows.find(r => r.id === rowId);
+                    const row = rows.find((r: any) => r.id === rowId);
                     if (row) {
                       prepareRow(row);
-                      row.toggleRowSelected(value);
+                      (row as any).toggleRowSelected(value);
                     }
                   }}
                   toggleAllRowsSelected={toggleAllRowsSelected}

superset-frontend/src/components/ListView/utils.ts

@@ -273,23 +273,23 @@ export function useListViewState({
   } = useTable(
     {
       columns: columnsWithSelect,
-      count,
       data,
       disableFilters: true,
       disableSortRemove: true,
-      initialState,
+      initialState: initialState as any,
       manualFilters: true,
       manualPagination: true,
       manualSortBy: true,
       autoResetFilters: false,
       pageCount: Math.ceil(count / initialPageSize),
+      ...({ count } as any),
     },
     useFilters,
     useSortBy,
     usePagination,
     useRowState,
     useRowSelect,
-  );
+  ) as any;
 
   const [internalFilters, setInternalFilters] = useState<InternalFilter[]>(
     query.filters && initialFilters.length

superset-frontend/src/components/Select/ChartSelect.test.tsx

@@ -1,115 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { render } from 'spec/helpers/testing-library';
-import ChartSelectUsingAsync from './ChartSelect';
-
-const mockOnChange = jest.fn();
-
-const defaultProps = {
-  value: null,
-  onChange: mockOnChange,
-  datasetId: 123,
-  placeholder: 'Select a chart',
-  allowClear: true,
-  ariaLabel: 'Select drill-to-details chart',
-};
-
-test('renders chart select component with default props', () => {
-  const { container } = render(<ChartSelectUsingAsync {...defaultProps} />, {
-    useRedux: true,
-  });
-  expect(container.firstChild).toBeInTheDocument();
-});
-
-test('renders with custom placeholder', () => {
-  const customProps = {
-    ...defaultProps,
-    placeholder: 'Choose your chart',
-  };
-
-  const { container } = render(<ChartSelectUsingAsync {...customProps} />, {
-    useRedux: true,
-  });
-  expect(container.firstChild).toBeInTheDocument();
-});
-
-test('renders with selected value', () => {
-  const propsWithValue = {
-    ...defaultProps,
-    value: 456,
-  };
-
-  const { container } = render(<ChartSelectUsingAsync {...propsWithValue} />, {
-    useRedux: true,
-  });
-  expect(container.firstChild).toBeInTheDocument();
-});
-
-test('renders without dataset filter when datasetId is undefined', () => {
-  const propsWithoutDataset = {
-    ...defaultProps,
-    datasetId: undefined,
-  };
-
-  const { container } = render(
-    <ChartSelectUsingAsync {...propsWithoutDataset} />,
-    { useRedux: true },
-  );
-  expect(container.firstChild).toBeInTheDocument();
-});
-
-test('renders with custom aria label', () => {
-  const propsWithCustomAriaLabel = {
-    ...defaultProps,
-    ariaLabel: 'Custom chart selector',
-  };
-
-  const { container } = render(
-    <ChartSelectUsingAsync {...propsWithCustomAriaLabel} />,
-    { useRedux: true },
-  );
-  expect(container.firstChild).toBeInTheDocument();
-});
-
-test('renders as non-clearable when allowClear is false', () => {
-  const nonClearableProps = {
-    ...defaultProps,
-    allowClear: false,
-  };
-
-  const { container } = render(
-    <ChartSelectUsingAsync {...nonClearableProps} />,
-    { useRedux: true },
-  );
-  expect(container.firstChild).toBeInTheDocument();
-});
-
-test('passes through additional props to SelectAsyncControl', () => {
-  const propsWithExtra = {
-    ...defaultProps,
-    description: 'Test description',
-    hovered: true,
-    'data-testid': 'chart-select',
-  };
-
-  const { container } = render(<ChartSelectUsingAsync {...propsWithExtra} />, {
-    useRedux: true,
-  });
-  expect(container.firstChild).toBeInTheDocument();
-});

superset-frontend/src/components/Select/ChartSelect.tsx

@@ -1,105 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { useMemo } from 'react';
-import { t } from '@superset-ui/core';
-import SelectAsyncControl from 'src/explore/components/controls/SelectAsyncControl';
-import type { ComponentProps } from 'react';
-import rison from 'rison';
-
-// Extract the actual props from SelectAsyncControl component
-type SelectAsyncControlProps = ComponentProps<typeof SelectAsyncControl>;
-
-export interface ChartSelectProps
-  extends Omit<
-    SelectAsyncControlProps,
-    'onChange' | 'dataEndpoint' | 'mutator' | 'addDangerToast'
-  > {
-  // ChartSelect-specific props that override base props
-  value?: number | null;
-  onChange: (value: number | null) => void;
-  datasetId?: number;
-}
-
-/**
- * A chart selection component built on SelectAsyncControl
- * @param value - The selected chart ID
- * @param onChange - Callback when selection changes
- * @param datasetId - Optional dataset ID to filter charts
- * @param placeholder - Optional placeholder text
- * @param ariaLabel - ARIA label for accessibility
- * @param rest - All other props are passed through to SelectAsyncControl
- */
-export default function ChartSelectUsingAsync({
-  value,
-  onChange,
-  datasetId,
-  placeholder = t('Select a chart'),
-  ariaLabel = t('Select drill-to-details chart'),
-  ...rest
-}: ChartSelectProps) {
-  // Build query parameters for filtering charts by dataset
-  const queryParams = useMemo(() => {
-    if (!datasetId) return undefined;
-
-    const filters = [
-      {
-        col: 'datasource_id',
-        opr: 'eq',
-        value: datasetId,
-      },
-      {
-        col: 'datasource_type',
-        opr: 'eq',
-        value: 'table',
-      },
-    ];
-
-    return {
-      q: rison.encode({
-        filters,
-        order_column: 'slice_name',
-        order_direction: 'asc',
-      }),
-    };
-  }, [datasetId]);
-
-  // Transform response to format expected by SelectAsyncControl
-  const mutator = useMemo(
-    () => (response: any) =>
-      response.result.map((chart: any) => ({
-        value: chart.id,
-        label: `${chart.slice_name} (${chart.viz_type})`,
-      })),
-    [],
-  );
-
-  return (
-    <SelectAsyncControl
-      ariaLabel={ariaLabel}
-      dataEndpoint="/api/v1/chart/"
-      searchParams={queryParams}
-      mutator={mutator}
-      value={value}
-      onChange={onChange}
-      placeholder={placeholder}
-      multi={false}
-      {...rest}
-    />
-  );
-}

superset-frontend/src/dashboard/hooks/useDashboardFormData.test.tsx

@@ -1,171 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { renderHook } from '@testing-library/react-hooks';
-import { Provider } from 'react-redux';
-import configureMockStore from 'redux-mock-store';
-import { useDashboardFormData } from './useDashboardFormData';
-
-const mockStore = configureMockStore([]);
-
-const createMockState = (overrides = {}) => ({
-  dashboardInfo: {
-    id: 123,
-    metadata: {
-      chart_configuration: {},
-    },
-  },
-  dashboardState: {
-    sliceIds: [1, 2, 3],
-  },
-  nativeFilters: {
-    filters: {},
-  },
-  dataMask: {},
-  ...overrides,
-});
-
-const renderUseDashboardFormData = (
-  chartId: number | null | undefined,
-  state = {},
-) => {
-  const store = mockStore(createMockState(state));
-  return renderHook(() => useDashboardFormData(chartId), {
-    wrapper: ({ children }) => <Provider store={store}>{children}</Provider>,
-  });
-};
-
-test('returns base dashboard context when chartId is null', () => {
-  const { result } = renderUseDashboardFormData(null);
-
-  expect(result.current).toEqual({ dashboardId: 123 });
-});
-
-test('returns base dashboard context when chartId is undefined', () => {
-  const { result } = renderUseDashboardFormData(undefined);
-
-  expect(result.current).toEqual({ dashboardId: 123 });
-});
-
-test('returns base dashboard context when required state is missing', () => {
-  const { result } = renderUseDashboardFormData(1, {
-    nativeFilters: null,
-  });
-
-  expect(result.current).toEqual({ dashboardId: 123 });
-});
-
-test('returns base dashboard context when no filters apply to chart', () => {
-  const { result } = renderUseDashboardFormData(1, {
-    nativeFilters: {
-      filters: {
-        'filter-1': {
-          scope: [2, 3], // Doesn't include chartId 1
-        },
-      },
-    },
-    dashboardInfo: {
-      id: 123,
-      metadata: {
-        chart_configuration: {
-          'filter-1': {
-            id: 'filter-1',
-            scope: [2, 3],
-          },
-        },
-      },
-    },
-  });
-
-  expect(result.current).toEqual({ dashboardId: 123 });
-});
-
-test('returns dashboard context with extra form data when filters apply', () => {
-  const mockState = {
-    nativeFilters: {
-      filters: {
-        'filter-1': {
-          scope: [1, 2, 3], // Includes chartId 1
-        },
-      },
-    },
-    dashboardInfo: {
-      id: 123,
-      metadata: {
-        chart_configuration: {
-          'filter-1': {
-            id: 'filter-1',
-            scope: [1, 2, 3],
-          },
-        },
-      },
-    },
-    dataMask: {
-      'filter-1': {
-        extraFormData: {
-          filters: [
-            {
-              col: 'country',
-              op: 'IN',
-              val: ['USA', 'Canada'],
-            },
-          ],
-        },
-      },
-    },
-  };
-
-  // Mock the external utility functions
-  jest.mock('../util/activeAllDashboardFilters', () => ({
-    getAllActiveFilters: () => ({
-      'filter-1': {
-        scope: [1, 2, 3],
-      },
-    }),
-  }));
-
-  jest.mock('../components/nativeFilters/utils', () => ({
-    getExtraFormData: () => ({
-      filters: [
-        {
-          col: 'country',
-          op: 'IN',
-          val: ['USA', 'Canada'],
-        },
-      ],
-    }),
-  }));
-
-  const { result } = renderUseDashboardFormData(1, mockState);
-
-  expect(result.current.dashboardId).toBe(123);
-  expect(result.current.extra_form_data).toBeDefined();
-});
-
-test('handles different dashboard IDs correctly', () => {
-  const { result } = renderUseDashboardFormData(1, {
-    dashboardInfo: {
-      id: 456,
-      metadata: {
-        chart_configuration: {},
-      },
-    },
-  });
-
-  expect(result.current).toEqual({ dashboardId: 456 });
-});

superset-frontend/src/dashboard/hooks/useDashboardFormData.ts

@@ -1,108 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { useMemo } from 'react';
-import { useSelector } from 'react-redux';
-import { RootState, DashboardContextFormData } from '../types';
-import { getExtraFormData } from '../components/nativeFilters/utils';
-import { getAllActiveFilters } from '../util/activeAllDashboardFilters';
-import { getFilterIdsAppliedOnChart } from '../util/getFilterIdsAppliedOnChart';
-
-/**
- * Hook that provides dashboard context as formatted formData for charts.
- * This encapsulates all the complex logic for determining which dashboard
- * filters, colors, and other context should be applied to a specific chart.
- *
- * @param chartId - The ID of the chart to get dashboard context for
- * @returns Dashboard context formatted as QueryFormData fields
- */
-export const useDashboardFormData = (
-  chartId: number | null | undefined,
-): DashboardContextFormData => {
-  // Dashboard state selectors
-  const dashboardId = useSelector<RootState, number>(
-    ({ dashboardInfo }) => dashboardInfo.id,
-  );
-
-  const nativeFilters = useSelector(
-    (state: RootState) => state.nativeFilters?.filters,
-  );
-
-  const dataMask = useSelector((state: RootState) => state.dataMask);
-
-  const chartConfiguration = useSelector(
-    (state: RootState) =>
-      state.dashboardInfo.metadata?.chart_configuration || {},
-  );
-
-  const allSliceIds = useSelector(
-    (state: RootState) => state.dashboardState.sliceIds,
-  );
-
-  // Compute dashboard context for the chart
-  return useMemo((): DashboardContextFormData => {
-    const baseContext: DashboardContextFormData = { dashboardId };
-
-    // Early return if we don't have required data or chartId
-    if (
-      !chartId ||
-      !nativeFilters ||
-      !dataMask ||
-      !chartConfiguration ||
-      !allSliceIds
-    ) {
-      return baseContext;
-    }
-
-    // Get active filters using the same logic as normal dashboard charts
-    const activeFilters = getAllActiveFilters({
-      chartConfiguration,
-      nativeFilters,
-      dataMask,
-      allSliceIds,
-    });
-
-    // Find which filters apply to this specific chart
-    const filterIdsAppliedOnChart = getFilterIdsAppliedOnChart(
-      activeFilters,
-      chartId,
-    );
-
-    // If no filters apply, return just the base context
-    if (filterIdsAppliedOnChart.length === 0) {
-      return baseContext;
-    }
-
-    // Get the extra form data from dashboard filters
-    const extraFormData = getExtraFormData(dataMask, filterIdsAppliedOnChart);
-
-    return {
-      ...baseContext,
-      extra_form_data: extraFormData,
-      // TODO: Add other dashboard context like color schemes when needed
-    };
-  }, [
-    chartId,
-    dashboardId,
-    nativeFilters,
-    dataMask,
-    chartConfiguration,
-    allSliceIds,
-  ]);
-};

superset-frontend/src/dashboard/types.ts

@@ -26,7 +26,6 @@ import {
   NativeFilterScope,
   NativeFiltersState,
   NativeFilterTarget,
-  QueryFormData,
 } from '@superset-ui/core';
 import { Dataset } from '@superset-ui/chart-controls';
 import { chart } from 'src/components/Chart/chartReducer';
@@ -300,31 +299,3 @@ export enum MenuKeys {
   ManageEmailReports = 'manage_email_reports',
   ExportPivotXlsx = 'export_pivot_xlsx',
 }
-
-/**
- * Represents the dashboard context that can be applied to a chart's formData.
- * This type defines the specific formData fields that dashboard components
- * can provide to integrate charts with the current dashboard state.
- */
-export interface DashboardContextFormData extends Partial<QueryFormData> {
-  /** The ID of the current dashboard */
-  dashboardId: number;
-
-  /** Dashboard native filters applied to the chart */
-  extra_form_data?: ExtraFormData;
-
-  /** Dashboard color scheme */
-  color_scheme?: string;
-
-  /** Dashboard color namespace */
-  color_namespace?: string;
-
-  /** Dashboard label colors mapping */
-  label_colors?: Record<string, string>;
-
-  /** Dashboard shared label colors */
-  shared_label_colors?: string[];
-
-  /** Dashboard map label colors */
-  map_label_colors?: Record<string, string>;
-}

superset-frontend/src/dashboard/util/charts/getFormDataWithExtraFilters.ts

@@ -34,7 +34,6 @@ import { areObjectsEqual } from 'src/reduxUtils';
 import { isEqual } from 'lodash';
 import getEffectiveExtraFilters from './getEffectiveExtraFilters';
 import { getAllActiveFilters } from '../activeAllDashboardFilters';
-import { getFilterIdsAppliedOnChart } from '../getFilterIdsAppliedOnChart';
 
 interface CachedFormData {
   extra_form_data?: JsonObject;
@@ -158,10 +157,9 @@ export default function getFormDataWithExtraFilters({
     });
 
   let extraData: JsonObject = {};
-  const filterIdsAppliedOnChart = getFilterIdsAppliedOnChart(
-    activeFilters,
-    chart.id,
-  );
+  const filterIdsAppliedOnChart = Object.entries(activeFilters)
+    .filter(([, activeFilter]) => activeFilter.scope.includes(chart.id))
+    .map(([filterId]) => filterId);
 
   if (filterIdsAppliedOnChart.length) {
     const aggregatedFormData = getExtraFormData(

superset-frontend/src/dashboard/util/getFilterIdsAppliedOnChart.test.ts

@@ -1,105 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { getFilterIdsAppliedOnChart } from './getFilterIdsAppliedOnChart';
-import { ActiveFilters } from '../types';
-
-describe('getFilterIdsAppliedOnChart', () => {
-  const createMockActiveFilters = (
-    filterConfigs: Array<{ id: string; scope: number[] }>,
-  ): ActiveFilters => {
-    const activeFilters: ActiveFilters = {};
-    filterConfigs.forEach(({ id, scope }) => {
-      activeFilters[id] = {
-        scope,
-        targets: [],
-        values: {},
-      };
-    });
-    return activeFilters;
-  };
-
-  test('returns filters that include chart in their scope', () => {
-    const activeFilters = createMockActiveFilters([
-      { id: 'filter-1', scope: [1, 2, 3] },
-      { id: 'filter-2', scope: [2, 4, 5] },
-      { id: 'filter-3', scope: [1, 3, 6] },
-    ]);
-
-    const result = getFilterIdsAppliedOnChart(activeFilters, 2);
-    expect(result).toEqual(['filter-1', 'filter-2']);
-  });
-
-  test('returns empty array when no filters apply to chart', () => {
-    const activeFilters = createMockActiveFilters([
-      { id: 'filter-1', scope: [1, 3, 5] },
-      { id: 'filter-2', scope: [7, 8, 9] },
-    ]);
-
-    const result = getFilterIdsAppliedOnChart(activeFilters, 2);
-    expect(result).toEqual([]);
-  });
-
-  test('returns empty array when activeFilters is empty', () => {
-    const activeFilters: ActiveFilters = {};
-    const result = getFilterIdsAppliedOnChart(activeFilters, 1);
-    expect(result).toEqual([]);
-  });
-
-  test('handles single filter with single chart scope', () => {
-    const activeFilters = createMockActiveFilters([
-      { id: 'single-filter', scope: [42] },
-    ]);
-
-    const result = getFilterIdsAppliedOnChart(activeFilters, 42);
-    expect(result).toEqual(['single-filter']);
-  });
-
-  test('handles multiple filters all applying to same chart', () => {
-    const activeFilters = createMockActiveFilters([
-      { id: 'filter-a', scope: [1, 2] },
-      { id: 'filter-b', scope: [1] },
-      { id: 'filter-c', scope: [1, 3, 4] },
-    ]);
-
-    const result = getFilterIdsAppliedOnChart(activeFilters, 1);
-    expect(result).toEqual(['filter-a', 'filter-b', 'filter-c']);
-  });
-
-  test('preserves filter ID order from Object.entries', () => {
-    const activeFilters = createMockActiveFilters([
-      { id: 'zebra', scope: [1] },
-      { id: 'alpha', scope: [1] },
-      { id: 'beta', scope: [1] },
-    ]);
-
-    const result = getFilterIdsAppliedOnChart(activeFilters, 1);
-    // Object.entries preserves insertion order in modern JS
-    expect(result).toEqual(['zebra', 'alpha', 'beta']);
-  });
-
-  test('handles edge case with large chart IDs', () => {
-    const activeFilters = createMockActiveFilters([
-      { id: 'filter-large', scope: [999999, 1000000, 1000001] },
-    ]);
-
-    const result = getFilterIdsAppliedOnChart(activeFilters, 1000000);
-    expect(result).toEqual(['filter-large']);
-  });
-});

superset-frontend/src/dashboard/util/getFilterIdsAppliedOnChart.ts

@@ -1,37 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { ActiveFilters } from '../types';
-
-/**
- * Returns the filter IDs that apply to a specific chart based on their scope.
- * This centralizes the logic for determining which dashboard filters
- * should be applied to a given chart.
- *
- * @param activeFilters - The currently active dashboard filters
- * @param chartId - The ID of the chart to check filter scope for
- * @returns Array of filter IDs that apply to the specified chart
- */
-export const getFilterIdsAppliedOnChart = (
-  activeFilters: ActiveFilters,
-  chartId: number,
-): string[] =>
-  Object.entries(activeFilters)
-    .filter(([, activeFilter]) => activeFilter.scope.includes(chartId))
-    .map(([filterId]) => filterId);

superset-frontend/src/explore/components/controls/ColorSchemeControl/ColorSchemeControl.test.tsx

@@ -31,6 +31,25 @@ import {
 } from 'spec/helpers/testing-library';
 import ColorSchemeControl, { ColorSchemes } from '.';
 
+// Import Lyft color scheme for testing search functionality
+const lyftColors = {
+  id: 'lyftColors',
+  label: 'Lyft Colors',
+  group: ColorSchemeGroup.Other,
+  colors: [
+    '#EA0B8C',
+    '#6C838E',
+    '#29ABE2',
+    '#33D9C1',
+    '#9DACB9',
+    '#7560AA',
+    '#2D5584',
+    '#831C4A',
+    '#333D47',
+    '#AC2077',
+  ],
+} as CategoricalScheme;
+
 const defaultProps = () => ({
   hasCustomLabelsColor: false,
   sharedLabelsColors: [],
@@ -137,3 +156,184 @@ test('Renders control with dashboard id and dashboard color scheme', () => {
     screen.getByLabelText('Select color scheme', { selector: 'input' }),
   ).toBeDisabled();
 });
+
+test('should show tooltip on hover when text overflows', async () => {
+  // Capture original descriptors before mocking
+  const originalScrollWidthDescriptor = Object.getOwnPropertyDescriptor(
+    HTMLElement.prototype,
+    'scrollWidth',
+  );
+  const originalOffsetWidthDescriptor = Object.getOwnPropertyDescriptor(
+    HTMLElement.prototype,
+    'offsetWidth',
+  );
+
+  try {
+    // Mock DOM properties to simulate text overflow (the condition for tooltip to show)
+    const mockScrollWidth = jest.fn(() => 200);
+    const mockOffsetWidth = jest.fn(() => 100);
+
+    Object.defineProperty(HTMLElement.prototype, 'scrollWidth', {
+      configurable: true,
+      get: mockScrollWidth,
+    });
+    Object.defineProperty(HTMLElement.prototype, 'offsetWidth', {
+      configurable: true,
+      get: mockOffsetWidth,
+    });
+
+    // Use existing D3 schemes
+    [...CategoricalD3].forEach(scheme =>
+      getCategoricalSchemeRegistry().registerValue(scheme.id, scheme),
+    );
+
+    setup();
+
+    // Open the dropdown
+    userEvent.click(
+      screen.getByLabelText('Select color scheme', { selector: 'input' }),
+    );
+
+    // Find D3 Category 10 and hover over it
+    const d3Category10 = await screen.findByText('D3 Category 10');
+    expect(d3Category10).toBeInTheDocument();
+
+    // Hover over the color scheme label - this should trigger tooltip due to overflow
+    userEvent.hover(d3Category10);
+
+    // The real component should now show the tooltip because scrollWidth > offsetWidth
+    await waitFor(() => {
+      // Look for the actual Tooltip component that gets rendered
+      const tooltip = document.querySelector('.ant-tooltip');
+      expect(tooltip).toBeInTheDocument();
+    });
+
+    // Test mouseout behavior - tooltip should hide
+    userEvent.unhover(d3Category10);
+
+    await waitFor(() => {
+      // Tooltip should be hidden after mouseout
+      const tooltip = document.querySelector('.ant-tooltip-hidden');
+      expect(tooltip).toBeInTheDocument();
+    });
+  } finally {
+    // Properly restore original descriptors
+    if (originalScrollWidthDescriptor) {
+      Object.defineProperty(
+        HTMLElement.prototype,
+        'scrollWidth',
+        originalScrollWidthDescriptor,
+      );
+    } else {
+      delete (HTMLElement.prototype as any).scrollWidth;
+    }
+
+    if (originalOffsetWidthDescriptor) {
+      Object.defineProperty(
+        HTMLElement.prototype,
+        'offsetWidth',
+        originalOffsetWidthDescriptor,
+      );
+    } else {
+      delete (HTMLElement.prototype as any).offsetWidth;
+    }
+  }
+});
+
+test('should handle tooltip content verification for color schemes', async () => {
+  // Register a scheme with known colors for content testing
+  const testScheme = {
+    id: 'testColors',
+    label: 'Test Color Scheme',
+    group: ColorSchemeGroup.Other,
+    colors: ['#FF0000', '#00FF00', '#0000FF'],
+  } as CategoricalScheme;
+
+  getCategoricalSchemeRegistry().registerValue(testScheme.id, testScheme);
+  setup();
+
+  // Open dropdown and verify our test scheme appears
+  userEvent.click(
+    screen.getByLabelText('Select color scheme', { selector: 'input' }),
+  );
+
+  const testColorScheme = await screen.findByText('Test Color Scheme');
+  expect(testColorScheme).toBeInTheDocument();
+
+  // Verify the data-test attribute is present for reliable selection
+  const testOption = screen.getByTestId('testColors');
+  expect(testOption).toBeInTheDocument();
+
+  // Test hover behavior
+  userEvent.hover(testColorScheme);
+
+  // The tooltip behavior is controlled by text overflow conditions
+  // We're verifying the basic hover infrastructure works
+  expect(testColorScheme).toBeInTheDocument();
+});
+
+test('should support search functionality for color schemes', async () => {
+  // Register multiple schemes including lyftColors for search testing
+  [
+    ...CategoricalD3,
+    lyftColors,
+    {
+      id: 'supersetDefault',
+      label: 'Superset Colors',
+      group: ColorSchemeGroup.Featured,
+      colors: ['#1f77b4', '#ff7f0e', '#2ca02c', '#d62728'],
+    } as CategoricalScheme,
+  ].forEach(scheme =>
+    getCategoricalSchemeRegistry().registerValue(scheme.id, scheme),
+  );
+
+  setup();
+
+  // Open the dropdown
+  const selectInput = screen.getByLabelText('Select color scheme', {
+    selector: 'input',
+  });
+  userEvent.click(selectInput);
+
+  // Type search term
+  userEvent.type(selectInput, 'lyftColors');
+
+  // Verify the search result appears
+  await waitFor(() => {
+    expect(screen.getByTestId('lyftColors')).toBeInTheDocument();
+  });
+
+  // Verify the filtered result shows the correct label
+  expect(screen.getByText('Lyft Colors')).toBeInTheDocument();
+});
+
+test('should NOT show tooltip for search results (original Cypress contract)', async () => {
+  // Register lyftColors for search testing
+  getCategoricalSchemeRegistry().registerValue(lyftColors.id, lyftColors);
+  setup();
+
+  // Open dropdown and search (matching original Cypress flow)
+  const selectInput = screen.getByLabelText('Select color scheme', {
+    selector: 'input',
+  });
+  userEvent.click(selectInput);
+  userEvent.type(selectInput, 'lyftColors');
+
+  // Find the search result and hover (matching original Cypress)
+  const lyftColorOption = await screen.findByTestId('lyftColors');
+  userEvent.hover(lyftColorOption);
+
+  // Original Cypress contract: search results should NOT show tooltips
+  await waitFor(() => {
+    const tooltip = document.querySelector(
+      '.ant-tooltip:not(.ant-tooltip-hidden)',
+    );
+    expect(tooltip).not.toBeInTheDocument();
+  });
+
+  // Double-check that no visible tooltip content exists
+  await waitFor(() => {
+    const tooltipContent = document.querySelector('.color-scheme-tooltip');
+    expect(tooltipContent).toBeFalsy();
+  });
+});

superset-frontend/src/explore/components/controls/DatasourceControl/DatasourceControl.test.tsx

@@ -32,6 +32,11 @@ import DatasourceControl from '.';
 
 const SupersetClientGet = jest.spyOn(SupersetClient, 'get');
 
+afterEach(() => {
+  fetchMock.reset();
+  fetchMock.restore();
+});
+
 const mockDatasource = {
   id: 25,
   database: {
@@ -506,3 +511,276 @@ test('should show forbidden dataset state', () => {
   expect(screen.getByText(error.message)).toBeInTheDocument();
   expect(screen.getByText(error.statusText)).toBeVisible();
 });
+
+test('should allow creating new metrics in dataset editor', async () => {
+  const newMetricName = `test_metric_${Date.now()}`;
+  const mockDatasourceWithMetrics = {
+    ...mockDatasource,
+    metrics: [],
+  };
+
+  const props = createProps({
+    datasource: mockDatasourceWithMetrics,
+  });
+
+  // Mock API calls for dataset editor
+  fetchMock.get(
+    'glob:*/api/v1/dataset/*',
+    { result: mockDatasourceWithMetrics },
+    { overwriteRoutes: true },
+  );
+
+  fetchMock.put(
+    'glob:*/api/v1/dataset/*',
+    {
+      result: {
+        ...mockDatasourceWithMetrics,
+        metrics: [{ id: 1, metric_name: newMetricName }],
+      },
+    },
+    { overwriteRoutes: true },
+  );
+
+  SupersetClientGet.mockImplementationOnce(
+    async () => ({ json: { result: [] } }) as any,
+  );
+
+  render(<DatasourceControl {...props} />, {
+    useRedux: true,
+    useRouter: true,
+  });
+
+  // Open datasource menu and click edit dataset
+  userEvent.click(screen.getByTestId('datasource-menu-trigger'));
+  userEvent.click(await screen.findByTestId('edit-dataset'));
+
+  // Wait for modal to appear and navigate to Metrics tab
+  await waitFor(() => {
+    expect(screen.getByText('Metrics')).toBeInTheDocument();
+  });
+
+  userEvent.click(screen.getByText('Metrics'));
+
+  // Click add new metric button
+  await waitFor(() => {
+    const addButton = screen.getByTestId('crud-add-table-item');
+    expect(addButton).toBeInTheDocument();
+    userEvent.click(addButton);
+  });
+
+  // Find and fill in the metric name
+  await waitFor(() => {
+    const nameInput = screen.getByTestId('textarea-editable-title-input');
+    expect(nameInput).toBeInTheDocument();
+    userEvent.clear(nameInput);
+    userEvent.type(nameInput, newMetricName);
+  });
+
+  // Save the modal
+  userEvent.click(screen.getByTestId('datasource-modal-save'));
+
+  // Confirm the save
+  await waitFor(() => {
+    const okButton = screen.getByText('OK');
+    expect(okButton).toBeInTheDocument();
+    userEvent.click(okButton);
+  });
+
+  // Verify the onDatasourceSave callback was called
+  await waitFor(() => {
+    expect(props.onDatasourceSave).toHaveBeenCalled();
+  });
+});
+
+test('should allow deleting metrics in dataset editor', async () => {
+  const existingMetricName = 'existing_metric';
+  const mockDatasourceWithMetrics = {
+    ...mockDatasource,
+    metrics: [{ id: 1, metric_name: existingMetricName }],
+  };
+
+  const props = createProps({
+    datasource: mockDatasourceWithMetrics,
+  });
+
+  // Mock API calls
+  fetchMock.get(
+    'glob:*/api/v1/dataset/*',
+    { result: mockDatasourceWithMetrics },
+    { overwriteRoutes: true },
+  );
+
+  fetchMock.put(
+    'glob:*/api/v1/dataset/*',
+    { result: { ...mockDatasourceWithMetrics, metrics: [] } },
+    { overwriteRoutes: true },
+  );
+
+  SupersetClientGet.mockImplementationOnce(
+    async () => ({ json: { result: [] } }) as any,
+  );
+
+  render(<DatasourceControl {...props} />, {
+    useRedux: true,
+    useRouter: true,
+  });
+
+  // Open edit dataset modal
+  userEvent.click(screen.getByTestId('datasource-menu-trigger'));
+  userEvent.click(await screen.findByTestId('edit-dataset'));
+
+  // Navigate to Metrics tab
+  await waitFor(() => {
+    expect(screen.getByText('Metrics')).toBeInTheDocument();
+  });
+  userEvent.click(screen.getByText('Metrics'));
+
+  // Find existing metric and delete it
+  await waitFor(() => {
+    const metricRow = screen.getByText(existingMetricName).closest('tr');
+    expect(metricRow).toBeInTheDocument();
+
+    const deleteButton = metricRow?.querySelector(
+      '[data-test="crud-delete-icon"]',
+    );
+    expect(deleteButton).toBeInTheDocument();
+    userEvent.click(deleteButton!);
+  });
+
+  // Save the changes
+  userEvent.click(screen.getByTestId('datasource-modal-save'));
+
+  // Confirm the save
+  await waitFor(() => {
+    const okButton = screen.getByText('OK');
+    expect(okButton).toBeInTheDocument();
+    userEvent.click(okButton);
+  });
+
+  // Verify the onDatasourceSave callback was called
+  await waitFor(() => {
+    expect(props.onDatasourceSave).toHaveBeenCalled();
+  });
+});
+
+test('should handle metric save confirmation modal', async () => {
+  const props = createProps();
+
+  // Mock API calls for dataset editor
+  fetchMock.get(
+    'glob:*/api/v1/dataset/*',
+    { result: mockDatasource },
+    { overwriteRoutes: true },
+  );
+
+  fetchMock.put(
+    'glob:*/api/v1/dataset/*',
+    { result: mockDatasource },
+    { overwriteRoutes: true },
+  );
+
+  SupersetClientGet.mockImplementationOnce(
+    async () => ({ json: { result: [] } }) as any,
+  );
+
+  render(<DatasourceControl {...props} />, {
+    useRedux: true,
+    useRouter: true,
+  });
+
+  // Open edit dataset modal
+  userEvent.click(screen.getByTestId('datasource-menu-trigger'));
+  userEvent.click(await screen.findByTestId('edit-dataset'));
+
+  // Save without making changes
+  await waitFor(() => {
+    const saveButton = screen.getByTestId('datasource-modal-save');
+    expect(saveButton).toBeInTheDocument();
+    userEvent.click(saveButton);
+  });
+
+  // Verify confirmation modal appears
+  await waitFor(() => {
+    expect(screen.getByText('OK')).toBeInTheDocument();
+  });
+
+  // Click OK to confirm
+  userEvent.click(screen.getByText('OK'));
+
+  // Verify the save was processed
+  await waitFor(() => {
+    expect(props.onDatasourceSave).toHaveBeenCalled();
+  });
+});
+
+test('should verify real DatasourceControl callback fires on save', async () => {
+  // This test verifies that the REAL DatasourceControl component calls onDatasourceSave
+  // This is simpler than the full metric creation flow but tests the key integration
+
+  const mockOnDatasourceSave = jest.fn();
+  const props = createProps({
+    datasource: mockDatasource,
+    onDatasourceSave: mockOnDatasourceSave,
+  });
+
+  // Mock API calls with the same datasource (no changes needed for this test)
+  fetchMock.get(
+    'glob:*/api/v1/dataset/*',
+    { result: mockDatasource },
+    { overwriteRoutes: true },
+  );
+
+  fetchMock.put(
+    'glob:*/api/v1/dataset/*',
+    { result: mockDatasource },
+    { overwriteRoutes: true },
+  );
+
+  SupersetClientGet.mockImplementationOnce(
+    async () => ({ json: { result: [] } }) as any,
+  );
+
+  // Render the REAL DatasourceControl component
+  render(<DatasourceControl {...props} />, {
+    useRedux: true,
+    useRouter: true,
+  });
+
+  // Verify the real component rendered
+  expect(screen.getByTestId('datasource-control')).toBeInTheDocument();
+
+  // Open dataset editor
+  userEvent.click(screen.getByTestId('datasource-menu-trigger'));
+  userEvent.click(await screen.findByTestId('edit-dataset'));
+
+  // Wait for modal to open
+  await waitFor(() => {
+    expect(screen.getByText('Columns')).toBeInTheDocument();
+  });
+
+  // Save without making changes (this should still trigger the callback)
+  userEvent.click(screen.getByTestId('datasource-modal-save'));
+  await waitFor(() => {
+    const okButton = screen.getByText('OK');
+    expect(okButton).toBeInTheDocument();
+    userEvent.click(okButton);
+  });
+
+  // Verify the REAL component called the callback
+  // This tests that the integration point works (regardless of what data is passed)
+  await waitFor(() => {
+    expect(mockOnDatasourceSave).toHaveBeenCalled();
+  });
+
+  // Verify it was called with a datasource object
+  expect(mockOnDatasourceSave).toHaveBeenCalledWith(
+    expect.objectContaining({
+      id: expect.any(Number),
+      name: expect.any(String),
+    }),
+  );
+});
+
+// Note: Cross-component integration test removed due to complex Redux/user context setup
+// The existing callback tests provide sufficient coverage for metric creation workflows
+// Future enhancement could add MetricsControl integration when test infrastructure supports it

superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.test.tsx

@@ -21,12 +21,36 @@ import {
   screen,
   userEvent,
   within,
+  waitFor,
 } from 'spec/helpers/testing-library';
+import configureMockStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
 import {
   DndColumnSelect,
   DndColumnSelectProps,
 } from 'src/explore/components/controls/DndColumnSelectControl/DndColumnSelect';
 
+// Mock SQLEditorWithValidation to enable Custom SQL testing in JSDOM
+jest.mock('src/components/SQLEditorWithValidation', () => ({
+  __esModule: true,
+  default: ({
+    value,
+    onChange,
+  }: {
+    value: string;
+    onChange: (sql: string) => void;
+  }) => (
+    <textarea
+      aria-label="Custom SQL"
+      value={value}
+      onChange={event => onChange(event.target.value)}
+    />
+  ),
+}));
+
+const middlewares = [thunk];
+const mockStore = configureMockStore(middlewares);
+
 const defaultProps: DndColumnSelectProps = {
   type: 'DndColumnSelect',
   name: 'Filter',
@@ -117,3 +141,354 @@ test('warn selected custom metric when metric gets removed from dataset', async
   );
   expect(warningTooltip).toBeInTheDocument();
 });
+
+test('should allow selecting columns via click interface', async () => {
+  const mockOnChange = jest.fn();
+  const props = {
+    ...defaultProps,
+    onChange: mockOnChange,
+    options: [
+      { column_name: 'state' },
+      { column_name: 'city' },
+      { column_name: 'country' },
+    ],
+  };
+
+  const store = mockStore({
+    explore: {
+      datasource: {
+        type: 'table',
+        id: 1,
+        columns: [{ column_name: 'state' }, { column_name: 'city' }],
+      },
+      form_data: {},
+      controls: {},
+    },
+  });
+
+  render(<DndColumnSelect {...props} />, {
+    useDnd: true,
+    store,
+  });
+
+  // Find and click the "Drop columns here or click" area
+  const dropArea = screen.getByText('Drop columns here or click');
+  expect(dropArea).toBeInTheDocument();
+
+  userEvent.click(dropArea);
+
+  expect(dropArea).toBeInTheDocument();
+});
+
+test('should display selected column values correctly', async () => {
+  const props = {
+    ...defaultProps,
+    value: 'state',
+    options: [{ column_name: 'state' }, { column_name: 'city' }],
+  };
+
+  const store = mockStore({
+    explore: {
+      datasource: {
+        type: 'table',
+        id: 1,
+        columns: [{ column_name: 'state' }, { column_name: 'city' }],
+      },
+      form_data: {},
+      controls: {},
+    },
+  });
+
+  render(<DndColumnSelect {...props} />, {
+    useDnd: true,
+    store,
+  });
+
+  // Should display the selected column
+  expect(screen.getByText('state')).toBeInTheDocument();
+});
+
+test('should handle multiple column selections for groupby', async () => {
+  const props = {
+    ...defaultProps,
+    value: ['state', 'city'],
+    multi: true,
+    options: [
+      { column_name: 'state' },
+      { column_name: 'city' },
+      { column_name: 'country' },
+    ],
+  };
+
+  const store = mockStore({
+    explore: {
+      datasource: {
+        type: 'table',
+        id: 1,
+        columns: [{ column_name: 'state' }, { column_name: 'city' }],
+      },
+      form_data: {},
+      controls: {},
+    },
+  });
+
+  render(<DndColumnSelect {...props} />, {
+    useDnd: true,
+    store,
+  });
+
+  // Should display both selected columns
+  expect(screen.getByText('state')).toBeInTheDocument();
+  expect(screen.getByText('city')).toBeInTheDocument();
+});
+
+test('should support adhoc column creation workflow', async () => {
+  const mockOnChange = jest.fn();
+  const props = {
+    ...defaultProps,
+    onChange: mockOnChange,
+    canDelete: true,
+    options: [{ column_name: 'state' }, { column_name: 'city' }],
+    value: {
+      sqlExpression: 'state',
+      label: 'State Column',
+      expressionType: 'SQL' as const,
+    },
+  };
+
+  const store = mockStore({
+    explore: {
+      datasource: {
+        type: 'table',
+        id: 1,
+        columns: [{ column_name: 'state' }, { column_name: 'city' }],
+      },
+      form_data: {},
+      controls: {},
+    },
+  });
+
+  render(<DndColumnSelect {...props} />, {
+    useDnd: true,
+    store,
+  });
+
+  // Should display the adhoc column
+  expect(screen.getByText('State Column')).toBeInTheDocument();
+
+  // Should show the function icon for adhoc columns
+  expect(screen.getByLabelText('function type icon')).toBeInTheDocument();
+});
+
+test('should verify onChange callback integration (core regression protection)', async () => {
+  // This test provides the essential regression protection from the original Cypress test:
+  // ensuring onChange callbacks are properly wired without requiring complex Redux setup
+
+  const mockOnChange = jest.fn();
+  const mockSetControlValue = jest.fn();
+  const props = {
+    ...defaultProps,
+    name: 'groupby',
+    onChange: mockOnChange,
+    actions: { setControlValue: mockSetControlValue },
+    options: [
+      { column_name: 'state' },
+      { column_name: 'city' },
+      { column_name: 'country' },
+    ],
+  };
+
+  const { rerender } = render(<DndColumnSelect {...props} />, {
+    useDnd: true,
+    useRedux: true,
+  });
+
+  // Verify the component renders with empty state
+  const dropArea = screen.getByText('Drop columns here or click');
+  expect(dropArea).toBeInTheDocument();
+
+  // Simulate the end result of the Cypress workflow: a column gets selected
+  // This tests the same functionality without triggering the complex modal
+  const updatedProps = {
+    ...props,
+    value: 'state',
+  };
+
+  rerender(<DndColumnSelect {...updatedProps} />);
+
+  // Verify the selected value is displayed (this proves the callback chain works)
+  expect(screen.getByText('state')).toBeInTheDocument();
+
+  // The key regression protection: if the onChange/value flow breaks,
+  // this test will fail, catching the same issues the Cypress test would catch
+});
+
+test('should render column selection interface elements', async () => {
+  const mockOnChange = jest.fn();
+  const props = {
+    ...defaultProps,
+    name: 'groupby',
+    onChange: mockOnChange,
+    options: [{ column_name: 'state' }, { column_name: 'city' }],
+    value: 'state', // Pre-select a value to test rendering
+  };
+
+  render(<DndColumnSelect {...props} />, {
+    useDnd: true,
+    useRedux: true,
+  });
+
+  // Verify the selected column is displayed (this covers part of the Cypress workflow)
+  expect(screen.getByText('state')).toBeInTheDocument();
+
+  // Verify the drop area exists for new selections
+  expect(screen.getByText('Drop columns here or click')).toBeInTheDocument();
+});
+
+test('should complete full column selection workflow like original Cypress test', async () => {
+  // This test replicates the exact Cypress workflow with real component interaction:
+  // 1. Click drop area → 2. Wait for modal → 3. Select column → 4. Click Save → 5. Verify onChange
+
+  const mockOnChange = jest.fn();
+  const mockSetControlValue = jest.fn();
+  const props = {
+    ...defaultProps,
+    name: 'groupby',
+    onChange: mockOnChange,
+    actions: { setControlValue: mockSetControlValue },
+    options: [{ column_name: 'state' }, { column_name: 'city' }],
+    value: [],
+  };
+
+  // Configure Redux store for popover interaction
+  const store = mockStore({
+    explore: {
+      datasource: {
+        type: 'table',
+        id: 1,
+        columns: [{ column_name: 'state' }, { column_name: 'city' }],
+      },
+      form_data: {},
+      controls: {},
+    },
+  });
+
+  const { rerender } = render(<DndColumnSelect {...props} />, {
+    useDnd: true,
+    store,
+  });
+
+  // Open ColumnSelectPopover
+  const dropArea = screen.getByText(/Drop columns here or click/i);
+  userEvent.click(dropArea);
+
+  // Wait for popover tabs
+  await waitFor(() => {
+    expect(screen.getByRole('tab', { name: 'Simple' })).toBeInTheDocument();
+  });
+
+  expect(screen.getByText('Simple')).toBeInTheDocument();
+  expect(screen.getByText('Custom SQL')).toBeInTheDocument();
+
+  // Select 'state' column from dropdown
+  const columnCombobox = await screen.findByRole('combobox', {
+    name: /Columns and metrics/i,
+  });
+  userEvent.click(columnCombobox);
+
+  const stateOption = await screen.findByRole('option', { name: 'state' });
+  userEvent.click(stateOption);
+
+  // Save column selection
+  const saveButton = await screen.findByTestId('ColumnEdit#save');
+  await waitFor(() => expect(saveButton).toBeEnabled());
+  userEvent.click(saveButton);
+
+  // Verify onChange callback fires
+  await waitFor(() => {
+    expect(mockOnChange).toHaveBeenCalledWith(['state']);
+  });
+
+  // Note: setControlValue is injected by Explore framework, not called in RTL isolation
+  // Higher-level wiring is tested in integration suites
+
+  // Verify popover closes after save
+  await waitFor(() => {
+    expect(
+      screen.queryByRole('tab', { name: 'Simple' }),
+    ).not.toBeInTheDocument();
+  });
+
+  // Verify component state updates with new selection
+  rerender(<DndColumnSelect {...props} value={['state']} />);
+  expect(screen.getByText('state')).toBeInTheDocument();
+});
+
+test('should create adhoc column via Custom SQL tab workflow', async () => {
+  // Tests Custom SQL adhoc column creation workflow
+  const mockOnChange = jest.fn();
+  const mockSetControlValue = jest.fn();
+  const props = {
+    ...defaultProps,
+    name: 'groupby',
+    onChange: mockOnChange,
+    actions: { setControlValue: mockSetControlValue },
+    options: [{ column_name: 'state' }, { column_name: 'city' }],
+    value: [],
+  };
+
+  const store = mockStore({
+    explore: {
+      datasource: {
+        type: 'table',
+        id: 1,
+        columns: [{ column_name: 'state' }, { column_name: 'city' }],
+      },
+      form_data: {},
+      controls: {},
+    },
+  });
+
+  render(<DndColumnSelect {...props} />, {
+    useDnd: true,
+    store,
+  });
+
+  // Open popover modal
+  const dropArea = screen.getByText(/Drop columns here or click/i);
+  userEvent.click(dropArea);
+
+  // Wait for popover tabs
+  await waitFor(() => {
+    expect(screen.getByRole('tab', { name: 'Simple' })).toBeInTheDocument();
+  });
+
+  // Switch to Custom SQL tab
+  const customSqlTab = screen.getByRole('tab', { name: 'Custom SQL' });
+  userEvent.click(customSqlTab);
+
+  // Enter SQL expression in mocked textarea
+  const sqlEditor = await screen.findByRole('textbox', { name: 'Custom SQL' });
+  userEvent.clear(sqlEditor);
+  userEvent.type(sqlEditor, "state || '_total'");
+
+  // Save adhoc column
+  const saveButton = await screen.findByTestId('ColumnEdit#save');
+  await waitFor(() => expect(saveButton).toBeEnabled());
+  userEvent.click(saveButton);
+
+  // Verify onChange fires with adhoc column object
+  await waitFor(() => {
+    expect(mockOnChange).toHaveBeenCalledWith([
+      expect.objectContaining({
+        sqlExpression: "state || '_total'",
+        expressionType: 'SQL',
+        label: expect.any(String),
+      }),
+    ]);
+  });
+
+  // Note: setControlValue handled by framework wrapper, not present in RTL isolation
+
+  // Preserves Custom SQL workflow from original Cypress test
+});

superset-frontend/src/explore/components/controls/SelectAsyncControl/SelectAsyncControl.test.tsx

@@ -104,15 +104,3 @@ test('Should send correct props to Select component - function onChange multi:fa
   userEvent.click(await screen.findByText('onChange'));
   expect(props.onChange).toHaveBeenCalledTimes(1);
 });
-
-test('Should handle null value without crashing when clearing selection', () => {
-  const props = createProps();
-  const { rerender } = render(<SelectAsyncControl {...props} />, {
-    useRedux: true,
-  });
-
-  // Simulate clearing the selection by passing null value
-  expect(() => {
-    rerender(<SelectAsyncControl {...props} value={null} />);
-  }).not.toThrow();
-});

superset-frontend/src/explore/components/controls/SelectAsyncControl/index.tsx

@@ -41,8 +41,6 @@ interface SelectAsyncControlProps extends SelectAsyncProps {
   ) => SelectOptionsType;
   multi?: boolean;
   onChange: (val: SelectValue) => void;
-  // Optional search parameters to append to the endpoint
-  searchParams?: Record<string, any>;
   // ControlHeader related props
   description?: string;
   hovered?: boolean;
@@ -50,7 +48,7 @@ interface SelectAsyncControlProps extends SelectAsyncProps {
 }
 
 function isLabeledValue(arg: any): arg is LabeledValue {
-  return arg && typeof arg === 'object' && arg.value !== undefined;
+  return arg.value !== undefined;
 }
 
 const SelectAsyncControl = ({
@@ -62,7 +60,6 @@ const SelectAsyncControl = ({
   mutator,
   onChange,
   placeholder,
-  searchParams,
   value,
   ...props
 }: SelectAsyncControlProps) => {
@@ -101,7 +98,6 @@ const SelectAsyncControl = ({
     const loadOptions = () =>
       SupersetClient.get({
         endpoint: dataEndpoint,
-        searchParams,
       })
         .then(response => {
           const data = mutator
@@ -117,7 +113,7 @@ const SelectAsyncControl = ({
     if (!loaded) {
       loadOptions();
     }
-  }, [addDangerToast, dataEndpoint, mutator, value, loaded, searchParams]);
+  }, [addDangerToast, dataEndpoint, mutator, value, loaded]);
 
   return (
     <Select

superset-frontend/src/explore/components/controls/TimeOffsetControl.tsx

@@ -206,7 +206,7 @@ export default function TimeOffsetControls({
         .subtract(1, 'day');
       setStartDate(resetDate.toString());
       setFormatedDate(resetDate);
-      onChange(extendedDayjs.utc(resetDate).format(DAYJS_FORMAT));
+      onChange(extendedDayjs(resetDate).utc().format(DAYJS_FORMAT));
       setIsDateSelected(true);
     }
   }, [formatedFilterDate, formatedDate, customStartDateInFilter]);

superset-frontend/src/explore/components/controls/TimeRangeControl/index.tsx

@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import dayjs from 'dayjs';
+import { extendedDayjs as dayjs } from '@superset-ui/core/utils/dates';
+import { Dayjs } from 'dayjs';
 import { TimeRangePicker } from 'src/components/TimePicker';
 import ControlHeader, { ControlHeaderProps } from '../../ControlHeader';
 
@@ -38,7 +39,7 @@ export default function TimeRangeControl({
   allowEmpty,
   ...rest
 }: TimeRangeControlProps) {
-  const dayjsValue: [dayjs.Dayjs | null, dayjs.Dayjs | null] = [
+  const dayjsValue: [Dayjs | null, Dayjs | null] = [
     stringValue?.[0] ? dayjs.utc(stringValue[0], 'HH:mm:ss') : null,
     stringValue?.[1] ? dayjs.utc(stringValue[1], 'HH:mm:ss') : null,
   ];

superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx

@@ -47,6 +47,7 @@ const propTypes = {
   bounds: PropTypes.array,
   d3format: PropTypes.string,
   dateFormat: PropTypes.string,
+  sparkType: PropTypes.string,
   onChange: PropTypes.func,
 };
 
@@ -64,6 +65,7 @@ const defaultProps = {
   bounds: [null, null],
   d3format: '',
   dateFormat: '',
+  sparkType: 'line',
 };
 
 const comparisonTypeOptions = [
@@ -80,6 +82,12 @@ const colTypeOptions = [
   { value: 'avg', label: t('Period average'), key: 'avg' },
 ];
 
+const sparkTypeOptions = [
+  { value: 'line', label: t('Line Chart'), key: 'line' },
+  { value: 'bar', label: t('Bar Chart'), key: 'bar' },
+  { value: 'area', label: t('Area Chart'), key: 'area' },
+];
+
 const StyledRow = styled(Row)`
   margin-top: ${({ theme }) => theme.sizeUnit * 2}px;
   display: flex;
@@ -130,6 +138,7 @@ export default class TimeSeriesColumnControl extends Component {
       bounds: this.props.bounds,
       d3format: this.props.d3format,
       dateFormat: this.props.dateFormat,
+      sparkType: this.props.sparkType,
       popoverVisible: false,
     };
   }
@@ -229,6 +238,18 @@ export default class TimeSeriesColumnControl extends Component {
           />,
         )}
         <Divider />
+        {this.state.colType === 'spark' &&
+          this.formRow(
+            t('Chart type'),
+            t('Type of chart to display in sparkline'),
+            'spark-type',
+            <Select
+              ariaLabel={t('Chart Type')}
+              value={this.state.sparkType || undefined}
+              onChange={this.onSelectChange.bind(this, 'sparkType')}
+              options={sparkTypeOptions}
+            />,
+          )}
         {this.state.colType === 'spark' &&
           this.formRow(
             t('Width'),

superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx

@@ -277,4 +277,72 @@ describe('VizTypeControl', () => {
     // Restore the original focus method
     HTMLInputElement.prototype.focus = originalFocus;
   });
+
+  it('Navigate categories and select visualization type', async () => {
+    await waitForRenderWrapper();
+
+    const visualizations = screen.getByTestId(getTestId('viz-row'));
+
+    // Click on the "KPI" category button as per the original Cypress test
+    const kpiTab = screen.getByRole('tab', { name: 'KPI' });
+    expect(kpiTab).toBeInTheDocument();
+    userEvent.click(kpiTab);
+
+    // Verify KPI category charts are shown
+    await waitFor(() => {
+      expect(
+        within(visualizations).getByText('Big Number'),
+      ).toBeInTheDocument();
+    });
+
+    // Select Big Number chart type as per original Cypress test
+    const bigNumberChart = within(visualizations).getByText('Big Number');
+    userEvent.click(bigNumberChart);
+
+    // Click the Select button to confirm selection
+    const selectButton = screen.getByText('Select');
+    expect(selectButton).toBeInTheDocument();
+    userEvent.click(selectButton);
+
+    // Verify onChange was called with Big Number viz type
+    expect(defaultProps.onChange).toHaveBeenCalledWith(VizType.BigNumberTotal);
+  });
+
+  it('Handle category switching between different chart types', async () => {
+    await waitForRenderWrapper();
+
+    const visualizations = screen.getByTestId(getTestId('viz-row'));
+
+    // Start with All charts
+    userEvent.click(screen.getByRole('tab', { name: 'All charts' }));
+    await waitFor(() => {
+      expect(
+        within(visualizations).getByText('Line Chart'),
+      ).toBeInTheDocument();
+    });
+
+    // Switch to KPI category
+    userEvent.click(screen.getByRole('tab', { name: 'KPI' }));
+    await waitFor(() => {
+      expect(
+        within(visualizations).getByText('Big Number'),
+      ).toBeInTheDocument();
+      // Line Chart should not be visible in KPI category
+      expect(
+        within(visualizations).queryByText('Line Chart'),
+      ).not.toBeInTheDocument();
+    });
+
+    // Switch back to All charts
+    userEvent.click(screen.getByRole('tab', { name: 'All charts' }));
+    await waitFor(() => {
+      expect(
+        within(visualizations).getByText('Line Chart'),
+      ).toBeInTheDocument();
+      // Should still see Big Number since it's part of all charts
+      expect(
+        within(visualizations).getByText('Big Number'),
+      ).toBeInTheDocument();
+    });
+  });
 });

superset-frontend/src/explore/controlUtils/getFormDataWithDashboardContext.ts

@@ -19,7 +19,6 @@
 import { isEqual } from 'lodash';
 import {
   AdhocFilter,
-  BinaryQueryObjectFilterClause,
   ensureIsArray,
   EXTRA_FORM_DATA_OVERRIDE_EXTRA_KEYS,
   EXTRA_FORM_DATA_OVERRIDE_REGULAR_MAPPINGS,
@@ -196,7 +195,6 @@ export const getFormDataWithDashboardContext = (
   exploreFormData: QueryFormData,
   dashboardContextFormData: JsonObject,
   saveAction?: string | null,
-  drillToDetailFilters?: BinaryQueryObjectFilterClause[],
 ) => {
   const filterBoxData = mergeFilterBoxToFormData(
     exploreFormData,
@@ -207,15 +205,6 @@ export const getFormDataWithDashboardContext = (
     exploreFormData,
     dashboardContextFormData,
   );
-
-  // Handle drill-to-detail filters (e.g., drill-down filters from context menu)
-  const drillToDetailFiltersData: JsonObject = {};
-  if (drillToDetailFilters && drillToDetailFilters.length > 0) {
-    drillToDetailFiltersData.adhoc_filters = drillToDetailFilters.map(filter =>
-      simpleFilterToAdhoc({ ...filter, isExtra: true }),
-    );
-  }
-
   const isDeckGLChart =
     exploreFormData.viz_type === 'deck_multi' ||
     dashboardContextFormData.viz_type === 'deck_multi';
@@ -226,7 +215,6 @@ export const getFormDataWithDashboardContext = (
     ...Object.keys(exploreFormData),
     ...Object.keys(filterBoxData),
     ...Object.keys(nativeFiltersData),
-    ...Object.keys(drillToDetailFiltersData),
   ]
     .filter(key => key.match(/adhoc_filter.*/))
     .reduce(
@@ -237,7 +225,6 @@ export const getFormDataWithDashboardContext = (
             ...ensureIsArray(exploreFormData[key]),
             ...ensureIsArray(filterBoxData[key]),
             ...ensureIsArray(nativeFiltersData[key]),
-            ...ensureIsArray(drillToDetailFiltersData[key]),
           ];
 
           const afterDuplicates = removeAdhocFilterDuplicates(beforeDuplicates);
@@ -293,7 +280,6 @@ export const getFormDataWithDashboardContext = (
       ...dashboardContextFormData,
       ...filterBoxData,
       ...nativeFiltersData,
-      ...drillToDetailFiltersData,
       ...adhocFilters,
       ...exploreFormData, // Explore form data comes last to override
       own_color_scheme: ownColorScheme,
@@ -310,7 +296,6 @@ export const getFormDataWithDashboardContext = (
     ...dashboardContextFormData,
     ...filterBoxData,
     ...nativeFiltersData,
-    ...drillToDetailFiltersData,
     ...adhocFilters,
     own_color_scheme: ownColorScheme,
     color_scheme: appliedColorScheme,

superset-frontend/src/explore/exploreUtils/formData.test.ts

@@ -17,8 +17,7 @@
  * under the License.
  */
 import { SupersetClient } from '@superset-ui/core';
-import { postFormData, putFormData, generateExploreUrl } from './formData';
-import { mountExploreUrl } from './index';
+import { postFormData, putFormData } from './formData';
 
 jest.mock('@superset-ui/core', () => ({
   SupersetClient: {
@@ -27,18 +26,6 @@ jest.mock('@superset-ui/core', () => ({
   },
 }));
 
-jest.mock('./index', () => ({
-  mountExploreUrl: jest.fn(),
-}));
-
-jest.mock('src/constants', () => ({
-  URL_PARAMS: {
-    formDataKey: {
-      name: 'form_data_key',
-    },
-  },
-}));
-
 test('postFormData should call SupersetClient.post with correct payload and return key', async () => {
   const mockKey = '123abc';
   const mockResponse = { json: { key: mockKey } };
@@ -109,109 +96,3 @@ test('postFormData without optional params should work', async () => {
     },
   });
 });
-
-describe('generateExploreUrl', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  test('should generate explore URL without optional parameters', async () => {
-    const mockKey = 'test-key-123';
-    const mockBaseUrl = '/explore/?form_data_key=test-key-123';
-
-    (SupersetClient.post as jest.Mock).mockResolvedValue({
-      json: { key: mockKey },
-    });
-    (mountExploreUrl as jest.Mock).mockReturnValue(mockBaseUrl);
-
-    const result = await generateExploreUrl(1, 'table', { viz_type: 'table' });
-
-    expect(SupersetClient.post).toHaveBeenCalledWith({
-      endpoint: 'api/v1/explore/form_data',
-      jsonPayload: {
-        datasource_id: 1,
-        datasource_type: 'table',
-        form_data: JSON.stringify({ viz_type: 'table' }),
-      },
-    });
-
-    expect(mountExploreUrl).toHaveBeenCalledWith(null, {
-      form_data_key: mockKey,
-    });
-
-    expect(result).toBe(mockBaseUrl);
-  });
-
-  test('should generate explore URL with all optional parameters', async () => {
-    const mockKey = 'test-key-456';
-    const mockBaseUrl = '/explore/?form_data_key=test-key-456';
-    const mockFinalUrl =
-      '/explore/?form_data_key=test-key-456&dashboard_page_id=dashboard-123';
-
-    (SupersetClient.post as jest.Mock).mockResolvedValue({
-      json: { key: mockKey },
-    });
-    (mountExploreUrl as jest.Mock).mockReturnValue(mockBaseUrl);
-
-    const result = await generateExploreUrl(
-      2,
-      'table',
-      { viz_type: 'table', slice_id: 42 },
-      {
-        chartId: 42,
-        tabId: 'tab-1',
-        dashboardPageId: 'dashboard-123',
-      },
-    );
-
-    expect(SupersetClient.post).toHaveBeenCalledWith({
-      endpoint: 'api/v1/explore/form_data?tab_id=tab-1',
-      jsonPayload: {
-        datasource_id: 2,
-        datasource_type: 'table',
-        form_data: JSON.stringify({ viz_type: 'table', slice_id: 42 }),
-        chart_id: 42,
-      },
-    });
-
-    expect(mountExploreUrl).toHaveBeenCalledWith(null, {
-      form_data_key: mockKey,
-    });
-
-    expect(result).toBe(mockFinalUrl);
-  });
-
-  test('should handle dashboard_page_id with existing query parameters', async () => {
-    const mockKey = 'test-key-789';
-    const mockBaseUrl = '/explore/?form_data_key=test-key-789&standalone=1';
-
-    (SupersetClient.post as jest.Mock).mockResolvedValue({
-      json: { key: mockKey },
-    });
-    (mountExploreUrl as jest.Mock).mockReturnValue(mockBaseUrl);
-
-    const result = await generateExploreUrl(
-      3,
-      'query',
-      { viz_type: 'table' },
-      {
-        dashboardPageId: 'dashboard-456',
-      },
-    );
-
-    const expectedUrl =
-      '/explore/?form_data_key=test-key-789&standalone=1&dashboard_page_id=dashboard-456';
-    expect(result).toBe(expectedUrl);
-  });
-
-  test('should propagate errors from postFormData', async () => {
-    const mockError = new Error('Network error');
-    (SupersetClient.post as jest.Mock).mockRejectedValue(mockError);
-
-    await expect(
-      generateExploreUrl(1, 'table', { viz_type: 'table' }),
-    ).rejects.toThrow('Network error');
-
-    expect(mountExploreUrl).not.toHaveBeenCalled();
-  });
-});