fix(explore): require a value for simple adhoc filters before allowing save

The Save button in the adhoc filter popover stayed enabled when a comparator-taking operator had no value, because `AdhocFilter.isValid()` only rejected a `null` comparator. An unset comparator is `undefined`, not `null`: selecting a subject resets it (and falls back to the `IN` operator), and the value Select's clear affordance emits `undefined` as well. This was most visible on boolean columns, whose operator list is restricted to unary operators, so a freshly picked boolean column lands on `IN` with no value and the popover looks complete. Saving sent a filter with no `val` to the query API, which tripped a bare `assert isinstance(eq, (tuple, list))` in the query builder and surfaced as a generic error instead of inline client-side validation. Extend the existing check to treat `undefined` like `null`, matching the empty-array guard already applied to `IN`/`NOT IN` comparators. Unary operators are unaffected: they short-circuit earlier via DISABLE_INPUT_OPERATORS.
2026-08-21 23:51:17 +00:00 · 2026-08-18 23:55:54 +00:00
487 changed files with 3884 additions and 14492 deletions
@@ -1,6 +1,6 @@
 name: Bug report
 description: Report a bug to improve Superset's stability
-labels: ["#bug"]
+labels: ["bug"]
 body:
  - type: markdown
    attributes:
@@ -1,7 +1,7 @@
 ---
 name: Cosmetic Issue
 about: Describe a cosmetic issue with CSS, positioning, layout, labeling, or similar
-labels: "#bug:cosmetic"
+labels: "cosmetic-issue"
 ---

 ## Screenshot
@@ -48,7 +48,7 @@ jobs:
          python-version: "3.11"

      - name: Install uv
-        uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
+        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
        with:
          python-version: "3.11"
          enable-cache: true
@@ -67,7 +67,7 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
+        uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
        with:
          languages: ${{ matrix.language }}
          # If you wish to specify custom queries, you can do so here or in a config file.
@@ -78,6 +78,6 @@ jobs:
          # queries: security-extended,security-and-quality

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
+        uses: github/codeql-action/analyze@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
        with:
          category: "/language:${{matrix.language}}"
@@ -78,14 +78,14 @@ jobs:
      USE_DASHBOARD: ${{ github.event.inputs.use_dashboard == 'true' || 'false' }}
    services:
      postgres:
-        image: ghcr.io/apache/superset/ci/postgres:17-alpine
+        image: postgres:17-alpine
        env:
          POSTGRES_USER: superset
          POSTGRES_PASSWORD: superset
        ports:
          - 15432:5432
      redis:
-        image: ghcr.io/apache/superset/ci/redis:7-alpine
+        image: redis:7-alpine
        ports:
          - 16379:6379
    steps:
@@ -186,14 +186,14 @@ jobs:
      GITHUB_TOKEN: ${{ github.token }}
    services:
      postgres:
-        image: ghcr.io/apache/superset/ci/postgres:17-alpine
+        image: postgres:17-alpine
        env:
          POSTGRES_USER: superset
          POSTGRES_PASSWORD: superset
        ports:
          - 15432:5432
      redis:
-        image: ghcr.io/apache/superset/ci/redis:7-alpine
+        image: redis:7-alpine
        ports:
          - 16379:6379
    steps:
@@ -53,7 +53,9 @@ jobs:
        mysql+mysqldb://superset:superset@127.0.0.1:13306/superset?charset=utf8mb4&binary_prefix=true
    services:
      mysql:
-        image: ghcr.io/apache/superset/ci/mysql:8.0
+        image: mysql:8.0
+        # Authenticated pulls use our higher Docker Hub rate limit. Empty on
+        # fork PRs (secrets unavailable) -> runner falls back to anonymous.
        env:
          MYSQL_ROOT_PASSWORD: root
        ports:
@@ -64,7 +66,7 @@ jobs:
          --health-timeout=5s
          --health-retries=5
      redis:
-        image: ghcr.io/apache/superset/ci/redis:7-alpine
+        image: redis:7-alpine
        options: --entrypoint redis-server
        ports:
          - 16379:6379
@@ -141,7 +143,7 @@ jobs:
      SUPERSET__SQLALCHEMY_DATABASE_URI: postgresql+psycopg2://superset:superset@127.0.0.1:15432/superset
    services:
      postgres:
-        image: ghcr.io/apache/superset/ci/postgres:17-alpine
+        image: postgres:17-alpine
        env:
          POSTGRES_USER: superset
          POSTGRES_PASSWORD: superset
@@ -150,7 +152,7 @@ jobs:
          # GitHub action runner's default installations
          - 15432:5432
      redis:
-        image: ghcr.io/apache/superset/ci/redis:7-alpine
+        image: redis:7-alpine
        ports:
          - 16379:6379
    steps:
@@ -200,7 +202,7 @@ jobs:
        sqlite:///${{ github.workspace }}/.temp/examples.db?check_same_thread=true
    services:
      redis:
-        image: ghcr.io/apache/superset/ci/redis:7-alpine
+        image: redis:7-alpine
        ports:
          - 16379:6379
    steps:
@@ -52,7 +52,7 @@ jobs:
      SUPERSET__SQLALCHEMY_EXAMPLES_URI: presto://localhost:15433/memory/default
    services:
      postgres:
-        image: ghcr.io/apache/superset/ci/postgres:17-alpine
+        image: postgres:17-alpine
        env:
          POSTGRES_USER: superset
          POSTGRES_PASSWORD: superset
@@ -61,7 +61,7 @@ jobs:
          # GitHub action runner's default installations
          - 15432:5432
      presto:
-        image: ghcr.io/apache/superset/ci/presto:350-e.6
+        image: starburstdata/presto:350-e.6
        env:
          POSTGRES_USER: superset
          POSTGRES_PASSWORD: superset
@@ -70,7 +70,7 @@ jobs:
          # GitHub action runner's default installations
          - 15433:8080
      redis:
-        image: ghcr.io/apache/superset/ci/redis:7-alpine
+        image: redis:7-alpine
        ports:
          - 16379:6379
    steps:
@@ -116,7 +116,7 @@ jobs:
      UPLOAD_FOLDER: /tmp/.superset/uploads/
    services:
      postgres:
-        image: ghcr.io/apache/superset/ci/postgres:17-alpine
+        image: postgres:17-alpine
        env:
          POSTGRES_USER: superset
          POSTGRES_PASSWORD: superset
@@ -125,7 +125,7 @@ jobs:
          # GitHub action runner's default installations
          - 15432:5432
      redis:
-        image: ghcr.io/apache/superset/ci/redis:7-alpine
+        image: redis:7-alpine
        ports:
          - 16379:6379
    steps:
@@ -75,18 +75,13 @@ jobs:
          SUPERSET_SECRET_KEY: not-a-secret
        run: |
          pytest --durations-min=0.5 --cov-report= --cov=superset ./tests/common ./tests/unit_tests --cache-clear --maxfail=50 --junit-xml=test-results/junit-unit.xml
-      # COVERAGE_FILE keeps these scoped gates off the default .coverage that
-      # the step above wrote. pytest-cov starts a fresh data file per run, so
-      # without it the last gate replaces the full-suite data and the report
-      # uploaded below contains only that gate's subtree -- every other file
-      # then reads as uncovered, and patch coverage on an unrelated PR is 0%.
      - name: Python 100% coverage unit tests
        env:
          SUPERSET_TESTENV: true
          SUPERSET_SECRET_KEY: not-a-secret
        run: |
-          COVERAGE_FILE="${RUNNER_TEMP}/.coverage.sql" pytest --durations-min=0.5 --cov=superset/sql/ ./tests/unit_tests/sql/ --cache-clear --cov-fail-under=100 --junit-xml=test-results/junit-sql-coverage.xml
-          COVERAGE_FILE="${RUNNER_TEMP}/.coverage.semantic_layers" pytest --durations-min=0.5 --cov=superset/semantic_layers/ ./tests/unit_tests/semantic_layers/ --cache-clear --cov-fail-under=100 --junit-xml=test-results/junit-semantic-layers-coverage.xml
+          pytest --durations-min=0.5 --cov=superset/sql/ ./tests/unit_tests/sql/ --cache-clear --cov-fail-under=100 --junit-xml=test-results/junit-sql-coverage.xml
+          pytest --durations-min=0.5 --cov=superset/semantic_layers/ ./tests/unit_tests/semantic_layers/ --cache-clear --cov-fail-under=100 --junit-xml=test-results/junit-semantic-layers-coverage.xml
      - name: Upload code coverage
        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
        with:
@@ -26,29 +26,6 @@ assists people when migrating to a new version.

 - `SAMPLES_ROW_LIMIT` is now the default for `/datasource/samples` requests without a valid explicit `per_page`, rather than a hard per-request ceiling; explicit limits are honored up to the existing global row-limit ceiling, matching `/chart/data` SAMPLES requests.

-### MCP tool results preserve stored string values
-
-Structured MCP tool results no longer add `<UNTRUSTED-CONTENT>` wrappers or
-rewrite delimiter-looking text inside string fields. Tool-result content remains
-user-controlled data, but clients must convey that trust boundary outside domain
-values instead of recognizing or removing marker strings.
-
-Clients that handled the former delimiter convention should stop stripping marker
-text: the same text can be legitimate stored content. Response models and content
-types are unchanged, and no metadata-database migration is required. Automated
-read-modify-write workflows should be paused or pinned away from older instances
-until every serving instance is upgraded; a mixed-version response has no reliable
-signal that tells a client whether its text is decorated. Redis-backed MCP response
-caches use a new internal namespace after the upgrade, so upgraded instances do not
-reuse older cached results.
-
-Values that a client already wrote back with presentation wrappers cannot be
-distinguished safely from intentional content. Operators should review possible
-`<UNTRUSTED-CONTENT>` / `</UNTRUSTED-CONTENT>` wrappers and
-`[ESCAPED-UNTRUSTED-CONTENT-OPEN]` /
-`[ESCAPED-UNTRUSTED-CONTENT-CLOSE]` substitutions rather than applying an automatic
-marker-removal migration.
-
 ### OAuth2 database callback metrics include their outcome

 The unqualified `DatabaseRestApi.oauth2` StatsD counter has been replaced with
@@ -125,23 +102,6 @@ dialect; each package's constraint in `pyproject.toml` documents why.
 No application-level configuration changes are required for deployments
 that don't touch SQLAlchemy directly.

-### New metric aggregates: MEDIAN, Sample Standard Deviation, Sample Variance
-
-`MEDIAN`, `STDDEV_SAMP`, and `VAR_SAMP` are now available anywhere a metric
-aggregate is chosen (every chart type, SQL Lab, MCP), not only in Pivot
-Table's controls. Support is opt-in per database engine *spec class*,
-verified against a live instance before being enabled: Postgres, MySQL
-(`STDDEV_SAMP`/`VAR_SAMP` only, no `MEDIAN`), DuckDB, and Redshift (inherits
-Postgres's support, not yet separately verified) ship enabled in this
-release. Engine specs that subclass one of those (e.g. MariaDB, Aurora
-MySQL/Postgres, TimescaleDB) inherit the same support, on the same
-not-yet-independently-verified basis. Picking one of these aggregates on a
-database that has not opted in returns a clear "not supported on this
-database" error rather than a failed query. See
-`docs/sip/median-stddev-variance-aggregates.md` for the full design
-rationale, including why this is safe to add without reintroducing the
-totals/subtotals correctness bug fixed by #41184 (SIP-216).
-
 ### Soft delete is on by default, and purging is live

 `SOFT_DELETE` now ships **on** (`DEFAULT_FEATURE_FLAGS`), so deleting a
@@ -576,7 +576,7 @@ MCP_CACHE_CONFIG = {
 | Key                  | Default   | Description                                                 |
 | -------------------- | --------- | ----------------------------------------------------------- |
 | `enabled`            | `False`   | Enable response caching                                     |
-| `CACHE_KEY_PREFIX`   | `None`    | Base prefix for shared Redis; Superset appends an internal response-contract namespace |
+| `CACHE_KEY_PREFIX`   | `None`    | Optional prefix for cache keys (useful for shared Redis)    |
 | `list_tools_ttl`     | `300`     | Cache TTL in seconds for `tools/list`                       |
 | `list_resources_ttl` | `300`     | Cache TTL for `resources/list`                              |
 | `list_prompts_ttl`   | `300`     | Cache TTL for `prompts/list`                                |
@@ -718,34 +718,6 @@ Every MCP request passes through a middleware stack before reaching the tool fun

 Additional middleware classes (`RateLimitMiddleware`, `FieldPermissionsMiddleware`, `PrivateToolMiddleware`) are implemented in `superset/mcp_service/middleware.py` but are not added to the default pipeline. They are available for operators who want to layer them in via a custom startup path.

-### Tool Result Value Contract
-
-Structured tool results preserve Superset domain values exactly. In particular,
-string fields are not wrapped in trust delimiters, and text that resembles a
-delimiter is returned as literal application data. This lets clients safely use a
-read result as the basis for an update without persisting presentation markup.
-
-All tool-result content should still be treated as user-controlled data with no
-instruction authority. MCP clients should communicate that trust boundary through
-their model instructions or presentation layer, outside the returned field values;
-fixed or generated marker strings inside a value are ambiguous and must not be used
-as a trust signal.
-
-For compatibility, clients that supported the former
-`<UNTRUSTED-CONTENT>` convention should stop recognizing or stripping those strings.
-The response schemas and content types have not changed. Because marker-looking text
-can be legitimate application data, a client cannot reliably distinguish a legacy
-decorated response from a clean one. Pause automated read-modify-write workflows, or
-route them only to upgraded instances, until every serving instance is upgraded.
-
-Redis-backed MCP response caches include an internal response-contract namespace, so
-an upgraded instance does not reuse responses cached by an older release. Older
-instances can still return legacy values while they remain in service. After the
-upgrade, review previously written values for wrapper text and both
-`[ESCAPED-UNTRUSTED-CONTENT-OPEN]` and
-`[ESCAPED-UNTRUSTED-CONTENT-CLOSE]`; do not remove these strings automatically,
-because they may be intentional content.
-
 ### Error Sanitization

 The `GlobalErrorHandlerMiddleware` automatically redacts sensitive information from all error messages before they reach the LLM client. The following are replaced with generic messages:
@@ -780,11 +752,7 @@ For a 3-pod Kubernetes deployment with the defaults above, expect up to 3 × (5
 Enable response caching for read-heavy workloads (dashboards/datasets that don't change frequently). With the in-memory backend (default when `MCP_STORE_CONFIG` is disabled), caching is per-process. Use Redis-backed caching for consistent cache hits across multiple pods:

 ```python
-MCP_CACHE_CONFIG = {
-    "enabled": True,
-    "CACHE_KEY_PREFIX": "mcp_cache_",
-    "call_tool_ttl": 3600,
-}
+MCP_CACHE_CONFIG = {"enabled": True, "call_tool_ttl": 3600}
 MCP_STORE_CONFIG = {"enabled": True, "CACHE_REDIS_URL": "redis://redis:6379/0"}
 ```

@@ -11,11 +11,6 @@ When soft-delete is enabled, deleting a chart, dashboard, or dataset archives it
 instead of removing it permanently. The **Recently Archived** view lets owners
 and admins find archived objects and restore them.

-A chart used by an alert or report cannot be archived while that dependency
-exists. In the chart list view, the archive confirmation lists the alerts and
-reports that use the chart; a blocked attempt names them and asks you to
-detach or delete them first.
-
 :::note

 This view is gated by the `SOFT_DELETE` feature flag. When the flag is off the
@@ -58,14 +58,14 @@
    "@fontsource/inter": "^5.3.0",
    "@mdx-js/react": "^3.1.1",
    "@saucelabs/theme-github-codeblock": "^0.3.0",
-    "@storybook/addon-docs": "^10.5.8",
+    "@storybook/addon-docs": "^10.5.7",
    "@superset-ui/core": "^0.20.4",
    "@swc/core": "^1.15.47",
    "antd": "^6.6.0",
    "baseline-browser-mapping": "^2.11.13",
    "caniuse-lite": "^1.0.30001809",
-    "docusaurus-plugin-openapi-docs": "^5.2.0",
-    "docusaurus-theme-openapi-docs": "^5.2.0",
+    "docusaurus-plugin-openapi-docs": "^5.1.3",
+    "docusaurus-theme-openapi-docs": "^5.1.3",
    "js-yaml": "^5.2.3",
    "json-bigint": "^1.0.0",
    "prism-react-renderer": "^2.4.1",
@@ -77,8 +77,8 @@
    "react-table": "^7.8.0",
    "remark-import-partial": "^0.0.2",
    "reselect": "^5.2.0",
-    "storybook": "^10.5.8",
-    "swagger-ui-react": "^5.32.13",
+    "storybook": "^10.5.7",
+    "swagger-ui-react": "^5.32.12",
    "swc-loader": "^0.2.7",
    "tinycolor2": "^1.4.2",
    "unist-util-visit": "^5.1.0"
@@ -93,7 +93,7 @@
    "@typescript-eslint/parser": "^8.67.0",
    "eslint": "^9.39.2",
    "eslint-plugin-react": "^7.37.5",
-    "globals": "^17.11.0",
+    "globals": "^17.9.0",
    "oxfmt": "^0.63.0",
    "typescript": "~6.0.3",
    "typescript-eslint": "^8.67.0",
@@ -1,236 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-->
-
-# SIP: System-wide MEDIAN, Sample Standard Deviation, and Sample Variance metric aggregates
-
-## [DRAFT — proposal for discussion]
-
-This document now has an accompanying implementation in this PR, for the
-proposed mechanism plus a first, empirically-verified engine set (Postgres,
-MySQL, DuckDB, Redshift by inheritance). It is intended to seed discussion on
-whether this is the right shape and scope before it goes up for a formal SIP
-vote, not to pre-empt that discussion, the code exists so reviewers have a
-concrete design to react to rather than a description of one.
-
-## Motivation
-
-Before #41184 (SIP-216, the non-additive-totals fix), the Pivot Table chart
-exposed an "Aggregation function" control with 18 choices, including
-`Median`, `Sample Standard Deviation`, `Sample Variance`, `First`, `Last`,
-`Count Unique Values`, and `List Unique Values`. #41184 deleted that control
-wholesale, and deliberately so: it re-aggregated already-aggregated cell
-values to compute totals/subtotals, which is exactly the class of bug
-SIP-216 fixed (summing per-group averages, averaging per-group medians, etc.
-produces silently wrong totals). #42761 subsequently restored the one piece
-of that control's functionality that was cleanly separable from the
-correctness bug, the "show as % of row/column/total" display option,
-redesigned as a decoupled, post-hoc-only `showValuesAs` control.
-
-A user has since noticed that several of the other pre-#41184 options never
-came back. Checking today's metric aggregate list (`AVG, COUNT,
-COUNT_DISTINCT, MAX, MIN, SUM`, see
-`superset-frontend/packages/superset-ui-core/src/query/types/Metric.ts`),
-most of these have a reasonable equivalent already: `Count Unique Values`
-maps to `COUNT_DISTINCT`; `Count`/`Average`/`Max`/`Min` are already standard
-aggregates; the two "fraction of" variants are already covered by
-`showValuesAs`. But `Median`, `Sample Standard Deviation`, and `Sample
-Variance` have no equivalent today anywhere in Superset, not just in Pivot
-Table, in any chart type, since the aggregate list is shared across the
-whole app.
-
-This is a real, currently-live gap, not a hypothetical one:
-`superset/mcp_service/chart/chart_utils.py`, `schemas.py`, and
-`prompts/create_chart_guided.py` already treat `STDDEV`, `VAR`, `MEDIAN`,
-and `PERCENTILE` as valid aggregate values in their own validation and
-documentation, but those values are never recognized by
-`superset/connectors/sqla/models.py`'s `sqla_aggregations` dict (the actual
-mapping from aggregate name to SQL), so an AI agent using the MCP tool to
-build a chart with `"aggregate": "STDDEV"` today creates a chart that
-**errors at query time** with "Adhoc metric aggregate is invalid." This SIP
-proposes closing that gap for real, at the source, rather than patching
-around it in MCP.
-
-## Proposed change
-
-Add `MEDIAN`, `STDDEV_SAMP`, and `VAR_SAMP` as first-class, system-wide
-metric aggregates, available anywhere a metric aggregate is chosen (every
-chart type, SQL Lab metric picker, MCP), not as a Pivot-Table-specific
-control.
-
-**Why this is safe with respect to SIP-216, and needs no Pivot-Table-specific
-code at all:** Pivot Table's non-additive-totals machinery
-(`superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/utilities.ts`)
-already classifies any metric aggregate not in `ADDITIVE_AGGREGATES = {SUM,
-COUNT, MIN, MAX}` as non-additive, which routes totals/subtotals through the
-correct DB-`GROUPING SETS`-rollup path rather than client-side
-re-aggregation (`AVG` and `COUNT_DISTINCT` already go through this path
-today). `MEDIAN`/`STDDEV_SAMP`/`VAR_SAMP` fall into that bucket
-automatically, with zero changes needed to the additivity logic. So once
-these are valid, buildable SQL aggregates, Pivot Table (and every other
-chart) gets correct behavior for free. This is the version of "restore the
-control" that does not reopen the bug that was just fixed.
-
-**Where the actual change needs to land, and what this PR does:**
-
-1. **Done.** `superset-frontend/packages/superset-ui-core/src/query/types/Metric.ts`,
-   extended the `Aggregate` type.
-2. **Done.** `superset-frontend/src/explore/constants.ts`, added to `AGGREGATES`
-   (drives `AGGREGATES_OPTIONS`, the dropdown in `AdhocMetricEditPopover`).
-3. **Done**, but not consolidated. `superset/connectors/sqla/models.py`
-   (`sqla_aggregations`) and `superset/models/helpers.py`
-   (`ExploreMixin.sqla_aggregations`) are both wired to consult the new
-   `BaseEngineSpec.get_extended_aggregation_func`, in addition to their
-   existing 6-aggregate dict, so neither's original, already-tested behavior
-   changed. They remain two separate dicts, consolidating them into one
-   source of truth is left as a follow-up (see Open questions).
-4. **Done**, and it surfaced a second, smaller bug on top of the one this SIP
-   opened with: MCP's own aggregate names (`STDDEV`, `VAR`) never matched any
-   real Superset aggregate, before or after this PR, they were always going
-   to error regardless of what this SIP does. `superset/mcp_service/chart/*`
-   now accepts the old shorthand as an alias, normalized to the real,
-   unambiguous names (`STDDEV_SAMP`, `VAR_SAMP`) this PR ships, and the guided
-   prompt text points at the correct names going forward. `MEDIAN`/
-   `PERCENTILE` were already spelled correctly in MCP; `PERCENTILE` remains
-   unimplemented (it needs a parameter this schema has no field for) and is
-   unchanged by this PR, out of scope here.
-
-**The part that needs real engineering care, this must not be a blind
-`sa.func.MEDIAN` / `sa.func.STDDEV_SAMP` / `sa.func.VAR_SAMP`:**
-
-`sqla_aggregations` today is a flat, engine-unaware dict (`sa.func.AVG`,
-etc., SQLAlchemy emits whatever function name it is given, with zero
-validation that the target dialect actually has it). Superset already has
-precedent for exactly this class of per-engine capability difference:
-`BaseEngineSpec.supports_grouping_sets` and `_time_grain_expressions`, both
-introduced by #41184 itself. This SIP proposes the same shape, a new
-per-engine-overridable mechanism (for example
-`BaseEngineSpec.get_aggregate_sql(aggregate, column)` with a sensible
-default, overridden per engine spec where the default does not hold),
-rather than a single hardcoded dict.
-
-Verified findings so far (via `sqlglot.transpile`, cross-checked against
-known engine docs; **not** exhaustively tested against live databases, that
-is necessary follow-up work this SIP alone cannot complete):
-
-| Engine | `MEDIAN(x)` | `STDDEV_SAMP(x)` | `VAR_SAMP(x)` |
-|---|---|---|---|
-| Postgres | `PERCENTILE_CONT(0.5) WITHIN GROUP (ORDER BY x)` | native | native |
-| MySQL | no native equivalent, needs explicit "unsupported" handling, not a blind emit | native | MySQL's `VARIANCE()` is an alias for `VAR_POP` (population), not `VAR_SAMP` (sample); a naive dialect-name substitution would silently compute the wrong statistic and needs an explicit, verified expression instead |
-| SQLite | only if the specific build was compiled with the (non-default) `SQLITE_ENABLE_PERCENTILE` extension (added in SQLite 3.43, 2023), cannot be assumed available | not available in core SQLite | not available in core SQLite |
-| BigQuery / Snowflake / DuckDB / Redshift / Oracle / T-SQL / Databricks / Spark | native `MEDIAN(x)` | native | native on BigQuery/Snowflake/Databricks/Spark, where `VARIANCE` is correctly sample variance; T-SQL has no function named `VARIANCE` at all and needs `VAR(x)` instead |
-| Trino / Presto / Hive | `PERCENTILE_CONT` / `approx_percentile` (dialect- and exactness-dependent) | native | `variance` is correctly sample variance per Trino/Presto docs |
-
-This table is deliberately not exhaustive, Superset has roughly 75
-`db_engine_specs` files. The proposed default (`BaseEngineSpec`) should be
-the safe choice (mark unsupported, surface a clear user-facing error) rather
-than an optimistic one, with individual engine specs opting in once
-verified. Ship for the handful of engines above first, extend
-opportunistically.
-
-**`Count Unique Values`, `First`, `Last`, `List Unique Values`, explicitly
-out of scope for this SIP:**
-
- `Count Unique Values` needs no work, it is already `COUNT_DISTINCT`.
- `First`/`Last` have no well-defined, unambiguous meaning as a plain
-  `GROUP BY` aggregate without an explicit ordering; most engines only
-  support this via window functions (`FIRST_VALUE`/`LAST_VALUE` `OVER
-  (ORDER BY ...)`) or do not support it as a simple aggregate at all
-  (Postgres has neither built in). Restoring this properly would mean
-  designing an "order by" sub-control on the metric, a real, separate
-  feature, not a one-line aggregate addition. Proposed as a follow-up SIP if
-  there is demand.
- `List Unique Values` maps to the `STRING_AGG`/`GROUP_CONCAT`/`LISTAGG`/
-  `ARRAY_AGG(DISTINCT ...)` family, real dialect differences, plus an open
-  UX question (unbounded cell content for high-cardinality columns).
-  Proposed as a follow-up SIP.
-
-## New or changed public interfaces
-
- New `Aggregate` values (`MEDIAN`, `STDDEV_SAMP`, `VAR_SAMP`) selectable
-  anywhere the standard metric control appears, every chart type, not just
-  Pivot Table.
- New `BaseEngineSpec` extensibility point for per-engine aggregate SQL
-  generation (exact shape TBD in implementation, likely mirrors
-  `_time_grain_expressions`).
- No REST API surface changes beyond the existing metric aggregate field
-  accepting new values.
-
-## Migration plan and compatibility
-
-No new tables/columns needed for the aggregate addition itself.
-
-Restoring prior chart settings, the way #42761 restored `show_values_as` for
-charts that had it before #41184, is murkier here than it was for that PR
-and needs its own design pass: the old `aggregate_function` was a single
-Pivot-Table-level setting applied uniformly to every metric on the chart,
-not a per-metric property. A chart that had `aggregate_function: Median`
-before #41184, with a metric of `SUM(sales)`, was already silently wrong
-under the old architecture (that is the bug that was fixed); mechanically
-rewriting its metric to `MEDIAN(sales)` on upgrade would change what the
-chart's leaf cells display, not just its totals, which may not match user
-intent. This SIP proposes a best-effort, flagged-for-review migration
-(surface affected charts to admins rather than silently rewriting them)
-rather than a fully automatic one-to-one restoration.
-
-## Rejected alternatives
-
- **Restoring the old `aggregateFunction` Pivot-Table control as-is.**
-  Rejected: this is the literal mechanism SIP-216 removed because it
-  reintroduces incorrect totals for non-additive metrics. Any fix has to go
-  through the metric's own aggregate, not a separate pivot-level override.
- **Routing all metric SQL generation through `sqlglot` expression-building
-  instead of SQLAlchemy's `sa.func`.** More architecturally thorough (would
-  give correct dialect syntax for free across more of the roughly 75 engine
-  specs), but a much larger, more invasive change to a hot path used by
-  every chart query. Noted as a possible future direction, not this SIP's
-  scope; this SIP proposes the smaller, `supports_grouping_sets`-shaped
-  extensibility point instead.
-
-## Open questions
-
- **Resolved for this PR, worth confirming as the community's preferred
-  shape:** implemented as `BaseEngineSpec._extended_aggregations` (a
-  `{aggregate_name: sqla_column -> sqla_column}` dict) plus a
-  `get_extended_aggregation_func` accessor, set on the concrete or shared
-  base engine spec class per engine (e.g. on `PostgresBaseEngineSpec` so
-  Redshift inherits it, but *not* on `PrestoBaseEngineSpec` so Hive/Spark/
-  Databricks don't silently inherit unverified behavior, mirroring how
-  `supports_grouping_sets` is opted into per-concrete-engine there today).
-  Did not route through the `superset/sql/dialects/` sqlglot-based layer;
-  that layer is for SQL Lab parsing, wiring it into chart-metric query
-  building felt like a separate, larger change from this SIP's scope.
- **Still open, not addressed in this PR:** how aggressively should
-  `MEDIAN` degrade on engines without a native or exact equivalent?
-  Trino/Presto/Hive were left unimplemented (unsupported) specifically to
-  avoid silently answering this with an approximate function
-  (`approx_percentile`) that changes the semantics of what a user asked
-  for. If someone wants `MEDIAN` on those engines, this needs a real
-  decision: require explicit opt-in, show a UI warning, or keep it
-  disallowed.
- **Resolved for this PR:** left the two `sqla_aggregations` dicts
-  (`connectors/sqla/models.py` and `models/helpers.py`) unconsolidated,
-  both now separately wired to the same new `get_extended_aggregation_func`
-  hook. Consolidating them into one source of truth is real but unrelated
-  cleanup, not bundled here to keep the diff reviewable.
- **New, from implementation:** only Postgres, MySQL (partial), DuckDB, and
-  Redshift (by inheritance, unverified) ship enabled. BigQuery, Snowflake,
-  Trino, Presto, Hive, Spark, Databricks, Oracle, and T-SQL all have
-  documented (not live-verified) support per the table above but are not
-  yet wired up, each needs the same live-instance verification treatment
-  before being enabled, this PR intentionally didn't guess.
@@ -4122,23 +4122,23 @@
  resolved "https://registry.yarnpkg.com/@standard-schema/utils/-/utils-0.3.0.tgz#3d5e608f16c2390c10528e98e59aef6bf73cae7b"
  integrity sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g==

-"@storybook/addon-docs@^10.5.8":
-  version "10.5.8"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-10.5.8.tgz#767c10c7a4cc1b625b93f869b2a2b09fc8514f2e"
-  integrity sha512-NlHiMKW/UvW/uL8HXFDCEVwoH3qZeGYZ/qlWax4d7H471b/T54MBq2KcB4ZrdA785FfIH3numAJdBb5jwn00Mg==
+"@storybook/addon-docs@^10.5.7":
+  version "10.5.7"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-10.5.7.tgz#6d599c94fc871c248ce06a5c081f57655c83f40a"
+  integrity sha512-KNARJfjICaizinsR3INMEiipZm1ObYo+xw+E26gteu50Bcy2dIZUtk5uHY5XdtardU3AXX6yRXoBZ2HCY3lbHA==
  dependencies:
    "@mdx-js/react" "^3.0.0"
-    "@storybook/csf-plugin" "10.5.8"
+    "@storybook/csf-plugin" "10.5.7"
    "@storybook/icons" "^2.0.2"
-    "@storybook/react-dom-shim" "10.5.8"
+    "@storybook/react-dom-shim" "10.5.7"
    react "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
    react-dom "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
    ts-dedent "^2.0.0"

-"@storybook/csf-plugin@10.5.8":
-  version "10.5.8"
-  resolved "https://registry.yarnpkg.com/@storybook/csf-plugin/-/csf-plugin-10.5.8.tgz#c626c5bfe55d0e279b2457e5cf150a788d1fc637"
-  integrity sha512-/FHiMyOWWEXfwK/lM0WxmkP9GLzbSJJuzGtfeuNWSOVDnvAMbjavitxfHb5wSbWKIQo0XYC1EJ2Y7x91XNYP4w==
+"@storybook/csf-plugin@10.5.7":
+  version "10.5.7"
+  resolved "https://registry.yarnpkg.com/@storybook/csf-plugin/-/csf-plugin-10.5.7.tgz#bc73f164d1b5f8e2931b2774f4b389a06453cf6e"
+  integrity sha512-IaX8FlM0H36HNFhJ2+4L9bCldqfvHGqcLg841SJNyK/DhfMlM7JsvY/GDH2ZFuWrUf8FSOx96GRRnHq6XfRKag==
  dependencies:
    unplugin "^2.3.5"

@@ -4152,10 +4152,10 @@
  resolved "https://registry.yarnpkg.com/@storybook/icons/-/icons-2.1.0.tgz#edfc2450a39c5e780f28c6cbc49acd7bff59b41a"
  integrity sha512-Fxh9vYpX9bQqFeHRiY8h2ApeRGDzRSMLwJwNZ/AIRqnyOKHxRKL+yFe+ctEkVJmuptRE9u1Hrn8ZZNHyfDKKNg==

-"@storybook/react-dom-shim@10.5.8":
-  version "10.5.8"
-  resolved "https://registry.yarnpkg.com/@storybook/react-dom-shim/-/react-dom-shim-10.5.8.tgz#40cc3e32af424baa2e4109a325dae2ede29999e2"
-  integrity sha512-N8D13/Xny+V3kfe1KBgsAHS0nKWXLLdgOOXS9poKdYzVwVCN+CGEGBxWX0zMMtdCptqa6/57em9coPlZMoO+bg==
+"@storybook/react-dom-shim@10.5.7":
+  version "10.5.7"
+  resolved "https://registry.yarnpkg.com/@storybook/react-dom-shim/-/react-dom-shim-10.5.7.tgz#9a5aa0e0f89c09e71c6cbfc6bb1abeb537e5aabf"
+  integrity sha512-lxOkyh+wu/MiBXvYQHjZfD+DRKOa4bHBzbuGuiHXnHXmdOcTRdcrQTsoeN2FPtfugmmOG66cZUEgDwNX+k5eRA==

 "@superset-ui/core@^0.20.4":
  version "0.20.4"
@@ -8014,10 +8014,10 @@ doctrine@^2.1.0:
  dependencies:
    esutils "^2.0.2"

-docusaurus-plugin-openapi-docs@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/docusaurus-plugin-openapi-docs/-/docusaurus-plugin-openapi-docs-5.2.0.tgz#8318ec90cd21fed023be57696211af7d72fd81db"
-  integrity sha512-MjrfRAMB64uvdxRVz6L9AXWe4QFjCdoBAzYs306yyI3nnXHsFj2lv2FnLA90JV9CAUZaGiYMvvkzBo2Nrkq/9w==
+docusaurus-plugin-openapi-docs@^5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/docusaurus-plugin-openapi-docs/-/docusaurus-plugin-openapi-docs-5.1.3.tgz#b8cd5f8451aaf881deb1a744a8295685f1681865"
+  integrity sha512-HnpblSBdXoR39VNTIW9zWERUsMJxXOpvdQoBKyaTkUBPwCM48Z76+ndo2yO2vADq+EhWjJlfxL1DUzCrgNjThQ==
  dependencies:
    "@apidevtools/json-schema-ref-parser" "^15.3.3"
    "@redocly/openapi-core" "^2.25.2"
@@ -8035,10 +8035,10 @@ docusaurus-plugin-openapi-docs@^5.2.0:
    swagger2openapi "^7.0.8"
    xml-formatter "^3.6.6"

-docusaurus-theme-openapi-docs@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/docusaurus-theme-openapi-docs/-/docusaurus-theme-openapi-docs-5.2.0.tgz#6d93a74e2e3cf0ae77d24e1c4144bd2e74a52115"
-  integrity sha512-L0b80LzaMUfr76a9EQXRPCf8nxkEz8Xo6Aknnke1UeE2oXsgoiVki6U+RTE7GmJRjO8zSNKXyckGmGmqqWuHeA==
+docusaurus-theme-openapi-docs@^5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/docusaurus-theme-openapi-docs/-/docusaurus-theme-openapi-docs-5.1.3.tgz#e23644a63785352abbc76e42760c0dfdff3669e1"
+  integrity sha512-npbD1QahtjAEmrOet/86i5fTmcJX4/rPhVT+c0qKjm7StUNbyqjwchSVBQuU1rB69T51JOA9TpT/y6QcB9Xjvw==
  dependencies:
    "@hookform/error-message" "^2.0.1"
    "@reduxjs/toolkit" "^2.8.2"
@@ -8123,7 +8123,7 @@ domhandler@^5.0.2, domhandler@^5.0.3:
  dependencies:
    domelementtype "^2.3.0"

-dompurify@^3.3.3, dompurify@^3.4.13:
+dompurify@^3.3.3, dompurify@^3.4.12:
  version "3.4.13"
  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.4.13.tgz#fc28949d59f92d62e28a3a764bcbeee35897a1be"
  integrity sha512-2vmYIoqjze2d+kakP8S/nS5shfsl587kzwEjcGlTdiksUVgFHnFCsLYDVj/JNqJVOQZGSYBTmuycv0PodwmnMQ==
@@ -9174,10 +9174,10 @@ globals@^14.0.0:
  resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
  integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==

-globals@^17.11.0:
-  version "17.11.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-17.11.0.tgz#d643485bb30220d7751e511cf4f68c73d3870d87"
-  integrity sha512-Z2I8hM+PbJDXQDq3Icgpzv+mPdwr68iZUU9d5WW4FuXfDUQfkZaZuvjMv42/5crNyw154+9+VWXbYrUgDXbxNw==
+globals@^17.9.0:
+  version "17.9.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-17.9.0.tgz#e43f252d6bbe71508da43902a1709c8895a59f70"
+  integrity sha512-m/MvAW61QVU5VDNF1Vj8axt016h8w7L5TU1e9zlab7XIttAT2YAlCwl75K1fOqvMM9apmD7lbCIRhpfkhmxhCg==

 globalthis@^1.0.4:
  version "1.0.4"
@@ -10284,10 +10284,10 @@ js-levenshtein@^1.1.6:
  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==

-js-yaml@4.1.0, js-yaml@=4.3.1, js-yaml@^4.1.0, js-yaml@^4.1.1, js-yaml@^4.2.0, js-yaml@^4.3.0:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.3.1.tgz#01216c001d67f48e2cd560d708c7af21090a3848"
-  integrity sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==
+js-yaml@4.1.0, js-yaml@=4.3.0, js-yaml@^4.1.0, js-yaml@^4.1.1, js-yaml@^4.2.0, js-yaml@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.3.0.tgz#d1900572a7f7cf0b5f540c83673e60bad3436592"
+  integrity sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==
  dependencies:
    argparse "^2.0.1"

@@ -14783,10 +14783,10 @@ stop-iteration-iterator@^1.1.0:
    es-errors "^1.3.0"
    internal-slot "^1.1.0"

-storybook@^10.5.8:
-  version "10.5.8"
-  resolved "https://registry.yarnpkg.com/storybook/-/storybook-10.5.8.tgz#d5f051983e6232c0a73ea02149a72c7bafb43275"
-  integrity sha512-rR4oFMSiWBSqI0lvsJPtcQUPj8+hzj3TkLu+Mw61Wo6YxPSb5FsLSHai0jZnuaIdKIlmu25KCfwlSQl4e1uvnA==
+storybook@^10.5.7:
+  version "10.5.7"
+  resolved "https://registry.yarnpkg.com/storybook/-/storybook-10.5.7.tgz#adfc465e51f337291c095278c23f1b8024ef2da7"
+  integrity sha512-oiKvWIwIoOhFP1i6dASYyMXwPHKEtVZMshqSB7EvIVYjWRh0l9H7gHEt1z4Gh2rLGFMekWdsm4s94rvwpR7gkg==
  dependencies:
    "@storybook/global" "^5.0.0"
    "@storybook/icons" "^2.0.2"
@@ -15103,10 +15103,10 @@ swagger-client@^3.37.8:
    "@swagger-api/apidom-parser-adapter-openapi-yaml-3-2" "^1.12.0"
    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.12.0"

-swagger-ui-react@^5.32.13:
-  version "5.32.13"
-  resolved "https://registry.yarnpkg.com/swagger-ui-react/-/swagger-ui-react-5.32.13.tgz#04c96140b0a2d4ea01ebec4d4cfc655d5ed9a500"
-  integrity sha512-XIDl+Ny6kE1N8wpSPiOFrjPfAevs4GR4XmV6BT6NLMikkMFIbIVocWbA8pnKYyYXQe8Rccfli5o2zDfySw0FnQ==
+swagger-ui-react@^5.32.12:
+  version "5.32.12"
+  resolved "https://registry.yarnpkg.com/swagger-ui-react/-/swagger-ui-react-5.32.12.tgz#47525a26774eb02db0e6203af72f5b32fa6205cc"
+  integrity sha512-WCdkNOQyMTZDu+z356FpwVWHf1dwZgQPUjdQPh1L4r7jULaJTKKlIItXq6WsZdYeXvsHndMdxxccEQXOAroUHQ==
  dependencies:
    "@babel/runtime-corejs3" "^7.27.1"
    "@scarf/scarf" "=1.4.0"
@@ -15115,11 +15115,11 @@ swagger-ui-react@^5.32.13:
    classnames "^2.5.1"
    css.escape "1.5.1"
    deep-extend "0.6.0"
-    dompurify "^3.4.13"
+    dompurify "^3.4.12"
    ieee754 "^1.2.1"
    immutable "^4.3.9"
    js-file-download "^0.4.12"
-    js-yaml "=4.3.1"
+    js-yaml "=4.3.0"
    lodash "^4.18.1"
    prop-types "^15.8.1"
    randexp "^0.5.3"
@@ -93,7 +93,7 @@ def find_models(module: ModuleType) -> list[type[Model]]:  # noqa: C901
    # where the current model is out-of-sync with the existing table after a
    # downgrade
    sqlalchemy_uri = current_app.config["SQLALCHEMY_DATABASE_URI"]
-    engine = create_engine(sqlalchemy_uri)
+    engine = create_engine(sqlalchemy_uri, future=True)
    Base = automap_base()  # noqa: N806
    Base.prepare(engine, reflect=True)
    seen = set()
@@ -99,7 +99,7 @@
        "geostyler-openlayers-parser": "^5.7.1",
        "geostyler-style": "11.0.2",
        "geostyler-wfs-parser": "^3.0.1",
-        "google-auth-library": "^11.0.2",
+        "google-auth-library": "^11.0.1",
        "immer": "^11.1.16",
        "interweave": "^13.1.1",
        "jquery": "^4.0.0",
@@ -180,13 +180,13 @@
        "@istanbuljs/nyc-config-typescript": "^1.0.1",
        "@playwright/test": "^1.62.1",
        "@pmmmwh/react-refresh-webpack-plugin": "^0.6.2",
-        "@storybook/addon-docs": "10.5.8",
-        "@storybook/addon-links": "10.5.8",
-        "@storybook/react-webpack5": "10.5.8",
+        "@storybook/addon-docs": "10.5.7",
+        "@storybook/addon-links": "10.5.7",
+        "@storybook/react-webpack5": "10.5.7",
        "@storybook/test-runner": "0.24.4",
        "@svgr/webpack": "^8.1.0",
        "@swc/core": "^1.15.47",
-        "@swc/plugin-emotion": "^14.19.0",
+        "@swc/plugin-emotion": "^14.15.0",
        "@swc/plugin-transform-imports": "^12.5.0",
        "@testing-library/dom": "^10.4.1",
        "@testing-library/jest-dom": "^7.0.1",
@@ -218,7 +218,7 @@
        "babel-loader": "^10.1.1",
        "babel-plugin-dynamic-import-node": "^2.3.3",
        "babel-plugin-jsx-remove-data-test-id": "^3.0.0",
-        "baseline-browser-mapping": "^2.11.14",
+        "baseline-browser-mapping": "^2.11.13",
        "cheerio": "1.2.0",
        "concurrently": "^10.0.4",
        "copy-webpack-plugin": "^14.0.0",
@@ -235,7 +235,7 @@
        "eslint-plugin-no-only-tests": "^3.4.0",
        "eslint-plugin-react-prefer-function-component": "^5.0.0",
        "eslint-plugin-react-you-might-not-need-an-effect": "^1.0.1",
-        "eslint-plugin-storybook": "10.5.8",
+        "eslint-plugin-storybook": "10.5.7",
        "eslint-plugin-testing-library": "^7.16.2",
        "eslint-plugin-theme-colors": "file:eslint-rules/eslint-plugin-theme-colors",
        "fetch-mock": "^12.6.0",
@@ -266,7 +266,7 @@
        "source-map": "^0.8.0",
        "source-map-support": "^0.5.21",
        "speed-measure-webpack-plugin": "^1.6.0",
-        "storybook": "10.5.8",
+        "storybook": "10.5.7",
        "style-loader": "^4.0.0",
        "stylelint": "^17.14.1",
        "swc-loader": "^0.2.7",
@@ -10765,16 +10765,16 @@
      "license": "MIT"
    },
    "node_modules/@storybook/addon-docs": {
-      "version": "10.5.8",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-10.5.8.tgz",
-      "integrity": "sha512-NlHiMKW/UvW/uL8HXFDCEVwoH3qZeGYZ/qlWax4d7H471b/T54MBq2KcB4ZrdA785FfIH3numAJdBb5jwn00Mg==",
+      "version": "10.5.7",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-10.5.7.tgz",
+      "integrity": "sha512-KNARJfjICaizinsR3INMEiipZm1ObYo+xw+E26gteu50Bcy2dIZUtk5uHY5XdtardU3AXX6yRXoBZ2HCY3lbHA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@mdx-js/react": "^3.0.0",
-        "@storybook/csf-plugin": "10.5.8",
+        "@storybook/csf-plugin": "10.5.7",
        "@storybook/icons": "^2.0.2",
-        "@storybook/react-dom-shim": "10.5.8",
+        "@storybook/react-dom-shim": "10.5.7",
        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
        "ts-dedent": "^2.0.0"
@@ -10785,7 +10785,7 @@
      },
      "peerDependencies": {
        "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "storybook": "10.5.8"
+        "storybook": "10.5.7"
      },
      "peerDependenciesMeta": {
        "@types/react": {
@@ -10794,9 +10794,9 @@
      }
    },
    "node_modules/@storybook/addon-docs/node_modules/@storybook/csf-plugin": {
-      "version": "10.5.8",
-      "resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-10.5.8.tgz",
-      "integrity": "sha512-/FHiMyOWWEXfwK/lM0WxmkP9GLzbSJJuzGtfeuNWSOVDnvAMbjavitxfHb5wSbWKIQo0XYC1EJ2Y7x91XNYP4w==",
+      "version": "10.5.7",
+      "resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-10.5.7.tgz",
+      "integrity": "sha512-IaX8FlM0H36HNFhJ2+4L9bCldqfvHGqcLg841SJNyK/DhfMlM7JsvY/GDH2ZFuWrUf8FSOx96GRRnHq6XfRKag==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -10809,7 +10809,7 @@
      "peerDependencies": {
        "esbuild": "*",
        "rollup": "*",
-        "storybook": "10.5.8",
+        "storybook": "10.5.7",
        "vite": "*",
        "webpack": "*"
      },
@@ -10829,9 +10829,9 @@
      }
    },
    "node_modules/@storybook/addon-docs/node_modules/@storybook/react-dom-shim": {
-      "version": "10.5.8",
-      "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-10.5.8.tgz",
-      "integrity": "sha512-N8D13/Xny+V3kfe1KBgsAHS0nKWXLLdgOOXS9poKdYzVwVCN+CGEGBxWX0zMMtdCptqa6/57em9coPlZMoO+bg==",
+      "version": "10.5.7",
+      "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-10.5.7.tgz",
+      "integrity": "sha512-lxOkyh+wu/MiBXvYQHjZfD+DRKOa4bHBzbuGuiHXnHXmdOcTRdcrQTsoeN2FPtfugmmOG66cZUEgDwNX+k5eRA==",
      "dev": true,
      "license": "MIT",
      "funding": {
@@ -10843,7 +10843,7 @@
        "@types/react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "storybook": "10.5.8"
+        "storybook": "10.5.7"
      },
      "peerDependenciesMeta": {
        "@types/react": {
@@ -10855,9 +10855,9 @@
      }
    },
    "node_modules/@storybook/addon-links": {
-      "version": "10.5.8",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-links/-/addon-links-10.5.8.tgz",
-      "integrity": "sha512-mpWw4alBJVGqgVh897LZ2keN/xnMHcH93wKJG+oGg4+cdEUA+06hCs5T4k+AS5Aa+EZ6LvdOoi2VPHssyQlCCA==",
+      "version": "10.5.7",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-links/-/addon-links-10.5.7.tgz",
+      "integrity": "sha512-17PxEOocLhAEaPeQ4q+8yul/LF9YEIePS1arknCAS7U1pQXTe0uj+R0pB6uPLVflM5gECQMiP4WzIj4tEiL6+A==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -10870,7 +10870,7 @@
      "peerDependencies": {
        "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "storybook": "10.5.8"
+        "storybook": "10.5.7"
      },
      "peerDependenciesMeta": {
        "@types/react": {
@@ -10964,15 +10964,15 @@
      }
    },
    "node_modules/@storybook/react-webpack5": {
-      "version": "10.5.8",
-      "resolved": "https://registry.npmjs.org/@storybook/react-webpack5/-/react-webpack5-10.5.8.tgz",
-      "integrity": "sha512-HkPi42WaoNSHC0DAERsJEF7Vhnluzsp/aiuhnH65GGYG5TmdLL9G8KDiYvXHGDCyb4RfoAPYrtzxaLMFfPPFvQ==",
+      "version": "10.5.7",
+      "resolved": "https://registry.npmjs.org/@storybook/react-webpack5/-/react-webpack5-10.5.7.tgz",
+      "integrity": "sha512-vvl07oXp2qfmHJHZ77Aw1F3LFOo7XubOta+lC8UmlEw3rDDJhQxJN3erJJVHavNhdA2jBTK6VUXQKdqQh7X7nQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@storybook/builder-webpack5": "10.5.8",
-        "@storybook/preset-react-webpack": "10.5.8",
-        "@storybook/react": "10.5.8"
+        "@storybook/builder-webpack5": "10.5.7",
+        "@storybook/preset-react-webpack": "10.5.7",
+        "@storybook/react": "10.5.7"
      },
      "funding": {
        "type": "opencollective",
@@ -10981,7 +10981,7 @@
      "peerDependencies": {
        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "storybook": "10.5.8",
+        "storybook": "10.5.7",
        "typescript": ">= 4.9.x"
      },
      "peerDependenciesMeta": {
@@ -10991,13 +10991,13 @@
      }
    },
    "node_modules/@storybook/react-webpack5/node_modules/@storybook/builder-webpack5": {
-      "version": "10.5.8",
-      "resolved": "https://registry.npmjs.org/@storybook/builder-webpack5/-/builder-webpack5-10.5.8.tgz",
-      "integrity": "sha512-ke5x27gtWQ4gpXCLWxdGkr8ZlJwBykV/KjbBTAlC04dmS9OkI9MBzGj+TteUlgrcaN7LwoNTR5zRmxKStOZYzQ==",
+      "version": "10.5.7",
+      "resolved": "https://registry.npmjs.org/@storybook/builder-webpack5/-/builder-webpack5-10.5.7.tgz",
+      "integrity": "sha512-4n4c60LihFivZnjAcXGO5+XbgZthoUtKb/nPKVgypj3MpEetzjq6XR83A4UNnRsXYmjqfn6bsDWNgEJ/RvQg5A==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@storybook/core-webpack": "10.5.8",
+        "@storybook/core-webpack": "10.5.7",
        "case-sensitive-paths-webpack-plugin": "^2.4.0",
        "cjs-module-lexer": "^1.2.3",
        "css-loader": "^7.1.2",
@@ -11019,7 +11019,7 @@
        "url": "https://opencollective.com/storybook"
      },
      "peerDependencies": {
-        "storybook": "10.5.8"
+        "storybook": "10.5.7"
      },
      "peerDependenciesMeta": {
        "typescript": {
@@ -11028,9 +11028,9 @@
      }
    },
    "node_modules/@storybook/react-webpack5/node_modules/@storybook/builder-webpack5/node_modules/@storybook/core-webpack": {
-      "version": "10.5.8",
-      "resolved": "https://registry.npmjs.org/@storybook/core-webpack/-/core-webpack-10.5.8.tgz",
-      "integrity": "sha512-HccINB0UbTtnyJtKpaX+C35BRTSnAwnreIMwwI+LpeUd4x9mQg0G9orB7lfBBZwd5LQf8YhM2Vkjiawzo41GLg==",
+      "version": "10.5.7",
+      "resolved": "https://registry.npmjs.org/@storybook/core-webpack/-/core-webpack-10.5.7.tgz",
+      "integrity": "sha512-0dtDw/FNPREoeCHX2RgZz0OecxaAGol1R7bCobFevArxyFIPJisTfjDMUFHKr+3B7BilTd3vnatl7Nlvgs0EiA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -11041,17 +11041,17 @@
        "url": "https://opencollective.com/storybook"
      },
      "peerDependencies": {
-        "storybook": "10.5.8"
+        "storybook": "10.5.7"
      }
    },
    "node_modules/@storybook/react-webpack5/node_modules/@storybook/preset-react-webpack": {
-      "version": "10.5.8",
-      "resolved": "https://registry.npmjs.org/@storybook/preset-react-webpack/-/preset-react-webpack-10.5.8.tgz",
-      "integrity": "sha512-0JjgVoX5t9Wb+gwddYHx/Ej7KFqwd65lpHXEhBoT4pFWRqVI0pvfHu42M+DRGjsgOye3uE+3pH4yHR3+0/fCHA==",
+      "version": "10.5.7",
+      "resolved": "https://registry.npmjs.org/@storybook/preset-react-webpack/-/preset-react-webpack-10.5.7.tgz",
+      "integrity": "sha512-xwNRcoVlIDx1/YYCFBAxfh/91vFiOgrVI+0Ir4u9eO87SH2leehRnJh619QEOrlQEU5px487y2BmL2ZVtmTpYA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@storybook/core-webpack": "10.5.8",
+        "@storybook/core-webpack": "10.5.7",
        "@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.0c3f3b7.0",
        "@types/semver": "^7.7.1",
        "magic-string": "^0.30.5",
@@ -11068,7 +11068,7 @@
      "peerDependencies": {
        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "storybook": "10.5.8"
+        "storybook": "10.5.7"
      },
      "peerDependenciesMeta": {
        "typescript": {
@@ -11077,9 +11077,9 @@
      }
    },
    "node_modules/@storybook/react-webpack5/node_modules/@storybook/preset-react-webpack/node_modules/@storybook/core-webpack": {
-      "version": "10.5.8",
-      "resolved": "https://registry.npmjs.org/@storybook/core-webpack/-/core-webpack-10.5.8.tgz",
-      "integrity": "sha512-HccINB0UbTtnyJtKpaX+C35BRTSnAwnreIMwwI+LpeUd4x9mQg0G9orB7lfBBZwd5LQf8YhM2Vkjiawzo41GLg==",
+      "version": "10.5.7",
+      "resolved": "https://registry.npmjs.org/@storybook/core-webpack/-/core-webpack-10.5.7.tgz",
+      "integrity": "sha512-0dtDw/FNPREoeCHX2RgZz0OecxaAGol1R7bCobFevArxyFIPJisTfjDMUFHKr+3B7BilTd3vnatl7Nlvgs0EiA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -11090,18 +11090,18 @@
        "url": "https://opencollective.com/storybook"
      },
      "peerDependencies": {
-        "storybook": "10.5.8"
+        "storybook": "10.5.7"
      }
    },
    "node_modules/@storybook/react-webpack5/node_modules/@storybook/react": {
-      "version": "10.5.8",
-      "resolved": "https://registry.npmjs.org/@storybook/react/-/react-10.5.8.tgz",
-      "integrity": "sha512-6qqkmqX6imtL+0Z9Uan2tIfYivOI0FiVmWr0zpqqQR15AkJ18JfNcNTQoyjeAlCO0Kei56SWqnu2qLq52TYplg==",
+      "version": "10.5.7",
+      "resolved": "https://registry.npmjs.org/@storybook/react/-/react-10.5.7.tgz",
+      "integrity": "sha512-uFvty2MMdFXzW5PcQe1JqDAZkz6cQq7q/9G/cbGVnBEvP6zsOVeL+bmrQ0/WBlFQN0Ko9+ZoCTvaQ9s65zBa5g==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@storybook/global": "^5.0.0",
-        "@storybook/react-dom-shim": "10.5.8",
+        "@storybook/react-dom-shim": "10.5.7",
        "react-docgen": "^8.0.2",
        "react-docgen-typescript": "^2.2.2"
      },
@@ -11114,7 +11114,7 @@
        "@types/react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "storybook": "10.5.8",
+        "storybook": "10.5.7",
        "typescript": ">= 4.9.x"
      },
      "peerDependenciesMeta": {
@@ -11130,9 +11130,9 @@
      }
    },
    "node_modules/@storybook/react-webpack5/node_modules/@storybook/react/node_modules/@storybook/react-dom-shim": {
-      "version": "10.5.8",
-      "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-10.5.8.tgz",
-      "integrity": "sha512-N8D13/Xny+V3kfe1KBgsAHS0nKWXLLdgOOXS9poKdYzVwVCN+CGEGBxWX0zMMtdCptqa6/57em9coPlZMoO+bg==",
+      "version": "10.5.7",
+      "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-10.5.7.tgz",
+      "integrity": "sha512-lxOkyh+wu/MiBXvYQHjZfD+DRKOa4bHBzbuGuiHXnHXmdOcTRdcrQTsoeN2FPtfugmmOG66cZUEgDwNX+k5eRA==",
      "dev": true,
      "license": "MIT",
      "funding": {
@@ -11144,7 +11144,7 @@
        "@types/react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "storybook": "10.5.8"
+        "storybook": "10.5.7"
      },
      "peerDependenciesMeta": {
        "@types/react": {
@@ -11808,9 +11808,9 @@
      }
    },
    "node_modules/@swc/plugin-emotion": {
-      "version": "14.19.0",
-      "resolved": "https://registry.npmjs.org/@swc/plugin-emotion/-/plugin-emotion-14.19.0.tgz",
-      "integrity": "sha512-0/q84ro0a7kdjpYpn9Wmi5/RLHYuSwYjO638lE5ZBQfIvYpSLJxbEgLsObCmdH4KPe2stoN8plVKUpCsKPggaw==",
+      "version": "14.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/plugin-emotion/-/plugin-emotion-14.15.0.tgz",
+      "integrity": "sha512-nCsTO7mOOPz2UnT3N6YWb014uI0CVxeKg53A/KM/CvuSIE6H3KPkhaziJQ3q2jI3u3LfFuDKEnU5ZmB1330Dqg==",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
@@ -15697,9 +15697,9 @@
      "license": "MIT"
    },
    "node_modules/baseline-browser-mapping": {
-      "version": "2.11.14",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.14.tgz",
-      "integrity": "sha512-JyJ954WzuIR8/FFzX0o5krdSTrBAkcCSRfWSleRsIHSWV+cZe2FI1PKggVkFke1hBldRs+LRxUczzE9iPmgZww==",
+      "version": "2.11.13",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.13.tgz",
+      "integrity": "sha512-k9HNuUVMlqVjQ9UHzfPjIqiDbWw7WqT1AoT7GL8VwvF3r0ZfArtgiSPAlmupyNquNgOJHTuH4CKYf8ttMTWBTQ==",
      "dev": true,
      "license": "Apache-2.0",
      "bin": {
@@ -20219,9 +20219,9 @@
      }
    },
    "node_modules/eslint-plugin-storybook": {
-      "version": "10.5.8",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-storybook/-/eslint-plugin-storybook-10.5.8.tgz",
-      "integrity": "sha512-bf9W5nZyWdIaCUZf4aEZnEeD1mn+csNYX8dYUQjAo6L7/DkSLtr65R4zFZ1xeS4m6dOXO6UtUySesCSw4e8w1g==",
+      "version": "10.5.7",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-storybook/-/eslint-plugin-storybook-10.5.7.tgz",
+      "integrity": "sha512-mLpamG1Rsica2jYbUzIZOEuy7Fm1IMtVLMvvxGTpjTVKUMxTXJsANx3MBpH2VSbGQB8Yzlt5399WL/O07K97Ig==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -20230,7 +20230,7 @@
      },
      "peerDependencies": {
        "eslint": ">=8",
-        "storybook": "10.5.8"
+        "storybook": "10.5.7"
      }
    },
    "node_modules/eslint-plugin-testing-library": {
@@ -22783,9 +22783,9 @@
      "license": "MIT"
    },
    "node_modules/google-auth-library": {
-      "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-11.0.2.tgz",
-      "integrity": "sha512-vzpgPutxrghPsnjrjpzLX2bdv8IOL719Rh0oEjGnQu8YCIbnbMuTTQ5zU9LcKvLdOPgCxBwppbvnhgW90Qna5Q==",
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-11.0.1.tgz",
+      "integrity": "sha512-ZqfaYduu9ASUaFuUk5dF9g9QvufdhhSj7jFiEnCrTQcH57sFPKYetM0iU4dcKkQk6CqC1xpSrVr5uQ9NhqjNOg==",
      "license": "Apache-2.0",
      "dependencies": {
        "base64-js": "^1.3.0",
@@ -37711,9 +37711,9 @@
      }
    },
    "node_modules/storybook": {
-      "version": "10.5.8",
-      "resolved": "https://registry.npmjs.org/storybook/-/storybook-10.5.8.tgz",
-      "integrity": "sha512-rR4oFMSiWBSqI0lvsJPtcQUPj8+hzj3TkLu+Mw61Wo6YxPSb5FsLSHai0jZnuaIdKIlmu25KCfwlSQl4e1uvnA==",
+      "version": "10.5.7",
+      "resolved": "https://registry.npmjs.org/storybook/-/storybook-10.5.7.tgz",
+      "integrity": "sha512-oiKvWIwIoOhFP1i6dASYyMXwPHKEtVZMshqSB7EvIVYjWRh0l9H7gHEt1z4Gh2rLGFMekWdsm4s94rvwpR7gkg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -43073,15 +43073,6 @@
        "node": ">=12"
      }
    },
-    "packages/superset-ui-core/node_modules/dompurify": {
-      "version": "3.4.13",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.13.tgz",
-      "integrity": "sha512-2vmYIoqjze2d+kakP8S/nS5shfsl587kzwEjcGlTdiksUVgFHnFCsLYDVj/JNqJVOQZGSYBTmuycv0PodwmnMQ==",
-      "license": "(MPL-2.0 OR Apache-2.0)",
-      "optionalDependencies": {
-        "@types/trusted-types": "^2.0.7"
-      }
-    },
    "packages/superset-ui-core/node_modules/react-ace": {
      "version": "14.0.1",
      "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-14.0.1.tgz",
@@ -43429,13 +43420,22 @@
      "license": "Apache-2.0",
      "dependencies": {
        "d3": "^3.5.17",
-        "prop-types": "^15.8.1"
+        "prop-types": "^15.8.1",
+        "react": "^19.2.7"
      },
      "peerDependencies": {
        "@apache-superset/core": "*",
        "@superset-ui/chart-controls": "*",
-        "@superset-ui/core": "*",
-        "react": "^18.3.0"
+        "@superset-ui/core": "*"
+      }
+    },
+    "plugins/plugin-chart-chord/node_modules/react": {
+      "version": "19.2.8",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.8.tgz",
+      "integrity": "sha512-PWaYA1L/q9u2u7xYQi+Y3L3Yfnie7XyLeaJICV1MGD6LprsBxcAqGjYyr0eY3p+QdsA+x/Irkt4Qif8D63+Sbw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
      }
    },
    "plugins/plugin-chart-country-map": {
@@ -176,7 +176,7 @@
    "geostyler-openlayers-parser": "^5.7.1",
    "geostyler-style": "11.0.2",
    "geostyler-wfs-parser": "^3.0.1",
-    "google-auth-library": "^11.0.2",
+    "google-auth-library": "^11.0.1",
    "immer": "^11.1.16",
    "interweave": "^13.1.1",
    "jquery": "^4.0.0",
@@ -257,13 +257,13 @@
    "@istanbuljs/nyc-config-typescript": "^1.0.1",
    "@playwright/test": "^1.62.1",
    "@pmmmwh/react-refresh-webpack-plugin": "^0.6.2",
-    "@storybook/addon-docs": "10.5.8",
-    "@storybook/addon-links": "10.5.8",
-    "@storybook/react-webpack5": "10.5.8",
+    "@storybook/addon-docs": "10.5.7",
+    "@storybook/addon-links": "10.5.7",
+    "@storybook/react-webpack5": "10.5.7",
    "@storybook/test-runner": "0.24.4",
    "@svgr/webpack": "^8.1.0",
    "@swc/core": "^1.15.47",
-    "@swc/plugin-emotion": "^14.19.0",
+    "@swc/plugin-emotion": "^14.15.0",
    "@swc/plugin-transform-imports": "^12.5.0",
    "@testing-library/dom": "^10.4.1",
    "@testing-library/jest-dom": "^7.0.1",
@@ -295,7 +295,7 @@
    "babel-loader": "^10.1.1",
    "babel-plugin-dynamic-import-node": "^2.3.3",
    "babel-plugin-jsx-remove-data-test-id": "^3.0.0",
-    "baseline-browser-mapping": "^2.11.14",
+    "baseline-browser-mapping": "^2.11.13",
    "cheerio": "1.2.0",
    "concurrently": "^10.0.4",
    "copy-webpack-plugin": "^14.0.0",
@@ -312,7 +312,7 @@
    "eslint-plugin-no-only-tests": "^3.4.0",
    "eslint-plugin-react-prefer-function-component": "^5.0.0",
    "eslint-plugin-react-you-might-not-need-an-effect": "^1.0.1",
-    "eslint-plugin-storybook": "10.5.8",
+    "eslint-plugin-storybook": "10.5.7",
    "eslint-plugin-testing-library": "^7.16.2",
    "eslint-plugin-theme-colors": "file:eslint-rules/eslint-plugin-theme-colors",
    "fetch-mock": "^12.6.0",
@@ -343,7 +343,7 @@
    "source-map": "^0.8.0",
    "source-map-support": "^0.5.21",
    "speed-measure-webpack-plugin": "^1.6.0",
-    "storybook": "10.5.8",
+    "storybook": "10.5.7",
    "style-loader": "^4.0.0",
    "stylelint": "^17.14.1",
    "swc-loader": "^0.2.7",
@@ -130,7 +130,6 @@ export enum GenericDataType {
  String = 1,
  Temporal = 2,
  Boolean = 3,
-  MultiValue = 4,
 }

 /**
@@ -28,7 +28,6 @@ import {
  FieldBinaryOutlined,
  FieldStringOutlined,
  NumberOutlined,
-  UnorderedListOutlined,
 } from '@ant-design/icons';
 import { Icons } from '@superset-ui/core/components';

@@ -73,10 +72,6 @@ export function ColumnTypeLabel({ type }: ColumnTypeLabelProps) {
    typeIcon = <FieldBinaryOutlined aria-label={t('boolean type icon')} />;
  } else if (type === GenericDataType.Temporal) {
    typeIcon = <ClockCircleOutlined aria-label={t('temporal type icon')} />;
-  } else if (type === GenericDataType.MultiValue) {
-    typeIcon = (
-      <UnorderedListOutlined aria-label={t('multi-value type icon')} />
-    );
  }

  return <TypeIconWrapper>{typeIcon}</TypeIconWrapper>;
@@ -51,20 +51,6 @@ export interface MetricOptionProps {
  shouldShowTooltip?: boolean;
 }

-/**
- * `url` is an arbitrary caller-supplied string rendered as an href. Only
- * http(s) and relative URLs become links; other schemes degrade to plain
- * text.
- */
-function isSafeHref(url: string): boolean {
-  try {
-    const { protocol } = new URL(url, window.location.origin);
-    return protocol === 'http:' || protocol === 'https:';
-  } catch {
-    return false;
-  }
-}
-
 export function MetricOption({
  metric,
  labelRef,
@@ -84,7 +70,7 @@ export function MetricOption({
      `}
      ref={labelRef}
    >
-      {url && isSafeHref(url) ? (
+      {url ? (
        <Typography.Link
          href={url}
          target={openInNewWindow ? '_blank' : ''}
@@ -64,21 +64,4 @@ describe('ColumnOption', () => {
    renderColumnTypeLabel({ type: GenericDataType.Temporal });
    expect(screen.getByLabelText('temporal type icon')).toBeVisible();
  });
-  test('multi-value (array) type shows list icon', () => {
-    renderColumnTypeLabel({ type: GenericDataType.MultiValue });
-    expect(screen.getByLabelText('multi-value type icon')).toBeVisible();
-  });
-});
-
-describe('GenericDataType enum parity', () => {
-  // These numeric values are shared with the backend enum in
-  // superset/utils/core.py (GenericDataType). They must stay in sync because
-  // the backend serializes columns using these integers.
-  test('values match the backend contract', () => {
-    expect(GenericDataType.Numeric).toBe(0);
-    expect(GenericDataType.String).toBe(1);
-    expect(GenericDataType.Temporal).toBe(2);
-    expect(GenericDataType.Boolean).toBe(3);
-    expect(GenericDataType.MultiValue).toBe(4);
-  });
 });
@@ -112,26 +112,3 @@ test('shows a Tooltip for the verbose metric name', () => {
  const { getByTestId } = setup();
  expect(getByTestId('mock-tooltip')).toBeInTheDocument();
 });
-test('does not render javascript: URLs as links', () => {
-  // Regression test: the url prop can be creator-authored and must
-  // never become a script-bearing href for other viewers.
-  const { queryByRole, getByText } = setup({
-    url: 'javascript:alert(document.domain)', // eslint-disable-line no-script-url
-  });
-  expect(queryByRole('link')).not.toBeInTheDocument();
-  expect(getByText(defaultProps.metric.verbose_name)).toBeInTheDocument();
-});
-test('does not render data: URLs as links', () => {
-  const { queryByRole } = setup({
-    url: 'data:text/html,<script>alert(1)</script>',
-  });
-  expect(queryByRole('link')).not.toBeInTheDocument();
-});
-test('renders relative URLs as links', () => {
-  const { getByRole } = setup({
-    url: '/superset/dashboard/1/',
-  });
-  expect(
-    getByRole('link', { name: defaultProps.metric.verbose_name }),
-  ).toHaveAttribute('href', '/superset/dashboard/1/');
-});
@@ -246,34 +246,6 @@ test('wraps component with proper container div', () => {
  expect(wrapper).toHaveAttribute('data-themed-ag-grid', 'true');
 });

-test('applies non-transparent backgrounds to native menus, tooltips and overlays', () => {
-  const customTheme = {
-    ...supersetTheme,
-    colorBgElevated: '#f2f2f2',
-  };
-
-  render(
-    <ThemeProvider theme={customTheme}>
-      <ThemedAgGridReact rowData={mockRowData} columnDefs={mockColumnDefs} />
-    </ThemeProvider>,
-  );
-
-  const agGrid = screen.getByTestId('ag-grid-react');
-  const theme = JSON.parse(agGrid.getAttribute('data-theme') || '{}');
-
-  // ag-grid's own context/column menus, side bar, tooltips and overlays are
-  // rendered against these params rather than `backgroundColor` (which is
-  // intentionally 'transparent' so the surrounding app shows through the
-  // grid body). Without explicit values they inherit transparency too,
-  // making native menus/popups unreadable.
-  expect(theme.chromeBackgroundColor).toBe('#f2f2f2');
-  expect(theme.menuBackgroundColor).toBe('#f2f2f2');
-  expect(theme.menuBorder).toBe(true);
-  expect(theme.sideBarBackgroundColor).toBe('#f2f2f2');
-  expect(theme.tooltipBackgroundColor).toBe('#f2f2f2');
-  expect(theme.modalOverlayBackgroundColor).toBe('#f2f2f2');
-});
-
 test('handles missing theme gracefully', () => {
  const incompleteTheme = {
    ...supersetTheme,
@@ -104,17 +104,6 @@ export const ThemedAgGridReact = forwardRef<
      foregroundColor: theme.colorText,
      browserColorScheme: isDarkMode ? 'dark' : 'light',

-      // Native menus, popups, side bar, tooltips and loading/no-rows overlays
-      // are rendered against these params rather than `backgroundColor`
-      // (which is intentionally transparent). Without explicit values they
-      // inherit transparency too, making them unreadable.
-      chromeBackgroundColor: theme.colorBgElevated,
-      menuBackgroundColor: theme.colorBgElevated,
-      menuBorder: true,
-      sideBarBackgroundColor: theme.colorBgElevated,
-      tooltipBackgroundColor: theme.colorBgElevated,
-      modalOverlayBackgroundColor: theme.colorBgElevated,
-
      // Header styling
      headerBackgroundColor: theme.colorFillTertiary,
      headerTextColor: theme.colorTextHeading,
@@ -25,11 +25,8 @@ export type Aggregate =
  | 'COUNT'
  | 'COUNT_DISTINCT'
  | 'MAX'
-  | 'MEDIAN'
  | 'MIN'
-  | 'STDDEV_SAMP'
-  | 'SUM'
-  | 'VAR_SAMP';
+  | 'SUM';

 export interface AdhocMetricBase {
  hasCustomLabel?: boolean;
@@ -49,6 +49,5 @@ export { default as finestTemporalGrainFormatter } from './formatters/finestTemp

 export { default as normalizeTimestamp } from './utils/normalizeTimestamp';
 export { default as denormalizeTimestamp } from './utils/denormalizeTimestamp';
-export { default as createTimeRangeFromGranularity } from './utils/createTimeRangeFromGranularity';

 export * from './types';
@@ -123,25 +123,6 @@ describe('isProbablyHTML', () => {
    expect(isProbablyHTML('<canvas></canvas>')).toBe(true);
    expect(isProbablyHTML('<iframe src="page.html"></iframe>')).toBe(true);
  });
-
-  test('should return true for script-capable and foreign-content tags', () => {
-    expect(isProbablyHTML('<svg onload="alert(1)"></svg>')).toBe(true);
-    expect(isProbablyHTML('<math><mi>x</mi></math>')).toBe(true);
-    expect(
-      isProbablyHTML('<details open ontoggle="alert(1)">x</details>'),
-    ).toBe(true);
-    expect(isProbablyHTML('<summary>x</summary>')).toBe(true);
-    expect(isProbablyHTML('<object data="x"></object>')).toBe(true);
-    expect(isProbablyHTML('<embed src="x">')).toBe(true);
-    expect(isProbablyHTML('<marquee>x</marquee>')).toBe(true);
-    expect(isProbablyHTML('<template>x</template>')).toBe(true);
-    expect(isProbablyHTML('<dialog open>x</dialog>')).toBe(true);
-  });
-
-  test('should return true for elements that parse into document.head', () => {
-    expect(isProbablyHTML('<style>body { display: none; }</style>')).toBe(true);
-    expect(isProbablyHTML('<title>injected</title>')).toBe(true);
-  });
 });

 describe('sanitizeHtmlIfNeeded', () => {
@@ -156,24 +137,6 @@ describe('sanitizeHtmlIfNeeded', () => {
    const sanitizedString = sanitizeHtmlIfNeeded(plainText);
    expect(sanitizedString).toEqual(plainText);
  });
-
-  test('should sanitize svg/details/style payloads instead of passing them through', () => {
-    const svgPayload = '<svg onload="alert(document.cookie)"></svg>';
-    const sanitizedSvg = sanitizeHtmlIfNeeded(svgPayload);
-    expect(sanitizedSvg).not.toContain('<svg');
-    expect(sanitizedSvg).not.toContain('onload');
-
-    // `details` (with its `open` attribute) is in js-xss's default
-    // whitelist, so the tag itself survives sanitization; the fix is that
-    // the payload is now routed through FilterXSS at all, which strips the
-    // non-whitelisted `ontoggle` handler instead of returning it verbatim.
-    const detailsPayload = '<details open ontoggle="alert(1)">x</details>';
-    const sanitizedDetails = sanitizeHtmlIfNeeded(detailsPayload);
-    expect(sanitizedDetails).toEqual('<details open>x</details>');
-
-    const stylePayload = '<style>body { display: none; }</style>';
-    expect(sanitizeHtmlIfNeeded(stylePayload)).not.toContain('<style');
-  });
 });

 describe('safeHtmlSpan', () => {
@@ -154,20 +154,6 @@ const KNOWN_HTML_TAGS = new Set([
  'html',
  'head',
  'body',
-  // Script-capable elements and foreign-content roots (SVG/MathML). These
-  // must be classified as HTML so that downstream sanitization is applied;
-  // omitting them makes the heuristic fail open — payloads such as
-  // `<svg onload=...>` or `<details open ontoggle=...>` would be classified
-  // "not HTML" and returned verbatim by sanitizeHtmlIfNeeded.
-  'svg',
-  'math',
-  'details',
-  'summary',
-  'object',
-  'embed',
-  'marquee',
-  'template',
-  'dialog',
 ]);

 const HTML_TAG_PATTERN = new RegExp(
@@ -197,15 +183,10 @@ export function isProbablyHTML(text: string) {
  const parser = new DOMParser();
  const doc = parser.parseFromString(cleanedStr, 'text/html');

-  // Check if parsing created actual HTML elements (not just text nodes).
-  // Some elements (e.g. <style>, <title>, <meta>, <link>) parse into
-  // document.head rather than document.body, so both must be inspected —
-  // otherwise a bare <style> payload is classified "not HTML" and skips
-  // sanitization.
-  const elements = [
-    ...Array.from(doc.head.childNodes),
-    ...Array.from(doc.body.childNodes),
-  ].filter(node => node.nodeType === 1) as Element[];
+  // Check if parsing created actual HTML elements (not just text nodes)
+  const elements = Array.from(doc.body.childNodes).filter(
+    node => node.nodeType === 1,
+  ) as Element[];

  // If no elements were created, it's not HTML
  if (elements.length === 0) {
@@ -47,10 +47,6 @@ export default defineConfig({
  // Retry logic - 2 retries in CI, 0 locally
  retries: process.env.CI ? 2 : 0,

-  // Disable capturing Git commit info as the project's history is increasingly dense
-  // and breach Playwright's default 3-seconds `git` command timeout limit
-  captureGitInfo: { commit: false, diff: false },
-
  // Reporter configuration - multiple reporters for better visibility
  reporter: process.env.CI
    ? [
@@ -22,7 +22,7 @@ import { Modal } from '../core/Modal';

 /**
 * Confirm Dialog component for Ant Design Modal.confirm dialogs.
- * These are the "Confirm" / "Cancel" confirmation dialogs used throughout Superset.
+ * These are the "OK" / "Cancel" confirmation dialogs used throughout Superset.
 * Uses getByRole with name to target specific confirm dialogs when multiple are open.
 */
 export class ConfirmDialog extends Modal {
@@ -43,7 +43,7 @@ export class ConfirmDialog extends Modal {
  }

  /**
-   * Clicks the Confirm button to confirm.
+   * Clicks the OK button to confirm.
   * @param options.timeout - If provided, silently returns if dialog doesn't appear
   *                          within timeout. If not provided, waits indefinitely (strict mode).
   */
@@ -53,7 +53,7 @@ export class ConfirmDialog extends Modal {
        state: 'visible',
        timeout: options?.timeout,
      });
-      await this.clickFooterButton('Confirm');
+      await this.clickFooterButton('OK');
      await this.waitForHidden();
    } catch (error) {
      // Only swallow TimeoutError when timeout was explicitly provided
@@ -0,0 +1,58 @@
+/**
+ * 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.
+ */
+
+/**
+ * With SOFT_DELETE enabled the delete-confirmation modal becomes recoverable:
+ * it explains the object is moved to the archive (and for how long), and drops
+ * the "type DELETE to confirm" friction. Non-destructive — the modal is opened
+ * and dismissed without deleting anything.
+ */
+import { test, expect } from '@playwright/test';
+import { skipUnlessFeatureEnabled } from '../../helpers/featureFlags';
+
+test.beforeEach(async ({ page }) => {
+  await skipUnlessFeatureEnabled(page, 'SOFT_DELETE');
+});
+
+test('chart delete confirmation reflects soft-delete (archive) semantics', async ({
+  page,
+}) => {
+  await page.goto('chart/list/');
+  await page.locator('[data-test="chart-row-delete"]').first().waitFor();
+  await page.locator('[data-test="chart-row-delete"]').first().click();
+
+  // The action reads as "Archive", not "Delete". Scope to the dialog: with
+  // the flag on, every list row's delete action is also named "Archive", so
+  // an unscoped button query is a strict-mode violation (25 rows + modal).
+  const dialog = page.getByRole('dialog');
+  await expect(dialog.getByText(/^Archive .+\?$/)).toBeVisible();
+  await expect(dialog.getByRole('button', { name: 'Archive' })).toBeVisible();
+
+  // Recoverable copy instead of "Are you sure … permanently".
+  await expect(page.getByText(/moved to Recently Archived/i)).toBeVisible();
+  await expect(
+    page.getByText(/recover it there within \d+ days/i),
+  ).toBeVisible();
+
+  // No "type DELETE to confirm" input in recoverable mode.
+  await expect(page.getByTestId('delete-modal-input')).toHaveCount(0);
+
+  // Dismiss without deleting.
+  await page.getByTestId('close-modal-btn').click();
+});
@@ -29,7 +29,7 @@
 * restore it and asserts — via the API — that it is live again.
 */
 import { test, expect, Page } from '@playwright/test';
-import { apiGet } from '../../helpers/api/requests';
+import { apiGet, apiPost } from '../../helpers/api/requests';
 import { extractIdFromResponse } from '../../helpers/api/assertions';
 import {
  apiPostChart,
@@ -188,3 +188,58 @@ test('permanently deletes an archived item from the view', async ({ page }) => {
    await TYPES[0].softDelete(page, id).catch(() => {});
  }
 });
+
+test('shows an empty message and no rows when the search matches nothing', async ({
+  page,
+}) => {
+  await page.goto('archived/');
+  await expect(page.getByTestId('archived-list-view')).toBeVisible();
+
+  const search = page.getByPlaceholder(/type a value/i);
+  await search.click();
+  await search.fill(`e2e_nonexistent_${Date.now()}`);
+  await search.press('Enter');
+
+  await expect(
+    page.getByText('No results match your filter criteria'),
+  ).toBeVisible();
+  await expect(page.getByTestId('archived-row-restore')).toHaveCount(0);
+});
+
+test('restoring an already-restored row surfaces an error without crashing', async ({
+  page,
+}) => {
+  const name = `e2e_stale_${Date.now()}`;
+  const id = await TYPES[0].create(page, name);
+  // Capture the uuid before soft-delete (a soft-deleted GET returns 404).
+  const { uuid } = (await (await apiGetDashboard(page, id)).json()).result;
+  try {
+    expect((await apiDeleteDashboard(page, id)).ok()).toBeTruthy();
+
+    await openArchive(page, 'Dashboard', name);
+    await expect(page.getByText(name, { exact: false })).toBeVisible();
+
+    // Simulate another actor restoring the object out from under this view.
+    const restored = await apiPost(
+      page,
+      `api/v1/dashboard/${uuid}/restore`,
+      {},
+    );
+    expect(restored.ok()).toBeTruthy();
+
+    // Clicking the now-stale row's Restore yields a 404 → danger toast, no crash.
+    await page
+      .getByRole('row')
+      .filter({ hasText: name })
+      .getByTestId('archived-row-restore')
+      .click();
+    await expect(
+      page.getByText(`Failed to restore ${name}`, { exact: false }),
+    ).toBeVisible({ timeout: 15000 });
+    // The page is still functional (the list view did not crash).
+    await expect(page.getByTestId('archived-list-view')).toBeVisible();
+  } finally {
+    // Re-archive the (possibly) restored dashboard, whatever happened above.
+    await apiDeleteDashboard(page, id).catch(() => {});
+  }
+});
@@ -27,21 +27,11 @@ const StyledTotalCell = styled.div`
  `}
 `;

-// `align` originates from the chart's stored column_config
-// (col.config.horizontalAlign), which can be set to an arbitrary string via
-// a direct chart-params API write. Emotion compiles interpolated strings as
-// CSS source, so the value must be clamped to a closed set of keywords
-// before it reaches the stylesheet — never interpolated raw.
-const ALLOWED_ALIGN_VALUES = new Set(['left', 'right', 'center']);
-
-const safeAlign = (align?: string) =>
-  align && ALLOWED_ALIGN_VALUES.has(align) ? align : 'left';
-
 const CellContainer = styled.div<{ backgroundColor?: string; align?: string }>`
  display: flex;
  background-color: ${({ backgroundColor }) =>
    backgroundColor || 'transparent'};
-  justify-content: ${({ align }) => safeAlign(align)};
+  justify-content: ${({ align }) => align || 'left'};
 `;

 const ArrowContainer = styled.div<{ arrowColor?: string }>`
@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import '@testing-library/jest-dom';
-import { render } from '@superset-ui/core/spec';
-import { NumericCellRenderer } from '../src/renderers/NumericCellRenderer';
-
-const renderCell = (horizontalAlign?: string) => {
-  const params = {
-    value: 42,
-    valueFormatted: '42',
-    node: { rowPinned: undefined, rowIndex: 0 },
-    hasBasicColorFormatters: false,
-    basicColorFormatters: [],
-    col: {
-      isNumeric: true,
-      config: horizontalAlign ? { horizontalAlign } : {},
-    },
-    valueRange: undefined,
-    alignPositiveNegative: false,
-    colorPositiveNegative: false,
-  } as unknown as Parameters<typeof NumericCellRenderer>[0];
-  return render(<NumericCellRenderer {...params} />);
-};
-
-const collectInjectedCss = () =>
-  Array.from(document.querySelectorAll('style'))
-    .map(style => style.textContent ?? '')
-    .join('\n');
-
-test('applies an allowed horizontalAlign value from column config', () => {
-  const { container } = renderCell('center');
-  expect(container.firstChild).toHaveStyle({ justifyContent: 'center' });
-});
-
-test('does not compile a malicious horizontalAlign into the stylesheet', () => {
-  const payload =
-    'right;} & { position:fixed; top:0; left:0; width:100vw; height:100vh; z-index:99999; background:#fff url(https://attacker.example/beacon) }';
-  const { container } = renderCell(payload);
-  const css = collectInjectedCss();
-  expect(css).not.toContain('position:fixed');
-  expect(css).not.toContain('attacker.example');
-  expect(container.firstChild).toHaveStyle({ justifyContent: 'left' });
-});
@@ -38,11 +38,3 @@ export const convertUTCTimestampToLocal = (utcTimestamp: number): number => {
  const offsetMs = date.getTimezoneOffset() * 60 * 1000;
  return utcTimestamp + offsetMs;
 };
-
-// Escapes HTML special characters before formatter output reaches an
-// innerHTML sink. Mirrors plugin-chart-country-map's escapeHtml.
-export const escapeHtml = (text: unknown): string => {
-  const div = document.createElement('div');
-  div.textContent = String(text);
-  return div.innerHTML;
-};
@@ -13,7 +13,6 @@ import d3tip from 'd3-tip';
 import { t } from '@apache-superset/core/translation';
 import { getContrastingColor } from '@superset-ui/core';
 import { CALENDAR_TOOLTIP_CLASS } from '../tooltip';
-import { escapeHtml } from '../utils';

 var d3 = typeof require === 'function' ? require('d3') : window.d3;

@@ -23,16 +22,14 @@ var CalHeatMap = function () {
  'use strict';

  var self = this;
-  // d3-tip assigns the .html() return value to the tip node via
-  // innerHTML, so formatter output is HTML-escaped first.
  self.tip = d3tip()
    .attr('class', `d3-tip ${CALENDAR_TOOLTIP_CLASS}`)
    .direction('n')
    .offset([-5, 0])
    .html(
      d => `
-      ${escapeHtml(self.options.timeFormatter(d.t))}: <strong>${escapeHtml(
-        self.options.valueFormatter(d.v),
+      ${self.options.timeFormatter(d.t)}: <strong>${self.options.valueFormatter(
+        d.v,
      )}</strong>
    `,
    );
@@ -40,7 +37,7 @@ var CalHeatMap = function () {
    .attr('class', `d3-tip ${CALENDAR_TOOLTIP_CLASS}`)
    .direction('n')
    .offset([-5, 0])
-    .html(d => escapeHtml(self.options.valueFormatter(d)));
+    .html(d => self.options.valueFormatter(d));

  this.allowedDataType = ['json', 'csv', 'tsv', 'txt'];

@@ -25,12 +25,8 @@ type FunctionalDateFormat = (date: Date) => string;
 interface CalHeatMapInstance {
  options: {
    dateFormatter: DateFormatter | null;
-    timeFormatter: (t: number) => string;
-    valueFormatter: (v: number) => string;
  };
  formatDate(date: Date, format: string | FunctionalDateFormat): string;
-  tip: { html(): (d: { t: number; v: number }) => string };
-  legendTip: { html(): (d: number) => string };
 }

 const CalHeatMap = CalHeatMapImport as unknown as new () => CalHeatMapInstance;
@@ -63,29 +59,3 @@ test('CalHeatMap keeps the D3 formatter fallback', () => {

  expect(calendar.formatDate(date, '%B')).toBe('January');
 });
-
-test('cell tooltip HTML escapes creator-controlled formatter output', () => {
-  // Regression test: the tip's .html() callback is assigned to the
-  // tooltip node via innerHTML (d3-tip), so formatter output must be
-  // escaped before it's returned.
-  const calendar = new CalHeatMap();
-  calendar.options.timeFormatter = () => '<img src=x onerror=alert(1)>';
-  calendar.options.valueFormatter = () => '<svg onload=alert(2)>';
-
-  const html = calendar.tip.html()({ t: 0, v: 1 });
-
-  expect(html).not.toContain('<img');
-  expect(html).not.toContain('<svg');
-  expect(html).toContain('&lt;img');
-  expect(html).toContain('&lt;svg');
-});
-
-test('legend tooltip HTML escapes creator-controlled formatter output', () => {
-  const calendar = new CalHeatMap();
-  calendar.options.valueFormatter = () => '<img src=x onerror=alert(1)>';
-
-  const html = calendar.legendTip.html()(1);
-
-  expect(html).not.toContain('<img');
-  expect(html).toContain('&lt;img');
-});
@@ -17,11 +17,7 @@
 * under the License.
 */

-import {
-  getFormattedUTCTime,
-  convertUTCTimestampToLocal,
-  escapeHtml,
-} from '../src/utils';
+import { getFormattedUTCTime, convertUTCTimestampToLocal } from '../src/utils';

 test('getFormattedUTCTime formats local timestamp for display as UTC date', () => {
  const utcTimestamp = 1420070400000; // 2015-01-01 00:00:00 UTC
@@ -91,22 +87,3 @@ test('convertUTCTimestampToLocal and getFormattedUTCTime work together to displa
  const formattedTime = getFormattedUTCTime(localTimestamp, '%Y-%m-%d');
  expect(formattedTime).toContain('2024-01-01');
 });
-
-test('escapeHtml neutralizes markup smuggled through a time format string', () => {
-  // Regression test: d3-time-format passes non-% characters through
-  // verbatim, so escaping must happen before the innerHTML sink.
-  const formatted = getFormattedUTCTime(
-    1704067200000,
-    '%Y <img src=x onerror=alert(1)>',
-  );
-  const escaped = escapeHtml(formatted);
-
-  expect(formatted).toContain('<img');
-  expect(escaped).not.toContain('<img');
-  expect(escaped).toContain('&lt;img');
-});
-
-test('escapeHtml stringifies non-string formatter output safely', () => {
-  expect(escapeHtml(1234)).toEqual('1234');
-  expect(escapeHtml('a & b < c')).toEqual('a &amp; b &lt; c');
-});
@@ -33,27 +33,6 @@ import { WmsLayerConf, WfsLayerConf, LayerConf, XyzLayerConf } from '../types';
 import { isWfsLayerConf, isWmsLayerConf, isXyzLayerConf } from '../typeguards';
 import { isVersionBelow } from './serviceUtil';

-/**
- * Escape HTML special characters in a layer attribution string.
- *
- * OpenLayers' Attribution control renders attribution strings via innerHTML,
- * and the attribution here comes from creator-supplied chart form data, so it
- * must be treated as untrusted text rather than markup to prevent stored XSS.
- *
- * @param attribution The attribution string from the layer configuration
- *
- * @returns The attribution with HTML special characters escaped
- */
-export const escapeAttribution = (attribution?: string): string | undefined =>
-  attribution === undefined
-    ? undefined
-    : attribution
-        .replace(/&/g, '&amp;')
-        .replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;')
-        .replace(/"/g, '&quot;')
-        .replace(/'/g, '&#039;');
-
 /**
 * Create a WMS layer.
 *
@@ -70,7 +49,7 @@ export const createWmsLayer = (wmsLayerConf: WmsLayerConf) => {
        LAYERS: layersParam,
        VERSION: version,
      },
-      attributions: escapeAttribution(attribution),
+      attributions: attribution,
    }),
  });
 };
@@ -87,7 +66,7 @@ export const createXyzLayer = (xyzLayerConf: XyzLayerConf) => {
  return new TileLayer({
    source: new XyzSource({
      url,
-      attributions: escapeAttribution(attribution),
+      attributions: attribution,
    }),
  });
 };
@@ -111,7 +90,7 @@ export const createWfsLayer = async (wfsLayerConf: WfsLayerConf) => {

  const wfsSource = new VectorSource({
    format: new GeoJSON(),
-    attributions: escapeAttribution(attribution),
+    attributions: attribution,
    url: extent => {
      const requestUrl = new URL(url);
      const params = requestUrl.searchParams;
@@ -17,65 +17,20 @@
 * under the License.
 */

-import { WfsLayerConf, WmsLayerConf, XyzLayerConf } from '../../src/types';
+import { WfsLayerConf } from '../../src/types';
 import {
  createLayer,
  createWfsLayer,
  createWmsLayer,
  createXyzLayer,
-  escapeAttribution,
 } from '../../src/util/layerUtil';

 describe('layerUtil', () => {
-  describe('escapeAttribution', () => {
-    test('escapes HTML markup in attribution strings', () => {
-      expect(escapeAttribution('(c) OSM <img src=x onerror=alert(1)>')).toBe(
-        '(c) OSM &lt;img src=x onerror=alert(1)&gt;',
-      );
-      expect(escapeAttribution('a & "b" \'c\'')).toBe(
-        'a &amp; &quot;b&quot; &#039;c&#039;',
-      );
-      expect(escapeAttribution(undefined)).toBeUndefined();
-    });
-  });
-
  describe('createWmsLayer', () => {
    test('exists', () => {
      // function is trivial
      expect(createWmsLayer).toBeDefined();
    });
-
-    test('escapes HTML in the layer attribution', () => {
-      const wmsLayerConf: WmsLayerConf = {
-        title: 'wms',
-        type: 'WMS',
-        url: 'https://ows-demo.terrestris.de/geoserver/osm/wms',
-        version: '1.3.0',
-        layersParam: 'osm:osm-fuel',
-        attribution: '(c) OSM <img src=x onerror=alert(1)>',
-      };
-      const layer = createWmsLayer(wmsLayerConf);
-      const attributions = layer.getSource()?.getAttributions();
-      expect(attributions?.(undefined as never)).toEqual([
-        '(c) OSM &lt;img src=x onerror=alert(1)&gt;',
-      ]);
-    });
-  });
-
-  describe('createXyzLayer', () => {
-    test('escapes HTML in the layer attribution', () => {
-      const xyzLayerConf: XyzLayerConf = {
-        title: 'osm',
-        type: 'XYZ',
-        url: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
-        attribution: '(c) OSM <img src=x onerror=alert(1)>',
-      };
-      const layer = createXyzLayer(xyzLayerConf);
-      const attributions = layer.getSource()?.getAttributions();
-      expect(attributions?.(undefined as never)).toEqual([
-        '(c) OSM &lt;img src=x onerror=alert(1)&gt;',
-      ]);
-    });
  });

  describe('createWfsLayer', () => {
@@ -30,12 +30,12 @@
  },
  "dependencies": {
    "d3": "^3.5.17",
-    "prop-types": "^15.8.1"
+    "prop-types": "^15.8.1",
+    "react": "^19.2.7"
  },
  "peerDependencies": {
    "@apache-superset/core": "*",
    "@superset-ui/chart-controls": "*",
-    "@superset-ui/core": "*",
-    "react": "^18.3.0"
+    "@superset-ui/core": "*"
  }
 }
@@ -17,10 +17,6 @@
 * under the License.
 */

-import { getNumberFormatter } from '@superset-ui/core';
-import { render, fireEvent } from '../../../../spec/helpers/testing-library';
-import BigNumberVis from './BigNumberViz';
-
 /**
 * Tests for the color threshold formatter logic in BigNumberViz.
 *
@@ -87,33 +83,3 @@ describe('BigNumberViz color formatters', () => {
    expect(getColorFromValue).not.toHaveBeenCalled();
  });
 });
-
-describe('BigNumberViz context menu', () => {
-  test('invokes onContextMenu and stops the event bubbling to ancestor handlers', () => {
-    const onContextMenu = jest.fn();
-    const ancestorHandler = jest.fn();
-
-    const { container } = render(
-      <div onContextMenu={ancestorHandler}>
-        <BigNumberVis
-          width={200}
-          height={100}
-          bigNumber={42}
-          headerFormatter={getNumberFormatter()}
-          headerFontSize={0.3}
-          subheaderFontSize={0.125}
-          subtitleFontSize={0.125}
-          subtitle=""
-          refs={{}}
-          onContextMenu={onContextMenu}
-        />
-      </div>,
-    );
-
-    const headerLine = container.querySelector('.header-line');
-    fireEvent.contextMenu(headerLine!, { clientX: 10, clientY: 20 });
-
-    expect(onContextMenu).toHaveBeenCalledWith(10, 20);
-    expect(ancestorHandler).not.toHaveBeenCalled();
-  });
-});
@@ -224,7 +224,6 @@ function BigNumberVis({
    const handleContextMenu = (e: MouseEvent<HTMLDivElement>) => {
      if (onContextMenu) {
        e.preventDefault();
-        e.stopPropagation();
        onContextMenu(e.nativeEvent.clientX, e.nativeEvent.clientY);
      }
    };
@@ -390,7 +390,6 @@ export default function transformProps(chartProps: EchartsGanttChartProps) {
    [GenericDataType.String]: undefined,
    [GenericDataType.Temporal]: tooltipTimeFormatter,
    [GenericDataType.Boolean]: undefined,
-    [GenericDataType.MultiValue]: undefined,
  };

  const echartOptions: EChartsCoreOption = {
@@ -80,7 +80,6 @@ import {
  getAnnotationData,
 } from '../utils/annotation';
 import {
-  collapseForecastKeys,
  extractForecastSeriesContext,
  extractForecastValuesFromTooltipParams,
  formatForecastTooltipSeries,
@@ -770,9 +769,7 @@ export default function transformProps(
      nameGap: xAxisTitleMarginPx,
      nameLocation: 'middle',
      axisLabel: {
-        hideOverlap: showMaxLabel
-          ? false
-          : !(xAxisType === AxisType.Time && xAxisLabelRotation !== 0),
+        hideOverlap: !(xAxisType === AxisType.Time && xAxisLabelRotation !== 0),
        formatter: deduplicatedFormatter,
        rotate: xAxisLabelRotation,
        interval: xAxisLabelInterval,
@@ -864,14 +861,12 @@ export default function transformProps(
          : params.value[0];
        const forecastValue: any[] = richTooltip ? params : [params];

-        const sortedKeys = collapseForecastKeys(
-          extractTooltipKeys(
-            forecastValue,
-            // horizontal mode is not supported in mixed series chart
-            1,
-            richTooltip,
-            tooltipSortByMetric,
-          ),
+        const sortedKeys = extractTooltipKeys(
+          forecastValue,
+          // horizontal mode is not supported in mixed series chart
+          1,
+          richTooltip,
+          tooltipSortByMetric,
        );

        const rows: string[][] = [];
@@ -18,7 +18,6 @@
 */
 import { t } from '@apache-superset/core/translation';
 import { NumberFormatter } from '@superset-ui/core';
-import { sanitizeHtml } from '../utils/series';

 /*
 function for finding the max metric values among all series data for Radar Chart
@@ -64,7 +63,7 @@ export const renderNormalizedTooltip = (
  const { color, name = '', value: values } = params;
  const seriesName = name || 'series0';

-  const colorDot = `<span style="display:inline-block;margin-right:5px;border-radius:50%;width:5px;height:5px;background-color:${sanitizeHtml(color)}"></span>`;
+  const colorDot = `<span style="display:inline-block;margin-right:5px;border-radius:50%;width:5px;height:5px;background-color:${color}"></span>`;

  // Get metric values with denormalization if needed
  const metricValues: TooltipMetricValue[] = metrics.map((metric, index) => {
@@ -86,26 +85,19 @@ export const renderNormalizedTooltip = (
    };
  });

-  // Tooltip is rendered via innerHTML (ECharts default renderMode
-  // 'html'), so seriesName/metric/value/color are HTML-escaped, matching
-  // the treatment every other echarts tooltip path applies.
  const tooltipRows = metricValues
    .map(
      ({ metric, value }) => `
        <div style="display:flex;">
-          <div>${colorDot}${sanitizeHtml(metric)}:</div>
-          <div style="font-weight:bold;margin-left:auto;">${sanitizeHtml(
-            String(value),
-          )}</div>
+          <div>${colorDot}${metric}:</div>
+          <div style="font-weight:bold;margin-left:auto;">${value}</div>
        </div>
      `,
    )
    .join('');

  return `
-    <div style="font-weight:bold;margin-bottom:5px;">${sanitizeHtml(
-      seriesName,
-    )}</div>
+    <div style="font-weight:bold;margin-bottom:5px;">${seriesName}</div>
    ${tooltipRows}
  `;
 };
@@ -21,14 +21,8 @@ import {
  waitFor,
  cleanup,
 } from '../../../../spec/helpers/testing-library';
-import {
-  AxisType,
-  createTimeRangeFromGranularity,
-  DTTM_ALIAS,
-  TimeGranularity,
-} from '@superset-ui/core';
+import { AxisType, TimeGranularity } from '@superset-ui/core';
 import { GenericDataType } from '@apache-superset/core/common';
-import { logging } from '@apache-superset/core/utils';
 import type { EChartsCoreOption } from 'echarts/core';
 import type { ECElementEvent } from 'echarts/types/src/util/types';
 import type { ReactNode } from 'react';
@@ -99,17 +93,12 @@ afterAll(() => {
 });

 afterEach(() => {
-  jest.useRealTimers();
  cleanup();
  mockEchart.mockReset();
  (globalThis as { ResizeObserver?: typeof ResizeObserver }).ResizeObserver =
    originalResizeObserver;
 });

-const advanceClickTimer = () => {
-  jest.advanceTimersByTime(300);
-};
-
 const defaultFormData: EchartsTimeseriesFormData & {
  vizType: string;
  dateFormat: string;
@@ -325,8 +314,7 @@ test('falls back to window resize listener when ResizeObserver is unavailable',
 });

 // Test for issue #25334: Bar chart cross-filter without dimensions
-test('emits cross-filter on X-axis value when no dimensions and categorical X-axis', () => {
-  jest.useFakeTimers();
+test('emits cross-filter on X-axis value when no dimensions and categorical X-axis', async () => {
  const setDataMaskMock = jest.fn();

  const propsWithCategoricalXAxis: TimeseriesChartTransformedProps = {
@@ -360,7 +348,13 @@ test('emits cross-filter on X-axis value when no dimensions and categorical X-ax
      dataIndex: 0,
    });

-    advanceClickTimer();
+    // Wait for the timer (TIMER_DURATION = 300ms)
+    await waitFor(
+      () => {
+        expect(setDataMaskMock).toHaveBeenCalled();
+      },
+      { timeout: 500 },
+    );

    // Verify the cross-filter uses the X-axis column and value, not the metric
    const dataMaskCall = setDataMaskMock.mock.calls[0][0];
@@ -374,8 +368,7 @@ test('emits cross-filter on X-axis value when no dimensions and categorical X-ax
  }
 });

-test('emits cross-filter on category value for horizontal bar clicks', () => {
-  jest.useFakeTimers();
+test('emits cross-filter on category value for horizontal bar clicks', async () => {
  const setDataMaskMock = jest.fn();

  render(
@@ -404,7 +397,12 @@ test('emits cross-filter on category value for horizontal bar clicks', () => {
    dataIndex: 0,
  });

-  advanceClickTimer();
+  await waitFor(
+    () => {
+      expect(setDataMaskMock).toHaveBeenCalled();
+    },
+    { timeout: 500 },
+  );

  expect(setDataMaskMock.mock.calls[0][0].extraFormData.filters).toEqual([
    {
@@ -426,7 +424,9 @@ test('uses rendered categorical axis for query event handlers', () => {
    />,
  );

-  expect(getLatestEchartProps().queryEventHandlers?.[0].query).toBe('xAxis');
+  expect(getLatestEchartProps().queryEventHandlers?.[0].query).toBe(
+    'xAxis.category',
+  );

  cleanup();
  mockEchart.mockReset();
@@ -445,7 +445,9 @@ test('uses rendered categorical axis for query event handlers', () => {
    />,
  );

-  expect(getLatestEchartProps().queryEventHandlers?.[0].query).toBe('yAxis');
+  expect(getLatestEchartProps().queryEventHandlers?.[0].query).toBe(
+    'yAxis.category',
+  );
 });

 test('emits cross-filter from horizontal categorical axis label clicks', () => {
@@ -471,9 +473,8 @@ test('emits cross-filter from horizontal categorical axis label clicks', () => {
    getLatestEchartProps().queryEventHandlers?.[0].handler;
  expect(labelClickHandler).toBeDefined();
  labelClickHandler?.({
-    targetType: 'axisLabel',
    value: 'Product A',
-  } as unknown as ECElementEvent);
+  } as ECElementEvent);

  expect(setDataMaskMock.mock.calls[0][0].extraFormData.filters).toEqual([
    {
@@ -484,8 +485,7 @@ test('emits cross-filter from horizontal categorical axis label clicks', () => {
  ]);
 });

-test('does not emit duplicate cross-filter for generic axis label clicks', () => {
-  jest.useFakeTimers();
+test('does not emit duplicate cross-filter for generic axis label clicks', async () => {
  const setDataMaskMock = jest.fn();

  render(
@@ -507,28 +507,11 @@ test('does not emit duplicate cross-filter for generic axis label clicks', () =>
    name: 'Product A',
  });

-  jest.advanceTimersByTime(400);
+  await new Promise(resolve => setTimeout(resolve, 400));
  expect(setDataMaskMock).not.toHaveBeenCalled();
 });

-test('keeps temporal range exclusive ends on whole-second boundaries', () => {
-  const clickedTimestamp = new Date(Date.UTC(2021, 0, 15, 12, 34, 56, 789));
-
-  [TimeGranularity.DAY, TimeGranularity.MONTH, TimeGranularity.YEAR].forEach(
-    grain => {
-      const [, inclusiveEnd] = createTimeRangeFromGranularity(
-        clickedTimestamp,
-        grain,
-        false,
-      );
-      const exclusiveEnd = new Date(inclusiveEnd.getTime() + 1);
-
-      expect(exclusiveEnd.getUTCMilliseconds()).toBe(0);
-    },
-  );
-});
-
-test('emits TEMPORAL_RANGE cross-filter from time axis label click on day bucket', () => {
+test('does not emit cross-filter when no dimensions and time-based X-axis', async () => {
  const setDataMaskMock = jest.fn();

  const propsWithTimeXAxis: TimeseriesChartTransformedProps = {
@@ -536,610 +519,39 @@ test('emits TEMPORAL_RANGE cross-filter from time axis label click on day bucket
    emitCrossFilters: true,
    setDataMask: setDataMaskMock,
    groupby: [], // No dimensions
-    resolvedTimeGrain: TimeGranularity.DAY,
-    formData: {
-      ...defaultFormData,
-      granularitySqla: 'ds',
-      timeGrainSqla: TimeGranularity.DAY,
-    },
    xAxis: {
-      label: DTTM_ALIAS,
-      type: AxisType.Time,
+      label: '__timestamp',
+      type: AxisType.Time, // Time-based X-axis (not categorical)
    },
  };

  render(<EchartsTimeseries {...propsWithTimeXAxis} />);

-  const labelClickHandler = getLatestEchartProps().queryEventHandlers?.find(
-    ({ query }) => query === 'xAxis',
-  )?.handler;
-  expect(labelClickHandler).toBeDefined();
-  labelClickHandler?.({
-    targetType: 'axisLabel',
-    value: '2021-01-01',
-  } as unknown as ECElementEvent);
+  const lastCall = mockEchart.mock.calls.at(-1);
+  expect(lastCall).toBeDefined();
+  const [props] = lastCall as [EchartsProps];

-  expect(setDataMaskMock.mock.calls[0][0].extraFormData.filters).toEqual([
-    {
-      col: 'ds',
-      op: 'TEMPORAL_RANGE',
-      val: '2021-01-01T00:00:00 : 2021-01-02T00:00:00',
-    },
-  ]);
-});
+  // Simulate a click event
+  const clickHandler = props.eventHandlers?.click;
+  if (clickHandler) {
+    clickHandler({
+      componentType: 'series',
+      seriesName: 'Sales',
+      data: [1609459200000, 100], // Timestamp
+      name: '2021-01-01',
+      dataIndex: 0,
+    });

-test('emits TEMPORAL_RANGE cross-filter from time axis label click on month bucket', () => {
-  const setDataMaskMock = jest.fn();
-
-  render(
-    <EchartsTimeseries
-      {...defaultProps}
-      emitCrossFilters
-      setDataMask={setDataMaskMock}
-      groupby={[]}
-      resolvedTimeGrain={TimeGranularity.MONTH}
-      formData={{
-        ...defaultFormData,
-        granularitySqla: 'ds',
-        timeGrainSqla: TimeGranularity.MONTH,
-      }}
-      xAxis={{
-        label: DTTM_ALIAS,
-        type: AxisType.Time,
-      }}
-    />,
-  );
-
-  const labelClickHandler = getLatestEchartProps().queryEventHandlers?.find(
-    ({ query }) => query === 'xAxis',
-  )?.handler;
-  expect(labelClickHandler).toBeDefined();
-  labelClickHandler?.({
-    targetType: 'axisLabel',
-    value: '2021-01-01',
-  } as unknown as ECElementEvent);
-
-  expect(setDataMaskMock.mock.calls[0][0].extraFormData.filters).toEqual([
-    {
-      col: 'ds',
-      op: 'TEMPORAL_RANGE',
-      val: '2021-01-01T00:00:00 : 2021-02-01T00:00:00',
-    },
-  ]);
-});
-
-test('emits TEMPORAL_RANGE cross-filter from time axis label click on year bucket', () => {
-  const setDataMaskMock = jest.fn();
-
-  render(
-    <EchartsTimeseries
-      {...defaultProps}
-      emitCrossFilters
-      setDataMask={setDataMaskMock}
-      groupby={[]}
-      resolvedTimeGrain={TimeGranularity.YEAR}
-      formData={{
-        ...defaultFormData,
-        granularitySqla: 'ds',
-        timeGrainSqla: TimeGranularity.YEAR,
-      }}
-      xAxis={{
-        label: DTTM_ALIAS,
-        type: AxisType.Time,
-      }}
-    />,
-  );
-
-  const labelClickHandler = getLatestEchartProps().queryEventHandlers?.find(
-    ({ query }) => query === 'xAxis',
-  )?.handler;
-  expect(labelClickHandler).toBeDefined();
-  labelClickHandler?.({
-    targetType: 'axisLabel',
-    value: '2021-01-01',
-  } as unknown as ECElementEvent);
-
-  expect(setDataMaskMock.mock.calls[0][0].extraFormData.filters).toEqual([
-    {
-      col: 'ds',
-      op: 'TEMPORAL_RANGE',
-      val: '2021-01-01T00:00:00 : 2022-01-01T00:00:00',
-    },
-  ]);
-});
-
-test('emits upper-exclusive TEMPORAL_RANGE from time point click on month bucket', () => {
-  jest.useFakeTimers();
-  const setDataMaskMock = jest.fn();
-
-  render(
-    <EchartsTimeseries
-      {...defaultProps}
-      emitCrossFilters
-      setDataMask={setDataMaskMock}
-      groupby={[]}
-      resolvedTimeGrain={TimeGranularity.MONTH}
-      formData={{
-        ...defaultFormData,
-        granularitySqla: 'ds',
-        timeGrainSqla: TimeGranularity.MONTH,
-      }}
-      xAxis={{
-        label: DTTM_ALIAS,
-        type: AxisType.Time,
-      }}
-    />,
-  );
-
-  const clickHandler = getLatestEchartProps().eventHandlers?.click;
-  expect(clickHandler).toBeDefined();
-  clickHandler?.({
-    componentType: 'series',
-    seriesName: 'Sales',
-    data: [Date.UTC(2021, 0, 1), 100],
-    name: '2021-01-01',
-    dataIndex: 0,
-  });
-
-  advanceClickTimer();
-
-  expect(setDataMaskMock.mock.calls[0][0].extraFormData.filters).toEqual([
-    {
-      col: 'ds',
-      op: 'TEMPORAL_RANGE',
-      val: '2021-01-01T00:00:00 : 2021-02-01T00:00:00',
-    },
-  ]);
-});
-
-test('emits TEMPORAL_RANGE from string-typed time point click value', () => {
-  jest.useFakeTimers();
-  const setDataMaskMock = jest.fn();
-
-  render(
-    <EchartsTimeseries
-      {...defaultProps}
-      emitCrossFilters
-      setDataMask={setDataMaskMock}
-      groupby={[]}
-      resolvedTimeGrain={TimeGranularity.MONTH}
-      formData={{
-        ...defaultFormData,
-        granularitySqla: 'ds',
-        timeGrainSqla: TimeGranularity.MONTH,
-      }}
-      xAxis={{
-        label: DTTM_ALIAS,
-        type: AxisType.Time,
-      }}
-    />,
-  );
-
-  const clickHandler = getLatestEchartProps().eventHandlers?.click;
-  expect(clickHandler).toBeDefined();
-  clickHandler?.({
-    componentType: 'series',
-    seriesName: 'Sales',
-    data: ['2021-01-01T00:00:00Z', 100],
-    name: '2021-01-01',
-    dataIndex: 0,
-  });
-
-  advanceClickTimer();
-
-  expect(setDataMaskMock.mock.calls[0][0].extraFormData.filters).toEqual([
-    {
-      col: 'ds',
-      op: 'TEMPORAL_RANGE',
-      val: '2021-01-01T00:00:00 : 2021-02-01T00:00:00',
-    },
-  ]);
-});
-
-test('uses resolved time grain for temporal point-click cross-filter', () => {
-  jest.useFakeTimers();
-  const setDataMaskMock = jest.fn();
-
-  render(
-    <EchartsTimeseries
-      {...defaultProps}
-      emitCrossFilters
-      setDataMask={setDataMaskMock}
-      groupby={[]}
-      resolvedTimeGrain={TimeGranularity.MONTH}
-      formData={{
-        ...defaultFormData,
-        granularitySqla: 'ds',
-        timeGrainSqla: TimeGranularity.DAY,
-        extraFormData: {
-          time_grain_sqla: TimeGranularity.MONTH,
-        },
-      }}
-      xAxis={{
-        label: DTTM_ALIAS,
-        type: AxisType.Time,
-      }}
-    />,
-  );
-
-  const clickHandler = getLatestEchartProps().eventHandlers?.click;
-  expect(clickHandler).toBeDefined();
-  clickHandler?.({
-    componentType: 'series',
-    seriesName: 'Sales',
-    data: [Date.UTC(2021, 0, 1), 100],
-    name: '2021-01-01',
-    dataIndex: 0,
-  });
-
-  advanceClickTimer();
-
-  expect(setDataMaskMock.mock.calls[0][0].extraFormData.filters).toEqual([
-    {
-      col: 'ds',
-      op: 'TEMPORAL_RANGE',
-      val: '2021-01-01T00:00:00 : 2021-02-01T00:00:00',
-    },
-  ]);
-});
-
-test('emits TEMPORAL_RANGE from horizontal time point click using timestamp, not metric', () => {
-  jest.useFakeTimers();
-  const setDataMaskMock = jest.fn();
-
-  render(
-    <EchartsTimeseries
-      {...defaultProps}
-      emitCrossFilters
-      setDataMask={setDataMaskMock}
-      groupby={[]}
-      resolvedTimeGrain={TimeGranularity.MONTH}
-      formData={{
-        ...defaultFormData,
-        orientation: OrientationType.Horizontal,
-        granularitySqla: 'ds',
-        timeGrainSqla: TimeGranularity.MONTH,
-      }}
-      xAxis={{
-        label: DTTM_ALIAS,
-        type: AxisType.Time,
-      }}
-    />,
-  );
-
-  const clickHandler = getLatestEchartProps().eventHandlers?.click;
-  expect(clickHandler).toBeDefined();
-  clickHandler?.({
-    componentType: 'series',
-    seriesName: 'Sales',
-    data: [129, Date.UTC(2021, 0, 1)],
-    name: '2021-01-01',
-    dataIndex: 0,
-  });
-
-  advanceClickTimer();
-
-  expect(setDataMaskMock.mock.calls[0][0].extraFormData.filters).toEqual([
-    {
-      col: 'ds',
-      op: 'TEMPORAL_RANGE',
-      val: '2021-01-01T00:00:00 : 2021-02-01T00:00:00',
-    },
-  ]);
-});
-
-test('emits TEMPORAL_RANGE cross-filter from horizontal time axis label click', () => {
-  const setDataMaskMock = jest.fn();
-
-  render(
-    <EchartsTimeseries
-      {...defaultProps}
-      emitCrossFilters
-      setDataMask={setDataMaskMock}
-      groupby={[]}
-      resolvedTimeGrain={TimeGranularity.MONTH}
-      formData={{
-        ...defaultFormData,
-        orientation: OrientationType.Horizontal,
-        granularitySqla: 'ds',
-        timeGrainSqla: TimeGranularity.MONTH,
-      }}
-      xAxis={{
-        label: DTTM_ALIAS,
-        type: AxisType.Time,
-      }}
-    />,
-  );
-
-  const labelClickHandler = getLatestEchartProps().queryEventHandlers?.find(
-    ({ query }) => query === 'yAxis',
-  )?.handler;
-  expect(labelClickHandler).toBeDefined();
-  labelClickHandler?.({
-    targetType: 'axisLabel',
-    value: '2021-01-01',
-  } as unknown as ECElementEvent);
-
-  expect(setDataMaskMock.mock.calls[0][0].extraFormData.filters).toEqual([
-    {
-      col: 'ds',
-      op: 'TEMPORAL_RANGE',
-      val: '2021-01-01T00:00:00 : 2021-02-01T00:00:00',
-    },
-  ]);
-});
-
-test('warns and skips temporal axis label cross-filter when label value cannot be parsed', () => {
-  const setDataMaskMock = jest.fn();
-  const warn = jest.spyOn(logging, 'warn').mockImplementation();
-
-  render(
-    <EchartsTimeseries
-      {...defaultProps}
-      emitCrossFilters
-      setDataMask={setDataMaskMock}
-      groupby={[]}
-      formData={{
-        ...defaultFormData,
-        granularitySqla: 'ds',
-        timeGrainSqla: TimeGranularity.MONTH,
-      }}
-      xAxis={{
-        label: DTTM_ALIAS,
-        type: AxisType.Time,
-      }}
-    />,
-  );
-
-  const labelClickHandler = getLatestEchartProps().queryEventHandlers?.find(
-    ({ query }) => query === 'xAxis',
-  )?.handler;
-  expect(labelClickHandler).toBeDefined();
-  labelClickHandler?.({
-    targetType: 'axisLabel',
-    value: 'not-a-date',
-  } as unknown as ECElementEvent);
-
-  expect(setDataMaskMock).not.toHaveBeenCalled();
-  expect(warn).toHaveBeenCalledWith(
-    'Unable to parse time axis value for cross-filtering',
-    'not-a-date',
-  );
-
-  warn.mockRestore();
-});
-
-test('logs and skips temporal point-click cross-filter when string value cannot be parsed', () => {
-  jest.useFakeTimers();
-  const setDataMaskMock = jest.fn();
-  const warn = jest.spyOn(logging, 'warn').mockImplementation();
-
-  render(
-    <EchartsTimeseries
-      {...defaultProps}
-      emitCrossFilters
-      setDataMask={setDataMaskMock}
-      groupby={[]}
-      resolvedTimeGrain={TimeGranularity.MONTH}
-      formData={{
-        ...defaultFormData,
-        granularitySqla: 'ds',
-        timeGrainSqla: TimeGranularity.MONTH,
-      }}
-      xAxis={{
-        label: DTTM_ALIAS,
-        type: AxisType.Time,
-      }}
-    />,
-  );
-
-  const clickHandler = getLatestEchartProps().eventHandlers?.click;
-  expect(clickHandler).toBeDefined();
-  clickHandler?.({
-    componentType: 'series',
-    seriesName: 'Sales',
-    data: ['not-a-date', 100],
-    name: 'not-a-date',
-    dataIndex: 0,
-  });
-
-  advanceClickTimer();
-
-  expect(setDataMaskMock).not.toHaveBeenCalled();
-  expect(warn).toHaveBeenCalledWith(
-    'Unable to parse time axis value for cross-filtering',
-    'not-a-date',
-  );
-
-  warn.mockRestore();
-});
-
-test('emits empty temporal X-axis data mask when filter grain is missing', () => {
-  jest.useFakeTimers();
-  const setDataMaskMock = jest.fn();
-
-  render(
-    <EchartsTimeseries
-      {...defaultProps}
-      emitCrossFilters
-      setDataMask={setDataMaskMock}
-      groupby={[]}
-      formData={{
-        ...defaultFormData,
-        granularitySqla: 'ds',
-        timeGrainSqla: undefined,
-      }}
-      xAxis={{
-        label: DTTM_ALIAS,
-        type: AxisType.Time,
-      }}
-    />,
-  );
-
-  const clickHandler = getLatestEchartProps().eventHandlers?.click;
-  expect(clickHandler).toBeDefined();
-  clickHandler?.({
-    componentType: 'series',
-    seriesName: 'Sales',
-    data: [Date.UTC(2021, 0, 1), 100],
-    name: '2021-01-01',
-    dataIndex: 0,
-  });
-
-  advanceClickTimer();
-
-  expect(setDataMaskMock.mock.calls[0][0]).toEqual({
-    extraFormData: {
-      filters: [],
-    },
-    filterState: {
-      label: undefined,
-      value: null,
-      selectedValues: null,
-    },
-  });
-});
-
-test('clears temporal X-axis cross-filter when clicking selected bucket again', () => {
-  jest.useFakeTimers();
-  const setDataMaskMock = jest.fn();
-  const selectedRange = '2021-01-01T00:00:00 : 2021-02-01T00:00:00';
-
-  render(
-    <EchartsTimeseries
-      {...defaultProps}
-      emitCrossFilters
-      setDataMask={setDataMaskMock}
-      groupby={[]}
-      selectedValues={{ 0: selectedRange }}
-      resolvedTimeGrain={TimeGranularity.MONTH}
-      formData={{
-        ...defaultFormData,
-        granularitySqla: 'ds',
-        timeGrainSqla: TimeGranularity.MONTH,
-      }}
-      xAxis={{
-        label: DTTM_ALIAS,
-        type: AxisType.Time,
-      }}
-    />,
-  );
-
-  const clickHandler = getLatestEchartProps().eventHandlers?.click;
-  expect(clickHandler).toBeDefined();
-  clickHandler?.({
-    componentType: 'series',
-    seriesName: 'Sales',
-    data: [Date.UTC(2021, 0, 1), 100],
-    name: '2021-01-01',
-    dataIndex: 0,
-  });
-
-  advanceClickTimer();
-
-  expect(setDataMaskMock.mock.calls[0][0]).toEqual({
-    extraFormData: {
-      filters: [],
-    },
-    filterState: {
-      label: undefined,
-      value: null,
-      selectedValues: null,
-    },
-  });
-});
-
-test('does not emit temporal X-axis label cross-filter when dimensions are set', () => {
-  const setDataMaskMock = jest.fn();
-
-  render(
-    <EchartsTimeseries
-      {...defaultProps}
-      emitCrossFilters
-      setDataMask={setDataMaskMock}
-      groupby={['country']}
-      formData={{
-        ...defaultFormData,
-        groupby: ['country'],
-        granularitySqla: 'ds',
-        timeGrainSqla: TimeGranularity.MONTH,
-      }}
-      xAxis={{
-        label: DTTM_ALIAS,
-        type: AxisType.Time,
-      }}
-    />,
-  );
-
-  const labelClickHandler = getLatestEchartProps().queryEventHandlers?.find(
-    ({ query }) => query === 'xAxis',
-  )?.handler;
-  expect(labelClickHandler).toBeDefined();
-  labelClickHandler?.({
-    targetType: 'axisLabel',
-    value: '2021-01-01',
-  } as unknown as ECElementEvent);
-
-  expect(setDataMaskMock).not.toHaveBeenCalled();
-});
-
-test('does not emit temporal X-axis cross-filter when dimensions are set', () => {
-  jest.useFakeTimers();
-  const setDataMaskMock = jest.fn();
-
-  render(
-    <EchartsTimeseries
-      {...defaultProps}
-      emitCrossFilters
-      setDataMask={setDataMaskMock}
-      groupby={['country']}
-      labelMap={{
-        Sales: ['US'],
-      }}
-      formData={{
-        ...defaultFormData,
-        groupby: ['country'],
-        granularitySqla: 'ds',
-        timeGrainSqla: TimeGranularity.MONTH,
-      }}
-      xAxis={{
-        label: DTTM_ALIAS,
-        type: AxisType.Time,
-      }}
-    />,
-  );
-
-  const clickHandler = getLatestEchartProps().eventHandlers?.click;
-  expect(clickHandler).toBeDefined();
-  clickHandler?.({
-    componentType: 'series',
-    seriesName: 'Sales',
-    data: [Date.UTC(2021, 0, 1), 100],
-    name: '2021-01-01',
-    dataIndex: 0,
-  });
-
-  advanceClickTimer();
-
-  expect(setDataMaskMock.mock.calls[0][0].extraFormData.filters).toEqual([
-    {
-      col: 'country',
-      op: 'IN',
-      val: ['US'],
-    },
-  ]);
-  expect(
-    setDataMaskMock.mock.calls[0][0].extraFormData.filters.some(
-      (filter: { op: string }) => filter.op === 'TEMPORAL_RANGE',
-    ),
-  ).toBe(false);
+    // Wait a bit and verify setDataMask was NOT called
+    await new Promise(resolve => setTimeout(resolve, 400));
+    expect(setDataMaskMock).not.toHaveBeenCalled();
+  }
 });

 // Test for issue #41102: horizontal bar cross-filter must use the category
 // value, not the metric. For horizontal bars the data tuple is value-first
 // (e.g. [100, 'Product A']), so relying on data[0] emitted the metric value.
-test('emits cross-filter on the category value for a horizontal categorical bar', () => {
-  jest.useFakeTimers();
+test('emits cross-filter on the category value for a horizontal categorical bar', async () => {
  const setDataMaskMock = jest.fn();

  const propsWithHorizontalXAxis: TimeseriesChartTransformedProps = {
@@ -1173,7 +585,12 @@ test('emits cross-filter on the category value for a horizontal categorical bar'
      dataIndex: 0,
    });

-    advanceClickTimer();
+    await waitFor(
+      () => {
+        expect(setDataMaskMock).toHaveBeenCalled();
+      },
+      { timeout: 500 },
+    );

    // Must filter on the category ('Product A'), not the metric value (100)
    const dataMaskCall = setDataMaskMock.mock.calls[0][0];
@@ -1187,55 +604,6 @@ test('emits cross-filter on the category value for a horizontal categorical bar'
  }
 });

-test('context menu cross-filter is available for a temporal bar point', async () => {
-  const onContextMenuMock = jest.fn();
-
-  render(
-    <EchartsTimeseries
-      {...defaultProps}
-      emitCrossFilters
-      onContextMenu={onContextMenuMock}
-      groupby={[]}
-      resolvedTimeGrain={TimeGranularity.MONTH}
-      formData={{
-        ...defaultFormData,
-        granularitySqla: 'ds',
-        timeGrainSqla: TimeGranularity.DAY,
-        extraFormData: {
-          time_grain_sqla: TimeGranularity.MONTH,
-        },
-      }}
-      xAxis={{
-        label: DTTM_ALIAS,
-        type: AxisType.Time,
-      }}
-    />,
-  );
-
-  const contextMenuHandler = getLatestEchartProps().eventHandlers?.contextmenu;
-  expect(contextMenuHandler).toBeDefined();
-  await contextMenuHandler?.({
-    componentType: 'series',
-    seriesName: 'Sales',
-    data: [Date.UTC(2021, 0, 1), 100],
-    name: '2021-01-01',
-    event: { stop: jest.fn(), event: { clientX: 10, clientY: 20 } },
-  });
-
-  await waitFor(() => {
-    expect(onContextMenuMock).toHaveBeenCalled();
-  });
-
-  const { crossFilter } = onContextMenuMock.mock.calls[0][2];
-  expect(crossFilter.dataMask.extraFormData.filters).toEqual([
-    {
-      col: 'ds',
-      op: 'TEMPORAL_RANGE',
-      val: '2021-01-01T00:00:00 : 2021-02-01T00:00:00',
-    },
-  ]);
-});
-
 // Test for issue #41102: the context-menu ("Add cross-filter") path must also
 // use the category value, not the metric, for a horizontal categorical bar.
 test('context menu cross-filter uses the category value for a horizontal categorical bar', async () => {
@@ -21,17 +21,14 @@ import {
  DTTM_ALIAS,
  BinaryQueryObjectFilterClause,
  AxisType,
-  type TimeGranularity,
  getTimeFormatter,
  getColumnLabel,
  getNumberFormatter,
  LegendState,
  ensureIsArray,
-  createTimeRangeFromGranularity,
 } from '@superset-ui/core';
 import { useTheme } from '@apache-superset/core/theme';
 import { GenericDataType } from '@apache-superset/core/common';
-import { logging } from '@apache-superset/core/utils';
 import type {
  ECElementEvent,
  ViewRootGroup,
@@ -51,29 +48,6 @@ import { getTemporalXAxisDrillByFilter } from '../utils/xAxisDrillByFilter';
 import { ExtraControls } from '../components/ExtraControls';

 const TIMER_DURATION = 300;
-const getTimestampFromTimeAxisValue = (value: string | number) => {
-  if (typeof value === 'number') {
-    return Number.isFinite(value) ? value : undefined;
-  }
-  const timestamp = Date.parse(value);
-  if (Number.isNaN(timestamp)) {
-    logging.warn('Unable to parse time axis value for cross-filtering', value);
-  }
-  return Number.isNaN(timestamp) ? undefined : timestamp;
-};
-
-// Day, month, and year ranges end at 23:59:59.999, so adding 1ms lands on a
-// whole-second next bucket boundary. The formatter intentionally emits seconds.
-const formatDateTime = (date: Date) =>
-  `${[
-    date.getUTCFullYear(),
-    String(date.getUTCMonth() + 1).padStart(2, '0'),
-    String(date.getUTCDate()).padStart(2, '0'),
-  ].join('-')}T${[
-    String(date.getUTCHours()).padStart(2, '0'),
-    String(date.getUTCMinutes()).padStart(2, '0'),
-    String(date.getUTCSeconds()).padStart(2, '0'),
-  ].join(':')}`;

 // Percent-change draggable baseline handle geometry, in pixels.
 const BASELINE_HANDLE_WIDTH = 8;
@@ -97,7 +71,6 @@ export default function EchartsTimeseries({
  onFocusedSeries,
  xValueFormatter,
  xAxis,
-  resolvedTimeGrain,
  refs,
  emitCrossFilters,
  coltypeMapping,
@@ -390,65 +363,6 @@ export default function EchartsTimeseries({
    [selectedValues, xAxis.label],
  );

-  const getTimeAxisCrossFilterDataMask = useCallback(
-    (clickedTimestamp: number) => {
-      const filterColumn =
-        xAxis.label === DTTM_ALIAS ? formData.granularitySqla : xAxis.label;
-      const grain = resolvedTimeGrain as TimeGranularity | undefined;
-
-      if (!filterColumn || !grain) {
-        return {
-          dataMask: {
-            extraFormData: {
-              filters: [],
-            },
-            filterState: {
-              label: undefined,
-              value: null,
-              selectedValues: null,
-            },
-          },
-          isCurrentValueSelected: false,
-        };
-      }
-
-      const [start, inclusiveEnd] = createTimeRangeFromGranularity(
-        new Date(clickedTimestamp),
-        grain,
-        false,
-      );
-      const exclusiveEnd = new Date(inclusiveEnd.getTime() + 1);
-      const timeRange = `${formatDateTime(start)} : ${formatDateTime(exclusiveEnd)}`;
-      const selected: string[] = Object.values(selectedValues);
-      const isCurrentValueSelected = selected.includes(timeRange);
-      const values = isCurrentValueSelected ? [] : [timeRange];
-
-      return {
-        dataMask: {
-          extraFormData: {
-            filters:
-              values.length === 0
-                ? []
-                : [
-                    {
-                      col: filterColumn,
-                      op: 'TEMPORAL_RANGE' as const,
-                      val: timeRange,
-                    },
-                  ],
-          },
-          filterState: {
-            label: values.length ? values : undefined,
-            value: values.length ? values : null,
-            selectedValues: values.length ? values : null,
-          },
-        },
-        isCurrentValueSelected,
-      };
-    },
-    [formData.granularitySqla, resolvedTimeGrain, selectedValues, xAxis.label],
-  );
-
  const handleChange = useCallback(
    (value: string) => {
      if (!emitCrossFilters) {
@@ -470,26 +384,15 @@ export default function EchartsTimeseries({
    [emitCrossFilters, setDataMask, getXAxisCrossFilterDataMask],
  );

-  const handleTimeAxisChange = useCallback(
-    (clickedTimestamp: number) => {
-      if (!emitCrossFilters) {
-        return;
-      }
-      setDataMask(getTimeAxisCrossFilterDataMask(clickedTimestamp).dataMask);
-    },
-    [emitCrossFilters, setDataMask, getTimeAxisCrossFilterDataMask],
-  );
-
  // Determine if X-axis can be used for cross-filtering (categorical axis without dimensions)
  const canCrossFilterByXAxis =
-    !hasDimensions &&
-    (xAxis.type === AxisType.Category || xAxis.type === AxisType.Time);
-  const xAxisValueIndex =
+    !hasDimensions && xAxis.type === AxisType.Category;
+  const categoryAxisValueIndex =
    formData.orientation === OrientationType.Horizontal ? 1 : 0;
-  const getXAxisValue = useCallback(
+  const getCategoryAxisValue = useCallback(
    (data: unknown, name: unknown) => {
      if (Array.isArray(data)) {
-        const categoryAxisValue = data[xAxisValueIndex];
+        const categoryAxisValue = data[categoryAxisValueIndex];
        if (
          typeof categoryAxisValue === 'string' ||
          typeof categoryAxisValue === 'number'
@@ -502,7 +405,7 @@ export default function EchartsTimeseries({
      }
      return undefined;
    },
-    [xAxisValueIndex],
+    [categoryAxisValueIndex],
  );

  const eventHandlers: EventHandlers = {
@@ -520,28 +423,15 @@ export default function EchartsTimeseries({
          // Cross-filter by dimension (original behavior)
          const { seriesName: name } = props;
          handleChange(name);
-        } else if (
-          canCrossFilterByXAxis &&
-          xAxis.type === AxisType.Category &&
-          props.componentType === 'series'
-        ) {
+        } else if (canCrossFilterByXAxis && props.componentType === 'series') {
          // Cross-filter by X-axis value when no dimensions (issue #25334)
-          const categoryAxisValue = getXAxisValue(props.data, props.name);
+          const categoryAxisValue = getCategoryAxisValue(
+            props.data,
+            props.name,
+          );
          if (categoryAxisValue !== undefined) {
            handleXAxisChange(categoryAxisValue);
          }
-        } else if (
-          canCrossFilterByXAxis &&
-          xAxis.type === AxisType.Time &&
-          props.componentType === 'series'
-        ) {
-          const timeAxisValue = getXAxisValue(props.data, props.name);
-          if (timeAxisValue !== undefined) {
-            const timestamp = getTimestampFromTimeAxisValue(timeAxisValue);
-            if (timestamp !== undefined) {
-              handleTimeAxisChange(timestamp);
-            }
-          }
        }
      }, TIMER_DURATION);
    },
@@ -576,20 +466,17 @@ export default function EchartsTimeseries({
        ];
        const groupBy = ensureIsArray(formData.groupby);
        if (data && xAxis.type === AxisType.Time) {
-          const timeAxisValue = getXAxisValue(data, eventParams.name);
-          if (timeAxisValue !== undefined) {
-            drillToDetailFilters.push({
-              col:
-                // if the xAxis is '__timestamp', granularity_sqla will be the column of filter
-                xAxis.label === DTTM_ALIAS
-                  ? formData.granularitySqla
-                  : xAxis.label,
-              grain: resolvedTimeGrain,
-              op: '==',
-              val: timeAxisValue,
-              formattedVal: xValueFormatter(timeAxisValue),
-            });
-          }
+          drillToDetailFilters.push({
+            col:
+              // if the xAxis is '__timestamp', granularity_sqla will be the column of filter
+              xAxis.label === DTTM_ALIAS
+                ? formData.granularitySqla
+                : xAxis.label,
+            grain: formData.timeGrainSqla,
+            op: '==',
+            val: data[0],
+            formattedVal: xValueFormatter(data[0]),
+          });
        }
        [
          ...(xAxis.type === AxisType.Category && data ? [xAxis.label] : []),
@@ -630,7 +517,9 @@ export default function EchartsTimeseries({
          xAxis.label === DTTM_ALIAS ? formData.granularitySqla : xAxis.label;
        if (data && xAxis.type === AxisType.Time && xAxisCol) {
          // For horizontal orientation the [x, value] pair is swapped
-          const xValue = Array.isArray(data) ? data[xAxisValueIndex] : data;
+          const xValue = Array.isArray(data)
+            ? data[categoryAxisValueIndex]
+            : data;
          const xAxisFilter = getTemporalXAxisDrillByFilter(
            xAxisCol,
            xValue,
@@ -641,7 +530,10 @@ export default function EchartsTimeseries({
            xAxisFilters.push(xAxisFilter);
          }
        } else if (xAxis.type === AxisType.Category && xAxisCol) {
-          const categoryAxisValue = getXAxisValue(data, eventParams.name);
+          const categoryAxisValue = getCategoryAxisValue(
+            data,
+            eventParams.name,
+          );
          if (categoryAxisValue !== undefined) {
            // A category axis can still sit on a temporal column when the
            // axis is forced categorical; filter by time bucket in that case
@@ -672,25 +564,15 @@ export default function EchartsTimeseries({
          crossFilter = getCrossFilterDataMask(seriesName);
        } else if (
          canCrossFilterByXAxis &&
-          xAxis.type === AxisType.Category &&
          eventParams.componentType === 'series'
        ) {
-          const categoryAxisValue = getXAxisValue(data, eventParams.name);
+          const categoryAxisValue = getCategoryAxisValue(
+            data,
+            eventParams.name,
+          );
          if (categoryAxisValue !== undefined) {
            crossFilter = getXAxisCrossFilterDataMask(categoryAxisValue);
          }
-        } else if (
-          canCrossFilterByXAxis &&
-          xAxis.type === AxisType.Time &&
-          eventParams.componentType === 'series'
-        ) {
-          const timeAxisValue = getXAxisValue(data, eventParams.name);
-          if (timeAxisValue !== undefined) {
-            const timestamp = getTimestampFromTimeAxisValue(timeAxisValue);
-            if (timestamp !== undefined) {
-              crossFilter = getTimeAxisCrossFilterDataMask(timestamp);
-            }
-          }
        }

        onContextMenu(pointerEvent.clientX, pointerEvent.clientY, {
@@ -711,39 +593,26 @@ export default function EchartsTimeseries({
      const { value } = event;
      if (
        canCrossFilterByXAxis &&
-        event.targetType === 'axisLabel' &&
        (typeof value === 'string' || typeof value === 'number')
      ) {
-        if (xAxis.type === AxisType.Time) {
-          const timestamp = getTimestampFromTimeAxisValue(value);
-          if (timestamp !== undefined) {
-            handleTimeAxisChange(timestamp);
-          }
-        } else {
-          handleXAxisChange(value);
-        }
+        handleXAxisChange(value);
      }
    },
-    [
-      canCrossFilterByXAxis,
-      handleTimeAxisChange,
-      handleXAxisChange,
-      xAxis.type,
-    ],
+    [canCrossFilterByXAxis, handleXAxisChange],
  );

-  const renderedXAxis =
+  const categoryAxis =
    formData.orientation === OrientationType.Horizontal ? 'yAxis' : 'xAxis';

  const queryEventHandlers = useMemo(
    () => [
      {
        name: 'click',
-        query: renderedXAxis,
+        query: `${categoryAxis}.category`,
        handler: handleXAxisLabelClick,
      },
    ],
-    [renderedXAxis, handleXAxisLabelClick],
+    [categoryAxis, handleXAxisLabelClick],
  );

  const zrEventHandlers: EventHandlers = {
@@ -95,7 +95,6 @@ import {
  getAnnotationData,
 } from '../utils/annotation';
 import {
-  collapseForecastKeys,
  extractForecastSeriesContext,
  extractForecastSeriesContexts,
  extractForecastValuesFromTooltipParams,
@@ -1248,7 +1247,7 @@ export default function transformProps(
    name: xAxisTitle,
    nameGap: convertInteger(xAxisTitleMargin),
    nameLocation: 'middle',
-    ...((xAxisType === AxisType.Category || xAxisType === AxisType.Time) &&
+    ...(xAxisType === AxisType.Category &&
      groupBy.length === 0 && {
        triggerEvent: true,
      }),
@@ -1256,12 +1255,10 @@ export default function transformProps(
      // When rotation is applied on time axes, hideOverlap can
      // aggressively hide the last label. Rotated labels already
      // have less overlap, so disabling hideOverlap is safe.
-      // At 0° rotation, also disable hideOverlap when showMaxLabel
-      // is active so the forced boundary label is never suppressed
-      // by ECharts' overlap detection (#39899).
-      hideOverlap: showMaxLabel
-        ? false
-        : !(xAxisType === AxisType.Time && xAxisLabelRotation !== 0),
+      // At 0° rotation, keep hideOverlap to prevent long labels
+      // from overlapping each other, with showMaxLabel to ensure
+      // the last data point label stays visible (#37181).
+      hideOverlap: !(xAxisType === AxisType.Time && xAxisLabelRotation !== 0),
      formatter: deduplicatedFormatter,
      rotate: xAxisLabelRotation,
      interval: xAxisLabelInterval,
@@ -1395,13 +1392,11 @@ export default function transformProps(
        const forecastValue: CallbackDataParams[] = richTooltip
          ? params
          : [params];
-        const sortedKeys = collapseForecastKeys(
-          extractTooltipKeys(
-            forecastValue,
-            yIndex,
-            richTooltip,
-            tooltipSortByMetric,
-          ),
+        const sortedKeys = extractTooltipKeys(
+          forecastValue,
+          yIndex,
+          richTooltip,
+          tooltipSortByMetric,
        );
        const filteredForecastValue = forecastValue.filter(
          (item: CallbackDataParams) =>
@@ -1600,7 +1595,6 @@ export default function transformProps(
      label: xAxisLabel,
      type: xAxisType,
    },
-    resolvedTimeGrain,
    refs,
    coltypeMapping: dataTypes,
    onLegendScroll,
@@ -467,14 +467,6 @@ export function transformSeries(
          return formatter(numericValue);
        }
        if (!onlyTotal) {
-          // A stacked segment with no height begins and ends at the same
-          // coordinate as the top of the segment beneath it, so its label is
-          // drawn over that segment's label. Zero and null have no height, so
-          // they carry no label. The rich tooltip omits zero observations from
-          // a stacked series for the same reason.
-          if (stack && !numericValue) {
-            return '';
-          }
          if (
            numericValue >=
            (thresholdValues[dataIndex] || Number.MIN_SAFE_INTEGER)
@@ -122,6 +122,5 @@ export type TimeseriesChartTransformedProps =
        label: string;
        type: AxisType;
      };
-      resolvedTimeGrain?: TimeGranularity;
      onFocusedSeries: (series: string | null) => void;
    };
@@ -28,7 +28,6 @@
 */

 import { z } from 'zod';
-import { sanitizeHtml } from '@superset-ui/core';

 // =============================================================================
 // Common Schemas
@@ -58,33 +57,6 @@ const fontStyleSchema = z.enum(['normal', 'italic', 'oblique']);
 /** Symbol type */
 const symbolTypeSchema = z.string();

-/**
- * With the ECharts default renderMode 'html', a string tooltip formatter is
- * assigned to the tooltip DOM element via innerHTML. ECharts formatter
- * strings commonly rely on inline markup (e.g. '{b}<br/>{c}') for layout, so
- * rejecting every '<' would break that supported usage; instead the value is
- * run through the same allowlist sanitizer used for other tooltip HTML,
- * which keeps presentational tags and strips anything else.
- */
-const sanitizedFormatterSchema = z
-  .string()
-  .transform(value => sanitizeHtml(value));
-
-/**
- * ECharts navigates to title.link/sublink on click, so restrict them to
- * http(s) and same-origin relative paths.
- */
-const safeLinkSchema = z
-  .string()
-  .refine(
-    value =>
-      /^https?:\/\//i.test(value) ||
-      (value.startsWith('/') && !value.startsWith('//')),
-    {
-      message: 'Only http(s) or same-origin relative URLs are allowed',
-    },
-  );
-
 // =============================================================================
 // Text Style Schema
 // =============================================================================
@@ -196,11 +168,11 @@ export const titleSchema = z.object({
  id: z.string().optional(),
  show: z.boolean().optional(),
  text: z.string().optional(),
-  link: safeLinkSchema.optional(),
+  link: z.string().optional(),
  target: z.enum(['self', 'blank']).optional(),
  textStyle: textStyleSchema.optional(),
  subtext: z.string().optional(),
-  sublink: safeLinkSchema.optional(),
+  sublink: z.string().optional(),
  subtarget: z.enum(['self', 'blank']).optional(),
  subtextStyle: textStyleSchema.optional(),
  textAlign: z.enum(['left', 'center', 'right']).optional(),
@@ -414,9 +386,7 @@ export const tooltipSchema = z.object({
      z.array(z.union([z.number(), z.string()])),
    ])
    .optional(),
-  // Only string formatters: a string tooltip formatter is rendered via
-  // innerHTML (default renderMode 'html'), so it is sanitized above.
-  formatter: sanitizedFormatterSchema.optional(),
+  formatter: z.string().optional(), // Only string formatters
  padding: z.union([z.number(), z.array(z.number())]).optional(),
  backgroundColor: colorSchema.optional(),
  borderColor: colorSchema.optional(),
@@ -427,9 +397,7 @@ export const tooltipSchema = z.object({
  shadowOffsetX: z.number().optional(),
  shadowOffsetY: z.number().optional(),
  textStyle: textStyleSchema.optional(),
-  // `extraCssText` is intentionally not accepted; unknown keys are
-  // stripped by the schema, so configs that still carry it keep working
-  // minus the raw CSS.
+  extraCssText: z.string().optional(),
  order: z
    .enum(['seriesAsc', 'seriesDesc', 'valueAsc', 'valueDesc'])
    .optional(),
@@ -607,9 +575,6 @@ export const seriesSchema = z.object({
  polarIndex: z.number().optional(),
  geoIndex: z.number().optional(),
  calendarIndex: z.number().optional(),
-  // Per-series `tooltip` is intentionally not admitted; the schema
-  // strips unknown keys. If per-series tooltips are ever admitted, reuse
-  // tooltipSchema so the formatter sanitization applies.
  label: labelSchema.optional(),
  labelLine: z
    .object({
@@ -60,21 +60,6 @@ export const extractForecastSeriesContexts = (
    {} as { [key: string]: ForecastSeriesEnum[] },
  );

-/**
- * Collapses raw ECharts series ids onto the names used to key tooltip rows.
- *
- * Tooltip values are grouped by forecast-stripped name, so any ordering derived
- * from the raw series ids has to be expressed in the same terms before it can be
- * matched against them. This matters beyond real Prophet output: a metric simply
- * labelled `ci__yhat_lower` collapses to `ci` exactly like a forecast bound
- * does, and a chart whose every series carries such a suffix has no id that
- * survives the comparison untouched.
- */
-export const collapseForecastKeys = (seriesIds: string[]): string[] =>
-  Array.from(
-    new Set(seriesIds.map(id => extractForecastSeriesContext(id).name)),
-  );
-
 export const extractForecastValuesFromTooltipParams = (
  params: any[],
  isHorizontal = false,
@@ -523,73 +523,3 @@ test('EChartOptionsParseError contains validation error details', () => {
    );
  }
 });
-
-// =============================================================================
-// Creator-authored options must not reach the tooltip's innerHTML/
-// navigation sinks unsanitized.
-// =============================================================================
-
-test('sanitizes tooltip string formatters instead of rejecting all markup', () => {
-  const input = `{ tooltip: { formatter: '<img src=x onerror=alert(1)>' } }`;
-  const result = parseEChartOptions(input);
-
-  expect(result.success).toBe(true);
-  expect(result.data?.tooltip).toEqual({ formatter: '<img src>' });
-});
-
-test('keeps presentational tags in tooltip string formatters', () => {
-  const input = `{ tooltip: { formatter: '{b}<br/>{c}' } }`;
-  const result = parseEChartOptions(input);
-
-  expect(result.success).toBe(true);
-  expect(result.data?.tooltip).toEqual({ formatter: '{b}<br />{c}' });
-});
-
-test('strips per-series tooltip config so its formatter never reaches the merge', () => {
-  const result = parseEChartOptions(
-    `{ series: [{ type: 'line', tooltip: { formatter: '<b onpointerover=alert(1)>x</b>' } }] }`,
-  );
-
-  expect(result.success).toBe(true);
-  expect(result.data).toEqual({ series: [{ type: 'line' }] });
-});
-
-test('accepts markup-free tooltip placeholder formatters', () => {
-  const input = `{ tooltip: { formatter: '{b}: {c}' } }`;
-  const result = parseEChartOptions(input);
-
-  expect(result.success).toBe(true);
-  expect(result.data).toEqual({ tooltip: { formatter: '{b}: {c}' } });
-});
-
-test('rejects javascript: URLs in title link and sublink', () => {
-  expect(() =>
-    parseEChartOptions(`{ title: { link: 'javascript:alert(1)' } }`),
-  ).toThrow(EChartOptionsParseError);
-  expect(() =>
-    parseEChartOptions(`{ title: { sublink: 'javascript:alert(1)' } }`),
-  ).toThrow(EChartOptionsParseError);
-  expect(() =>
-    parseEChartOptions(`{ title: { link: '//evil.example/x' } }`),
-  ).toThrow(EChartOptionsParseError);
-});
-
-test('accepts http(s) and same-origin relative title links', () => {
-  const result = parseEChartOptions(
-    `{ title: { link: 'https://superset.apache.org', sublink: '/dashboard/1/' } }`,
-  );
-
-  expect(result.success).toBe(true);
-  expect(result.data).toEqual({
-    title: { link: 'https://superset.apache.org', sublink: '/dashboard/1/' },
-  });
-});
-
-test('strips tooltip extraCssText instead of passing raw CSS through', () => {
-  const result = parseEChartOptions(
-    `{ tooltip: { show: true, extraCssText: 'background:url(//evil.example/x)' } }`,
-  );
-
-  expect(result.success).toBe(true);
-  expect(result.data).toEqual({ tooltip: { show: true } });
-});
@@ -1165,110 +1165,6 @@ test('x-axis dedup keeps the forced min label when the endpoints format identica
  expect(formatter(min)).toBe('May');
 });

-test('#39899 - x-axis dates do not overlap and last label stays visible at 0° rotation (mixed)', () => {
-  // When showMaxLabel is active on a time axis with 0° rotation,
-  // hideOverlap must be off so ECharts cannot suppress the forced
-  // max label (the end-of-axis date).
-  const chartProps = createEchartsTimeseriesTestChartProps<
-    EchartsMixedTimeseriesFormData,
-    EchartsMixedTimeseriesProps
-  >({
-    ...MIXED_TIMESERIES_CHART_PROPS_DEFAULTS,
-    defaultQueriesData: [
-      createTestQueryData(
-        [
-          {
-            __timestamp: Date.UTC(2026, 0, 1),
-            sum__num: 100,
-          },
-          {
-            __timestamp: Date.UTC(2026, 6, 1),
-            sum__num: 200,
-          },
-        ],
-        {
-          colnames: ['__timestamp', 'sum__num'],
-          coltypes: [GenericDataType.Temporal, GenericDataType.Numeric],
-          label_map: { __timestamp: ['__timestamp'], sum__num: ['sum__num'] },
-        },
-      ),
-      createTestQueryData(
-        [
-          {
-            __timestamp: Date.UTC(2026, 0, 1),
-            sum__num: 100,
-          },
-          {
-            __timestamp: Date.UTC(2026, 6, 1),
-            sum__num: 200,
-          },
-        ],
-        {
-          colnames: ['__timestamp', 'sum__num'],
-          coltypes: [GenericDataType.Temporal, GenericDataType.Numeric],
-          label_map: { __timestamp: ['__timestamp'], sum__num: ['sum__num'] },
-        },
-      ),
-    ],
-    formData: {
-      ...formData,
-      x_axis: '__timestamp',
-      metrics: ['sum__num'],
-      metricsB: ['sum__num'],
-      groupby: [],
-      groupbyB: [],
-      xAxisLabelRotation: 0,
-      // showMaxLabel (and therefore hideOverlap: false) only activates when
-      // a time grain resolves, so this needs one set to actually exercise
-      // the #39899 fix rather than silently no-op.
-      timeGrainSqla: TimeGranularity.MONTH,
-    },
-    queriesData: [
-      createTestQueryData(
-        [
-          {
-            __timestamp: Date.UTC(2026, 0, 1),
-            sum__num: 100,
-          },
-          {
-            __timestamp: Date.UTC(2026, 6, 1),
-            sum__num: 200,
-          },
-        ],
-        {
-          colnames: ['__timestamp', 'sum__num'],
-          coltypes: [GenericDataType.Temporal, GenericDataType.Numeric],
-          label_map: { __timestamp: ['__timestamp'], sum__num: ['sum__num'] },
-        },
-      ),
-      createTestQueryData(
-        [
-          {
-            __timestamp: Date.UTC(2026, 0, 1),
-            sum__num: 100,
-          },
-          {
-            __timestamp: Date.UTC(2026, 6, 1),
-            sum__num: 200,
-          },
-        ],
-        {
-          colnames: ['__timestamp', 'sum__num'],
-          coltypes: [GenericDataType.Temporal, GenericDataType.Numeric],
-          label_map: { __timestamp: ['__timestamp'], sum__num: ['sum__num'] },
-        },
-      ),
-    ],
-  });
-
-  const { echartOptions } = transformProps(chartProps);
-  const { axisLabel } = echartOptions.xAxis as Record<string, any>;
-
-  expect(axisLabel.showMaxLabel).toBe(true);
-  expect(axisLabel.alignMaxLabel).toBe('right');
-  expect(axisLabel.hideOverlap).toBe(false);
-});
-
 test('regression #37921: multi-metric Query A with groupby does not duplicate first metric in series names', () => {
  // Regression test for https://github.com/apache/superset/issues/37921
  // ("Residual" follow-up to #37055).
@@ -70,42 +70,4 @@ describe('renderNormalizedTooltip', () => {
    expect(tooltip).toContain('N/A');
    expect(tooltip).not.toContain('NaN');
  });
-
-  test('should HTML-escape series names from query data', () => {
-    // Regression test: the tooltip is rendered via innerHTML, so markup
-    // in query-result values must not become live DOM.
-    const tooltip = renderNormalizedTooltip(
-      { ...params, name: '<img src=x onerror=alert(1)>' },
-      metrics,
-      mockGetDenormalizedValue,
-      metricsWithCustomBounds,
-    );
-    expect(tooltip).not.toContain('<img');
-    expect(tooltip).toContain('&lt;img');
-  });
-
-  test('should HTML-escape metric labels', () => {
-    const tooltip = renderNormalizedTooltip(
-      params,
-      ['<svg onload=alert(1)>', 'metric2'],
-      mockGetDenormalizedValue,
-      metricsWithCustomBounds,
-    );
-    expect(tooltip).not.toContain('<svg');
-    expect(tooltip).toContain('&lt;svg');
-  });
-
-  test('should HTML-escape the series color used for the tooltip color dot', () => {
-    // Regression test: `color` is interpolated into a style attribute
-    // unquoted, so an unescaped quote could break out of the attribute
-    // and inject markup.
-    const tooltip = renderNormalizedTooltip(
-      { ...params, color: 'red" onmouseover="alert(1)' },
-      metrics,
-      mockGetDenormalizedValue,
-      metricsWithCustomBounds,
-    );
-    expect(tooltip).not.toContain('" onmouseover="alert(1)"');
-    expect(tooltip).toContain('&quot; onmouseover=&quot;alert(1)');
-  });
 });
@@ -16,17 +16,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-import { render, waitFor } from '@testing-library/react';
-import { AxisType, DTTM_ALIAS, TimeGranularity } from '@superset-ui/core';
+import { render } from '@testing-library/react';
+import { AxisType } from '@superset-ui/core';
 import { supersetTheme, ThemeProvider } from '@apache-superset/core/theme';
-import { logging } from '@apache-superset/core/utils';
-import type { ECElementEvent } from 'echarts/types/src/util/types';
 import EchartsTimeseries from '../../src/Timeseries/EchartsTimeseries';
-import {
-  OrientationType,
-  TimeseriesChartTransformedProps,
-} from '../../src/Timeseries/types';
-import type { EchartsProps } from '../../src/types';
+import { TimeseriesChartTransformedProps } from '../../src/Timeseries/types';

 // Percent-change draggable baseline: this is the one piece of the ECharts
 // rebuilds with zero prior test coverage despite six separate production
@@ -46,14 +40,12 @@ let mockChart: {
  convertFromPixel: jest.Mock;
  getModel: jest.Mock;
 };
-const mockEchart = jest.fn();

 jest.mock('../../src/components/Echart', () => {
  const { forwardRef, useImperativeHandle } = jest.requireActual('react');
  return {
    __esModule: true,
-    default: forwardRef((props: unknown, ref: unknown) => {
-      mockEchart(props);
+    default: forwardRef((_props: unknown, ref: unknown) => {
      useImperativeHandle(ref, () => ({
        getEchartInstance: () => mockChart,
      }));
@@ -123,17 +115,6 @@ function renderTimeseries(
  );
 }

-function getLatestEchartProps() {
-  const lastCall = mockEchart.mock.calls.at(-1);
-  expect(lastCall).toBeDefined();
-  const [props] = lastCall as [EchartsProps];
-  return props;
-}
-
-function advanceClickTimer() {
-  jest.advanceTimersByTime(300);
-}
-
 // Pulls the graphic descriptor for the draggable baseline handle out of the
 // most recent setOption call, mirroring how ECharts itself would read it.
 function getBaselineGraphic() {
@@ -145,7 +126,6 @@ function getBaselineGraphic() {

 beforeEach(() => {
  jest.clearAllMocks();
-  mockEchart.mockReset();
  setupChartMock();
  jest.spyOn(window, 'requestAnimationFrame').mockImplementation(cb => {
    cb(0);
@@ -154,7 +134,6 @@ beforeEach(() => {
 });

 afterEach(() => {
-  jest.useRealTimers();
  jest.restoreAllMocks();
 });

@@ -266,400 +245,3 @@ test('does not touch the chart instance when rebase is disabled', () => {

  expect(mockChart.setOption).not.toHaveBeenCalled();
 });
-
-test('emits TEMPORAL_RANGE cross-filter from time axis label click on day bucket', () => {
-  const setDataMask = jest.fn();
-
-  renderTimeseries({
-    emitCrossFilters: true,
-    setDataMask,
-    groupby: [],
-    resolvedTimeGrain: TimeGranularity.DAY,
-    formData: {
-      granularitySqla: 'ds',
-      timeGrainSqla: TimeGranularity.DAY,
-      vizType: 'echarts_timeseries_line',
-    } as any,
-    xAxis: {
-      label: DTTM_ALIAS,
-      type: AxisType.Time,
-    },
-  });
-
-  const labelClickHandler = getLatestEchartProps().queryEventHandlers?.find(
-    ({ query }) => query === 'xAxis',
-  )?.handler;
-  expect(labelClickHandler).toBeDefined();
-  labelClickHandler?.({
-    targetType: 'axisLabel',
-    value: '2021-01-01',
-  } as unknown as ECElementEvent);
-
-  expect(setDataMask.mock.calls[0][0]).toEqual({
-    extraFormData: {
-      filters: [
-        {
-          col: 'ds',
-          op: 'TEMPORAL_RANGE',
-          val: '2021-01-01T00:00:00 : 2021-01-02T00:00:00',
-        },
-      ],
-    },
-    filterState: {
-      label: ['2021-01-01T00:00:00 : 2021-01-02T00:00:00'],
-      value: ['2021-01-01T00:00:00 : 2021-01-02T00:00:00'],
-      selectedValues: ['2021-01-01T00:00:00 : 2021-01-02T00:00:00'],
-    },
-  });
-});
-
-test('emits upper-exclusive TEMPORAL_RANGE from time point click on month bucket', () => {
-  jest.useFakeTimers();
-  const setDataMask = jest.fn();
-
-  renderTimeseries({
-    emitCrossFilters: true,
-    setDataMask,
-    groupby: [],
-    resolvedTimeGrain: TimeGranularity.MONTH,
-    formData: {
-      granularitySqla: 'ds',
-      timeGrainSqla: TimeGranularity.MONTH,
-      vizType: 'echarts_timeseries_line',
-    } as any,
-    xAxis: {
-      label: DTTM_ALIAS,
-      type: AxisType.Time,
-    },
-  });
-
-  getLatestEchartProps().eventHandlers?.click?.({
-    componentType: 'series',
-    seriesName: 'Sales',
-    data: [Date.UTC(2021, 0, 1), 100],
-    name: '2021-01-01',
-    dataIndex: 0,
-  });
-  advanceClickTimer();
-
-  expect(setDataMask.mock.calls[0][0].extraFormData.filters).toEqual([
-    {
-      col: 'ds',
-      op: 'TEMPORAL_RANGE',
-      val: '2021-01-01T00:00:00 : 2021-02-01T00:00:00',
-    },
-  ]);
-});
-
-test('uses resolved time grain for temporal point-click cross-filter', () => {
-  jest.useFakeTimers();
-  const setDataMask = jest.fn();
-
-  renderTimeseries({
-    emitCrossFilters: true,
-    setDataMask,
-    groupby: [],
-    resolvedTimeGrain: TimeGranularity.MONTH,
-    formData: {
-      granularitySqla: 'ds',
-      timeGrainSqla: TimeGranularity.DAY,
-      extraFormData: {
-        time_grain_sqla: TimeGranularity.MONTH,
-      },
-      vizType: 'echarts_timeseries_line',
-    } as any,
-    xAxis: {
-      label: DTTM_ALIAS,
-      type: AxisType.Time,
-    },
-  });
-
-  getLatestEchartProps().eventHandlers?.click?.({
-    componentType: 'series',
-    seriesName: 'Sales',
-    data: [Date.UTC(2021, 0, 1), 100],
-    name: '2021-01-01',
-    dataIndex: 0,
-  });
-  advanceClickTimer();
-
-  expect(setDataMask.mock.calls[0][0].extraFormData.filters).toEqual([
-    {
-      col: 'ds',
-      op: 'TEMPORAL_RANGE',
-      val: '2021-01-01T00:00:00 : 2021-02-01T00:00:00',
-    },
-  ]);
-});
-
-test('emits TEMPORAL_RANGE from string-typed time point click value', () => {
-  jest.useFakeTimers();
-  const setDataMask = jest.fn();
-
-  renderTimeseries({
-    emitCrossFilters: true,
-    setDataMask,
-    groupby: [],
-    resolvedTimeGrain: TimeGranularity.MONTH,
-    formData: {
-      granularitySqla: 'ds',
-      timeGrainSqla: TimeGranularity.MONTH,
-      vizType: 'echarts_timeseries_line',
-    } as any,
-    xAxis: {
-      label: DTTM_ALIAS,
-      type: AxisType.Time,
-    },
-  });
-
-  getLatestEchartProps().eventHandlers?.click?.({
-    componentType: 'series',
-    seriesName: 'Sales',
-    data: ['2021-01-01T00:00:00Z', 100],
-    name: '2021-01-01',
-    dataIndex: 0,
-  });
-  advanceClickTimer();
-
-  expect(setDataMask.mock.calls[0][0].extraFormData.filters).toEqual([
-    {
-      col: 'ds',
-      op: 'TEMPORAL_RANGE',
-      val: '2021-01-01T00:00:00 : 2021-02-01T00:00:00',
-    },
-  ]);
-});
-
-test('emits TEMPORAL_RANGE from horizontal time point click using timestamp, not metric', () => {
-  jest.useFakeTimers();
-  const setDataMask = jest.fn();
-
-  renderTimeseries({
-    emitCrossFilters: true,
-    setDataMask,
-    groupby: [],
-    resolvedTimeGrain: TimeGranularity.MONTH,
-    formData: {
-      orientation: OrientationType.Horizontal,
-      granularitySqla: 'ds',
-      timeGrainSqla: TimeGranularity.MONTH,
-      vizType: 'echarts_timeseries_line',
-    } as any,
-    xAxis: {
-      label: DTTM_ALIAS,
-      type: AxisType.Time,
-    },
-  });
-
-  getLatestEchartProps().eventHandlers?.click?.({
-    componentType: 'series',
-    seriesName: 'Sales',
-    data: [129, Date.UTC(2021, 0, 1)],
-    name: '2021-01-01',
-    dataIndex: 0,
-  });
-  advanceClickTimer();
-
-  expect(setDataMask.mock.calls[0][0].extraFormData.filters).toEqual([
-    {
-      col: 'ds',
-      op: 'TEMPORAL_RANGE',
-      val: '2021-01-01T00:00:00 : 2021-02-01T00:00:00',
-    },
-  ]);
-});
-
-test('clears temporal X-axis cross-filter when clicking selected bucket again', () => {
-  jest.useFakeTimers();
-  const setDataMask = jest.fn();
-  const selectedRange = '2021-01-01T00:00:00 : 2021-02-01T00:00:00';
-
-  renderTimeseries({
-    emitCrossFilters: true,
-    setDataMask,
-    groupby: [],
-    selectedValues: { 0: selectedRange },
-    resolvedTimeGrain: TimeGranularity.MONTH,
-    formData: {
-      granularitySqla: 'ds',
-      timeGrainSqla: TimeGranularity.MONTH,
-      vizType: 'echarts_timeseries_line',
-    } as any,
-    xAxis: {
-      label: DTTM_ALIAS,
-      type: AxisType.Time,
-    },
-  });
-
-  getLatestEchartProps().eventHandlers?.click?.({
-    componentType: 'series',
-    seriesName: 'Sales',
-    data: [Date.UTC(2021, 0, 1), 100],
-    name: '2021-01-01',
-    dataIndex: 0,
-  });
-  advanceClickTimer();
-
-  expect(setDataMask.mock.calls[0][0]).toEqual({
-    extraFormData: {
-      filters: [],
-    },
-    filterState: {
-      label: undefined,
-      value: null,
-      selectedValues: null,
-    },
-  });
-});
-
-test('emits empty temporal X-axis data mask when filter grain is missing', () => {
-  jest.useFakeTimers();
-  const setDataMask = jest.fn();
-
-  renderTimeseries({
-    emitCrossFilters: true,
-    setDataMask,
-    groupby: [],
-    formData: {
-      granularitySqla: 'ds',
-      timeGrainSqla: undefined,
-      vizType: 'echarts_timeseries_line',
-    } as any,
-    xAxis: {
-      label: DTTM_ALIAS,
-      type: AxisType.Time,
-    },
-  });
-
-  getLatestEchartProps().eventHandlers?.click?.({
-    componentType: 'series',
-    seriesName: 'Sales',
-    data: [Date.UTC(2021, 0, 1), 100],
-    name: '2021-01-01',
-    dataIndex: 0,
-  });
-  advanceClickTimer();
-
-  expect(setDataMask.mock.calls[0][0]).toEqual({
-    extraFormData: {
-      filters: [],
-    },
-    filterState: {
-      label: undefined,
-      value: null,
-      selectedValues: null,
-    },
-  });
-});
-
-test('warns and skips temporal cross-filter when string value cannot be parsed', () => {
-  jest.useFakeTimers();
-  const setDataMask = jest.fn();
-  const warn = jest.spyOn(logging, 'warn').mockImplementation();
-
-  renderTimeseries({
-    emitCrossFilters: true,
-    setDataMask,
-    groupby: [],
-    resolvedTimeGrain: TimeGranularity.MONTH,
-    formData: {
-      granularitySqla: 'ds',
-      timeGrainSqla: TimeGranularity.MONTH,
-      vizType: 'echarts_timeseries_line',
-    } as any,
-    xAxis: {
-      label: DTTM_ALIAS,
-      type: AxisType.Time,
-    },
-  });
-
-  getLatestEchartProps().eventHandlers?.click?.({
-    componentType: 'series',
-    seriesName: 'Sales',
-    data: ['not-a-date', 100],
-    name: 'not-a-date',
-    dataIndex: 0,
-  });
-  advanceClickTimer();
-
-  expect(setDataMask).not.toHaveBeenCalled();
-  expect(warn).toHaveBeenCalledWith(
-    'Unable to parse time axis value for cross-filtering',
-    'not-a-date',
-  );
-});
-
-test('does not emit temporal X-axis label cross-filter when dimensions are set', () => {
-  const setDataMask = jest.fn();
-
-  renderTimeseries({
-    emitCrossFilters: true,
-    setDataMask,
-    groupby: ['country'],
-    formData: {
-      groupby: ['country'],
-      granularitySqla: 'ds',
-      timeGrainSqla: TimeGranularity.MONTH,
-      vizType: 'echarts_timeseries_line',
-    } as any,
-    xAxis: {
-      label: DTTM_ALIAS,
-      type: AxisType.Time,
-    },
-  });
-
-  const labelClickHandler = getLatestEchartProps().queryEventHandlers?.find(
-    ({ query }) => query === 'xAxis',
-  )?.handler;
-  expect(labelClickHandler).toBeDefined();
-  labelClickHandler?.({
-    targetType: 'axisLabel',
-    value: '2021-01-01',
-  } as unknown as ECElementEvent);
-
-  expect(setDataMask).not.toHaveBeenCalled();
-});
-
-test('context menu cross-filter is available for a temporal bar point', async () => {
-  const onContextMenu = jest.fn();
-
-  renderTimeseries({
-    emitCrossFilters: true,
-    onContextMenu,
-    groupby: [],
-    resolvedTimeGrain: TimeGranularity.MONTH,
-    formData: {
-      granularitySqla: 'ds',
-      timeGrainSqla: TimeGranularity.DAY,
-      extraFormData: {
-        time_grain_sqla: TimeGranularity.MONTH,
-      },
-      vizType: 'echarts_timeseries_line',
-    } as any,
-    xAxis: {
-      label: DTTM_ALIAS,
-      type: AxisType.Time,
-    },
-  });
-
-  await getLatestEchartProps().eventHandlers?.contextmenu?.({
-    componentType: 'series',
-    seriesName: 'Sales',
-    data: [Date.UTC(2021, 0, 1), 100],
-    name: '2021-01-01',
-    event: { stop: jest.fn(), event: { clientX: 10, clientY: 20 } },
-  });
-
-  await waitFor(() => {
-    expect(onContextMenu).toHaveBeenCalled();
-  });
-
-  const { crossFilter } = onContextMenu.mock.calls[0][2];
-  expect(crossFilter.dataMask.extraFormData.filters).toEqual([
-    {
-      col: 'ds',
-      op: 'TEMPORAL_RANGE',
-      val: '2021-01-01T00:00:00 : 2021-02-01T00:00:00',
-    },
-  ]);
-});
@@ -2083,39 +2083,6 @@ test('xAxisForceCategorical forces Category axis regardless of Numeric coltype',
  expect(xAxis.triggerEvent).toBe(true);
 });

-test('temporal x-axis enables trigger events when no dimensions are set', () => {
-  const ts1 = 1745784000000;
-  const ts2 = 1745870400000;
-  const chartProps = createTestChartProps({
-    formData: {
-      metrics: ['metric'],
-      granularity_sqla: 'ds',
-      x_axis: '__timestamp',
-    },
-    queriesData: [
-      createTestQueryData(
-        [
-          { __timestamp: ts1, metric: 10 },
-          { __timestamp: ts2, metric: 20 },
-        ],
-        {
-          colnames: ['__timestamp', 'metric'],
-          coltypes: [GenericDataType.Temporal, GenericDataType.Numeric],
-        },
-      ),
-    ],
-  });
-
-  const { echartOptions } = transformProps(chartProps);
-  const xAxis = echartOptions.xAxis as {
-    triggerEvent?: boolean;
-    type: string;
-  };
-
-  expect(xAxis.type).toBe(AxisType.Time);
-  expect(xAxis.triggerEvent).toBe(true);
-});
-
 test('temporal x coltype forced categorical yields a Category axis with date labels', () => {
  // Issue #28204: with a temporal x-axis (e.g. weekly grain) the default Time
  // scale places ticks at "nice" intervals that don't line up with the buckets.
@@ -2363,7 +2330,6 @@ test('tooltip time grain wiring: dashboard-level extraFormData time grain overri
  });

  const transformedProps = transformProps(chartProps);
-  expect(transformedProps.resolvedTimeGrain).toBe(TimeGranularity.MONTH);
  const tooltipFormatter = (
    transformedProps.echartOptions as unknown as TooltipFormatterOptions
  ).tooltip.formatter;
@@ -2397,7 +2363,6 @@ test('tooltip time grain wiring: chart-level time grain drives the tooltip when
  });

  const transformedProps = transformProps(chartProps);
-  expect(transformedProps.resolvedTimeGrain).toBe(TimeGranularity.YEAR);
  const tooltipFormatter = (
    transformedProps.echartOptions as unknown as TooltipFormatterOptions
  ).tooltip.formatter;
@@ -2564,64 +2529,3 @@ describe('EchartsTimeseries tooltip truncation', () => {
    expect(buildTooltip(undefined, longCategory)).toContain(longCategory);
  });
 });
-
-describe('tooltip for metrics whose labels end in forecast suffixes', () => {
-  const marker = '<span style="background-color:#1f77b4;"></span>';
-  const seriesIds = ['ci__yhat', 'ci__yhat_lower', 'ci__yhat_upper'];
-  const values = [1.5, 0.5, 2.0];
-
-  // Metrics can be labelled `ci__yhat*` with no forecast enabled and no plain
-  // observation series. Every series then collapses onto the same
-  // forecast-stripped tooltip key, so no raw series id matches itself.
-  const buildTooltip = (tooltipSortByMetric = false) => {
-    const chartProps = createTestChartProps({
-      formData: {
-        x_axis: 'dt',
-        metrics: seriesIds,
-        groupby: [],
-        richTooltip: true,
-        tooltipSortByMetric,
-      } as Partial<EchartsTimeseriesFormData>,
-      queriesData: [
-        createTestQueryData([
-          {
-            dt: 599616000000,
-            ci__yhat: 1.5,
-            ci__yhat_lower: 0.5,
-            ci__yhat_upper: 2.5,
-          },
-        ]),
-      ],
-    });
-    const tooltipFormatter = (transformProps(chartProps).echartOptions as any)
-      .tooltip.formatter;
-    return tooltipFormatter(
-      seriesIds.map((id, i) => ({
-        seriesId: id,
-        seriesName: id,
-        value: [599616000000, values[i]],
-        data: [599616000000, values[i]],
-        marker,
-      })),
-    );
-  };
-
-  test('renders the collapsed series rather than falling back to "No data"', () => {
-    const html = buildTooltip();
-    expect(html).not.toContain('No data');
-    expect(html).toContain('>ci<');
-    expect(html).toContain('ŷ = 1.5 (0.5, 2.5)');
-  });
-
-  test('renders a single row rather than one per forecast suffix', () => {
-    const html = buildTooltip();
-    expect(html.match(/<tr/g)).toHaveLength(1);
-    expect(html).toContain('>ci<');
-  });
-
-  test('still renders the row when the tooltip is sorted by metric', () => {
-    const html = buildTooltip(true);
-    expect(html).not.toContain('No data');
-    expect(html).toContain('>ci<');
-  });
-});
@@ -20,14 +20,13 @@ import {
  CategoricalColorScale,
  ChartProps,
  TimeGranularity,
-  getNumberFormatter,
 } from '@superset-ui/core';
 import { GenericDataType } from '@apache-superset/core/common';
 import { supersetTheme } from '@apache-superset/core/theme';
 import type { SeriesOption } from 'echarts';
 import type { ScatterSeriesOption } from 'echarts/charts';
 import { EchartsTimeseriesSeriesType } from '../../src';
-import { StackControlsValue, TIMESERIES_CONSTANTS } from '../../src/constants';
+import { TIMESERIES_CONSTANTS } from '../../src/constants';
 import {
  LegendOrientation,
  EchartsTimeseriesChartProps,
@@ -341,15 +340,15 @@ test('should configure time axis labels to show max label for last month visibil
  );
 });

-test('#39899 - x-axis dates do not overlap and last label stays visible at 0° rotation', () => {
+test('x-axis dates do not overlap and last label stays visible at 0° rotation', () => {
  const result = transformProps(buildTimeseriesChartProps());
  const { axisLabel } = result.echartOptions.xAxis as Record<string, any>;

-  // showMaxLabel forces the last data point label to render
+  expect(axisLabel.hideOverlap).toBe(true);
+  // showMaxLabel forces the last data point label to render even
+  // when hideOverlap is active, preventing the #37181 regression.
  expect(axisLabel.showMaxLabel).toBe(true);
  expect(axisLabel.alignMaxLabel).toBe('right');
-  // hideOverlap must be OFF so ECharts cannot suppress the forced max label
-  expect(axisLabel.hideOverlap).toBe(false);
 });

 test('last x-axis date is visible and not cut off when rotated -45°', () => {
@@ -567,70 +566,3 @@ test('getPadding should handle Left position with zero margin correctly', () =>
    getChartPaddingSpy.mockRestore();
  }
 });
-
-/**
- * #42702: a stacked segment with no height starts and ends at the same
- * coordinate as the top of the segment beneath it, so a value label on it is
- * drawn over that segment's label. `percentage_threshold` does not filter these
- * out: it defaults to 0, and `thresholdValues[dataIndex] || MIN_SAFE_INTEGER`
- * turns a 0 threshold into "no filtering", which is intentional.
- */
-const stackedLabel = (
-  numericValue: number | null,
-  opts: Record<string, unknown> = {},
-) => {
-  const series = transformSeries(
-    { id: 'B', name: 'B', data: [[1, numericValue]] } as SeriesOption,
-    mockColorScale,
-    'B',
-    {
-      seriesType: EchartsTimeseriesSeriesType.Bar,
-      stack: StackControlsValue.Stack,
-      showValue: true,
-      onlyTotal: false,
-      formatter: getNumberFormatter(),
-      thresholdValues: [0],
-      ...opts,
-    },
-  ) as SeriesOption & {
-    label: { formatter: (params: unknown) => string };
-  };
-  return series.label.formatter({
-    value: [1, numericValue],
-    dataIndex: 0,
-    seriesIndex: 1,
-    seriesName: 'B',
-  });
-};
-
-test('stacked value labels are omitted for a zero-height segment', () => {
-  expect(stackedLabel(0)).toBe('');
-  expect(stackedLabel(null)).toBe('');
-});
-
-test('stacked value labels are kept for segments that have height', () => {
-  expect(stackedLabel(32)).toBe('32');
-  expect(stackedLabel(-5)).toBe('-5');
-});
-
-test('a zero value keeps its label when the series is not stacked', () => {
-  // Without a stack the label sits on the bar itself, so there is nothing for
-  // it to collide with.
-  expect(stackedLabel(0, { stack: undefined })).toBe('0');
-});
-
-test('percentage_threshold still filters values below the threshold', () => {
-  // 10% of a 100 total. The zero-height guard must not swallow this rule.
-  expect(stackedLabel(5, { thresholdValues: [10] })).toBe('');
-  expect(stackedLabel(50, { thresholdValues: [10] })).toBe('50');
-});
-
-test('only-total labels are unaffected by the zero-height guard', () => {
-  expect(
-    stackedLabel(0, {
-      onlyTotal: true,
-      showValueIndexes: [1],
-      totalStackedValues: [32],
-    }),
-  ).toBe('32');
-});
@@ -23,7 +23,6 @@ import {
 } from '@superset-ui/core';
 import { SeriesOption } from 'echarts';
 import {
-  collapseForecastKeys,
  extractForecastSeriesContext,
  extractForecastValuesFromTooltipParams,
  formatForecastTooltipSeries,
@@ -465,35 +464,3 @@ describe('formatForecastTooltipSeries truncation', () => {
    expect(cell).toBe(`${marker}cpu`);
  });
 });
-
-describe('collapseForecastKeys', () => {
-  test('leaves plain observation series untouched and in order', () => {
-    expect(collapseForecastKeys(['foo', 'bar'])).toEqual(['foo', 'bar']);
-  });
-
-  test('folds a forecast bundle down to a single key', () => {
-    expect(
-      collapseForecastKeys([
-        'foo',
-        'foo__yhat',
-        'foo__yhat_lower',
-        'foo__yhat_upper',
-      ]),
-    ).toEqual(['foo']);
-  });
-
-  test('keeps a key for metrics whose labels are entirely forecast suffixes', () => {
-    // Charts can carry metrics literally labelled `ci__yhat*` with no plain
-    // observation series. Callers match these against forecast-stripped keys,
-    // so an uncollapsed id here would match nothing and drop every row.
-    expect(
-      collapseForecastKeys(['ci__yhat', 'ci__yhat_lower', 'ci__yhat_upper']),
-    ).toEqual(['ci']);
-  });
-
-  test('preserves the incoming order of distinct series', () => {
-    expect(
-      collapseForecastKeys(['b__yhat_lower', 'a__yhat', 'b__yhat']),
-    ).toEqual(['b', 'a']);
-  });
-});
@@ -290,25 +290,6 @@ test('isAdditiveMetric: non-additive aggregates, SQL, and saved metrics are not
  expect(isAdditiveMetric('count')).toBe(false);
 });

-test('isAdditiveMetric: MEDIAN/STDDEV_SAMP/VAR_SAMP are non-additive, with no dedicated code needed', () => {
-  // Regression guard: MEDIAN/STDDEV_SAMP/VAR_SAMP are new system-wide metric
-  // aggregates (not pivot-table-specific). They must fall outside
-  // ADDITIVE_AGGREGATES so totals/subtotals route through the correct
-  // DB-rollup path automatically, same as AVG/COUNT_DISTINCT already do --
-  // averaging per-group medians (or variances) is exactly the class of bug
-  // SIP-216 fixed for AVG, and would be equally wrong here.
-  (['MEDIAN', 'STDDEV_SAMP', 'VAR_SAMP'] as const).forEach(aggregate => {
-    expect(
-      isAdditiveMetric({
-        expressionType: 'SIMPLE',
-        aggregate,
-        column: { column_name: 'num' },
-        label: `${aggregate.toLowerCase()}_num`,
-      } as QueryFormMetric),
-    ).toBe(false);
-  });
-});
-
 test('allMetricsAdditive: all additive vs any non-additive vs empty', () => {
  const sum = {
    expressionType: 'SIMPLE',
@@ -80,19 +80,6 @@ interface DatamapSource {
  country?: string;
 }

-/**
- * Escape HTML special characters to prevent XSS attacks. Popup templates are
- * assigned to the hover element via innerHTML by the datamaps library, and
- * formatter output can echo a creator-controlled format string verbatim
- * (see createD3NumberFormatter's invalid-format fallback), so both the name
- * and the formatted value must be treated as untrusted text.
- */
-function escapeHtml(text: string): string {
-  const div = document.createElement('div');
-  div.textContent = text;
-  return div.innerHTML;
-}
-
 const propTypes = {
  data: PropTypes.arrayOf(
    PropTypes.shape({
@@ -292,9 +279,9 @@ function WorldMap(element: HTMLElement, props: WorldMapProps): void {
      highlightBorderWidth: 1,
      popupTemplate: (geo, d) =>
        d &&
-        `<div class="hoverinfo"><strong>${escapeHtml(
-          d.name,
-        )}</strong><br>${escapeHtml(String(formatter(d.m1)))}</div>`,
+        `<div class="hoverinfo"><strong>${d.name}</strong><br>${formatter(
+          d.m1,
+        )}</div>`,
    },
    bubblesConfig: {
      borderWidth: 1,
@@ -303,9 +290,9 @@ function WorldMap(element: HTMLElement, props: WorldMapProps): void {
      popupOnHover: !inContextMenu,
      radius: null,
      popupTemplate: (geo, d) =>
-        `<div class="hoverinfo"><strong>${escapeHtml(
-          d.name,
-        )}</strong><br>${escapeHtml(String(formatter(d.m2)))}</div>`,
+        `<div class="hoverinfo"><strong>${d.name}</strong><br>${formatter(
+          d.m2,
+        )}</div>`,
      fillOpacity: 0.5,
      animate: true,
      highlightOnHover: !inContextMenu,
@@ -180,33 +180,6 @@ test('disables Datamaps highlightOnHover while the context menu is open', () =>
  expect(geographyConfig?.highlightOnHover).toBe(false);
 });

-test('escapes markup in hover popup templates', () => {
-  // Regression test for stored XSS via the number-formatter fallback: an
-  // invalid Y Axis Format string is echoed verbatim by the formatter
-  // (createD3NumberFormatter's catch branch), so the popup templates must
-  // HTML-escape formatter output before datamaps assigns it via innerHTML.
-  const maliciousFormatter = getNumberFormatter('<img src=x onerror=alert(1)>');
-  WorldMap(container, { ...baseProps, formatter: maliciousFormatter });
-
-  const geographyConfig = lastDatamapConfig?.geographyConfig as {
-    popupTemplate: (geo: unknown, d: unknown) => string;
-  };
-  const bubblesConfig = lastDatamapConfig?.bubblesConfig as {
-    popupTemplate: (geo: unknown, d: unknown) => string;
-  };
-  const entry = { name: '<b>United States</b>', m1: 100, m2: 200 };
-
-  const geoPopup = geographyConfig.popupTemplate({}, entry);
-  const bubblePopup = bubblesConfig.popupTemplate({}, entry);
-
-  [geoPopup, bubblePopup].forEach(popup => {
-    expect(popup).not.toContain('<img');
-    expect(popup).not.toContain('<b>');
-    expect(popup).toContain('&lt;img src=x onerror=alert(1)&gt;');
-    expect(popup).toContain('&lt;b&gt;United States&lt;/b&gt;');
-  });
-});
-
 test('does not throw error when onContextMenu is undefined', () => {
  const propsWithoutContextMenu = {
    ...baseProps,
@@ -1524,9 +1524,7 @@ export function popPermalink(key: string): SqlLabThunkAction<Promise<unknown>> {
            dbId: json.dbId ? parseInt(json.dbId, 10) : undefined,
            catalog: json.catalog ?? null,
            schema: json.schema ?? undefined,
-            // The recipient must review the prefilled query and press
-            // Run; a permalink payload never auto-runs.
-            autorun: false,
+            autorun: json.autorun ? json.autorun : false,
            sql: json.sql ? json.sql : 'SELECT ...',
            templateParams: json.templateParams,
          }),
@@ -1550,9 +1548,7 @@ export function popStoredQuery(
            dbId: json.dbId ? parseInt(json.dbId, 10) : undefined,
            catalog: json.catalog ?? null,
            schema: json.schema ?? undefined,
-            // Same rule as popPermalink above — stored payloads never
-            // auto-run.
-            autorun: false,
+            autorun: json.autorun ? json.autorun : false,
            sql: json.sql ? json.sql : 'SELECT ...',
            templateParams: json.templateParams,
          }),
@@ -1631,9 +1627,7 @@ export function popDatasourceQuery(
            name: `${QUERY_TEXT} ${json.result.name}`,
            dbId: json.result.database.id,
            schema: json.result.schema,
-            // `sql` here can come straight from the URL, so its mere
-            // presence must never imply auto-execution.
-            autorun: false,
+            autorun: sql !== undefined,
            sql: sql || json.result.select_star,
          }),
        ),
@@ -390,7 +390,7 @@ const ResultSet = ({
              // provides.
              redirect(getExportCsvUrl(query.id));
            },
-            confirmText: t('Confirm'),
+            confirmText: t('OK'),
            cancelText: t('Close'),
          });
        }
@@ -719,7 +719,7 @@ const ResultSet = ({
    if (data && data.length > 0) {
      const allowHTML = getItem(
        LocalStorageKeys.SqllabIsRenderHtmlEnabled,
-        false,
+        true,
      );

      const tableProps = {
@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-import { render, screen, userEvent } from 'spec/helpers/testing-library';
+import { render, screen } from 'spec/helpers/testing-library';
 import SaveDatasetActionButton from 'src/SqlLab/components/SaveDatasetActionButton';

 // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
@@ -27,7 +27,6 @@ describe('SaveDatasetActionButton', () => {
      <SaveDatasetActionButton
        setShowSave={() => true}
        onSaveAsExplore={onSaveAsExplore}
-        canSaveDataset
      />,
    );

@@ -42,27 +41,4 @@ describe('SaveDatasetActionButton', () => {
    expect(saveBtn).toBeVisible();
    expect(saveDatasetBtn).toBeVisible();
  });
-
-  test('disables the save dataset button when the query did not run successfully', async () => {
-    render(
-      <SaveDatasetActionButton
-        setShowSave={() => true}
-        onSaveAsExplore={jest.fn()}
-        canSaveDataset={false}
-      />,
-    );
-
-    const saveDatasetBtn = screen.getByRole('button', {
-      name: /save dataset/i,
-    });
-    expect(saveDatasetBtn).toBeDisabled();
-
-    // the disabled button is wrapped in a span so the tooltip still triggers
-    userEvent.hover(saveDatasetBtn.parentElement as HTMLElement);
-    expect(
-      await screen.findByRole('tooltip', {
-        name: 'You must run the query successfully first',
-      }),
-    ).toBeInTheDocument();
-  });
 });
@@ -23,13 +23,11 @@ import { Button } from '@superset-ui/core/components';
 interface SaveDatasetActionButtonProps {
  setShowSave: (arg0: boolean) => void;
  onSaveAsExplore?: () => void;
-  canSaveDataset: boolean;
 }

 const SaveDatasetActionButton = ({
  setShowSave,
  onSaveAsExplore,
-  canSaveDataset,
 }: SaveDatasetActionButtonProps) => (
  <>
    <Button
@@ -45,13 +43,8 @@ const SaveDatasetActionButton = ({
        color="default"
        variant="text"
        onClick={() => onSaveAsExplore?.()}
-        disabled={!canSaveDataset}
        icon={<Icons.TableOutlined />}
-        tooltip={
-          canSaveDataset
-            ? t('Save or Overwrite Dataset')
-            : t('You must run the query successfully first')
-        }
+        tooltip={t('Save or Overwrite Dataset')}
        aria-label={t('Save dataset')}
      />
    )}
@@ -35,7 +35,6 @@ const mockedProps = {
  onSave: () => {},
  saveQueryWarning: null,
  columns: [],
-  canSaveDataset: true,
 };

 const mockState = {
@@ -52,7 +52,6 @@ interface SaveQueryProps {
  onUpdate: (arg0: QueryPayload, id: string) => void;
  saveQueryWarning: string | null;
  database: Partial<DatabaseObject> | undefined;
-  canSaveDataset: boolean;
 }

 export type QueryPayload = {
@@ -82,7 +81,6 @@ const SaveQuery = ({
  saveQueryWarning,
  database,
  columns,
-  canSaveDataset,
 }: SaveQueryProps) => {
  const queryEditor = useQueryEditor(queryEditorId, [
    'autorun',
@@ -209,7 +207,6 @@ const SaveQuery = ({
        <SaveDatasetActionButton
          setShowSave={setShowSave}
          onSaveAsExplore={canExploreDatabase ? onSaveAsExplore : undefined}
-          canSaveDataset={canSaveDataset}
        />
      )}
      <SaveDatasetModal
@@ -21,7 +21,6 @@ import {
  isFeatureEnabled,
  getExtensionsRegistry,
  FeatureFlag,
-  QueryState,
 } from '@superset-ui/core';
 import {
  act,
@@ -335,47 +334,6 @@ describe('SqlEditor', () => {
    expect(await findByText('10 000')).toBeInTheDocument();
  });

-  const setupWithLatestQuery = (overrides: Partial<typeof latestQuery>) =>
-    setup(
-      mockedProps,
-      createStore({
-        ...mockInitialState,
-        sqlLab: {
-          ...mockInitialState.sqlLab,
-          queries: {
-            [latestQuery.id]: { ...latestQuery, ...overrides },
-          },
-          databases: {
-            1991: {
-              ...mockInitialState.sqlLab.databases[1991],
-              allows_virtual_table_explore: true,
-            },
-          },
-        },
-      }),
-    );
-
-  test('enables the save dataset button when the latest query succeeded', async () => {
-    const { findByRole } = setupWithLatestQuery({ state: QueryState.Success });
-    expect(await findByRole('button', { name: 'Save dataset' })).toBeEnabled();
-  });
-
-  test('disables the save dataset button when the latest query failed', async () => {
-    const { findByRole } = setupWithLatestQuery({
-      state: QueryState.Failed,
-      results: undefined,
-    });
-    expect(await findByRole('button', { name: 'Save dataset' })).toBeDisabled();
-  });
-
-  test('disables the save dataset button when the results are not loaded', async () => {
-    const { findByRole } = setupWithLatestQuery({
-      state: QueryState.Success,
-      results: undefined,
-    });
-    expect(await findByRole('button', { name: 'Save dataset' })).toBeDisabled();
-  });
-
  test('renders an Extension if provided', async () => {
    const extensionsRegistry = getExtensionsRegistry();

@@ -40,7 +40,6 @@ import {
  getExtensionsRegistry,
  QueryResponse,
  Query,
-  QueryState,
 } from '@superset-ui/core';
 import { Alert } from '@apache-superset/core/components';
 import { css, styled, useTheme } from '@apache-superset/core/theme';
@@ -284,7 +283,7 @@ const SqlEditor: FC<Props> = ({
    getItem(LocalStorageKeys.SqllabIsAutocompleteEnabled, true),
  );
  const [renderHTMLEnabled, setRenderHTMLEnabled] = useState(
-    getItem(LocalStorageKeys.SqllabIsRenderHtmlEnabled, false),
+    getItem(LocalStorageKeys.SqllabIsRenderHtmlEnabled, true),
  );
  const [showCreateAsModal, setShowCreateAsModal] = useState(false);
  const [createAs, setCreateAs] = useState('');
@@ -296,9 +295,6 @@ const SqlEditor: FC<Props> = ({

  const SqlFormExtension = extensionsRegistry.get('sqleditor.extension.form');

-  const successful = latestQuery?.state === QueryState.Success;
-  const resultColumns = latestQuery?.results?.columns || [];
-
  const startQuery = useCallback(
    (
      ctasArg = false,
@@ -716,6 +712,7 @@ const SqlEditor: FC<Props> = ({

  const getSecondaryMenuItems = () => {
    const qe = queryEditor;
+    const successful = latestQuery?.state === 'success';
    const scheduleToolTip = successful
      ? t('Schedule the query periodically')
      : t('You must run the query successfully first');
@@ -861,14 +858,13 @@ const SqlEditor: FC<Props> = ({
          )}
        <SaveQuery
          queryEditorId={queryEditor.id}
-          columns={resultColumns}
+          columns={latestQuery?.results?.columns || []}
          onSave={onSaveQuery}
          onUpdate={(query, remoteId) =>
            dispatch(updateSavedQuery(query, remoteId))
          }
          saveQueryWarning={saveQueryWarning}
          database={database}
-          canSaveDataset={successful && resultColumns.length > 0}
        />
        <ShareSqlLabQuery queryEditorId={queryEditor.id} />
      </>
@@ -223,11 +223,6 @@ export default function chartReducer(
  }

  if (action.type in actionHandlers) {
-    // ADD_CHART creates the entry, so it runs without prior state; every other
-    // handler reads state that is absent once the chart has been removed
-    if (action.type !== actions.ADD_CHART && !charts[action.key]) {
-      return charts;
-    }
    return {
      ...charts,
      [action.key]: actionHandlers[action.type](charts[action.key]),
@@ -91,20 +91,4 @@ describe('chart reducers', () => {
    expect(newState[chartKey].chartUpdateEndTime).toBeGreaterThan(0);
    expect(newState[chartKey].chartStatus).toEqual('failed');
  });
-
-  test('ignores an action for a chart that is no longer in state', () => {
-    const action = actions.chartUpdateStopped(999, new AbortController());
-    expect(() => chartReducer(charts, action)).not.toThrow();
-    expect(chartReducer(charts, action)).toEqual(charts);
-  });
-
-  test('still adds a chart that is not yet in state', () => {
-    const newChartKey = 2;
-    const newState = chartReducer(
-      charts,
-      actions.addChart({ ...chart, id: newChartKey }, newChartKey),
-    );
-    expect(newState[newChartKey].id).toEqual(newChartKey);
-    expect(newState[chartKey]).toEqual(testChart);
-  });
 });
@@ -120,7 +120,7 @@ describe('DatasourceModal', () => {
    });
    const saveButton = screen.getByTestId('datasource-modal-save');
    fireEvent.click(saveButton);
-    const okButton = await screen.findByRole('button', { name: 'Confirm' });
+    const okButton = await screen.findByRole('button', { name: 'OK' });
    fireEvent.click(okButton);
    await waitFor(() => {
      expect(onDatasourceSave).toHaveBeenCalled();
@@ -142,7 +142,7 @@ describe('DatasourceModal', () => {

    const saveButton = screen.getByTestId('datasource-modal-save');
    fireEvent.click(saveButton);
-    const okButton = await screen.findByRole('button', { name: 'Confirm' });
+    const okButton = await screen.findByRole('button', { name: 'OK' });
    fireEvent.click(okButton);

    const errorElements = await screen.findAllByText('Error saving dataset');
@@ -230,7 +230,7 @@ describe('DatasourceModal', () => {
    expect(checkbox).toBeChecked();

    // Click OK to submit
-    const okButton = screen.getByRole('button', { name: 'Confirm' });
+    const okButton = screen.getByRole('button', { name: 'OK' });
    fireEvent.click(okButton);

    // Verify the PUT request was made with override_columns=true
@@ -297,7 +297,7 @@ describe('DatasourceModal', () => {
    expect(checkbox).not.toBeChecked();

    // Click OK to submit
-    const okButton = screen.getByRole('button', { name: 'Confirm' });
+    const okButton = screen.getByRole('button', { name: 'OK' });
    fireEvent.click(okButton);

    // Verify the PUT request was made with override_columns=false
@@ -395,7 +395,7 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
        show={confirmModalOpen}
        onHide={handleConfirmModalClose}
        onHandledPrimaryAction={handleConfirmSave}
-        primaryButtonName={t('Confirm')}
+        primaryButtonName={t('OK')}
        primaryButtonLoading={isSaving}
      >
        {getSaveDialog()}
@@ -1627,7 +1627,9 @@ function DatasourceEditor({
              {t(
                'Default URL to redirect to when accessing from the dataset list page. Accepts relative URLs such as',
              )}{' '}
-              <Typography.Text code>/dashboard/{'{id}'}/</Typography.Text>
+              <Typography.Text code>
+                /superset/dashboard/{'{id}'}/
+              </Typography.Text>
            </>
          }
          control={<TextControl controlId="default_endpoint" />}
@@ -1993,6 +1995,7 @@ function DatasourceEditor({
                          col => col.column_name,
                        )}
                        height={300}
+                        allowHTML
                      />
                    </>
                  )}
@@ -71,17 +71,6 @@ test('renders Tabs', async () => {
  expect(screen.getByTestId('edit-dataset-tabs')).toBeInTheDocument();
 });

-test('recommends a registered client route for the default URL', async () => {
-  await asyncRender(createProps());
-
-  userEvent.click(screen.getByRole('tab', { name: 'Settings' }));
-
-  expect(await screen.findByText('/dashboard/{id}/')).toBeInTheDocument();
-  expect(
-    screen.queryByText('/superset/dashboard/{id}/'),
-  ).not.toBeInTheDocument();
-});
-
 test('can sync columns from source', async () => {
  const testProps = createProps();
  await asyncRender({
@@ -63,7 +63,7 @@ export const FilterableTable = ({
  height,
  filterText = '',
  expandedColumns = [],
-  allowHTML = false,
+  allowHTML = true,
  striped,
  themeOverrides,
 }: FilterableTableProps) => {
@@ -64,35 +64,6 @@ test('should render cellData value for default cell data', () => {
  expect(container).toHaveTextContent('regular_text');
 });

-test('should render HTML cell data as inert text by default', () => {
-  const { container } = render(
-    <>
-      {renderResultCell({
-        cellData: '<img src="https://attacker.example/beacon.gif" />link',
-        columnKey: 'a',
-      })}
-    </>,
-  );
-  expect(container.querySelector('img')).not.toBeInTheDocument();
-  expect(container).toHaveTextContent(
-    '<img src="https://attacker.example/beacon.gif" />link',
-  );
-});
-
-test('should render sanitized HTML only when allowHTML is explicitly enabled', () => {
-  const { container } = render(
-    <>
-      {renderResultCell({
-        cellData: '<b>bold</b>',
-        columnKey: 'a',
-        allowHTML: true,
-      })}
-    </>,
-  );
-  expect(container.querySelector('b')).toBeInTheDocument();
-  expect(container).toHaveTextContent('bold');
-});
-
 test('should transform cell data by getCellContent for the regular text', () => {
  const { container } = render(
    <>
@@ -32,15 +32,11 @@ type Params = CellParams & {
  getCellContent?: (args: CellParams) => string;
 };

-// Result cells carry untrusted warehouse data, so HTML rendering is opt-in:
-// even sanitized markup keeps active capabilities (img/video fetch beacons,
-// phishing anchors), which must not activate by default for data the viewer
-// did not author.
 export const renderResultCell = ({
  cellData,
  getCellContent,
  columnKey,
-  allowHTML = false,
+  allowHTML = true,
 }: Params) => {
  const cellNode =
    getCellContent?.({ cellData, columnKey }) ?? String(cellData);
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import {
-  URL_PARAMS,
-  RESERVED_CHART_URL_PARAMS,
-  RESERVED_DASHBOARD_URL_PARAMS,
-} from 'src/constants';
-
-test('permalinkKey is reserved on both the chart and dashboard URL param lists', () => {
-  // Dashboard and explore permalinks resolve against different backend
-  // KV resources/salts, so a key from one must never leak into the other's
-  // URL via the reserved-params passthrough logic.
-  expect(RESERVED_DASHBOARD_URL_PARAMS).toContain(URL_PARAMS.permalinkKey.name);
-  expect(RESERVED_CHART_URL_PARAMS).toContain(URL_PARAMS.permalinkKey.name);
-});
@@ -123,7 +123,6 @@ export const RESERVED_CHART_URL_PARAMS: string[] = [
  URL_PARAMS.datasourceId.name,
  URL_PARAMS.datasourceType.name,
  URL_PARAMS.datasetId.name,
-  URL_PARAMS.permalinkKey.name,
  URL_PARAMS.versionHistory.name,
 ];
 export const RESERVED_DASHBOARD_URL_PARAMS: string[] = [
@@ -468,7 +468,7 @@ function SliceAdder({
          <AutoSizer>
            {({ height, width }: { height: number; width: number }) => (
              <List
-                style={{ width, height, maxHeight: height }}
+                style={{ width, height }}
                rowCount={filteredSlices.length}
                rowHeight={DEFAULT_CELL_HEIGHT}
                rowProps={listRowProps}
@@ -105,17 +105,10 @@ export const SamplesPane = ({
        1,
      )
        .then(response => {
-          // A 200 that carries no `result` payload resolves to undefined here.
-          // Read through it so the pane falls back to its empty state instead
-          // of throwing a TypeError that surfaces as an internal error message.
-          const rows = ensureIsArray(response?.data);
-          setData(rows);
-          setColnames(ensureIsArray(response?.colnames));
-          setColtypes(ensureIsArray(response?.coltypes));
-          // Fall back to the rows actually returned rather than to zero: the
-          // controls only render when there are rows, and a hardcoded 0 would
-          // label a populated table as "0 rows".
-          setRowCount(response?.rowcount ?? rows.length);
+          setData(ensureIsArray(response.data));
+          setColnames(ensureIsArray(response.colnames));
+          setColtypes(ensureIsArray(response.coltypes));
+          setRowCount(response.rowcount);
          setResponseError('');
          cache.set(queryFormData, true);
          if (queryForce) {
@@ -19,6 +19,7 @@
 import { useMemo, useCallback, useRef, useState } from 'react';
 import {
  getTimeFormatter,
+  safeHtmlSpan,
  TimeFormats,
  getMetricLabel,
  QueryFormMetric,
@@ -91,11 +92,8 @@ export function useGridColumns(
                  ) {
                    return timeFormatter(value);
                  }
-                  // Render string cells as plain text: this grid shows raw
-                  // query results (untrusted warehouse data) to any viewer,
-                  // so HTML must stay inert here even after sanitization.
                  if (typeof value === 'string') {
-                    return value;
+                    return safeHtmlSpan(value);
                  }
                  return String(value);
                },
@@ -60,27 +60,6 @@ describe('SamplesPane', () => {
    400,
  );

-  // A 200 response that carries no `result` payload, as reported in #36840.
-  fetchMock.post(
-    'end:/datasource/samples?force=false&datasource_type=table&datasource_id=37&per_page=100&page=1',
-    {},
-  );
-
-  // A 200 whose result carries rows but omits `rowcount`.
-  fetchMock.post(
-    'end:/datasource/samples?force=false&datasource_type=table&datasource_id=38&per_page=100&page=1',
-    {
-      result: {
-        data: [
-          { __timestamp: 1230768000000, genre: 'Action' },
-          { __timestamp: 1230768000010, genre: 'Horror' },
-        ],
-        colnames: ['__timestamp', 'genre'],
-        coltypes: [2, 1],
-      },
-    },
-  );
-
  const setForceQuery = jest.fn();

  afterAll(() => {
@@ -135,29 +114,4 @@ describe('SamplesPane', () => {
    expect(queryByText('Action')).toBeVisible();
    expect(queryByText('Horror')).toBeVisible();
  });
-
-  test('renders the empty state when the response carries no result payload', async () => {
-    const props = createSamplesPaneProps({ datasourceId: 37 });
-    const { findByText, queryByRole } = render(<SamplesPane {...props} />, {
-      useRedux: true,
-    });
-
-    expect(
-      await findByText('No samples were returned for this dataset'),
-    ).toBeVisible();
-    // The pane should not leak an internal TypeError through the error alert.
-    expect(queryByRole('alert')).not.toBeInTheDocument();
-  });
-
-  test('counts the returned rows when the response omits rowcount', async () => {
-    const props = createSamplesPaneProps({ datasourceId: 38 });
-    const { findByText, queryByText } = render(<SamplesPane {...props} />, {
-      useRedux: true,
-    });
-
-    expect(await findByText('Action')).toBeVisible();
-    // Falling back to 0 here would label a populated table as "0 rows".
-    expect(queryByText('0 rows')).not.toBeInTheDocument();
-    expect(queryByText('2 rows')).toBeVisible();
-  });
 });
@@ -148,7 +148,7 @@ export const DatasourceItems = ({

  return (
    <List
-      style={{ width: width - BORDER_WIDTH, height, maxHeight: height }}
+      style={{ width: width - BORDER_WIDTH, height }}
      rowHeight={rowHeight}
      rowCount={flattenedItems.length}
      rowProps={rowProps}
@@ -150,7 +150,7 @@ const waitForRender = (props?: any) =>
 test('renders with default props', async () => {
  await waitForRender();
  expect(screen.getByRole('button', { name: 'Apply' })).toBeDisabled();
-  expect(screen.getByRole('button', { name: 'Confirm' })).toBeDisabled();
+  expect(screen.getByRole('button', { name: 'OK' })).toBeDisabled();
  expect(screen.getByRole('button', { name: 'Cancel' })).toBeEnabled();
 });

@@ -188,7 +188,7 @@ test('enables apply and ok buttons', async () => {

  await waitFor(() => {
    expect(screen.getByRole('button', { name: 'Apply' })).toBeEnabled();
-    expect(screen.getByRole('button', { name: 'Confirm' })).toBeEnabled();
+    expect(screen.getByRole('button', { name: 'OK' })).toBeEnabled();
  });
 });

@@ -203,7 +203,7 @@ test('triggers addAnnotationLayer and close when ok button is clicked', async ()
  const addAnnotationLayer = jest.fn();
  const close = jest.fn();
  await waitForRender({ name: 'Test', value: '2x', addAnnotationLayer, close });
-  userEvent.click(screen.getByRole('button', { name: 'Confirm' }));
+  userEvent.click(screen.getByRole('button', { name: 'OK' }));
  expect(addAnnotationLayer).toHaveBeenCalled();
  expect(close).toHaveBeenCalled();
 });
@@ -724,7 +724,7 @@ test('Disable apply button if formula is incorrect', async () => {

  const formulaInput = screen.getByRole('textbox', { name: 'Formula' });
  const applyButton = screen.getByRole('button', { name: 'Apply' });
-  const okButton = screen.getByRole('button', { name: 'Confirm' });
+  const okButton = screen.getByRole('button', { name: 'OK' });

  userEvent.type(formulaInput, 'x+1');
  expect(formulaInput).toHaveValue('x+1');
@@ -1303,7 +1303,7 @@ function AnnotationLayer({
            disabled={!isValid}
            onClick={submitAnnotation}
          >
-            {t('Confirm')}
+            {t('OK')}
          </Button>
        </div>
      </div>
@@ -112,31 +112,6 @@ describe('ColorBreakpointOption', () => {
    expect(colorPreview).toBeInTheDocument();
  });

-  test('should coerce non-numeric color channels instead of injecting CSS', async () => {
-    // Stored form_data is opaque JSON, so a saved chart can carry a string
-    // channel crafted to break out of the styled-component declaration.
-    const maliciousBreakpoint = {
-      id: 3,
-      color: {
-        r: '0,0,0,1); } body { display: none } .x { background: rgba(0' as unknown as number,
-        g: 0,
-        b: 0,
-        a: 1,
-      },
-      minValue: 0,
-      maxValue: 100,
-    };
-
-    renderComponent({ breakpoint: maliciousBreakpoint });
-
-    const colorPreview = await screen.findByTestId('color-preview');
-    expect(colorPreview).toBeInTheDocument();
-    // The malicious string is coerced to a safe numeric channel (0), so the
-    // rendered rule is a plain rgba() value with no injected CSS.
-    expect(colorPreview).toHaveStyle({ background: 'rgba(0, 0, 0, 1)' });
-    expect(document.body).toBeVisible();
-  });
-
  test('should handle decimal values', async () => {
    const decimalBreakpoint: ColorBreakpointType = {
      id: 2,
@@ -31,19 +31,6 @@ const BreakpointColorPreview = styled.div`
  margin-right: ${({ theme }) => theme.sizeUnit}px;
 `;

-// Chart params are stored server-side as opaque JSON, so breakpoint color
-// channels can arrive as arbitrary strings despite the compile-time numeric
-// type. The formatted color is interpolated into a styled-component template
-// (a stylesheet, not a per-property style assignment), so each channel must
-// be coerced to a plain number to keep attacker-controlled strings from
-// injecting CSS rules.
-const toRgbChannel = (channel: unknown): number => {
-  const value = Number(channel);
-  return Number.isFinite(value)
-    ? Math.min(255, Math.max(0, Math.round(value)))
-    : 0;
-};
-
 const ColorBreakpointOption = ({
  breakpoint,
  colorBreakpoints,
@@ -54,9 +41,7 @@ const ColorBreakpointOption = ({
  const { color, minValue, maxValue } = breakpoint;

  const formattedColor = color
-    ? `rgba(${toRgbChannel(color.r)}, ${toRgbChannel(color.g)}, ${toRgbChannel(
-        color.b,
-      )}, 1)`
+    ? `rgba(${color.r}, ${color.g}, ${color.b}, 1)`
    : '';

  return (
@@ -251,11 +251,4 @@ export const DEFAULT_CONFIG_FORM_LAYOUT: ColumnConfigFormLayout = {
      { name: 'horizontalAlign', override: { defaultValue: 'left' } },
    ],
  ],
-  [GenericDataType.MultiValue]: [
-    [
-      'columnWidth',
-      { name: 'horizontalAlign', override: { defaultValue: 'left' } },
-    ],
-    ['truncateLongCells'],
-  ],
 };
@@ -187,7 +187,7 @@ async function openAndSaveChanges(
  await userEvent.click(screen.getByTestId('datasource-menu-trigger'));
  await userEvent.click(await screen.findByTestId('edit-dataset'));
  await userEvent.click(await screen.findByTestId('datasource-modal-save'));
-  await userEvent.click(await screen.findByText('Confirm'));
+  await userEvent.click(await screen.findByText('OK'));
 }

 test('Should render', async () => {
@@ -714,10 +714,10 @@ test('should handle metric save confirmation modal', async () => {
  await userEvent.click(await screen.findByTestId('datasource-modal-save'));

  // Verify confirmation modal appears
-  expect(await screen.findByText('Confirm')).toBeInTheDocument();
+  expect(await screen.findByText('OK')).toBeInTheDocument();

  // Confirm save
-  await userEvent.click(screen.getByText('Confirm'));
+  await userEvent.click(screen.getByText('OK'));

  await waitFor(() => {
    expect(props.onDatasourceSave).toHaveBeenCalled();
@@ -207,6 +207,38 @@ describe('AdhocFilter', () => {
    expect(adhocFilter10.isValid()).toBe(true);
  });

+  test('is invalid when a comparator-taking operator has no comparator', () => {
+    // A comparator that was never set, or that was cleared through the value
+    // Select's clear affordance, is `undefined` rather than `null` or `[]`.
+    const adhocFilter1 = new AdhocFilter({
+      expressionType: ExpressionTypes.Simple,
+      subject: 'is_intro',
+      operator: 'IN',
+      comparator: undefined,
+      clause: Clauses.Where,
+    });
+    expect(adhocFilter1.isValid()).toBe(false);
+
+    const adhocFilter2 = new AdhocFilter({
+      expressionType: ExpressionTypes.Simple,
+      subject: 'is_intro',
+      operator: '==',
+      comparator: undefined,
+      clause: Clauses.Where,
+    });
+    expect(adhocFilter2.isValid()).toBe(false);
+
+    // `false` is a legitimate boolean comparator, not a missing value
+    const adhocFilter3 = new AdhocFilter({
+      expressionType: ExpressionTypes.Simple,
+      subject: 'is_intro',
+      operator: '==',
+      comparator: false,
+      clause: Clauses.Where,
+    });
+    expect(adhocFilter3.isValid()).toBe(true);
+  });
+
  test('can translate from simple expressions to sql expressions', () => {
    const adhocFilter1 = new AdhocFilter({
      expressionType: ExpressionTypes.Simple,
@@ -270,74 +302,6 @@ describe('AdhocFilter', () => {
    });
    expect(adhocFilter.comparator).toBe(undefined);
  });
-  // Charts saved before #32701 persisted `==` as the operation for IS_TRUE and
-  // IS_FALSE, alongside a boolean comparator. `translateToSql` and the backend
-  // both key off `operator`, so dropping the comparator would render such a
-  // filter as `col =` and query it as `col IS NULL`.
-  test('keeps the legacy boolean comparator for IS_TRUE', () => {
-    const adhocFilter = new AdhocFilter({
-      expressionType: ExpressionTypes.Simple,
-      subject: 'col',
-      operator: '==',
-      operatorId: Operators.IsTrue,
-      comparator: true,
-      clause: Clauses.Where,
-    });
-    expect(adhocFilter.operator).toBe('==');
-    expect(adhocFilter.comparator).toBe(true);
-    expect(adhocFilter.translateToSql()).toBe("col = 'TRUE'");
-  });
-  test('keeps the legacy boolean comparator for IS_FALSE', () => {
-    const adhocFilter = new AdhocFilter({
-      expressionType: ExpressionTypes.Simple,
-      subject: 'col',
-      operator: '==',
-      operatorId: Operators.IsFalse,
-      comparator: false,
-      clause: Clauses.Where,
-    });
-    expect(adhocFilter.operator).toBe('==');
-    expect(adhocFilter.comparator).toBe(false);
-    expect(adhocFilter.translateToSql()).toBe("col = 'FALSE'");
-  });
-  test('restores the boolean even when the stored comparator is missing', () => {
-    const adhocFilter = new AdhocFilter({
-      expressionType: ExpressionTypes.Simple,
-      subject: 'col',
-      operator: '==',
-      operatorId: Operators.IsTrue,
-      clause: Clauses.Where,
-    });
-    expect(adhocFilter.comparator).toBe(true);
-  });
-  test('keeps a legacy boolean filter intact when the control re-posts it', () => {
-    const stored = {
-      expressionType: ExpressionTypes.Simple,
-      subject: 'col',
-      operator: '==',
-      operatorId: Operators.IsTrue,
-      comparator: true,
-      clause: Clauses.Where,
-    };
-    // DndFilterSelect wraps props.value and hands those instances to onChange
-    const posted = JSON.parse(JSON.stringify(new AdhocFilter(stored)));
-    expect(posted.operator).toBe('==');
-    expect(posted.comparator).toBe(true);
-    expect(posted.operatorId).toBe(Operators.IsTrue);
-  });
-  test('leaves a genuine equality filter on a boolean value alone', () => {
-    const adhocFilter = new AdhocFilter({
-      expressionType: ExpressionTypes.Simple,
-      subject: 'col',
-      operator: '==',
-      operatorId: Operators.Equals,
-      comparator: true,
-      clause: Clauses.Where,
-    });
-    expect(adhocFilter.operator).toBe('==');
-    expect(adhocFilter.comparator).toBe(true);
-    expect(adhocFilter.translateToSql()).toBe("col = 'TRUE'");
-  });
  test('sets the label properly if subject is a string', () => {
    const adhocFilter = new AdhocFilter({
      expressionType: ExpressionTypes.Simple,
@@ -30,15 +30,6 @@ const CUSTOM_OPERATIONS = [...CUSTOM_OPERATORS].map(
  op => OPERATOR_ENUM_TO_OPERATOR_TYPE[op].operation,
 );

-// Charts saved before #32701 store `==` for IS_TRUE/IS_FALSE with the boolean
-// in the comparator; blanking it makes them query `col IS NULL`. Restoring it
-// leaves the emitted SQL untouched -- reconciling `operator` to `IS TRUE`
-// would not, and Druid rejects that predicate on VARCHAR columns.
-const LEGACY_BOOLEAN_COMPARATORS = new Map<string, boolean>([
-  [Operators.IsTrue, true],
-  [Operators.IsFalse, false],
-]);
-
 interface AdhocFilterInput {
  expressionType?: string;
  subject?: string | { column_name?: string; [key: string]: unknown } | null;
@@ -86,16 +77,6 @@ export default class AdhocFilter {
      ) {
        this.comparator = undefined;
      }
-      if (
-        this.operator ===
-          OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.Equals].operation &&
-        adhocFilter.operatorId &&
-        LEGACY_BOOLEAN_COMPARATORS.has(adhocFilter.operatorId)
-      ) {
-        this.comparator = LEGACY_BOOLEAN_COMPARATORS.get(
-          adhocFilter.operatorId,
-        );
-      }
      this.clause = adhocFilter.clause || Clauses.Where;
      this.sqlExpression = null;
    } else if (this.expressionType === ExpressionTypes.Sql) {
@@ -182,8 +163,10 @@ export default class AdhocFilter {
          // A non-empty array of values ('IN' or 'NOT IN' clauses)
          return this.comparator.length > 0;
        }
-        // A value has been selected or typed
-        return this.comparator !== null;
+        // A value has been selected or typed. An unset comparator is
+        // `undefined` rather than `null`: picking a new subject resets it, and
+        // the value Select's clear affordance emits `undefined` too.
+        return this.comparator != null;
      }
    }

@@ -181,6 +181,29 @@ describe('AdhocFilterEditPopover', () => {
    expect(saveButton).toBeDisabled();
  });

+  test('disables save button when a boolean column has no value selected', async () => {
+    const booleanColumn = { type: 'BOOL', column_name: 'is_intro' };
+    renderPopover({
+      adhocFilter: new AdhocFilter({
+        expressionType: ExpressionTypes.Simple,
+        clause: Clauses.Where,
+      }),
+      options: [booleanColumn],
+      datasource: { columns: [booleanColumn], filter_select: false },
+    });
+
+    // Picking the subject resets the comparator to `undefined`; the value
+    // control is then left untouched, mirroring the reported repro.
+    await userEvent.click(screen.getByTestId('select-element'));
+    await userEvent.click(
+      await screen.findByRole('option', { name: /is_intro/ }),
+    );
+
+    expect(
+      screen.getByTestId('adhoc-filter-edit-popover-save-button'),
+    ).toBeDisabled();
+  });
+
  test('initiates resize when resize handle is dragged', async () => {
    const onResize = jest.fn();
    renderPopover({ onResize });
@@ -367,22 +367,8 @@ function AdhocFilterEditPopover({
              </ErrorBoundary>
            ),
          },
-          ...(datasource?.type === 'semantic_view' ||
-          [
-            Operators.ContainsAny,
-            Operators.ContainsAll,
-            Operators.IsEmpty,
-            Operators.IsNotEmpty,
-            Operators.LengthEquals,
-            Operators.LengthGreaterThan,
-            Operators.LengthLessThan,
-            Operators.LengthGreaterThanOrEqual,
-            Operators.LengthLessThanOrEqual,
-          ].includes(adhocFilter.operatorId as Operators)
-            ? // Hide the Custom SQL tab for element-level array operators: they
-              // have no portable SQL representation, and converting one would
-              // silently turn the filter into invalid raw SQL.
-              []
+          ...(datasource?.type === 'semantic_view'
+            ? []
            : [
                {
                  key: ExpressionTypes.Sql,
@@ -35,7 +35,6 @@ import {
 } from 'src/explore/constants';
 import AdhocMetric from 'src/explore/components/controls/MetricControl/AdhocMetric';
 import { FeatureFlag, isFeatureEnabled } from '@superset-ui/core';
-import { GenericDataType } from '@apache-superset/core/common';
 import fetchMock from 'fetch-mock';

 import { TestDataset, Dataset } from '@superset-ui/chart-controls';
@@ -253,78 +252,6 @@ test('shows boolean only operators when subject is number', () => {
  ].map(operator => expect(isOperatorRelevant(operator, 'value')).toBe(true));
 });

-test('shows array operators (tier 1 + tier 2) when subject is multi-value', () => {
-  const props = setup({
-    adhocFilter: new AdhocFilter({
-      expressionType: ExpressionTypes.Simple,
-      subject: 'skills',
-      operatorId: undefined,
-      operator: undefined,
-      comparator: undefined,
-      clause: undefined,
-    }),
-    datasource: {
-      columns: [
-        {
-          id: 3,
-          column_name: 'skills',
-          type: 'Array(String)',
-          type_generic: GenericDataType.MultiValue,
-        },
-      ],
-    },
-  });
-  const { isOperatorRelevant } = useSimpleTabFilterProps(
-    props as unknown as Props,
-  );
-  // Tier 1 (whole-array) + Tier 2 (element-level) are all relevant.
-  [
-    Operators.Equals,
-    Operators.NotEquals,
-    Operators.In,
-    Operators.NotIn,
-    Operators.IsNull,
-    Operators.IsNotNull,
-    Operators.ContainsAny,
-    Operators.ContainsAll,
-    Operators.IsEmpty,
-    Operators.IsNotEmpty,
-  ].forEach(operator =>
-    expect(isOperatorRelevant(operator, 'skills')).toBe(true),
-  );
-  // scalar-only operators are hidden for array columns
-  [Operators.GreaterThan, Operators.LessThan, Operators.Like].forEach(
-    operator => expect(isOperatorRelevant(operator, 'skills')).toBe(false),
-  );
-});
-
-test('hides element-level array operators for non multi-value columns', () => {
-  const props = setup({
-    adhocFilter: new AdhocFilter({
-      expressionType: ExpressionTypes.Simple,
-      subject: 'value',
-      operatorId: undefined,
-      operator: undefined,
-      comparator: undefined,
-      clause: undefined,
-    }),
-    datasource: {
-      columns: [{ id: 3, column_name: 'value', type: 'STRING' }],
-    },
-  });
-  const { isOperatorRelevant } = useSimpleTabFilterProps(
-    props as unknown as Props,
-  );
-  [
-    Operators.ContainsAny,
-    Operators.ContainsAll,
-    Operators.IsEmpty,
-    Operators.IsNotEmpty,
-  ].forEach(operator =>
-    expect(isOperatorRelevant(operator, 'value')).toBe(false),
-  );
-});
-
 test('will convert from individual comparator to array if the operator changes to multi', () => {
  const props = setup();
  const { onOperatorChange } = useSimpleTabFilterProps(
@@ -382,49 +309,6 @@ test('will convert from array to individual comparators if the operator changes
  );
 });

-test('resets the comparator when switching between array value families', () => {
-  // Equal to (whole-array literal) -> Contains all (individual elements):
-  // the value spaces are incompatible, so the stale value must be cleared.
-  const wholeArrayFilter = new AdhocFilter({
-    expressionType: ExpressionTypes.Simple,
-    subject: 'scores',
-    operatorId: Operators.Equals,
-    operator: OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.Equals].operation,
-    comparator: '[5,6,7]',
-    clause: Clauses.Where,
-  });
-  const props = setup({ adhocFilter: wholeArrayFilter });
-  const { onOperatorChange } = useSimpleTabFilterProps(
-    props as unknown as Props,
-  );
-  onOperatorChange(Operators.ContainsAll);
-  const lastCall =
-    props.onChange.mock.calls[props.onChange.mock.calls.length - 1][0];
-  expect(lastCall.operatorId).toEqual(Operators.ContainsAll);
-  expect(lastCall.comparator).toBeUndefined();
-});
-
-test('keeps the value when switching within the element family', () => {
-  // Contains any <-> Contains all both take individual elements, so the
-  // selected elements should carry over.
-  const elementFilter = new AdhocFilter({
-    expressionType: ExpressionTypes.Simple,
-    subject: 'scores',
-    operatorId: Operators.ContainsAny,
-    operator: OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.ContainsAny].operation,
-    comparator: ['5', '6'],
-    clause: Clauses.Where,
-  });
-  const props = setup({ adhocFilter: elementFilter });
-  const { onOperatorChange } = useSimpleTabFilterProps(
-    props as unknown as Props,
-  );
-  onOperatorChange(Operators.ContainsAll);
-  const lastCall =
-    props.onChange.mock.calls[props.onChange.mock.calls.length - 1][0];
-  expect(lastCall.comparator).toEqual(['5', '6']);
-});
-
 test('passes the new adhocFilter to onChange after onComparatorChange', () => {
  const props = setup();
  const { onComparatorChange } = useSimpleTabFilterProps(
@@ -515,28 +399,6 @@ test('will not display boolean operators when column type is string', () => {
  });
 });

-test.each(['STRING', 'DATE'])(
-  'will not display boolean operators when an expression column declares type %s',
-  type => {
-    const props = setup({
-      datasource: {
-        type: 'table' as const,
-        datasource_name: 'table1',
-        schema: 'schema',
-        columns: [{ column_name: 'value', type, expression: '"value"' }],
-      },
-      adhocFilter: simpleAdhocFilter,
-    });
-    const { isOperatorRelevant } = useSimpleTabFilterProps(
-      props as unknown as Props,
-    );
-    const booleanOnlyOperators = [Operators.IsTrue, Operators.IsFalse];
-    booleanOnlyOperators.forEach(operator => {
-      expect(isOperatorRelevant(operator, 'value')).toBe(false);
-    });
-  },
-);
-
 test('will display boolean operators when column is an expression', () => {
  const props = setup({
    datasource: {
@@ -32,7 +32,6 @@ import {
  isDefined,
  SupersetClient,
 } from '@superset-ui/core';
-import { GenericDataType } from '@apache-superset/core/common';
 import { styled, useTheme, css } from '@apache-superset/core/theme';
 import {
  Operators,
@@ -119,8 +118,6 @@ export const useSimpleTabFilterProps = (props: Props) => {
    const isColumnNumber =
      !!column && (column.type === 'INT' || column.type === 'INTEGER');
    const isColumnFunction = !!column && !!column.expression;
-    const isColumnMultiValue =
-      !!column && column.type_generic === GenericDataType.MultiValue;

    if (operator && operator === Operators.LatestPartition) {
      const { partitionColumn } = props;
@@ -130,41 +127,8 @@ export const useSimpleTabFilterProps = (props: Props) => {
      // hide the TEMPORAL_RANGE operator
      return false;
    }
-    // Element-level array operators only apply to multi-value columns.
-    const arrayElementOperators = [
-      Operators.ContainsAny,
-      Operators.ContainsAll,
-      Operators.IsEmpty,
-      Operators.IsNotEmpty,
-      Operators.LengthEquals,
-      Operators.LengthGreaterThan,
-      Operators.LengthLessThan,
-      Operators.LengthGreaterThanOrEqual,
-      Operators.LengthLessThanOrEqual,
-    ];
-    if (arrayElementOperators.includes(operator)) {
-      return isColumnMultiValue;
-    }
-    if (isColumnMultiValue) {
-      // Array columns support whole-array operators (=, !=, In, Not in, null
-      // checks) plus the element-level operators above. Scalar-only operators
-      // (Like, <, >, <=, >=) are hidden because they aren't valid on an array.
-      return [
-        Operators.Equals,
-        Operators.NotEquals,
-        Operators.In,
-        Operators.NotIn,
-        Operators.IsNull,
-        Operators.IsNotNull,
-        ...arrayElementOperators,
-      ].includes(operator);
-    }
    if (operator === Operators.IsTrue || operator === Operators.IsFalse) {
-      // An expression column may evaluate to a boolean, but that is only a
-      // safe assumption while its type is unknown; a declared type wins.
-      return (
-        isColumnBoolean || isColumnNumber || (isColumnFunction && !column?.type)
-      );
+      return isColumnBoolean || isColumnNumber || isColumnFunction;
    }
    if (isColumnBoolean) {
      return operator === Operators.IsNull || operator === Operators.IsNotNull;
@@ -203,19 +167,9 @@ export const useSimpleTabFilterProps = (props: Props) => {
          ].operation
        : null;
    if (!isDefined(operator)) {
-      // The previous operator is not relevant for the new subject; pick a
-      // sensible default and reset the comparator. Multi-value (array) columns
-      // default to "Contains any" (element membership) rather than the
-      // scalar-only IN.
-      const newColumn = props.datasource.columns?.find(
-        col => col.column_name === subject,
-      );
-      const defaultOperator =
-        newColumn?.type_generic === GenericDataType.MultiValue
-          ? Operators.ContainsAny
-          : Operators.In;
-      operator = defaultOperator;
-      operatorId = defaultOperator;
+      // if operator is `null`, use the `IN` and reset the comparator.
+      operator = Operators.In;
+      operatorId = Operators.In;
      comparator = undefined;
    }

@@ -239,38 +193,10 @@ export const useSimpleTabFilterProps = (props: Props) => {
  };
  const onOperatorChange = (operatorId: Operators) => {
    const currentComparator = props.adhocFilter.comparator;
-    // The value space differs between operator families: element-level array
-    // ops (Contains any/all) take individual elements, whole-array/scalar ops
-    // (=, In, …) take whole arrays or scalars, Length ops take a count, and the
-    // unary ops take nothing. A value from one family is meaningless in another,
-    // so reset the value when the family changes (e.g. Equal to -> Contains all).
-    const comparatorKind = (op?: Operators): string => {
-      if (!op) return 'none';
-      if (op === Operators.ContainsAny || op === Operators.ContainsAll) {
-        return 'element';
-      }
-      if (
-        op === Operators.LengthEquals ||
-        op === Operators.LengthGreaterThan ||
-        op === Operators.LengthLessThan ||
-        op === Operators.LengthGreaterThanOrEqual ||
-        op === Operators.LengthLessThanOrEqual
-      ) {
-        return 'length';
-      }
-      if (DISABLE_INPUT_OPERATORS.includes(op)) return 'none';
-      return 'value';
-    };
-    const valueFamilyChanged =
-      comparatorKind(props.adhocFilter.operatorId as Operators | undefined) !==
-      comparatorKind(operatorId);
-
    let newComparator;
-    if (valueFamilyChanged) {
-      newComparator = undefined;
-    } else if (MULTI_OPERATORS.has(operatorId)) {
-      // convert between list of comparators and individual comparators
-      // (e.g. `in ('North America', 'Africa')` to `== 'North America'`)
+    // convert between list of comparators and individual comparators
+    // (e.g. `in ('North America', 'Africa')` to `== 'North America'`)
+    if (MULTI_OPERATORS.has(operatorId)) {
      newComparator = Array.isArray(currentComparator)
        ? currentComparator
        : [currentComparator].filter(element => element != null);
@@ -507,42 +433,19 @@ const AdhocFilterEditPopoverSimpleTabContent: FC<Props> = props => {
        if (loadingComparatorSuggestions) {
          controller.abort();
        }
-        // Element-level array operators (Contains any / Contains all) search
-        // inside the array, so suggest individual elements; whole-array
-        // operators (=, In, …) keep the default distinct-array suggestions.
-        const { operatorId } = props.adhocFilter;
-        const arrayElements =
-          operatorId === Operators.ContainsAny ||
-          operatorId === Operators.ContainsAll;
        setLoadingComparatorSuggestions(true);
        SupersetClient.get({
          signal,
-          endpoint: `/api/v1/datasource/${datasource.type}/${datasource.id}/column/${col}/values/${
-            arrayElements ? '?array_elements=true' : ''
-          }`,
+          endpoint: `/api/v1/datasource/${datasource.type}/${datasource.id}/column/${col}/values/`,
        })
          .then(({ json }) => {
            setSuggestions(
-              json.result.map((suggestion: unknown) => {
-                // Complex column values arrive as JS arrays or objects: whole
-                // arrays for MULTI_VALUE columns (e.g. [5, 6, 7]) and Map/Tuple
-                // objects for nested-container columns (e.g. {"a": ["x","y"]}).
-                // A raw array/object is neither a valid single-select value
-                // (antd collapses an array to its first element) nor renderable
-                // as a React child (an object throws). Render it as its literal
-                // string, which is also exactly what the backend's
-                // parse_array_literal expects for the whole-array operators.
-                if (suggestion !== null && typeof suggestion === 'object') {
-                  const literal = JSON.stringify(suggestion);
-                  return { value: literal, label: literal };
-                }
-                return {
-                  value: suggestion as null | number | boolean | string,
-                  label: optionLabel(
-                    suggestion as null | number | boolean | string,
-                  ),
-                };
-              }),
+              json.result.map(
+                (suggestion: null | number | boolean | string) => ({
+                  value: suggestion,
+                  label: optionLabel(suggestion),
+                }),
+              ),
            );
            setLoadingComparatorSuggestions(false);
          })
@@ -561,7 +464,6 @@ const AdhocFilterEditPopoverSimpleTabContent: FC<Props> = props => {
  }, [
    props.adhocFilter.subject,
    props.adhocFilter.clause,
-    props.adhocFilter.operatorId,
    props.datasource,
    datePicker,
  ]);
@@ -44,17 +44,6 @@ export const OPERATORS_TO_SQL = {
  'IS NULL': 'IS NULL',
  'IS TRUE': 'IS TRUE',
  'IS FALSE': 'IS FALSE',
-  // Element-level array operators (shown as filter labels; not executable SQL —
-  // the Custom SQL tab is hidden for these).
-  CONTAINS_ANY: 'CONTAINS ANY',
-  CONTAINS_ALL: 'CONTAINS ALL',
-  IS_EMPTY: 'IS EMPTY',
-  IS_NOT_EMPTY: 'IS NOT EMPTY',
-  LENGTH_EQUALS: 'LENGTH =',
-  LENGTH_GREATER_THAN: 'LENGTH >',
-  LENGTH_LESS_THAN: 'LENGTH <',
-  LENGTH_GREATER_THAN_OR_EQUALS: 'LENGTH >=',
-  LENGTH_LESS_THAN_OR_EQUALS: 'LENGTH <=',
  'LATEST PARTITION': ({
    datasource,
  }: {
--- a/Show More
+++ b/Show More