test(mcp): add -> None return types and remove redundant ToolError import

All 6 new test methods in TestListDatasetsRequestWrapper were missing the required -> None return type annotation (Rule 12). Also remove the inline `from fastmcp.exceptions import ToolError` in test_flat_kwargs_rejected since ToolError is already imported at module top-level (line 27).
2026-05-15 04:45:10 +00:00 · 2026-05-07 16:55:35 +00:00 · 2026-05-07 16:55:35 +00:00 · 2026-05-07 16:55:35 +00:00 · 2026-05-07 16:55:35 +00:00 · 2026-05-07 16:55:35 +00:00
224 changed files with 24316 additions and 1614 deletions
--- a/.github/workflows/ephemeral-env-pr-close.yml
+++ b/.github/workflows/ephemeral-env-pr-close.yml
@@ -58,7 +58,7 @@ jobs:
      - name: Login to Amazon ECR
        if: steps.describe-services.outputs.active == 'true'
        id: login-ecr
-        uses: aws-actions/amazon-ecr-login@19d944daaa35f0fa1d3f7f8af1d3f2e5de25c5b7 # v2
+        uses: aws-actions/amazon-ecr-login@fa648b43de3d4d023bcb3f89ed6940096949c419 # v2

      - name: Delete ECR image tag
        if: steps.describe-services.outputs.active == 'true'
--- a/.github/workflows/ephemeral-env.yml
+++ b/.github/workflows/ephemeral-env.yml
@@ -199,7 +199,7 @@ jobs:

      - name: Login to Amazon ECR
        id: login-ecr
-        uses: aws-actions/amazon-ecr-login@19d944daaa35f0fa1d3f7f8af1d3f2e5de25c5b7 # v2
+        uses: aws-actions/amazon-ecr-login@fa648b43de3d4d023bcb3f89ed6940096949c419 # v2

      - name: Load, tag and push image to ECR
        id: push-image
@@ -235,7 +235,7 @@ jobs:

      - name: Login to Amazon ECR
        id: login-ecr
-        uses: aws-actions/amazon-ecr-login@19d944daaa35f0fa1d3f7f8af1d3f2e5de25c5b7 # v2
+        uses: aws-actions/amazon-ecr-login@fa648b43de3d4d023bcb3f89ed6940096949c419 # v2

      - name: Check target image exists in ECR
        id: check-image
--- a/.github/workflows/superset-python-unittest.yml
+++ b/.github/workflows/superset-python-unittest.yml
@@ -54,6 +54,7 @@ jobs:
          SUPERSET_SECRET_KEY: not-a-secret
        run: |
          pytest --durations-min=0.5 --cov=superset/sql/ ./tests/unit_tests/sql/ --cache-clear --cov-fail-under=100
+          pytest --durations-min=0.5 --cov=superset/semantic_layers/ ./tests/unit_tests/semantic_layers/ --cache-clear --cov-fail-under=100
      - name: Upload code coverage
        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
        with:
--- a/UPDATING.md
+++ b/UPDATING.md
@@ -46,6 +46,13 @@ The Deck.gl MapBox chart's **Opacity**, **Default longitude**, **Default latitud

 **To restore fit-to-data behavior:** Open the chart in Explore, clear the **Default longitude**, **Default latitude**, and **Zoom** fields in the Viewport section, and re-save the chart.

+### Combined datasource list endpoint
+
+Added a new combined datasource list endpoint at `GET /api/v1/datasource/` to serve datasets and semantic views in one response.
+
+- The endpoint is available to users with at least one of `can_read` on `Dataset` or `SemanticView`.
+- Semantic views are included only when the `SEMANTIC_LAYERS` feature flag is enabled.
+- The endpoint enforces strict `order_column` validation and returns `400` for invalid sort columns.
 ### ClickHouse minimum driver version bump

 The minimum required version of `clickhouse-connect` has been raised to `>=0.13.0`. If you are using the ClickHouse connector, please upgrade your `clickhouse-connect` package. The `_mutate_label` workaround that appended hash suffixes to column aliases has also been removed, as it is no longer needed with modern versions of the driver.
--- a/docker/pythonpath_dev/superset_config.py
+++ b/docker/pythonpath_dev/superset_config.py
@@ -105,7 +105,13 @@ class CeleryConfig:

 CELERY_CONFIG = CeleryConfig

-FEATURE_FLAGS = {"ALERT_REPORTS": True, "DATASET_FOLDERS": True}
+FEATURE_FLAGS = {
+    "ALERT_REPORTS": True,
+    "DATASET_FOLDERS": True,
+    "ENABLE_EXTENSIONS": True,
+    "SEMANTIC_LAYERS": True,
+}
+EXTENSIONS_PATH = "/app/docker/extensions"
 ALERT_REPORTS_NOTIFICATION_DRY_RUN = True
 WEBDRIVER_BASEURL = f"http://superset_app{os.environ.get('SUPERSET_APP_ROOT', '/')}/"  # When using docker compose baseurl should be http://superset_nginx{ENV{BASEPATH}}/  # noqa: E501
 # The base URL for the email report hyperlinks.
--- a/docs/developer_docs/extensions/contribution-types.md
+++ b/docs/developer_docs/extensions/contribution-types.md
@@ -224,3 +224,52 @@ async def analysis_guide(ctx: Context) -> str:
 ```

 See [MCP Integration](./mcp) for implementation details.
+
+### Semantic Layers
+
+Extensions can register custom semantic layer implementations that allow Superset to connect to external data modeling frameworks. Each semantic layer defines how to authenticate, discover semantic views (tables/metrics/dimensions), and execute queries against the external system.
+
+```python
+from superset_core.semantic_layers.decorators import semantic_layer
+from superset_core.semantic_layers.layer import SemanticLayer
+
+from my_extension.config import MyConfig
+from my_extension.view import MySemanticView
+
+
+@semantic_layer(
+    id="my_platform",
+    name="My Data Platform",
+    description="Connect to My Data Platform's semantic layer",
+)
+class MySemanticLayer(SemanticLayer[MyConfig, MySemanticView]):
+    configuration_class = MyConfig
+
+    @classmethod
+    def from_configuration(cls, configuration: dict) -> "MySemanticLayer":
+        config = MyConfig.model_validate(configuration)
+        return cls(config)
+
+    @classmethod
+    def get_configuration_schema(cls, configuration=None) -> dict:
+        return MyConfig.model_json_schema()
+
+    @classmethod
+    def get_runtime_schema(cls, configuration=None, runtime_data=None) -> dict:
+        return {"type": "object", "properties": {}}
+
+    def get_semantic_views(self, runtime_configuration: dict) -> set[MySemanticView]:
+        # Return available views from the external platform
+        ...
+
+    def get_semantic_view(self, name: str, additional_configuration: dict) -> MySemanticView:
+        # Return a specific view by name
+        ...
+```
+
+**Note**: The `@semantic_layer` decorator automatically detects context and applies appropriate ID prefixing:
+
+- **Extension context**: ID prefixed as `extensions.{publisher}.{name}.{id}`
+- **Host context**: Original ID used as-is
+
+The decorator registers the class in the semantic layers registry, making it available in the UI for users to create connections. The `configuration_class` should be a Pydantic model that defines the fields needed to connect (credentials, project, database, etc.). Superset uses the model's JSON schema to render the configuration form dynamically.
--- a/docs/package.json
+++ b/docs/package.json
@@ -67,12 +67,12 @@
    "@storybook/preview-api": "^8.6.18",
    "@storybook/theming": "^8.6.15",
    "@superset-ui/core": "^0.20.4",
-    "@swc/core": "^1.15.32",
+    "@swc/core": "^1.15.33",
    "antd": "^6.3.7",
-    "baseline-browser-mapping": "^2.10.24",
-    "caniuse-lite": "^1.0.30001791",
-    "docusaurus-plugin-openapi-docs": "^5.0.1",
-    "docusaurus-theme-openapi-docs": "^5.0.1",
+    "baseline-browser-mapping": "^2.10.27",
+    "caniuse-lite": "^1.0.30001792",
+    "docusaurus-plugin-openapi-docs": "^5.0.2",
+    "docusaurus-theme-openapi-docs": "^5.0.2",
    "js-yaml": "^4.1.1",
    "js-yaml-loader": "^1.2.2",
    "json-bigint": "^1.0.0",
@@ -103,7 +103,7 @@
    "eslint-config-prettier": "^10.1.8",
    "eslint-plugin-prettier": "^5.5.5",
    "eslint-plugin-react": "^7.37.5",
-    "globals": "^17.5.0",
+    "globals": "^17.6.0",
    "prettier": "^3.8.3",
    "typescript": "~6.0.3",
    "typescript-eslint": "^8.59.1",
--- a/docs/static/feature-flags.json
+++ b/docs/static/feature-flags.json
@@ -81,6 +81,12 @@
        "lifecycle": "development",
        "description": "Expand nested types in Presto into extra columns/arrays. Experimental, doesn't work with all nested types."
      },
+      {
+        "name": "SEMANTIC_LAYERS",
+        "default": false,
+        "lifecycle": "development",
+        "description": "Enable semantic layers and show semantic views alongside datasets"
+      },
      {
        "name": "TABLE_V2_TIME_COMPARISON_ENABLED",
        "default": false,
--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@@ -4239,86 +4239,86 @@
  dependencies:
    apg-lite "^1.0.4"

-"@swc/core-darwin-arm64@1.15.32":
-  version "1.15.32"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.32.tgz#3592714588fdbb8b7a869f81ff96c7236fcf1c09"
-  integrity sha512-/YWMvJDPu+AAwuUsM2G+DNQ/7zhodURGzdQyewEqcvgklAdDHs3LwQmLLnyn6SJl8DT8UOxkbzK+D1PmPeelRg==
+"@swc/core-darwin-arm64@1.15.33":
+  version "1.15.33"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.33.tgz#d84134fb80417d41128739f0b9014542e3ed9dd3"
+  integrity sha512-N+L0uXhuO7FIfzqwgxmzv0zIpV0qEp8wPX3QQs2p4atjMoywup2JTeDlXPw+z9pWJGCae3JjM+tZ6myclI+2gA==

-"@swc/core-darwin-x64@1.15.32":
-  version "1.15.32"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.15.32.tgz#965044b632933146e319862ea7e4b717eb9f83dd"
-  integrity sha512-KOTXJXdAhWL+hZ77MYP3z+4pcMFaQhQ74yqyN1uz093q0YnbxpqMtYpPISbYvMHzVRNNx5kN+9RZAXEaadhWVA==
+"@swc/core-darwin-x64@1.15.33":
+  version "1.15.33"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.15.33.tgz#0badb9834071f1c6005986571d4a96359c1d7cd0"
+  integrity sha512-/Il4QHSOhV4FekbsDtkrNmKbsX26oSysvgrRswa/RYOHXAkwXDbB4jaeKq6PsJLSPkzJ2KzQ061gtBnk0vNHfA==

-"@swc/core-linux-arm-gnueabihf@1.15.32":
-  version "1.15.32"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.32.tgz#70e70ad6ad961055f4a9be9e4947e455c18239e6"
-  integrity sha512-oOoxLweljlc0A4X8ybsgxV7cVaYTwBOg2iMDJcFR3Sr48C+lsv9VzSmqdK/IVIXF4W4GjLc3VqTAdSMXlfVLuQ==
+"@swc/core-linux-arm-gnueabihf@1.15.33":
+  version "1.15.33"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.33.tgz#b7577a825b59d98b6a9a5c991d842046efe1c34a"
+  integrity sha512-C64hBnBxq4viOPQ8hlx+2lJ23bzZBGnjw7ryALmS+0Q3zHmwO8lw1/DArLENw4Q18/0w5wdEO1k3m1wWNtKGqQ==

-"@swc/core-linux-arm64-gnu@1.15.32":
-  version "1.15.32"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.32.tgz#7b82e2cc5995e8f919e29f6ce702285f5f1c3ad1"
-  integrity sha512-oDzEkdl6D6BAWdMtU5KGO7y3HR5fJcvByNLyEk9+ugj8nP5Ovb7P4kBcStBXc4MPExFGQryehiINMlmY8HlclA==
+"@swc/core-linux-arm64-gnu@1.15.33":
+  version "1.15.33"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.33.tgz#304c48321494a18c67b2913c273b08674ee70d8c"
+  integrity sha512-TRJfnJbX3jqpxRDRoieMzRiCBS5jOmXNb3iQXmcgjFEHKLnAgK1RZRU8Cq1MsPqO4jAJp/ld1G4O3fXuxv85uw==

-"@swc/core-linux-arm64-musl@1.15.32":
-  version "1.15.32"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.32.tgz#16c581b9f859b0175a8bab5cbf694bef7dbf95b8"
-  integrity sha512-omcqjoZP/b8D8PuczVoRwJieC6ibj7qIxTftNYokz4/aSmKFHvsd7nIFfPk5ZvtzncbH4AY7+Dkr/Lp2gWxYeA==
+"@swc/core-linux-arm64-musl@1.15.33":
+  version "1.15.33"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.33.tgz#d116cbc04ccb4f4ee810da6bca79d4423605dbcd"
+  integrity sha512-il7tYM+CpUNzieQbwAjFT1P8zqAhmGWNAGhQZBnxurXZ0aNn+5nqYFTEUKNZl7QibtT0uQXzTZrNGHCIj6Y1Og==

-"@swc/core-linux-ppc64-gnu@1.15.32":
-  version "1.15.32"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-ppc64-gnu/-/core-linux-ppc64-gnu-1.15.32.tgz#420f7744dae327c8e4917c87ced5c1b3e0a38f96"
-  integrity sha512-KGkTMyz/Tbn3PBNu0AVZ4GTDFKnICrYcTiNPZq8DrvK42pnFsf3GNDrIG9E5AtQlTmC0YigkWKmu0eMcfTrmgA==
+"@swc/core-linux-ppc64-gnu@1.15.33":
+  version "1.15.33"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-ppc64-gnu/-/core-linux-ppc64-gnu-1.15.33.tgz#f5354dba36db9414305bab344c817d57b8b457c2"
+  integrity sha512-ZtNBwN0Z7CFj9Il0FcPaKdjgP7URyKu/3RfH46vq+0paOBqLj4NYldD6Qo//Duif/7IOtAraUfDOmp0PLAufog==

-"@swc/core-linux-s390x-gnu@1.15.32":
-  version "1.15.32"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-s390x-gnu/-/core-linux-s390x-gnu-1.15.32.tgz#9b563a3a73c544f29454e53894bfe533b9a27ffe"
-  integrity sha512-G3Aa4tVS/3OGZBkoNIwUF9F6RAy+Osb4GOlo62SinLmDiErz/ykmM7KH0wkz6l9kM8jJq1HyAM6atJTUEbBk7g==
+"@swc/core-linux-s390x-gnu@1.15.33":
+  version "1.15.33"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-s390x-gnu/-/core-linux-s390x-gnu-1.15.33.tgz#016df9f4c9d7fd65b85ca9c558c5aec341f06da0"
+  integrity sha512-De1IyajoOmhOYYjw/lx66bKlyDpHZTueqwpDrWgf5O7T6d1ODeJJO9/OqMBmrBQc5C+dNnlmIufHsp4QVCWufA==

-"@swc/core-linux-x64-gnu@1.15.32":
-  version "1.15.32"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.32.tgz#615c7bcc1890379dffcc74b6780e2277e65f4b61"
-  integrity sha512-ERsjfGcj6CBmj3vJnGDO8m8rTvw6RqMcWo1dogOtNx3/+/0+NNpJiXDobJrr1GwInI/BHAEkvSFIH6d2LqPcUQ==
+"@swc/core-linux-x64-gnu@1.15.33":
+  version "1.15.33"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.33.tgz#49f36558ede072e71999aa37f123367daed2a662"
+  integrity sha512-mGTH0YxmUN+x6vRN/I6NOk5X0ogNktkwPnJ94IMvR7QjhRDwL0O8RXEDhyUM0YtwWrryBOqaJQBX4zruxEPRGw==

-"@swc/core-linux-x64-musl@1.15.32":
-  version "1.15.32"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.32.tgz#038604d25bdebb1d1ad780d827a44654fa4b5bdd"
-  integrity sha512-N4Ggahe/8SUbTX50P6EdhbW9YWcgbZVb52R4cq6MK+zsoMjRq7rGvV5ztA05QnbaCYqMYx8rTY7KAIA3Crdo4Q==
+"@swc/core-linux-x64-musl@1.15.33":
+  version "1.15.33"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.33.tgz#b096665f5cfeee2612325f301da5c1590b10d8f3"
+  integrity sha512-hj628ZkSEJf6zMf5VMbYrG2O6QqyTIp2qwY6VlCjvIa9lAEZ5c2lfPblCLVGYubTeLJDxadLB/CxqQYOQABeEQ==

-"@swc/core-win32-arm64-msvc@1.15.32":
-  version "1.15.32"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.32.tgz#c82006e6ef92a998e96d2160b1657f5334af4d54"
-  integrity sha512-01yN0o9jvo8xBTP12aPK2wW8b41jmOlGbDDlAnoynotc4pO6xA0zby9f1z6j++qXDpGBttLySq1omgVrlQKYcw==
+"@swc/core-win32-arm64-msvc@1.15.33":
+  version "1.15.33"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.33.tgz#f3101263a0dbaa173ec47638c9719d0b89838bd2"
+  integrity sha512-GV2oohtN2/5+KSccl86VULu3aT+LrISC8uzgSq0FRnikpD+Zwc+sBlXmoKQ+Db6jI57ITUOIB8jRkdGMABC29g==

-"@swc/core-win32-ia32-msvc@1.15.32":
-  version "1.15.32"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.32.tgz#e2ae1c95bd6599322bc6e9a82685b7537a193f7b"
-  integrity sha512-fLagI9XZYNpTcmlqAcp3KBtmj7E19WCmYD80Jxj1Kn5tGNa7yxNLd3NNdWxuZGUPl5iC0/KqZru7g08gF6Fsrw==
+"@swc/core-win32-ia32-msvc@1.15.33":
+  version "1.15.33"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.33.tgz#eb981ef5613d42c9220559bdb0c8bc58cf6c3eb9"
+  integrity sha512-gtyvzSNR8DHKfFEA2uqb8Ld1myqi6uEg2jyeUq3ikn5ytYs7H8RpZYC8mdy4NXr8hfcdJfCLXPlYaqqfBXpoEQ==

-"@swc/core-win32-x64-msvc@1.15.32":
-  version "1.15.32"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.32.tgz#2535c791821054072a511dee0d13e5de9c5cd29b"
-  integrity sha512-gbc2bQ/T2CiR+w0OvcVKwLOFAcPZBvmWmolbwpg1E8UrpeC03DGtyMUApOHNXNYWA3SHFrYXCQtosrcMza1YFg==
+"@swc/core-win32-x64-msvc@1.15.33":
+  version "1.15.33"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.33.tgz#a2fed9956933027ceb368857bac4bb4ee203d47c"
+  integrity sha512-d6fRqQSkJI+kmMEBWaDQ7TMl8+YjLYbwRUPZQ9DY0ORBJeTzOrG0twvfvlZ2xgw6jA0ScQKgfBm4vHLSLl5Hqg==

-"@swc/core@^1.15.32", "@swc/core@^1.7.39":
-  version "1.15.32"
-  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.15.32.tgz#2333d66f4b8e7c4fded087ead13c135ff84ab9d6"
-  integrity sha512-/eWL0n43D64QWEUHLtTE+jDqjkJhyidjkDhv6f0uJohOUAhywxQ9wXYp845DNNds0JpCdI4Uo0a9bl+vbXf+ew==
+"@swc/core@^1.15.33", "@swc/core@^1.7.39":
+  version "1.15.33"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.15.33.tgz#2a6571c8aca961925f14beae52b3f43c18370fc6"
+  integrity sha512-jOlwnFV2xhuuZeAUILGFULeR6vDPfijEJ57evfocwznQldLU3w2cZ9bSDryY9ip+AsM3r1NJKzf47V2NXebkeQ==
  dependencies:
    "@swc/counter" "^0.1.3"
    "@swc/types" "^0.1.26"
  optionalDependencies:
-    "@swc/core-darwin-arm64" "1.15.32"
-    "@swc/core-darwin-x64" "1.15.32"
-    "@swc/core-linux-arm-gnueabihf" "1.15.32"
-    "@swc/core-linux-arm64-gnu" "1.15.32"
-    "@swc/core-linux-arm64-musl" "1.15.32"
-    "@swc/core-linux-ppc64-gnu" "1.15.32"
-    "@swc/core-linux-s390x-gnu" "1.15.32"
-    "@swc/core-linux-x64-gnu" "1.15.32"
-    "@swc/core-linux-x64-musl" "1.15.32"
-    "@swc/core-win32-arm64-msvc" "1.15.32"
-    "@swc/core-win32-ia32-msvc" "1.15.32"
-    "@swc/core-win32-x64-msvc" "1.15.32"
+    "@swc/core-darwin-arm64" "1.15.33"
+    "@swc/core-darwin-x64" "1.15.33"
+    "@swc/core-linux-arm-gnueabihf" "1.15.33"
+    "@swc/core-linux-arm64-gnu" "1.15.33"
+    "@swc/core-linux-arm64-musl" "1.15.33"
+    "@swc/core-linux-ppc64-gnu" "1.15.33"
+    "@swc/core-linux-s390x-gnu" "1.15.33"
+    "@swc/core-linux-x64-gnu" "1.15.33"
+    "@swc/core-linux-x64-musl" "1.15.33"
+    "@swc/core-win32-arm64-msvc" "1.15.33"
+    "@swc/core-win32-ia32-msvc" "1.15.33"
+    "@swc/core-win32-x64-msvc" "1.15.33"

 "@swc/counter@^0.1.3":
  version "0.1.3"
@@ -5794,10 +5794,10 @@ base64-js@^1.3.1, base64-js@^1.5.1:
  resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==

-baseline-browser-mapping@^2.10.24, baseline-browser-mapping@^2.9.0, baseline-browser-mapping@^2.9.19:
-  version "2.10.24"
-  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.24.tgz#6dc320c7bf53859ec2bf55d54db6d2e5c078df16"
-  integrity sha512-I2NkZOOrj2XuguvWCK6OVh9GavsNjZjK908Rq3mIBK25+GD8vPX5w2WdxVqnQ7xx3SrZJiCiZFu+/Oz50oSYSA==
+baseline-browser-mapping@^2.10.27, baseline-browser-mapping@^2.9.0, baseline-browser-mapping@^2.9.19:
+  version "2.10.27"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.27.tgz#fee941c2a0b42cdf83c6427e4c830b1d0bdab2c3"
+  integrity sha512-zEs/ufmZoUd7WftKpKyXaT6RFxpQ5Qm9xytKRHvJfxFV9DFJkZph9RvJ1LcOUi0Z1ZVijMte65JbILeV+8QQEA==

 batch@0.6.1:
  version "0.6.1"
@@ -6035,10 +6035,10 @@ caniuse-api@^3.0.0:
    lodash.memoize "^4.1.2"
    lodash.uniq "^4.5.0"

-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001702, caniuse-lite@^1.0.30001759, caniuse-lite@^1.0.30001791:
-  version "1.0.30001791"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001791.tgz#dfb93d85c40ad380c57123e72e10f3c575786b51"
-  integrity sha512-yk0l/YSrOnFZk3UROpDLQD9+kC1l4meK/wed583AXrzoarMGJcbRi2Q4RaUYbKxYAsZ8sWmaSa/DsLmdBeI1vQ==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001702, caniuse-lite@^1.0.30001759, caniuse-lite@^1.0.30001792:
+  version "1.0.30001792"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001792.tgz#ca8bb9be244835a335e2018272ce7223691873c5"
+  integrity sha512-hVLMUZFgR4JJ6ACt1uEESvQN1/dBVqPAKY0hgrV70eN3391K6juAfTjKZLKvOMsx8PxA7gsY1/tLMMTcfFLLpw==

 ccount@^2.0.0:
  version "2.0.1"
@@ -6062,12 +6062,7 @@ chalk@^4.0.0, chalk@^4.1.2:
    ansi-styles "^4.1.0"
    supports-color "^7.1.0"

-chalk@^5.0.1, chalk@^5.2.0:
-  version "5.6.0"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-5.6.0.tgz"
-  integrity sha512-46QrSQFyVSEyYAgQ22hQ+zDa60YHA4fBstHmtSApj1Y5vKtG27fWowW03jCk5KcbXEWPZUIR894aARCA/G1kfQ==
-
-chalk@^5.6.2:
+chalk@^5.0.1, chalk@^5.2.0, chalk@^5.6.2:
  version "5.6.2"
  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.6.2.tgz#b1238b6e23ea337af71c7f8a295db5af0c158aea"
  integrity sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==
@@ -7305,10 +7300,10 @@ doctrine@^2.1.0:
  dependencies:
    esutils "^2.0.2"

-docusaurus-plugin-openapi-docs@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/docusaurus-plugin-openapi-docs/-/docusaurus-plugin-openapi-docs-5.0.1.tgz#2fe62b58fc1af11e3d947edc2f0d60e04f1aa149"
-  integrity sha512-OVfoDovRdiS78DQYWmr2BjuOF2A6kVmJ43mgkQaAEZxASyHbUft4zUIhvfa7gqema6KNL9pVKejDievZdZ3wGQ==
+docusaurus-plugin-openapi-docs@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/docusaurus-plugin-openapi-docs/-/docusaurus-plugin-openapi-docs-5.0.2.tgz#f00028621deb9179065fe7d6a541256692ef941b"
+  integrity sha512-WCC2m6PpylXZfNga+ScelTG0a7jUGtbB9+AmbR9lUj93FPryTs8VHTMJ3fKtO0senJTWgOU3MDvZw0v+mE3ztA==
  dependencies:
    "@apidevtools/json-schema-ref-parser" "^15.3.3"
    "@redocly/openapi-core" "^2.25.2"
@@ -7326,10 +7321,10 @@ docusaurus-plugin-openapi-docs@^5.0.1:
    swagger2openapi "^7.0.8"
    xml-formatter "^3.6.6"

-docusaurus-theme-openapi-docs@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/docusaurus-theme-openapi-docs/-/docusaurus-theme-openapi-docs-5.0.1.tgz#a2c2c91346b6238f6d7862752cdb02611fb5396f"
-  integrity sha512-bVeb7hOqog9LKVrJzYXdNJ7/0N22lk0VE22QK+naAn5GuAvYo41JmpXW9hqLIPkEp2UbexTHoPW9SYVdUsyvvw==
+docusaurus-theme-openapi-docs@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/docusaurus-theme-openapi-docs/-/docusaurus-theme-openapi-docs-5.0.2.tgz#2ab6f6b04fc2e494e24971d31432a9187c84a2fe"
+  integrity sha512-BD6WhbunR6kXqtoUUDlhxO4HlCNM2nYENGr/TbiTEknkgXYKQz+FEIhY4Hyz5GSLpuhPih0CDuNl7Xkfpcz0Yw==
  dependencies:
    "@hookform/error-message" "^2.0.1"
    "@reduxjs/toolkit" "^2.8.2"
@@ -8474,10 +8469,10 @@ globals@^15.14.0:
  resolved "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz"
  integrity sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==

-globals@^17.5.0:
-  version "17.5.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-17.5.0.tgz#a82c641d898f8dfbe0e81f66fdff7d0de43f88c6"
-  integrity sha512-qoV+HK2yFl/366t2/Cb3+xxPUo5BuMynomoDmiaZBIdbs+0pYbjfZU+twLhGKp4uCZ/+NbtpVepH5bGCxRyy2g==
+globals@^17.6.0:
+  version "17.6.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-17.6.0.tgz#0f0be018d5cca8690e6375ead1f65c4bb96191fc"
+  integrity sha512-sepffkT8stwnIYbsMBpoCHJuJM5l98FUF2AnE07hfvE0m/qp3R586hw4jF4uadbhvg1ooIdzuu7CsfD2jzCaNA==

 globalthis@^1.0.4:
  version "1.0.4"
--- a/helm/superset/Chart.yaml
+++ b/helm/superset/Chart.yaml
@@ -29,7 +29,7 @@ maintainers:
  - name: craig-rueda
    email: craig@craigrueda.com
    url: https://github.com/craig-rueda
-version: 0.15.4 # See [README](https://github.com/apache/superset/blob/master/helm/superset/README.md#versioning) for version details.
+version: 0.15.5 # See [README](https://github.com/apache/superset/blob/master/helm/superset/README.md#versioning) for version details.
 dependencies:
  - name: postgresql
    version: 16.7.27
--- a/helm/superset/README.md
+++ b/helm/superset/README.md
@@ -23,7 +23,7 @@ NOTE: This file is generated by helm-docs: https://github.com/norwoodj/helm-docs

 # superset

-![Version: 0.15.4](https://img.shields.io/badge/Version-0.15.4-informational?style=flat-square)
+![Version: 0.15.5](https://img.shields.io/badge/Version-0.15.5-informational?style=flat-square)

 Apache Superset is a modern, enterprise-ready business intelligence web application

--- a/helm/superset/values.yaml
+++ b/helm/superset/values.yaml
@@ -844,6 +844,8 @@ postgresql:
    database: superset

  image:
+    registry: docker.io
+    repository: bitnamilegacy/postgresql
    tag: "14.17.0-debian-12-r3"

  ## PostgreSQL Primary parameters
@@ -918,6 +920,11 @@ redis:
      accessModes:
        - ReadWriteOnce

+  image:
+    registry: docker.io
+    repository: bitnamilegacy/redis
+    tag: 7.0.10-debian-11-r4
+
 nodeSelector: {}

 tolerations: []
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -95,7 +95,7 @@ dependencies = [
    "redis>=5.0.0, <6.0",
    "rison>=2.0.0, <3.0",
    "selenium>=4.14.0, <5.0",
-    "shillelagh[gsheetsapi]>=1.4.3, <2.0",
+    "shillelagh[gsheetsapi]>=1.4.4, <2.0",
    "sshtunnel>=0.4.0, <0.5",
    "simplejson>=3.15.0",
    "slack_sdk>=3.19.0, <4",
@@ -114,7 +114,7 @@ dependencies = [

 [project.optional-dependencies]

-athena = ["pyathena[pandas]>=2, <3"]
+athena = ["pyathena[pandas]>=2, <4"]
 aurora-data-api = ["preset-sqlalchemy-aurora-data-api>=0.2.8,<0.3"]
 bigquery = [
    "pandas-gbq>=0.19.1",
@@ -135,7 +135,7 @@ databricks = [
    "databricks-sqlalchemy==1.0.5",
 ]
 db2 = ["ibm-db-sa>0.3.8, <=0.4.0"]
-denodo = ["denodo-sqlalchemy~=1.0.6"]
+denodo = ["denodo-sqlalchemy>=1.0.6,<2.1.0"]
 dremio = ["sqlalchemy-dremio>=1.2.1, <4"]
 drill = ["sqlalchemy-drill>=1.1.4, <2"]
 druid = ["pydruid>=0.6.5,<0.7"]
@@ -145,11 +145,17 @@ solr = ["sqlalchemy-solr >= 0.2.0"]
 elasticsearch = ["elasticsearch-dbapi>=0.2.12, <0.3.0"]
 exasol = ["sqlalchemy-exasol >= 2.4.0, <3.0"]
 excel = ["xlrd>=1.2.0, <1.3"]
-fastmcp = ["fastmcp>=3.2.4,<4.0"]
+fastmcp = [
+    "fastmcp>=3.2.4,<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.7.0,<1.0",
+]
 firebird = ["sqlalchemy-firebird>=0.7.0, <0.8"]
 firebolt = ["firebolt-sqlalchemy>=1.0.0, <2"]
 gevent = ["gevent>=23.9.1"]
-gsheets = ["shillelagh[gsheetsapi]>=1.4.3, <2"]
+gsheets = ["shillelagh[gsheetsapi]>=1.4.4, <2"]
 hana = ["hdbcli==2.4.162", "sqlalchemy_hana==0.4.0"]
 hive = [
    "pyhive[hive]>=0.6.5;python_version<'3.11'",
@@ -158,7 +164,7 @@ hive = [
    "thrift>=0.14.1, <1.0.0",
    "thrift_sasl>=0.4.3, < 1.0.0",
 ]
-impala = ["impyla>0.16.2, <0.17"]
+impala = ["impyla>0.16.2, <0.23"]
 kusto = ["sqlalchemy-kusto>=3.0.0, <4"]
 kylin = ["kylinpy>=2.8.1, <2.9"]
 mssql = ["pymssql>=2.2.8, <3"]
@@ -171,7 +177,7 @@ ocient = [
    "shapely",
    "geojson",
 ]
-oracle = ["cx-Oracle>8.0.0, <8.1"]
+oracle = ["cx-Oracle>8.0.0, <8.4"]
 parseable = ["sqlalchemy-parseable>=0.1.3,<0.2.0"]
 pinot = ["pinotdb>=5.0.0, <6.0.0"]
 playwright = ["playwright>=1.37.0, <2"]
@@ -181,7 +187,7 @@ trino = ["trino>=0.328.0"]
 prophet = ["prophet>=1.1.6, <2"]
 redshift = ["sqlalchemy-redshift>=0.8.1, <0.9"]
 risingwave = ["sqlalchemy-risingwave"]
-shillelagh = ["shillelagh[all]>=1.4.3, <2"]
+shillelagh = ["shillelagh[all]>=1.4.4, <2"]
 singlestore = ["sqlalchemy-singlestoredb>=1.1.1, <2"]
 snowflake = ["snowflake-sqlalchemy>=1.2.4, <2"]
 sqlite = ["syntaqlite>=0.1.0"]
@@ -197,7 +203,7 @@ tdengine = [
 ]
 teradata = ["teradatasql>=16.20.0.23"]
 thumbnails = [] # deprecated, will be removed in 7.0
-vertica = ["sqlalchemy-vertica-python>=0.5.9, < 0.6"]
+vertica = ["sqlalchemy-vertica-python>= 0.5.9, < 0.7"]
 netezza = ["nzalchemy>=11.0.2"]
 starrocks = ["starrocks>=1.0.0"]
 doris = ["pydoris>=1.0.0, <2.0.0"]
@@ -288,6 +294,7 @@ module = [
    "superset.tags.filters",
    "superset.commands.security.update",
    "superset.commands.security.create",
+    "superset.semantic_layers.api",
 ]
 warn_unused_ignores = false

@@ -376,6 +383,7 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"

 [tool.ruff.lint.per-file-ignores]
 "superset/mcp_service/app.py" = ["S608", "E501"]  # LLM instruction text: SQL examples (S608) and long lines in multiline string (E501)
+"superset/mcp_service/*/tool/list_*.py" = ["E501"]  # LLM docstring examples show full request shapes which exceed line length
 "scripts/*" = ["TID251"]
 "setup.py" = ["TID251"]
 "superset/config.py" = ["TID251"]
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -183,7 +183,9 @@ idna==3.10
    #   trio
    #   url-normalize
 isodate==0.7.2
-    # via apache-superset (pyproject.toml)
+    # via
+    #   apache-superset (pyproject.toml)
+    #   apache-superset-core
 itsdangerous==2.2.0
    # via
    #   flask
@@ -296,6 +298,7 @@ pyarrow==20.0.0
    # via
    #   -r requirements/base.in
    #   apache-superset (pyproject.toml)
+    #   apache-superset-core
 pyasn1==0.6.3
    # via
    #   pyasn1-modules
@@ -381,7 +384,7 @@ selenium==4.32.0
    # via apache-superset (pyproject.toml)
 setuptools==80.9.0
    # via -r requirements/base.in
-shillelagh==1.4.3
+shillelagh==1.4.4
    # via apache-superset (pyproject.toml)
 simplejson==3.20.1
    # via apache-superset (pyproject.toml)
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -442,6 +442,7 @@ isodate==0.7.2
    # via
    #   -c requirements/base-constraint.txt
    #   apache-superset
+    #   apache-superset-core
 isort==6.0.1
    # via pylint
 itsdangerous==2.2.0
@@ -715,6 +716,7 @@ pyarrow==20.0.0
    # via
    #   -c requirements/base-constraint.txt
    #   apache-superset
+    #   apache-superset-core
    #   db-dtypes
    #   pandas-gbq
 pyasn1==0.6.3
@@ -866,6 +868,8 @@ referencing==0.36.2
    #   jsonschema
    #   jsonschema-path
    #   jsonschema-specifications
+regex==2026.4.4
+    # via tiktoken
 requests==2.33.0
    # via
    #   -c requirements/base-constraint.txt
@@ -878,6 +882,7 @@ requests==2.33.0
    #   requests-cache
    #   requests-oauthlib
    #   shillelagh
+    #   tiktoken
    #   trino
 requests-cache==1.2.1
    # via
@@ -931,7 +936,7 @@ setuptools==80.9.0
    #   pydata-google-auth
    #   zope-event
    #   zope-interface
-shillelagh==1.4.3
+shillelagh==1.4.4
    # via
    #   -c requirements/base-constraint.txt
    #   apache-superset
@@ -1003,6 +1008,8 @@ tabulate==0.9.0
    # via
    #   -c requirements/base-constraint.txt
    #   apache-superset
+tiktoken==0.12.0
+    # via apache-superset
 tomli-w==1.2.0
    # via apache-superset-extensions-cli
 tomlkit==0.13.3
--- a/superset-core/pyproject.toml
+++ b/superset-core/pyproject.toml
@@ -43,6 +43,8 @@ classifiers = [
 ]
 dependencies = [
    "flask-appbuilder>=5.0.2,<6",
+    "isodate>=0.7.0",
+    "pyarrow>=16.0.0",
    "pydantic>=2.8.0",
    "sqlalchemy>=1.4.0,<2.0",
    "sqlalchemy-utils>=0.38.0, <0.43", # expanding lowerbound to work with pydoris
--- a/superset-core/src/superset_core/semantic_layers/config.py
+++ b/superset-core/src/superset_core/semantic_layers/config.py
@@ -0,0 +1,73 @@
+# 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.
+
+from __future__ import annotations
+
+from typing import Any
+
+from pydantic import BaseModel
+
+
+def build_configuration_schema(
+    config_class: type[BaseModel],
+    configuration: BaseModel | None = None,
+) -> dict[str, Any]:
+    """
+    Build a JSON schema from a Pydantic configuration class.
+
+    Handles generic boilerplate that any semantic layer with dynamic fields needs:
+
+    - Reorders properties to match model field order (Pydantic sorts alphabetically)
+    - When ``configuration`` is None, sets ``enum: []`` on all ``x-dynamic`` properties
+      so the frontend renders them as empty dropdowns
+
+    Semantic layer implementations call this instead of
+    ``model_json_schema()`` directly,
+    then only need to add their own dynamic population logic.
+    """
+    schema = config_class.model_json_schema()
+
+    # Pydantic sorts properties alphabetically; restore model field order
+    field_order = [
+        field.alias or name for name, field in config_class.model_fields.items()
+    ]
+    schema["properties"] = {
+        key: schema["properties"][key]
+        for key in field_order
+        if key in schema["properties"]
+    }
+
+    if configuration is None:
+        for prop_schema in schema["properties"].values():
+            if prop_schema.get("x-dynamic"):
+                prop_schema["enum"] = []
+
+    return schema
+
+
+def check_dependencies(
+    prop_schema: dict[str, Any],
+    configuration: BaseModel,
+) -> bool:
+    """
+    Check whether a dynamic property's dependencies are satisfied.
+
+    Reads the ``x-dependsOn`` list from the property schema and returns ``True``
+    when every referenced attribute on ``configuration`` is truthy.
+    """
+    dependencies = prop_schema.get("x-dependsOn", [])
+    return all(getattr(configuration, dep, None) for dep in dependencies)
--- a/superset-core/src/superset_core/semantic_layers/daos.py
+++ b/superset-core/src/superset_core/semantic_layers/daos.py
@@ -0,0 +1,169 @@
+# 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 DAO interfaces for superset-core.
+
+Provides abstract DAO classes for semantic layers and views that define the
+interface contract. Host implementations replace these with concrete classes
+backed by SQLAlchemy during initialization.
+
+Usage:
+    from superset_core.semantic_layers.daos import (
+        AbstractSemanticLayerDAO,
+        AbstractSemanticViewDAO,
+    )
+"""
+
+from __future__ import annotations
+
+from abc import abstractmethod
+from typing import Any, ClassVar
+
+from superset_core.common.daos import BaseDAO
+from superset_core.semantic_layers.models import SemanticLayerModel, SemanticViewModel
+
+
+class AbstractSemanticLayerDAO(BaseDAO[SemanticLayerModel]):
+    """
+    Abstract DAO interface for SemanticLayer.
+
+    Host implementations will replace this class during initialization
+    with a concrete DAO providing actual database access.
+    """
+
+    model_cls: ClassVar[type[Any] | None] = None
+    base_filter = None
+    id_column_name = "uuid"
+    uuid_column_name = "uuid"
+
+    @classmethod
+    @abstractmethod
+    def validate_uniqueness(cls, name: str) -> bool:
+        """
+        Validate that a semantic layer name is unique.
+
+        :param name: Semantic layer name to validate
+        :return: True if the name is unique, False otherwise
+        """
+        ...
+
+    @classmethod
+    @abstractmethod
+    def validate_update_uniqueness(cls, layer_uuid: str, name: str) -> bool:
+        """
+        Validate that a semantic layer name is unique for an update operation,
+        excluding the layer being updated.
+
+        :param layer_uuid: UUID of the semantic layer being updated
+        :param name: New name to validate
+        :return: True if the name is unique, False otherwise
+        """
+        ...
+
+    @classmethod
+    @abstractmethod
+    def find_by_name(cls, name: str) -> SemanticLayerModel | None:
+        """
+        Find a semantic layer by name.
+
+        :param name: Semantic layer name
+        :return: SemanticLayerModel instance or None
+        """
+        ...
+
+    @classmethod
+    @abstractmethod
+    def get_semantic_views(cls, layer_uuid: str) -> list[SemanticViewModel]:
+        """
+        Get all semantic views associated with a semantic layer.
+
+        :param layer_uuid: UUID of the semantic layer
+        :return: List of SemanticViewModel instances
+        """
+        ...
+
+
+class AbstractSemanticViewDAO(BaseDAO[SemanticViewModel]):
+    """
+    Abstract DAO interface for SemanticView.
+
+    Host implementations will replace this class during initialization
+    with a concrete DAO providing actual database access.
+    """
+
+    model_cls: ClassVar[type[Any] | None] = None
+    base_filter = None
+    id_column_name = "id"
+    uuid_column_name = "uuid"
+
+    @classmethod
+    @abstractmethod
+    def validate_uniqueness(
+        cls,
+        name: str,
+        layer_uuid: str,
+        configuration: dict[str, Any],
+    ) -> bool:
+        """
+        Validate that a semantic view is unique within a semantic layer.
+
+        Uniqueness is determined by the combination of name, layer UUID, and
+        configuration.
+
+        :param name: View name
+        :param layer_uuid: UUID of the parent semantic layer
+        :param configuration: Configuration dict to compare
+        :return: True if unique, False otherwise
+        """
+        ...
+
+    @classmethod
+    @abstractmethod
+    def validate_update_uniqueness(
+        cls,
+        view_uuid: str,
+        name: str,
+        layer_uuid: str,
+        configuration: dict[str, Any],
+    ) -> bool:
+        """
+        Validate that a semantic view is unique within a semantic layer for an
+        update operation, excluding the view being updated.
+
+        :param view_uuid: UUID of the view being updated
+        :param name: New name to validate
+        :param layer_uuid: UUID of the parent semantic layer
+        :param configuration: Configuration dict to compare
+        :return: True if unique, False otherwise
+        """
+        ...
+
+    @classmethod
+    @abstractmethod
+    def find_by_name(cls, name: str, layer_uuid: str) -> SemanticViewModel | None:
+        """
+        Find a semantic view by name within a semantic layer.
+
+        :param name: View name
+        :param layer_uuid: UUID of the parent semantic layer
+        :return: SemanticViewModel instance or None
+        """
+        ...
+
+
+__all__ = ["AbstractSemanticLayerDAO", "AbstractSemanticViewDAO"]
--- a/superset-core/src/superset_core/semantic_layers/decorators.py
+++ b/superset-core/src/superset_core/semantic_layers/decorators.py
@@ -0,0 +1,102 @@
+# 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 registration decorator for Superset.
+
+This module provides a decorator interface to register semantic layer
+implementations with the host application, enabling automatic discovery
+by the extensions framework.
+
+Usage:
+    from superset_core.semantic_layers.decorators import semantic_layer
+
+    @semantic_layer(
+        id="snowflake",
+        name="Snowflake Cortex",
+        description="Snowflake semantic layer via Cortex Analyst",
+    )
+    class SnowflakeSemanticLayer(SemanticLayer[SnowflakeConfig, SnowflakeView]):
+        ...
+
+    # Or with minimal arguments:
+    @semantic_layer(id="dbt", name="dbt Semantic Layer")
+    class DbtSemanticLayer(SemanticLayer[DbtConfig, DbtView]):
+        ...
+"""
+
+from __future__ import annotations
+
+from typing import Callable, TypeVar
+
+# Type variable for decorated semantic layer classes
+T = TypeVar("T")
+
+
+def semantic_layer(
+    id: str,
+    name: str,
+    description: str | None = None,
+) -> Callable[[T], T]:
+    """
+    Decorator to register a semantic layer implementation.
+
+    Automatically detects extension context and applies appropriate
+    namespacing to prevent ID conflicts between host and extension
+    semantic layers.
+
+    Host implementations will replace this function during initialization
+    with a concrete implementation providing actual functionality.
+
+    Args:
+        id: Unique semantic layer type identifier (e.g., "snowflake",
+            "dbt"). Used as the key in the semantic layers registry and
+            stored in the ``type`` column of the ``SemanticLayer`` model.
+        name: Human-readable display name (e.g., "Snowflake Cortex").
+            Shown in the UI when listing available semantic layer types.
+        description: Optional description for documentation and UI
+            tooltips.
+
+    Returns:
+        Decorated semantic layer class registered with the host
+        application.
+
+    Raises:
+        NotImplementedError: If called before host implementation is
+            initialized.
+
+    Example:
+        from superset_core.semantic_layers.decorators import semantic_layer
+        from superset_core.semantic_layers.layer import SemanticLayer
+
+        @semantic_layer(
+            id="snowflake",
+            name="Snowflake Cortex",
+            description="Connect to Snowflake Cortex Analyst",
+        )
+        class SnowflakeSemanticLayer(
+            SemanticLayer[SnowflakeConfig, SnowflakeView]
+        ):
+            ...
+    """
+    raise NotImplementedError(
+        "Semantic layer decorator not initialized. "
+        "This decorator should be replaced during Superset startup."
+    )
+
+
+__all__ = ["semantic_layer"]
--- a/superset-core/src/superset_core/semantic_layers/layer.py
+++ b/superset-core/src/superset_core/semantic_layers/layer.py
@@ -0,0 +1,129 @@
+# 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.
+
+from __future__ import annotations
+
+from abc import ABC, abstractmethod
+from typing import Any, Generic, TypeVar
+
+from pydantic import BaseModel
+from superset_core.semantic_layers.view import SemanticView
+
+ConfigT = TypeVar("ConfigT", bound=BaseModel)
+SemanticViewT = TypeVar("SemanticViewT", bound="SemanticView")
+
+
+class SemanticLayer(ABC, Generic[ConfigT, SemanticViewT]):
+    """
+    Abstract base class for semantic layers.
+    """
+
+    configuration_class: type[BaseModel]
+
+    @classmethod
+    @abstractmethod
+    def from_configuration(
+        cls,
+        configuration: dict[str, Any],
+    ) -> SemanticLayer[ConfigT, SemanticViewT]:
+        """
+        Create a semantic layer from its configuration.
+        """
+        raise NotImplementedError(
+            "Semantic layers must implement the from_configuration method"
+        )
+
+    @classmethod
+    @abstractmethod
+    def get_configuration_schema(
+        cls,
+        configuration: ConfigT | None = None,
+    ) -> dict[str, Any]:
+        """
+        Get the JSON schema for the configuration needed to add the semantic layer.
+
+        A partial configuration `configuration` can be sent to improve the schema,
+        allowing for progressive validation and better UX. For example, a semantic
+        layer might require:
+
+            - auth information
+            - a database
+
+        If the user provides the auth information, a client can send the partial
+        configuration to this method, and the resulting JSON schema would include
+        the list of databases the user has access to, allowing a dropdown to be
+        populated.
+
+        The Snowflake semantic layer has an example implementation of this method, where
+        database and schema names are populated based on the provided connection info.
+        """
+        raise NotImplementedError(
+            "Semantic layers must implement the get_configuration_schema method"
+        )
+
+    @classmethod
+    @abstractmethod
+    def get_runtime_schema(
+        cls,
+        configuration: ConfigT,
+        runtime_data: dict[str, Any] | None = None,
+    ) -> dict[str, Any]:
+        """
+        Get the JSON schema for the runtime parameters needed to load semantic views.
+
+        This returns the schema needed to connect to a semantic view given the
+        configuration for the semantic layer. For example, a semantic layer might
+        be configured by:
+
+            - auth information
+            - an optional database
+
+        If the user does not provide a database when creating the semantic layer, the
+        runtime schema would require the database name to be provided before loading any
+        semantic views. This allows users to create semantic layers that connect to a
+        specific database (or project, account, etc.), or that allow users to select it
+        at query time.
+
+        The Snowflake semantic layer has an example implementation of this method, where
+        database and schema names are required if they were not provided in the initial
+        configuration.
+        """
+        raise NotImplementedError(
+            "Semantic layers must implement the get_runtime_schema method"
+        )
+
+    @abstractmethod
+    def get_semantic_views(
+        self,
+        runtime_configuration: dict[str, Any],
+    ) -> set[SemanticViewT]:
+        """
+        Get the semantic views available in the semantic layer.
+
+        The runtime configuration can provide information like a given project or
+        schema, used to restrict the semantic views returned.
+        """
+
+    @abstractmethod
+    def get_semantic_view(
+        self,
+        name: str,
+        additional_configuration: dict[str, Any],
+    ) -> SemanticViewT:
+        """
+        Get a specific semantic view by its name and additional configuration.
+        """
--- a/superset-core/src/superset_core/semantic_layers/models.py
+++ b/superset-core/src/superset_core/semantic_layers/models.py
@@ -0,0 +1,85 @@
+# 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 model interfaces for superset-core.
+
+Provides abstract model classes for semantic layers and views that will be
+replaced by the host implementation's concrete SQLAlchemy models during
+initialization.
+
+Usage:
+    from superset_core.semantic_layers.models import (
+        SemanticLayerModel,
+        SemanticViewModel,
+    )
+"""
+
+from __future__ import annotations
+
+from datetime import datetime
+from uuid import UUID
+
+from superset_core.common.models import CoreModel
+
+
+class SemanticLayerModel(CoreModel):
+    """
+    Abstract interface for the SemanticLayer database model.
+
+    Host implementations will replace this class during initialization
+    with a concrete SQLAlchemy model providing actual persistence.
+    """
+
+    __abstract__ = True
+
+    # Type hints for expected column attributes
+    uuid: UUID
+    name: str
+    description: str | None
+    type: str
+    configuration: str
+    configuration_version: int
+    cache_timeout: int | None
+    created_on: datetime | None
+    changed_on: datetime | None
+
+
+class SemanticViewModel(CoreModel):
+    """
+    Abstract interface for the SemanticView database model.
+
+    Host implementations will replace this class during initialization
+    with a concrete SQLAlchemy model providing actual persistence.
+    """
+
+    __abstract__ = True
+
+    # Type hints for expected column attributes
+    id: int
+    uuid: UUID
+    name: str
+    description: str | None
+    configuration: str
+    configuration_version: int
+    cache_timeout: int | None
+    semantic_layer_uuid: UUID
+    created_on: datetime | None
+    changed_on: datetime | None
+
+
+__all__ = ["SemanticLayerModel", "SemanticViewModel"]
--- a/superset-core/src/superset_core/semantic_layers/types.py
+++ b/superset-core/src/superset_core/semantic_layers/types.py
@@ -0,0 +1,209 @@
+# 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.
+
+from __future__ import annotations
+
+import enum
+from dataclasses import dataclass
+from datetime import date, datetime, time, timedelta
+
+import isodate
+import pyarrow as pa
+
+
+@dataclass(frozen=True)
+class Grain:
+    """
+    Represents a time grain (e.g., day, month, year).
+
+    Attributes:
+        name: Human-readable name of the grain (e.g., "Second")
+        representation: ISO 8601 duration (e.g., "PT1S", "P1D", "P1M")
+    """
+
+    name: str
+    representation: str
+
+    def __post_init__(self) -> None:
+        isodate.parse_duration(self.representation)
+
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, Grain):
+            return self.representation == other.representation
+        return NotImplemented
+
+    def __hash__(self) -> int:
+        return hash(self.representation)
+
+
+class Grains:
+    """Pre-defined common grains and factory for custom ones."""
+
+    SECOND = Grain("Second", "PT1S")
+    MINUTE = Grain("Minute", "PT1M")
+    HOUR = Grain("Hour", "PT1H")
+    DAY = Grain("Day", "P1D")
+    WEEK = Grain("Week", "P1W")
+    MONTH = Grain("Month", "P1M")
+    QUARTER = Grain("Quarter", "P3M")
+    YEAR = Grain("Year", "P1Y")
+
+    _REGISTRY: dict[str, Grain] = {
+        "PT1S": SECOND,
+        "PT1M": MINUTE,
+        "PT1H": HOUR,
+        "P1D": DAY,
+        "P1W": WEEK,
+        "P1M": MONTH,
+        "P3M": QUARTER,
+        "P1Y": YEAR,
+    }
+
+    @classmethod
+    def get(cls, representation: str, name: str | None = None) -> Grain:
+        """Return a pre-defined grain or create a custom one."""
+        if grain := cls._REGISTRY.get(representation):
+            return grain
+        return Grain(name or representation, representation)
+
+
+@dataclass(frozen=True)
+class Dimension:
+    id: str
+    name: str
+    type: pa.DataType
+
+    definition: str | None = None
+    description: str | None = None
+    grain: Grain | None = None
+
+
+@dataclass(frozen=True)
+class Metric:
+    id: str
+    name: str
+    type: pa.DataType
+
+    definition: str
+    description: str | None = None
+
+
+@dataclass(frozen=True)
+class AdhocExpression:
+    id: str
+    definition: str
+
+
+class Operator(str, enum.Enum):
+    EQUALS = "="
+    NOT_EQUALS = "!="
+    GREATER_THAN = ">"
+    LESS_THAN = "<"
+    GREATER_THAN_OR_EQUAL = ">="
+    LESS_THAN_OR_EQUAL = "<="
+    IN = "IN"
+    NOT_IN = "NOT IN"
+    LIKE = "LIKE"
+    NOT_LIKE = "NOT LIKE"
+    IS_NULL = "IS NULL"
+    IS_NOT_NULL = "IS NOT NULL"
+    ADHOC = "ADHOC"
+
+
+FilterValues = str | int | float | bool | datetime | date | time | timedelta | None
+
+
+class PredicateType(enum.Enum):
+    WHERE = "WHERE"
+    HAVING = "HAVING"
+
+
+@dataclass(frozen=True, order=True)
+class Filter:
+    type: PredicateType
+    column: Dimension | Metric | None
+    operator: Operator
+    value: FilterValues | frozenset[FilterValues]
+
+
+class OrderDirection(enum.Enum):
+    ASC = "ASC"
+    DESC = "DESC"
+
+
+OrderTuple = tuple[Metric | Dimension | AdhocExpression, OrderDirection]
+
+
+@dataclass(frozen=True)
+class GroupLimit:
+    """
+    Limit query to top/bottom N combinations of specified dimensions.
+
+    The `filters` parameter allows specifying separate filter constraints for the
+    group limit subquery. This is useful when you want to determine the top N groups
+    using different criteria (e.g., a different time range) than the main query.
+
+    For example, you might want to find the top 10 products by sales over the last
+    30 days, but then show daily sales for those products over the last 7 days.
+    """
+
+    dimensions: list[Dimension]
+    top: int
+    metric: Metric | None
+    direction: OrderDirection = OrderDirection.DESC
+    group_others: bool = False
+    filters: set[Filter] | None = None
+
+
+@dataclass(frozen=True)
+class SemanticRequest:
+    """
+    Represents a request made to obtain semantic results.
+
+    This could be a SQL query, an HTTP request, etc.
+    """
+
+    type: str
+    definition: str
+
+
+@dataclass(frozen=True)
+class SemanticResult:
+    """
+    Represents the results of a semantic query.
+
+    This includes any requests (SQL queries, HTTP requests) that were performed in order
+    to obtain the results, in order to help troubleshooting.
+    """
+
+    requests: list[SemanticRequest]
+    results: pa.Table
+
+
+@dataclass(frozen=True)
+class SemanticQuery:
+    """
+    Represents a semantic query.
+    """
+
+    metrics: list[Metric]
+    dimensions: list[Dimension]
+    filters: set[Filter] | None = None
+    order: list[OrderTuple] | None = None
+    limit: int | None = None
+    offset: int | None = None
+    group_limit: GroupLimit | None = None
--- a/superset-core/src/superset_core/semantic_layers/view.py
+++ b/superset-core/src/superset_core/semantic_layers/view.py
@@ -0,0 +1,113 @@
+# 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.
+
+from __future__ import annotations
+
+import enum
+from abc import ABC, abstractmethod
+
+from superset_core.semantic_layers.types import (
+    Dimension,
+    Filter,
+    Metric,
+    SemanticQuery,
+    SemanticResult,
+)
+
+
+# TODO (betodealmeida): move to the extension JSON
+class SemanticViewFeature(enum.Enum):
+    """
+    Custom features supported by semantic layers.
+    """
+
+    ADHOC_EXPRESSIONS_IN_ORDERBY = "ADHOC_EXPRESSIONS_IN_ORDERBY"
+    GROUP_LIMIT = "GROUP_LIMIT"
+    GROUP_OTHERS = "GROUP_OTHERS"
+
+
+class SemanticView(ABC):
+    """
+    Abstract base class for semantic views.
+    """
+
+    features: frozenset[SemanticViewFeature]
+
+    # Implementations must expose a display name for the view.
+    # Declared here as a type annotation (not abstract) so that existing
+    # implementations are not required to add a formal @abstractmethod.
+    name: str
+
+    @abstractmethod
+    def uid(self) -> str:
+        """
+        Returns a unique identifier for the semantic view.
+        """
+
+    @abstractmethod
+    def get_dimensions(self) -> set[Dimension]:
+        """
+        Get the dimensions defined in the semantic view.
+        """
+
+    @abstractmethod
+    def get_metrics(self) -> set[Metric]:
+        """
+        Get the metrics defined in the semantic view.
+        """
+
+    @abstractmethod
+    def get_values(
+        self,
+        dimension: Dimension,
+        filters: set[Filter] | None = None,
+    ) -> SemanticResult:
+        """
+        Return distinct values for a dimension.
+        """
+
+    @abstractmethod
+    def get_table(self, query: SemanticQuery) -> SemanticResult:
+        """
+        Execute a semantic query and return the results.
+        """
+
+    @abstractmethod
+    def get_row_count(self, query: SemanticQuery) -> SemanticResult:
+        """
+        Execute a query and return the number of rows the result would have.
+        """
+
+    @abstractmethod
+    def get_compatible_metrics(
+        self,
+        selected_metrics: set[Metric],
+        selected_dimensions: set[Dimension],
+    ) -> set[Metric]:
+        """
+        Return metrics compatible with the selected dimensions.
+        """
+
+    @abstractmethod
+    def get_compatible_dimensions(
+        self,
+        selected_metrics: set[Metric],
+        selected_dimensions: set[Dimension],
+    ) -> set[Dimension]:
+        """
+        Return dimensions compatible with the selected metrics.
+        """
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -28,8 +28,14 @@
        "@emotion/cache": "^11.4.0",
        "@emotion/react": "^11.14.0",
        "@emotion/styled": "^11.14.1",
+        "@fontsource/fira-code": "^5.2.7",
        "@fontsource/ibm-plex-mono": "^5.2.7",
+        "@fontsource/inter": "^5.2.8",
        "@googleapis/sheets": "^13.0.1",
+        "@great-expectations/jsonforms-antd-renderers": "^2.2.10",
+        "@jsonforms/core": "^3.7.0",
+        "@jsonforms/react": "^3.7.0",
+        "@jsonforms/vanilla-renderers": "^3.7.0",
        "@luma.gl/constants": "~9.2.5",
        "@luma.gl/core": "~9.2.5",
        "@luma.gl/engine": "~9.2.5",
@@ -37,6 +43,7 @@
        "@luma.gl/shadertools": "~9.2.5",
        "@luma.gl/webgl": "~9.2.5",
        "@reduxjs/toolkit": "^1.9.3",
+        "@rjsf/antd": "^5.24.13",
        "@rjsf/core": "^5.24.13",
        "@rjsf/utils": "^5.24.3",
        "@rjsf/validator-ajv8": "^5.24.13",
@@ -108,7 +115,7 @@
        "memoize-one": "^5.2.1",
        "mousetrap": "^1.6.5",
        "mustache": "^4.2.0",
-        "nanoid": "^5.1.9",
+        "nanoid": "^5.1.11",
        "ol": "^10.9.0",
        "pretty-ms": "^9.3.0",
        "query-string": "9.3.1",
@@ -242,7 +249,7 @@
        "eslint-plugin-no-only-tests": "^3.4.0",
        "eslint-plugin-prettier": "^5.5.5",
        "eslint-plugin-react-prefer-function-component": "^5.0.0",
-        "eslint-plugin-react-you-might-not-need-an-effect": "^0.9.3",
+        "eslint-plugin-react-you-might-not-need-an-effect": "^0.10.0",
        "eslint-plugin-storybook": "^0.8.0",
        "eslint-plugin-testing-library": "^7.16.2",
        "eslint-plugin-theme-colors": "file:eslint-rules/eslint-plugin-theme-colors",
@@ -257,7 +264,7 @@
        "jest-html-reporter": "^4.4.0",
        "jest-websocket-mock": "^2.5.0",
        "js-yaml-loader": "^1.2.2",
-        "jsdom": "^29.1.0",
+        "jsdom": "^29.1.1",
        "lerna": "^9.0.4",
        "lightningcss": "^1.32.0",
        "mini-css-extract-plugin": "^2.10.2",
@@ -3913,6 +3920,15 @@
        }
      }
    },
+    "node_modules/@fontsource/fira-code": {
+      "version": "5.2.7",
+      "resolved": "https://registry.npmjs.org/@fontsource/fira-code/-/fira-code-5.2.7.tgz",
+      "integrity": "sha512-tnB9NNund9TwIym8/7DMJe573nlPEQb+fKUV5GL8TBYXjIhDvL0D7mgmNVNQUPhXp+R7RylQeiBdkA4EbOHPGQ==",
+      "license": "OFL-1.1",
+      "funding": {
+        "url": "https://github.com/sponsors/ayuhito"
+      }
+    },
    "node_modules/@fontsource/ibm-plex-mono": {
      "version": "5.2.7",
      "resolved": "https://registry.npmjs.org/@fontsource/ibm-plex-mono/-/ibm-plex-mono-5.2.7.tgz",
@@ -3927,7 +3943,6 @@
      "resolved": "https://registry.npmjs.org/@fontsource/inter/-/inter-5.2.8.tgz",
      "integrity": "sha512-P6r5WnJoKiNVV+zvW2xM13gNdFhAEpQ9dQJHt3naLvfg+LkF2ldgSLiF4T41lf1SQCM9QmkqPTn4TH568IRagg==",
      "license": "OFL-1.1",
-      "peer": true,
      "funding": {
        "url": "https://github.com/sponsors/ayuhito"
      }
@@ -3954,6 +3969,26 @@
        "node": ">=12.0.0"
      }
    },
+    "node_modules/@great-expectations/jsonforms-antd-renderers": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/@great-expectations/jsonforms-antd-renderers/-/jsonforms-antd-renderers-2.3.5.tgz",
+      "integrity": "sha512-nWJQCX6zg2mQNk+QT5SFZUkaq2SNDRO5H7zoJmNvlndd0Byoq6AaB+UTdGt/SpO1knJFe80mmiWwh99fY/go3A==",
+      "license": "MIT",
+      "dependencies": {
+        "lodash.isempty": "^4.4.0",
+        "lodash.merge": "^4.6.2",
+        "lodash.range": "^3.2.0",
+        "lodash.startcase": "^4.4.0"
+      },
+      "peerDependencies": {
+        "@ant-design/icons": "^5.3.0",
+        "@jsonforms/core": "^3.3.0",
+        "@jsonforms/react": "^3.3.0",
+        "antd": "^5.14.0",
+        "dayjs": "^1",
+        "react": "^17 || ^18"
+      }
+    },
    "node_modules/@hapi/address": {
      "version": "5.1.1",
      "resolved": "https://registry.npmjs.org/@hapi/address/-/address-5.1.1.tgz",
@@ -6324,6 +6359,45 @@
        "@jridgewell/sourcemap-codec": "^1.4.14"
      }
    },
+    "node_modules/@jsonforms/core": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/@jsonforms/core/-/core-3.7.0.tgz",
+      "integrity": "sha512-CE9viWtwi9QWLqlWLeOul1/R1GRAyOA9y6OoUpsCc0FhyR+g5p29F3k0fUExHWxL0Sf4KHcXYkfhtqfRBPS8ww==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.3",
+        "ajv": "^8.6.1",
+        "ajv-formats": "^2.1.0",
+        "lodash": "^4.17.21"
+      }
+    },
+    "node_modules/@jsonforms/react": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/@jsonforms/react/-/react-3.7.0.tgz",
+      "integrity": "sha512-HkY7qAx8vW97wPEgZ7GxCB3iiXG1c95GuObxtcDHGPBJWMwnxWBnVYJmv5h7nthrInKsQKHZL5OusnC/sj/1GQ==",
+      "license": "MIT",
+      "dependencies": {
+        "lodash": "^4.17.21"
+      },
+      "peerDependencies": {
+        "@jsonforms/core": "3.7.0",
+        "react": "^16.12.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@jsonforms/vanilla-renderers": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/@jsonforms/vanilla-renderers/-/vanilla-renderers-3.7.0.tgz",
+      "integrity": "sha512-RdXQGsheARUJVbaTe6SqGw9W4/yrm0BgUok6OKUj8krp1NF4fqXc5UbYGHFksMR/p7LCuoYHCtQzKLXEfxJbDw==",
+      "license": "MIT",
+      "dependencies": {
+        "lodash": "^4.17.21"
+      },
+      "peerDependencies": {
+        "@jsonforms/core": "3.7.0",
+        "@jsonforms/react": "3.7.0",
+        "react": "^16.12.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
    "node_modules/@jsonjoy.com/base64": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz",
@@ -9494,6 +9568,89 @@
      "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==",
      "license": "MIT"
    },
+    "node_modules/@rjsf/antd": {
+      "version": "5.24.13",
+      "resolved": "https://registry.npmjs.org/@rjsf/antd/-/antd-5.24.13.tgz",
+      "integrity": "sha512-UiWE8xoBxxCoe/SEkdQEmL5E6z3I1pw0+y0dTyGt8SHfAxxFc4/OWn7tKOAiNsKCXgf83t0JKn6CHWLD01sAdQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "classnames": "^2.5.1",
+        "lodash": "^4.17.21",
+        "lodash-es": "^4.17.21",
+        "rc-picker": "2.7.6"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@ant-design/icons": "^4.0.0 || ^5.0.0",
+        "@rjsf/core": "^5.24.x",
+        "@rjsf/utils": "^5.24.x",
+        "antd": "^4.24.0 || ^5.8.5",
+        "dayjs": "^1.8.0",
+        "react": "^16.14.0 || >=17"
+      }
+    },
+    "node_modules/@rjsf/antd/node_modules/rc-picker": {
+      "version": "2.7.6",
+      "resolved": "https://registry.npmjs.org/rc-picker/-/rc-picker-2.7.6.tgz",
+      "integrity": "sha512-H9if/BUJUZBOhPfWcPeT15JUI3/ntrG9muzERrXDkSoWmDj4yzmBvumozpxYrHwjcKnjyDGAke68d+whWwvhHA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.10.1",
+        "classnames": "^2.2.1",
+        "date-fns": "2.x",
+        "dayjs": "1.x",
+        "moment": "^2.24.0",
+        "rc-trigger": "^5.0.4",
+        "rc-util": "^5.37.0",
+        "shallowequal": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=8.x"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/@rjsf/antd/node_modules/rc-picker/node_modules/rc-trigger": {
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-5.3.4.tgz",
+      "integrity": "sha512-mQv+vas0TwKcjAO2izNPkqR4j86OemLRmvL2nOzdP9OWNWA1ivoTt5hzFqYNW9zACwmTezRiN8bttrC7cZzYSw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.18.3",
+        "classnames": "^2.2.6",
+        "rc-align": "^4.0.0",
+        "rc-motion": "^2.0.0",
+        "rc-util": "^5.19.2"
+      },
+      "engines": {
+        "node": ">=8.x"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/@rjsf/antd/node_modules/rc-picker/node_modules/rc-trigger/node_modules/rc-align": {
+      "version": "4.0.15",
+      "resolved": "https://registry.npmjs.org/rc-align/-/rc-align-4.0.15.tgz",
+      "integrity": "sha512-wqJtVH60pka/nOX7/IspElA8gjPNQKIx/ZqJ6heATCkXpe1Zg4cPVrMD2vC96wjsFFL8WsmhPbx9tdMo1qqlIA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.10.1",
+        "classnames": "2.x",
+        "dom-align": "^1.7.0",
+        "rc-util": "^5.26.0",
+        "resize-observer-polyfill": "^1.5.1"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
    "node_modules/@rjsf/core": {
      "version": "5.24.13",
      "resolved": "https://registry.npmjs.org/@rjsf/core/-/core-5.24.13.tgz",
@@ -20795,6 +20952,22 @@
        "topojson": "^1.6.19"
      }
    },
+    "node_modules/date-fns": {
+      "version": "2.30.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
+      "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.21.0"
+      },
+      "engines": {
+        "node": ">=0.11"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/date-fns"
+      }
+    },
    "node_modules/dateformat": {
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.2.tgz",
@@ -21402,6 +21575,12 @@
      "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
      "license": "MIT"
    },
+    "node_modules/dom-align": {
+      "version": "1.12.4",
+      "resolved": "https://registry.npmjs.org/dom-align/-/dom-align-1.12.4.tgz",
+      "integrity": "sha512-R8LUSEay/68zE5c8/3BDxiTEvgb4xZTF0RKmAHfiEVN3klfIpXfi2/QCoiWPccVQ0J/ZGdz9OjzL4uJEP/MRAw==",
+      "license": "MIT"
+    },
    "node_modules/dom-converter": {
      "version": "0.2.0",
      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
@@ -22693,9 +22872,9 @@
      "license": "MIT"
    },
    "node_modules/eslint-plugin-react-you-might-not-need-an-effect": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-you-might-not-need-an-effect/-/eslint-plugin-react-you-might-not-need-an-effect-0.9.3.tgz",
-      "integrity": "sha512-44cce7LndBnpDRWBTQ8p7ircIdl2rJBP5+V9Ik64E935UB47uA9ZMU1Uv160lAMhtvoPYqXBjQ+tojr5JF3mFQ==",
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-you-might-not-need-an-effect/-/eslint-plugin-react-you-might-not-need-an-effect-0.10.0.tgz",
+      "integrity": "sha512-a4pugbQc2zLiE2NZGuXdTjtMNvlP2984QFPDv71eskUYDzigLFYfBL4QjK+RnRtcboHoXRKOcQqEZKxiK6KegA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -31502,9 +31681,9 @@
      }
    },
    "node_modules/jsdom": {
-      "version": "29.1.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-29.1.0.tgz",
-      "integrity": "sha512-YNUc7fB9QuvSSQWfrH0xF+TyABkxUwx8sswgIDaCrw4Hol8BghdZDkITtZheRJeMtzWlnTfsM3bBBusRvpO1wg==",
+      "version": "29.1.1",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-29.1.1.tgz",
+      "integrity": "sha512-ECi4Fi2f7BdJtUKTflYRTiaMxIB0O6zfR1fX0GXpUrf6flp8QIYn1UT20YQqdSOfk2dfkCwS8LAFoJDEppNK5Q==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -33114,6 +33293,12 @@
      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
      "license": "MIT"
    },
+    "node_modules/lodash.isempty": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
+      "integrity": "sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg==",
+      "license": "MIT"
+    },
    "node_modules/lodash.isequal": {
      "version": "4.5.0",
      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
@@ -33145,7 +33330,18 @@
      "version": "4.6.2",
      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.range": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.range/-/lodash.range-3.2.0.tgz",
+      "integrity": "sha512-Fgkb7SinmuzqgIhNhAElo0BL/R1rHCnhwSZf78omqSwvWqD0kD2ssOAutQonDKH/ldS8BxA72ORYI09qAY9CYg==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.startcase": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz",
+      "integrity": "sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==",
      "license": "MIT"
    },
    "node_modules/lodash.uniq": {
@@ -36356,6 +36552,15 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
    "node_modules/monaco-editor": {
      "version": "0.52.2",
      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.52.2.tgz",
@@ -36498,9 +36703,9 @@
      }
    },
    "node_modules/nanoid": {
-      "version": "5.1.9",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.9.tgz",
-      "integrity": "sha512-ZUvP7KeBLe3OZ1ypw6dI/TzYJuvHP77IM4Ry73waSQTLn8/g8rpdjfyVAh7t1/+FjBtG4lCP42MEbDxOsRpBMw==",
+      "version": "5.1.11",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.11.tgz",
+      "integrity": "sha512-v+KEsUv2ps74PaSKv0gHTxTCgMXOIfBEbaqa6w6ISIGC7ZsvHN4N9oJ8d4cmf0n5oTzQz2SLmThbQWhjd/8eKg==",
      "funding": [
        {
          "type": "github",
@@ -43365,6 +43570,12 @@
      "integrity": "sha512-b6i4ZpVuUxB9h5gfCxPiusKYkqTMOjEbBs4wMaFbkfia4yFv92UKZ6Df8WXcKbn08JNL/abvg3FnMAOfakDvUw==",
      "license": "MIT"
    },
+    "node_modules/shallowequal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
+      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==",
+      "license": "MIT"
+    },
    "node_modules/shapefile": {
      "version": "0.3.1",
      "resolved": "https://registry.npmjs.org/shapefile/-/shapefile-0.3.1.tgz",
@@ -49388,7 +49599,7 @@
      "dependencies": {
        "chalk": "^5.6.2",
        "lodash-es": "^4.18.1",
-        "yeoman-generator": "^8.2.2",
+        "yeoman-generator": "^8.1.2",
        "yosay": "^3.0.0"
      },
      "devDependencies": {
@@ -50364,7 +50575,7 @@
        "classnames": "^2.5.1",
        "d3-array": "^3.2.4",
        "lodash": "^4.18.1",
-        "memoize-one": "^5.2.1",
+        "memoize-one": "^6.0.0",
        "react-table": "^7.8.0",
        "regenerator-runtime": "^0.14.1",
        "xss": "^1.0.15"
@@ -50395,6 +50606,12 @@
        "node": ">=12"
      }
    },
+    "plugins/plugin-chart-ag-grid-table/node_modules/memoize-one": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
+      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==",
+      "license": "MIT"
+    },
    "plugins/plugin-chart-cartodiagram": {
      "name": "@superset-ui/plugin-chart-cartodiagram",
      "version": "0.0.1",
@@ -50432,7 +50649,7 @@
        "acorn": "^8.16.0",
        "d3-array": "^3.2.4",
        "lodash": "^4.18.1",
-        "zod": "^4.4.1"
+        "zod": "^4.4.3"
      },
      "peerDependencies": {
        "@apache-superset/core": "*",
@@ -50676,7 +50893,7 @@
        "@deck.gl/extensions": "~9.2.9",
        "@deck.gl/geo-layers": "~9.2.5",
        "@deck.gl/layers": "~9.2.5",
-        "@deck.gl/mapbox": "~9.3.1",
+        "@deck.gl/mapbox": "^9.3.2",
        "@deck.gl/mesh-layers": "~9.2.5",
        "@luma.gl/constants": "~9.2.5",
        "@luma.gl/core": "~9.2.5",
@@ -50724,16 +50941,16 @@
      }
    },
    "plugins/preset-chart-deckgl/node_modules/@deck.gl/mapbox": {
-      "version": "9.3.1",
-      "resolved": "https://registry.npmjs.org/@deck.gl/mapbox/-/mapbox-9.3.1.tgz",
-      "integrity": "sha512-4SgpWMeZiqiZEiz9yPdr89cVRL8HFcvXLxXUA0ExhMreUdNuK/j2OIQHPhw6vp1xCFbJEEqRelQ0pJYkhGDkYw==",
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/mapbox/-/mapbox-9.3.2.tgz",
+      "integrity": "sha512-+T9pJwsOXwjUxyGN6oiBMfIs28VtDIG1V1Rqz4qqn4TjjNEFFw+xO0olJIg8FO5IAqw2OtePdsrMj0tX8tHdGQ==",
      "license": "MIT",
      "dependencies": {
        "@math.gl/web-mercator": "^4.1.0"
      },
      "peerDependencies": {
        "@deck.gl/core": "~9.3.0",
-        "@luma.gl/core": "~9.3.2",
+        "@luma.gl/core": "~9.3.3",
        "@math.gl/web-mercator": "^4.1.0"
      }
    },
--- a/superset-frontend/package.json
+++ b/superset-frontend/package.json
@@ -117,7 +117,14 @@
    "@luma.gl/gltf": "~9.2.5",
    "@luma.gl/shadertools": "~9.2.5",
    "@luma.gl/webgl": "~9.2.5",
+    "@fontsource/fira-code": "^5.2.7",
+    "@fontsource/inter": "^5.2.8",
+    "@great-expectations/jsonforms-antd-renderers": "^2.2.10",
+    "@jsonforms/core": "^3.7.0",
+    "@jsonforms/react": "^3.7.0",
+    "@jsonforms/vanilla-renderers": "^3.7.0",
    "@reduxjs/toolkit": "^1.9.3",
+    "@rjsf/antd": "^5.24.13",
    "@rjsf/core": "^5.24.13",
    "@rjsf/utils": "^5.24.3",
    "@rjsf/validator-ajv8": "^5.24.13",
@@ -189,7 +196,7 @@
    "memoize-one": "^5.2.1",
    "mousetrap": "^1.6.5",
    "mustache": "^4.2.0",
-    "nanoid": "^5.1.9",
+    "nanoid": "^5.1.11",
    "ol": "^10.9.0",
    "pretty-ms": "^9.3.0",
    "query-string": "9.3.1",
@@ -323,7 +330,7 @@
    "eslint-plugin-no-only-tests": "^3.4.0",
    "eslint-plugin-prettier": "^5.5.5",
    "eslint-plugin-react-prefer-function-component": "^5.0.0",
-    "eslint-plugin-react-you-might-not-need-an-effect": "^0.9.3",
+    "eslint-plugin-react-you-might-not-need-an-effect": "^0.10.0",
    "eslint-plugin-storybook": "^0.8.0",
    "eslint-plugin-testing-library": "^7.16.2",
    "eslint-plugin-theme-colors": "file:eslint-rules/eslint-plugin-theme-colors",
@@ -338,7 +345,7 @@
    "jest-html-reporter": "^4.4.0",
    "jest-websocket-mock": "^2.5.0",
    "js-yaml-loader": "^1.2.2",
-    "jsdom": "^29.1.0",
+    "jsdom": "^29.1.1",
    "lerna": "^9.0.4",
    "lightningcss": "^1.32.0",
    "mini-css-extract-plugin": "^2.10.2",
--- a/superset-frontend/packages/generator-superset/package.json
+++ b/superset-frontend/packages/generator-superset/package.json
@@ -30,7 +30,7 @@
  "dependencies": {
    "chalk": "^5.6.2",
    "lodash-es": "^4.18.1",
-    "yeoman-generator": "^8.2.2",
+    "yeoman-generator": "^8.1.2",
    "yosay": "^3.0.0"
  },
  "devDependencies": {
--- a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/matrixifyControls.test.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/matrixifyControls.test.ts
@@ -18,6 +18,7 @@
 */

 import { isMatrixifyVisible } from './matrixifyControls';
+import type { ControlStateMapping } from '../types';

 /**
 * Helper to build a controls object matching the shape used by
@@ -25,7 +26,7 @@ import { isMatrixifyVisible } from './matrixifyControls';
 */
 function makeControls(
  overrides: Record<string, unknown> = {},
-): Record<string, { value: unknown }> {
+): ControlStateMapping {
  const defaults: Record<string, unknown> = {
    matrixify_enable: false,
    matrixify_mode_rows: 'disabled',
@@ -36,7 +37,7 @@ function makeControls(
  const merged = { ...defaults, ...overrides };
  return Object.fromEntries(
    Object.entries(merged).map(([k, v]) => [k, { value: v }]),
-  );
+  ) as ControlStateMapping;
 }

 // ── matrixify_enable guard ──────────────────────────────────────────
--- a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/matrixifyControls.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/matrixifyControls.tsx
@@ -20,7 +20,7 @@

 import { t } from '@apache-superset/core/translation';
 import { validateNonEmpty } from '@superset-ui/core';
-import { SharedControlConfig } from '../types';
+import { ControlStateMapping, SharedControlConfig } from '../types';
 import { dndAdhocMetricControl } from './dndControls';
 import { defineSavedMetrics } from '../utils';

@@ -29,9 +29,12 @@ import { defineSavedMetrics } from '../utils';
 * Controls for transforming charts into matrix/grid layouts
 */

-// Utility function to check if matrixify controls should be visible
+// Utility function to check if matrixify controls should be visible.
+// Controls both visibility callbacks and validator injection via mapStateToProps.
+// The matrixify_enable guard prevents hidden validators from firing on
+// pre-revamp charts with stale matrixify_mode defaults (fix for #38519).
 const isMatrixifyVisible = (
-  controls: any,
+  controls: ControlStateMapping | undefined,
  axis: 'rows' | 'columns',
  mode?: 'metrics' | 'dimensions',
  selectionMode?: 'members' | 'topn' | 'all',
--- a/superset-frontend/packages/superset-ui-chart-controls/test/shared-controls/matrixifyControls.test.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/test/shared-controls/matrixifyControls.test.tsx
@@ -0,0 +1,238 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Tests for the matrixify_enable guard in isMatrixifyVisible() and
+ * validator injection via mapStateToProps on real matrixify control definitions.
+ *
+ * These are TDD tests for the fix to apache/superset#38519 regression:
+ * isMatrixifyVisible() must check matrixify_enable before evaluating mode,
+ * otherwise pre-revamp charts with stale matrixify_mode defaults trigger
+ * hidden validators that block save.
+ */
+
+import {
+  matrixifyControls,
+  isMatrixifyVisible,
+} from '../../src/shared-controls/matrixifyControls';
+import type { ControlPanelState, ControlStateMapping } from '../../src/types';
+
+// Helper: build a minimal controls object for ControlPanelState
+const buildControls = (
+  overrides: Record<string, any> = {},
+): ControlStateMapping => {
+  const controls: Record<string, { value: any }> = {};
+  Object.entries(overrides).forEach(([key, value]) => {
+    controls[key] = { value };
+  });
+  return controls as ControlStateMapping;
+};
+
+// Helper: build a minimal ControlPanelState for mapStateToProps.
+// Only provides fields that isMatrixifyVisible and mapStateToProps actually read.
+const buildState = (
+  controlValues: Record<string, any> = {},
+  formData: Record<string, any> = {},
+) =>
+  ({
+    controls: buildControls(controlValues),
+    datasource: { columns: [], type: 'table' },
+    form_data: formData,
+    common: {},
+    metadata: {},
+    slice: { slice_id: 0 },
+  }) as unknown as ControlPanelState;
+
+// ============================================================
+// Validator injection tests via real mapStateToProps (rows)
+// ============================================================
+
+// --- matrixify_dimension_rows ---
+
+test('matrixify_dimension_rows: validators empty when matrixify_enable is falsy', () => {
+  const control = matrixifyControls.matrixify_dimension_rows;
+  const state = buildState(
+    {
+      matrixify_enable: undefined,
+      matrixify_mode_rows: 'dimensions',
+      matrixify_dimension_selection_mode_rows: 'members',
+    },
+    { matrixify_mode_rows: 'dimensions' },
+  );
+
+  const result = control.mapStateToProps!(state, {} as any);
+  expect(result.validators).toEqual([]);
+});
+
+test('matrixify_dimension_rows: validators present when matrixify_enable is true', () => {
+  const control = matrixifyControls.matrixify_dimension_rows;
+  const state = buildState(
+    {
+      matrixify_enable: true,
+      matrixify_mode_rows: 'dimensions',
+      matrixify_dimension_selection_mode_rows: 'members',
+    },
+    { matrixify_mode_rows: 'dimensions' },
+  );
+
+  const result = control.mapStateToProps!(state, {} as any);
+  expect(result.validators.length).toBeGreaterThan(0);
+});
+
+// --- matrixify_topn_value_rows ---
+
+test('matrixify_topn_value_rows: validators empty when matrixify_enable is falsy', () => {
+  const control = matrixifyControls.matrixify_topn_value_rows;
+  const state = buildState(
+    {
+      matrixify_enable: undefined,
+      matrixify_mode_rows: 'dimensions',
+      matrixify_dimension_selection_mode_rows: 'topn',
+    },
+    { matrixify_mode_rows: 'dimensions' },
+  );
+
+  const result = control.mapStateToProps!(state, {} as any);
+  expect(result.validators).toEqual([]);
+});
+
+test('matrixify_topn_value_rows: validators present when matrixify_enable is true', () => {
+  const control = matrixifyControls.matrixify_topn_value_rows;
+  const state = buildState(
+    {
+      matrixify_enable: true,
+      matrixify_mode_rows: 'dimensions',
+      matrixify_dimension_selection_mode_rows: 'topn',
+    },
+    { matrixify_mode_rows: 'dimensions' },
+  );
+
+  const result = control.mapStateToProps!(state, {} as any);
+  expect(result.validators.length).toBeGreaterThan(0);
+});
+
+// --- matrixify_topn_metric_rows ---
+
+test('matrixify_topn_metric_rows: validators empty when matrixify_enable is falsy', () => {
+  const control = matrixifyControls.matrixify_topn_metric_rows;
+  const state = buildState(
+    {
+      matrixify_enable: undefined,
+      matrixify_mode_rows: 'dimensions',
+      matrixify_dimension_selection_mode_rows: 'topn',
+    },
+    { matrixify_mode_rows: 'dimensions' },
+  );
+
+  const result = control.mapStateToProps!(state, {} as any);
+  expect(result.validators).toEqual([]);
+});
+
+test('matrixify_topn_metric_rows: validators present when matrixify_enable is true', () => {
+  const control = matrixifyControls.matrixify_topn_metric_rows;
+  const state = buildState(
+    {
+      matrixify_enable: true,
+      matrixify_mode_rows: 'dimensions',
+      matrixify_dimension_selection_mode_rows: 'topn',
+    },
+    { matrixify_mode_rows: 'dimensions' },
+  );
+
+  const result = control.mapStateToProps!(state, {} as any);
+  expect(result.validators.length).toBeGreaterThan(0);
+});
+
+// ============================================================
+// Validator injection tests via real mapStateToProps (columns)
+// ============================================================
+
+test('matrixify_dimension_columns: validators empty when matrixify_enable is falsy', () => {
+  const control = matrixifyControls.matrixify_dimension_columns;
+  const state = buildState(
+    {
+      matrixify_enable: undefined,
+      matrixify_mode_columns: 'dimensions',
+      matrixify_dimension_selection_mode_columns: 'members',
+    },
+    { matrixify_mode_columns: 'dimensions' },
+  );
+
+  const result = control.mapStateToProps!(state, {} as any);
+  expect(result.validators).toEqual([]);
+});
+
+test('matrixify_dimension_columns: validators present when matrixify_enable is true', () => {
+  const control = matrixifyControls.matrixify_dimension_columns;
+  const state = buildState(
+    {
+      matrixify_enable: true,
+      matrixify_mode_columns: 'dimensions',
+      matrixify_dimension_selection_mode_columns: 'members',
+    },
+    { matrixify_mode_columns: 'dimensions' },
+  );
+
+  const result = control.mapStateToProps!(state, {} as any);
+  expect(result.validators.length).toBeGreaterThan(0);
+});
+
+// ============================================================
+// Direct isMatrixifyVisible guard tests
+// ============================================================
+
+test.each([
+  ['undefined', undefined],
+  ['null', null],
+  ['false', false],
+  ['0', 0],
+])(
+  'isMatrixifyVisible returns false when matrixify_enable is %s',
+  (_, value) => {
+    const controls = buildControls({
+      matrixify_enable: value,
+      matrixify_mode_rows: 'dimensions',
+    });
+    expect(isMatrixifyVisible(controls, 'rows')).toBe(false);
+  },
+);
+
+test('isMatrixifyVisible returns true when matrixify_enable is true and mode matches', () => {
+  const controls = buildControls({
+    matrixify_enable: true,
+    matrixify_mode_rows: 'dimensions',
+  });
+  expect(isMatrixifyVisible(controls, 'rows', 'dimensions')).toBe(true);
+});
+
+test('isMatrixifyVisible returns false when matrixify_enable is true but mode is disabled', () => {
+  const controls = buildControls({
+    matrixify_enable: true,
+    matrixify_mode_rows: 'disabled',
+  });
+  expect(isMatrixifyVisible(controls, 'rows')).toBe(false);
+});
+
+test('isMatrixifyVisible returns true when matrixify_enable is true and any non-disabled mode (no mode filter)', () => {
+  const controls = buildControls({
+    matrixify_enable: true,
+    matrixify_mode_columns: 'metrics',
+  });
+  expect(isMatrixifyVisible(controls, 'columns')).toBe(true);
+});
--- a/superset-frontend/packages/superset-ui-core/src/color/CategoricalColorScale.ts
+++ b/superset-frontend/packages/superset-ui-core/src/color/CategoricalColorScale.ts
@@ -94,11 +94,20 @@ class CategoricalColorScale extends ExtensibleFunction {

  /**
   * Increment the color range with analogous colors
+   *
+   * @param forceMinimumExpansion When true, expand at least once even if the
+   * ordinal domain is still shorter than the palette. Shared dashboard labels
+   * can resolve from the global map without entering the scale domain, so
+   * domain-based sizing alone would skip expansion while collision resolution
+   * still needs analogous colors.
   */
-  incrementColorRange() {
-    const multiple = Math.floor(
+  incrementColorRange(forceMinimumExpansion = false) {
+    const domainBasedMultiple = Math.floor(
      this.domain().length / this.originColors.length,
    );
+    const multiple = forceMinimumExpansion
+      ? Math.max(domainBasedMultiple, 1)
+      : domainBasedMultiple;
    // the domain has grown larger than the original range
    // increments the range with analogous colors
    if (multiple > this.multiple) {
@@ -144,6 +153,7 @@ class CategoricalColorScale extends ExtensibleFunction {
      if (isFeatureEnabled(FeatureFlag.UseAnalogousColors)) {
        this.incrementColorRange();
      }
+
      if (
        // feature flag to be deprecated (will become standard behaviour)
        isFeatureEnabled(FeatureFlag.AvoidColorsCollision) &&
@@ -154,6 +164,39 @@ class CategoricalColorScale extends ExtensibleFunction {
      }
    }

+    if (
+      isFeatureEnabled(FeatureFlag.AvoidColorsCollision) &&
+      source === LabelsColorMapSource.Dashboard &&
+      (forcedColor || isExistingLabel)
+    ) {
+      const colliding = [...this.chartLabelsColorMap.entries()].filter(
+        ([labelKey, c]) => c === color && labelKey !== cleanedValue,
+      );
+      if (
+        colliding.length > 0 &&
+        isFeatureEnabled(FeatureFlag.UseAnalogousColors)
+      ) {
+        this.incrementColorRange(true);
+      }
+      for (const [otherLabel] of colliding) {
+        if (
+          Object.prototype.hasOwnProperty.call(this.forcedColors, otherLabel)
+        ) {
+          continue;
+        }
+        const newColor = this.getNextAvailableColor(otherLabel, color);
+        this.chartLabelsColorMap.set(otherLabel, newColor);
+        if (sliceId) {
+          this.labelsColorMapInstance.addSlice(
+            otherLabel,
+            newColor,
+            sliceId,
+            appliedColorScheme,
+          );
+        }
+      }
+    }
+
    // keep track of values in this slice
    this.chartLabelsColorMap.set(cleanedValue, color);

--- a/superset-frontend/packages/superset-ui-core/src/components/DynamicEditableTitle/DynamicEditableTitle.regression.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/DynamicEditableTitle/DynamicEditableTitle.regression.test.tsx
@@ -70,46 +70,11 @@ test('a change event that arrives before isEditing flips is not dropped', () =>
 });

 test('prop changes mid-edit do not clobber unsaved typing', async () => {
-  // Rerender DynamicEditableTitle directly with a changed title prop so the
-  // sync effect actually runs. Going through Harness would not exercise the
-  // bug because Harness owns its own state and only reads initialTitle once.
-  const onSave = jest.fn();
-  const props = {
-    placeholder: 'placeholder',
-    canEdit: true,
-    label: 'Title',
-    onSave,
-  };
-  const { rerender } = render(<DynamicEditableTitle {...props} title="Foo" />);
+  const { rerender } = render(<Harness initialTitle="Foo" />);
  const input = screen.getByRole('textbox') as HTMLInputElement;
  userEvent.click(input);
  await userEvent.type(input, 'X', { delay: 1 });
  expect(input.value).toBe('FooX');
-  rerender(<DynamicEditableTitle {...props} title="Bar" />);
+  rerender(<Harness initialTitle="Foo" />);
  expect(input.value).toBe('FooX');
-  // Locks in commit semantics: blur after a real edit must persist the
-  // user's typed value, even when a competing parent-driven title arrived
-  // mid-edit.
-  fireEvent.blur(input);
-  expect(onSave).toHaveBeenCalledWith('FooX');
-});
-
-test('passive focus then parent-driven title change then blur does not revert', () => {
-  // Phantom-revert scenario: user clicks the input but does not type, the
-  // parent autosaves a new title from elsewhere, then the user blurs. The
-  // component must NOT call onSave with the stale local value, otherwise it
-  // would silently overwrite the parent's update.
-  const onSave = jest.fn();
-  const props = {
-    placeholder: 'placeholder',
-    canEdit: true,
-    label: 'Title',
-    onSave,
-  };
-  const { rerender } = render(<DynamicEditableTitle {...props} title="Foo" />);
-  const input = screen.getByRole('textbox') as HTMLInputElement;
-  userEvent.click(input);
-  rerender(<DynamicEditableTitle {...props} title="Bar" />);
-  fireEvent.blur(input);
-  expect(onSave).not.toHaveBeenCalled();
 });
--- a/superset-frontend/packages/superset-ui-core/src/components/DynamicEditableTitle/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/DynamicEditableTitle/index.tsx
@@ -81,25 +81,12 @@ export const DynamicEditableTitle = memo(

    const sizerRef = useRef<HTMLSpanElement>(null);
    const inputRef = useRef<InputRef>(null);
-    // Tracks whether the user has actually typed since entering edit mode.
-    // Gates onSave so that passive focus (click without typing) followed by a
-    // parent-driven title change and blur does not silently revert the
-    // parent's update with our stale currentTitle.
-    const dirtyRef = useRef(false);
    const { width: containerWidth, ref: containerRef } = useResizeDetector({
      refreshMode: 'debounce',
    });

    useEffect(() => {
-      // Don't overwrite in-flight user input when the parent re-renders with a
-      // new title prop mid-edit. handleBlur already syncs currentTitle on commit;
-      // re-running this effect when isEditing flips would resync to a stale
-      // title prop, so isEditing is intentionally read via closure rather than
-      // listed as a dep.
-      if (!isEditing) {
-        setCurrentTitle(title);
-      }
-      // eslint-disable-next-line react-hooks/exhaustive-deps
+      setCurrentTitle(title);
    }, [title]);
    useEffect(() => {
      if (isEditing) {
@@ -151,19 +138,10 @@ export const DynamicEditableTitle = memo(
        return;
      }
      const formattedTitle = currentTitle.trim();
-      // Only commit when the user actually typed. Passive focus must not
-      // overwrite a parent-driven title change that landed mid-edit.
-      if (dirtyRef.current && title !== formattedTitle) {
-        setCurrentTitle(formattedTitle);
+      setCurrentTitle(formattedTitle);
+      if (title !== formattedTitle) {
        onSave(formattedTitle);
-      } else if (!dirtyRef.current) {
-        // Drop any stale local state and resync to the latest title prop so a
-        // subsequent edit starts from the current parent value.
-        setCurrentTitle(title);
-      } else {
-        setCurrentTitle(formattedTitle);
      }
-      dirtyRef.current = false;
      setIsEditing(false);
    }, [canEdit, currentTitle, onSave, title]);

@@ -180,7 +158,6 @@ export const DynamicEditableTitle = memo(
        if (!isEditing) {
          setIsEditing(true);
        }
-        dirtyRef.current = true;
        setCurrentTitle(ev.target.value);
      },
      [canEdit, isEditing],
--- a/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/DatasetTypeLabel.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/DatasetTypeLabel.tsx
@@ -23,7 +23,7 @@ import { Label } from '..';

 // Define the prop types for DatasetTypeLabel
 interface DatasetTypeLabelProps {
-  datasetType: 'physical' | 'virtual'; // Accepts only 'physical' or 'virtual'
+  datasetType: 'physical' | 'virtual' | 'semantic_view';
 }

 const SIZE = 's'; // Define the size as a constant
@@ -32,6 +32,22 @@ export const DatasetTypeLabel: React.FC<DatasetTypeLabelProps> = ({
  datasetType,
 }) => {
  const theme = useTheme();
+  if (datasetType === 'semantic_view') {
+    return (
+      <Label
+        icon={
+          <Icons.ApartmentOutlined
+            iconSize={SIZE}
+            iconColor={theme.colorInfo}
+          />
+        }
+        type="info"
+        style={{ color: theme.colorInfo }}
+      >
+        {t('Semantic')}
+      </Label>
+    );
+  }
  const isPhysical = datasetType === 'physical';
  const label: string = isPhysical ? t('Physical') : t('Virtual');
  const labelType = isPhysical ? 'primary' : 'default';
--- a/superset-frontend/packages/superset-ui-core/src/query/DatasourceKey.ts
+++ b/superset-frontend/packages/superset-ui-core/src/query/DatasourceKey.ts
@@ -19,6 +19,15 @@

 import { DatasourceType } from './types/Datasource';

+const DATASOURCE_TYPE_MAP: Record<string, DatasourceType> = {
+  table: DatasourceType.Table,
+  query: DatasourceType.Query,
+  dataset: DatasourceType.Dataset,
+  sl_table: DatasourceType.SlTable,
+  saved_query: DatasourceType.SavedQuery,
+  semantic_view: DatasourceType.SemanticView,
+};
+
 export default class DatasourceKey {
  readonly id: number;

@@ -27,8 +36,7 @@ export default class DatasourceKey {
  constructor(key: string) {
    const [idStr, typeStr] = key.split('__');
    this.id = parseInt(idStr, 10);
-    this.type = DatasourceType.Table; // default to SqlaTable model
-    this.type = typeStr === 'query' ? DatasourceType.Query : this.type;
+    this.type = DATASOURCE_TYPE_MAP[typeStr] ?? DatasourceType.Table;
  }

  public toString() {
--- a/superset-frontend/packages/superset-ui-core/src/query/types/Datasource.ts
+++ b/superset-frontend/packages/superset-ui-core/src/query/types/Datasource.ts
@@ -26,6 +26,7 @@ export enum DatasourceType {
  Dataset = 'dataset',
  SlTable = 'sl_table',
  SavedQuery = 'saved_query',
+  SemanticView = 'semantic_view',
 }

 export interface Currency {
@@ -40,6 +41,13 @@ export interface Datasource {
  id: number;
  name: string;
  type: DatasourceType;
+  /**
+   * The parent resource that owns this datasource.
+   * For SQL-based datasets this is the database; for semantic views it is the
+   * semantic layer.  Use this field instead of the legacy `database` field when
+   * you only need the display name.
+   */
+  parent?: { name: string };
  columns: Column[];
  metrics: Metric[];
  description?: string;
--- a/superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts
+++ b/superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts
@@ -61,6 +61,7 @@ export enum FeatureFlag {
  ListviewsDefaultCardView = 'LISTVIEWS_DEFAULT_CARD_VIEW',
  Matrixify = 'MATRIXIFY',
  ScheduledQueries = 'SCHEDULED_QUERIES',
+  SemanticLayers = 'SEMANTIC_LAYERS',
  SqllabBackendPersistence = 'SQLLAB_BACKEND_PERSISTENCE',
  SqlValidatorsByEngine = 'SQL_VALIDATORS_BY_ENGINE',
  SshTunneling = 'SSH_TUNNELING',
--- a/superset-frontend/packages/superset-ui-core/test/color/CategoricalColorScale.test.ts
+++ b/superset-frontend/packages/superset-ui-core/test/color/CategoricalColorScale.test.ts
@@ -21,6 +21,7 @@ import { ScaleOrdinal } from 'd3-scale';
 import {
  CategoricalColorScale,
  FeatureFlag,
+  getLabelsColorMap,
  LabelsColorMapSource,
 } from '@superset-ui/core';

@@ -199,10 +200,42 @@ describe('CategoricalColorScale', () => {
      const returnedColor = scale.getColor(value, sliceId);
      expect(returnedColor).toBe(expectedColor);
    });
+    test('reassigns colliding colors when no sliceId is provided', () => {
+      window.featureFlags = {
+        [FeatureFlag.AvoidColorsCollision]: true,
+      };
+      const PALETTE = ['red', 'blue', 'green'];
+
+      const chartAScale = new CategoricalColorScale(PALETTE);
+      const labelsColorMap = chartAScale.labelsColorMapInstance;
+      labelsColorMap.reset();
+      labelsColorMap.source = LabelsColorMapSource.Dashboard;
+
+      try {
+        chartAScale.getColor('Trains', 101, 'testScheme');
+
+        const chartBScale = new CategoricalColorScale(PALETTE);
+        // Call getColor without sliceId (or with undefined)
+        chartBScale.getColor('Classic Cars', undefined, 'testScheme');
+        chartBScale.getColor('Trains', undefined, 'testScheme');
+
+        const classicCarsColor =
+          chartBScale.chartLabelsColorMap.get('Classic Cars');
+        const trainsColor = chartBScale.chartLabelsColorMap.get('Trains');
+
+        expect(trainsColor).toBe('red');
+        expect(classicCarsColor).toBeDefined();
+        expect(classicCarsColor).not.toBe('red');
+      } finally {
+        labelsColorMap.reset();
+        labelsColorMap.source = LabelsColorMapSource.Dashboard;
+      }
+    });
    test('conditionally calls getNextAvailableColor', () => {
      window.featureFlags = {
        [FeatureFlag.AvoidColorsCollision]: true,
      };
+      scale.labelsColorMapInstance.source = LabelsColorMapSource.Explore;

      scale.getColor('testValue1');
      scale.getColor('testValue2');
@@ -225,6 +258,27 @@ describe('CategoricalColorScale', () => {

      expect(getNextAvailableColorSpy).not.toHaveBeenCalled();
    });
+    test('reassigns non-forced labels when a dashboard-synced label would duplicate their color', () => {
+      window.featureFlags = {
+        [FeatureFlag.AvoidColorsCollision]: true,
+      };
+
+      const dashScale = new CategoricalColorScale(['red', 'blue', 'green']);
+      const sliceId = 501;
+      const colorScheme = 'preset';
+
+      dashScale.labelsColorMapInstance.source = LabelsColorMapSource.Dashboard;
+      jest
+        .spyOn(dashScale.labelsColorMapInstance, 'getColorMap')
+        .mockReturnValue(new Map([['Trains', 'red']]));
+
+      dashScale.getColor('Classic Cars', sliceId, colorScheme);
+      dashScale.getColor('Trains', sliceId, colorScheme);
+
+      expect(dashScale.chartLabelsColorMap.get('Trains')).toBe('red');
+      expect(dashScale.chartLabelsColorMap.get('Classic Cars')).not.toBe('red');
+      expect(dashScale.chartLabelsColorMap.get('Classic Cars')).toBeDefined();
+    });
  });

  describe('.setColor(value, forcedColor)', () => {
@@ -479,6 +533,131 @@ describe('CategoricalColorScale', () => {
    });
  });

+  describe('dashboard shared-dimension color collision', () => {
+    let labelsColorMap: ReturnType<typeof getLabelsColorMap>;
+
+    beforeEach(() => {
+      window.featureFlags = {
+        [FeatureFlag.AvoidColorsCollision]: true,
+      };
+      const sentinel = new CategoricalColorScale(['red', 'blue', 'green']);
+      labelsColorMap = sentinel.labelsColorMapInstance;
+      labelsColorMap.reset();
+      labelsColorMap.source = LabelsColorMapSource.Dashboard;
+    });
+
+    afterEach(() => {
+      jest.restoreAllMocks();
+      labelsColorMap.reset();
+    });
+
+    test('reproduces the bug without the fix: Classic Cars and Trains would both be red', () => {
+      window.featureFlags = {
+        [FeatureFlag.AvoidColorsCollision]: false,
+      };
+
+      const PALETTE = ['red', 'blue', 'green'];
+
+      const chartAScale = new CategoricalColorScale(PALETTE);
+      chartAScale.getColor('Trains', 101, 'testScheme');
+      expect(labelsColorMap.getColorMap().get('Trains')).toBe('red');
+
+      const chartBScale = new CategoricalColorScale(PALETTE);
+      chartBScale.getColor('Classic Cars', 102, 'testScheme');
+      chartBScale.getColor('Trains', 102, 'testScheme');
+
+      const classicCarsColor =
+        chartBScale.chartLabelsColorMap.get('Classic Cars');
+      const trainsColor = chartBScale.chartLabelsColorMap.get('Trains');
+
+      expect(trainsColor).toBe('red');
+      expect(classicCarsColor).toBe('red');
+    });
+
+    test('fix: Classic Cars is reassigned when Trains locks red from the dashboard', () => {
+      const PALETTE = ['red', 'blue', 'green'];
+
+      const chartAScale = new CategoricalColorScale(PALETTE);
+      chartAScale.getColor('Trains', 101, 'testScheme');
+      expect(labelsColorMap.getColorMap().get('Trains')).toBe('red');
+
+      const chartBScale = new CategoricalColorScale(PALETTE);
+      chartBScale.getColor('Classic Cars', 102, 'testScheme');
+      chartBScale.getColor('Trains', 102, 'testScheme');
+
+      const classicCarsColor =
+        chartBScale.chartLabelsColorMap.get('Classic Cars');
+      const trainsColor = chartBScale.chartLabelsColorMap.get('Trains');
+
+      expect(trainsColor).toBe('red');
+      expect(classicCarsColor).toBeDefined();
+      expect(classicCarsColor).not.toBe('red');
+    });
+
+    test('fix: no series in Chart B share a color when palette has enough colors', () => {
+      const PALETTE = ['red', 'blue', 'green'];
+
+      const chartAScale = new CategoricalColorScale(PALETTE);
+      chartAScale.getColor('Trains', 101, 'testScheme');
+
+      const chartBScale = new CategoricalColorScale(PALETTE);
+      chartBScale.getColor('Classic Cars', 102, 'testScheme');
+      chartBScale.getColor('Trains', 102, 'testScheme');
+
+      const colors = Array.from(chartBScale.chartLabelsColorMap.values());
+      const uniqueColors = new Set(colors);
+
+      expect(uniqueColors.size).toBe(colors.length);
+    });
+
+    test('fix: increments analogous color range for dashboard collisions when UseAnalogousColors is enabled', () => {
+      window.featureFlags = {
+        [FeatureFlag.AvoidColorsCollision]: true,
+        [FeatureFlag.UseAnalogousColors]: true,
+      };
+
+      const PALETTE = ['red', 'blue', 'green'];
+
+      const chartAScale = new CategoricalColorScale(PALETTE);
+      chartAScale.getColor('Trains', 101, 'testScheme');
+
+      const chartBScale = new CategoricalColorScale(PALETTE);
+      const addSliceSpy = jest.spyOn(
+        chartBScale.labelsColorMapInstance,
+        'addSlice',
+      );
+      chartBScale.getColor('Classic Cars', 102, 'testScheme');
+      chartBScale.getColor('Model T', 102, 'testScheme');
+      chartBScale.getColor('Trains', 102, 'testScheme');
+
+      expect(chartBScale.chartLabelsColorMap.get('Trains')).toBe('red');
+      expect(chartBScale.chartLabelsColorMap.get('Classic Cars')).toBeDefined();
+      expect(chartBScale.chartLabelsColorMap.get('Classic Cars')).not.toBe(
+        'red',
+      );
+      expect(chartBScale.range()).toHaveLength(6);
+      expect(
+        addSliceSpy.mock.calls.some(
+          ([label, color]) => label === 'Classic Cars' && color !== 'red',
+        ),
+      ).toBe(true);
+    });
+
+    test('fix: forced colors (user-set in dashboard JSON) are never reassigned', () => {
+      const PALETTE = ['red', 'blue', 'green'];
+      const forcedColors = { 'Classic Cars': 'red' };
+
+      const chartAScale = new CategoricalColorScale(PALETTE);
+      chartAScale.getColor('Trains', 101, 'testScheme');
+
+      const chartBScale = new CategoricalColorScale(PALETTE, forcedColors);
+      chartBScale.getColor('Classic Cars', 102, 'testScheme');
+      chartBScale.getColor('Trains', 102, 'testScheme');
+
+      expect(chartBScale.chartLabelsColorMap.get('Classic Cars')).toBe('red');
+    });
+  });
+
  describe("is compatible with D3's ScaleOrdinal", () => {
    test('passes type check', () => {
      const scale: ScaleOrdinal<{ toString(): string }, string> =
--- a/superset-frontend/packages/superset-ui-core/test/connection/SupersetClient.test.ts
+++ b/superset-frontend/packages/superset-ui-core/test/connection/SupersetClient.test.ts
@@ -19,6 +19,7 @@
 import fetchMock from 'fetch-mock';

 import { SupersetClient, SupersetClientClass } from '@superset-ui/core';
+import type { SupersetClientInterface } from '@superset-ui/core';
 import { LOGIN_GLOB } from './fixtures/constants';

 beforeAll(() => fetchMock.mockGlobal());
@@ -31,6 +32,10 @@ describe('SupersetClient', () => {

  afterEach(() => SupersetClient.reset());

+  const clientWithGetUrl = SupersetClient as SupersetClientInterface & {
+    getUrl: (...args: unknown[]) => string;
+  };
+
  test('exposes configure, init, get, post, postForm, delete, put, request, reset, getGuestToken, getCSRFToken, getUrl, isAuthenticated, and reAuthenticate methods', () => {
    expect(typeof SupersetClient.configure).toBe('function');
    expect(typeof SupersetClient.init).toBe('function');
@@ -43,7 +48,7 @@ describe('SupersetClient', () => {
    expect(typeof SupersetClient.reset).toBe('function');
    expect(typeof SupersetClient.getGuestToken).toBe('function');
    expect(typeof SupersetClient.getCSRFToken).toBe('function');
-    expect(typeof SupersetClient.getUrl).toBe('function');
+    expect(typeof clientWithGetUrl.getUrl).toBe('function');
    expect(typeof SupersetClient.isAuthenticated).toBe('function');
    expect(typeof SupersetClient.reAuthenticate).toBe('function');
  });
@@ -58,7 +63,7 @@ describe('SupersetClient', () => {
    expect(SupersetClient.request).toThrow();
    expect(SupersetClient.getGuestToken).toThrow();
    expect(SupersetClient.getCSRFToken).toThrow();
-    expect(SupersetClient.getUrl).toThrow();
+    expect(clientWithGetUrl.getUrl).toThrow();
    expect(SupersetClient.isAuthenticated).toThrow();
    expect(SupersetClient.reAuthenticate).toThrow();
    expect(SupersetClient.configure).not.toThrow();
@@ -100,7 +105,7 @@ describe('SupersetClient', () => {
    const getUrlSpy = jest.spyOn(SupersetClientClass.prototype, 'getUrl');

    SupersetClient.configure({ appRoot: '/app' });
-    expect(SupersetClient.getUrl({ endpoint: '/some/path' })).toContain(
+    expect(clientWithGetUrl.getUrl({ endpoint: '/some/path' })).toContain(
      '/app/some/path',
    );
    expect(getUrlSpy).toHaveBeenCalledTimes(1);
--- a/superset-frontend/packages/superset-ui-core/test/query/types/Datasource.test.ts
+++ b/superset-frontend/packages/superset-ui-core/test/query/types/Datasource.test.ts
@@ -28,10 +28,11 @@ test('DEFAULT_METRICS', () => {
 });

 test('DatasourceType', () => {
-  expect(Object.keys(DatasourceType).length).toBe(5);
+  expect(Object.keys(DatasourceType).length).toBe(6);
  expect(DatasourceType.Table).toBe('table');
  expect(DatasourceType.Query).toBe('query');
  expect(DatasourceType.Dataset).toBe('dataset');
  expect(DatasourceType.SlTable).toBe('sl_table');
  expect(DatasourceType.SavedQuery).toBe('saved_query');
+  expect(DatasourceType.SemanticView).toBe('semantic_view');
 });
--- a/superset-frontend/packages/superset-ui-core/test/time-format/TimeFormatter.test.ts
+++ b/superset-frontend/packages/superset-ui-core/test/time-format/TimeFormatter.test.ts
@@ -71,10 +71,16 @@ describe('TimeFormatter', () => {
      // PivotData.processRecord coerces values with String(), turning numeric
      // timestamps into strings.
      const timestamp = PREVIEW_TIME.getTime().toString();
-      expect(formatter.format(timestamp)).toEqual('2017');
+      expect(formatter.format(timestamp as unknown as number | Date)).toEqual(
+        '2017',
+      );
    });
    test('handles ISO-8601 string without misinterpreting it as a number', () => {
-      expect(formatter.format('2017-02-14T11:22:33.000Z')).toEqual('2017');
+      expect(
+        formatter.format(
+          '2017-02-14T11:22:33.000Z' as unknown as number | Date,
+        ),
+      ).toEqual('2017');
    });
    test('otherwise returns formatted value', () => {
      expect(formatter.format(PREVIEW_TIME)).toEqual('2017');
--- a/superset-frontend/plugins/plugin-chart-ag-grid-table/package.json
+++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/package.json
@@ -29,7 +29,7 @@
    "classnames": "^2.5.1",
    "d3-array": "^3.2.4",
    "lodash": "^4.18.1",
-    "memoize-one": "^5.2.1",
+    "memoize-one": "^6.0.0",
    "react-table": "^7.8.0",
    "regenerator-runtime": "^0.14.1",
    "xss": "^1.0.15"
--- a/superset-frontend/plugins/plugin-chart-ag-grid-table/test/memoization.test.ts
+++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/test/memoization.test.ts
@@ -0,0 +1,99 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Regression coverage for memoize-one v6 adoption.
+ *
+ * memoize-one v6 changed the signature of the (optional) custom `isEqual`
+ * callback from per-argument `(a, b) => bool` to arg-array
+ * `(newArgs, lastArgs) => bool`. Of the four memoizeOne callsites in
+ * `src/transformProps.ts` (`processComparisonDataRecords`,
+ * `processDataRecords`, `processColumns`, `getBasicColorFormatter`), only
+ * `processColumns` passes a custom comparator (`isEqualColumns`); its
+ * signature already takes arg-arrays and is compatible with v6. The other
+ * three rely on memoize-one's default referential-equality comparator, which
+ * is unchanged between v5 and v6.
+ *
+ * These tests lock those assumptions in by observing the memoization
+ * behavior through the public `transformProps` API: identical chart-props
+ * input references should produce referentially-equal `data` and `columns`
+ * arrays (cache hit), while inputs that differ on the sub-fields each
+ * memoizer actually compares should produce fresh arrays (cache miss).
+ */
+import transformProps from '../src/transformProps';
+import testData from '../../plugin-chart-table/test/testData';
+
+test('transformProps returns referentially-equal data/columns on identical input (cache hit)', () => {
+  // processColumns and processDataRecords are both wrapped by memoizeOne at
+  // module scope. Two consecutive calls with the same chartProps reference
+  // should hit both caches and yield the same output references.
+  const first = transformProps(testData.basic);
+  const second = transformProps(testData.basic);
+
+  expect(second.columns).toBe(first.columns);
+  expect(second.data).toBe(first.data);
+});
+
+test('transformProps busts its memoization caches when sub-field inputs change (cache miss)', () => {
+  const first = transformProps(testData.basic);
+
+  // `processColumns` is wrapped with a custom equality (`isEqualColumns`) that
+  // compares specific chartProps sub-fields by identity — mutating only the
+  // top-level props reference is NOT enough to bust it. Here we supply a fresh
+  // `datasource.columnFormats` reference, which `isEqualColumns` compares with
+  // `===`, forcing `processColumns` to recompute and return a new `columns`
+  // array.
+  //
+  // `processDataRecords` uses memoize-one's default referential equality on
+  // `(data, columns)`. We also hand it a fresh `queriesData[0].data` array, so
+  // together with the recomputed `columns` reference it too cache-misses.
+  const freshProps = {
+    ...testData.basic,
+    datasource: {
+      ...testData.basic.datasource,
+      columnFormats: {},
+    },
+    queriesData: [
+      {
+        ...testData.basic.queriesData[0],
+        data: [...(testData.basic.queriesData[0].data || [])],
+      },
+    ],
+  };
+  const second = transformProps(freshProps);
+
+  expect(second.columns).not.toBe(first.columns);
+  expect(second.data).not.toBe(first.data);
+});
+
+test('transformProps memoizes the comparison-mode data pipeline on identical input', () => {
+  // Exercises `processComparisonDataRecords` (the third of four memoizeOne
+  // callsites in transformProps.ts) via the `comparison` fixture, which has
+  // `time_compare` set and therefore flows through the comparison branch
+  // where `passedData = comparisonData`.
+  //
+  // Note: we don't assert reference equality on `columns` here because the
+  // comparison branch runs `comparisonColumns` through the non-memoized
+  // `processComparisonColumns` helper, which returns a fresh array on each
+  // call by design.
+  const first = transformProps(testData.comparison);
+  const second = transformProps(testData.comparison);
+
+  expect(second.data).toBe(first.data);
+});
--- a/superset-frontend/plugins/plugin-chart-echarts/package.json
+++ b/superset-frontend/plugins/plugin-chart-echarts/package.json
@@ -29,7 +29,7 @@
    "acorn": "^8.16.0",
    "d3-array": "^3.2.4",
    "lodash": "^4.18.1",
-    "zod": "^4.4.1"
+    "zod": "^4.4.3"
  },
  "peerDependencies": {
    "@apache-superset/core": "*",
--- a/superset-frontend/plugins/plugin-chart-echarts/test/MixedTimeseries/transformProps.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/MixedTimeseries/transformProps.test.ts
@@ -20,12 +20,14 @@ import {
  AnnotationStyle,
  AnnotationType,
  AnnotationSourceType,
+  AxisType,
  DataRecord,
  FormulaAnnotationLayer,
  IntervalAnnotationLayer,
  VizType,
  ChartDataResponseResult,
 } from '@superset-ui/core';
+import { GenericDataType } from '@apache-superset/core/common';
 import {
  LegendOrientation,
  LegendType,
@@ -496,3 +498,133 @@ test('should add a formula annotation when X-axis column has dataset-level label
  expect(Array.isArray(formulaSeries?.data)).toBe(true);
  expect((formulaSeries!.data as unknown[]).length).toBeGreaterThan(0);
 });
+
+test('numeric x coltype never gets silently coerced to the Time axis', () => {
+  // Regression guard for echarts-timeseries-epoch-x-axis-labels investigation.
+  // Mixed Timeseries must follow the reported coltype: Numeric values stay
+  // off the Time axis and are not silently reinterpreted as Date instances.
+  // A future change that coerces Numeric → Time would bring back the "NaN"
+  // label symptom we were investigating. We also assert that whichever
+  // formatter is picked, it produces a string and does not emit "NaN".
+  const ts1 = 1745784000000;
+  const ts2 = 1745870400000;
+  const epochRows = [
+    { __timestamp: ts1, metric: 10 },
+    { __timestamp: ts2, metric: 20 },
+  ];
+  const epochQueryData = createTestQueryData(epochRows, {
+    colnames: ['__timestamp', 'metric'],
+    coltypes: [GenericDataType.Numeric, GenericDataType.Numeric],
+    label_map: { __timestamp: ['__timestamp'], metric: ['metric'] },
+  });
+
+  const chartProps = createEchartsTimeseriesTestChartProps<
+    EchartsMixedTimeseriesFormData,
+    EchartsMixedTimeseriesProps
+  >({
+    ...MIXED_TIMESERIES_CHART_PROPS_DEFAULTS,
+    defaultQueriesData: [epochQueryData, epochQueryData],
+    formData: {
+      ...formData,
+      x_axis: '__timestamp',
+      metrics: ['metric'],
+      metricsB: ['metric'],
+      groupby: [],
+      groupbyB: [],
+    },
+    queriesData: [epochQueryData, epochQueryData],
+  });
+
+  const { echartOptions } = transformProps(chartProps);
+  const xAxis = echartOptions.xAxis as {
+    type: string;
+    axisLabel: { formatter: (v: number) => string };
+  };
+
+  expect(xAxis.type).not.toBe(AxisType.Time);
+  const label = xAxis.axisLabel.formatter(ts1);
+  expect(typeof label).toBe('string');
+  expect(label).not.toMatch(/NaN/);
+});
+
+test('xAxisForceCategorical forces Category axis regardless of Numeric coltype', () => {
+  const ts1 = 1745784000000;
+  const ts2 = 1745870400000;
+  const epochRows = [
+    { __timestamp: ts1, metric: 10 },
+    { __timestamp: ts2, metric: 20 },
+  ];
+  const epochQueryData = createTestQueryData(epochRows, {
+    colnames: ['__timestamp', 'metric'],
+    coltypes: [GenericDataType.Numeric, GenericDataType.Numeric],
+    label_map: { __timestamp: ['__timestamp'], metric: ['metric'] },
+  });
+
+  const chartProps = createEchartsTimeseriesTestChartProps<
+    EchartsMixedTimeseriesFormData,
+    EchartsMixedTimeseriesProps
+  >({
+    ...MIXED_TIMESERIES_CHART_PROPS_DEFAULTS,
+    defaultQueriesData: [epochQueryData, epochQueryData],
+    formData: {
+      ...formData,
+      x_axis: '__timestamp',
+      metrics: ['metric'],
+      metricsB: ['metric'],
+      groupby: [],
+      groupbyB: [],
+      xAxisForceCategorical: true,
+    },
+    queriesData: [epochQueryData, epochQueryData],
+  });
+
+  const { echartOptions } = transformProps(chartProps);
+  const xAxis = echartOptions.xAxis as { type: string };
+
+  expect(xAxis.type).toBe(AxisType.Category);
+});
+
+test('temporal x coltype wires the time formatter and Time axis', () => {
+  // Regression guard: the happy path for mixed-timeseries charts. Ensures
+  // Temporal coltype still routes through the TimeFormatter so the time axis
+  // rendering path is exercised by the test suite.
+  const ts1 = 1745784000000;
+  const ts2 = 1745870400000;
+  const temporalRows = [
+    { __timestamp: ts1, metric: 10 },
+    { __timestamp: ts2, metric: 20 },
+  ];
+  const temporalQueryData = createTestQueryData(temporalRows, {
+    colnames: ['__timestamp', 'metric'],
+    coltypes: [GenericDataType.Temporal, GenericDataType.Numeric],
+    label_map: { __timestamp: ['__timestamp'], metric: ['metric'] },
+  });
+
+  const chartProps = createEchartsTimeseriesTestChartProps<
+    EchartsMixedTimeseriesFormData,
+    EchartsMixedTimeseriesProps
+  >({
+    ...MIXED_TIMESERIES_CHART_PROPS_DEFAULTS,
+    defaultQueriesData: [temporalQueryData, temporalQueryData],
+    formData: {
+      ...formData,
+      x_axis: '__timestamp',
+      metrics: ['metric'],
+      metricsB: ['metric'],
+      groupby: [],
+      groupbyB: [],
+    },
+    queriesData: [temporalQueryData, temporalQueryData],
+  });
+
+  const { echartOptions } = transformProps(chartProps);
+  const xAxis = echartOptions.xAxis as {
+    type: string;
+    axisLabel: { formatter: (v: Date) => string };
+  };
+
+  expect(xAxis.type).toBe(AxisType.Time);
+  const label = xAxis.axisLabel.formatter(new Date(ts1));
+  expect(typeof label).toBe('string');
+  expect(label).not.toMatch(/NaN/);
+});
--- a/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/transformProps.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/transformProps.test.ts
@@ -20,6 +20,7 @@ import {
  AnnotationSourceType,
  AnnotationStyle,
  AnnotationType,
+  AxisType,
  ComparisonType,
  DataRecord,
  EventAnnotationLayer,
@@ -1472,6 +1473,118 @@ test('x-axis formatter deduplicates consecutive identical labels for coarse time
  expect(label4).toBe('');
 });

+test('numeric x coltype routes through the number formatter (not the time formatter)', () => {
+  // Regression guard for echarts-timeseries-epoch-x-axis-labels investigation.
+  // When the query reports a Numeric x-axis coltype (including epoch-ms-like
+  // values), Timeseries transformProps must pick the Value axis and run the
+  // label through getNumberFormatter, not the time formatter. If this ever
+  // changes, epoch-ms values that arrive as Numeric would suddenly be treated
+  // as Date instances and could render "NaN" — the symptom that prompted this
+  // investigation.
+  const ts1 = 1745784000000;
+  const ts2 = 1745870400000;
+  const chartProps = createTestChartProps({
+    formData: {
+      metrics: ['metric'],
+      granularity_sqla: 'ds',
+      x_axis: '__timestamp',
+    },
+    queriesData: [
+      createTestQueryData(
+        [
+          { __timestamp: ts1, metric: 10 },
+          { __timestamp: ts2, metric: 20 },
+        ],
+        {
+          colnames: ['__timestamp', 'metric'],
+          coltypes: [GenericDataType.Numeric, GenericDataType.Numeric],
+        },
+      ),
+    ],
+  });
+
+  const { echartOptions } = transformProps(chartProps);
+  const xAxis = echartOptions.xAxis as {
+    type: string;
+    axisLabel: { formatter: (v: number) => string };
+  };
+
+  expect(xAxis.type).toBe(AxisType.Value);
+  const label = xAxis.axisLabel.formatter(ts1);
+  expect(typeof label).toBe('string');
+  expect(label).not.toMatch(/NaN/);
+});
+
+test('xAxisForceCategorical forces Category axis regardless of Numeric coltype', () => {
+  const ts1 = 1745784000000;
+  const ts2 = 1745870400000;
+  const chartProps = createTestChartProps({
+    formData: {
+      metrics: ['metric'],
+      granularity_sqla: 'ds',
+      x_axis: '__timestamp',
+      xAxisForceCategorical: true,
+    },
+    queriesData: [
+      createTestQueryData(
+        [
+          { __timestamp: ts1, metric: 10 },
+          { __timestamp: ts2, metric: 20 },
+        ],
+        {
+          colnames: ['__timestamp', 'metric'],
+          coltypes: [GenericDataType.Numeric, GenericDataType.Numeric],
+        },
+      ),
+    ],
+  });
+
+  const { echartOptions } = transformProps(chartProps);
+  const xAxis = echartOptions.xAxis as { type: string };
+
+  expect(xAxis.type).toBe(AxisType.Category);
+});
+
+test('temporal x coltype wires the time formatter and Time axis', () => {
+  // Regression guard: the happy path for time-series charts. Ensures that
+  // Temporal coltype keeps routing through the TimeFormatter so a refactor
+  // does not accidentally drop Date handling (the feared regression that
+  // sparked this investigation).
+  const ts1 = 1745784000000;
+  const ts2 = 1745870400000;
+  const chartProps = createTestChartProps({
+    formData: {
+      metrics: ['metric'],
+      granularity_sqla: 'ds',
+      x_axis: '__timestamp',
+    },
+    queriesData: [
+      createTestQueryData(
+        [
+          { __timestamp: ts1, metric: 10 },
+          { __timestamp: ts2, metric: 20 },
+        ],
+        {
+          colnames: ['__timestamp', 'metric'],
+          coltypes: [GenericDataType.Temporal, GenericDataType.Numeric],
+        },
+      ),
+    ],
+  });
+
+  const { echartOptions } = transformProps(chartProps);
+  const xAxis = echartOptions.xAxis as {
+    type: string;
+    axisLabel: { formatter: (v: Date) => string };
+  };
+
+  expect(xAxis.type).toBe(AxisType.Time);
+  const label = xAxis.axisLabel.formatter(new Date(ts1));
+  expect(typeof label).toBe('string');
+  expect(label).not.toMatch(/NaN/);
+  expect(label).not.toBe(String(ts1));
+});
+
 test('should assign distinct dash patterns for multiple time offsets consistently', () => {
  const queriesDataWithMultipleOffsets = [
    createTestQueryData([
--- a/superset-frontend/plugins/plugin-chart-echarts/test/utils/formatters.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/utils/formatters.test.ts
@@ -19,11 +19,13 @@
 import {
  NumberFormats,
  SMART_DATE_ID,
+  SMART_DATE_VERBOSE_ID,
  TimeFormatter,
  TimeGranularity,
 } from '@superset-ui/core';
 import {
  getPercentFormatter,
+  getTooltipTimeFormatter,
  getXAxisFormatter,
 } from '../../src/utils/formatters';

@@ -179,3 +181,53 @@ test('getXAxisFormatter without time grain should use standard smart date behavi

  expect(standardResult).toBe(timeGrainResult);
 });
+
+// Regression tests for echarts-timeseries-epoch-x-axis-labels investigation.
+// The bug report was that temporal x-axis labels could render as "NaN"
+// in some edge cases that we could not reproduce locally. The tests below
+// lock in the current behavior of the formatters so that a future refactor
+// surfaces any change in contract.
+
+test('getTooltipTimeFormatter returns a TimeFormatter with SMART_DATE_VERBOSE id for SMART_DATE_ID', () => {
+  const formatter = getTooltipTimeFormatter(SMART_DATE_ID);
+  expect(formatter).toBeInstanceOf(TimeFormatter);
+  expect((formatter as TimeFormatter).id).toBe(SMART_DATE_VERBOSE_ID);
+});
+
+test('getTooltipTimeFormatter returns a TimeFormatter for a custom format string', () => {
+  const customFormat = '%Y-%m-%d %H:%M';
+  const formatter = getTooltipTimeFormatter(customFormat);
+  expect(formatter).toBeInstanceOf(TimeFormatter);
+  expect((formatter as TimeFormatter).id).toBe(customFormat);
+});
+
+test('getTooltipTimeFormatter falls back to the String constructor when no format is supplied', () => {
+  expect(getTooltipTimeFormatter()).toBe(String);
+  expect(getTooltipTimeFormatter(undefined)).toBe(String);
+});
+
+test('getXAxisFormatter produces stable SMART_DATE output for a valid Date', () => {
+  // Documents the current happy-path output format so unexpected changes are
+  // caught during review.
+  const formatter = getXAxisFormatter(SMART_DATE_ID) as TimeFormatter;
+  const result = formatter.format(new Date('2025-01-15T00:00:00.000Z'));
+  expect(typeof result).toBe('string');
+  expect(result).not.toMatch(/NaN/);
+  expect(result.length).toBeGreaterThan(0);
+});
+
+test('getXAxisFormatter returns a string for an Invalid Date without throwing', () => {
+  // If a caller ever passes an Invalid Date (the originally-suspected cause
+  // of epoch-ms axis labels showing NaN in echarts), the formatter must
+  // still return a string instead of throwing, so echarts does not blow up
+  // the chart render. The *content* of that string is format-dependent and
+  // intentionally not asserted here — only that it is a string.
+  const formatter = getXAxisFormatter(SMART_DATE_ID) as TimeFormatter;
+  const invalid = new Date(Number.NaN);
+  expect(() => formatter.format(invalid)).not.toThrow();
+  expect(typeof formatter.format(invalid)).toBe('string');
+
+  const customFormatter = getXAxisFormatter('%Y-%m-%d') as TimeFormatter;
+  expect(() => customFormatter.format(invalid)).not.toThrow();
+  expect(typeof customFormatter.format(invalid)).toBe('string');
+});
--- a/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts
@@ -1402,7 +1402,7 @@ test('getAxisType with forced categorical', () => {

 test('getAxisType treats numeric as category for bar charts', () => {
  expect(
-    getAxisType(
+    (getAxisType as (...args: unknown[]) => AxisType)(
      false,
      false,
      GenericDataType.Numeric,
@@ -1410,7 +1410,7 @@ test('getAxisType treats numeric as category for bar charts', () => {
    ),
  ).toEqual(AxisType.Category);
  expect(
-    getAxisType(
+    (getAxisType as (...args: unknown[]) => AxisType)(
      false,
      false,
      GenericDataType.Numeric,
@@ -1419,6 +1419,22 @@ test('getAxisType treats numeric as category for bar charts', () => {
  ).toEqual(AxisType.Value);
 });

+test('getAxisType does not coerce Numeric x-axis to Time regardless of values', () => {
+  // Regression guard for echarts-timeseries-epoch-x-axis-labels investigation:
+  // getAxisType only considers the coltype reported by the query, never the
+  // actual values. Numeric coltype must stay on a Value axis so a future
+  // change that introduces implicit temporal coercion is surfaced here.
+  expect(getAxisType(false, false, GenericDataType.Numeric)).toEqual(
+    AxisType.Value,
+  );
+  expect(getAxisType(false, false, GenericDataType.Temporal)).toEqual(
+    AxisType.Time,
+  );
+  expect(getAxisType(false, false, GenericDataType.String)).toEqual(
+    AxisType.Category,
+  );
+});
+
 test('getMinAndMaxFromBounds returns empty object when not truncating', () => {
  expect(
    getMinAndMaxFromBounds(
--- a/superset-frontend/plugins/preset-chart-deckgl/package.json
+++ b/superset-frontend/plugins/preset-chart-deckgl/package.json
@@ -29,7 +29,7 @@
    "@deck.gl/extensions": "~9.2.9",
    "@deck.gl/geo-layers": "~9.2.5",
    "@deck.gl/layers": "~9.2.5",
-    "@deck.gl/mapbox": "~9.3.1",
+    "@deck.gl/mapbox": "~9.3.2",
    "@deck.gl/mesh-layers": "~9.2.5",
    "@luma.gl/constants": "~9.2.5",
    "@luma.gl/core": "~9.2.5",
--- a/superset-frontend/src/components/Chart/Chart.tsx
+++ b/superset-frontend/src/components/Chart/Chart.tsx
@@ -359,7 +359,9 @@ class Chart extends PureComponent<ChartProps, {}> {
      width,
    } = this.props;

-    const databaseName = datasource?.database?.name as string | undefined;
+    const databaseName =
+      datasource?.parent?.name ??
+      (datasource?.database?.name as string | undefined);

    const isLoading = chartStatus === 'loading';
    // Suppress spinner during auto-refresh to avoid visual flicker
--- a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.tsx
+++ b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.tsx
@@ -58,6 +58,7 @@ import { Dataset } from '../types';
 import TableControls from './DrillDetailTableControls';
 import { getDrillPayload } from './utils';
 import { ResultsPage } from './types';
+import { datasetLabelLower } from 'src/features/semanticLayers/label';

 const PAGE_SIZE = 50;

@@ -373,7 +374,7 @@ export default function DrillDetailPane({
    tableContent = <Loading />;
  } else if (resultsPage?.total === 0) {
    // Render empty state if no results are returned for page
-    const title = t('No rows were returned for this dataset');
+    const title = t('No rows were returned for this %s', datasetLabelLower());
    tableContent = <EmptyState image="document.svg" title={title} />;
  } else {
    // Render table if at least one page has successfully loaded
--- a/superset-frontend/src/components/DatabaseSelector/index.tsx
+++ b/superset-frontend/src/components/DatabaseSelector/index.tsx
@@ -52,6 +52,10 @@ import type {
  DatabaseObject,
 } from './types';
 import { StyledFormLabel } from './styles';
+import {
+  databaseLabel,
+  databasesLabelLower,
+} from 'src/features/semanticLayers/label';

 const DatabaseSelectorWrapper = styled.div<{ horizontal?: boolean }>`
  ${({ theme, horizontal }) =>
@@ -433,7 +437,11 @@ export function DatabaseSelector({
  function renderDatabaseSelect() {
    if (sqlLabMode) {
      return renderSelectRow(
-        t('Select database or type to search databases'),
+        t(
+          'Select %s or type to search %s',
+          databaseLabel().toLowerCase(),
+          databasesLabelLower(),
+        ),
        null,
        null,
        {
@@ -450,16 +458,24 @@ export function DatabaseSelector({
    return (
      <div>
        {renderSelectRow(
-          t('Database'),
+          databaseLabel(),
          <AsyncSelect
-            ariaLabel={t('Select database or type to search databases')}
+            ariaLabel={t(
+              'Select %s or type to search %s',
+              databaseLabel().toLowerCase(),
+              databasesLabelLower(),
+            )}
            optionFilterProps={['database_name', 'value']}
            data-test="select-database"
            lazyLoading={false}
            notFoundContent={emptyState}
            onChange={changeDatabase}
            value={currentDb}
-            placeholder={t('Select database or type to search databases')}
+            placeholder={t(
+              'Select %s or type to search %s',
+              databaseLabel().toLowerCase(),
+              databasesLabelLower(),
+            )}
            disabled={!isDatabaseSelectEnabled || readOnly}
            options={loadDatabases}
            sortComparator={sortComparator}
--- a/superset-frontend/src/components/Datasource/ChangeDatasourceModal/ChangeDatasourceModal.test.tsx
+++ b/superset-frontend/src/components/Datasource/ChangeDatasourceModal/ChangeDatasourceModal.test.tsx
@@ -27,6 +27,7 @@ const mockStore = configureStore([thunk]);
 const store = mockStore({});

 const mockedProps = {
+  addSuccessToast: jest.fn(),
  addDangerToast: () => {},
  onDatasourceSave: jest.fn(),
  onChange: () => {},
@@ -91,3 +92,36 @@ test('changes the datasource', async () => {
    expect(fetchMock.callHistory.calls(/api\/v1\/dataset\/7/)).toHaveLength(1),
  );
 });
+
+test('does not show success toast or close modal when datasource request fails', async () => {
+  const props = {
+    ...mockedProps,
+    addDangerToast: jest.fn(),
+    addSuccessToast: jest.fn(),
+    onHide: jest.fn(),
+  };
+  (fetchMock.removeRoutes as any)(DATASOURCE_ENDPOINT);
+  (fetchMock.removeRoutes as any)(DATASOURCES_ENDPOINT);
+  (fetchMock.removeRoutes as any)(INFO_ENDPOINT);
+  fetchMock.get(DATASOURCES_ENDPOINT, { result: [mockDatasource['7__table']] });
+  fetchMock.get(INFO_ENDPOINT, {});
+  fetchMock.get(DATASOURCE_ENDPOINT, 500);
+
+  const { findByTestId, getByRole } = setup(props);
+  const confirmLink = await findByTestId('datasource-link');
+  fireEvent.click(confirmLink);
+  fireEvent.click(getByRole('button', { name: 'Proceed' }));
+
+  await waitFor(() => {
+    expect(fetchMock.callHistory.calls(/api\/v1\/dataset\/7/)).toHaveLength(1);
+  });
+  expect(props.addSuccessToast).not.toHaveBeenCalled();
+  expect(props.onHide).not.toHaveBeenCalled();
+
+  (fetchMock.removeRoutes as any)(DATASOURCE_ENDPOINT);
+  (fetchMock.removeRoutes as any)(DATASOURCES_ENDPOINT);
+  (fetchMock.removeRoutes as any)(INFO_ENDPOINT);
+  fetchMock.get(DATASOURCES_ENDPOINT, { result: [mockDatasource['7__table']] });
+  fetchMock.get(INFO_ENDPOINT, {});
+  fetchMock.get(DATASOURCE_ENDPOINT, DATASOURCE_PAYLOAD);
+});
--- a/superset-frontend/src/components/Datasource/ChangeDatasourceModal/index.tsx
+++ b/superset-frontend/src/components/Datasource/ChangeDatasourceModal/index.tsx
@@ -53,6 +53,7 @@ import {
 import withToasts from 'src/components/MessageToasts/withToasts';
 import { InputRef } from 'antd';
 import type { Datasource, ChangeDatasourceModalProps } from '../types';
+import { datasetLabelLower } from 'src/features/semanticLayers/label';

 const CONFIRM_WARNING_MESSAGE = t(
  'Warning! Changing the dataset may break the chart if the metadata does not exist.',
@@ -109,7 +110,11 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
  const {
    state: { loading, resourceCollection, resourceCount },
    fetchData,
-  } = useListViewResource<Dataset>('dataset', t('dataset'), addDangerToast);
+  } = useListViewResource<Dataset>(
+    'dataset',
+    datasetLabelLower(),
+    addDangerToast,
+  );

  const selectDatasource = useCallback((datasource: Datasource) => {
    setConfirmChange(true);
@@ -166,28 +171,27 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
    setPageIndex(0);
  };

-  const handleChangeConfirm = () => {
-    SupersetClient.get({
-      endpoint: `/api/v1/dataset/${confirmedDataset?.id}`,
-    })
-      .then(({ json }) => {
-        // eslint-disable-next-line no-param-reassign
-        json.result.type = 'table';
-        onDatasourceSave(json.result);
-        onChange(`${confirmedDataset?.id}__table`);
-      })
-      .catch(response => {
-        getClientErrorObject(response).then(
-          ({ error, message }: { error: any; message: string }) => {
-            const errorMessage = error
-              ? error.error || error.statusText || error
-              : message;
-            addDangerToast(errorMessage);
-          },
-        );
+  const handleChangeConfirm = async () => {
+    try {
+      const { json } = await SupersetClient.get({
+        endpoint: `/api/v1/dataset/${confirmedDataset?.id}`,
      });
-    onHide();
-    addSuccessToast(t('Successfully changed dataset!'));
+      // eslint-disable-next-line no-param-reassign
+      json.result.type = 'table';
+      onDatasourceSave(json.result);
+      onChange(`${confirmedDataset?.id}__table`);
+      onHide();
+      addSuccessToast(t('Successfully changed %s!', datasetLabelLower()));
+    } catch (response) {
+      getClientErrorObject(response).then(
+        ({ error, message }: { error: any; message: string }) => {
+          const errorMessage = error
+            ? error.error || error.statusText || error
+            : message;
+          addDangerToast(errorMessage);
+        },
+      );
+    }
  };

  const handlerCancelConfirm = () => {
@@ -253,7 +257,7 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
      onHide={onHide}
      responsive
      name="Swap dataset"
-      title={t('Swap dataset')}
+      title={t('Swap %s', datasetLabelLower())}
      width={confirmChange ? '432px' : ''}
      height={confirmChange ? 'auto' : '540px'}
      hideFooter={!confirmChange}
--- a/superset-frontend/src/components/ErrorMessage/DatasetNotFoundErrorMessage.tsx
+++ b/superset-frontend/src/components/ErrorMessage/DatasetNotFoundErrorMessage.tsx
@@ -20,6 +20,7 @@ import { t } from '@apache-superset/core/translation';

 import type { ErrorMessageComponentProps } from './types';
 import { ErrorAlert } from './ErrorAlert';
+import { datasetLabelLower } from 'src/features/semanticLayers/label';

 export function DatasetNotFoundErrorMessage({
  error,
@@ -29,7 +30,7 @@ export function DatasetNotFoundErrorMessage({
  const { level, message } = error;
  return (
    <ErrorAlert
-      errorType={t('Missing dataset')}
+      errorType={t('Missing %s', datasetLabelLower())}
      message={subtitle}
      description={message}
      type={level}
--- a/superset-frontend/src/components/ListView/Filters/index.tsx
+++ b/superset-frontend/src/components/ListView/Filters/index.tsx
@@ -60,6 +60,12 @@ function UIFilters(
        filter.current?.clearFilter?.();
      });
    },
+    clearFilterById: (id: string) => {
+      const index = filters.findIndex(f => f.id === id);
+      if (index >= 0) {
+        filterRefs[index]?.current?.clearFilter?.();
+      }
+    },
  }));

  return (
--- a/superset-frontend/src/components/ListView/ListView.tsx
+++ b/superset-frontend/src/components/ListView/ListView.tsx
@@ -19,7 +19,14 @@
 import { t } from '@apache-superset/core/translation';
 import { Alert } from '@apache-superset/core/components';
 import { styled } from '@apache-superset/core/theme';
-import { useCallback, useEffect, useRef, useState, ReactNode } from 'react';
+import {
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useRef,
+  useState,
+  ReactNode,
+} from 'react';
 import cx from 'classnames';
 import TableCollection from '@superset-ui/core/components/TableCollection';
 import BulkTagModal from 'src/features/tags/BulkTagModal';
@@ -265,6 +272,11 @@ export interface ListViewProps<T extends object = any> {
  columnsForWrapText?: string[];
  enableBulkTag?: boolean;
  bulkTagResourceName?: string;
+  /** Optional ref exposed to callers for programmatic filter control. */
+  filtersRef?: React.RefObject<{
+    clearFilters: () => void;
+    clearFilterById: (id: string) => void;
+  }>;
 }

 export function ListView<T extends object = any>({
@@ -291,6 +303,7 @@ export function ListView<T extends object = any>({
  columnsForWrapText,
  enableBulkTag = false,
  bulkTagResourceName,
+  filtersRef,
  addSuccessToast,
  addDangerToast,
 }: ListViewProps<T>) {
@@ -338,7 +351,21 @@ export function ListView<T extends object = any>({
    });
  }

-  const filterControlsRef = useRef<{ clearFilters: () => void }>(null);
+  const filterControlsRef = useRef<{
+    clearFilters: () => void;
+    clearFilterById: (id: string) => void;
+  }>(null);
+
+  // Wire the optional external filtersRef to our internal filterControlsRef.
+  // useLayoutEffect fires synchronously after DOM mutations, guaranteeing the
+  // ref is populated before the first paint and after every update.
+  useLayoutEffect(() => {
+    if (filtersRef) {
+      (
+        filtersRef as React.MutableRefObject<typeof filterControlsRef.current>
+      ).current = filterControlsRef.current;
+    }
+  });

  const handleClearFilterControls = useCallback(() => {
    if (query.filters) {
--- a/superset-frontend/src/dashboard/components/AddSliceCard/AddSliceCard.tsx
+++ b/superset-frontend/src/dashboard/components/AddSliceCard/AddSliceCard.tsx
@@ -36,6 +36,7 @@ import { Tooltip, ImageLoader } from '@superset-ui/core/components';
 import { GenericLink, usePluginContext } from 'src/components';
 import { assetUrl } from 'src/utils/assetUrl';
 import { Theme } from '@emotion/react';
+import { datasetLabel } from 'src/features/semanticLayers/label';

 const FALLBACK_THUMBNAIL_URL = assetUrl(
  '/static/assets/images/chart-card-fallback.svg',
@@ -283,7 +284,7 @@ const AddSliceCard: FC<{
            >
              <MetadataItem label={t('Viz type')} value={vizName} />
              <MetadataItem
-                label={t('Dataset')}
+                label={datasetLabel()}
                value={
                  datasourceUrl ? (
                    <GenericLink to={datasourceUrl}>
--- a/superset-frontend/src/dashboard/components/AutoRefreshStatus/StatusIndicatorDot.test.tsx
+++ b/superset-frontend/src/dashboard/components/AutoRefreshStatus/StatusIndicatorDot.test.tsx
@@ -17,7 +17,8 @@
 * under the License.
 */
 import { render, screen, act } from 'spec/helpers/testing-library';
-import { StatusIndicatorDot } from './StatusIndicatorDot';
+import { supersetTheme } from '@apache-superset/core/theme';
+import { getStatusConfig, StatusIndicatorDot } from './StatusIndicatorDot';
 import { AutoRefreshStatus } from '../../types/autoRefresh';

 afterEach(() => {
@@ -62,6 +63,15 @@ test('renders with paused status', () => {
  expect(dot).toHaveAttribute('data-status', AutoRefreshStatus.Paused);
 });

+test('uses the icon color for the paused status outline', () => {
+  expect(
+    getStatusConfig(supersetTheme, AutoRefreshStatus.Paused),
+  ).toMatchObject({
+    needsBorder: true,
+    outlineColor: 'currentColor',
+  });
+});
+
 test('has correct accessibility attributes', () => {
  render(<StatusIndicatorDot status={AutoRefreshStatus.Success} />);
  const dot = screen.getByTestId('status-indicator-dot');
--- a/superset-frontend/src/dashboard/components/AutoRefreshStatus/StatusIndicatorDot.tsx
+++ b/superset-frontend/src/dashboard/components/AutoRefreshStatus/StatusIndicatorDot.tsx
@@ -39,9 +39,10 @@ export interface StatusIndicatorDotProps {
 interface StatusConfig {
  color: string;
  needsBorder: boolean;
+  outlineColor?: string;
 }

-const getStatusConfig = (
+export const getStatusConfig = (
  theme: ReturnType<typeof useTheme>,
  status: AutoRefreshStatus,
 ): StatusConfig => {
@@ -75,6 +76,7 @@ const getStatusConfig = (
      return {
        color: theme.colorBgContainer,
        needsBorder: true,
+        outlineColor: 'currentColor',
      };
    default:
      return {
@@ -136,13 +138,15 @@ export const StatusIndicatorDot: FC<StatusIndicatorDotProps> = ({
      width: ${size}px;
      height: ${size}px;
      border-radius: 50%;
+      color: ${theme.colorTextSecondary};
      background-color: ${statusConfig.color};
      transition:
        background-color ${theme.motionDurationMid} ease-in-out,
        border-color ${theme.motionDurationMid} ease-in-out;
-      border: ${statusConfig.needsBorder
-        ? `1px solid ${theme.colorBorder}`
-        : 'none'};
+      border: ${statusConfig.needsBorder ? '1px solid' : 'none'};
+      border-color: ${statusConfig.needsBorder
+        ? statusConfig.outlineColor
+        : 'transparent'};
      box-shadow: ${statusConfig.needsBorder
        ? 'none'
        : `0 0 0 2px ${theme.colorBgContainer}`};
--- a/superset-frontend/src/dashboard/components/SliceAdder.tsx
+++ b/superset-frontend/src/dashboard/components/SliceAdder.tsx
@@ -55,6 +55,7 @@ import type { ConnectDragSource } from 'react-dnd';
 import AddSliceCard from './AddSliceCard';
 import AddSliceDragPreview from './dnd/AddSliceDragPreview';
 import { DragDroppable } from './dnd/DragDroppable';
+import { datasetLabelLower } from 'src/features/semanticLayers/label';

 export type SliceAdderProps = {
  theme: Theme;
@@ -88,7 +89,7 @@ const KEYS_TO_FILTERS = ['slice_name', 'viz_type', 'datasource_name'];
 const KEYS_TO_SORT = {
  slice_name: t('name'),
  viz_type: t('viz type'),
-  datasource_name: t('dataset'),
+  datasource_name: datasetLabelLower(),
  changed_on: t('recent'),
 };

--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/GroupByFilterCard.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/GroupByFilterCard.tsx
@@ -51,6 +51,10 @@ import { addDangerToast } from 'src/components/MessageToasts/actions';
 import { cachedSupersetGet } from 'src/utils/cachedSupersetGet';
 import { dispatchChartCustomizationHoverAction } from './utils';
 import { mergeExtraFormData } from '../../utils';
+import {
+  datasetLabel as getDatasetLabel,
+  datasetLabelLower,
+} from 'src/features/semanticLayers/label';

 interface ColumnApiResponse {
  column_name?: string;
@@ -262,9 +266,9 @@ const GroupByFilterCardContent: FC<{
      </Row>

      <Row>
-        <RowLabel>{t('Dataset')}</RowLabel>
+        <RowLabel>{getDatasetLabel()}</RowLabel>
        <RowValue>
-          {typeof datasetLabel === 'string' ? datasetLabel : 'Dataset'}
+          {typeof datasetLabel === 'string' ? datasetLabel : t('Dataset')}
        </RowValue>
      </Row>

@@ -475,7 +479,13 @@ const GroupByFilterCard: FC<GroupByFilterCardProps> = ({
      } catch (error) {
        setColumnOptions([]);
        dispatch(
-          addDangerToast(t('Failed to load columns for dataset %s', datasetId)),
+          addDangerToast(
+            t(
+              'Failed to load columns for %s %s',
+              datasetLabelLower(),
+              datasetId,
+            ),
+          ),
        );
      } finally {
        setLoading(false);
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DatasetSelect.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DatasetSelect.tsx
@@ -30,6 +30,11 @@ import {
  Dataset,
  DatasetSelectLabel,
 } from 'src/features/datasets/DatasetSelectLabel';
+import {
+  datasetLabel,
+  datasetLabelLower,
+  datasetsLabelLower,
+} from 'src/features/semanticLayers/label';

 interface DatasetSelectProps {
  onChange: (value: { label: string | ReactNode; value: number }) => void;
@@ -101,13 +106,13 @@ const DatasetSelect = ({

  return (
    <AsyncSelect
-      ariaLabel={t('Dataset')}
+      ariaLabel={datasetLabel()}
      value={value}
      options={loadDatasetOptionsCallback}
      onChange={onChange}
      optionFilterProps={['table_name']}
-      notFoundContent={t('No compatible datasets found')}
-      placeholder={t('Select a dataset')}
+      notFoundContent={t('No compatible %s found', datasetsLabelLower())}
+      placeholder={t('Select a %s', datasetLabelLower())}
    />
  );
 };
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
@@ -120,6 +120,7 @@ import {
  INPUT_WIDTH,
 } from './constants';
 import DependencyList from './DependencyList';
+import { datasetLabel } from 'src/features/semanticLayers/label';

 const FORM_ITEM_WIDTH = 260;

@@ -325,6 +326,12 @@ const FiltersConfigForm = (
  const filters = form.getFieldValue('filters');
  const formValues = filters?.[filterId];
  const formFilter = formValues || undoFormValues || defaultFormFilter;
+  const formFilterWithTimeGrains = formFilter as typeof formFilter & {
+    time_grains?: string[];
+  };
+  const filterToEditWithTimeGrains = filterToEdit as
+    | (Filter & { time_grains?: string[] })
+    | undefined;

  const handleModifyFilter = useCallback(() => {
    if (onModifyFilter) {
@@ -587,7 +594,8 @@ const FiltersConfigForm = (
    !!filterToEdit?.time_range;

  const hasTimeGrainPreFilter = !!(
-    formFilter?.time_grains?.length || filterToEdit?.time_grains?.length
+    formFilterWithTimeGrains?.time_grains?.length ||
+    filterToEditWithTimeGrains?.time_grains?.length
  );

  const hasEnableSingleValue =
@@ -1052,7 +1060,7 @@ const FiltersConfigForm = (
                      <StyledFormItem
                        expanded={expanded}
                        name={['filters', filterId, 'dataset']}
-                        label={<StyledLabel>{t('Dataset')}</StyledLabel>}
+                        label={<StyledLabel>{datasetLabel()}</StyledLabel>}
                        initialValue={
                          datasetDetails
                            ? {
@@ -1072,7 +1080,10 @@ const FiltersConfigForm = (
                        rules={[
                          {
                            required: !isRemoved,
-                            message: t('Dataset is required'),
+                            message:
+                              datasetLabel() === t('Datasource')
+                                ? t('Datasource is required')
+                                : t('Dataset is required'),
                          },
                        ]}
                        {...getFiltersConfigModalTestId('datasource-input')}
@@ -1098,7 +1109,7 @@ const FiltersConfigForm = (
                    ) : (
                      <StyledFormItem
                        expanded={expanded}
-                        label={<StyledLabel>{t('Dataset')}</StyledLabel>}
+                        label={<StyledLabel>{datasetLabel()}</StyledLabel>}
                      >
                        <Loading position="inline-centered" />
                      </StyledFormItem>
@@ -1322,7 +1333,7 @@ const FiltersConfigForm = (
                                            'time_grains',
                                          ]}
                                          initialValue={
-                                            filterToEdit?.time_grains
+                                            filterToEditWithTimeGrains?.time_grains
                                          }
                                          {...getFiltersConfigModalTestId(
                                            'time-grain-allowlist',
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/transformers/filterTransformer.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/transformers/filterTransformer.ts
@@ -113,7 +113,7 @@ function transformFormInput(
    excluded: [],
  };

-  return {
+  const result: Filter & { time_grains?: string[] } = {
    id,
    type: NativeFilterType.NativeFilter,
    name: formInputs.name,
@@ -127,14 +127,17 @@ function transformFormInput(
    adhoc_filters: formInputs.adhoc_filters,
    time_range: formInputs.time_range,
    granularity_sqla: formInputs.granularity_sqla,
-    time_grains: formInputs.time_grains?.length
-      ? formInputs.time_grains
-      : undefined,
    sortMetric: formInputs.sortMetric ?? null,
    requiredFirst: formInputs.requiredFirst
      ? Object.values(formInputs.requiredFirst).find(rf => rf)
      : undefined,
  };
+
+  if (formInputs.time_grains?.length) {
+    result.time_grains = formInputs.time_grains;
+  }
+
+  return result;
 }

 function transformSavedFilter(id: string, filter: Filter): Filter {
--- a/superset-frontend/src/embedded/index.tsx
+++ b/superset-frontend/src/embedded/index.tsx
@@ -19,7 +19,7 @@
 import 'src/public-path';

 import { lazy, Suspense } from 'react';
-import { createRoot } from 'react-dom/client';
+import { createRoot, type Root } from 'react-dom/client';
 import { BrowserRouter as Router, Route } from 'react-router-dom';
 import { Global } from '@emotion/react';
 import { t } from '@apache-superset/core/translation';
@@ -150,6 +150,8 @@ if (!window.parent || window.parent === window) {
 // }

 let displayedUnauthorizedToast = false;
+let root: Root | null = null;
+let started = false;

 /**
 * If there is a problem with the guest token, we will start getting
@@ -175,6 +177,8 @@ function guestUnauthorizedHandler() {
 }

 function start() {
+  if (started) return undefined;
+  started = true;
  const getMeWithRole = makeApi<void, { result: UserWithPermissionsAndRoles }>({
    method: 'GET',
    endpoint: '/api/v1/me/roles/',
@@ -189,16 +193,21 @@ function start() {
        type: USER_LOADED,
        user: result,
      });
-      createRoot(appMountPoint).render(<EmbeddedApp />);
+      if (!root) {
+        root = createRoot(appMountPoint);
+      }
+      root.render(<EmbeddedApp />);
    },
    err => {
-      // something is most likely wrong with the guest token
+      // something is most likely wrong with the guest token; reset the guard
+      // so a rehandshake with a valid token can retry.
      logging.error(err);
      showFailureMessage(
        t(
          'Something went wrong with embedded authentication. Check the dev console for details.',
        ),
      );
+      started = false;
    },
  );
 }
@@ -243,16 +252,11 @@ window.addEventListener('message', function embeddedPageInitializer(event) {
      debug: debugMode,
    });

-    let started = false;
-
    Switchboard.defineMethod(
      'guestToken',
      ({ guestToken }: { guestToken: string }) => {
        setupGuestClient(guestToken);
-        if (!started) {
-          start();
-          started = true;
-        }
+        start();
      },
    );

@@ -322,7 +326,7 @@ window.addEventListener('message', function embeddedPageInitializer(event) {
  }
 });

-// Clean up theme controller on page unload
+// Clean up theme controller and unmount React root on page unload
 window.addEventListener('beforeunload', () => {
  try {
    const controller = getThemeController();
@@ -333,6 +337,10 @@ window.addEventListener('beforeunload', () => {
  } catch (error) {
    logging.warn('Failed to destroy theme controller:', error);
  }
+  if (root) {
+    root.unmount();
+    root = null;
+  }
 });

 log('embed page is ready to receive messages');
--- a/superset-frontend/src/explore/actions/exploreActions.test.ts
+++ b/superset-frontend/src/explore/actions/exploreActions.test.ts
@@ -17,6 +17,7 @@
 * under the License.
 */
 import type { AnyAction } from 'redux';
+import { SupersetClient } from '@superset-ui/core';
 import { defaultState } from 'src/explore/store';
 import exploreReducer, {
  ExploreState,
@@ -240,3 +241,107 @@ describe('reducers', () => {
    );
  });
 });
+
+test('fetchCompatibility ignores stale async responses', async () => {
+  const dispatch = jest.fn();
+
+  let resolveFirst: (value: {
+    json: {
+      result: {
+        compatible_metrics: string[];
+        compatible_dimensions: string[];
+      };
+    };
+  }) => void;
+  let resolveSecond: (value: {
+    json: {
+      result: {
+        compatible_metrics: string[];
+        compatible_dimensions: string[];
+      };
+    };
+  }) => void;
+
+  const firstPromise = new Promise<{
+    json: {
+      result: {
+        compatible_metrics: string[];
+        compatible_dimensions: string[];
+      };
+    };
+  }>(resolve => {
+    resolveFirst = resolve;
+  });
+  const secondPromise = new Promise<{
+    json: {
+      result: {
+        compatible_metrics: string[];
+        compatible_dimensions: string[];
+      };
+    };
+  }>(resolve => {
+    resolveSecond = resolve;
+  });
+
+  const postSpy = jest.spyOn(SupersetClient, 'post');
+  postSpy
+    .mockImplementationOnce(() => firstPromise as never)
+    .mockImplementationOnce(() => secondPromise as never);
+
+  const firstThunk = actions.fetchCompatibility(
+    'semantic_view',
+    7,
+    ['m1'],
+    ['d1'],
+  )(dispatch as any);
+  const secondThunk = actions.fetchCompatibility(
+    'semantic_view',
+    7,
+    ['m2'],
+    ['d2'],
+  )(dispatch as any);
+
+  resolveSecond!({
+    json: {
+      result: {
+        compatible_metrics: ['m2'],
+        compatible_dimensions: ['d2'],
+      },
+    },
+  });
+  await secondThunk;
+
+  resolveFirst!({
+    json: {
+      result: {
+        compatible_metrics: ['m1'],
+        compatible_dimensions: ['d1'],
+      },
+    },
+  });
+  await firstThunk;
+
+  const compatibilityActions = dispatch.mock.calls
+    .map(call => call[0])
+    .filter((action: AnyAction) => action.type === actions.SET_COMPATIBILITY);
+  const successfulActions = compatibilityActions.filter(
+    (action: AnyAction) => action.compatibilityLoading === false,
+  );
+
+  expect(successfulActions).toContainEqual(
+    expect.objectContaining({
+      compatibleMetrics: ['m2'],
+      compatibleDimensions: ['d2'],
+      compatibilityLoading: false,
+    }),
+  );
+  expect(successfulActions).not.toContainEqual(
+    expect.objectContaining({
+      compatibleMetrics: ['m1'],
+      compatibleDimensions: ['d1'],
+      compatibilityLoading: false,
+    }),
+  );
+
+  postSpy.mockRestore();
+});
--- a/superset-frontend/src/explore/actions/exploreActions.ts
+++ b/superset-frontend/src/explore/actions/exploreActions.ts
@@ -166,6 +166,90 @@ export function updateExploreChartState(
  };
 }

+export const SET_COMPATIBILITY = 'SET_COMPATIBILITY';
+export function setCompatibility(payload: {
+  compatibleMetrics: string[] | null;
+  compatibleDimensions: string[] | null;
+  compatibilityLoading: boolean;
+}) {
+  return { type: SET_COMPATIBILITY, ...payload };
+}
+
+let compatibilityRequestSeq = 0;
+
+/**
+ * Fetch compatible metrics and dimensions for the current selection.
+ *
+ * Only fires for semantic views — SQL datasets always have full compatibility
+ * so we short-circuit to `null` (no filtering) for everything else.
+ *
+ * Covers both real-time selection changes (M3) and saved-chart loading (M4):
+ * call this thunk on mount as well as whenever the metric / dimension
+ * selection changes in Explore.
+ */
+export function fetchCompatibility(
+  datasourceType: string,
+  datasourceId: number,
+  selectedMetrics: string[],
+  selectedDimensions: string[],
+) {
+  return async (dispatch: Dispatch) => {
+    compatibilityRequestSeq += 1;
+    const requestSeq = compatibilityRequestSeq;
+
+    if (datasourceType !== 'semantic_view') {
+      dispatch(
+        setCompatibility({
+          compatibleMetrics: null,
+          compatibleDimensions: null,
+          compatibilityLoading: false,
+        }),
+      );
+      return;
+    }
+
+    dispatch(
+      setCompatibility({
+        compatibleMetrics: null,
+        compatibleDimensions: null,
+        compatibilityLoading: true,
+      }),
+    );
+
+    try {
+      const { json } = await SupersetClient.post({
+        endpoint: `/api/v1/datasource/${datasourceType}/${datasourceId}/compatible`,
+        jsonPayload: {
+          selected_metrics: selectedMetrics,
+          selected_dimensions: selectedDimensions,
+        },
+      });
+      if (requestSeq !== compatibilityRequestSeq) {
+        return;
+      }
+      dispatch(
+        setCompatibility({
+          compatibleMetrics: json.result.compatible_metrics,
+          compatibleDimensions: json.result.compatible_dimensions,
+          compatibilityLoading: false,
+        }),
+      );
+    } catch {
+      // On error fall back to no filtering so the user is never blocked.
+      if (requestSeq !== compatibilityRequestSeq) {
+        return;
+      }
+      dispatch(
+        setCompatibility({
+          compatibleMetrics: null,
+          compatibleDimensions: null,
+          compatibilityLoading: false,
+        }),
+      );
+    }
+  };
+}
+
 export const SET_STASH_FORM_DATA = 'SET_STASH_FORM_DATA';
 export function setStashFormData(
  isHidden: boolean,
@@ -208,6 +292,7 @@ export const exploreActions = {
  sliceUpdated,
  setForceQuery,
  syncDatasourceMetadata,
+  fetchCompatibility,
 };

 export type ExploreActions = typeof exploreActions;
--- a/superset-frontend/src/explore/actions/hydrateExplore.test.ts
+++ b/superset-frontend/src/explore/actions/hydrateExplore.test.ts
@@ -21,6 +21,10 @@ import { VizType } from '@superset-ui/core';
 import { hydrateExplore, HYDRATE_EXPLORE } from './hydrateExplore';
 import { exploreInitialData } from '../fixtures';

+afterEach(() => {
+  window.history.pushState({}, '', '/');
+});
+
 test('creates hydrate action from initial data', () => {
  const dispatch = jest.fn();
  const getState = jest.fn(() => ({
@@ -168,6 +172,84 @@ test('creates hydrate action with existing state', () => {
  );
 });

+test('hydrates sliceName from preview form data before saved slice name', () => {
+  window.history.pushState({}, '', '/explore/?form_data_key=preview-key');
+
+  const dispatch = jest.fn();
+  const getState = jest.fn(() => ({
+    user: {},
+    charts: {},
+    datasources: {},
+    common: {},
+    explore: {},
+  }));
+  const previewSliceName = 'RENAMED - Bug Evidence';
+  const savedSliceName = 'Most Populated Countries';
+  const previewInitialData = {
+    ...exploreInitialData,
+    form_data: {
+      ...exploreInitialData.form_data,
+      slice_name: previewSliceName,
+    },
+    slice: {
+      ...exploreInitialData.slice!,
+      slice_name: savedSliceName,
+    },
+  };
+
+  // @ts-expect-error we only need the fields consumed by hydrateExplore
+  hydrateExplore(previewInitialData)(dispatch, getState);
+
+  expect(dispatch).toHaveBeenCalledWith(
+    expect.objectContaining({
+      type: HYDRATE_EXPLORE,
+      data: expect.objectContaining({
+        explore: expect.objectContaining({
+          sliceName: previewSliceName,
+        }),
+      }),
+    }),
+  );
+});
+
+test('hydrates sliceName from saved slice when regular form data has stale name', () => {
+  const dispatch = jest.fn();
+  const getState = jest.fn(() => ({
+    user: {},
+    charts: {},
+    datasources: {},
+    common: {},
+    explore: {},
+  }));
+  const staleFormDataSliceName = 'Stale Params Name';
+  const savedSliceName = 'Current Saved Name';
+  const savedChartInitialData = {
+    ...exploreInitialData,
+    form_data: {
+      ...exploreInitialData.form_data,
+      slice_name: staleFormDataSliceName,
+    },
+    slice: {
+      ...exploreInitialData.slice!,
+      slice_name: savedSliceName,
+    },
+  };
+
+  // @ts-expect-error we only need the fields consumed by hydrateExplore
+  hydrateExplore(savedChartInitialData)(dispatch, getState);
+
+  expect(dispatch).toHaveBeenCalledWith(
+    expect.objectContaining({
+      type: HYDRATE_EXPLORE,
+      data: expect.objectContaining({
+        explore: expect.objectContaining({
+          sliceName: savedSliceName,
+        }),
+      }),
+    }),
+  );
+});
+
 test('uses configured default time range if not set', () => {
  const dispatch = jest.fn();
  const getState = jest.fn(() => ({
--- a/superset-frontend/src/explore/actions/hydrateExplore.ts
+++ b/superset-frontend/src/explore/actions/hydrateExplore.ts
@@ -24,7 +24,7 @@ import {
  ExplorePageState,
 } from 'src/explore/types';
 import { getChartKey } from 'src/explore/exploreUtils';
-import { getControlsState } from 'src/explore/store';
+import { getControlsState, handleDeprecatedControls } from 'src/explore/store';
 import { Dispatch } from 'redux';
 import {
  Currency,
@@ -77,6 +77,12 @@ export const hydrateExplore =
    const fallbackSlice = sliceId ? sliceEntities?.slices?.[sliceId] : null;
    const initialSlice = slice ?? fallbackSlice;
    const initialFormData = form_data ?? initialSlice?.form_data;
+    const isCachedFormData = getUrlParam(URL_PARAMS.formDataKey) !== null;
+    const [primarySliceNameSource, fallbackSliceNameSource] = isCachedFormData
+      ? [initialFormData, initialSlice]
+      : [initialSlice, initialFormData];
+    const initialSliceName =
+      primarySliceNameSource?.slice_name ?? fallbackSliceNameSource?.slice_name;
    if (!initialFormData.viz_type) {
      const defaultVizType = common?.conf.DEFAULT_VIZ_TYPE || VizType.Table;
      initialFormData.viz_type =
@@ -116,6 +122,12 @@ export const hydrateExplore =
        ]),
    );

+    // Normalize deprecated controls (e.g., migrate old per-axis matrixify
+    // flags to matrixify_enable) before form_data is stored in Redux state.
+    // getControlsState also calls this on its own copy, but state.form_data
+    // must reflect the same migration so the two stay consistent.
+    handleDeprecatedControls(initialFormData);
+
    const initialExploreState = {
      form_data: initialFormData,
      slice: initialSlice,
@@ -177,6 +189,7 @@ export const hydrateExplore =
      // because `bootstrapData.controls` is undefined.
      controls: initialControls,
      form_data: initialFormData,
+      sliceName: initialSliceName,
      slice: initialSlice,
      controlsTransferred: explore.controlsTransferred,
      standalone: getUrlParam(URL_PARAMS.standalone),
--- a/superset-frontend/src/explore/actions/saveModalActions.ts
+++ b/superset-frontend/src/explore/actions/saveModalActions.ts
@@ -151,11 +151,8 @@ export const getSlicePayload = async (
    const [id, typeString] = formData.datasource.split('__');
    datasourceId = parseInt(id, 10);

-    const formattedTypeString =
-      typeString.charAt(0).toUpperCase() + typeString.slice(1);
-    if (formattedTypeString in DatasourceType) {
-      datasourceType =
-        DatasourceType[formattedTypeString as keyof typeof DatasourceType];
+    if (Object.values(DatasourceType).includes(typeString as DatasourceType)) {
+      datasourceType = typeString as DatasourceType;
    }
  }

--- a/superset-frontend/src/explore/components/DataTablesPane/components/SamplesPane.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/components/SamplesPane.tsx
@@ -19,6 +19,7 @@
 import { useState, useEffect, useMemo, useCallback } from 'react';
 import { t } from '@apache-superset/core/translation';
 import { ensureIsArray } from '@superset-ui/core';
+import { datasetLabelLower } from 'src/features/semanticLayers/label';
 import { styled } from '@apache-superset/core/theme';
 import { EmptyState, Loading } from '@superset-ui/core/components';
 import { GenericDataType } from '@apache-superset/core/common';
@@ -160,7 +161,10 @@ export const SamplesPane = ({
  }

  if (data.length === 0) {
-    const title = t('No samples were returned for this dataset');
+    const title = t(
+      'No samples were returned for this %s',
+      datasetLabelLower(),
+    );
    return <EmptyState image="document.svg" title={title} />;
  }

--- a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragOption/DatasourcePanelDragOption.test.tsx
+++ b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragOption/DatasourcePanelDragOption.test.tsx
@@ -26,7 +26,7 @@ test('should render', async () => {
      value={{ metric_name: 'test', uuid: '1' }}
      type={DndItemType.Metric}
    />,
-    { useDnd: true },
+    { useDnd: true, useRedux: true, initialState: { explore: {} } },
  );

  expect(
@@ -41,7 +41,7 @@ test('should have attribute draggable:true', async () => {
      value={{ metric_name: 'test', uuid: '1' }}
      type={DndItemType.Metric}
    />,
-    { useDnd: true },
+    { useDnd: true, useRedux: true, initialState: { explore: {} } },
  );

  expect(
--- a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragOption/index.tsx
+++ b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragOption/index.tsx
@@ -16,8 +16,9 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-import { RefObject } from 'react';
+import { RefObject, useMemo } from 'react';
 import { useDrag } from 'react-dnd';
+import { useSelector } from 'react-redux';
 import { Metric } from '@superset-ui/core';
 import { css, styled, useTheme } from '@apache-superset/core/theme';
 import { ColumnMeta } from '@superset-ui/chart-controls';
@@ -27,6 +28,7 @@ import {
  StyledMetricOption,
 } from 'src/explore/components/optionRenderers';
 import { Icons } from '@superset-ui/core/components/Icons';
+import { ExplorePageState } from 'src/explore/types';

 import { DatasourcePanelDndItem } from '../types';

@@ -70,11 +72,38 @@ export default function DatasourcePanelDragOption(
 ) {
  const { labelRef, showTooltip, type, value } = props;
  const theme = useTheme();
+
+  // Read compatibility lists from Redux.
+  // `null` means no filtering is active (SQL datasets, or no selection yet).
+  const compatibleMetrics = useSelector<
+    ExplorePageState,
+    string[] | null | undefined
+  >(state => state.explore.compatibleMetrics);
+  const compatibleDimensions = useSelector<
+    ExplorePageState,
+    string[] | null | undefined
+  >(state => state.explore.compatibleDimensions);
+
+  // An item is compatible when the list is null (no filter) or when its
+  // name explicitly appears in the list returned by the backend.
+  const isCompatible = useMemo(() => {
+    if (type === DndItemType.Metric) {
+      if (!compatibleMetrics) return true;
+      return compatibleMetrics.includes((value as Metric).metric_name);
+    }
+    if (type === DndItemType.Column) {
+      if (!compatibleDimensions) return true;
+      return compatibleDimensions.includes((value as ColumnMeta).column_name);
+    }
+    return true;
+  }, [type, value, compatibleMetrics, compatibleDimensions]);
+
  const [{ isDragging }, drag] = useDrag({
    item: {
      value: props.value,
      type: props.type,
    },
+    canDrag: isCompatible,
    collect: monitor => ({
      isDragging: monitor.isDragging(),
    }),
@@ -87,7 +116,14 @@ export default function DatasourcePanelDragOption(
  };

  return (
-    <DatasourceItemContainer data-test="DatasourcePanelDragOption" ref={drag}>
+    <DatasourceItemContainer
+      data-test="DatasourcePanelDragOption"
+      ref={drag}
+      style={{
+        opacity: isCompatible ? 1 : 0.35,
+        cursor: isCompatible ? 'grab' : 'not-allowed',
+      }}
+    >
      {type === DndItemType.Column ? (
        <StyledColumnOption column={value as ColumnMeta} {...optionProps} />
      ) : (
--- a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelItem.test.tsx
+++ b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelItem.test.tsx
@@ -89,7 +89,7 @@ const setup = (data: DatasourcePanelItemProps['data'] = mockData) =>
        <DatasourcePanelItem index={index} data={data} style={{}} />
      ))}
    </>,
-    { useDnd: true },
+    { useDnd: true, useRedux: true, initialState: { explore: {} } },
  );

 test('renders each item accordingly', () => {
--- a/superset-frontend/src/explore/components/DatasourcePanel/index.tsx
+++ b/superset-frontend/src/explore/components/DatasourcePanel/index.tsx
@@ -122,7 +122,7 @@ const sortColumns = (slice: DatasourcePanelColumn[]) =>
      if (col2?.is_dttm && !col1?.is_dttm) {
        return 1;
      }
-      return 0;
+      return (col1?.column_name ?? '').localeCompare(col2?.column_name ?? '');
    })
    .sort((a, b) => (b?.is_certified ?? 0) - (a?.is_certified ?? 0));

@@ -191,7 +191,9 @@ export default function DataSourcePanel({

  const filteredMetrics = useMemo(() => {
    if (!searchKeyword) {
-      return allowedMetrics ?? [];
+      return [...(allowedMetrics ?? [])].sort((a, b) =>
+        (a?.metric_name ?? '').localeCompare(b?.metric_name ?? ''),
+      );
    }
    return matchSorter(allowedMetrics, searchKeyword, {
      keys: [
--- a/superset-frontend/src/explore/components/ExploreViewContainer/index.tsx
+++ b/superset-frontend/src/explore/components/ExploreViewContainer/index.tsx
@@ -36,6 +36,7 @@ import {
  JsonObject,
  MatrixifyFormData,
  DatasourceType,
+  ensureIsArray,
 } from '@superset-ui/core';
 import {
  ControlStateMapping,
@@ -412,6 +413,48 @@ function ExploreViewContainer(props: ExploreViewContainerProps) {
    [originalTitle, theme?.brandAppName, theme?.brandLogoAlt],
  );

+  // M3 + M4: fire compatibility check on mount and whenever the metric /
+  // dimension selection changes.  Only semantic views use the endpoint;
+  // SQL datasets short-circuit to null inside fetchCompatibility.
+  const selectedMetrics = useMemo(
+    () =>
+      ensureIsArray(props.form_data.metrics).filter(
+        (m): m is string => typeof m === 'string',
+      ),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [JSON.stringify(props.form_data.metrics)],
+  );
+  const selectedDimensions = useMemo(
+    () =>
+      [
+        ...ensureIsArray(props.form_data.groupby),
+        ...ensureIsArray(props.form_data.columns),
+        ...(typeof props.form_data.x_axis === 'string'
+          ? [props.form_data.x_axis]
+          : []),
+      ].filter((d): d is string => typeof d === 'string'),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [
+      JSON.stringify(props.form_data.groupby),
+      JSON.stringify(props.form_data.columns),
+      props.form_data.x_axis,
+    ],
+  );
+  useEffect(() => {
+    props.actions.fetchCompatibility(
+      props.datasource.type,
+      props.datasource.id as number,
+      selectedMetrics,
+      selectedDimensions,
+    );
+    // props.datasource.id covers the saved-chart-loading case (M4)
+  }, [
+    props.datasource.id,
+    props.datasource.type,
+    selectedMetrics,
+    selectedDimensions,
+  ]);
+
  const addHistory = useCallback(
    async ({
      isReplace = false,
--- a/superset-frontend/src/explore/components/SaveModal.test.tsx
+++ b/superset-frontend/src/explore/components/SaveModal.test.tsx
@@ -179,6 +179,33 @@ test('renders the right footer buttons', () => {
  ).toBeInTheDocument();
 });

+test('initializes chart name from current Explore slice name', () => {
+  const previewSliceName = 'RENAMED - Bug Evidence';
+  const savedSliceName = 'Most Populated Countries';
+  const { getByTestId } = setup(
+    {
+      ...defaultProps,
+      form_data: {
+        ...defaultProps.form_data,
+        slice_name: previewSliceName,
+      },
+      sliceName: previewSliceName,
+    },
+    mockStore({
+      ...initialState,
+      explore: {
+        ...initialState.explore,
+        slice: {
+          ...initialState.explore.slice,
+          slice_name: savedSliceName,
+        },
+      },
+    }),
+  );
+
+  expect(getByTestId('new-chart-name')).toHaveValue(previewSliceName);
+});
+
 test('does not render a message when overriding', () => {
  const { getByRole, queryByRole } = setup();

--- a/superset-frontend/src/explore/components/controls/CollectionControl/index.tsx
+++ b/superset-frontend/src/explore/components/controls/CollectionControl/index.tsx
@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback, useMemo, useRef } from 'react';
 import { IconTooltip, List } from '@superset-ui/core/components';
 import { nanoid } from 'nanoid';
 import { t } from '@apache-superset/core/translation';
@@ -185,8 +185,22 @@ function CollectionControl({
    }),
  );

+  // Two items can collide when keyAccessor returns falsy and the index
+  // fallback is used — breaking dnd-kit reordering and React reconciliation.
+  // Assign a stable nanoid per item ref when no key is available.
+  const generatedIdsRef = useRef<WeakMap<CollectionItem, string>>(new WeakMap());
  const itemIds = useMemo(
-    () => value.map((item, i) => keyAccessor(item) || String(i)),
+    () =>
+      value.map(item => {
+        const accessed = keyAccessor(item);
+        if (accessed) return accessed;
+        let id = generatedIdsRef.current.get(item);
+        if (!id) {
+          id = nanoid(11);
+          generatedIdsRef.current.set(item, id);
+        }
+        return id;
+      }),
    [value, keyAccessor],
  );

@@ -197,8 +211,16 @@ function CollectionControl({

  const onChangeItem = useCallback(
    (i: number, itemValue: CollectionItem) => {
+      const oldItem = value[i];
+      const newItem = { ...oldItem, ...itemValue };
+      // Replacing the object would orphan the WeakMap-stored id and remount
+      // the row. Carry the generated id over to the new ref.
+      const generatedId = generatedIdsRef.current.get(oldItem);
+      if (generatedId) {
+        generatedIdsRef.current.set(newItem, generatedId);
+      }
      const newValue = [...value];
-      newValue[i] = { ...value[i], ...itemValue };
+      newValue[i] = newItem;
      onChange?.(newValue);
    },
    [value, onChange],
--- a/superset-frontend/src/explore/components/controls/ColumnConfigControl/ColumnConfigConstants.test.tsx
+++ b/superset-frontend/src/explore/components/controls/ColumnConfigControl/ColumnConfigConstants.test.tsx
@@ -19,15 +19,19 @@

 import { SHARED_COLUMN_CONFIG_PROPS } from './constants';

-const tokenSeparators =
-  SHARED_COLUMN_CONFIG_PROPS.d3NumberFormat.tokenSeparators;
-
 test('should allow commas in D3 format inputs', () => {
-  expect(tokenSeparators).toBeDefined();
-  expect(tokenSeparators).not.toContain(',');
+  const { options } = SHARED_COLUMN_CONFIG_PROPS.d3NumberFormat;
+  const labels = (options ?? []).map((option: { label: unknown }) =>
+    String(option.label),
+  );
+  expect(labels.some((label: string) => label.includes(','))).toBe(true);
 });

-test('should have correct default token separators', () => {
-  const expectedSeparators = ['\r\n', '\n', '\t', ';'];
-  expect(tokenSeparators).toEqual(expectedSeparators);
+test('should use defaults from Select token separators', () => {
+  expect(
+    Object.prototype.hasOwnProperty.call(
+      SHARED_COLUMN_CONFIG_PROPS.d3NumberFormat,
+      'tokenSeparators',
+    ),
+  ).toBe(false);
 });
--- a/superset-frontend/src/explore/components/controls/ColumnConfigControl/constants.tsx
+++ b/superset-frontend/src/explore/components/controls/ColumnConfigControl/constants.tsx
@@ -58,8 +58,6 @@ const d3NumberFormat: ControlFormItemSpec<'Select'> = {
  creatable: true,
  minWidth: '14em',
  debounceDelay: 500,
-  // default value tokenSeparators in superset-frontend/packages/superset-ui-core/src/components/Select/constants.ts
-  tokenSeparators: ['\r\n', '\n', '\t', ';'],
 };

 const d3TimeFormat: ControlFormItemSpec<'Select'> = {
--- a/superset-frontend/src/explore/components/controls/DatasourceControl/index.tsx
+++ b/superset-frontend/src/explore/components/controls/DatasourceControl/index.tsx
@@ -40,11 +40,13 @@ import {
  DatasourceModal,
  ErrorAlert,
 } from 'src/components';
+import SemanticViewEditModal from 'src/features/semanticViews/SemanticViewEditModal';
 import { Menu } from '@superset-ui/core/components/Menu';
 import { Icons } from '@superset-ui/core/components/Icons';
 import WarningIconWithTooltip from '@superset-ui/core/components/WarningIconWithTooltip';
 import { URL_PARAMS } from 'src/constants';
 import { getDatasourceAsSaveableDataset } from 'src/utils/datasourceUtils';
+import { datasetLabelLower } from 'src/features/semanticLayers/label';
 import {
  userHasPermission,
  isUserAdmin,
@@ -68,6 +70,7 @@ interface ExtendedDatasource extends Datasource {
  }>;
  extra?: string;
  health_check_message?: string;
+  cache_timeout?: number | null;
  database?: {
    id: number;
    database_name: string;
@@ -375,7 +378,7 @@ class DatasourceControl extends PureComponent<

    const canAccessSqlLab = userHasPermission(user, 'SQL Lab', 'menu_access');

-    const editText = t('Edit dataset');
+    const editText = t('Edit %s', datasetLabelLower());
    const requestedQuery = {
      datasourceKey: `${datasource.id}__${datasource.type}`,
      sql: datasource.sql,
@@ -387,7 +390,9 @@ class DatasourceControl extends PureComponent<
        label: !allowEdit ? (
          <Tooltip
            title={t(
-              'You must be a dataset owner in order to edit. Please reach out to a dataset owner to request modifications or edit access.',
+              'You must be a %s owner in order to edit. Please reach out to a %s owner to request modifications or edit access.',
+              datasetLabelLower(),
+              datasetLabelLower(),
            )}
          >
            {editText}
@@ -402,7 +407,7 @@ class DatasourceControl extends PureComponent<

    defaultDatasourceMenuItems.push({
      key: CHANGE_DATASET,
-      label: t('Swap dataset'),
+      label: t('Swap %s', datasetLabelLower()),
    });

    if (!isMissingDatasource && canAccessSqlLab) {
@@ -481,7 +486,7 @@ class DatasourceControl extends PureComponent<

    queryDatasourceMenuItems.push({
      key: SAVE_AS_DATASET,
-      label: <span>{t('Save as dataset')}</span>,
+      label: <span>{t('Save as %s', datasetLabelLower())}</span>,
    });

    const queryDatasourceMenu = (
@@ -495,7 +500,7 @@ class DatasourceControl extends PureComponent<

    const titleText =
      isMissingDatasource && !datasource.name
-        ? t('Missing dataset')
+        ? t('Missing %s', datasetLabelLower())
        : getDatasourceTitle(datasource);

    const tooltip = titleText;
@@ -561,14 +566,15 @@ class DatasourceControl extends PureComponent<
            ) : (
              <ErrorAlert
                type="warning"
-                message={t('Missing dataset')}
+                message={t('Missing %s', datasetLabelLower())}
                descriptionPre={false}
                descriptionDetailsCollapsed={false}
                descriptionDetails={
                  <>
                    <p>
                      {t(
-                        'The dataset linked to this chart may have been deleted.',
+                        'The %s linked to this chart may have been deleted.',
+                        datasetLabelLower(),
                      )}
                    </p>
                    <p>
@@ -578,7 +584,7 @@ class DatasourceControl extends PureComponent<
                          this.handleMenuItemClick({ key: CHANGE_DATASET })
                        }
                      >
-                        {t('Swap dataset')}
+                        {t('Swap %s', datasetLabelLower())}
                      </Button>
                    </p>
                  </>
@@ -587,14 +593,27 @@ class DatasourceControl extends PureComponent<
            )}
          </div>
        )}
-        {showEditDatasourceModal && (
-          <DatasourceModal
-            datasource={datasource}
-            show={showEditDatasourceModal}
-            onDatasourceSave={this.onDatasourceSave}
-            onHide={this.toggleEditDatasourceModal}
-          />
-        )}
+        {showEditDatasourceModal &&
+          (String(datasource.type) === 'semantic_view' ? (
+            <SemanticViewEditModal
+              show={showEditDatasourceModal}
+              onHide={this.toggleEditDatasourceModal}
+              onSave={() => this.onDatasourceSave(datasource)}
+              semanticView={{
+                id: datasource.id,
+                table_name: datasource.name,
+                description: datasource.description,
+                cache_timeout: datasource.cache_timeout,
+              }}
+            />
+          ) : (
+            <DatasourceModal
+              datasource={datasource}
+              show={showEditDatasourceModal}
+              onDatasourceSave={this.onDatasourceSave}
+              onHide={this.toggleEditDatasourceModal}
+            />
+          ))}
        {showChangeDatasourceModal && (
          <ChangeDatasourceModal
            onDatasourceSave={this.onDatasourceSave}
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
@@ -142,6 +142,10 @@ const ColumnSelectPopover = ({
  const datasourceType = useSelector<ExplorePageState, string | undefined>(
    state => state.explore.datasource.type,
  );
+  const compatibleDimensions = useSelector<
+    ExplorePageState,
+    string[] | null | undefined
+  >(state => state.explore.compatibleDimensions);
  const [initialLabel] = useState(label);
  const [initialAdhocColumn, initialCalculatedColumn, initialSimpleColumn] =
    getInitialColumnValues(editedColumn);
@@ -167,21 +171,22 @@ const ColumnSelectPopover = ({

  const sqlEditorRef = useRef<editors.EditorHandle>(null);

-  const [calculatedColumns, simpleColumns] = useMemo(
-    () =>
-      columns?.reduce(
-        (acc: [ColumnMeta[], ColumnMeta[]], column: ColumnMeta) => {
-          if (column.expression) {
-            acc[0].push(column);
-          } else {
-            acc[1].push(column);
-          }
-          return acc;
-        },
-        [[], []],
-      ),
-    [columns],
-  );
+  const [calculatedColumns, simpleColumns] = useMemo(() => {
+    const [calc, simple] = (columns ?? []).reduce(
+      (acc: [ColumnMeta[], ColumnMeta[]], column: ColumnMeta) => {
+        if (column.expression) {
+          acc[0].push(column);
+        } else {
+          acc[1].push(column);
+        }
+        return acc;
+      },
+      [[], []],
+    );
+    const alpha = (a: ColumnMeta, b: ColumnMeta) =>
+      (a.column_name ?? '').localeCompare(b.column_name ?? '');
+    return [calc.sort(alpha), simple.sort(alpha)];
+  }, [columns]);

  // Filter metrics that are already selected in the chart
  const availableMetrics = useMemo(() => {
@@ -551,6 +556,11 @@ const ColumnSelectPopover = ({
                          key: `column-${simpleColumn.column_name}`,
                          column_name: simpleColumn.column_name,
                          verbose_name: simpleColumn.verbose_name ?? '',
+                          disabled:
+                            compatibleDimensions != null &&
+                            !compatibleDimensions.includes(
+                              simpleColumn.column_name,
+                            ),
                        })),
                        ...availableMetrics.map(metric => ({
                          value: metric.metric_name,
@@ -565,6 +575,9 @@ const ColumnSelectPopover = ({
                          key: `metric-${metric.metric_name}`,
                          metric_name: metric.metric_name,
                          verbose_name: metric.verbose_name ?? '',
+                          disabled:
+                            compatibleDimensions != null &&
+                            !compatibleDimensions.includes(metric.metric_name),
                        })),
                      ]}
                      optionFilterProps={[
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndAdhocFilterOption.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndAdhocFilterOption.tsx
@@ -23,6 +23,7 @@ import AdhocFilter from 'src/explore/components/controls/FilterControl/AdhocFilt
 import { OptionSortType } from 'src/explore/types';
 import { useGetTimeRangeLabel } from 'src/explore/components/controls/FilterControl/utils';
 import OptionWrapper from './OptionWrapper';
+import { datasetLabelLower } from 'src/features/semanticLayers/label';

 export interface DndAdhocFilterOptionProps {
  adhocFilter: AdhocFilter;
@@ -68,7 +69,10 @@ export default function DndAdhocFilterOption({
        isExtra={adhocFilter.isExtra}
        datasourceWarningMessage={
          adhocFilter.datasourceWarning
-            ? t('This filter might be incompatible with current dataset')
+            ? t(
+                'This filter might be incompatible with current %s',
+                datasetLabelLower(),
+              )
            : undefined
        }
      />
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnMetricSelect.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnMetricSelect.tsx
@@ -38,6 +38,7 @@ import AdhocMetric from 'src/explore/components/controls/MetricControl/AdhocMetr
 import MetricDefinitionValue from 'src/explore/components/controls/MetricControl/MetricDefinitionValue';
 import ColumnSelectPopoverTrigger from './ColumnSelectPopoverTrigger';
 import { DndControlProps } from './types';
+import { datasetLabelLower } from 'src/features/semanticLayers/label';

 const AGGREGATED_DECK_GL_CHART_TYPES = [
  'deck_screengrid',
@@ -129,6 +130,16 @@ function DndColumnMetricSelect(props: DndColumnMetricSelectProps) {
    formData,
  } = props;

+  // Semantic views do not support arbitrary SQL expressions as dimensions.
+  // Merge 'sqlExpression' into disabledTabs so the Custom SQL tab is hidden.
+  const effectiveDisabledTabs = useMemo(
+    () =>
+      String(datasource?.type) === 'semantic_view'
+        ? new Set([...(disabledTabs ?? []), 'sqlExpression'])
+        : disabledTabs,
+    [datasource?.type, disabledTabs],
+  );
+
  const [newColumnPopoverVisible, setNewColumnPopoverVisible] = useState(false);

  const combinedOptionsMap = useMemo(() => {
@@ -303,7 +314,7 @@ function DndColumnMetricSelect(props: DndColumnMetricSelectProps) {
              }}
              editedColumn={column}
              isTemporal={isTemporal}
-              disabledTabs={disabledTabs}
+              disabledTabs={effectiveDisabledTabs}
            >
              <OptionWrapper
                key={`column-${idx}`}
@@ -326,7 +337,10 @@ function DndColumnMetricSelect(props: DndColumnMetricSelectProps) {
            typeof item === 'object' &&
            'error_text' in item &&
            item.error_text)
-            ? t('This metric might be incompatible with current dataset')
+            ? t(
+                'This metric might be incompatible with current %s',
+                datasetLabelLower(),
+              )
            : undefined;

        return (
@@ -440,7 +454,7 @@ function DndColumnMetricSelect(props: DndColumnMetricSelectProps) {
        togglePopover={toggleColumnPopover}
        closePopover={closeColumnPopover}
        isTemporal={false}
-        disabledTabs={disabledTabs}
+        disabledTabs={effectiveDisabledTabs}
        metrics={savedMetrics}
        selectedMetrics={selectedMetrics}
      >
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.tsx
@@ -17,6 +17,7 @@
 * under the License.
 */
 import { useCallback, useMemo, useState } from 'react';
+import { useSelector } from 'react-redux';
 import { t } from '@apache-superset/core/translation';
 import { AdhocColumn, QueryFormColumn, isAdhocColumn } from '@superset-ui/core';
 import { tn } from '@apache-superset/core/translation';
@@ -27,8 +28,10 @@ import OptionWrapper from 'src/explore/components/controls/DndColumnSelectContro
 import { OptionSelector } from 'src/explore/components/controls/DndColumnSelectControl/utils';
 import { DatasourcePanelDndItem } from 'src/explore/components/DatasourcePanel/types';
 import { DndItemType } from 'src/explore/components/DndItemType';
+import { ExplorePageState } from 'src/explore/types';
 import ColumnSelectPopoverTrigger from './ColumnSelectPopoverTrigger';
 import { DndControlProps } from './types';
+import { datasetLabelLower } from 'src/features/semanticLayers/label';

 export type DndColumnSelectProps = DndControlProps<QueryFormColumn> & {
  options: ColumnMeta[];
@@ -49,6 +52,19 @@ function DndColumnSelect(props: DndColumnSelectProps) {
    isTemporal,
    disabledTabs,
  } = props;
+
+  // Semantic views do not support arbitrary SQL expressions as dimensions.
+  const datasourceType = useSelector<ExplorePageState, string | undefined>(
+    state => state.explore.datasource?.type,
+  );
+  const effectiveDisabledTabs = useMemo(
+    () =>
+      datasourceType === 'semantic_view'
+        ? new Set([...(disabledTabs ?? []), 'sqlExpression'])
+        : disabledTabs,
+    [datasourceType, disabledTabs],
+  );
+
  const [newColumnPopoverVisible, setNewColumnPopoverVisible] = useState(false);

  const optionSelector = useMemo(() => {
@@ -103,7 +119,10 @@ function DndColumnSelect(props: DndColumnSelectProps) {
      optionSelector.values.map((column, idx) => {
        const datasourceWarningMessage =
          isAdhocColumn(column) && column.datasourceWarning
-            ? t('This column might be incompatible with current dataset')
+            ? t(
+                'This column might be incompatible with current %s',
+                datasetLabelLower(),
+              )
            : undefined;
        const withCaret = isAdhocColumn(column) || !column.error_text;

@@ -121,7 +140,7 @@ function DndColumnSelect(props: DndColumnSelectProps) {
            }}
            editedColumn={column}
            isTemporal={isTemporal}
-            disabledTabs={disabledTabs}
+            disabledTabs={effectiveDisabledTabs}
          >
            <OptionWrapper
              key={idx}
@@ -205,7 +224,7 @@ function DndColumnSelect(props: DndColumnSelectProps) {
        closePopover={closePopover}
        visible={newColumnPopoverVisible}
        isTemporal={isTemporal}
-        disabledTabs={disabledTabs}
+        disabledTabs={effectiveDisabledTabs}
      >
        <div />
      </ColumnSelectPopoverTrigger>
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.test.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.test.tsx
@@ -69,7 +69,7 @@ const baseFormData = {
 };

 const mockStore = configureStore([thunk]);
-const store = mockStore({});
+const store = mockStore({ explore: {} });

 function setup({
  value = undefined,
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.test.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.test.tsx
@@ -69,14 +69,20 @@ const adhocMetricB = {
 };

 test('renders with default props', () => {
-  render(<DndMetricSelect {...defaultProps} />, { useDnd: true });
+  render(<DndMetricSelect {...defaultProps} />, {
+    useDnd: true,
+    useRedux: true,
+  });
  expect(
    screen.getByText('Drop a column/metric here or click'),
  ).toBeInTheDocument();
 });

 test('renders with default props and multi = true', () => {
-  render(<DndMetricSelect {...defaultProps} multi />, { useDnd: true });
+  render(<DndMetricSelect {...defaultProps} multi />, {
+    useDnd: true,
+    useRedux: true,
+  });
  expect(
    screen.getByText('Drop columns/metrics here or click'),
  ).toBeInTheDocument();
@@ -86,6 +92,7 @@ test('render selected metrics correctly', () => {
  const metricValues = ['metric_a', 'metric_b', adhocMetricB];
  render(<DndMetricSelect {...defaultProps} value={metricValues} multi />, {
    useDnd: true,
+    useRedux: true,
  });
  expect(screen.getByText('metric_a')).toBeVisible();
  expect(screen.getByText('Metric B')).toBeVisible();
@@ -107,6 +114,7 @@ test('warn selected custom metric when metric gets removed from dataset', async
    />,
    {
      useDnd: true,
+      useRedux: true,
    },
  );

@@ -159,6 +167,7 @@ test('warn selected custom metric when metric gets removed from dataset for sing
    />,
    {
      useDnd: true,
+      useRedux: true,
    },
  );

@@ -217,6 +226,7 @@ test('remove selected adhoc metric when column gets removed from dataset', async
    />,
    {
      useDnd: true,
+      useRedux: true,
    },
  );

@@ -259,6 +269,7 @@ test('update adhoc metric name when column label in dataset changes', () => {
    />,
    {
      useDnd: true,
+      useRedux: true,
    },
  );

@@ -304,6 +315,7 @@ test('can drag metrics', async () => {
  const metricValues = ['metric_a', 'metric_b', adhocMetricB];
  render(<DndMetricSelect {...defaultProps} value={metricValues} multi />, {
    useDnd: true,
+    useRedux: true,
  });

  expect(screen.getByText('metric_a')).toBeVisible();
@@ -341,6 +353,7 @@ test('cannot drop a duplicated item', () => {
    </>,
    {
      useDnd: true,
+      useRedux: true,
    },
  );

@@ -374,6 +387,7 @@ test('can drop a saved metric when disallow_adhoc_metrics', () => {
    </>,
    {
      useDnd: true,
+      useRedux: true,
    },
  );

@@ -415,6 +429,7 @@ test('cannot drop non-saved metrics when disallow_adhoc_metrics', () => {
    </>,
    {
      useDnd: true,
+      useRedux: true,
    },
  );

@@ -463,6 +478,7 @@ test('title changes on custom SQL text change', async () => {
    />,
    {
      useDnd: true,
+      useRedux: true,
    },
  );

--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.tsx
@@ -41,6 +41,7 @@ import { DndItemType } from 'src/explore/components/DndItemType';
 import DndSelectLabel from 'src/explore/components/controls/DndColumnSelectControl/DndSelectLabel';
 import { savedMetricType } from 'src/explore/components/controls/MetricControl/types';
 import { AGGREGATES } from 'src/explore/constants';
+import { datasetLabelLower } from 'src/features/semanticLayers/label';

 const EMPTY_OBJECT = {};
 const DND_ACCEPTED_TYPES = [DndItemType.Column, DndItemType.Metric];
@@ -77,7 +78,10 @@ const coerceMetrics = (
    ) {
      return {
        metric_name: metric,
-        error_text: t('This metric might be incompatible with current dataset'),
+        error_text: t(
+          'This metric might be incompatible with current %s',
+          datasetLabelLower(),
+        ),
        uuid: nanoid(),
      };
    }
@@ -128,6 +132,26 @@ const DndMetricSelect = (props: any) => {
    return extra;
  }, [datasource?.extra]);

+  // Semantic views do not support arbitrary SQL expressions as metrics.
+  const disallowAdhocMetrics =
+    extra.disallow_adhoc_metrics || datasource?.type === 'semantic_view';
+
+  // AdhocMetricEditPopover reads `datasource.extra.disallow_adhoc_metrics`
+  // directly, so we need to inject the flag there too — not just in canDrop.
+  const datasourceForPopover = useMemo(() => {
+    if (!disallowAdhocMetrics || !datasource) return datasource;
+    let parsedExtra: Record<string, unknown> = {};
+    if (datasource.extra) {
+      try {
+        parsedExtra = JSON.parse(datasource.extra as string);
+      } catch {} // eslint-disable-line no-empty
+    }
+    return {
+      ...datasource,
+      extra: JSON.stringify({ ...parsedExtra, disallow_adhoc_metrics: true }),
+    };
+  }, [disallowAdhocMetrics, datasource]);
+
  const savedMetricSet = useMemo(
    () =>
      new Set(
@@ -184,7 +208,7 @@ const DndMetricSelect = (props: any) => {
  const canDrop = useCallback(
    (item: DatasourcePanelDndItem) => {
      if (
-        extra.disallow_adhoc_metrics &&
+        disallowAdhocMetrics &&
        (item.type !== DndItemType.Metric ||
          !savedMetricSet.has(item.value.metric_name))
      ) {
@@ -293,14 +317,17 @@ const DndMetricSelect = (props: any) => {
        columns={props.columns}
        savedMetrics={props.savedMetrics}
        savedMetricsOptions={getSavedMetricOptionsForMetric(index)}
-        datasource={props.datasource}
+        datasource={datasourceForPopover}
        onMoveLabel={moveLabel}
        onDropLabel={handleDropLabel}
        type={`${DndItemType.AdhocMetricOption}_${props.name}_${props.label}`}
        multi={multi}
        datasourceWarningMessage={
          option instanceof AdhocMetric && option.datasourceWarning
-            ? t('This metric might be incompatible with current dataset')
+            ? t(
+                'This metric might be incompatible with current %s',
+                datasetLabelLower(),
+              )
            : undefined
        }
      />
@@ -399,7 +426,7 @@ const DndMetricSelect = (props: any) => {
        columns={props.columns}
        savedMetricsOptions={newSavedMetricOptions}
        savedMetric={EMPTY_OBJECT as savedMetricType}
-        datasource={props.datasource}
+        datasource={datasourceForPopover}
        isControlledComponent
        visible={newMetricPopoverVisible}
        togglePopover={togglePopover}
--- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.tsx
+++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.tsx
@@ -415,21 +415,25 @@ export default class AdhocFilterEditPopover extends Component<
                </ErrorBoundary>
              ),
            },
-            {
-              key: ExpressionTypes.Sql,
-              label: t('Custom SQL'),
-              children: (
-                <ErrorBoundary>
-                  <AdhocFilterEditPopoverSqlTabContent
-                    adhocFilter={this.state.adhocFilter}
-                    onChange={this.onAdhocFilterChange}
-                    options={this.props.options}
-                    height={this.state.height}
-                    datasource={datasource}
-                  />
-                </ErrorBoundary>
-              ),
-            },
+            ...(datasource?.type === 'semantic_view'
+              ? []
+              : [
+                  {
+                    key: ExpressionTypes.Sql,
+                    label: t('Custom SQL'),
+                    children: (
+                      <ErrorBoundary>
+                        <AdhocFilterEditPopoverSqlTabContent
+                          adhocFilter={this.state.adhocFilter}
+                          onChange={this.onAdhocFilterChange}
+                          options={this.props.options}
+                          height={this.state.height}
+                          datasource={datasource}
+                        />
+                      </ErrorBoundary>
+                    ),
+                  },
+                ]),
          ]}
        />
        {hasDeckSlices && (
--- a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/AdhocMetricEditPopover.test.tsx
+++ b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/AdhocMetricEditPopover.test.tsx
@@ -67,13 +67,19 @@ const createProps = () => ({

 test('Should render', () => {
  const props = createProps();
-  render(<AdhocMetricEditPopover {...props} />);
+  render(<AdhocMetricEditPopover {...props} />, {
+    useRedux: true,
+    initialState: { explore: {} },
+  });
  expect(screen.getByTestId('metrics-edit-popover')).toBeVisible();
 });

 test('Should render correct elements', () => {
  const props = createProps();
-  render(<AdhocMetricEditPopover {...props} />);
+  render(<AdhocMetricEditPopover {...props} />, {
+    useRedux: true,
+    initialState: { explore: {} },
+  });
  expect(screen.getByRole('tablist')).toBeVisible();
  expect(screen.getByRole('button', { name: 'Resize' })).toBeVisible();
  expect(screen.getByRole('button', { name: 'Save' })).toBeVisible();
@@ -82,7 +88,10 @@ test('Should render correct elements', () => {

 test('Should render correct elements for SQL', () => {
  const props = createProps();
-  render(<AdhocMetricEditPopover {...props} />);
+  render(<AdhocMetricEditPopover {...props} />, {
+    useRedux: true,
+    initialState: { explore: {} },
+  });
  expect(screen.getByRole('tab', { name: 'Custom SQL' })).toBeVisible();
  expect(screen.getByRole('tab', { name: 'Simple' })).toBeVisible();
  expect(screen.getByRole('tab', { name: 'Saved' })).toBeVisible();
@@ -94,7 +103,10 @@ test('Should render correct elements for allow ad-hoc metrics', () => {
    ...createProps(),
    datasource: { extra: '{"disallow_adhoc_metrics": false}' },
  };
-  render(<AdhocMetricEditPopover {...props} />);
+  render(<AdhocMetricEditPopover {...props} />, {
+    useRedux: true,
+    initialState: { explore: {} },
+  });
  expect(screen.getByRole('tab', { name: 'Custom SQL' })).toBeEnabled();
  expect(screen.getByRole('tab', { name: 'Simple' })).toBeEnabled();
  expect(screen.getByRole('tab', { name: 'Saved' })).toBeEnabled();
@@ -106,7 +118,10 @@ test('Should render correct elements for disallow ad-hoc metrics', () => {
    ...createProps(),
    datasource: { extra: '{"disallow_adhoc_metrics": true}' },
  };
-  render(<AdhocMetricEditPopover {...props} />);
+  render(<AdhocMetricEditPopover {...props} />, {
+    useRedux: true,
+    initialState: { explore: {} },
+  });
  expect(screen.getByRole('tab', { name: 'Custom SQL' })).toHaveAttribute(
    'aria-disabled',
    'true',
@@ -121,7 +136,10 @@ test('Should render correct elements for disallow ad-hoc metrics', () => {

 test('Clicking on "Close" should call onClose', () => {
  const props = createProps();
-  render(<AdhocMetricEditPopover {...props} />);
+  render(<AdhocMetricEditPopover {...props} />, {
+    useRedux: true,
+    initialState: { explore: {} },
+  });
  expect(props.onClose).toHaveBeenCalledTimes(0);
  userEvent.click(screen.getByRole('button', { name: 'Close' }));
  expect(props.onClose).toHaveBeenCalledTimes(1);
@@ -129,7 +147,10 @@ test('Clicking on "Close" should call onClose', () => {

 test('Clicking on "Save" should call onChange and onClose', async () => {
  const props = createProps();
-  render(<AdhocMetricEditPopover {...props} />);
+  render(<AdhocMetricEditPopover {...props} />, {
+    useRedux: true,
+    initialState: { explore: {} },
+  });
  expect(props.onChange).toHaveBeenCalledTimes(0);
  expect(props.onClose).toHaveBeenCalledTimes(0);
  userEvent.click(
@@ -145,7 +166,10 @@ test('Clicking on "Save" should call onChange and onClose', async () => {

 test('Clicking on "Save" should not call onChange and onClose', () => {
  const props = createProps();
-  render(<AdhocMetricEditPopover {...props} />);
+  render(<AdhocMetricEditPopover {...props} />, {
+    useRedux: true,
+    initialState: { explore: {} },
+  });
  expect(props.onChange).toHaveBeenCalledTimes(0);
  expect(props.onClose).toHaveBeenCalledTimes(0);
  userEvent.click(screen.getByRole('button', { name: 'Save' }));
@@ -155,7 +179,10 @@ test('Clicking on "Save" should not call onChange and onClose', () => {

 test('Clicking on "Save" should call onChange and onClose for new metric', () => {
  const props = createProps();
-  render(<AdhocMetricEditPopover {...props} isNewMetric />);
+  render(<AdhocMetricEditPopover {...props} isNewMetric />, {
+    useRedux: true,
+    initialState: { explore: {} },
+  });
  expect(props.onChange).toHaveBeenCalledTimes(0);
  expect(props.onClose).toHaveBeenCalledTimes(0);
  userEvent.click(screen.getByRole('button', { name: 'Save' }));
@@ -165,7 +192,10 @@ test('Clicking on "Save" should call onChange and onClose for new metric', () =>

 test('Clicking on "Save" should call onChange and onClose for new title', () => {
  const props = createProps();
-  render(<AdhocMetricEditPopover {...props} isLabelModified />);
+  render(<AdhocMetricEditPopover {...props} isLabelModified />, {
+    useRedux: true,
+    initialState: { explore: {} },
+  });
  expect(props.onChange).toHaveBeenCalledTimes(0);
  expect(props.onClose).toHaveBeenCalledTimes(0);
  userEvent.click(screen.getByRole('button', { name: 'Save' }));
@@ -178,7 +208,10 @@ test('Should switch to tab:Simple', () => {
  props.getCurrentTab.mockImplementation(tab => {
    props.adhocMetric.expressionType = tab;
  });
-  render(<AdhocMetricEditPopover {...props} />);
+  render(<AdhocMetricEditPopover {...props} />, {
+    useRedux: true,
+    initialState: { explore: {} },
+  });

  expect(screen.getByRole('tabpanel', { name: 'Saved' })).toBeVisible();
  expect(
@@ -202,7 +235,10 @@ test('Should render "Simple" tab correctly', () => {
  props.getCurrentTab.mockImplementation(tab => {
    props.adhocMetric.expressionType = tab;
  });
-  render(<AdhocMetricEditPopover {...props} />);
+  render(<AdhocMetricEditPopover {...props} />, {
+    useRedux: true,
+    initialState: { explore: {} },
+  });

  const tab = screen.getByRole('tab', { name: 'Simple' }).parentElement!;
  userEvent.click(tab);
@@ -216,7 +252,10 @@ test('Should switch to tab:Custom SQL', () => {
  props.getCurrentTab.mockImplementation(tab => {
    props.adhocMetric.expressionType = tab;
  });
-  render(<AdhocMetricEditPopover {...props} />);
+  render(<AdhocMetricEditPopover {...props} />, {
+    useRedux: true,
+    initialState: { explore: {} },
+  });

  expect(screen.getByRole('tabpanel', { name: 'Saved' })).toBeVisible();
  expect(
@@ -242,7 +281,10 @@ test('Should render "Custom SQL" tab correctly', async () => {
  props.getCurrentTab.mockImplementation(tab => {
    props.adhocMetric.expressionType = tab;
  });
-  render(<AdhocMetricEditPopover {...props} />);
+  render(<AdhocMetricEditPopover {...props} />, {
+    useRedux: true,
+    initialState: { explore: {} },
+  });

  const tab = screen.getByRole('tab', { name: 'Custom SQL' }).parentElement!;
  userEvent.click(tab);
@@ -286,7 +328,10 @@ test('Should filter saved metrics by metric_name and verbose_name', async () =>
      },
    ],
  };
-  render(<AdhocMetricEditPopover {...props} />);
+  render(<AdhocMetricEditPopover {...props} />, {
+    useRedux: true,
+    initialState: { explore: {} },
+  });

  const combobox = screen.getByRole('combobox', {
    name: 'Select saved metrics',
@@ -362,7 +407,10 @@ test('Should filter columns by column_name and verbose_name in Simple tab', asyn
  props.getCurrentTab.mockImplementation(tab => {
    props.adhocMetric.expressionType = tab;
  });
-  render(<AdhocMetricEditPopover {...props} />);
+  render(<AdhocMetricEditPopover {...props} />, {
+    useRedux: true,
+    initialState: { explore: {} },
+  });

  const tab = screen.getByRole('tab', { name: 'Simple' }).parentElement!;
  userEvent.click(tab);
--- a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.tsx
+++ b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.tsx
@@ -18,6 +18,7 @@
 */
 /* eslint-disable camelcase */
 import { PureComponent, createRef } from 'react';
+import { useSelector } from 'react-redux';
 import { isDefined, ensureIsArray, DatasourceType } from '@superset-ui/core';
 import { t } from '@apache-superset/core/translation';
 import type { editors } from '@apache-superset/core';
@@ -94,6 +95,8 @@ interface AdhocMetricEditPopoverProps {
  datasource?: DatasourceInfo;
  isNewMetric?: boolean;
  isLabelModified?: boolean;
+  /** Names of metrics the user may select; null means no filtering. */
+  compatibleMetrics?: string[] | null;
 }

 interface AdhocMetricEditPopoverState {
@@ -123,7 +126,7 @@ const StyledSelect = styled(Select)`

 export const SAVED_TAB_KEY = 'SAVED';

-export default class AdhocMetricEditPopover extends PureComponent<
+class AdhocMetricEditPopover extends PureComponent<
  AdhocMetricEditPopoverProps,
  AdhocMetricEditPopoverState
 > {
@@ -438,15 +441,24 @@ export default class AdhocMetricEditPopover extends PureComponent<
                ensureIsArray(savedMetricsOptions).length > 0 ? (
                  <FormItem label={t('Saved metric')}>
                    <StyledSelect
-                      options={ensureIsArray(savedMetricsOptions).map(
-                        savedMetric => ({
+                      options={[...ensureIsArray(savedMetricsOptions)]
+                        .sort((a, b) =>
+                          (a.metric_name ?? '').localeCompare(
+                            b.metric_name ?? '',
+                          ),
+                        )
+                        .map(savedMetric => ({
                          value: savedMetric.metric_name,
                          label: this.renderMetricOption(savedMetric),
                          key: savedMetric.id,
                          metric_name: savedMetric.metric_name,
                          verbose_name: savedMetric.verbose_name ?? '',
-                        }),
-                      )}
+                          disabled:
+                            this.props.compatibleMetrics != null &&
+                            !this.props.compatibleMetrics.includes(
+                              savedMetric.metric_name,
+                            ),
+                        }))}
                      optionFilterProps={['metric_name', 'verbose_name']}
                      {...savedSelectProps}
                    />
@@ -596,3 +608,20 @@ export default class AdhocMetricEditPopover extends PureComponent<
 }
 // @ts-expect-error - defaultProps for backward compatibility
 AdhocMetricEditPopover.defaultProps = defaultProps;
+
+// ---------------------------------------------------------------------------
+// Thin functional wrapper that injects compatibility data from Redux.
+// AdhocMetricEditPopover is a class component and cannot use hooks directly.
+// ---------------------------------------------------------------------------
+function AdhocMetricEditPopoverWithRedux(props: AdhocMetricEditPopoverProps) {
+  const compatibleMetrics = useSelector(
+    (state: any) =>
+      state.explore?.compatibleMetrics as string[] | null | undefined,
+  );
+  return (
+    <AdhocMetricEditPopover {...props} compatibleMetrics={compatibleMetrics} />
+  );
+}
+
+export { AdhocMetricEditPopover };
+export default AdhocMetricEditPopoverWithRedux;
--- a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricOption.test.tsx
+++ b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricOption.test.tsx
@@ -61,7 +61,11 @@ function setup(overrides: Record<string, unknown> = {}) {
    ...overrides,
  };
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return render(<AdhocMetricOption {...(props as any)} />, { useDnd: true });
+  return render(<AdhocMetricOption {...(props as any)} />, {
+    useDnd: true,
+    useRedux: true,
+    initialState: { explore: {} },
+  });
 }

 test('renders an overlay trigger wrapper for the label', () => {
--- a/superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.test.tsx
+++ b/superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.test.tsx
@@ -62,7 +62,10 @@ function setup(overrides: Record<string, unknown> = {}) {
    ...defaultProps,
    ...overrides,
  };
-  const result = render(<MetricsControl {...props} />, { useDnd: true });
+  const result = render(<MetricsControl {...props} />, {
+    useDnd: true,
+    useRedux: true,
+  });
  return { onChange, ...result };
 }

@@ -166,7 +169,7 @@ test('does not remove custom SQL metric if savedMetrics changes', async () => {
      ]}
      datasource={undefined}
    />,
-    { useDnd: true },
+    { useDnd: true, useRedux: true },
  );

  expect(screen.getByText('old label')).toBeInTheDocument();
--- a/superset-frontend/src/explore/controls.tsx
+++ b/superset-frontend/src/explore/controls.tsx
@@ -64,6 +64,7 @@ import {
  validateNonEmpty,
 } from '@superset-ui/core';
 import { t } from '@apache-superset/core/translation';
+import { datasetLabel } from 'src/features/semanticLayers/label';
 import { formatSelectOptions } from 'src/explore/exploreUtils';
 import { TIME_FILTER_LABELS } from './constants';
 import { StyledColumnOption } from './components/optionRenderers';
@@ -214,7 +215,7 @@ export const controls = {

  datasource: {
    type: 'DatasourceControl',
-    label: t('Dataset'),
+    label: datasetLabel(),
    default: null,
    description: null,
    mapStateToProps: ({ datasource }: ControlState) => ({
--- a/superset-frontend/src/explore/reducers/exploreReducer.ts
+++ b/superset-frontend/src/explore/reducers/exploreReducer.ts
@@ -70,6 +70,9 @@ export interface ExploreState {
  metadata?: {
    owners?: string[] | null;
  };
+  compatibleMetrics?: string[] | null;
+  compatibleDimensions?: string[] | null;
+  compatibilityLoading?: boolean;
  saveAction?: SaveActionType | null;
  chartStates?: Record<number, JsonObject>;
 }
@@ -178,6 +181,13 @@ interface UpdateExploreChartStateAction {
  lastModified: number;
 }

+interface SetCompatibilityAction {
+  type: typeof actions.SET_COMPATIBILITY;
+  compatibleMetrics: string[] | null;
+  compatibleDimensions: string[] | null;
+  compatibilityLoading: boolean;
+}
+
 type ExploreAction =
  | DynamicPluginControlsReadyAction
  | ToggleFaveStarAction
@@ -197,6 +207,7 @@ type ExploreAction =
  | SliceUpdatedAction
  | SetForceQueryAction
  | UpdateExploreChartStateAction
+  | SetCompatibilityAction
  | HydrateExplore;

 // Extended control state for dynamic form controls - uses Record for flexibility
@@ -635,6 +646,15 @@ export default function exploreReducer(
        force: typedAction.force,
      };
    },
+    [actions.SET_COMPATIBILITY]() {
+      const typedAction = action as SetCompatibilityAction;
+      return {
+        ...state,
+        compatibleMetrics: typedAction.compatibleMetrics,
+        compatibleDimensions: typedAction.compatibleDimensions,
+        compatibilityLoading: typedAction.compatibilityLoading,
+      };
+    },
    [actions.UPDATE_EXPLORE_CHART_STATE]() {
      const typedAction = action as UpdateExploreChartStateAction;
      return {
--- a/superset-frontend/src/explore/store.test.tsx
+++ b/superset-frontend/src/explore/store.test.tsx
@@ -17,55 +17,359 @@
 * under the License.
 */
 import { getChartControlPanelRegistry } from '@superset-ui/core';
-import { applyDefaultFormData } from 'src/explore/store';
+import {
+  applyDefaultFormData,
+  getControlsState,
+  handleDeprecatedControls,
+} from 'src/explore/store';

-// eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
-describe('store', () => {
-  beforeAll(() => {
-    getChartControlPanelRegistry().registerValue('test-chart', {
-      controlPanelSections: [
-        {
-          label: 'Test section',
-          expanded: true,
-          controlSetRows: [['row_limit']],
-        },
-      ],
-    });
-  });
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+(window as any).featureFlags = {};

-  afterAll(() => {
-    getChartControlPanelRegistry().remove('test-chart');
-  });
-
-  // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
-  describe('applyDefaultFormData', () => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (window as any).featureFlags = {};
-
-    test('applies default to formData if the key is missing', () => {
-      const inputFormData = {
-        datasource: '11_table',
-        viz_type: 'test-chart',
-      };
-      let outputFormData = applyDefaultFormData(inputFormData);
-      expect(outputFormData.row_limit).toEqual(10000);
-
-      const inputWithRowLimit = {
-        ...inputFormData,
-        row_limit: 888,
-      };
-      outputFormData = applyDefaultFormData(inputWithRowLimit);
-      expect(outputFormData.row_limit).toEqual(888);
-    });
-
-    test('keeps null if key is defined with null', () => {
-      const inputFormData = {
-        datasource: '11_table',
-        viz_type: 'test-chart',
-        row_limit: null,
-      };
-      const outputFormData = applyDefaultFormData(inputFormData);
-      expect(outputFormData.row_limit).toBe(null);
-    });
+beforeAll(() => {
+  getChartControlPanelRegistry().registerValue('test-chart', {
+    controlPanelSections: [
+      {
+        label: 'Test section',
+        expanded: true,
+        controlSetRows: [['row_limit']],
+      },
+    ],
  });
 });
+
+afterAll(() => {
+  getChartControlPanelRegistry().remove('test-chart');
+});
+
+// Helper: build ExploreState for getControlsState
+const buildExploreState = (controlOverrides: Record<string, any> = {}) => ({
+  datasource: { type: 'table' },
+  controls: Object.fromEntries(
+    Object.entries(controlOverrides).map(([k, v]) => [k, { value: v }]),
+  ),
+});
+
+// ============================================================
+// Existing applyDefaultFormData tests
+// ============================================================
+
+test('applyDefaultFormData applies default to formData if the key is missing', () => {
+  const inputFormData = {
+    datasource: '11_table',
+    viz_type: 'test-chart',
+  };
+  let outputFormData = applyDefaultFormData(inputFormData);
+  expect(outputFormData.row_limit).toEqual(10000);
+
+  const inputWithRowLimit = {
+    ...inputFormData,
+    row_limit: 888,
+  };
+  outputFormData = applyDefaultFormData(inputWithRowLimit);
+  expect(outputFormData.row_limit).toEqual(888);
+});
+
+test('applyDefaultFormData keeps null if key is defined with null', () => {
+  const inputFormData = {
+    datasource: '11_table',
+    viz_type: 'test-chart',
+    row_limit: null,
+  };
+  const outputFormData = applyDefaultFormData(inputFormData);
+  expect(outputFormData.row_limit).toBe(null);
+});
+
+// ============================================================
+// Migration tests: handleDeprecatedControls normalizes stale matrixify modes
+// (fix for apache/superset#38519 regression — guards validators AND
+// downstream UI consumers that infer matrixify state from mode values)
+// ============================================================
+
+test('getControlsState resets stale matrixify_mode_rows to disabled when matrixify_enable key absent', () => {
+  const state = buildExploreState();
+  const formData = {
+    datasource: '1__table',
+    viz_type: 'test-chart',
+    matrixify_mode_rows: 'dimensions', // stale pre-revamp default
+  };
+
+  const result = getControlsState(state as any, formData as any);
+  const modeControl = result.matrixify_mode_rows as any;
+  expect(modeControl?.value).toBe('disabled');
+});
+
+test('getControlsState resets stale matrixify_mode_columns to disabled when matrixify_enable key absent', () => {
+  const state = buildExploreState();
+  const formData = {
+    datasource: '1__table',
+    viz_type: 'test-chart',
+    matrixify_mode_columns: 'metrics', // stale pre-revamp default
+  };
+
+  const result = getControlsState(state as any, formData as any);
+  const modeControl = result.matrixify_mode_columns as any;
+  expect(modeControl?.value).toBe('disabled');
+});
+
+test('getControlsState preserves matrixify mode values when matrixify_enable is true', () => {
+  const state = buildExploreState();
+  const formData = {
+    datasource: '1__table',
+    viz_type: 'test-chart',
+    matrixify_enable: true,
+    matrixify_mode_rows: 'dimensions',
+  };
+
+  const result = getControlsState(state as any, formData as any);
+  const modeControl = result.matrixify_mode_rows as any;
+  expect(modeControl?.value).toBe('dimensions');
+});
+
+test('getControlsState preserves matrixify mode values when matrixify_enable is explicitly false', () => {
+  const state = buildExploreState();
+  const formData = {
+    datasource: '1__table',
+    viz_type: 'test-chart',
+    matrixify_enable: false,
+    matrixify_mode_rows: 'dimensions',
+  };
+
+  const result = getControlsState(state as any, formData as any);
+  const modeControl = result.matrixify_mode_rows as any;
+  // matrixify_enable key IS present (just false) — migration does NOT fire
+  expect(modeControl?.value).toBe('dimensions');
+});
+
+test('getControlsState is idempotent when matrixify modes already disabled', () => {
+  const state = buildExploreState();
+  const formData = {
+    datasource: '1__table',
+    viz_type: 'test-chart',
+    matrixify_mode_rows: 'disabled',
+    matrixify_mode_columns: 'disabled',
+  };
+
+  const result = getControlsState(state as any, formData as any);
+  expect((result.matrixify_mode_rows as any)?.value).toBe('disabled');
+  expect((result.matrixify_mode_columns as any)?.value).toBe('disabled');
+});
+
+test('getControlsState handles form_data with no matrixify keys', () => {
+  const state = buildExploreState();
+  const formData = {
+    datasource: '1__table',
+    viz_type: 'test-chart',
+  };
+
+  const result = getControlsState(state as any, formData as any);
+  // Controls should get their defaults — matrixify_mode defaults to 'disabled'
+  expect((result.matrixify_mode_rows as any)?.value).toBe('disabled');
+  expect((result.matrixify_mode_columns as any)?.value).toBe('disabled');
+});
+
+test('getControlsState round-trip: pre-revamp form_data produces no matrixify validation errors', () => {
+  // Simulate a chart saved before #38519 with stale matrixify defaults
+  // Empty controls: on real first-load hydration, no pre-existing controls exist
+  const state = buildExploreState();
+  const preRevampFormData = {
+    datasource: '1__table',
+    viz_type: 'test-chart',
+    // Stale old defaults — no matrixify_enable key (legacy chart)
+    matrixify_mode_rows: 'dimensions',
+    matrixify_mode_columns: 'metrics',
+  };
+
+  const result = getControlsState(state as any, preRevampFormData as any);
+
+  // Every matrixify control should have zero validation errors
+  const matrixifyControlEntries = Object.entries(result).filter(([name]) =>
+    name.startsWith('matrixify_'),
+  );
+  const controlsWithErrors = matrixifyControlEntries.filter(
+    ([, control]) => (control as any)?.validationErrors?.length > 0,
+  );
+
+  expect(controlsWithErrors).toEqual([]);
+});
+
+// ============================================================
+// Dashboard hydration: applyDefaultFormData with stale form_data
+// ============================================================
+
+test('applyDefaultFormData normalizes stale matrixify modes for legacy charts', () => {
+  // Dashboard hydration now runs handleDeprecatedControls too, so stale
+  // matrixify modes from pre-revamp charts are normalized to 'disabled'.
+  // This protects downstream consumers (ChartContextMenu, DrillBySubmenu,
+  // ChartRenderer) that infer "matrixify is active" from mode values alone.
+  const preRevampFormData = {
+    datasource: '1__table',
+    viz_type: 'test-chart',
+    matrixify_mode_rows: 'dimensions',
+    matrixify_mode_columns: 'metrics',
+    // No matrixify_enable key — legacy chart that never used matrixify
+  };
+
+  const outputFormData = applyDefaultFormData(preRevampFormData as any);
+
+  // Stale values are now normalized to 'disabled'
+  expect(outputFormData.matrixify_mode_rows).toBe('disabled');
+  expect(outputFormData.matrixify_mode_columns).toBe('disabled');
+  expect(outputFormData.matrixify_enable).toBe(false);
+});
+
+// ============================================================
+// P1: Pre-revamp charts that actually used matrixify via old per-axis flags
+// (matrixify_enable_vertical_layout / matrixify_enable_horizontal_layout)
+// ============================================================
+
+test('getControlsState preserves modes and sets matrixify_enable when old vertical flag is true', () => {
+  const state = buildExploreState();
+  const formData = {
+    datasource: '1__table',
+    viz_type: 'test-chart',
+    matrixify_enable_vertical_layout: true,
+    matrixify_mode_rows: 'dimensions',
+    matrixify_mode_columns: 'metrics',
+  };
+
+  const result = getControlsState(state as any, formData as any);
+  // Vertical layout was enabled — rows mode preserved, matrixify_enable migrated
+  expect((result.matrixify_mode_rows as any)?.value).toBe('dimensions');
+  expect((result.matrixify_enable as any)?.value).toBe(true);
+  // Horizontal layout was NOT enabled — columns mode reset
+  expect((result.matrixify_mode_columns as any)?.value).toBe('disabled');
+});
+
+test('getControlsState preserves modes and sets matrixify_enable when old horizontal flag is true', () => {
+  const state = buildExploreState();
+  const formData = {
+    datasource: '1__table',
+    viz_type: 'test-chart',
+    matrixify_enable_horizontal_layout: true,
+    matrixify_mode_rows: 'dimensions',
+    matrixify_mode_columns: 'metrics',
+  };
+
+  const result = getControlsState(state as any, formData as any);
+  // Horizontal layout was enabled — columns mode preserved, matrixify_enable migrated
+  expect((result.matrixify_mode_columns as any)?.value).toBe('metrics');
+  expect((result.matrixify_enable as any)?.value).toBe(true);
+  // Vertical layout was NOT enabled — rows mode reset
+  expect((result.matrixify_mode_rows as any)?.value).toBe('disabled');
+});
+
+test('getControlsState preserves both modes when both old per-axis flags are true', () => {
+  const state = buildExploreState();
+  const formData = {
+    datasource: '1__table',
+    viz_type: 'test-chart',
+    matrixify_enable_vertical_layout: true,
+    matrixify_enable_horizontal_layout: true,
+    matrixify_mode_rows: 'dimensions',
+    matrixify_mode_columns: 'metrics',
+  };
+
+  const result = getControlsState(state as any, formData as any);
+  expect((result.matrixify_mode_rows as any)?.value).toBe('dimensions');
+  expect((result.matrixify_mode_columns as any)?.value).toBe('metrics');
+  expect((result.matrixify_enable as any)?.value).toBe(true);
+});
+
+test('getControlsState resets modes when old per-axis flags are explicitly false', () => {
+  const state = buildExploreState();
+  const formData = {
+    datasource: '1__table',
+    viz_type: 'test-chart',
+    matrixify_enable_vertical_layout: false,
+    matrixify_enable_horizontal_layout: false,
+    matrixify_mode_rows: 'dimensions',
+    matrixify_mode_columns: 'metrics',
+  };
+
+  const result = getControlsState(state as any, formData as any);
+  // Old flags present but false — chart never used matrixify, reset stale modes
+  expect((result.matrixify_mode_rows as any)?.value).toBe('disabled');
+  expect((result.matrixify_mode_columns as any)?.value).toBe('disabled');
+});
+
+// ============================================================
+// P2: Dashboard hydration (applyDefaultFormData) with old per-axis flags
+// ============================================================
+
+test('applyDefaultFormData preserves modes when old vertical flag is true', () => {
+  const formData = {
+    datasource: '1__table',
+    viz_type: 'test-chart',
+    matrixify_enable_vertical_layout: true,
+    matrixify_mode_rows: 'dimensions',
+    matrixify_mode_columns: 'metrics',
+  };
+
+  const outputFormData = applyDefaultFormData(formData as any);
+  expect(outputFormData.matrixify_mode_rows).toBe('dimensions');
+  expect(outputFormData.matrixify_enable).toBe(true);
+  // Horizontal not enabled — columns reset
+  expect(outputFormData.matrixify_mode_columns).toBe('disabled');
+});
+
+test('applyDefaultFormData preserves modes when both old flags are true', () => {
+  const formData = {
+    datasource: '1__table',
+    viz_type: 'test-chart',
+    matrixify_enable_vertical_layout: true,
+    matrixify_enable_horizontal_layout: true,
+    matrixify_mode_rows: 'dimensions',
+    matrixify_mode_columns: 'metrics',
+  };
+
+  const outputFormData = applyDefaultFormData(formData as any);
+  expect(outputFormData.matrixify_mode_rows).toBe('dimensions');
+  expect(outputFormData.matrixify_mode_columns).toBe('metrics');
+  expect(outputFormData.matrixify_enable).toBe(true);
+});
+
+// ============================================================
+// Direct handleDeprecatedControls tests: verify form_data mutation
+// so callers (hydrateExplore) can propagate migrated fields into state
+// ============================================================
+
+test('handleDeprecatedControls sets matrixify_enable on form_data when old vertical flag is true', () => {
+  const formData: any = {
+    matrixify_enable_vertical_layout: true,
+    matrixify_mode_rows: 'dimensions',
+    matrixify_mode_columns: 'metrics',
+  };
+  handleDeprecatedControls(formData);
+
+  expect(formData.matrixify_enable).toBe(true);
+  expect(formData.matrixify_mode_rows).toBe('dimensions');
+  // Horizontal not enabled — columns reset
+  expect(formData.matrixify_mode_columns).toBe('disabled');
+});
+
+test('handleDeprecatedControls resets modes when no matrixify_enable and no old flags', () => {
+  const formData: any = {
+    matrixify_mode_rows: 'dimensions',
+    matrixify_mode_columns: 'metrics',
+  };
+  handleDeprecatedControls(formData);
+
+  expect(formData.matrixify_enable).toBeUndefined();
+  expect(formData.matrixify_mode_rows).toBe('disabled');
+  expect(formData.matrixify_mode_columns).toBe('disabled');
+});
+
+test('handleDeprecatedControls is idempotent — no-op when matrixify_enable already present', () => {
+  const formData: any = {
+    matrixify_enable: true,
+    matrixify_mode_rows: 'dimensions',
+    matrixify_mode_columns: 'metrics',
+  };
+  handleDeprecatedControls(formData);
+
+  // No mutation — matrixify_enable key is present
+  expect(formData.matrixify_enable).toBe(true);
+  expect(formData.matrixify_mode_rows).toBe('dimensions');
+  expect(formData.matrixify_mode_columns).toBe('metrics');
+});
--- a/superset-frontend/src/explore/store.ts
+++ b/superset-frontend/src/explore/store.ts
@@ -41,9 +41,16 @@ type FormData = QueryFormData & {
  y_axis_zero?: boolean;
  y_axis_bounds?: [number | null, number | null];
  datasource?: string;
+  matrixify_enable?: boolean;
+  matrixify_mode_rows?: string;
+  matrixify_mode_columns?: string;
+  // Pre-revamp per-axis enable flags (removed in #38519, may still exist in
+  // persisted form_data for charts that actually used matrixify)
+  matrixify_enable_vertical_layout?: boolean;
+  matrixify_enable_horizontal_layout?: boolean;
 };

-function handleDeprecatedControls(formData: FormData): void {
+export function handleDeprecatedControls(formData: FormData): void {
  // Reaffectation / handling of deprecated controls
  /* eslint-disable no-param-reassign */

@@ -51,6 +58,37 @@ function handleDeprecatedControls(formData: FormData): void {
  if (formData.y_axis_zero) {
    formData.y_axis_bounds = [0, null];
  }
+
+  // #38519: migrate pre-revamp matrixify controls to the new single-toggle
+  // system. Before the revamp, per-axis enable flags
+  // (matrixify_enable_vertical_layout / matrixify_enable_horizontal_layout)
+  // gated visibility, and matrixify_mode_rows/columns defaulted to
+  // non-disabled values ('dimensions'/'metrics'). The revamp replaced those
+  // with a single matrixify_enable toggle and mode default 'disabled'.
+  //
+  // Charts that actually used matrixify pre-revamp have the old per-axis
+  // flags set to true — we must preserve their modes and set
+  // matrixify_enable: true. Charts that never used matrixify (or predate it)
+  // need stale mode defaults reset to 'disabled' because 4 downstream UI
+  // consumers (ExploreChartPanel, ChartContextMenu, DrillBySubmenu,
+  // ChartRenderer) infer "matrixify is active" from mode values alone.
+  if (!('matrixify_enable' in formData)) {
+    const hadVerticalLayout =
+      formData.matrixify_enable_vertical_layout === true;
+    const hadHorizontalLayout =
+      formData.matrixify_enable_horizontal_layout === true;
+
+    if (hadVerticalLayout || hadHorizontalLayout) {
+      // Pre-revamp chart that genuinely used matrixify — migrate to new flag
+      formData.matrixify_enable = true;
+      if (!hadVerticalLayout) formData.matrixify_mode_rows = 'disabled';
+      if (!hadHorizontalLayout) formData.matrixify_mode_columns = 'disabled';
+    } else {
+      // Never used matrixify — reset stale defaults
+      formData.matrixify_mode_rows = 'disabled';
+      formData.matrixify_mode_columns = 'disabled';
+    }
+  }
 }

 export function getControlsState(
@@ -89,25 +127,31 @@ export function getControlsState(
 export function applyDefaultFormData(
  inputFormData: FormData,
 ): Record<string, unknown> {
-  const datasourceType = inputFormData.datasource?.split('__')[1] ?? '';
-  const vizType = inputFormData.viz_type;
+  // Normalize deprecated controls before building control state — ensures
+  // stale matrixify modes are cleaned on the dashboard hydration path too,
+  // not just the explore path (getControlsState).
+  const cleanedFormData = { ...inputFormData };
+  handleDeprecatedControls(cleanedFormData);
+
+  const datasourceType = cleanedFormData.datasource?.split('__')[1] ?? '';
+  const vizType = cleanedFormData.viz_type;
  const controlsState = getAllControlsState(
    vizType,
    datasourceType as DatasourceType,
    null,
-    inputFormData,
+    cleanedFormData,
  );
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
  const controlFormData = getFormDataFromControls(controlsState as any);

  const formData: Record<string, unknown> = {};
  Object.keys(controlsState)
-    .concat(Object.keys(inputFormData))
+    .concat(Object.keys(cleanedFormData))
    .forEach(controlName => {
-      if (inputFormData[controlName as keyof FormData] === undefined) {
+      if (cleanedFormData[controlName as keyof FormData] === undefined) {
        formData[controlName] = controlFormData[controlName];
      } else {
-        formData[controlName] = inputFormData[controlName as keyof FormData];
+        formData[controlName] = cleanedFormData[controlName as keyof FormData];
      }
    });

--- a/superset-frontend/src/explore/types.ts
+++ b/superset-frontend/src/explore/types.ts
@@ -71,6 +71,8 @@ export type OptionSortType = Partial<

 export type Datasource = Dataset & {
  database?: DatabaseObject;
+  /** The parent resource that owns this datasource (database or semantic layer). */
+  parent?: { name: string };
  datasource?: string;
  catalog?: string | null;
  schema?: string;
@@ -131,6 +133,9 @@ export interface ExplorePageState {
    standalone: boolean;
    force: boolean;
    common: JsonObject;
+    compatibleMetrics?: string[] | null;
+    compatibleDimensions?: string[] | null;
+    compatibilityLoading?: boolean;
  };
  sliceEntities?: JsonObject; // propagated from Dashboard view
 }
--- a/superset-frontend/src/features/home/Menu.tsx
+++ b/superset-frontend/src/features/home/Menu.tsx
@@ -35,6 +35,7 @@ import {
  MenuObjectProps,
  MenuData,
 } from 'src/types/bootstrapTypes';
+import { datasetsLabel } from 'src/features/semanticLayers/label';
 import RightMenu from './RightMenu';
 import { NAVBAR_MENU_POPUP_OFFSET } from './commonMenuData';

@@ -223,7 +224,7 @@ export function Menu({
        setActiveTabs(['Charts']);
        break;
      case path.startsWith(Paths.Datasets):
-        setActiveTabs(['Datasets']);
+        setActiveTabs([datasetsLabel()]);
        break;
      case path.startsWith(Paths.SqlLab) || path.startsWith(Paths.SavedQueries):
        setActiveTabs(['SQL']);
@@ -408,6 +409,12 @@ export default function MenuWrapper({ data, ...rest }: MenuProps) {
    Manage: true,
  };

+  // Remap labels that depend on feature flags so they stay in sync with
+  // the active-tab key used in the Menu component above.
+  const labelOverrides: Record<string, () => string> = {
+    Datasets: datasetsLabel,
+  };
+
  // Cycle through menu.menu to build out cleanedMenu and settings
  const cleanedMenu: MenuObjectProps[] = [];
  const settings: MenuObjectProps[] = [];
@@ -419,6 +426,10 @@ export default function MenuWrapper({ data, ...rest }: MenuProps) {
    const children: (MenuObjectProps | string)[] = [];
    const newItem = {
      ...item,
+      // Apply any label override for this item (keyed by FAB internal name).
+      ...(item.name && labelOverrides[item.name]
+        ? { label: labelOverrides[item.name]() }
+        : {}),
    };

    // Filter childs
--- a/superset-frontend/src/features/home/SubMenu.tsx
+++ b/superset-frontend/src/features/home/SubMenu.tsx
@@ -149,6 +149,7 @@ export interface ButtonProps {
  buttonStyle: 'primary' | 'secondary' | 'dashed' | 'link' | 'tertiary';
  loading?: boolean;
  icon?: ReactNode;
+  component?: ReactNode;
 }

 export interface SubMenuProps {
@@ -312,18 +313,22 @@ const SubMenuComponent: FunctionComponent<SubMenuProps> = props => {
                ),
            }))}
          />
-          {props.buttons?.map((btn, i) => (
-            <Button
-              key={i}
-              buttonStyle={btn.buttonStyle}
-              icon={btn.icon}
-              onClick={btn.onClick}
-              data-test={btn['data-test']}
-              loading={btn.loading ?? false}
-            >
-              {btn.name}
-            </Button>
-          ))}
+          {props.buttons?.map((btn, i) =>
+            btn.component ? (
+              <span key={i}>{btn.component}</span>
+            ) : (
+              <Button
+                key={i}
+                buttonStyle={btn.buttonStyle}
+                icon={btn.icon}
+                onClick={btn.onClick}
+                data-test={btn['data-test']}
+                loading={btn.loading ?? false}
+              >
+                {btn.name}
+              </Button>
+            ),
+          )}
        </div>
      </Row>
      {props.children}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Amin Ghadersohi	18e8217498	test(mcp): add -> None return types and remove redundant ToolError import	2026-05-07 16:55:35 +00:00
Amin Ghadersohi	32234ea0bb	test(mcp): add -> None return types and remove redundant ToolError import All 6 new test methods in TestListDatasetsRequestWrapper were missing the required -> None return type annotation (Rule 12). Also remove the inline `from fastmcp.exceptions import ToolError` in test_flat_kwargs_rejected since ToolError is already imported at module top-level (line 27).	2026-05-07 16:55:35 +00:00
Amin Ghadersohi	a2b0f64176	fix(mcp): use valid opr value in docstring filter examples; fix dashboard docstring test - Replace opr:"ct" with opr:"sw" in filter examples in list_datasets, list_charts, and list_dashboards docstrings — "ct" is not a valid ColumnOperatorEnum value, so examples using it produce validation errors - Fix TestDashboardSortableColumns.test_sortable_columns_in_docstring: assertion checked for "Sortable columns for order_column:" (plain text) but docstring uses RST backtick format; split into two substring checks matching "Sortable columns for" and "order_column" separately	2026-05-07 16:55:35 +00:00
Amin Ghadersohi	4d66dc0774	test(mcp): fix and strengthen TestListDatasetsRequestWrapper tests - Fix test_sortable_columns_in_docstring: assertion used plain-text match but docstring now uses RST backtick format; use substring check for both 'Sortable columns for' and 'order_column' separately - Fix test_dataset_filter_valid_col: opr='ct' is not a valid ColumnOperatorEnum value; use opr='sw' (starts-with) instead - Add test_request_wrapper_enforced_by_tool: exercises the wrapper pattern through the actual FastMCP client call (not just schema instantiation), verifying the MCP tool layer accepts request={...} correctly - Strengthen test_flat_kwargs_rejected: assert that the ToolError message references the unexpected arguments ('search', 'Unexpected', or 'request') so the test cannot pass on unrelated failures	2026-05-07 16:55:35 +00:00
Amin Ghadersohi	5542a2f3b1	fix(mcp): clarify request wrapper pattern in list_datasets, list_charts, list_dashboards LLMs consistently passed flat kwargs (search, page, page_size) to list_* tools instead of wrapping them in the required `request` object, causing pydantic validation errors. - Add docstring usage examples to list_datasets, list_charts, and list_dashboards showing the correct `request={...}` call shape and explicitly warning against flat kwargs - Enumerate valid filter columns directly in DatasetFilter, ChartFilter, and DashboardFilter field descriptions (e.g. `created_by_fk` is not a valid dataset filter col) - Add TestListDatasetsRequestWrapper tests covering: correct request wrapper usage, default values, valid/invalid filter col validation, and the flat-kwargs rejection scenario from story #105712 - Allow E501 in list_*.py tool files (docstring examples need full request shapes to be instructive)	2026-05-07 16:55:35 +00:00
Richard Fogaca Nienkotter	8c80caefa3	fix(explore): preserve preview chart name on save (#39908 )	2026-05-07 13:08:28 -03:00
Richard Fogaca Nienkotter	8088c5d1de	fix(dashboard): match auto-refresh paused-dot outline to icon color (#39909 )	2026-05-07 13:07:52 -03:00
Amin Ghadersohi	9b520312a1	fix(mcp): use tiktoken for response-size-guard token estimation (#39912 )	2026-05-07 11:51:31 -04:00
Amin Ghadersohi	9ac4711ac8	fix(mcp): prevent DetachedInstanceError in get_chart_preview (#39921 )	2026-05-07 11:44:11 -04:00
dependabot[bot]	7593d2a164	chore(deps): bump caniuse-lite from 1.0.30001791 to 1.0.30001792 in /docs (#39933 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-05-07 21:57:29 +07:00
dependabot[bot]	d3c44e311e	chore(deps): bump aws-actions/amazon-ecr-login from 2.1.4 to 2.1.5 (#39931 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-05-07 21:54:59 +07:00
Enzo Martellucci	b5186d1c65	fix(reports): keep body sized so standalone screenshots don't time out (#39944 )	2026-05-07 12:26:50 +02:00
bdonovan1	5b5dd01028	fix(sqla): parenthesize calculated column expressions in WHERE clause (#39793 ) Co-authored-by: Brian Donovan <briand@netflix.com> Co-authored-by: Vitor Avila <96086495+Vitor-Avila@users.noreply.github.com>	2026-05-06 19:45:27 -03:00
bialkou	4aa4415d8f	fix(i18n): update Russian translations (#39589 ) Co-authored-by: bito-code-review[bot] <188872107+bito-code-review[bot]@users.noreply.github.com>	2026-05-06 13:05:23 -04:00
Sebastian Mohr	e667ceb6cf	feat(themes): expose active theme mode via data-theme-mode attribute (#39063 )	2026-05-06 18:17:54 +03:00
Enzo Martellucci	9aaa12c7d4	fix(reports): preserve urlParams in multi-tab report fan-out (#39884 )	2026-05-06 16:29:45 +02:00
Alexandru Soare	adfbbf1433	fix(sql): quote identifiers in transpile_to_dialect to fix case-sensitive column filters (#39521 )	2026-05-06 10:53:09 +03:00
dependabot[bot]	d7663a9a1c	chore(deps-dev): update denodo-sqlalchemy requirement from ~=1.0.6 to >=1.0.6,<2.1.0 (#39832 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-05-05 22:17:21 -07:00
dependabot[bot]	7290d3c452	chore(deps-dev): update pyathena requirement from <3,>=2 to >=2,<4 (#39830 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-05-05 22:17:00 -07:00
dependabot[bot]	d7beffcec1	chore(deps-dev): bump eslint-plugin-react-you-might-not-need-an-effect from 0.9.3 to 0.10.0 in /superset-frontend (#39853 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-05-05 22:15:10 -07:00
dependabot[bot]	f018b67895	chore(deps-dev): update sqlalchemy-vertica-python requirement from <0.6,>=0.5.9 to >=0.5.9,<0.7 (#39831 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-05-05 22:14:08 -07:00
dependabot[bot]	5e2c6d8c9e	chore(deps): bump nanoid from 5.1.9 to 5.1.11 in /superset-frontend (#39820 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-05-05 22:13:52 -07:00
dependabot[bot]	b305c8681c	chore(deps-dev): update impyla requirement from <0.17,>0.16.2 to >0.16.2,<0.23 (#39833 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-05-05 22:09:37 -07:00
dependabot[bot]	d578fa1949	chore(deps): bump @deck.gl/mapbox from 9.3.1 to 9.3.2 in /superset-frontend (#39814 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Đỗ Trọng Hải <41283691+hainenber@users.noreply.github.com>	2026-05-05 22:09:33 -07:00
dependabot[bot]	14d28c34fd	chore(deps-dev): update cx-oracle requirement from <8.1,>8.0.0 to >8.0.0,<8.4 (#39753 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-05-05 22:05:54 -07:00
dependabot[bot]	c06aee8513	chore(deps-dev): bump jsdom from 29.1.0 to 29.1.1 in /superset-frontend (#39815 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Đỗ Trọng Hải <41283691+hainenber@users.noreply.github.com>	2026-05-05 22:04:47 -07:00
dependabot[bot]	d0ef19953a	chore(deps): bump memoize-one from 5.2.1 to 6.0.0 in /superset-frontend/plugins/plugin-chart-ag-grid-table (#37910 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Evan Rusackas <evan@rusackas.com>	2026-05-05 21:38:49 -07:00
Vitor Avila	3745e37182	fix(OAuth2): Support OAuth2 exception with legacy endpoint (#39897 )	2026-05-05 21:21:48 -03:00
Joe Li	4b17ac2629	fix(explore): add matrixify_enable guard to prevent stale validators on pre-revamp charts (#38765 ) Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>	2026-05-05 16:45:38 -07:00
Amin Ghadersohi	4a21a5365f	fix(mcp): validate column refs in generate_explore_link, update_chart_preview, and update_chart (#39797 )	2026-05-05 19:12:31 -04:00
Richard Fogaca Nienkotter	9459bc7bf4	fix(mcp): warn on invalid chart preview form data key (#39891 ) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-05-05 16:40:00 -03:00
Beto Dealmeida	cb53745d43	feat: semantic layer extension (#37815 )	2026-05-05 12:07:46 -04:00
jesperct	9e91ae8cff	fix(colors): reassign colliding series when dashboard locks shared dimension color (#39297 ) Co-authored-by: codeant-ai-for-open-source[bot] <244253245+codeant-ai-for-open-source[bot]@users.noreply.github.com>	2026-05-05 08:38:19 -07:00
jesperct	5b5f23d127	test(plugin-chart-echarts): regression guards for temporal x-axis labels on timeseries charts (#39208 )	2026-05-05 08:37:35 -07:00
Mehmet Salih Yavuz	8173cfe9e3	fix(CollectionControl): assign stable ids to keyless items (#39862 )	2026-05-05 17:52:36 +03:00
Mehmet Salih Yavuz	586de12a05	fix(embedded): prevent duplicate React root on rehandshake (#39860 )	2026-05-05 17:52:01 +03:00
dependabot[bot]	d6188374b4	chore(deps): bump docusaurus-theme-openapi-docs from 5.0.1 to 5.0.2 in /docs (#39846 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-05-05 09:16:53 +07:00
dependabot[bot]	2edae162f0	chore(deps): bump baseline-browser-mapping from 2.10.24 to 2.10.27 in /docs (#39848 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-05-05 09:16:33 +07:00
dependabot[bot]	e80207218b	chore(deps-dev): bump eslint from 10.2.1 to 10.3.0 in /superset-websocket (#39843 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-05-04 17:02:27 -07:00
Beto Dealmeida	76955017eb	chore: bump shillelagh to 1.4.4 (#39870 )	2026-05-04 19:39:38 -04:00
Beto Dealmeida	5325b87e73	fix(clickhouse): prevent expensive table scan (#39867 )	2026-05-04 19:39:10 -04:00
Đỗ Trọng Hải	e76318633e	fix(helm): allow chart to work out-of-the-box with legacy Bitnami images (#39839 ) Signed-off-by: hainenber <dotronghai96@gmail.com>	2026-05-04 15:54:01 -07:00
Sam Firke	c2725e86f3	fix(markdown): Allow "target" attribute (#39868 )	2026-05-04 18:27:43 -04:00
dependabot[bot]	2f605724e7	chore(deps-dev): bump globals from 17.5.0 to 17.6.0 in /superset-websocket (#39844 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-05-04 15:09:36 -07:00
dependabot[bot]	ebb02d0ecf	chore(deps): bump @swc/core from 1.15.32 to 1.15.33 in /docs (#39845 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-05-04 15:09:21 -07:00
dependabot[bot]	319b8a1124	chore(deps-dev): bump globals from 17.5.0 to 17.6.0 in /docs (#39847 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-05-04 15:08:59 -07:00
dependabot[bot]	2be971ce77	chore(deps): bump docusaurus-plugin-openapi-docs from 5.0.1 to 5.0.2 in /docs (#39849 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-05-04 15:08:10 -07:00
dependabot[bot]	812f4ae080	chore(deps): update zod requirement from ^4.4.1 to ^4.4.3 in /superset-frontend/plugins/plugin-chart-echarts (#39850 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-05-04 15:07:55 -07:00
dependabot[bot]	af8d15fdfc	chore(deps): bump yeoman-generator from 8.1.2 to 8.2.2 in /superset-frontend (#39852 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-05-04 15:07:41 -07:00
Amin Ghadersohi	673634f7af	fix(mcp): point get_dataset_info url to explore view instead of legacy tablemodelview edit (#39838 )	2026-05-04 13:39:05 -04:00