Merge branch 'master' into enxdev/feat/enhance-database-modal-validation

Co-authored-by: Đỗ Trọng Hải <41283691+hainenber@users.noreply.github.com>

.github/workflows/ephemeral-env-pr-close.yml

@@ -58,7 +58,7 @@ jobs:
       - name: Login to Amazon ECR
         if: steps.describe-services.outputs.active == 'true'
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@376925c9d111252e87ae59691e5a442dd100ef6a # v2
+        uses: aws-actions/amazon-ecr-login@19d944daaa35f0fa1d3f7f8af1d3f2e5de25c5b7 # v2
 
       - name: Delete ECR image tag
         if: steps.describe-services.outputs.active == 'true'

.github/workflows/ephemeral-env.yml

@@ -199,7 +199,7 @@ jobs:
 
       - name: Login to Amazon ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@376925c9d111252e87ae59691e5a442dd100ef6a # v2
+        uses: aws-actions/amazon-ecr-login@19d944daaa35f0fa1d3f7f8af1d3f2e5de25c5b7 # v2
 
       - name: Load, tag and push image to ECR
         id: push-image
@@ -235,7 +235,7 @@ jobs:
 
       - name: Login to Amazon ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@376925c9d111252e87ae59691e5a442dd100ef6a # v2
+        uses: aws-actions/amazon-ecr-login@19d944daaa35f0fa1d3f7f8af1d3f2e5de25c5b7 # v2
 
       - name: Check target image exists in ECR
         id: check-image

.gitignore

@@ -62,6 +62,7 @@ rat-results.txt
 superset/app/
 superset-websocket/config.json
 .direnv
+*.log
 
 # Node.js, webpack artifacts, storybook
 *.entry.js

docs/admin_docs/configuration/aws-iam.mdx

@@ -0,0 +1,162 @@
+{/*
+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.
+*/}
+
+---
+title: AWS IAM Authentication
+sidebar_label: AWS IAM Authentication
+sidebar_position: 15
+---
+
+# AWS IAM Authentication for AWS Databases
+
+Superset supports IAM-based authentication for **Amazon Aurora** (PostgreSQL and MySQL) and **Amazon Redshift**. IAM auth eliminates the need for database passwords — Superset generates a short-lived auth token using temporary AWS credentials instead.
+
+Cross-account IAM role assumption via STS `AssumeRole` is supported, allowing a Superset deployment in one AWS account to connect to databases in a different account.
+
+## Prerequisites
+
+- Enable the `AWS_DATABASE_IAM_AUTH` feature flag in `superset_config.py`. IAM authentication is gated behind this flag; if it is disabled, connections using `aws_iam` fail with *"AWS IAM database authentication is not enabled."*
+  ```python
+  FEATURE_FLAGS = {
+      "AWS_DATABASE_IAM_AUTH": True,
+  }
+  ```
+- `boto3` must be installed in your Superset environment:
+  ```bash
+  pip install boto3
+  ```
+- The Superset server's IAM role (or static credentials) must have permission to call `sts:AssumeRole` (for cross-account) or the same-account permissions for the target service:
+  - **Aurora (RDS)**: `rds-db:connect`
+  - **Redshift provisioned**: `redshift:GetClusterCredentials`
+  - **Redshift Serverless**: `redshift-serverless:GetCredentials` and `redshift-serverless:GetWorkgroup`
+- SSL must be enabled on the Aurora / Redshift endpoint (required for IAM token auth).
+
+## Configuration
+
+IAM authentication is configured via the **encrypted_extra** field of the database connection. Access this field in the **Advanced** → **Security** section of the database connection form, under **Secure Extra**.
+
+### Aurora PostgreSQL or Aurora MySQL
+
+```json
+{
+  "aws_iam": {
+    "enabled": true,
+    "role_arn": "arn:aws:iam::222222222222:role/SupersetDatabaseAccess",
+    "external_id": "superset-prod-12345",
+    "region": "us-east-1",
+    "db_username": "superset_iam_user",
+    "session_duration": 3600
+  }
+}
+```
+
+| Field | Required | Description |
+|-------|----------|-------------|
+| `enabled` | Yes | Set to `true` to activate IAM auth |
+| `role_arn` | No | ARN of the cross-account IAM role to assume via STS. Omit for same-account auth |
+| `external_id` | No | External ID for the STS `AssumeRole` call, if required by the target role's trust policy |
+| `region` | Yes | AWS region of the database cluster |
+| `db_username` | Yes | The database username associated with the IAM identity |
+| `session_duration` | No | STS session duration in seconds (default: `3600`) |
+
+### Redshift (Serverless)
+
+```json
+{
+  "aws_iam": {
+    "enabled": true,
+    "role_arn": "arn:aws:iam::222222222222:role/SupersetRedshiftAccess",
+    "region": "us-east-1",
+    "workgroup_name": "my-workgroup",
+    "db_name": "dev"
+  }
+}
+```
+
+### Redshift (Provisioned Cluster)
+
+```json
+{
+  "aws_iam": {
+    "enabled": true,
+    "role_arn": "arn:aws:iam::222222222222:role/SupersetRedshiftAccess",
+    "region": "us-east-1",
+    "cluster_identifier": "my-cluster",
+    "db_username": "superset_iam_user",
+    "db_name": "dev"
+  }
+}
+```
+
+## Cross-Account IAM Setup
+
+To connect to a database in Account B from a Superset deployment in Account A:
+
+**1. In Account B — create a database-access role:**
+
+```json
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Effect": "Allow",
+      "Action": ["rds-db:connect"],
+      "Resource": "arn:aws:rds-db:us-east-1:222222222222:dbuser/db-XXXXXXXXXXXX/superset_iam_user"
+    }
+  ]
+}
+```
+
+**Trust policy** (allows Account A's Superset role to assume it):
+
+```json
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Effect": "Allow",
+      "Principal": {
+        "AWS": "arn:aws:iam::111111111111:role/SupersetInstanceRole"
+      },
+      "Action": "sts:AssumeRole",
+      "Condition": {
+        "StringEquals": {
+          "sts:ExternalId": "superset-prod-12345"
+        }
+      }
+    }
+  ]
+}
+```
+
+**2. In Account A — grant Superset's role permission to assume the Account B role:**
+
+```json
+{
+  "Effect": "Allow",
+  "Action": "sts:AssumeRole",
+  "Resource": "arn:aws:iam::222222222222:role/SupersetDatabaseAccess"
+}
+```
+
+**3. Configure the database connection in Superset** using the `role_arn` and `external_id` from the trust policy (as shown in the configuration example above).
+
+## Credential Caching
+
+STS credentials are cached in memory keyed by `(role_arn, region, external_id)` with a 10-minute TTL. This reduces the number of STS API calls when multiple queries are executed with the same connection. Tokens are refreshed automatically before expiry.

docs/admin_docs/configuration/importing-exporting-datasources.mdx

@@ -10,6 +10,10 @@ version: 1
 The superset cli allows you to import and export datasources from and to YAML. Datasources include
 databases. The data is expected to be organized in the following hierarchy:
 
+:::info
+Superset's ZIP-based import/export also covers **dashboards**, **charts**, and **saved queries**, exercised through the UI and REST API. The [Dashboard Import Overwrite Behavior](#dashboard-import-overwrite-behavior) and [UUIDs in API Responses](#uuids-in-api-responses) sections below document the behavior shared across all asset types.
+:::
+
 ```text
 ├──databases
 |  ├──database_1
@@ -75,6 +79,29 @@ The optional username flag **-u** sets the user used for the datasource import.
 superset import_datasources -p <path / filename> -u 'admin'
 ```
 
+## Dashboard Import Overwrite Behavior
+
+When importing a dashboard ZIP with the **overwrite** option enabled, any existing charts that are part of the dashboard are **replaced** rather than duplicated. This applies to:
+
+- Charts whose UUID matches a chart already present in the target instance
+- The full chart configuration (query, visualization type, columns, metrics) is replaced by the imported version
+
+If you import without the overwrite flag, existing charts with conflicting UUIDs are left unchanged and the import skips those objects. Use overwrite when you want to push a fully updated dashboard (including chart definitions) from a development or staging environment to production.
+
+## UUIDs in API Responses
+
+The REST API POST endpoints for **datasets**, **charts**, and **dashboards** include the auto-generated `uuid` field in the response body:
+
+```json
+{
+  "id": 42,
+  "uuid": "b8a8d5c3-1234-4abc-8def-0123456789ab",
+  ...
+}
+```
+
+UUIDs remain stable across import/export cycles and can be used for cross-environment workflows — for example, recording a UUID when creating a chart in development and using it to identify the matching chart after importing into production.
+
 ## Legacy Importing Datasources
 
 ### From older versions of Superset to current version

docs/admin_docs/configuration/mcp-server.mdx

@@ -501,6 +501,7 @@ All MCP settings go in `superset_config.py`. Defaults are defined in `superset/m
 | `MCP_SERVICE_URL` | `None` | Public base URL for MCP-generated links (set this when behind a reverse proxy) |
 | `MCP_DEBUG` | `False` | Enable debug logging |
 | `MCP_DEV_USERNAME` | -- | Superset username for development mode (no auth) |
+| `MCP_PARSE_REQUEST_ENABLED` | `True` | Pre-parse MCP tool inputs from JSON strings into objects. Set to `False` for clients (Claude Desktop, LangChain) that do not double-serialize arguments — this produces cleaner tool schemas for those clients |
 
 ### Authentication
 
@@ -664,6 +665,32 @@ MCP_CSRF_CONFIG = {
 
 ---
 
+## Audit Events
+
+All MCP tool calls are logged to Superset's event logger, the same system used by the web UI (viewable at **Settings → Action Log**). Each event captures:
+
+- **Action**: `mcp.<tool_name>.<phase>` (e.g., `mcp.list_databases.query`)
+- **User**: the resolved Superset username from the JWT or dev config
+- **Timestamp**: when the operation ran
+
+This means MCP activity is auditable alongside normal user activity. No additional configuration is required — logging is on by default whenever the event logger is enabled in your Superset deployment.
+
+## Tool Pagination
+
+MCP list tools (`list_datasets`, `list_charts`, `list_dashboards`, `list_databases`) use **offset pagination** via `page` (1-based) and `page_size` parameters. Responses include `page`, `page_size`, `total_count`, `total_pages`, `has_previous`, and `has_next`. To iterate through all results:
+
+```python
+# Example: fetch all charts across pages
+all_charts = []
+page = 1
+while True:
+    result = mcp.list_charts(page=page, page_size=50)
+    all_charts.extend(result["charts"])
+    if not result.get("has_next"):
+        break
+    page += 1
+```
+
 ## Security Best Practices
 
 - **Use TLS** for all production MCP endpoints -- place the server behind a reverse proxy with HTTPS

docs/docs/using-superset/creating-your-first-dashboard.mdx

@@ -63,6 +63,12 @@ by clicking the **Connect** button in the bottom right corner of the modal windo
 
 Congratulations, you've just added a new data source in Superset!
 
+### Sharing a Database Connection
+
+When adding a new database, you can share the connection with other Superset users. Shared connections appear in other users' database lists, making it easier to collaborate on the same data without requiring each user to configure the same connection separately.
+
+To share a connection, enable the **Share connection with other users** option in the **Advanced** tab of the database connection modal before saving. You can change sharing settings later by editing the database connection.
+
 ### Registering a new table
 
 Now that you’ve configured a data source, you can select specific tables (called **Datasets** in Superset)
@@ -80,6 +86,22 @@ we register the **cleaned_sales_data** table from the **examples** database.
 
 To finish, click the **Add** button in the bottom right corner. You should now see your dataset in the list of datasets.
 
+### Organizing Datasets into Folders
+
+The Datasets list view supports **folders** for organizing datasets into groups. To create and manage folders:
+
+1. In the **Datasets** list, click the **Folders** panel on the left sidebar.
+2. Click **+ New Folder** to create a top-level folder, or drag an existing folder to nest it.
+3. Drag dataset rows onto a folder to move them in, or right-click a dataset and select **Move to folder**.
+
+Folders are per-user organizational aids — they do not affect dataset access permissions or how other users see the datasets.
+
+### Uploading Files via the OS File Manager (PWA)
+
+When Superset is installed as a **Progressive Web App (PWA)** from your browser, your operating system will offer Superset as an option when opening CSV, Excel (`.xls`/`.xlsx`), and Parquet files. Double-clicking or right-clicking a supported file and selecting "Open with Superset" navigates directly to the upload workflow for that file.
+
+To install Superset as a PWA, look for the install icon in your browser's address bar (Chrome, Edge) when visiting your Superset instance over HTTPS. PWA installation requires HTTPS and a valid manifest — your admin needs to confirm the app manifest is served correctly.
+
 ### Customizing column properties
 
 Now that you've registered your dataset, you can configure column properties
@@ -234,6 +256,64 @@ For example, when running the local development build, the following will disabl
 Top Nav and remove the Filter Bar:
 `http://localhost:8088/superset/dashboard/my-dashboard/?standalone=1&show_filters=0`
 
+### AG Grid Interactive Table
+
+The **AG Grid Interactive Table** chart type is Superset's fully-featured data grid, suitable for large paginated datasets where the standard Table chart is not enough.
+
+#### Server-Side Column Filters
+
+AG Grid supports server-side column filters that query the full dataset — not just the loaded page. Filters are applied before data is sent to the browser, so results are correct even across millions of rows.
+
+**Available filter types:**
+
+| Column type | Filter options |
+|---|---|
+| Text | Contains, equals, starts with, ends with |
+| Number | Equals, not equal, less than, greater than, between |
+| Date | Before, after, between, blank |
+| Set | Select from a list of distinct values |
+
+**AND / OR logic:** Each column supports combining multiple conditions with AND or OR. Filters from different columns are always combined with AND.
+
+**Interaction with pagination:** Server-side filters run as WHERE clauses in the underlying SQL query, so pagination always operates over the already-filtered result set.
+
+#### Time Shift (Time Comparison)
+
+AG Grid Interactive Table supports **Time Shift** (time comparison), matching the behavior of the standard Table chart. In the **Advanced Analytics** → **Time Comparison** section of the chart configuration, enter a shift expression (e.g., `1 year ago`, `minus 7 days`) to add comparison columns showing values from the offset period. Dashboard-level time range overrides apply to both the base and comparison periods.
+
+### Dynamic Currency Formatting
+
+Chart metric values can display currencies dynamically rather than using a fixed currency code. To enable:
+
+1. Open the dataset editor for your dataset (**Datasets → Edit**).
+2. In the **Advanced** tab, set **Currency Code Column** to the name of a column in your dataset that contains ISO 4217 currency codes (e.g., `USD`, `EUR`, `GBP`).
+3. In the Explore chart configuration, open the metric's **Number format** section and select **Auto-detect** for currency.
+
+When Auto-detect is active, each row uses the currency code from the designated column, so a single chart can display values in multiple currencies — each formatted correctly for its currency.
+
+### ECharts Option Editor
+
+For ECharts-based chart types (line, bar, area, scatter, pie, and others), Explore includes an advanced **ECharts Option Editor** that accepts raw JSON overrides for the underlying ECharts configuration.
+
+Access it via the **Customize** tab → **ECharts Options** section at the bottom of the panel. The JSON you enter is deep-merged on top of Superset's generated ECharts config, so you can override specific options without rewriting the entire config.
+
+**Example:** override the legend position and add a custom title:
+
+```json
+{
+  "legend": { "orient": "vertical", "right": "5%", "top": "middle" },
+  "title": { "text": "My Custom Title", "left": "center" }
+}
+```
+
+:::caution
+ECharts option overrides bypass Superset's validation layer. Invalid option keys are silently ignored by ECharts. Overrides that conflict with Superset-generated options (e.g., `series`) may produce unexpected results.
+:::
+
+### Table Chart: Exporting Filtered Data
+
+When the **Search Box** is visible in a Table chart, the **Download** action exports only the rows currently visible after the search filter is applied — not the full underlying dataset. This matches the visual output and is intentional. To export the full dataset regardless of search state, use the **Download as CSV** option from the chart's three-dot menu in the dashboard or from the Explore chart toolbar before applying a search filter.
+
 :::resources
 - [Dashboard Customization](https://docs.preset.io/docs/dashboard-customization) - Advanced dashboard styling and layout options
 - [Blog: BI Dashboard Best Practices](https://preset.io/blog/bi-dashboard-best-practices/)

docs/docs/using-superset/embedding.mdx

@@ -0,0 +1,130 @@
+{/*
+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.
+*/}
+
+---
+title: Embedding Superset
+sidebar_position: 6
+---
+
+# Embedding Superset
+
+Superset dashboards can be embedded directly in host applications using the `@superset-ui/embedded-sdk` package.
+
+:::info Prerequisites
+- The `EMBEDDED_SUPERSET` feature flag must be enabled.
+- The embedding domain and allowed origins must be configured by an admin.
+:::
+
+## Quick Start
+
+Install the SDK:
+
+```bash
+npm install @superset-ui/embedded-sdk
+```
+
+Embed a dashboard:
+
+```javascript
+import { embedDashboard } from '@superset-ui/embedded-sdk';
+
+embedDashboard({
+  id: 'dashboard-uuid-here',          // from Dashboard → Embed
+  supersetDomain: 'https://superset.example.com',
+  mountPoint: document.getElementById('superset-container'),
+  fetchGuestToken: () => fetchTokenFromYourBackend(),
+  dashboardUiConfig: {
+    hideTitle: true,
+    filters: { expanded: false },
+  },
+});
+```
+
+`fetchGuestToken` must return a **guest token** obtained from your server by calling Superset's `/api/v1/security/guest_token/` endpoint with a service account. Do not call this endpoint from client-side code.
+
+---
+
+## Callbacks
+
+### `resolvePermalinkUrl`
+
+When a user copies a permalink from an embedded dashboard, Superset generates a URL on its own domain. In an embedded context this URL is usually not meaningful to the host application's users — the dashboard is rendered inside the host app, not at the Superset URL.
+
+The `resolvePermalinkUrl` callback lets the host app intercept permalink generation and return a URL on the host domain instead:
+
+```javascript
+embedDashboard({
+  id: 'my-dashboard-uuid',
+  supersetDomain: 'https://superset.example.com',
+  mountPoint: document.getElementById('superset-container'),
+  fetchGuestToken: () => fetchGuestToken(),
+  /**
+   * Called when Superset generates a permalink.
+   * @param {Object} args - { key: string } — the permalink key
+   * @returns {string | null} - your host URL, or null to use Superset's default
+   */
+  resolvePermalinkUrl: ({ key }) => {
+    return `https://myapp.example.com/dashboard?permalink=${key}`;
+  },
+});
+```
+
+If the callback returns `null` or is not provided, Superset uses its own permalink URL as a fallback.
+
+---
+
+## Feature Flags for Embedded Mode
+
+### `DISABLE_EMBEDDED_SUPERSET_LOGOUT`
+
+Hides the logout button when Superset is embedded in a host application. This is useful when the host application manages the session lifecycle and you do not want users to accidentally log out of the embedded Superset session:
+
+```python
+# superset_config.py
+FEATURE_FLAGS = {
+    "EMBEDDED_SUPERSET": True,
+    "DISABLE_EMBEDDED_SUPERSET_LOGOUT": True,
+}
+```
+
+When enabled, the **Logout** menu item is removed from the user avatar dropdown in the embedded view. The session can still be invalidated server-side by revoking the guest token.
+
+### `EMBEDDED_SUPERSET`
+
+Must be `True` to enable the embedded SDK and the guest token endpoint. Without this flag, `embedDashboard` will fail to load.
+
+---
+
+## URL Parameters
+
+The following URL parameters can be passed through the `urlParams` option in `dashboardUiConfig` or appended to the embedded iframe URL:
+
+| Parameter | Values | Effect |
+|-----------|--------|--------|
+| `standalone` | `0`, `1`, `2`, `3` | `0`: normal; `1`: hide nav; `2`: hide nav + title; `3`: hide nav + title + tabs |
+| `show_filters` | `0`, `1` | Show or hide the native filter bar |
+| `expand_filters` | `0`, `1` | Start with filter bar expanded or collapsed |
+
+---
+
+## Security Notes
+
+- **Guest tokens expire** — their lifetime is controlled by the `GUEST_TOKEN_JWT_EXP_SECONDS` config (default: 5 minutes). Refresh tokens before they expire using a token refresh mechanism in your host app.
+- **Row-level security** — pass `rls` rules in the guest token request to restrict which rows are visible to the embedded user.
+- **Allowed domains** — restrict which host origins can embed a dashboard by setting **Allowed Domains** per-dashboard in the *Embed* settings modal. Superset checks the request's `Referer` header against this list before serving the embedded view; an empty list allows any origin, so configure this explicitly for production.

docs/docs/using-superset/exploring-data.mdx

@@ -329,6 +329,27 @@ various options in this section, refer to the
 Lastly, save your chart as Tutorial Resample and add it to the Tutorial Dashboard. Go to the
 tutorial dashboard to see the four charts side by side and compare the different outputs.
 
+### SQL Lab Tips
+
+**Schema and table browser**: The left-side table browser uses a collapsible treeview — click a schema to expand its tables, and click a table to see its columns and sample data inline. This makes navigating large schemas much faster than the previous flat list.
+
+**Find in editor**: Press **Ctrl+F** (or **Cmd+F** on Mac) to open the Monaco find/replace widget inside the SQL editor without leaving the editor.
+
+**Resizable panels**: The dividers between the SQL editor, schema browser, and results pane are draggable. Adjust them to match your workflow and screen size.
+
+**Dialect-aware Format SQL**: The **Format SQL** button applies the SQL dialect of the currently selected database — Trino, Presto, MySQL, PostgreSQL, etc. — rather than a generic formatter. Switch to a different database in the toolbar and re-format to get dialect-specific output. Jinja template syntax (`{{ }}`, `{% %}`) is preserved during formatting and will not cause format errors.
+
+### Time Range Natural Language Expressions
+
+The **Custom** time range picker accepts natural language expressions alongside specific dates:
+
+- **Relative**: `Last 7 days`, `Last month`, `Last quarter`, `Last year`
+- **Anchored**: `previous calendar week`, `previous calendar month`
+- **"First of" expressions**: `first day of this week`, `first day of this month`, `first day of this quarter`, `first day of this year`, `first week of this year`
+- **Offsets**: `30 days ago`, `1 year ago`, `next week`
+
+These expressions are evaluated at query time, so saved charts always display data relative to the current date.
+
 :::resources
 - [Chart Walkthroughs](https://docs.preset.io/docs/chart-walkthroughs) - Detailed guides for most chart types
 - [Blog: Why Apache ECharts is the Future of Apache Superset](https://preset.io/blog/2021-4-1-why-echarts/)

docs/docs/using-superset/using-ai-with-superset.mdx

@@ -56,8 +56,8 @@ Ask your AI assistant to browse what's available in your Superset instance:
 Describe the visualization you want and AI creates it for you:
 
 - **Create charts from natural language** -- describe what you want to see and AI picks the right chart type, metrics, and dimensions
-- **Preview before saving** -- AI generates a preview so you can review before committing
-- **Modify existing charts** -- update filters, change chart types, add metrics
+- **Preview before saving** -- `generate_chart` defaults to `save_chart=False`, showing the chart in Explore before it's committed. Ask AI to save once you're satisfied.
+- **Modify existing charts** -- `update_chart` also supports preview mode so you can review changes before saving
 - **Get Explore links** -- open any chart in Superset's Explore view for further refinement
 
 **Example prompts:**
@@ -195,27 +195,59 @@ Ask your admin for the MCP server URL and any authentication tokens you need.
 
 ## Available Tools Reference
 
+### Exploration & Discovery
+
 | Tool | Description |
 |------|-------------|
 | `health_check` | Verify the MCP server is running and connected |
 | `get_instance_info` | Get instance statistics (dataset, chart, dashboard counts) |
 | `get_schema` | Discover available charts, datasets, and dashboards with schema info |
+
+### Datasets
+
+| Tool | Description |
+|------|-------------|
 | `list_datasets` | List datasets with filtering and search |
 | `get_dataset_info` | Get dataset metadata (columns, metrics, filters) |
+| `create_virtual_dataset` | Create a virtual dataset from a SQL query |
+
+### Charts
+
+| Tool | Description |
+|------|-------------|
 | `list_charts` | List charts with filtering and search |
 | `get_chart_info` | Get chart metadata and configuration |
 | `get_chart_data` | Retrieve chart data (JSON, CSV, or Excel) |
 | `get_chart_preview` | Generate a chart preview (URL, ASCII, table, or Vega-Lite) |
-| `generate_chart` | Create a new chart from a specification |
-| `update_chart` | Modify an existing chart's configuration |
+| `get_chart_type_schema` | Get the configuration schema for a chart type |
+| `generate_chart` | Create a new chart from a specification (defaults to preview mode — review before saving) |
+| `update_chart` | Modify an existing chart's configuration (pass `generate_preview=False` to persist immediately instead of returning a preview URL) |
 | `update_chart_preview` | Update a cached chart preview without saving |
+| `generate_explore_link` | Generate an Explore URL for interactive visualization |
+
+### Dashboards
+
+| Tool | Description |
+|------|-------------|
 | `list_dashboards` | List dashboards with filtering and search |
 | `get_dashboard_info` | Get dashboard metadata and layout |
 | `generate_dashboard` | Create a new dashboard with specified charts |
 | `add_chart_to_existing_dashboard` | Add a chart to an existing dashboard |
+
+### SQL
+
+| Tool | Description |
+|------|-------------|
 | `execute_sql` | Run a SQL query with RBAC enforcement |
+| `save_sql_query` | Persist a SQL query to SQL Lab's saved queries |
 | `open_sql_lab_with_context` | Open SQL Lab with a pre-populated query |
-| `generate_explore_link` | Generate an Explore URL for interactive visualization |
+
+### Databases
+
+| Tool | Description |
+|------|-------------|
+| `list_databases` | List configured database connections |
+| `get_database_info` | Get details about a specific database connection |
 
 ---
 

docs/package.json

@@ -67,10 +67,10 @@
     "@storybook/preview-api": "^8.6.18",
     "@storybook/theming": "^8.6.15",
     "@superset-ui/core": "^0.20.4",
-    "@swc/core": "^1.15.26",
+    "@swc/core": "^1.15.30",
     "antd": "^6.3.6",
-    "baseline-browser-mapping": "^2.10.19",
-    "caniuse-lite": "^1.0.30001788",
+    "baseline-browser-mapping": "^2.10.21",
+    "caniuse-lite": "^1.0.30001790",
     "docusaurus-plugin-openapi-docs": "^5.0.1",
     "docusaurus-theme-openapi-docs": "^5.0.1",
     "js-yaml": "^4.1.1",
@@ -98,15 +98,15 @@
     "@types/js-yaml": "^4.0.9",
     "@types/react": "^19.1.8",
     "@typescript-eslint/eslint-plugin": "^8.52.0",
-    "@typescript-eslint/parser": "^8.56.1",
+    "@typescript-eslint/parser": "^8.59.0",
     "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.5",
     "eslint-plugin-react": "^7.37.5",
     "globals": "^17.5.0",
     "prettier": "^3.8.3",
-    "typescript": "~5.9.3",
-    "typescript-eslint": "^8.58.2",
+    "typescript": "~6.0.3",
+    "typescript-eslint": "^8.59.0",
     "webpack": "^5.106.2"
   },
   "browserslist": {

docs/tsconfig.json

@@ -3,6 +3,7 @@
   "extends": "@docusaurus/tsconfig",
   "compilerOptions": {
     "baseUrl": ".",
+    "ignoreDeprecations": "6.0",
     "skipLibCheck": true,
     "noImplicitAny": false,
     "strict": false,

docs/yarn.lock

@@ -4239,86 +4239,86 @@
   dependencies:
     apg-lite "^1.0.4"
 
-"@swc/core-darwin-arm64@1.15.26":
-  version "1.15.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.26.tgz#b10c6ef2ddfdb0f9a9d75add77fbcb05a876310e"
-  integrity sha512-OmcP96CFsNOwa65tamQayRcfqhNlcQ3YCWOq+0Wb+CAM4uB7kOMrXY41Gj4atthxrGhLQ9pg7Vk26iApb88idA==
+"@swc/core-darwin-arm64@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.30.tgz#23447f1c30c9155fe35602de4392b4ecfa0a54cc"
+  integrity sha512-VvpP+vq08HmGYewMWvrdsxh9s2lthz/808zXm8Yu5kaqeR8Yia2b0eYXleHQ3VAjoStUDk6LzTheBW9KXYQdMA==
 
-"@swc/core-darwin-x64@1.15.26":
-  version "1.15.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.15.26.tgz#91f81b957a46565b21933554f019b50249514f54"
-  integrity sha512-liTTTpKSv89ivIxcZ+iU1cRige9Y7JkOjVnJ2Ystzl+DsWNHqt7wLTTgm/u7gEqmmAS2JKryODLQn3q1UtFNPQ==
+"@swc/core-darwin-x64@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.15.30.tgz#16e6e35fff5b07c712d8af44783da59ac64ad5cf"
+  integrity sha512-WiJA0hiZI3nwQAO6mu5RqigtWGDtth4Hiq6rbZxAaQyhIcqKIg5IoMRc1Y071lrNJn29eEDMC86Rq58xgUxlDg==
 
-"@swc/core-linux-arm-gnueabihf@1.15.26":
-  version "1.15.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.26.tgz#81a05689a7a2464fce1a558999ca049f682ede87"
-  integrity sha512-Y/g+m3I8CeBof5A3kWWOS6QA2HOIUytF5EeTgfwcAK+GKT/tGe7Xqo5svBtaqflU5od2zzbMTWqkinPXgRWGgA==
+"@swc/core-linux-arm-gnueabihf@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.30.tgz#abce7de734301109a7df23c22f6b6d233e3b9de9"
+  integrity sha512-YANuFUo48kIT6plJgCD0keae9HFXfjxsbvsgevqc0hr/07X/p7sAWTFOGYEc2SXcASaK7UvuQqzlbW8pr7R79g==
 
-"@swc/core-linux-arm64-gnu@1.15.26":
-  version "1.15.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.26.tgz#ce32870841e85a8d5fa8d4dd8ad0b501aa641348"
-  integrity sha512-19IvwyPfBN/rz9s7qXhOTQmW0922+pjpRUUvIebu+CMM75nX6YuDzHsGx8hSmn5dS89SNaMCh1lgUuXqm++6jg==
+"@swc/core-linux-arm64-gnu@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.30.tgz#9a4e418cdbbfe64506dd12469a553c07e1924fef"
+  integrity sha512-VndG8jaR4ugY6u+iVOT0Q+d2fZd7sLgjPgN8W/Le+3EbZKl+cRfFxV7Eoz4gfLqhmneZPdcIzf9T3LkgkmqNLg==
 
-"@swc/core-linux-arm64-musl@1.15.26":
-  version "1.15.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.26.tgz#6c4e5c5cdbe18718fe998c80b9432367d9a08d10"
-  integrity sha512-iNlbvTIo425rkKzDLLWFJGnFXr3myETUdIDHcjuiPNZE8b0ogmcAuilC4yEJX7FSHGbnlsoJcCT2xf4b3VJmmQ==
+"@swc/core-linux-arm64-musl@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.30.tgz#4cd68ccb2af71c3ec539b15aa15c8fd304833d26"
+  integrity sha512-1SYGs2l0Yyyi0pR/P/NKz/x0kqxkoiw+BXeJjLUdecSk/KasncWlJrc6hOvFSgKHOBrzgM5jwuluKtlT8dnrcA==
 
-"@swc/core-linux-ppc64-gnu@1.15.26":
-  version "1.15.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-ppc64-gnu/-/core-linux-ppc64-gnu-1.15.26.tgz#60db5a6a5b780dd7bfba8ae58f3f58af621858cb"
-  integrity sha512-AuuEOtG+YXKIjIUup4RsxYNklx6XVB3WKWfhxG6hnfPrn7vp89RNOLbbyyprgj6Sk7k9ulwGVTJElEvmBNPSCA==
+"@swc/core-linux-ppc64-gnu@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-ppc64-gnu/-/core-linux-ppc64-gnu-1.15.30.tgz#561997d3c5f392db7e3473cb4bbc43e6d6b1160c"
+  integrity sha512-TXREtiXeRhbfDFbmhnkIsXpKfzbfT73YkV2ZF6w0sfxgjC5zI2ZAbaCOq25qxvegofj2K93DtOpm9RLaBgqR2g==
 
-"@swc/core-linux-s390x-gnu@1.15.26":
-  version "1.15.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-s390x-gnu/-/core-linux-s390x-gnu-1.15.26.tgz#7e942cecb219b2aec132fd84b2e2d6cc337d9cb9"
-  integrity sha512-JcMDWQvW1BchUyRg8E0jHiTx7CQYpUr5uDEL1dnPDECrEjBEGG2ynmJ3XX70sWXql0JagqR1t3VpANYFWdUnqA==
+"@swc/core-linux-s390x-gnu@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-s390x-gnu/-/core-linux-s390x-gnu-1.15.30.tgz#d6f1d5dceca794909305584cb69f80dd91820410"
+  integrity sha512-DCR2YYeyd6DQE4OuDhImouuNcjXEiEdnn1Y0DyGteugPEDvVuvYk8Xddi+4o2SgWH6jiW8/I+3emZvbep1NC+g==
 
-"@swc/core-linux-x64-gnu@1.15.26":
-  version "1.15.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.26.tgz#cb8774fa36ecbea1988dc42757360db55e0d3374"
-  integrity sha512-FW7V7Mbpq4+PA7BiAq76LJs8MdNuUSylyuRVfQRkhIyeWadFroZ+KOPgjku8Z/fXzngxBRvsk+PGGB0t8mGcjA==
+"@swc/core-linux-x64-gnu@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.30.tgz#c3e91c60f265a62cec60145f0d2d931feb1cf41a"
+  integrity sha512-5Pizw3NgfOJ5BJOBK8TIRa59xFW2avESTOBDPTAYwZYa1JNDs+KMF9lUfjJiJLM5HiMs/wPheA9eiT0q9m2AoA==
 
-"@swc/core-linux-x64-musl@1.15.26":
-  version "1.15.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.26.tgz#fad8549f4b89277d11dafe507493e5525c6e85b5"
-  integrity sha512-w8erqMHsVcdGwUfJxF6LaiTuPoKnyLOcUbhLcxiXrlLt5MLjtlgcIeUY/NWK/oPoyqkgH+/i8pOJnMTxvl83ZQ==
+"@swc/core-linux-x64-musl@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.30.tgz#3fd112e617a951438f73930b514adf19375067fb"
+  integrity sha512-qyqydP/wyH8alcIP4a2hnGSjHLJjm9H7yDFup+CPy9oTahFgLLwnNcv5UHXqO2Qs3AIND+cls5f/Bb6hqpxdgA==
 
-"@swc/core-win32-arm64-msvc@1.15.26":
-  version "1.15.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.26.tgz#b41d975fd3df8f82a38362cfa86b3de1d654d5a0"
-  integrity sha512-uDCWCNpUiqkbvPmsuPUTn/P7ag9SqNXD2JT/W3dUu7yZ2krzN+nmmoQ2xRX63/J6RYiHI7aT4jo7Z++lsljlPA==
+"@swc/core-win32-arm64-msvc@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.30.tgz#d005dce92e4ec1b0a7898667c9cf5e5215e4631c"
+  integrity sha512-CaQENgDHVGOg1mSF5sQVgvfFHG9kjMor2rkLMLeLOkfZYNj13ppnJ9+lfaBZLZUMMbnlGQnavCJb8PVBUOso7Q==
 
-"@swc/core-win32-ia32-msvc@1.15.26":
-  version "1.15.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.26.tgz#dadf3200ebb79e32fce204f0922f0eec7ebc958d"
-  integrity sha512-2k1ax1QmmqLEnpC0uRCw7OXhBfyvdPqERBXupDasjYbChT6ZSO/uha28Bp38cw0viKIG79L27aTDkbkABsMW3w==
+"@swc/core-win32-ia32-msvc@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.30.tgz#67ebfaa22266835a3d82776014c2f428346062bd"
+  integrity sha512-30VdLeGk6fugiUs/kUdJ/pAg7z/zpvVbR11RH60jZ0Z42WIeIniYx0rLEWN7h/pKJ3CopqsQ3RsogCAkRKiA2g==
 
-"@swc/core-win32-x64-msvc@1.15.26":
-  version "1.15.26"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.26.tgz#5aa0fe6533226e2e2f103ea81a2b1cc6fa3f60f5"
-  integrity sha512-aUuYecSEGa4SUSdyCWaI/vk8jdseifYnsF1GZQx2+piL8GIuT/5QrVcFfmes4Iwy7FIVXxtzD063z/FfpZ7K7w==
+"@swc/core-win32-x64-msvc@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.30.tgz#cb602b53f9cdcdfb580cecdb02b536339d4b004b"
+  integrity sha512-4iObHPR+Q4oDY110EF5SF5eIaaVJNpMdG9C0q3Q92BsJ5y467uHz7sYQhP60WYlLFsLQ1el2YrIPUItUAQGOKg==
 
-"@swc/core@^1.15.26", "@swc/core@^1.7.39":
-  version "1.15.26"
-  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.15.26.tgz#347cdd3c49ab2fd02468ea569e6975ccb990bd67"
-  integrity sha512-tglZGyx8N5PC+x1Nd/JrZxqpqlcZoSuG9gTDKO6AuFToFiVB3uS8HvbKFuO7g3lJzvFf9riAb94xs9HU2UhAHQ==
+"@swc/core@^1.15.30", "@swc/core@^1.7.39":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.15.30.tgz#2f77d5ed3b0df964aac8aaa251dc43ed822100cc"
+  integrity sha512-R8VQbQY1BZcbIF2p3gjlTCwAQzx1A194ugWfwld5y+WgVVWqVKm7eURGGOVbQVubgKWzidP2agomBbg96rZilQ==
   dependencies:
     "@swc/counter" "^0.1.3"
     "@swc/types" "^0.1.26"
   optionalDependencies:
-    "@swc/core-darwin-arm64" "1.15.26"
-    "@swc/core-darwin-x64" "1.15.26"
-    "@swc/core-linux-arm-gnueabihf" "1.15.26"
-    "@swc/core-linux-arm64-gnu" "1.15.26"
-    "@swc/core-linux-arm64-musl" "1.15.26"
-    "@swc/core-linux-ppc64-gnu" "1.15.26"
-    "@swc/core-linux-s390x-gnu" "1.15.26"
-    "@swc/core-linux-x64-gnu" "1.15.26"
-    "@swc/core-linux-x64-musl" "1.15.26"
-    "@swc/core-win32-arm64-msvc" "1.15.26"
-    "@swc/core-win32-ia32-msvc" "1.15.26"
-    "@swc/core-win32-x64-msvc" "1.15.26"
+    "@swc/core-darwin-arm64" "1.15.30"
+    "@swc/core-darwin-x64" "1.15.30"
+    "@swc/core-linux-arm-gnueabihf" "1.15.30"
+    "@swc/core-linux-arm64-gnu" "1.15.30"
+    "@swc/core-linux-arm64-musl" "1.15.30"
+    "@swc/core-linux-ppc64-gnu" "1.15.30"
+    "@swc/core-linux-s390x-gnu" "1.15.30"
+    "@swc/core-linux-x64-gnu" "1.15.30"
+    "@swc/core-linux-x64-musl" "1.15.30"
+    "@swc/core-win32-arm64-msvc" "1.15.30"
+    "@swc/core-win32-ia32-msvc" "1.15.30"
+    "@swc/core-win32-x64-msvc" "1.15.30"
 
 "@swc/counter@^0.1.3":
   version "0.1.3"
@@ -5040,100 +5040,100 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@8.58.2", "@typescript-eslint/eslint-plugin@^8.52.0":
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.58.2.tgz#a6882a6a328e1259cff259fdb03184245ef06191"
-  integrity sha512-aC2qc5thQahutKjP+cl8cgN9DWe3ZUqVko30CMSZHnFEHyhOYoZSzkGtAI2mcwZ38xeImDucI4dnqsHiOYuuCw==
+"@typescript-eslint/eslint-plugin@8.59.0", "@typescript-eslint/eslint-plugin@^8.52.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.59.0.tgz#fcbe76b693ce2412410cf4d48aefd617d345f2d9"
+  integrity sha512-HyAZtpdkgZwpq8Sz3FSUvCR4c+ScbuWa9AksK2Jweub7w4M3yTz4O11AqVJzLYjy/B9ZWPyc81I+mOdJU/bDQw==
   dependencies:
     "@eslint-community/regexpp" "^4.12.2"
-    "@typescript-eslint/scope-manager" "8.58.2"
-    "@typescript-eslint/type-utils" "8.58.2"
-    "@typescript-eslint/utils" "8.58.2"
-    "@typescript-eslint/visitor-keys" "8.58.2"
+    "@typescript-eslint/scope-manager" "8.59.0"
+    "@typescript-eslint/type-utils" "8.59.0"
+    "@typescript-eslint/utils" "8.59.0"
+    "@typescript-eslint/visitor-keys" "8.59.0"
     ignore "^7.0.5"
     natural-compare "^1.4.0"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/parser@8.58.2", "@typescript-eslint/parser@^8.56.1":
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.58.2.tgz#b267545e4bd515d896fe1f3a5b6f334fa6aa0026"
-  integrity sha512-/Zb/xaIDfxeJnvishjGdcR4jmr7S+bda8PKNhRGdljDM+elXhlvN0FyPSsMnLmJUrVG9aPO6dof80wjMawsASg==
+"@typescript-eslint/parser@8.59.0", "@typescript-eslint/parser@^8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.59.0.tgz#57a138280b3ceaf07904fbd62c433d5cc1ee1573"
+  integrity sha512-TI1XGwKbDpo9tRW8UDIXCOeLk55qe9ZFGs8MTKU6/M08HWTw52DD/IYhfQtOEhEdPhLMT26Ka/x7p70nd3dzDg==
   dependencies:
-    "@typescript-eslint/scope-manager" "8.58.2"
-    "@typescript-eslint/types" "8.58.2"
-    "@typescript-eslint/typescript-estree" "8.58.2"
-    "@typescript-eslint/visitor-keys" "8.58.2"
+    "@typescript-eslint/scope-manager" "8.59.0"
+    "@typescript-eslint/types" "8.59.0"
+    "@typescript-eslint/typescript-estree" "8.59.0"
+    "@typescript-eslint/visitor-keys" "8.59.0"
     debug "^4.4.3"
 
-"@typescript-eslint/project-service@8.58.2":
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.58.2.tgz#8c980249100e21b87baba0ca10880fdf893e0a8e"
-  integrity sha512-Cq6UfpZZk15+r87BkIh5rDpi38W4b+Sjnb8wQCPPDDweS/LRCFjCyViEbzHk5Ck3f2QDfgmlxqSa7S7clDtlfg==
+"@typescript-eslint/project-service@8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.59.0.tgz#914bf62069d870faa0389ffd725774a200f511bf"
+  integrity sha512-Lw5ITrR5s5TbC19YSvlr63ZfLaJoU6vtKTHyB0GQOpX0W7d5/Ir6vUahWi/8Sps/nOukZQ0IB3SmlxZnjaKVnw==
   dependencies:
-    "@typescript-eslint/tsconfig-utils" "^8.58.2"
-    "@typescript-eslint/types" "^8.58.2"
+    "@typescript-eslint/tsconfig-utils" "^8.59.0"
+    "@typescript-eslint/types" "^8.59.0"
     debug "^4.4.3"
 
-"@typescript-eslint/scope-manager@8.58.2":
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.58.2.tgz#aa73784d78f117940e83f71705af07ba695cd60c"
-  integrity sha512-SgmyvDPexWETQek+qzZnrG6844IaO02UVyOLhI4wpo82dpZJY9+6YZCKAMFzXb7qhx37mFK1QcPQ18tud+vo6Q==
+"@typescript-eslint/scope-manager@8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.59.0.tgz#f71be268bd31da1c160815c689e4dde7c9bc9e8e"
+  integrity sha512-UzR16Ut8IpA3Mc4DbgAShlPPkVm8xXMWafXxB0BocaVRHs8ZGakAxGRskF7FId3sdk9lgGD73GSFaWmWFDE4dg==
   dependencies:
-    "@typescript-eslint/types" "8.58.2"
-    "@typescript-eslint/visitor-keys" "8.58.2"
+    "@typescript-eslint/types" "8.59.0"
+    "@typescript-eslint/visitor-keys" "8.59.0"
 
-"@typescript-eslint/tsconfig-utils@8.58.2", "@typescript-eslint/tsconfig-utils@^8.58.2":
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.58.2.tgz#fa13f96432c9348bf87f6f44826def585fad7bca"
-  integrity sha512-3SR+RukipDvkkKp/d0jP0dyzuls3DbGmwDpVEc5wqk5f38KFThakqAAO0XMirWAE+kT00oTauTbzMFGPoAzB0A==
+"@typescript-eslint/tsconfig-utils@8.59.0", "@typescript-eslint/tsconfig-utils@^8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.0.tgz#1276077f5ad77e384446ea28a2474e8f8be1af41"
+  integrity sha512-91Sbl3s4Kb3SybliIY6muFBmHVv+pYXfybC4Oolp3dvk8BvIE3wOPc+403CWIT7mJNkfQRGtdqghzs2+Z91Tqg==
 
-"@typescript-eslint/type-utils@8.58.2":
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.58.2.tgz#024eb1dd597f8a34cb22d8d9ab32da857bc9a817"
-  integrity sha512-Z7EloNR/B389FvabdGeTo2XMs4W9TjtPiO9DAsmT0yom0bwlPyRjkJ1uCdW1DvrrrYP50AJZ9Xc3sByZA9+dcg==
+"@typescript-eslint/type-utils@8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.59.0.tgz#2834ea3b179cedfc9244dcd4f74105a27751a439"
+  integrity sha512-3TRiZaQSltGqGeNrJzzr1+8YcEobKH9rHnqIp/1psfKFmhRQDNMGP5hBufanYTGznwShzVLs3Mz+gDN7HkWfXg==
   dependencies:
-    "@typescript-eslint/types" "8.58.2"
-    "@typescript-eslint/typescript-estree" "8.58.2"
-    "@typescript-eslint/utils" "8.58.2"
+    "@typescript-eslint/types" "8.59.0"
+    "@typescript-eslint/typescript-estree" "8.59.0"
+    "@typescript-eslint/utils" "8.59.0"
     debug "^4.4.3"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/types@8.58.2", "@typescript-eslint/types@^8.58.2":
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.58.2.tgz#3ab8051de0f19a46ddefb0749d0f7d82974bd57c"
-  integrity sha512-9TukXyATBQf/Jq9AMQXfvurk+G5R2MwfqQGDR2GzGz28HvY/lXNKGhkY+6IOubwcquikWk5cjlgPvD2uAA7htQ==
+"@typescript-eslint/types@8.59.0", "@typescript-eslint/types@^8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.59.0.tgz#cfcc643c6e879016479775850d86d84c14492738"
+  integrity sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A==
 
-"@typescript-eslint/typescript-estree@8.58.2":
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.58.2.tgz#b1beb1f959385b341cc76f0aebbf028e23dfdb8b"
-  integrity sha512-ELGuoofuhhoCvNbQjFFiobFcGgcDCEm0ThWdmO4Z0UzLqPXS3KFvnEZ+SHewwOYHjM09tkzOWXNTv9u6Gqtyuw==
+"@typescript-eslint/typescript-estree@8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.0.tgz#feba58a70ab6ea7ac53a2f3ae900db28ce3454c2"
+  integrity sha512-O9Re9P1BmBLFJyikRbQpLku/QA3/AueZNO9WePLBwQrvkixTmDe8u76B6CYUAITRl/rHawggEqUGn5QIkVRLMw==
   dependencies:
-    "@typescript-eslint/project-service" "8.58.2"
-    "@typescript-eslint/tsconfig-utils" "8.58.2"
-    "@typescript-eslint/types" "8.58.2"
-    "@typescript-eslint/visitor-keys" "8.58.2"
+    "@typescript-eslint/project-service" "8.59.0"
+    "@typescript-eslint/tsconfig-utils" "8.59.0"
+    "@typescript-eslint/types" "8.59.0"
+    "@typescript-eslint/visitor-keys" "8.59.0"
     debug "^4.4.3"
     minimatch "^10.2.2"
     semver "^7.7.3"
     tinyglobby "^0.2.15"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/utils@8.58.2":
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.58.2.tgz#27165554a02d1ff57d98262fa92060498dabc8b3"
-  integrity sha512-QZfjHNEzPY8+l0+fIXMvuQ2sJlplB4zgDZvA+NmvZsZv3EQwOcc1DuIU1VJUTWZ/RKouBMhDyNaBMx4sWvrzRA==
+"@typescript-eslint/utils@8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.59.0.tgz#f50df9bd6967881ef64fba62230111153179ead5"
+  integrity sha512-I1R/K7V07XsMJ12Oaxg/O9GfrysGTmCRhvZJBv0RE0NcULMzjqVpR5kRRQjHsz3J/bElU7HwCO7zkqL+MSUz+g==
   dependencies:
     "@eslint-community/eslint-utils" "^4.9.1"
-    "@typescript-eslint/scope-manager" "8.58.2"
-    "@typescript-eslint/types" "8.58.2"
-    "@typescript-eslint/typescript-estree" "8.58.2"
+    "@typescript-eslint/scope-manager" "8.59.0"
+    "@typescript-eslint/types" "8.59.0"
+    "@typescript-eslint/typescript-estree" "8.59.0"
 
-"@typescript-eslint/visitor-keys@8.58.2":
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.58.2.tgz#9ed699eaa9b5720b6b6b6f9c16e6c7d4cd32b276"
-  integrity sha512-f1WO2Lx8a9t8DARmcWAUPJbu0G20bJlj8L4z72K00TMeJAoyLr/tHhI/pzYBLrR4dXWkcxO1cWYZEOX8DKHTqA==
+"@typescript-eslint/visitor-keys@8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.0.tgz#2e80de30e7e944ed4bd47d751e37dcb04db03795"
+  integrity sha512-/uejZt4dSere1bx12WLlPfv8GktzcaDtuJ7s42/HEZ5zGj9oxRaD4bj7qwSunXkf+pbAhFt2zjpHYUiT5lHf0Q==
   dependencies:
-    "@typescript-eslint/types" "8.58.2"
+    "@typescript-eslint/types" "8.59.0"
     eslint-visitor-keys "^5.0.0"
 
 "@ungap/structured-clone@^1.0.0":
@@ -5794,10 +5794,10 @@ base64-js@^1.3.1, base64-js@^1.5.1:
   resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-baseline-browser-mapping@^2.10.19, baseline-browser-mapping@^2.9.0, baseline-browser-mapping@^2.9.19:
-  version "2.10.19"
-  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.19.tgz#7697721c22f94f66195d0c34299b1a91e3299493"
-  integrity sha512-qCkNLi2sfBOn8XhZQ0FXsT1Ki/Yo5P90hrkRamVFRS7/KV9hpfA4HkoWNU152+8w0zPjnxo5psx5NL3PSGgv5g==
+baseline-browser-mapping@^2.10.21, baseline-browser-mapping@^2.9.0, baseline-browser-mapping@^2.9.19:
+  version "2.10.21"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.21.tgz#136f9f181ee0d7ca6e3edbf42d9559763d2c1141"
+  integrity sha512-Q+rUQ7Uz8AHM7DEaNdwvfFCTq7a43lNTzuS94eiWqwyxfV/wJv+oUivef51T91mmRY4d4A1u9rcSvkeufCVXlA==
 
 batch@0.6.1:
   version "0.6.1"
@@ -6035,10 +6035,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001702, caniuse-lite@^1.0.30001759, caniuse-lite@^1.0.30001788:
-  version "1.0.30001788"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001788.tgz#31e97d1bfec332b3f2d7eea7781460c97629b3bf"
-  integrity sha512-6q8HFp+lOQtcf7wBK+uEenxymVWkGKkjFpCvw5W25cmMwEDU45p1xQFBQv8JDlMMry7eNxyBaR+qxgmTUZkIRQ==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001702, caniuse-lite@^1.0.30001759, caniuse-lite@^1.0.30001790:
+  version "1.0.30001790"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001790.tgz#04660c7de15f445d86dd10ac88a8936ac0698e45"
+  integrity sha512-bOoxfJPyYo+ds6W0YfptaCWbFnJYjh2Y1Eow5lRv+vI2u8ganPZqNm1JwNh0t2ELQCqIWg4B3dWEusgAmsoyOw==
 
 ccount@^2.0.0:
   version "2.0.1"
@@ -12428,9 +12428,9 @@ postcss-zindex@^6.0.2:
   integrity sha512-5BxW9l1evPB/4ZIc+2GobEBoKC+h8gPGCMi+jxsYvd2x0mjq7wazk6DrP71pStqxE9Foxh5TVnonbWpFZzXaYg==
 
 postcss@^8.4.21, postcss@^8.4.24, postcss@^8.4.33, postcss@^8.5.4:
-  version "8.5.6"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz"
-  integrity sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==
+  version "8.5.10"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.10.tgz#8992d8c30acf3f12169e7c09514a12fed7e48356"
+  integrity sha512-pMMHxBOZKFU6HgAZ4eyGnwXF/EvPGGqUr0MnZ5+99485wwW41kW91A4LOGxSHhgugZmSChL5AlElNdwlNgcnLQ==
   dependencies:
     nanoid "^3.3.11"
     picocolors "^1.1.1"
@@ -14720,20 +14720,20 @@ types-ramda@^0.30.1:
   dependencies:
     ts-toolbelt "^9.6.0"
 
-typescript-eslint@^8.58.2:
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.58.2.tgz#55f425fc668c2d5148f45587f2cd04532d715c6a"
-  integrity sha512-V8iSng9mRbdZjl54VJ9NKr6ZB+dW0J3TzRXRGcSbLIej9jV86ZRtlYeTKDR/QLxXykocJ5icNzbsl2+5TzIvcQ==
+typescript-eslint@^8.59.0:
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.59.0.tgz#d1cc7c63559ce7116aeb66d35ec9dbe0063379fd"
+  integrity sha512-BU3ONW9X+v90EcCH9ZS6LMackcVtxRLlI3XrYyqZIwVSHIk7Qf7bFw1z0M9Q0IUxhTMZCf8piY9hTYaNEIASrw==
   dependencies:
-    "@typescript-eslint/eslint-plugin" "8.58.2"
-    "@typescript-eslint/parser" "8.58.2"
-    "@typescript-eslint/typescript-estree" "8.58.2"
-    "@typescript-eslint/utils" "8.58.2"
+    "@typescript-eslint/eslint-plugin" "8.59.0"
+    "@typescript-eslint/parser" "8.59.0"
+    "@typescript-eslint/typescript-estree" "8.59.0"
+    "@typescript-eslint/utils" "8.59.0"
 
-typescript@~5.9.3:
-  version "5.9.3"
-  resolved "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz"
-  integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==
+typescript@~6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-6.0.3.tgz#90251dc007916e972786cb94d74d15b185577d21"
+  integrity sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==
 
 ufo@^1.5.4:
   version "1.6.1"

pyproject.toml

@@ -89,10 +89,11 @@ dependencies = [
     "python-dateutil",
     "python-dotenv", # optional dependencies for Flask but required for Superset, see https://flask.palletsprojects.com/en/stable/installation/#optional-dependencies
     "pygeohash",
-    "pyarrow>=16.1.0, <19", # before upgrading pyarrow, check that all db dependencies support this, see e.g. https://github.com/apache/superset/pull/34693
+    "pyarrow>=16.1.0, <21", # before upgrading pyarrow, check that all db dependencies support this, see e.g. https://github.com/apache/superset/pull/34693
     "pyyaml>=6.0.0, <7.0.0",
     "PyJWT>=2.4.0, <3.0",
     "redis>=5.0.0, <6.0",
+    "rison>=2.0.0, <3.0",
     "selenium>=4.14.0, <5.0",
     "shillelagh[gsheetsapi]>=1.4.3, <2.0",
     "sshtunnel>=0.4.0, <0.5",
@@ -240,7 +241,7 @@ combine_as_imports = true
 include_trailing_comma = true
 line_length = 88
 known_first_party = "superset, apache-superset-core, apache-superset-extensions-cli"
-known_third_party = "alembic, apispec, backoff, celery, click, colorama, cron_descriptor, croniter, cryptography, dateutil, deprecation, flask, flask_appbuilder, flask_babel, flask_caching, flask_compress, flask_jwt_extended, flask_login, flask_migrate, flask_sqlalchemy, flask_talisman, flask_testing, flask_wtf, freezegun, geohash, geopy, holidays, humanize, isodate, jinja2, jwt, markdown, markupsafe, marshmallow, marshmallow-union, msgpack, nh3, numpy, pandas, parameterized, parsedatetime, pgsanity, polyline, prison, progress, pyarrow, sqlalchemy_bigquery, pyhive, pyparsing, pytest, pytest_mock, pytz, redis, requests, selenium, setuptools, shillelagh, simplejson, slack, sqlalchemy, sqlalchemy_utils, syntaqlite, typing_extensions, urllib3, werkzeug, wtforms, wtforms_json, yaml"
+known_third_party = "alembic, apispec, backoff, celery, click, colorama, cron_descriptor, croniter, cryptography, dateutil, deprecation, flask, flask_appbuilder, flask_babel, flask_caching, flask_compress, flask_jwt_extended, flask_login, flask_migrate, flask_sqlalchemy, flask_talisman, flask_testing, flask_wtf, freezegun, geohash, geopy, holidays, humanize, isodate, jinja2, jwt, markdown, markupsafe, marshmallow, marshmallow-union, msgpack, nh3, numpy, pandas, parameterized, parsedatetime, pgsanity, polyline, rison, progress, pyarrow, sqlalchemy_bigquery, pyhive, pyparsing, pytest, pytest_mock, pytz, redis, requests, selenium, setuptools, shillelagh, simplejson, slack, sqlalchemy, sqlalchemy_utils, syntaqlite, typing_extensions, urllib3, werkzeug, wtforms, wtforms_json, yaml"
 multi_line_output = 3
 order_by_type = false
 

requirements/base.in

@@ -25,6 +25,16 @@ filelock>=3.20.3,<4.0.0
 # Security: decompression bomb fix (required by aiohttp 3.13.3)
 brotli>=1.2.0,<2.0.0
 numexpr>=2.9.0
+# Security: CVE-2026-34073 (MEDIUM) - Improper Certificate Validation
+cryptography>=46.0.7,<47.0.0
+# Security: Snyk - XSS vulnerability in Mako templates
+mako>=1.3.11,<2.0.0
+# Security: CVE-2024-52338 (CRITICAL) - Deserialization of untrusted data in IPC/Parquet readers
+pyarrow>=20.0.0,<21.0.0
+# Security: CVE-2026-27459 - pyopenssl certificate validation
+pyopenssl>=26.0.0,<27.0.0
+# Security: CVE-2026-25645 (MEDIUM) - Insecure Temporary File
+requests>=2.33.0,<3.0.0
 
 # 5.0.0 has a sensitive deprecation used in other libs
 # -> https://github.com/aio-libs/async-timeout/blob/master/CHANGES.rst#500-2024-10-31

requirements/base.txt

@@ -86,8 +86,9 @@ cron-descriptor==1.4.5
     # via apache-superset (pyproject.toml)
 croniter==6.0.0
     # via apache-superset (pyproject.toml)
-cryptography==46.0.6
+cryptography==46.0.7
     # via
+    #   -r requirements/base.in
     #   apache-superset (pyproject.toml)
     #   paramiko
     #   pyopenssl
@@ -205,8 +206,9 @@ kombu==5.5.3
     # via celery
 limits==5.1.0
     # via flask-limiter
-mako==1.3.10
+mako==1.3.11
     # via
+    #   -r requirements/base.in
     #   apache-superset (pyproject.toml)
     #   alembic
 markdown==3.8.1
@@ -247,7 +249,6 @@ numpy==1.26.4
     #   bottleneck
     #   numexpr
     #   pandas
-    #   pyarrow
 odfpy==1.4.1
     # via pandas
 openapi-schema-validator==0.6.3
@@ -279,7 +280,7 @@ parsedatetime==2.6
     # via apache-superset (pyproject.toml)
 pgsanity==0.2.9
     # via apache-superset (pyproject.toml)
-pillow==12.1.1
+pillow==12.2.0
     # via apache-superset (pyproject.toml)
 platformdirs==4.3.8
     # via requests-cache
@@ -291,8 +292,10 @@ prison==0.2.1
     # via flask-appbuilder
 prompt-toolkit==3.0.51
     # via click-repl
-pyarrow==16.1.0
-    # via apache-superset (pyproject.toml)
+pyarrow==20.0.0
+    # via
+    #   -r requirements/base.in
+    #   apache-superset (pyproject.toml)
 pyasn1==0.6.3
     # via
     #   pyasn1-modules
@@ -319,8 +322,10 @@ pyjwt==2.12.0
     #   redis
 pynacl==1.6.2
     # via paramiko
-pyopenssl==25.3.0
-    # via shillelagh
+pyopenssl==26.0.0
+    # via
+    #   -r requirements/base.in
+    #   shillelagh
 pyparsing==3.2.3
     # via apache-superset (pyproject.toml)
 pysocks==1.7.1
@@ -353,8 +358,9 @@ referencing==0.36.2
     # via
     #   jsonschema
     #   jsonschema-specifications
-requests==2.32.4
+requests==2.33.0
     # via
+    #   -r requirements/base.in
     #   requests-cache
     #   shillelagh
 requests-cache==1.2.1
@@ -363,6 +369,8 @@ rfc3339-validator==0.1.4
     # via openapi-schema-validator
 rich==13.9.4
     # via flask-limiter
+rison==2.0.0
+    # via apache-superset (pyproject.toml)
 rpds-py==0.25.0
     # via
     #   jsonschema

requirements/development.txt

@@ -52,7 +52,7 @@ attrs==25.3.0
     #   referencing
     #   requests-cache
     #   trio
-authlib==1.6.7
+authlib==1.6.9
     # via fastmcp
 babel==2.17.0
     # via
@@ -178,7 +178,7 @@ croniter==6.0.0
     # via
     #   -c requirements/base-constraint.txt
     #   apache-superset
-cryptography==46.0.6
+cryptography==46.0.7
     # via
     #   -c requirements/base-constraint.txt
     #   apache-superset
@@ -503,7 +503,7 @@ limits==5.1.0
     # via
     #   -c requirements/base-constraint.txt
     #   flask-limiter
-mako==1.3.10
+mako==1.3.11
     # via
     #   -c requirements/base-constraint.txt
     #   alembic
@@ -580,7 +580,6 @@ numpy==1.26.4
     #   pandas
     #   pandas-gbq
     #   prophet
-    #   pyarrow
 oauthlib==3.2.2
     # via requests-oauthlib
 odfpy==1.4.1
@@ -655,7 +654,7 @@ pgsanity==0.2.9
     # via
     #   -c requirements/base-constraint.txt
     #   apache-superset
-pillow==12.1.1
+pillow==12.2.0
     # via
     #   -c requirements/base-constraint.txt
     #   apache-superset
@@ -710,7 +709,7 @@ psycopg2-binary==2.9.9
     # via apache-superset
 py-key-value-aio==0.4.4
     # via fastmcp
-pyarrow==16.1.0
+pyarrow==20.0.0
     # via
     #   -c requirements/base-constraint.txt
     #   apache-superset
@@ -778,7 +777,7 @@ pynacl==1.6.2
     # via
     #   -c requirements/base-constraint.txt
     #   paramiko
-pyopenssl==25.3.0
+pyopenssl==26.0.0
     # via
     #   -c requirements/base-constraint.txt
     #   shillelagh
@@ -865,7 +864,7 @@ referencing==0.36.2
     #   jsonschema
     #   jsonschema-path
     #   jsonschema-specifications
-requests==2.32.4
+requests==2.33.0
     # via
     #   -c requirements/base-constraint.txt
     #   docker
@@ -897,6 +896,10 @@ rich==13.9.4
     #   rich-rst
 rich-rst==1.3.1
     # via cyclopts
+rison==2.0.0
+    # via
+    #   -c requirements/base-constraint.txt
+    #   apache-superset
 rpds-py==0.25.0
     # via
     #   -c requirements/base-constraint.txt

superset-frontend/cypress-base/cypress/e2e/database/modal.test.ts

@@ -68,21 +68,19 @@ describe('Add database', () => {
     cy.get('input[name="username"]').type('testusername', { force: true });
     cy.get('input[name="database"]').type('testdb', { force: true });
     cy.get('input[name="password"]').type('testpass', { force: true });
-
     cy.get('body').click(0, 0);
 
-    cy.wait('@validateParams', { timeout: 30000 });
-
-    cy.getBySel('btn-submit-connection').should('not.be.disabled');
+    // Wait for all intermediate validation calls to settle, then check the button
+    cy.getBySel('btn-submit-connection').should('not.be.disabled', {
+      timeout: 60000,
+    });
     cy.getBySel('btn-submit-connection').click({ force: true });
 
-    cy.wait('@validateParams', { timeout: 30000 }).then(() => {
-      cy.wait('@createDb', { timeout: 60000 }).then(() => {
-        cy.contains(
-          '.ant-form-item-explain-error',
-          "The hostname provided can't be resolved",
-        ).should('exist');
-      });
+    cy.wait('@createDb', { timeout: 60000 }).then(() => {
+      cy.contains(
+        '.ant-form-item-explain-error',
+        "The hostname provided can't be resolved",
+      ).should('exist');
     });
   });
 
@@ -90,29 +88,22 @@ describe('Add database', () => {
     cy.get('.preferred > :nth-child(1)').click();
 
     cy.get('input[name="host"]').type('localhost', { force: true });
-    cy.get('body').click(0, 0);
-    cy.wait('@validateParams', { timeout: 30000 });
-
     cy.get('input[name="port"]').type('5430', { force: true });
     cy.get('input[name="database"]').type('testdb', { force: true });
     cy.get('input[name="username"]').type('testusername', { force: true });
-
-    cy.wait('@validateParams', { timeout: 30000 });
-
     cy.get('input[name="password"]').type('testpass', { force: true });
-    cy.wait('@validateParams');
+    cy.get('body').click(0, 0);
 
-    cy.getBySel('btn-submit-connection').should('not.be.disabled');
+    // Wait for all intermediate validation calls to settle, then check the button
+    cy.getBySel('btn-submit-connection').should('not.be.disabled', {
+      timeout: 60000,
+    });
     cy.getBySel('btn-submit-connection').click({ force: true });
-    cy.wait('@validateParams', { timeout: 30000 }).then(() => {
-      cy.get('body').click(0, 0);
-      cy.getBySel('btn-submit-connection').click({ force: true });
-      cy.wait('@createDb', { timeout: 60000 }).then(() => {
-        cy.contains(
-          '.ant-form-item-explain-error',
-          'The port is closed',
-        ).should('exist');
-      });
+
+    cy.wait('@createDb', { timeout: 60000 }).then(() => {
+      cy.contains('.ant-form-item-explain-error', 'The port is closed').should(
+        'exist',
+      );
     });
   });
 });

superset-frontend/oxlint.json

@@ -33,6 +33,33 @@
     // - No FontAwesome icons (use Icons component)
     // - No template variables in i18n (use parameterized messages)
 
+    // === Rules carried over from ESLint that oxlint does NOT implement ===
+    // oxlint 1.58+ errors on unknown builtin rules, so these can no longer
+    // be listed in this config. They were silently dropped in earlier
+    // oxlint versions (not actually enforced). Documented here for future
+    // maintainers — if/when oxlint adds them, re-enable in the relevant
+    // plugin section above.
+    //   import: newline-after-import, no-extraneous-dependencies,
+    //           no-import-module-exports, no-relative-packages,
+    //           no-unresolved, no-useless-path-segments
+    //   react:  default-props-match-prop-types, destructuring-assignment,
+    //           forbid-component-props, forbid-foreign-prop-types,
+    //           forbid-prop-types, function-component-definition,
+    //           jsx-no-bind, jsx-uses-vars, no-access-state-in-setstate,
+    //           no-deprecated, no-did-update-set-state, no-typos,
+    //           no-unstable-nested-components,
+    //           no-unused-class-component-methods, no-unused-prop-types,
+    //           no-unused-state, prefer-stateless-function, prop-types,
+    //           require-default-props, sort-comp, static-property-placement
+    //           (prefer-stateless-function / function-component-definition
+    //            are represented by react/prefer-function-component below)
+    //   jsx-a11y: interactive-supports-focus,
+    //             no-interactive-element-to-noninteractive-role,
+    //             no-noninteractive-element-interactions,
+    //             no-noninteractive-element-to-interactive-role
+    //   typescript: naming-convention
+    //   unicorn: prevent-abbreviations
+
     // === Core ESLint rules ===
     // Error prevention
     "no-console": "warn",
@@ -89,7 +116,6 @@
     "no-object-constructor": "error",
 
     // === Import plugin rules ===
-    "import/no-unresolved": "error",
     // TODO: Fix incorrect named imports in Storybook and other files
     "import/named": "warn",
     // TODO: Fix duplicate exports in shared-controls and other modules
@@ -105,56 +131,24 @@
     "import/first": "error",
     // TODO: Consolidate duplicate imports in DatasetList and other files
     "import/no-duplicates": "warn",
-    "import/newline-after-import": "error",
     "import/no-absolute-path": "error",
     "import/no-dynamic-require": "error",
     "import/no-webpack-loader-syntax": "error",
     "import/no-self-import": "error",
     "import/no-cycle": "off",
-    "import/no-useless-path-segments": ["error", { "commonjs": true }],
     "import/prefer-default-export": "off",
-    "import/no-relative-packages": "off",
-    "import/no-import-module-exports": "off",
-    "import/no-extraneous-dependencies": [
-      "error",
-      {
-        "devDependencies": [
-          "test/**",
-          "tests/**",
-          "spec/**",
-          "**/__tests__/**",
-          "**/__mocks__/**",
-          "*.test.{js,jsx,ts,tsx}",
-          "*.spec.{js,jsx,ts,tsx}",
-          "**/*.test.{js,jsx,ts,tsx}",
-          "**/*.spec.{js,jsx,ts,tsx}",
-          "**/jest.config.js",
-          "**/jest.setup.js",
-          "**/webpack.config.js",
-          "**/webpack.config.*.js",
-          "**/.eslintrc.js"
-        ],
-        "optionalDependencies": false
-      }
-    ],
 
     // === React plugin rules ===
-    "react/prop-types": "off",
-    "react/require-default-props": "off",
-    "react/forbid-prop-types": "off",
-    "react/forbid-component-props": "warn",
     "react/jsx-filename-extension": [
       "warn",
       { "extensions": [".jsx", ".tsx"] }
     ],
     "react/jsx-fragments": "error",
-    "react/jsx-no-bind": "off",
     "react/jsx-props-no-spreading": "off",
     "react/jsx-boolean-value": ["error", "never", { "always": [] }],
     "react/jsx-no-duplicate-props": "error",
     "react/jsx-no-undef": "error",
     "react/jsx-pascal-case": ["error", { "allowAllCaps": true, "ignore": [] }],
-    "react/jsx-uses-vars": "error",
     "react/jsx-no-target-blank": ["error", { "enforceDynamicLinks": "always" }],
     "react/jsx-no-comment-textnodes": "error",
     "react/jsx-no-useless-fragment": "off",
@@ -165,40 +159,27 @@
     "react/no-array-index-key": "off",
     "react/no-children-prop": "error",
     "react/no-danger": "error",
-    "react/forbid-foreign-prop-types": "error",
     "react/no-danger-with-children": "error",
-    "react/no-deprecated": "error",
-    "react/no-did-update-set-state": "error",
     "react/no-find-dom-node": "error",
     "react/no-is-mounted": "error",
     "react/no-render-return-value": "error",
     "react/no-string-refs": "off",
     "react/no-unescaped-entities": "off",
     "react/no-unknown-property": "off",
-    "react/no-unused-prop-types": "off",
-    "react/no-unused-state": "error",
     "react/no-will-update-set-state": "error",
     "react/prefer-es6-class": ["error", "always"],
-    "react/prefer-stateless-function": [
-      "error",
-      { "ignorePureComponents": true }
-    ],
     "react/require-render-return": "error",
     "react/self-closing-comp": "error",
     "react/void-dom-elements-no-children": "error",
-    "react/no-access-state-in-setstate": "error",
     "react/no-redundant-should-component-update": "error",
     "react/no-this-in-sfc": "error",
-    "react/no-typos": "error",
-    "react/no-unstable-nested-components": "off",
-    "react/no-unused-class-component-methods": "off",
-    "react/destructuring-assignment": "off",
-    "react/sort-comp": "off",
     "react/state-in-constructor": "off",
-    "react/static-property-placement": "off",
     "react/react-in-jsx-scope": "off",
-    "react/function-component-definition": "off",
-    "react/default-props-match-prop-types": "off",
+    // Successor to the ESLint-era `react/prefer-stateless-function` and
+    // `react/function-component-definition` rules. Disabled because the
+    // codebase still contains legacy class components; flip to "error"
+    // once the class-to-function migration completes.
+    "react/prefer-function-component": "off",
     "react/button-has-type": [
       "error",
       { "button": true, "submit": true, "reset": false }
@@ -223,7 +204,6 @@
     "jsx-a11y/html-has-lang": "error",
     "jsx-a11y/iframe-has-title": "error",
     "jsx-a11y/img-redundant-alt": "error",
-    "jsx-a11y/interactive-supports-focus": "error",
     "jsx-a11y/label-has-associated-control": "error",
     "jsx-a11y/lang": "error",
     "jsx-a11y/media-has-caption": "error",
@@ -231,9 +211,6 @@
     "jsx-a11y/no-access-key": "error",
     "jsx-a11y/no-autofocus": ["error", { "ignoreNonDOM": true }],
     "jsx-a11y/no-distracting-elements": "error",
-    "jsx-a11y/no-interactive-element-to-noninteractive-role": "error",
-    "jsx-a11y/no-noninteractive-element-interactions": "error",
-    "jsx-a11y/no-noninteractive-element-to-interactive-role": "error",
     "jsx-a11y/no-noninteractive-tabindex": "error",
     "jsx-a11y/no-redundant-roles": "error",
     "jsx-a11y/no-static-element-interactions": "off",
@@ -253,17 +230,6 @@
     "@typescript-eslint/explicit-module-boundary-types": "off",
     "@typescript-eslint/no-unused-vars": "warn",
     "@typescript-eslint/prefer-optional-chain": "error",
-    "@typescript-eslint/naming-convention": [
-      "error",
-      {
-        "selector": "enum",
-        "format": ["PascalCase"]
-      },
-      {
-        "selector": "enumMember",
-        "format": ["PascalCase"]
-      }
-    ],
 
     // === Unicorn rules (bonus coverage) ===
     "unicorn/no-new-array": "error",
@@ -279,7 +245,6 @@
     "unicorn/prefer-negative-index": "error",
     "unicorn/prefer-math-trunc": "error",
     "unicorn/filename-case": "off",
-    "unicorn/prevent-abbreviations": "off",
     "unicorn/no-null": "off",
     "unicorn/no-array-reduce": "off",
     "unicorn/no-array-for-each": "off",

superset-frontend/package.json

@@ -154,12 +154,12 @@
     "@visx/scale": "^3.5.0",
     "@visx/tooltip": "^3.0.0",
     "@visx/xychart": "^3.5.1",
-    "ag-grid-community": "35.0.1",
-    "ag-grid-react": "35.0.1",
+    "ag-grid-community": "35.2.1",
+    "ag-grid-react": "35.2.1",
     "antd": "^5.26.0",
     "chrono-node": "^2.9.0",
     "classnames": "^2.2.5",
-    "content-disposition": "^1.0.1",
+    "content-disposition": "^1.1.0",
     "d3-color": "^3.1.0",
     "d3-scale": "^4.0.2",
     "dayjs": "^1.11.20",
@@ -170,9 +170,9 @@
     "fs-extra": "^11.3.4",
     "fuse.js": "^7.3.0",
     "geolib": "^3.3.14",
-    "geostyler": "^18.3.1",
+    "geostyler": "^18.5.0",
     "geostyler-data": "^1.1.0",
-    "geostyler-openlayers-parser": "^5.4.1",
+    "geostyler-openlayers-parser": "^5.7.0",
     "geostyler-style": "11.0.2",
     "geostyler-wfs-parser": "^3.0.1",
     "google-auth-library": "^10.6.2",
@@ -183,21 +183,21 @@
     "json-bigint": "^1.0.0",
     "json-stringify-pretty-compact": "^2.0.0",
     "lodash": "^4.18.1",
-    "mapbox-gl": "^3.20.0",
-    "markdown-to-jsx": "^9.7.15",
-    "match-sorter": "^8.2.0",
+    "mapbox-gl": "^3.22.0",
+    "markdown-to-jsx": "^9.7.16",
+    "match-sorter": "^8.3.0",
     "memoize-one": "^5.2.1",
     "mousetrap": "^1.6.5",
     "mustache": "^4.2.0",
-    "nanoid": "^5.1.7",
-    "ol": "^10.8.0",
+    "nanoid": "^5.1.9",
+    "ol": "^10.9.0",
     "pretty-ms": "^9.3.0",
     "query-string": "9.3.1",
     "re-resizable": "^6.11.2",
     "react": "^17.0.2",
-    "react-arborist": "^3.4.3",
-    "react-checkbox-tree": "^1.8.0",
-    "react-diff-viewer-continued": "^4.2.0",
+    "react-arborist": "^3.5.0",
+    "react-checkbox-tree": "^2.0.1",
+    "react-diff-viewer-continued": "^4.2.2",
     "react-dnd": "^11.1.3",
     "react-dnd-html5-backend": "^11.1.3",
     "react-dom": "^17.0.2",
@@ -230,9 +230,9 @@
     "use-event-callback": "^0.1.0",
     "use-immer": "^0.11.0",
     "use-query-params": "^2.2.2",
-    "uuid": "^13.0.0",
+    "uuid": "^14.0.0",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
-    "yargs": "^17.7.2"
+    "yargs": "^18.0.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.28.6",
@@ -258,19 +258,19 @@
     "@mihkeleidast/storybook-addon-source": "^1.0.1",
     "@playwright/test": "^1.59.1",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.6.2",
-    "@storybook/addon-actions": "^8.6.17",
-    "@storybook/addon-controls": "^8.6.17",
-    "@storybook/addon-essentials": "^8.6.17",
-    "@storybook/addon-links": "^8.6.17",
-    "@storybook/addon-mdx-gfm": "^8.6.17",
-    "@storybook/components": "^8.6.17",
-    "@storybook/preview-api": "^8.6.17",
-    "@storybook/react": "^8.6.17",
-    "@storybook/react-webpack5": "^8.6.17",
-    "@storybook/test": "^8.6.15",
+    "@storybook/addon-actions": "^8.6.18",
+    "@storybook/addon-controls": "^8.6.18",
+    "@storybook/addon-essentials": "^8.6.18",
+    "@storybook/addon-links": "^8.6.18",
+    "@storybook/addon-mdx-gfm": "^8.6.18",
+    "@storybook/components": "^8.6.18",
+    "@storybook/preview-api": "^8.6.18",
+    "@storybook/react": "^8.6.18",
+    "@storybook/react-webpack5": "^8.6.18",
+    "@storybook/test": "^8.6.18",
     "@storybook/test-runner": "^0.17.0",
     "@svgr/webpack": "^8.1.0",
-    "@swc/core": "^1.15.24",
+    "@swc/core": "^1.15.30",
     "@swc/plugin-emotion": "^14.8.0",
     "@swc/plugin-transform-imports": "^12.5.0",
     "@testing-library/dom": "^8.20.1",
@@ -281,6 +281,7 @@
     "@types/content-disposition": "^0.5.9",
     "@types/dom-to-image": "^2.6.7",
     "@types/jest": "^30.0.0",
+    "@types/jquery": "^4.0.0",
     "@types/js-levenshtein": "^1.1.3",
     "@types/json-bigint": "^1.0.4",
     "@types/mousetrap": "^1.6.15",
@@ -298,14 +299,14 @@
     "@types/rison": "0.1.0",
     "@types/tinycolor2": "^1.4.3",
     "@types/unzipper": "^0.10.11",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/parser": "^7.18.0",
+    "@typescript-eslint/eslint-plugin": "^8.59.0",
+    "@typescript-eslint/parser": "^8.58.2",
     "babel-jest": "^30.0.2",
     "babel-loader": "^10.1.1",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-jsx-remove-data-test-id": "^3.0.0",
     "babel-plugin-lodash": "^3.3.4",
-    "baseline-browser-mapping": "^2.10.16",
+    "baseline-browser-mapping": "^2.10.21",
     "cheerio": "1.2.0",
     "concurrently": "^9.2.1",
     "copy-webpack-plugin": "^14.0.0",
@@ -325,14 +326,14 @@
     "eslint-plugin-no-only-tests": "^3.3.0",
     "eslint-plugin-prettier": "^5.5.5",
     "eslint-plugin-react-prefer-function-component": "^5.0.0",
-    "eslint-plugin-react-you-might-not-need-an-effect": "^0.9.2",
+    "eslint-plugin-react-you-might-not-need-an-effect": "^0.9.3",
     "eslint-plugin-storybook": "^0.8.0",
     "eslint-plugin-testing-library": "^7.16.2",
     "eslint-plugin-theme-colors": "file:eslint-rules/eslint-plugin-theme-colors",
     "fetch-mock": "^12.6.0",
     "fork-ts-checker-webpack-plugin": "^9.1.0",
     "history": "^5.3.0",
-    "html-webpack-plugin": "^5.6.6",
+    "html-webpack-plugin": "^5.6.7",
     "http-server": "^14.1.1",
     "imports-loader": "^5.0.0",
     "jest": "^30.3.0",
@@ -345,7 +346,7 @@
     "lightningcss": "^1.32.0",
     "mini-css-extract-plugin": "^2.10.2",
     "open-cli": "^9.0.0",
-    "oxlint": "^1.56.0",
+    "oxlint": "^1.61.0",
     "po2json": "^0.4.5",
     "prettier": "3.8.3",
     "prettier-plugin-packagejson": "^3.0.2",
@@ -356,10 +357,10 @@
     "source-map": "^0.7.6",
     "source-map-support": "^0.5.21",
     "speed-measure-webpack-plugin": "^1.6.0",
-    "storybook": "8.6.17",
+    "storybook": "8.6.18",
     "style-loader": "^4.0.0",
     "swc-loader": "^0.2.7",
-    "terser-webpack-plugin": "^5.4.0",
+    "terser-webpack-plugin": "^5.5.0",
     "thread-loader": "^4.0.4",
     "ts-jest": "^29.4.9",
     "tscw-config": "^1.1.2",
@@ -368,12 +369,12 @@
     "unzipper": "^0.12.3",
     "vm-browserify": "^1.1.2",
     "wait-on": "^9.0.5",
-    "webpack": "^5.106.0",
+    "webpack": "^5.106.2",
     "webpack-bundle-analyzer": "^5.3.0",
     "webpack-cli": "^6.0.1",
     "webpack-dev-server": "^5.2.3",
     "webpack-manifest-plugin": "^5.0.1",
-    "webpack-sources": "^3.3.4",
+    "webpack-sources": "^3.4.0",
     "webpack-visualizer-plugin2": "^2.0.0"
   },
   "peerDependencies": {

superset-frontend/packages/superset-ui-chart-controls/src/sections/chartTitle.tsx

@@ -23,7 +23,7 @@ import { ControlPanelSectionConfig } from '../types';
 import { formatSelectOptions } from '../utils';
 
 export const TITLE_MARGIN_OPTIONS: number[] = [
-  0, 15, 30, 50, 75, 100, 125, 150, 200,
+  0, 15, 30, 40, 50, 75, 100, 125, 150, 200,
 ];
 export const TITLE_POSITION_OPTIONS: [string, string][] = [
   ['Left', t('Left')],
@@ -56,7 +56,7 @@ export const titleControls: ControlPanelSectionConfig = {
           clearable: true,
           label: t('X Axis Title Margin'),
           renderTrigger: true,
-          default: TITLE_MARGIN_OPTIONS[0],
+          default: TITLE_MARGIN_OPTIONS[3],
           choices: formatSelectOptions(TITLE_MARGIN_OPTIONS),
         },
       },
@@ -82,7 +82,7 @@ export const titleControls: ControlPanelSectionConfig = {
           clearable: true,
           label: t('Y Axis Title Margin'),
           renderTrigger: true,
-          default: TITLE_MARGIN_OPTIONS[0],
+          default: TITLE_MARGIN_OPTIONS[4],
           choices: formatSelectOptions(TITLE_MARGIN_OPTIONS),
         },
       },

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

@@ -30,8 +30,8 @@
     "@types/json-bigint": "^1.0.4",
     "@visx/responsive": "^3.12.0",
     "ace-builds": "^1.43.6",
-    "ag-grid-community": "35.0.1",
-    "ag-grid-react": "35.0.1",
+    "ag-grid-community": "35.2.1",
+    "ag-grid-react": "35.2.1",
     "brace": "^0.11.1",
     "classnames": "^2.5.1",
     "core-js": "^3.49.0",
@@ -42,7 +42,7 @@
     "d3-time": "^3.1.0",
     "d3-time-format": "^4.1.0",
     "dayjs": "^1.11.20",
-    "dompurify": "^3.4.0",
+    "dompurify": "^3.4.1",
     "fetch-retry": "^6.0.0",
     "handlebars": "^4.7.9",
     "jed": "^1.1.1",
@@ -56,7 +56,7 @@
     "react-js-cron": "^5.2.0",
     "react-markdown": "^8.0.7",
     "react-resize-detector": "^7.1.2",
-    "react-syntax-highlighter": "^16.1.0",
+    "react-syntax-highlighter": "^16.1.1",
     "react-ultimate-pagination": "^1.3.2",
     "regenerator-runtime": "^0.14.1",
     "rehype-raw": "^7.0.0",
@@ -74,7 +74,7 @@
     "@types/d3-scale": "^2.1.1",
     "@types/d3-time": "^3.0.4",
     "@types/d3-time-format": "^4.0.3",
-    "@types/jquery": "^3.5.33",
+    "@types/jquery": "^4.0.0",
     "@types/lodash": "^4.17.24",
     "@types/node": "^25.6.0",
     "@types/prop-types": "^15.7.15",

superset-frontend/packages/superset-ui-core/src/components/Form/LabeledErrorBoundInput.tsx

@@ -79,7 +79,7 @@ export const LabeledErrorBoundInput = ({
           isValidating ? 'validating' : hasError ? 'error' : 'success'
         }
         help={errorMessage || helpText}
-        hasFeedback={!!hasError}
+        hasFeedback={isValidating || !!hasError}
       >
         {visibilityToggle || props.name === 'password' ? (
           <StyledInputPassword

superset-frontend/packages/superset-ui-core/src/components/Icons/AntdEnhanced.tsx

@@ -90,6 +90,7 @@ import {
   InfoCircleFilled,
   InsertRowAboveOutlined,
   InsertRowBelowOutlined,
+  LeftOutlined,
   LineChartOutlined,
   LineOutlined,
   LinkOutlined,
@@ -246,6 +247,7 @@ const AntdIcons = {
   InfoCircleFilled,
   InsertRowAboveOutlined,
   InsertRowBelowOutlined,
+  LeftOutlined,
   LineChartOutlined,
   LineOutlined,
   LinkOutlined,

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

@@ -95,10 +95,13 @@ const TitleLink = styled.span`
 const TitleRight = styled.span`
   ${({ theme }) => css`
     position: absolute;
-    right: -1px;
     font-weight: 400;
     bottom: ${theme.sizeUnit * 3}px;
     right: ${theme.sizeUnit * 2}px;
+    max-width: 120px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
   `}
 `;
 const CoverFooter = styled.div`
@@ -244,7 +247,11 @@ function ListViewCard({
                     {title}
                   </TitleLink>
                 </Tooltip>
-                {titleRight && <TitleRight>{titleRight}</TitleRight>}
+                {titleRight && (
+                  <Tooltip title={titleRight}>
+                    <TitleRight>{titleRight}</TitleRight>
+                  </Tooltip>
+                )}
                 <div className="card-actions" data-test="card-actions">
                   {actions}
                 </div>

superset-frontend/packages/superset-ui-core/src/components/Modal/Modal.tsx

@@ -227,8 +227,15 @@ const CustomModal = ({
   draggableConfig,
   destroyOnHidden,
   openerRef,
+  bodyStyle,
+  styles: stylesProp,
   ...rest
 }: ModalProps) => {
+  // Convert deprecated bodyStyle to styles.body
+  const styles = useMemo(
+    () => (bodyStyle ? { ...stylesProp, body: bodyStyle } : stylesProp),
+    [bodyStyle, stylesProp],
+  );
   const draggableRef = useRef<HTMLDivElement>(null);
   const [bounds, setBounds] = useState<DraggableBounds>();
   const [dragDisabled, setDragDisabled] = useState<boolean>(true);
@@ -361,6 +368,7 @@ const CustomModal = ({
       draggable={draggable}
       resizable={resizable}
       destroyOnHidden={destroyOnHidden}
+      styles={styles}
       {...rest}
     >
       {children}

superset-frontend/packages/superset-ui-core/src/components/Modal/types.ts

@@ -51,7 +51,9 @@ export interface ModalProps {
   destroyOnHidden?: boolean;
   maskClosable?: boolean;
   zIndex?: number;
+  /** @deprecated Use styles.body instead */
   bodyStyle?: CSSProperties;
+  styles?: { body?: CSSProperties; [key: string]: CSSProperties | undefined };
   openerRef?: React.RefObject<HTMLElement>;
 }
 

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

@@ -155,19 +155,21 @@ export const PageHeaderWithActions = ({
               popupRender={() => additionalActionsMenu}
               {...menuDropdownProps}
             >
-              <Button
-                css={menuTriggerStyles}
-                buttonStyle="tertiary"
-                aria-label={t('Menu actions trigger')}
-                tooltip={tooltipProps?.text}
-                placement={tooltipProps?.placement}
-                data-test="actions-trigger"
-              >
-                <Icons.EllipsisOutlined
-                  iconColor={theme.colorPrimary}
-                  iconSize="l"
-                />
-              </Button>
+              <span>
+                <Button
+                  css={menuTriggerStyles}
+                  buttonStyle="tertiary"
+                  aria-label={t('Menu actions trigger')}
+                  tooltip={tooltipProps?.text}
+                  placement={tooltipProps?.placement}
+                  data-test="actions-trigger"
+                >
+                  <Icons.EllipsisOutlined
+                    iconColor={theme.colorPrimary}
+                    iconSize="l"
+                  />
+                </Button>
+              </span>
             </Dropdown>
           )}
         </div>

superset-frontend/packages/superset-ui-core/src/query/types/Dashboard.ts

@@ -81,6 +81,7 @@ export type Filter = {
   granularity?: string;
   time_grain_sqla?: string;
   time_range?: string;
+  time_grains?: string[];
   requiredFirst?: boolean;
   tabsInScope?: string[];
   chartsInScope?: number[];

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

@@ -31,7 +31,7 @@
   "dependencies": {
     "d3": "^3.5.17",
     "prop-types": "^15.8.1",
-    "react": "^19.2.1"
+    "react": "^19.2.5"
   },
   "peerDependencies": {
     "@superset-ui/chart-controls": "*",

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

@@ -34,7 +34,7 @@
     "fast-safe-stringify": "^2.1.1",
     "lodash": "^4.18.1",
     "nvd3-fork": "^2.0.5",
-    "dompurify": "^3.4.0",
+    "dompurify": "^3.4.1",
     "prop-types": "^15.8.1",
     "urijs": "^1.19.11"
   },

superset-frontend/plugins/plugin-chart-echarts/src/Bubble/constants.ts

@@ -25,8 +25,8 @@ export const DEFAULT_FORM_DATA: Partial<EchartsBubbleFormData> = {
   emitFilter: false,
   logXAis: false,
   logYAxis: false,
-  xAxisTitleMargin: 30,
-  yAxisTitleMargin: 30,
+  xAxisTitleMargin: 40,
+  yAxisTitleMargin: 50,
   truncateXAxis: false,
   truncateYAxis: false,
   xAxisBounds: [null, null],

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

@@ -144,7 +144,7 @@ const config: ControlPanelConfig = {
               clearable: true,
               label: t('X axis title margin'),
               renderTrigger: true,
-              default: sections.TITLE_MARGIN_OPTIONS[1],
+              default: sections.TITLE_MARGIN_OPTIONS[3],
               choices: formatSelectOptions(sections.TITLE_MARGIN_OPTIONS),
             },
           },
@@ -216,7 +216,7 @@ const config: ControlPanelConfig = {
               clearable: true,
               label: t('Y axis title margin'),
               renderTrigger: true,
-              default: sections.TITLE_MARGIN_OPTIONS[1],
+              default: sections.TITLE_MARGIN_OPTIONS[4],
               choices: formatSelectOptions(sections.TITLE_MARGIN_OPTIONS),
             },
           },

superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/EchartsTimeseries.test.tsx

@@ -156,9 +156,9 @@ const defaultFormData: EchartsTimeseriesFormData & {
   showLegend: false,
   legendSort: null,
   xAxisTitle: '',
-  xAxisTitleMargin: 0,
+  xAxisTitleMargin: 40,
   yAxisTitle: '',
-  yAxisTitleMargin: 15,
+  yAxisTitleMargin: 50,
   yAxisTitlePosition: '',
   time_range: 'No filter',
   granularity: undefined,

superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/controlPanel.tsx

@@ -92,7 +92,7 @@ function createAxisTitleControl(axis: 'x' | 'y'): ControlSetRow[] {
           clearable: true,
           label: t('Axis title margin'),
           renderTrigger: true,
-          default: sections.TITLE_MARGIN_OPTIONS[0],
+          default: sections.TITLE_MARGIN_OPTIONS[3],
           choices: formatSelectOptions(sections.TITLE_MARGIN_OPTIONS),
           visibility: ({ controls }: ControlPanelsContainerProps) =>
             isXAxis ? isVertical(controls) : isHorizontal(controls),
@@ -125,7 +125,7 @@ function createAxisTitleControl(axis: 'x' | 'y'): ControlSetRow[] {
           clearable: true,
           label: t('Axis title margin'),
           renderTrigger: true,
-          default: sections.TITLE_MARGIN_OPTIONS[1],
+          default: sections.TITLE_MARGIN_OPTIONS[4],
           choices: formatSelectOptions(sections.TITLE_MARGIN_OPTIONS),
           visibility: ({ controls }: ControlPanelsContainerProps) =>
             isXAxis ? isHorizontal(controls) : isVertical(controls),

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

@@ -44,9 +44,9 @@ export const DEFAULT_FORM_DATA: EchartsTimeseriesFormData = {
   // ...DEFAULT_TITLE_FORM_DATA, // TODO: figure out why these break things for stories (e.g. Bubble Chart)
   // here are the contents of DEFAULT_TITLE_FORM_DATA:
   xAxisTitle: '',
-  xAxisTitleMargin: 0,
+  xAxisTitleMargin: 40,
   yAxisTitle: '',
-  yAxisTitleMargin: 15,
+  yAxisTitleMargin: 50,
   yAxisTitlePosition: 'Top',
   // Now that the weird bug workaround is over, here's the rest...
   ...DEFAULT_SORT_SERIES_DATA,

superset-frontend/plugins/plugin-chart-echarts/src/components/Echart.tsx

@@ -179,7 +179,13 @@ function Echart(
       }
       if (!divRef.current) return;
       if (!chartRef.current) {
-        chartRef.current = init(divRef.current, null, { locale });
+        // Pass width and height to init to avoid "Can't get DOM width or height" warning
+        // since the DOM element may not have its dimensions yet when init is called
+        chartRef.current = init(divRef.current, null, {
+          locale,
+          width,
+          height,
+        });
       }
       // did mount
       handleSizeChange({ width, height });

superset-frontend/plugins/plugin-chart-echarts/src/constants.ts

@@ -107,9 +107,9 @@ export const DEFAULT_LEGEND_FORM_DATA: LegendFormData = {
 
 export const DEFAULT_TITLE_FORM_DATA: TitleFormData = {
   xAxisTitle: '',
-  xAxisTitleMargin: 0,
+  xAxisTitleMargin: 40,
   yAxisTitle: '',
-  yAxisTitleMargin: 15,
+  yAxisTitleMargin: 50,
   yAxisTitlePosition: 'Top',
 };
 

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

@@ -110,11 +110,11 @@ const formData: EchartsMixedTimeseriesFormData = {
   truncateYAxisSecondary: false,
   xAxisLabelRotation: 0,
   xAxisTitle: '',
-  xAxisTitleMargin: 0,
+  xAxisTitleMargin: 40,
   yAxisBounds: [undefined, undefined],
   yAxisBoundsSecondary: [undefined, undefined],
   yAxisTitle: '',
-  yAxisTitleMargin: 15,
+  yAxisTitleMargin: 50,
   yAxisTitlePosition: '',
   yAxisTitleSecondary: '',
   zoomable: false,

superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.tsx

@@ -917,7 +917,7 @@ export class TableRenderer extends Component<
               allowRenderHtml,
             )}
             <span
-              role="columnheader"
+              role="button"
               tabIndex={0}
               // Prevents event bubbling to avoid conflict with column header click handlers
               // Ensures sort operation executes without triggering cross-filtration

superset-frontend/plugins/plugin-chart-point-cluster-map/package.json

@@ -27,9 +27,9 @@
   ],
   "dependencies": {
     "@math.gl/web-mercator": "^4.1.0",
-    "mapbox-gl": "^3.0.0",
-    "maplibre-gl": "^5.23.0",
-    "react-map-gl": "^8.0.0",
+    "mapbox-gl": "^3.22.0",
+    "maplibre-gl": "^5.24.0",
+    "react-map-gl": "^8.1.1",
     "supercluster": "^8.0.1"
   },
   "peerDependencies": {

superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx

@@ -829,7 +829,7 @@ export default function TableChart<D extends DataRecord = DataRecord>(
           th {
             border-right: 1px solid ${theme.colorSplit};
           }
-          th:first-child {
+          th:first-of-type {
             border-left: none;
           }
           th:last-child {

superset-frontend/plugins/plugin-chart-word-cloud/src/plugin/buildQuery.ts

@@ -30,7 +30,7 @@ export default function buildQuery(formData: WordCloudFormData) {
   if (sort_by_metric && metric) {
     orderby.push([metric, false]);
   }
-  if (sort_by_series && series) {
+  if (sort_by_series !== false && series) {
     orderby.push([series, true]);
   }
 

superset-frontend/plugins/plugin-chart-word-cloud/src/plugin/controlPanel.tsx

@@ -41,7 +41,7 @@ const config: ControlPanelConfig = {
             config: {
               type: 'CheckboxControl',
               label: t('Sort by series'),
-              default: false,
+              default: true,
               description: t(
                 'Sort results by series name in ascending order. ' +
                   'When combined with "Sort by metric", this acts as a tiebreaker ' +

superset-frontend/plugins/plugin-chart-word-cloud/test/buildQuery.test.ts

@@ -86,5 +86,16 @@ describe('plugin-chart-word-cloud', () => {
         ['foo', true],
       ]);
     });
+
+    test('should order by series ASC when sort_by_series is undefined (legacy chart)', () => {
+      const queryContext = buildQuery({
+        ...basicFormData,
+        metric: 'count',
+        sort_by_metric: false,
+        row_limit: 100,
+      });
+      const [query] = queryContext.queries;
+      expect(query.orderby).toEqual([['foo', true]]);
+    });
   });
 });

superset-frontend/plugins/plugin-chart-word-cloud/test/controlPanel.test.ts

@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { isCustomControlItem } from '@superset-ui/chart-controls';
 import controlPanel from '../src/plugin/controlPanel';
 import React, { ReactElement } from 'react';
 
@@ -45,3 +46,24 @@ test('control panel has rotation and color_scheme controls', () => {
   );
   expect(colorSchemeRow).toBeDefined();
 });
+
+test('sort_by_series defaults to true to preserve legacy ordering', () => {
+  const querySection = controlPanel.controlPanelSections.find(
+    (section): section is NonNullable<typeof section> =>
+      Boolean(section && section.label === 'Query'),
+  );
+  expect(querySection).toBeDefined();
+  if (!querySection) {
+    throw new Error('Query section missing');
+  }
+
+  const sortBySeriesEntry = querySection.controlSetRows
+    .flat()
+    .find(item => isCustomControlItem(item) && item.name === 'sort_by_series');
+
+  expect(isCustomControlItem(sortBySeriesEntry)).toBe(true);
+  if (!isCustomControlItem(sortBySeriesEntry)) {
+    throw new Error('sort_by_series control missing');
+  }
+  expect(sortBySeriesEntry.config.default).toBe(true);
+});

superset-frontend/plugins/preset-chart-deckgl/package.json

@@ -29,7 +29,7 @@
     "@deck.gl/extensions": "~9.2.9",
     "@deck.gl/geo-layers": "~9.2.5",
     "@deck.gl/layers": "~9.2.5",
-    "@deck.gl/mapbox": "~9.2.5",
+    "@deck.gl/mapbox": "~9.3.1",
     "@deck.gl/mesh-layers": "~9.2.5",
     "@luma.gl/constants": "~9.2.5",
     "@luma.gl/core": "~9.2.5",
@@ -46,11 +46,11 @@
     "d3-scale": "^4.0.2",
     "handlebars": "^4.7.9",
     "lodash": "^4.18.1",
-    "maplibre-gl": "^5.23.0",
+    "maplibre-gl": "^5.24.0",
     "mousetrap": "^1.6.5",
     "ngeohash": "^0.6.3",
     "prop-types": "^15.8.1",
-    "react-map-gl": "^8.0.0",
+    "react-map-gl": "^8.1.1",
     "underscore": "^1.13.7",
     "urijs": "^1.19.11",
     "xss": "^1.0.15"

superset-frontend/scripts/build.js

@@ -27,10 +27,11 @@ process.env.PATH = `./node_modules/.bin:${process.env.PATH}`;
 
 const { spawnSync } = require('child_process');
 const fastGlob = require('fast-glob');
-const { argv } = require('yargs');
+const yargs = require('yargs');
+const { hideBin } = require('yargs/helpers');
 
-const { _: globs } = argv;
-const glob = globs.length > 1 ? `{${globs.join(',')}}` : globs[0] || '*';
+const { globs } = yargs(hideBin(process.argv)).parse();
+const glob = globs?.length > 1 ? `{${globs.join(',')}}` : globs?.[0] || '*';
 
 const BABEL_CONFIG = '--config-file=../../babel.config.js';
 

superset-frontend/src/SqlLab/components/ShareSqlLabQuery/ShareSqlLabQuery.test.tsx

@@ -134,8 +134,8 @@ describe('ShareSqlLabQuery', () => {
       const button = screen.getByRole('button');
       userEvent.hover(button);
       expect(
-         await screen.findByText('Copy query link to your clipboard'),
-       ).toBeInTheDocument();
+        await screen.findByText('Copy query link to your clipboard'),
+      ).toBeInTheDocument();
       await waitFor(() => {
         // CopyToClipboard default tooltip must NOT appear —
         // only the Button-level "Copy query link to your clipboard" should show.

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

@@ -22,7 +22,7 @@ import { connect } from 'react-redux';
 import type { QueryEditor, SqlLabRootState } from 'src/SqlLab/types';
 import { t } from '@apache-superset/core/translation';
 import { FeatureFlag, isFeatureEnabled } from '@superset-ui/core';
-import { styled, css } from '@apache-superset/core/theme';
+import { styled } from '@apache-superset/core/theme';
 import { Logger } from 'src/logger/LogUtils';
 import { EmptyState, Tooltip } from '@superset-ui/core/components';
 import { detectOS } from 'src/utils/common';
@@ -89,6 +89,11 @@ const TabTitle = styled.span`
   text-transform: none;
 `;
 
+const AddTabIconWrapper = styled.span`
+  display: inline-flex;
+  vertical-align: middle;
+`;
+
 // Get the user's OS
 const userOS = detectOS();
 
@@ -194,13 +199,9 @@ class TabbedSqlEditors extends PureComponent<TabbedSqlEditorsProps> {
               : t('New tab (Ctrl + t)')
           }
         >
-          <Icons.PlusCircleOutlined
-            iconSize="s"
-            css={css`
-              vertical-align: middle;
-            `}
-            data-test="add-tab-icon"
-          />
+          <AddTabIconWrapper>
+            <Icons.PlusCircleOutlined iconSize="s" data-test="add-tab-icon" />
+          </AddTabIconWrapper>
         </Tooltip>
       </StyledTab>
     );
@@ -241,13 +242,9 @@ class TabbedSqlEditors extends PureComponent<TabbedSqlEditorsProps> {
                 : t('New tab (Ctrl + t)')
             }
           >
-            <Icons.PlusOutlined
-              iconSize="l"
-              css={css`
-                vertical-align: middle;
-              `}
-              data-test="add-tab-icon"
-            />
+            <AddTabIconWrapper>
+              <Icons.PlusOutlined iconSize="l" data-test="add-tab-icon" />
+            </AddTabIconWrapper>
           </Tooltip>
         }
         items={tabItems}

superset-frontend/src/SqlLab/components/TableExploreTree/TreeNodeRenderer.tsx

@@ -386,18 +386,19 @@ const TreeNodeRenderer: React.FC<TreeNodeRendererProps> = ({
                       : handlePinTable(tableName, schema, catalog ?? null)
                   }
                 />
+                <ActionButton
+                  label={`toggle-${schema}-${tableName}`}
+                  tooltip={isManuallyOpen ? t('Collapse') : t('Expand')}
+                  icon={
+                    isManuallyOpen ? (
+                      <Icons.UpOutlined iconSize="m" />
+                    ) : (
+                      <Icons.DownOutlined iconSize="m" />
+                    )
+                  }
+                  onClick={() => node.toggle()}
+                />
               </div>
-              <ActionButton
-                label={`toggle-${schema}-${tableName}`}
-                icon={
-                  isManuallyOpen ? (
-                    <Icons.UpOutlined iconSize="m" />
-                  ) : (
-                    <Icons.DownOutlined iconSize="m" />
-                  )
-                }
-                onClick={() => node.toggle()}
-              />
             </div>
           );
         })()}

superset-frontend/src/SqlLab/reducers/getInitialState.test.ts

@@ -34,6 +34,7 @@ const apiData = {
     lastName: 'last name',
     permissions: {},
     roles: {},
+    groups: [],
   },
 };
 const apiDataWithTabState = {

superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/DeckglLayerVisibilityCustomizationPlugin.test.tsx

@@ -32,6 +32,7 @@ jest.mock('@superset-ui/core', () => ({
 const mockSupersetClientGet = SupersetClient.get as jest.Mock;
 
 const defaultProps: PluginDeckglLayerVisibilityProps = {
+  data: [],
   formData: {
     viz_type: 'deckgl_layer_visibility',
     defaultToAllLayersVisible: true,
@@ -40,7 +41,13 @@ const defaultProps: PluginDeckglLayerVisibilityProps = {
   height: 400,
   width: 600,
   filterState: {},
+  inputRef: { current: null },
   setDataMask: jest.fn(),
+  setFocusedFilter: jest.fn(),
+  unsetFocusedFilter: jest.fn(),
+  setHoveredFilter: jest.fn(),
+  unsetHoveredFilter: jest.fn(),
+  setFilterActive: jest.fn(),
 };
 
 const mockCharts = {
@@ -85,10 +92,13 @@ test('displays loading state initially', () => {
     },
   });
 
-  expect(screen.getByText('Loading deck.gl layers...')).toBeInTheDocument();
+  expect(
+    screen.getByTestId('deckgl-layer-visibility-select'),
+  ).toBeInTheDocument();
+  expect(screen.getByRole('combobox')).toBeDisabled();
 });
 
-test('displays message when no deck.gl multi layer charts are found', async () => {
+test('displays disabled select when no deck.gl multi layer charts are found', async () => {
   mockSupersetClientGet.mockResolvedValue({ json: { result: [] } });
 
   render(<DeckglLayerVisibilityCustomizationPlugin {...defaultProps} />, {
@@ -107,11 +117,7 @@ test('displays message when no deck.gl multi layer charts are found', async () =
   });
 
   await waitFor(() => {
-    expect(
-      screen.getByText(
-        'No deck.gl multi layer charts found in this dashboard.',
-      ),
-    ).toBeInTheDocument();
+    expect(screen.getByRole('combobox')).toBeDisabled();
   });
 });
 
@@ -126,10 +132,10 @@ test('renders layer selection control with layers from API', async () => {
   });
 
   await waitFor(() => {
-    expect(screen.getByText('Exclude layers (deck.gl)')).toBeInTheDocument();
+    expect(
+      screen.getByTestId('deckgl-layer-visibility-select'),
+    ).toBeInTheDocument();
   });
-
-  expect(screen.getByRole('combobox')).toBeInTheDocument();
 });
 
 test('collects unique layer IDs from multiple deck_multi charts', async () => {
@@ -168,7 +174,9 @@ test('handles layer selection and calls setDataMask', async () => {
   );
 
   await waitFor(() => {
-    expect(screen.getByText('Exclude layers (deck.gl)')).toBeInTheDocument();
+    expect(
+      screen.getByTestId('deckgl-layer-visibility-select'),
+    ).toBeInTheDocument();
   });
 
   const select = screen.getByRole('combobox');
@@ -211,7 +219,9 @@ test('initializes with filterState value when provided', async () => {
   );
 
   await waitFor(() => {
-    expect(screen.getByText('Exclude layers (deck.gl)')).toBeInTheDocument();
+    expect(
+      screen.getByTestId('deckgl-layer-visibility-select'),
+    ).toBeInTheDocument();
   });
 
   const select = screen.getByRole('combobox');
@@ -280,7 +290,9 @@ test('does not auto-initialize when defaultToAllLayersVisible is false', async (
   );
 
   await waitFor(() => {
-    expect(screen.getByText('Exclude layers (deck.gl)')).toBeInTheDocument();
+    expect(
+      screen.getByTestId('deckgl-layer-visibility-select'),
+    ).toBeInTheDocument();
   });
 
   expect(setDataMaskMock).not.toHaveBeenCalled();
@@ -304,7 +316,9 @@ test('handles multiple layer selection', async () => {
   );
 
   await waitFor(() => {
-    expect(screen.getByText('Exclude layers (deck.gl)')).toBeInTheDocument();
+    expect(
+      screen.getByTestId('deckgl-layer-visibility-select'),
+    ).toBeInTheDocument();
   });
 
   const select = screen.getByRole('combobox');
@@ -331,29 +345,36 @@ test('handles multiple layer selection', async () => {
   });
 });
 
-test('displays tooltip info icon', async () => {
-  mockSupersetClientGet.mockResolvedValue(mockApiResponse);
+test('displays tooltip on hover when select is disabled', async () => {
+  mockSupersetClientGet.mockResolvedValue({ json: { result: [] } });
 
   render(<DeckglLayerVisibilityCustomizationPlugin {...defaultProps} />, {
     useRedux: true,
     initialState: {
-      sliceEntities: { slices: mockCharts },
+      sliceEntities: {
+        slices: {
+          chart1: {
+            form_data: {
+              viz_type: 'line',
+            },
+          },
+        },
+      },
     },
   });
 
   await waitFor(() => {
-    expect(screen.getByText('Exclude layers (deck.gl)')).toBeInTheDocument();
+    expect(
+      screen.getByTestId('deckgl-layer-visibility-select'),
+    ).toBeInTheDocument();
   });
 
-  const tooltipIcon = screen.getByRole('img', { name: /info-circle/i });
-  expect(tooltipIcon).toBeInTheDocument();
-
-  await userEvent.hover(tooltipIcon);
+  await userEvent.hover(screen.getByTestId('deckgl-layer-visibility-select'));
 
   await waitFor(() => {
     expect(
       screen.getByText(
-        'Choose layers to hide from all deck.gl Multiple Layer charts in this dashboard.',
+        'No multilayer deck.gl charts are currently added to this dashboard.',
       ),
     ).toBeInTheDocument();
   });
@@ -378,11 +399,7 @@ test('handles charts with undefined deck_slices', async () => {
   });
 
   await waitFor(() => {
-    expect(
-      screen.getByText(
-        'No deck.gl multi layer charts found in this dashboard.',
-      ),
-    ).toBeInTheDocument();
+    expect(screen.getByRole('combobox')).toBeDisabled();
   });
 });
 
@@ -406,11 +423,7 @@ test('handles charts with non-array deck_slices', async () => {
   });
 
   await waitFor(() => {
-    expect(
-      screen.getByText(
-        'No deck.gl multi layer charts found in this dashboard.',
-      ),
-    ).toBeInTheDocument();
+    expect(screen.getByRole('combobox')).toBeDisabled();
   });
 });
 
@@ -447,6 +460,30 @@ test('deduplicates layer IDs from multiple charts', async () => {
   expect(callArgs.endpoint).toContain('/api/v1/chart/?q=');
 });
 
+test('renders validate message when filterState has validateMessage', async () => {
+  mockSupersetClientGet.mockResolvedValue(mockApiResponse);
+
+  render(
+    <DeckglLayerVisibilityCustomizationPlugin
+      {...defaultProps}
+      filterState={{
+        validateMessage: 'This field is required',
+        validateStatus: 'error',
+      }}
+    />,
+    {
+      useRedux: true,
+      initialState: {
+        sliceEntities: { slices: mockCharts },
+      },
+    },
+  );
+
+  await waitFor(() => {
+    expect(screen.getByText('This field is required')).toBeInTheDocument();
+  });
+});
+
 test('respects existing visible_deckgl_layers from Redux state', async () => {
   mockSupersetClientGet.mockResolvedValue(mockApiResponse);
   const setDataMaskMock = jest.fn();
@@ -477,7 +514,9 @@ test('respects existing visible_deckgl_layers from Redux state', async () => {
   );
 
   await waitFor(() => {
-    expect(screen.getByText('Exclude layers (deck.gl)')).toBeInTheDocument();
+    expect(
+      screen.getByTestId('deckgl-layer-visibility-select'),
+    ).toBeInTheDocument();
   });
 
   expect(setDataMaskMock).not.toHaveBeenCalled();

superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/DeckglLayerVisibilityCustomizationPlugin.tsx

@@ -19,19 +19,17 @@
 import { useEffect, useState, useMemo, useRef, useCallback } from 'react';
 import { t } from '@apache-superset/core/translation';
 import { DataMask, ExtraFormData } from '@superset-ui/core';
-import { useTheme } from '@apache-superset/core/theme';
 import {
   Select,
   FormItem,
   Tooltip,
-  Icons,
-  Flex,
+  type FormItemProps,
 } from '@superset-ui/core/components';
 import { useSelector } from 'react-redux';
 import { createSelector } from '@reduxjs/toolkit';
 import { PluginDeckglLayerVisibilityProps } from './types';
 import { useDeckLayerMetadata } from './useDeckLayerMetadata';
-import { FilterPluginStyle } from '../common';
+import { FilterPluginStyle, StatusMessage } from '../common';
 import { Slice } from 'src/dashboard/types';
 
 type SliceEntitiesState = {
@@ -72,7 +70,6 @@ export default function DeckglLayerVisibilityCustomizationPlugin(
   props: PluginDeckglLayerVisibilityProps,
 ) {
   const { formData, filterState, setDataMask, width, height } = props;
-  const theme = useTheme();
   const [hiddenLayers, setHiddenLayers] = useState<number[]>(
     filterState?.value || [],
   );
@@ -128,6 +125,19 @@ export default function DeckglLayerVisibilityCustomizationPlugin(
     setDataMask,
   ]);
 
+  const formItemData: FormItemProps = useMemo(() => {
+    if (filterState.validateMessage) {
+      return {
+        extra: (
+          <StatusMessage status={filterState.validateStatus}>
+            {filterState.validateMessage}
+          </StatusMessage>
+        ),
+      };
+    }
+    return EMPTY_OBJECT as FormItemProps;
+  }, [filterState.validateMessage, filterState.validateStatus]);
+
   const handleLayerChange = useCallback(
     (selectedHiddenLayers: number[]) => {
       setHiddenLayers(selectedHiddenLayers);
@@ -157,48 +167,34 @@ export default function DeckglLayerVisibilityCustomizationPlugin(
     [apiLayers],
   );
 
-  if (isLoadingMetadata && apiLayers.length === 0) {
-    return (
-      <FilterPluginStyle height={height} width={width}>
-        <div>{t('Loading deck.gl layers...')}</div>
-      </FilterPluginStyle>
-    );
-  }
-
   return (
     <FilterPluginStyle height={height} width={width}>
-      {apiLayers.length === 0 ? (
-        <div>{t('No deck.gl multi layer charts found in this dashboard.')}</div>
-      ) : (
-        <FormItem
-          label={
-            <Flex gap={theme.sizeUnit}>
-              <span>{t('Exclude layers (deck.gl)')}</span>
-              <Tooltip
-                title={t(
-                  'Choose layers to hide from all deck.gl Multiple Layer charts in this dashboard.',
-                )}
-              >
-                <span className="tooltip-icon">
-                  <Icons.InfoCircleOutlined
-                    iconSize="m"
-                    iconColor={theme.colorIcon}
-                  />
-                </span>
-              </Tooltip>
-            </Flex>
+      <FormItem validateStatus={filterState.validateStatus} {...formItemData}>
+        <Tooltip
+          title={
+            !isLoadingMetadata && apiLayers.length === 0
+              ? t(
+                  'No multilayer deck.gl charts are currently added to this dashboard.',
+                )
+              : null
           }
         >
-          <Select
-            mode="multiple"
-            value={hiddenLayers}
-            onChange={handleLayerChange}
-            options={selectOptions}
-            placeholder={t('Select layers to hide')}
-            allowClear
-          />
-        </FormItem>
-      )}
+          <div>
+            <Select
+              data-test="deckgl-layer-visibility-select"
+              mode="multiple"
+              oneLine
+              value={hiddenLayers}
+              onChange={handleLayerChange}
+              options={selectOptions}
+              placeholder={t('Select layers to hide')}
+              allowClear
+              disabled={apiLayers.length === 0}
+              loading={isLoadingMetadata && apiLayers.length === 0}
+            />
+          </div>
+        </Tooltip>
+      </FormItem>
     </FilterPluginStyle>
   );
 }

superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/index.ts

@@ -21,6 +21,7 @@ import { Behavior, ChartMetadata, ChartPlugin } from '@superset-ui/core';
 import buildQuery from './buildQuery';
 import controlPanel from './controlPanel';
 import transformProps from './transformProps';
+import thumbnail from './images/thumbnail.png';
 
 export default class DeckglLayerVisibilityCustomizationPlugin extends ChartPlugin {
   constructor() {
@@ -29,7 +30,7 @@ export default class DeckglLayerVisibilityCustomizationPlugin extends ChartPlugi
       description: t('Chart customization to control deck.gl layer visibility'),
       behaviors: [Behavior.InteractiveChart, Behavior.ChartCustomization],
       tags: [t('Deckgl'), t('Experimental')],
-      thumbnail: '',
+      thumbnail,
       enableNoResults: false,
       datasourceCount: 0,
     });

superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/types.ts

@@ -16,31 +16,25 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { QueryFormData, DataMask } from '@superset-ui/core';
+import { QueryFormData, FilterState } from '@superset-ui/core';
+import { PluginFilterHooks, PluginFilterStylesProps } from '../types';
+import { RefObject } from 'react';
+import type { RefSelectProps } from '@superset-ui/core/components';
+import { ColumnData, ColumnOption } from '../DynamicGroupBy/types';
 
 export interface DeckglLayerVisibilityFormData extends QueryFormData {
   defaultToAllLayersVisible?: boolean;
 }
 
-export const DEFAULT_FORM_DATA: Partial<DeckglLayerVisibilityFormData> = {
-  defaultToAllLayersVisible: true,
-};
-
 export interface LayerInfo {
   sliceId: number;
   name: string;
   type: string;
 }
 
-export interface PluginDeckglLayerVisibilityProps {
+export type PluginDeckglLayerVisibilityProps = PluginFilterStylesProps & {
+  data: (ColumnOption | ColumnData)[];
+  filterState: FilterState;
   formData: DeckglLayerVisibilityFormData;
-  height: number;
-  width: number;
-  filterState: {
-    value?: number[];
-  };
-  setDataMask: (dataMask: DataMask) => void;
-  ownState?: {
-    availableLayers?: LayerInfo[];
-  };
-}
+  inputRef: RefObject<RefSelectProps>;
+} & PluginFilterHooks;

superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/useDeckLayerMetadata.test.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { renderHook } from '@testing-library/react-hooks';
+import { act, renderHook } from '@testing-library/react-hooks';
 import { SupersetClient } from '@superset-ui/core';
 import { useDeckLayerMetadata } from './useDeckLayerMetadata';
 
@@ -168,6 +168,34 @@ test('handles empty result from API', async () => {
   expect(result.current.error).toBe(null);
 });
 
+test('clears isLoading when sliceIds transitions from non-empty to empty', async () => {
+  const mockResponse = {
+    json: {
+      result: [{ id: 1, slice_name: 'Layer 1', viz_type: 'deck_scatter' }],
+    },
+  };
+  mockSupersetClientGet.mockResolvedValue(mockResponse);
+
+  const { result, rerender, waitForNextUpdate } = renderHook(
+    ({ ids }) => useDeckLayerMetadata(ids),
+    {
+      initialProps: { ids: [1] },
+    },
+  );
+
+  await waitForNextUpdate();
+
+  expect(result.current.isLoading).toBe(false);
+  expect(result.current.layers).toHaveLength(1);
+
+  act(() => {
+    rerender({ ids: [] });
+  });
+
+  expect(result.current.isLoading).toBe(false);
+  expect(result.current.layers).toEqual([]);
+});
+
 test('does not refetch when sliceIds array has same values', async () => {
   const mockResponse = {
     json: {

superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/useDeckLayerMetadata.ts

@@ -35,12 +35,13 @@ export const useDeckLayerMetadata = (
   error: string | null;
 } => {
   const [layers, setLayers] = useState<LayerInfo[]>([]);
-  const [isLoading, setIsLoading] = useState(false);
+  const [isLoading, setIsLoading] = useState(sliceIds.length > 0);
   const [error, setError] = useState<string | null>(null);
 
   useEffect(() => {
     if (!sliceIds || sliceIds.length === 0) {
       setLayers([]);
+      setIsLoading(false);
       return;
     }
 

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

@@ -40,6 +40,19 @@ jest.mock('src/dashboard/util/isEmbedded', () => ({
   isEmbedded: jest.fn(() => false),
 }));
 
+jest.mock('src/explore/exploreUtils', () => {
+  const actual = jest.requireActual('src/explore/exploreUtils');
+  return {
+    ...actual,
+    exportChart: jest.fn(),
+  };
+});
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { exportChart: exportChartMock } = jest.requireMock(
+  'src/explore/exploreUtils',
+) as { exportChart: jest.Mock };
+
 const CHART_DATA_ENDPOINT = 'glob:*/api/v1/chart/data*';
 const FORM_DATA_KEY_ENDPOINT = 'glob:*/api/v1/explore/form_data';
 
@@ -553,4 +566,66 @@ describe('Table view with pagination', () => {
     // Table should still be rendered without crashes
     expect(screen.getByTestId('drill-by-results-table')).toBeInTheDocument();
   });
+
+  test('CSV download calls exportChart with drilledFormData', async () => {
+    exportChartMock.mockClear();
+    await renderModal({
+      column: { column_name: 'state', verbose_name: null },
+      drillByConfig: {
+        filters: [{ col: 'gender', op: '==', val: 'boy' }],
+        groupbyFieldName: 'groupby',
+      },
+    });
+
+    const tableRadio = await screen.findByRole('radio', { name: /table/i });
+    userEvent.click(tableRadio);
+    await waitFor(() =>
+      expect(screen.getByTestId('drill-by-results-table')).toBeInTheDocument(),
+    );
+
+    await userEvent.click(
+      await screen.findByRole('button', { name: 'Download' }),
+    );
+    await userEvent.click(await screen.findByText('Export to CSV'));
+
+    expect(exportChartMock).toHaveBeenCalledTimes(1);
+    expect(exportChartMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        resultFormat: 'csv',
+        resultType: 'full',
+        formData: expect.objectContaining({ slice_id: 0 }),
+      }),
+    );
+  });
+
+  test('XLSX download calls exportChart with xlsx format', async () => {
+    exportChartMock.mockClear();
+    await renderModal({
+      column: { column_name: 'state', verbose_name: null },
+      drillByConfig: {
+        filters: [{ col: 'gender', op: '==', val: 'boy' }],
+        groupbyFieldName: 'groupby',
+      },
+    });
+
+    const tableRadio = await screen.findByRole('radio', { name: /table/i });
+    userEvent.click(tableRadio);
+    await waitFor(() =>
+      expect(screen.getByTestId('drill-by-results-table')).toBeInTheDocument(),
+    );
+
+    await userEvent.click(
+      await screen.findByRole('button', { name: 'Download' }),
+    );
+    await userEvent.click(await screen.findByText('Export to Excel'));
+
+    expect(exportChartMock).toHaveBeenCalledTimes(1);
+    expect(exportChartMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        resultFormat: 'xlsx',
+        resultType: 'full',
+        formData: expect.objectContaining({ slice_id: 0 }),
+      }),
+    );
+  });
 });

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

@@ -54,7 +54,7 @@ import {
   LOG_ACTIONS_FURTHER_DRILL_BY,
 } from 'src/logger/LogUtils';
 import { findPermission } from 'src/utils/findPermission';
-import { getQuerySettings } from 'src/explore/exploreUtils';
+import { getQuerySettings, exportChart } from 'src/explore/exploreUtils';
 import { isEmbedded } from 'src/dashboard/util/isEmbedded';
 import { Dataset, DrillByType } from '../types';
 import DrillByChart from './DrillByChart';
@@ -209,12 +209,6 @@ export default function DrillByModal({
   const { displayModeToggle, drillByDisplayMode } = useDisplayModeToggle();
   const [chartDataResult, setChartDataResult] = useState<QueryData[]>();
 
-  const resultsTable = useResultsTableView(
-    chartDataResult,
-    formData.datasource,
-    canDownload,
-  );
-
   const [currentFormData, setCurrentFormData] = useState(formData);
   const [usedGroupbyColumns, setUsedGroupbyColumns] = useState<Column[]>(
     [...initialGroupbyColumns, column].filter(isDefined),
@@ -377,6 +371,63 @@ export default function DrillByModal({
     formData,
   ]);
 
+  const handleDownload = useCallback(
+    (exportType: 'csv' | 'xlsx') => {
+      Promise.resolve(
+        exportChart({
+          formData: drilledFormData,
+          resultFormat: exportType,
+          resultType: 'full',
+        }),
+      ).catch(error => {
+        addDangerToast(
+          t('Failed to generate download: %s', error?.message || error),
+        );
+      });
+    },
+    [drilledFormData, addDangerToast],
+  );
+
+  const handleDownloadCSV = useCallback(
+    () => handleDownload('csv'),
+    [handleDownload],
+  );
+
+  const handleDownloadXLSX = useCallback(
+    () => handleDownload('xlsx'),
+    [handleDownload],
+  );
+
+  const handleReload = useCallback(() => {
+    setChartDataResult(undefined);
+    setIsChartDataLoading(true);
+    const [useLegacyApi] = getQuerySettings(drilledFormData);
+    getChartDataRequest({
+      formData: drilledFormData,
+    })
+      .then(({ response, json }) =>
+        handleChartDataResponse(response, json, useLegacyApi),
+      )
+      .then(queriesResponse => {
+        setChartDataResult(queriesResponse);
+      })
+      .catch(() => {
+        addDangerToast(t('Failed to load chart data.'));
+      })
+      .finally(() => {
+        setIsChartDataLoading(false);
+      });
+  }, [addDangerToast, drilledFormData]);
+
+  const resultsTable = useResultsTableView(
+    chartDataResult,
+    formData.datasource,
+    canDownload,
+    handleDownloadCSV,
+    handleDownloadXLSX,
+    handleReload,
+  );
+
   useEffect(() => {
     setUsedGroupbyColumns(usedCols =>
       !currentColumn ||

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

@@ -35,6 +35,9 @@ export const useResultsTableView = (
   chartDataResult: QueryData[] | undefined,
   datasourceId: string,
   canDownload: boolean,
+  onDownloadCSV?: () => void,
+  onDownloadXLSX?: () => void,
+  onReload?: () => void,
 ) => {
   if (!isDefined(chartDataResult)) {
     return <div />;
@@ -50,6 +53,9 @@ export const useResultsTableView = (
           datasourceId={datasourceId}
           isVisible
           canDownload={canDownload}
+          onDownloadCSV={onDownloadCSV}
+          onDownloadXLSX={onDownloadXLSX}
+          onReload={onReload}
         />
       </ResultContainer>
     );
@@ -70,6 +76,9 @@ export const useResultsTableView = (
               datasourceId={datasourceId}
               isVisible
               canDownload={canDownload}
+              onDownloadCSV={onDownloadCSV}
+              onDownloadXLSX={onDownloadXLSX}
+              onReload={onReload}
             />
           </ResultContainer>
         ),

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

@@ -0,0 +1,57 @@
+/**
+ * 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, screen, userEvent } from 'spec/helpers/testing-library';
+import DownloadDropdown from './DownloadDropdown';
+
+const onDownloadCSV = jest.fn();
+const onDownloadXLSX = jest.fn();
+
+beforeEach(() => {
+  onDownloadCSV.mockClear();
+  onDownloadXLSX.mockClear();
+});
+
+const setup = () =>
+  render(
+    <DownloadDropdown
+      onDownloadCSV={onDownloadCSV}
+      onDownloadXLSX={onDownloadXLSX}
+    />,
+  );
+
+test('renders a download trigger with accessible label', () => {
+  setup();
+  expect(screen.getByRole('button', { name: 'Download' })).toBeInTheDocument();
+});
+
+test('fires onDownloadCSV when CSV menu item is selected', async () => {
+  setup();
+  await userEvent.click(screen.getByRole('button', { name: 'Download' }));
+  await userEvent.click(await screen.findByText('Export to CSV'));
+  expect(onDownloadCSV).toHaveBeenCalledTimes(1);
+  expect(onDownloadXLSX).not.toHaveBeenCalled();
+});
+
+test('fires onDownloadXLSX when Excel menu item is selected', async () => {
+  setup();
+  await userEvent.click(screen.getByRole('button', { name: 'Download' }));
+  await userEvent.click(await screen.findByText('Export to Excel'));
+  expect(onDownloadXLSX).toHaveBeenCalledTimes(1);
+  expect(onDownloadCSV).not.toHaveBeenCalled();
+});

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

@@ -0,0 +1,82 @@
+/**
+ * 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 { t } from '@apache-superset/core/translation';
+import { css, useTheme } from '@apache-superset/core/theme';
+import { Dropdown, Tooltip } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
+
+interface DownloadDropdownProps {
+  onDownloadCSV: () => void;
+  onDownloadXLSX: () => void;
+}
+
+const DownloadDropdown = ({
+  onDownloadCSV,
+  onDownloadXLSX,
+}: DownloadDropdownProps) => {
+  const theme = useTheme();
+  return (
+    <Dropdown
+      trigger={['click']}
+      menu={{
+        onClick: ({ key }) => {
+          if (key === 'csv') {
+            onDownloadCSV();
+          } else if (key === 'xlsx') {
+            onDownloadXLSX();
+          }
+        },
+        items: [
+          {
+            key: 'csv',
+            label: t('Export to CSV'),
+            icon: <Icons.FileOutlined />,
+          },
+          {
+            key: 'xlsx',
+            label: t('Export to Excel'),
+            icon: <Icons.FileOutlined />,
+          },
+        ],
+      }}
+    >
+      <Tooltip title={t('Download')}>
+        <span
+          tabIndex={0}
+          role="button"
+          aria-label={t('Download')}
+          data-test="drill-detail-download-btn"
+        >
+          <Icons.DownloadOutlined
+            iconColor={theme.colorIcon}
+            iconSize="l"
+            css={css`
+              &.anticon > * {
+                line-height: 0;
+              }
+            `}
+          />
+        </span>
+      </Tooltip>
+    </Dropdown>
+  );
+};
+
+export default DownloadDropdown;

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

@@ -18,7 +18,12 @@
  */
 import fetchMock from 'fetch-mock';
 import { QueryFormData, SupersetClient } from '@superset-ui/core';
-import { render, screen, waitFor } from 'spec/helpers/testing-library';
+import {
+  render,
+  screen,
+  userEvent,
+  waitFor,
+} from 'spec/helpers/testing-library';
 import { getMockStoreWithNativeFilters } from 'spec/fixtures/mockStore';
 import chartQueries, { sliceId } from 'spec/fixtures/mockChartQueries';
 import { supersetGetCache } from 'src/utils/cachedSupersetGet';
@@ -189,6 +194,66 @@ test('should render the error', async () => {
   expect(screen.getByText('Error: Something went wrong')).toBeInTheDocument();
 });
 
+describe('download actions', () => {
+  const renderWithDownloadPermission = () =>
+    render(
+      <DrillDetailPane
+        initialFilters={[]}
+        formData={chart.form_data as unknown as QueryFormData}
+      />,
+      {
+        useRedux: true,
+        initialState: {
+          user: { roles: { Admin: [['can_csv', 'Superset']] } },
+          common: { conf: { SAMPLES_ROW_LIMIT: 10, ROW_LIMIT: 50000 } },
+          dashboardInfo: { id: 123 },
+        },
+      },
+    );
+
+  const clickDownloadItem = async (label: string) => {
+    await userEvent.click(
+      await screen.findByRole('button', { name: 'Download' }),
+    );
+    await userEvent.click(await screen.findByText(label));
+  };
+
+  test('CSV export posts drill_detail payload with ROW_LIMIT', async () => {
+    fetchWithData();
+    const postFormSpy = jest
+      .spyOn(SupersetClient, 'postForm')
+      .mockImplementation(() => Promise.resolve());
+    renderWithDownloadPermission();
+
+    await clickDownloadItem('Export to CSV');
+
+    expect(postFormSpy).toHaveBeenCalledTimes(1);
+    const body = postFormSpy.mock.calls[0][1] as { form_data: string };
+    const payload = JSON.parse(body.form_data);
+    expect(payload.result_type).toBe('drill_detail');
+    expect(payload.result_format).toBe('csv');
+    expect(payload.queries[0].row_limit).toBe(50000);
+    expect(payload.form_data.dashboardId).toBe(123);
+    postFormSpy.mockRestore();
+  });
+
+  test('XLSX export uses xlsx result_format', async () => {
+    fetchWithData();
+    const postFormSpy = jest
+      .spyOn(SupersetClient, 'postForm')
+      .mockImplementation(() => Promise.resolve());
+    renderWithDownloadPermission();
+
+    await clickDownloadItem('Export to Excel');
+
+    expect(postFormSpy).toHaveBeenCalledTimes(1);
+    const body = postFormSpy.mock.calls[0][1] as { form_data: string };
+    const payload = JSON.parse(body.form_data);
+    expect(payload.result_format).toBe('xlsx');
+    postFormSpy.mockRestore();
+  });
+});
+
 test('should use verbose_map for column headers when available', async () => {
   jest.restoreAllMocks();
 

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

@@ -33,6 +33,7 @@ import {
   ensureIsArray,
   JsonObject,
   QueryFormData,
+  SupersetClient,
 } from '@superset-ui/core';
 import { css, useTheme } from '@apache-superset/core/theme';
 import { GenericDataType } from '@apache-superset/core/common';
@@ -47,6 +48,10 @@ import Table, {
   TableSize,
 } from '@superset-ui/core/components/Table';
 import { RootState } from 'src/dashboard/types';
+import { usePermissions } from 'src/hooks/usePermissions';
+import { useToasts } from 'src/components/MessageToasts/withToasts';
+import { ensureAppRoot } from 'src/utils/pathUtils';
+import { safeStringify } from 'src/utils/safeStringify';
 import HeaderWithRadioGroup from '@superset-ui/core/components/Table/header-renderers/HeaderWithRadioGroup';
 import { useDatasetMetadataBar } from 'src/features/datasets/metadataBar/useDatasetMetadataBar';
 import { Dataset } from '../types';
@@ -108,6 +113,13 @@ export default function DrillDetailPane({
       state.common.conf.SAMPLES_ROW_LIMIT,
   );
 
+  const ROW_LIMIT = useSelector(
+    (state: { common: { conf: JsonObject } }) => state.common.conf.ROW_LIMIT,
+  );
+
+  const { canDownload } = usePermissions();
+  const { addDangerToast } = useToasts();
+
   // Extract datasource ID/type from string ID
   const [datasourceId, datasourceType] = useMemo(
     () => formData.datasource.split('__'),
@@ -207,6 +219,64 @@ export default function DrillDetailPane({
     setPageIndex(0);
   }, []);
 
+  const handleDownload = useCallback(
+    (exportType: 'csv' | 'xlsx') => {
+      const drillPayload = getDrillPayload(formData, filters);
+      if (!drillPayload) {
+        addDangerToast(t('Unable to generate download payload'));
+        return;
+      }
+      const payload: JsonObject = {
+        datasource: {
+          id: parseInt(datasourceId, 10),
+          type: datasourceType,
+        },
+        queries: [
+          {
+            ...drillPayload,
+            columns: [],
+            metrics: [],
+            orderby: [],
+            row_limit: ROW_LIMIT,
+            row_offset: 0,
+          },
+        ],
+        result_type: 'drill_detail',
+        result_format: exportType,
+        force: false,
+      };
+      if (dashboardId) {
+        payload.form_data = { dashboardId };
+      }
+      SupersetClient.postForm(ensureAppRoot('/api/v1/chart/data'), {
+        form_data: safeStringify(payload),
+      }).catch(error => {
+        addDangerToast(
+          t('Failed to generate download: %s', error.message || error),
+        );
+      });
+    },
+    [
+      formData,
+      filters,
+      datasourceId,
+      datasourceType,
+      ROW_LIMIT,
+      dashboardId,
+      addDangerToast,
+    ],
+  );
+
+  const handleDownloadCSV = useCallback(
+    () => handleDownload('csv'),
+    [handleDownload],
+  );
+
+  const handleDownloadXLSX = useCallback(
+    () => handleDownload('xlsx'),
+    [handleDownload],
+  );
+
   // Clear cache and reset page index if filters change
   useEffect(() => {
     setResponseError('');
@@ -338,6 +408,11 @@ export default function DrillDetailPane({
           totalCount={resultsPage?.total}
           loading={isLoading}
           onReload={handleReload}
+          canDownload={canDownload}
+          onDownloadCSV={handleDownloadCSV}
+          onDownloadXLSX={handleDownloadXLSX}
+          data={data}
+          columnNames={resultsPage?.colNames}
         />
       )}
       {tableContent}

superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.stories.tsx

@@ -33,4 +33,9 @@ InteractiveTableControls.args = {
     { op: '>', col: 'tz_offset', val: 200 },
     { op: '==', col: 'platform', val: 'GB' },
   ],
+  canDownload: true,
+  onDownloadCSV: () => {},
+  onDownloadXLSX: () => {},
+  onReload: () => {},
+  loading: false,
 };

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

@@ -17,20 +17,27 @@
  * under the License.
  */
 import { render, screen, userEvent } from 'spec/helpers/testing-library';
-import TableControls from './DrillDetailTableControls';
+import TableControls, { TableControlsProps } from './DrillDetailTableControls';
 
 const setFilters = jest.fn();
 const onReload = jest.fn();
-const setup = (overrides: Record<string, any> = {}) => {
+const onDownloadCSV = jest.fn();
+const onDownloadXLSX = jest.fn();
+const setup = (overrides: Partial<TableControlsProps> = {}) => {
   const props = {
     filters: [],
     setFilters,
     onReload,
     loading: false,
     totalCount: 0,
+    canDownload: true,
+    onDownloadCSV,
+    onDownloadXLSX,
+    data: [],
+    columnNames: [],
     ...overrides,
   };
-  return render(<TableControls {...props} />);
+  return render(<TableControls {...props} />, { useRedux: true });
 };
 test('should render', () => {
   const { container } = setup();

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

@@ -27,6 +27,11 @@ import {
 import { css, useTheme } from '@apache-superset/core/theme';
 import RowCountLabel from 'src/components/RowCountLabel';
 import { Icons } from '@superset-ui/core/components/Icons';
+import { Tooltip } from '@superset-ui/core/components';
+import { CopyToClipboardButton } from 'src/explore/components/DataTableControl';
+import { TabularDataRow } from 'src/utils/common';
+import { usePermissions } from 'src/hooks/usePermissions';
+import DownloadDropdown from './DownloadDropdown';
 
 export type TableControlsProps = {
   filters: BinaryQueryObjectFilterClause[];
@@ -34,6 +39,11 @@ export type TableControlsProps = {
   totalCount?: number;
   loading: boolean;
   onReload: () => void;
+  canDownload: boolean;
+  onDownloadCSV: () => void;
+  onDownloadXLSX: () => void;
+  data?: TabularDataRow[];
+  columnNames?: string[];
 };
 
 export default function TableControls({
@@ -42,8 +52,14 @@ export default function TableControls({
   totalCount,
   loading,
   onReload,
+  canDownload,
+  onDownloadCSV,
+  onDownloadXLSX,
+  data,
+  columnNames,
 }: TableControlsProps) {
   const theme = useTheme();
+  const { canCopyClipboard: copyEnabled } = usePermissions();
   const filterMap: Record<string, BinaryQueryObjectFilterClause> = useMemo(
     () =>
       Object.assign(
@@ -118,16 +134,38 @@ export default function TableControls({
           display: flex;
           align-items: center;
           height: min-content;
+          gap: ${theme.sizeUnit * 3}px;
         `}
       >
         <RowCountLabel loading={loading && !totalCount} rowcount={totalCount} />
-        <Icons.ReloadOutlined
-          iconColor={theme.colorIcon}
-          iconSize="l"
-          aria-label={t('Reload')}
-          role="button"
-          onClick={onReload}
-        />
+        {canDownload && (
+          <DownloadDropdown
+            onDownloadCSV={onDownloadCSV}
+            onDownloadXLSX={onDownloadXLSX}
+          />
+        )}
+        {copyEnabled ? (
+          <CopyToClipboardButton data={data} columns={columnNames} />
+        ) : (
+          <Tooltip title={t("You don't have permission to copy to clipboard")}>
+            <span>
+              <CopyToClipboardButton
+                data={data}
+                columns={columnNames}
+                disabled
+              />
+            </span>
+          </Tooltip>
+        )}
+        <Tooltip title={t('Reload')}>
+          <Icons.ReloadOutlined
+            iconColor={theme.colorIcon}
+            iconSize="l"
+            aria-label={t('Reload')}
+            role="button"
+            onClick={onReload}
+          />
+        </Tooltip>
       </div>
     </div>
   );

superset-frontend/src/components/DatabaseSelector/index.tsx

@@ -139,9 +139,11 @@ const LabelStyle = styled.div`
   }
 `;
 
-const SelectButton = styled(Button)<{ empty: boolean }>`
-  color: ${({ theme, empty }) =>
-    empty ? theme.colorTextPlaceholder : theme.colorTextBase};
+const SelectButton = styled(Button, {
+  shouldForwardProp: prop => prop !== '$empty',
+})<{ $empty: boolean }>`
+  color: ${({ theme, $empty }) =>
+    $empty ? theme.colorTextPlaceholder : theme.colorTextBase};
 `;
 
 export const SelectLabel = ({
@@ -410,7 +412,7 @@ export function DatabaseSelector({
             buttonStyle="tertiary"
             disabled={sqlLabModeConfig.disabled}
             loading={sqlLabModeConfig.loading}
-            empty={!sqlLabModeConfig.displayValue}
+            $empty={!sqlLabModeConfig.displayValue}
           >
             {displayValue}
           </SelectButton>

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

@@ -68,7 +68,7 @@ export function ActionsBar({ actions }: ActionsBarProps) {
         const IconComponent = Icons[icon as IconNameType];
         return (
           <ActionButton
-            key={tooltip ? undefined : index}
+            key={rest.label ?? index}
             icon={<IconComponent iconSize="l" />}
             tooltip={tooltip}
             {...rest}

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

@@ -81,7 +81,7 @@ function UIFilters(
             dateFilterValueType,
             min,
             max,
-            dropdownStyle,
+            popupStyle,
             autoComplete,
             inputName,
           },
@@ -114,7 +114,7 @@ function UIFilters(
                 paginate={paginate}
                 selects={selects}
                 loading={loading ?? false}
-                dropdownStyle={dropdownStyle}
+                dropdownStyle={popupStyle}
               />
             );
           }

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

@@ -66,7 +66,7 @@ export interface ListViewFilter {
   dateFilterValueType?: 'unix' | 'iso';
   min?: number;
   max?: number;
-  dropdownStyle?: React.CSSProperties;
+  popupStyle?: React.CSSProperties;
   autoComplete?: string;
   inputName?: string;
 }

superset-frontend/src/components/Modal/StandardModal.tsx

@@ -76,7 +76,7 @@ const StyledModal = styled(Modal)`
   .ant-collapse {
     border: none;
 
-    > .ant-collapse-item:first-child {
+    > .ant-collapse-item:first-of-type {
       border-top: none;
     }
 

superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx

@@ -252,7 +252,7 @@ const DashboardContentWrapper = styled.div`
         width: 100%;
       }
 
-      & > .empty-droptarget:first-child:not(.empty-droptarget--full) {
+      & > .empty-droptarget:first-of-type:not(.empty-droptarget--full) {
         height: ${theme.sizeUnit * 4}px;
         top: 0;
       }
@@ -298,7 +298,7 @@ const StyledDashboardContent = styled.div<{
     `}
 
       /* this is the ParentSize wrapper */
-    & > div:first-child {
+    & > div:first-of-type {
         height: 100% !important;
       }
     }

superset-frontend/src/dashboard/components/DashboardGrid.tsx

@@ -102,7 +102,7 @@ const GridContent = styled.div<{ editMode?: boolean }>`
       }
     }
 
-    & > .empty-droptarget:first-child {
+    & > .empty-droptarget:first-of-type {
       height: ${theme.sizeUnit * 4}px;
       margin-top: ${theme.sizeUnit * -4}px;
     }

superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx

@@ -148,7 +148,7 @@ type SliceHeaderControlsPropsWithRouter = SliceHeaderControlsProps &
   RouteComponentProps;
 
 const dropdownIconsStyles = css`
-  &&.anticon > .anticon:first-child {
+  &&.anticon > .anticon:first-of-type {
     margin-right: 0;
     vertical-align: 0;
   }

superset-frontend/src/dashboard/components/filterscope/FilterScope.test.tsx

@@ -171,7 +171,7 @@ function getCheckboxIcon(element: HTMLElement): Element {
  * checkbox state change is the fill color of the SVG icon.
  */
 function getCheckboxState(name: string): CheckboxState {
-  const element = screen.getByRole('link', { name });
+  const element = screen.getByRole('button', { name });
   const svgPath = getCheckboxIcon(element).children[1].children[0].children[0];
   const fill = svgPath.getAttribute('fill');
   return fill === supersetTheme.colorPrimary
@@ -183,7 +183,7 @@ function getCheckboxState(name: string): CheckboxState {
 
 // Replace the original clickCheckbox function with the async version
 async function clickCheckbox(name: string) {
-  const element = screen.getByRole('link', { name });
+  const element = screen.getByRole('button', { name });
   const checkboxLabel = getCheckboxIcon(element);
   await userEvent.click(checkboxLabel);
 }
@@ -204,11 +204,11 @@ test('renders with empty filters', () => {
 
 test('renders with filters values', () => {
   render(<FilterScopeSelector {...createProps()} />, { useRedux: true });
-  expect(screen.getByRole('link', { name: FILTER_A })).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: FILTER_B })).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: FILTER_C })).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: TAB_A })).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: TAB_B })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: FILTER_A })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: FILTER_B })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: FILTER_C })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: TAB_A })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: TAB_B })).toBeInTheDocument();
   expect(screen.queryByText(CHART_A)).not.toBeInTheDocument();
   expect(screen.queryByText(CHART_B)).not.toBeInTheDocument();
   expect(screen.queryByText(CHART_C)).not.toBeInTheDocument();
@@ -222,21 +222,21 @@ test('collapses/expands all filters', () => {
     useRedux: true,
   });
   userEvent.click(screen.getAllByRole('button', { name: COLLAPSE_ALL })[0]);
-  expect(screen.getByRole('link', { name: ALL_FILTERS })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: ALL_FILTERS })).toBeInTheDocument();
   expect(
-    screen.queryByRole('link', { name: FILTER_A }),
+    screen.queryByRole('button', { name: FILTER_A }),
   ).not.toBeInTheDocument();
   expect(
-    screen.queryByRole('link', { name: FILTER_B }),
+    screen.queryByRole('button', { name: FILTER_B }),
   ).not.toBeInTheDocument();
   expect(
-    screen.queryByRole('link', { name: FILTER_C }),
+    screen.queryByRole('button', { name: FILTER_C }),
   ).not.toBeInTheDocument();
   userEvent.click(screen.getAllByRole('button', { name: EXPAND_ALL })[0]);
-  expect(screen.getByRole('link', { name: ALL_FILTERS })).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: FILTER_A })).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: FILTER_B })).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: FILTER_C })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: ALL_FILTERS })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: FILTER_A })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: FILTER_B })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: FILTER_C })).toBeInTheDocument();
 });
 
 test('collapses/expands all charts', () => {
@@ -251,10 +251,10 @@ test('collapses/expands all charts', () => {
   expect(screen.queryByText(CHART_D)).not.toBeInTheDocument();
   userEvent.click(screen.getAllByRole('button', { name: EXPAND_ALL })[1]);
   expect(screen.getByText(ALL_CHARTS)).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: CHART_A })).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: CHART_B })).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: CHART_C })).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: CHART_D })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: CHART_A })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: CHART_B })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: CHART_C })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: CHART_D })).toBeInTheDocument();
 });
 
 test('searches for a chart', () => {
@@ -262,9 +262,13 @@ test('searches for a chart', () => {
     useRedux: true,
   });
   userEvent.type(screen.getByPlaceholderText('Search...'), CHART_C);
-  expect(screen.queryByRole('link', { name: CHART_A })).not.toBeInTheDocument();
-  expect(screen.queryByRole('link', { name: CHART_B })).not.toBeInTheDocument();
-  expect(screen.getByRole('link', { name: CHART_C })).toBeInTheDocument();
+  expect(
+    screen.queryByRole('button', { name: CHART_A }),
+  ).not.toBeInTheDocument();
+  expect(
+    screen.queryByRole('button', { name: CHART_B }),
+  ).not.toBeInTheDocument();
+  expect(screen.getByRole('button', { name: CHART_C })).toBeInTheDocument();
 });
 
 // Update all tests that use clickCheckbox to be async and await the function call

superset-frontend/src/dashboard/components/gridComponents/Column/Column.tsx

@@ -104,11 +104,11 @@ const ColumnStyles = styled.div<{ editMode: boolean }>`
         z-index: ${EMPTY_CONTAINER_Z_INDEX};
         width: 100%;
         height: ${theme.sizeUnit * 4}px;
-        &:first-child {
+        &:first-of-type {
           inset-block-start: 0;
         }
       }
-      &:first-child:not(.droptarget-edge) {
+      &:first-of-type:not(.droptarget-edge) {
         position: absolute;
         top: 0;
         left: 0;
@@ -116,7 +116,7 @@ const ColumnStyles = styled.div<{ editMode: boolean }>`
         width: 100%;
         height: 100%;
       }
-      &:not(:first-child):not(.droptarget-edge) {
+      &:not(:first-of-type):not(.droptarget-edge) {
         width: 100%;
         min-height: ${theme.sizeUnit * 4}px;
       }

superset-frontend/src/dashboard/components/gridComponents/Row/Row.tsx

@@ -100,7 +100,7 @@ const GridRow = styled.div<{ editMode: boolean }>`
         &:not(:last-child) {
           width: ${theme.sizeUnit * 4}px;
         }
-        &:first-child:not(.droptarget-side) {
+        &:first-of-type:not(.droptarget-side) {
           z-index: ${EMPTY_CONTAINER_Z_INDEX};
           position: absolute;
           width: 100%;
@@ -111,7 +111,7 @@ const GridRow = styled.div<{ editMode: boolean }>`
         z-index: ${EMPTY_CONTAINER_Z_INDEX};
         position: absolute;
         width: ${theme.sizeUnit * 4}px;
-        &:first-child {
+        &:first-of-type {
           inset-inline-start: 0;
         }
       }

superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.test.tsx

@@ -0,0 +1,99 @@
+/**
+ * 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 { ReactNode } from 'react';
+import { render, screen } from 'spec/helpers/testing-library';
+import {
+  ChartCustomization,
+  ChartCustomizationType,
+  Filter,
+  NativeFilterType,
+} from '@superset-ui/core';
+import { ChartCustomizationPlugins } from 'src/constants';
+import FilterControl from './FilterControl';
+
+jest.mock('src/dashboard/components/nativeFilters/state', () => ({
+  useIsFilterInScope: () => () => false,
+}));
+
+jest.mock('../Vertical', () => {
+  const { createContext } = require('react');
+  return {
+    FilterBarScrollContext: createContext(false),
+  };
+});
+
+jest.mock('./FilterValue', () => () => null);
+
+jest.mock('../../FilterCard', () => ({
+  FilterCard: ({ children }: { children: ReactNode }) => <>{children}</>,
+}));
+
+jest.mock('./GroupByFilterCard', () => () => null);
+
+jest.mock('../utils', () => ({
+  checkIsMissingRequiredValue: () => false,
+}));
+
+jest.mock('react-reverse-portal', () => ({
+  createHtmlPortalNode: () => ({}),
+  InPortal: ({ children }: { children: ReactNode }) => <>{children}</>,
+  OutPortal: () => null,
+}));
+
+const deckglFilter: ChartCustomization = {
+  id: 'filter1',
+  name: 'Layer Visibility',
+  filterType: ChartCustomizationPlugins.DeckglLayerVisibility,
+  type: ChartCustomizationType.ChartCustomization,
+  targets: [],
+  scope: { rootPath: [], excluded: [] },
+  controlValues: {},
+  defaultDataMask: {},
+};
+
+const nativeFilter: Filter = {
+  id: 'filter2',
+  name: 'Select Filter',
+  filterType: 'filter_select',
+  type: NativeFilterType.NativeFilter,
+  targets: [],
+  scope: { rootPath: [], excluded: [] },
+  controlValues: {},
+  defaultDataMask: {},
+  cascadeParentIds: [],
+  description: '',
+};
+
+test('renders DeckglLayerVisibilityTooltip for deckgl layer visibility filter type', () => {
+  render(
+    <FilterControl filter={deckglFilter} onFilterSelectionChange={jest.fn()} />,
+  );
+  expect(
+    screen.getByTestId('deckgl-layer-visibility-tooltip-icon'),
+  ).toBeInTheDocument();
+});
+
+test('does not render DeckglLayerVisibilityTooltip for standard filter type', () => {
+  render(
+    <FilterControl filter={nativeFilter} onFilterSelectionChange={jest.fn()} />,
+  );
+  expect(
+    screen.queryByTestId('deckgl-layer-visibility-tooltip-icon'),
+  ).not.toBeInTheDocument();
+});

superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.tsx

@@ -24,6 +24,7 @@ import {
 } from 'react-reverse-portal';
 import { FilterBarOrientation } from 'src/dashboard/types';
 import { isChartCustomization } from '@superset-ui/core';
+import { ChartCustomizationPlugins } from 'src/constants';
 import { checkIsMissingRequiredValue } from '../utils';
 import FilterValue from './FilterValue';
 import { FilterCard } from '../../FilterCard';
@@ -35,6 +36,7 @@ import {
   FilterStyledIcon,
   RequiredFieldIndicator,
   DescriptionToolTip,
+  DeckglLayerVisibilityTooltip,
   useFilterControlDisplay,
 } from './FilterControlShared';
 import GroupByFilterCard from './GroupByFilterCard';
@@ -85,6 +87,10 @@ const FilterControl = ({
         {filter.description?.trim() && (
           <DescriptionToolTip description={filter.description} />
         )}
+        {filter.filterType ===
+          ChartCustomizationPlugins.DeckglLayerVisibility && (
+          <DeckglLayerVisibilityTooltip />
+        )}
         <FilterStyledIcon data-test="filter-icon">{icon}</FilterStyledIcon>
       </FilterControlTitleBox>
     ),
@@ -94,6 +100,7 @@ const FilterControl = ({
       name,
       isRequired,
       filter.description,
+      filter.filterType,
       icon,
     ],
   );

superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControlShared.test.tsx

@@ -0,0 +1,34 @@
+/**
+ * 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, screen, userEvent } from 'spec/helpers/testing-library';
+import { DeckglLayerVisibilityTooltip } from './FilterControlShared';
+
+test('renders DeckglLayerVisibilityTooltip with icon button', () => {
+  render(<DeckglLayerVisibilityTooltip />);
+  expect(screen.getByRole('button')).toBeInTheDocument();
+});
+
+test('shows tooltip content on hover for DeckglLayerVisibilityTooltip', async () => {
+  render(<DeckglLayerVisibilityTooltip />);
+  userEvent.hover(screen.getByRole('button'));
+  const tooltip = await screen.findByRole('tooltip');
+  expect(tooltip).toHaveTextContent(
+    'Choose layers to hide from all deck.gl Multiple Layer charts in this dashboard.',
+  );
+});

superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControlShared.tsx

@@ -19,6 +19,7 @@
 import { useMemo } from 'react';
 import { truncationCSS } from '@superset-ui/core';
 import { styled, SupersetTheme } from '@apache-superset/core/theme';
+import { t } from '@apache-superset/core/translation';
 import {
   FormItem as StyledFormItem,
   Form,
@@ -201,6 +202,10 @@ const ToolTipContainer = styled.div`
   display: flex;
 `;
 
+const StyledInfoCircleOutlined = styled(Icons.InfoCircleOutlined)`
+  padding-left: ${({ theme }) => theme.sizeUnit}px;
+`;
+
 export const RequiredFieldIndicator = () => (
   <span
     css={(theme: SupersetTheme) => ({
@@ -231,12 +236,23 @@ export const DescriptionToolTip = ({
         whiteSpace: 'normal',
       }}
     >
-      <Icons.InfoCircleOutlined
+      <StyledInfoCircleOutlined className="text-muted" role="button" />
+    </Tooltip>
+  </ToolTipContainer>
+);
+
+export const DeckglLayerVisibilityTooltip = () => (
+  <ToolTipContainer>
+    <Tooltip
+      title={t(
+        'Choose layers to hide from all deck.gl Multiple Layer charts in this dashboard.',
+      )}
+      placement="right"
+    >
+      <StyledInfoCircleOutlined
         className="text-muted"
         role="button"
-        css={(theme: SupersetTheme) => ({
-          paddingLeft: `${theme.sizeUnit}px`,
-        })}
+        data-test="deckgl-layer-visibility-tooltip-icon"
       />
     </Tooltip>
   </ToolTipContainer>

superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterDivider.tsx

@@ -45,7 +45,7 @@ const HorizontalDivider = ({ title, description }: FilterDividerProps) => {
         border-left: 1px solid ${theme.colorSplit};
         padding-left: ${4 * theme.sizeUnit}px;
 
-        .filter-item-wrapper:first-child & {
+        .filter-item-wrapper:first-of-type & {
           border-left: none;
           padding-left: 0;
         }

superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.timeGrain.test.ts

@@ -0,0 +1,60 @@
+/**
+ * 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 { ChartDataResponseResult } from '@superset-ui/core';
+import { applyTimeGrainAllowlist } from './FilterValue';
+
+const baseResults = [
+  {
+    data: [
+      { duration: 'PT1H', name: 'Hour' },
+      { duration: 'P1D', name: 'Day' },
+      { duration: 'P1W', name: 'Week' },
+      { duration: 'P1M', name: 'Month' },
+    ],
+  },
+] as unknown as ChartDataResponseResult[];
+
+test('applyTimeGrainAllowlist should filter to configured durations', () => {
+  const filtered = applyTimeGrainAllowlist(
+    'filter_timegrain',
+    ['PT1H', 'P1D', 'P1W'],
+    baseResults,
+  );
+
+  expect(filtered[0].data).toEqual([
+    { duration: 'PT1H', name: 'Hour' },
+    { duration: 'P1D', name: 'Day' },
+    { duration: 'P1W', name: 'Week' },
+  ]);
+});
+
+test('applyTimeGrainAllowlist should return unfiltered results for non-timegrain filters', () => {
+  const filtered = applyTimeGrainAllowlist(
+    'filter_select',
+    ['PT1H'],
+    baseResults,
+  );
+  expect(filtered).toEqual(baseResults);
+});
+
+test('applyTimeGrainAllowlist should return unfiltered results when allowlist is empty', () => {
+  const filtered = applyTimeGrainAllowlist('filter_timegrain', [], baseResults);
+  expect(filtered).toEqual(baseResults);
+});

superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx

@@ -61,7 +61,7 @@ import { RESPONSIVE_WIDTH } from 'src/filters/components/common';
 import { dispatchHoverAction, dispatchFocusAction } from './utils';
 import { FilterControlProps } from './types';
 import { getFormData } from '../../utils';
-import { useFilterDependencies } from './state';
+import { useFilterDependencies, useTransitiveParentIds } from './state';
 import { useFilterOutlined } from '../useFilterOutlined';
 
 const HEIGHT = 32;
@@ -84,6 +84,35 @@ const StyledDiv = styled.div<{
 
 const queriesDataPlaceholder = [{ data: [{}] }];
 
+type TimeGrainFilterConfig = {
+  time_grains?: string[];
+};
+
+export const applyTimeGrainAllowlist = (
+  filterType: string,
+  allowedTimeGrains: string[] | undefined,
+  results: ChartDataResponseResult[],
+): ChartDataResponseResult[] => {
+  if (filterType !== 'filter_timegrain' || !allowedTimeGrains?.length) {
+    return results;
+  }
+
+  return results.map(result => {
+    if (!Array.isArray(result.data)) {
+      return result;
+    }
+
+    return {
+      ...result,
+      data: result.data.filter(row =>
+        allowedTimeGrains.includes(
+          (row as { duration?: string }).duration ?? '',
+        ),
+      ),
+    };
+  });
+};
+
 const useShouldFilterRefresh = () => {
   const isDashboardRefreshing = useSelector<RootState, boolean>(
     state => state.dashboardState.isRefreshing,
@@ -114,11 +143,15 @@ const FilterValue: FC<FilterValueProps> = ({
 }) => {
   const { id, targets, filterType } = filter;
   const isCustomization = isChartCustomization(filter);
+  const allowedTimeGrains = isCustomization
+    ? undefined
+    : (filter as TimeGrainFilterConfig).time_grains;
   const adhocFilters = isCustomization ? undefined : filter.adhoc_filters;
   const timeRange = isCustomization ? undefined : filter.time_range;
   const granularitySqla = isCustomization ? undefined : filter.granularity_sqla;
   const metadata = getChartMetadataRegistry().get(filterType);
   const dependencies = useFilterDependencies(id, dataMaskSelected);
+  const transitiveParentIds = useTransitiveParentIds(id);
   const shouldRefresh = useShouldFilterRefresh();
 
   const behaviors = useMemo(
@@ -187,12 +220,15 @@ const FilterValue: FC<FilterValueProps> = ({
       dashboardId,
     });
     const filterOwnState = filter.dataMask?.ownState || {};
-    if ((filter.cascadeParentIds ?? []).length) {
-      // Prevent unnecessary backend requests by validating parent filter selections first
+    if (transitiveParentIds.length) {
+      // Prevent unnecessary backend requests by validating ancestor filter
+      // selections first. We walk the full transitive ancestor chain (not just
+      // direct parents) so the counts line up with `dependencies`, which is
+      // itself built from the transitive chain by `useFilterDependencies`.
 
       let selectedParentFilterValueCounts = 0;
       let isTimeRangeSelected = false;
-      (filter.cascadeParentIds ?? []).forEach(pId => {
+      transitiveParentIds.forEach(pId => {
         const extraFormData = dataMaskSelected?.[pId]?.extraFormData;
         if (extraFormData?.filters?.length) {
           selectedParentFilterValueCounts += extraFormData.filters.length;
@@ -202,7 +238,7 @@ const FilterValue: FC<FilterValueProps> = ({
         }
       });
 
-      // check if all parent filters with defaults have a value selected
+      // check if all ancestor filters with defaults have a value selected
 
       const depsCount = dependencies.filters?.length ?? 0;
       const hasTimeRangeDeps = Boolean(dependencies?.time_range);
@@ -212,7 +248,7 @@ const FilterValue: FC<FilterValueProps> = ({
         (hasTimeRangeDeps && !isTimeRangeSelected)
       ) {
         // child filter should not request backend until it
-        // has all the required information from parent filters
+        // has all the required information from ancestor filters
         return;
       }
       setHasDepsFilterValue(false);
@@ -247,12 +283,24 @@ const FilterValue: FC<FilterValueProps> = ({
             // deal with getChartDataRequest transforming the response data
             const result = 'result' in json ? json.result[0] : json;
             if (response.status === 200) {
-              setState([result as ChartDataResponseResult]);
+              setState(
+                applyTimeGrainAllowlist(filterType, allowedTimeGrains, [
+                  result as ChartDataResponseResult,
+                ]),
+              );
+              setError(undefined);
               handleFilterLoadFinish();
             } else if (response.status === 202) {
               waitForAsyncData(result as Parameters<typeof waitForAsyncData>[0])
                 .then((asyncResult: ChartDataResponseResult[]) => {
-                  setState(asyncResult);
+                  setState(
+                    applyTimeGrainAllowlist(
+                      filterType,
+                      allowedTimeGrains,
+                      asyncResult,
+                    ),
+                  );
+                  setError(undefined);
                   handleFilterLoadFinish();
                 })
                 .catch((error: Response) => {
@@ -267,7 +315,13 @@ const FilterValue: FC<FilterValueProps> = ({
               );
             }
           } else {
-            setState(json.result as ChartDataResponseResult[]);
+            setState(
+              applyTimeGrainAllowlist(
+                filterType,
+                allowedTimeGrains,
+                json.result as ChartDataResponseResult[],
+              ),
+            );
             setError(undefined);
             handleFilterLoadFinish();
           }
@@ -286,11 +340,13 @@ const FilterValue: FC<FilterValueProps> = ({
     groupby,
     handleFilterLoadFinish,
     filter,
+    allowedTimeGrains,
     hasDataSource,
     isRefreshing,
     shouldRefresh,
     dataMaskSelected,
     setHasDepsFilterValue,
+    transitiveParentIds,
   ]);
 
   useEffect(() => {

superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/state.test.ts

@@ -0,0 +1,177 @@
+/**
+ * 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 configureStore from 'redux-mock-store';
+import { createElement } from 'react';
+import type { ReactNode } from 'react';
+import type { DataMaskStateWithId } from '@superset-ui/core';
+import {
+  FilterConfigMap,
+  resolveTransitiveParentIds,
+} from '../../dependencyGraph';
+import { useFilterDependencies, useTransitiveParentIds } from './state';
+
+const mockStore = configureStore([]);
+
+const buildWrapper = (filters: FilterConfigMap) => {
+  const store = mockStore({ nativeFilters: { filters } });
+  return ({ children }: { children: ReactNode }) =>
+    createElement(Provider, { store }, children);
+};
+
+test('resolveTransitiveParentIds returns empty for a filter with no parents', () => {
+  expect(
+    resolveTransitiveParentIds('A', {
+      A: { cascadeParentIds: [] },
+    }),
+  ).toEqual([]);
+});
+
+test('resolveTransitiveParentIds walks a linear chain A -> B -> C -> D', () => {
+  // D depends on C, C on B, B on A; each level only lists its direct parent.
+  const result = resolveTransitiveParentIds('D', {
+    A: { cascadeParentIds: [] },
+    B: { cascadeParentIds: ['A'] },
+    C: { cascadeParentIds: ['B'] },
+    D: { cascadeParentIds: ['C'] },
+  });
+  // Furthest ancestor first, closest parent last.
+  expect(result).toEqual(['A', 'B', 'C']);
+});
+
+test('resolveTransitiveParentIds deduplicates shared ancestors in a diamond', () => {
+  //      A
+  //    /  \
+  //   B    C
+  //    \  /
+  //     D
+  const result = resolveTransitiveParentIds('D', {
+    A: { cascadeParentIds: [] },
+    B: { cascadeParentIds: ['A'] },
+    C: { cascadeParentIds: ['A'] },
+    D: { cascadeParentIds: ['B', 'C'] },
+  });
+  expect(result).toContain('A');
+  expect(result).toContain('B');
+  expect(result).toContain('C');
+  // A should only appear once even though reachable via B and C.
+  expect(result.filter(id => id === 'A')).toHaveLength(1);
+});
+
+test('resolveTransitiveParentIds defends against cyclic configuration', () => {
+  // Filter config modal enforces acyclicity, but malformed saved state
+  // should not spin forever here.
+  const result = resolveTransitiveParentIds('A', {
+    A: { cascadeParentIds: ['B'] },
+    B: { cascadeParentIds: ['A'] },
+  });
+  expect(result).toEqual(['B']);
+});
+
+test('resolveTransitiveParentIds tolerates missing filter entries', () => {
+  // Unknown parent id referenced in cascadeParentIds should not crash.
+  expect(
+    resolveTransitiveParentIds('X', {
+      X: { cascadeParentIds: ['Y'] },
+    }),
+  ).toEqual(['Y']);
+});
+
+test('useTransitiveParentIds reads filter config from redux', () => {
+  const wrapper = buildWrapper({
+    A: { cascadeParentIds: [] },
+    B: { cascadeParentIds: ['A'] },
+    C: { cascadeParentIds: ['B'] },
+  });
+  const { result } = renderHook(() => useTransitiveParentIds('C'), { wrapper });
+  expect(result.current).toEqual(['A', 'B']);
+});
+
+test('useFilterDependencies merges extraFormData across the full chain', () => {
+  // Regression test for sc-102912: a chain A -> B -> C -> D where each level
+  // only lists its direct parent must still produce extra_form_data that
+  // includes clauses from every ancestor, not just the closest parent.
+  const wrapper = buildWrapper({
+    A: { cascadeParentIds: [] },
+    B: { cascadeParentIds: ['A'] },
+    C: { cascadeParentIds: ['B'] },
+    D: { cascadeParentIds: ['C'] },
+  });
+  const dataMaskSelected: DataMaskStateWithId = {
+    A: {
+      id: 'A',
+      extraFormData: { filters: [{ col: 'country', op: 'IN', val: ['US'] }] },
+    },
+    B: {
+      id: 'B',
+      extraFormData: { filters: [{ col: 'region', op: 'IN', val: ['West'] }] },
+    },
+    C: {
+      id: 'C',
+      extraFormData: { filters: [{ col: 'state', op: 'IN', val: ['CA'] }] },
+    },
+  };
+  const { result } = renderHook(
+    () => useFilterDependencies('D', dataMaskSelected),
+    { wrapper },
+  );
+  const cols = (result.current.filters ?? []).map(f => f.col);
+  // All three ancestor clauses must be present.
+  expect(cols).toEqual(expect.arrayContaining(['country', 'region', 'state']));
+  expect(result.current.filters ?? []).toHaveLength(3);
+});
+
+test('useFilterDependencies lets the closest ancestor override scalar fields', () => {
+  // `mergeExtraFormData` appends filter arrays but overrides scalar fields
+  // like `time_range`. Topological order must put the closest parent last so
+  // its scalar overrides win over further ancestors.
+  const wrapper = buildWrapper({
+    A: { cascadeParentIds: [] },
+    B: { cascadeParentIds: ['A'] },
+    C: { cascadeParentIds: ['B'] },
+  });
+  const dataMaskSelected: DataMaskStateWithId = {
+    A: {
+      id: 'A',
+      extraFormData: { time_range: 'Last year' },
+    },
+    B: {
+      id: 'B',
+      extraFormData: { time_range: 'Last month' },
+    },
+  };
+  const { result } = renderHook(
+    () => useFilterDependencies('C', dataMaskSelected),
+    { wrapper },
+  );
+  // B is C's closest ancestor with a time_range, so it should win over A.
+  expect(result.current.time_range).toBe('Last month');
+});
+
+test('useFilterDependencies returns empty object when parent state is missing', () => {
+  const wrapper = buildWrapper({
+    A: { cascadeParentIds: [] },
+    B: { cascadeParentIds: ['A'] },
+  });
+  const { result } = renderHook(() => useFilterDependencies('B', {}), {
+    wrapper,
+  });
+  expect(result.current).toEqual({});
+});

superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/state.ts

@@ -18,25 +18,41 @@
  */
 import { useMemo } from 'react';
 import { shallowEqual, useSelector } from 'react-redux';
-import {
-  DataMaskStateWithId,
-  ensureIsArray,
-  ExtraFormData,
-} from '@superset-ui/core';
+import { DataMaskStateWithId, ExtraFormData } from '@superset-ui/core';
+import { RootState } from 'src/dashboard/types';
 import { mergeExtraFormData } from '../../utils';
+import {
+  FilterConfigMap,
+  resolveTransitiveParentIds,
+} from '../../dependencyGraph';
+
+/**
+ * Resolve the transitive ancestor ids for a given filter from the live
+ * native-filter configuration in Redux. Shared between
+ * `useFilterDependencies` and the readiness guard in `FilterValue` so they
+ * always agree on which parents count.
+ */
+export function useTransitiveParentIds(id: string): string[] {
+  const filterConfig = useSelector<RootState, FilterConfigMap | undefined>(
+    state => state.nativeFilters?.filters,
+    shallowEqual,
+  );
+
+  return useMemo(
+    () => resolveTransitiveParentIds(id, filterConfig ?? {}),
+    [id, filterConfig],
+  );
+}
 
-// eslint-disable-next-line import/prefer-default-export
 export function useFilterDependencies(
   id: string,
   dataMaskSelected?: DataMaskStateWithId,
 ): ExtraFormData {
-  const dependencyIds = useSelector<any, string[] | undefined>(
-    state => state.nativeFilters.filters[id]?.cascadeParentIds,
-    shallowEqual,
-  );
+  const dependencyIds = useTransitiveParentIds(id);
+
   return useMemo(() => {
-    let dependencies = {};
-    ensureIsArray(dependencyIds).forEach(parentId => {
+    let dependencies: ExtraFormData = {};
+    dependencyIds.forEach(parentId => {
       const parentState = dataMaskSelected?.[parentId];
       dependencies = mergeExtraFormData(
         dependencies,

superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitleContainer.tsx

@@ -212,6 +212,7 @@ const FilterTitleContainer = forwardRef<HTMLDivElement, Props>(
                   onRemove(id);
                 }}
                 alt={t('Remove filter')}
+                data-test="filter-remove-button"
               />
             )}
           </div>

superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx

@@ -107,6 +107,7 @@ import RemovedFilter from './RemovedFilter';
 import { useBackendFormUpdate, useDefaultValue } from './state';
 import {
   hasTemporalColumns,
+  getTimeGrainOptions,
   isValidFilterValue,
   mostUsedDataset,
   setNativeFilterFieldValues,
@@ -262,6 +263,12 @@ export interface FiltersConfigFormProps {
 
 const FILTERS_WITH_ADHOC_FILTERS = ['filter_select', 'filter_range'];
 
+const getOptionDataTest = (
+  prefix: string,
+  value: string | number | undefined,
+) =>
+  `${prefix}-${String(value ?? 'undefined').replace(/[^a-zA-Z0-9_-]/g, '-')}`;
+
 // TODO: Rename the filter plugins and remove this mapping
 const FILTER_TYPE_NAME_MAPPING = {
   [t('Select filter')]: t('Value'),
@@ -579,6 +586,10 @@ const FiltersConfigForm = (
     !!filterToEdit?.adhoc_filters?.length ||
     !!filterToEdit?.time_range;
 
+  const hasTimeGrainPreFilter = !!(
+    formFilter?.time_grains?.length || filterToEdit?.time_grains?.length
+  );
+
   const hasEnableSingleValue =
     formFilter?.controlValues?.enableSingleValue !== undefined ||
     filterToEdit?.controlValues?.enableSingleValue !== undefined;
@@ -746,6 +757,7 @@ const FiltersConfigForm = (
             'schema',
             'sql',
             'table_name',
+            'time_grain_sqla',
           ],
         })}`,
       })
@@ -936,6 +948,16 @@ const FiltersConfigForm = (
                             label: name || pluginKey,
                           };
                         })}
+                        optionRender={option => (
+                          <span
+                            data-test={getOptionDataTest(
+                              'customization-type-option',
+                              option.value,
+                            )}
+                          >
+                            {option.label || option.value}
+                          </span>
+                        )}
                         onChange={value => {
                           setNativeFilterFieldValues(form, filterId, {
                             filterType: value,
@@ -994,6 +1016,16 @@ const FiltersConfigForm = (
                             disabled: isDisabled,
                           };
                         })}
+                        optionRender={option => (
+                          <span
+                            data-test={getOptionDataTest(
+                              'filter-type-option',
+                              option.value,
+                            )}
+                          >
+                            {option.label || option.value}
+                          </span>
+                        )}
                         onChange={value => {
                           setNativeFilterFieldValues(form, filterId, {
                             filterType: value,
@@ -1254,6 +1286,78 @@ const FiltersConfigForm = (
                                     </CollapsibleControl>
                                   </FormItem>
                                 )}
+                                {itemTypeField === 'filter_timegrain' &&
+                                  hasDataset &&
+                                  datasetDetails?.time_grain_sqla &&
+                                  datasetDetails.time_grain_sqla.length > 0 && (
+                                    <FormItem
+                                      name={[
+                                        'filters',
+                                        filterId,
+                                        'preFilterTimegrain',
+                                      ]}
+                                    >
+                                      <CollapsibleControl
+                                        initialValue={hasTimeGrainPreFilter}
+                                        title={t('Pre-filter available values')}
+                                        tooltip={t(
+                                          'Select which time grains are available in the filter control. This is a UI allow list only and does not add extra conditions to the underlying queries.',
+                                        )}
+                                        onChange={checked => {
+                                          if (!checked) {
+                                            setNativeFilterFieldValues(
+                                              form,
+                                              filterId,
+                                              { time_grains: undefined },
+                                            );
+                                            forceUpdate();
+                                          }
+                                          formChanged();
+                                        }}
+                                      >
+                                        <FormItem
+                                          name={[
+                                            'filters',
+                                            filterId,
+                                            'time_grains',
+                                          ]}
+                                          initialValue={
+                                            filterToEdit?.time_grains
+                                          }
+                                          {...getFiltersConfigModalTestId(
+                                            'time-grain-allowlist',
+                                          )}
+                                        >
+                                          <Select
+                                            mode="multiple"
+                                            ariaLabel={t('Time grain options')}
+                                            options={getTimeGrainOptions(
+                                              datasetDetails.time_grain_sqla,
+                                            )}
+                                            sortComparator={() => 0}
+                                            onChange={(values: string[]) => {
+                                              setNativeFilterFieldValues(
+                                                form,
+                                                filterId,
+                                                {
+                                                  time_grains:
+                                                    values.length > 0 &&
+                                                    values.length <
+                                                      datasetDetails
+                                                        .time_grain_sqla.length
+                                                      ? values
+                                                      : undefined,
+                                                },
+                                              );
+                                              forceUpdate();
+                                              formChanged();
+                                            }}
+                                            css={{ width: INPUT_WIDTH }}
+                                          />
+                                        </FormItem>
+                                      </CollapsibleControl>
+                                    </FormItem>
+                                  )}
                                 {itemTypeField !== 'filter_range' ? (
                                   <FormItem
                                     name={['filters', filterId, 'sortFilter']}
@@ -1347,24 +1451,21 @@ const FiltersConfigForm = (
                                               }),
                                             )}
                                             onChange={value => {
-                                              if (value !== undefined) {
-                                                const previous =
-                                                  form.getFieldValue(
-                                                    'filters',
-                                                  )?.[filterId].controlValues ||
-                                                  {};
-                                                setNativeFilterFieldValues(
-                                                  form,
-                                                  filterId,
-                                                  {
-                                                    controlValues: {
-                                                      ...previous,
-                                                      sortMetric: value,
-                                                    },
+                                              const previous =
+                                                form.getFieldValue('filters')?.[
+                                                  filterId
+                                                ].controlValues || {};
+                                              setNativeFilterFieldValues(
+                                                form,
+                                                filterId,
+                                                {
+                                                  controlValues: {
+                                                    ...previous,
+                                                    sortMetric: value,
                                                   },
-                                                );
-                                                forceUpdate();
-                                              }
+                                                },
+                                              );
+                                              forceUpdate();
                                               formChanged();
                                             }}
                                           />

superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/TimeGrainPreFilter.test.tsx

@@ -0,0 +1,203 @@
+/**
+ * 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 {
+  cleanup,
+  render,
+  screen,
+  userEvent,
+  waitFor,
+} from 'spec/helpers/testing-library';
+import { Form, Select } from '@superset-ui/core/components';
+import { CollapsibleControl } from './CollapsibleControl';
+import { getTimeGrainOptions } from './utils';
+
+/**
+ * Tests for the Time Grain Pre-filter feature (CollapsibleControl + Select).
+ *
+ * These tests verify:
+ * - Options are rendered in database order (no client-side sorting)
+ * - A saved subset of time_grains is loaded and shown as selected values
+ * - The CollapsibleControl checkbox shows/hides the Select
+ * - Toggling the checkbox off clears the underlying selection
+ */
+
+const TIME_GRAIN_TUPLES: [string, string][] = [
+  ['PT1S', 'Second'],
+  ['PT1M', 'Minute'],
+  ['PT1H', 'Hour'],
+  ['P1D', 'Day'],
+  ['P1W', 'Week'],
+];
+
+// NOTE: This file uses the real AntD Select. In jsdom, rc-overflow schedules
+// deferred updates (raf/timers) that can fire after unmount and cause
+// "state update on unmounted component" warnings. Scoped fake timers let us
+// clear pending work deterministically during teardown for this test only.
+beforeEach(() => {
+  jest.useFakeTimers();
+});
+
+afterEach(() => {
+  cleanup();
+  jest.clearAllTimers();
+  jest.useRealTimers();
+});
+
+const renderPreFilter = (props: {
+  savedGrains?: string[];
+  initialChecked?: boolean;
+  onChangeMock?: jest.Mock;
+}) => {
+  const {
+    savedGrains,
+    initialChecked = false,
+    onChangeMock = jest.fn(),
+  } = props;
+  const options = getTimeGrainOptions(TIME_GRAIN_TUPLES);
+
+  const PreFilterHarness = () => {
+    const [form] = Form.useForm();
+
+    const handleToggle = (checked: boolean) => {
+      // Mirrors the real form behavior: clear persisted values when disabled.
+      if (!checked) {
+        form.setFieldValue('time_grains', undefined);
+      }
+      onChangeMock(checked);
+    };
+
+    return (
+      <Form form={form}>
+        <CollapsibleControl
+          title="Pre-filter available values"
+          initialValue={initialChecked}
+          onChange={handleToggle}
+        >
+          <Form.Item name="time_grains" initialValue={savedGrains}>
+            <Select
+              mode="multiple"
+              ariaLabel="Time grain options"
+              options={options}
+              sortComparator={() => 0}
+            />
+          </Form.Item>
+        </CollapsibleControl>
+        <Form.Item noStyle shouldUpdate>
+          {() => (
+            <div data-test="time-grains-value">
+              {JSON.stringify(form.getFieldValue('time_grains') ?? null)}
+            </div>
+          )}
+        </Form.Item>
+      </Form>
+    );
+  };
+
+  return render(<PreFilterHarness />);
+};
+
+test('time grain options preserve database order (no sorting)', async () => {
+  renderPreFilter({ initialChecked: true });
+
+  const combobox = screen.getByRole('combobox', {
+    name: /Time grain options/i,
+  });
+  await userEvent.click(combobox);
+
+  const labels = (await screen.findAllByRole('option')).map(
+    option => option.textContent,
+  );
+
+  // Options must follow database order: Second, Minute, Hour, Day, Week
+  expect(labels).toEqual(['Second', 'Minute', 'Hour', 'Day', 'Week']);
+});
+
+test('saved time grains are loaded as selected values', () => {
+  renderPreFilter({ savedGrains: ['P1D', 'P1W'], initialChecked: true });
+
+  expect(screen.getByTitle('Day')).toBeInTheDocument();
+  expect(screen.getByTitle('Week')).toBeInTheDocument();
+  expect(screen.queryByTitle('Second')).not.toBeInTheDocument();
+  expect(screen.getByTestId('time-grains-value')).toHaveTextContent(
+    '["P1D","P1W"]',
+  );
+});
+
+test('unchecking CollapsibleControl clears underlying time_grains selection', async () => {
+  renderPreFilter({ savedGrains: ['P1D', 'P1W'], initialChecked: true });
+
+  expect(screen.getByTestId('time-grains-value')).toHaveTextContent(
+    '["P1D","P1W"]',
+  );
+
+  const checkbox = screen.getByRole('checkbox', {
+    name: /Pre-filter available values/i,
+  });
+  await userEvent.click(checkbox);
+
+  await waitFor(() => {
+    expect(screen.queryByRole('combobox')).not.toBeInTheDocument();
+    expect(screen.getByTestId('time-grains-value')).toHaveTextContent('null');
+  });
+});
+
+test('CollapsibleControl checkbox shows and hides the grain Select', async () => {
+  renderPreFilter({});
+
+  // Initially unchecked — select should be hidden
+  expect(screen.queryByRole('combobox')).not.toBeInTheDocument();
+
+  const checkbox = screen.getByRole('checkbox', {
+    name: /Pre-filter available values/i,
+  });
+  await userEvent.click(checkbox);
+
+  // After checking — select should appear
+  expect(screen.getByRole('combobox')).toBeInTheDocument();
+
+  await userEvent.click(checkbox);
+
+  // After unchecking — select should disappear
+  expect(screen.queryByRole('combobox')).not.toBeInTheDocument();
+});
+
+test('CollapsibleControl starts expanded when initialValue is true', () => {
+  renderPreFilter({ initialChecked: true });
+
+  // When initialValue=true the checkbox is checked and children are visible
+  expect(screen.getByRole('combobox')).toBeInTheDocument();
+  const checkbox = screen.getByRole('checkbox', {
+    name: /Pre-filter available values/i,
+  });
+  expect(checkbox).toBeChecked();
+});
+
+test('onChange is called with correct value when checkbox is toggled', async () => {
+  const onChangeMock = jest.fn();
+  renderPreFilter({ onChangeMock });
+
+  const checkbox = screen.getByRole('checkbox', {
+    name: /Pre-filter available values/i,
+  });
+  await userEvent.click(checkbox);
+  expect(onChangeMock).toHaveBeenCalledWith(true);
+
+  await userEvent.click(checkbox);
+  expect(onChangeMock).toHaveBeenCalledWith(false);
+});

superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.test.ts

@@ -30,6 +30,7 @@ import {
   shouldShowTimeRangePicker,
   mostUsedDataset,
   doesColumnMatchFilterType,
+  getTimeGrainOptions,
 } from './utils';
 
 // Test hasTemporalColumns - validates time range pre-filter visibility logic
@@ -276,3 +277,29 @@ test('isValidFilterValue returns false when range filter value is not an array',
   expect(isValidFilterValue(null, true)).toBe(false);
   expect(isValidFilterValue(undefined, true)).toBe(false);
 });
+
+test('getTimeGrainOptions normalizes tuple payloads into visible select options', () => {
+  expect(
+    getTimeGrainOptions([
+      ['P1D', 'Day'],
+      ['PT1H', 'Hour'],
+      ['P1W', 'Week'],
+    ]),
+  ).toEqual([
+    { value: 'P1D', label: 'Day' },
+    { value: 'PT1H', label: 'Hour' },
+    { value: 'P1W', label: 'Week' },
+  ]);
+});
+
+test('getTimeGrainOptions falls back to value when tuple label is empty', () => {
+  expect(
+    getTimeGrainOptions([
+      ['P1D', ''],
+      ['P1W', 'Week'],
+    ]),
+  ).toEqual([
+    { value: 'P1D', label: 'P1D' },
+    { value: 'P1W', label: 'Week' },
+  ]);
+});

superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.ts

@@ -27,6 +27,16 @@ import { FILTER_SUPPORTED_TYPES } from './constants';
 
 const FILTERS_FIELD_NAME = 'filters';
 
+type TimeGrainTuple = [string, string];
+
+export const getTimeGrainOptions = (
+  timeGrains: TimeGrainTuple[] = [],
+): { value: string; label: string }[] =>
+  timeGrains.map(timeGrain => {
+    const [value, label] = timeGrain;
+    return { value, label: label || value };
+  });
+
 export const useForceUpdate = (isActive = true) => {
   const [, updateState] = useState({});
   return useCallback(() => {

superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/transformers/filterTransformer.ts

@@ -127,6 +127,9 @@ function transformFormInput(
     adhoc_filters: formInputs.adhoc_filters,
     time_range: formInputs.time_range,
     granularity_sqla: formInputs.granularity_sqla,
+    time_grains: formInputs.time_grains?.length
+      ? formInputs.time_grains
+      : undefined,
     sortMetric: formInputs.sortMetric ?? null,
     requiredFirst: formInputs.requiredFirst
       ? Object.values(formInputs.requiredFirst).find(rf => rf)

superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/types.ts

@@ -51,6 +51,7 @@ export interface NativeFiltersFormItem {
   adhoc_filters?: AdhocFilter[];
   time_range?: string;
   granularity_sqla?: string;
+  time_grains?: string[];
   type: typeof NativeFilterType.NativeFilter;
   description: string;
 }

superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts

@@ -140,6 +140,9 @@ export const createHandleSave =
         time_range: formInputs.time_range,
         controlValues: formInputs.controlValues ?? {},
         granularity_sqla: formInputs.granularity_sqla,
+        ...(formInputs.time_grains?.length
+          ? { time_grains: formInputs.time_grains }
+          : {}),
         requiredFirst: Object.values(formInputs.requiredFirst ?? {}).find(
           rf => rf,
         ),

superset-frontend/src/dashboard/components/nativeFilters/dependencyGraph.ts

@@ -0,0 +1,75 @@
+/**
+ * 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 { ensureIsArray } from '@superset-ui/core';
+
+/**
+ * Shared graph primitives for the native-filter dependency graph.
+ *
+ * A dependent filter stores only its *direct* parents in `cascadeParentIds`,
+ * but most consumers (options queries, `extra_form_data` emitted to charts,
+ * readiness checks) need the full transitive ancestor set. Keeping the graph
+ * primitives here lets the hook layer and any non-React callers (e.g. form
+ * validation, batch checks) share one traversal implementation.
+ */
+
+/**
+ * Minimal shape we need from the native-filter config map. Kept intentionally
+ * narrow so dividers / chart customizations (which may omit `cascadeParentIds`)
+ * are also assignable.
+ */
+export type FilterConfigMap = Record<string, { cascadeParentIds?: string[] }>;
+
+/**
+ * Resolve the full set of transitive ancestor filter ids for the given filter,
+ * in topological order (furthest ancestor first, closest parent last).
+ *
+ * The ordering is significant: `mergeExtraFormData` appends filter arrays but
+ * *overrides* scalar fields like `time_range`, so iterating ancestors from
+ * furthest to closest makes the closest parent's scalar overrides win. A chain
+ * A -> B -> C -> D where each level lists only its direct parent therefore
+ * produces `[A, B, C]` for D, which matches the intended precedence.
+ *
+ * Cycles are silently skipped. The filter-config modal enforces acyclicity at
+ * save time (see `hasCircularDependency`), but defensive traversal here keeps
+ * a malformed saved config from spinning forever.
+ */
+export function resolveTransitiveParentIds(
+  id: string,
+  filterConfig: FilterConfigMap,
+): string[] {
+  const ordered: string[] = [];
+  const visited = new Set<string>([id]);
+
+  const visit = (currentId: string) => {
+    const parents = ensureIsArray(
+      filterConfig[currentId]?.cascadeParentIds,
+    ) as string[];
+    parents.forEach(parentId => {
+      if (visited.has(parentId)) return;
+      visited.add(parentId);
+      // Depth-first so the furthest ancestors are appended before the
+      // closer parents, giving a stable topological order.
+      visit(parentId);
+      ordered.push(parentId);
+    });
+  };
+
+  visit(id);
+  return ordered;
+}

superset-frontend/src/dashboard/components/nativeFilters/utils.test.ts

@@ -19,7 +19,11 @@
 import { Behavior } from '@superset-ui/core';
 import { DashboardLayout } from 'src/dashboard/types';
 import { CHART_TYPE } from 'src/dashboard/util/componentTypes';
-import { nativeFilterGate, findTabsWithChartsInScope } from './utils';
+import {
+  nativeFilterGate,
+  findTabsWithChartsInScope,
+  getFormData,
+} from './utils';
 
 // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
 describe('nativeFilterGate', () => {
@@ -81,3 +85,18 @@ test('findTabsWithChartsInScope should handle a recursive layout structure', ()
     [],
   );
 });
+
+test('getFormData should include persisted time_grains for time grain filters', () => {
+  const formData = getFormData({
+    dashboardId: 10,
+    id: 'NATIVE_FILTER-1',
+    filterType: 'filter_timegrain',
+    type: 'NATIVE_FILTER' as any,
+    controlValues: {},
+    defaultDataMask: {},
+    datasetId: 11,
+    time_grains: ['PT1H', 'P1D', 'P1W'],
+  });
+
+  expect((formData as any).time_grains).toEqual(['PT1H', 'P1D', 'P1W']);
+});