docs(ci): auto-regenerate openapi files used for docs

2026-06-13 19:49:18 +00:00 · 2025-05-06 16:02:41 -07:00
387 changed files with 9852 additions and 16809 deletions
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,36 +0,0 @@
-# .coveragerc to control coverage.py
-[run]
-branch = True
-source = superset
-# omit = bad_file.py
-
-[paths]
-source =
-    superset/
-    */site-packages/
-
-[report]
-# Regexes for lines to exclude from consideration
-exclude_lines =
-    # Have to re-enable the standard pragma
-    pragma: no cover
-
-    # Don't complain about missing debug-only code:
-    def __repr__
-    if self\.debug
-
-    # Don't complain if tests don't hit defensive assertion code:
-    raise AssertionError
-    raise NotImplementedError
-
-    # Don't complain if non-runnable code isn't run:
-    if 0:
-    if __name__ == .__main__.:
-
-    # Ignore importlib backport
-    from importlib
-
-    if TYPE_CHECKING:
-
-#fail_under = 100
-show_missing = True
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -27,8 +27,6 @@ updates:
  - package-ecosystem: "uv"
    directory: "requirements/"
    open-pull-requests-limit: 10
-    schedule:
-      interval: "weekly"
    labels:
      - uv
      - dependabot
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -48,8 +48,6 @@ jobs:
          allow-dependencies-licenses: pkg:npm/store2@2.14.2, pkg:npm/applitools/core, pkg:npm/applitools/core-base, pkg:npm/applitools/css-tree, pkg:npm/applitools/ec-client, pkg:npm/applitools/eg-socks5-proxy-server, pkg:npm/applitools/eyes, pkg:npm/applitools/eyes-cypress, pkg:npm/applitools/nml-client, pkg:npm/applitools/tunnel-client, pkg:npm/applitools/utils, pkg:npm/node-forge@1.3.1, pkg:npm/rgbcolor, pkg:npm/jszip@3.10.1

  python-dependency-liccheck:
-    # NOTE: Configuration for liccheck lives in our pyproject.yml.
-    # You cannot use a liccheck.ini file in this workflow.
    runs-on: ubuntu-22.04
    steps:
      - name: "Checkout Repository"
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -18,7 +18,7 @@ jobs:
    runs-on: ubuntu-24.04
    strategy:
      matrix:
-        python-version: ["current", "previous", "next"]
+        python-version: ["current", "previous"]
    steps:
      - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
        uses: actions/checkout@v4
--- a/.github/workflows/superset-docs-deploy.yml
+++ b/.github/workflows/superset-docs-deploy.yml
@@ -41,6 +41,8 @@ jobs:
          node-version-file: './docs/.nvmrc'
      - name: Setup Python
        uses: ./.github/actions/setup-backend/
+      - name: Update openapi docs
+        run: superset update_api_docs
      - uses: actions/setup-java@v4
        with:
          distribution: 'zulu'
--- a/.github/workflows/superset-docs-verify.yml
+++ b/.github/workflows/superset-docs-verify.yml
@@ -20,7 +20,7 @@ jobs:
    steps:
      - uses: actions/checkout@v4
      # Do not bump this linkinator-action version without opening
-      # an ASF Infra ticket to allow the new version first!
+      # an ASF Infra ticket to allow the new verison first!
      - uses: JustinBeckwith/linkinator-action@v1.11.0
        continue-on-error: true # This will make the job advisory (non-blocking, no red X)
        with:
--- a/.github/workflows/superset-python-integrationtest.yml
+++ b/.github/workflows/superset-python-integrationtest.yml
@@ -77,7 +77,7 @@ jobs:
    runs-on: ubuntu-24.04
    strategy:
      matrix:
-        python-version: ["current", "previous", "next"]
+        python-version: ["current", "previous"]
    env:
      PYTHONPATH: ${{ github.workspace }}
      SUPERSET_CONFIG: tests.integration_tests.superset_test_config
--- a/.github/workflows/superset-python-unittest.yml
+++ b/.github/workflows/superset-python-unittest.yml
@@ -19,7 +19,7 @@ jobs:
    runs-on: ubuntu-24.04
    strategy:
      matrix:
-        python-version: ["previous", "current", "next"]
+        python-version: ["previous", "current"]
    env:
      PYTHONPATH: ${{ github.workspace }}
    steps:
@@ -45,13 +45,6 @@ jobs:
          SUPERSET_SECRET_KEY: not-a-secret
        run: |
          pytest --durations-min=0.5 --cov-report= --cov=superset ./tests/common ./tests/unit_tests --cache-clear --maxfail=50
-      - name: Python 100% coverage unit tests
-        if: steps.check.outputs.python
-        env:
-          SUPERSET_TESTENV: true
-          SUPERSET_SECRET_KEY: not-a-secret
-        run: |
-          pytest --durations-min=0.5 --cov-report= --cov=superset/sql/ ./tests/unit_tests/sql/ --cache-clear --cov-fail-under=100
      - name: Upload code coverage
        uses: codecov/codecov-action@v5
        with:
--- a/2
+++ b/2
@@ -18,7 +18,7 @@
 ######################################################################
 # Node stage to deal with static asset construction
 ######################################################################
-ARG PY_VER=3.11.12-slim-bookworm
+ARG PY_VER=3.11.11-slim-bookworm

 # If BUILDPLATFORM is null, set it to 'amd64' (or leave as is otherwise).
 ARG BUILDPLATFORM=${BUILDPLATFORM:-amd64}
--- a/README.md
+++ b/README.md
@@ -103,7 +103,7 @@ Here are some of the major database solutions that are supported:

 <p align="center">
  <img src="https://superset.apache.org/img/databases/redshift.png" alt="redshift" border="0" width="200"/>
-  <img src="https://superset.apache.org/img/databases/google-biquery.png" alt="google-bigquery" border="0" width="200"/>
+  <img src="https://superset.apache.org/img/databases/google-biquery.png" alt="google-biquery" border="0" width="200"/>
  <img src="https://superset.apache.org/img/databases/snowflake.png" alt="snowflake" border="0" width="200"/>
  <img src="https://superset.apache.org/img/databases/trino.png" alt="trino" border="0" width="150" />
  <img src="https://superset.apache.org/img/databases/presto.png" alt="presto" border="0" width="200"/>
@@ -136,7 +136,7 @@ Here are some of the major database solutions that are supported:
  <img src="https://superset.apache.org/img/databases/starrocks.png" alt="starrocks" border="0" width="200" />
  <img src="https://superset.apache.org/img/databases/doris.png" alt="doris" border="0" width="200" />
  <img src="https://superset.apache.org/img/databases/oceanbase.svg" alt="oceanbase" border="0" width="220" />
-  <img src="https://superset.apache.org/img/databases/sap-hana.png" alt="sap-hana" border="0" width="220" />
+  <img src="https://superset.apache.org/img/databases/sap-hana.png" alt="oceanbase" border="0" width="220" />
  <img src="https://superset.apache.org/img/databases/denodo.png" alt="denodo" border="0" width="200" />
  <img src="https://superset.apache.org/img/databases/ydb.svg" alt="ydb" border="0" width="200" />
  <img src="https://superset.apache.org/img/databases/tdengine.png" alt="TDengine" border="0" width="200" />
--- a/RESOURCES/INTHEWILD.md
+++ b/RESOURCES/INTHEWILD.md
@@ -43,7 +43,6 @@ Join our growing community!
 - [Cape Crypto](https://capecrypto.com)
 - [Capital Service S.A.](https://capitalservice.pl) [@pkonarzewski]
 - [Clark.de](https://clark.de/)
- [Europace](https://europace.de)
 - [KarrotPay](https://www.daangnpay.com/)
 - [Remita](https://remita.net) [@mujibishola]
 - [Taveo](https://www.taveo.com) [@codek]
@@ -105,7 +104,6 @@ Join our growing community!
 - [Formbricks](https://formbricks.com)
 - [Gavagai](https://gavagai.io) [@gavagai-corp]
 - [GfK Data Lab](https://www.gfk.com/home) [@mherr]
- [HPE](https://www.hpe.com/in/en/home.html) [@anmol-hpe]
 - [Hydrolix](https://www.hydrolix.io/)
 - [Intercom](https://www.intercom.com/) [@kate-gallo]
 - [jampp](https://jampp.com/)
--- a/docker-compose-image-tag.yml
+++ b/docker-compose-image-tag.yml
@@ -65,6 +65,8 @@ services:
      superset-init:
        condition: service_completed_successfully
    volumes: *superset-volumes
+    environment:
+      SUPERSET_LOG_LEVEL: "${SUPERSET_LOG_LEVEL:-info}"

  superset-init:
    image: *superset-image
@@ -84,6 +86,9 @@ services:
    volumes: *superset-volumes
    healthcheck:
      disable: true
+    environment:
+      SUPERSET_LOAD_EXAMPLES: "${SUPERSET_LOAD_EXAMPLES:-yes}"
+      SUPERSET_LOG_LEVEL: "${SUPERSET_LOG_LEVEL:-info}"

  superset-worker:
    image: *superset-image
@@ -106,6 +111,8 @@ services:
          "CMD-SHELL",
          "celery -A superset.tasks.celery_app:app inspect ping -d celery@$$HOSTNAME",
        ]
+    environment:
+      SUPERSET_LOG_LEVEL: "${SUPERSET_LOG_LEVEL:-info}"

  superset-worker-beat:
    image: *superset-image
@@ -124,6 +131,8 @@ services:
    volumes: *superset-volumes
    healthcheck:
      disable: true
+    environment:
+      SUPERSET_LOG_LEVEL: "${SUPERSET_LOG_LEVEL:-info}"

 volumes:
  superset_home:
--- a/docker-compose-non-dev.yml
+++ b/docker-compose-non-dev.yml
@@ -71,6 +71,8 @@ services:
      superset-init:
        condition: service_completed_successfully
    volumes: *superset-volumes
+    environment:
+      SUPERSET_LOG_LEVEL: "${SUPERSET_LOG_LEVEL:-info}"

  superset-init:
    container_name: superset_init
@@ -91,6 +93,9 @@ services:
    volumes: *superset-volumes
    healthcheck:
      disable: true
+    environment:
+      SUPERSET_LOAD_EXAMPLES: "${SUPERSET_LOAD_EXAMPLES:-yes}"
+      SUPERSET_LOG_LEVEL: "${SUPERSET_LOG_LEVEL:-info}"

  superset-worker:
    build:
@@ -114,6 +119,8 @@ services:
          "CMD-SHELL",
          "celery -A superset.tasks.celery_app:app inspect ping -d celery@$$HOSTNAME",
        ]
+    environment:
+      SUPERSET_LOG_LEVEL: "${SUPERSET_LOG_LEVEL:-info}"

  superset-worker-beat:
    build:
@@ -133,6 +140,8 @@ services:
    volumes: *superset-volumes
    healthcheck:
      disable: true
+    environment:
+      SUPERSET_LOG_LEVEL: "${SUPERSET_LOG_LEVEL:-info}"

 volumes:
  superset_home:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -104,6 +104,9 @@ services:
      superset-init:
        condition: service_completed_successfully
    volumes: *superset-volumes
+    environment:
+      CYPRESS_CONFIG: "${CYPRESS_CONFIG:-}"
+      SUPERSET_LOG_LEVEL: "${SUPERSET_LOG_LEVEL:-info}"

  superset-websocket:
    container_name: superset_websocket
@@ -155,6 +158,10 @@ services:
        condition: service_started
    user: *superset-user
    volumes: *superset-volumes
+    environment:
+      CYPRESS_CONFIG: "${CYPRESS_CONFIG:-}"
+      SUPERSET_LOAD_EXAMPLES: "${SUPERSET_LOAD_EXAMPLES:-yes}"
+      SUPERSET_LOG_LEVEL: "${SUPERSET_LOG_LEVEL:-info}"
    healthcheck:
      disable: true

@@ -199,6 +206,8 @@ services:
        required: false
    environment:
      CELERYD_CONCURRENCY: 2
+      CYPRESS_CONFIG: "${CYPRESS_CONFIG:-}"
+      SUPERSET_LOG_LEVEL: "${SUPERSET_LOG_LEVEL:-info}"
    restart: unless-stopped
    depends_on:
      superset-init:
@@ -230,6 +239,9 @@ services:
    volumes: *superset-volumes
    healthcheck:
      disable: true
+    environment:
+      CYPRESS_CONFIG: "${CYPRESS_CONFIG:-}"
+      SUPERSET_LOG_LEVEL: "${SUPERSET_LOG_LEVEL:-info}"

  superset-tests-worker:
    build:
@@ -250,6 +262,7 @@ services:
      REDIS_RESULTS_DB: 3
      REDIS_HOST: localhost
      CELERYD_CONCURRENCY: 8
+      SUPERSET_LOG_LEVEL: "${SUPERSET_LOG_LEVEL:-info}"
    network_mode: host
    depends_on:
      superset-init:
--- a/docs/docs/configuration/configuring-superset.mdx
+++ b/docs/docs/configuration/configuring-superset.mdx
@@ -302,15 +302,6 @@ AUTH_USER_REGISTRATION = True
 AUTH_USER_REGISTRATION_ROLE = "Public"
 ```

-In case you want to assign the `Admin` role on new user registration, it can be assigned as follows:
-```python
-AUTH_USER_REGISTRATION_ROLE = "Admin"
-```
-If you encounter the [issue](https://github.com/apache/superset/issues/13243) of not being able to list users from the Superset main page settings, although a newly registered user has an `Admin` role, please re-run `superset init` to sync the required permissions. Below is the command to re-run `superset init` using docker compose.
-```
-docker-compose exec superset superset init
-```
-
 Then, create a `CustomSsoSecurityManager` that extends `SupersetSecurityManager` and overrides
 `oauth_user_info`:

--- a/docs/docs/configuration/databases.mdx
+++ b/docs/docs/configuration/databases.mdx
@@ -72,8 +72,7 @@ are compatible with Superset.
 | [PostgreSQL](/docs/configuration/databases#postgres)                    | `pip install psycopg2`                                                             | `postgresql://<UserName>:<DBPassword>@<Database Host>/<Database Name>`                                                                                 |
 | [Presto](/docs/configuration/databases#presto)                          | `pip install pyhive`                                                               | `presto://{username}:{password}@{hostname}:{port}/{database}`                                                                                                                                            |
 | [Rockset](/docs/configuration/databases#rockset)                        | `pip install rockset-sqlalchemy`                                                   | `rockset://<api_key>:@<api_server>`                                                                                                                    |
-| [SAP Hana](/docs/configuration/databases#hana) | `pip install hdbcli sqlalchemy-hana` or `pip install apache_superset[hana]` | `hana://{username}:{password}@{host}:{port}` |
-| [SingleStore](/docs/configuration/databases#singlestore)                | `pip install sqlalchemy-singlestoredb`                                               | `singlestoredb://{username}:{password}@{host}:{port}/{database}`                                                                                     |
+| [SAP Hana](/docs/configuration/databases#hana)                          | `pip install hdbcli sqlalchemy-hana` or `pip install apache_superset[hana]`          | `hana://{username}:{password}@{host}:{port}`                                                                                                           |
 | [StarRocks](/docs/configuration/databases#starrocks)                    | `pip install starrocks`                                                            | `starrocks://<User>:<Password>@<Host>:<Port>/<Catalog>.<Database>`                                                                                     |
 | [Snowflake](/docs/configuration/databases#snowflake)                    | `pip install snowflake-sqlalchemy`                                                 | `snowflake://{user}:{password}@{account}.{region}/{database}?role={role}&warehouse={warehouse}`                                                        |
 | SQLite                                                    | No additional library needed                                                       | `sqlite://path/to/file.db?check_same_thread=false`                                                                                                     |
@@ -1300,16 +1299,6 @@ You might have noticed that some special charecters are used in the above connec
 For more information about this check the [sqlalchemy documentation](https://docs.sqlalchemy.org/en/20/core/engines.html#escaping-special-characters-such-as-signs-in-passwords). Which says `When constructing a fully formed URL string to pass to create_engine(), special characters such as those that may be used in the user and password need to be URL encoded to be parsed correctly. This includes the @ sign.`
 :::

-#### SingleStore
-
-The recommended connector library for SingleStore is
-[sqlalchemy-singlestoredb](https://github.com/singlestore-labs/sqlalchemy-singlestoredb).
-
-The expected connection string is formatted as follows:
-
-```
-singlestoredb://{username}:{password}@{host}:{port}/{database}
-```

 #### StarRocks

--- a/docs/docs/configuration/sql-templating.mdx
+++ b/docs/docs/configuration/sql-templating.mdx
@@ -250,14 +250,6 @@ Will be rendered as:
 SELECT * FROM users WHERE role IN ('admin', 'viewer')
 ```

-**Current User RLS Rules**
-
-The `{{ current_user_rls_rules() }}` macro returns an array of RLS rules applied to the current dataset for the logged in user.
-
-If you have caching enabled in your Superset configuration, then the list of RLS Rules will be used
-by Superset when calculating the cache key. A cache key is a unique identifier that determines if there's a
-cache hit in the future and Superset can retrieve cached data.
-
 **Custom URL Parameters**

 The `{{ url_param('custom_variable') }}` macro lets you define arbitrary URL
--- a/docs/docs/installation/docker-builds.mdx
+++ b/docs/docs/installation/docker-builds.mdx
@@ -64,56 +64,6 @@ check the [supersetbot docker](https://github.com/apache-superset/supersetbot)
 subcommand and the [docker.yml](https://github.com/apache/superset/blob/master/.github/workflows/docker.yml)
 GitHub action.

-## Building your own production Docker image
-
-Every Superset deployment will require its own set of drivers depending on the data warehouse(s),
-etc. so we recommend that users build their own Docker image by extending the `lean` image.
-
-Here's an example Dockerfile that does this. Follow the in-line comments to customize it for
-your desired Superset version and database drivers. The comments also note that a certain feature flag will
-have to be enabled in your config file.
-
-You would build the image with `docker build -t mysuperset:latest .` or `docker build -t ourcompanysuperset:4.1.2 .`
-
-```Dockerfile
-# change this to apache/superset:4.1.2 or whatever version you want to build from;
-# otherwise the default is the latest commit on GitHub master branch
-FROM apache/superset:master
-
-USER root
-
-# Set environment variable for Playwright
-ENV PLAYWRIGHT_BROWSERS_PATH=/usr/local/share/playwright-browsers
-
-# Install packages using uv into the virtual environment
-# Superset started using uv after the 4.1 branch; if you are building from apache/superset:4.1.x,
-# replace the first two lines with RUN pip install \
-RUN . /app/.venv/bin/activate && \
-    uv pip install \
-    # install psycopg2 for using PostgreSQL metadata store - could be a MySQL package if using that backend:
-    psycopg2-binary \
-    # add the driver(s) for your data warehouse(s), in this example we're showing for Microsoft SQL Server:
-    pymssql \
-    # package needed for using single-sign on authentication:
-    Authlib \
-    # openpyxl to be able to upload Excel files
-    openpyxl \
-    # Pillow for Alerts & Reports to generate PDFs of dashboards
-    Pillow \
-    # install Playwright for taking screenshots for Alerts & Reports. This assumes the feature flag PLAYWRIGHT_REPORTS_AND_THUMBNAILS is enabled
-    # That feature flag will default to True starting in 6.0.0
-    # Playwright works only with Chrome.
-    # If you are still using Selenium instead of Playwright, you would instead install here the selenium package and a headless browser & webdriver
-    playwright \
-    && playwright install-deps \
-    && PLAYWRIGHT_BROWSERS_PATH=/usr/local/share/playwright-browsers playwright install chromium
-
-# Switch back to the superset user
-USER superset
-
-CMD ["/app/docker/entrypoints/run-server.sh"]
-```
-
 ## Key ARGs in Dockerfile

 - `BUILD_TRANSLATIONS`: whether to build the translations into the image. For the
--- a/docs/docs/installation/installation-methods.mdx
+++ b/docs/docs/installation/installation-methods.mdx
@@ -27,7 +27,9 @@ You will need to back up your metadata DB. That could mean backing up the servic

 You will also need to extend the Superset docker image. The default `lean` images do not contain drivers needed to access your metadata database (Postgres or MySQL), nor to access your data warehouse, nor the headless browser needed for Alerts & Reports. You could run a `-dev` image while demoing Superset, which has some of this, but you'll still need to install the driver for your data warehouse. The `-dev` images run as root, which is not recommended for production.

-Ideally you will build your own image of Superset that extends `lean`, adding what your deployment needs. See [Building your own production Docker image](/docs/installation/docker-builds/#building-your-own-production-docker-image).
+Ideally you will build your own image of Superset that extends `lean`, adding what your deployment needs.
+
+See [Docker Build Presets](/docs/installation/docker-builds/#build-presets) for more information about the different image versions you can extend.

 ## [Kubernetes (K8s)](/docs/installation/kubernetes.mdx)

--- a/docs/docs/security/cves.mdx
+++ b/docs/docs/security/cves.mdx
@@ -2,13 +2,6 @@
 title: CVEs fixed by release
 sidebar_position: 2
 ---
-#### Version 4.1.2
-
-| CVE            | Title                                                                              | Affected |
-|:---------------|:-----------------------------------------------------------------------------------|---------:|
-| CVE-2025-27696 | Improper authorization leading to resource ownership takeover                      |  < 4.1.2 |
-| CVE-2025-48912 | Improper authorization bypass on row level security via SQL Injection              |  < 4.1.2 |
-
 #### Version 4.1.0

 | CVE            | Title                                                                              | Affected |
--- a/docs/package.json
+++ b/docs/package.json
@@ -26,10 +26,10 @@
    "@emotion/styled": "^10.0.27",
    "@saucelabs/theme-github-codeblock": "^0.3.0",
    "@superset-ui/style": "^0.14.23",
-    "antd": "^5.25.1",
+    "antd": "^5.24.5",
    "docusaurus-plugin-less": "^2.0.2",
    "less": "^4.3.0",
-    "less-loader": "^12.3.0",
+    "less-loader": "^11.0.0",
    "prism-react-renderer": "^2.4.1",
    "react": "^18.3.1",
    "react-dom": "^18.3.1",
@@ -39,17 +39,17 @@
  },
  "devDependencies": {
    "@docusaurus/module-type-aliases": "^3.7.0",
-    "@docusaurus/tsconfig": "^3.8.0",
+    "@docusaurus/tsconfig": "^3.7.0",
    "@types/react": "^18.3.12",
    "@typescript-eslint/eslint-plugin": "^5.0.0",
    "@typescript-eslint/parser": "^5.0.0",
    "eslint": "^8.0.0",
-    "eslint-config-prettier": "^10.1.5",
+    "eslint-config-prettier": "^10.1.2",
    "eslint-plugin-prettier": "^4.0.0",
    "eslint-plugin-react": "^7.37.5",
    "prettier": "^2.0.0",
    "typescript": "~5.8.3",
-    "webpack": "^5.99.9"
+    "webpack": "^5.99.7"
  },
  "browserslist": {
    "production": [
--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@@ -1092,13 +1092,20 @@
    core-js-pure "^3.30.2"
    regenerator-runtime "^0.14.0"

-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.3", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.7", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.5", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.6", "@babel/runtime@^7.23.9", "@babel/runtime@^7.24.4", "@babel/runtime@^7.24.7", "@babel/runtime@^7.24.8", "@babel/runtime@^7.25.7", "@babel/runtime@^7.25.9", "@babel/runtime@^7.26.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.25.9", "@babel/runtime@^7.8.4":
  version "7.27.0"
  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.0.tgz#fbee7cf97c709518ecc1f590984481d5460d4762"
  integrity sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==
  dependencies:
    regenerator-runtime "^0.14.0"

+"@babel/runtime@^7.10.1", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.16.7", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.5", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.6", "@babel/runtime@^7.23.9", "@babel/runtime@^7.24.4", "@babel/runtime@^7.24.7", "@babel/runtime@^7.24.8", "@babel/runtime@^7.25.7", "@babel/runtime@^7.26.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2":
+  version "7.26.10"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.10.tgz#a07b4d8fa27af131a633d7b3524db803eb4764c2"
+  integrity sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==
+  dependencies:
+    regenerator-runtime "^0.14.0"
+
 "@babel/template@^7.25.9", "@babel/template@^7.26.9", "@babel/template@^7.27.0":
  version "7.27.0"
  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.0.tgz#b253e5406cc1df1c57dcd18f11760c2dbf40c0b4"
@@ -1935,10 +1942,10 @@
    fs-extra "^11.1.1"
    tslib "^2.6.0"

-"@docusaurus/tsconfig@^3.8.0":
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/@docusaurus/tsconfig/-/tsconfig-3.8.0.tgz#ea7ee0917e1562cf0a6e95e049c42f1f61351f32"
-  integrity sha512-utLl48nNjSYBoq47RKukZ9fPLEX3nJWThzrujb0ndQQ1jc/gh4RhTRaAqItH9nImnsgGKmLMnyoMBpfGmoop+w==
+"@docusaurus/tsconfig@^3.7.0":
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/tsconfig/-/tsconfig-3.7.0.tgz#654dcc524e25b8809af0f1b0b42485c18c047ab5"
+  integrity sha512-vRsyj3yUZCjscgfgcFYjIsTcAru/4h4YH2/XAE8Rs7wWdnng98PgWKvP5ovVc4rmRpRg2WChVW0uOy2xHDvDBQ==

 "@docusaurus/types@3.7.0":
  version "3.7.0"
@@ -4179,10 +4186,10 @@ ansi-styles@^6.1.0:
  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==

-antd@^5.25.1:
-  version "5.25.1"
-  resolved "https://registry.yarnpkg.com/antd/-/antd-5.25.1.tgz#859b419a18d113492304ccd66c29074a71902241"
-  integrity sha512-4KC7KuPCjr0z3Vuw9DsF+ceqJaPLbuUI3lOX1sY8ix25ceamp+P8yxOmk3Y2JHCD2ZAhq+5IQ/DTJRN2adWYKQ==
+antd@^5.24.5:
+  version "5.24.5"
+  resolved "https://registry.yarnpkg.com/antd/-/antd-5.24.5.tgz#b0976a113163888d1477f9e666c3c23352b098e9"
+  integrity sha512-1lAv/G+9ewQanyoAo3JumQmIlVxwo5QwWGb6QCHYc40Cq0NxC/EzITcjsgq1PSaTUpLkKq8A2l7Fjtu47vqQBg==
  dependencies:
    "@ant-design/colors" "^7.2.0"
    "@ant-design/cssinjs" "^1.23.0"
@@ -4199,37 +4206,37 @@ antd@^5.25.1:
    classnames "^2.5.1"
    copy-to-clipboard "^3.3.3"
    dayjs "^1.11.11"
-    rc-cascader "~3.34.0"
+    rc-cascader "~3.33.1"
    rc-checkbox "~3.5.0"
    rc-collapse "~3.9.0"
    rc-dialog "~9.6.0"
    rc-drawer "~7.2.0"
    rc-dropdown "~4.2.1"
    rc-field-form "~2.7.0"
-    rc-image "~7.12.0"
-    rc-input "~1.8.0"
-    rc-input-number "~9.5.0"
-    rc-mentions "~2.20.0"
+    rc-image "~7.11.1"
+    rc-input "~1.7.3"
+    rc-input-number "~9.4.0"
+    rc-mentions "~2.19.1"
    rc-menu "~9.16.1"
    rc-motion "^2.9.5"
-    rc-notification "~5.6.4"
+    rc-notification "~5.6.3"
    rc-pagination "~5.1.0"
    rc-picker "~4.11.3"
    rc-progress "~4.0.0"
    rc-rate "~2.13.1"
    rc-resize-observer "^1.4.3"
    rc-segmented "~2.7.0"
-    rc-select "~14.16.7"
+    rc-select "~14.16.6"
    rc-slider "~11.1.8"
    rc-steps "~6.0.1"
    rc-switch "~4.1.0"
    rc-table "~7.50.4"
-    rc-tabs "~15.6.1"
-    rc-textarea "~1.10.0"
+    rc-tabs "~15.5.1"
+    rc-textarea "~1.9.0"
    rc-tooltip "~6.4.0"
    rc-tree "~5.13.1"
    rc-tree-select "~5.27.0"
-    rc-upload "~4.9.0"
+    rc-upload "~4.8.1"
    rc-util "^5.44.4"
    scroll-into-view-if-needed "^3.1.0"
    throttle-debounce "^5.0.2"
@@ -5667,7 +5674,12 @@ data-view-byte-offset@^1.0.1:
    es-errors "^1.3.0"
    is-data-view "^1.0.1"

-dayjs@^1.11.11, dayjs@^1.11.13:
+dayjs@^1.11.11:
+  version "1.11.12"
+  resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.12.tgz"
+  integrity sha512-Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg==
+
+dayjs@^1.11.13:
  version "1.11.13"
  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c"
  integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==
@@ -6247,10 +6259,10 @@ escape-string-regexp@^5.0.0:
  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8"
  integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==

-eslint-config-prettier@^10.1.5:
-  version "10.1.5"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.1.5.tgz#00c18d7225043b6fbce6a665697377998d453782"
-  integrity sha512-zc1UmCpNltmVY34vuLRV61r1K27sWuX39E+uyUnY8xS2Bex88VV9cugG+UZbRSRGtGyFboj+D8JODyme1plMpw==
+eslint-config-prettier@^10.1.2:
+  version "10.1.2"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.1.2.tgz#31a4b393c40c4180202c27e829af43323bf85276"
+  integrity sha512-Epgp/EofAUeEpIdZkW60MHKvPyru1ruQJxPL+WIycnaPApuseK0Zpkrh/FwL9oIpQvIhJwV7ptOy0DWUjTlCiA==

 eslint-plugin-prettier@^4.0.0:
  version "4.2.1"
@@ -8211,10 +8223,10 @@ layout-base@^2.0.0:
  resolved "https://registry.yarnpkg.com/layout-base/-/layout-base-2.0.1.tgz#d0337913586c90f9c2c075292069f5c2da5dd285"
  integrity sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==

-less-loader@^12.3.0:
-  version "12.3.0"
-  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-12.3.0.tgz#d4a00361568be86a97da3df4f16954b0d4c15340"
-  integrity sha512-0M6+uYulvYIWs52y0LqN4+QM9TqWAohYSNTo4htE8Z7Cn3G/qQMEmktfHmyJT23k+20kU9zHH2wrfFXkxNLtVw==
+less-loader@^11.0.0:
+  version "11.1.4"
+  resolved "https://registry.npmjs.org/less-loader/-/less-loader-11.1.4.tgz"
+  integrity sha512-6/GrYaB6QcW6Vj+/9ZPgKKs6G10YZai/l/eJ4SLwbzqNTBsAqt5hSLVF47TgsiBxV1P6eAU0GYRH3YRuQU9V3A==

 less@^4.3.0:
  version "4.3.0"
@@ -10605,10 +10617,10 @@ raw-body@2.5.2:
    iconv-lite "0.4.24"
    unpipe "1.0.0"

-rc-cascader@~3.34.0:
-  version "3.34.0"
-  resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-3.34.0.tgz#56f936ab6b1229bab7d558701ce9b9e96536582c"
-  integrity sha512-KpXypcvju9ptjW9FaN2NFcA2QH9E9LHKq169Y0eWtH4e/wHQ5Wh5qZakAgvb8EKZ736WZ3B0zLLOBsrsja5Dag==
+rc-cascader@~3.33.1:
+  version "3.33.1"
+  resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-3.33.1.tgz#19e01462ef5ef51b723c1f562c7b9cde4691e7ee"
+  integrity sha512-Kyl4EJ7ZfCBuidmZVieegcbFw0RcU5bHHSbtEdmuLYd0fYHCAiYKZ6zon7fWAVyC6rWWOOib0XKdTSf7ElC9rg==
  dependencies:
    "@babel/runtime" "^7.25.7"
    classnames "^2.3.1"
@@ -10676,10 +10688,10 @@ rc-field-form@~2.7.0:
    "@rc-component/async-validator" "^5.0.3"
    rc-util "^5.32.2"

-rc-image@~7.12.0:
-  version "7.12.0"
-  resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-7.12.0.tgz#95e9314701e668217d113c1f29b4f01ac025cafe"
-  integrity sha512-cZ3HTyyckPnNnUb9/DRqduqzLfrQRyi+CdHjdqgsyDpI3Ln5UX1kXnAhPBSJj9pVRzwRFgqkN7p9b6HBDjmu/Q==
+rc-image@~7.11.1:
+  version "7.11.1"
+  resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-7.11.1.tgz#3ab290708dc053d3681de94186522e4e594f6772"
+  integrity sha512-XuoWx4KUXg7hNy5mRTy1i8c8p3K8boWg6UajbHpDXS5AlRVucNfTi5YxTtPBTBzegxAZpvuLfh3emXFt6ybUdA==
  dependencies:
    "@babel/runtime" "^7.11.2"
    "@rc-component/portal" "^1.0.2"
@@ -10688,37 +10700,37 @@ rc-image@~7.12.0:
    rc-motion "^2.6.2"
    rc-util "^5.34.1"

-rc-input-number@~9.5.0:
-  version "9.5.0"
-  resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-9.5.0.tgz#b47963d0f2cbd85ab2f1badfdc089a904c073f38"
-  integrity sha512-bKaEvB5tHebUURAEXw35LDcnRZLq3x1k7GxfAqBMzmpHkDGzjAtnUL8y4y5N15rIFIg5IJgwr211jInl3cipag==
+rc-input-number@~9.4.0:
+  version "9.4.0"
+  resolved "https://registry.npmjs.org/rc-input-number/-/rc-input-number-9.4.0.tgz"
+  integrity sha512-Tiy4DcXcFXAf9wDhN8aUAyMeCLHJUHA/VA/t7Hj8ZEx5ETvxG7MArDOSE6psbiSCo+vJPm4E3fGN710ITVn6GA==
  dependencies:
    "@babel/runtime" "^7.10.1"
    "@rc-component/mini-decimal" "^1.0.1"
    classnames "^2.2.5"
-    rc-input "~1.8.0"
+    rc-input "~1.7.1"
    rc-util "^5.40.1"

-rc-input@~1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/rc-input/-/rc-input-1.8.0.tgz#d2f4404befebf2fbdc28390d5494c302f74ae974"
-  integrity sha512-KXvaTbX+7ha8a/k+eg6SYRVERK0NddX8QX7a7AnRvUa/rEH0CNMlpcBzBkhI0wp2C8C4HlMoYl8TImSN+fuHKA==
+rc-input@~1.7.1, rc-input@~1.7.3:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/rc-input/-/rc-input-1.7.3.tgz#cb334a17b93ce985bceb243b4c111a5ed641e0e3"
+  integrity sha512-A5w4egJq8+4JzlQ55FfQjDnPvOaAbzwC3VLOAdOytyek3TboSOP9qxN+Gifup+shVXfvecBLBbWBpWxmk02SWQ==
  dependencies:
    "@babel/runtime" "^7.11.1"
    classnames "^2.2.1"
    rc-util "^5.18.1"

-rc-mentions@~2.20.0:
-  version "2.20.0"
-  resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-2.20.0.tgz#3bbeac0352b02e0ce3e1244adb48701bb6903bf7"
-  integrity sha512-w8HCMZEh3f0nR8ZEd466ATqmXFCMGMN5UFCzEUL0bM/nGw/wOS2GgRzKBcm19K++jDyuWCOJOdgcKGXU3fXfbQ==
+rc-mentions@~2.19.1:
+  version "2.19.1"
+  resolved "https://registry.npmjs.org/rc-mentions/-/rc-mentions-2.19.1.tgz"
+  integrity sha512-KK3bAc/bPFI993J3necmaMXD2reZTzytZdlTvkeBbp50IGH1BDPDvxLdHDUrpQx2b2TGaVJsn+86BvYa03kGqA==
  dependencies:
    "@babel/runtime" "^7.22.5"
    "@rc-component/trigger" "^2.0.0"
    classnames "^2.2.6"
-    rc-input "~1.8.0"
+    rc-input "~1.7.1"
    rc-menu "~9.16.0"
-    rc-textarea "~1.10.0"
+    rc-textarea "~1.9.0"
    rc-util "^5.34.1"

 rc-menu@~9.16.0, rc-menu@~9.16.1:
@@ -10742,10 +10754,10 @@ rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.3.0, rc-motion@^2.3.4, rc-motio
    classnames "^2.2.1"
    rc-util "^5.44.0"

-rc-notification@~5.6.4:
-  version "5.6.4"
-  resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-5.6.4.tgz#ea89c39c13cd517fdfd97fe63f03376fabb78544"
-  integrity sha512-KcS4O6B4qzM3KH7lkwOB7ooLPZ4b6J+VMmQgT51VZCeEcmghdeR4IrMcFq0LG+RPdnbe/ArT086tGM8Snimgiw==
+rc-notification@~5.6.3:
+  version "5.6.3"
+  resolved "https://registry.npmjs.org/rc-notification/-/rc-notification-5.6.3.tgz"
+  integrity sha512-42szwnn8VYQoT6GnjO00i1iwqV9D1TTMvxObWsuLwgl0TsOokzhkYiufdtQBsJMFjJravS1hfDKVMHLKLcPE4g==
  dependencies:
    "@babel/runtime" "^7.10.1"
    classnames "2.x"
@@ -10821,10 +10833,10 @@ rc-segmented@~2.7.0:
    rc-motion "^2.4.4"
    rc-util "^5.17.0"

-rc-select@~14.16.2, rc-select@~14.16.7:
-  version "14.16.8"
-  resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-14.16.8.tgz#78e6782f1ccc1f03d9003bc3effa4ed609d29a97"
-  integrity sha512-NOV5BZa1wZrsdkKaiK7LHRuo5ZjZYMDxPP6/1+09+FB4KoNi8jcG1ZqLE3AVCxEsYMBe65OBx71wFoHRTP3LRg==
+rc-select@~14.16.2, rc-select@~14.16.6:
+  version "14.16.6"
+  resolved "https://registry.npmjs.org/rc-select/-/rc-select-14.16.6.tgz"
+  integrity sha512-YPMtRPqfZWOm2XGTbx5/YVr1HT0vn//8QS77At0Gjb3Lv+Lbut0IORJPKLWu1hQ3u4GsA0SrDzs7nI8JG7Zmyg==
  dependencies:
    "@babel/runtime" "^7.10.1"
    "@rc-component/trigger" "^2.1.1"
@@ -10873,10 +10885,10 @@ rc-table@~7.50.4:
    rc-util "^5.44.3"
    rc-virtual-list "^3.14.2"

-rc-tabs@~15.6.1:
-  version "15.6.1"
-  resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-15.6.1.tgz#f0b6c65384dfa09a64eb539e86a0667c7a650708"
-  integrity sha512-/HzDV1VqOsUWyuC0c6AkxVYFjvx9+rFPKZ32ejxX0Uc7QCzcEjTA9/xMgv4HemPKwzBNX8KhGVbbumDjnj92aA==
+rc-tabs@~15.5.1:
+  version "15.5.1"
+  resolved "https://registry.npmjs.org/rc-tabs/-/rc-tabs-15.5.1.tgz"
+  integrity sha512-yiWivLAjEo5d1v2xlseB2dQocsOhkoVSfo1krS8v8r+02K+TBUjSjXIf7dgyVSxp6wRIPv5pMi5hanNUlQMgUA==
  dependencies:
    "@babel/runtime" "^7.11.2"
    classnames "2.x"
@@ -10886,14 +10898,14 @@ rc-tabs@~15.6.1:
    rc-resize-observer "^1.0.0"
    rc-util "^5.34.1"

-rc-textarea@~1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/rc-textarea/-/rc-textarea-1.10.0.tgz#f8f962ef83be0b8e35db97cf03dbfb86ddd9c46c"
-  integrity sha512-ai9IkanNuyBS4x6sOL8qu/Ld40e6cEs6pgk93R+XLYg0mDSjNBGey6/ZpDs5+gNLD7urQ14po3V6Ck2dJLt9SA==
+rc-textarea@~1.9.0:
+  version "1.9.0"
+  resolved "https://registry.npmjs.org/rc-textarea/-/rc-textarea-1.9.0.tgz"
+  integrity sha512-dQW/Bc/MriPBTugj2Kx9PMS5eXCCGn2cxoIaichjbNvOiARlaHdI99j4DTxLl/V8+PIfW06uFy7kjfUIDDKyxQ==
  dependencies:
    "@babel/runtime" "^7.10.1"
    classnames "^2.2.1"
-    rc-input "~1.8.0"
+    rc-input "~1.7.1"
    rc-resize-observer "^1.0.0"
    rc-util "^5.27.0"

@@ -10929,10 +10941,10 @@ rc-tree@~5.13.0, rc-tree@~5.13.1:
    rc-util "^5.16.1"
    rc-virtual-list "^3.5.1"

-rc-upload@~4.9.0:
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-4.9.0.tgz#911963ab5a0b538c743765371c05e2de9e3f5436"
-  integrity sha512-pAzlPnyiFn1GCtEybEG2m9nXNzQyWXqWV2xFYCmDxjN9HzyjS5Pz2F+pbNdYw8mMJsixLEKLG0wVy9vOGxJMJA==
+rc-upload@~4.8.1:
+  version "4.8.1"
+  resolved "https://registry.npmjs.org/rc-upload/-/rc-upload-4.8.1.tgz"
+  integrity sha512-toEAhwl4hjLAI1u8/CgKWt30BR06ulPa4iGQSMvSXoHzO88gPCslxqV/mnn4gJU7PDoltGIC9Eh+wkeudqgHyw==
  dependencies:
    "@babel/runtime" "^7.18.3"
    classnames "^2.2.5"
@@ -13033,10 +13045,10 @@ webpack-sources@^3.2.3:
  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==

-webpack@^5.88.1, webpack@^5.95.0, webpack@^5.99.9:
-  version "5.99.9"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.99.9.tgz#d7de799ec17d0cce3c83b70744b4aedb537d8247"
-  integrity sha512-brOPwM3JnmOa+7kd3NsmOUOwbDAj8FT9xDsG3IW0MgbN9yZV7Oi/s/+MNQ/EcSMqw7qfoRyXPoeEWT8zLVdVGg==
+webpack@^5.88.1, webpack@^5.95.0, webpack@^5.99.7:
+  version "5.99.7"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.99.7.tgz#60201c1ca66da046b07d006c2f6e0cc5e8a7bdba"
+  integrity sha512-CNqKBRMQjwcmKR0idID5va1qlhrqVUKpovi+Ec79ksW8ux7iS1+A6VqzfZXgVYCFRKl7XL5ap3ZoMpwBJxcg0w==
  dependencies:
    "@types/eslint-scope" "^3.7.7"
    "@types/estree" "^1.0.6"
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,7 +32,6 @@ authors = [
 classifiers = [
    "Programming Language :: Python :: 3.10",
    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
    "backoff>=1.8.0",
@@ -45,7 +44,7 @@ dependencies = [
    "cryptography>=42.0.4, <45.0.0",
    "deprecation>=2.1.0, <2.2.0",
    "flask>=2.2.5, <3.0.0",
-    "flask-appbuilder>=4.7.0, <5.0.0",
+    "flask-appbuilder>=4.6.3, <5.0.0",
    "flask-caching>=2.1.0, <3",
    "flask-compress>=1.13, <2.0",
    "flask-talisman>=1.0.0, <2.0",
@@ -67,7 +66,7 @@ dependencies = [
    "markdown>=3.0",
    "msgpack>=1.0.0, <1.1",
    "nh3>=0.2.11, <0.3",
-    "numpy>1.23.5, <2.3",
+    "numpy>1.23.5, <2",
    "packaging",
    # --------------------------
    # pandas and related (wanting pandas[performance] without numba as it's 100+MB and not needed)
@@ -94,8 +93,8 @@ dependencies = [
    "sqlalchemy>=1.4, <2",
    "sqlalchemy-utils>=0.38.3, <0.39",
    "sqlglot>=26.1.3, <27",
-    # newer pandas needs 0.9+
-    "tabulate>=0.9.0, <1.0",
+    "sqlparse>=0.5.0",
+    "tabulate>=0.8.9, <0.9",
    "typing-extensions>=4, <5",
    "waitress; sys_platform == 'win32'",
    "wtforms>=2.3.3, <4",
@@ -167,7 +166,6 @@ prophet = ["prophet>=1.1.5, <2"]
 redshift = ["sqlalchemy-redshift>=0.8.1, <0.9"]
 rockset = ["rockset-sqlalchemy>=0.0.1, <1"]
 shillelagh = ["shillelagh[all]>=1.2.18, <2"]
-singlestore = ["sqlalchemy-singlestoredb>=1.1.1, <2"]
 snowflake = ["snowflake-sqlalchemy>=1.2.4, <2"]
 spark = [
    "pyhive[hive]>=0.6.5;python_version<'3.11'",
@@ -218,7 +216,7 @@ combine_as_imports = true
 include_trailing_comma = true
 line_length = 88
 known_first_party = "superset"
-known_third_party = "alembic, apispec, backoff, celery, click, colorama, cron_descriptor, croniter, cryptography, dateutil, deprecation, flask, flask_appbuilder, flask_babel, flask_caching, flask_compress, flask_jwt_extended, flask_login, flask_migrate, flask_sqlalchemy, flask_talisman, flask_testing, flask_wtf, freezegun, geohash, geopy, holidays, humanize, isodate, jinja2, jwt, markdown, markupsafe, marshmallow, msgpack, nh3, numpy, pandas, parameterized, parsedatetime, pgsanity, polyline, prison, progress, pyarrow, sqlalchemy_bigquery, pyhive, pyparsing, pytest, pytest_mock, pytz, redis, requests, selenium, setuptools, shillelagh, simplejson, slack, sqlalchemy, sqlalchemy_utils, typing_extensions, urllib3, werkzeug, wtforms, wtforms_json, yaml"
+known_third_party = "alembic, apispec, backoff, celery, click, colorama, cron_descriptor, croniter, cryptography, dateutil, deprecation, flask, flask_appbuilder, flask_babel, flask_caching, flask_compress, flask_jwt_extended, flask_login, flask_migrate, flask_sqlalchemy, flask_talisman, flask_testing, flask_wtf, freezegun, geohash, geopy, holidays, humanize, isodate, jinja2, jwt, markdown, markupsafe, marshmallow, msgpack, nh3, numpy, pandas, parameterized, parsedatetime, pgsanity, polyline, prison, progress, pyarrow, sqlalchemy_bigquery, pyhive, pyparsing, pytest, pytest_mock, pytz, redis, requests, selenium, setuptools, shillelagh, simplejson, slack, sqlalchemy, sqlalchemy_utils, sqlparse, typing_extensions, urllib3, werkzeug, wtforms, wtforms_json, yaml"
 multi_line_output = 3
 order_by_type = false

@@ -242,12 +240,6 @@ disallow_untyped_calls = false
 disallow_untyped_defs = false
 disable_error_code = "annotation-unchecked"

-# TODO: remove this once cryptography is fixed, introduced in cryptography 44.0.3
-[[tool.mypy.overrides]]
-module = "cryptography.*"
-ignore_errors = true
-follow_imports = "skip"
-
 [tool.ruff]
 # Exclude a variety of commonly ignored directories.
 exclude = [
@@ -280,6 +272,7 @@ exclude = [
    "venv",
 ]

+
 # Same as Black.
 line-length = 88
 indent-width = 4
@@ -374,7 +367,6 @@ docstring-code-line-length = "dynamic"
 requirement_txt_file = "requirements/base.txt"
 authorized_licenses = [
    "academic free license (afl)",
-    "any-osi",
    "apache license 2.0",
    "apache software",
    "apache software, bsd",
@@ -388,7 +380,6 @@ authorized_licenses = [
    "osi approved",
    "psf-2.0",
    "python software foundation",
-    "simplified bsd",
    "the unlicense (unlicense)",
    "the unlicense",
 ]
--- a/requirements/README.md
+++ b/requirements/README.md
@@ -1,13 +0,0 @@
-## Python dependency logic
-
-In this folder, the `.in` files, in conjunction with the `../pyproject.toml` file (in the root of the repo) are used to generate the pinned requirements as `.txt` files.
-
-To alter the pinned dependency, you can edit/alter the `.in` and `pyproject.toml` files, and then run the following command:
-
-```bash
-./scripts/uv-pip-compile.sh
-```
-
-This will generate the pinned requirements in the `.txt` files, which will be used in our CI/CD pipelines and in the Docker images.
-
-We recommend to everyone in the community to use the pinned requirements in their local development environments, to ensure consistency across different environments, though we don't force requirements as part of our python package semantics to allow flexibility for users to install different versions of the dependencies if they wish.
--- a/requirements/base.in
+++ b/requirements/base.in
@@ -33,6 +33,3 @@ apispec>=6.0.0,<6.7.0
 # https://marshmallow-sqlalchemy.readthedocs.io/en/latest/changelog.html#id3
 # Opened this issue https://github.com/marshmallow-code/marshmallow-sqlalchemy/issues/665
 marshmallow-sqlalchemy>=1.3.0,<1.4.1
-
-# needed for python 3.12 support
-openapi-schema-validator>=0.6.3
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,6 +1,6 @@
 # This file was autogenerated by uv via the following command:
 #    uv pip compile pyproject.toml requirements/base.in -o requirements/base.txt
-alembic==1.15.2
+alembic==1.15.1
    # via flask-migrate
 amqp==5.3.1
    # via kombu
@@ -8,10 +8,12 @@ apispec==6.6.1
    # via
    #   -r requirements/base.in
    #   flask-appbuilder
-apsw==3.49.2.0
+apsw==3.49.1.0
    # via shillelagh
 async-timeout==4.0.3
-    # via -r requirements/base.in
+    # via
+    #   -r requirements/base.in
+    #   redis
 attrs==25.3.0
    # via
    #   cattrs
@@ -30,7 +32,7 @@ billiard==4.2.1
    # via celery
 blinker==1.9.0
    # via flask
-bottleneck==1.5.0
+bottleneck==1.4.2
    # via apache-superset (pyproject.toml)
 brotli==1.1.0
    # via flask-compress
@@ -40,11 +42,11 @@ cachelib==0.13.0
    #   flask-session
 cachetools==5.5.2
    # via google-auth
-cattrs==24.1.3
+cattrs==24.1.2
    # via requests-cache
 celery==5.5.2
    # via apache-superset (pyproject.toml)
-certifi==2025.4.26
+certifi==2025.1.31
    # via
    #   requests
    #   selenium
@@ -52,9 +54,9 @@ cffi==1.17.1
    # via
    #   cryptography
    #   pynacl
-charset-normalizer==3.4.2
+charset-normalizer==3.4.1
    # via requests
-click==8.2.0
+click==8.1.8
    # via
    #   apache-superset (pyproject.toml)
    #   celery
@@ -97,6 +99,11 @@ email-validator==2.2.0
    # via flask-appbuilder
 et-xmlfile==2.0.0
    # via openpyxl
+exceptiongroup==1.2.2
+    # via
+    #   cattrs
+    #   trio
+    #   trio-websocket
 flask==2.3.3
    # via
    #   apache-superset (pyproject.toml)
@@ -111,7 +118,7 @@ flask==2.3.3
    #   flask-session
    #   flask-sqlalchemy
    #   flask-wtf
-flask-appbuilder==4.7.0
+flask-appbuilder==4.6.3
    # via apache-superset (pyproject.toml)
 flask-babel==2.0.0
    # via flask-appbuilder
@@ -145,12 +152,13 @@ geographiclib==2.0
    # via geopy
 geopy==2.4.1
    # via apache-superset (pyproject.toml)
-google-auth==2.40.1
+google-auth==2.38.0
    # via shillelagh
 greenlet==3.1.1
    # via
    #   apache-superset (pyproject.toml)
    #   shillelagh
+    #   sqlalchemy
 gunicorn==23.0.0
    # via apache-superset (pyproject.toml)
 h11==0.16.0
@@ -166,7 +174,6 @@ idna==3.10
    #   email-validator
    #   requests
    #   trio
-    #   url-normalize
 importlib-metadata==8.7.0
    # via apache-superset (pyproject.toml)
 isodate==0.7.2
@@ -182,13 +189,9 @@ jinja2==3.1.6
 jsonpath-ng==1.7.0
    # via apache-superset (pyproject.toml)
 jsonschema==4.23.0
-    # via
-    #   flask-appbuilder
-    #   openapi-schema-validator
-jsonschema-specifications==2025.4.1
-    # via
-    #   jsonschema
-    #   openapi-schema-validator
+    # via flask-appbuilder
+jsonschema-specifications==2024.10.1
+    # via jsonschema
 kombu==5.5.3
    # via celery
 korean-lunar-calendar==0.3.1
@@ -235,16 +238,12 @@ numpy==1.26.4
    #   pandas
 odfpy==1.4.1
    # via pandas
-openapi-schema-validator==0.6.3
-    # via -r requirements/base.in
 openpyxl==3.1.5
    # via pandas
 ordered-set==4.1.0
    # via flask-limiter
 outcome==1.3.0.post0
-    # via
-    #   trio
-    #   trio-websocket
+    # via trio
 packaging==25.0
    # via
    #   apache-superset (pyproject.toml)
@@ -264,7 +263,7 @@ parsedatetime==2.6
    # via apache-superset (pyproject.toml)
 pgsanity==0.2.9
    # via apache-superset (pyproject.toml)
-platformdirs==4.3.8
+platformdirs==4.3.7
    # via requests-cache
 ply==3.11
    # via jsonpath-ng
@@ -280,7 +279,7 @@ pyasn1==0.6.1
    # via
    #   pyasn1-modules
    #   rsa
-pyasn1-modules==0.4.2
+pyasn1-modules==0.4.1
    # via google-auth
 pycparser==2.22
    # via cffi
@@ -335,17 +334,15 @@ requests==2.32.3
    #   shillelagh
 requests-cache==1.2.1
    # via shillelagh
-rfc3339-validator==0.1.4
-    # via openapi-schema-validator
 rich==13.9.4
    # via flask-limiter
-rpds-py==0.25.0
+rpds-py==0.23.1
    # via
    #   jsonschema
    #   referencing
-rsa==4.9.1
+rsa==4.9
    # via google-auth
-selenium==4.32.0
+selenium==4.27.1
    # via apache-superset (pyproject.toml)
 shillelagh==1.3.5
    # via apache-superset (pyproject.toml)
@@ -355,7 +352,6 @@ six==1.17.0
    # via
    #   prison
    #   python-dateutil
-    #   rfc3339-validator
    #   url-normalize
    #   wtforms-json
 slack-sdk==3.35.0
@@ -377,32 +373,36 @@ sqlalchemy-utils==0.38.3
    # via
    #   apache-superset (pyproject.toml)
    #   flask-appbuilder
-sqlglot==26.17.1
+sqlglot==26.16.4
+    # via apache-superset (pyproject.toml)
+sqlparse==0.5.3
    # via apache-superset (pyproject.toml)
 sshtunnel==0.4.0
    # via apache-superset (pyproject.toml)
-tabulate==0.9.0
+tabulate==0.8.10
    # via apache-superset (pyproject.toml)
-trio==0.30.0
+trio==0.28.0
    # via
    #   selenium
    #   trio-websocket
-trio-websocket==0.12.2
+trio-websocket==0.11.1
    # via selenium
-typing-extensions==4.13.2
+typing-extensions==4.12.2
    # via
    #   apache-superset (pyproject.toml)
    #   alembic
+    #   cattrs
    #   limits
    #   pyopenssl
    #   referencing
+    #   rich
    #   selenium
    #   shillelagh
 tzdata==2025.2
    # via
    #   kombu
    #   pandas
-url-normalize==2.2.1
+url-normalize==1.4.3
    # via requests-cache
 urllib3==1.26.20
    # via
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -2,7 +2,7 @@
 #    uv pip compile requirements/development.in -c requirements/base.txt -o requirements/development.txt
 -e .
    # via -r requirements/development.in
-alembic==1.15.2
+alembic==1.15.1
    # via
    #   -c requirements/base.txt
    #   flask-migrate
@@ -14,10 +14,14 @@ apispec==6.6.1
    # via
    #   -c requirements/base.txt
    #   flask-appbuilder
-apsw==3.49.2.0
+apsw==3.49.1.0
    # via
    #   -c requirements/base.txt
    #   shillelagh
+async-timeout==4.0.3
+    # via
+    #   -c requirements/base.txt
+    #   redis
 attrs==25.3.0
    # via
    #   -c requirements/base.txt
@@ -47,7 +51,7 @@ blinker==1.9.0
    # via
    #   -c requirements/base.txt
    #   flask
-bottleneck==1.5.0
+bottleneck==1.4.2
    # via
    #   -c requirements/base.txt
    #   apache-superset
@@ -64,7 +68,7 @@ cachetools==5.5.2
    # via
    #   -c requirements/base.txt
    #   google-auth
-cattrs==24.1.3
+cattrs==24.1.2
    # via
    #   -c requirements/base.txt
    #   requests-cache
@@ -72,7 +76,7 @@ celery==5.5.2
    # via
    #   -c requirements/base.txt
    #   apache-superset
-certifi==2025.4.26
+certifi==2025.1.31
    # via
    #   -c requirements/base.txt
    #   requests
@@ -84,11 +88,11 @@ cffi==1.17.1
    #   pynacl
 cfgv==3.4.0
    # via pre-commit
-charset-normalizer==3.4.2
+charset-normalizer==3.4.1
    # via
    #   -c requirements/base.txt
    #   requests
-click==8.2.0
+click==8.1.8
    # via
    #   -c requirements/base.txt
    #   apache-superset
@@ -172,6 +176,13 @@ et-xmlfile==2.0.0
    # via
    #   -c requirements/base.txt
    #   openpyxl
+exceptiongroup==1.2.2
+    # via
+    #   -c requirements/base.txt
+    #   cattrs
+    #   pytest
+    #   trio
+    #   trio-websocket
 filelock==3.12.2
    # via virtualenv
 flask==2.3.3
@@ -191,7 +202,7 @@ flask==2.3.3
    #   flask-sqlalchemy
    #   flask-testing
    #   flask-wtf
-flask-appbuilder==4.7.0
+flask-appbuilder==4.6.3
    # via
    #   -c requirements/base.txt
    #   apache-superset
@@ -269,7 +280,7 @@ google-api-core==2.23.0
    #   google-cloud-core
    #   pandas-gbq
    #   sqlalchemy-bigquery
-google-auth==2.40.1
+google-auth==2.38.0
    # via
    #   -c requirements/base.txt
    #   google-api-core
@@ -307,6 +318,7 @@ greenlet==3.1.1
    #   apache-superset
    #   gevent
    #   shillelagh
+    #   sqlalchemy
 grpcio==1.71.0
    # via
    #   apache-superset
@@ -343,7 +355,6 @@ idna==3.10
    #   email-validator
    #   requests
    #   trio
-    #   url-normalize
 importlib-metadata==8.7.0
    # via
    #   -c requirements/base.txt
@@ -378,7 +389,7 @@ jsonschema==4.23.0
    #   openapi-spec-validator
 jsonschema-path==0.3.4
    # via openapi-spec-validator
-jsonschema-specifications==2025.4.1
+jsonschema-specifications==2024.10.1
    # via
    #   -c requirements/base.txt
    #   jsonschema
@@ -469,9 +480,7 @@ odfpy==1.4.1
    #   -c requirements/base.txt
    #   pandas
 openapi-schema-validator==0.6.3
-    # via
-    #   -c requirements/base.txt
-    #   openapi-spec-validator
+    # via openapi-spec-validator
 openapi-spec-validator==0.7.1
    # via apache-superset
 openpyxl==3.1.5
@@ -486,7 +495,6 @@ outcome==1.3.0.post0
    # via
    #   -c requirements/base.txt
    #   trio
-    #   trio-websocket
 packaging==25.0
    # via
    #   -c requirements/base.txt
@@ -534,7 +542,7 @@ pillow==10.3.0
    # via
    #   apache-superset
    #   matplotlib
-platformdirs==4.3.8
+platformdirs==4.3.7
    # via
    #   -c requirements/base.txt
    #   requests-cache
@@ -590,7 +598,7 @@ pyasn1==0.6.1
    #   pyasn1-modules
    #   python-ldap
    #   rsa
-pyasn1-modules==0.4.2
+pyasn1-modules==0.4.1
    # via
    #   -c requirements/base.txt
    #   google-auth
@@ -718,29 +726,27 @@ requests-cache==1.2.1
 requests-oauthlib==2.0.0
    # via google-auth-oauthlib
 rfc3339-validator==0.1.4
-    # via
-    #   -c requirements/base.txt
-    #   openapi-schema-validator
+    # via openapi-schema-validator
 rich==13.9.4
    # via
    #   -c requirements/base.txt
    #   flask-limiter
-rpds-py==0.25.0
+rpds-py==0.23.1
    # via
    #   -c requirements/base.txt
    #   jsonschema
    #   referencing
-rsa==4.9.1
+rsa==4.9
    # via
    #   -c requirements/base.txt
    #   google-auth
 ruff==0.8.0
    # via apache-superset
-selenium==4.32.0
+selenium==4.27.1
    # via
    #   -c requirements/base.txt
    #   apache-superset
-setuptools==80.7.1
+setuptools==75.6.0
    # via
    #   nodeenv
    #   pandas-gbq
@@ -761,6 +767,7 @@ six==1.17.0
    #   prison
    #   python-dateutil
    #   rfc3339-validator
+    #   url-normalize
    #   wtforms-json
 slack-sdk==3.35.0
    # via
@@ -792,45 +799,55 @@ sqlalchemy-utils==0.38.3
    #   -c requirements/base.txt
    #   apache-superset
    #   flask-appbuilder
-sqlglot==26.17.1
+sqlglot==26.16.4
    # via
    #   -c requirements/base.txt
    #   apache-superset
 sqloxide==0.1.51
    # via apache-superset
+sqlparse==0.5.3
+    # via
+    #   -c requirements/base.txt
+    #   apache-superset
 sshtunnel==0.4.0
    # via
    #   -c requirements/base.txt
    #   apache-superset
 statsd==4.0.1
    # via apache-superset
-tabulate==0.9.0
+tabulate==0.8.10
    # via
    #   -c requirements/base.txt
    #   apache-superset
+tomli==2.2.1
+    # via
+    #   coverage
+    #   pytest
 tqdm==4.67.1
    # via
    #   cmdstanpy
    #   prophet
 trino==0.330.0
    # via apache-superset
-trio==0.30.0
+trio==0.28.0
    # via
    #   -c requirements/base.txt
    #   selenium
    #   trio-websocket
-trio-websocket==0.12.2
+trio-websocket==0.11.1
    # via
    #   -c requirements/base.txt
    #   selenium
-typing-extensions==4.13.2
+typing-extensions==4.12.2
    # via
    #   -c requirements/base.txt
    #   alembic
    #   apache-superset
+    #   cattrs
    #   limits
    #   pyopenssl
    #   referencing
+    #   rich
    #   selenium
    #   shillelagh
 tzdata==2025.2
@@ -840,7 +857,7 @@ tzdata==2025.2
    #   pandas
 tzlocal==5.2
    # via trino
-url-normalize==2.2.1
+url-normalize==1.4.3
    # via
    #   -c requirements/base.txt
    #   requests-cache
--- a/superset-embedded-sdk/README.md
+++ b/superset-embedded-sdk/README.md
@@ -116,11 +116,8 @@ Example `POST /security/guest_token` payload:
 }
 ```

-Alternatively, a guest token can be created directly in your app without interacting with the Superset API.
-To do this, you should update the `GUEST_TOKEN_JWT_SECRET`
-in the Superset [config.py](https://github.com/apache/superset/blob/master/superset/config.py). Also set the
-`GUEST_TOKEN_JWT_AUDIENCE` variable that matches what is set for the `aud` in the JSON payload:
-
+Alternatively, a guest token can be created directly in your app with a json like the following, and then signed
+with the secret set in configuration variable `GUEST_TOKEN_JWT_SECRET` (see configuration file config.py)
 ```
 {
  "user": {
@@ -142,13 +139,6 @@ in the Superset [config.py](https://github.com/apache/superset/blob/master/super
 }
 ```

-In this example, the configuration file includes the following setting:
-
-```python
-GUEST_TOKEN_JWT_AUDIENCE="superset"
-```
-
-
 ### Sandbox iframe

 The Embedded SDK creates an iframe with [sandbox](https://developer.mozilla.org/es/docs/Web/HTML/Element/iframe#sandbox) mode by default
--- a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/table.test.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/table.test.ts
@@ -252,215 +252,4 @@ describe('Visualization > Table', () => {
    });
    cy.get('td').contains(/\d*%/);
  });
-
-  it('Test row limit with server pagination toggle', () => {
-    cy.visitChartByParams({
-      ...VIZ_DEFAULTS,
-      metrics: ['count'],
-      row_limit: 100,
-    });
-
-    // Enable server pagination
-    cy.get('[data-test="server_pagination-header"] div.pull-left').click();
-
-    // Click row limit control and select high value (200k)
-    cy.get('div[aria-label="Row limit"]').click();
-
-    // Type 200000 and press enter to select the option
-    cy.get('div[aria-label="Row limit"]')
-      .find('.ant-select-selection-search-input:visible')
-      .type('200000{enter}');
-
-    // Verify that there is no error tooltip when server pagination is enabled
-    cy.get('[data-test="error-tooltip"]').should('not.exist');
-
-    // Disable server pagination
-    cy.get('[data-test="server_pagination-header"] div.pull-left').click();
-
-    // Verify error tooltip appears
-    cy.get('[data-test="error-tooltip"]').should('be.visible');
-
-    // Trigger mouseover and verify tooltip text
-    cy.get('[data-test="error-tooltip"]').trigger('mouseover');
-
-    // Verify tooltip content
-    cy.get('.antd5-tooltip-inner').should('be.visible');
-    cy.get('.antd5-tooltip-inner').should(
-      'contain',
-      'Server pagination needs to be enabled for values over',
-    );
-
-    // Hide the tooltip by adding display:none style
-    cy.get('.antd5-tooltip').invoke('attr', 'style', 'display: none');
-
-    // Enable server pagination again
-    cy.get('[data-test="server_pagination-header"] div.pull-left').click();
-
-    cy.get('[data-test="error-tooltip"]').should('not.exist');
-
-    cy.get('div[aria-label="Row limit"]').click();
-
-    // Type 1000000
-    cy.get('div[aria-label="Row limit"]')
-      .find('.ant-select-selection-search-input:visible')
-      .type('1000000');
-
-    // Wait for 1 second
-    cy.wait(1000);
-
-    // Press enter
-    cy.get('div[aria-label="Row limit"]')
-      .find('.ant-select-selection-search-input:visible')
-      .type('{enter}');
-
-    // Wait for error tooltip to appear and verify its content
-    cy.get('[data-test="error-tooltip"]')
-      .should('be.visible')
-      .trigger('mouseover');
-
-    // Wait for tooltip content and verify
-    cy.get('.antd5-tooltip-inner').should('exist');
-    cy.get('.antd5-tooltip-inner').should('be.visible');
-
-    // Verify tooltip content separately
-    cy.get('.antd5-tooltip-inner').should('contain', 'Value cannot exceed');
-  });
-
-  it('Test sorting with server pagination enabled', () => {
-    cy.visitChartByParams({
-      ...VIZ_DEFAULTS,
-      metrics: ['count'],
-      groupby: ['name'],
-      row_limit: 100000,
-      server_pagination: true, // Enable server pagination
-    });
-
-    // Wait for the initial data load
-    cy.wait('@chartData');
-
-    // Get the first column header (name)
-    cy.get('.chart-container th').contains('name').as('nameHeader');
-
-    // Click to sort ascending
-    cy.get('@nameHeader').click();
-    cy.wait('@chartData');
-
-    // Verify first row starts with 'A'
-    cy.get('.chart-container td:first').invoke('text').should('match', /^[Aa]/);
-
-    // Click again to sort descending
-    cy.get('@nameHeader').click();
-    cy.wait('@chartData');
-
-    // Verify first row starts with 'Z'
-    cy.get('.chart-container td:first').invoke('text').should('match', /^[Zz]/);
-
-    // Test numeric sorting
-    cy.get('.chart-container th').contains('COUNT').as('countHeader');
-
-    // Click to sort ascending by count
-    cy.get('@countHeader').click();
-    cy.wait('@chartData');
-
-    // Get first two count values and verify ascending order
-    cy.get('.chart-container td:nth-child(2)').then($cells => {
-      const first = parseFloat($cells[0].textContent || '0');
-      const second = parseFloat($cells[1].textContent || '0');
-      expect(first).to.be.at.most(second);
-    });
-
-    // Click again to sort descending
-    cy.get('@countHeader').click();
-    cy.wait('@chartData');
-
-    // Get first two count values and verify descending order
-    cy.get('.chart-container td:nth-child(2)').then($cells => {
-      const first = parseFloat($cells[0].textContent || '0');
-      const second = parseFloat($cells[1].textContent || '0');
-      expect(first).to.be.at.least(second);
-    });
-  });
-
-  it('Test search with server pagination enabled', () => {
-    cy.visitChartByParams({
-      ...VIZ_DEFAULTS,
-      metrics: ['count'],
-      groupby: ['name', 'state'],
-      row_limit: 100000,
-      server_pagination: true,
-      include_search: true,
-    });
-
-    cy.wait('@chartData');
-
-    // Basic search test
-    cy.get('span.dt-global-filter input.form-control.input-sm').should(
-      'be.visible',
-    );
-
-    cy.get('span.dt-global-filter input.form-control.input-sm').type('John');
-
-    cy.wait('@chartData');
-
-    cy.get('.chart-container tbody tr').each($row => {
-      cy.wrap($row).contains(/John/i);
-    });
-
-    // Clear and test case-insensitive search
-    cy.get('span.dt-global-filter input.form-control.input-sm').clear();
-
-    cy.wait('@chartData');
-
-    cy.get('span.dt-global-filter input.form-control.input-sm').type('mary');
-
-    cy.wait('@chartData');
-
-    cy.get('.chart-container tbody tr').each($row => {
-      cy.wrap($row).contains(/Mary/i);
-    });
-
-    // Test special characters
-    cy.get('span.dt-global-filter input.form-control.input-sm').clear();
-
-    cy.get('span.dt-global-filter input.form-control.input-sm').type('Nicole');
-
-    cy.wait('@chartData');
-
-    cy.get('.chart-container tbody tr').each($row => {
-      cy.wrap($row).contains(/Nicole/i);
-    });
-
-    // Test no results
-    cy.get('span.dt-global-filter input.form-control.input-sm').clear();
-
-    cy.get('span.dt-global-filter input.form-control.input-sm').type('XYZ123');
-
-    cy.wait('@chartData');
-
-    cy.get('.chart-container').contains('No records found');
-
-    // Test column-specific search
-    cy.get('.search-select').should('be.visible');
-
-    cy.get('.search-select').click();
-
-    cy.get('.ant-select-dropdown').should('be.visible');
-
-    cy.get('.ant-select-item-option').contains('state').should('be.visible');
-
-    cy.get('.ant-select-item-option').contains('state').click();
-
-    cy.get('span.dt-global-filter input.form-control.input-sm').clear();
-
-    cy.get('span.dt-global-filter input.form-control.input-sm').type('CA');
-
-    cy.wait('@chartData');
-    cy.wait(1000);
-
-    cy.get('td[aria-labelledby="header-state"]').should('be.visible');
-
-    cy.get('td[aria-labelledby="header-state"]')
-      .first()
-      .should('contain', 'CA');
-  });
 });
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
--- a/superset-frontend/package.json
+++ b/superset-frontend/package.json
@@ -122,7 +122,7 @@
    "@visx/tooltip": "^3.0.0",
    "@visx/xychart": "^3.5.1",
    "abortcontroller-polyfill": "^1.7.8",
-    "ace-builds": "^1.41.0",
+    "ace-builds": "^1.36.3",
    "ag-grid-community": "33.1.1",
    "ag-grid-react": "33.1.1",
    "antd": "4.10.3",
@@ -137,7 +137,6 @@
    "dayjs": "^1.11.13",
    "dom-to-image-more": "^3.2.0",
    "dom-to-pdf": "^0.3.2",
-    "dompurify": "^3.2.4",
    "echarts": "^5.6.0",
    "emotion-rgba": "0.0.12",
    "eslint-plugin-i18n-strings": "file:eslint-rules/eslint-plugin-i18n-strings",
@@ -231,7 +230,7 @@
    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
    "@babel/plugin-transform-modules-commonjs": "^7.26.3",
    "@babel/plugin-transform-runtime": "^7.27.1",
-    "@babel/preset-env": "^7.27.2",
+    "@babel/preset-env": "^7.26.7",
    "@babel/preset-react": "^7.26.3",
    "@babel/preset-typescript": "^7.26.0",
    "@babel/register": "^7.23.7",
@@ -261,6 +260,7 @@
    "@testing-library/user-event": "^12.8.3",
    "@types/classnames": "^2.2.10",
    "@types/dom-to-image": "^2.6.7",
+    "@types/enzyme": "^3.10.18",
    "@types/fetch-mock": "^7.3.2",
    "@types/jest": "^29.5.12",
    "@types/jquery": "^3.5.8",
@@ -290,8 +290,9 @@
    "@types/yargs": "12 - 18",
    "@typescript-eslint/eslint-plugin": "^5.62.0",
    "@typescript-eslint/parser": "^5.62.0",
+    "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
    "babel-jest": "^29.7.0",
-    "babel-loader": "^10.0.0",
+    "babel-loader": "^9.1.3",
    "babel-plugin-dynamic-import-node": "^2.3.3",
    "babel-plugin-jsx-remove-data-test-id": "^3.0.0",
    "babel-plugin-lodash": "^3.3.4",
@@ -301,6 +302,8 @@
    "cross-env": "^7.0.3",
    "css-loader": "^7.1.2",
    "css-minimizer-webpack-plugin": "^7.0.2",
+    "enzyme": "^3.11.0",
+    "enzyme-matchers": "^7.1.2",
    "eslint": "^8.56.0",
    "eslint-config-airbnb": "^19.0.4",
    "eslint-config-prettier": "^7.2.0",
--- a/superset-frontend/packages/superset-ui-chart-controls/package.json
+++ b/superset-frontend/packages/superset-ui-chart-controls/package.json
@@ -25,6 +25,7 @@
  ],
  "dependencies": {
    "@react-icons/all-files": "^4.1.0",
+    "@types/enzyme": "^3.10.18",
    "@types/react": "*",
    "lodash": "^4.17.21",
    "prop-types": "^15.8.1"
--- a/superset-frontend/packages/superset-ui-chart-controls/src/constants.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/constants.ts
@@ -26,7 +26,6 @@ import {
 import { ColumnMeta, SortSeriesData, SortSeriesType } from './types';

 export const DEFAULT_MAX_ROW = 100000;
-export const DEFAULT_MAX_ROW_TABLE_SERVER = 500000;

 // eslint-disable-next-line import/prefer-default-export
 export const TIME_FILTER_LABELS = {
--- a/superset-frontend/packages/superset-ui-chart-controls/src/operators/aggregateOperator.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/operators/aggregateOperator.ts
@@ -30,7 +30,7 @@ export const aggregationOperator: PostProcessingFactory<
 > = (formData: QueryFormData, queryObject) => {
  const { aggregation = 'LAST_VALUE' } = formData;

-  if (aggregation === 'LAST_VALUE' || aggregation === 'raw') {
+  if (aggregation === 'LAST_VALUE') {
    return undefined;
  }

--- a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/customControls.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/customControls.tsx
@@ -70,7 +70,6 @@ export const aggregationControl = {
    clearable: false,
    renderTrigger: false,
    choices: [
-      ['raw', t('None')],
      ['LAST_VALUE', t('Last Value')],
      ['sum', t('Total (Sum)')],
      ['mean', t('Average (Mean)')],
@@ -78,9 +77,7 @@ export const aggregationControl = {
      ['max', t('Maximum')],
      ['median', t('Median')],
    ],
-    description: t(
-      'Aggregation method used to compute the Big Number from the Trendline.For non-additive metrics like ratios, averages, distinct counts, etc use NONE.',
-    ),
+    description: t('Select an aggregation method to apply to the metric.'),
    provideFormDataToProps: true,
    mapStateToProps: ({ form_data }: ControlPanelState) => ({
      value: form_data.aggregation || 'LAST_VALUE',
--- a/superset-frontend/packages/superset-ui-chart-controls/src/types.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/types.ts
@@ -69,7 +69,6 @@ export interface Dataset {
  columns: ColumnMeta[];
  metrics: Metric[];
  column_formats: Record<string, string>;
-  currency_formats?: Record<string, Currency>;
  verbose_map: Record<string, string>;
  main_dttm_col: string;
  // eg. ['["ds", true]', 'ds [asc]']
--- a/superset-frontend/packages/superset-ui-core/package.json
+++ b/superset-frontend/packages/superset-ui-core/package.json
@@ -56,6 +56,7 @@
    "@types/d3-scale": "^2.1.1",
    "@types/d3-time": "^3.0.4",
    "@types/d3-time-format": "^4.0.3",
+    "@types/enzyme": "^3.10.18",
    "@types/fetch-mock": "^7.3.8",
    "@types/lodash": "^4.17.16",
    "@types/math-expression-evaluator": "^1.3.3",
--- a/superset-frontend/packages/superset-ui-core/src/chart/models/ChartMetadata.ts
+++ b/superset-frontend/packages/superset-ui-core/src/chart/models/ChartMetadata.ts
@@ -49,7 +49,6 @@ export interface ChartMetadataConfig {
  label?: ChartLabel | null;
  labelExplanation?: string | null;
  queryObjectCount?: number;
-  dynamicQueryObjectCount?: boolean;
  parseMethod?: ParseMethod;
  // suppressContextMenu: true hides the default context menu for the chart.
  // This is useful for viz plugins that define their own context menu.
@@ -93,8 +92,6 @@ export default class ChartMetadata {

  queryObjectCount: number;

-  dynamicQueryObjectCount: boolean;
-
  parseMethod: ParseMethod;

  suppressContextMenu?: boolean;
@@ -118,7 +115,6 @@ export default class ChartMetadata {
      label = null,
      labelExplanation = null,
      queryObjectCount = 1,
-      dynamicQueryObjectCount = false,
      parseMethod = 'json-bigint',
      suppressContextMenu = false,
    } = config;
@@ -149,7 +145,6 @@ export default class ChartMetadata {
    this.label = label;
    this.labelExplanation = labelExplanation;
    this.queryObjectCount = queryObjectCount;
-    this.dynamicQueryObjectCount = dynamicQueryObjectCount;
    this.parseMethod = parseMethod;
    this.suppressContextMenu = suppressContextMenu;
  }
--- a/superset-frontend/packages/superset-ui-core/src/connection/callApi/parseResponse.ts
+++ b/superset-frontend/packages/superset-ui-core/src/connection/callApi/parseResponse.ts
@@ -58,18 +58,17 @@ export default async function parseResponse<T extends ParseMethod = 'json'>(
    const result: JsonResponse = {
      response,
      json: cloneDeepWith(json, (value: any) => {
+        // `json-bigint` could not handle floats well, see sidorares/json-bigint#62
+        // TODO: clean up after json-bigint>1.0.1 is released
+        if (value?.isInteger?.() === false) {
+          return Number(value);
+        }
        if (
-          value?.isInteger?.() === true &&
-          (value?.isGreaterThan?.(Number.MAX_SAFE_INTEGER) ||
-            value?.isLessThan?.(Number.MIN_SAFE_INTEGER))
+          value?.isGreaterThan?.(Number.MAX_SAFE_INTEGER) ||
+          value?.isLessThan?.(Number.MIN_SAFE_INTEGER)
        ) {
          return BigInt(value);
        }
-        // // `json-bigint` could not handle floats well, see sidorares/json-bigint#62
-        // // TODO: clean up after json-bigint>1.0.1 is released
-        if (value?.isNaN?.() === false) {
-          return value?.toNumber?.();
-        }
        return undefined;
      }),
    };
--- a/superset-frontend/packages/superset-ui-core/src/validator/index.ts
+++ b/superset-frontend/packages/superset-ui-core/src/validator/index.ts
@@ -25,4 +25,3 @@ export { default as validateNonEmpty } from './validateNonEmpty';
 export { default as validateMaxValue } from './validateMaxValue';
 export { default as validateMapboxStylesUrl } from './validateMapboxStylesUrl';
 export { default as validateTimeComparisonRangeValues } from './validateTimeComparisonRangeValues';
-export { default as validateServerPagination } from './validateServerPagination';
--- a/superset-frontend/packages/superset-ui-core/test/connection/callApi/parseResponse.test.ts
+++ b/superset-frontend/packages/superset-ui-core/test/connection/callApi/parseResponse.test.ts
@@ -143,7 +143,7 @@ describe('parseResponse()', () => {
    const mockBigIntUrl = '/mock/get/bigInt';
    const mockGetBigIntPayload = `{
      "value": 9223372036854775807, "minus": { "value": -483729382918228373892, "str": "something" },
-      "number": 1234, "floatValue": { "plus": 0.3452211361231223, "minus": -0.3452211361231223, "even": 1234567890123456.0000000 },
+      "number": 1234, "floatValue": { "plus": 0.3452211361231223, "minus": -0.3452211361231223 },
      "string.constructor": "data.constructor",
      "constructor": "constructor"
    }`;
@@ -161,7 +161,6 @@ describe('parseResponse()', () => {
    expect(responseBigNumber.json.floatValue.minus).toEqual(
      -0.3452211361231223,
    );
-    expect(responseBigNumber.json.floatValue.even).toEqual(1234567890123456);
    expect(
      responseBigNumber.json.floatValue.plus +
        responseBigNumber.json.floatValue.minus,
--- a/superset-frontend/packages/superset-ui-core/test/validator/validateServerPagination.test.ts
+++ b/superset-frontend/packages/superset-ui-core/test/validator/validateServerPagination.test.ts
@@ -1,153 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { validateServerPagination } from '@superset-ui/core';
-import './setup';
-
-const DEFAULT_MAX_ROW = 100000;
-const DEFAULT_MAX_ROW_TABLE_SERVER = 500000;
-
-test('validateServerPagination returns warning message only when value is between max thresholds and server pagination is disabled', () => {
-  // Should show warning - value between thresholds and server pagination disabled
-  expect(
-    validateServerPagination(
-      200000,
-      false,
-      DEFAULT_MAX_ROW,
-      DEFAULT_MAX_ROW_TABLE_SERVER,
-    ),
-  ).toBeTruthy();
-  expect(
-    validateServerPagination(
-      300000,
-      false,
-      DEFAULT_MAX_ROW,
-      DEFAULT_MAX_ROW_TABLE_SERVER,
-    ),
-  ).toBeTruthy();
-
-  // Should not show warning - value above max server threshold
-  expect(
-    validateServerPagination(
-      600000,
-      false,
-      DEFAULT_MAX_ROW,
-      DEFAULT_MAX_ROW_TABLE_SERVER,
-    ),
-  ).toBeFalsy();
-
-  // Should not show warning - value below max without server threshold
-  expect(
-    validateServerPagination(
-      50000,
-      false,
-      DEFAULT_MAX_ROW,
-      DEFAULT_MAX_ROW_TABLE_SERVER,
-    ),
-  ).toBeFalsy();
-});
-
-test('validateServerPagination returns false when server pagination is enabled regardless of value', () => {
-  expect(
-    validateServerPagination(
-      200000,
-      true,
-      DEFAULT_MAX_ROW,
-      DEFAULT_MAX_ROW_TABLE_SERVER,
-    ),
-  ).toBeFalsy();
-  expect(
-    validateServerPagination(
-      300000,
-      true,
-      DEFAULT_MAX_ROW,
-      DEFAULT_MAX_ROW_TABLE_SERVER,
-    ),
-  ).toBeFalsy();
-  expect(
-    validateServerPagination(
-      600000,
-      true,
-      DEFAULT_MAX_ROW,
-      DEFAULT_MAX_ROW_TABLE_SERVER,
-    ),
-  ).toBeFalsy();
-});
-
-test('validateServerPagination handles string inputs correctly', () => {
-  expect(
-    validateServerPagination(
-      '200000',
-      false,
-      DEFAULT_MAX_ROW,
-      DEFAULT_MAX_ROW_TABLE_SERVER,
-    ),
-  ).toBeTruthy();
-  expect(
-    validateServerPagination(
-      '600000',
-      false,
-      DEFAULT_MAX_ROW,
-      DEFAULT_MAX_ROW_TABLE_SERVER,
-    ),
-  ).toBeFalsy();
-  expect(
-    validateServerPagination(
-      '50000',
-      false,
-      DEFAULT_MAX_ROW,
-      DEFAULT_MAX_ROW_TABLE_SERVER,
-    ),
-  ).toBeFalsy();
-});
-
-test('validateServerPagination handles edge cases', () => {
-  expect(
-    validateServerPagination(
-      undefined,
-      false,
-      DEFAULT_MAX_ROW,
-      DEFAULT_MAX_ROW_TABLE_SERVER,
-    ),
-  ).toBeFalsy();
-  expect(
-    validateServerPagination(
-      null,
-      false,
-      DEFAULT_MAX_ROW,
-      DEFAULT_MAX_ROW_TABLE_SERVER,
-    ),
-  ).toBeFalsy();
-  expect(
-    validateServerPagination(
-      NaN,
-      false,
-      DEFAULT_MAX_ROW,
-      DEFAULT_MAX_ROW_TABLE_SERVER,
-    ),
-  ).toBeFalsy();
-  expect(
-    validateServerPagination(
-      'invalid',
-      false,
-      DEFAULT_MAX_ROW,
-      DEFAULT_MAX_ROW_TABLE_SERVER,
-    ),
-  ).toBeFalsy();
-});
--- a/superset-frontend/packages/superset-ui-demo/package.json
+++ b/superset-frontend/packages/superset-ui-demo/package.json
@@ -54,11 +54,11 @@
  },
  "devDependencies": {
    "@babel/core": "^7.26.0",
-    "@babel/preset-env": "^7.27.2",
+    "@babel/preset-env": "^7.26.7",
    "@babel/preset-react": "^7.26.3",
    "@babel/preset-typescript": "^7.23.3",
    "@storybook/react-webpack5": "8.2.9",
-    "babel-loader": "^10.0.0",
+    "babel-loader": "^9.1.3",
    "fork-ts-checker-webpack-plugin": "^9.0.2",
    "ts-loader": "^9.5.2",
    "typescript": "^5.7.2"
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/Multi.tsx
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/Multi.tsx
@@ -38,20 +38,9 @@ import {
 } from '../DeckGLContainer';
 import { getExploreLongUrl } from '../utils/explore';
 import layerGenerators from '../layers';
-import fitViewport, { Viewport } from '../utils/fitViewport';
+import { Viewport } from '../utils/fitViewport';
 import { TooltipProps } from '../components/Tooltip';

-import { getPoints as getPointsArc } from '../layers/Arc/Arc';
-import { getPoints as getPointsPath } from '../layers/Path/Path';
-import { getPoints as getPointsPolygon } from '../layers/Polygon/Polygon';
-import { getPoints as getPointsGrid } from '../layers/Grid/Grid';
-import { getPoints as getPointsScatter } from '../layers/Scatter/Scatter';
-import { getPoints as getPointsContour } from '../layers/Contour/Contour';
-import { getPoints as getPointsHeatmap } from '../layers/Heatmap/Heatmap';
-import { getPoints as getPointsHex } from '../layers/Hex/Hex';
-import { getPoints as getPointsGeojson } from '../layers/Geojson/Geojson';
-import { getPoints as getPointsScreengrid } from '../layers/Screengrid/Screengrid';
-
 export type DeckMultiProps = {
  formData: QueryFormData;
  payload: JsonObject;
@@ -67,35 +56,7 @@ export type DeckMultiProps = {
 const DeckMulti = (props: DeckMultiProps) => {
  const containerRef = useRef<DeckGLContainerHandle>();

-  const getAdjustedViewport = useCallback(() => {
-    let viewport = { ...props.viewport };
-    const points = [
-      ...getPointsPolygon(props.payload.data.features.deck_polygon || []),
-      ...getPointsPath(props.payload.data.features.deck_path || []),
-      ...getPointsGrid(props.payload.data.features.deck_grid || []),
-      ...getPointsScatter(props.payload.data.features.deck_scatter || []),
-      ...getPointsContour(props.payload.data.features.deck_contour || []),
-      ...getPointsHeatmap(props.payload.data.features.deck_heatmap || []),
-      ...getPointsHex(props.payload.data.features.deck_hex || []),
-      ...getPointsArc(props.payload.data.features.deck_arc || []),
-      ...getPointsGeojson(props.payload.data.features.deck_geojson || []),
-      ...getPointsScreengrid(props.payload.data.features.deck_screengrid || []),
-    ];
-
-    if (props.formData) {
-      viewport = fitViewport(viewport, {
-        width: props.width,
-        height: props.height,
-        points,
-      });
-    }
-    if (viewport.zoom < 0) {
-      viewport.zoom = 0;
-    }
-    return viewport;
-  }, [props]);
-
-  const [viewport, setViewport] = useState<Viewport>(getAdjustedViewport());
+  const [viewport, setViewport] = useState<Viewport>();
  const [subSlicesLayers, setSubSlicesLayers] = useState<Record<number, Layer>>(
    {},
  );
@@ -109,31 +70,23 @@ const DeckMulti = (props: DeckMultiProps) => {

  const loadLayers = useCallback(
    (formData: QueryFormData, payload: JsonObject, viewport?: Viewport) => {
-      setViewport(getAdjustedViewport());
+      setViewport(viewport);
      setSubSlicesLayers({});
      payload.data.slices.forEach(
        (subslice: { slice_id: number } & JsonObject) => {
          // Filters applied to multi_deck are passed down to underlying charts
          // note that dashboard contextual information (filter_immune_slices and such) aren't
          // taken into consideration here
-          const extra_filters = [
-            ...(subslice.form_data.extra_filters || []),
+          const filters = [
+            ...(subslice.form_data.filters || []),
+            ...(formData.filters || []),
            ...(formData.extra_filters || []),
-            ...(formData.extra_form_data?.filters || []),
          ];
-
-          const adhoc_filters = [
-            ...(formData.adhoc_filters || []),
-            ...(subslice.formData?.adhoc_filters || []),
-            ...(formData.extra_form_data?.adhoc_filters || []),
-          ];
-
          const subsliceCopy = {
            ...subslice,
            form_data: {
              ...subslice.form_data,
-              extra_filters,
-              adhoc_filters,
+              filters,
            },
          };

@@ -164,13 +117,7 @@ const DeckMulti = (props: DeckMultiProps) => {
        },
      );
    },
-    [
-      props.datasource,
-      props.onAddFilter,
-      props.onSelect,
-      setTooltip,
-      getAdjustedViewport,
-    ],
+    [props.datasource, props.onAddFilter, props.onSelect, setTooltip],
  );

  const prevDeckSlices = usePrevious(props.formData.deck_slices);
@@ -189,7 +136,7 @@ const DeckMulti = (props: DeckMultiProps) => {
    <DeckGLContainerStyledWrapper
      ref={containerRef}
      mapboxApiAccessToken={payload.data.mapboxApiKey}
-      viewport={viewport}
+      viewport={viewport || props.viewport}
      layers={layers}
      mapStyle={formData.mapbox_style}
      setControlValue={setControlValue}
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/Arc.tsx
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/Arc.tsx
@@ -29,7 +29,7 @@ import TooltipRow from '../../TooltipRow';
 import { TooltipProps } from '../../components/Tooltip';
 import { Point } from '../../types';

-export function getPoints(data: JsonObject[]) {
+function getPoints(data: JsonObject[]) {
  const points: Point[] = [];
  data.forEach(d => {
    points.push(d.sourcePosition);
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/Contour.tsx
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/Contour.tsx
@@ -97,7 +97,7 @@ export const getLayer: getLayerType<unknown> = function (
  });
 };

-export function getPoints(data: any[]) {
+function getPoints(data: any[]) {
  return data.map(d => d.position);
 }

--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/Geojson.tsx
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/Geojson.tsx
@@ -39,7 +39,6 @@ import { commonLayerProps } from '../common';
 import TooltipRow from '../../TooltipRow';
 import fitViewport, { Viewport } from '../../utils/fitViewport';
 import { TooltipProps } from '../../components/Tooltip';
-import { Point } from '../../types';

 type ProcessedFeature = Feature<Geometry, GeoJsonProperties> & {
  properties: JsonObject;
@@ -173,17 +172,6 @@ export type DeckGLGeoJsonProps = {
  width: number;
 };

-export function getPoints(data: Point[]) {
-  return data.reduce((acc: Array<any>, feature: any) => {
-    const bounds = geojsonExtent(feature);
-    if (bounds) {
-      return [...acc, [bounds[0], bounds[1]], [bounds[2], bounds[3]]];
-    }
-
-    return acc;
-  }, []);
-}
-
 const DeckGLGeoJson = (props: DeckGLGeoJsonProps) => {
  const containerRef = useRef<DeckGLContainerHandle>();
  const setTooltip = useCallback((tooltip: TooltipProps['tooltip']) => {
@@ -198,13 +186,24 @@ const DeckGLGeoJson = (props: DeckGLGeoJsonProps) => {

  const viewport: Viewport = useMemo(() => {
    if (formData.autozoom) {
-      const points = getPoints(payload.data.features) || [];
+      const points =
+        payload?.data?.features?.reduce?.(
+          (acc: [number, number, number, number][], feature: any) => {
+            const bounds = geojsonExtent(feature);
+            if (bounds) {
+              return [...acc, [bounds[0], bounds[1]], [bounds[2], bounds[3]]];
+            }
+
+            return acc;
+          },
+          [],
+        ) || [];

      if (points.length) {
        return fitViewport(props.viewport, {
          width,
          height,
-          points: getPoints(payload.data.features) || [],
+          points,
        });
      }
    }
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/Grid.tsx
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/Grid.tsx
@@ -86,7 +86,7 @@ export function getLayer(
  });
 }

-export function getPoints(data: JsonObject[]) {
+function getPoints(data: JsonObject[]) {
  return data.map(d => d.position);
 }

--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/Heatmap.tsx
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/Heatmap.tsx
@@ -79,7 +79,7 @@ export const getLayer: getLayerType<unknown> = (
  });
 };

-export function getPoints(data: any[]) {
+function getPoints(data: any[]) {
  return data.map(d => d.position);
 }

--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/Hex.tsx
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/Hex.tsx
@@ -84,7 +84,7 @@ export function getLayer(
  });
 }

-export function getPoints(data: JsonObject[]) {
+function getPoints(data: JsonObject[]) {
  return data.map(d => d.position);
 }

--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/Path.tsx
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/Path.tsx
@@ -76,7 +76,7 @@ export function getLayer(
  });
 }

-export function getPoints(data: JsonObject[]) {
+function getPoints(data: JsonObject[]) {
  let points: Point[] = [];
  data.forEach(d => {
    points = points.concat(d.path);
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/Polygon.tsx
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/Polygon.tsx
@@ -173,10 +173,6 @@ export type DeckGLPolygonProps = {
  height: number;
 };

-export function getPoints(data: JsonObject[]) {
-  return data.flatMap(getPointsFromPolygon);
-}
-
 const DeckGLPolygon = (props: DeckGLPolygonProps) => {
  const containerRef = useRef<DeckGLContainerHandle>();

@@ -187,7 +183,7 @@ const DeckGLPolygon = (props: DeckGLPolygonProps) => {
      viewport = fitViewport(viewport, {
        width: props.width,
        height: props.height,
-        points: getPoints(features),
+        points: features.flatMap(getPointsFromPolygon),
      });
    }
    if (viewport.zoom < 0) {
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.tsx
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.tsx
@@ -30,7 +30,7 @@ import TooltipRow from '../../TooltipRow';
 import { unitToRadius } from '../../utils/geo';
 import { TooltipProps } from '../../components/Tooltip';

-export function getPoints(data: JsonObject[]) {
+function getPoints(data: JsonObject[]) {
  return data.map(d => d.position);
 }

--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/Screengrid.tsx
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/Screengrid.tsx
@@ -34,7 +34,7 @@ import {
 } from '../../DeckGLContainer';
 import { TooltipProps } from '../../components/Tooltip';

-export function getPoints(data: JsonObject[]) {
+function getPoints(data: JsonObject[]) {
  return data.map(d => d.position);
 }

--- a/superset-frontend/plugins/legacy-preset-chart-nvd3/package.json
+++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/package.json
@@ -31,11 +31,11 @@
  "dependencies": {
    "d3": "^3.5.17",
    "d3-tip": "^0.9.1",
+    "dompurify": "^3.2.4",
    "fast-safe-stringify": "^2.1.1",
    "lodash": "^4.17.21",
    "dayjs": "^1.11.13",
    "nvd3-fork": "^2.0.5",
-    "dompurify": "^3.2.4",
    "prop-types": "^15.8.1",
    "urijs": "^1.19.11"
  },
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/PopKPI.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/PopKPI.tsx
@@ -36,25 +36,13 @@ import {
 } from './types';
 import { useOverflowDetection } from './useOverflowDetection';

-const MetricNameText = styled.div<{ metricNameFontSize?: number }>`
-  ${({ theme, metricNameFontSize }) => `
-    font-family: ${theme.typography.families.sansSerif};
-    font-weight: ${theme.typography.weights.normal};
-    font-size: ${metricNameFontSize || theme.typography.sizes.s * 2}px;
-    text-align: center;
-    margin-bottom: ${theme.gridUnit * 3}px;
-  `}
-`;
-
 const NumbersContainer = styled.div`
  display: flex;
  justify-content: center;
  align-items: center;
  flex-direction: column;
  width: 100%;
-  height: 100%;
  overflow: auto;
-  padding: 12px;
 `;

 const ComparisonValue = styled.div<PopKPIComparisonValueStyleProps>`
@@ -85,8 +73,6 @@ export default function PopKPI(props: PopKPIProps) {
    prevNumber,
    valueDifference,
    percentDifferenceFormattedString,
-    metricName,
-    metricNameFontSize,
    headerFontSize,
    subheaderFontSize,
    comparisonColorEnabled,
@@ -98,8 +84,8 @@ export default function PopKPI(props: PopKPIProps) {
    subtitle,
    subtitleFontSize,
    dashboardTimeRange,
-    showMetricName,
  } = props;
+
  const [comparisonRange, setComparisonRange] = useState<string>('');

  useEffect(() => {
@@ -274,16 +260,9 @@ export default function PopKPI(props: PopKPIProps) {
            width: fit-content;
            margin: auto;
            align-items: flex-start;
-            overflow: auto;
          `
        }
      >
-        {showMetricName && metricName && (
-          <MetricNameText metricNameFontSize={metricNameFontSize}>
-            {metricName}
-          </MetricNameText>
-        )}
-
        <div css={bigValueContainerStyles}>
          {bigNumber}
          {percentDifferenceNumber !== 0 && (
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/controlPanel.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/controlPanel.ts
@@ -28,8 +28,6 @@ import {
  subheaderFontSize,
  subtitleControl,
  subtitleFontSize,
-  showMetricNameControl,
-  metricNameFontSizeWithVisibility,
 } from '../sharedControls';
 import { ColorSchemeEnum } from './types';

@@ -72,8 +70,6 @@ const config: ControlPanelConfig = {
        ],
        [subtitleControl],
        [subtitleFontSize],
-        [showMetricNameControl],
-        [metricNameFontSizeWithVisibility],
        [
          {
            ...subheaderFontSize,
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/index.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/index.ts
@@ -32,7 +32,6 @@ export default class PopKPIPlugin extends ChartPlugin {
      tags: [
        t('Comparison'),
        t('Business'),
-        t('ECharts'),
        t('Percentages'),
        t('Report'),
        t('Advanced-Analytics'),
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/transformProps.ts
@@ -26,13 +26,7 @@ import {
  SimpleAdhocFilter,
  ensureIsArray,
 } from '@superset-ui/core';
-import {
-  getComparisonFontSize,
-  getHeaderFontSize,
-  getMetricNameFontSize,
-} from './utils';
-
-import { getOriginalLabel } from '../utils';
+import { getComparisonFontSize, getHeaderFontSize } from './utils';

 dayjs.extend(utc);

@@ -89,7 +83,6 @@ export default function transformProps(chartProps: ChartProps) {
    headerFontSize,
    headerText,
    metric,
-    metricNameFontSize,
    yAxisFormat,
    currencyFormat,
    subheaderFontSize,
@@ -98,14 +91,11 @@ export default function transformProps(chartProps: ChartProps) {
    percentDifferenceFormat,
    subtitle = '',
    subtitleFontSize,
-    columnConfig = {},
+    columnConfig,
  } = formData;
  const { data: dataA = [] } = queriesData[0];
  const data = dataA;
  const metricName = metric ? getMetricLabel(metric) : '';
-  const metrics = chartProps.datasource?.metrics || [];
-  const originalLabel = getOriginalLabel(metric, metrics);
-  const showMetricName = chartProps.rawFormData?.show_metric_name ?? false;
  const timeComparison = ensureIsArray(chartProps.rawFormData?.time_compare)[0];
  const startDateOffset = chartProps.rawFormData?.start_date_offset;
  const currentTimeRangeFilter = chartProps.rawFormData?.adhoc_filters?.filter(
@@ -189,7 +179,7 @@ export default function transformProps(chartProps: ChartProps) {
    width,
    height,
    data,
-    metricName: originalLabel,
+    metricName,
    bigNumber,
    prevNumber,
    valueDifference,
@@ -197,8 +187,6 @@ export default function transformProps(chartProps: ChartProps) {
    boldText,
    subtitle,
    subtitleFontSize,
-    showMetricName,
-    metricNameFontSize: getMetricNameFontSize(metricNameFontSize),
    headerFontSize: getHeaderFontSize(headerFontSize),
    subheaderFontSize: getComparisonFontSize(subheaderFontSize),
    headerText,
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/types.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/types.ts
@@ -61,8 +61,6 @@ export type PopKPIProps = PopKPIStylesProps &
    data: TimeseriesDataRecord[];
    metrics: Metric[];
    metricName: string;
-    metricNameFontSize?: number;
-    showMetricName: boolean;
    bigNumber: string;
    prevNumber: string;
    subtitle?: string;
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/utils.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/utils.ts
@@ -16,19 +16,10 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-import {
-  headerFontSize,
-  subheaderFontSize,
-  metricNameFontSize,
-} from '../sharedControls';
+import { headerFontSize, subheaderFontSize } from '../sharedControls';

 const headerFontSizes = [16, 20, 30, 48, 60];
-const sharedFontSizes = [16, 20, 26, 32, 40];
-
-const metricNameProportionValues =
-  metricNameFontSize.config.options.map(
-    (option: { label: string; value: number }) => option.value,
-  ) ?? [];
+const comparisonFontSizes = [16, 20, 26, 32, 40];

 const headerProportionValues =
  headerFontSize.config.options.map(
@@ -49,10 +40,6 @@ const getFontSizeMapping = (
    return acc;
  }, {});

-const metricNameFontSizesMapping = getFontSizeMapping(
-  metricNameProportionValues,
-  sharedFontSizes,
-);
 const headerFontSizesMapping = getFontSizeMapping(
  headerProportionValues,
  headerFontSizes,
@@ -60,17 +47,13 @@ const headerFontSizesMapping = getFontSizeMapping(

 const comparisonFontSizesMapping = getFontSizeMapping(
  subheaderProportionValues,
-  sharedFontSizes,
+  comparisonFontSizes,
 );

-export const getMetricNameFontSize = (proportionValue: number) =>
-  metricNameFontSizesMapping[proportionValue] ??
-  sharedFontSizes[sharedFontSizes.length - 1];
-
 export const getHeaderFontSize = (proportionValue: number) =>
  headerFontSizesMapping[proportionValue] ??
  headerFontSizes[headerFontSizes.length - 1];

 export const getComparisonFontSize = (proportionValue: number) =>
  comparisonFontSizesMapping[proportionValue] ??
-  sharedFontSizes[sharedFontSizes.length - 1];
+  comparisonFontSizes[comparisonFontSizes.length - 1];
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/controlPanel.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/controlPanel.ts
@@ -28,8 +28,6 @@ import {
  headerFontSize,
  subtitleFontSize,
  subtitleControl,
-  showMetricNameControl,
-  metricNameFontSizeWithVisibility,
 } from '../sharedControls';

 export default {
@@ -46,8 +44,6 @@ export default {
        [headerFontSize],
        [subtitleControl],
        [subtitleFontSize],
-        [showMetricNameControl],
-        [metricNameFontSizeWithVisibility],
        ['y_axis_format'],
        ['currency_format'],
        [
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/index.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/index.ts
@@ -39,7 +39,6 @@ const metadata = {
  tags: [
    t('Additive'),
    t('Business'),
-    t('ECharts'),
    t('Legacy'),
    t('Percentages'),
    t('Featured'),
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.test.ts
@@ -36,7 +36,6 @@ jest.mock('@superset-ui/core', () => ({
 jest.mock('../utils', () => ({
  getDateFormatter: jest.fn(() => (v: any) => `${v}pm`),
  parseMetricValue: jest.fn(val => Number(val)),
-  getOriginalLabel: jest.fn((metric, metrics) => metric),
 }));

 describe('BigNumberTotal transformProps', () => {
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.ts
@@ -29,7 +29,7 @@ import {
  getValueFormatter,
 } from '@superset-ui/core';
 import { BigNumberTotalChartProps, BigNumberVizProps } from '../types';
-import { getDateFormatter, getOriginalLabel, parseMetricValue } from '../utils';
+import { getDateFormatter, parseMetricValue } from '../utils';
 import { Refs } from '../../types';

 export default function transformProps(
@@ -45,7 +45,6 @@ export default function transformProps(
    datasource: { currencyFormats = {}, columnFormats = {} },
  } = chartProps;
  const {
-    metricNameFontSize,
    headerFontSize,
    metric = 'value',
    subtitle,
@@ -59,12 +58,9 @@ export default function transformProps(
    subheaderFontSize,
  } = formData;
  const refs: Refs = {};
-  const { data = [], coltypes = [] } = queriesData[0] || {};
+  const { data = [], coltypes = [] } = queriesData[0];
  const granularity = extractTimegrain(rawFormData as QueryFormData);
-  const metrics = chartProps.datasource?.metrics || [];
-  const originalLabel = getOriginalLabel(metric, metrics);
  const metricName = getMetricLabel(metric);
-  const showMetricName = chartProps.rawFormData?.show_metric_name ?? false;
  const formattedSubtitle = subtitle?.trim() ? subtitle : subheader || '';
  const formattedSubtitleFontSize = subtitle?.trim()
    ? (subtitleFontSize ?? 1)
@@ -107,6 +103,7 @@ export default function transformProps(
  const colorThresholdFormatters =
    getColorFormatters(conditionalFormatting, data, false) ??
    defaultColorFormatters;
+
  return {
    width,
    height,
@@ -119,8 +116,5 @@ export default function transformProps(
    onContextMenu,
    refs,
    colorThresholdFormatters,
-    metricName: originalLabel,
-    showMetricName,
-    metricNameFontSize,
  };
 }
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberViz.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberViz.tsx
@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-import { PureComponent, MouseEvent, createRef } from 'react';
+import { PureComponent, MouseEvent } from 'react';
 import {
  t,
  getNumberFormatter,
@@ -35,7 +35,6 @@ const defaultNumberFormatter = getNumberFormatter();

 const PROPORTION = {
  // text size: proportion of the chart container sans trendline
-  METRIC_NAME: 0.125,
  KICKER: 0.1,
  HEADER: 0.3,
  SUBHEADER: 0.125,
@@ -43,20 +42,13 @@ const PROPORTION = {
  TRENDLINE: 0.3,
 };

-type BigNumberVisState = {
-  elementsRendered: boolean;
-  recalculateTrigger: boolean;
-};
-
-class BigNumberVis extends PureComponent<BigNumberVizProps, BigNumberVisState> {
+class BigNumberVis extends PureComponent<BigNumberVizProps> {
  static defaultProps = {
    className: '',
    headerFormatter: defaultNumberFormatter,
    formatTime: getTimeFormatter(SMART_DATE_VERBOSE_ID),
    headerFontSize: PROPORTION.HEADER,
    kickerFontSize: PROPORTION.KICKER,
-    metricNameFontSize: PROPORTION.METRIC_NAME,
-    showMetricName: true,
    mainColor: BRAND_COLOR,
    showTimestamp: false,
    showTrendLine: false,
@@ -66,40 +58,6 @@ class BigNumberVis extends PureComponent<BigNumberVizProps, BigNumberVisState> {
    timeRangeFixed: false,
  };

-  // Create refs for each component to measure heights
-  metricNameRef = createRef<HTMLDivElement>();
-
-  kickerRef = createRef<HTMLDivElement>();
-
-  headerRef = createRef<HTMLDivElement>();
-
-  subheaderRef = createRef<HTMLDivElement>();
-
-  subtitleRef = createRef<HTMLDivElement>();
-
-  state = {
-    elementsRendered: false,
-    recalculateTrigger: false,
-  };
-
-  componentDidMount() {
-    // Wait for elements to render and then calculate heights
-    setTimeout(() => {
-      this.setState({ elementsRendered: true });
-    }, 0);
-  }
-
-  componentDidUpdate(prevProps: BigNumberVizProps) {
-    if (
-      prevProps.height !== this.props.height ||
-      prevProps.showTrendLine !== this.props.showTrendLine
-    ) {
-      this.setState(prevState => ({
-        recalculateTrigger: !prevState.recalculateTrigger,
-      }));
-    }
-  }
-
  getClassName() {
    const { className, showTrendLine, bigNumberFallback } = this.props;
    const names = `superset-legacy-chart-big-number ${className} ${
@@ -134,37 +92,6 @@ class BigNumberVis extends PureComponent<BigNumberVizProps, BigNumberVisState> {
    );
  }

-  renderMetricName(maxHeight: number) {
-    const { metricName, width, showMetricName } = this.props;
-    if (!showMetricName || !metricName) return null;
-
-    const text = metricName;
-
-    const container = this.createTemporaryContainer();
-    document.body.append(container);
-    const fontSize = computeMaxFontSize({
-      text,
-      maxWidth: width,
-      maxHeight,
-      className: 'metric-name',
-      container,
-    });
-    container.remove();
-
-    return (
-      <div
-        ref={this.metricNameRef}
-        className="metric-name"
-        style={{
-          fontSize,
-          height: 'auto',
-        }}
-      >
-        {text}
-      </div>
-    );
-  }
-
  renderKicker(maxHeight: number) {
    const { timestamp, showTimestamp, formatTime, width } = this.props;
    if (
@@ -191,7 +118,6 @@ class BigNumberVis extends PureComponent<BigNumberVizProps, BigNumberVisState> {

    return (
      <div
-        ref={this.kickerRef}
        className="kicker"
        style={{
          fontSize,
@@ -247,7 +173,6 @@ class BigNumberVis extends PureComponent<BigNumberVizProps, BigNumberVisState> {

    return (
      <div
-        ref={this.headerRef}
        className="header-line"
        style={{
          display: 'flex',
@@ -286,7 +211,6 @@ class BigNumberVis extends PureComponent<BigNumberVizProps, BigNumberVisState> {

      return (
        <div
-          ref={this.subheaderRef}
          className="subheader-line"
          style={{
            fontSize,
@@ -332,7 +256,6 @@ class BigNumberVis extends PureComponent<BigNumberVizProps, BigNumberVisState> {
      return (
        <>
          <div
-            ref={this.subtitleRef}
            className="subtitle-line subheader-line"
            style={{
              fontSize: `${fontSize}px`,
@@ -393,35 +316,6 @@ class BigNumberVis extends PureComponent<BigNumberVizProps, BigNumberVisState> {
    );
  }

-  getTotalElementsHeight() {
-    const marginPerElement = 8; // theme.gridUnit = 4, so margin-bottom = 8px
-
-    const refs = [
-      this.metricNameRef,
-      this.kickerRef,
-      this.headerRef,
-      this.subheaderRef,
-      this.subtitleRef,
-    ];
-
-    // Filter refs to only those with a current element
-    const visibleRefs = refs.filter(ref => ref.current);
-
-    const totalHeight = visibleRefs.reduce((sum, ref, index) => {
-      const height = ref.current?.offsetHeight || 0;
-      const margin = index < visibleRefs.length - 1 ? marginPerElement : 0;
-      return sum + height + margin;
-    }, 0);
-
-    return totalHeight;
-  }
-
-  shouldApplyOverflow(availableHeight: number) {
-    if (!this.state.elementsRendered) return false;
-    const totalHeight = this.getTotalElementsHeight();
-    return totalHeight > availableHeight;
-  }
-
  render() {
    const {
      showTrendLine,
@@ -429,7 +323,6 @@ class BigNumberVis extends PureComponent<BigNumberVizProps, BigNumberVisState> {
      kickerFontSize,
      headerFontSize,
      subtitleFontSize,
-      metricNameFontSize,
      subheaderFontSize,
    } = this.props;
    const className = this.getClassName();
@@ -437,31 +330,11 @@ class BigNumberVis extends PureComponent<BigNumberVizProps, BigNumberVisState> {
    if (showTrendLine) {
      const chartHeight = Math.floor(PROPORTION.TRENDLINE * height);
      const allTextHeight = height - chartHeight;
-      const shouldApplyOverflow = this.shouldApplyOverflow(allTextHeight);

      return (
        <div className={className}>
-          <div
-            className="text-container"
-            style={{
-              height: allTextHeight,
-              ...(shouldApplyOverflow
-                ? {
-                    display: 'block',
-                    boxSizing: 'border-box',
-                    overflowX: 'hidden',
-                    overflowY: 'auto',
-                    width: '100%',
-                  }
-                : {}),
-            }}
-          >
+          <div className="text-container" style={{ height: allTextHeight }}>
            {this.renderFallbackWarning()}
-            {this.renderMetricName(
-              Math.ceil(
-                (metricNameFontSize || 0) * (1 - PROPORTION.TRENDLINE) * height,
-              ),
-            )}
            {this.renderKicker(
              Math.ceil(
                (kickerFontSize || 0) * (1 - PROPORTION.TRENDLINE) * height,
@@ -483,33 +356,16 @@ class BigNumberVis extends PureComponent<BigNumberVizProps, BigNumberVisState> {
        </div>
      );
    }
-    const shouldApplyOverflow = this.shouldApplyOverflow(height);
+
    return (
-      <div
-        className={className}
-        style={{
-          height,
-          ...(shouldApplyOverflow
-            ? {
-                display: 'block',
-                boxSizing: 'border-box',
-                overflowX: 'hidden',
-                overflowY: 'auto',
-                width: '100%',
-              }
-            : {}),
-        }}
-      >
-        <div className="text-container">
-          {this.renderFallbackWarning()}
-          {this.renderMetricName((metricNameFontSize || 0) * height)}
-          {this.renderKicker((kickerFontSize || 0) * height)}
-          {this.renderHeader(Math.ceil(headerFontSize * height))}
-          {this.rendermetricComparisonSummary(
-            Math.ceil(subheaderFontSize * height),
-          )}
-          {this.renderSubtitle(Math.ceil(subtitleFontSize * height))}
-        </div>
+      <div className={className} style={{ height }}>
+        {this.renderFallbackWarning()}
+        {this.renderKicker((kickerFontSize || 0) * height)}
+        {this.renderHeader(Math.ceil(headerFontSize * height))}
+        {this.rendermetricComparisonSummary(
+          Math.ceil(subheaderFontSize * height),
+        )}
+        {this.renderSubtitle(Math.ceil(subtitleFontSize * height))}
      </div>
    );
  }
@@ -544,12 +400,7 @@ export default styled(BigNumberVis)`

    .kicker {
      line-height: 1em;
-      margin-bottom: ${theme.gridUnit * 2}px;
-    }
-
-    .metric-name {
-      line-height: 1em;
-      margin-bottom: ${theme.gridUnit * 2}px;
+      padding-bottom: 2em;
    }

    .header-line {
@@ -565,12 +416,12 @@ export default styled(BigNumberVis)`

    .subheader-line {
      line-height: 1em;
-      margin-bottom: ${theme.gridUnit * 2}px;
+      padding-bottom: 0;
    }

    .subtitle-line {
      line-height: 1em;
-      margin-bottom: ${theme.gridUnit * 2}px;
+      padding-bottom: 0;
    }

    &.is-fallback-value {
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/buildQuery.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/buildQuery.test.ts
@@ -1,86 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { QueryFormData } from '@superset-ui/core';
-import buildQuery from './buildQuery';
-
-jest.mock('@superset-ui/core', () => ({
-  ...jest.requireActual('@superset-ui/core'),
-  getXAxisColumn: jest.fn(() => 'order_date'),
-  isXAxisSet: jest.fn(() => true),
-}));
-
-jest.mock('@superset-ui/chart-controls', () => ({
-  pivotOperator: jest.fn(() => ({ operation: 'pivot' })),
-  aggregationOperator: jest.fn(formData => {
-    if (formData.aggregation === 'LAST_VALUE' || !formData.aggregation) {
-      return undefined;
-    }
-    return {
-      operation: 'aggregation',
-      options: { operator: formData.aggregation },
-    };
-  }),
-  flattenOperator: jest.fn(() => ({ operation: 'flatten' })),
-  resampleOperator: jest.fn(() => ({ operation: 'resample' })),
-  rollingWindowOperator: jest.fn(() => ({ operation: 'rolling' })),
-}));
-
-describe('BigNumberWithTrendline buildQuery', () => {
-  const baseFormData: QueryFormData = {
-    datasource: '1__table',
-    viz_type: 'big_number',
-    metric: 'custom_metric',
-    aggregation: null,
-  };
-
-  it('creates raw metric query when aggregation is null', () => {
-    const queryContext = buildQuery({ ...baseFormData });
-    const bigNumberQuery = queryContext.queries[1];
-
-    expect(bigNumberQuery.post_processing).toEqual([{ operation: 'pivot' }]);
-    expect(bigNumberQuery.is_timeseries).toBe(true);
-  });
-
-  it('adds aggregation operator when aggregation is "sum"', () => {
-    const queryContext = buildQuery({ ...baseFormData, aggregation: 'sum' });
-    const bigNumberQuery = queryContext.queries[1];
-
-    expect(bigNumberQuery.post_processing).toEqual([
-      { operation: 'pivot' },
-      { operation: 'aggregation', options: { operator: 'sum' } },
-    ]);
-    expect(bigNumberQuery.is_timeseries).toBe(true);
-  });
-
-  it('skips aggregation when aggregation is LAST_VALUE', () => {
-    const queryContext = buildQuery({
-      ...baseFormData,
-      aggregation: 'LAST_VALUE',
-    });
-    const bigNumberQuery = queryContext.queries[1];
-
-    expect(bigNumberQuery.post_processing).toEqual([{ operation: 'pivot' }]);
-    expect(bigNumberQuery.is_timeseries).toBe(true);
-  });
-
-  it('always returns two queries', () => {
-    const queryContext = buildQuery({ ...baseFormData });
-    expect(queryContext.queries.length).toBe(2);
-  });
-});
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/buildQuery.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/buildQuery.ts
@@ -16,7 +16,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 import {
  buildQueryContext,
  ensureIsArray,
@@ -33,17 +32,15 @@ import {
 } from '@superset-ui/chart-controls';

 export default function buildQuery(formData: QueryFormData) {
-  const isRawMetric = formData.aggregation === 'raw';
-
-  const timeColumn = isXAxisSet(formData)
-    ? ensureIsArray(getXAxisColumn(formData))
-    : [];
-
  return buildQueryContext(formData, baseQueryObject => [
    {
      ...baseQueryObject,
-      columns: [...timeColumn],
-      ...(timeColumn.length ? {} : { is_timeseries: true }),
+      columns: [
+        ...(isXAxisSet(formData)
+          ? ensureIsArray(getXAxisColumn(formData))
+          : []),
+      ],
+      ...(isXAxisSet(formData) ? {} : { is_timeseries: true }),
      post_processing: [
        pivotOperator(formData, baseQueryObject),
        rollingWindowOperator(formData, baseQueryObject),
@@ -51,16 +48,19 @@ export default function buildQuery(formData: QueryFormData) {
        flattenOperator(formData, baseQueryObject),
      ],
    },
+
    {
      ...baseQueryObject,
-      columns: [...(isRawMetric ? [] : timeColumn)],
-      is_timeseries: !isRawMetric,
-      post_processing: isRawMetric
-        ? []
-        : [
-            pivotOperator(formData, baseQueryObject),
-            aggregationOperator(formData, baseQueryObject),
-          ],
+      columns: [
+        ...(isXAxisSet(formData)
+          ? ensureIsArray(getXAxisColumn(formData))
+          : []),
+      ],
+      ...(isXAxisSet(formData) ? {} : { is_timeseries: true }),
+      post_processing: [
+        pivotOperator(formData, baseQueryObject),
+        aggregationOperator(formData, baseQueryObject),
+      ],
    },
  ]);
 }
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/controlPanel.tsx
@@ -31,8 +31,6 @@ import {
  subheaderFontSize,
  subtitleFontSize,
  subtitleControl,
-  showMetricNameControl,
-  metricNameFontSizeWithVisibility,
 } from '../sharedControls';

 const config: ControlPanelConfig = {
@@ -143,8 +141,6 @@ const config: ControlPanelConfig = {
        [subheaderFontSize],
        [subtitleControl],
        [subtitleFontSize],
-        [showMetricNameControl],
-        [metricNameFontSizeWithVisibility],
        ['y_axis_format'],
        ['currency_format'],
        [
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/index.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/index.ts
@@ -37,7 +37,6 @@ const metadata = {
  name: t('Big Number with Trendline'),
  tags: [
    t('Advanced-Analytics'),
-    t('ECharts'),
    t('Line'),
    t('Percentages'),
    t('Featured'),
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.test.ts
@@ -39,7 +39,6 @@ jest.mock('@superset-ui/core', () => ({
 jest.mock('../utils', () => ({
  getDateFormatter: jest.fn(() => (v: any) => `${v}pm`),
  parseMetricValue: jest.fn(val => Number(val)),
-  getOriginalLabel: jest.fn((metric, metrics) => metric),
 }));

 jest.mock('../../utils/tooltip', () => ({
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.ts
@@ -35,7 +35,7 @@ import {
  BigNumberWithTrendlineChartProps,
  TimeSeriesDatum,
 } from '../types';
-import { getDateFormatter, parseMetricValue, getOriginalLabel } from '../utils';
+import { getDateFormatter, parseMetricValue } from '../utils';
 import { getDefaultTooltip } from '../../utils/tooltip';
 import { Refs } from '../../types';

@@ -62,7 +62,6 @@ export default function transformProps(
    compareLag: compareLag_,
    compareSuffix = '',
    timeFormat,
-    metricNameFontSize,
    headerFontSize,
    metric = 'value',
    showTimestamp,
@@ -97,9 +96,6 @@ export default function transformProps(
  const aggregatedData = hasAggregatedData ? aggregatedQueryData.data[0] : null;
  const refs: Refs = {};
  const metricName = getMetricLabel(metric);
-  const metrics = chartProps.datasource?.metrics || [];
-  const originalLabel = getOriginalLabel(metric, metrics);
-  const showMetricName = chartProps.rawFormData?.show_metric_name ?? false;
  const compareLag = Number(compareLag_) || 0;
  let formattedSubheader = subheader;

@@ -307,9 +303,6 @@ export default function transformProps(
    headerFormatter,
    formatTime,
    formData,
-    metricName: originalLabel,
-    showMetricName,
-    metricNameFontSize,
    headerFontSize,
    subtitleFontSize,
    subtitle,
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/sharedControls.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/sharedControls.ts
@@ -21,68 +21,106 @@
 import { t } from '@superset-ui/core';
 import { CustomControlItem } from '@superset-ui/chart-controls';

-const FONT_SIZE_OPTIONS_SMALL = [
-  { label: t('Tiny'), value: 0.125 },
-  { label: t('Small'), value: 0.15 },
-  { label: t('Normal'), value: 0.2 },
-  { label: t('Large'), value: 0.3 },
-  { label: t('Huge'), value: 0.4 },
-];
+export const headerFontSize: CustomControlItem = {
+  name: 'header_font_size',
+  config: {
+    type: 'SelectControl',
+    label: t('Big Number Font Size'),
+    renderTrigger: true,
+    clearable: false,
+    default: 0.4,
+    // Values represent the percentage of space a header should take
+    options: [
+      {
+        label: t('Tiny'),
+        value: 0.2,
+      },
+      {
+        label: t('Small'),
+        value: 0.3,
+      },
+      {
+        label: t('Normal'),
+        value: 0.4,
+      },
+      {
+        label: t('Large'),
+        value: 0.5,
+      },
+      {
+        label: t('Huge'),
+        value: 0.6,
+      },
+    ],
+  },
+};

-const FONT_SIZE_OPTIONS_LARGE = [
-  { label: t('Tiny'), value: 0.2 },
-  { label: t('Small'), value: 0.3 },
-  { label: t('Normal'), value: 0.4 },
-  { label: t('Large'), value: 0.5 },
-  { label: t('Huge'), value: 0.6 },
-];
-
-function makeFontSizeControl(
-  name: string,
-  label: string,
-  defaultValue: number,
-  options: { label: string; value: number }[],
-): CustomControlItem {
-  return {
-    name,
-    config: {
-      type: 'SelectControl',
-      label: t(label),
-      renderTrigger: true,
-      clearable: false,
-      default: defaultValue,
-      options,
-    },
-  };
-}
-
-export const headerFontSize = makeFontSizeControl(
-  'header_font_size',
-  'Big Number Font Size',
-  0.4,
-  FONT_SIZE_OPTIONS_LARGE,
-);
-
-export const subtitleFontSize = makeFontSizeControl(
-  'subtitle_font_size',
-  'Subtitle Font Size',
-  0.15,
-  FONT_SIZE_OPTIONS_SMALL,
-);
-
-export const subheaderFontSize = makeFontSizeControl(
-  'subheader_font_size',
-  'Subheader Font Size',
-  0.15,
-  FONT_SIZE_OPTIONS_SMALL,
-);
-
-export const metricNameFontSize = makeFontSizeControl(
-  'metric_name_font_size',
-  'Metric Name Font Size',
-  0.15,
-  FONT_SIZE_OPTIONS_SMALL,
-);
+export const subtitleFontSize: CustomControlItem = {
+  name: 'subtitle_font_size',
+  config: {
+    type: 'SelectControl',
+    label: t('Subtitle Font Size'),
+    renderTrigger: true,
+    clearable: false,
+    default: 0.15,
+    // Values represent the percentage of space a subtitle should take
+    options: [
+      {
+        label: t('Tiny'),
+        value: 0.125,
+      },
+      {
+        label: t('Small'),
+        value: 0.15,
+      },
+      {
+        label: t('Normal'),
+        value: 0.2,
+      },
+      {
+        label: t('Large'),
+        value: 0.3,
+      },
+      {
+        label: t('Huge'),
+        value: 0.4,
+      },
+    ],
+  },
+};
+export const subheaderFontSize: CustomControlItem = {
+  name: 'subheader_font_size',
+  config: {
+    type: 'SelectControl',
+    label: t('Subheader Font Size'),
+    renderTrigger: true,
+    clearable: false,
+    default: 0.15,
+    // Values represent the percentage of space a subheader should take
+    options: [
+      {
+        label: t('Tiny'),
+        value: 0.125,
+      },
+      {
+        label: t('Small'),
+        value: 0.15,
+      },
+      {
+        label: t('Normal'),
+        value: 0.2,
+      },
+      {
+        label: t('Large'),
+        value: 0.3,
+      },
+      {
+        label: t('Huge'),
+        value: 0.4,
+      },
+    ],
+  },
+};

 export const subtitleControl: CustomControlItem = {
  name: 'subtitle',
@@ -93,23 +131,3 @@ export const subtitleControl: CustomControlItem = {
    description: t('Description text that shows up below your Big Number'),
  },
 };
-
-export const showMetricNameControl: CustomControlItem = {
-  name: 'show_metric_name',
-  config: {
-    type: 'CheckboxControl',
-    label: t('Show Metric Name'),
-    renderTrigger: true,
-    default: false,
-    description: t('Whether to display the metric name'),
-  },
-};
-
-export const metricNameFontSizeWithVisibility: CustomControlItem = {
-  ...metricNameFontSize,
-  config: {
-    ...metricNameFontSize.config,
-    visibility: ({ controls }) => controls?.show_metric_name?.value === true,
-    resetOnHide: false,
-  },
-};
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/types.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/types.ts
@@ -75,10 +75,6 @@ export type BigNumberVizProps = {
  bigNumberFallback?: TimeSeriesDatum;
  headerFormatter: ValueFormatter | TimeFormatter;
  formatTime?: TimeFormatter;
-  metricName?: string;
-  friendlyMetricName?: string;
-  metricNameFontSize?: number;
-  showMetricName?: boolean;
  headerFontSize: number;
  kickerFontSize?: number;
  subheader?: string;
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/utils.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/utils.ts
@@ -22,10 +22,6 @@ import utc from 'dayjs/plugin/utc';
 import {
  getTimeFormatter,
  getTimeFormatterForGranularity,
-  isAdhocMetricSimple,
-  isSavedMetric,
-  Metric,
-  QueryFormMetric,
  SMART_DATE_ID,
  TimeGranularity,
 } from '@superset-ui/core';
@@ -51,43 +47,3 @@ export const getDateFormatter = (
  timeFormat === SMART_DATE_ID
    ? getTimeFormatterForGranularity(granularity)
    : getTimeFormatter(timeFormat ?? fallbackFormat);
-
-export function getOriginalLabel(
-  metric: QueryFormMetric,
-  metrics: Metric[] = [],
-): string {
-  const metricLabel = typeof metric === 'string' ? metric : metric.label || '';
-
-  if (isSavedMetric(metric)) {
-    const metricEntry = metrics.find(m => m.metric_name === metric);
-    return (
-      metricEntry?.verbose_name ||
-      metricEntry?.metric_name ||
-      metric ||
-      'Unknown Metric'
-    );
-  }
-
-  if (isAdhocMetricSimple(metric)) {
-    const column = metric.column || {};
-    const columnName = column.column_name || 'unknown_column';
-    const verboseName = column.verbose_name || columnName;
-    const aggregate = metric.aggregate || 'UNKNOWN';
-    return metric.hasCustomLabel && metric.label
-      ? metric.label
-      : `${aggregate}(${verboseName})`;
-  }
-
-  if (
-    typeof metric === 'object' &&
-    'expressionType' in metric &&
-    metric.expressionType === 'SQL' &&
-    'sqlExpression' in metric
-  ) {
-    return metric.hasCustomLabel && metric.label
-      ? metric.label
-      : metricLabel || 'Custom Metric';
-  }
-
-  return metricLabel || 'Unknown Metric';
-}
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/constants.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/constants.ts
@@ -32,7 +32,6 @@ export const DEFAULT_FORM_DATA: Partial<EchartsBubbleFormData> = {
  xAxisBounds: [null, null],
  yAxisBounds: [null, null],
  xAxisLabelRotation: defaultXAxis.xAxisLabelRotation,
-  xAxisLabelInterval: defaultXAxis.xAxisLabelInterval,
  opacity: 0.6,
 };

--- a/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/controlPanel.tsx
@@ -31,7 +31,6 @@ import {
  truncateXAxis,
  xAxisBounds,
  xAxisLabelRotation,
-  xAxisLabelInterval,
 } from '../controls';
 import { defaultYAxis } from '../defaults';

@@ -134,7 +133,6 @@ const config: ControlPanelConfig = {
          },
        ],
        [xAxisLabelRotation],
-        [xAxisLabelInterval],
        [
          {
            name: 'x_axis_title_margin',
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/transformProps.ts
@@ -120,7 +120,6 @@ export default function transformProps(chartProps: EchartsBubbleChartProps) {
    truncateXAxis,
    truncateYAxis,
    xAxisLabelRotation,
-    xAxisLabelInterval,
    yAxisLabelRotation,
    tooltipSizeFormat,
    opacity,
@@ -198,7 +197,6 @@ export default function transformProps(chartProps: EchartsBubbleChartProps) {
        },
      },
      nameRotate: xAxisLabelRotation,
-      interval: xAxisLabelInterval,
      scale: true,
      name: bubbleXAxisTitle,
      nameLocation: 'middle',
--- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx
@@ -19,7 +19,6 @@
 import { ensureIsArray, t } from '@superset-ui/core';
 import { cloneDeep } from 'lodash';
 import {
-  ControlPanelsContainerProps,
  ControlPanelConfig,
  ControlPanelSectionConfig,
  ControlSetRow,
@@ -28,8 +27,6 @@ import {
  getStandardizedControls,
  sections,
  sharedControls,
-  DEFAULT_SORT_SERIES_DATA,
-  SORT_SERIES_CHOICES,
 } from '@superset-ui/chart-controls';

 import { DEFAULT_FORM_DATA } from './types';
@@ -41,7 +38,6 @@ import {
  truncateXAxis,
  xAxisBounds,
  xAxisLabelRotation,
-  xAxisLabelInterval,
 } from '../controls';

 const {
@@ -200,23 +196,6 @@ function createCustomizeSection(
        },
      },
    ],
-    [
-      {
-        name: `only_total${controlSuffix}`,
-        config: {
-          type: 'CheckboxControl',
-          label: t('Only Total'),
-          default: true,
-          renderTrigger: true,
-          description: t(
-            'Only show the total value on the stacked chart, and not show on the selected category',
-          ),
-          visibility: ({ controls }: ControlPanelsContainerProps) =>
-            Boolean(controls?.show_value?.value) &&
-            Boolean(controls?.stack?.value),
-        },
-      },
-    ],
    [
      {
        name: `opacity${controlSuffix}`,
@@ -279,35 +258,6 @@ function createCustomizeSection(
        },
      },
    ],
-    [<ControlSubSectionHeader>{t('Series Order')}</ControlSubSectionHeader>],
-    [
-      {
-        name: `sort_series_type${controlSuffix}`,
-        config: {
-          type: 'SelectControl',
-          freeForm: false,
-          label: t('Sort Series By'),
-          choices: SORT_SERIES_CHOICES,
-          default: DEFAULT_SORT_SERIES_DATA.sort_series_type,
-          renderTrigger: true,
-          description: t(
-            'Based on what should series be ordered on the chart and legend',
-          ),
-        },
-      },
-    ],
-    [
-      {
-        name: `sort_series_ascending${controlSuffix}`,
-        config: {
-          type: 'CheckboxControl',
-          label: t('Sort Series Ascending'),
-          default: DEFAULT_SORT_SERIES_DATA.sort_series_ascending,
-          renderTrigger: true,
-          description: t('Sort series in ascending order'),
-        },
-      },
-    ],
  ];
 }

@@ -369,7 +319,6 @@ const config: ControlPanelConfig = {
        [<ControlSubSectionHeader>{t('X Axis')}</ControlSubSectionHeader>],
        ['x_axis_time_format'],
        [xAxisLabelRotation],
-        [xAxisLabelInterval],
        ...richTooltipSection,
        // eslint-disable-next-line react/jsx-key
        [<ControlSubSectionHeader>{t('Y Axis')}</ControlSubSectionHeader>],
--- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
@@ -97,7 +97,6 @@ import {
  getXAxisFormatter,
  getYAxisFormatter,
 } from '../utils/formatters';
-import { getMetricDisplayName } from '../utils/metricDisplayName';

 const getFormatter = (
  customFormatters: Record<string, ValueFormatter>,
@@ -173,8 +172,6 @@ export default function transformProps(
    showLegend,
    showValue,
    showValueB,
-    onlyTotal,
-    onlyTotalB,
    stack,
    stackB,
    truncateXAxis,
@@ -195,7 +192,6 @@ export default function transformProps(
    tooltipSortByMetric,
    xAxisBounds,
    xAxisLabelRotation,
-    xAxisLabelInterval,
    groupby,
    groupbyB,
    xAxis: xAxisOrig,
@@ -206,10 +202,6 @@ export default function transformProps(
    yAxisTitleMargin,
    yAxisTitlePosition,
    sliceId,
-    sortSeriesType,
-    sortSeriesTypeB,
-    sortSeriesAscending,
-    sortSeriesAscendingB,
    timeGrainSqla,
    percentageThreshold,
    metrics = [],
@@ -230,42 +222,14 @@ export default function transformProps(
  }

  const rebasedDataA = rebaseForecastDatum(data1, verboseMap);
-  const { totalStackedValues, thresholdValues } = extractDataTotalValues(
-    rebasedDataA,
-    {
-      stack,
-      percentageThreshold,
-      xAxisCol: xAxisLabel,
-    },
-  );
-
-  const MetricDisplayNameA = getMetricDisplayName(metrics[0], verboseMap);
-  const MetricDisplayNameB = getMetricDisplayName(metricsB[0], verboseMap);
-
-  const [rawSeriesA, sortedTotalValuesA] = extractSeries(rebasedDataA, {
+  const [rawSeriesA] = extractSeries(rebasedDataA, {
    fillNeighborValue: stack ? 0 : undefined,
    xAxis: xAxisLabel,
-    sortSeriesType,
-    sortSeriesAscending,
-    stack,
-    totalStackedValues,
  });
  const rebasedDataB = rebaseForecastDatum(data2, verboseMap);
-  const {
-    totalStackedValues: totalStackedValuesB,
-    thresholdValues: thresholdValuesB,
-  } = extractDataTotalValues(rebasedDataB, {
-    stack: Boolean(stackB),
-    percentageThreshold,
-    xAxisCol: xAxisLabel,
-  });
-  const [rawSeriesB, sortedTotalValuesB] = extractSeries(rebasedDataB, {
+  const [rawSeriesB] = extractSeries(rebasedDataB, {
    fillNeighborValue: stackB ? 0 : undefined,
    xAxis: xAxisLabel,
-    sortSeriesType: sortSeriesTypeB,
-    sortSeriesAscending: sortSeriesAscendingB,
-    stack: Boolean(stackB),
-    totalStackedValues: totalStackedValuesB,
  });

  const dataTypes = getColtypesMapping(queriesData[0]);
@@ -323,11 +287,25 @@ export default function transformProps(
  );
  const showValueIndexesA = extractShowValueIndexes(rawSeriesA, {
    stack,
-    onlyTotal,
  });
  const showValueIndexesB = extractShowValueIndexes(rawSeriesB, {
    stack,
-    onlyTotal,
+  });
+  const { totalStackedValues, thresholdValues } = extractDataTotalValues(
+    rebasedDataA,
+    {
+      stack,
+      percentageThreshold,
+      xAxisCol: xAxisLabel,
+    },
+  );
+  const {
+    totalStackedValues: totalStackedValuesB,
+    thresholdValues: thresholdValuesB,
+  } = extractDataTotalValues(rebasedDataB, {
+    stack: Boolean(stackB),
+    percentageThreshold,
+    xAxisCol: xAxisLabel,
  });

  annotationLayers
@@ -395,12 +373,6 @@ export default function transformProps(
    const seriesName = inverted[entryName] || entryName;
    const colorScaleKey = getOriginalSeries(seriesName, array);

-    let displayName = `${entryName} (Query A)`;
-
-    if (groupby.length > 0) {
-      displayName = `${MetricDisplayNameA} (Query A), ${entryName}`;
-    }
-
    const seriesFormatter = getFormatter(
      customFormatters,
      formatter,
@@ -410,10 +382,7 @@ export default function transformProps(
    );

    const transformedSeries = transformSeries(
-      {
-        ...entry,
-        id: `${displayName || ''}`,
-      },
+      entry,
      colorScale,
      colorScaleKey,
      {
@@ -423,7 +392,6 @@ export default function transformProps(
        areaOpacity: opacity,
        seriesType,
        showValue,
-        onlyTotal,
        stack: Boolean(stack),
        stackIdSuffix: '\na',
        yAxisIndex,
@@ -438,8 +406,8 @@ export default function transformProps(
                formatter: seriesFormatter,
              })
            : seriesFormatter,
-        totalStackedValues: sortedTotalValuesA,
        showValueIndexes: showValueIndexesA,
+        totalStackedValues,
        thresholdValues,
        timeShiftColor,
      },
@@ -453,12 +421,6 @@ export default function transformProps(
    const seriesName = `${seriesEntry} (1)`;
    const colorScaleKey = getOriginalSeries(seriesEntry, array);

-    let displayName = `${entryName} (Query B)`;
-
-    if (groupbyB.length > 0) {
-      displayName = `${MetricDisplayNameB} (Query B), ${entryName}`;
-    }
-
    const seriesFormatter = getFormatter(
      customFormattersSecondary,
      formatterSecondary,
@@ -468,11 +430,7 @@ export default function transformProps(
    );

    const transformedSeries = transformSeries(
-      {
-        ...entry,
-        id: `${displayName || ''}`,
-      },
-
+      entry,
      colorScale,
      colorScaleKey,
      {
@@ -482,12 +440,13 @@ export default function transformProps(
        areaOpacity: opacityB,
        seriesType: seriesTypeB,
        showValue: showValueB,
-        onlyTotal: onlyTotalB,
        stack: Boolean(stackB),
        stackIdSuffix: '\nb',
        yAxisIndex: yAxisIndexB,
        filterState,
-        seriesKey: entry.name,
+        seriesKey: primarySeries.has(entry.name as string)
+          ? `${entry.name} (1)`
+          : entry.name,
        sliceId,
        queryIndex: 1,
        formatter:
@@ -497,8 +456,8 @@ export default function transformProps(
                formatter: seriesFormatter,
              })
            : seriesFormatter,
-        totalStackedValues: sortedTotalValuesB,
        showValueIndexes: showValueIndexesB,
+        totalStackedValues: totalStackedValuesB,
        thresholdValues: thresholdValuesB,
        timeShiftColor,
      },
@@ -555,7 +514,6 @@ export default function transformProps(
      axisLabel: {
        formatter: xAxisFormatter,
        rotate: xAxisLabelRotation,
-        interval: xAxisLabelInterval,
      },
      minorTick: { show: minorTicks },
      minInterval:
--- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/types.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/types.ts
@@ -61,7 +61,6 @@ export type EchartsMixedTimeseriesFormData = QueryFormData & {
  zoomable: boolean;
  richTooltip: boolean;
  xAxisLabelRotation: number;
-  xAxisLabelInterval?: number | string;
  colorScheme?: string;
  // types specific to Query A and Query B
  area: boolean;
@@ -134,7 +133,6 @@ export const DEFAULT_FORM_DATA: EchartsMixedTimeseriesFormData = {
  zoomable: TIMESERIES_DEFAULTS.zoomable,
  richTooltip: TIMESERIES_DEFAULTS.richTooltip,
  xAxisLabelRotation: TIMESERIES_DEFAULTS.xAxisLabelRotation,
-  xAxisLabelInterval: TIMESERIES_DEFAULTS.xAxisLabelInterval,
  ...DEFAULT_TITLE_FORM_DATA,
 };

--- a/superset-frontend/plugins/plugin-chart-echarts/src/Pie/buildQuery.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Pie/buildQuery.ts
@@ -16,30 +16,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-import {
-  buildQueryContext,
-  getMetricLabel,
-  QueryFormData,
-} from '@superset-ui/core';
-import { getContributionLabel } from './utils';
+import { buildQueryContext, QueryFormData } from '@superset-ui/core';

 export default function buildQuery(formData: QueryFormData) {
  const { metric, sort_by_metric } = formData;
-  const metricLabel = getMetricLabel(metric);
-
  return buildQueryContext(formData, baseQueryObject => [
    {
      ...baseQueryObject,
      ...(sort_by_metric && { orderby: [[metric, false]] }),
-      post_processing: [
-        {
-          operation: 'contribution',
-          options: {
-            columns: [metricLabel],
-            rename_columns: [getContributionLabel(metricLabel)],
-          },
-        },
-      ],
    },
  ]);
 }
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Pie/constants.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Pie/constants.ts
@@ -1,19 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-export const CONTRIBUTION_SUFFIX = '__contribution' as const;
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx
@@ -84,23 +84,6 @@ const config: ControlPanelConfig = {
            },
          },
        ],
-        [
-          {
-            name: 'threshold_for_other',
-            config: {
-              type: 'NumberControl',
-              label: t('Threshold for Other'),
-              min: 0,
-              step: 0.5,
-              max: 100,
-              default: 0,
-              renderTrigger: true,
-              description: t(
-                'Values less than this percentage will be grouped into the Other category.',
-              ),
-            },
-          },
-        ],
        [
          {
            name: 'roseType',
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Pie/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Pie/transformProps.ts
@@ -27,7 +27,6 @@ import {
  ValueFormatter,
  getValueFormatter,
  tooltipHtml,
-  DataRecord,
 } from '@superset-ui/core';
 import type { CallbackDataParams } from 'echarts/types/src/util/types';
 import type { EChartsCoreOption } from 'echarts/core';
@@ -37,7 +36,6 @@ import {
  EchartsPieChartProps,
  EchartsPieFormData,
  EchartsPieLabelType,
-  PieChartDataItem,
  PieChartTransformedProps,
 } from './types';
 import { DEFAULT_LEGEND_FORM_DATA, OpacityEnum } from '../constants';
@@ -52,7 +50,6 @@ import { defaultGrid } from '../defaults';
 import { convertInteger } from '../utils/convertInteger';
 import { getDefaultTooltip } from '../utils/tooltip';
 import { Refs } from '../types';
-import { getContributionLabel } from './utils';

 const percentFormatter = getNumberFormatter(NumberFormats.PERCENT_2_POINT);

@@ -136,7 +133,7 @@ export default function transformProps(
    datasource,
  } = chartProps;
  const { columnFormats = {}, currencyFormats = {} } = datasource;
-  const { data: rawData = [] } = queriesData[0];
+  const { data = [] } = queriesData[0];
  const coltypeMapping = getColtypesMapping(queriesData[0]);

  const {
@@ -162,7 +159,6 @@ export default function transformProps(
    sliceId,
    showTotal,
    roseType,
-    thresholdForOther,
  }: EchartsPieFormData = {
    ...DEFAULT_LEGEND_FORM_DATA,
    ...DEFAULT_PIE_FORM_DATA,
@@ -170,68 +166,17 @@ export default function transformProps(
  };
  const refs: Refs = {};
  const metricLabel = getMetricLabel(metric);
-  const contributionLabel = getContributionLabel(metricLabel);
  const groupbyLabels = groupby.map(getColumnLabel);
  const minShowLabelAngle = (showLabelsThreshold || 0) * 3.6;

-  const numberFormatter = getValueFormatter(
-    metric,
-    currencyFormats,
-    columnFormats,
-    numberFormat,
-    currencyFormat,
+  const keys = data.map(datum =>
+    extractGroupbyLabel({
+      datum,
+      groupby: groupbyLabels,
+      coltypeMapping,
+      timeFormatter: getTimeFormatter(dateFormat),
+    }),
  );
-
-  let data = rawData;
-  const otherRows: DataRecord[] = [];
-  const otherTooltipData: string[][] = [];
-  let otherDatum: PieChartDataItem | null = null;
-  let otherSum = 0;
-  if (thresholdForOther) {
-    let contributionSum = 0;
-    data = data.filter(datum => {
-      const contribution = datum[contributionLabel] as number;
-      if (!contribution || contribution * 100 >= thresholdForOther) {
-        return true;
-      }
-      otherSum += datum[metricLabel] as number;
-      contributionSum += contribution;
-      otherRows.push(datum);
-      otherTooltipData.push([
-        extractGroupbyLabel({
-          datum,
-          groupby: groupbyLabels,
-          coltypeMapping,
-          timeFormatter: getTimeFormatter(dateFormat),
-        }),
-        numberFormatter(datum[metricLabel] as number),
-        percentFormatter(contribution),
-      ]);
-      return false;
-    });
-    const otherName = t('Other');
-    otherTooltipData.push([
-      t('Total'),
-      numberFormatter(otherSum),
-      percentFormatter(contributionSum),
-    ]);
-    if (otherSum) {
-      otherDatum = {
-        name: otherName,
-        value: otherSum,
-        itemStyle: {
-          color: theme.colors.grayscale.dark1,
-          opacity:
-            filterState.selectedValues &&
-            !filterState.selectedValues.includes(otherName)
-              ? OpacityEnum.SemiTransparent
-              : OpacityEnum.NonTransparent,
-        },
-        isOther: true,
-      };
-    }
-  }
-
  const labelMap = data.reduce((acc: Record<string, string[]>, datum) => {
    const label = extractGroupbyLabel({
      datum,
@@ -247,6 +192,13 @@ export default function transformProps(

  const { setDataMask = () => {}, onContextMenu } = hooks;
  const colorFn = CategoricalColorNamespace.getScale(colorScheme as string);
+  const numberFormatter = getValueFormatter(
+    metric,
+    currencyFormats,
+    columnFormats,
+    numberFormat,
+    currencyFormat,
+  );

  let totalValue = 0;

@@ -277,10 +229,6 @@ export default function transformProps(
      },
    };
  });
-  if (otherDatum) {
-    transformedData.push(otherDatum);
-    totalValue += otherSum;
-  }

  const selectedValues = (filterState.selectedValues || []).reduce(
    (acc: Record<string, number>, selectedValue: string) => {
@@ -424,9 +372,6 @@ export default function transformProps(
          numberFormatter,
          sanitizeName: true,
        });
-        if (params?.data?.isOther) {
-          return tooltipHtml(otherTooltipData, name);
-        }
        return tooltipHtml(
          [[metricLabel, formattedValue, formattedPercent]],
          name,
@@ -435,7 +380,7 @@ export default function transformProps(
    },
    legend: {
      ...getLegendProps(legendType, legendOrientation, showLegend, theme),
-      data: transformedData.map(datum => datum.name),
+      data: keys,
    },
    graphic: showTotal
      ? {
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Pie/types.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Pie/types.ts
@@ -47,7 +47,6 @@ export type EchartsPieFormData = QueryFormData &
    dateFormat: string;
    showLabelsThreshold: number;
    roseType: 'radius' | 'area' | null;
-    thresholdForOther: number;
  };

 export enum EchartsPieLabelType {
@@ -83,20 +82,9 @@ export const DEFAULT_FORM_DATA: EchartsPieFormData = {
  showLabelsThreshold: 5,
  dateFormat: 'smart_date',
  roseType: null,
-  thresholdForOther: 0,
 };

 export type PieChartTransformedProps =
  BaseTransformedProps<EchartsPieFormData> &
    ContextMenuTransformedProps &
    CrossFilterTransformedProps;
-
-export interface PieChartDataItem {
-  name: string;
-  value: number;
-  itemStyle: {
-    color: string;
-    opacity: number;
-  };
-  isOther?: boolean;
-}
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Pie/utils.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Pie/utils.ts
@@ -1,22 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { CONTRIBUTION_SUFFIX } from './constants';
-
-export const getContributionLabel = (metricLabel: string) =>
-  `${metricLabel}${CONTRIBUTION_SUFFIX}`;
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Radar/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Radar/transformProps.ts
@@ -24,7 +24,6 @@ import {
  getNumberFormatter,
  getTimeFormatter,
  NumberFormatter,
-  isDefined,
 } from '@superset-ui/core';
 import type { CallbackDataParams } from 'echarts/types/src/util/types';
 import type { RadarSeriesDataItemOption } from 'echarts/types/src/chart/radar/RadarSeries';
@@ -36,7 +35,6 @@ import {
  EchartsRadarFormData,
  EchartsRadarLabelType,
  RadarChartTransformedProps,
-  SeriesNormalizedMap,
 } from './types';
 import { DEFAULT_LEGEND_FORM_DATA, OpacityEnum } from '../constants';
 import {
@@ -48,31 +46,18 @@ import {
 import { defaultGrid } from '../defaults';
 import { Refs } from '../types';
 import { getDefaultTooltip } from '../utils/tooltip';
-import { findGlobalMax, renderNormalizedTooltip } from './utils';

 export function formatLabel({
  params,
  labelType,
  numberFormatter,
-  getDenormalizedSeriesValue,
-  metricsWithCustomBounds,
-  metricLabels,
 }: {
  params: CallbackDataParams;
  labelType: EchartsRadarLabelType;
  numberFormatter: NumberFormatter;
-  getDenormalizedSeriesValue: (seriesName: string, value: string) => number;
-  metricsWithCustomBounds: Set<string>;
-  metricLabels: string[];
 }): string {
-  const { name = '', value, dimensionIndex = 0 } = params;
-  const metricLabel = metricLabels[dimensionIndex];
-
-  const formattedValue = numberFormatter(
-    metricsWithCustomBounds.has(metricLabel)
-      ? (value as number)
-      : (getDenormalizedSeriesValue(name, String(value)) as number),
-  );
+  const { name = '', value } = params;
+  const formattedValue = numberFormatter(value as number);

  switch (labelType) {
    case EchartsRadarLabelType.Value:
@@ -100,7 +85,6 @@ export default function transformProps(
  } = chartProps;
  const refs: Refs = {};
  const { data = [] } = queriesData[0];
-  const globalMax = findGlobalMax(data, Object.keys(data[0] || {}));
  const coltypeMapping = getColtypesMapping(queriesData[0]);

  const {
@@ -127,38 +111,14 @@ export default function transformProps(
  const { setDataMask = () => {}, onContextMenu } = hooks;
  const colorFn = CategoricalColorNamespace.getScale(colorScheme as string);
  const numberFormatter = getNumberFormatter(numberFormat);
-  const denormalizedSeriesValues: SeriesNormalizedMap = {};
-
-  const getDenormalizedSeriesValue = (
-    seriesName: string,
-    normalizedValue: string,
-  ): number =>
-    denormalizedSeriesValues?.[seriesName]?.[normalizedValue] ??
-    Number(normalizedValue);
-
-  const metricLabels = metrics.map(getMetricLabel);
-
-  const metricsWithCustomBounds = new Set(
-    metricLabels.filter(metricLabel => {
-      const config = columnConfig?.[metricLabel];
-      const hasMax = !!isDefined(config?.radarMetricMaxValue);
-      const hasMin =
-        isDefined(config?.radarMetricMinValue) &&
-        config?.radarMetricMinValue !== 0;
-      return hasMax || hasMin;
-    }),
-  );
-
  const formatter = (params: CallbackDataParams) =>
    formatLabel({
      params,
      numberFormatter,
      labelType,
-      getDenormalizedSeriesValue,
-      metricsWithCustomBounds,
-      metricLabels,
    });

+  const metricLabels = metrics.map(getMetricLabel);
  const groupbyLabels = groupby.map(getColumnLabel);

  const metricLabelAndMaxValueMap = new Map<string, number>();
@@ -252,58 +212,28 @@ export default function transformProps(
    {},
  );

-  const normalizeArray = (arr: number[], decimals = 10, seriesName: string) =>
-    arr.map((value, index) => {
-      const metricLabel = metricLabels[index];
-      if (metricsWithCustomBounds.has(metricLabel)) {
-        return value;
-      }
-
-      const max = Math.max(...arr);
-      const normalizedValue = Number((value / max).toFixed(decimals));
-
-      denormalizedSeriesValues[seriesName][String(normalizedValue)] = value;
-      return normalizedValue;
-    });
-
-  // Normalize the transformed data
-  const normalizedTransformedData = transformedData.map(series => {
-    if (Array.isArray(series.value)) {
-      const seriesName = String(series?.name || '');
-      denormalizedSeriesValues[seriesName] = {};
-
-      return {
-        ...series,
-        value: normalizeArray(series.value as number[], 10, seriesName),
-      };
-    }
-    return series;
-  });
-
  const indicator = metricLabels.map(metricLabel => {
-    const isMetricWithCustomBounds = metricsWithCustomBounds.has(metricLabel);
-    if (!isMetricWithCustomBounds) {
-      return {
-        name: metricLabel,
-        max: 1,
-        min: 0,
-      };
-    }
    const maxValueInControl = columnConfig?.[metricLabel]?.radarMetricMaxValue;
    const minValueInControl = columnConfig?.[metricLabel]?.radarMetricMinValue;

    // Ensure that 0 is at the center of the polar coordinates
-    const maxValue =
+    const metricValueAsMax =
      metricLabelAndMaxValueMap.get(metricLabel) === 0
        ? Number.MAX_SAFE_INTEGER
-        : globalMax;
-    const max = isDefined(maxValueInControl) ? maxValueInControl : maxValue;
+        : metricLabelAndMaxValueMap.get(metricLabel);
+    const max =
+      maxValueInControl === null ? metricValueAsMax : maxValueInControl;

    let min: number;
-    if (isDefined(minValueInControl)) {
-      min = minValueInControl;
-    } else {
+    // If the min value doesn't exist, set it to 0 (default),
+    // if it is null, set it to the min value of the data,
+    // otherwise, use the value from the control
+    if (minValueInControl === undefined) {
      min = 0;
+    } else if (minValueInControl === null) {
+      min = metricLabelAndMinValueMap.get(metricLabel) || 0;
+    } else {
+      min = minValueInControl;
    }

    return {
@@ -325,24 +255,10 @@ export default function transformProps(
          backgroundColor: theme.colors.grayscale.light5,
        },
      },
-      data: normalizedTransformedData,
+      data: transformedData,
    },
  ];

-  const NormalizedTooltipFormater = (
-    params: CallbackDataParams & {
-      color: string;
-      name: string;
-      value: number[];
-    },
-  ) =>
-    renderNormalizedTooltip(
-      params,
-      metricLabels,
-      getDenormalizedSeriesValue,
-      metricsWithCustomBounds,
-    );
-
  const echartOptions: EChartsCoreOption = {
    grid: {
      ...defaultGrid,
@@ -351,7 +267,6 @@ export default function transformProps(
      ...getDefaultTooltip(refs),
      show: !inContextMenu,
      trigger: 'item',
-      formatter: NormalizedTooltipFormater,
    },
    legend: {
      ...getLegendProps(legendType, legendOrientation, showLegend, theme),
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Radar/types.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Radar/types.ts
@@ -35,7 +35,7 @@ import { DEFAULT_LEGEND_FORM_DATA } from '../constants';

 type RadarColumnConfig = Record<
  string,
-  { radarMetricMaxValue?: number | null; radarMetricMinValue?: number }
+  { radarMetricMaxValue?: number; radarMetricMinValue?: number }
 >;

 export type EchartsRadarFormData = QueryFormData &
@@ -53,7 +53,6 @@ export type EchartsRadarFormData = QueryFormData &
    isCircle: boolean;
    numberFormat: string;
    dateFormat: string;
-    isNormalized: boolean;
  };

 export enum EchartsRadarLabelType {
@@ -84,17 +83,3 @@ export type RadarChartTransformedProps =
  BaseTransformedProps<EchartsRadarFormData> &
    ContextMenuTransformedProps &
    CrossFilterTransformedProps;
-
-/**
- * Represents a mapping from a normalized value (as string) to an original numeric value.
- */
-interface NormalizedValueMap {
-  [normalized: string]: number;
-}
-
-/**
- * Represents a collection of series, each containing its own NormalizedValueMap.
- */
-export interface SeriesNormalizedMap {
-  [seriesName: string]: NormalizedValueMap;
-}
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Radar/utils.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Radar/utils.ts
@@ -1,92 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- function for finding the max metric values among all series data for Radar Chart
-*/
-export const findGlobalMax = (
-  data: Record<string, unknown>[],
-  metrics: string[],
-): number => {
-  if (!data?.length || !metrics?.length) return 0;
-
-  return data.reduce((globalMax, row) => {
-    const rowMax = metrics.reduce((max, metric) => {
-      const value = row[metric];
-      return typeof value === 'number' &&
-        Number.isFinite(value) &&
-        !Number.isNaN(value)
-        ? Math.max(max, value)
-        : max;
-    }, 0);
-
-    return Math.max(globalMax, rowMax);
-  }, 0);
-};
-
-interface TooltipParams {
-  color: string;
-  name?: string;
-  value: number[];
-}
-
-interface TooltipMetricValue {
-  metric: string;
-  value: number;
-}
-
-export const renderNormalizedTooltip = (
-  params: TooltipParams,
-  metrics: string[],
-  getDenormalizedValue: (seriesName: string, value: string) => number,
-  metricsWithCustomBounds: Set<string>,
-): string => {
-  const { color, name = '', value: values } = params;
-  const seriesName = name || 'series0';
-
-  const colorDot = `<span style="display:inline-block;margin-right:5px;border-radius:50%;width:5px;height:5px;background-color:${color}"></span>`;
-
-  // Get metric values with denormalization if needed
-  const metricValues: TooltipMetricValue[] = metrics.map((metric, index) => {
-    const value = values[index];
-    const originalValue = metricsWithCustomBounds.has(metric)
-      ? value
-      : getDenormalizedValue(name, String(value));
-
-    return {
-      metric,
-      value: originalValue,
-    };
-  });
-
-  const tooltipRows = metricValues
-    .map(
-      ({ metric, value }) => `
-        <div style="display:flex;">
-          <div>${colorDot}${metric}:</div>
-          <div style="font-weight:bold;margin-left:auto;">${value}</div>
-        </div>
-      `,
-    )
-    .join('');
-
-  return `
-    <div style="font-weight:bold;margin-bottom:5px;">${seriesName}</div>
-    ${tooltipRows}
-  `;
-};
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Sankey/index.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Sankey/index.ts
@@ -57,7 +57,7 @@ export default class EchartsSankeyChartPlugin extends ChartPlugin<
        ),
        exampleGallery: [{ url: example1 }, { url: example2 }],
        name: t('Sankey Chart'),
-        tags: [t('Directional'), t('ECharts'), t('Distribution'), t('Flow')],
+        tags: [t('Directional'), t('Distribution'), t('Flow')],
        thumbnail,
      }),
      transformProps,
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Sankey/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Sankey/transformProps.ts
@@ -73,25 +73,13 @@ export default function transformProps(
  }));

  // stores a map with the total values for each node considering the links
-  const incomingFlows = new Map<string, number>();
-  const outgoingFlows = new Map<string, number>();
-  const allNodeNames = new Set<string>();
-
+  const nodeValues = new Map<string, number>();
  links.forEach(link => {
    const { source, target, value } = link;
-    allNodeNames.add(source);
-    allNodeNames.add(target);
-    incomingFlows.set(target, (incomingFlows.get(target) || 0) + value);
-    outgoingFlows.set(source, (outgoingFlows.get(source) || 0) + value);
-  });
-
-  const nodeValues = new Map<string, number>();
-
-  allNodeNames.forEach(nodeName => {
-    const totalIncoming = incomingFlows.get(nodeName) || 0;
-    const totalOutgoing = outgoingFlows.get(nodeName) || 0;
-
-    nodeValues.set(nodeName, Math.max(totalIncoming, totalOutgoing));
+    const sourceValue = nodeValues.get(source) || 0;
+    const targetValue = nodeValues.get(target) || 0;
+    nodeValues.set(source, sourceValue + value);
+    nodeValues.set(target, targetValue + value);
  });

  const tooltipFormatter = (params: CallbackDataParams) => {
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Area/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Area/controlPanel.tsx
@@ -37,7 +37,6 @@ import {
  seriesOrderSection,
  percentageThresholdControl,
  xAxisLabelRotation,
-  xAxisLabelInterval,
  truncateXAxis,
  xAxisBounds,
  minorTicks,
@@ -196,7 +195,6 @@ const config: ControlPanelConfig = {
          },
        ],
        [xAxisLabelRotation],
-        [xAxisLabelInterval],
        ...richTooltipSection,
        // eslint-disable-next-line react/jsx-key
        [<ControlSubSectionHeader>{t('Y Axis')}</ControlSubSectionHeader>],
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/controlPanel.tsx
@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-import { JsonArray, t } from '@superset-ui/core';
+import { t } from '@superset-ui/core';
 import {
  ControlPanelConfig,
  ControlPanelsContainerProps,
@@ -38,7 +38,6 @@ import {
  truncateXAxis,
  xAxisBounds,
  xAxisLabelRotation,
-  xAxisLabelInterval,
 } from '../../../controls';

 import { OrientationType } from '../../types';
@@ -46,7 +45,6 @@ import {
  DEFAULT_FORM_DATA,
  TIME_SERIES_DESCRIPTION_TEXT,
 } from '../../constants';
-import { StackControlsValue } from '../../../constants';

 const {
  logAxis,
@@ -189,18 +187,6 @@ function createAxisControl(axis: 'x' | 'y'): ControlSetRow[] {
        },
      },
    ],
-    [
-      {
-        name: xAxisLabelInterval.name,
-        config: {
-          ...xAxisLabelInterval.config,
-          visibility: ({ controls }: ControlPanelsContainerProps) =>
-            isXAxis ? isVertical(controls) : isHorizontal(controls),
-          disableStash: true,
-          resetOnHide: false,
-        },
-      },
-    ],
    [
      {
        name: 'y_axis_format',
@@ -335,38 +321,6 @@ const config: ControlPanelConfig = {
        ['color_scheme'],
        ['time_shift_color'],
        ...showValueSection,
-        [
-          {
-            name: 'stackDimension',
-            config: {
-              type: 'SelectControl',
-              label: t('Split stack by'),
-              visibility: ({ controls }) =>
-                controls?.stack?.value === StackControlsValue.Stack,
-              renderTrigger: true,
-              description: t(
-                'Stack in groups, where each group corresponds to a dimension',
-              ),
-              shouldMapStateToProps: (
-                prevState,
-                state,
-                controlState,
-                chartState,
-              ) => true,
-              mapStateToProps: (state, controlState, chartState) => {
-                const value: JsonArray = state.controls.groupby
-                  .value as JsonArray;
-                const valueAsStringArr: string[][] = value.map(v => {
-                  if (v) return [v.toString(), v.toString()];
-                  return ['', ''];
-                });
-                return {
-                  choices: valueAsStringArr,
-                };
-              },
-            },
-          },
-        ],
        [minorTicks],
        [
          {
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Line/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Line/controlPanel.tsx
@@ -41,7 +41,6 @@ import {
  truncateXAxis,
  xAxisBounds,
  xAxisLabelRotation,
-  xAxisLabelInterval,
 } from '../../../controls';

 const {
@@ -184,7 +183,6 @@ const config: ControlPanelConfig = {
          },
        ],
        [xAxisLabelRotation],
-        [xAxisLabelInterval],
        ...richTooltipSection,
        // eslint-disable-next-line react/jsx-key
        [<ControlSubSectionHeader>{t('Y Axis')}</ControlSubSectionHeader>],
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/controlPanel.tsx
@@ -40,7 +40,6 @@ import {
  truncateXAxis,
  xAxisBounds,
  xAxisLabelRotation,
-  xAxisLabelInterval,
 } from '../../../controls';

 const {
@@ -127,7 +126,6 @@ const config: ControlPanelConfig = {
          },
        ],
        [xAxisLabelRotation],
-        [xAxisLabelInterval],
        // eslint-disable-next-line react/jsx-key
        ...richTooltipSection,
        // eslint-disable-next-line react/jsx-key
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/controlPanel.tsx
@@ -40,7 +40,6 @@ import {
  truncateXAxis,
  xAxisBounds,
  xAxisLabelRotation,
-  xAxisLabelInterval,
 } from '../../../controls';

 const {
@@ -126,7 +125,6 @@ const config: ControlPanelConfig = {
          },
        ],
        [xAxisLabelRotation],
-        [xAxisLabelInterval],
        // eslint-disable-next-line react/jsx-key
        ...richTooltipSection,
        // eslint-disable-next-line react/jsx-key
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/controlPanel.tsx
@@ -38,7 +38,6 @@ import {
  truncateXAxis,
  xAxisBounds,
  xAxisLabelRotation,
-  xAxisLabelInterval,
 } from '../../controls';

 const {
@@ -178,7 +177,6 @@ const config: ControlPanelConfig = {
          },
        ],
        [xAxisLabelRotation],
-        [xAxisLabelInterval],
        ...richTooltipSection,
        // eslint-disable-next-line react/jsx-key
        [<ControlSubSectionHeader>{t('Y Axis')}</ControlSubSectionHeader>],
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/constants.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/constants.ts
@@ -78,7 +78,6 @@ export const DEFAULT_FORM_DATA: EchartsTimeseriesFormData = {
  richTooltip: true,
  xAxisForceCategorical: false,
  xAxisLabelRotation: defaultXAxis.xAxisLabelRotation,
-  xAxisLabelInterval: defaultXAxis.xAxisLabelInterval,
  groupby: [],
  showValue: false,
  onlyTotal: false,
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts
@@ -58,7 +58,6 @@ export default class EchartsTimeseriesChartPlugin extends EchartsChartPlugin<
        name: t('Generic Chart'),
        tags: [
          t('Advanced-Analytics'),
-          t('ECharts'),
          t('Line'),
          t('Predictive'),
          t('Time'),
--- a/Show More
+++ b/Show More