Merge remote-tracking branch 'origin/master' into HEAD

# Conflicts:
#	tests/unit_tests/commands/importers/v1/utils_test.py

.github/dependabot.yml

@@ -5,10 +5,6 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-    groups:
-      security:
-        applies-to: "security-updates"
-        patterns: ["*"]
     cooldown:
       default-days: 7
 
@@ -65,9 +61,6 @@ updates:
       - npm
       - dependabot
     groups:
-      security:
-        applies-to: "security-updates"
-        patterns: ["*"]
       rjsf:
         patterns:
           - "@rjsf/*"
@@ -105,10 +98,6 @@ updates:
     labels:
       - pip
       - dependabot
-    groups:
-      security:
-        applies-to: "security-updates"
-        patterns: ["*"]
     cooldown:
       default-days: 7
 
@@ -116,10 +105,6 @@ updates:
     directory: ".github/actions"
     schedule:
       interval: "daily"
-    groups:
-      security:
-        applies-to: "security-updates"
-        patterns: ["*"]
     open-pull-requests-limit: 10
     versioning-strategy: increase
     cooldown:
@@ -130,9 +115,6 @@ updates:
     schedule:
       interval: "daily"
     groups:
-      security:
-        applies-to: "security-updates"
-        patterns: ["*"]
       storybook:
         patterns:
           - "@storybook/*"
@@ -160,10 +142,6 @@ updates:
     labels:
       - npm
       - dependabot
-    groups:
-      security:
-        applies-to: "security-updates"
-        patterns: ["*"]
     versioning-strategy: increase
     cooldown:
       default-days: 7
@@ -175,10 +153,6 @@ updates:
     labels:
       - npm
       - dependabot
-    groups:
-      security:
-        applies-to: "security-updates"
-        patterns: ["*"]
     open-pull-requests-limit: 10
     versioning-strategy: increase
     cooldown:

.github/workflows/superset-docs-deploy.yml

@@ -141,7 +141,7 @@ jobs:
           yarn install --check-cache
       - name: Download database diagnostics (if triggered by integration tests)
         if: github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success'
-        uses: dawidd6/action-download-artifact@d63b86af1b34672e53c440b1b83979861906bad7 # v24
+        uses: dawidd6/action-download-artifact@b6e2e70617bc3265edd6dab6c906732b2f1ae151 # v21
         continue-on-error: true
         with:
           workflow: superset-python-integrationtest.yml
@@ -150,7 +150,7 @@ jobs:
           path: docs/src/data/
       - name: Try to download latest diagnostics (for push/dispatch triggers)
         if: github.event_name != 'workflow_run'
-        uses: dawidd6/action-download-artifact@d63b86af1b34672e53c440b1b83979861906bad7 # v24
+        uses: dawidd6/action-download-artifact@b6e2e70617bc3265edd6dab6c906732b2f1ae151 # v21
         continue-on-error: true
         with:
           workflow: superset-python-integrationtest.yml

.github/workflows/superset-docs-verify.yml

@@ -140,7 +140,7 @@ jobs:
         run: |
           yarn install --check-cache
       - name: Download database diagnostics from integration tests
-        uses: dawidd6/action-download-artifact@d63b86af1b34672e53c440b1b83979861906bad7 # v24
+        uses: dawidd6/action-download-artifact@b6e2e70617bc3265edd6dab6c906732b2f1ae151 # v21
         with:
           workflow: superset-python-integrationtest.yml
           run_id: ${{ github.event.workflow_run.id }}

.github/workflows/testcontainers.yml

@@ -1,188 +0,0 @@
-# db_engine_specs tests against real databases (testcontainers)
-name: Testcontainers
-
-# Spins up real Docker containers (see tests/testcontainers/ for the current
-# dialect list) via testcontainers-python, which catches real dialect/driver
-# regressions -- the kind mocked db_engine_specs unit tests structurally
-# cannot, e.g. apache/superset#42899 (Trino emitting OFFSET before LIMIT).
-# Runs on a nightly cron (catches drift from a driver's own releases, not
-# just from Superset's changes) and on pull_request, scoped via `paths` to
-# only PRs that actually touch this test suite or the workflow itself, so
-# unrelated PRs across the repo are never affected.
-#
-# A matrix entry can set `nightly_only: true` to run only on the cron (or a
-# manual workflow_dispatch), never on pull_request -- for a dialect whose
-# image is too heavy (a multi-service cluster, a many-GB image, a slow
-# licensed installer) to justify adding its wall-clock/resource cost to
-# every PR that merely touches this suite. Omit the field entirely for a
-# normal dialect; it isn't nightly-only by default.
-permissions:
-  contents: read
-
-on:
-  schedule:
-    - cron: "0 5 * * *"
-  workflow_dispatch: {}
-  pull_request:
-    paths:
-      - ".github/workflows/testcontainers.yml"
-      - "tests/testcontainers/**"
-      - "superset/db_engine_specs/**"
-      - "pyproject.toml"
-      - "requirements/development.in"
-      - "requirements/development.txt"
-
-concurrency:
-  # Scoped by ref, not just workflow name -- otherwise every PR run and the
-  # nightly cron share one group, and starting the workflow on another PR
-  # (or the nightly firing mid-PR-run) cancels an unrelated in-progress run.
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  testcontainers:
-    runs-on: ubuntu-26.04
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          # One job per dialect rather than one job for the whole suite: a
-          # single slow container would otherwise inflate the wall-clock
-          # time for every dialect, not just its own. Running in parallel
-          # means the suite's total time is bounded by the slowest dialect,
-          # not the sum of all of them. Db2's first-boot init is documented
-          # upstream as notably slow (a real instance bring-up, not just a
-          # process start) and untested locally here (no arm64 image), so
-          # it gets a wider timeout margin than the rest until real CI data
-          # says otherwise.
-          - dialect: cockroachdb
-            timeout: 10
-          - dialect: crate
-            timeout: 10
-          - dialect: trino
-            timeout: 10
-          - dialect: mssql
-            timeout: 10
-          - dialect: elasticsearch
-            timeout: 10
-          - dialect: oracle
-            timeout: 15
-          - dialect: db2
-            timeout: 25
-          - dialect: mariadb
-            timeout: 10
-          - dialect: timescaledb
-            timeout: 10
-          - dialect: yugabytedb
-            timeout: 10
-          - dialect: monetdb
-            timeout: 10
-          - dialect: mongodb
-            timeout: 10
-          - dialect: postgres
-            timeout: 10
-          - dialect: mysql
-            timeout: 10
-          - dialect: clickhouse
-            timeout: 10
-          # StarRocks' allin1-ubuntu image brings up both FE and BE in one
-          # container, which is a heavier bring-up than a single-process
-          # database -- wider margin until real CI data says otherwise.
-          - dialect: starrocks
-            timeout: 15
-          - dialect: databend
-            timeout: 10
-          - dialect: risingwave
-            timeout: 10
-          - dialect: firebird
-            timeout: 10
-          - dialect: ydb
-            timeout: 10
-          # OceanBase bootstraps a distributed-style cluster even in
-          # single-node MODE=MINI -- too heavy for every PR's CI budget, so
-          # it runs on the nightly cron / manual dispatch only.
-          - dialect: oceanbase
-            timeout: 20
-            nightly_only: true
-    timeout-minutes: ${{ matrix.timeout }}
-    env:
-      PYTHONPATH: ${{ github.workspace }}
-      SUPERSET_TESTENV: true
-      SUPERSET_SECRET_KEY: not-a-secret
-      # This job's matrix installs exactly one dialect's testcontainers
-      # driver for exactly this job, so treat that driver as required: a
-      # broken/missing import should fail the job, not silently skip to a
-      # misleadingly green, zero-tests-run result. See _driver.py.
-      SUPERSET_TESTCONTAINERS_STRICT: true
-    steps:
-      - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-        with:
-          persist-credentials: false
-      - name: Setup Python
-        uses: ./.github/actions/setup-backend/
-        with:
-          python-version: current
-      - name: Install db2 driver (ibm-db-sa)
-        # ibm-db (the db2 DBAPI) ships no Linux arm64 wheel, so it's kept out
-        # of the baseline dev install (requirements/development.in) to avoid
-        # breaking the multi-platform dev Docker image build. Install it here
-        # instead, only for this leg of the matrix.
-        if: matrix.dialect == 'db2'
-        run: uv pip install --system -e .[db2]
-      - name: Install oceanbase driver (oceanbase_py)
-        # oceanbase_py pins sqlalchemy-utils>=0.38.3,<0.39, which conflicts
-        # outright with Superset's own sqlalchemy-utils==0.42.1 pin -- kept
-        # out of the baseline dev install for the same reason as db2 above.
-        # Installed as its own standalone package (not via `-e .[oceanbase]`)
-        # so --no-deps only skips *oceanbase_py's* dependencies -- applied
-        # to `-e .[oceanbase]` instead, --no-deps blocks pip from installing
-        # anything the extras marker pulls in, including oceanbase_py
-        # itself, which "succeeds" without actually installing it
-        # (confirmed on real CI: the install step reported success, but the
-        # module was still missing). This job only needs oceanbase_py's
-        # dialect module importable, not its sqlalchemy-utils dependency
-        # satisfied, since nothing here calls into it.
-        if: matrix.dialect == 'oceanbase'
-        run: uv pip install --system --no-deps "oceanbase_py>=0.0.1.2"
-      - name: Install Firebird client library (libfbclient2)
-        # sqlalchemy-firebird's driver (firebird-driver) is a pure-Python
-        # ctypes wrapper (its wheel is py3-none-any) that dynamically loads
-        # the native Firebird client library from the host at import time
-        # -- it doesn't bundle that library itself, so it has to come from
-        # the system package manager, only for this leg of the matrix.
-        if: matrix.dialect == 'firebird'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libfbclient2
-      - name: Run testcontainers db_engine_specs tests (${{ matrix.dialect }})
-        # A job-level `if:` can't reference `matrix` (only github/inputs/
-        # needs/vars are available there), so the nightly_only skip has to
-        # live on the step instead. A dialect without `nightly_only` set
-        # evaluates the left side true (unset is null, and `null != true`
-        # is true) and always runs; one WITH it set only runs on the cron
-        # or a manual dispatch, never on pull_request.
-        if: >-
-          matrix.nightly_only != true ||
-          github.event_name == 'schedule' ||
-          github.event_name == 'workflow_dispatch'
-        run: |
-          pytest --durations-min=2 -v -m testcontainers \
-            ./tests/testcontainers/db_engine_specs/test_${{ matrix.dialect }}.py \
-            --junit-xml=test-results/junit-testcontainers-${{ matrix.dialect }}.xml
-      - name: Upload JUnit test results
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: junit-results-testcontainers-${{ matrix.dialect }}
-          path: test-results/
-          retention-days: 7
-
-  actions-timeline:
-    needs: [testcontainers]
-    if: always()
-    runs-on: ubuntu-26.04
-    permissions:
-      actions: read
-    steps:
-      - uses: Kesin11/actions-timeline@57fc93f20c6da7fbc14063c6d24a2a5627c799ad # v3.2.0

UPDATING.md

@@ -25,7 +25,6 @@ assists people when migrating to a new version.
 ## Next
 
 - `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.
-- The `cockroachdb` extra (`pip install apache-superset[cockroachdb]`) now installs `sqlalchemy-cockroachdb` instead of the abandoned `cockroachdb` package, whose SQLAlchemy dialect could not be imported under SQLAlchemy 2.0. Existing environments with the old package installed must `pip uninstall cockroachdb` before reinstalling the extra -- both packages register the same `cockroachdb` SQLAlchemy dialect entry point, so leaving the old one in place can still load the abandoned implementation.
 
 ### MCP tool results preserve stored string values
 
@@ -59,7 +58,6 @@ the old counter to use the outcome-specific replacements.
 
 - [42930](https://github.com/apache/superset/pull/42930): Dataset import data-URI fetches no longer honor an HTTP(S) proxy when `DATASET_IMPORT_ALLOW_INTERNAL_DATA_URLS` is `False` (the default): the connection is now made directly to the destination so the peer-address check validates the real target instead of a proxy's. Deployments that require an egress proxy to reach legitimate external data URLs for dataset import should set `DATASET_IMPORT_ALLOW_INTERNAL_DATA_URLS = True` or otherwise ensure those URLs resolve without one.
 - [42935](https://github.com/apache/superset/pull/42935): The MCP service now refuses to start (`MCPAuthConfigError`) when `MCP_JWT_ISSUER` trusts more than one issuer and no `MCP_USER_RESOLVER` is configured, instead of only logging a warning. This was already a documented misconfiguration (the default resolver isn't issuer-scoped, so distinct trusted issuers minting the same username/email would resolve to the same Superset user); deployments trusting multiple issuers must configure an `MCP_USER_RESOLVER` that derives its identity from the token's `iss` claim before upgrading. Single-issuer deployments are unaffected.
-- [42429](https://github.com/apache/superset/pull/42429): The Country Map chart's Iran GeoJSON now gives Alborz province its own ISO 3166-2 code, `IR-32`, instead of `IR-30`. `ISO` is the join key used to color/filter provinces on this chart, so any existing dataset keyed on `IR-30` for Alborz will silently stop matching after upgrading; re-key that data to `IR-32`.
 - [43388](https://github.com/apache/superset/pull/43388): The MCP service now refuses to start (`MCPAuthConfigError`) if `MCP_DEV_USERNAME` and `MCP_AUTH_ENABLED = True` are both set, and separately if `MCP_AUTH_ENABLED = True` but no usable JWT key material is configured (RSA key/JWKS, or an explicit `MCP_JWT_SECRET` for HMAC) — both previously started with authentication silently weaker than configured. Deployments combining a dev-mode username with JWT auth enabled, or enabling JWT auth without key material, must pick one before upgrading: unset `MCP_DEV_USERNAME` for a real auth deployment, or unset `MCP_AUTH_ENABLED` (or configure the key material) for a dev-mode one. Response caching (`MCP_CACHE_CONFIG["enabled"] = True`) now also excludes every tool with a side effect by default, not only a partial list, so a previously-cached mutating tool call is no longer served from cache; no config change is needed to pick this up.
 - [42393](https://github.com/apache/superset/pull/42393): Exported dataset YAML now carries a `uuid` for each metric and column so that custom folder assignments (which reference metrics/columns by UUID) survive an import into another workspace. This affects any export bundle that contains datasets, not just a dataset export: chart, dashboard, database and full-asset exports all embed the same dataset YAML, so a dashboard exported from this release also fails to import into an older one even though no dataset was exported directly. As with `folders` and `currency_code_column`, the affected `datasets/` files fail schema validation (`Unknown field: uuid`) when imported into Superset releases that predate this change; regenerate or hand-edit exports for older targets in mixed-version fleets.
 - [42300](https://github.com/apache/superset/pull/42300): Timeseries charts (line/area/bar) with a Y-axis bound in effect — either an explicit `yAxisBounds` or one derived from `truncateYAxis` — now clamp out-of-range data points to that bound instead of letting ECharts drop the point (and the line segments around it) entirely. Any existing chart with a configured Y-axis bound and data outside it will look different after upgrading: a gap becomes a point pinned to the boundary. The clamp also rewrites the value ECharts reads for that point's tooltip and data label, so the displayed value is the bound rather than the true observation.
@@ -186,12 +184,10 @@ misrepresents the entity as unchanged.
 - **Storage growth.** Capture writes shadow rows per save, so the metadata
   database grows with edit volume. The `version_history.prune_old_versions`
   beat task removes rows whose transaction is older than
-  `SUPERSET_VERSION_HISTORY_RETENTION_DAYS` (default 30).
-- **Check a replaced `CELERY_CONFIG`.** Carry both the
-  `superset.tasks.version_history_retention` import and the
-  `version_history.prune_old_versions` beat entry; see
-  [Version-history retention (pruning)](#version-history-retention-pruning) for
-  the startup-warning behavior.
+  `SUPERSET_VERSION_HISTORY_RETENTION_DAYS` (default 30). A deployment that
+  replaces `CELERY_CONFIG` rather than inheriting it must carry both the
+  `superset.tasks.version_history_retention` import and the beat entry; a
+  startup warning names whichever is absent.
 - **`PUT` responses change shape.** Entity updates now return populated
   `old_version_uuid` / `new_version_uuid` fields and an `ETag` header, which
   were null or absent while capture was off.
@@ -200,10 +196,7 @@ misrepresents the entity as unchanged.
 kill-switch — not removed with the rollout toggles. Setting it to a falsy value
 stops capture within a restart, without a revert-and-redeploy. Unlike the
 soft-delete toggle, turning it off is a clean stop: existing version rows remain
-readable and no entity state is altered. Restore is unavailable (404) while
-capture is off. A full rollback also sets
-`FEATURE_FLAGS = {"VERSION_HISTORY": False}` to hide the panel — capture off
-with the panel left on shows an empty or stale history.
+readable and no entity state is altered.
 
 ### Scheduled report execution now enforces one application deadline
 
@@ -665,9 +658,9 @@ ALTER TABLE tagged_object DROP CONSTRAINT <constraint_name>;
 ALTER TABLE tagged_object DROP FOREIGN KEY <constraint_name>;
 ```
 
-### Entity version-history infrastructure
+### Entity version-history infrastructure (gated off by default)
 
-Introduces the schema and SQLAlchemy-Continuum wiring that captures version history for charts, dashboards, and datasets, plus read-only `GET /api/v1/{chart,dashboard,dataset}/<uuid>/versions/` endpoints. Capture is governed by the `ENABLE_VERSIONING_CAPTURE` config value — an operational kill-switch (a release toggle that became a permanent ops switch), not a feature flag; see "Version history is on by default" above for the shipped default. With capture off, no save writes version rows; the endpoints continue to serve already-captured rows read-only. The migration is additive; existing entity `PUT` responses gain `old_version_uuid` / `new_version_uuid` body fields and an `ETag` header (both null/absent when capture is off).
+Introduces the schema and SQLAlchemy-Continuum wiring that captures version history for charts, dashboards, and datasets, plus read-only `GET /api/v1/{chart,dashboard,dataset}/<uuid>/versions/` endpoints. This ships **inert**: a new config flag `ENABLE_VERSIONING_CAPTURE` defaults to `False`, so no save writes any version rows and the endpoints return empty. It is an operational kill-switch (a release toggle that becomes a permanent ops switch), not a feature flag — set it to `True` to enable capture once validated. The migration is additive; existing entity `PUT` responses gain `old_version_uuid` / `new_version_uuid` body fields and an `ETag` header (both null/absent when capture is off).
 
 A few save- and import-path internals change **unconditionally** (independent of the flag), because the versioned mappers must behave correctly whether or not capture is enabled:
 
@@ -688,7 +681,7 @@ A read-only companion to the version-history endpoints: each entity type gains a
 | `q`                  | string                       | —          | Case-insensitive search over the full history, applied before pagination (so `count` reflects matches) |
 | `page` / `page_size` | integer                      | `0` / `25` | Pagination (`page_size` clamped to 200)                                                                |
 
-Authorization reuses the resource's `can_read` permission and per-object `raise_for_access`; related-entity rows are visibility-filtered to what the caller may see. The stream reflects captured history; with capture off it remains readable but stops accruing new entries.
+Authorization reuses the resource's `can_read` permission and per-object `raise_for_access`; related-entity rows are visibility-filtered to what the caller may see. The stream is empty unless version capture is on (`ENABLE_VERSIONING_CAPTURE`).
 
 ### Version-history retention (pruning)
 
@@ -708,7 +701,7 @@ Purging is **live by default** (`SOFT_DELETE_PURGE_DRY_RUN=False`), so the reten
 
 Deployments that replace the default `CELERY_CONFIG` must ensure workers register `superset.tasks.deletion_retention` and schedule the `deletion_retention.purge_soft_deleted` task themselves. The shipped Docker development config uses `imports` and includes both entries. While `SOFT_DELETE` is statically enabled, a missing beat entry logs a startup warning; when the override explicitly defines `imports`, a missing purge module is also reported.
 
-Operators can immediately erase a specific entity for compliance (GDPR) via `superset deletion-retention force-purge --uuid <uuid>`; this applies legacy hard-delete semantics — a live chart referencing a force-purged dataset is left without a datasource until re-pointed (the chart is not modified), and it purges the named entity even when it was never soft-deleted. Every scheduled evaluation writes a provisional, content-free record to the new `purge_audit_log` table before the cascade starts. Meaningful retained outcomes survive the entity they name. Blocked audit records carry a stable machine-readable `reason` code (`report_schedule`, `user_attribute`, or `cascade_integrity_failure` for an unexpected cascade failure caused by a database integrity constraint) so the audit table alone answers why an entity was not purged; records finalized before the column existed keep a NULL reason. Apply the migration before rolling out the new code: the audit model declares the column, so a worker on the new code with an un-migrated table fails its write-ahead write and the scheduled purge fails closed until the migration lands. During a rolling deploy, workers still on the old code write reason-less blocked rows and suppress on status alone; both effects are self-healing, since a NULL-reason record never matches a reason code and the next all-new-code run re-anchors the entity. Consecutive scheduled evaluations blocked with the same status **and reason** suppress only the redundant current provisional record — a reason change writes one new blocked record carrying the new code; completed outcomes, outcome transitions, and every force-purge attempt remain independent and immutable. Retained transition records are not automatically expired, so entities whose block reason changes repeatedly can accumulate multiple audit rows. The **scheduled** purge fails closed when its provisional record cannot be written, while **force-purge** proceeds even if the audit write fails — the operator is present and deletion outranks audit for a compliance erasure. Operators can monitor `deletion_retention.blocked_audit_suppressed` and `deletion_retention.blocked_audit_dedupe_fallback` to verify suppression and fail-safe fallback behavior without changing the existing blocked-workload gauge.
+Operators can immediately erase a specific entity for compliance (GDPR) via `superset deletion-retention force-purge --uuid <uuid>`; this applies legacy hard-delete semantics — a live chart referencing a force-purged dataset is left without a datasource until re-pointed (the chart is not modified), and it purges the named entity even when it was never soft-deleted. Every scheduled evaluation writes a provisional, content-free record to the new `purge_audit_log` table before the cascade starts. Meaningful retained outcomes survive the entity they name. Consecutive scheduled evaluations with the same blocked outcome suppress only the redundant current provisional record; completed outcomes, outcome transitions, and every force-purge attempt remain independent and immutable. The **scheduled** purge fails closed when its provisional record cannot be written, while **force-purge** proceeds even if the audit write fails — the operator is present and deletion outranks audit for a compliance erasure. Operators can monitor `deletion_retention.blocked_audit_suppressed` and `deletion_retention.blocked_audit_dedupe_fallback` to verify suppression and fail-safe fallback behavior without changing the existing blocked-workload gauge.
 
 ### Recently Archived view and permanent delete (purge) endpoints
 
@@ -904,7 +897,7 @@ The migration is transactional (all-or-nothing) and idempotent — it can be saf
 
 ### Soft delete and restore for datasets
 
-**The soft-delete behavior in this section applies only when the `SOFT_DELETE` feature flag is enabled. The flag defaults to `True`** (`@lifecycle: testing`), so on a default deployment `DELETE /api/v1/dataset/<id>` uses the recoverable soft-delete behavior described below. Setting `SOFT_DELETE` to `False` restores legacy permanent hard-delete behavior for subsequent deletes.
+**The soft-delete behavior in this section applies only when the `SOFT_DELETE` feature flag is enabled. The flag defaults to `False`** (`@lifecycle: development`), so on a default deployment `DELETE /api/v1/dataset/<id>` continues to **hard-delete permanently** — nothing is recoverable. Enable `SOFT_DELETE` to get the behavior described below.
 
 **Flag-toggle caveat:** the soft-delete visibility filter is evaluated per query while the flag is on. If datasets are soft-deleted during a flag-on window and the flag is later turned **off**, those rows reappear as live datasets in all lists, lookups, and relationship loads (including charts that reference them). The `POST /<uuid>/restore` endpoint and the `dataset_deleted_state` list filter remain functional regardless of the flag, deliberately, so rows soft-deleted during a flag-on window stay discoverable and restorable after a rollback of the flag.
 
@@ -934,7 +927,7 @@ With the flag enabled: `DELETE /api/v1/dataset/<id>` no longer hard-deletes the
 
 ### Soft delete and restore for charts
 
-**Everything in this section applies only when the `SOFT_DELETE` feature flag is enabled. The flag defaults to `True`** (`@lifecycle: testing`), so on a default deployment `DELETE /api/v1/chart/<id>` uses the recoverable soft-delete behavior described below. Setting `SOFT_DELETE` to `False` restores legacy permanent hard-delete behavior for subsequent deletes.
+**Everything in this section applies only when the `SOFT_DELETE` feature flag is enabled. The flag defaults to `False`** (`@lifecycle: development`), so on a default deployment `DELETE /api/v1/chart/<id>` continues to **hard-delete permanently** — nothing is recoverable. Enable `SOFT_DELETE` to get the behavior described below.
 
 **Flag-toggle caveat:** the soft-delete visibility filter is evaluated per query while the flag is on. If charts are soft-deleted during a flag-on window and the flag is later turned **off**, those rows reappear as live charts in all lists, lookups, and relationship loads (including dashboards that contained them). The `POST /<uuid>/restore` endpoint and the `chart_deleted_state` list filter remain functional regardless of the flag, deliberately, so rows soft-deleted during a flag-on window stay discoverable and restorable after a rollback of the flag.
 
@@ -958,7 +951,7 @@ With the flag enabled: `DELETE /api/v1/chart/<id>` no longer hard-deletes the ch
 
 ### Soft delete and restore for dashboards
 
-**Everything in this section applies only when the `SOFT_DELETE` feature flag is enabled. The flag defaults to `True`** (`@lifecycle: testing`), so on a default deployment `DELETE /api/v1/dashboard/<id>` uses the recoverable soft-delete behavior described below. Setting `SOFT_DELETE` to `False` restores legacy permanent hard-delete behavior for subsequent deletes.
+**Everything in this section applies only when the `SOFT_DELETE` feature flag is enabled. The flag defaults to `False`** (`@lifecycle: development`), so on a default deployment `DELETE /api/v1/dashboard/<id>` continues to **hard-delete permanently** — nothing is recoverable. Enable `SOFT_DELETE` to get the behavior described below.
 
 **Flag-toggle caveat:** the soft-delete visibility filter is evaluated per query while the flag is on. If dashboards are soft-deleted during a flag-on window and the flag is later turned **off**, those rows reappear as live dashboards in all lists and lookups (including slug lookups — if a soft-deleted dashboard's slug was reused while the flag was on, both rows become visible with the same slug). The `POST /<uuid>/restore` endpoint and the `dashboard_deleted_state` list filter remain functional regardless of the flag, deliberately, so rows soft-deleted during a flag-on window stay discoverable and restorable after a rollback of the flag.
 

docs/admin_docs/configuration/alerts-reports.mdx

@@ -14,20 +14,6 @@ Users can configure automated alerts and reports to send dashboards or charts to
 
 Alerts and reports are disabled by default. To turn them on, you'll need to change configuration settings and install a suitable headless browser in your environment.
 
-## Content Format Options
-
-When scheduling an alert or report, you can choose the format used to deliver the dashboard or chart:
-
-- **PDF** – a full-page screenshot rendered as a PDF attachment. Available for both dashboards and charts.
-- **PNG** – a screenshot delivered as an attachment. Emails embed the image inline in the message body; Slack and webhook recipients receive it as an uploaded file. Available for both dashboards and charts.
-- **CSV** – chart data attached as a `.csv` file. Available for charts only.
-- **XLSX (Excel)** – chart data attached as a `.xlsx` file. Available for charts only. If the chart's data spans multiple server-paginated files, email delivery detects the bundle and renames the attachment to `.zip`; Slack and webhook deliveries always name the file with an `.xlsx` extension even when the contents are a multi-file ZIP archive.
-- **Text** – chart data embedded directly in the email or Slack message body. Available only for charts using a text-based visualization type (e.g. Table, Pivot Table, Paired t-test).
-
-Dashboard reports and alerts are limited to the PDF and PNG formats; the CSV, XLSX, and Text options are only available when scheduling a report or alert for an individual chart.
-
-For alerts (not scheduled reports), PNG/PDF screenshots and chart CSV/XLSX data are only generated when the `ALERTS_ATTACH_REPORTS` [feature flag](/admin-docs/configuration/configuring-superset#feature-flags) is enabled (the default); with it disabled, an alert notification is still sent, but without the attachment.
-
 ## Requirements
 
 ### Commons

docs/admin_docs/configuration/cache.mdx

@@ -76,27 +76,6 @@ value defined in `DATA_CACHE_CONFIG`.
 Note, that by setting the cache timeout to `-1`, caching for charting data can be disabled, either
 per chart, dataset or database, or by default if set in `DATA_CACHE_CONFIG`.
 
-Native filter option queries (the dropdown values for native filters) go through this same
-chart-data cache, but their freshness needs often differ from regular chart queries, especially for
-datasets whose visible values change frequently, including RLS-constrained datasets. Set
-`NATIVE_FILTER_OPTIONS_CACHE_TIMEOUT` in `superset_config.py` to give these queries a dedicated
-timeout, checked before the chart/dataset/database chain and the `DATA_CACHE_CONFIG` default above:
-
-```python
-NATIVE_FILTER_OPTIONS_CACHE_TIMEOUT = 60  # seconds
-```
-
-- `None` (default): native filter option queries fall through to the normal
-  chart/dataset/database/`DATA_CACHE_CONFIG` resolution chain.
-- `-1`: disables caching for native filter option queries entirely.
-- `0`: passed directly to the cache backend; behavior is backend-specific, so use `-1` if the intent
-  is to disable caching.
-- A positive integer: cache native filter option queries for that many seconds.
-
-This setting only applies to requests detected as native filter option queries. It takes precedence
-over the per-chart/dataset/database timeouts, but not over an explicit per-request
-`custom_cache_timeout` override (e.g. "Force refresh").
-
 ## Limiting Cached Result Size
 
 Very large chart or SQL query results can flood the cache backend (Redis/Memcached), evicting many

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

@@ -83,26 +83,6 @@ The optional username flag **-u** sets the user used for the datasource import.
 superset import_datasources -p <path / filename> -u 'admin'
 ```
 
-## Importing a Directory of Assets
-
-The `import_directory` command imports a directory of exported assets (databases, datasets,
-dashboards, charts) in the same layout produced by the ZIP-based export. Saved queries and tags
-included in a full export are not imported by this command:
-
-```bash
-superset import_directory <path / directory>
-```
-
-As with `import_datasources`, the optional username flag **-u** sets the user assigned as the
-owner of the imported assets. The default is 'admin'. Example:
-
-```bash
-superset import_directory <path / directory> -u 'admin'
-```
-
-If the specified user does not exist, the command fails immediately with an error rather than
-importing the assets without an owner.
-
 ## Dashboard Import Overwrite Behavior
 
 When importing a dashboard ZIP with the **overwrite** option enabled, any existing charts that are part of the dashboard are **replaced** rather than duplicated. This applies to:

docs/admin_docs/configuration/mcp-server.mdx

@@ -505,8 +505,6 @@ All MCP settings go in `superset_config.py`. Defaults are defined in `superset/m
 | `MCP_DEV_USERNAME`   | --            | Superset username for development mode (no auth)                                                                                                                                                                                                                             |
 | `MCP_RBAC_ENABLED`   | `True`        | Enforce Superset's role-based access control on MCP tool calls. When `True`, each tool checks that the authenticated user has the required FAB permission before executing. Disable only for testing or trusted-network deployments.                                         |
 | `MCP_DISABLED_TOOLS` | `set()`       | Set of tool names to remove from the MCP server at startup. Disabled tools are never advertised to AI clients during tool discovery. Useful when a custom extension tool should replace a built-in Superset tool. See [Disabling built-in tools](#disabling-built-in-tools). |
-| `MCP_DISABLED_CHART_PLUGINS` | `frozenset()` | Set of chart type plugin names (e.g. `"handlebars"`) to hide from `generate_chart`. Does not affect `get_chart_type_schema`. See [Disabling chart type plugins](#disabling-chart-type-plugins). |
-| `MCP_CHART_PLUGIN_ENABLED_FUNC` | `None`        | Callable `(chart_type: str) -> bool` evaluated per registry lookup for dynamic enable/disable decisions. Takes precedence over `MCP_DISABLED_CHART_PLUGINS` when set. See [Disabling chart type plugins](#disabling-chart-type-plugins). |
 
 ### Authentication
 
@@ -895,39 +893,6 @@ MCP_DISABLED_TOOLS = {"extensions.myorg.myextension.some_tool"}
 Specifying a tool name that does not exist logs a warning at startup and is otherwise ignored — it will not prevent the server from starting.
 :::
 
-## Disabling chart type plugins
-
-The `generate_chart` tool dispatches per chart type (`xy`, `table`, `pie`, `pivot_table`, `mixed_timeseries`, `handlebars`, `big_number`, `histogram`, `box_plot`, `waterfall`) to a registered chart type plugin. Two settings let operators enable or disable individual chart type plugins at runtime, without a code deploy.
-
-### Static deny-list
-
-Set `MCP_DISABLED_CHART_PLUGINS` in your `superset_config.py` to a set of chart type names:
-
-```python
-# superset_config.py
-
-# Emergency kill switch: hide "handlebars" from all callers
-MCP_DISABLED_CHART_PLUGINS = {"handlebars"}
-```
-
-Disabled chart types stay registered but are filtered out at lookup time: they're never listed in `generate_chart`'s supported chart types, and `generate_chart` calls for them are rejected. `get_chart_type_schema` consults its own static schema/example map rather than the registry filter, so a disabled chart type's schema remains queryable through that tool even though `generate_chart` will reject it.
-
-### Dynamic predicate
-
-For per-request control (A/B tests, gradual rollout, entitlement checks), set `MCP_CHART_PLUGIN_ENABLED_FUNC` to a callable. It's evaluated as `enabled_func(chart_type: str) -> bool` on every registry lookup, and it takes precedence over `MCP_DISABLED_CHART_PLUGINS` when set:
-
-```python
-# superset_config.py
-from flask import g
-
-
-def MCP_CHART_PLUGIN_ENABLED_FUNC(chart_type: str) -> bool:
-    flags = getattr(g, "feature_flags", {})
-    return flags.get(f"mcp_chart_{chart_type}", True)
-```
-
-The callable must be cheap and in-process (consult already-loaded feature flags or request-local context) -- do not perform network I/O per call. If it raises, the registry fails closed (the plugin is hidden) and logs a warning.
-
 ## Security Best Practices
 
 - **Use TLS** for all production MCP endpoints -- place the server behind a reverse proxy with HTTPS

docs/admin_docs/configuration/theming.mdx

@@ -88,27 +88,6 @@ THEME_DARK = {
 # - OS preference detection is automatically enabled
 ```
 
-### Default Theme Mode
-
-By default, Superset mimics the visitor's OS/browser preference (light or dark) for
-sessions that don't have a saved user preference. Use `THEME_DEFAULT_MODE` to override
-that starting point instance-wide for the standard application:
-
-```python
-# Default theme mode for sessions without a saved user preference.
-# One of "default" (always light), "dark" (always dark), or "system" (mimic OS preference).
-THEME_DEFAULT_MODE = "dark"
-```
-
-- `"system"` (the default) preserves the existing behavior of following the OS/browser
-  preference, provided a dark theme is configured (`THEME_DARK` is not `None`). If no dark
-  theme is available, Superset always starts in light mode regardless of this setting.
-- `"default"` or `"dark"` forces that starting mode for first-time visitors; users can still switch themes manually afterward if both `THEME_DEFAULT` and `THEME_DARK` are available.
-- A user's own saved preference, once they toggle the theme switcher, always takes precedence over `THEME_DEFAULT_MODE`.
-- `THEME_DEFAULT_MODE` has no effect on embedded dashboards: the embed SDK sets the
-  starting mode via its own `themeMode` URL parameter, which takes precedence and falls
-  back to light mode when the parameter is absent.
-
 ### App Branding
 
 The application name shown in the browser title bar and navigation can be

docs/admin_docs/security/security.mdx

@@ -243,42 +243,6 @@ Each subject in the response includes flat scalar ids (`user_id`, `role_id`, `gr
 than a nested object, so callers can match directly on whichever id they already have — only the
 id field matching the subject's `type` is populated; the others are `null`.
 
-#### Extending Editorship with EXTRA_EDITORS_RESOLVER
-
-Deployments that grant edit access to a dashboard or chart through a mechanism outside
-Superset's own Subject-based `editors` list — for example, a folder-permission system or an
-internal directory service — can plug that logic in with `EXTRA_EDITORS_RESOLVER`:
-
-```python
-def extra_editors_resolver(resource):
-    # `resource` is the Dashboard or Slice instance being checked.
-    # Return Subject instances, raw subject ids, or dicts with an `id` key.
-    return [...]
-
-
-EXTRA_EDITORS_RESOLVER = extra_editors_resolver
-```
-
-The resolver's result is unioned with the resource's own `editors` for editorship checks: it
-feeds `is_editor`, `raise_for_editorship`, save-as, and soft-delete restore. When
-`EXTRA_EDITORS_RESOLVER` is configured, the usual lockout-prevention behavior — automatically
-re-adding a non-admin who removes themselves from a resource's editors — is skipped, since the
-deployment has its own way of keeping the resource editable. This skip is global to the setting,
-not per-resource: it still applies on a resource where the resolver currently returns no
-subjects, so a resolver that can't guarantee an alternate editor for every resource can let the
-last editor remove themselves and leave it uneditable by non-admins.
-
-Resolved subject ids are also surfaced as `extra_editors` in the chart and dashboard `GET`
-responses, so API clients can distinguish resolver-granted editorship from the resource's own
-`editors` list. This field is attached after serialization and isn't part of the OpenAPI response
-schema, so generated API clients won't see it as a typed field.
-
-Because the resolver is arbitrary per-deployment Python rather than a SQL-expressible condition,
-editorship it grants cannot be reflected in list-view filtering (for example, the soft-deleted
-archive is scoped to editors via a SQL query). It does still run once per row on chart and
-dashboard list responses to populate `extra_editors`, so a slow or unavailable external resolver
-affects ordinary list requests, not just direct per-object checks.
-
 ### Dashboard Access Control
 
 Access to dashboards is managed via editors (subjects that have edit permissions to the dashboard).
@@ -619,28 +583,6 @@ SELECT * FROM (
   queries run against tables that have associated datasets with RLS filters will then have
   the appropriate predicates injected automatically.
 
-#### RLS Indicator in the Dataset List and Explore
-
-When a dataset has one or more RLS filters that apply to it, Superset shows a lock
-icon badge next to the dataset name in the **Datasets** list and next to the dataset
-selector in **Explore**. Hovering over the badge shows a tooltip listing each
-applicable filter's name, filter type (Regular or Base), group key (if any), assigned
-subjects (labeled "Roles" in the tooltip, but may include users and groups too), and
-clause.
-
-This badge also surfaces filters that are inherited from the physical tables
-referenced by a virtual (SQL-based) dataset, as described above. Inherited filters
-are marked "from underlying table" in the tooltip, and a summary note is shown
-whenever any of the listed filters are inherited rather than assigned directly to
-the dataset. Inherited-filter detection depends on Superset's SQL parser being able
-to identify the referenced tables and match them to a physical dataset by name,
-schema, and database, so it's best-effort: unparseable or unmatched references won't
-surface a filter on the badge even if one would apply at query time.
-
-The badge is a visibility aid only — it does not change which filters are applied to
-a query. Use the RLS REST API described below if you need to confirm exactly which
-filters affect a dataset.
-
 #### Checking RLS Filters via the API
 
 You can use the RLS REST API to audit which filters are configured and which datasets

docs/data/countries.json

@@ -86,7 +86,6 @@
     "Israel",
     "Italy",
     "Italy (regions)",
-    "Italy (regions and autonomous provinces)",
     "Ivory Coast",
     "Japan",
     "Jordan",

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

@@ -406,18 +406,6 @@ ECharts option overrides bypass Superset's validation layer. Invalid option keys
 
 When the **Search Box** is visible in a Table chart, the **Download** action exports only the rows currently visible after the search filter is applied — not the full underlying dataset. This matches the visual output and is intentional. To export the full dataset regardless of search state, use the **Download as CSV** option from the chart's three-dot menu in the dashboard or from the Explore chart toolbar before applying a search filter.
 
-### Exporting a Chart as an Image or PDF
-
-Alongside the raw-data export options (CSV, JSON, Excel), a chart's three-dot menu — in a dashboard or from the Explore chart toolbar — offers a few ways to export a visual snapshot of the chart:
-
-- **Export screenshot (jpeg)** — a single-click JPEG screenshot of the chart.
-- **Export screenshot (png)** — opens a submenu with **Transparent background** and **Solid background** options. The solid option uses the current theme's background color. PNG produces a higher-quality image than the JPEG export.
-- **Export as PDF** — downloads the chart as a PDF file.
-
-The dropdown menu is briefly hidden while the screenshot or PDF is being captured so it doesn't appear in the exported file. In Explore, these image and PDF options are available from the **Export All Data** submenu, and also from the **Export current view** submenu when the chart type supports current-view export.
-
-These menu items respect your permissions: the dashboard export menu only appears if you can download, and the image/PDF options are disabled if you lack image-export permission.
-
 ### Sharing a Specific Tab
 
 When a dashboard has tabs, each tab gets its own shareable URL. Navigate to the tab you want to share and copy the URL from your browser's address bar — the tab anchor is encoded in the URL so that anyone opening the link lands directly on that tab.

docs/docs/using-superset/embedding.mdx

@@ -88,21 +88,6 @@ embedDashboard({
 
 If the callback returns `null` or is not provided, Superset uses its own permalink URL as a fallback.
 
-### Permalink origin rewriting
-
-This rewrite only applies to the non-embedded permalink path — it has no effect on embedded dashboards. When Superset is not embedded, it rewrites the origin of any permalink URL it generates to `window.location.origin` before showing it to the user, which keeps a proxied or subdirectory-deployed Superset from handing out a permalink that points at an internal hostname the user's browser can't reach.
-
-When Superset **is** embedded, this rewrite is skipped entirely regardless of the flag below: a `resolvePermalinkUrl` callback's return value is used as-is, and if no callback is provided (or it fails), the backend-supplied URL is also returned as-is.
-
-If your reverse proxy correctly forwards `X-Forwarded-Host` and you'd rather non-embedded permalinks carry the backend's literal origin, opt out of the rewrite with `EMBEDDED_DISABLE_PERMALINK_ORIGIN_REWRITE`:
-
-```python
-# superset_config.py
-EMBEDDED_DISABLE_PERMALINK_ORIGIN_REWRITE = True
-```
-
-This defaults to `False` (rewrite enabled) and only affects non-embedded permalinks. Flipping the default would regress the common proxied/subdirectory deployment by exposing an unreachable internal host in copied permalinks.
-
 ---
 
 ## Feature Flags for Embedded Mode

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

@@ -248,12 +248,11 @@ Ask your admin for the MCP server URL and any authentication tokens you need.
 
 ### Datasets
 
-| Tool                     | Description                                                                                                                  |
-| ------------------------ | ---------------------------------------------------------------------------------------------------------------------------- |
-| `list_datasets`          | List datasets with filtering and search                                                                                      |
-| `get_dataset_info`       | Get dataset metadata (columns, metrics, schema details)                                                                      |
-| `create_virtual_dataset` | Create a virtual dataset from a SQL query                                                                                    |
-| `update_dataset_metric`  | Update a saved metric's expression, name, verbose_name, or format (affects every chart using it; requires dataset ownership) |
+| Tool                     | Description                                      |
+| ------------------------ | ------------------------------------------------ |
+| `list_datasets`          | List datasets with filtering and search          |
+| `get_dataset_info`       | Get dataset metadata (columns, metrics, filters) |
+| `create_virtual_dataset` | Create a virtual dataset from a SQL query        |
 
 ### Charts
 

docs/docs/using-superset/version-history.mdx

@@ -15,29 +15,29 @@ description of what changed — "Chart renamed to Q3 Revenue", "Added filter on
 'Region'" — rather than a raw diff. You can search the history and filter it
 down to changes on the entity itself or on the things it depends on.
 
-## Enabling and disabling it
+## Enabling it
+
+Two switches are involved, and both matter.
 
 | Setting | Type | Effect |
 | --- | --- | --- |
 | `VERSION_HISTORY` | Feature flag | Shows the version history UI |
 | `ENABLE_VERSIONING_CAPTURE` | Config value | Records versions as entities are saved |
 
-Both default to on. To turn the feature off:
-
 ```python
 # superset_config.py
-FEATURE_FLAGS = {"VERSION_HISTORY": False}
-ENABLE_VERSIONING_CAPTURE = False
+FEATURE_FLAGS = {"VERSION_HISTORY": True}
+ENABLE_VERSIONING_CAPTURE = True
 ```
 
-Restart Superset and its workers for the capture change to take effect. Existing
-history remains readable while capture is off, but **Restore** is unavailable
-(404).
+Both default to off. They are separate because capture is the expensive half:
+an operator may want to start recording history before exposing the UI, so that
+there is something to show when they do.
 
-Disable them together: capture off with the UI left on gives a panel that
-stops filling — an empty or stale history misrepresents the entity as
-unchanged. History only accrues while capture is on; edits made while it was
-off are not reconstructed.
+Turning the UI on without capture gives a panel that reports "No history yet"
+and never fills, so enable capture first — or at the same time. History only
+accrues from the moment capture is switched on; earlier edits are not
+reconstructed.
 
 ## Viewing history
 

docs/package.json

@@ -58,11 +58,11 @@
     "@fontsource/inter": "^5.3.0",
     "@mdx-js/react": "^3.1.1",
     "@saucelabs/theme-github-codeblock": "^0.3.0",
-    "@storybook/addon-docs": "^10.5.10",
+    "@storybook/addon-docs": "^10.5.9",
     "@superset-ui/core": "^0.20.4",
-    "@swc/core": "^1.16.1",
+    "@swc/core": "^1.16.0",
     "antd": "^6.6.1",
-    "baseline-browser-mapping": "^2.11.16",
+    "baseline-browser-mapping": "^2.11.15",
     "caniuse-lite": "^1.0.30001809",
     "docusaurus-plugin-openapi-docs": "^5.2.0",
     "docusaurus-theme-openapi-docs": "^5.2.0",
@@ -77,8 +77,8 @@
     "react-table": "^7.8.0",
     "remark-import-partial": "^0.0.2",
     "reselect": "^5.2.0",
-    "storybook": "^10.5.10",
-    "swagger-ui-react": "^5.32.14",
+    "storybook": "^10.5.9",
+    "swagger-ui-react": "^5.32.13",
     "swc-loader": "^0.2.7",
     "tinycolor2": "^1.4.2",
     "unist-util-visit": "^5.1.0"
@@ -94,7 +94,7 @@
     "eslint": "^9.39.2",
     "eslint-plugin-react": "^7.37.5",
     "globals": "^17.11.0",
-    "oxfmt": "^0.64.0",
+    "oxfmt": "^0.63.0",
     "typescript": "~6.0.3",
     "typescript-eslint": "^8.67.0",
     "webpack": "^5.109.2"

docs/static/feature-flags.json

@@ -93,6 +93,12 @@
         "lifecycle": "development",
         "description": "Enable semantic layers and show semantic views alongside datasets"
       },
+      {
+        "name": "SOFT_DELETE",
+        "default": true,
+        "lifecycle": "development",
+        "description": "Temporary rollout / kill-switch gate for soft delete (off = legacy hard delete). An emergency stop, not a clean rollback: flipping ON->OFF resurrects already-soft-deleted rows. Retained through this release as the move-back lever; removed (along with its two gate points \u2014 BaseDAO.delete routing and the do_orm_execute visibility listener) once post-flip confidence is established."
+      },
       {
         "name": "TABLE_V2_TIME_COMPARISON_ENABLED",
         "default": false,
@@ -104,6 +110,12 @@
         "default": false,
         "lifecycle": "development",
         "description": "Enables the tagging system for organizing assets"
+      },
+      {
+        "name": "VERSION_HISTORY",
+        "default": true,
+        "lifecycle": "development",
+        "description": "Enables the version history panel on Explore and Dashboard pages. History only accrues while ``ENABLE_VERSIONING_CAPTURE`` is also on; with capture off the panel renders but stays empty, so the two ship with matching defaults and should be changed together."
       }
     ],
     "testing": [
@@ -120,12 +132,6 @@
         "lifecycle": "testing",
         "description": "Enables filter functionality in Alerts and Reports"
       },
-      {
-        "name": "ALERT_REPORTS_RETRY",
-        "default": false,
-        "lifecycle": "testing",
-        "description": "Enables automatic retry functionality for failed report executions"
-      },
       {
         "name": "ALERT_REPORT_SLACK_V2",
         "default": true,
@@ -227,12 +233,6 @@
         "lifecycle": "testing",
         "description": "Apply RLS rules to SQL Lab queries. Requires query parsing/manipulation. May break queries or allow RLS bypass. Use with care!"
       },
-      {
-        "name": "SOFT_DELETE",
-        "default": true,
-        "lifecycle": "testing",
-        "description": "Temporary rollout / kill-switch gate for soft delete (off = legacy hard delete). An emergency stop, not a clean rollback: flipping ON->OFF resurrects already-soft-deleted rows. Retained through this release as the move-back lever; removed (along with its two gate points \u2014 BaseDAO.delete routing and the do_orm_execute visibility listener) once post-flip confidence is established."
-      },
       {
         "name": "SSH_TUNNELING",
         "default": false,
@@ -245,12 +245,6 @@
         "default": false,
         "lifecycle": "testing",
         "description": "Use analogous colors in charts"
-      },
-      {
-        "name": "VERSION_HISTORY",
-        "default": true,
-        "lifecycle": "testing",
-        "description": "Enables the version history panel on Explore and Dashboard pages. History only accrues while ``ENABLE_VERSIONING_CAPTURE`` is also on; with capture off the panel renders empty or stale history, so the two ship with matching defaults and should be changed together."
       }
     ],
     "stable": [

docs/yarn.lock

@@ -2145,10 +2145,10 @@
     utility-types "^3.10.0"
     webpack "^5.88.1"
 
-"@emnapi/core@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.11.0.tgz#8a655042dbbb10d0266670c9903c34a7001c705b"
-  integrity sha512-l9Oo58x0HOP5znGzVhYW9U3e5wVuA4LAZU2AGezTmkhO1CgQRFDhDg4nneHsu/t3WniXg9QrG2nIXL/ZS8ln8Q==
+"@emnapi/core@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.11.1.tgz#b9e1064f3a6b1631e241e638eb48d736bfd372a6"
+  integrity sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==
   dependencies:
     "@emnapi/wasi-threads" "1.2.2"
     tslib "^2.4.0"
@@ -2169,10 +2169,10 @@
     "@emnapi/wasi-threads" "1.2.2"
     tslib "^2.4.0"
 
-"@emnapi/runtime@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.11.0.tgz#ce16b3674ff7266bbf50f9668bde8a04f3014d4e"
-  integrity sha512-55coeOFKHv1ywEcUXJtWU5f+Jr/W5tZDvZig8DLKSwUN1JpROQ4rk/SNOQiFWmaR/VKF4zuFyW1B8JduOSv6Pg==
+"@emnapi/runtime@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.11.1.tgz#58f1f3d5d81a9b12f793ab688c96371901027c24"
+  integrity sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==
   dependencies:
     tslib "^2.4.0"
 
@@ -2934,20 +2934,13 @@
     "@emnapi/runtime" "^1.5.0"
     "@tybys/wasm-util" "^0.10.1"
 
-"@napi-rs/wasm-runtime@^1.1.4":
+"@napi-rs/wasm-runtime@^1.1.4", "@napi-rs/wasm-runtime@^1.1.6":
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz#ed33806d0f9be98dc76d0c3d4fd872fda701b5d5"
   integrity sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==
   dependencies:
     "@tybys/wasm-util" "^0.10.3"
 
-"@napi-rs/wasm-runtime@^1.1.5":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-1.2.3.tgz#97e3d45d7424dc5da1d4e32f3bf3b292f6c1b44c"
-  integrity sha512-UMduMbqO5s5zF2NkNacMT/yK5Y5QiKvWr2+50bzIIxFDwVJ2h49b+oyjaCGPhJxd2/gC2x39EHv/gHVuu36x2Q==
-  dependencies:
-    "@tybys/wasm-util" "^0.10.3"
-
 "@noble/hashes@1.4.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.4.0.tgz#45814aa329f30e4fe0ba49426f49dfccdd066426"
@@ -3083,199 +3076,199 @@
   resolved "https://registry.yarnpkg.com/@oxc-project/types/-/types-0.127.0.tgz#8374fcdfb4a641861218daa5700c447c00b66663"
   integrity sha512-aIYXQBo4lCbO4z0R3FHeucQHpF46l2LbMdxRvqvuRuW2OxdnSkcng5B8+K12spgLDj93rtN3+J2Vac/TIO+ciQ==
 
-"@oxc-resolver/binding-android-arm-eabi@11.21.2":
-  version "11.21.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-android-arm-eabi/-/binding-android-arm-eabi-11.21.2.tgz#ef832062e3a2f0c7604a8312c34eacf23a7bd7e3"
-  integrity sha512-xQoCRv+gKax9KTdwdaQNnAFOai8neay7g3jExDIORzhbrejwGSJaZNTdOJHR5ziLg2joMxOCMOFMo4zuxza2uQ==
+"@oxc-resolver/binding-android-arm-eabi@11.23.0":
+  version "11.23.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-android-arm-eabi/-/binding-android-arm-eabi-11.23.0.tgz#31b3087c2c8a9d100ae22aced377c03befc87efa"
+  integrity sha512-8IJyWRLVAyhTfe9/TIEbQqSQnl5rUqYJrUOS6Dkr+Mq9FGHMxDGeiEmwkBqCvDP5KckpPh/GYSgbag66O6JsCw==
 
-"@oxc-resolver/binding-android-arm64@11.21.2":
-  version "11.21.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-android-arm64/-/binding-android-arm64-11.21.2.tgz#be6093b76621981c57833172a7fa9b5b0753daef"
-  integrity sha512-HF5oiE2L05yInPYCFD/4uxSrEZW4SuIfn99Y6L1xnJnzl066JR+MJs2rIdstw8A2MPlAKH+13dpFPNycjqzvGg==
+"@oxc-resolver/binding-android-arm64@11.23.0":
+  version "11.23.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-android-arm64/-/binding-android-arm64-11.23.0.tgz#744d8c82d37189ddb76f911b6fbd9915d8090a9b"
+  integrity sha512-pprVojnNhHxupwTT2gdeUlkxll6XEvWWBk3oVicOSNVWQC99OBnDhMQDoirqnzrE1bScQSMS2JgPpqdlrhz/Fg==
 
-"@oxc-resolver/binding-darwin-arm64@11.21.2":
-  version "11.21.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-11.21.2.tgz#b5ec0b6774ef9c60bb3e9237b39b603aac39f75f"
-  integrity sha512-UX4u49CVCAD8QZNELaW8eMGgMAGwFWYEPbvNsh+3r/gs4NX3KfpiACMVwRQT0EuH3uat9hM5Zl+Ppm9pJD8tgg==
+"@oxc-resolver/binding-darwin-arm64@11.23.0":
+  version "11.23.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-11.23.0.tgz#a57f71c22d3d39da3ce08fbd672a25673ad38364"
+  integrity sha512-mbIrWIMAJeytyee36OyUP5XH92TP7FaKaQ2m5AjokKy7STgjrhRt7SMXqpqLjhGm6Xn721Xmsg6H3Rtd9YQETw==
 
-"@oxc-resolver/binding-darwin-x64@11.21.2":
-  version "11.21.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-11.21.2.tgz#79dbeeca048fda1de9c71169b08924535369a14d"
-  integrity sha512-J9xPx7YBkrRmJ+xl561ztnMWEc1aOyjEIxBiGX1dVb3u7bGSnfObfcZk+Pd+uM0HZAPNsQ1xvD8j52A/uOSqNQ==
+"@oxc-resolver/binding-darwin-x64@11.23.0":
+  version "11.23.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-11.23.0.tgz#ca28168b5aca8003c2a114731ffc556f04ac40e4"
+  integrity sha512-UnIphmZ1LazUCr9DXWaKYWtKDefPMbgLsywaoYxRqVCNHhq4MM6d2q1Nz1i9Vzxt5i+cE2nRUYpAUHr/lijNYA==
 
-"@oxc-resolver/binding-freebsd-x64@11.21.2":
-  version "11.21.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-11.21.2.tgz#8d49e6cb2269597b6ef0bc90c5b23e68d946f8c3"
-  integrity sha512-fRlt7OvSaQkWj6+EDTVxawVxOlqJB2QSnBfkeCyK4RTvsGctbw3BiH2Tb7DzMs7bikc4BRBpvWP5zF9K8b54Zg==
+"@oxc-resolver/binding-freebsd-x64@11.23.0":
+  version "11.23.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-11.23.0.tgz#b956c5b3eda65e1302e291c185d7fca10fbfd7fb"
+  integrity sha512-aaZ/cSEYFkSxgS2hOrobT6RQcsWNviOX8dW6CEkVx2/UYkAf9MeHbjl3W0usWV53rVV//ndBdn2nb1y7jsu4lw==
 
-"@oxc-resolver/binding-linux-arm-gnueabihf@11.21.2":
-  version "11.21.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-11.21.2.tgz#84413d558915ecf81da5914336b9fe9a70a84acd"
-  integrity sha512-gK+vPUcPQITkGwBKpZGrcDHSlU6eDGl7AQacxS2CEKAZIBHWkOVFeJwLZ4tYnA1acJqRM5lt7yYwPCVqGHIJ7A==
+"@oxc-resolver/binding-linux-arm-gnueabihf@11.23.0":
+  version "11.23.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-11.23.0.tgz#f59878badc556b023a12980f8fd4ca363f8065e2"
+  integrity sha512-IoJLvO5SjLSVMaq83BNTrPCb1FppvoJc1IhZ5CoUVl3PykUBku7D+LK1j0GSurhJcIc6zfjghsvaZNpq5ev6Mg==
 
-"@oxc-resolver/binding-linux-arm-musleabihf@11.21.2":
-  version "11.21.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-11.21.2.tgz#af2554d8984592926ec92fd838bd01e3e14f2f53"
-  integrity sha512-L/Rgas7SrOKy/z7IH+HxSFRqVO4PuLDKLEGKvnhoCBBq3UJ0YzGBou3qMzaAGgkJwsIvX2pBF+7ojzfUhLiZxQ==
+"@oxc-resolver/binding-linux-arm-musleabihf@11.23.0":
+  version "11.23.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-11.23.0.tgz#19e4cd124f6fb0f17c2693525422be493edabf39"
+  integrity sha512-vskFpwg44T/LFsfjSCnVZ5ygcuqzPC1yUzVEiKa8BgHAQz0+QLQQW3EGWLPVi8EXFghzjR4EtgPBtOhCjU4jdw==
 
-"@oxc-resolver/binding-linux-arm64-gnu@11.21.2":
-  version "11.21.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-11.21.2.tgz#453a2e5d1d858d7e5bff0ddde584ec46560a37b6"
-  integrity sha512-CUEYvlX1Fk7E9kUMzuswru1J9HLxMwnpDeQGjQuI4ZH+iNCoa2X9T+pvyzrbsgl7WnIeTFTlNlHsRfVdf5g9/g==
+"@oxc-resolver/binding-linux-arm64-gnu@11.23.0":
+  version "11.23.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-11.23.0.tgz#770c64d6f976c6374de3314942616b6c8f2afb05"
+  integrity sha512-//TcHVhrChyw5RYtgts6WO7KcWq9387c1Z5Zvhqpk/ktAbyaRYgBZrpSY1GDCFq50ASt6B6jhh+JxB1rB45IAg==
 
-"@oxc-resolver/binding-linux-arm64-musl@11.21.2":
-  version "11.21.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-11.21.2.tgz#4e04fb8d43aa3baa037f88a292b0eee386dfd742"
-  integrity sha512-ViN1ZibQyxwC67GpoP33oo+S9UyUnkog13vzQb9+v9bCNvrVzJuk0MRdacjtv/9xfRMVF/eqHFyl8YOeykI10Q==
+"@oxc-resolver/binding-linux-arm64-musl@11.23.0":
+  version "11.23.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-11.23.0.tgz#88640f695e6ca9f71641b59f2996d5bb3eaaea42"
+  integrity sha512-ZFqlwiTf7CXLLSGyAR9tYiO33LiaeIEXW+xm42d8mnUGpDgPltyrCGYtQezyMMEXvjhOgCz1X+i7sbDTJEx+bg==
 
-"@oxc-resolver/binding-linux-ppc64-gnu@11.21.2":
-  version "11.21.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-11.21.2.tgz#662de504b88a9d7c745808514bfdb2a4e9f53760"
-  integrity sha512-CU1sCqWnhGqYD5I1HedHk5pujrn7ssDkNB/AEQd/pd3D/EojVSgJUlpbafwIbyhia3PgIfkvdFpRPWSALzVumA==
+"@oxc-resolver/binding-linux-ppc64-gnu@11.23.0":
+  version "11.23.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-11.23.0.tgz#7c2a0c45ab65354b89f8777c806fcfebe09f12e8"
+  integrity sha512-oZ5LeN5+H1R19dRjTAxKrxQguH+AsemHcnthEfFxf4OjmBSty2doHLeSmMunKy3zpTHJQ3lh3Af+dNS+W6dYeA==
 
-"@oxc-resolver/binding-linux-riscv64-gnu@11.21.2":
-  version "11.21.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-11.21.2.tgz#72e7d1edb906d42a2ad339a3a6be5b097c00a0a0"
-  integrity sha512-jWVyZtIHca4Gb96x7dag+y69vlei7ffjrsveLkmf2ZhqEAz6ZSBnY1GWvgZUaZlwZP62A3xD092BW97Q5VGc+g==
+"@oxc-resolver/binding-linux-riscv64-gnu@11.23.0":
+  version "11.23.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-11.23.0.tgz#fb502eb40ca7576d826672ba9f6c6ba9bb87094d"
+  integrity sha512-O4ciFDyX5ebQd0qkb1bjAIg8IEfiLT03GbSeylwlwlUMK9KwBWaALwrxSbc0Msaz4U6iPj+T9eRXpD5mxBfmvA==
 
-"@oxc-resolver/binding-linux-riscv64-musl@11.21.2":
-  version "11.21.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-11.21.2.tgz#cf5788f4dd858ae6a27d1252b0b662b39a4bbf2d"
-  integrity sha512-LF29obFqNgBUgDX7rmUK7M4D0JQG5LxhYzn3xXmECcHU9aQAdWG7NiY052qybtesEdwHQXKNTWYQ7mTsybNvWg==
+"@oxc-resolver/binding-linux-riscv64-musl@11.23.0":
+  version "11.23.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-11.23.0.tgz#2159fe2807e1356d9149a151d06cd9a0c7253224"
+  integrity sha512-P3o8Y9kISYjcxadmbO+94ThRwLhwGuDAbA7dcdd4+YLpfeF+mmobz8fXf4NmSdfSqjyRSkceJDBRZha9NVYkiQ==
 
-"@oxc-resolver/binding-linux-s390x-gnu@11.21.2":
-  version "11.21.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-11.21.2.tgz#ec3933ccb443b68eb9b879b7f25489fcde11cc53"
-  integrity sha512-+NYcm+cCHBbtdQQ3A4phQTSuVRYnNHz7wrl9XRAPEovcdoqi0mb1K5ZOl+jN54ZD+q1zz3V0vltbFJmzecJKmw==
+"@oxc-resolver/binding-linux-s390x-gnu@11.23.0":
+  version "11.23.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-11.23.0.tgz#1fb7c19af499a5701d53f2aa38e841f153d7cf86"
+  integrity sha512-oj03m1E3RmTFczKhcKJDzHaEDKJnPIsDcQFVxBJsSdXGSuIPdt5TvcM332FfMQgzI6yDJqyl4InrnFfXrmUTKQ==
 
-"@oxc-resolver/binding-linux-x64-gnu@11.21.2":
-  version "11.21.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-11.21.2.tgz#9cb87e203ef40631d7ff2cd1a8a6c145a5595054"
-  integrity sha512-UQqZDdG2r2HhAOsZEgufkIWHPQ886IUyuJQkoZByvzhW8j51R4UNzGBJFkTiTnLhQnggwJRdJgFWK4uY6ZVIMw==
+"@oxc-resolver/binding-linux-x64-gnu@11.23.0":
+  version "11.23.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-11.23.0.tgz#580644712d78ebe1c1d4b7077db992ce149d46e8"
+  integrity sha512-BqJxbSC8FdP7mSuSpRePTGHm0hXWV+dfz//f7SjsteZncLaBgWTBmi/OZNv7sX6CyG/Pt/eJkPorP+DkMOhMwQ==
 
-"@oxc-resolver/binding-linux-x64-musl@11.21.2":
-  version "11.21.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-11.21.2.tgz#a1ebb07307eccb2b150dc6bcac5a575cf3b647bc"
-  integrity sha512-3Q9PMRjalWkT6NZ4jfujuqTCFwoWErg3y3BnOgb544B8IMw4PktiwWOigMfOHNRLMghZeJ7hpfpZf4CP7rV7Og==
+"@oxc-resolver/binding-linux-x64-musl@11.23.0":
+  version "11.23.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-11.23.0.tgz#709b86ff4c0a43bfeb4d7e5cc7334ee77780c5ae"
+  integrity sha512-utmw+VmUrW4K8LI5/6jhg4aGYKJHOIjQ9syYOOA6pF3w7haKu4r4enTe2U0C04/HbUvkq/Zif43xFsKW1Pnq9w==
 
-"@oxc-resolver/binding-openharmony-arm64@11.21.2":
-  version "11.21.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-openharmony-arm64/-/binding-openharmony-arm64-11.21.2.tgz#aba2e14c823e3356acfb8bce06be97d5aa5fcab8"
-  integrity sha512-Eljeq3ndtyKhM+Es8LITi4Zl2htzuRZcrPMF3kMCsrILztvU6AjZ3FuEhHHKobPUB9rMpzLpJP5bDqXI7r+iog==
+"@oxc-resolver/binding-openharmony-arm64@11.23.0":
+  version "11.23.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-openharmony-arm64/-/binding-openharmony-arm64-11.23.0.tgz#580331f88fbdbc7b518a93e2ab43a7692e24f7f4"
+  integrity sha512-V6lbRrthHa4TbvsLjPtg+EkXT1tRY+s4I8rYLXUfiHlZzGx3sLv1EH9CEOOevjvUYHLsbe/gqCIc73XnQfPb9A==
 
-"@oxc-resolver/binding-wasm32-wasi@11.21.2":
-  version "11.21.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-11.21.2.tgz#8840346c1b8a3028b1b3575abb2e45fed529d3d6"
-  integrity sha512-HGDbNsIywqc4LxU38+CTJNnB/6BF7rheWOJ259b4eE0aEnelYblC8x+1tEd63bp31fYne63RQz9Jb4yVnC7Yig==
+"@oxc-resolver/binding-wasm32-wasi@11.23.0":
+  version "11.23.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-11.23.0.tgz#4d5f1300d1a4ef18b933329ad7c6b395bac28580"
+  integrity sha512-gRoOxQPdnAmIAjxcuQNBxfihvx+wjTaQM/9/eP12xwnGNawOG/+Zz9RHN4WNSxT45b5CrscK4NB8aPh+oZQXAQ==
   dependencies:
-    "@emnapi/core" "1.11.0"
-    "@emnapi/runtime" "1.11.0"
-    "@napi-rs/wasm-runtime" "^1.1.5"
+    "@emnapi/core" "1.11.1"
+    "@emnapi/runtime" "1.11.1"
+    "@napi-rs/wasm-runtime" "^1.1.6"
 
-"@oxc-resolver/binding-win32-arm64-msvc@11.21.2":
-  version "11.21.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-11.21.2.tgz#c987ab635ffe553e6230255a07c0576686f5ab45"
-  integrity sha512-iWx25CBEgH49iE9q5coEGI/jb1jl5kkCY9z6U5Og67xCkQ/WFMDc2J5U78+AE91SUxM2NqSLhJC8/PLfWnImww==
+"@oxc-resolver/binding-win32-arm64-msvc@11.23.0":
+  version "11.23.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-11.23.0.tgz#87145652fdf60741d07b893150d61fa06e2a1d15"
+  integrity sha512-CgTGMYsJVe1eUiCdJTpGw21svXw79ITsemN1h0hcNkiswasDbN5MoibSLY+gRMWP5syfEz5iffrjZnwEP8xeUA==
 
-"@oxc-resolver/binding-win32-x64-msvc@11.21.2":
-  version "11.21.2"
-  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-11.21.2.tgz#dbdf12721396ef4c31899d0963b002df32f57050"
-  integrity sha512-VPoCAhKvCQTlG7vxqaBXcmuvbh77BfnGXj8g0pbvVXpm1F/R8rDVwqIWcEbMzrI1JvJlm8v7T9uMVQb6UctMRg==
+"@oxc-resolver/binding-win32-x64-msvc@11.23.0":
+  version "11.23.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-11.23.0.tgz#8b66dbfa7b796139e719063fc0e44084e80a1c15"
+  integrity sha512-gUGJpr+Rn6zMxm5juApV0K3U845i8t47o8k+rbO0BHbi4PoJIfSPeQmrE2dgohQm2g5k6iviNFyXCGqvmaYUpw==
 
-"@oxfmt/binding-android-arm-eabi@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-android-arm-eabi/-/binding-android-arm-eabi-0.64.0.tgz#e14e25c032f6d8a6b025eb5ee7bb606c3cbdd10e"
-  integrity sha512-o6uzh/jTOQeAY5TdkAeXdqv7MBRcPxiRA08zrcBtkKj5cSu/FMu0Hl7Q6Fi1KCKyCWZ6lJVjBzdsJvsKltUsGQ==
+"@oxfmt/binding-android-arm-eabi@0.63.0":
+  version "0.63.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-android-arm-eabi/-/binding-android-arm-eabi-0.63.0.tgz#136176dc94fdc41e21415cc770d86f5066282e0f"
+  integrity sha512-YmRth4ZPGgEXcgmkhvANbC9uD67dxmSobW7DQuyt5tOBOKvPnIpk5SVHBj88E+7wMNRI2FhqaDbOhQFBix+b8A==
 
-"@oxfmt/binding-android-arm64@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-android-arm64/-/binding-android-arm64-0.64.0.tgz#294a15b8402eedde0e0a467748e3efadf61bf523"
-  integrity sha512-jRGSUeeP7p3Gynw2YaCVtjBIA6ZxY6bEB/ES5i54OhqmRTyuVg7ZgstEtzgq6GOAJd+2QZ5pvf+bFfmW5Mp9cw==
+"@oxfmt/binding-android-arm64@0.63.0":
+  version "0.63.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-android-arm64/-/binding-android-arm64-0.63.0.tgz#10bc42457179210061c801122a64304619e3bdab"
+  integrity sha512-icbahX8X2X3sRamOMecvdYeZXWjPDazRDIfvWfy7Ca1nc/ZDT2Y9k5Nt7s46EqFd7NQPdgk+CM3/SgIT5LPCaQ==
 
-"@oxfmt/binding-darwin-arm64@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-darwin-arm64/-/binding-darwin-arm64-0.64.0.tgz#d55b1a5d5d97d4ccde8e4be7b63e06e4e56f2d13"
-  integrity sha512-JINwtU2lW7nOFSqi+H2qplipNUqah9Gc1jgGmB82kTD4UnZrZIVxCJ9qEmFiKfjNq27gYLFhrUb0to86aCwMjw==
+"@oxfmt/binding-darwin-arm64@0.63.0":
+  version "0.63.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-darwin-arm64/-/binding-darwin-arm64-0.63.0.tgz#5f9084d9a760a1836387f8970a7f9d614ec3d909"
+  integrity sha512-WV+Ze5v5gI2qoj8jpAovt8KBTW8pjEz/AiMXXjeTQS+Bmf/MmZXTS40S8xNPDszX+W8WDv2Bbk6qKrMTtUGu1A==
 
-"@oxfmt/binding-darwin-x64@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-darwin-x64/-/binding-darwin-x64-0.64.0.tgz#1c9673270ed597ba9456d40fa0607d50e81158ea"
-  integrity sha512-gCmuswrgrOSajV4HCRFkVCGIruPq8bjYuPYgSE2WQB3mD6XrdyZ3JMSRZCkQ8zCxOyGWriBo6QoZ5nmMHQ1BfA==
+"@oxfmt/binding-darwin-x64@0.63.0":
+  version "0.63.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-darwin-x64/-/binding-darwin-x64-0.63.0.tgz#badd4a02218a9a62319817d5c337b30159a54a21"
+  integrity sha512-CJGSBdDxXOWIpoFXHpverimCvz084KA7L483rqJ44c3jDtzv6d4qOSoR/V9ywSHfV+Ks1lwIj2P49BFhunLNAA==
 
-"@oxfmt/binding-freebsd-x64@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-freebsd-x64/-/binding-freebsd-x64-0.64.0.tgz#9e8f8b3a5a558043c664d43d54e441756af30c56"
-  integrity sha512-Ab8g7a38pT0MMImjh7anRSTve6buWBIlcXIFBYa5xl4s6UxEgKSc2xOOhbGtLwvXnEi2PsEDGoJh3oUU7xkehQ==
+"@oxfmt/binding-freebsd-x64@0.63.0":
+  version "0.63.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-freebsd-x64/-/binding-freebsd-x64-0.63.0.tgz#a17261e95c8ebef1f76d8aaac746a64fdb6ba51e"
+  integrity sha512-BDfKY+KhL2078cgswBBFQPAYuxCy93bS/iC5frdSeSbTLcGrR6VC2hsuPTanoJmg84+wSyWl0wWC1eR+uTnkRg==
 
-"@oxfmt/binding-linux-arm-gnueabihf@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-0.64.0.tgz#cfe552538c9e9402ca64d7b83b1ccf02457ef391"
-  integrity sha512-BgvS3CoQ+Xy2deoZqEN8JVKabcCZi2RxA3yant8G9OAv9KuPJ9TCjHkqigzdHUVwErZxEP5d2bzLIEyKYyBDLg==
+"@oxfmt/binding-linux-arm-gnueabihf@0.63.0":
+  version "0.63.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-0.63.0.tgz#baeee34bb08e0769af878623f442e83bc0aacd7a"
+  integrity sha512-Ov1cQEXT4mj7cojAokWSS1eoxkoyvbDfAbxNsGIKY2o36kvdAaFzPxRN6NxFRk9fD72B8oCoTTX/NuYTUWlpsg==
 
-"@oxfmt/binding-linux-arm-musleabihf@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-0.64.0.tgz#1944e367da59e8b1770c5ba96465d0c7e640053e"
-  integrity sha512-QXpNxwoMj0YvnceCNZadNSden3bIcnvjn/sDp/rwZhRoZoZYGpHvtPyhGsdJz9uvT9GkaMW7SsLddurU56dt8w==
+"@oxfmt/binding-linux-arm-musleabihf@0.63.0":
+  version "0.63.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-0.63.0.tgz#e70d5697ec4b6bb5f87a3f019e01b3f956b8e44b"
+  integrity sha512-0LE7ro3+6L79jcMANycAZfRaC7zxr9YZ2+vEL5uMD9QlEep+rS/r1kSJsnuLl991NXJZD60euh0PC1GHrR20vw==
 
-"@oxfmt/binding-linux-arm64-gnu@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.64.0.tgz#510386113bf6a128cf3106d612471dbd1a13b0f4"
-  integrity sha512-BBgH3I1ppDsI5pZ4Pdhw0ceYxwVCfbU/bZEBCeZ6caRS9x0ZabErxubP7riGUn11PXZBhe8DYdjkDKP1FlVQ5w==
+"@oxfmt/binding-linux-arm64-gnu@0.63.0":
+  version "0.63.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.63.0.tgz#638a8ed4f3d256c50aeb6d2c19cfc65792c902e1"
+  integrity sha512-izPk+2Z4gjuZK32Fqh5qXoMpT/2NXzLh++ob57HiEiVSQZ1iYXu8EKMzb+K5AvWyIEXhdDIt7ADjGGtFhkT9Bw==
 
-"@oxfmt/binding-linux-arm64-musl@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.64.0.tgz#7235405901cb0368b659eb42b362a817fc3330a3"
-  integrity sha512-v19HSjC/BGXdt26qEvKZtwAHgGmQ2Agcap2kQP+KIqoRZqivVzYth3ui2dJA1i+6/fjpjga85lIOaJJjQ/bOOw==
+"@oxfmt/binding-linux-arm64-musl@0.63.0":
+  version "0.63.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.63.0.tgz#af5a9b787f5233f27a3360ad56235fc1b011f760"
+  integrity sha512-alPmbOuWXFXiSo+lOtv6X71C7SYMEDW2WVvywOvf9BwKgEhSNGhMTLeFVSjKUMCamcjbbgVdsWF8GN1uy8xshg==
 
-"@oxfmt/binding-linux-ppc64-gnu@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-0.64.0.tgz#1f0563c530dfa634682ffa32d16830404b95a8c6"
-  integrity sha512-PElLnOo4xFTBZrxPhgTIj0eHqZXwEBQoNWtb7facUV170T0B0FRET0iNbb3LUeLWTybkUW+vsdyv4ihOdyXGyw==
+"@oxfmt/binding-linux-ppc64-gnu@0.63.0":
+  version "0.63.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-0.63.0.tgz#c1a211206134a5577e355a495989e0d733218d60"
+  integrity sha512-BdzCPvolJc4AWZ+YMzgUDJcDzbQWrFjYuqBHoNHNqP1aCaluQRJNs4k3vNU5IG7vTpjf9zeD73D7MFM1TecZpg==
 
-"@oxfmt/binding-linux-riscv64-gnu@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-0.64.0.tgz#36f55e955c5b38b587470f181146c9a11cf8bdb1"
-  integrity sha512-Qzsg15n4F5CH+MorcRW4MkAEMiLzXmeG+DiDSbP/bBTqCmWOH3K9DHryNrve+JHlV0txS+B6Z9P5Xz+cmWeL+g==
+"@oxfmt/binding-linux-riscv64-gnu@0.63.0":
+  version "0.63.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-0.63.0.tgz#4863f0311e5c1b88f75ef822959b3ca4fd938937"
+  integrity sha512-7sIgfLzqtNKSkMGsGVyRpHwpjNezRg2XONvUOheFZs95TSZpM0JAuPpA8KrQFsWc4wPU95roX2O69JgH8igOgw==
 
-"@oxfmt/binding-linux-riscv64-musl@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-0.64.0.tgz#bb9c6c3860c8832fe271623eb6131ea5f5e094cd"
-  integrity sha512-/GZ358wnQ/Ez4UVnCcZIi56JkY0sOdZ+B108pqXKqZz3jLS59F4KEAB1Qv3fRlObrFEk+3L2vUQ/xoPx+3vjXw==
+"@oxfmt/binding-linux-riscv64-musl@0.63.0":
+  version "0.63.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-0.63.0.tgz#ad05a017d12553e2f544743c4940adb552aa1d1c"
+  integrity sha512-9Tcg0y0WcVa6Mm9AgcgFMseDS+VkFJZpKZ8We9SpDY4gg5jewSwln+0sO04QLcTS1BtfDl9MwR+NfID8L7PUTg==
 
-"@oxfmt/binding-linux-s390x-gnu@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-0.64.0.tgz#7d736d923f3c7f88743f26479a49903c6dbaf818"
-  integrity sha512-/C9We3DXegowfLXtVCYHeNiU9azwCDr5cQkEtCVlc74vyn+lLQSPApJ1CZmxAduqeq/Oi3gQ+IVptyhCaTMtkQ==
+"@oxfmt/binding-linux-s390x-gnu@0.63.0":
+  version "0.63.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-0.63.0.tgz#2803f539db15bc66db115888fa8f84d6531ed2b9"
+  integrity sha512-qWKC1pEOpx1qYhXaugPhHUeXwSfqEOk2wJH2LqVXGPV5iQYfdAZdt+d2XDiX4DTSWA2QDMUcFB+wEORh3Xn/sA==
 
-"@oxfmt/binding-linux-x64-gnu@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.64.0.tgz#34dfe2bde9ed124324b45aae078618456e850452"
-  integrity sha512-91KM2CeRWscIEHlj1NsW2WSnzGeq1Ehq+39bfDowTdkn+fcvK/x4Y1RcyqT7glyBjZio0ldkeCG6Usj3v7ASog==
+"@oxfmt/binding-linux-x64-gnu@0.63.0":
+  version "0.63.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.63.0.tgz#c22a06a60ae2d6b3de522095e0c50a816040a033"
+  integrity sha512-S9wXYOiGSqYGS4Fx/TFsY+xDd/7dE5s+rUgbA4TsHiVF9e8J3ZcKmP7dsP/7iqLI9Wz7Ic7TzEr3mdthRCTdrA==
 
-"@oxfmt/binding-linux-x64-musl@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-x64-musl/-/binding-linux-x64-musl-0.64.0.tgz#b5edc644409aff9715279650767d34d2fb65d59a"
-  integrity sha512-gw7uEk9I+7zoT1EYLra1eWArIzNcz8e3jkv+Noo2+o2T7wPvsNSQbfoa4DSfZlvn1i6mJ05RiZ4/omaXPDNhQg==
+"@oxfmt/binding-linux-x64-musl@0.63.0":
+  version "0.63.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-x64-musl/-/binding-linux-x64-musl-0.63.0.tgz#48d3eeaf8e3757f638cf92de5ee4858befc9c0a3"
+  integrity sha512-5eGyTJuMZNwBSHCivXt8Yuta6GeTYksOPXRk2MIhajiyFGQx7bjaHIwY+ZusAoFHhT157A9x6sktLjYo9D5oMQ==
 
-"@oxfmt/binding-openharmony-arm64@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-openharmony-arm64/-/binding-openharmony-arm64-0.64.0.tgz#6b1d9c662e08bf5fbc1e9ccdb45ed28c004b90c4"
-  integrity sha512-HYHFf616FHSPSO07c09mjmXBfQ73wIVM3m0txOiooa5XZkGoxFd6B14PVj0LB0DXIqJ6wAO/dDR/NX/5UUaqnw==
+"@oxfmt/binding-openharmony-arm64@0.63.0":
+  version "0.63.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-openharmony-arm64/-/binding-openharmony-arm64-0.63.0.tgz#02be9e140ae35ba30f52bdce27612fece4a01ab3"
+  integrity sha512-Rz7hx+Dv3DoW/S6pwVAyjfFXp7/trdQ1zg+vNmsdsdDNlUccugp4XNqambSuEAeP0DaG9k72AtNyfDXCEg0AGw==
 
-"@oxfmt/binding-win32-arm64-msvc@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.64.0.tgz#bc5a005e159a8f9af4168eed2e61fe477f4029db"
-  integrity sha512-uQjFp081IZSWD6VAofX2iO2z01awAdHmfC+NrieWIPKrT2hZKQDyq/U18M7ifC0sm0Wz8aHY/p6+FDYIzs/CrQ==
+"@oxfmt/binding-win32-arm64-msvc@0.63.0":
+  version "0.63.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.63.0.tgz#2226eaf52b6345a2cb926499216b2486cf0dbec2"
+  integrity sha512-T/IuizKN9mr4Xw6YYnptkXRNdLkyIlUZ7c8zfTOBpoytZyJ1BAsMUvsMDEx0X4YvSMpaivm+DR8112rQfzC25g==
 
-"@oxfmt/binding-win32-ia32-msvc@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-0.64.0.tgz#88e90b96f7b39e4b6f75178c94c52d464fa58b53"
-  integrity sha512-lNM6byTAQ881jugzFu8juJTbNRgsUTlswMA6pJmwi1XDvmIqnnb49lcUAs5gz94fCJLrVN+/X3s3jOKqx23WIQ==
+"@oxfmt/binding-win32-ia32-msvc@0.63.0":
+  version "0.63.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-0.63.0.tgz#58d263bb5ecd7330c02f9dcd8cda10f66e42e74b"
+  integrity sha512-XjrO5FJ5Wl9vsAxtCP1G/eaeT6y1K2s9CICUHGE42cEjou32/J6S+B1KnrOAboj6E7uhJnwPbRSvznWcxNdA0g==
 
-"@oxfmt/binding-win32-x64-msvc@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.64.0.tgz#788c7fe26f89e57269f79e8f8a34e9b1497bc674"
-  integrity sha512-BtmbtL/QjMtF1a6C3CqoDluH2IfB6fJt62E+B9RFfUPtFk4Iz9PFS6+y/SzzOvSxc7aUk2Kphwg7Dh8lMbwu6g==
+"@oxfmt/binding-win32-x64-msvc@0.63.0":
+  version "0.63.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.63.0.tgz#02a166c8a8049c55d0096d1ba9d8e73f3a4d26a7"
+  integrity sha512-sgsHCQy432OTQH4Ikk3tZptp3GqwnhwUDuY0loBH41zyHWfMZY9v8Dy78wsnSofHejvFozZGgJgBB1A0LQRwMQ==
 
 "@parcel/watcher-android-arm64@2.5.6":
   version "2.5.6"
@@ -4129,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.10":
-  version "10.5.10"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-10.5.10.tgz#c65d1d4a6d1e2de50f0decaf82ea57583f220b30"
-  integrity sha512-06JoK3/a7FWI/6GzuidJP9iHp1/Vejboe6lzS1jW+d8ItpecriBt+oXh1VNmUM7i7PjI6pZnet+j51QnLyeOoQ==
+"@storybook/addon-docs@^10.5.9":
+  version "10.5.9"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-10.5.9.tgz#6d871977f7ad833dc142d12ee43490105dec4d07"
+  integrity sha512-8sFsMkZYrrdqCLdV+hnwTwDF7RaBsBPRwl4wfc8ve9Q/7Yhi5REe/Xjvd8x1yn6fBPPw9tnID9dx6Agdnr81fw==
   dependencies:
     "@mdx-js/react" "^3.0.0"
-    "@storybook/csf-plugin" "10.5.10"
+    "@storybook/csf-plugin" "10.5.9"
     "@storybook/icons" "^2.0.2"
-    "@storybook/react-dom-shim" "10.5.10"
+    "@storybook/react-dom-shim" "10.5.9"
     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.10":
-  version "10.5.10"
-  resolved "https://registry.yarnpkg.com/@storybook/csf-plugin/-/csf-plugin-10.5.10.tgz#c65da1cdfe0a11795a14c518e9f8f828b8d54b3b"
-  integrity sha512-TaCLBrqVEr767+w58QDotDUiCTuE5cyRJuRcDlsKQyUIyGBv+lYD3lu8wBiVCYxgIjB/gu9HmqiC+0yx1rHzaw==
+"@storybook/csf-plugin@10.5.9":
+  version "10.5.9"
+  resolved "https://registry.yarnpkg.com/@storybook/csf-plugin/-/csf-plugin-10.5.9.tgz#805e4c93a1704b220351d62bb0c74ce3b78c5e10"
+  integrity sha512-4H5QIHQVtQYCuL43GCRLGjNQhZpQg9gL03ja0DV80kO2Dn9LEt6ol87bSnSjn4VDgcAXtgTzXFvRLknfVgAAqg==
   dependencies:
     unplugin "^2.3.5"
 
@@ -4159,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.10":
-  version "10.5.10"
-  resolved "https://registry.yarnpkg.com/@storybook/react-dom-shim/-/react-dom-shim-10.5.10.tgz#8ddcad879d8804a9bbc09a5d0ea10f8356f01ed6"
-  integrity sha512-rbu62ILo/VE3iXKmu+kWXFpD1H1Lwi0f19q/x7JnDsD2dxKS9w5znLEqPIq2qxpzi/wjjIb2iUP1cRG1d/9W5A==
+"@storybook/react-dom-shim@10.5.9":
+  version "10.5.9"
+  resolved "https://registry.yarnpkg.com/@storybook/react-dom-shim/-/react-dom-shim-10.5.9.tgz#549793845bb8b966acd36002d33d7b54cc5c92d4"
+  integrity sha512-7qZD6CSa64p1m/zX9tG4ALcEHlEk0Bx+5++4RL3MFlRCgCFfAomXsCHTzF0RyF8cI4vl+hS7Y0ryjQchVs6UQA==
 
 "@superset-ui/core@^0.20.4":
   version "0.20.4"
@@ -4862,86 +4855,86 @@
   dependencies:
     apg-lite "^1.0.4"
 
-"@swc/core-darwin-arm64@1.16.1":
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.16.1.tgz#f6f6983e2268888558cdbe043001d82449445def"
-  integrity sha512-zlJblJ8ncErD43lKdxjbUaUskJQf+LxiPXYcWXD8/8ZMV+7uuAT+CwjciLXpyZBd5Pq/S726bMpeeAwSeL1hhg==
+"@swc/core-darwin-arm64@1.16.0":
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.16.0.tgz#8c5a2af031c62ebcb6354aa6975bfb7eac895223"
+  integrity sha512-SJQPl+xG/zB8bNjC/gTg3WOmOvz7EzlQD+VShfCKFYPNr2qvb+vATUY11vYEjnMWCn6wV8H8eAtjQrVflYyX5A==
 
-"@swc/core-darwin-x64@1.16.1":
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.16.1.tgz#98b61e8c7ffe9f6263a08677353ba5606f6992de"
-  integrity sha512-IN0BmPWb0YAh/17mmlWB/HDBtTw2MfuW4hulf/tQAgTQBRH17l+z499bNJLK6LizSjqs0P7V+jU38Zj+vJC1DA==
+"@swc/core-darwin-x64@1.16.0":
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.16.0.tgz#0d2496c0429d7e8bc45b50348adf9d105bb56793"
+  integrity sha512-ql2JVch8V5t1i+HxiiuD4oVDI1dOku4/e3QiCkplONrm3SLitqNAP+nztHN51fSG2IgGuOwpAi3hgA+ukT5yQg==
 
-"@swc/core-linux-arm-gnueabihf@1.16.1":
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.16.1.tgz#afc245521cd43a65a87cdd87fe99fb9e4f4eaa58"
-  integrity sha512-EYgrx2YOCQ2Twz2S793kqNjPkpvYVUPzzR95bIb7by+VQcyaai4lZZ2iz/tZvcFVKSNcN3/JTKwx+aBn2ZL52A==
+"@swc/core-linux-arm-gnueabihf@1.16.0":
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.16.0.tgz#5f02a85842a04cd21f2ab9e8e67dc4b16f7024a4"
+  integrity sha512-PcdDBaRbe39y37h1rXVkhNy7mEU7f8b34KD761C68R23EsfMsj5oDPVddRzGdSRAvwwSfH0WSNEHgYmc/AJipg==
 
-"@swc/core-linux-arm64-gnu@1.16.1":
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.16.1.tgz#c44ca749af555ef8127795de141094cd28da9714"
-  integrity sha512-moyKm0YZlHdHohzm1YwgAyesqnE853rO0REMfJLFAova51wF9BNi+3ZW2PeS7Vqvn6HeJuepLpAHbBdZctxpHA==
+"@swc/core-linux-arm64-gnu@1.16.0":
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.16.0.tgz#6264498c88c51649511c6b4af532d330d3cf0631"
+  integrity sha512-t21IUztHQ/COucy7Kk9eIlehmq08H/hYq7aRA6fZox3S5ddi6TxWPK6e5S/+aTCf6+Od9qQ+LIpjHMiTy737vA==
 
-"@swc/core-linux-arm64-musl@1.16.1":
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.16.1.tgz#a1a3d15d5fb074c474c9a60a14488ec16124253f"
-  integrity sha512-kKGBO9wdapiSzuf5ZzZ2fYtlu1BNSYtIIUxvH1ir/gcelTOREEHGDCLTDFx/2Knf878nU11A40z7LxwasEFxqA==
+"@swc/core-linux-arm64-musl@1.16.0":
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.16.0.tgz#7a451eba69aa9a80799b9b8b9af46bf6f49803bd"
+  integrity sha512-d9+iajbMB87b0umgbP+Gy3yBDSDgty4Q6H5pZ8fgTb/dOoKIwwynP4L4kvWCOFg2i49kxmAAUs1uJZh9s0E+RQ==
 
-"@swc/core-linux-ppc64-gnu@1.16.1":
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-ppc64-gnu/-/core-linux-ppc64-gnu-1.16.1.tgz#7eb33976ece5e45e63f9c9c1ab0da9405df76f7f"
-  integrity sha512-nZ6qahtLxC3PM54cWOQZHxt4lTCF/3J4LIoWWzz6v7A+rLs8Dx54anYQf7mH3eIi8KlNpgKci/ie8ZSqFN8O7A==
+"@swc/core-linux-ppc64-gnu@1.16.0":
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-ppc64-gnu/-/core-linux-ppc64-gnu-1.16.0.tgz#99a7ba46a56190a52c646506e940dffe554c5d10"
+  integrity sha512-QRpeKGOg+B0qmo3BFU+6rL/gpoKYYJ7OFSMf5DNMafohYZ/iq2qvAH9Gcrf8NxROj3iooKOVewJ+YgahH1nSLw==
 
-"@swc/core-linux-s390x-gnu@1.16.1":
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-s390x-gnu/-/core-linux-s390x-gnu-1.16.1.tgz#f02f2687d2ee1c8f59430ef638c63714862c9389"
-  integrity sha512-4ji5PNzhYq193Z4/4xUaSoNJza6iCkDJSzhetrbB6KOYxsr+kxtQr8ePWhMJUiMt6JUWtXaZ1PYT8FhtED+nGA==
+"@swc/core-linux-s390x-gnu@1.16.0":
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-s390x-gnu/-/core-linux-s390x-gnu-1.16.0.tgz#61473e056d1dd0d4690352a875c14f41bdd9f60a"
+  integrity sha512-q+Vr/hmHCcRXT/WFzOJC+T6GGEEtq2iaTtmyLfxO7yzu4ckgcqSNkg9m181wfNhuMwfNBoBhOfwQCnLsGZ5F4g==
 
-"@swc/core-linux-x64-gnu@1.16.1":
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.16.1.tgz#af4c571bbe07044ee0bec49ade1e53c1022d4979"
-  integrity sha512-VJQxqrisHV+B394IgrOu8YsIIXZgffnf5tO+yc9Z/hoUpuZEvuQTjWwlnpZdpyD+0nx6LTD1/3k646JYm43yJA==
+"@swc/core-linux-x64-gnu@1.16.0":
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.16.0.tgz#008fc149a9135bca92b1e1f63037e2612c4d0fb5"
+  integrity sha512-DWVBc3QnpsSgKoq8N4rmZeZa5r/XrHdLkITsExN/tvTdqPtAPDPt+Ysy33OfgBlyN8lNe4xwsXWe6DXlRkJeRQ==
 
-"@swc/core-linux-x64-musl@1.16.1":
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.16.1.tgz#113eb36a1d3bd21bbf4a48a22fad97dc1c7cc91c"
-  integrity sha512-r9oV1mwxxsIGcLV1IQ/tw76MW3doatKze1QFWuC+a7QqJUkhY/bKTSVk6NpKKUGm2LDsE33Va8VqSClfA7vSiQ==
+"@swc/core-linux-x64-musl@1.16.0":
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.16.0.tgz#4300ea0c63864dc3989ca0e956b4a5e4c666196c"
+  integrity sha512-6XCgDSc1HPf/5dpjvABhKHICiBcsuZyW3hQMkn8sxel0TqprkJGp+H4iaBYIUTPixhrBub2hBPtfjcZLE6yL3w==
 
-"@swc/core-win32-arm64-msvc@1.16.1":
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.16.1.tgz#7cc6cfde26ad7e15fe93de98033e7c1892bcf127"
-  integrity sha512-6huNRessoBLxWEqBm5zJXyCQ27TO7anvkdiuQ5MDO4CJni0nOXEqKtV9RllQ2TdyENKKsUMXVnIfW2hIXx/R5Q==
+"@swc/core-win32-arm64-msvc@1.16.0":
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.16.0.tgz#1d4146b7c1aada2992692cdc72bb0b43a885136e"
+  integrity sha512-T/+9VVCZJ3AKEth9IP3U9AJ2YscQq+7LUqRTvfR4a2q36+Ri22oOwUizpAKOqQ42vb2Y/kOa4TOcJOfHoDIT/w==
 
-"@swc/core-win32-ia32-msvc@1.16.1":
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.16.1.tgz#2330c734f4129c2064b8848fb956501788aab9a3"
-  integrity sha512-OVKJFUzphrGmsh+BGtcZDesx0YryV7/Yvy5XGgTqnrZfjnyfcr5uaqYQugCckdIlupc5Vs3XtDjRAj12z4ZPlw==
+"@swc/core-win32-ia32-msvc@1.16.0":
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.16.0.tgz#c5c2a60905ffa9e4647214bef75778f0c73ba0d4"
+  integrity sha512-Pr1lsR/PMs8ndL0UWMrW8nLZ7H7sspIxBRDdjL8f+YJ/FJNASgzfunbVVXAqj0csgIJYHPZy+OW9smjFmk1Rcg==
 
-"@swc/core-win32-x64-msvc@1.16.1":
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.16.1.tgz#04825a3f9e6fbe390825ff02708a5ebdd3a9841b"
-  integrity sha512-Bt+VIhWYCGk4urklnkkteLUOeLv1VxigwTCeB/xC6rBZxY6IIKdDwCJf6on3E3SUGsIqmQS6QqtuJQc1VxF4Aw==
+"@swc/core-win32-x64-msvc@1.16.0":
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.16.0.tgz#67dd85a90437e6fa9951cce7842f6cac3ec3f60d"
+  integrity sha512-ktdeYLgOQdaonvsj5tJijqgpb0wk7gfF80wCFVA0kucI1hhSUIyfcGbjo5+9sdqv38OhMnTdLoA6xbqgOgPQjw==
 
-"@swc/core@^1.15.40", "@swc/core@^1.16.1":
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.16.1.tgz#5ea7ff32f3b352c871aa47195efd4932f709a569"
-  integrity sha512-nUaeu91O5QZKrQdaDCHd402ogUIoNOOjpkZNq0UomWK0G6gDaGmLhvddF1/3BXf5O8aLyo6ZPY/aMDWvaJQ/hg==
+"@swc/core@^1.15.40", "@swc/core@^1.16.0":
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.16.0.tgz#79cd13789725d3e3ad0df605dc88d9e255d7ebfd"
+  integrity sha512-zSdvEHxBg00WhUNtW/u58hhcdR33gjtMQvOBo8F7POWJDyjRCt/miKfhidT3hCc/118RUwNnlEAmxiihFMbK4Q==
   dependencies:
     "@swc/counter" "^0.1.3"
     "@swc/types" "^0.1.28"
   optionalDependencies:
-    "@swc/core-darwin-arm64" "1.16.1"
-    "@swc/core-darwin-x64" "1.16.1"
-    "@swc/core-linux-arm-gnueabihf" "1.16.1"
-    "@swc/core-linux-arm64-gnu" "1.16.1"
-    "@swc/core-linux-arm64-musl" "1.16.1"
-    "@swc/core-linux-ppc64-gnu" "1.16.1"
-    "@swc/core-linux-s390x-gnu" "1.16.1"
-    "@swc/core-linux-x64-gnu" "1.16.1"
-    "@swc/core-linux-x64-musl" "1.16.1"
-    "@swc/core-win32-arm64-msvc" "1.16.1"
-    "@swc/core-win32-ia32-msvc" "1.16.1"
-    "@swc/core-win32-x64-msvc" "1.16.1"
+    "@swc/core-darwin-arm64" "1.16.0"
+    "@swc/core-darwin-x64" "1.16.0"
+    "@swc/core-linux-arm-gnueabihf" "1.16.0"
+    "@swc/core-linux-arm64-gnu" "1.16.0"
+    "@swc/core-linux-arm64-musl" "1.16.0"
+    "@swc/core-linux-ppc64-gnu" "1.16.0"
+    "@swc/core-linux-s390x-gnu" "1.16.0"
+    "@swc/core-linux-x64-gnu" "1.16.0"
+    "@swc/core-linux-x64-musl" "1.16.0"
+    "@swc/core-win32-arm64-msvc" "1.16.0"
+    "@swc/core-win32-ia32-msvc" "1.16.0"
+    "@swc/core-win32-x64-msvc" "1.16.0"
 
 "@swc/counter@^0.1.3":
   version "0.1.3"
@@ -6529,10 +6522,10 @@ base64-js@^1.3.1, base64-js@^1.5.1:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-baseline-browser-mapping@^2.10.38, baseline-browser-mapping@^2.11.16, baseline-browser-mapping@^2.9.19:
-  version "2.11.16"
-  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.11.16.tgz#0fa19a4ece2e34439ecaa3fdca8a59acfbd287fb"
-  integrity sha512-H/bNPUFHewJHyCTdjn1n3Pit5+2GmWT6mmeHImPX+8MA9NA6b67jO4gYmi4jTbCJb2otq34KMZnovndDPqJwhQ==
+baseline-browser-mapping@^2.10.38, baseline-browser-mapping@^2.11.15, baseline-browser-mapping@^2.9.19:
+  version "2.11.15"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.11.15.tgz#9c0cac93d7d304f3d61bb41088a102cd62e68676"
+  integrity sha512-FwMjJJ7HnyZpWe+oWxegG0fezZyBZUagI5LZEoO3GCbtbKNwRfMH9Ue5d5v01PNePBy1QSfPSDTTeVL0Hb9EzA==
 
 batch@0.6.1:
   version "0.6.1"
@@ -11856,10 +11849,10 @@ neotraverse@0.6.15:
   resolved "https://registry.yarnpkg.com/neotraverse/-/neotraverse-0.6.15.tgz#dc4abb64700c52440f13bc53635b559862420360"
   integrity sha512-HZpdkco+JeXq0G+WWpMJ4NsX3pqb5O7eR9uGz3FfoFt+LYzU8iRWp49nJtud6hsDoywM8tIrDo3gjgmOqJA8LA==
 
-neotraverse@=1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/neotraverse/-/neotraverse-1.0.1.tgz#7c89b43f6504ef85928c718f578c68621576d194"
-  integrity sha512-WmmLty1YWwJl9yZi77v2dVIV6X2kuYV8YYBI/G3LWGKdGHmHUvL1z7FW0iDvEvGAwNEoc5x1tOOOyDnf5jJw/w==
+neotraverse@=0.6.18:
+  version "0.6.18"
+  resolved "https://registry.yarnpkg.com/neotraverse/-/neotraverse-0.6.18.tgz#abcb33dda2e8e713cf6321b29405e822230cdb30"
+  integrity sha512-Z4SmBUweYa09+o6pG+eASabEpP6QkQ70yHj351pQoEXIs8uHbaU2DWVmzBANKgflPa47A50PtB2+NgRpQvr7vA==
 
 no-case@^3.0.4:
   version "3.0.4"
@@ -12244,57 +12237,57 @@ oxc-parser@^0.127.0:
     "@oxc-parser/binding-win32-ia32-msvc" "0.127.0"
     "@oxc-parser/binding-win32-x64-msvc" "0.127.0"
 
-oxc-resolver@11.21.2:
-  version "11.21.2"
-  resolved "https://registry.yarnpkg.com/oxc-resolver/-/oxc-resolver-11.21.2.tgz#06f49557c98adb97133d85362797c460ef028057"
-  integrity sha512-w5tLwYN3Zo24w5EeWJjJWZOwhYqTtC8PS2B1tIt7BZUuqTIcU07sQValbDw+rq7+AuAGzOHklgK+ifsy4lpXfw==
+oxc-resolver@^11.19.1:
+  version "11.23.0"
+  resolved "https://registry.yarnpkg.com/oxc-resolver/-/oxc-resolver-11.23.0.tgz#bb9e32fa028dbde0584b5964dbc59de2878ac171"
+  integrity sha512-f0+l598CJMOLnYPXsXxttJALH0ljtivdRMKtvHhxRuWa5FYmw5+qODARl8oYjMC/brpzKcrpdORsOBrTqhBZ9A==
   optionalDependencies:
-    "@oxc-resolver/binding-android-arm-eabi" "11.21.2"
-    "@oxc-resolver/binding-android-arm64" "11.21.2"
-    "@oxc-resolver/binding-darwin-arm64" "11.21.2"
-    "@oxc-resolver/binding-darwin-x64" "11.21.2"
-    "@oxc-resolver/binding-freebsd-x64" "11.21.2"
-    "@oxc-resolver/binding-linux-arm-gnueabihf" "11.21.2"
-    "@oxc-resolver/binding-linux-arm-musleabihf" "11.21.2"
-    "@oxc-resolver/binding-linux-arm64-gnu" "11.21.2"
-    "@oxc-resolver/binding-linux-arm64-musl" "11.21.2"
-    "@oxc-resolver/binding-linux-ppc64-gnu" "11.21.2"
-    "@oxc-resolver/binding-linux-riscv64-gnu" "11.21.2"
-    "@oxc-resolver/binding-linux-riscv64-musl" "11.21.2"
-    "@oxc-resolver/binding-linux-s390x-gnu" "11.21.2"
-    "@oxc-resolver/binding-linux-x64-gnu" "11.21.2"
-    "@oxc-resolver/binding-linux-x64-musl" "11.21.2"
-    "@oxc-resolver/binding-openharmony-arm64" "11.21.2"
-    "@oxc-resolver/binding-wasm32-wasi" "11.21.2"
-    "@oxc-resolver/binding-win32-arm64-msvc" "11.21.2"
-    "@oxc-resolver/binding-win32-x64-msvc" "11.21.2"
+    "@oxc-resolver/binding-android-arm-eabi" "11.23.0"
+    "@oxc-resolver/binding-android-arm64" "11.23.0"
+    "@oxc-resolver/binding-darwin-arm64" "11.23.0"
+    "@oxc-resolver/binding-darwin-x64" "11.23.0"
+    "@oxc-resolver/binding-freebsd-x64" "11.23.0"
+    "@oxc-resolver/binding-linux-arm-gnueabihf" "11.23.0"
+    "@oxc-resolver/binding-linux-arm-musleabihf" "11.23.0"
+    "@oxc-resolver/binding-linux-arm64-gnu" "11.23.0"
+    "@oxc-resolver/binding-linux-arm64-musl" "11.23.0"
+    "@oxc-resolver/binding-linux-ppc64-gnu" "11.23.0"
+    "@oxc-resolver/binding-linux-riscv64-gnu" "11.23.0"
+    "@oxc-resolver/binding-linux-riscv64-musl" "11.23.0"
+    "@oxc-resolver/binding-linux-s390x-gnu" "11.23.0"
+    "@oxc-resolver/binding-linux-x64-gnu" "11.23.0"
+    "@oxc-resolver/binding-linux-x64-musl" "11.23.0"
+    "@oxc-resolver/binding-openharmony-arm64" "11.23.0"
+    "@oxc-resolver/binding-wasm32-wasi" "11.23.0"
+    "@oxc-resolver/binding-win32-arm64-msvc" "11.23.0"
+    "@oxc-resolver/binding-win32-x64-msvc" "11.23.0"
 
-oxfmt@^0.64.0:
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/oxfmt/-/oxfmt-0.64.0.tgz#666a5148cdf7385007cd46e35e8ff8f94ecfd96b"
-  integrity sha512-XZ4GFBN/PLbXKq+0zrgpQfPKYuJlUuj+nzZJY7UpIbFMNyefNLCdN9EwViycNqnYcv0wrn0jXcQLlqJp8RCKBg==
+oxfmt@^0.63.0:
+  version "0.63.0"
+  resolved "https://registry.yarnpkg.com/oxfmt/-/oxfmt-0.63.0.tgz#c7338e6c43a68d5cf8dc61c08b617d77cb54e323"
+  integrity sha512-kgdDwv35wvVf6554U2Ab8Jnd0zTM+TsEQWwaB70RAjK3gICFAFGO+2Hd3Be27GMoXj3XRL9IKSNRVl7KBQL6iw==
   dependencies:
     tinypool "2.1.0"
   optionalDependencies:
-    "@oxfmt/binding-android-arm-eabi" "0.64.0"
-    "@oxfmt/binding-android-arm64" "0.64.0"
-    "@oxfmt/binding-darwin-arm64" "0.64.0"
-    "@oxfmt/binding-darwin-x64" "0.64.0"
-    "@oxfmt/binding-freebsd-x64" "0.64.0"
-    "@oxfmt/binding-linux-arm-gnueabihf" "0.64.0"
-    "@oxfmt/binding-linux-arm-musleabihf" "0.64.0"
-    "@oxfmt/binding-linux-arm64-gnu" "0.64.0"
-    "@oxfmt/binding-linux-arm64-musl" "0.64.0"
-    "@oxfmt/binding-linux-ppc64-gnu" "0.64.0"
-    "@oxfmt/binding-linux-riscv64-gnu" "0.64.0"
-    "@oxfmt/binding-linux-riscv64-musl" "0.64.0"
-    "@oxfmt/binding-linux-s390x-gnu" "0.64.0"
-    "@oxfmt/binding-linux-x64-gnu" "0.64.0"
-    "@oxfmt/binding-linux-x64-musl" "0.64.0"
-    "@oxfmt/binding-openharmony-arm64" "0.64.0"
-    "@oxfmt/binding-win32-arm64-msvc" "0.64.0"
-    "@oxfmt/binding-win32-ia32-msvc" "0.64.0"
-    "@oxfmt/binding-win32-x64-msvc" "0.64.0"
+    "@oxfmt/binding-android-arm-eabi" "0.63.0"
+    "@oxfmt/binding-android-arm64" "0.63.0"
+    "@oxfmt/binding-darwin-arm64" "0.63.0"
+    "@oxfmt/binding-darwin-x64" "0.63.0"
+    "@oxfmt/binding-freebsd-x64" "0.63.0"
+    "@oxfmt/binding-linux-arm-gnueabihf" "0.63.0"
+    "@oxfmt/binding-linux-arm-musleabihf" "0.63.0"
+    "@oxfmt/binding-linux-arm64-gnu" "0.63.0"
+    "@oxfmt/binding-linux-arm64-musl" "0.63.0"
+    "@oxfmt/binding-linux-ppc64-gnu" "0.63.0"
+    "@oxfmt/binding-linux-riscv64-gnu" "0.63.0"
+    "@oxfmt/binding-linux-riscv64-musl" "0.63.0"
+    "@oxfmt/binding-linux-s390x-gnu" "0.63.0"
+    "@oxfmt/binding-linux-x64-gnu" "0.63.0"
+    "@oxfmt/binding-linux-x64-musl" "0.63.0"
+    "@oxfmt/binding-openharmony-arm64" "0.63.0"
+    "@oxfmt/binding-win32-arm64-msvc" "0.63.0"
+    "@oxfmt/binding-win32-ia32-msvc" "0.63.0"
+    "@oxfmt/binding-win32-x64-msvc" "0.63.0"
 
 p-cancelable@^3.0.0:
   version "3.0.0"
@@ -13590,7 +13583,7 @@ react-modal@^3.16.3:
     react-lifecycles-compat "^3.0.0"
     warning "^4.0.3"
 
-react-redux@^9.2.0, react-redux@^9.3.0:
+react-redux@^9.2.0:
   version "9.3.0"
   resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-9.3.0.tgz#a30113bb6d95c0a715d54dda4308d450fca6ce09"
   integrity sha512-KQopgqFo/p/fgmAs5qz6p5RWaNAzq40WAu7fJIXnQpYxFPbJYtsJPWvGeF2rOBaY/kEuV77AVsX8TsQzKm+A/g==
@@ -14790,10 +14783,10 @@ stop-iteration-iterator@^1.1.0:
     es-errors "^1.3.0"
     internal-slot "^1.1.0"
 
-storybook@^10.5.10:
-  version "10.5.10"
-  resolved "https://registry.yarnpkg.com/storybook/-/storybook-10.5.10.tgz#97e9b4a71b4df7732e82d64edffe07f9e8d70083"
-  integrity sha512-Rz8k9ejFHsi7lbtJTaxZlhCUz4GkbJIKEoKDjXeLfr/ZhXip73E6keKxW0KH8iGeKiCqHAbJCV4YIQrxTOLiig==
+storybook@^10.5.9:
+  version "10.5.9"
+  resolved "https://registry.yarnpkg.com/storybook/-/storybook-10.5.9.tgz#61f476fd73785dcf09e9198ddf404b9b8c06964a"
+  integrity sha512-UfdMKSjEhIKr8LbqYyIE5r7vT/drL/PxN75YaouJ+UG0FssEy6cf49OdTF3kstAqVMHskc+zEqyRoiQHZXHwgA==
   dependencies:
     "@storybook/global" "^5.0.0"
     "@storybook/icons" "^2.0.2"
@@ -14807,7 +14800,7 @@ storybook@^10.5.10:
     jsonc-parser "^3.3.1"
     open "^10.2.0"
     oxc-parser "^0.127.0"
-    oxc-resolver "11.21.2"
+    oxc-resolver "^11.19.1"
     recast "^0.23.5"
     semver "^7.7.3"
     use-sync-external-store "^1.5.0"
@@ -15064,10 +15057,10 @@ svgo@^3.0.2, svgo@^3.2.0:
     picocolors "^1.0.0"
     sax "^1.5.0"
 
-swagger-client@^3.38.0:
-  version "3.38.0"
-  resolved "https://registry.yarnpkg.com/swagger-client/-/swagger-client-3.38.0.tgz#542431f02d809b49115272ff8b9e48d545b9f53c"
-  integrity sha512-n7aykm1BEdQ3fKePJJx63UGjYe8/5fuxFMi3qZP4OJGZvzljKvmhxNwIF/MB71sF/lop9NeWZReKvPib9CY+2g==
+swagger-client@^3.37.8:
+  version "3.37.8"
+  resolved "https://registry.yarnpkg.com/swagger-client/-/swagger-client-3.37.8.tgz#26c24c89cbfda7459f6afb53bdfcb6d8dbe9ac82"
+  integrity sha512-uoKwfq+8DvWVDhoALDrEtex9f26Yi2VkvEFjsrMHd8Gl+TcApJkVXtNiE35p5JQjMsvwkvr1eLVlOFNF4GL1bQ==
   dependencies:
     "@babel/runtime-corejs3" "^7.22.15"
     "@scarf/scarf" "=1.4.0"
@@ -15081,7 +15074,7 @@ swagger-client@^3.38.0:
     deepmerge "~4.3.0"
     fast-json-patch "^3.0.0-1"
     js-yaml "^4.2.0"
-    neotraverse "=1.0.1"
+    neotraverse "=0.6.18"
     node-abort-controller "^3.1.1"
     openapi-path-templating "^2.2.1"
     openapi-server-url-templating "^1.3.0"
@@ -15110,10 +15103,10 @@ swagger-client@^3.38.0:
     "@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.14:
-  version "5.32.14"
-  resolved "https://registry.yarnpkg.com/swagger-ui-react/-/swagger-ui-react-5.32.14.tgz#31b69b0f6910e87dbcc81886208061ca1f72e034"
-  integrity sha512-6LAVBeC78DplbJ7kutm/YeBYo22nPzGOca4bIZAvQG4w2eSetnYDdazaUfY0qzQUlg/H90HnYZX3rg67EmENOw==
+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==
   dependencies:
     "@babel/runtime-corejs3" "^7.27.1"
     "@scarf/scarf" "=1.4.0"
@@ -15136,7 +15129,7 @@ swagger-ui-react@^5.32.14:
     react-immutable-proptypes "2.2.0"
     react-immutable-pure-component "^2.2.0"
     react-inspector "^6.0.1"
-    react-redux "^9.3.0"
+    react-redux "^9.2.0"
     react-syntax-highlighter "^16.0.0"
     redux "^5.0.1"
     redux-immutable "^4.0.0"
@@ -15144,7 +15137,7 @@ swagger-ui-react@^5.32.14:
     reselect "^5.1.1"
     serialize-error "^8.1.0"
     sha.js "^2.4.12"
-    swagger-client "^3.38.0"
+    swagger-client "^3.37.8"
     url-parse "^1.5.10"
     xml "=1.0.1"
     xml-but-prettier "^1.0.1"

pyproject.toml

@@ -80,7 +80,7 @@ dependencies = [
     # marshmallow 4 compatibility: see superset/marshmallow_compatibility.py for a
     # Flask-AppBuilder workaround. Tracking issue:
     # https://github.com/apache/superset/issues/33162
-    "marshmallow>=3.0, <5",
+    "marshmallow>=4.3.1, <5",
     "marshmallow-union>=0.1.15.post1",
     "msgpack>=1.2.0, <1.3",
     "nh3>=0.3.5, <0.4",
@@ -94,7 +94,7 @@ dependencies = [
     "parsedatetime",
     "paramiko>=3.4.0, <4.0", # 4.0 removed DSSKey, still referenced by sshtunnel
     "pgsanity",
-    "Pillow>=12.3.0, <13", # raise floor to match resolved pin; closes SCA false-positive on 11.x-range CVEs already fixed in 12.3.0
+    "Pillow>=11.0.0, <13",
     "polyline>=2.0.4, <3.0",
     "pydantic>=2.8.0",
     "pyparsing>=3.3.2, <4",
@@ -103,7 +103,7 @@ dependencies = [
     "pygeohash",
     "pyarrow>=25.0.1, <26", # before upgrading pyarrow, check that all db dependencies support this, see e.g. https://github.com/apache/superset/pull/34693
     "pyyaml>=6.0.3, <7.0.0",
-    "PyJWT>=2.13.0, <3.0", # raise floor to match resolved pin; closes SCA false-positive on 2.4.x-range CVEs already fixed in 2.13.0
+    "PyJWT>=2.4.0, <3.0",
     "redis>=5.0.0, <9.0",
     "rison>=2.0.1, <3.0",
 
@@ -141,17 +141,8 @@ bigquery = [
     "sqlalchemy-bigquery>=1.17.2",
     "google-cloud-bigquery>=3.42.3",
 ]
-clickhouse = ["clickhouse-connect>=1.7.2, <2.0"]
-# The `cockroachdb` PyPI package (last released 2021) is abandoned and its
-# SQLAlchemy dialect cannot even import under SQLAlchemy 2.0 (it references
-# sqlalchemy.dialects.postgresql.psycopg2.PGCompiler_psycopg2, removed in
-# 2.0). sqlalchemy-cockroachdb is the actively maintained replacement,
-# already linked from CockroachDbEngineSpec.metadata's docs_url, and
-# registers the same `cockroachdb` SQLAlchemy dialect entry point.
-# sqlalchemy-cockroachdb itself declares no DBAPI dependency (its own docs
-# require picking one), so pull in the same psycopg2-binary pin as the
-# `postgres` extra -- CockroachDB speaks the Postgres wire protocol.
-cockroachdb = ["sqlalchemy-cockroachdb>=2.0.0, <3", "psycopg2-binary==2.9.12"]
+clickhouse = ["clickhouse-connect>=1.7.1, <2.0"]
+cockroachdb = ["cockroachdb>=0.3.5, <0.4"]
 crate = ["sqlalchemy-cratedb>=0.43.1, <1"]
 # sqlalchemy-d1's only release (0.1.0, Nov 2025) pins sqlalchemy<2,>=1.4,
 # explicitly excluding SQLAlchemy 2.0. See superset/db_engine_specs/d1.py's
@@ -194,12 +185,11 @@ excel = ["xlrd>=2.0.2, <2.1"]
 # installing this extra is only required to actually run exports.
 excel-export = ["boto3"]
 fastmcp = [
-    "fastmcp>=3.4.7,<4.0",
-    "mcp>=1.29.1,<2.0",
+    "fastmcp>=3.4.6,<4.0",
     # tiktoken backs the response-size-guard token estimator. Without
     # it, the middleware falls back to a coarser character-based
     # heuristic that under-counts JSON-heavy MCP responses.
-    "tiktoken>=0.14.0,<1.0",
+    "tiktoken>=0.13.0,<1.0",
 ]
 # sqlalchemy-firebird >=2.0.0 unconditionally requires SQLAlchemy 2.0 on
 # Python >=3.8 (which covers Superset's >=3.11 floor), with no dual-compat
@@ -222,23 +212,14 @@ impala = ["impyla>=0.24.0, <0.25"]
 # superset/db_engine_specs/kusto.py's known_incompatibilities metadata.
 kusto = ["sqlalchemy-kusto>=3.1.2, <4"]
 kylin = ["kylinpy>=2.8.4, <2.9"]
-# MariaDB is a MySQL fork implementing the same wire protocol - connects via
-# the plain mysql dialect, same driver as mysql.
-mariadb = ["apache-superset[mysql]"]
-monetdb = ["sqlalchemy-monetdb>=2.1.0, <3", "pymonetdb>=1.9.1, <2"]
-mongodb = ["pymongosql>=0.7.3, <1"]
 mssql = ["pymssql>=2.3.13, <3"]
 # motherduck is an alias for duckdb - MotherDuck works via the duckdb driver
 motherduck = ["apache-superset[duckdb]"]
 mysql = ["mysqlclient>=2.2.8, <3"]
 ocient = [
     # Closed-source vendor package with no public changelog; permissive
-    # unpinned sqlalchemy>=1.4 declared. Verified compatible with SQLAlchemy
-    # 2.0 against pyocient>=3.9.0 (discussion #40273): dialect construction,
-    # error extraction, and GIS-type sanitization all pass under 2.0.52. Note
-    # pyocient 3.9.0 relocated its geo-type classes from private top-level
-    # names (pyocient._STPoint) to public ones under pyocient.api
-    # (pyocient.api.STPoint), which is unrelated to the SQLAlchemy bump.
+    # unpinned sqlalchemy>=1.4 declared, but SQLAlchemy 2.0 support is
+    # unverified. Lower confidence than the other bumps in this PR.
     "sqlalchemy-ocient>=3.0.0, <4",
     "pyocient>=3.9.0, <4",
     "shapely",
@@ -250,7 +231,7 @@ pinot = ["pinotdb>=5.0.0, <10.0.0"]
 playwright = ["playwright>=1.62.0, <2"]
 postgres = ["psycopg2-binary==2.9.12"]
 presto = ["pyhive[presto]>=0.6.5"]
-trino = ["trino>=0.339.0"]
+trino = ["trino>=0.338.0"]
 prophet = ["prophet>=1.4.0, <2"]
 # sqlalchemy-redshift cuts hard from SQLAlchemy 1.4-only (0.8.x) to 2.0-only
 # (>=1.0.0) with no dual-compat release. Bumped now that Superset's own
@@ -264,7 +245,7 @@ risingwave = ["sqlalchemy-risingwave>=2.0.0"]
 shillelagh = ["shillelagh[all]>=1.4.5, <2"]
 singlestore = ["sqlalchemy-singlestoredb>=1.2.1, <2"]
 snowflake = ["snowflake-sqlalchemy>=1.11.0, <2"]
-sqlite = ["syntaqlite>=0.9.0,<0.10.0"]
+sqlite = ["syntaqlite>=0.7.0,<0.8.0"]
 spark = [
     "pyhive[hive_pure_sasl]>=0.7",
     "tableschema",
@@ -274,10 +255,7 @@ tdengine = [
     "taospy>=2.8.10",
     "taos-ws-py>=0.7.0"
 ]
-teradata = ["teradatasql>=20.0.0.66"]
-# TimescaleDB is a genuine Postgres extension, not a fork - connects via the
-# plain postgresql dialect, same driver as postgres.
-timescaledb = ["apache-superset[postgres]"]
+teradata = ["teradatasql>=20.0.0.65"]
 thumbnails = [] # deprecated, will be removed in 7.0
 vertica = ["sqlalchemy-vertica-python>= 0.6.3, < 0.7"]
 netezza = ["nzalchemy>= 11.1.2, < 11.2"]
@@ -285,18 +263,11 @@ starrocks = ["starrocks>=1.3.4, <2"]
 doris = ["pydoris>=1.2.0, <2.0.0"]
 oceanbase = ["oceanbase_py>=0.0.1.2"]
 ydb = ["ydb-sqlalchemy>=0.1.22", "ydb-sqlglot-plugin>=0.2.8"]
-# YugabyteDB's YSQL layer is fully Postgres-wire compatible - connects via
-# the plain postgresql dialect, same driver as postgres.
-yugabytedb = ["apache-superset[postgres]"]
 development = [
     # no bounds for apache-superset-extensions-cli until a stable version
     "apache-superset-extensions-cli",
     "boto3",
-    # 7.0.0 raises `docker.errors.DockerException: ... Not supported URL
-    # scheme http+docker` against the requests/urllib3 versions pinned
-    # elsewhere in this file -- breaks testcontainers (tests/testcontainers/)
-    # before any container even starts. 7.2.0 is confirmed working.
-    "docker>=7.2.0",
+    "docker",
     "flask-testing",
     "freezegun",
     "grpcio>=1.82.1",
@@ -318,7 +289,7 @@ development = [
     "ruff",
     "sqloxide",
     "statsd",
-    "syntaqlite>=0.9.0,<0.10.0",
+    "syntaqlite>=0.7.0,<0.8.0",
 ]
 
 [project.urls]

pytest.ini

@@ -19,13 +19,7 @@ testpaths =
     tests
 python_files = *_test.py test_*.py *_tests.py *viz/utils.py
 # `-p no:warnings` temporarily disabled in favor of more finely tuned `filterwarnings`.
-# `not testcontainers` excludes tests/testcontainers/ by default: those spin up
-# real Docker containers, and `testpaths = tests` would otherwise pull them into
-# every plain `pytest` run. The dedicated CI job (testcontainers.yml) overrides
-# this with an explicit `-m testcontainers` to run them.
-addopts = -m "not testcontainers"
-markers =
-    testcontainers: exercises a real database via testcontainers-python (needs Docker); excluded by default, see .github/workflows/testcontainers.yml
+#addopts = -p no:warnings
 asyncio_mode = auto
 
 # `ignore` is effectively equivalent to `-p no:warnings`.

requirements/base.txt

@@ -168,11 +168,11 @@ greenlet==3.5.4
     #   apache-superset (pyproject.toml)
     #   shillelagh
     #   sqlalchemy
-gunicorn==26.2.0
+gunicorn==26.0.0
     # via apache-superset (pyproject.toml)
 hashids==1.3.1
     # via apache-superset (pyproject.toml)
-holidays==0.103
+holidays==0.102
     # via apache-superset (pyproject.toml)
 humanize==4.12.3
     # via apache-superset (pyproject.toml)
@@ -263,6 +263,7 @@ packaging==25.0
     #   apache-superset (pyproject.toml)
     #   apispec
     #   deprecation
+    #   gunicorn
     #   kombu
     #   limits
     #   shillelagh

requirements/development.in

@@ -16,32 +16,5 @@
 # specific language governing permissions and limitations
 # under the License.
 #
--e .[development,bigquery,clickhouse,cockroachdb,crate,databend,druid,duckdb,elasticsearch,fastmcp,firebird,gevent,gsheets,monetdb,mongodb,mssql,mysql,oracle,postgres,presto,prophet,risingwave,starrocks,trino,thumbnails,ydb]
+-e .[development,bigquery,druid,duckdb,fastmcp,gevent,gsheets,mysql,postgres,presto,prophet,trino,thumbnails]
 -e ./superset-extensions-cli[test]
-# testcontainers-backed db_engine_specs tests (tests/testcontainers/) --
-# see .github/workflows/testcontainers.yml
-#
-# `db2` (the `ibm-db-sa`/`ibm-db` driver) and `oceanbase` (the `oceanbase_py`
-# driver) are both deliberately left out of the baseline dev install above:
-# `ibm-db` ships no Linux arm64 wheel, breaking the multi-platform
-# (amd64+arm64) dev Docker image build; `oceanbase_py` pins
-# `sqlalchemy-utils>=0.38.3,<0.39`, which conflicts outright with Superset's
-# own `sqlalchemy-utils==0.42.1` pin -- there's no version of both that can
-# coexist in one resolved environment. Both testcontainers CI jobs install
-# their driver on demand instead, only for their own matrix leg -- see
-# .github/workflows/testcontainers.yml.
-#
-# mariadb/timescaledb/yugabytedb need no testcontainers extra of their own:
-# they reuse the postgres/mysql container classes pointed at a different
-# image, and psycopg2-binary/mysqlclient are already pulled in above via
-# the postgres/mysql extras. Plain postgres/mysql obviously need nothing
-# extra either. clickhouse and starrocks also need no testcontainers extra:
-# ClickHouseContainer has no driver import of its own (clickhouse-connect,
-# pulled in above via the clickhouse extra, is all the test needs), and
-# StarRocks has no dedicated testcontainers module at all -- its test uses
-# a generic DockerContainer plus the same mysqlclient the mysql extra
-# already provides. databend/risingwave/firebird/ydb are the same story:
-# none has a dedicated testcontainers module, so each test uses a generic
-# DockerContainer plus whatever driver its own extra above already
-# provides.
-testcontainers[cockroachdb,cratedb,mongodb,mssql,mysql,oracle,postgres,trino]>=4.15.0,<5

requirements/development.txt

@@ -12,17 +12,10 @@
     #   apache-superset
 aiofile==3.9.0
     # via py-key-value-aio
-aiohappyeyeballs==2.7.1
-    # via aiohttp
-aiohttp==3.14.3
-    # via ydb
-aiosignal==1.4.0
-    # via aiohttp
 alembic==1.15.2
     # via
     #   -c requirements/base-constraint.txt
     #   flask-migrate
-    #   starrocks
 amqp==5.3.1
     # via
     #   -c requirements/base-constraint.txt
@@ -31,8 +24,6 @@ annotated-types==0.7.0
     # via
     #   -c requirements/base-constraint.txt
     #   pydantic
-antlr4-python3-runtime==4.13.2
-    # via pymongosql
 anyio==4.11.0
     # via
     #   httpx
@@ -51,12 +42,9 @@ apsw==3.50.1.0
     #   shillelagh
 astroid==3.3.10
     # via pylint
-asyncmy2==0.2.21
-    # via starrocks
 attrs==25.3.0
     # via
     #   -c requirements/base-constraint.txt
-    #   aiohttp
     #   cattrs
     #   cyclopts
     #   jsonschema
@@ -77,7 +65,6 @@ backports-tarfile==1.2.0
 backports-zstd==1.6.0
     # via
     #   -c requirements/base-constraint.txt
-    #   clickhouse-connect
     #   flask-compress
 bcrypt==4.3.0
     # via
@@ -130,11 +117,8 @@ celery==5.6.3
 certifi==2026.5.20
     # via
     #   -c requirements/base-constraint.txt
-    #   clickhouse-connect
-    #   elasticsearch
     #   httpcore
     #   httpx
-    #   opensearch-py
     #   requests
 cffi==2.0.0
     # via
@@ -176,8 +160,6 @@ click-repl==0.3.0
     # via
     #   -c requirements/base-constraint.txt
     #   celery
-clickhouse-connect==1.7.2
-    # via apache-superset
 cmdstanpy==1.1.0
     # via prophet
 colorama==0.4.6
@@ -189,8 +171,6 @@ contourpy==1.0.7
     # via matplotlib
 coverage==7.6.8
     # via pytest-cov
-crate==2.2.1
-    # via sqlalchemy-cratedb
 cron-descriptor==1.4.5
     # via
     #   -c requirements/base-constraint.txt
@@ -206,20 +186,14 @@ cryptography==50.0.0
     #   authlib
     #   google-auth
     #   joserfc
-    #   oracledb
     #   paramiko
     #   pyjwt
-    #   pymysql
     #   pyopenssl
     #   secretstorage
 cycler==0.12.1
     # via matplotlib
 cyclopts==4.2.4
     # via fastmcp-slim
-databend-driver==0.34.2
-    # via databend-sqlalchemy
-databend-sqlalchemy==0.5.5
-    # via apache-superset
 db-dtypes==1.3.1
     # via pandas-gbq
 defusedxml==0.7.1
@@ -242,11 +216,8 @@ dnspython==2.7.0
     # via
     #   -c requirements/base-constraint.txt
     #   email-validator
-    #   pymongo
-docker==7.2.0
-    # via
-    #   apache-superset
-    #   testcontainers
+docker==7.0.0
+    # via apache-superset
 docstring-parser==0.17.0
     # via cyclopts
 docutils==0.22.2
@@ -257,10 +228,6 @@ duckdb==1.5.5
     #   duckdb-engine
 duckdb-engine==0.17.0
     # via apache-superset
-elasticsearch==7.17.13
-    # via elasticsearch-dbapi
-elasticsearch-dbapi==0.2.13
-    # via apache-superset
 email-validator==2.2.0
     # via
     #   -c requirements/base-constraint.txt
@@ -270,8 +237,6 @@ et-xmlfile==2.0.0
     # via
     #   -c requirements/base-constraint.txt
     #   openpyxl
-events==0.5
-    # via opensearch-py
 exceptiongroup==1.3.0
     # via fastmcp-slim
 fastmcp==3.4.7
@@ -282,10 +247,6 @@ filelock==3.20.3
     # via
     #   -c requirements/base-constraint.txt
     #   virtualenv
-firebird-base==2.0.3
-    # via firebird-driver
-firebird-driver==2.0.3
-    # via sqlalchemy-firebird
 flask==2.3.3
     # via
     #   -c requirements/base-constraint.txt
@@ -366,18 +327,12 @@ fonttools==4.60.2
     # via matplotlib
 freezegun==1.5.1
     # via apache-superset
-frozenlist==1.8.0
-    # via
-    #   aiohttp
-    #   aiosignal
 future==1.0.0
     # via pyhive
 geographiclib==2.0
     # via
     #   -c requirements/base-constraint.txt
     #   geopy
-geojson==3.3.0
-    # via sqlalchemy-cratedb
 geopy==2.4.1
     # via
     #   -c requirements/base-constraint.txt
@@ -434,10 +389,9 @@ grpcio==1.83.0
     #   apache-superset
     #   google-api-core
     #   grpcio-status
-    #   ydb
 grpcio-status==1.60.1
     # via google-api-core
-gunicorn==26.2.0
+gunicorn==26.0.0
     # via
     #   -c requirements/base-constraint.txt
     #   apache-superset
@@ -449,7 +403,7 @@ hashids==1.3.1
     # via
     #   -c requirements/base-constraint.txt
     #   apache-superset
-holidays==0.103
+holidays==0.102
     # via
     #   -c requirements/base-constraint.txt
     #   apache-superset
@@ -460,7 +414,6 @@ httpx==0.28.1
     # via
     #   fastmcp-slim
     #   mcp
-    #   testcontainers
 httpx-sse==0.4.1
     # via mcp
 humanize==4.12.3
@@ -477,7 +430,6 @@ idna==3.15
     #   httpx
     #   requests
     #   url-normalize
-    #   yarl
 importlib-metadata==8.7.0
     # via
     #   keyring
@@ -516,7 +468,6 @@ jmespath==1.1.0
     # via
     #   boto3
     #   botocore
-    #   pymongosql
 joserfc==1.7.2
     # via fastmcp-slim
 jsonpath-ng==1.8.0
@@ -549,8 +500,6 @@ kombu==5.6.2
     # via
     #   -c requirements/base-constraint.txt
     #   celery
-lark==1.3.1
-    # via starrocks
 lazy-object-proxy==1.10.0
     # via openapi-spec-validator
 limits==5.1.0
@@ -558,9 +507,7 @@ limits==5.1.0
     #   -c requirements/base-constraint.txt
     #   flask-limiter
 lz4==4.4.5
-    # via
-    #   clickhouse-connect
-    #   trino
+    # via trino
 mako==1.4.1
     # via
     #   -c requirements/base-constraint.txt
@@ -600,10 +547,8 @@ matplotlib==3.9.0
     # via prophet
 mccabe==0.7.0
     # via pylint
-mcp==1.29.1
-    # via
-    #   apache-superset
-    #   fastmcp-slim
+mcp==1.24.0
+    # via fastmcp-slim
 mdurl==0.1.2
     # via
     #   -c requirements/base-constraint.txt
@@ -620,10 +565,6 @@ msgspec==0.19.0
     # via
     #   -c requirements/base-constraint.txt
     #   flask-session
-multidict==6.7.1
-    # via
-    #   aiohttp
-    #   yarl
 mysqlclient==2.2.8
     # via apache-superset
 nh3==0.3.6
@@ -662,22 +603,14 @@ openpyxl==3.1.5
     # via
     #   -c requirements/base-constraint.txt
     #   pandas
-opensearch-py==2.8.0
-    # via elasticsearch-dbapi
 opentelemetry-api==1.39.1
     # via fastmcp-slim
-oracledb==4.0.2
-    # via
-    #   apache-superset
-    #   testcontainers
 ordered-set==4.1.0
     # via
     #   -c requirements/base-constraint.txt
     #   flask-limiter
 orjson==3.11.9
-    # via
-    #   crate
-    #   trino
+    # via trino
 packaging==25.0
     # via
     #   -c requirements/base-constraint.txt
@@ -685,10 +618,11 @@ packaging==25.0
     #   apispec
     #   db-dtypes
     #   deprecation
+    #   docker
     #   duckdb-engine
-    #   elasticsearch-dbapi
     #   fastmcp-slim
     #   google-cloud-bigquery
+    #   gunicorn
     #   kombu
     #   limits
     #   matplotlib
@@ -696,8 +630,6 @@ packaging==25.0
     #   pytest
     #   shillelagh
     #   sqlalchemy-bigquery
-    #   sqlalchemy-firebird
-    #   ydb
 pandas==2.3.3
     # via
     #   -c requirements/base-constraint.txt
@@ -759,22 +691,16 @@ prompt-toolkit==3.0.51
     # via
     #   -c requirements/base-constraint.txt
     #   click-repl
-propcache==0.5.2
-    # via
-    #   aiohttp
-    #   yarl
 prophet==1.4.0
     # via apache-superset
 proto-plus==1.25.0
     # via google-api-core
 protobuf==5.29.6
     # via
-    #   firebird-base
     #   google-api-core
     #   googleapis-common-protos
     #   grpcio-status
     #   proto-plus
-    #   ydb
 psutil==6.1.0
     # via
     #   apache-superset
@@ -848,24 +774,6 @@ pyjwt==2.13.0
     #   mcp
 pylint==3.3.7
     # via apache-superset
-pymonetdb==1.9.1
-    # via
-    #   apache-superset
-    #   sqlalchemy-monetdb
-pymongo==4.17.0
-    # via
-    #   pymongosql
-    #   testcontainers
-pymongosql==0.7.3
-    # via apache-superset
-pymssql==2.3.13
-    # via
-    #   apache-superset
-    #   testcontainers
-pymysql==1.2.0
-    # via
-    #   starrocks
-    #   testcontainers
 pynacl==1.6.2
     # via
     #   -c requirements/base-constraint.txt
@@ -910,13 +818,11 @@ python-dateutil==2.9.0.post0
     #   botocore
     #   celery
     #   croniter
-    #   firebird-driver
     #   flask-appbuilder
     #   freezegun
     #   google-cloud-bigquery
     #   holidays
     #   matplotlib
-    #   opensearch-py
     #   pandas
     #   pyhive
     #   shillelagh
@@ -927,7 +833,6 @@ python-dotenv==1.2.2
     #   apache-superset
     #   fastmcp-slim
     #   pydantic-settings
-    #   testcontainers
 python-ldap==3.4.7
     # via apache-superset
 python-multipart==0.0.29
@@ -971,7 +876,6 @@ requests==2.33.0
     #   google-api-core
     #   google-cloud-bigquery
     #   jsonschema-path
-    #   opensearch-py
     #   pydruid
     #   pyhive
     #   requests-cache
@@ -1050,42 +954,20 @@ sqlalchemy==2.0.52
     #   alembic
     #   apache-superset
     #   apache-superset-core
-    #   databend-sqlalchemy
     #   duckdb-engine
-    #   elasticsearch-dbapi
     #   flask-appbuilder
     #   flask-sqlalchemy
     #   marshmallow-sqlalchemy
     #   shillelagh
     #   sqlalchemy-bigquery
-    #   sqlalchemy-cockroachdb
     #   sqlalchemy-continuum
-    #   sqlalchemy-cratedb
-    #   sqlalchemy-firebird
-    #   sqlalchemy-monetdb
-    #   sqlalchemy-risingwave
     #   sqlalchemy-utils
-    #   starrocks
-    #   testcontainers
-    #   ydb-sqlalchemy
 sqlalchemy-bigquery==1.17.2
     # via apache-superset
-sqlalchemy-cockroachdb==2.0.4
-    # via apache-superset
 sqlalchemy-continuum==1.7.0
     # via
     #   -c requirements/base-constraint.txt
     #   apache-superset
-sqlalchemy-cratedb==0.43.1
-    # via
-    #   apache-superset
-    #   testcontainers
-sqlalchemy-firebird==2.2.0
-    # via apache-superset
-sqlalchemy-monetdb==2.1.0
-    # via apache-superset
-sqlalchemy-risingwave==2.1.0
-    # via apache-superset
 sqlalchemy-utils==0.42.1
     # via
     #   -c requirements/base-constraint.txt
@@ -1097,7 +979,6 @@ sqlglot==30.17.0
     #   -c requirements/base-constraint.txt
     #   apache-superset
     #   apache-superset-core
-    #   ydb-sqlglot-plugin
 sqloxide==0.1.51
     # via apache-superset
 sse-starlette==3.0.2
@@ -1110,19 +991,15 @@ starlette==1.3.1
     # via
     #   fastmcp-slim
     #   mcp
-starrocks==1.3.4
-    # via apache-superset
 statsd==4.0.1
     # via apache-superset
-syntaqlite==0.9.0
+syntaqlite==0.7.1
     # via apache-superset
 tabulate==0.10.0
     # via
     #   -c requirements/base-constraint.txt
     #   apache-superset
-testcontainers==4.15.0
-    # via -r requirements/development.in
-tiktoken==0.14.0
+tiktoken==0.13.0
     # via apache-superset
 tomli-w==1.2.0
     # via apache-superset-extensions-cli
@@ -1132,15 +1009,11 @@ tqdm==4.67.1
     # via
     #   cmdstanpy
     #   prophet
-trino==0.339.0
-    # via
-    #   apache-superset
-    #   testcontainers
+trino==0.338.0
+    # via apache-superset
 typing-extensions==4.16.0
     # via
     #   -c requirements/base-constraint.txt
-    #   aiohttp
-    #   aiosignal
     #   alembic
     #   anyio
     #   apache-superset
@@ -1152,7 +1025,6 @@ typing-extensions==4.16.0
     #   limits
     #   mcp
     #   opentelemetry-api
-    #   oracledb
     #   py-key-value-aio
     #   pydantic
     #   pydantic-core
@@ -1161,7 +1033,6 @@ typing-extensions==4.16.0
     #   shillelagh
     #   sqlalchemy
     #   starlette
-    #   testcontainers
     #   typing-inspection
 typing-inspection==0.4.2
     # via
@@ -1189,22 +1060,13 @@ urllib3==2.7.0
     # via
     #   -c requirements/base-constraint.txt
     #   botocore
-    #   clickhouse-connect
-    #   crate
     #   docker
-    #   elasticsearch
-    #   opensearch-py
     #   requests
     #   requests-cache
-    #   testcontainers
 uvicorn==0.37.0
     # via
     #   fastmcp-slim
     #   mcp
-verlib2==0.3.2
-    # via
-    #   crate
-    #   sqlalchemy-cratedb
 vine==5.1.0
     # via
     #   -c requirements/base-constraint.txt
@@ -1238,7 +1100,6 @@ wrapt==1.17.2
     # via
     #   -c requirements/base-constraint.txt
     #   deprecated
-    #   testcontainers
 wtforms==3.2.2
     # via
     #   -c requirements/base-constraint.txt
@@ -1259,18 +1120,6 @@ xlsxwriter==3.2.9
     #   -c requirements/base-constraint.txt
     #   apache-superset
     #   pandas
-yarl==1.24.5
-    # via aiohttp
-ydb==3.31.4
-    # via
-    #   ydb-dbapi
-    #   ydb-sqlalchemy
-ydb-dbapi==0.1.23
-    # via ydb-sqlalchemy
-ydb-sqlalchemy==0.1.22
-    # via apache-superset
-ydb-sqlglot-plugin==0.2.8
-    # via apache-superset
 zipp==3.23.0
     # via importlib-metadata
 zope-event==5.0

superset-core/src/superset_core/semantic_layers/__init__.py

@@ -1,18 +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.
-
-"""Semantic layer contracts for extension authors."""

superset-frontend/oxlint.json

@@ -113,7 +113,7 @@
     // === Import plugin rules ===
     "import/named": "error",
     "import/export": "error",
-    "import/no-named-as-default": "warn",
+    "import/no-named-as-default": "error",
     "import/no-named-as-default-member": "error",
     "import/no-mutable-exports": "error",
     "import/no-amd": "error",

superset-frontend/package.json

@@ -177,7 +177,7 @@
     "geostyler-style": "11.0.2",
     "geostyler-wfs-parser": "^3.0.1",
     "google-auth-library": "^11.0.2",
-    "immer": "^11.1.18",
+    "immer": "^11.1.17",
     "interweave": "^13.1.1",
     "jquery": "^4.0.0",
     "js-levenshtein": "^1.1.6",
@@ -230,7 +230,7 @@
     "use-event-callback": "^0.1.0",
     "use-immer": "^0.11.0",
     "use-query-params": "^2.2.2",
-    "uuid": "^14.0.2",
+    "uuid": "^14.0.1",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
     "yargs": "^18.1.0"
   },
@@ -257,12 +257,12 @@
     "@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.10",
-    "@storybook/addon-links": "10.5.10",
-    "@storybook/react-webpack5": "10.5.10",
+    "@storybook/addon-docs": "10.5.9",
+    "@storybook/addon-links": "10.5.9",
+    "@storybook/react-webpack5": "10.5.9",
     "@storybook/test-runner": "0.24.4",
     "@svgr/webpack": "^8.1.0",
-    "@swc/core": "^1.16.1",
+    "@swc/core": "^1.16.0",
     "@swc/plugin-emotion": "^15.0.0",
     "@swc/plugin-transform-imports": "^13.0.0",
     "@testing-library/dom": "^10.4.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.16",
+    "baseline-browser-mapping": "^2.11.15",
     "cheerio": "1.2.0",
     "concurrently": "^10.0.5",
     "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.10",
+    "eslint-plugin-storybook": "10.5.9",
     "eslint-plugin-testing-library": "^7.16.2",
     "eslint-plugin-theme-colors": "file:eslint-rules/eslint-plugin-theme-colors",
     "fetch-mock": "^12.6.0",
@@ -326,13 +326,13 @@
     "jest-websocket-mock": "^2.5.0",
     "js-yaml-loader": "^1.2.2",
     "jsdom": "^30.0.1",
-    "lerna": "^10.0.1",
+    "lerna": "^10.0.0",
     "lightningcss": "^1.33.0",
     "mini-css-extract-plugin": "^2.10.2",
     "minimizer-webpack-plugin": "^5.6.1",
     "open-cli": "^9.0.0",
-    "oxfmt": "^0.64.0",
-    "oxlint": "^1.79.0",
+    "oxfmt": "^0.63.0",
+    "oxlint": "^1.78.0",
     "po2json": "^0.4.5",
     "postcss-styled-syntax": "^0.7.2",
     "process": "^0.11.10",
@@ -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.10",
+    "storybook": "10.5.9",
     "style-loader": "^4.0.0",
     "stylelint": "^17.14.1",
     "swc-loader": "^0.2.7",

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

@@ -68,7 +68,7 @@
     "d3-time": "^3.1.0",
     "d3-time-format": "^4.1.0",
     "dayjs": "^1.11.23",
-    "dompurify": "^3.4.14",
+    "dompurify": "^3.4.13",
     "fetch-retry": "^6.0.0",
     "handlebars": "^4.7.9",
     "jed": "^1.1.1",

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

@@ -1,153 +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 { useState } from 'react';
-import { fireEvent, render, screen } from '@superset-ui/core/spec';
-import { Input } from '../Input';
-import { Modal } from './Modal';
-
-const drag = (
-  target: Element,
-  from: [number, number],
-  to: [number, number],
-) => {
-  fireEvent.mouseDown(target, { clientX: from[0], clientY: from[1] });
-  fireEvent.mouseMove(document, { clientX: to[0], clientY: to[1] });
-  fireEvent.mouseUp(document);
-};
-
-const isDragged = () => !!document.querySelector('.react-draggable-dragged');
-
-describe('Modal draggable', () => {
-  test('dragging from the title bar moves the modal', () => {
-    render(
-      <Modal show onHide={() => {}} title="Edit Dataset" draggable name="test">
-        <Input data-test="field" defaultValue="value" />
-      </Modal>,
-    );
-
-    const trigger = document.querySelector('.draggable-trigger') as HTMLElement;
-    drag(trigger, [100, 50], [150, 90]);
-
-    expect(isDragged()).toBe(true);
-  });
-
-  test('dragging inside modal content does not move the modal', () => {
-    render(
-      <Modal show onHide={() => {}} title="Edit Dataset" draggable name="test">
-        <Input data-test="field" defaultValue="first_view_event" />
-      </Modal>,
-    );
-
-    const input = screen.getByTestId('field');
-    drag(input, [200, 400], [260, 430]);
-
-    expect(isDragged()).toBe(false);
-  });
-
-  test('dragging inside modal content does not move the modal, even after an unrelated re-render while the title was hovered', () => {
-    // Regression test: the title bar used to gate dragging with a
-    // hover-tracked boolean (mouseover/mouseout on `.draggable-trigger`)
-    // instead of react-draggable's own `handle` prop. Because the title
-    // element was defined as an inline component recreated on every
-    // render, any unrelated state change while the cursor was over the
-    // title (e.g. typing in any field) force-remounted it without a real
-    // mouseout ever firing, leaving dragging permanently enabled -- so
-    // selecting text anywhere in the modal dragged the whole modal
-    // instead.
-    function Harness() {
-      const [tick, setTick] = useState(0);
-      return (
-        <Modal
-          show
-          onHide={() => {}}
-          title="Edit Dataset"
-          draggable
-          name="test"
-        >
-          <button
-            type="button"
-            data-test="rerender"
-            onClick={() => setTick(tick + 1)}
-          >
-            rerender
-          </button>
-          <Input data-test="field" defaultValue="first_view_event" />
-        </Modal>
-      );
-    }
-
-    render(<Harness />);
-
-    const trigger = document.querySelector('.draggable-trigger') as HTMLElement;
-    fireEvent.mouseOver(trigger);
-    fireEvent.click(screen.getByTestId('rerender'));
-
-    const input = screen.getByTestId('field');
-    drag(input, [200, 400], [260, 430]);
-
-    expect(isDragged()).toBe(false);
-  });
-
-  test('dragging is disabled entirely when draggable is not set', () => {
-    render(
-      <Modal show onHide={() => {}} title="Edit Dataset" name="test">
-        <Input data-test="field" defaultValue="value" />
-      </Modal>,
-    );
-
-    expect(document.querySelector('.draggable-trigger')).toBeNull();
-  });
-
-  test('draggableConfig cannot re-enable dragging on a non-draggable modal', () => {
-    render(
-      <Modal
-        show
-        onHide={() => {}}
-        title="Edit Dataset"
-        name="test"
-        draggableConfig={{ disabled: false }}
-      >
-        <Input data-test="field" defaultValue="value" />
-      </Modal>,
-    );
-
-    expect(document.querySelector('.draggable-trigger')).toBeNull();
-  });
-
-  test('draggableConfig can still opt a draggable modal out of dragging', () => {
-    render(
-      <Modal
-        show
-        onHide={() => {}}
-        title="Edit Dataset"
-        draggable
-        name="test"
-        draggableConfig={{ disabled: true }}
-      >
-        <Input data-test="field" defaultValue="value" />
-      </Modal>,
-    );
-
-    const trigger = document.querySelector('.draggable-trigger') as HTMLElement;
-    drag(trigger, [100, 50], [150, 90]);
-
-    expect(isDragged()).toBe(false);
-  });
-});

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

@@ -269,6 +269,7 @@ const CustomModal = ({
   );
   const draggableRef = useRef<HTMLDivElement>(null);
   const [bounds, setBounds] = useState<DraggableBounds>({});
+  const [dragDisabled, setDragDisabled] = useState<boolean>(true);
   const theme = useTheme();
 
   const handleOnHide = () => {
@@ -338,7 +339,19 @@ const CustomModal = ({
   }, [hideFooter, resizableConfig]);
 
   const ModalTitle = () =>
-    draggable ? <div className="draggable-trigger">{title}</div> : <>{title}</>;
+    draggable ? (
+      <div
+        className="draggable-trigger"
+        onMouseOver={() => dragDisabled && setDragDisabled(false)}
+        onMouseOut={() => !dragDisabled && setDragDisabled(true)}
+        onFocus={() => dragDisabled && setDragDisabled(false)}
+        onBlur={() => !dragDisabled && setDragDisabled(true)}
+      >
+        {title}
+      </div>
+    ) : (
+      <>{title}</>
+    );
 
   return (
     <StyledModal
@@ -365,19 +378,13 @@ const CustomModal = ({
       modalRender={modal =>
         resizable || draggable ? (
           <Draggable
+            disabled={!draggable || dragDisabled}
             bounds={bounds ?? false}
             onStart={(event, uiData) => onDragStart(event, uiData)}
-            {...draggableConfig}
-            // `disabled` and `handle` are applied after the spread so callers
-            // can't use `draggableConfig` to re-enable dragging on a
-            // non-draggable modal or move the drag handle off the title bar.
-            // A caller opting a draggable modal out via
-            // `draggableConfig.disabled` is still honored.
-            disabled={!draggable || !!draggableConfig?.disabled}
-            handle={draggable ? '.draggable-trigger' : undefined}
             // Pass nodeRef so react-draggable does not fall back to
             // ReactDOM.findDOMNode (deprecated in React 18+ Strict Mode).
             nodeRef={draggableRef}
+            {...draggableConfig}
           >
             {resizable ? (
               <Resizable className="resizable" {...getResizableConfig}>

superset-frontend/packages/superset-ui-core/src/components/ThemedAgGridReact/ThemedAgGridReact.test.tsx

@@ -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,

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

@@ -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,

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

@@ -28,7 +28,6 @@ export enum FeatureFlag {
   AlertReportSlackV2 = 'ALERT_REPORT_SLACK_V2',
   AlertReportWebhook = 'ALERT_REPORT_WEBHOOK',
   AlertReportsFilter = 'ALERT_REPORTS_FILTER',
-  AlertReportsRetry = 'ALERT_REPORTS_RETRY',
   AllowFullCsvExport = 'ALLOW_FULL_CSV_EXPORT',
   ChartPluginsExperimental = 'CHART_PLUGINS_EXPERIMENTAL',
   ConfirmDashboardDiff = 'CONFIRM_DASHBOARD_DIFF',

superset-frontend/plugins/plugin-chart-country-map/scripts/Country Map GeoJSON Generator.ipynb

@@ -105,7 +105,7 @@
    "source": [
     "## Download Data\n",
     "\n",
-    "Download datasets (_Admin 0 - Countries_ in [1:10](https://www.naturalearthdata.com/downloads/10m-cultural-vectors/), and _Admin 1 \u2013 States, Provinces_ in 1:10 and [1:50](https://www.naturalearthdata.com/downloads/50m-cultural-vectors/)) from Natural Earch Data:"
+    "Download datasets (_Admin 0 - Countries_ in [1:10](https://www.naturalearthdata.com/downloads/10m-cultural-vectors/), and _Admin 1 – States, Provinces_ in 1:10 and [1:50](https://www.naturalearthdata.com/downloads/50m-cultural-vectors/)) from Natural Earch Data:"
    ]
   },
   {
@@ -584,7 +584,7 @@
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
-       "<p>9 rows \u00d7 121 columns</p>\n",
+       "<p>9 rows × 121 columns</p>\n",
        "</div>"
       ],
       "text/plain": [
@@ -926,33 +926,33 @@
        "      <td>11.0</td>\n",
        "      <td>11.0</td>\n",
        "      <td>Q34617</td>\n",
-       "      <td>\u0633\u0627\u0646 \u0628\u064a\u064a\u0631 \u0648\u0645\u064a\u0643\u0644\u0648\u0646</td>\n",
-       "      <td>\u09b8\u09be\u0981 \u09aa\u09bf\u09af\u09bc\u09c7\u09b0 \u0993 \u09ae\u09bf\u0995\u09b2\u09cb\u0981</td>\n",
+       "      <td>سان بيير وميكلون</td>\n",
+       "      <td>সাঁ পিয়ের ও মিকলোঁ</td>\n",
        "      <td>Saint-Pierre und Miquelon</td>\n",
        "      <td>Saint Pierre and Miquelon</td>\n",
-       "      <td>San Pedro y Miquel\u00f3n</td>\n",
+       "      <td>San Pedro y Miquelón</td>\n",
        "      <td>Saint-Pierre-et-Miquelon</td>\n",
-       "      <td>\u03a3\u03b1\u03b9\u03bd-\u03a0\u03b9\u03b5\u03c1 \u03ba\u03b1\u03b9 \u039c\u03b9\u03ba\u03b5\u03bb\u03cc\u03bd</td>\n",
-       "      <td>\u0938\u0928\u094d\u0924 \u092a\u093f\u092f\u0930 \u0914\u0930 \u092e\u093f\u0915\u0932\u093e\u0928</td>\n",
-       "      <td>Saint-Pierre \u00e9s Miquelon</td>\n",
+       "      <td>Σαιν-Πιερ και Μικελόν</td>\n",
+       "      <td>सन्त पियर और मिकलान</td>\n",
+       "      <td>Saint-Pierre és Miquelon</td>\n",
        "      <td>Saint Pierre dan Miquelon</td>\n",
        "      <td>Saint-Pierre e Miquelon</td>\n",
-       "      <td>\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u5cf6\u30fb\u30df\u30af\u30ed\u30f3\u5cf6</td>\n",
-       "      <td>\uc0dd\ud53c\uc5d0\ub974 \ubbf8\ud074\ub871</td>\n",
+       "      <td>サンピエール島・ミクロン島</td>\n",
+       "      <td>생피에르 미클롱</td>\n",
        "      <td>Saint-Pierre en Miquelon</td>\n",
        "      <td>Saint-Pierre i Miquelon</td>\n",
        "      <td>Saint-Pierre e Miquelon</td>\n",
-       "      <td>\u0421\u0435\u043d-\u041f\u044c\u0435\u0440 \u0438 \u041c\u0438\u043a\u0435\u043b\u043e\u043d</td>\n",
+       "      <td>Сен-Пьер и Микелон</td>\n",
        "      <td>Saint-Pierre och Miquelon</td>\n",
        "      <td>Saint Pierre ve Miquelon</td>\n",
-       "      <td>Saint-Pierre v\u00e0 Miquelon</td>\n",
-       "      <td>\u5723\u76ae\u57c3\u5c14\u548c\u5bc6\u514b\u9686</td>\n",
+       "      <td>Saint-Pierre và Miquelon</td>\n",
+       "      <td>圣皮埃尔和密克隆</td>\n",
        "      <td>1159315673</td>\n",
-       "      <td>\u05e1\u05df-\u05e4\u05d9\u05d9\u05e8 \u05d5\u05de\u05d9\u05e7\u05dc\u05d5\u05df</td>\n",
-       "      <td>\u0421\u0435\u043d-\u041f'\u0454\u0440 \u0456 \u041c\u0456\u043a\u0435\u043b\u043e\u043d</td>\n",
-       "      <td>\u0633\u06cc\u0646\u0679 \u067e\u06cc\u0626\u0631 \u0648 \u0645\u06cc\u06a9\u06cc\u0644\u0648\u0646</td>\n",
-       "      <td>\u0633\u0646 \u067e\u06cc\u0631 \u0648 \u0645\u06cc\u06a9\u0644\u0646</td>\n",
-       "      <td>\u8056\u76ae\u57c3\u8207\u5bc6\u514b\u9686\u7fa4\u5cf6</td>\n",
+       "      <td>סן-פייר ומיקלון</td>\n",
+       "      <td>Сен-П'єр і Мікелон</td>\n",
+       "      <td>سینٹ پیئر و میکیلون</td>\n",
+       "      <td>سن پیر و میکلن</td>\n",
+       "      <td>聖皮埃與密克隆群島</td>\n",
        "      <td>None</td>\n",
        "      <td>None</td>\n",
        "      <td>None</td>\n",
@@ -1051,33 +1051,33 @@
        "      <td>11.0</td>\n",
        "      <td>11.0</td>\n",
        "      <td>None</td>\n",
-       "      <td>\u0645\u064a\u0643\u0644\u0648\u0646 \u0648\u0644\u0627\u0646\u063a\u0644\u064a\u062f</td>\n",
-       "      <td>\u09ae\u09bf\u0995\u09c1\u0987\u09b2\u09a8-\u09b2\u09cd\u09af\u09be\u0982\u09b2\u09c7\u09a1</td>\n",
+       "      <td>ميكلون ولانغليد</td>\n",
+       "      <td>মিকুইলন-ল্যাংলেড</td>\n",
        "      <td>Miquelon-Langlade</td>\n",
        "      <td>Miquelon-Langlade</td>\n",
-       "      <td>Miquel\u00f3n-Langlade</td>\n",
+       "      <td>Miquelón-Langlade</td>\n",
        "      <td>Miquelon-Langlade</td>\n",
-       "      <td>\u039c\u03b9\u03ba\u03b5\u03bb\u03cc\u03bd-\u039b\u03b1\u03b3\u03ba\u03bb\u03ad\u03b9\u03bd\u03c4</td>\n",
-       "      <td>\u092e\u093f\u0915\u0947\u0932\u0949\u0928-\u0932\u0948\u0902\u0917\u0932\u0947\u0921</td>\n",
+       "      <td>Μικελόν-Λαγκλέιντ</td>\n",
+       "      <td>मिकेलॉन-लैंगलेड</td>\n",
        "      <td>Miquelon-Langlade</td>\n",
        "      <td>Miquelon-Langlade</td>\n",
        "      <td>Miquelon-Langlade</td>\n",
-       "      <td>\u30df\u30af\u30ed\u30f3\uff1d\u30e9\u30f3\u30b0\u30e9\u30fc\u30c9</td>\n",
-       "      <td>\ubbf8\ud074\ub871-\ub7ad\uae00\ub808\uc774\ub4dc</td>\n",
+       "      <td>ミクロン＝ラングラード</td>\n",
+       "      <td>미클롱-랭글레이드</td>\n",
        "      <td>Miquelon-Langlade</td>\n",
        "      <td>Miquelon-Langlade</td>\n",
-       "      <td>Miquel\u00e3o-Langlade</td>\n",
-       "      <td>\u041c\u0438\u043a\u0435\u043b\u043e\u043d-\u041b\u0430\u043d\u0433\u043b\u0430\u0434</td>\n",
+       "      <td>Miquelão-Langlade</td>\n",
+       "      <td>Микелон-Ланглад</td>\n",
        "      <td>Miquelon-Langlade</td>\n",
        "      <td>Miquelon-Langlade</td>\n",
        "      <td>Miquelon-Langlade</td>\n",
-       "      <td>\u5bc6\u514b\u9686-\u6717\u683c\u62c9\u5fb7</td>\n",
+       "      <td>密克隆-朗格拉德</td>\n",
        "      <td>1159315961</td>\n",
-       "      <td>\u05de\u05d9\u05e8\u05d4</td>\n",
-       "      <td>\u041c\u0456\u043a\u0432\u0435\u043b\u043e\u043d-\u041b\u0430\u043d\u0433\u043b\u0430\u0434\u0435</td>\n",
-       "      <td>\u0645\u06cc\u06a9\u06cc\u0648\u0644\u0648\u0646 \u0644\u06cc\u0646\u06af\u0644\u0627\u0688\u06d2</td>\n",
-       "      <td>\u0645\u06cc\u06a9\u0648\u0626\u0644\u0648\u0646-\u0644\u0627\u0646\u06af\u0644\u06cc\u062f</td>\n",
-       "      <td>\u5bc6\u514b\u9686-\u6717\u683c\u62c9\u5fb7</td>\n",
+       "      <td>מירה</td>\n",
+       "      <td>Міквелон-Лангладе</td>\n",
+       "      <td>میکیولون لینگلاڈے</td>\n",
+       "      <td>میکوئلون-لانگلید</td>\n",
+       "      <td>密克隆-朗格拉德</td>\n",
        "      <td>None</td>\n",
        "      <td>None</td>\n",
        "      <td>None</td>\n",
@@ -1167,48 +1167,48 @@
        "2177   PM.97501       None     None        1.0      fra     SB00       None   \n",
        "\n",
        "      min_label  max_label  min_zoom wikidataid           name_ar  \\\n",
-       "2176       11.0       11.0      11.0     Q34617  \u0633\u0627\u0646 \u0628\u064a\u064a\u0631 \u0648\u0645\u064a\u0643\u0644\u0648\u0646   \n",
-       "2177       11.0       11.0      11.0       None   \u0645\u064a\u0643\u0644\u0648\u0646 \u0648\u0644\u0627\u0646\u063a\u0644\u064a\u062f   \n",
+       "2176       11.0       11.0      11.0     Q34617  سان بيير وميكلون   \n",
+       "2177       11.0       11.0      11.0       None   ميكلون ولانغليد   \n",
        "\n",
        "                  name_bn                    name_de  \\\n",
-       "2176  \u09b8\u09be\u0981 \u09aa\u09bf\u09af\u09bc\u09c7\u09b0 \u0993 \u09ae\u09bf\u0995\u09b2\u09cb\u0981  Saint-Pierre und Miquelon   \n",
-       "2177     \u09ae\u09bf\u0995\u09c1\u0987\u09b2\u09a8-\u09b2\u09cd\u09af\u09be\u0982\u09b2\u09c7\u09a1          Miquelon-Langlade   \n",
+       "2176  সাঁ পিয়ের ও মিকলোঁ  Saint-Pierre und Miquelon   \n",
+       "2177     মিকুইলন-ল্যাংলেড          Miquelon-Langlade   \n",
        "\n",
        "                        name_en               name_es  \\\n",
-       "2176  Saint Pierre and Miquelon  San Pedro y Miquel\u00f3n   \n",
-       "2177          Miquelon-Langlade     Miquel\u00f3n-Langlade   \n",
+       "2176  Saint Pierre and Miquelon  San Pedro y Miquelón   \n",
+       "2177          Miquelon-Langlade     Miquelón-Langlade   \n",
        "\n",
        "                       name_fr                name_el              name_hi  \\\n",
-       "2176  Saint-Pierre-et-Miquelon  \u03a3\u03b1\u03b9\u03bd-\u03a0\u03b9\u03b5\u03c1 \u03ba\u03b1\u03b9 \u039c\u03b9\u03ba\u03b5\u03bb\u03cc\u03bd  \u0938\u0928\u094d\u0924 \u092a\u093f\u092f\u0930 \u0914\u0930 \u092e\u093f\u0915\u0932\u093e\u0928   \n",
-       "2177         Miquelon-Langlade      \u039c\u03b9\u03ba\u03b5\u03bb\u03cc\u03bd-\u039b\u03b1\u03b3\u03ba\u03bb\u03ad\u03b9\u03bd\u03c4      \u092e\u093f\u0915\u0947\u0932\u0949\u0928-\u0932\u0948\u0902\u0917\u0932\u0947\u0921   \n",
+       "2176  Saint-Pierre-et-Miquelon  Σαιν-Πιερ και Μικελόν  सन्त पियर और मिकलान   \n",
+       "2177         Miquelon-Langlade      Μικελόν-Λαγκλέιντ      मिकेलॉन-लैंगलेड   \n",
        "\n",
        "                       name_hu                    name_id  \\\n",
-       "2176  Saint-Pierre \u00e9s Miquelon  Saint Pierre dan Miquelon   \n",
+       "2176  Saint-Pierre és Miquelon  Saint Pierre dan Miquelon   \n",
        "2177         Miquelon-Langlade          Miquelon-Langlade   \n",
        "\n",
        "                      name_it        name_ja    name_ko  \\\n",
-       "2176  Saint-Pierre e Miquelon  \u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u5cf6\u30fb\u30df\u30af\u30ed\u30f3\u5cf6   \uc0dd\ud53c\uc5d0\ub974 \ubbf8\ud074\ub871   \n",
-       "2177        Miquelon-Langlade    \u30df\u30af\u30ed\u30f3\uff1d\u30e9\u30f3\u30b0\u30e9\u30fc\u30c9  \ubbf8\ud074\ub871-\ub7ad\uae00\ub808\uc774\ub4dc   \n",
+       "2176  Saint-Pierre e Miquelon  サンピエール島・ミクロン島   생피에르 미클롱   \n",
+       "2177        Miquelon-Langlade    ミクロン＝ラングラード  미클롱-랭글레이드   \n",
        "\n",
        "                       name_nl                  name_pl  \\\n",
        "2176  Saint-Pierre en Miquelon  Saint-Pierre i Miquelon   \n",
        "2177         Miquelon-Langlade        Miquelon-Langlade   \n",
        "\n",
        "                      name_pt             name_ru                    name_sv  \\\n",
-       "2176  Saint-Pierre e Miquelon  \u0421\u0435\u043d-\u041f\u044c\u0435\u0440 \u0438 \u041c\u0438\u043a\u0435\u043b\u043e\u043d  Saint-Pierre och Miquelon   \n",
-       "2177        Miquel\u00e3o-Langlade     \u041c\u0438\u043a\u0435\u043b\u043e\u043d-\u041b\u0430\u043d\u0433\u043b\u0430\u0434          Miquelon-Langlade   \n",
+       "2176  Saint-Pierre e Miquelon  Сен-Пьер и Микелон  Saint-Pierre och Miquelon   \n",
+       "2177        Miquelão-Langlade     Микелон-Ланглад          Miquelon-Langlade   \n",
        "\n",
        "                       name_tr                   name_vi   name_zh  \\\n",
-       "2176  Saint Pierre ve Miquelon  Saint-Pierre v\u00e0 Miquelon  \u5723\u76ae\u57c3\u5c14\u548c\u5bc6\u514b\u9686   \n",
-       "2177         Miquelon-Langlade         Miquelon-Langlade  \u5bc6\u514b\u9686-\u6717\u683c\u62c9\u5fb7   \n",
+       "2176  Saint Pierre ve Miquelon  Saint-Pierre và Miquelon  圣皮埃尔和密克隆   \n",
+       "2177         Miquelon-Langlade         Miquelon-Langlade  密克隆-朗格拉德   \n",
        "\n",
        "           ne_id          name_he             name_uk              name_ur  \\\n",
-       "2176  1159315673  \u05e1\u05df-\u05e4\u05d9\u05d9\u05e8 \u05d5\u05de\u05d9\u05e7\u05dc\u05d5\u05df  \u0421\u0435\u043d-\u041f'\u0454\u0440 \u0456 \u041c\u0456\u043a\u0435\u043b\u043e\u043d  \u0633\u06cc\u0646\u0679 \u067e\u06cc\u0626\u0631 \u0648 \u0645\u06cc\u06a9\u06cc\u0644\u0648\u0646   \n",
-       "2177  1159315961             \u05de\u05d9\u05e8\u05d4   \u041c\u0456\u043a\u0432\u0435\u043b\u043e\u043d-\u041b\u0430\u043d\u0433\u043b\u0430\u0434\u0435    \u0645\u06cc\u06a9\u06cc\u0648\u0644\u0648\u0646 \u0644\u06cc\u0646\u06af\u0644\u0627\u0688\u06d2   \n",
+       "2176  1159315673  סן-פייר ומיקלון  Сен-П'єр і Мікелон  سینٹ پیئر و میکیلون   \n",
+       "2177  1159315961             מירה   Міквелон-Лангладе    میکیولون لینگلاڈے   \n",
        "\n",
        "               name_fa   name_zht FCLASS_ISO FCLASS_US FCLASS_FR FCLASS_RU  \\\n",
-       "2176    \u0633\u0646 \u067e\u06cc\u0631 \u0648 \u0645\u06cc\u06a9\u0644\u0646  \u8056\u76ae\u57c3\u8207\u5bc6\u514b\u9686\u7fa4\u5cf6       None      None      None      None   \n",
-       "2177  \u0645\u06cc\u06a9\u0648\u0626\u0644\u0648\u0646-\u0644\u0627\u0646\u06af\u0644\u06cc\u062f   \u5bc6\u514b\u9686-\u6717\u683c\u62c9\u5fb7       None      None      None      None   \n",
+       "2176    سن پیر و میکلن  聖皮埃與密克隆群島       None      None      None      None   \n",
+       "2177  میکوئلون-لانگلید   密克隆-朗格拉德       None      None      None      None   \n",
        "\n",
        "     FCLASS_ES FCLASS_CN FCLASS_TW FCLASS_IN FCLASS_NP FCLASS_PK FCLASS_DE  \\\n",
        "2176      None      None      None      None      None      None      None   \n",
@@ -1330,7 +1330,7 @@
     "  'costa rica',\n",
     "  'croatia',\n",
     "  'cuba',\n",
-    "  'cura\u00e7ao',\n",
+    "  'curaçao',\n",
     "  'cyprus',\n",
     "  'czech republic',\n",
     "  'denmark',\n",
@@ -1343,7 +1343,7 @@
     "  'equatorial guinea',\n",
     "  'eritrea',\n",
     "  'estonia',\n",
-    "  # 'eswatini', # not sure why this doesn't work \u2014 Swaziland isn't available to alias, either.\n",
+    "  # 'eswatini', # not sure why this doesn't work — Swaziland isn't available to alias, either.\n",
     "  'ethiopia',\n",
     "  'falkland islands',\n",
     "  'faroe islands',\n",
@@ -1443,7 +1443,7 @@
     "  'portugal',\n",
     "  'puerto rico',\n",
     "  'qatar',\n",
-    "  # 'r\u00e9union', # part of France, in Natural Earth data\n",
+    "  # 'réunion', # part of France, in Natural Earth data\n",
     "  'republic of serbia',\n",
     "  'romania',\n",
     "  'russia',\n",
@@ -1911,34 +1911,34 @@
        "      <td>9.0</td>\n",
        "      <td>1159320473</td>\n",
        "      <td>Q8646</td>\n",
-       "      <td>\u0647\u0648\u0646\u063a \u0643\u0648\u0646\u063a</td>\n",
-       "      <td>\u09b9\u0982\u0995\u0982</td>\n",
+       "      <td>هونغ كونغ</td>\n",
+       "      <td>হংকং</td>\n",
        "      <td>Hongkong</td>\n",
        "      <td>Hong Kong</td>\n",
        "      <td>Hong Kong</td>\n",
-       "      <td>\u0647\u0646\u06af \u06a9\u0646\u06af</td>\n",
+       "      <td>هنگ کنگ</td>\n",
        "      <td>Hong Kong</td>\n",
-       "      <td>\u03a7\u03bf\u03bd\u03b3\u03ba \u039a\u03bf\u03bd\u03b3\u03ba</td>\n",
-       "      <td>\u05d4\u05d5\u05e0\u05d2 \u05e7\u05d5\u05e0\u05d2</td>\n",
-       "      <td>\u0939\u093e\u0902\u0917\u0915\u093e\u0902\u0917</td>\n",
+       "      <td>Χονγκ Κονγκ</td>\n",
+       "      <td>הונג קונג</td>\n",
+       "      <td>हांगकांग</td>\n",
        "      <td>Hongkong</td>\n",
        "      <td>Hong Kong</td>\n",
        "      <td>Hong Kong</td>\n",
-       "      <td>\u9999\u6e2f</td>\n",
-       "      <td>\ud64d\ucf69</td>\n",
+       "      <td>香港</td>\n",
+       "      <td>홍콩</td>\n",
        "      <td>Hongkong</td>\n",
        "      <td>Hongkong</td>\n",
        "      <td>Hong Kong</td>\n",
-       "      <td>\u0413\u043e\u043d\u043a\u043e\u043d\u0433</td>\n",
+       "      <td>Гонконг</td>\n",
        "      <td>Hongkong</td>\n",
        "      <td>Hong Kong</td>\n",
-       "      <td>\u0413\u043e\u043d\u043a\u043e\u043d\u0433</td>\n",
-       "      <td>\u06c1\u0627\u0646\u06af \u06a9\u0627\u0646\u06af</td>\n",
-       "      <td>H\u1ed3ng K\u00f4ng</td>\n",
-       "      <td>\u9999\u6e2f</td>\n",
-       "      <td>\u9999\u6e2f</td>\n",
+       "      <td>Гонконг</td>\n",
+       "      <td>ہانگ کانگ</td>\n",
+       "      <td>Hồng Kông</td>\n",
+       "      <td>香港</td>\n",
+       "      <td>香港</td>\n",
        "      <td>MULTIPOLYGON (((114.22983 22.55581, 114.23471 ...</td>\n",
-       "      <td>\u9999\u6e2f\u7279\u522b\u884c\u653f\u533a</td>\n",
+       "      <td>香港特别行政区</td>\n",
        "      <td>CN-91</td>\n",
        "    </tr>\n",
        "    <tr>\n",
@@ -1965,34 +1965,34 @@
        "      <td>8.0</td>\n",
        "      <td>1159321335</td>\n",
        "      <td>Q865</td>\n",
-       "      <td>\u062a\u0627\u064a\u0648\u0627\u0646</td>\n",
-       "      <td>\u09a4\u09be\u0987\u0993\u09af\u09bc\u09be\u09a8</td>\n",
+       "      <td>تايوان</td>\n",
+       "      <td>তাইওয়ান</td>\n",
        "      <td>Republik China</td>\n",
        "      <td>Taiwan</td>\n",
-       "      <td>Rep\u00fablica de China</td>\n",
-       "      <td>\u062a\u0627\u06cc\u0648\u0627\u0646</td>\n",
-       "      <td>Ta\u00efwan</td>\n",
-       "      <td>\u0394\u03b7\u03bc\u03bf\u03ba\u03c1\u03b1\u03c4\u03af\u03b1 \u03c4\u03b7\u03c2 \u039a\u03af\u03bd\u03b1\u03c2</td>\n",
-       "      <td>\u05d8\u05d0\u05d9\u05d5\u05d5\u05d0\u05df</td>\n",
-       "      <td>\u091a\u0940\u0928\u0940 \u0917\u0923\u0930\u093e\u091c\u094d\u092f</td>\n",
-       "      <td>K\u00ednai K\u00f6zt\u00e1rsas\u00e1g</td>\n",
+       "      <td>República de China</td>\n",
+       "      <td>تایوان</td>\n",
+       "      <td>Taïwan</td>\n",
+       "      <td>Δημοκρατία της Κίνας</td>\n",
+       "      <td>טאיוואן</td>\n",
+       "      <td>चीनी गणराज्य</td>\n",
+       "      <td>Kínai Köztársaság</td>\n",
        "      <td>Taiwan</td>\n",
        "      <td>Taiwan</td>\n",
-       "      <td>\u4e2d\u83ef\u6c11\u56fd</td>\n",
-       "      <td>\uc911\ud654\ubbfc\uad6d</td>\n",
+       "      <td>中華民国</td>\n",
+       "      <td>중화민국</td>\n",
        "      <td>Taiwan</td>\n",
-       "      <td>Republika Chi\u0144ska</td>\n",
+       "      <td>Republika Chińska</td>\n",
        "      <td>Taiwan</td>\n",
-       "      <td>\u0422\u0430\u0439\u0432\u0430\u043d\u044c</td>\n",
+       "      <td>Тайвань</td>\n",
        "      <td>Taiwan</td>\n",
-       "      <td>\u00c7in Cumhuriyeti</td>\n",
-       "      <td>\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0456\u043a\u0430 \u041a\u0438\u0442\u0430\u0439</td>\n",
-       "      <td>\u062a\u0627\u0626\u06cc\u0648\u0627\u0646</td>\n",
-       "      <td>\u0110\u00e0i Loan</td>\n",
-       "      <td>\u4e2d\u534e\u6c11\u56fd</td>\n",
-       "      <td>\u4e2d\u83ef\u6c11\u570b</td>\n",
+       "      <td>Çin Cumhuriyeti</td>\n",
+       "      <td>Республіка Китай</td>\n",
+       "      <td>تائیوان</td>\n",
+       "      <td>Đài Loan</td>\n",
+       "      <td>中华民国</td>\n",
+       "      <td>中華民國</td>\n",
        "      <td>MULTIPOLYGON (((121.90577 24.9501, 121.83473 2...</td>\n",
-       "      <td>\u4e2d\u56fd\u53f0\u6e7e</td>\n",
+       "      <td>中国台湾</td>\n",
        "      <td>CN-71</td>\n",
        "    </tr>\n",
        "    <tr>\n",
@@ -2019,34 +2019,34 @@
        "      <td>9.0</td>\n",
        "      <td>1159320475</td>\n",
        "      <td>Q14773</td>\n",
-       "      <td>\u0645\u0627\u0643\u0627\u0648</td>\n",
-       "      <td>\u09ae\u09be\u0995\u09be\u0993</td>\n",
+       "      <td>ماكاو</td>\n",
+       "      <td>মাকাও</td>\n",
        "      <td>Macau</td>\n",
        "      <td>Macau</td>\n",
        "      <td>Macao</td>\n",
-       "      <td>\u0645\u0627\u06a9\u0627\u0626\u0648</td>\n",
+       "      <td>ماکائو</td>\n",
        "      <td>Macao</td>\n",
-       "      <td>\u039c\u03b1\u03ba\u03ac\u03bf\u03c5</td>\n",
-       "      <td>\u05de\u05e7\u05d0\u05d5</td>\n",
-       "      <td>\u092e\u0915\u093e\u0909</td>\n",
-       "      <td>Maka\u00f3</td>\n",
+       "      <td>Μακάου</td>\n",
+       "      <td>מקאו</td>\n",
+       "      <td>मकाउ</td>\n",
+       "      <td>Makaó</td>\n",
        "      <td>Makau</td>\n",
        "      <td>Macao</td>\n",
-       "      <td>\u30de\u30ab\u30aa</td>\n",
-       "      <td>\ub9c8\uce74\uc624</td>\n",
+       "      <td>マカオ</td>\n",
+       "      <td>마카오</td>\n",
        "      <td>Macau</td>\n",
        "      <td>Makau</td>\n",
        "      <td>Macau</td>\n",
-       "      <td>\u041c\u0430\u043a\u0430\u043e</td>\n",
+       "      <td>Макао</td>\n",
        "      <td>Macao</td>\n",
        "      <td>Makao</td>\n",
-       "      <td>\u0410\u043e\u043c\u0438\u043d\u044c</td>\n",
-       "      <td>\u0645\u06a9\u0627\u0624</td>\n",
+       "      <td>Аоминь</td>\n",
+       "      <td>مکاؤ</td>\n",
        "      <td>Ma Cao</td>\n",
-       "      <td>\u6fb3\u95e8</td>\n",
-       "      <td>\u6fb3\u9580</td>\n",
+       "      <td>澳门</td>\n",
+       "      <td>澳門</td>\n",
        "      <td>MULTIPOLYGON (((113.5586 22.16303, 113.56943 2...</td>\n",
-       "      <td>\u6fb3\u95e8\u7279\u522b\u884c\u653f\u533a</td>\n",
+       "      <td>澳门特别行政区</td>\n",
        "      <td>CN-92</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
@@ -2070,34 +2070,34 @@
        "2          4           3     MO  20070017         5       0.0        4.0   \n",
        "\n",
        "   max_label       ne_id wikidataid    name_ar   name_bn         name_de  \\\n",
-       "0        9.0  1159320473      Q8646  \u0647\u0648\u0646\u063a \u0643\u0648\u0646\u063a      \u09b9\u0982\u0995\u0982        Hongkong   \n",
-       "1        8.0  1159321335       Q865     \u062a\u0627\u064a\u0648\u0627\u0646  \u09a4\u09be\u0987\u0993\u09af\u09bc\u09be\u09a8  Republik China   \n",
-       "2        9.0  1159320475     Q14773      \u0645\u0627\u0643\u0627\u0648     \u09ae\u09be\u0995\u09be\u0993           Macau   \n",
+       "0        9.0  1159320473      Q8646  هونغ كونغ      হংকং        Hongkong   \n",
+       "1        8.0  1159321335       Q865     تايوان  তাইওয়ান  Republik China   \n",
+       "2        9.0  1159320475     Q14773      ماكاو     মাকাও           Macau   \n",
        "\n",
        "     name_en             name_es  name_fa    name_fr               name_el  \\\n",
-       "0  Hong Kong           Hong Kong  \u0647\u0646\u06af \u06a9\u0646\u06af  Hong Kong           \u03a7\u03bf\u03bd\u03b3\u03ba \u039a\u03bf\u03bd\u03b3\u03ba   \n",
-       "1     Taiwan  Rep\u00fablica de China   \u062a\u0627\u06cc\u0648\u0627\u0646     Ta\u00efwan  \u0394\u03b7\u03bc\u03bf\u03ba\u03c1\u03b1\u03c4\u03af\u03b1 \u03c4\u03b7\u03c2 \u039a\u03af\u03bd\u03b1\u03c2   \n",
-       "2      Macau               Macao   \u0645\u0627\u06a9\u0627\u0626\u0648      Macao                \u039c\u03b1\u03ba\u03ac\u03bf\u03c5   \n",
+       "0  Hong Kong           Hong Kong  هنگ کنگ  Hong Kong           Χονγκ Κονγκ   \n",
+       "1     Taiwan  República de China   تایوان     Taïwan  Δημοκρατία της Κίνας   \n",
+       "2      Macau               Macao   ماکائو      Macao                Μακάου   \n",
        "\n",
        "     name_he       name_hi            name_hu    name_id    name_it name_ja  \\\n",
-       "0  \u05d4\u05d5\u05e0\u05d2 \u05e7\u05d5\u05e0\u05d2      \u0939\u093e\u0902\u0917\u0915\u093e\u0902\u0917           Hongkong  Hong Kong  Hong Kong      \u9999\u6e2f   \n",
-       "1    \u05d8\u05d0\u05d9\u05d5\u05d5\u05d0\u05df  \u091a\u0940\u0928\u0940 \u0917\u0923\u0930\u093e\u091c\u094d\u092f  K\u00ednai K\u00f6zt\u00e1rsas\u00e1g     Taiwan     Taiwan    \u4e2d\u83ef\u6c11\u56fd   \n",
-       "2       \u05de\u05e7\u05d0\u05d5          \u092e\u0915\u093e\u0909              Maka\u00f3      Makau      Macao     \u30de\u30ab\u30aa   \n",
+       "0  הונג קונג      हांगकांग           Hongkong  Hong Kong  Hong Kong      香港   \n",
+       "1    טאיוואן  चीनी गणराज्य  Kínai Köztársaság     Taiwan     Taiwan    中華民国   \n",
+       "2       מקאו          मकाउ              Makaó      Makau      Macao     マカオ   \n",
        "\n",
        "  name_ko   name_nl            name_pl    name_pt  name_ru   name_sv  \\\n",
-       "0      \ud64d\ucf69  Hongkong           Hongkong  Hong Kong  \u0413\u043e\u043d\u043a\u043e\u043d\u0433  Hongkong   \n",
-       "1    \uc911\ud654\ubbfc\uad6d    Taiwan  Republika Chi\u0144ska     Taiwan  \u0422\u0430\u0439\u0432\u0430\u043d\u044c    Taiwan   \n",
-       "2     \ub9c8\uce74\uc624     Macau              Makau      Macau    \u041c\u0430\u043a\u0430\u043e     Macao   \n",
+       "0      홍콩  Hongkong           Hongkong  Hong Kong  Гонконг  Hongkong   \n",
+       "1    중화민국    Taiwan  Republika Chińska     Taiwan  Тайвань    Taiwan   \n",
+       "2     마카오     Macau              Makau      Macau    Макао     Macao   \n",
        "\n",
        "           name_tr           name_uk    name_ur    name_vi name_zh_x name_zht  \\\n",
-       "0        Hong Kong           \u0413\u043e\u043d\u043a\u043e\u043d\u0433  \u06c1\u0627\u0646\u06af \u06a9\u0627\u0646\u06af  H\u1ed3ng K\u00f4ng        \u9999\u6e2f       \u9999\u6e2f   \n",
-       "1  \u00c7in Cumhuriyeti  \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0456\u043a\u0430 \u041a\u0438\u0442\u0430\u0439    \u062a\u0627\u0626\u06cc\u0648\u0627\u0646   \u0110\u00e0i Loan      \u4e2d\u534e\u6c11\u56fd     \u4e2d\u83ef\u6c11\u570b   \n",
-       "2            Makao            \u0410\u043e\u043c\u0438\u043d\u044c       \u0645\u06a9\u0627\u0624     Ma Cao        \u6fb3\u95e8       \u6fb3\u9580   \n",
+       "0        Hong Kong           Гонконг  ہانگ کانگ  Hồng Kông        香港       香港   \n",
+       "1  Çin Cumhuriyeti  Республіка Китай    تائیوان   Đài Loan      中华民国     中華民國   \n",
+       "2            Makao            Аоминь       مکاؤ     Ma Cao        澳门       澳門   \n",
        "\n",
        "                                            geometry name_zh_y iso_3166_2  \n",
-       "0  MULTIPOLYGON (((114.22983 22.55581, 114.23471 ...   \u9999\u6e2f\u7279\u522b\u884c\u653f\u533a      CN-91  \n",
-       "1  MULTIPOLYGON (((121.90577 24.9501, 121.83473 2...      \u4e2d\u56fd\u53f0\u6e7e      CN-71  \n",
-       "2  MULTIPOLYGON (((113.5586 22.16303, 113.56943 2...   \u6fb3\u95e8\u7279\u522b\u884c\u653f\u533a      CN-92  "
+       "0  MULTIPOLYGON (((114.22983 22.55581, 114.23471 ...   香港特别行政区      CN-91  \n",
+       "1  MULTIPOLYGON (((121.90577 24.9501, 121.83473 2...      中国台湾      CN-71  \n",
+       "2  MULTIPOLYGON (((113.5586 22.16303, 113.56943 2...   澳门特别行政区      CN-92  "
       ]
      },
      "execution_count": 14,
@@ -2114,7 +2114,7 @@
     "china_sars = china_sars.merge(pd.DataFrame(\n",
     "    data={\n",
     "        \"name_en\": [\"Taiwan\", \"Hong Kong\", \"Macau\"],\n",
-    "        \"name_zh\": [\"\u4e2d\u56fd\u53f0\u6e7e\", \"\u9999\u6e2f\u7279\u522b\u884c\u653f\u533a\", \"\u6fb3\u95e8\u7279\u522b\u884c\u653f\u533a\"],\n",
+    "        \"name_zh\": [\"中国台湾\", \"香港特别行政区\", \"澳门特别行政区\"],\n",
     "        \"iso_3166_2\": [\"CN-71\", \"CN-91\", \"CN-92\"],\n",
     "    },\n",
     "), on=\"name_en\", how=\"left\")\n",
@@ -2252,7 +2252,7 @@
     "    }\n",
     ")[[\"geometry\", \"iso_3166_2\", \"name\"]].copy()\n",
     "\n",
-    "# Convert MA01 \u2192 MA-01\n",
+    "# Convert MA01 → MA-01\n",
     "morocco_copy[\"iso_3166_2\"] = morocco_copy[\n",
     "    \"iso_3166_2\"\n",
     "].str.replace(\n",
@@ -2290,7 +2290,7 @@
    "source": [
     "#### Finland\n",
     "\n",
-    "- The \u00c5land Islands (ISO country code AX) is an autonomous region of Finland, and carries the ISO-3166 code FI-01."
+    "- The Åland Islands (ISO country code AX) is an autonomous region of Finland, and carries the ISO-3166 code FI-01."
    ]
   },
   {
@@ -2312,12 +2312,12 @@
    "outputs": [],
    "source": [
     "finland_aland = df_admin0_10m.loc[\n",
-    "    df_admin0_10m.name_en.isin(['\u00c5land']),\n",
+    "    df_admin0_10m.name_en.isin(['Åland']),\n",
     "    [x for x in df_admin0_10m.columns if x in df.columns]\n",
     "]\n",
     "finland_aland = finland_aland.merge(pd.DataFrame(\n",
     "    data={\n",
-    "        \"name_en\": [\"\u00c5land\"],\n",
+    "        \"name_en\": [\"Åland\"],\n",
     "        \"name_fi\": [\"Ahvenanmaan maakunta\"],\n",
     "        \"iso_3166_2\": [\"FI-01\"],\n",
     "    },\n",
@@ -3197,34 +3197,34 @@
     "\n",
     "# Turkey city name corrections\n",
     "# Fix completely wrong spellings\n",
-    "replace_column('name', turkey, 'Kinkkale', 'K\u0131r\u0131kkale')\n",
+    "replace_column('name', turkey, 'Kinkkale', 'Kırıkkale')\n",
     "replace_column('name', turkey, 'Zinguldak', 'Zonguldak')\n",
-    "replace_column('name', turkey, 'K. Maras', 'Kahramanmara\u015f')\n",
+    "replace_column('name', turkey, 'K. Maras', 'Kahramanmaraş')\n",
     "\n",
     "# Fix missing Turkish characters\n",
-    "replace_column('name', turkey, 'Adiyaman', 'Ad\u0131yaman')\n",
-    "replace_column('name', turkey, 'Agri', 'A\u011fr\u0131')\n",
-    "replace_column('name', turkey, 'Aydin', 'Ayd\u0131n')\n",
-    "replace_column('name', turkey, 'Balikesir', 'Bal\u0131kesir')\n",
-    "replace_column('name', turkey, '\u00c7ankiri', '\u00c7ank\u0131r\u0131')\n",
-    "replace_column('name', turkey, 'Diyarbakir', 'Diyarbak\u0131r')\n",
-    "replace_column('name', turkey, 'Elazig', 'El\u00e2z\u0131\u011f')\n",
-    "replace_column('name', turkey, 'Eskisehir', 'Eski\u015fehir')\n",
-    "replace_column('name', turkey, 'G\u00fcm\u00fcshane', 'G\u00fcm\u00fc\u015fhane')\n",
-    "replace_column('name', turkey, 'Hakkari', 'Hakk\u00e2ri')\n",
-    "replace_column('name', turkey, 'Istanbul', '\u0130stanbul')\n",
-    "replace_column('name', turkey, 'Izmir', '\u0130zmir')\n",
-    "replace_column('name', turkey, 'I\u011fdir', 'I\u011fd\u0131r')\n",
-    "replace_column('name', turkey, 'Kirklareli', 'K\u0131rklareli')\n",
-    "replace_column('name', turkey, 'Kirsehir', 'K\u0131r\u015fehir')\n",
-    "replace_column('name', turkey, 'Mugla', 'Mu\u011fla')\n",
-    "replace_column('name', turkey, 'Mus', 'Mu\u015f')\n",
-    "replace_column('name', turkey, 'Nevsehir', 'Nev\u015fehir')\n",
-    "replace_column('name', turkey, 'Nigde', 'Ni\u011fde')\n",
-    "replace_column('name', turkey, 'Sanliurfa', '\u015eanl\u0131urfa')\n",
-    "replace_column('name', turkey, 'Sirnak', '\u015e\u0131rnak')\n",
-    "replace_column('name', turkey, 'Tekirdag', 'Tekirda\u011f')\n",
-    "replace_column('name', turkey, 'Usak', 'U\u015fak')\n",
+    "replace_column('name', turkey, 'Adiyaman', 'Adıyaman')\n",
+    "replace_column('name', turkey, 'Agri', 'Ağrı')\n",
+    "replace_column('name', turkey, 'Aydin', 'Aydın')\n",
+    "replace_column('name', turkey, 'Balikesir', 'Balıkesir')\n",
+    "replace_column('name', turkey, 'Çankiri', 'Çankırı')\n",
+    "replace_column('name', turkey, 'Diyarbakir', 'Diyarbakır')\n",
+    "replace_column('name', turkey, 'Elazig', 'Elâzığ')\n",
+    "replace_column('name', turkey, 'Eskisehir', 'Eskişehir')\n",
+    "replace_column('name', turkey, 'Gümüshane', 'Gümüşhane')\n",
+    "replace_column('name', turkey, 'Hakkari', 'Hakkâri')\n",
+    "replace_column('name', turkey, 'Istanbul', 'İstanbul')\n",
+    "replace_column('name', turkey, 'Izmir', 'İzmir')\n",
+    "replace_column('name', turkey, 'Iğdir', 'Iğdır')\n",
+    "replace_column('name', turkey, 'Kirklareli', 'Kırklareli')\n",
+    "replace_column('name', turkey, 'Kirsehir', 'Kırşehir')\n",
+    "replace_column('name', turkey, 'Mugla', 'Muğla')\n",
+    "replace_column('name', turkey, 'Mus', 'Muş')\n",
+    "replace_column('name', turkey, 'Nevsehir', 'Nevşehir')\n",
+    "replace_column('name', turkey, 'Nigde', 'Niğde')\n",
+    "replace_column('name', turkey, 'Sanliurfa', 'Şanlıurfa')\n",
+    "replace_column('name', turkey, 'Sirnak', 'Şırnak')\n",
+    "replace_column('name', turkey, 'Tekirdag', 'Tekirdağ')\n",
+    "replace_column('name', turkey, 'Usak', 'Uşak')\n",
     "turkey_copy = turkey.copy()"
    ]
   },
@@ -3263,18 +3263,18 @@
     "\n",
     "# Region names corresponding to NUTS-1\n",
     "\n",
-    "region_name_dict = {'TR1':'\u0130stanbul',\n",
-    "                    'TR2':'Bat\u0131 Marmara',\n",
+    "region_name_dict = {'TR1':'İstanbul',\n",
+    "                    'TR2':'Batı Marmara',\n",
     "                    'TR3':'Ege',\n",
-    "                    'TR4':'Do\u011fu Marmara',\n",
-    "                    'TR5':'Bat\u0131 Anadolu',\n",
+    "                    'TR4':'Doğu Marmara',\n",
+    "                    'TR5':'Batı Anadolu',\n",
     "                    'TR6':'Akdeniz',\n",
     "                    'TR7':'Orta Anadolu',\n",
-    "                    'TR8':'Bat\u0131 Karadeniz',\n",
-    "                    'TR9':'Do\u011fu Karadeniz',\n",
-    "                    'TRA':'Kuzeydo\u011fu Anadolu',\n",
-    "                    'TRC':'G\u00fcneydo\u011fu Anadolu',\n",
-    "                    'TRB':'Ortado\u011fu Anadolu'\n",
+    "                    'TR8':'Batı Karadeniz',\n",
+    "                    'TR9':'Doğu Karadeniz',\n",
+    "                    'TRA':'Kuzeydoğu Anadolu',\n",
+    "                    'TRC':'Güneydoğu Anadolu',\n",
+    "                    'TRB':'Ortadoğu Anadolu'\n",
     "                    }\n",
     "\n",
     "\n",
@@ -3517,8 +3517,8 @@
     "france_copy = france.copy()\n",
     "reposition(france_copy, france.name=='Guadeloupe', 57.4, 25.4, 1.5, 1.5)\n",
     "reposition(france_copy, france.name=='Martinique', 58.4, 27.1, 1.5, 1.5)\n",
-    "reposition(france_copy, france.name=='Guyane fran\u00e7aise', 52, 37.7, 0.35, 0.35)\n",
-    "reposition(france_copy, france.name=='La R\u00e9union', -55, 62.8, 1.5, 1.5)\n",
+    "reposition(france_copy, france.name=='Guyane française', 52, 37.7, 0.35, 0.35)\n",
+    "reposition(france_copy, france.name=='La Réunion', -55, 62.8, 1.5, 1.5)\n",
     "reposition(france_copy, france.name=='Mayotte', -43, 54.3, 1.5, 1.5)\n",
     "\n",
     "not speed_run and france_copy.plot(figsize=(8, 8), **plot_styles)"
@@ -3669,8 +3669,8 @@
     "france_overseas = france.copy()\n",
     "reposition(france_overseas, france.name=='Guadeloupe', 53.2, 29, 1.5, 1.5)\n",
     "reposition(france_overseas, france.name=='Martinique', 52.8, 27.5, 1.5, 1.5)\n",
-    "reposition(france_overseas, france.name=='Guyane fran\u00e7aise', 45, 35.5, 0.3, 0.3)\n",
-    "reposition(france_overseas, france.name=='La R\u00e9union', -58.2, 60.5, 1.5, 1.5)\n",
+    "reposition(france_overseas, france.name=='Guyane française', 45, 35.5, 0.3, 0.3)\n",
+    "reposition(france_overseas, france.name=='La Réunion', -58.2, 60.5, 1.5, 1.5)\n",
     "reposition(france_overseas, france.name=='Mayotte', -50.5, 52.2, 2, 2)\n",
     "\n",
     "# Tahiti\n",
@@ -3713,7 +3713,7 @@
     "france_overseas = pd.concat([france_overseas, saint_martin_data], ignore_index=True)\n",
     "reposition(france_overseas, france_overseas.admin=='Saint Martin', 54.8, 30.3, 5, 5)\n",
     "\n",
-    "# Saint Barth\u00e9l\u00e9my\n",
+    "# Saint Barthélémy\n",
     "saint_barthelemy_data = df[(df['admin'] == 'Saint Barthelemy')]\n",
     "france_overseas = pd.concat([france_overseas, saint_barthelemy_data], ignore_index=True)\n",
     "reposition(france_overseas, france_overseas.admin=='Saint Barthelemy', 54.5, 30, 8, 8)\n",
@@ -3729,13 +3729,13 @@
     "france_overseas = pd.concat([france_overseas, paris_and_littlecrowndpts_copy], ignore_index=True)\n",
     "\n",
     "# Update metadata properly\n",
-    "france_overseas.loc[france_overseas['name'] == 'Windward Islands', ['name', 'iso_3166_2']] = ['Polyn\u00e9sie fran\u00e7aise', 'FR-PF']\n",
-    "france_overseas.loc[france_overseas['name'] == 'Archipel des Kerguelen', ['name', 'iso_3166_2']] = ['Terres australes et antarctiques fran\u00e7aises', 'FR-TF']\n",
+    "france_overseas.loc[france_overseas['name'] == 'Windward Islands', ['name', 'iso_3166_2']] = ['Polynésie française', 'FR-PF']\n",
+    "france_overseas.loc[france_overseas['name'] == 'Archipel des Kerguelen', ['name', 'iso_3166_2']] = ['Terres australes et antarctiques françaises', 'FR-TF']\n",
     "france_overseas.loc[france_overseas['admin'] == 'Wallis and Futuna', ['name', 'iso_3166_2']] = ['Wallis et Futuna', 'FR-WF']\n",
-    "france_overseas.loc[france_overseas['admin'] == 'New Caledonia', ['name', 'iso_3166_2']] = ['Nouvelle-Cal\u00e9donie', 'FR-NC']\n",
+    "france_overseas.loc[france_overseas['admin'] == 'New Caledonia', ['name', 'iso_3166_2']] = ['Nouvelle-Calédonie', 'FR-NC']\n",
     "france_overseas.loc[france_overseas['admin'] == 'Saint Pierre and Miquelon', ['name', 'iso_3166_2']] = ['Saint-Pierre-et-Miquelon', 'FR-PM']\n",
     "france_overseas.loc[france_overseas['admin'] == 'Saint Martin', ['name', 'iso_3166_2']] = ['Saint-Martin', 'FR-MF']\n",
-    "france_overseas.loc[france_overseas['admin'] == 'Saint Barthelemy', ['name', 'iso_3166_2']] = ['Saint-Barth\u00e9l\u00e9my', 'FR-BL']\n",
+    "france_overseas.loc[france_overseas['admin'] == 'Saint Barthelemy', ['name', 'iso_3166_2']] = ['Saint-Barthélémy', 'FR-BL']\n",
     "\n",
     "# Plot data\n",
     "france_overseas = france_overseas.rename(columns={'NAME_1': 'name','ISO': 'iso_3166_2'})\n",
@@ -3821,51 +3821,6 @@
     "not speed_run and italy_regions.plot(figsize=(10, 7), **plot_styles)"
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "id": "65aIalqEt1LR"
-   },
-   "source": [
-    "#### Italy Regions and Autonomous Provinces"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "execution": {
-     "iopub.execute_input": "2026-07-27T19:54:28.892892Z",
-     "iopub.status.busy": "2026-07-27T19:54:28.892454Z",
-     "iopub.status.idle": "2026-07-27T19:54:31.123499Z",
-     "shell.execute_reply": "2026-07-27T19:54:31.122932Z"
-    }
-   },
-   "outputs": [],
-   "source": [
-    "trento_and_bozen = df[(df.admin == 'Italy') & (df.iso_3166_2.isin(['IT-TN', 'IT-BZ']))][['geometry','iso_3166_2','name']]\n",
-    "\n",
-    "italy_regions_and_autonomous_provinces = pd.concat([italy_regions, trento_and_bozen])\n",
-    "\n",
-    "italy_regions_and_autonomous_provinces = italy_regions_and_autonomous_provinces[italy_regions_and_autonomous_provinces['iso_3166_2'] != 'IT-32']"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "execution": {
-     "iopub.execute_input": "2026-07-27T19:54:28.892892Z",
-     "iopub.status.busy": "2026-07-27T19:54:28.892454Z",
-     "iopub.status.idle": "2026-07-27T19:54:31.123499Z",
-     "shell.execute_reply": "2026-07-27T19:54:31.122932Z"
-    }
-   },
-   "outputs": [],
-   "source": [
-    "not speed_run and italy_regions_and_autonomous_provinces.plot(figsize=(10, 7), **plot_styles)"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {
@@ -4376,86 +4331,86 @@
      "output_type": "stream",
      "text": [
       "Kon Tum\n",
-      "\u0110\u1eafk N\u00f4ng\n",
-      "\u0110\u1eafk L\u1eafk\n",
+      "Đắk Nông\n",
+      "Đắk Lắk\n",
       "Gia Lai\n",
-      "B\u00ecnh Ph\u01b0\u1edbc\n",
-      "T\u00e2y Ninh\n",
+      "Bình Phước\n",
+      "Tây Ninh\n",
       "Long An\n",
-      "\u0110\u1ed3ng Th\u00e1p\n",
+      "Đồng Tháp\n",
       "An Giang\n",
-      "Ki\u00ean Giang\n",
-      "\u0110i\u1ec7n Bi\u00ean\n",
-      "S\u01a1n La\n",
-      "Thanh H\u00f3a\n",
-      "Ngh\u1ec7 An\n",
-      "H\u00e0 T\u0129nh\n",
-      "Qu\u1ea3ng B\u00ecnh\n",
-      "Qu\u1ea3ng Tr\u1ecb\n",
-      "Th\u1eeba Thi\u00ean - Hu\u1ebf\n",
-      "Qu\u1ea3ng Nam\n",
-      "H\u00e0 Giang\n",
-      "Cao B\u1eb1ng\n",
-      "L\u00e0o Cai\n",
-      "Lai Ch\u00e2u\n",
-      "L\u1ea1ng S\u01a1n\n",
-      "Qu\u1ea3ng Ninh\n",
-      "S\u00f3c Tr\u0103ng\n",
-      "Ti\u1ec1n Giang\n",
-      "B\u00e0 R\u1ecba - V\u0169ng T\u00e0u\n",
-      "Th\u00e0nh ph\u1ed1 H\u1ed3 Ch\u00ed Minh\n",
-      "Kh\u00e1nh H\u00f2a\n",
-      "C\u00e0 Mau\n",
-      "B\u1ea1c Li\u00eau\n",
-      "H\u1eadu Giang\n",
-      "V\u0129nh Long\n",
-      "Tr\u00e0 Vinh\n",
-      "B\u1ebfn Tre\n",
-      "\u0110\u1ed3ng Nai\n",
-      "B\u00ecnh Thu\u1eadn\n",
-      "Ninh Thu\u1eadn\n",
-      "Ph\u00fa Y\u00ean\n",
-      "B\u00ecnh \u0110\u1ecbnh\n",
-      "Qu\u1ea3ng Ng\u00e3i\n",
-      "\u0110\u00e0 N\u1eb5ng\n",
-      "Ninh B\u00ecnh\n",
-      "Nam \u0110\u1ecbnh\n",
-      "Th\u00e1i B\u00ecnh\n",
-      "H\u1ea3i Ph\u00f2ng\n",
-      "H\u00f2a B\u00ecnh\n",
-      "Tuy\u00ean Quang\n",
-      "Y\u00ean B\u00e1i\n",
-      "V\u0129nh Ph\u00fac\n",
-      "Ph\u00fa Th\u1ecd\n",
-      "H\u00e0 N\u1ed9i\n",
-      "B\u1eafc K\u1ea1n\n",
-      "H\u01b0ng Y\u00ean\n",
-      "B\u1eafc Ninh\n",
-      "B\u1eafc Giang\n",
-      "Th\u00e1i Nguy\u00ean\n",
-      "H\u1ea3i D\u01b0\u01a1ng\n",
-      "H\u00e0 Nam\n",
-      "B\u00ecnh D\u01b0\u01a1ng\n",
-      "L\u00e2m \u0110\u1ed3ng\n",
-      "C\u1ea7n Th\u01a1\n"
+      "Kiên Giang\n",
+      "Điện Biên\n",
+      "Sơn La\n",
+      "Thanh Hóa\n",
+      "Nghệ An\n",
+      "Hà Tĩnh\n",
+      "Quảng Bình\n",
+      "Quảng Trị\n",
+      "Thừa Thiên - Huế\n",
+      "Quảng Nam\n",
+      "Hà Giang\n",
+      "Cao Bằng\n",
+      "Lào Cai\n",
+      "Lai Châu\n",
+      "Lạng Sơn\n",
+      "Quảng Ninh\n",
+      "Sóc Trăng\n",
+      "Tiền Giang\n",
+      "Bà Rịa - Vũng Tàu\n",
+      "Thành phố Hồ Chí Minh\n",
+      "Khánh Hòa\n",
+      "Cà Mau\n",
+      "Bạc Liêu\n",
+      "Hậu Giang\n",
+      "Vĩnh Long\n",
+      "Trà Vinh\n",
+      "Bến Tre\n",
+      "Đồng Nai\n",
+      "Bình Thuận\n",
+      "Ninh Thuận\n",
+      "Phú Yên\n",
+      "Bình Định\n",
+      "Quảng Ngãi\n",
+      "Đà Nẵng\n",
+      "Ninh Bình\n",
+      "Nam Định\n",
+      "Thái Bình\n",
+      "Hải Phòng\n",
+      "Hòa Bình\n",
+      "Tuyên Quang\n",
+      "Yên Bái\n",
+      "Vĩnh Phúc\n",
+      "Phú Thọ\n",
+      "Hà Nội\n",
+      "Bắc Kạn\n",
+      "Hưng Yên\n",
+      "Bắc Ninh\n",
+      "Bắc Giang\n",
+      "Thái Nguyên\n",
+      "Hải Dương\n",
+      "Hà Nam\n",
+      "Bình Dương\n",
+      "Lâm Đồng\n",
+      "Cần Thơ\n"
      ]
     }
    ],
    "source": [
     "vietnam = df[df.admin == 'Vietnam']\n",
     "vietnam_copy = vietnam.copy()\n",
-    "replace_column('name', vietnam_copy, '\u00d0ong Th\u00e1p', '\u0110\u1ed3ng Th\u00e1p')\n",
-    "replace_column('name', vietnam_copy, 'Son La', 'S\u01a1n La')\n",
-    "replace_column('name', vietnam_copy, 'Ha Tinh', 'H\u00e0 T\u0129nh')\n",
-    "replace_column('name', vietnam_copy, 'Qu\u00e0ng Nam', 'Qu\u1ea3ng Nam')\n",
-    "replace_column('name', vietnam_copy, 'Lai Chau', 'Lai Ch\u00e2u')\n",
-    "replace_column('name', vietnam_copy, 'H\u1ed3 Ch\u00ed Minh city', 'Th\u00e0nh ph\u1ed1 H\u1ed3 Ch\u00ed Minh')\n",
-    "replace_column('name', vietnam_copy, 'Hau Giang', 'H\u1eadu Giang')\n",
-    "replace_column('name', vietnam_copy, 'Ha Noi', 'H\u00e0 N\u1ed9i')\n",
-    "replace_column('name', vietnam_copy, 'Can Tho', 'C\u1ea7n Th\u01a1')\n",
-    "replace_column('name', vietnam_copy, '\u0110\u00f4ng Nam B\u1ed9', '\u0110\u1ed3ng Nai')\n",
-    "replace_column('name', vietnam_copy, '\u0110\u00f4ng B\u1eafc', 'B\u1eafc K\u1ea1n')\n",
-    "replace_column('name', vietnam_copy, '\u0110\u1ed3ng B\u1eb1ng S\u00f4ng H\u1ed3ng', 'H\u01b0ng Y\u00ean')\n",
+    "replace_column('name', vietnam_copy, 'Ðong Tháp', 'Đồng Tháp')\n",
+    "replace_column('name', vietnam_copy, 'Son La', 'Sơn La')\n",
+    "replace_column('name', vietnam_copy, 'Ha Tinh', 'Hà Tĩnh')\n",
+    "replace_column('name', vietnam_copy, 'Quàng Nam', 'Quảng Nam')\n",
+    "replace_column('name', vietnam_copy, 'Lai Chau', 'Lai Châu')\n",
+    "replace_column('name', vietnam_copy, 'Hồ Chí Minh city', 'Thành phố Hồ Chí Minh')\n",
+    "replace_column('name', vietnam_copy, 'Hau Giang', 'Hậu Giang')\n",
+    "replace_column('name', vietnam_copy, 'Ha Noi', 'Hà Nội')\n",
+    "replace_column('name', vietnam_copy, 'Can Tho', 'Cần Thơ')\n",
+    "replace_column('name', vietnam_copy, 'Đông Nam Bộ', 'Đồng Nai')\n",
+    "replace_column('name', vietnam_copy, 'Đông Bắc', 'Bắc Kạn')\n",
+    "replace_column('name', vietnam_copy, 'Đồng Bằng Sông Hồng', 'Hưng Yên')\n",
     "for i in vietnam_copy['name']:\n",
     "    print(i)"
    ]
@@ -4499,7 +4454,6 @@
     "    \"turkey\": turkey_copy,\n",
     "    \"turkey_regions\": turkey_regions,\n",
     "    \"italy_regions\": italy_regions,\n",
-    "    \"italy_regions_and_autonomous_provinces\": italy_regions_and_autonomous_provinces,\n",
     "    \"philippines_regions\": philippines_regions,\n",
     "    \"latvia\": latvia_copy,\n",
     "    \"netherlands\": netherlands_copy,\n",
@@ -4538,7 +4492,7 @@
       "aruba has only one subdivision - removing from countries array\n",
       "british indian ocean territory has only one subdivision - removing from countries array\n",
       "cayman islands has only one subdivision - removing from countries array\n",
-      "cura\u00e7ao has only one subdivision - removing from countries array\n",
+      "curaçao has only one subdivision - removing from countries array\n",
       "falkland islands has only one subdivision - removing from countries array\n",
       "faroe islands has only one subdivision - removing from countries array\n",
       "gibraltar has only one subdivision - removing from countries array\n",
@@ -4574,7 +4528,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "cura\u00e7ao has only one subdivision - removing from countries array\n",
+      "curaçao has only one subdivision - removing from countries array\n",
       "falkland islands has only one subdivision - removing from countries array\n",
       "faroe islands has only one subdivision - removing from countries array\n"
      ]

superset-frontend/plugins/plugin-chart-country-map/src/countries.ts

@@ -103,7 +103,6 @@ import iran from './countries/iran.geojson';
 import israel from './countries/israel.geojson';
 import italy from './countries/italy.geojson';
 import italy_regions from './countries/italy_regions.geojson';
-import italy_regions_and_autonomous_provinces from './countries/italy_regions_and_autonomous_provinces.geojson';
 import ivory_coast from './countries/ivory_coast.geojson';
 import japan from './countries/japan.geojson';
 import jordan from './countries/jordan.geojson';
@@ -307,7 +306,6 @@ export const countries = {
   israel,
   italy,
   italy_regions,
-  italy_regions_and_autonomous_provinces,
   ivory_coast,
   japan,
   jordan,
@@ -432,9 +430,6 @@ export const countryOptions = Object.keys(countries).map(x => {
   if (x === 'italy_regions') {
     return [x, 'Italy (regions)'];
   }
-  if (x === 'italy_regions_and_autonomous_provinces') {
-    return [x, 'Italy (regions and autonomous provinces)'];
-  }
   if (x === 'france_regions') {
     return [x, 'France (regions)'];
   }

superset-frontend/plugins/plugin-chart-country-map/src/countries/iran.geojson

@@ -33,6 +33,6 @@
 { "type": "Feature", "properties": { "ISO": "IR-25", "NAME_1": "Yazd" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 53.650710076708663, 32.61286754000497 ], [ 54.70904341032508, 32.920083929729572 ], [ 54.814670038291581, 32.970700994954939 ], [ 54.908204380227914, 33.088161526533213 ], [ 54.986339146034709, 33.329955553206219 ], [ 55.040082635105477, 33.385688585459832 ], [ 55.139404737638529, 33.430362861356969 ], [ 55.217229445082808, 33.437261664194409 ], [ 55.274590285313366, 33.470644639738339 ], [ 55.359856397954388, 33.594642238948154 ], [ 55.386418085026548, 33.665464788968791 ], [ 55.375255974983247, 34.344363918859756 ], [ 55.484706658785228, 34.365163682857656 ], [ 55.741125116131172, 34.360331935770205 ], [ 55.850885858295669, 34.407254137268581 ], [ 56.210450474010145, 34.906060898691521 ], [ 56.619211053447316, 34.993678289721288 ], [ 57.016602818165495, 35.148294175835531 ], [ 57.268370395577278, 35.201314195393763 ], [ 57.37957807766611, 35.177336330707078 ], [ 57.671239861630283, 34.993936672139682 ], [ 57.705553013161023, 34.930994777786736 ], [ 57.692013788105783, 34.86686432502853 ], [ 57.595172154271495, 34.788807075386217 ], [ 57.198917271115135, 34.557735908285508 ], [ 57.13080773289056, 34.456295071360444 ], [ 57.004820591397163, 34.142567449728006 ], [ 56.9966557148893, 33.973482164370353 ], [ 57.05887413883039, 33.685256863513416 ], [ 57.105796340328823, 33.623581041032196 ], [ 57.304440545394812, 33.603737291442826 ], [ 57.559928826753946, 33.653243313528094 ], [ 57.602716913155007, 33.607716376009932 ], [ 57.642301060445561, 33.54405101214445 ], [ 57.71702518066752, 33.121699530808655 ], [ 57.782240838144162, 32.996797594033694 ], [ 58.04062300025123, 32.871068834059429 ], [ 58.147696568142067, 32.748595689139734 ], [ 58.152554151852598, 32.671882025734874 ], [ 58.10036095639299, 32.568141588163769 ], [ 58.224384393125206, 32.352547512457704 ], [ 58.222213982789071, 32.297563788138291 ], [ 58.173948195053129, 32.146048489246368 ], [ 58.040726353038735, 31.994533189455126 ], [ 58.003932732809346, 31.907200019265474 ], [ 57.901199985590836, 31.771549384496495 ], [ 57.834744093764868, 31.637268175286067 ], [ 56.761631300743886, 32.03008657533519 ], [ 56.634093865639386, 32.049181016990303 ], [ 56.566397738564774, 31.978926906851257 ], [ 56.358451776328366, 31.879036363537352 ], [ 56.287758416617578, 31.815086777932436 ], [ 55.756834750623227, 31.576264146373262 ], [ 55.712289666834636, 31.495183823874356 ], [ 55.684487746312413, 31.110917873960716 ], [ 55.514989048006157, 31.046787421202509 ], [ 55.32637006962301, 31.024773261276948 ], [ 55.116460401726158, 31.043247586207144 ], [ 54.554427525110157, 30.957774767091792 ], [ 54.466474237296211, 30.873361314273211 ], [ 54.420275506209634, 30.797913722740077 ], [ 54.398054640709063, 30.725075792014195 ], [ 54.400638462195275, 30.675466417141422 ], [ 54.515566848231458, 30.450441393055826 ], [ 54.539441359231319, 30.350550848842602 ], [ 54.603830194407919, 30.297349962131022 ], [ 54.591221144440226, 29.973106187400617 ], [ 54.616749301838809, 29.847971707528245 ], [ 54.430197381004291, 29.793220527205563 ], [ 54.227212355265976, 29.882879137362295 ], [ 54.071769646851692, 29.984268297443975 ], [ 54.043140904029485, 30.044161282317305 ], [ 54.007587518149421, 30.263191840231229 ], [ 53.964075962235825, 30.329983628841376 ], [ 53.80460249241105, 30.499068915098348 ], [ 53.638411086002804, 30.755151476559377 ], [ 53.404936964569231, 31.261502996865772 ], [ 53.276469354377184, 31.395086574985442 ], [ 53.125160760160952, 31.51394236874529 ], [ 52.870706007576189, 31.597451483998782 ], [ 52.827091098875087, 31.744419257542688 ], [ 52.824093866238911, 31.813846544482431 ], [ 52.904915806319366, 32.164600328542292 ], [ 52.883728468693846, 32.505199692911503 ], [ 53.060358513834331, 32.576694037399875 ], [ 53.164641554664001, 32.640333563742956 ], [ 53.261069777348325, 32.672011216944099 ], [ 53.334036900182753, 32.67412995043685 ], [ 53.650710076708663, 32.61286754000497 ] ] ] } },
 { "type": "Feature", "properties": { "ISO": "IR-26", "NAME_1": "Qom" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 51.788911574109818, 34.54197459605075 ], [ 51.451671176683419, 34.469730942728802 ], [ 51.158355747219957, 34.452522691469028 ], [ 51.063064406097453, 34.418235379259329 ], [ 51.013765089587196, 34.357903143914939 ], [ 50.983689405941277, 34.161610216338374 ], [ 51.004670037991843, 34.11838288036563 ], [ 51.032988723350854, 34.105799668819657 ], [ 50.802201776190998, 34.157889513290399 ], [ 50.699262323397477, 34.20488922825524 ], [ 50.441190219652867, 34.224784653788731 ], [ 50.32874230321471, 34.317879747052643 ], [ 50.30445438016551, 34.367463284403016 ], [ 50.30869184805033, 34.408520209140306 ], [ 50.264146763362419, 34.466423651730111 ], [ 50.158313429820907, 34.492106838759582 ], [ 50.060024855162908, 34.577062893038089 ], [ 50.069429966020095, 34.628739325459492 ], [ 50.162757603280738, 34.671992498954637 ], [ 50.173402947587931, 34.692042955018337 ], [ 50.152629022011752, 34.716124172492528 ], [ 50.153972609148582, 34.781494858700739 ], [ 50.21112674290481, 34.819373684547884 ], [ 50.301147088267498, 34.809374295387386 ], [ 50.388170200094635, 34.829915676067571 ], [ 50.447598097873879, 34.862058417262119 ], [ 50.57151818181859, 34.878129787859393 ], [ 50.693681268375826, 34.915956935963777 ], [ 50.723033481609889, 35.107883206244935 ], [ 50.784735141613453, 35.218419093866089 ], [ 51.072159457692806, 35.213251450893722 ], [ 51.31235151570985, 35.153952745222966 ], [ 51.882342564157966, 34.875494290429117 ], [ 51.893194614040169, 34.754002997440352 ], [ 51.866116163929803, 34.66646312077637 ], [ 51.788911574109818, 34.54197459605075 ] ] ] } },
 { "type": "Feature", "properties": { "ISO": "IR-07", "NAME_1": "Tehran" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 50.784735141613453, 35.218419093866089 ], [ 50.8712414886038, 35.4471906603207 ], [ 50.870828078353099, 35.517031358410463 ], [ 50.798687778717976, 35.604777939750079 ], [ 50.825095940725078, 35.654454591106457 ], [ 50.889640414373616, 35.686726828380415 ], [ 50.942082799381637, 35.739169213388493 ], [ 50.970321006209417, 35.799679657490174 ], [ 51.059069657138934, 35.803713687037032 ], [ 51.075205776225573, 35.916666515247471 ], [ 51.135716220327254, 35.97314292980235 ], [ 51.216396812163111, 35.997347107083328 ], [ 51.297077403998969, 35.989279047989669 ], [ 51.353553818553848, 36.017517255716768 ], [ 51.356896600397761, 36.116271267305137 ], [ 51.465003697062969, 36.064698188570503 ], [ 51.618275995141062, 36.054052843363991 ], [ 51.754391717004125, 36.010980536122815 ], [ 51.856504348396925, 35.921554469962814 ], [ 51.950245395908269, 35.799804796354238 ], [ 52.029206984015048, 35.77091767021426 ], [ 52.108168573021203, 35.767171128744565 ], [ 52.177001580758315, 35.789960435925366 ], [ 52.306812778986512, 35.917394518242418 ], [ 52.398486768949226, 35.976202298397311 ], [ 52.625863072322886, 35.931347154447622 ], [ 52.740274692622961, 35.881014309162993 ], [ 52.816342400881069, 35.86825023046373 ], [ 52.901401807947025, 35.889695950507701 ], [ 52.944810011972436, 35.881556912421559 ], [ 53.0347270036483, 35.831094875927761 ], [ 53.066249628117816, 35.718905341008679 ], [ 53.079375441123659, 35.618136298551292 ], [ 53.047232699929111, 35.528374334707735 ], [ 52.888275994941182, 35.410190335415621 ], [ 52.674955682358814, 35.336189683806822 ], [ 52.594133742278359, 35.338721829348913 ], [ 52.21968631437187, 35.414221095926791 ], [ 51.982078077840981, 35.54431651499516 ], [ 51.922443475386046, 35.54684866053725 ], [ 51.870146926239613, 35.569818833971965 ], [ 51.853403762073924, 35.555452785717478 ], [ 51.821054315304366, 35.403420721988709 ], [ 51.822501255228701, 35.315260727700377 ], [ 51.980631137916646, 35.125246487135655 ], [ 51.968022087948953, 35.063725694285324 ], [ 51.916862420364396, 34.998587551174523 ], [ 51.882342564157966, 34.875494290429117 ], [ 51.31235151570985, 35.153952745222966 ], [ 51.072159457692806, 35.213251450893722 ], [ 50.784735141613453, 35.218419093866089 ] ] ] } },
-{ "type": "Feature", "properties": { "ISO": "IR-32", "NAME_1": "Alborz" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 50.696471795436992, 35.550543525163562 ], [ 50.689753858853464, 35.639246120911707 ], [ 50.650996534762271, 35.676478989813518 ], [ 50.594772576992796, 35.677047431493747 ], [ 50.581956822349468, 35.650072333271567 ], [ 50.620714146440662, 35.60635407178296 ], [ 50.610378858697345, 35.574831448212763 ], [ 50.527696568441854, 35.62911754054204 ], [ 50.285540805663629, 35.666014513558935 ], [ 50.238618605064573, 35.741022853721688 ], [ 50.2302470229817, 35.771925361466231 ], [ 50.242752720161889, 35.81083771428905 ], [ 50.297736443581982, 35.853961697474347 ], [ 50.500204706282148, 35.934266872717956 ], [ 50.534517856913567, 35.960802721368452 ], [ 50.625881789413029, 36.164769599037754 ], [ 50.47188602092308, 36.239648748890602 ], [ 50.420829706126028, 36.296389472396186 ], [ 50.449665155422565, 36.331684474958536 ], [ 50.563146599735774, 36.339177557897983 ], [ 50.966222772263109, 36.292203681354806 ], [ 51.029888137027854, 36.27179149008515 ], [ 51.086008742009824, 36.222259630477538 ], [ 51.127970005211523, 36.20745433175199 ], [ 51.291991001283634, 36.178102118517927 ], [ 51.356896600397761, 36.116271267305137 ], [ 51.353553818553848, 36.017517255716768 ], [ 51.297077403998969, 35.989279047989669 ], [ 51.216396812163111, 35.997347107083328 ], [ 51.135716220327254, 35.97314292980235 ], [ 51.075205776225573, 35.916666515247471 ], [ 51.059069657138934, 35.803713687037032 ], [ 50.970321006209417, 35.799679657490174 ], [ 50.942082799381637, 35.739169213388493 ], [ 50.889640414373616, 35.686726828380415 ], [ 50.825095940725078, 35.654454591106457 ], [ 50.798687778717976, 35.604777939750079 ], [ 50.75269575410573, 35.601341458441539 ], [ 50.724893832684188, 35.555168564877363 ], [ 50.696471795436992, 35.550543525163562 ] ] ] } }
+{ "type": "Feature", "properties": { "ISO": "IR-30", "NAME_1": "Alborz" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 50.696471795436992, 35.550543525163562 ], [ 50.689753858853464, 35.639246120911707 ], [ 50.650996534762271, 35.676478989813518 ], [ 50.594772576992796, 35.677047431493747 ], [ 50.581956822349468, 35.650072333271567 ], [ 50.620714146440662, 35.60635407178296 ], [ 50.610378858697345, 35.574831448212763 ], [ 50.527696568441854, 35.62911754054204 ], [ 50.285540805663629, 35.666014513558935 ], [ 50.238618605064573, 35.741022853721688 ], [ 50.2302470229817, 35.771925361466231 ], [ 50.242752720161889, 35.81083771428905 ], [ 50.297736443581982, 35.853961697474347 ], [ 50.500204706282148, 35.934266872717956 ], [ 50.534517856913567, 35.960802721368452 ], [ 50.625881789413029, 36.164769599037754 ], [ 50.47188602092308, 36.239648748890602 ], [ 50.420829706126028, 36.296389472396186 ], [ 50.449665155422565, 36.331684474958536 ], [ 50.563146599735774, 36.339177557897983 ], [ 50.966222772263109, 36.292203681354806 ], [ 51.029888137027854, 36.27179149008515 ], [ 51.086008742009824, 36.222259630477538 ], [ 51.127970005211523, 36.20745433175199 ], [ 51.291991001283634, 36.178102118517927 ], [ 51.356896600397761, 36.116271267305137 ], [ 51.353553818553848, 36.017517255716768 ], [ 51.297077403998969, 35.989279047989669 ], [ 51.216396812163111, 35.997347107083328 ], [ 51.135716220327254, 35.97314292980235 ], [ 51.075205776225573, 35.916666515247471 ], [ 51.059069657138934, 35.803713687037032 ], [ 50.970321006209417, 35.799679657490174 ], [ 50.942082799381637, 35.739169213388493 ], [ 50.889640414373616, 35.686726828380415 ], [ 50.825095940725078, 35.654454591106457 ], [ 50.798687778717976, 35.604777939750079 ], [ 50.75269575410573, 35.601341458441539 ], [ 50.724893832684188, 35.555168564877363 ], [ 50.696471795436992, 35.550543525163562 ] ] ] } }
 ]
 }

superset-frontend/plugins/plugin-chart-country-map/test/countries.test.ts

@@ -1,58 +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 fs from 'fs';
-import path from 'path';
-import { countryOptions } from '../src/countries';
-
-type ItalyFeature = { properties: { ISO: string; NAME_1: string } };
-
-test('countryOptions includes labeled entries for the Italy region variants', () => {
-  expect(countryOptions).toContainEqual(['italy_regions', 'Italy (regions)']);
-  expect(countryOptions).toContainEqual([
-    'italy_regions_and_autonomous_provinces',
-    'Italy (regions and autonomous provinces)',
-  ]);
-});
-
-test('italy_regions_and_autonomous_provinces geojson has the expected shape', () => {
-  // jest maps `.geojson` imports to an empty object mock, so the file is
-  // read from disk directly to verify its actual shape.
-  const geojsonPath = path.join(
-    __dirname,
-    '../src/countries/italy_regions_and_autonomous_provinces.geojson',
-  );
-  const geojson = JSON.parse(fs.readFileSync(geojsonPath, 'utf-8'));
-  const features: ItalyFeature[] = geojson.features;
-
-  expect(features).toHaveLength(21);
-  features.forEach(feature => {
-    expect(feature.properties).toEqual(
-      expect.objectContaining({
-        ISO: expect.any(String),
-        NAME_1: expect.any(String),
-      }),
-    );
-  });
-
-  const isoCodes = features.map(feature => feature.properties.ISO);
-  expect(new Set(isoCodes).size).toBe(isoCodes.length);
-  expect(isoCodes).toContain('IT-BZ');
-  expect(isoCodes).toContain('IT-TN');
-  expect(isoCodes).not.toContain('IT-32');
-});

superset-frontend/plugins/plugin-chart-country-map/test/iran.geojson.test.ts

@@ -1,69 +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 fs from 'fs';
-import path from 'path';
-
-type Feature = {
-  properties: {
-    ISO: string;
-    NAME_1: string;
-  };
-};
-
-// `.geojson` imports are mocked out to an empty object by the Jest module
-// mapper (see jest.config.js), so the file is read from disk directly to
-// exercise the real, committed data.
-function loadIranGeoJson(): { features: Feature[] } {
-  const filePath = path.join(__dirname, '../src/countries/iran.geojson');
-  return JSON.parse(fs.readFileSync(filePath, 'utf-8'));
-}
-
-test('every Iranian province has its own distinct ISO 3166-2 code', () => {
-  const { features } = loadIranGeoJson();
-
-  // Pin the feature count too, so dropping a province other than
-  // Tehran/Alborz (which would still leave every remaining ISO code
-  // distinct) doesn't slip past the checks below.
-  expect(features.length).toBe(31);
-
-  // Sanity check: every province name in this file is unique, so a
-  // duplicate ISO code below can only mean two different provinces were
-  // mistakenly assigned the same code (as opposed to one province being
-  // split across multiple polygon features).
-  const names = features.map(feature => feature.properties.NAME_1);
-  expect(new Set(names).size).toBe(names.length);
-
-  const isoByName = new Map(
-    features.map(feature => [
-      feature.properties.NAME_1,
-      feature.properties.ISO,
-    ]),
-  );
-  const isoCodes = features.map(feature => feature.properties.ISO);
-
-  expect(new Set(isoCodes).size).toBe(isoCodes.length);
-
-  // Tehran and Alborz were split into separate provinces in 2010, but the
-  // GeoJSON still assigned both the same ISO code (IR-07), which used to
-  // make it impossible to distinguish them on the Country Map chart. Alborz
-  // now uses its pre-2020 ISO 3166-2 code, IR-32.
-  expect(isoByName.get('Tehran')).toBe('IR-07');
-  expect(isoByName.get('Alborz')).toBe('IR-32');
-});

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

@@ -201,31 +201,6 @@ function createCustomizeSection(
         },
       },
     ],
-    [
-      {
-        name: `label_position${controlSuffix}`,
-        config: {
-          type: 'SelectControl',
-          freeForm: false,
-          label: t('Label Position'),
-          choices: [
-            ['auto', t('Auto')],
-            ['top', t('Top')],
-            ['inside', t('Inside')],
-            ['bottom', t('Bottom')],
-            ['left', t('Left')],
-            ['right', t('Right')],
-          ],
-          default: 'auto',
-          renderTrigger: true,
-          description: t(
-            'Position of the data label relative to the data point',
-          ),
-          visibility: ({ controls }: ControlPanelsContainerProps) =>
-            Boolean(controls?.[`show_value${controlSuffix}`]?.value),
-        },
-      },
-    ],
     [
       {
         name: `only_total${controlSuffix}`,

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

@@ -189,8 +189,6 @@ export default function transformProps(
     showLegend,
     showValue,
     showValueB,
-    labelPosition,
-    labelPositionB,
     onlyTotal,
     onlyTotalB,
     stack,
@@ -535,7 +533,6 @@ export default function transformProps(
         thresholdValues,
         timeShiftColor,
         theme,
-        labelPosition,
       },
     );
 
@@ -624,7 +621,6 @@ export default function transformProps(
         thresholdValues: thresholdValuesB,
         timeShiftColor,
         theme,
-        labelPosition: labelPositionB,
       },
     );
 

superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/types.ts

@@ -32,7 +32,6 @@ import {
   ContextMenuTransformedProps,
   CrossFilterTransformedProps,
   EchartsTimeseriesSeriesType,
-  LabelPositionEnum,
   LegendFormData,
   StackType,
   TitleFormData,
@@ -87,18 +86,6 @@ export type EchartsMixedTimeseriesFormData = QueryFormData & {
   seriesTypeB: EchartsTimeseriesSeriesType;
   showValue: boolean;
   showValueB: boolean;
-  /**
-   * Where the data label sits relative to its data point on query A, applied
-   * when `showValue` is on.
-   *
-   * `'auto'` keeps the orientation-aware default the chart used before this
-   * control existed: `Right` for a horizontal chart, `Top` otherwise. It is
-   * also the value every chart saved before then resolves to, so the default
-   * must stay `'auto'` for those to keep rendering as they did.
-   */
-  labelPosition?: LabelPositionEnum | 'auto';
-  /** The same, for query B. Resolved independently of {@link labelPosition}. */
-  labelPositionB?: LabelPositionEnum | 'auto';
   stack: StackType;
   stackB: StackType;
   yAxisIndex?: number;
@@ -143,8 +130,6 @@ export const DEFAULT_FORM_DATA: EchartsMixedTimeseriesFormData = {
   seriesTypeB: TIMESERIES_DEFAULTS.seriesType,
   showValue: TIMESERIES_DEFAULTS.showValue,
   showValueB: TIMESERIES_DEFAULTS.showValue,
-  labelPosition: 'auto',
-  labelPositionB: 'auto',
   stack: TIMESERIES_DEFAULTS.stack,
   stackB: TIMESERIES_DEFAULTS.stack,
   yAxisIndex: 0,

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

@@ -86,7 +86,6 @@ export const DEFAULT_FORM_DATA: EchartsTimeseriesFormData = {
   xAxisLabelInterval: defaultXAxis.xAxisLabelInterval,
   groupby: [],
   showValue: false,
-  labelPosition: 'auto',
   onlyTotal: false,
   percentageThreshold: 0,
   orientation: OrientationType.Vertical,

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

@@ -292,7 +292,6 @@ export default function transformProps(
     showLegend,
     showValue,
     size,
-    labelPosition,
     colorByPrimaryAxis,
     sliceId,
     sortSeriesType,
@@ -753,7 +752,6 @@ export default function transformProps(
         theme,
         hasDimensions: (groupBy?.length ?? 0) > 0,
         colorByPrimaryAxis,
-        labelPosition,
       },
     );
     if (transformedSeries) {

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

@@ -51,7 +51,6 @@ import { extractForecastSeriesContext } from '../utils/forecast';
 import {
   EchartsTimeseriesSeriesType,
   ForecastSeriesEnum,
-  LabelPositionEnum,
   LegendOrientation,
   OrientationType,
   StackType,
@@ -171,7 +170,6 @@ export const getBaselineSeriesForStream = (
 export function transformNegativeLabelsPosition(
   series: SeriesOption,
   isHorizontal: boolean,
-  labelPosition?: string,
 ): TimeseriesDataRecord[] {
   /*
    * Adjusts label position for negative values in bar series
@@ -187,10 +185,7 @@ export function transformNegativeLabelsPosition(
       ? {
           value,
           label: {
-            position:
-              labelPosition && labelPosition !== 'auto'
-                ? labelPosition
-                : 'outside',
+            position: 'outside',
           },
         }
       : value;
@@ -260,7 +255,6 @@ export function transformSeries(
     theme?: SupersetTheme;
     hasDimensions?: boolean;
     colorByPrimaryAxis?: boolean;
-    labelPosition?: string;
   },
 ): SeriesOption | undefined {
   const { name, data } = series;
@@ -293,7 +287,6 @@ export function transformSeries(
     timeShiftColor,
     theme,
     colorByPrimaryAxis = false,
-    labelPosition,
   } = opts;
   const contexts = seriesContexts[name || ''] || [];
   const hasForecast =
@@ -413,13 +406,7 @@ export function transformSeries(
             ),
           }
         : seriesType === 'bar' && !stack
-          ? {
-              data: transformNegativeLabelsPosition(
-                series,
-                isHorizontal,
-                labelPosition,
-              ),
-            }
+          ? { data: transformNegativeLabelsPosition(series, isHorizontal) }
           : null
       : null),
     connectNulls,
@@ -456,12 +443,7 @@ export function transformSeries(
     symbolSize: symbolSizeFn ?? markerSize,
     label: {
       show: !!showValue,
-      position: (labelPosition === 'auto' || !labelPosition
-        ? isHorizontal
-          ? LabelPositionEnum.Right
-          : LabelPositionEnum.Top
-        : labelPosition) as LabelPositionEnum,
-      ...(plotType === 'bar' ? { overflow: 'truncate' } : {}),
+      position: isHorizontal ? 'right' : 'top',
       color: theme?.colorText,
       textBorderWidth: 0,
       formatter: (params: any) => {

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

@@ -32,7 +32,6 @@ import {
   BaseTransformedProps,
   ContextMenuTransformedProps,
   CrossFilterTransformedProps,
-  LabelPositionEnum,
   LegendFormData,
   StackType,
   TitleFormData,
@@ -100,16 +99,6 @@ export type EchartsTimeseriesFormData = QueryFormData & {
   xAxisLabelRotation: number;
   xAxisLabelInterval: number | string;
   showValue: boolean;
-  /**
-   * Where the data label sits relative to its data point, applied when
-   * `showValue` is on.
-   *
-   * `'auto'` keeps the orientation-aware default the chart used before this
-   * control existed: `Right` for a horizontal chart, `Top` otherwise. It is
-   * also the value every chart saved before then resolves to, so the default
-   * must stay `'auto'` for those to keep rendering as they did.
-   */
-  labelPosition?: LabelPositionEnum | 'auto';
   onlyTotal: boolean;
   showExtraControls: boolean;
   percentageThreshold: number;

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

@@ -175,18 +175,6 @@ const config: ControlPanelConfig = {
       label: t('X Axis'),
       expanded: true,
       controlSetRows: [
-        [
-          {
-            name: 'show_x_axis',
-            config: {
-              type: 'CheckboxControl',
-              label: t('Show X axis'),
-              renderTrigger: true,
-              default: true,
-              description: t('Show or hide the X axis line, ticks, and labels'),
-            },
-          },
-        ],
         [
           {
             name: 'x_axis_label',
@@ -195,8 +183,6 @@ const config: ControlPanelConfig = {
               label: t('X Axis Label'),
               renderTrigger: true,
               default: '',
-              visibility: ({ controls }) =>
-                controls?.show_x_axis?.value !== false,
             },
           },
         ],
@@ -207,8 +193,6 @@ const config: ControlPanelConfig = {
               ...sharedControls.x_axis_time_format,
               default: DEFAULT_TIME_FORMAT,
               description: `${D3_TIME_FORMAT_DOCS}.`,
-              visibility: ({ controls }) =>
-                controls?.show_x_axis?.value !== false,
             },
           },
         ],
@@ -229,8 +213,6 @@ const config: ControlPanelConfig = {
               clearable: false,
               renderTrigger: true,
               description: t('The way the ticks are laid out on the X-axis'),
-              visibility: ({ controls }) =>
-                controls?.show_x_axis?.value !== false,
             },
           },
         ],
@@ -240,20 +222,6 @@ const config: ControlPanelConfig = {
       label: t('Y Axis'),
       expanded: true,
       controlSetRows: [
-        [
-          {
-            name: 'show_y_axis',
-            config: {
-              type: 'CheckboxControl',
-              label: t('Show Y axis'),
-              renderTrigger: true,
-              default: true,
-              description: t(
-                'Show or hide the Y axis line, ticks, gridlines, and labels',
-              ),
-            },
-          },
-        ],
         [
           {
             name: 'y_axis_label',
@@ -262,8 +230,6 @@ const config: ControlPanelConfig = {
               label: t('Y Axis Label'),
               renderTrigger: true,
               default: '',
-              visibility: ({ controls }) =>
-                controls?.show_y_axis?.value !== false,
             },
           },
         ],
@@ -273,10 +239,6 @@ const config: ControlPanelConfig = {
     },
   ],
   controlOverrides: {
-    // Note: y_axis_format and currency_format are intentionally NOT gated on
-    // show_y_axis. They drive `defaultFormatter`, which formats the bar labels
-    // and tooltips as well as the axis, so they must stay configurable even
-    // when the Y axis itself is hidden.
     groupby: {
       label: t('Breakdowns'),
       description:

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

@@ -185,8 +185,6 @@ export default function transformProps(
     xTicksLayout,
     xAxisTimeFormat,
     showLegend,
-    showXAxis = true,
-    showYAxis = true,
     yAxisLabel,
     xAxisLabel,
     yAxisFormat,
@@ -435,10 +433,8 @@ export default function transformProps(
     grid: {
       ...defaultGrid,
       top: theme.sizeUnit * 7,
-      // Reclaim the axis-oriented padding when an axis is hidden so an
-      // axis-free chart gets a clean, tight layout instead of empty margins.
-      bottom: theme.sizeUnit * (showXAxis ? 7 : 3),
-      left: theme.sizeUnit * (showYAxis ? 5 : 2),
+      bottom: theme.sizeUnit * 7,
+      left: theme.sizeUnit * 5,
       right: theme.sizeUnit * 7,
     },
     legend: {
@@ -447,7 +443,6 @@ export default function transformProps(
       data: [legendNames.INCREASE, legendNames.DECREASE, legendNames.TOTAL],
     },
     xAxis: {
-      show: showXAxis,
       data: xAxisData,
       type: 'category',
       name: xAxisLabel,
@@ -459,7 +454,6 @@ export default function transformProps(
     },
     yAxis: {
       ...defaultYAxis,
-      show: showYAxis,
       type: 'value',
       nameTextStyle: {
         padding: [0, 0, theme.sizeUnit * 5, 0],

superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/types.ts

@@ -55,10 +55,8 @@ export type EchartsWaterfallFormData = QueryFormData &
     xAxisLabel: string;
     xAxisTimeFormat?: string;
     xTicksLayout?: WaterfallFormXTicksLayout;
-    showXAxis: boolean;
     yAxisLabel: string;
     yAxisFormat: string;
-    showYAxis: boolean;
     increaseLabel?: string;
     decreaseLabel?: string;
     totalLabel?: string;
@@ -67,8 +65,6 @@ export type EchartsWaterfallFormData = QueryFormData &
 
 export const DEFAULT_FORM_DATA: Partial<EchartsWaterfallFormData> = {
   showLegend: true,
-  showXAxis: true,
-  showYAxis: true,
 };
 
 export interface EchartsWaterfallChartProps extends ChartProps {

superset-frontend/plugins/plugin-chart-echarts/src/controls.tsx

@@ -140,28 +140,6 @@ export const showValueControl: ControlSetItem = {
   },
 };
 
-export const labelPositionControl: ControlSetItem = {
-  name: 'label_position',
-  config: {
-    type: 'SelectControl',
-    freeForm: false,
-    label: t('Label Position'),
-    choices: [
-      ['auto', t('Auto')],
-      ['top', t('Top')],
-      ['inside', t('Inside')],
-      ['bottom', t('Bottom')],
-      ['left', t('Left')],
-      ['right', t('Right')],
-    ],
-    default: 'auto',
-    renderTrigger: true,
-    description: t('Position of the data label relative to the data point'),
-    visibility: ({ controls }: ControlPanelsContainerProps) =>
-      Boolean(controls?.show_value?.value),
-  },
-};
-
 export const colorByPrimaryAxisControl: ControlSetItem = {
   name: 'color_by_primary_axis',
   config: {
@@ -241,7 +219,6 @@ export const percentageThresholdControl: ControlSetItem = {
 
 export const showValueSection: ControlSetRow[] = [
   [showValueControl],
-  [labelPositionControl],
   [stackControl],
   [onlyTotalControl],
   [percentageThresholdControl],
@@ -253,13 +230,11 @@ export const colorByPrimaryAxisSection: ControlSetRow[] = [
 
 export const showValueSectionWithoutStack: ControlSetRow[] = [
   [showValueControl],
-  [labelPositionControl],
   [onlyTotalControl],
 ];
 
 export const showValueSectionWithoutStream: ControlSetRow[] = [
   [showValueControl],
-  [labelPositionControl],
   [stackControlWithoutStream],
   [onlyTotalControl],
   [percentageThresholdControl],

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

@@ -114,23 +114,6 @@ export const textStyleSchema = z.object({
 // Style Schemas
 // =============================================================================
 
-/** Repeating tile pattern painted over a fill, e.g. hatching */
-export const decalSchema = z.object({
-  symbol: z.union([symbolTypeSchema, z.array(symbolTypeSchema)]).optional(),
-  symbolSize: z.number().optional(),
-  symbolKeepAspect: z.boolean().optional(),
-  color: colorSchema.optional(),
-  backgroundColor: colorSchema.optional(),
-  dashArrayX: z
-    .union([z.number(), z.array(z.union([z.number(), z.array(z.number())]))])
-    .optional(),
-  dashArrayY: z.union([z.number(), z.array(z.number())]).optional(),
-  /** Radians, not degrees. */
-  rotation: z.number().optional(),
-  maxTileWidth: z.number().optional(),
-  maxTileHeight: z.number().optional(),
-});
-
 export const lineStyleSchema = z.object({
   color: colorSchema.optional(),
   width: z.number().optional(),
@@ -167,7 +150,6 @@ export const itemStyleSchema = z.object({
   shadowOffsetX: z.number().optional(),
   shadowOffsetY: z.number().optional(),
   opacity: z.number().min(0).max(1).optional(),
-  decal: decalSchema.optional(),
 });
 
 // =============================================================================
@@ -836,7 +818,6 @@ export type TextStyleOption = z.infer<typeof textStyleSchema>;
 export type LineStyleOption = z.infer<typeof lineStyleSchema>;
 export type AreaStyleOption = z.infer<typeof areaStyleSchema>;
 export type ItemStyleOption = z.infer<typeof itemStyleSchema>;
-export type DecalOption = z.infer<typeof decalSchema>;
 export type LabelOption = z.infer<typeof labelSchema>;
 export type TitleOption = z.infer<typeof titleSchema>;
 export type LegendOption = z.infer<typeof legendSchema>;

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

@@ -593,94 +593,3 @@ test('strips tooltip extraCssText instead of passing raw CSS through', () => {
   expect(result.success).toBe(true);
   expect(result.data).toEqual({ tooltip: { show: true } });
 });
-
-test('accepts a decal pattern on itemStyle', () => {
-  const result = parseEChartOptions(
-    `{ series: { itemStyle: { decal: {
-        symbol: 'rect',
-        dashArrayX: [1, 0],
-        dashArrayY: [2, 4],
-        rotation: -0.7853981633974483,
-        color: 'rgba(0, 0, 0, 0.2)',
-      } } } }`,
-  );
-
-  expect(result.success).toBe(true);
-  expect(result.data).toEqual({
-    series: {
-      itemStyle: {
-        decal: {
-          symbol: 'rect',
-          dashArrayX: [1, 0],
-          dashArrayY: [2, 4],
-          rotation: -0.7853981633974483,
-          color: 'rgba(0, 0, 0, 0.2)',
-        },
-      },
-    },
-  });
-});
-
-test('accepts the full decal shape, including per-row dash arrays', () => {
-  // `dashArrayX` nests one level to offset rows from each other; `dashArrayY`
-  // has no equivalent.
-  const result = parseEChartOptions(
-    `{ series: { itemStyle: { decal: {
-        symbol: ['rect', 'circle'],
-        symbolSize: 0.8,
-        symbolKeepAspect: false,
-        color: '#383838',
-        backgroundColor: 'transparent',
-        dashArrayX: [[1, 0], [0, 1]],
-        dashArrayY: 5,
-        rotation: 0,
-        maxTileWidth: 512,
-        maxTileHeight: 512,
-      } } } }`,
-  );
-
-  expect(result.success).toBe(true);
-  expect(
-    (result.data as { series: { itemStyle: { decal: unknown } } }).series
-      .itemStyle.decal,
-  ).toEqual({
-    symbol: ['rect', 'circle'],
-    symbolSize: 0.8,
-    symbolKeepAspect: false,
-    color: '#383838',
-    backgroundColor: 'transparent',
-    dashArrayX: [
-      [1, 0],
-      [0, 1],
-    ],
-    dashArrayY: 5,
-    rotation: 0,
-    maxTileWidth: 512,
-    maxTileHeight: 512,
-  });
-});
-
-test('strips unknown keys from a decal rather than passing them through', () => {
-  const result = parseEChartOptions(
-    `{ series: { itemStyle: { decal: { symbol: 'rect', onclick: 'alert(1)' } } } }`,
-  );
-
-  expect(result.success).toBe(true);
-  expect(result.data).toEqual({
-    series: { itemStyle: { decal: { symbol: 'rect' } } },
-  });
-});
-
-test('rejects a decal whose values are of the wrong type', () => {
-  // Unknown keys are stripped; a known key with a bad type is an error.
-  const input = `{ series: { itemStyle: { decal: { rotation: 'sideways' } } } }`;
-
-  expect(() => parseEChartOptions(input)).toThrow(EChartOptionsParseError);
-  try {
-    parseEChartOptions(input);
-  } catch (error) {
-    expect((error as EChartOptionsParseError).errorType).toBe(
-      'validation_error',
-    );
-  }
-});

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

@@ -1,109 +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 { ControlPanelsContainerProps } from '@superset-ui/chart-controls/types';
-import controlPanel from '../../src/MixedTimeseries/controlPanel';
-
-// Narrow shape of the controls under test: enough to exercise `visibility`
-// without reaching for `any`.
-type VisibilityControl = {
-  name: string;
-  config: { visibility: (props: ControlPanelsContainerProps) => boolean };
-};
-
-const config = controlPanel;
-
-const getControl = (controlName: string) => {
-  for (const section of config.controlPanelSections) {
-    if (section && section.controlSetRows) {
-      for (const row of section.controlSetRows) {
-        for (const control of row) {
-          if (
-            typeof control === 'object' &&
-            control !== null &&
-            'name' in control &&
-            control.name === controlName
-          ) {
-            return control;
-          }
-        }
-      }
-    }
-  }
-  return null;
-};
-
-// Mock getStandardizedControls
-jest.mock('@superset-ui/chart-controls', () => {
-  const actual = jest.requireActual('@superset-ui/chart-controls');
-  return {
-    ...actual,
-    getStandardizedControls: jest.fn(() => ({
-      popAllMetrics: jest.fn(() => []),
-      popAllColumns: jest.fn(() => []),
-    })),
-  };
-});
-
-test('should have correct visibility for label_position', () => {
-  const labelPositionCtrl = getControl(
-    'label_position',
-  ) as unknown as VisibilityControl;
-  expect(labelPositionCtrl).toBeDefined();
-  expect(labelPositionCtrl.config.visibility).toBeDefined();
-
-  expect(
-    labelPositionCtrl.config.visibility({
-      controls: {
-        show_value: { value: true },
-      },
-    } as unknown as ControlPanelsContainerProps),
-  ).toBe(true);
-
-  expect(
-    labelPositionCtrl.config.visibility({
-      controls: {
-        show_value: { value: false },
-      },
-    } as unknown as ControlPanelsContainerProps),
-  ).toBe(false);
-});
-
-test('should have correct visibility for label_positionB', () => {
-  const labelPositionBCtrl = getControl(
-    'label_positionB',
-  ) as unknown as VisibilityControl;
-  expect(labelPositionBCtrl).toBeDefined();
-  expect(labelPositionBCtrl.config.visibility).toBeDefined();
-
-  expect(
-    labelPositionBCtrl.config.visibility({
-      controls: {
-        show_valueB: { value: true },
-      },
-    } as unknown as ControlPanelsContainerProps),
-  ).toBe(true);
-
-  expect(
-    labelPositionBCtrl.config.visibility({
-      controls: {
-        show_valueB: { value: false },
-      },
-    } as unknown as ControlPanelsContainerProps),
-  ).toBe(false);
-});

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

@@ -34,7 +34,6 @@ import {
   LegendOrientation,
   LegendType,
   EchartsTimeseriesSeriesType,
-  LabelPositionEnum,
 } from '../../src';
 import transformProps from '../../src/MixedTimeseries/transformProps';
 import {
@@ -43,7 +42,7 @@ import {
   EchartsMixedTimeseriesProps,
 } from '../../src/MixedTimeseries/types';
 import { createEchartsTimeseriesTestChartProps } from '../helpers';
-import type { BarSeriesOption, LineSeriesOption, SeriesOption } from 'echarts';
+import type { SeriesOption } from 'echarts';
 
 type LabelFormatterParams = {
   value: [number, number];
@@ -434,58 +433,6 @@ test('keeps bar value label clipping aligned with the assigned y-axis', () => {
   expect(formatSeriesLabel(barSeries, [timestamp, 0.5])).toBe('');
 });
 
-test('threads labelPosition and labelPositionB to series A and B', () => {
-  const timestamp = 1704067200000;
-  const queryAData = createTestQueryData(
-    [{ __timestamp: timestamp, lineMetric: 0.25 }],
-    {
-      colnames: ['__timestamp', 'lineMetric'],
-      coltypes: [GenericDataType.Temporal, GenericDataType.Numeric],
-      label_map: { lineMetric: ['lineMetric'] },
-    },
-  );
-  const queryBData = createTestQueryData(
-    [{ __timestamp: timestamp, barMetric: 0.5 }],
-    {
-      colnames: ['__timestamp', 'barMetric'],
-      coltypes: [GenericDataType.Temporal, GenericDataType.Numeric],
-      label_map: { 'barMetric (1)': ['barMetric'] },
-    },
-  );
-  const chartProps = createEchartsTimeseriesTestChartProps<
-    EchartsMixedTimeseriesFormData,
-    EchartsMixedTimeseriesProps
-  >({
-    ...MIXED_TIMESERIES_CHART_PROPS_DEFAULTS,
-    defaultQueriesData: [queryAData, queryBData],
-    formData: {
-      ...formData,
-      groupby: [],
-      groupbyB: [],
-      metrics: ['lineMetric'],
-      metricsB: ['barMetric'],
-      showValue: true,
-      showValueB: true,
-      labelPosition: LabelPositionEnum.Inside,
-      labelPositionB: LabelPositionEnum.Bottom,
-      stack: null,
-      stackB: null,
-      x_axis: '__timestamp',
-    },
-    queriesData: [queryAData, queryBData],
-  });
-
-  const { echartOptions } = transformProps(chartProps);
-  // `SeriesOption` is a union across every echarts series type and does not
-  // carry `label`; the two series under test are a line and a bar.
-  const series = echartOptions.series as (LineSeriesOption | BarSeriesOption)[];
-  const seriesA = series.find(s => s.name === 'lineMetric');
-  const seriesB = series.find(s => s.name === 'barMetric');
-
-  expect(seriesA?.label?.position).toBe(LabelPositionEnum.Inside);
-  expect(seriesB?.label?.position).toBe(LabelPositionEnum.Bottom);
-});
-
 describe('legend sorting', () => {
   const getChartProps = (overrides = {}) =>
     createEchartsTimeseriesTestChartProps<

superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Bar/controlPanel.test.ts

@@ -25,13 +25,6 @@ import {
 } from '../../../src/constants';
 import { OrientationType } from '../../../src/Timeseries/types';
 
-// Narrow shape of the control under test: enough to exercise `visibility`
-// without reaching for `any`.
-type VisibilityControl = {
-  name: string;
-  config: { visibility: (props: ControlPanelsContainerProps) => boolean };
-};
-
 const config = controlPanel;
 
 const getControl = (controlName: string) => {
@@ -299,42 +292,3 @@ test('x_axis_time_format should be hidden for numeric columns', () => {
     false,
   );
 });
-
-test('should have visibility function for label_position', () => {
-  const labelPositionCtrl = getControl(
-    'label_position',
-  ) as unknown as VisibilityControl;
-  expect(labelPositionCtrl).toBeDefined();
-  expect(labelPositionCtrl.config.visibility).toBeDefined();
-  expect(typeof labelPositionCtrl.config.visibility).toBe('function');
-
-  expect(
-    labelPositionCtrl.config.visibility({
-      controls: {
-        show_value: { value: true },
-        show_valueB: { value: false },
-      },
-    } as unknown as ControlPanelsContainerProps),
-  ).toBe(true);
-
-  // Visibility follows `show_value` alone. No Timeseries panel defines
-  // `show_valueB` — Mixed declares its own suffixed controls — so it must not
-  // reveal the control on its own.
-  expect(
-    labelPositionCtrl.config.visibility({
-      controls: {
-        show_value: { value: false },
-        show_valueB: { value: true },
-      },
-    } as unknown as ControlPanelsContainerProps),
-  ).toBe(false);
-
-  expect(
-    labelPositionCtrl.config.visibility({
-      controls: {
-        show_value: { value: false },
-        show_valueB: { value: false },
-      },
-    } as unknown as ControlPanelsContainerProps),
-  ).toBe(false);
-});

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

@@ -48,7 +48,6 @@ import {
   LegendOrientation,
   LegendType,
   EchartsTimeseriesChartProps,
-  LabelPositionEnum,
 } from '../../src/types';
 import { DEFAULT_FORM_DATA } from '../../src/Timeseries/constants';
 import { createEchartsTimeseriesTestChartProps } from '../helpers';
@@ -748,146 +747,6 @@ describe('Does transformProps transform series correctly', () => {
     });
   });
 
-  test('should respect labelPosition configuration', () => {
-    const chartProps = createTestChartProps({
-      formData: {
-        ...formData,
-        labelPosition: LabelPositionEnum.InsideBottom,
-      },
-      queriesData,
-    });
-
-    const transformedSeries = transformProps(chartProps).echartOptions
-      .series as any[];
-
-    transformedSeries.forEach(series => {
-      expect(series.label.position).toBe('insideBottom');
-      expect(series.label.overflow).toBeUndefined();
-    });
-  });
-
-  test('should default to top when labelPosition is auto and orientation is vertical', () => {
-    const chartProps = createTestChartProps({
-      formData: {
-        ...formData,
-        labelPosition: 'auto',
-        orientation: OrientationType.Vertical,
-      },
-      queriesData,
-    });
-
-    const transformedSeries = transformProps(chartProps).echartOptions
-      .series as any[];
-
-    transformedSeries.forEach(series => {
-      expect(series.label.position).toBe('top');
-      expect(series.label.overflow).toBeUndefined();
-    });
-  });
-
-  test('should default to right when labelPosition is auto and orientation is horizontal', () => {
-    const chartProps = createTestChartProps({
-      formData: {
-        ...formData,
-        labelPosition: 'auto',
-        orientation: OrientationType.Horizontal,
-      },
-      queriesData,
-    });
-
-    const transformedSeries = transformProps(chartProps).echartOptions
-      .series as any[];
-
-    transformedSeries.forEach(series => {
-      expect(series.label.position).toBe('right');
-      expect(series.label.overflow).toBeUndefined();
-    });
-  });
-
-  test('should default to right when labelPosition is unset and orientation is horizontal', () => {
-    const chartProps = createTestChartProps({
-      formData: {
-        ...formData,
-        labelPosition: undefined,
-        orientation: OrientationType.Horizontal,
-      },
-      queriesData,
-    });
-
-    const transformedSeries = transformProps(chartProps).echartOptions
-      .series as any[];
-
-    transformedSeries.forEach(series => {
-      expect(series.label.position).toBe('right');
-      expect(series.label.overflow).toBeUndefined();
-    });
-  });
-
-  test('should set overflow: truncate only for bar series', () => {
-    const barChartProps = createTestChartProps({
-      formData: {
-        ...formData,
-        seriesType: EchartsTimeseriesSeriesType.Bar,
-      },
-      queriesData,
-    });
-    const lineChartProps = createTestChartProps({
-      formData: {
-        ...formData,
-        seriesType: EchartsTimeseriesSeriesType.Line,
-      },
-      queriesData,
-    });
-
-    const barSeries = transformProps(barChartProps).echartOptions
-      .series as any[];
-    const lineSeries = transformProps(lineChartProps).echartOptions
-      .series as any[];
-
-    barSeries.forEach(series => {
-      expect(series.label.overflow).toBe('truncate');
-    });
-    lineSeries.forEach(series => {
-      expect(series.label.overflow).toBeUndefined();
-    });
-  });
-
-  test('should respect labelPosition for negative values in unstacked bar charts', () => {
-    const negativeQueriesData = [
-      createTestQueryData(
-        createTestData(
-          [
-            {
-              'San Francisco': -1,
-              'New York': 2,
-            },
-          ],
-          { intervalMs: 300000000 },
-        ),
-      ),
-    ];
-
-    const chartProps = createTestChartProps({
-      formData: {
-        ...formData,
-        seriesType: EchartsTimeseriesSeriesType.Bar,
-        stack: false,
-        labelPosition: LabelPositionEnum.Inside,
-      },
-      queriesData: negativeQueriesData,
-    });
-
-    const transformedSeries = transformProps(chartProps).echartOptions
-      .series as any[];
-
-    expect(transformedSeries[0].data[0]).toEqual({
-      value: [expect.any(Number), -1],
-      label: {
-        position: 'inside',
-      },
-    });
-  });
-
   test('should show only totals when onlyTotal is true', () => {
     const chartProps = createTestChartProps({
       formData: { ...formData, onlyTotal: true },

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

@@ -166,56 +166,3 @@ test('hide totals', () => {
     ['-', '-'],
   ]);
 });
-
-const buildAxes = (extraFormData: Record<string, unknown>) => {
-  const chartProps = new ChartProps({
-    formData: { ...formData, ...extraFormData },
-    width: 800,
-    height: 600,
-    queriesData: [{ data }],
-    theme: supersetTheme,
-  });
-  const transformedProps = transformProps(
-    chartProps as unknown as EchartsWaterfallChartProps,
-  );
-  return {
-    xAxis: transformedProps.echartOptions.xAxis as any,
-    yAxis: transformedProps.echartOptions.yAxis as any,
-    grid: transformedProps.echartOptions.grid as any,
-  };
-};
-
-test('shows both axes by default', () => {
-  const { xAxis, yAxis } = buildAxes({});
-  expect(xAxis.show).not.toBe(false);
-  expect(yAxis.show).not.toBe(false);
-});
-
-test('hides the whole X axis when showXAxis is false', () => {
-  const { xAxis } = buildAxes({ showXAxis: false });
-  // echarts hides the axis line, ticks, labels, name, and gridlines when
-  // `show` is false — a single flag rather than a set of sub-flags.
-  expect(xAxis.show).toBe(false);
-});
-
-test('hides the whole Y axis when showYAxis is false', () => {
-  const { yAxis } = buildAxes({ showYAxis: false });
-  expect(yAxis.show).toBe(false);
-});
-
-test('reclaims the bottom grid margin when the X axis is hidden', () => {
-  const { grid: shown } = buildAxes({ showXAxis: true });
-  const { grid: hidden } = buildAxes({ showXAxis: false });
-  // The bottom margin reserves room for the X-axis labels and name; with the
-  // axis hidden that space should be reclaimed for a clean, axis-free layout.
-  expect(hidden.bottom).toBeLessThan(shown.bottom);
-  // Hiding the X axis must not shrink the Y-axis (left) margin.
-  expect(hidden.left).toBe(shown.left);
-});
-
-test('reclaims the left grid margin when the Y axis is hidden', () => {
-  const { grid: shown } = buildAxes({ showYAxis: true });
-  const { grid: hidden } = buildAxes({ showYAxis: false });
-  expect(hidden.left).toBeLessThan(shown.left);
-  expect(hidden.bottom).toBe(shown.bottom);
-});

superset-frontend/plugins/plugin-chart-pivot-table/src/plugin/transformProps.ts

@@ -107,11 +107,6 @@ export default function transformProps(chartProps: ChartProps<QueryFormData>) {
   );
   const metricsArr = ensureIsArray(formData.metrics);
   let data: QueryData[];
-  // The rows that conditional formatting derives its color scale from. Only the
-  // leaf (detail) cells belong in that domain: the totals are aggregates of the
-  // very cells being shaded, so letting them in makes the grand total the max
-  // and leaves every detail cell nearly unshaded.
-  let colorScaleRows: DataRecord[];
   if (allMetricsAdditive(metricsArr)) {
     // Additive fast-path: a single full-detail query was issued; synthesize
     // each rollup level by reducing the leaf rows on the client (see SIP.md).
@@ -133,11 +128,6 @@ export default function transformProps(chartProps: ChartProps<QueryFormData>) {
       data: synthesized[i] as DataRecord[],
       groupby: combination,
     }));
-    // The query returned the leaf rows and nothing else, so no totals can leak
-    // into the domain. Use those raw rows rather than the synthesized leaf
-    // level, whose reduction coerces values through `Number` and drops
-    // non-numeric ones -- that would shift the domain for additive metrics.
-    colorScaleRows = leafRows;
   } else {
     // Non-additive: a single GROUPING SETS query returned all rollup levels
     // tagged with GROUPING() markers; split the combined result back into one
@@ -155,13 +145,6 @@ export default function transformProps(chartProps: ChartProps<QueryFormData>) {
       data: splitRows[i] as DataRecord[],
       groupby: combination,
     }));
-    // This result *does* carry the rollup levels, so pick out the leaf level --
-    // the one grouping every dimension, same definition the splitter uses.
-    const leafIndex = levelLabels.findIndex(labels => {
-      const grouped = new Set(labels);
-      return allGroupbyLabels.every(label => grouped.has(label));
-    });
-    colorScaleRows = (splitRows[leafIndex] as DataRecord[]) ?? [];
   }
   // The full-granularity query has the most colnames -- use it for column/type
   // metadata and formatters.
@@ -238,7 +221,7 @@ export default function transformProps(chartProps: ChartProps<QueryFormData>) {
   );
   const metricColorFormatters = getColorFormatters(
     pivotConditionalFormatting,
-    colorScaleRows,
+    mainQuery.data,
     theme,
   );
 

superset-frontend/plugins/plugin-chart-pivot-table/test/plugin/transformProps.test.ts

@@ -452,152 +452,3 @@ test('additive metrics: synthesizes rollup levels from a single leaf query', ()
     { region: 'EU', v: 5 },
   ]);
 });
-
-test('conditional formatting scales over leaf cells only, not rollup totals', () => {
-  const gm = (col: string) => `${col}__superset_grouping`;
-  // `metrics` below is a plain string, i.e. a saved-metric reference.
-  // `isAdditiveMetric` treats every string as non-additive no matter what it is
-  // named, because form data does not reveal the aggregate behind a saved
-  // metric -- so a saved metric labelled "SUM(sales)" (as in the report this
-  // regression comes from) takes the non-additive path despite the name. That
-  // path issues a single GROUPING SETS query whose result carries the rollup
-  // levels alongside the leaf rows, so with both totals toggles on the grand
-  // total (100) is part of that result.
-  const row = (
-    productLine: string | null,
-    dealSize: string | null,
-    sales: number,
-  ) => ({
-    product_line: productLine,
-    deal_size: dealSize,
-    'SUM(sales)': sales,
-    [gm('product_line')]: productLine === null ? 1 : 0,
-    [gm('deal_size')]: dealSize === null ? 1 : 0,
-  });
-  const totalsChartProps = new ChartProps<QueryFormData>({
-    formData: {
-      ...formData,
-      combineMetric: false,
-      transposePivot: false,
-      metricsLayout: MetricsLayoutEnum.ROWS,
-      groupbyRows: ['product_line'],
-      groupbyColumns: ['deal_size'],
-      metrics: ['SUM(sales)'],
-      colTotals: true,
-      rowTotals: true,
-      conditionalFormatting: [
-        {
-          colorScheme: '#ACE1C4',
-          column: 'SUM(sales)',
-          operator: '>',
-          targetValue: 0,
-        },
-      ],
-    },
-    width: 800,
-    height: 600,
-    queriesData: [
-      {
-        data: [
-          // leaf cells
-          row('Classic Cars', 'Small', 10),
-          row('Classic Cars', 'Large', 20),
-          row('Motorcycles', 'Small', 30),
-          row('Motorcycles', 'Large', 40),
-          // row totals
-          row('Classic Cars', null, 30),
-          row('Motorcycles', null, 70),
-          // column totals
-          row(null, 'Small', 40),
-          row(null, 'Large', 60),
-          // grand total
-          row(null, null, 100),
-        ],
-        colnames: [
-          'product_line',
-          'deal_size',
-          'SUM(sales)',
-          gm('product_line'),
-          gm('deal_size'),
-        ],
-        coltypes: [1, 1, 0, 0, 0],
-      },
-    ],
-    hooks: { setDataMask },
-    filterState: { selectedFilters: {} },
-    datasource: { verboseMap: {}, columnFormats: {} },
-    theme: supersetTheme,
-  });
-
-  const { getColorFromValue } =
-    transformProps(totalsChartProps).metricColorFormatters[0];
-  // The largest leaf cell must be fully saturated. Including the grand total
-  // in the domain would stretch it to 100 and leave this cell washed out.
-  expect(getColorFromValue(40)).toEqual('#ACE1C4FF');
-});
-
-test('conditional formatting on the additive path uses the raw leaf query rows', () => {
-  // Counterpart to the test above for the additive fast path. Its query returns
-  // the leaf rows only, so the domain is those rows verbatim -- deliberately not
-  // the synthesized leaf level, whose reduction would coerce values through
-  // `Number` and drop non-numeric ones.
-  const additiveChartProps = new ChartProps<QueryFormData>({
-    formData: {
-      ...formData,
-      combineMetric: false,
-      transposePivot: false,
-      metricsLayout: MetricsLayoutEnum.ROWS,
-      groupbyRows: ['product_line'],
-      groupbyColumns: ['deal_size'],
-      metrics: [
-        {
-          expressionType: 'SIMPLE',
-          aggregate: 'SUM',
-          column: { column_name: 'sales' },
-          label: 'SUM(sales)',
-        },
-      ],
-      colTotals: true,
-      rowTotals: true,
-      conditionalFormatting: [
-        {
-          colorScheme: '#ACE1C4',
-          column: 'SUM(sales)',
-          operator: '>',
-          targetValue: 0,
-        },
-      ],
-    },
-    width: 800,
-    height: 600,
-    queriesData: [
-      {
-        data: [
-          {
-            product_line: 'Classic Cars',
-            deal_size: 'Small',
-            'SUM(sales)': 10,
-          },
-          {
-            product_line: 'Classic Cars',
-            deal_size: 'Large',
-            'SUM(sales)': 20,
-          },
-          { product_line: 'Motorcycles', deal_size: 'Small', 'SUM(sales)': 30 },
-          { product_line: 'Motorcycles', deal_size: 'Large', 'SUM(sales)': 40 },
-        ],
-        colnames: ['product_line', 'deal_size', 'SUM(sales)'],
-        coltypes: [1, 1, 0],
-      },
-    ],
-    hooks: { setDataMask },
-    filterState: { selectedFilters: {} },
-    datasource: { verboseMap: {}, columnFormats: {} },
-    theme: supersetTheme,
-  });
-
-  const { getColorFromValue } =
-    transformProps(additiveChartProps).metricColorFormatters[0];
-  // Scale spans the leaf cells (max 40), never the client-side grand total 100.
-  expect(getColorFromValue(40)).toEqual('#ACE1C4FF');
-});

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

@@ -1138,8 +1138,7 @@ export default function TableChart<D extends DataRecord = DataRecord>(
                 ?.backgroundColor || backgroundColor;
             arrow =
               column.label === comparisonLabels[0]
-                ? (basicColorColumnFormatters[row.index]?.[column.key]
-                    ?.mainArrow ?? arrow)
+                ? basicColorColumnFormatters[row.index]?.[column.key]?.mainArrow
                 : '';
           }
           const rowSurfaceColor =
@@ -1195,36 +1194,30 @@ export default function TableChart<D extends DataRecord = DataRecord>(
             }
           `;
 
-          // Plain inline style (rather than the `css` prop) so the arrow's
-          // color is guaranteed to apply regardless of whether the consuming
-          // app's build wires up the emotion JSX pragma for the `css` prop --
-          // notably, this codebase's own Jest/Babel config does not, which
-          // silently no-ops any `css` prop on a plain DOM element.
-          let arrowStyles: CSSProperties = {
-            color:
+          let arrowStyles = css`
+            color: ${
               basicColorFormatters &&
               basicColorFormatters[row.index]?.[originKey]?.arrowColor ===
                 ColorSchemeEnum.Green
                 ? theme.colorSuccess
-                : theme.colorError,
-            marginRight: theme.sizeUnit,
-          };
+                : theme.colorError
+            };
+            margin-right: ${theme.sizeUnit}px;
+          `;
 
           if (
             basicColorColumnFormatters &&
             basicColorColumnFormatters?.length > 0
           ) {
-            const columnArrowColor =
-              basicColorColumnFormatters[row.index]?.[column.key]?.arrowColor;
-            if (columnArrowColor) {
-              arrowStyles = {
-                color:
-                  columnArrowColor === ColorSchemeEnum.Green
-                    ? theme.colorSuccess
-                    : theme.colorError,
-                marginRight: theme.sizeUnit,
+            arrowStyles = css`
+              color: ${
+                basicColorColumnFormatters[row.index]?.[column.key]
+                  ?.arrowColor === ColorSchemeEnum.Green
+                  ? theme.colorSuccess
+                  : theme.colorError
               };
-            }
+              margin-right: ${theme.sizeUnit}px;
+            `;
           }
 
           const cellProps = {
@@ -1309,12 +1302,12 @@ export default function TableChart<D extends DataRecord = DataRecord>(
                   className="dt-truncate-cell"
                   style={columnWidth ? { width: columnWidth } : undefined}
                 >
-                  {arrow && <span style={arrowStyles}>{arrow}</span>}
+                  {arrow && <span css={arrowStyles}>{arrow}</span>}
                   {text}
                 </div>
               ) : (
                 <>
-                  {arrow && <span style={arrowStyles}>{arrow}</span>}
+                  {arrow && <span css={arrowStyles}>{arrow}</span>}
                   {text}
                 </>
               )}

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

@@ -2111,14 +2111,7 @@ describe('plugin-chart-table', () => {
 
         expect(() =>
           render(
-            ProviderWrapper({
-              children: (
-                <TableChart
-                  {...propsWithMissingFormatterEntry}
-                  sticky={false}
-                />
-              ),
-            }),
+            <TableChart {...propsWithMissingFormatterEntry} sticky={false} />,
           ),
         ).not.toThrow();
 
@@ -2132,24 +2125,8 @@ describe('plugin-chart-table', () => {
           'rgba(0, 150, 0, 0.2)',
         );
 
-        // the row missing a formatter entry falls back to the row-level
-        // comparison arrow instead of losing it: before the fix, this row's
-        // arrow was silently cleared (and its color, computed the same way,
-        // would have flipped to the "decrease" color) whenever the
-        // column-specific lookup for this row was undefined.
-        const arrowCell = screen
-          .getAllByTitle('110')
-          .find(cell => cell.querySelector('span'));
-        expect(arrowCell).toHaveTextContent('↑110');
-        expect(getComputedStyle(arrowCell!).background).toContain(
-          'rgba(0, 150, 0, 0.2)',
-        );
-        // the fallback arrow itself must also keep the "increase" color --
-        // asserting only the cell background would still pass if the arrow's
-        // own color had regressed to the "decrease" color.
-        expect(arrowCell!.querySelector('span')).toHaveStyle({
-          color: supersetTheme.colorSuccess,
-        });
+        // the row missing a formatter entry still renders its raw value
+        expect(screen.getAllByTitle('110').length).toBeGreaterThan(0);
       });
 
       test('preserves client-side search text across temporal table rerenders', async () => {

superset-frontend/plugins/preset-chart-deckgl/src/components/Tooltip.test.tsx

@@ -1,64 +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.
- */
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { render, screen } from '@testing-library/react';
-// eslint-disable-next-line import/no-extraneous-dependencies
-import '@testing-library/jest-dom';
-import { supersetTheme, ThemeProvider } from '@apache-superset/core/theme';
-import type { ReactElement } from 'react';
-import Tooltip from './Tooltip';
-
-const renderWithTheme = (component: ReactElement) =>
-  render(<ThemeProvider theme={supersetTheme}>{component}</ThemeProvider>);
-
-const tooltip = {
-  x: 10,
-  y: 20,
-  content: <span data-test="tooltip-content">Fremont: 42</span>,
-};
-
-test('renders an opaque, themed surface for the default variant', () => {
-  renderWithTheme(<Tooltip tooltip={tooltip} />);
-
-  const container = screen.getByTestId('tooltip-content').parentElement;
-  expect(container).toHaveStyle({
-    background: supersetTheme.colorBgElevated,
-    color: supersetTheme.colorText,
-  });
-});
-
-test('renders an opaque, themed surface for the custom (handlebars) variant, see #41154', () => {
-  renderWithTheme(<Tooltip tooltip={tooltip} variant="custom" />);
-
-  // Custom tooltip content comes from a user-supplied handlebars template, so
-  // the container must supply its own background instead of letting the map
-  // show through. See https://github.com/apache/superset/issues/41154
-  const container = screen.getByTestId('tooltip-content').parentElement;
-  expect(container).toHaveStyle({
-    background: supersetTheme.colorBgElevated,
-    color: supersetTheme.colorText,
-    'border-radius': `${supersetTheme.borderRadius}px`,
-    padding: `${supersetTheme.sizeUnit * 2}px`,
-  });
-});
-
-test('renders nothing without a tooltip', () => {
-  const { container } = renderWithTheme(<Tooltip tooltip={null} />);
-  expect(container).toBeEmptyDOMElement();
-});

superset-frontend/plugins/preset-chart-deckgl/src/components/Tooltip.tsx

@@ -44,15 +44,23 @@ const StyledDiv = styled.div<{
     left: ${left}px;
     z-index: 9;
     pointer-events: none;
-    padding: ${theme.sizeUnit * 2}px;
-    margin: ${variant === 'default' ? theme.sizeUnit * 2 : theme.sizeUnit * 3}px;
-    background: ${theme.colorBgElevated};
-    color: ${theme.colorText};
-    max-width: 300px;
-    font-size: ${theme.fontSizeSM}px;
-    border: 1px solid ${theme.colorBorder};
-    border-radius: ${theme.borderRadius}px;
-    box-shadow: ${theme.boxShadowSecondary};
+    ${
+      variant === 'default'
+        ? `
+      padding: ${theme.sizeUnit * 2}px;
+      margin: ${theme.sizeUnit * 2}px;
+      background: ${theme.colorBgElevated};
+      color: ${theme.colorText};
+      max-width: 300px;
+      font-size: ${theme.fontSizeSM}px;
+      border: 1px solid ${theme.colorBorder};
+      border-radius: ${theme.borderRadius}px;
+      box-shadow: ${theme.boxShadowSecondary};
+    `
+        : `
+      margin: ${theme.sizeUnit * 3}px;
+    `
+    }
   `}
 `;
 

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

@@ -61,53 +61,6 @@ describe('sqlLabReducer', () => {
     });
   });
 
-  test('should default extra_json to an empty object when extra is unset', () => {
-    // `extra` is nullable in the metadata database, and JSON.parse(extra || '')
-    // is guaranteed to throw because '' is never valid JSON, so one such row
-    // took down the whole reducer.
-    const incomingDb = {
-      ...databases.result[0],
-      extra: null,
-    };
-    const incomingDbId = Number(incomingDb.id);
-
-    const action = actions.setDatabases([incomingDb] as any);
-
-    const newState = sqlLabReducer(initialState, action);
-
-    expect(newState.databases[incomingDbId]).toEqual({
-      ...incomingDb,
-      extra_json: {},
-    });
-  });
-
-  test('defaults extra_json when a database has malformed extra', () => {
-    const incomingDb = { ...databases.result[0], extra: '{not json' };
-
-    const newState = sqlLabReducer(
-      initialState,
-      actions.setDatabases([incomingDb] as any),
-    );
-
-    expect(newState.databases[Number(incomingDb.id)].extra_json).toEqual({});
-  });
-
-  test('keeps a valid extra payload', () => {
-    const incomingDb = {
-      ...databases.result[0],
-      extra: '{"engine_params": {"pool_size": 5}}',
-    };
-
-    const newState = sqlLabReducer(
-      initialState,
-      actions.setDatabases([incomingDb] as any),
-    );
-
-    expect(newState.databases[Number(incomingDb.id)].extra_json).toEqual({
-      engine_params: { pool_size: 5 },
-    });
-  });
-
   // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
   describe('Query editors actions', () => {
     let newState: SqlLabState;

superset-frontend/src/SqlLab/reducers/sqlLab.ts

@@ -36,27 +36,6 @@ import {
 
 type SqlLabState = SqlLabRootState['sqlLab'];
 
-/**
- * A database's `extra` column is free-form and frequently empty: it is nullable
- * in the metadata database and the API returns it verbatim. `JSON.parse` cannot
- * represent that, and `JSON.parse(extra || '')` is guaranteed to throw, since
- * the empty string is never valid JSON — so a single database row with no
- * `extra` took down the whole SET_DATABASES reducer and with it SQL Lab.
- * Malformed JSON is treated the same way: one bad row must not cost the user
- * every other database.
- */
-function parseDatabaseExtra(extra: unknown): Record<string, unknown> {
-  if (typeof extra !== 'string' || extra.trim() === '') {
-    return {};
-  }
-  try {
-    const parsed = JSON.parse(extra);
-    return parsed && typeof parsed === 'object' ? parsed : {};
-  } catch {
-    return {};
-  }
-}
-
 function alterUnsavedQueryEditorState(
   state: SqlLabState,
   updatedState: Partial<QueryEditor>,
@@ -748,7 +727,7 @@ export default function sqlLabReducer(
       (action.databases as any[])!.forEach((db: any) => {
         databases[db.id] = {
           ...db,
-          extra_json: parseDatabaseExtra(db.extra),
+          extra_json: JSON.parse(db.extra || ''),
         };
       });
       return {

superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ScopingTreePanel.tsx

@@ -22,7 +22,7 @@ import { t } from '@apache-superset/core/translation';
 import { isDefined, NativeFilterScope } from '@superset-ui/core';
 import { Alert } from '@apache-superset/core/components';
 import { css, styled, useTheme } from '@apache-superset/core/theme';
-import { Select } from '@superset-ui/core/components';
+import { Select, Tooltip } from '@superset-ui/core/components';
 import { noOp } from 'src/utils/common';
 import ScopingTree from 'src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/ScopingTree';
 import {
@@ -33,6 +33,7 @@ import {
 } from 'src/dashboard/types';
 import { CHART_TYPE } from 'src/dashboard/util/componentTypes';
 import type { SelectOptionsType } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 import { NEW_CHART_SCOPING_ID } from './constants';
 
 interface ScopingTreePanelProps {
@@ -108,6 +109,16 @@ const ChartSelect = ({
             margin-bottom: 0;
           `}
         >{`${t('Chart')} *`}</InfoText>
+        <Tooltip title={t('Tooltip')} placement="top">
+          <Icons.InfoCircleOutlined
+            iconSize="xs"
+            css={css`
+              & > span {
+                line-height: 0;
+              }
+            `}
+          />
+        </Tooltip>
       </div>
       <Select
         data-test="select-chart"

superset-frontend/src/explore/components/controls/FilterControl/AdhocFilter/AdhocFilter.test.ts

@@ -207,38 +207,6 @@ 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,

superset-frontend/src/explore/components/controls/FilterControl/AdhocFilter/index.ts

@@ -182,10 +182,8 @@ 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. 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;
+        // A value has been selected or typed
+        return this.comparator !== null;
       }
     }
 

superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/AdhocFilterEditPopover.test.tsx

@@ -181,29 +181,6 @@ 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 });

superset-frontend/src/features/alerts/AlertReportModal.tsx

@@ -723,13 +723,11 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
     force_screenshot: false,
     include_cta: true,
     grace_period: undefined,
-    ...(isFeatureEnabled(FeatureFlag.AlertReportsRetry) && {
-      retry_on_failure: false,
-      retry_max_attempts: 3,
-      send_failed_reports: false,
-      retry_notify_owners: true,
-      retry_notify_recipients: false,
-    }),
+    retry_on_failure: false,
+    retry_max_attempts: 3,
+    send_failed_reports: false,
+    retry_notify_owners: true,
+    retry_notify_recipients: false,
   };
 
   const fetchDashboardFilterValues = async (
@@ -2764,7 +2762,7 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
                 </>
               ),
             },
-            ...(isReport && isFeatureEnabled(FeatureFlag.AlertReportsRetry)
+            ...(isReport
               ? [
                   {
                     key: 'error-handling',

superset-frontend/src/features/reports/ReportModal/ReportModal.test.tsx

@@ -452,23 +452,7 @@ test('submit failure dispatches danger toast and keeps modal open', async () =>
 // Error Handling section tests
 // ---------------------------------------------------------------------------
 
-const enableRetryFlag = () => {
-  mockedIsFeatureEnabled.mockImplementation(
-    (featureFlag: string) =>
-      featureFlag === FeatureFlag.AlertReports ||
-      featureFlag === FeatureFlag.AlertReportsRetry,
-  );
-};
-
-test('Error Handling section is hidden when ALERT_REPORTS_RETRY flag is off', () => {
-  const store = createStore({}, reducerIndex);
-  render(<ReportModal {...defaultProps} />, { useRedux: true, store });
-
-  expect(screen.queryByText('Error Handling')).not.toBeInTheDocument();
-});
-
-test('Error Handling section is visible when ALERT_REPORTS_RETRY flag is on', () => {
-  enableRetryFlag();
+test('Error Handling section is visible and Enable Retries checkbox is unchecked by default', () => {
   const store = createStore({}, reducerIndex);
   render(<ReportModal {...defaultProps} />, { useRedux: true, store });
 
@@ -480,7 +464,6 @@ test('Error Handling section is visible when ALERT_REPORTS_RETRY flag is on', ()
 });
 
 test('conditional retry fields are hidden when Enable Retries is unchecked', () => {
-  enableRetryFlag();
   const store = createStore({}, reducerIndex);
   render(<ReportModal {...defaultProps} />, { useRedux: true, store });
 
@@ -490,7 +473,6 @@ test('conditional retry fields are hidden when Enable Retries is unchecked', ()
 });
 
 test('conditional retry fields appear when Enable Retries is checked', async () => {
-  enableRetryFlag();
   const store = createStore({}, reducerIndex);
   render(<ReportModal {...defaultProps} />, { useRedux: true, store });
 
@@ -507,7 +489,6 @@ test('conditional retry fields appear when Enable Retries is checked', async ()
 });
 
 test('retry fields are included in the POST body when Enable Retries is enabled', async () => {
-  enableRetryFlag();
   fetchMock.post(REPORT_ENDPOINT, { result: {} }, { name: 'post-retry' });
   const store = createStore({}, reducerIndex);
   render(

superset-frontend/src/features/reports/ReportModal/index.tsx

@@ -26,12 +26,7 @@ import {
 } from 'react';
 
 import { t } from '@apache-superset/core/translation';
-import {
-  getClientErrorObject,
-  isFeatureEnabled,
-  FeatureFlag,
-  VizType,
-} from '@superset-ui/core';
+import { getClientErrorObject, VizType } from '@superset-ui/core';
 import { Alert } from '@apache-superset/core/components';
 import { SupersetTheme } from '@apache-superset/core/theme';
 import { useDispatch, useSelector } from 'react-redux';
@@ -201,13 +196,11 @@ function ReportModal({
       crontab: currentReport.crontab,
       report_format: currentReport.report_format || defaultNotificationFormat,
       timezone: currentReport.timezone,
-      ...(isFeatureEnabled(FeatureFlag.AlertReportsRetry) && {
-        retry_on_failure: currentReport.retry_on_failure ?? false,
-        retry_max_attempts: currentReport.retry_max_attempts ?? 3,
-        send_failed_reports: currentReport.send_failed_reports ?? false,
-        retry_notify_owners: currentReport.retry_notify_owners ?? true,
-        retry_notify_recipients: currentReport.retry_notify_recipients ?? false,
-      }),
+      retry_on_failure: currentReport.retry_on_failure ?? false,
+      retry_max_attempts: currentReport.retry_max_attempts ?? 3,
+      send_failed_reports: currentReport.send_failed_reports ?? false,
+      retry_notify_owners: currentReport.retry_notify_owners ?? true,
+      retry_notify_recipients: currentReport.retry_notify_recipients ?? false,
     };
 
     setCurrentReport({ isSubmitting: true, error: undefined });
@@ -485,8 +478,7 @@ function ReportModal({
         />
         {isChart && renderMessageContentSection}
         {(!isChart || !isTextBasedChart) && renderCustomWidthSection}
-        {isFeatureEnabled(FeatureFlag.AlertReportsRetry) &&
-          renderErrorHandlingSection}
+        {renderErrorHandlingSection}
       </StyledBottomSection>
       {currentReport.error && (
         <Alert

superset-frontend/src/pages/Chart/Chart.test.tsx

@@ -223,7 +223,7 @@ describe('ChartPage', () => {
       window.history.pushState(
         {},
         '',
-        `/explore/?${URL_PARAMS.dashboardPageId.name}=${dashboardPageId}`,
+        `/?${URL_PARAMS.dashboardPageId.name}=${dashboardPageId}`,
       );
       const { getByTestId } = render(<ChartPage />, {
         useRouter: true,
@@ -261,13 +261,13 @@ describe('ChartPage', () => {
       window.history.pushState(
         {},
         '',
-        `/explore/?${URL_PARAMS.dashboardPageId.name}=${dashboardPageId}`,
+        `/?${URL_PARAMS.dashboardPageId.name}=${dashboardPageId}`,
       );
       const { getByTestId } = render(
         <>
           <Link
             to={{
-              pathname: '/explore/',
+              pathname: '/',
               search: `?${URL_PARAMS.dashboardPageId.name}=${dashboardPageId}`,
               state: { saveAction: 'overwrite' },
             }}
@@ -324,7 +324,7 @@ describe('ChartPage', () => {
       });
       render(
         <>
-          <Link to="/explore/?slice_id=99">Navigate away</Link>
+          <Link to="/?slice_id=99">Navigate away</Link>
           <ChartPage />
         </>,
         {
@@ -382,7 +382,7 @@ describe('ChartPage', () => {
         <>
           <Link
             to={{
-              pathname: '/explore/',
+              pathname: '/',
               search: `?${URL_PARAMS.sliceId.name}=${formData.slice_id}`,
               state: toChartStateHistoryState({
                 ...formData,
@@ -392,7 +392,7 @@ describe('ChartPage', () => {
           >
             Change the chart
           </Link>
-          <Link to="/explore/?slice_id=99">Navigate away</Link>
+          <Link to="/?slice_id=99">Navigate away</Link>
           <ChartPage />
         </>,
         { useRouter: true, useRedux: true, useDnd: true },
@@ -433,14 +433,14 @@ describe('ChartPage', () => {
         <>
           <Link
             to={{
-              pathname: '/explore/',
+              pathname: '/',
               search: `?${URL_PARAMS.sliceId.name}=99`,
               state: toChartStateHistoryState({ ...formData, slice_id: 99 }),
             }}
           >
             Another chart
           </Link>
-          <Link to="/explore/?slice_id=100">Navigate away</Link>
+          <Link to="/?slice_id=100">Navigate away</Link>
           <ChartPage />
         </>,
         { useRouter: true, useRedux: true, useDnd: true },
@@ -477,14 +477,14 @@ describe('ChartPage', () => {
         <>
           <Link
             to={{
-              pathname: '/explore/',
+              pathname: '/',
               search: `?${URL_PARAMS.sliceId.name}=${formData.slice_id}`,
               state: toChartStateHistoryState(formData),
             }}
           >
             Change the chart
           </Link>
-          <Link to="/explore/?slice_id=99">Navigate away</Link>
+          <Link to="/?slice_id=99">Navigate away</Link>
           <ChartPage />
         </>,
         { useRouter: true, useRedux: true, useDnd: true, store },
@@ -507,32 +507,6 @@ describe('ChartPage', () => {
       window.history.back();
       await waitFor(() => expect(loads()).toBe(1));
     });
-
-    test('does not re-fetch explore data when navigating to a dashboard', async () => {
-      const exploreApiRoute = 'glob:*/api/v1/explore/*';
-      const exploreFormData = getExploreFormData({
-        viz_type: VizType.Table,
-        show_cell_bars: true,
-      });
-      fetchMock.get(exploreApiRoute, {
-        result: { dataset: { id: 1 }, form_data: exploreFormData },
-      });
-      render(
-        <>
-          <Link to="/dashboard/5/">Go to dashboard</Link>
-          <ChartPage />
-        </>,
-        { useRouter: true, useRedux: true, useDnd: true },
-      );
-      await waitFor(() =>
-        expect(fetchMock.callHistory.calls(exploreApiRoute).length).toBe(1),
-      );
-
-      fireEvent.click(screen.getByText('Go to dashboard'));
-
-      await new Promise(resolve => setTimeout(resolve, 0));
-      expect(fetchMock.callHistory.calls(exploreApiRoute).length).toBe(1);
-    });
   });
 
   test('does not show error toast when request is aborted on unmount', async () => {
@@ -585,7 +559,7 @@ describe('ChartPage', () => {
 
     render(
       <>
-        <Link to="/explore/?slice_id=99">Navigate</Link>
+        <Link to="/?slice_id=99">Navigate</Link>
         <ChartPage />
       </>,
       {

superset-frontend/src/pages/Chart/index.tsx

@@ -56,11 +56,6 @@ const isValidResult = (rv: JsonObject): boolean =>
 const hasDatasetId = (rv: JsonObject): boolean =>
   isDefined(rv?.result?.dataset?.id);
 
-const EXPLORE_ROUTE_PREFIX = '/explore/';
-
-const isExploreRoute = (pathname: string): boolean =>
-  pathname.startsWith(EXPLORE_ROUTE_PREFIX);
-
 const fetchExploreData = async (
   exploreUrlParams: URLSearchParams,
   signal?: AbortSignal,
@@ -317,8 +312,6 @@ export default function ExplorePage() {
   // Other REPLACE: ignored (URL sync from updateHistory).
   // Entries holding a chart state of the loaded chart are skipped: Explore
   // pushed them itself, and ExploreViewContainer restores a popped one in place.
-  // Navigations that leave Explore must not trigger a re-fetch while the page
-  // is unmounting, as the destination's URL params are not chart params.
   useEffect(() => {
     const unlisten = history.listen((loc: Location, action: Action) => {
       const saveAction = (loc.state as Record<string, unknown>)?.saveAction as
@@ -333,9 +326,6 @@ export default function ExplorePage() {
           return;
         }
       }
-      if (!isExploreRoute(loc.pathname)) {
-        return;
-      }
       if (action === 'PUSH' || action === 'POP') {
         setIsLoaded(false);
         loadExploreData(loc, saveAction);

superset-frontend/src/pages/DatabaseList/DatabaseList.semanticLayerDelete.test.tsx

@@ -1,425 +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 fetchMock from 'fetch-mock';
-import rison from 'rison';
-import { configureStore } from '@reduxjs/toolkit';
-import {
-  act,
-  fireEvent,
-  render,
-  screen,
-  waitFor,
-  within,
-} from 'spec/helpers/testing-library';
-import userEvent from '@testing-library/user-event';
-import DatabaseList from 'src/pages/DatabaseList';
-
-/**
- * Deleting a semantic layer cascade-deletes its semantic views (SC-108418).
- * These tests pin the delete confirmation's cascade warning: the dependent
- * views are counted and named before the user confirms, and a failed lookup
- * still opens the modal with an uncounted warning rather than blocking.
- */
-
-const SL_UUID = '6a000000-0000-4000-8000-000000000001';
-const SL_UUID_B = '6b000000-0000-4000-8000-000000000002';
-
-const semanticLayerRow = {
-  source_type: 'semantic_layer',
-  uuid: SL_UUID,
-  database_name: 'Demo Semantic Layer',
-  backend: 'Demo',
-  sl_type: 'demo',
-  description: null,
-  allow_run_async: null,
-  allow_dml: null,
-  allow_file_upload: null,
-  expose_in_sqllab: null,
-  changed_on_delta_humanized: 'a day ago',
-  changed_by: null,
-};
-
-const semanticLayerRowB = {
-  ...semanticLayerRow,
-  uuid: SL_UUID_B,
-  database_name: 'Second Semantic Layer',
-};
-
-const CONNECTIONS_ROUTE = 'glob:*/api/v1/semantic_layer/connections/*';
-const DATASOURCE_ROUTE = 'glob:*/api/v1/datasource/?*';
-const DELETE_ROUTE = `glob:*/api/v1/semantic_layer/${SL_UUID}`;
-
-const mockUser = {
-  userId: 1,
-  firstName: 'Admin',
-  lastName: 'User',
-  roles: { Admin: [['can_write', 'Database']] },
-  permissions: {},
-  isActive: true,
-  email: 'admin@example.com',
-  createdOn: '2026-01-01T00:00:00',
-};
-
-const dependentView = (id: number, name: string) => ({
-  id,
-  table_name: name,
-  kind: 'semantic_view',
-  source_type: 'semantic_layer',
-});
-
-const setupMocks = ({
-  dependents,
-  dependentsError = false,
-  rows = [semanticLayerRow],
-}: {
-  dependents: { id: number; table_name: string }[];
-  dependentsError?: boolean;
-  rows?: (typeof semanticLayerRow)[];
-}) => {
-  fetchMock.clearHistory().removeRoutes();
-  fetchMock.get('glob:*/api/v1/database/_info*', {
-    permissions: ['can_read', 'can_write', 'can_export'],
-  });
-  fetchMock.get('glob:*/api/v1/database/?q=*', { result: [], count: 0 });
-  fetchMock.get('glob:*/api/v1/database/related/*', { result: [], count: 0 });
-  fetchMock.get(CONNECTIONS_ROUTE, {
-    result: rows,
-    count: rows.length,
-  });
-  if (dependentsError) {
-    fetchMock.get(DATASOURCE_ROUTE, 500, { name: DATASOURCE_ROUTE });
-  } else {
-    fetchMock.get(
-      DATASOURCE_ROUTE,
-      { result: dependents, count: dependents.length },
-      { name: DATASOURCE_ROUTE },
-    );
-  }
-  fetchMock.delete(DELETE_ROUTE, {});
-};
-
-const renderDatabaseList = () => {
-  const store = configureStore({
-    reducer: {
-      user: (state = mockUser) => state,
-      common: (
-        state = {
-          conf: {
-            CSV_EXTENSIONS: ['csv'],
-            EXCEL_EXTENSIONS: ['xls'],
-            COLUMNAR_EXTENSIONS: ['parquet'],
-            ALLOWED_EXTENSIONS: ['csv', 'xls', 'parquet'],
-            SYNC_DB_PERMISSIONS_IN_ASYNC_MODE: false,
-          },
-        },
-      ) => state,
-    },
-    middleware: getDefaultMiddleware =>
-      getDefaultMiddleware({ serializableCheck: false, immutableCheck: false }),
-  });
-
-  return render(<DatabaseList user={mockUser} />, {
-    store,
-    useQueryParams: true,
-    useRouter: true,
-  });
-};
-
-const openDeleteModal = async () => {
-  const deleteButton = await screen.findByTestId('Delete');
-  await userEvent.click(deleteButton);
-  return screen.findByRole('dialog');
-};
-
-beforeEach(() => {
-  window.featureFlags = { SEMANTIC_LAYERS: true } as never;
-});
-
-afterEach(() => {
-  window.featureFlags = {} as never;
-  fetchMock.clearHistory();
-  fetchMock.removeRoutes();
-});
-
-test('delete confirmation warns about cascade-deleting dependent views by count and name', async () => {
-  setupMocks({
-    dependents: [
-      dependentView(1, 'marketing'),
-      dependentView(2, 'sales'),
-      dependentView(3, 'orders'),
-    ],
-  });
-  renderDatabaseList();
-
-  const dialog = await openDeleteModal();
-
-  expect(
-    within(dialog).getByText(
-      'This will also permanently delete its 3 semantic views. Charts built on those views will stop working.',
-    ),
-  ).toBeInTheDocument();
-  expect(
-    within(dialog).getByText('Affected semantic views'),
-  ).toBeInTheDocument();
-  expect(within(dialog).getByText('marketing')).toBeInTheDocument();
-  expect(within(dialog).getByText('sales')).toBeInTheDocument();
-  expect(within(dialog).getByText('orders')).toBeInTheDocument();
-
-  // The dependent lookup must target this layer's views.
-  const lookupCalls = fetchMock.callHistory.calls(DATASOURCE_ROUTE);
-  expect(lookupCalls).toHaveLength(1);
-  const q = new URL(lookupCalls[0].url).searchParams.get('q') as string;
-  expect(rison.decode(q)).toMatchObject({
-    filters: [{ col: 'semantic_layer_uuid', opr: 'eq', value: SL_UUID }],
-  });
-});
-
-test('a single dependent view is announced in the singular', async () => {
-  setupMocks({ dependents: [dependentView(1, 'marketing')] });
-  renderDatabaseList();
-
-  const dialog = await openDeleteModal();
-
-  expect(
-    within(dialog).getByText(
-      'This will also permanently delete its 1 semantic view. Charts built on that view will stop working.',
-    ),
-  ).toBeInTheDocument();
-});
-
-test('a genuinely empty layer says so instead of warning about nonexistent views', async () => {
-  // A successful count === 0 is always genuinely empty, never
-  // access-filtering: a layer is only reachable when its perm is granted,
-  // and the dependent-view count ORs on that same perm.
-  setupMocks({ dependents: [] });
-  renderDatabaseList();
-
-  const dialog = await openDeleteModal();
-
-  expect(
-    within(dialog).getByText(
-      'This semantic layer has no dependent semantic views.',
-    ),
-  ).toBeInTheDocument();
-  expect(
-    within(dialog).queryByText(
-      /charts built on those views will stop working/i,
-    ),
-  ).not.toBeInTheDocument();
-  expect(
-    within(dialog).queryByText('Affected semantic views'),
-  ).not.toBeInTheDocument();
-});
-
-test('a counted response with an empty name page keeps the count but omits the list', async () => {
-  setupMocks({ dependents: [] });
-  fetchMock.removeRoutes({ names: [DATASOURCE_ROUTE] });
-  fetchMock.get(
-    DATASOURCE_ROUTE,
-    { result: [], count: 3 },
-    { name: DATASOURCE_ROUTE },
-  );
-  renderDatabaseList();
-
-  const dialog = await openDeleteModal();
-
-  expect(
-    within(dialog).getByText(
-      'This will also permanently delete its 3 semantic views. Charts built on those views will stop working.',
-    ),
-  ).toBeInTheDocument();
-  expect(
-    within(dialog).queryByText('Affected semantic views'),
-  ).not.toBeInTheDocument();
-});
-
-test('a failed dependent lookup still opens the modal with an uncounted warning', async () => {
-  setupMocks({ dependents: [], dependentsError: true });
-  renderDatabaseList();
-
-  const dialog = await openDeleteModal();
-
-  expect(
-    within(dialog).getByText(
-      'Deleting this semantic layer also permanently deletes any semantic views it contains, and charts built on those views will stop working. The affected views could not be listed.',
-    ),
-  ).toBeInTheDocument();
-});
-
-test('the overflow footer reports dependent views beyond the listed page', async () => {
-  // The lookup pages at 10 names; the count is the full total.
-  setupMocks({ dependents: [] });
-  fetchMock.removeRoutes({ names: [DATASOURCE_ROUTE] });
-  fetchMock.get(
-    DATASOURCE_ROUTE,
-    {
-      result: Array.from({ length: 10 }, (_, i) =>
-        dependentView(i + 1, `view_${i + 1}`),
-      ),
-      count: 12,
-    },
-    { name: DATASOURCE_ROUTE },
-  );
-  renderDatabaseList();
-
-  const dialog = await openDeleteModal();
-
-  expect(
-    within(dialog).getByText(
-      'This will also permanently delete its 12 semantic views. Charts built on those views will stop working.',
-    ),
-  ).toBeInTheDocument();
-  expect(within(dialog).getByText('view_10')).toBeInTheDocument();
-  expect(within(dialog).getByText('... and 2 others')).toBeInTheDocument();
-});
-
-test('the overflow footer uses the singular for one unlisted view', async () => {
-  setupMocks({ dependents: [] });
-  fetchMock.removeRoutes({ names: [DATASOURCE_ROUTE] });
-  fetchMock.get(
-    DATASOURCE_ROUTE,
-    {
-      result: Array.from({ length: 10 }, (_, i) =>
-        dependentView(i + 1, `view_${i + 1}`),
-      ),
-      count: 11,
-    },
-    { name: DATASOURCE_ROUTE },
-  );
-  renderDatabaseList();
-
-  const dialog = await openDeleteModal();
-
-  expect(within(dialog).getByText('... and 1 other')).toBeInTheDocument();
-});
-
-test('a pending lookup disables repeated delete requests and shows progress', async () => {
-  setupMocks({ dependents: [dependentView(1, 'marketing')] });
-  fetchMock.removeRoutes({ names: [DATASOURCE_ROUTE] });
-  let releaseLookup: () => void = () => {};
-  const lookupGate = new Promise<void>(resolve => {
-    releaseLookup = resolve;
-  });
-  fetchMock.get(
-    DATASOURCE_ROUTE,
-    async () => {
-      await lookupGate;
-      return { result: [dependentView(1, 'marketing')], count: 1 };
-    },
-    { name: DATASOURCE_ROUTE },
-  );
-  renderDatabaseList();
-
-  const deleteButton = await screen.findByTestId('Delete');
-  await userEvent.click(deleteButton);
-  expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-  await waitFor(() => {
-    expect(screen.getByTestId('Delete')).toHaveAttribute(
-      'aria-disabled',
-      'true',
-    );
-  });
-  expect(screen.getByTestId('Delete')).toHaveAccessibleName(
-    'Loading dependent semantic views',
-  );
-
-  await userEvent.click(screen.getByTestId('Delete'));
-  expect(fetchMock.callHistory.calls(DATASOURCE_ROUTE)).toHaveLength(1);
-
-  releaseLookup();
-  expect(await screen.findByRole('dialog')).toBeInTheDocument();
-});
-
-test("a stale lookup resolving late cannot replace a newer row's modal", async () => {
-  // Click Delete on layer A (its lookup hangs), then on layer B (resolves
-  // immediately). When A's lookup finally resolves, the generation guard must
-  // drop it: the modal keeps showing B's preview.
-  setupMocks({
-    dependents: [],
-    rows: [semanticLayerRow, semanticLayerRowB],
-  });
-  fetchMock.removeRoutes({ names: [DATASOURCE_ROUTE] });
-  let releaseFirstLookup: () => void = () => {};
-  const firstLookupGate = new Promise<void>(resolve => {
-    releaseFirstLookup = resolve;
-  });
-  fetchMock.get(
-    DATASOURCE_ROUTE,
-    async ({ url }) => {
-      // The layer uuid rides in the rison-encoded `q` filter and its
-      // characters survive URL encoding, so a substring check is enough to
-      // tell the two lookups apart.
-      if (url.includes(SL_UUID)) {
-        await firstLookupGate;
-        return { result: [dependentView(1, 'stale_view')], count: 1 };
-      }
-      return { result: [dependentView(2, 'fresh_view')], count: 1 };
-    },
-    { name: DATASOURCE_ROUTE },
-  );
-  renderDatabaseList();
-
-  const deleteButtons = await screen.findAllByTestId('Delete');
-  expect(deleteButtons).toHaveLength(2);
-
-  // fireEvent, not userEvent: userEvent's hover step re-renders the row
-  // (tooltip) and detaches the pressed node mid-sequence when the table has
-  // multiple rows, so its click never reaches the handler.
-  fireEvent.click(deleteButtons[0]);
-  await waitFor(() => {
-    expect(screen.getAllByTestId('Delete')[0]).toHaveAttribute(
-      'aria-disabled',
-      'true',
-    );
-  });
-  expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-
-  fireEvent.click(screen.getAllByTestId('Delete')[1]);
-  const dialog = await screen.findByRole('dialog');
-  expect(within(dialog).getByText('fresh_view')).toBeInTheDocument();
-
-  await act(async () => {
-    releaseFirstLookup();
-    await new Promise(resolve => {
-      setTimeout(resolve, 0);
-    });
-  });
-
-  expect(
-    within(screen.getByRole('dialog')).getByText('fresh_view'),
-  ).toBeInTheDocument();
-  expect(screen.queryByText('stale_view')).not.toBeInTheDocument();
-});
-
-test('confirming the modal deletes the semantic layer', async () => {
-  setupMocks({ dependents: [dependentView(1, 'marketing')] });
-  renderDatabaseList();
-
-  const dialog = await openDeleteModal();
-
-  await userEvent.type(
-    within(dialog).getByTestId('delete-modal-input'),
-    'DELETE',
-  );
-  await userEvent.click(within(dialog).getByRole('button', { name: 'Delete' }));
-
-  await waitFor(() => {
-    expect(fetchMock.callHistory.calls(DELETE_ROUTE)).toHaveLength(1);
-  });
-});

superset-frontend/src/pages/DatabaseList/index.tsx

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { t, tn } from '@apache-superset/core/translation';
+import { t } from '@apache-superset/core/translation';
 import {
   getExtensionsRegistry,
   SupersetClient,
@@ -24,7 +24,7 @@ import {
   FeatureFlag,
 } from '@superset-ui/core';
 import { css, useTheme } from '@apache-superset/core/theme';
-import { useState, useMemo, useEffect, useCallback, useRef } from 'react';
+import { useState, useMemo, useEffect, useCallback } from 'react';
 import type { CellProps } from 'react-table';
 import rison from 'rison';
 import { useSelector } from 'react-redux';
@@ -101,91 +101,6 @@ interface DatabaseDeleteObject extends DatabaseObject {
   dashboards: any;
   sqllab_tab_count: number;
 }
-
-/** How many dependent semantic views the delete confirmation lists by name. */
-const MAX_DEPENDENT_VIEWS_LISTED = 10;
-
-type SemanticLayerDeletePreview =
-  | { status: 'loading'; item: ConnectionItem }
-  | {
-      status: 'loaded';
-      item: ConnectionItem;
-      dependentViewCount: number;
-      dependentViewNames: string[];
-    }
-  | { status: 'failed'; item: ConnectionItem };
-
-type ResolvedSemanticLayerDeletePreview = Exclude<
-  SemanticLayerDeletePreview,
-  { status: 'loading' }
->;
-
-function SemanticLayerCascadeWarning({
-  preview,
-}: {
-  preview: ResolvedSemanticLayerDeletePreview;
-}) {
-  if (preview.status === 'failed') {
-    return (
-      <p>
-        {t(
-          'Deleting this semantic layer also permanently deletes any semantic views it contains, and charts built on those views will stop working. The affected views could not be listed.',
-        )}
-      </p>
-    );
-  }
-
-  // A reachable layer always has all of its views counted (the layer's perm
-  // and its views' perms travel together), so zero means genuinely empty —
-  // never access-filtered. An honest empty message keeps the destructive
-  // warning credible for the layers where it matters.
-  if (preview.dependentViewCount === 0) {
-    return <p>{t('This semantic layer has no dependent semantic views.')}</p>;
-  }
-
-  const listedViewCount = preview.dependentViewNames.length;
-  const overflowViewCount = preview.dependentViewCount - listedViewCount;
-
-  return (
-    <>
-      <p>
-        {tn(
-          'This will also permanently delete its %s semantic view. Charts built on that view will stop working.',
-          'This will also permanently delete its %s semantic views. Charts built on those views will stop working.',
-          preview.dependentViewCount,
-          preview.dependentViewCount,
-        )}
-      </p>
-      {listedViewCount > 0 && (
-        <>
-          <h4>{t('Affected semantic views')}</h4>
-          <List
-            split={false}
-            size="small"
-            dataSource={preview.dependentViewNames}
-            renderItem={(name: string, index: number) => (
-              <List.Item key={`${index}-${name}`} compact>
-                <List.Item.Meta avatar={<span>•</span>} title={name} />
-              </List.Item>
-            )}
-            footer={
-              overflowViewCount > 0 && (
-                <div>
-                  {tn(
-                    '... and %s other',
-                    '... and %s others',
-                    overflowViewCount,
-                    overflowViewCount,
-                  )}
-                </div>
-              )
-            }
-          />
-        </>
-      )}
-    </>
-  );
-}
 interface DatabaseListProps {
   addDangerToast: (msg: string) => void;
   addSuccessToast: (msg: string) => void;
@@ -342,8 +257,8 @@ function DatabaseList({
   const [slCurrentlyEditing, setSlCurrentlyEditing] = useState<string | null>(
     null,
   );
-  const [slDeletePreview, setSlDeletePreview] =
-    useState<SemanticLayerDeletePreview | null>(null);
+  const [slCurrentlyDeleting, setSlCurrentlyDeleting] =
+    useState<ConnectionItem | null>(null);
 
   const [allowUploads, setAllowUploads] = useState<boolean>(false);
   const isAdmin = isUserAdmin(fullUser);
@@ -389,43 +304,6 @@ function DatabaseList({
     [],
   );
 
-  // Deleting a semantic layer cascade-deletes its semantic views, so the
-  // confirmation must say what else is about to be destroyed. If the lookup
-  // fails the modal still opens, with an uncounted warning: the count is an
-  // aid, not a gate on deleting. The generation counter drops stale
-  // resolutions -- without it a slow lookup could reopen a modal the user
-  // already dismissed, or replace a newer row's modal with an older one.
-  const slDeleteLookupRef = useRef(0);
-  const openSemanticLayerDeleteModal = useCallback((item: ConnectionItem) => {
-    slDeleteLookupRef.current += 1;
-    const lookupId = slDeleteLookupRef.current;
-    setSlDeletePreview({ status: 'loading', item });
-    return SupersetClient.get({
-      endpoint: `/api/v1/datasource/?q=${rison.encode_uri({
-        filters: [{ col: 'semantic_layer_uuid', opr: 'eq', value: item.uuid }],
-        order_column: 'table_name',
-        order_direction: 'asc',
-        page: 0,
-        page_size: MAX_DEPENDENT_VIEWS_LISTED,
-      })}`,
-    })
-      .then(({ json = {} }) => {
-        if (slDeleteLookupRef.current !== lookupId) return;
-        setSlDeletePreview({
-          status: 'loaded',
-          item,
-          dependentViewCount: json.count ?? 0,
-          dependentViewNames: (json.result ?? []).map(
-            (view: { table_name: string }) => view.table_name,
-          ),
-        });
-      })
-      .catch(() => {
-        if (slDeleteLookupRef.current !== lookupId) return;
-        setSlDeletePreview({ status: 'failed', item });
-      });
-  }, []);
-
   function handleDatabaseDelete(database: DatabaseObject) {
     const { id, database_name: dbName } = database;
     SupersetClient.delete({
@@ -688,7 +566,7 @@ function DatabaseList({
       () => {
         refreshData();
         addSuccessToast(t('Deleted: %s', item.database_name));
-        setSlDeletePreview(null);
+        setSlCurrentlyDeleting(null);
       },
       createErrorHandler(errMsg =>
         addDangerToast(
@@ -799,29 +677,15 @@ function DatabaseList({
 
           if (isSemanticLayer) {
             if (!canEdit && !canDelete) return null;
-            const isLoadingDependents =
-              slDeletePreview?.status === 'loading' &&
-              slDeletePreview.item.uuid === original.uuid;
             return (
               <div className="actions">
                 {canDelete && (
                   <ActionButton
                     label={t('Delete')}
-                    tooltip={
-                      isLoadingDependents
-                        ? t('Loading dependent semantic views')
-                        : t('Delete')
-                    }
+                    tooltip={t('Delete')}
                     placement="bottom"
-                    icon={
-                      isLoadingDependents ? (
-                        <Icons.LoadingOutlined iconSize="l" spin />
-                      ) : (
-                        <Icons.DeleteOutlined iconSize="l" />
-                      )
-                    }
-                    disabled={isLoadingDependents}
-                    onClick={() => openSemanticLayerDeleteModal(original)}
+                    icon={<Icons.DeleteOutlined iconSize="l" />}
+                    onClick={() => setSlCurrentlyDeleting(original)}
                   />
                 )}
                 {canEdit && (
@@ -917,8 +781,6 @@ function DatabaseList({
       handleDatabaseExport,
       handleDatabasePermSync,
       openDatabaseDeleteModal,
-      openSemanticLayerDeleteModal,
-      slDeletePreview,
     ],
   );
 
@@ -1070,21 +932,20 @@ function DatabaseList({
         addSuccessToast={addSuccessToast}
         semanticLayerUuid={slCurrentlyEditing ?? undefined}
       />
-      {slDeletePreview && slDeletePreview.status !== 'loading' && (
+      {slCurrentlyDeleting && (
         <DeleteModal
           description={
-            <>
-              <p>
-                {t('Are you sure you want to delete')}{' '}
-                <b>{slDeletePreview.item.database_name}</b>?
-              </p>
-              <SemanticLayerCascadeWarning preview={slDeletePreview} />
-            </>
+            <p>
+              {t('Are you sure you want to delete')}{' '}
+              <b>{slCurrentlyDeleting.database_name}</b>?
+            </p>
           }
           onConfirm={() => {
-            handleSemanticLayerDelete(slDeletePreview.item);
+            if (slCurrentlyDeleting) {
+              handleSemanticLayerDelete(slCurrentlyDeleting);
+            }
           }}
-          onHide={() => setSlDeletePreview(null)}
+          onHide={() => setSlCurrentlyDeleting(null)}
           open
           title={
             <ModalTitleWithIcon

superset-frontend/src/utils/downloadAsImage.test.ts

@@ -17,7 +17,6 @@
  * under the License.
  */
 import domToImage from 'dom-to-image-more';
-import { getInstanceByDom } from 'echarts/core';
 import { addWarningToast } from 'src/components/MessageToasts/actions';
 import downloadAsImageOptimized, {
   waitForStableScrollHeight,
@@ -28,11 +27,6 @@ jest.mock('dom-to-image-more', () => ({
   default: { toJpeg: jest.fn(), toPng: jest.fn() },
 }));
 
-jest.mock('echarts/core', () => ({
-  __esModule: true,
-  getInstanceByDom: jest.fn(),
-}));
-
 jest.mock('src/components/MessageToasts/actions', () => ({
   addWarningToast: jest.fn(),
 }));
@@ -44,7 +38,6 @@ jest.mock('@apache-superset/core/translation', () => ({
 const mockToJpeg = domToImage.toJpeg as jest.Mock;
 const mockToPng = domToImage.toPng as jest.Mock;
 const mockAddWarningToast = addWarningToast as jest.Mock;
-const mockGetInstanceByDom = getInstanceByDom as jest.Mock;
 
 // document.fonts.ready is not implemented in jsdom; provide a resolved promise
 Object.defineProperty(document, 'fonts', {
@@ -88,9 +81,6 @@ function attachMockApi(
 
 beforeEach(() => {
   jest.clearAllMocks();
-  // clearAllMocks does not clear a mockReturnValue, so reset the instance lookup explicitly to
-  // stop a return value leaking into any clone-path test added after the ECharts ones below.
-  mockGetInstanceByDom.mockReset();
   mockToJpeg.mockResolvedValue('data:image/jpeg;base64,test');
   mockToPng.mockResolvedValue('data:image/png;base64,test');
 });
@@ -744,227 +734,3 @@ test('clone path falls back to white background when theme is absent', async ()
 
   document.body.removeChild(container);
 });
-
-// jsdom does not implement HTMLCanvasElement.getContext, so stub a minimal 2d context.
-function stubCanvasContext() {
-  const drawImage = jest.fn();
-  const spy = jest
-    .spyOn(HTMLCanvasElement.prototype, 'getContext')
-    .mockReturnValue({ drawImage } as unknown as CanvasRenderingContext2D);
-  return { drawImage, restore: () => spy.mockRestore() };
-}
-
-test('re-renders an ECharts canvas at PNG_SCALE pixel ratio so the export is crisp', async () => {
-  const { restore } = stubCanvasContext();
-
-  const container = document.createElement('div');
-  const host = document.createElement('div');
-  host.className = 'echarts-host';
-  const canvas = document.createElement('canvas');
-  // on-screen backing store: CSS 400×300 at devicePixelRatio 1
-  canvas.width = 400;
-  canvas.height = 300;
-  host.appendChild(canvas);
-  container.appendChild(host);
-  document.body.appendChild(container);
-
-  // Fake ECharts instance whose renderToCanvas returns a 2× (high-res) canvas
-  const hiRes = document.createElement('canvas');
-  hiRes.width = 800;
-  hiRes.height = 600;
-  let renderOpts: Record<string, unknown> | undefined;
-  const renderToCanvas = jest.fn((opts?: Record<string, unknown>) => {
-    renderOpts = opts;
-    return hiRes;
-  });
-  mockGetInstanceByDom.mockReturnValue({ renderToCanvas });
-
-  // Capture the cloned canvas backing store handed to dom-to-image
-  let clonedCanvasWidth: number | undefined;
-  let clonedCanvasHeight: number | undefined;
-  mockToPng.mockImplementation((cloneRoot: HTMLElement) => {
-    const c = cloneRoot.querySelector('canvas');
-    clonedCanvasWidth = c?.width;
-    clonedCanvasHeight = c?.height;
-    return Promise.resolve('data:image/png;base64,test');
-  });
-
-  const handler = downloadAsImageOptimized(
-    'div',
-    'Sunburst',
-    false,
-    undefined,
-    { format: 'png' },
-  );
-  await handler(syntheticEventFor(container));
-
-  // Instance recovered from the canvas's echarts-host ancestor...
-  expect(mockGetInstanceByDom).toHaveBeenCalledWith(host);
-  // ...and re-rendered at PNG_SCALE (2). No backgroundColor is forced, so the chart keeps its
-  // own configured background (matching the on-screen canvas).
-  expect(renderToCanvas).toHaveBeenCalled();
-  expect(renderOpts).toEqual(expect.objectContaining({ pixelRatio: 2 }));
-  expect(renderOpts).not.toHaveProperty('backgroundColor');
-  // The cloned canvas dom-to-image serializes is the 2× high-res source
-  expect(clonedCanvasWidth).toBe(800);
-  expect(clonedCanvasHeight).toBe(600);
-  expect(mockToPng).toHaveBeenCalled();
-
-  restore();
-  document.body.removeChild(container);
-});
-
-test('preserves a non-ECharts canvas at its on-screen resolution (no re-render)', async () => {
-  const { drawImage, restore } = stubCanvasContext();
-
-  const container = document.createElement('div');
-  const canvas = document.createElement('canvas');
-  canvas.width = 400;
-  canvas.height = 300;
-  container.appendChild(canvas);
-  document.body.appendChild(container);
-
-  let clonedCanvasWidth: number | undefined;
-  mockToPng.mockImplementation((cloneRoot: HTMLElement) => {
-    clonedCanvasWidth = cloneRoot.querySelector('canvas')?.width;
-    return Promise.resolve('data:image/png;base64,test');
-  });
-
-  const handler = downloadAsImageOptimized(
-    'div',
-    'Deck Chart',
-    false,
-    undefined,
-    { format: 'png' },
-  );
-  await handler(syntheticEventFor(container));
-
-  // No echarts-host ancestor → echarts is never imported/consulted and the on-screen bitmap is
-  // copied 1:1.
-  expect(mockGetInstanceByDom).not.toHaveBeenCalled();
-  expect(clonedCanvasWidth).toBe(400);
-  expect(drawImage).toHaveBeenCalled();
-
-  restore();
-  document.body.removeChild(container);
-});
-
-test('falls back to a 1:1 copy when the ECharts instance is gone (getInstanceByDom returns undefined)', async () => {
-  const { drawImage, restore } = stubCanvasContext();
-  // Disposed / not-yet-initialised chart: the host is in the DOM but has no live instance.
-  mockGetInstanceByDom.mockReturnValue(undefined);
-
-  const container = document.createElement('div');
-  const host = document.createElement('div');
-  host.className = 'echarts-host';
-  const canvas = document.createElement('canvas');
-  canvas.width = 400;
-  canvas.height = 300;
-  host.appendChild(canvas);
-  container.appendChild(host);
-  document.body.appendChild(container);
-
-  let clonedCanvasWidth: number | undefined;
-  mockToPng.mockImplementation((cloneRoot: HTMLElement) => {
-    clonedCanvasWidth = cloneRoot.querySelector('canvas')?.width;
-    return Promise.resolve('data:image/png;base64,test');
-  });
-
-  const handler = downloadAsImageOptimized(
-    'div',
-    'Sunburst',
-    false,
-    undefined,
-    { format: 'png' },
-  );
-  await handler(syntheticEventFor(container));
-
-  expect(mockGetInstanceByDom).toHaveBeenCalledWith(host);
-  // No instance → the on-screen bitmap is copied 1:1 and the export still completes
-  expect(clonedCanvasWidth).toBe(400);
-  expect(drawImage).toHaveBeenCalled();
-  expect(mockToPng).toHaveBeenCalled();
-  expect(mockAddWarningToast).not.toHaveBeenCalled();
-
-  restore();
-  document.body.removeChild(container);
-});
-
-test('falls back to a 1:1 copy (and still exports) when renderToCanvas throws', async () => {
-  const { drawImage, restore } = stubCanvasContext();
-  // A valid but unhealthy instance (mid-dispose, errored chart) whose re-render throws.
-  const renderToCanvas = jest.fn(() => {
-    throw new Error('chart is disposing');
-  });
-  mockGetInstanceByDom.mockReturnValue({ renderToCanvas });
-
-  const container = document.createElement('div');
-  const host = document.createElement('div');
-  host.className = 'echarts-host';
-  const canvas = document.createElement('canvas');
-  canvas.width = 400;
-  canvas.height = 300;
-  host.appendChild(canvas);
-  container.appendChild(host);
-  document.body.appendChild(container);
-
-  let clonedCanvasWidth: number | undefined;
-  mockToPng.mockImplementation((cloneRoot: HTMLElement) => {
-    clonedCanvasWidth = cloneRoot.querySelector('canvas')?.width;
-    return Promise.resolve('data:image/png;base64,test');
-  });
-
-  const handler = downloadAsImageOptimized(
-    'div',
-    'Sunburst',
-    false,
-    undefined,
-    { format: 'png' },
-  );
-  await handler(syntheticEventFor(container));
-
-  // The throw is swallowed per-canvas: the export completes via the on-screen 1:1 copy rather
-  // than aborting the whole capture.
-  expect(renderToCanvas).toHaveBeenCalled();
-  expect(clonedCanvasWidth).toBe(400);
-  expect(drawImage).toHaveBeenCalled();
-  expect(mockToPng).toHaveBeenCalled();
-  expect(mockAddWarningToast).not.toHaveBeenCalled();
-
-  restore();
-  document.body.removeChild(container);
-});
-
-test('re-renders an ECharts host only once when it owns multiple canvas layers', async () => {
-  const { restore } = stubCanvasContext();
-
-  const container = document.createElement('div');
-  const host = document.createElement('div');
-  host.className = 'echarts-host';
-  // ECharts may add a second <canvas> for a hover/progressive layer
-  host.appendChild(document.createElement('canvas'));
-  host.appendChild(document.createElement('canvas'));
-  container.appendChild(host);
-  document.body.appendChild(container);
-
-  const hiRes = document.createElement('canvas');
-  hiRes.width = 800;
-  hiRes.height = 600;
-  const renderToCanvas = jest.fn(() => hiRes);
-  mockGetInstanceByDom.mockReturnValue({ renderToCanvas });
-
-  const handler = downloadAsImageOptimized(
-    'div',
-    'Sunburst',
-    false,
-    undefined,
-    { format: 'png' },
-  );
-  await handler(syntheticEventFor(container));
-
-  // Both canvases resolve to the same instance; the flattened render happens once
-  expect(renderToCanvas).toHaveBeenCalledTimes(1);
-
-  restore();
-  document.body.removeChild(container);
-});

superset-frontend/src/utils/downloadAsImage.tsx

@@ -27,23 +27,10 @@ import { forceLoadAllCharts, restoreVirtualization } from './downloadUtils';
 
 const IMAGE_DOWNLOAD_QUALITY = 0.95;
 const PNG_SCALE = 2; // Higher quality for PNG
-// ECharts canvas charts (e.g. sunburst) bake their pixel detail into the on-screen backing
-// store (CSS size × devicePixelRatio). Copying that 1:1 and then letting the PNG path upscale
-// it via transform: scale(PNG_SCALE) only stretches the bitmap, producing a blurry export. To
-// keep the export crisp, these charts are re-rendered at this pixel ratio at capture time; it is
-// tied to PNG_SCALE so the re-render matches the scaled output box.
-const EXPORT_CANVAS_PIXEL_RATIO = PNG_SCALE;
-// The div passed to ECharts `init()` carries this class (source of truth:
-// plugins/plugin-chart-echarts/src/components/Echart.tsx `ECHARTS_HOST_CLASS`). It lets the
-// exporter recover the live ECharts instance for a canvas via `getInstanceByDom`.
-const ECHARTS_HOST_CLASS = 'echarts-host';
 export type BackgroundType = 'transparent' | 'solid';
 const TRANSPARENT_RGBA = 'transparent';
 const POLL_INTERVAL_MS = 100;
 
-// Resolved lazily via a dynamic import so echarts stays out of the core bundle.
-type EChartsGetInstanceByDom = typeof import('echarts/core').getInstanceByDom;
-
 // Tracks original cell styles to restore after capture
 type CellFixup = { el: HTMLElement; minHeight: string; overflow: string };
 
@@ -236,73 +223,30 @@ const processCloneForVisibility = (clone: HTMLElement) => {
     });
 };
 
-const preserveCanvasContent = (
-  original: Element,
-  clone: Element,
-  getInstanceByDom?: EChartsGetInstanceByDom,
-) => {
+const preserveCanvasContent = (original: Element, clone: Element) => {
   const originalCanvases = original.querySelectorAll('canvas');
   const clonedCanvases = clone.querySelectorAll('canvas');
-  // `renderToCanvas` flattens all of an ECharts instance's zrender layers into a single canvas,
-  // so once a host is re-rendered its other <canvas> layers (e.g. a hover layer) are skipped;
-  // if the re-render throws, the host is marked 'failed' so each layer falls back to a 1:1 copy.
-  const hostRenderState = new Map<Element, 'rendered' | 'failed'>();
 
   originalCanvases.forEach((originalCanvas, i) => {
-    const clonedCanvas = clonedCanvases[i] as HTMLCanvasElement | undefined;
-    if (!clonedCanvas) return;
-    const ctx = clonedCanvas.getContext('2d');
-    if (!ctx) return;
-
-    // For ECharts (canvas renderer) charts such as sunburst, re-render the chart at a higher
-    // pixel ratio instead of copying the on-screen bitmap, so the PNG path upscales a matching
-    // high-resolution source rather than stretching a low-resolution one. `getInstanceByDom` is
-    // only supplied on the PNG path, so JPEG (and non-ECharts canvases) keep the 1:1 copy below.
-    const host = originalCanvas.closest(`.${ECHARTS_HOST_CLASS}`);
-    const hostState = host ? hostRenderState.get(host) : undefined;
-    // Sibling layer of a host already re-rendered: the flattened render covers it.
-    if (hostState === 'rendered') return;
-    const instance =
-      host && hostState !== 'failed'
-        ? getInstanceByDom?.(host as HTMLElement)
-        : undefined;
-    if (host && instance) {
-      try {
-        // No `backgroundColor` is passed, so renderToCanvas inherits the chart's own configured
-        // background (transparent when unset) — matching the on-screen canvas. The overall export
-        // background is applied separately via the dom-to-image `bgcolor` option.
-        const hiResCanvas = instance.renderToCanvas({
-          pixelRatio: EXPORT_CANVAS_PIXEL_RATIO,
-        });
-        clonedCanvas.width = hiResCanvas.width;
-        clonedCanvas.height = hiResCanvas.height;
-        ctx.drawImage(hiResCanvas, 0, 0);
-        hostRenderState.set(host, 'rendered');
-        return;
-      } catch {
-        // A valid but unhealthy instance (mid-dispose, errored chart) can throw. Mark the host
-        // 'failed' and fall back to the on-screen 1:1 copy below so a single bad chart can never
-        // abort the whole export (e.g. a 20-chart dashboard capture).
-        hostRenderState.set(host, 'failed');
+    if (originalCanvases[i] && clonedCanvases[i]) {
+      const clonedCanvas = clonedCanvases[i] as HTMLCanvasElement;
+      const ctx = clonedCanvas.getContext('2d');
+      if (ctx) {
+        clonedCanvas.width = originalCanvas.width;
+        clonedCanvas.height = originalCanvas.height;
+        ctx.drawImage(originalCanvas, 0, 0);
       }
     }
-
-    // Non-ECharts canvases (deck.gl/WebGL and friends), and the fallback when a re-render is
-    // unavailable or threw: preserve the on-screen bitmap as-is.
-    clonedCanvas.width = originalCanvas.width;
-    clonedCanvas.height = originalCanvas.height;
-    ctx.drawImage(originalCanvas, 0, 0);
   });
 };
 
 const createEnhancedClone = (
   originalElement: Element,
   theme?: SupersetTheme,
-  getInstanceByDom?: EChartsGetInstanceByDom,
 ): { clone: HTMLElement; cleanup: () => void } => {
   const clone = originalElement.cloneNode(true) as HTMLElement;
   copyAllComputedStyles(originalElement, clone, theme);
-  preserveCanvasContent(originalElement, clone, getInstanceByDom);
+  preserveCanvasContent(originalElement, clone);
 
   const tempContainer = document.createElement('div');
   tempContainer.style.cssText = `
@@ -560,26 +504,10 @@ export default function downloadAsImageOptimized(
     // All other chart types: use the clone-based approach
     let cleanup: (() => void) | null = null;
 
-    // Only the PNG path upscales the layout (transform: scale(PNG_SCALE)), so only there does a
-    // higher-resolution canvas help; JPEG keeps the throw-free 1:1 copy. Re-render ECharts
-    // (canvas renderer) charts, e.g. sunburst, at a higher pixel ratio so the upscale samples a
-    // matching source instead of stretching the on-screen bitmap. echarts is pulled in lazily —
-    // only when a chart is actually present — so it stays out of the core bundle; if the import
-    // fails the canvases fall back to a 1:1 copy.
-    let getInstanceByDom: EChartsGetInstanceByDom | undefined;
-    if (isPng && elementToPrint.querySelector(`.${ECHARTS_HOST_CLASS}`)) {
-      try {
-        ({ getInstanceByDom } = await import('echarts/core'));
-      } catch {
-        // echarts not available in this context; canvases keep their on-screen resolution.
-      }
-    }
-
     try {
       const { clone, cleanup: cleanupFn } = createEnhancedClone(
         elementToPrint,
         theme,
-        getInstanceByDom,
       );
       cleanup = cleanupFn;
 

superset-frontend/src/utils/downloadAsPivotExcel.test.ts

@@ -1,116 +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 type { WorkBook } from 'xlsx';
-import { getNumberFormatterRegistry } from '@superset-ui/core';
-import exportPivotExcel from './downloadAsPivotExcel';
-
-const mockWriteFile = jest.fn();
-
-jest.mock('xlsx', () => {
-  const actual = jest.requireActual('xlsx');
-  return {
-    ...actual,
-    writeFile: (...args: unknown[]) => mockWriteFile(...args),
-  };
-});
-
-// Renders a single-row pivot table with the given cell values, runs the
-// export, and returns the resulting sheet so each test only has to state
-// its input cells and assertions.
-function exportRowAndGetSheet(cells: string[]): WorkBook['Sheets'][string] {
-  document.body.innerHTML = `
-    <table id="pivot-table">
-      <tbody>
-        <tr>
-          ${cells.map(cell => `<td>${cell}</td>`).join('\n          ')}
-        </tr>
-      </tbody>
-    </table>
-  `;
-
-  exportPivotExcel('#pivot-table', 'export');
-
-  const workbook = mockWriteFile.mock.calls.at(-1)?.[0] as WorkBook;
-  return workbook.Sheets[workbook.SheetNames[0]];
-}
-
-test('preserves locale-formatted numbers exactly as rendered, without SheetJS reinterpreting them', () => {
-  const sheet = exportRowAndGetSheet(['1.234,56', '12,50%', '3.500']);
-
-  expect(mockWriteFile).toHaveBeenCalledTimes(1);
-
-  // These are Spanish-locale D3_FORMAT strings ("." as thousands separator,
-  // "," as decimal separator). Each must survive the export untouched, as a
-  // text cell, rather than being silently reparsed as a different number
-  // (SheetJS's default HTML table parsing would otherwise turn "1.234,56"
-  // into the number 1.23456, "3.500" into 3.5, and "12,50%" into 12.5).
-  expect(sheet.A1).toMatchObject({ t: 's', v: '1.234,56' });
-  expect(sheet.B1).toMatchObject({ t: 's', v: '12,50%' });
-  expect(sheet.C1).toMatchObject({ t: 's', v: '3.500' });
-});
-
-test('restores unambiguous plain numbers to native Excel numeric cells', () => {
-  const sheet = exportRowAndGetSheet(['42', '-3.5', '3.500', '1,234']);
-
-  // "42" and "-3.5" round-trip exactly through Number(), so they're
-  // unambiguous under any locale and are restored to real numbers.
-  expect(sheet.A1).toMatchObject({ t: 'n', v: 42 });
-  expect(sheet.B1).toMatchObject({ t: 'n', v: -3.5 });
-  // "3.500" (trailing zero padding) and "1,234" (grouped thousands) don't
-  // round-trip, so they stay as text rather than risk misparsing them.
-  expect(sheet.C1).toMatchObject({ t: 's', v: '3.500' });
-  expect(sheet.D1).toMatchObject({ t: 's', v: '1,234' });
-});
-
-test('does not restore grouped-thousands numbers under a "." thousands-separator locale', () => {
-  const registry = getNumberFormatterRegistry();
-  const original = registry.d3Format;
-  registry.setD3Format({ decimal: ',', thousands: '.', grouping: [3] });
-
-  try {
-    // Under a Spanish-style D3_FORMAT, "1.234" is the plain integer 1234
-    // rendered with a "." group separator, not the decimal 1.234. It also
-    // round-trips cleanly through Number(), so without the locale check it
-    // would be misrestored to the number 1.234, silently corrupting the
-    // value this PR exists to preserve. "42" has no "." and still round
-    // trips safely, so it's still restored.
-    const sheet = exportRowAndGetSheet(['1.234', '42']);
-    expect(sheet.A1).toMatchObject({ t: 's', v: '1.234' });
-    expect(sheet.B1).toMatchObject({ t: 'n', v: 42 });
-  } finally {
-    registry.setD3Format(original);
-  }
-});
-
-test('leaves date-shaped strings as text rather than reinterpreting them as dates', () => {
-  const sheet = exportRowAndGetSheet([
-    '2024-01-01',
-    '2024-01-01 13:45:30',
-    'not-a-date',
-  ]);
-
-  // A rendered string can't be reliably classified as a genuine date rather
-  // than a coincidentally date-shaped formatted number (e.g. a custom
-  // D3_FORMAT grouping/thousands locale can render a plain metric like
-  // 20240101 as "2024-01-01"), so date-shaped cells are left exactly as
-  // rendered instead of being reinterpreted as native Excel dates.
-  expect(sheet.A1).toMatchObject({ t: 's', v: '2024-01-01' });
-  expect(sheet.B1).toMatchObject({ t: 's', v: '2024-01-01 13:45:30' });
-  expect(sheet.C1).toMatchObject({ t: 's', v: 'not-a-date' });
-});

superset-frontend/src/utils/downloadAsPivotExcel.ts

@@ -16,63 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { getNumberFormatterRegistry } from '@superset-ui/core';
 import { utils, writeFile } from 'xlsx';
-import type { WorkSheet } from 'xlsx';
-
-// `raw: true` (used below) keeps every table cell as text, so ordinary
-// numbers lose their native Excel type along with the locale-formatted
-// values. A cell's text is only restored to a real number when it is
-// unambiguous under the active D3_FORMAT locale: a plain number that
-// round-trips losslessly through Number() (e.g. "42" or "-3.5"). Restoring
-// those can't reintroduce the misparsing raw: true guards against. Anything
-// else (grouped thousands, percent suffixes, trailing zero padding,
-// date-shaped text, other D3_FORMAT output, etc.) stays as text, exactly as
-// rendered: a rendered string can't be reliably classified as a genuine date
-// rather than a coincidentally date-shaped formatted number (e.g. a custom
-// D3_FORMAT grouping/thousands locale can render a plain metric like
-// 20240101 as "2024-01-01"), so cells are never reinterpreted as dates.
-//
-// Number()'s round-trip check assumes "." is a decimal point, which isn't
-// true under every locale: a Spanish D3_FORMAT (thousands: '.') renders the
-// plain integer 1234 as "1.234", which also round-trips through Number() as
-// the decimal 1.234. When the active locale uses "." as its thousands
-// separator, a cell containing "." can't be trusted as an unambiguous
-// decimal, so it's left as text instead.
-function restoreUnambiguousNumbers(sheet: WorkSheet): void {
-  const { thousands } = getNumberFormatterRegistry().d3Format;
-  Object.keys(sheet).forEach(cellRef => {
-    if (cellRef.startsWith('!')) {
-      return;
-    }
-    const cell = sheet[cellRef];
-    if (!cell || cell.t !== 's' || typeof cell.v !== 'string') {
-      return;
-    }
-    if (thousands === '.' && cell.v.includes('.')) {
-      return;
-    }
-    const value = Number(cell.v);
-    if (cell.v !== '' && Number.isFinite(value) && String(value) === cell.v) {
-      cell.t = 'n';
-      cell.v = value;
-    }
-  });
-}
 
 export default function exportPivotExcel(
   tableSelector: string,
   fileName: string,
 ) {
   const table = document.querySelector(tableSelector);
-  // `raw: true` keeps every cell as the literal text rendered in the DOM.
-  // Without it, SheetJS tries to infer numbers/dates from the displayed
-  // string, which mangles values that were formatted using a non-US
-  // D3_FORMAT (e.g. "1.234,56" gets misread as a date or truncated number).
-  const workbook = utils.table_to_book(table, { raw: true });
-  const sheet = workbook.Sheets[workbook.SheetNames[0]];
-  if (sheet) {
-    restoreUnambiguousNumbers(sheet);
-  }
+  const workbook = utils.table_to_book(table);
   writeFile(workbook, `${fileName}.xlsx`);
 }

superset-websocket/package.json

@@ -37,11 +37,11 @@
     "eslint": "^10.8.1",
     "eslint-config-prettier": "^10.1.8",
     "globals": "^17.11.0",
-    "oxfmt": "^0.64.0",
+    "oxfmt": "^0.63.0",
     "tscw-config": "^1.1.2",
     "typescript": "^6.0.3",
     "typescript-eslint": "^8.67.0",
-    "vitest": "^4.1.11"
+    "vitest": "^4.1.10"
   },
   "engines": {
     "node": "^24.16.0",

superset/charts/api.py

@@ -21,7 +21,7 @@ from io import BytesIO
 from typing import Any, cast, Optional
 from zipfile import is_zipfile, ZipFile
 
-from flask import current_app, redirect, request, Response, url_for
+from flask import current_app, redirect, request, Response, send_file, url_for
 from flask_appbuilder.api import expose, protect, rison as parse_rison, safe
 from flask_appbuilder.hooks import before_request
 from flask_appbuilder.models.sqla.interface import SQLAInterface
@@ -103,7 +103,7 @@ from superset.subjects.filters import (
 from superset.tasks.thumbnails import cache_chart_thumbnail
 from superset.tasks.utils import get_current_user
 from superset.utils import json
-from superset.utils.core import send_export_zip
+from superset.utils.core import sanitize_cookie_token
 from superset.utils.screenshots import (
     ChartScreenshot,
     DEFAULT_CHART_WINDOW_SIZE,
@@ -1293,7 +1293,15 @@ class ChartRestApi(SoftDeleteApiMixin, BaseSupersetModelRestApi):
                 return self.response_404()
         buf.seek(0)
 
-        return send_export_zip(buf, filename)
+        response = send_file(
+            buf,
+            mimetype="application/zip",
+            as_attachment=True,
+            download_name=filename,
+        )
+        if token := sanitize_cookie_token(request.args.get("token")):
+            response.set_cookie(token, "done", max_age=600)
+        return response
 
     @expose("/favorite_status/", methods=("GET",))
     @protect()

superset/charts/data/api.py

@@ -72,7 +72,6 @@ from superset.views.base_api import statsd_metrics
 
 if TYPE_CHECKING:
     from superset.common.query_context import QueryContext
-    from superset.models.slice import Slice
 
 logger = logging.getLogger(__name__)
 
@@ -259,7 +258,6 @@ class ChartDataRestApi(ChartRestApi):
             datasource=query_context.datasource,
             add_extra_log_payload=add_extra_log_payload,
             dashboard_filter_context=dashboard_filter_context,
-            slice_=chart,
         )
 
     @expose("/data", methods=("POST",))
@@ -477,7 +475,6 @@ class ChartDataRestApi(ChartRestApi):
         filename: str | None = None,
         expected_rows: int | None = None,
         dashboard_filter_context: DashboardFilterContext | None = None,
-        slice_: Slice | None = None,
     ) -> Response:
         if isinstance(result, ChartDataExecutionResult):
             execution_result: ChartDataExecutionResult | None = result
@@ -515,12 +512,6 @@ class ChartDataRestApi(ChartRestApi):
 
             is_csv_format = result_format == ChartDataResultFormat.CSV
 
-            # A chart's saved query context rarely carries a slice_id in its
-            # form data, so the query context factory can't resolve the slice
-            # for it; routes that already hold the chart pass it explicitly
-            # and the factory-resolved slice covers the rest.
-            slice_ = slice_ or materialized_result["query_context"].slice_
-
             # Check if we should use streaming for large datasets
             if is_csv_format and self._should_use_streaming(
                 materialized_result,
@@ -531,12 +522,9 @@ class ChartDataRestApi(ChartRestApi):
                     form_data,
                     filename=filename,
                     expected_rows=expected_rows,
-                    slice_=slice_,
                 )
 
-            export_filename = filename or self._get_default_export_filename(
-                form_data, slice_
-            )
+            export_filename = filename or self._get_default_export_filename(form_data)
             # `generate_download_headers` always appends the format extension,
             # so strip a matching one here to avoid doubled extensions (e.g.
             # "chart.csv.csv") if the caller already included it.
@@ -608,45 +596,22 @@ class ChartDataRestApi(ChartRestApi):
         return self.response_400(message=f"Unsupported result_format: {result_format}")
 
     @staticmethod
-    def _get_default_export_filename(
-        form_data: dict[str, Any] | None,
-        slice_: Slice | None = None,
-    ) -> str:
+    def _get_default_export_filename(form_data: dict[str, Any] | None) -> str:
         """
         Build a fallback export filename (without extension) from the chart's
         name so downloaded files are easy to identify, instead of the
         generic timestamp-only default used by ``generate_download_headers``.
 
-        The name comes from the first usable candidate: an explicit
-        ``slice_name`` in the form data, the name of the chart the export
-        was requested for, the ``viz_type``, and finally a generic "export".
-
         Used whenever the client hasn't supplied an explicit filename, by
         both the streaming and non-streaming chart data export responses.
         """
         timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-        candidates = (
-            form_data.get("slice_name") if form_data else None,
-            slice_.slice_name if slice_ is not None else None,
-            form_data.get("viz_type") if form_data else None,
-        )
-
         chart_name = "export"
-        for candidate in candidates:
-            if not isinstance(candidate, str):
-                continue
-            # secure_filename strips a name written entirely in a non-latin
-            # alphabet down to an empty string; skip such candidates so the
-            # filename keeps a meaningful segment.
-            if safe_candidate := secure_filename(candidate):
-                chart_name = safe_candidate
-                break
 
-        # Chart names can be up to 250 characters; cap the name segment so
-        # the whole filename (prefix, timestamp and extension included)
-        # stays within the 255-character single-component limit common to
-        # NTFS, ext4 and APFS.
-        chart_name = chart_name[:150]
+        if form_data and form_data.get("slice_name"):
+            chart_name = form_data["slice_name"]
+        elif form_data and form_data.get("viz_type"):
+            chart_name = form_data["viz_type"]
 
         return secure_filename(f"superset_{chart_name}_{timestamp}")
 
@@ -680,7 +645,6 @@ class ChartDataRestApi(ChartRestApi):
         expected_rows: int | None = None,
         add_extra_log_payload: Callable[..., None] | None = None,
         dashboard_filter_context: DashboardFilterContext | None = None,
-        slice_: Slice | None = None,
     ) -> Response:
         """Get data response and optionally log is_cached information."""
         try:
@@ -705,7 +669,6 @@ class ChartDataRestApi(ChartRestApi):
             filename,
             expected_rows,
             dashboard_filter_context=dashboard_filter_context,
-            slice_=slice_,
         )
 
     def _extract_export_params_from_request(self) -> tuple[str | None, int | None]:
@@ -813,14 +776,13 @@ class ChartDataRestApi(ChartRestApi):
         form_data: dict[str, Any] | None = None,
         filename: str | None = None,
         expected_rows: int | None = None,
-        slice_: Slice | None = None,
     ) -> Response:
         """Create a streaming CSV response for large datasets."""
         query_context = result["query_context"]
 
         # Use filename from frontend if provided, otherwise generate one
         if not filename:
-            filename = f"{self._get_default_export_filename(form_data, slice_)}.csv"
+            filename = f"{self._get_default_export_filename(form_data)}.csv"
         else:
             # Sanitize the client-provided filename before placing it in the
             # Content-Disposition header to avoid header/path injection.

superset/commands/database/exceptions.py

@@ -52,6 +52,42 @@ class DatabaseRequiredFieldValidationError(ValidationError):
         )
 
 
+class DatabaseExtraJSONValidationError(ValidationError):
+    """
+    Marshmallow validation error for database encrypted extra must be a valid JSON
+    """
+
+    def __init__(self, json_error: str = "") -> None:
+        super().__init__(
+            [
+                _(
+                    "Field cannot be decoded by JSON. %(json_error)s",
+                    json_error=json_error,
+                )
+            ],
+            field_name="extra",
+        )
+
+
+class DatabaseExtraValidationError(ValidationError):
+    """
+    Marshmallow validation error for database encrypted extra must be a valid JSON
+    """
+
+    def __init__(self, key: str = "") -> None:
+        super().__init__(
+            [
+                _(
+                    "The metadata_params in Extra field "
+                    "is not configured correctly. The key "
+                    "%{key}s is invalid.",
+                    key=key,
+                )
+            ],
+            field_name="extra",
+        )
+
+
 class DatabaseConnectionSyncPermissionsError(CommandException):
     status = 500
     message = _("Unable to sync permissions for this database connection.")

superset/commands/deletion_retention/audit.py

@@ -24,10 +24,8 @@ purge rolls back. The record is written ``pending`` *before* the purge and
 flipped to ``confirmed`` *after* it commits, so a crash leaves at most a
 ``pending`` row, never a missing one. ``pending`` rows are reconciled on the
 next run. Completed records are immutable. Consecutive scheduled evaluations
-that remain blocked for the same reason may discard only their current
-redundant provisional row — a reason change retains one new row carrying the
-new code; force-purge and other meaningful outcomes are retained
-independently.
+that remain blocked may discard only their current redundant provisional row;
+force-purge and other meaningful outcomes are retained independently.
 
 The dedicated ``purge_audit_log`` table is content-free (no name or PII; only
 action, actor, UTC time, entity type, UUID, and affected referrers) and is never
@@ -89,10 +87,6 @@ class _AuditRecoverySnapshot:
     entity_type: str
     entity_uuid: str | None
     created_on: datetime
-    # Sourced from the finalization call's reason argument, never from the
-    # row: pending rows are reason-less by design, so reading the row here
-    # would silently record NULL.
-    reason: str | None
 
 
 def _utc_now() -> datetime:
@@ -142,18 +136,8 @@ def write_ahead(
         session.close()
 
 
-def finalize(
-    record_id: UUID | None,
-    status: str,
-    *,
-    reason: str | None = None,
-    **details: Any,
-) -> None:
-    """Finalize a pending attempt on the dedicated audit session.
-
-    ``reason`` is persisted only for blocked outcomes; the audit records a
-    cause for a purge that did not happen, never for one that did.
-    """
+def finalize(record_id: UUID | None, status: str, **details: Any) -> None:
+    """Finalize a pending attempt on the dedicated audit session."""
     if record_id is None:
         return
     session = _dedicated_session()
@@ -164,8 +148,6 @@ def finalize(
         referrers = details.get("affected_referrers")
         if referrers:
             values["affected_referrers"] = ",".join(referrers)
-        if reason is not None and status == STATUS_BLOCKED:
-            values["reason"] = reason
         removed_dashboard_slices = details.get("removed_dashboard_slices")
         if removed_dashboard_slices is not None:
             values["removed_dashboard_slices"] = removed_dashboard_slices
@@ -210,21 +192,12 @@ def fail(record_id: UUID | None) -> None:
     finalize(record_id, STATUS_FAILED)
 
 
-def block(record_id: UUID | None, reason: str | None) -> None:
-    """Mark an attempt blocked by ordinary deletion policy.
-
-    ``reason`` is a stable machine code from the closed ``REASON_*``
-    vocabulary in :mod:`superset.commands.deletion_retention.purge_policy`.
-    It is required by signature (every blocked outcome has a classified
-    cause); ``None`` is tolerated defensively so a threading gap can never
-    block a purge, and leaves the persisted reason NULL.
-    """
-    finalize(record_id, STATUS_BLOCKED, reason=reason)
+def block(record_id: UUID | None) -> None:
+    """Mark an attempt blocked by ordinary deletion policy."""
+    finalize(record_id, STATUS_BLOCKED)
 
 
-def _capture_recovery_snapshot(
-    record: PurgeAuditLog, reason: str | None
-) -> _AuditRecoverySnapshot:
+def _capture_recovery_snapshot(record: PurgeAuditLog) -> _AuditRecoverySnapshot:
     """Capture the content-free fields needed for fail-safe recovery."""
     return _AuditRecoverySnapshot(
         id=cast(UUID, record.id),
@@ -232,37 +205,26 @@ def _capture_recovery_snapshot(
         entity_type=str(record.entity_type),
         entity_uuid=record.entity_uuid,
         created_on=cast(datetime, record.created_on),
-        reason=reason,
     )
 
 
 def _retention_predecessor(
     session: Session, current: PurgeAuditLog
 ) -> PurgeAuditLog | None:
-    """Return the latest row that could unambiguously precede ``current``.
-
-    The latest same-entity retention row by ``created_on`` — deliberately not
-    bounded by ``current.created_on``. If another visible row has a later
-    timestamp, it surfaces here so the caller's strictly-older check retains
-    the current row. Timestamps provide database ordering for this predicate,
-    not causal ordering across workers.
-    """
+    """Return the latest row that could unambiguously precede ``current``."""
     predecessor: PurgeAuditLog | None = session.execute(
         sa.select(PurgeAuditLog)
         .where(PurgeAuditLog.entity_uuid == current.entity_uuid)
         .where(PurgeAuditLog.entity_type == current.entity_type)
         .where(PurgeAuditLog.trigger == TRIGGER_RETENTION)
+        .where(PurgeAuditLog.created_on <= current.created_on)
         .where(PurgeAuditLog.id != current.id)
         .order_by(PurgeAuditLog.created_on.desc())
         .limit(1)
     ).scalar_one_or_none()
     if predecessor is None:
         return predecessor
-    # A timestamp-tied row differing in status OR reason makes the
-    # predecessor ambiguous. ``is_distinct_from`` keeps the reason
-    # comparison NULL-safe on all supported dialects (reason is nullable;
-    # status is not).
-    tied_mixed_exists: bool = session.execute(
+    tied_mixed_status_exists: bool = session.execute(
         sa.select(
             sa.exists().where(
                 PurgeAuditLog.entity_uuid == current.entity_uuid,
@@ -270,43 +232,23 @@ def _retention_predecessor(
                 PurgeAuditLog.trigger == TRIGGER_RETENTION,
                 PurgeAuditLog.created_on == predecessor.created_on,
                 PurgeAuditLog.id != current.id,
-                sa.or_(
-                    PurgeAuditLog.status != predecessor.status,
-                    PurgeAuditLog.reason.is_distinct_from(predecessor.reason),
-                ),
+                PurgeAuditLog.status != predecessor.status,
             )
         )
     ).scalar_one()
-    if tied_mixed_exists:
+    if tied_mixed_status_exists:
         return None
     return predecessor
 
 
 def _suppress_redundant_block(
-    session: Session,
-    current: PurgeAuditLog,
-    predecessor: PurgeAuditLog | None,
-    reason: str | None,
+    session: Session, current: PurgeAuditLog, predecessor: PurgeAuditLog | None
 ) -> bool:
-    """Delete a pending row only against a strictly older same-reason block."""
-    if not reason:
-        # Fail safe on a threading gap: a missing current code must retain
-        # the row (and be visible), never silently revive the status-only
-        # predicate.
-        logger.warning(
-            "deletion_retention: blocked audit row %s has no reason code; "
-            "refusing suppression",
-            current.id,
-        )
-        return False
+    """Delete only a pending row with a strictly older blocked predecessor."""
     if (
         predecessor is None
         or predecessor.created_on >= current.created_on
         or predecessor.status != STATUS_BLOCKED
-        # A reason-less (pre-feature) predecessor never matches: the first
-        # post-upgrade block of a long-blocked entity is retained once and
-        # becomes the new suppression anchor.
-        or predecessor.reason != reason
     ):
         return False
     deleted_rows: int | None = session.execute(
@@ -322,7 +264,7 @@ def _suppress_redundant_block(
     return deleted_rows == 1
 
 
-def _retain_blocked(session: Session, record_id: UUID, reason: str | None) -> None:
+def _retain_blocked(session: Session, record_id: UUID) -> None:
     """Conditionally retain the current provisional row as blocked."""
     session.execute(
         sa.update(PurgeAuditLog.__table__)
@@ -330,7 +272,7 @@ def _retain_blocked(session: Session, record_id: UUID, reason: str | None) -> No
             PurgeAuditLog.__table__.c.id == record_id,
             PurgeAuditLog.__table__.c.status == STATUS_PENDING,
         )
-        .values(status=STATUS_BLOCKED, removed_dashboard_slices=0, reason=reason)
+        .values(status=STATUS_BLOCKED, removed_dashboard_slices=0)
     )
 
 
@@ -343,11 +285,7 @@ def _recover_retention_blocked(
         current: PurgeAuditLog | None = recovery_session.get(PurgeAuditLog, record_id)
         if current is not None:
             if current.status == STATUS_PENDING:
-                _retain_blocked(
-                    recovery_session,
-                    record_id,
-                    snapshot.reason if snapshot else None,
-                )
+                _retain_blocked(recovery_session, record_id)
                 recovery_session.commit()
             return "fallback"
         if snapshot is None:
@@ -362,7 +300,6 @@ def _recover_retention_blocked(
                 entity_uuid=snapshot.entity_uuid,
                 removed_dashboard_slices=0,
                 created_on=snapshot.created_on,
-                reason=snapshot.reason,
             )
         )
         recovery_session.commit()
@@ -382,14 +319,9 @@ def _recover_retention_blocked(
 
 
 def finalize_retention_blocked(
-    record_id: UUID | None, reason: str | None
+    record_id: UUID | None,
 ) -> RetentionBlockedDisposition:
-    """Finalize a scheduled blocker, suppressing only proven redundant evidence.
-
-    ``reason`` is the stable machine code for the block (see
-    :func:`block`); it is persisted on retained rows and captured in the
-    snapshot used by the crash-recovery path.
-    """
+    """Finalize a scheduled blocker, suppressing only proven redundant evidence."""
     if record_id is None:
         return "fallback"
     session: Session = _dedicated_session()
@@ -398,17 +330,15 @@ def finalize_retention_blocked(
         current: PurgeAuditLog | None = session.get(PurgeAuditLog, record_id)
         if current is None:
             return "fallback"
-        snapshot = _capture_recovery_snapshot(current, reason)
+        snapshot = _capture_recovery_snapshot(current)
         if current.status != STATUS_PENDING or current.trigger != TRIGGER_RETENTION:
             return "retained"
         predecessor: PurgeAuditLog | None = None
         if current.entity_uuid is not None:
             predecessor = _retention_predecessor(session, current)
-        suppressed: bool = _suppress_redundant_block(
-            session, current, predecessor, reason
-        )
+        suppressed: bool = _suppress_redundant_block(session, current, predecessor)
         if not suppressed:
-            _retain_blocked(session, record_id, reason)
+            _retain_blocked(session, record_id)
         session.commit()
         return "suppressed" if suppressed else "retained"
     except SQLAlchemyError:
@@ -453,12 +383,6 @@ def reconcile_pending(stale_before: datetime | None = None) -> dict[str, int]:
     ``confirmed``. A surviving or unresolvable entity means the attempt did
     not durably purge it and is finalized as failed; normal selection may
     retry.
-
-    An attempt that had already decided ``blocked`` when its worker died is
-    indistinguishable here from any other stalled attempt, so it reconciles
-    as failed with no reason: pending rows carry no reason by design, and
-    inventing one would assert evidence this process never witnessed. The
-    next scheduled attempt re-anchors the entity with its real code.
     """
     cutoff = stale_before or _utc_now() - _PENDING_STALE_AFTER
     reconciled = absent = failed = 0

superset/commands/deletion_retention/force_purge.py

@@ -183,7 +183,7 @@ class ForcePurgeCommand:
                 removed_dashboard_slices=result.removed_dashboard_slices,
             )
         elif result.blocked_reason is not None:
-            audit.block(record_id, result.blocker.code if result.blocker else None)
+            audit.block(record_id)
         else:
             audit.fail(record_id)
         if result.purged:

superset/commands/deletion_retention/purge_cascade.py

@@ -53,11 +53,9 @@ from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Session
 
 from superset.commands.deletion_retention.purge_policy import (
-    BlockerReason,
     get_purge_policy,
     PurgeBlockedError,
     PurgeEntityPolicy,
-    REASON_CASCADE_INTEGRITY_FAILURE,
 )
 
 logger: logging.Logger = logging.getLogger(__name__)
@@ -146,17 +144,7 @@ class CascadeResult:
     dangling_chart_uuids: list[str] = field(default_factory=list)
     removed_dashboard_slices: int = 0
     version_rows_removed: int = 0
-    blocker: BlockerReason | None = None
-
-    @property
-    def blocked_reason(self) -> str | None:
-        """Return the operator-facing blocker phrase, if the purge was blocked."""
-        return self.blocker.phrase if self.blocker else None
-
-    @property
-    def blocked_reason_code(self) -> str | None:
-        """Return the stable audit code, if the purge was blocked."""
-        return self.blocker.code if self.blocker else None
+    blocked_reason: str | None = None
 
 
 class PurgeRaceLostError(Exception):
@@ -279,21 +267,20 @@ def cascade_hard_delete(
             purged=False,
             entity_type=entity_type,
             entity_uuid=uuid,
-            blocker=ex.reason,
+            blocked_reason=str(ex),
         )
     except IntegrityError as ex:
-        # Not a policy decision: a database integrity constraint failed.
+        # Not a policy decision: a restrictive FK the cascade did not handle.
         # Two audiences, two messages. The curated reason goes to the caller
         # (and from there into a user toast), because raw driver text carries
         # the failing SQL and bind parameters. The constraint detail goes to
-        # the log at WARNING, because an entity permanently unpurgeable after
-        # an integrity failure represents a cascade defect someone has to be
-        # able to diagnose. The stable audit code identifies this as an unexpected
-        # cascade failure rather than intended policy behavior without
-        # claiming which kind of constraint the database reported.
+        # the log at WARNING, because an entity permanently unpurgeable via an
+        # unknown FK is a cascade-coverage bug someone has to be able to
+        # diagnose -- reported at INFO as a policy block, it read as intended
+        # behaviour.
         logger.warning(
-            "deletion_retention: %s id=%s purge failed on a database "
-            "integrity constraint: %s",
+            "deletion_retention: %s id=%s purge failed on a restrictive "
+            "foreign key the cascade does not handle: %s",
             entity_type,
             entity_id,
             ex,
@@ -302,10 +289,7 @@ def cascade_hard_delete(
             purged=False,
             entity_type=entity_type,
             entity_uuid=uuid,
-            blocker=BlockerReason(
-                REASON_CASCADE_INTEGRITY_FAILURE,
-                "cascade blocked by a database integrity constraint",
-            ),
+            blocked_reason="blocked by database references",
         )
 
     return CascadeResult(

superset/commands/deletion_retention/purge_policy.py

@@ -24,7 +24,7 @@ from dataclasses import dataclass
 from enum import Enum
 from functools import lru_cache
 from types import MappingProxyType
-from typing import Any, cast, NamedTuple
+from typing import Any, cast
 
 import sqlalchemy as sa
 from sqlalchemy.orm import Mapper, Session
@@ -36,44 +36,10 @@ from superset.utils.sqlalchemy_events import (
 
 logger: logging.Logger = logging.getLogger(__name__)
 
-# Stable machine-readable reason codes persisted on purge audit records.
-# The values are frozen identifiers pinned by a golden-set test: they equal
-# the related-table names at introduction by coincidence, never by derivation,
-# so a physical table rename changes only the blocker mapping's key and
-# leaves the persisted code untouched — audit history and the suppression
-# predicate compare these literals.
-REASON_REPORT_SCHEDULE: str = "report_schedule"
-REASON_USER_ATTRIBUTE: str = "user_attribute"
-REASON_CASCADE_INTEGRITY_FAILURE: str = "cascade_integrity_failure"
-
-ALL_REASON_CODES: frozenset[str] = frozenset(
-    {
-        REASON_REPORT_SCHEDULE,
-        REASON_USER_ATTRIBUTE,
-        REASON_CASCADE_INTEGRITY_FAILURE,
-    }
-)
-
-
-class BlockerReason(NamedTuple):
-    """One blocker's persisted audit code paired with its operator phrase."""
-
-    code: str
-    phrase: str
-
 
 class PurgeBlockedError(Exception):
     """Raised when ordinary deletion policy forbids purging an entity."""
 
-    def __init__(self, reason: BlockerReason) -> None:
-        super().__init__(reason.phrase)
-        self.reason: BlockerReason = reason
-
-    @property
-    def reason_code(self) -> str:
-        """Return the stable machine-readable blocker code."""
-        return self.reason.code
-
 
 class DependencyClassification(str, Enum):
     """Describe how purge treats a persistence dependency."""
@@ -140,21 +106,11 @@ class DependencyPolicy:
     key: DependencyKey
     classification: DependencyClassification
     phase: ExecutionPhase | None = None
-    blocker: BlockerReason | None = None
+    blocked_reason: str | None = None
     optional_listener: bool = False
     listener_action: ListenerAction | None = None
     version_column: str | None = None
 
-    @property
-    def blocked_reason(self) -> str | None:
-        """Return the operator-facing blocker phrase, if this policy blocks."""
-        return self.blocker.phrase if self.blocker else None
-
-    @property
-    def blocked_reason_code(self) -> str | None:
-        """Return the stable audit code, if this policy blocks."""
-        return self.blocker.code if self.blocker else None
-
 
 @dataclass(frozen=True)
 class PurgeEntityPolicy:
@@ -460,7 +416,7 @@ def purge_policy_registry() -> Mapping[type[Any], PurgeEntityPolicy]:
         keys: tuple[DependencyKey, ...],
         classifications: tuple[DependencyClassification, ...],
         synthetic: tuple[DependencyPolicy, ...],
-        blocked_reasons: Mapping[str, BlockerReason] = MappingProxyType({}),
+        blocked_reasons: Mapping[str, str] = MappingProxyType({}),
         version_columns: Mapping[str, str] = MappingProxyType({}),
     ) -> tuple[DependencyPolicy, ...]:
         phases: dict[DependencyClassification, ExecutionPhase | None] = {
@@ -472,22 +428,15 @@ def purge_policy_registry() -> Mapping[type[Any], PurgeEntityPolicy]:
         }
         if len(keys) != len(classifications):
             raise ValueError("Every dependency key requires one classification")
-
-        def declare(
-            key: DependencyKey, classification: DependencyClassification
-        ) -> DependencyPolicy:
-            blocker: BlockerReason | None = blocked_reasons.get(key.related_table)
-            return DependencyPolicy(
-                key,
-                classification,
-                phases[classification],
-                blocker=blocker,
-                version_column=version_columns.get(key.related_table),
-            )
-
         return (
             tuple(
-                declare(key, classification)
+                DependencyPolicy(
+                    key,
+                    classification,
+                    phases[classification],
+                    blocked_reason=blocked_reasons.get(key.related_table),
+                    version_column=version_columns.get(key.related_table),
+                )
                 for key, classification in zip(keys, classifications, strict=True)
             )
             + synthetic
@@ -590,12 +539,7 @@ def purge_policy_registry() -> Mapping[type[Any], PurgeEntityPolicy]:
                     DependencyClassification.PRESERVE,
                 ),
                 (tag_cleanup, chart_membership_versions),
-                # Keyed by related table; the audit code is declared, not derived.
-                {
-                    "report_schedule": BlockerReason(
-                        REASON_REPORT_SCHEDULE, "associated alerts or reports exist"
-                    )
-                },
+                {"report_schedule": "associated alerts or reports exist"},
                 {"slices_version": "id"},
             ),
             validate=validate_deletion_allowed,
@@ -743,16 +687,10 @@ def purge_policy_registry() -> Mapping[type[Any], PurgeEntityPolicy]:
                     DependencyClassification.PRESERVE,
                 ),
                 (tag_cleanup, dashboard_membership_versions),
-                # Keyed by related table; the audit code is declared, not derived.
-                # Declaration order is part of the audit contract: the first
-                # matching blocker's code is the one recorded.
                 {
-                    "report_schedule": BlockerReason(
-                        REASON_REPORT_SCHEDULE, "associated alerts or reports exist"
-                    ),
-                    "user_attribute": BlockerReason(
-                        REASON_USER_ATTRIBUTE,
-                        "a user has this dashboard set as their welcome page",
+                    "report_schedule": "associated alerts or reports exist",
+                    "user_attribute": (
+                        "a user has this dashboard set as their welcome page"
                     ),
                 },
                 {"dashboards_version": "id"},
@@ -955,9 +893,9 @@ def validate_deletion_allowed(
         if session.execute(
             sa.select(sa.literal(1)).select_from(table).where(*predicates).limit(1)
         ).first():
-            if dependency.blocker is None:
+            if dependency.blocked_reason is None:
                 raise RuntimeError(f"Missing blocker reason for {key.describe()}")
-            raise PurgeBlockedError(dependency.blocker)
+            raise PurgeBlockedError(dependency.blocked_reason)
 
 
 def count_dashboard_slices(

superset/commands/explore/permalink/create.py

@@ -18,13 +18,11 @@ import logging
 from functools import partial
 from typing import Any, Optional
 
-from jinja2.exceptions import TemplateError
 from sqlalchemy.exc import SQLAlchemyError
 
 from superset import db
 from superset.commands.explore.permalink.base import BaseExplorePermalinkCommand
 from superset.daos.key_value import KeyValueDAO
-from superset.exceptions import SupersetTemplateException
 from superset.explore.permalink.exceptions import ExplorePermalinkCreateFailedError
 from superset.explore.utils import check_access as check_chart_access
 from superset.key_value.exceptions import (
@@ -60,10 +58,7 @@ class CreateExplorePermalinkCommand(BaseExplorePermalinkCommand):
         d_id, d_type = self.datasource.split("__")
         datasource_id = int(d_id)
         datasource_type = DatasourceType(d_type)
-        try:
-            check_chart_access(datasource_id, self.chart_id, datasource_type)
-        except TemplateError as ex:
-            raise SupersetTemplateException(str(ex)) from ex
+        check_chart_access(datasource_id, self.chart_id, datasource_type)
         value = {
             "chartId": self.chart_id,
             "datasourceId": datasource_id,

superset/commands/explore/permalink/get.py

@@ -17,13 +17,11 @@
 import logging
 from typing import Optional
 
-from jinja2.exceptions import TemplateError
 from sqlalchemy.exc import SQLAlchemyError
 
 from superset.commands.dataset.exceptions import DatasetNotFoundError
 from superset.commands.explore.permalink.base import BaseExplorePermalinkCommand
 from superset.daos.key_value import KeyValueDAO
-from superset.exceptions import SupersetTemplateException
 from superset.explore.permalink.exceptions import ExplorePermalinkGetFailedError
 from superset.explore.permalink.types import ExplorePermalinkValue
 from superset.explore.utils import check_access as check_chart_access
@@ -56,10 +54,7 @@ class GetExplorePermalinkCommand(BaseExplorePermalinkCommand):
                 datasource_type = DatasourceType(
                     value.get("datasourceType", DatasourceType.TABLE)
                 )
-                try:
-                    check_chart_access(datasource_id, chart_id, datasource_type)
-                except TemplateError as ex:
-                    raise SupersetTemplateException(str(ex)) from ex
+                check_chart_access(datasource_id, chart_id, datasource_type)
                 return value
             return None
         except (

superset/commands/importers/v1/utils.py

@@ -324,6 +324,20 @@ def load_configs(
                     )
                 exc.messages = {file_name: exc.messages}
                 exceptions.append(exc)
+            except json.JSONDecodeError as exc:
+                # masked_encrypted_extra comes straight from the imported YAML
+                # (before schema validation) and may not be valid JSON. Convert
+                # the raw decode error into a ValidationError so it flows into
+                # the aggregated CommandInvalidError like every other per-file
+                # validation failure, instead of escaping as an opaque 500.
+                logger.error(
+                    "Invalid JSON in masked_encrypted_extra for %s: %s",
+                    file_name,
+                    exc,
+                )
+                exceptions.append(
+                    ValidationError({file_name: {"masked_encrypted_extra": [str(exc)]}})
+                )
 
     return configs
 

superset/commands/report/execute.py

@@ -1620,9 +1620,6 @@ class BaseReportState:
         (caller should ``return`` without re-raising), or False if the caller
         should fall through to its own error handling path.
         """
-        if not feature_flag_manager.is_feature_enabled("ALERT_REPORTS_RETRY"):
-            return False
-
         retry_on_failure: bool = self._report_schedule.retry_on_failure
         if not retry_on_failure:
             return False
@@ -1738,8 +1735,7 @@ class ReportNotTriggeredErrorState(BaseReportState):
         # retry delay, consider the retry chain dead and let the new window
         # proceed (e.g., apply_async failed after committing RETRYING).
         if (
-            feature_flag_manager.is_feature_enabled("ALERT_REPORTS_RETRY")
-            and self._report_schedule.last_state == ReportState.RETRYING
+            self._report_schedule.last_state == ReportState.RETRYING
             and self._is_retry_window_stale()
         ):
             max_delay: int = app.config.get(
@@ -1771,8 +1767,6 @@ class ReportNotTriggeredErrorState(BaseReportState):
                     return
             self.send()
             # Clear any retry state from previous failed attempts in this window.
-            # Always reset on success regardless of feature flag — prevents
-            # stale counters from being reused if the flag is later re-enabled.
             self._reset_retry_counter()
             warning_message = (
                 ";".join(self._execution_warnings) if self._execution_warnings else None
@@ -2062,8 +2056,7 @@ class ReportSuccessState(BaseReportState):
             raise
 
         # send() succeeded — clear retry state and log success. Any execution
-        # warnings are incorporated by create_log(). Always reset regardless
-        # of feature flag to prevent stale counters.
+        # warnings are incorporated by create_log().
         self._reset_retry_counter()
         self.update_report_schedule_and_log(ReportState.SUCCESS, error_message=None)
 

superset/commands/report/update.py

@@ -22,7 +22,7 @@ from flask_appbuilder.models.sqla import Model
 from flask_babel import gettext as _
 from marshmallow import ValidationError
 
-from superset import is_feature_enabled, security_manager
+from superset import security_manager
 from superset.commands.base import UpdateMixin
 from superset.commands.report.base import BaseReportScheduleCommand
 from superset.commands.report.exceptions import (
@@ -193,24 +193,23 @@ class UpdateReportScheduleCommand(UpdateMixin, BaseReportScheduleCommand):
             include_viewers=False,
         )
 
-        # Validate retry config when the feature is enabled.
-        if is_feature_enabled("ALERT_REPORTS_RETRY"):
-            # Fall back to the existing DB value for fields not in the payload.
-            send_failed = self._properties.get(
-                "send_failed_reports", self._model.send_failed_reports
-            )
-            retry_enabled = self._properties.get(
-                "retry_on_failure", self._model.retry_on_failure
-            )
-            if send_failed and not retry_enabled:
-                msg = _("send_failed_reports requires retry_on_failure to be enabled")
-                exceptions.append(ValidationError({"send_failed_reports": [msg]}))
+        # Validate retry config: send_failed_reports requires retry_on_failure.
+        # Fall back to the existing DB value for fields not in the payload.
+        send_failed = self._properties.get(
+            "send_failed_reports", self._model.send_failed_reports
+        )
+        retry_enabled = self._properties.get(
+            "retry_on_failure", self._model.retry_on_failure
+        )
+        if send_failed and not retry_enabled:
+            msg = _("send_failed_reports requires retry_on_failure to be enabled")
+            exceptions.append(ValidationError({"send_failed_reports": [msg]}))
 
-            # Retries are only supported for reports, not alerts.
-            report_type = self._properties.get("type", self._model.type)
-            if report_type == ReportScheduleType.ALERT and retry_enabled:
-                msg = _("Retries are not supported for alerts")
-                exceptions.append(ValidationError({"retry_on_failure": [msg]}))
+        # Retries are only supported for reports, not alerts.
+        report_type = self._properties.get("type", self._model.type)
+        if report_type == ReportScheduleType.ALERT and retry_enabled:
+            msg = _("Retries are not supported for alerts")
+            exceptions.append(ValidationError({"retry_on_failure": [msg]}))
 
         if exceptions:
             raise ReportScheduleInvalidError(exceptions=exceptions)

superset/commands/sql_lab/results.py

@@ -34,7 +34,6 @@ from superset.exceptions import (
 from superset.models.sql_lab import Query
 from superset.sqllab.utils import apply_display_max_row_configuration_if_require
 from superset.utils import core as utils
-from superset.utils.database import warm_and_release_connection
 from superset.utils.dates import now_as_float
 from superset.views.utils import _deserialize_results_payload
 
@@ -110,17 +109,6 @@ class SqlExecutionResultsCommand(BaseCommand):
                 status=400,
             ) from ex
 
-        # Release the DB connection back to the pool before the S3 fetch and the
-        # CPU-bound decompress/deserialize/expand work below: none of that needs
-        # the DB, and holding a connection for their duration (which can run well
-        # past this endpoint's client-side timeout for large results) is what
-        # exhausts the small per-worker SQLAlchemy pool when several large-result
-        # downloads land concurrently on the same gunicorn worker. `database` is
-        # warmed first since `_deserialize_results_payload` needs
-        # `self._query.database.db_engine_spec` later in `run()`, after the
-        # connection has been released.
-        warm_and_release_connection(self._query, "database")
-
         # Now fetch results from backend (query exists, so this is a valid request)
         read_from_results_backend_start = now_as_float()
         self._blob = results_backend.get(self._key)

superset/commands/tag/create.py

@@ -18,15 +18,13 @@ import logging
 from functools import partial
 from typing import Any
 
-from jinja2.exceptions import TemplateError
-
 from superset import security_manager
 from superset.commands.base import BaseCommand, CreateMixin
 from superset.commands.tag.exceptions import TagCreateFailedError, TagInvalidError
 from superset.commands.tag.utils import to_object_model, to_object_type
 from superset.commands.utils import current_user_can_modify_object
 from superset.daos.tag import TagDAO
-from superset.exceptions import SupersetParseError, SupersetSecurityException
+from superset.exceptions import SupersetSecurityException
 from superset.tags.models import ObjectType, TagType
 from superset.utils.decorators import on_error, transaction
 
@@ -97,30 +95,8 @@ class CreateCustomTagCommand(CreateMixin, BaseCommand):
                     )
                 )
         except SupersetSecurityException:
-            # A routine, expected authorization denial; swallowed silently by
-            # design (no logging) and surfaced to the caller as a validation
-            # failure rather than an unhandled 500.
             exceptions.append(
-                TagCreateFailedError(
-                    f"Could not validate access for {object_type} {object_id}"
-                )
-            )
-        except (TemplateError, SupersetParseError) as ex:
-            # Authorizing a saved query parses its Jinja-templated SQL to resolve
-            # table references. Malformed Jinja (TemplateError) or an
-            # unresolvable partition macro (SupersetParseError) is a validation
-            # failure, not an unhandled 500 -- but unlike an access denial it is
-            # genuinely unexpected, so log it for server-side visibility and
-            # preserve the underlying error text instead of discarding it.
-            logger.warning(
-                "Could not parse query %s while validating tag access: %s",
-                object_id,
-                str(ex),
-            )
-            exceptions.append(
-                TagCreateFailedError(
-                    f"Could not validate access for {object_type} {object_id}: {ex}"
-                )
+                TagCreateFailedError(f"Access denied for {object_type} {object_id}")
             )
 
 

superset/commands/version_restore.py

@@ -138,8 +138,8 @@ class BaseRestoreVersionCommand(BaseCommand):
         # With capture off, Continuum's write listeners are detached: a
         # revert would mutate the live entity with NO new version row —
         # a destructive, untracked write. The whole restore surface is
-        # therefore inert under the kill-switch (404, indistinguishable from
-        # "no such version"). Existing history remains readable.
+        # therefore inert under the kill-switch, matching the read-side
+        # convention (404, indistinguishable from "no such version").
         if not capture_enabled():
             raise self.not_found_exc()
         entity = find_active_by_uuid(self.model_cls, self._uuid)

superset/config.py

@@ -708,7 +708,7 @@ DEFAULT_FEATURE_FLAGS: dict[str, bool] = {
     # the move-back lever; removed (along with its two gate points —
     # BaseDAO.delete routing and the do_orm_execute visibility listener) once
     # post-flip confidence is established.
-    # @lifecycle: testing
+    # @lifecycle: development
     "SOFT_DELETE": True,
     # Enable semantic layers and show semantic views alongside datasets
     # @lifecycle: development
@@ -742,9 +742,9 @@ DEFAULT_FEATURE_FLAGS: dict[str, bool] = {
     "TAGGING_SYSTEM": False,
     # Enables the version history panel on Explore and Dashboard pages.
     # History only accrues while ``ENABLE_VERSIONING_CAPTURE`` is also on;
-    # with capture off the panel renders empty or stale history, so the two
-    # ship with matching defaults and should be changed together.
-    # @lifecycle: testing
+    # with capture off the panel renders but stays empty, so the two ship
+    # with matching defaults and should be changed together.
+    # @lifecycle: development
     "VERSION_HISTORY": True,
     # =================================================================
     # IN TESTING
@@ -759,9 +759,6 @@ DEFAULT_FEATURE_FLAGS: dict[str, bool] = {
     # @lifecycle: testing
     # @docs: https://superset.apache.org/docs/configuration/alerts-reports
     "ALERT_REPORTS": False,
-    # Enables automatic retry functionality for failed report executions
-    # @lifecycle: testing
-    "ALERT_REPORTS_RETRY": False,
     # Enables Slack V2 integration for Alerts and Reports.
     # Defaults to True; the legacy Slack v1 path is deprecated and will be removed
     # in the next major release. Operators must grant the Slack bot both the
@@ -1697,9 +1694,17 @@ DATETIME_FORMAT_DETECTION_SAMPLE_SIZE = 1000
 # The limit for the Superset Meta DB when the feature flag ENABLE_SUPERSET_META_DB is on
 SUPERSET_META_DB_LIMIT: int | None = 1000
 
-# Master switch for entity-version-history capture. A falsy value disables
-# version writes while keeping existing history available read-only through the
-# ``/versions/`` endpoints; Restore is unavailable while capture is disabled.
+# Master switch for entity-version-history capture. Capture is enabled by
+# default, so saves write shadow rows and a ``version_transaction`` /
+# ``version_changes`` record. Set this to a falsy value in
+# ``superset_config.py`` (or via the environment variable of the same name) to
+# disable the before-flush listeners while keeping the /versions/ endpoints
+# available read-only.
+# Capture ships on. It is an operational escape hatch — set the environment
+# variable to a falsy value when a versioning-induced regression needs a
+# 30-second recovery instead of revert-and-redeploy — not a feature flag,
+# and it remains permanently as the kill-switch rather than being removed
+# with the rollout toggles.
 ENABLE_VERSIONING_CAPTURE: bool = utils.parse_boolean_string(
     os.environ.get("ENABLE_VERSIONING_CAPTURE", "true")
 )

superset/daos/base.py

@@ -38,7 +38,7 @@ from flask_appbuilder.models.filters import BaseFilter
 from flask_appbuilder.models.sqla.interface import SQLAInterface
 from pydantic import BaseModel, Field
 from sqlalchemy import asc, cast, desc, false, or_, Text
-from sqlalchemy.exc import OperationalError, SQLAlchemyError, StatementError
+from sqlalchemy.exc import SQLAlchemyError, StatementError
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.inspection import inspect
 from sqlalchemy.orm import ColumnProperty, joinedload, Query, RelationshipProperty
@@ -255,11 +255,6 @@ class BaseDAO(CoreBaseDAO[T], Generic[T]):
             filter = uuid_column == model_id_or_uuid
         try:
             return query.filter(filter).one_or_none()
-        except OperationalError:
-            # A transient connection-level failure (e.g. the server dropping the
-            # connection mid-query) surfaces as OperationalError, a StatementError
-            # subclass. Let it propagate instead of masking it as a "not found".
-            raise
         except StatementError:
             # can happen if neither uuid nor int is passed
             return None
@@ -346,11 +341,6 @@ class BaseDAO(CoreBaseDAO[T], Generic[T]):
 
         try:
             return query.filter(column == converted_value).one_or_none()
-        except OperationalError:
-            # A transient connection-level failure (e.g. the server dropping the
-            # connection mid-query) surfaces as OperationalError, a StatementError
-            # subclass. Let it propagate instead of masking it as a "not found".
-            raise
         except StatementError:
             # can happen if int is passed instead of a string or similar
             return None
@@ -443,11 +433,6 @@ class BaseDAO(CoreBaseDAO[T], Generic[T]):
 
         try:
             results = query.all()
-        except OperationalError:
-            # A transient connection-level failure (e.g. the server dropping the
-            # connection mid-query) surfaces as OperationalError. Let it propagate
-            # as a 5xx instead of masking it as a 400 "record doesn't exist".
-            raise
         except SQLAlchemyError as ex:
             model_name = cls.model_cls.__name__ if cls.model_cls else "Unknown"
             raise DAOFindFailedError(