chore(🦾): bump python python-dotenv 1.1.0 -> 1.1.1

feat: introducing a docker-compose-light.yml for lighter development (#34324 )
style(FastVizSwitcher): Adjust padding for FastVizSwitcher selector (#34317 )
2026-04-30 21:44:40 +00:00 · 2025-07-28 19:12:51 +00:00 · 2025-07-28 09:27:07 -07:00 · 2025-07-28 14:39:10 +03:00 · 2025-07-28 12:19:14 +03:00 · 2025-07-27 19:39:10 -07:00
334 changed files with 13216 additions and 2714 deletions
--- a/.cursor/rules/dev-standard.mdc
+++ b/.cursor/rules/dev-standard.mdc
@@ -0,0 +1,125 @@
+---
+description: Apache Superset development standards and guidelines for Cursor IDE
+globs: ["**/*.py", "**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx", "**/*.sql", "**/*.md"]
+alwaysApply: true
+---
+
+# Apache Superset Development Standards for Cursor IDE
+
+Apache Superset is a data visualization platform with Flask/Python backend and React/TypeScript frontend.
+
+## ⚠️ CRITICAL: Ongoing Refactors (What NOT to Do)
+
+**These migrations are actively happening - avoid deprecated patterns:**
+
+### Frontend Modernization
+- **NO `any` types** - Use proper TypeScript types
+- **NO JavaScript files** - Convert to TypeScript (.ts/.tsx)
+- **NO Enzyme** - Use React Testing Library/Jest (Enzyme fully removed)
+- **Use @superset-ui/core** - Don't import Ant Design directly
+
+### Testing Strategy Migration
+- **Prefer unit tests** over integration tests
+- **Prefer integration tests** over Cypress end-to-end tests
+- **Cypress is last resort** - Actively moving away from Cypress
+- **Use Jest + React Testing Library** for component testing
+
+### Backend Type Safety
+- **Add type hints** - All new Python code needs proper typing
+- **MyPy compliance** - Run `pre-commit run mypy` to validate
+- **SQLAlchemy typing** - Use proper model annotations
+
+## Code Standards
+
+### TypeScript Frontend
+- **NO `any` types** - Use proper TypeScript
+- **Functional components** with hooks
+- **@superset-ui/core** for UI components (not direct antd)
+- **Jest** for testing (NO Enzyme)
+- **Redux** for global state, hooks for local
+
+### Python Backend
+- **Type hints required** for all new code
+- **MyPy compliant** - run `pre-commit run mypy`
+- **SQLAlchemy models** with proper typing
+- **pytest** for testing
+
+### Apache License Headers
+- **New files require ASF license headers** - When creating new code files, include the standard Apache Software Foundation license header
+- **LLM instruction files are excluded** - Files like LLMS.md, CLAUDE.md, etc. are in `.rat-excludes` to avoid header token overhead
+
+## Key Directory Structure
+
+```
+superset/
+├── superset/                    # Python backend (Flask, SQLAlchemy)
+│   ├── views/api/              # REST API endpoints
+│   ├── models/                 # Database models
+│   └── connectors/             # Database connections
+├── superset-frontend/src/       # React TypeScript frontend
+│   ├── components/             # Reusable components
+│   ├── explore/                # Chart builder
+│   ├── dashboard/              # Dashboard interface
+│   └── SqlLab/                 # SQL editor
+├── superset-frontend/packages/
+│   └── superset-ui-core/       # UI component library (USE THIS)
+├── tests/                      # Python/integration tests
+├── docs/                       # Documentation (UPDATE FOR CHANGES)
+└── UPDATING.md                 # Breaking changes log
+```
+
+## Architecture Patterns
+
+### Dataset-Centric Approach
+Charts built from enriched datasets containing:
+- Dimension columns with labels/descriptions
+- Predefined metrics as SQL expressions
+- Self-service analytics within defined contexts
+
+### Security & Features
+- **RBAC**: Role-based access via Flask-AppBuilder
+- **Feature flags**: Control feature rollouts
+- **Row-level security**: SQL-based data access control
+
+## Test Utilities
+
+### Python Test Helpers
+- **`SupersetTestCase`** - Base class in `tests/integration_tests/base_tests.py`
+- **`@with_config`** - Config mocking decorator
+- **`@with_feature_flags`** - Feature flag testing
+- **`login_as()`, `login_as_admin()`** - Authentication helpers
+- **`create_dashboard()`, `create_slice()`** - Data setup utilities
+
+### TypeScript Test Helpers
+- **`superset-frontend/spec/helpers/testing-library.tsx`** - Custom render() with providers
+- **`createWrapper()`** - Redux/Router/Theme wrapper
+- **`selectOption()`** - Select component helper
+- **React Testing Library** - NO Enzyme (removed)
+
+## Pre-commit Validation
+
+**Use pre-commit hooks for quality validation:**
+
+```bash
+# Install hooks
+pre-commit install
+
+# Quick validation (faster than --all-files)
+pre-commit run                    # Staged files only
+pre-commit run mypy              # Python type checking
+pre-commit run prettier          # Code formatting
+pre-commit run eslint            # Frontend linting
+```
+
+## Development Guidelines
+
+- **Documentation**: Update docs/ for any user-facing changes
+- **Breaking Changes**: Add to UPDATING.md
+- **Docstrings**: Required for new functions/classes
+- **Follow existing patterns**: Mimic code style, use existing libraries and utilities
+- **Type Safety**: This codebase is actively modernizing toward full TypeScript and type safety
+- **Always run `pre-commit run`** to validate changes before committing
+
+---
+
+**Note**: This codebase is actively modernizing toward full TypeScript and type safety. Always run `pre-commit run` to validate changes. Follow the ongoing refactors section to avoid deprecated patterns.
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -42,7 +42,7 @@ body:
      options:
        - master / latest-dev
        - "5.0.0"
-        - "4.1.2"
+        - "4.1.3"
    validations:
      required: true
  - type: dropdown
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -0,0 +1 @@
+../LLMS.md
--- a/.github/workflows/claude.yml
+++ b/.github/workflows/claude.yml
@@ -0,0 +1,82 @@
+name: Claude PR Assistant
+
+on:
+  issue_comment:
+    types: [created]
+  pull_request_review_comment:
+    types: [created]
+
+jobs:
+  check-permissions:
+    if: |
+      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
+      (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude'))
+    runs-on: ubuntu-latest
+    outputs:
+      allowed: ${{ steps.check.outputs.allowed }}
+    steps:
+      - name: Check if user is allowed
+        id: check
+        run: |
+          # List of allowed users
+          ALLOWED_USERS="mistercrunch,rusackas"
+
+          # Get the commenter's username
+          COMMENTER="${{ github.event.comment.user.login }}"
+
+          echo "Checking permissions for user: $COMMENTER"
+
+          # Check if user is in allowed list
+          if [[ ",$ALLOWED_USERS," == *",$COMMENTER,"* ]]; then
+            echo "allowed=true" >> $GITHUB_OUTPUT
+            echo "✅ User $COMMENTER is allowed to use Claude"
+          else
+            echo "allowed=false" >> $GITHUB_OUTPUT
+            echo "❌ User $COMMENTER is not allowed to use Claude"
+          fi
+
+  deny-access:
+    needs: check-permissions
+    if: needs.check-permissions.outputs.allowed == 'false'
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - name: Comment access denied
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const message = `👋 Hi @${{ github.event.comment.user.login || github.event.review.user.login || github.event.issue.user.login }}!
+
+            Thanks for trying to use Claude Code, but currently only certain team members have access to this feature.
+
+            If you believe you should have access, please contact a project maintainer.`;
+
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              body: message
+            });
+
+  claude-code-action:
+    needs: check-permissions
+    if: needs.check-permissions.outputs.allowed == 'true'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+      issues: write
+      id-token: write
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 1
+
+    - name: Run Claude PR Action
+      uses: anthropics/claude-code-action@beta
+      with:
+        anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
+        timeout_minutes: "60"
--- a/.github/workflows/superset-python-unittest.yml
+++ b/.github/workflows/superset-python-unittest.yml
@@ -51,7 +51,7 @@ jobs:
          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
+          pytest --durations-min=0.5 --cov=superset/sql/ ./tests/unit_tests/sql/ --cache-clear --cov-fail-under=100
      - name: Upload code coverage
        uses: codecov/codecov-action@v5
        with:
--- a/.gitignore
+++ b/.gitignore
@@ -92,6 +92,7 @@ scripts/*.zip
 # IntelliJ
 *.iml
 venv
+.venv
@eaDir/

 # PyCharm
@@ -126,4 +127,7 @@ docker/*local*
 # Jest test report
 test-report.html
 superset/static/stats/statistics.html
+
+# LLM-related
+CLAUDE.local.md
 .aider*
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -52,14 +52,6 @@ repos:
      - id: trailing-whitespace
        exclude: ^.*\.(snap)
        args: ["--markdown-linebreak-ext=md"]
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v4.0.0-alpha.8 # Use the sha or tag you want to point at
-    hooks:
-      - id: prettier
-        additional_dependencies:
-          - prettier@3.5.3
-        args: ["--ignore-path=./superset-frontend/.prettierignore", "--exclude", "site-packages"]
-        files: "superset-frontend"
  - repo: local
    hooks:
    - id: eslint-frontend
@@ -76,7 +68,7 @@ repos:
      files: ^docs/.*\.(js|jsx|ts|tsx)$
    - id: type-checking-frontend
      name: Type-Checking (Frontend)
-      entry: bash -c './scripts/check-type.js package=superset-frontend excludeDeclarationDir=cypress-base'
+      entry: ./scripts/check-type.js package=superset-frontend excludeDeclarationDir=cypress-base
      language: system
      files: ^superset-frontend\/.*\.(js|jsx|ts|tsx)$
      exclude: ^superset-frontend/cypress-base\/
@@ -97,9 +89,9 @@ repos:
  - repo: https://github.com/astral-sh/ruff-pre-commit
    rev: v0.9.7
    hooks:
+      - id: ruff-format
      - id: ruff
        args: [--fix]
-      - id: ruff-format
  - repo: local
    hooks:
    - id: pylint
@@ -113,9 +105,10 @@ repos:
        - |
          TARGET_BRANCH=${GITHUB_BASE_REF:-master}
          git fetch origin "$TARGET_BRANCH"
-          files=$(git diff --name-only --diff-filter=ACM origin/"$TARGET_BRANCH"..HEAD | grep '^superset/.*\.py$' || true)
+          BASE=$(git merge-base origin/"$TARGET_BRANCH" HEAD)
+          files=$(git diff --name-only --diff-filter=ACM "$BASE"..HEAD | grep '^superset/.*\.py$' || true)
          if [ -n "$files" ]; then
-            pylint --rcfile=.pylintrc --load-plugins=superset.extensions.pylint $files
+            pylint --rcfile=.pylintrc --load-plugins=superset.extensions.pylint --reports=no $files
          else
            echo "No Python files to lint."
          fi
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -76,3 +76,11 @@ ydb.svg
 erd.puml
 erd.svg
 intro_header.txt
+
+# for LLMs
+llm-context.md
+LLMS.md
+CLAUDE.md
+CURSOR.md
+GEMINI.md
+GPT.md
--- a/CHANGELOG/4.1.3.md
+++ b/CHANGELOG/4.1.3.md
@@ -0,0 +1,58 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+## Change Log
+
+### 4.1.3 (Thu May 29 02:31:07 2025 -0500)
+
+**Database Migrations**
+
+**Features**
+
+**Fixes**
+
+- [#33522](https://github.com/apache/superset/pull/33522) fix(Sqllab):  Autocomplete got stuck in UI when open it too fast (@rebenitez1802)
+- [#33425](https://github.com/apache/superset/pull/33425) fix(table-chart): time shift is not working (@justinpark)
+- [#32414](https://github.com/apache/superset/pull/32414) fix(api): Added uuid to list api calls (@withnale)
+- [#33354](https://github.com/apache/superset/pull/33354) fix: loading examples from raw.githubusercontent.com fails with 429 errors (@mistercrunch)
+- [#32382](https://github.com/apache/superset/pull/32382) fix(pinot): revert join and subquery flags (@yuribogomolov)
+- [#32473](https://github.com/apache/superset/pull/32473) fix(plugin-chart-echarts): remove erroneous upper bound value (@villebro)
+- [#33048](https://github.com/apache/superset/pull/33048) fix: improve error type on parse error (@justinpark)
+- [#32968](https://github.com/apache/superset/pull/32968) fix(pivot-table): Revert "fix(Pivot Table): Fix column width to respect currency config (#31414)" (@justinpark)
+- [#32795](https://github.com/apache/superset/pull/32795) fix(log): store navigation path to get correct logging path (@justinpark)
+- [#33216](https://github.com/apache/superset/pull/33216) fix: Downgrade to marshmallow<4 (@amotl)
+- [#32866](https://github.com/apache/superset/pull/32866) fix: make packages PEP 625 compliant (@sadpandajoe)
+- [#32035](https://github.com/apache/superset/pull/32035) fix(fe/dashboard-list): display modifier info for `Last modified` data (@hainenber)
+- [#32708](https://github.com/apache/superset/pull/32708) fix(logging): missing path in event data (@justinpark)
+- [#32699](https://github.com/apache/superset/pull/32699) fix: Signature of Celery pruner jobs (@michael-s-molina)
+- [#32681](https://github.com/apache/superset/pull/32681) fix(log): Update recent_activity by event name (@justinpark)
+- [#32608](https://github.com/apache/superset/pull/32608) fix(welcome): perf on distinct recent activities (@justinpark)
+- [#32572](https://github.com/apache/superset/pull/32572) fix: Log table retention policy (@michael-s-molina)
+- [#32406](https://github.com/apache/superset/pull/32406) fix(model/helper): represent RLS filter clause in proper textual SQL string (@hainenber)
+- [#32240](https://github.com/apache/superset/pull/32240) fix: upgrade to 3.11.11-slim-bookworm to address critical vulnerabilities (@gpchandran)
+- [#30858](https://github.com/apache/superset/pull/30858) fix(chart data): removing query from /chart/data payload when accessing as guest user (@fisjac)
+
+**Others**
+
+- [#33612](https://github.com/apache/superset/pull/33612) chore: update Dockerfile - Upgrade to 3.11.12 (@gpchandran)
+- [#33435](https://github.com/apache/superset/pull/33435) docs: CVEs fixed on 4.1.2 (@sha174n)
+- [#33339](https://github.com/apache/superset/pull/33339) chore(🦾): bump python h11 0.14.0 -> 0.16.0 (@github-actions[bot])
+- [#32745](https://github.com/apache/superset/pull/32745) chore(🦾): bump python sqlglot 26.1.3 -> 26.11.1 (@github-actions[bot])
+- [#32782](https://github.com/apache/superset/pull/32782) chore: Revert "chore: bump base image in Dockerfile with `ARG PY_VER=3.11.11-slim-bookworm`" (@sadpandajoe)
+- [#32780](https://github.com/apache/superset/pull/32780) chore: bump base image in Dockerfile with `ARG PY_VER=3.11.11-slim-bookworm` (@gpchandran)
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -0,0 +1 @@
+LLMS.md
--- a/6
+++ b/6
@@ -167,7 +167,7 @@ RUN mkdir -p \
    && touch superset/static/version_info.json

 # Install Playwright and optionally setup headless browsers
-ARG INCLUDE_CHROMIUM="true"
+ARG INCLUDE_CHROMIUM="false"
 ARG INCLUDE_FIREFOX="false"
 RUN --mount=type=cache,target=${SUPERSET_HOME}/.cache/uv \
    if [ "$INCLUDE_CHROMIUM" = "true" ] || [ "$INCLUDE_FIREFOX" = "true" ]; then \
@@ -223,7 +223,7 @@ RUN --mount=type=cache,target=${SUPERSET_HOME}/.cache/uv \
    /app/docker/pip-install.sh --requires-build-essential -r requirements/base.txt
 # Install the superset package
 RUN --mount=type=cache,target=${SUPERSET_HOME}/.cache/uv \
-    uv pip install .
+    uv pip install -e .
 RUN python -m compileall /app/superset

 USER superset
@@ -246,7 +246,7 @@ RUN --mount=type=cache,target=${SUPERSET_HOME}/.cache/uv \
    /app/docker/pip-install.sh --requires-build-essential -r requirements/development.txt
 # Install the superset package
 RUN --mount=type=cache,target=${SUPERSET_HOME}/.cache/uv \
-    uv pip install .
+    uv pip install -e .

 RUN uv pip install .[postgres]
 RUN python -m compileall /app/superset
--- a/GEMINI.md
+++ b/GEMINI.md
@@ -0,0 +1 @@
+LLMS.md
--- a/GPT.md
+++ b/GPT.md
@@ -0,0 +1 @@
+LLMS.md
--- a/LLMS.md
+++ b/LLMS.md
@@ -0,0 +1,191 @@
+# LLM Context Guide for Apache Superset
+
+Apache Superset is a data visualization platform with Flask/Python backend and React/TypeScript frontend.
+
+## ⚠️ CRITICAL: Ongoing Refactors (What NOT to Do)
+
+**These migrations are actively happening - avoid deprecated patterns:**
+
+### Frontend Modernization
+- **NO `any` types** - Use proper TypeScript types
+- **NO JavaScript files** - Convert to TypeScript (.ts/.tsx)
+- **Use @superset-ui/core** - Don't import Ant Design directly
+
+### Testing Strategy Migration
+- **Prefer unit tests** over integration tests
+- **Prefer integration tests** over Cypress end-to-end tests
+- **Cypress is last resort** - Actively moving away from Cypress
+- **Use Jest + React Testing Library** for component testing
+
+### Backend Type Safety
+- **Add type hints** - All new Python code needs proper typing
+- **MyPy compliance** - Run `pre-commit run mypy` to validate
+- **SQLAlchemy typing** - Use proper model annotations
+
+### UUID Migration
+- **Prefer UUIDs over auto-incrementing IDs** - New models should use UUID primary keys
+- **External API exposure** - Use UUIDs in public APIs instead of internal integer IDs
+- **Existing models** - Add UUID fields alongside integer IDs for gradual migration
+
+## Key Directories
+
+```
+superset/
+├── superset/                    # Python backend (Flask, SQLAlchemy)
+│   ├── views/api/              # REST API endpoints
+│   ├── models/                 # Database models
+│   └── connectors/             # Database connections
+├── superset-frontend/src/       # React TypeScript frontend
+│   ├── components/             # Reusable components
+│   ├── explore/                # Chart builder
+│   ├── dashboard/              # Dashboard interface
+│   └── SqlLab/                 # SQL editor
+├── superset-frontend/packages/
+│   └── superset-ui-core/       # UI component library (USE THIS)
+├── tests/                      # Python/integration tests
+├── docs/                       # Documentation (UPDATE FOR CHANGES)
+└── UPDATING.md                 # Breaking changes log
+```
+
+## Code Standards
+
+### TypeScript Frontend
+- **Avoid `any` types** - Use proper TypeScript, reuse existing types
+- **Functional components** with hooks
+- **@superset-ui/core** for UI components (not direct antd)
+- **Jest** for testing (NO Enzyme)
+- **Redux** for global state where it exists, hooks for local
+
+### Python Backend  
+- **Type hints required** for all new code
+- **MyPy compliant** - run `pre-commit run mypy`
+- **SQLAlchemy models** with proper typing
+- **pytest** for testing
+
+### Apache License Headers
+- **New files require ASF license headers** - When creating new code files, include the standard Apache Software Foundation license header
+- **LLM instruction files are excluded** - Files like LLMS.md, CLAUDE.md, etc. are in `.rat-excludes` to avoid header token overhead
+
+## Documentation Requirements
+
+- **docs/**: Update for any user-facing changes
+- **UPDATING.md**: Add breaking changes here
+- **Docstrings**: Required for new functions/classes
+
+## Architecture Patterns
+
+### Security & Features
+- **RBAC**: Role-based access via Flask-AppBuilder
+- **Feature flags**: Control feature rollouts
+- **Row-level security**: SQL-based data access control
+
+## Test Utilities
+
+### Python Test Helpers
+- **`SupersetTestCase`** - Base class in `tests/integration_tests/base_tests.py`
+- **`@with_config`** - Config mocking decorator
+- **`@with_feature_flags`** - Feature flag testing
+- **`login_as()`, `login_as_admin()`** - Authentication helpers
+- **`create_dashboard()`, `create_slice()`** - Data setup utilities
+
+### TypeScript Test Helpers
+- **`superset-frontend/spec/helpers/testing-library.tsx`** - Custom render() with providers
+- **`createWrapper()`** - Redux/Router/Theme wrapper
+- **`selectOption()`** - Select component helper
+- **React Testing Library** - NO Enzyme (removed)
+
+### Test Database Patterns
+- **Mock patterns**: Use `MagicMock()` for config objects, avoid `AsyncMock` for synchronous code
+- **API tests**: Update expected columns when adding new model fields
+
+### Running Tests
+```bash
+# Frontend
+npm run test                           # All tests
+npm run test -- filename.test.tsx     # Single file
+
+# Backend  
+pytest                                 # All tests
+pytest tests/unit_tests/specific_test.py  # Single file
+pytest tests/unit_tests/               # Directory
+
+# If pytest fails with database/setup issues, ask the user to run test environment setup
+```
+
+## Environment Validation
+
+**Quick Setup Check (run this first):**
+
+```bash
+# Verify Superset is running
+curl -f http://localhost:8088/health || echo "❌ Setup required - see https://superset.apache.org/docs/contributing/development#working-with-llms"
+```
+
+**If health checks fail:**
+"It appears you aren't set up properly. Please refer to the [Working with LLMs](https://superset.apache.org/docs/contributing/development#working-with-llms) section in the development docs for setup instructions."
+
+**Key Project Files:**
+- `superset-frontend/package.json` - Frontend build scripts (`npm run dev` on port 9000, `npm run test`, `npm run lint`)
+- `pyproject.toml` - Python tooling (ruff, mypy configs)
+- `requirements/` folder - Python dependencies (base.txt, development.txt)
+
+## SQLAlchemy Query Best Practices  
+- **Use negation operator**: `~Model.field` instead of `== False` to avoid ruff E712 errors
+- **Example**: `~Model.is_active` instead of `Model.is_active == False`
+
+## Pre-commit Validation
+
+**Use pre-commit hooks for quality validation:**
+
+```bash
+# Install hooks
+pre-commit install
+
+# IMPORTANT: Stage your changes first!
+git add .                        # Pre-commit only checks staged files
+
+# Quick validation (faster than --all-files)
+pre-commit run                   # Staged files only
+pre-commit run mypy              # Python type checking
+pre-commit run prettier          # Code formatting
+pre-commit run eslint            # Frontend linting
+```
+
+**Important pre-commit usage notes:**
+- **Stage files first**: Run `git add .` before `pre-commit run` to check only changed files (much faster)
+- **Virtual environment**: Activate your Python virtual environment before running pre-commit
+  ```bash
+  # Common virtual environment locations (yours may differ):
+  source .venv/bin/activate      # if using .venv
+  source venv/bin/activate       # if using venv
+  source ~/venvs/superset/bin/activate  # if using a central location
+  ```
+  If you get a "command not found" error, ask the user which virtual environment to activate
+- **Auto-fixes**: Some hooks auto-fix issues (e.g., trailing whitespace). Re-run after fixes are applied
+
+## Common File Patterns
+
+### API Structure
+- **`/api.py`** - REST endpoints with decorators and OpenAPI docstrings
+- **`/schemas.py`** - Marshmallow validation schemas for OpenAPI spec
+- **`/commands/`** - Business logic classes with @transaction() decorators
+- **`/models/`** - SQLAlchemy database models
+- **OpenAPI docs**: Auto-generated at `/swagger/v1` from docstrings and schemas
+
+### Migration Files
+- **Location**: `superset/migrations/versions/`
+- **Naming**: `YYYY-MM-DD_HH-MM_hash_description.py`
+- **Utilities**: Use helpers from `superset.migrations.shared.utils` for database compatibility
+- **Pattern**: Import utilities instead of raw SQLAlchemy operations
+
+## Platform-Specific Instructions
+
+- **[CLAUDE.md](CLAUDE.md)** - For Claude/Anthropic tools
+- **[.github/copilot-instructions.md](.github/copilot-instructions.md)** - For GitHub Copilot  
+- **[GEMINI.md](GEMINI.md)** - For Google Gemini tools
+- **[GPT.md](GPT.md)** - For OpenAI/ChatGPT tools
+- **[.cursor/rules/dev-standard.mdc](.cursor/rules/dev-standard.mdc)** - For Cursor editor
+
+---
+
+**LLM Note**: This codebase is actively modernizing toward full TypeScript and type safety. Always run `pre-commit run` to validate changes. Follow the ongoing refactors section to avoid deprecated patterns.
--- a/UPDATING.md
+++ b/UPDATING.md
@@ -23,7 +23,10 @@ This file documents any backwards-incompatible changes in Superset and
 assists people when migrating to a new version.

 ## Next
-
+- [33084](https://github.com/apache/superset/pull/33084) The DISALLOWED_SQL_FUNCTIONS configuration now includes additional potentially sensitive database functions across PostgreSQL, MySQL, SQLite, MS SQL Server, and ClickHouse. Existing queries using these functions may now be blocked. Review your SQL Lab queries and dashboards if you encounter "disallowed function" errors after upgrading
+- [34235](https://github.com/apache/superset/pull/34235) CSV exports now use `utf-8-sig` encoding by default to include a UTF-8 BOM, improving compatibility with Excel.
+- [34258](https://github.com/apache/superset/pull/34258) changing the default in Dockerfile to INCLUDE_CHROMIUM="false" (from "true") in the past. This ensures the `lean` layer is lean by default, and people can opt-in to the `chromium` layer by setting the build arg `INCLUDE_CHROMIUM=true`. This is a breaking change for anyone using the `lean` layer, as it will no longer include Chromium by default.
+- [34204](https://github.com/apache/superset/pull/33603) OpenStreetView has been promoted as the new default for Deck.gl visualization since it can be enabled by default without requiring an API key. If you have Mapbox set up and want to disable OpenStreeView in your environment, please follow the steps documented here [https://superset.apache.org/docs/configuration/map-tiles].
 - [33116](https://github.com/apache/superset/pull/33116) In Echarts Series charts (e.g. Line, Area, Bar, etc.) charts, the `x_axis_sort_series` and `x_axis_sort_series_ascending` form data items have been renamed with `x_axis_sort` and `x_axis_sort_asc`.
  There's a migration added that can potentially affect a significant number of existing charts.
 - [32317](https://github.com/apache/superset/pull/32317) The horizontal filter bar feature is now out of testing/beta development and its feature flag `HORIZONTAL_FILTER_BAR` has been removed.
--- a/docker-compose-image-tag.yml
+++ b/docker-compose-image-tag.yml
@@ -20,6 +20,9 @@
 # If you choose to use this type of deployment make sure to
 # create you own docker environment file (docker/.env) with your own
 # unique random secure passwords and SECRET_KEY.
+#
+# For verbose logging during development:
+# - Set SUPERSET_LOG_LEVEL=debug in docker/.env-local for detailed Superset logs
 # -----------------------------------------------------------------------
 x-superset-image: &superset-image apachesuperset.docker.scarf.sh/apache/superset:${TAG:-latest-dev}
 x-superset-volumes:
--- a/docker-compose-light.yml
+++ b/docker-compose-light.yml
@@ -0,0 +1,157 @@
+#
+# 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.
+#
+
+# -----------------------------------------------------------------------
+# Lightweight docker-compose for running multiple Superset instances
+# This includes only essential services: database, Redis, and Superset app
+#
+# IMPORTANT: To run multiple instances in parallel:
+# - Use different project names: docker-compose -p project1 -f docker-compose-light.yml up
+# - Use different NODE_PORT values: NODE_PORT=9002 docker-compose -p project2 -f docker-compose-light.yml up
+# - Volumes are isolated by project name (e.g., project1_db_home_light, project2_db_home_light)
+# - Database name is intentionally different (superset_light) to prevent accidental cross-connections
+#
+# For verbose logging during development:
+# - Set SUPERSET_LOG_LEVEL=debug in docker/.env-local for detailed Superset logs
+# -----------------------------------------------------------------------
+x-superset-user: &superset-user root
+x-superset-volumes: &superset-volumes
+  # /app/pythonpath_docker will be appended to the PYTHONPATH in the final container
+  - ./docker:/app/docker
+  - ./superset:/app/superset
+  - ./superset-frontend:/app/superset-frontend
+  - superset_home_light:/app/superset_home
+  - ./tests:/app/tests
+x-common-build: &common-build
+  context: .
+  target: ${SUPERSET_BUILD_TARGET:-dev} # can use `dev` (default) or `lean`
+  cache_from:
+    - apache/superset-cache:3.10-slim-bookworm
+  args:
+    DEV_MODE: "true"
+    INCLUDE_CHROMIUM: ${INCLUDE_CHROMIUM:-false}
+    INCLUDE_FIREFOX: ${INCLUDE_FIREFOX:-false}
+    BUILD_TRANSLATIONS: ${BUILD_TRANSLATIONS:-false}
+
+services:
+  db-light:
+    env_file:
+      - path: docker/.env # default
+        required: true
+      - path: docker/.env-local # optional override
+        required: false
+    image: postgres:16
+    restart: unless-stopped
+    # No host port mapping - only accessible within Docker network
+    volumes:
+      - db_home_light:/var/lib/postgresql/data
+      - ./docker/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
+    environment:
+      # Override database name to avoid conflicts
+      POSTGRES_DB: superset_light
+
+  superset-light:
+    env_file:
+      - path: docker/.env # default
+        required: true
+      - path: docker/.env-local # optional override
+        required: false
+    build:
+      <<: *common-build
+    command: ["/app/docker/docker-bootstrap.sh", "app"]
+    restart: unless-stopped
+    # No host port mapping - accessed via webpack dev server proxy
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    user: *superset-user
+    depends_on:
+      superset-init-light:
+        condition: service_completed_successfully
+    volumes: *superset-volumes
+    environment:
+      # Override DB connection for light service
+      DATABASE_HOST: db-light
+      DATABASE_DB: superset_light
+      POSTGRES_DB: superset_light
+      EXAMPLES_HOST: db-light
+      EXAMPLES_DB: superset_light
+      EXAMPLES_USER: superset
+      EXAMPLES_PASSWORD: superset
+      # Use light-specific config that disables Redis
+      SUPERSET_CONFIG_PATH: /app/docker/pythonpath_dev/superset_config_docker_light.py
+
+  superset-init-light:
+    build:
+      <<: *common-build
+    command: ["/app/docker/docker-init.sh"]
+    env_file:
+      - path: docker/.env # default
+        required: true
+      - path: docker/.env-local # optional override
+        required: false
+    depends_on:
+      db-light:
+        condition: service_started
+    user: *superset-user
+    volumes: *superset-volumes
+    environment:
+      # Override DB connection for light service
+      DATABASE_HOST: db-light
+      DATABASE_DB: superset_light
+      POSTGRES_DB: superset_light
+      EXAMPLES_HOST: db-light
+      EXAMPLES_DB: superset_light
+      EXAMPLES_USER: superset
+      EXAMPLES_PASSWORD: superset
+      # Use light-specific config that disables Redis
+      SUPERSET_CONFIG_PATH: /app/docker/pythonpath_dev/superset_config_docker_light.py
+    healthcheck:
+      disable: true
+
+  superset-node-light:
+    build:
+      context: .
+      target: superset-node
+      args:
+        # This prevents building the frontend bundle since we'll mount local folder
+        # and build it on startup while firing docker-frontend.sh in dev mode, where
+        # it'll mount and watch local files and rebuild as you update them
+        DEV_MODE: "true"
+        BUILD_TRANSLATIONS: ${BUILD_TRANSLATIONS:-false}
+    environment:
+      # set this to false if you have perf issues running the npm i; npm run dev in-docker
+      # if you do so, you have to run this manually on the host, which should perform better!
+      BUILD_SUPERSET_FRONTEND_IN_DOCKER: true
+      NPM_RUN_PRUNE: false
+      SCARF_ANALYTICS: "${SCARF_ANALYTICS:-}"
+      # configuring the dev-server to use the host.docker.internal to connect to the backend
+      superset: "http://superset-light:8088"
+    ports:
+      - "127.0.0.1:${NODE_PORT:-9001}:9000"  # Parameterized port
+    command: ["/app/docker/docker-frontend.sh"]
+    env_file:
+      - path: docker/.env # default
+        required: true
+      - path: docker/.env-local # optional override
+        required: false
+    volumes: *superset-volumes
+
+volumes:
+  superset_home_light:
+    external: false
+  db_home_light:
+    external: false
--- a/docker-compose-non-dev.yml
+++ b/docker-compose-non-dev.yml
@@ -20,6 +20,9 @@
 # If you choose to use this type of deployment make sure to
 # create you own docker environment file (docker/.env) with your own
 # unique random secure passwords and SECRET_KEY.
+#
+# For verbose logging during development:
+# - Set SUPERSET_LOG_LEVEL=debug in docker/.env-local for detailed Superset logs
 # -----------------------------------------------------------------------
 x-superset-volumes:
  &superset-volumes # /app/pythonpath_docker will be appended to the PYTHONPATH in the final container
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,6 +20,9 @@
 # If you choose to use this type of deployment make sure to
 # create you own docker environment file (docker/.env) with your own
 # unique random secure passwords and SECRET_KEY.
+#
+# For verbose logging during development:
+# - Set SUPERSET_LOG_LEVEL=debug in docker/.env-local for detailed Superset logs
 # -----------------------------------------------------------------------
 x-superset-user: &superset-user root
 x-superset-volumes: &superset-volumes
--- a/docker/.env
+++ b/docker/.env
@@ -53,7 +53,12 @@ PYTHONPATH=/app/pythonpath:/app/docker/pythonpath_dev
 REDIS_HOST=redis
 REDIS_PORT=6379

+# Development and logging configuration
+# FLASK_DEBUG: Enables Flask dev features (auto-reload, better error pages) - keep 'true' for development
 FLASK_DEBUG=true
+# SUPERSET_LOG_LEVEL: Controls Superset application logging verbosity (debug, info, warning, error, critical)
+SUPERSET_LOG_LEVEL=info
+
 SUPERSET_APP_ROOT="/"
 SUPERSET_ENV=development
 SUPERSET_LOAD_EXAMPLES=yes
@@ -66,4 +71,3 @@ SUPERSET_SECRET_KEY=TEST_NON_DEV_SECRET
 ENABLE_PLAYWRIGHT=false
 PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
 BUILD_SUPERSET_FRONTEND_IN_DOCKER=true
-SUPERSET_LOG_LEVEL=info
--- a/docker/pythonpath_dev/.gitignore
+++ b/docker/pythonpath_dev/.gitignore
@@ -20,4 +20,5 @@
 # DON'T ignore the .gitignore
 !.gitignore
 !superset_config.py
+!superset_config_docker_light.py
 !superset_config_local.example
--- a/docker/pythonpath_dev/superset_config.py
+++ b/docker/pythonpath_dev/superset_config.py
@@ -129,7 +129,7 @@ if os.getenv("CYPRESS_CONFIG") == "true":
 #
 try:
    import superset_config_docker
-    from superset_config_docker import *  # noqa
+    from superset_config_docker import *  # noqa: F403

    logger.info(
        f"Loaded your Docker configuration at [{superset_config_docker.__file__}]"
--- a/docker/pythonpath_dev/superset_config_docker_light.py
+++ b/docker/pythonpath_dev/superset_config_docker_light.py
@@ -0,0 +1,37 @@
+# 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.
+#
+# Configuration for docker-compose-light.yml - disables Redis and uses minimal services
+
+# Import all settings from the main config first
+from flask_caching.backends.filesystemcache import FileSystemCache
+from superset_config import *  # noqa: F403
+
+# Override caching to use simple in-memory cache instead of Redis
+RESULTS_BACKEND = FileSystemCache("/app/superset_home/sqllab")
+
+CACHE_CONFIG = {
+    "CACHE_TYPE": "SimpleCache",
+    "CACHE_DEFAULT_TIMEOUT": 300,
+    "CACHE_KEY_PREFIX": "superset_light_",
+}
+DATA_CACHE_CONFIG = CACHE_CONFIG
+THUMBNAIL_CACHE_CONFIG = CACHE_CONFIG
+
+
+# Disable Celery entirely for lightweight mode
+CELERY_CONFIG = None  # type: ignore[assignment,misc]
--- a/docs/docs/configuration/map-tiles.mdx
+++ b/docs/docs/configuration/map-tiles.mdx
@@ -0,0 +1,78 @@
+---
+title: Map Tiles
+sidebar_position: 12
+version: 1
+---
+
+# Map tiles
+
+Superset uses OSM and Mapbox tiles by default. OSM is free but you still need setting your MAPBOX_API_KEY if you want to use mapbox maps.
+
+## Setting map tiles
+
+Map tiles can be set with `DECKGL_BASE_MAP` in your `superset_config.py` or `superset_config_docker.py`
+For adding your own map tiles, you can use the following format.
+
+```python
+DECKGL_BASE_MAP = [
+    ['tile://https://your_personal_url/{z}/{x}/{y}.png', 'MyTile']
+]
+```
+Openstreetmap tiles url can be added without prefix.
+```python
+DECKGL_BASE_MAP = [
+    ['https://c.tile.openstreetmap.org/{z}/{x}/{y}.png', 'OpenStreetMap']
+]
+```
+
+Default values are:
+```python
+DECKGL_BASE_MAP = [
+    ['https://tile.openstreetmap.org/{z}/{x}/{y}.png', 'Streets (OSM)'],
+    ['https://tile.osm.ch/osm-swiss-style/{z}/{x}/{y}.png', 'Topography (OSM)'],
+    ['mapbox://styles/mapbox/streets-v9', 'Streets'],
+    ['mapbox://styles/mapbox/dark-v9', 'Dark'],
+    ['mapbox://styles/mapbox/light-v9', 'Light'],
+    ['mapbox://styles/mapbox/satellite-streets-v9', 'Satellite Streets'],
+    ['mapbox://styles/mapbox/satellite-v9', 'Satellite'],
+    ['mapbox://styles/mapbox/outdoors-v9', 'Outdoors'],
+]
+```
+
+It is possible to set only mapbox by removing osm tiles and other way around.
+
+:::warning
+Setting `DECKGL_BASE_MAP` overwrite default values
+:::
+
+After defining your map tiles, set them in these variables:
+- `CORS_OPTIONS`
+- `connect-src` of `TALISMAN_CONFIG` and `TALISMAN_CONFIG_DEV` variables.
+
+```python
+ENABLE_CORS = True
+CORS_OPTIONS: dict[Any, Any] = {
+    "origins": [
+        "https://tile.openstreetmap.org",
+        "https://tile.osm.ch",
+        "https://your_personal_url/{z}/{x}/{y}.png",
+    ]
+}
+
+.
+.
+
+TALISMAN_CONFIG = {
+    "content_security_policy": {
+        ...
+        "connect-src": [
+            "'self'",
+            "https://api.mapbox.com",
+            "https://events.mapbox.com",
+            "https://tile.openstreetmap.org",
+            "https://tile.osm.ch",
+            "https://your_personal_url/{z}/{x}/{y}.png",
+        ],
+        ...
+}
+```
--- a/docs/docs/configuration/theming.mdx
+++ b/docs/docs/configuration/theming.mdx
@@ -10,44 +10,85 @@ version: 1
 apache-superset>=6.0
 :::

-Superset now rides on **Ant Design v5’s token-based theming**.
+Superset now rides on **Ant Design v5's token-based theming**.
 Every Antd token works, plus a handful of Superset-specific ones for charts and dashboard chrome.

-## 1 — Create a theme
+## Managing Themes via CRUD Interface

-1. Open the official [Ant Design Theme Editor](https://ant.design/theme-editor)
-2. Design your palette, typography, and component overrides.
-3. Open the `CONFIG` modal and paste the JSON.
+Superset now includes a built-in **Theme Management** interface accessible from the admin menu under **Settings > Themes**.
+
+### Creating a New Theme
+
+1. Navigate to **Settings > Themes** in the Superset interface
+2. Click **+ Theme** to create a new theme
+3. Use the [Ant Design Theme Editor](https://ant.design/theme-editor) to design your theme:
+   - Design your palette, typography, and component overrides
+   - Open the `CONFIG` modal and copy the JSON configuration
+4. Paste the JSON into the theme definition field in Superset
+5. Give your theme a descriptive name and save

 You can also extend with Superset-specific tokens (documented in the default theme object) before you import.

-## 2 — Apply it instance-wide
+### Applying Themes to Dashboards
+
+Once created, themes can be applied to individual dashboards:
+- Edit any dashboard and select your custom theme from the theme dropdown
+- Each dashboard can have its own theme, allowing for branded or context-specific styling
+
+## Alternative: Instance-wide Configuration
+
+For system-wide theming, you can configure default themes via Python configuration:
+
+### Setting Default Themes

 ```python
 # superset_config.py
-THEME = {
-    # Paste your JSON theme definition here
+
+# Default theme (light mode)
+THEME_DEFAULT = {
+    "token": {
+        "colorPrimary": "#2893B3",
+        "colorSuccess": "#5ac189",
+        # ... your theme JSON configuration
+    }
+}
+
+# Dark theme configuration
+THEME_DARK = {
+    "algorithm": "dark",
+    "token": {
+        "colorPrimary": "#2893B3",
+        # ... your dark theme overrides
+    }
+}
+
+# Theme behavior settings
+THEME_SETTINGS = {
+    "enforced": False,          # If True, forces default theme always
+    "allowSwitching": True,     # Allow users to switch between themes
+    "allowOSPreference": True,  # Auto-detect system theme preference
 }
 ```

-Restart Superset to apply changes
+### Copying Themes from CRUD Interface

-## 3 — Tweak live in the app (beta)
+To use a theme created via the CRUD interface as your system default:

-Set the feature flag in your `superset_config`
-```python
-DEFAULT_FEATURE_FLAGS: dict[str, bool] = {
-    {{ ... }}
-    THEME_ALLOW_THEME_EDITOR_BETA = True,
-}
-```
+1. Navigate to **Settings > Themes** and edit your desired theme
+2. Copy the complete JSON configuration from the theme definition field
+3. Paste it directly into your `superset_config.py` as shown above

- Enables a JSON editor panel inside Superset as a new icon in the navbar
- Intended for testing/design and rapid in-context iteration
- End-user theme switching & preferences coming later
+Restart Superset to apply changes.

-## 4 — Potential Next Steps
+## Theme Development Workflow

- CRUD UI for managing multiple themes
- Per-dashboard & per-workspace theme assignment
- User-selectable theme preferences
+1. **Design**: Use the [Ant Design Theme Editor](https://ant.design/theme-editor) to iterate on your design
+2. **Test**: Create themes in Superset's CRUD interface for testing
+3. **Apply**: Assign themes to specific dashboards or configure instance-wide
+4. **Iterate**: Modify theme JSON directly in the CRUD interface or re-import from the theme editor
+
+## Advanced Features
+
+- **System Themes**: Superset includes built-in light and dark themes
+- **Per-Dashboard Theming**: Each dashboard can have its own visual identity
+- **JSON Editor**: Edit theme configurations directly within Superset's interface
--- a/docs/docs/contributing/development.mdx
+++ b/docs/docs/contributing/development.mdx
@@ -194,6 +194,48 @@ You can also run the pre-commit checks manually in various ways:
  Replace `<hook_id>` with the ID of the specific hook you want to run. You can find the list
  of available hooks in the `.pre-commit-config.yaml` file.

+## Working with LLMs
+
+### Environment Setup
+Ensure Docker Compose is running before starting LLM sessions:
+```bash
+docker compose up
+```
+
+Validate your environment:
+```bash
+curl -f http://localhost:8088/health && echo "✅ Superset ready"
+```
+
+### LLM Session Best Practices
+- Always validate environment setup first using the health checks above
+- Use focused validation commands: `pre-commit run` (not `--all-files`)
+- **Read [LLMS.md](https://github.com/apache/superset/blob/master/LLMS.md) first** - Contains comprehensive development guidelines, coding standards, and critical refactor information
+- **Check platform-specific files** when available:
+  - `CLAUDE.md` - For Claude/Anthropic tools
+  - `CURSOR.md` - For Cursor editor
+  - `GEMINI.md` - For Google Gemini tools
+  - `GPT.md` - For OpenAI/ChatGPT tools
+- Follow the TypeScript migration guidelines and avoid deprecated patterns listed in LLMS.md
+
+### Key Development Commands
+```bash
+# Frontend development
+cd superset-frontend
+npm run dev          # Development server on http://localhost:9000
+npm run test         # Run all tests
+npm run test -- filename.test.tsx  # Run single test file
+npm run lint         # Linting and type checking
+
+# Backend validation
+pre-commit run mypy  # Type checking
+pytest              # Run all tests
+pytest tests/unit_tests/specific_test.py  # Run single test file
+pytest tests/unit_tests/  # Run all tests in directory
+```
+
+For detailed development context, environment setup, and coding guidelines, see [LLMS.md](https://github.com/apache/superset/blob/master/LLMS.md).
+
 ## Alternatives to `docker compose`

 :::caution
--- a/docs/docs/installation/docker-compose.mdx
+++ b/docs/docs/installation/docker-compose.mdx
@@ -26,11 +26,14 @@ Superset locally is using Docker Compose on a Linux or Mac OSX
 computer. Superset does not have official support for Windows. It's also the easiest
 way to launch a fully functioning **development environment** quickly.

-Note that there are 3 major ways we support to run `docker compose`:
+Note that there are 4 major ways we support to run `docker compose`:

 1. **docker-compose.yml:** for interactive development, where we mount your local folder with the
  frontend/backend files that you can edit and experience the changes you
  make in the app in real time
+1. **docker-compose-light.yml:** a lightweight configuration with minimal services (database,
+  Superset app, and frontend dev server) for development. Uses in-memory caching instead of Redis
+  and is designed for running multiple instances simultaneously
 1. **docker-compose-non-dev.yml** where we just build a more immutable image based on the
  local branch and get all the required images running. Changes in the local branch
  at the time you fire this up will be reflected, but changes to the code
@@ -44,7 +47,7 @@ Note that there are 3 major ways we support to run `docker compose`:
  The `dev` builds include the `psycopg2-binary` required to connect
  to the Postgres database launched as part of the `docker compose` builds.

-More on these two approaches after setting up the requirements for either.
+More on these approaches after setting up the requirements for either.

 ## Requirements

@@ -103,13 +106,36 @@ and help you start fresh. In the context of `docker compose` setting
 from within docker. This will slow down the startup, but will fix various npm-related issues.
 :::

-### Option #2 - build a set of immutable images from the local branch
+### Option #2 - lightweight development with multiple instances
+
+For a lighter development setup that uses fewer resources and supports running multiple instances:
+
+```bash
+# Single lightweight instance (default port 9001)
+docker compose -f docker-compose-light.yml up
+
+# Multiple instances with different ports
+NODE_PORT=9001 docker compose -p superset-1 -f docker-compose-light.yml up
+NODE_PORT=9002 docker compose -p superset-2 -f docker-compose-light.yml up
+NODE_PORT=9003 docker compose -p superset-3 -f docker-compose-light.yml up
+```
+
+This configuration includes:
+- PostgreSQL database (internal network only)
+- Superset application server
+- Frontend development server with webpack hot reloading
+- In-memory caching (no Redis)
+- Isolated volumes and networks per instance
+
+Access each instance at `http://localhost:{NODE_PORT}` (e.g., `http://localhost:9001`).
+
+### Option #3 - build a set of immutable images from the local branch

 ```bash
 docker compose -f docker-compose-non-dev.yml up
 ```

-### Option #3 - boot up an official release
+### Option #4 - boot up an official release

 ```bash
 # Set the version you want to run
--- a/docs/eslint.config.js
+++ b/docs/eslint.config.js
@@ -0,0 +1,72 @@
+/* eslint-env node */
+/**
+ * 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.
+ */
+const typescriptEslintParser = require('@typescript-eslint/parser');
+const typescriptEslintPlugin = require('@typescript-eslint/eslint-plugin');
+const eslintConfigPrettier = require('eslint-config-prettier');
+const prettierEslintPlugin = require('eslint-plugin-prettier');
+const js = require('@eslint/js');
+const ts = require('typescript-eslint');
+const react = require('eslint-plugin-react');
+const globals = require('globals');
+const { defineConfig, globalIgnores } = require('eslint/config');
+
+module.exports = defineConfig([
+  globalIgnores(['build/**/*', '.docusaurus/**/*', 'node_modules/**/*']),
+  js.configs.recommended,
+  ...ts.configs.recommended,
+  eslintConfigPrettier,
+  {
+    files: ['eslint.config.js'],
+    rules: {
+      '@typescript-eslint/no-require-imports': 'off',
+    }
+  },
+  {
+    languageOptions: {
+      parser: typescriptEslintParser,
+      parserOptions: {
+        ecmaFeatures: {
+          jsx: true,
+        },
+        ecmaVersion: 2020,
+        sourceType: 'module',
+      },
+      globals: {
+        ...globals.browser,
+        ...globals.node,
+      },
+    },
+    plugins: {
+      typescript: typescriptEslintPlugin,
+      react,
+      prettier: prettierEslintPlugin,
+    },
+    rules: {
+      'react/react-in-jsx-scope': 'off',
+      'react/prop-types': 'off',
+      '@typescript-eslint/explicit-module-boundary-types': 'off',
+    },
+    settings: {
+      react: {
+        version: 'detect',
+      },
+    },
+  }
+])
--- a/docs/package.json
+++ b/docs/package.json
@@ -40,15 +40,18 @@
  "devDependencies": {
    "@docusaurus/module-type-aliases": "^3.8.1",
    "@docusaurus/tsconfig": "^3.8.1",
+    "@eslint/js": "^9.31.0",
    "@types/react": "^19.1.8",
-    "@typescript-eslint/eslint-plugin": "^5.0.0",
-    "@typescript-eslint/parser": "^5.0.0",
-    "eslint": "^8.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.37.0",
+    "@typescript-eslint/parser": "^8.37.0",
+    "eslint": "^9.31.0",
    "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-prettier": "^5.5.1",
    "eslint-plugin-react": "^7.37.5",
-    "prettier": "^2.0.0",
+    "globals": "^16.3.0",
+    "prettier": "^3.6.2",
    "typescript": "~5.8.3",
+    "typescript-eslint": "^8.37.0",
    "webpack": "^5.99.9"
  },
  "browserslist": {
@@ -62,5 +65,6 @@
      "last 1 firefox version",
      "last 1 safari version"
    ]
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
 }
--- a/docs/src/pages/index.tsx
+++ b/docs/src/pages/index.tsx
@@ -111,7 +111,7 @@ const StyledTitleContainer = styled('div')`
  }
 `;

-const StyledButton = styled(Link as React.ComponentType<any>)`
+const StyledButton = styled(Link)`
  border-radius: 10px;
  font-size: 20px;
  font-weight: bold;
--- a/docs/src/theme/Root.js
+++ b/docs/src/theme/Root.js
@@ -16,7 +16,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-/* eslint-disable no-undef */
 import { useEffect } from 'react';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';

@@ -50,7 +49,9 @@ export default function Root({ children }) {

      // Handle route changes for SPA
      const handleRouteChange = () => {
-        devMode && console.log('Route changed to:', window.location.pathname);
+        if (devMode) {
+          console.log('Route changed to:', window.location.pathname);
+        }

        // Short timeout to ensure the page has fully rendered
        setTimeout(() => {
@@ -58,11 +59,9 @@ export default function Root({ children }) {
          const currentTitle = document.title;
          const currentPath = window.location.pathname;

-          devMode &&
-            console.log('Tracking page view:', currentPath, currentTitle);
-
          // For testing: impersonate real domain - ONLY FOR DEVELOPMENT
          if (devMode) {
+            console.log('Tracking page view:', currentPath, currentTitle);
            window._paq.push(['setDomains', ['superset.apache.org']]);
            window._paq.push([
              'setCustomUrl',
@@ -85,17 +84,22 @@ export default function Root({ children }) {
        'routeDidUpdate',
      ];

-      devMode && console.log('Setting up Docusaurus route listeners');
+      if (devMode) {
+        console.log('Setting up Docusaurus route listeners');
+      }
      possibleEvents.forEach(eventName => {
        document.addEventListener(eventName, () => {
-          devMode &&
+          if (devMode) {
            console.log(`Docusaurus route update detected via ${eventName}`);
+          }
          handleRouteChange();
        });
      });

      // Also set up manual history tracking as fallback
-      devMode && console.log('Setting up manual history tracking as fallback');
+      if (devMode) {
+        console.log('Setting up manual history tracking as fallback');
+      }
      const originalPushState = window.history.pushState;
      window.history.pushState = function () {
        originalPushState.apply(this, arguments);
--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@@ -2157,30 +2157,71 @@
  dependencies:
    eslint-visitor-keys "^3.4.3"

-"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.6.1":
+"@eslint-community/eslint-utils@^4.7.0":
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz#607084630c6c033992a082de6e6fbc1a8b52175a"
+  integrity sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==
+  dependencies:
+    eslint-visitor-keys "^3.4.3"
+
+"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.12.1":
  version "4.12.1"
-  resolved "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0"
  integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==

-"@eslint/eslintrc@^2.1.4":
-  version "2.1.4"
-  resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz"
-  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
+"@eslint/config-array@^0.21.0":
+  version "0.21.0"
+  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.21.0.tgz#abdbcbd16b124c638081766392a4d6b509f72636"
+  integrity sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==
+  dependencies:
+    "@eslint/object-schema" "^2.1.6"
+    debug "^4.3.1"
+    minimatch "^3.1.2"
+
+"@eslint/config-helpers@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@eslint/config-helpers/-/config-helpers-0.3.0.tgz#3e09a90dfb87e0005c7694791e58e97077271286"
+  integrity sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==
+
+"@eslint/core@^0.15.0", "@eslint/core@^0.15.1":
+  version "0.15.1"
+  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.15.1.tgz#d530d44209cbfe2f82ef86d6ba08760196dd3b60"
+  integrity sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==
+  dependencies:
+    "@types/json-schema" "^7.0.15"
+
+"@eslint/eslintrc@^3.3.1":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.3.1.tgz#e55f7f1dd400600dd066dbba349c4c0bac916964"
+  integrity sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==
  dependencies:
    ajv "^6.12.4"
    debug "^4.3.2"
-    espree "^9.6.0"
-    globals "^13.19.0"
+    espree "^10.0.1"
+    globals "^14.0.0"
    ignore "^5.2.0"
    import-fresh "^3.2.1"
    js-yaml "^4.1.0"
    minimatch "^3.1.2"
    strip-json-comments "^3.1.1"

-"@eslint/js@8.57.1":
-  version "8.57.1"
-  resolved "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz"
-  integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
+"@eslint/js@9.31.0", "@eslint/js@^9.31.0":
+  version "9.31.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.31.0.tgz#adb1f39953d8c475c4384b67b67541b0d7206ed8"
+  integrity sha512-LOm5OVt7D4qiKCqoiPbA7LWmI+tbw1VbTUowBcUMgQSuM6poJufkFkYDcQpo5KfgD39TnNySV26QjOh7VFpSyw==
+
+"@eslint/object-schema@^2.1.6":
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.6.tgz#58369ab5b5b3ca117880c0f6c0b0f32f6950f24f"
+  integrity sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==
+
+"@eslint/plugin-kit@^0.3.1":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.3.3.tgz#32926b59bd407d58d817941e48b2a7049359b1fd"
+  integrity sha512-1+WqvgNMhmlAambTvT3KPtCl/Ibr68VldY2XY40SL1CE0ZXiakFR/cbTspaF5HsnpDMvcYYoJHfl4980NBjGag==
+  dependencies:
+    "@eslint/core" "^0.15.1"
+    levn "^0.4.1"

 "@hapi/hoek@^9.0.0", "@hapi/hoek@^9.3.0":
  version "9.3.0"
@@ -2194,24 +2235,33 @@
  dependencies:
    "@hapi/hoek" "^9.0.0"

-"@humanwhocodes/config-array@^0.13.0":
-  version "0.13.0"
-  resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz"
-  integrity sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==
+"@humanfs/core@^0.19.1":
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.1.tgz#17c55ca7d426733fe3c561906b8173c336b40a77"
+  integrity sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==
+
+"@humanfs/node@^0.16.6":
+  version "0.16.6"
+  resolved "https://registry.yarnpkg.com/@humanfs/node/-/node-0.16.6.tgz#ee2a10eaabd1131987bf0488fd9b820174cd765e"
+  integrity sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==
  dependencies:
-    "@humanwhocodes/object-schema" "^2.0.3"
-    debug "^4.3.1"
-    minimatch "^3.0.5"
+    "@humanfs/core" "^0.19.1"
+    "@humanwhocodes/retry" "^0.3.0"

 "@humanwhocodes/module-importer@^1.0.1":
  version "1.0.1"
  resolved "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz"
  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==

-"@humanwhocodes/object-schema@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz"
-  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
+"@humanwhocodes/retry@^0.3.0":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.1.tgz#c72a5c76a9fbaf3488e231b13dc52c0da7bab42a"
+  integrity sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==
+
+"@humanwhocodes/retry@^0.4.2":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.4.3.tgz#c2b9d2e374ee62c586d3adbea87199b1d7a7a6ba"
+  integrity sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==

 "@iconify/types@^2.0.0":
  version "2.0.0"
@@ -2353,7 +2403,7 @@
  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==

-"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
+"@nodelib/fs.walk@^1.2.3":
  version "1.2.8"
  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -2361,6 +2411,11 @@
    "@nodelib/fs.scandir" "2.1.5"
    fastq "^1.6.0"

+"@pkgr/core@^0.2.4":
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.2.7.tgz#eb5014dfd0b03e7f3ba2eeeff506eed89b028058"
+  integrity sha512-YLT9Zo3oNPJoBjBc4q8G2mjU4tqIbf5CEOORbUUr48dCD9q3umJ3IPlVqOqDakPfd2HuwccBaqlGhN4Gmr5OWg==
+
 "@pnpm/config.env-replace@^1.1.0":
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz#ab29da53df41e8948a00f2433f085f54de8b3a4c"
@@ -3599,11 +3654,6 @@
  dependencies:
    "@types/node" "*"

-"@types/semver@^7.3.12":
-  version "7.5.8"
-  resolved "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz"
-  integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
-
 "@types/send@*":
  version "0.17.4"
  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a"
@@ -3674,91 +3724,105 @@
  dependencies:
    "@types/yargs-parser" "*"

-"@typescript-eslint/eslint-plugin@^5.0.0":
-  version "5.62.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz"
-  integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==
+"@typescript-eslint/eslint-plugin@8.37.0", "@typescript-eslint/eslint-plugin@^8.37.0":
+  version "8.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.37.0.tgz#332392883f936137cd6252c8eb236d298e514e70"
+  integrity sha512-jsuVWeIkb6ggzB+wPCsR4e6loj+rM72ohW6IBn2C+5NCvfUVY8s33iFPySSVXqtm5Hu29Ne/9bnA0JmyLmgenA==
  dependencies:
-    "@eslint-community/regexpp" "^4.4.0"
-    "@typescript-eslint/scope-manager" "5.62.0"
-    "@typescript-eslint/type-utils" "5.62.0"
-    "@typescript-eslint/utils" "5.62.0"
-    debug "^4.3.4"
+    "@eslint-community/regexpp" "^4.10.0"
+    "@typescript-eslint/scope-manager" "8.37.0"
+    "@typescript-eslint/type-utils" "8.37.0"
+    "@typescript-eslint/utils" "8.37.0"
+    "@typescript-eslint/visitor-keys" "8.37.0"
    graphemer "^1.4.0"
-    ignore "^5.2.0"
-    natural-compare-lite "^1.4.0"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
+    ignore "^7.0.0"
+    natural-compare "^1.4.0"
+    ts-api-utils "^2.1.0"

-"@typescript-eslint/parser@^5.0.0":
-  version "5.62.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz"
-  integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==
+"@typescript-eslint/parser@8.37.0", "@typescript-eslint/parser@^8.37.0":
+  version "8.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.37.0.tgz#b87f6b61e25ad5cc5bbf8baf809b8da889c89804"
+  integrity sha512-kVIaQE9vrN9RLCQMQ3iyRlVJpTiDUY6woHGb30JDkfJErqrQEmtdWH3gV0PBAfGZgQXoqzXOO0T3K6ioApbbAA==
  dependencies:
-    "@typescript-eslint/scope-manager" "5.62.0"
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/typescript-estree" "5.62.0"
+    "@typescript-eslint/scope-manager" "8.37.0"
+    "@typescript-eslint/types" "8.37.0"
+    "@typescript-eslint/typescript-estree" "8.37.0"
+    "@typescript-eslint/visitor-keys" "8.37.0"
    debug "^4.3.4"

-"@typescript-eslint/scope-manager@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz"
-  integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==
+"@typescript-eslint/project-service@8.37.0":
+  version "8.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.37.0.tgz#0594352e32a4ac9258591b88af77b5653800cdfe"
+  integrity sha512-BIUXYsbkl5A1aJDdYJCBAo8rCEbAvdquQ8AnLb6z5Lp1u3x5PNgSSx9A/zqYc++Xnr/0DVpls8iQ2cJs/izTXA==
  dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/visitor-keys" "5.62.0"
-
-"@typescript-eslint/type-utils@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz"
-  integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==
-  dependencies:
-    "@typescript-eslint/typescript-estree" "5.62.0"
-    "@typescript-eslint/utils" "5.62.0"
+    "@typescript-eslint/tsconfig-utils" "^8.37.0"
+    "@typescript-eslint/types" "^8.37.0"
    debug "^4.3.4"
-    tsutils "^3.21.0"

-"@typescript-eslint/types@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz"
-  integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
-
-"@typescript-eslint/typescript-estree@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz"
-  integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
+"@typescript-eslint/scope-manager@8.37.0":
+  version "8.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.37.0.tgz#a31a3c80ca2ef4ed58de13742debb692e7d4c0a4"
+  integrity sha512-0vGq0yiU1gbjKob2q691ybTg9JX6ShiVXAAfm2jGf3q0hdP6/BruaFjL/ManAR/lj05AvYCH+5bbVo0VtzmjOA==
  dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/visitor-keys" "5.62.0"
+    "@typescript-eslint/types" "8.37.0"
+    "@typescript-eslint/visitor-keys" "8.37.0"
+
+"@typescript-eslint/tsconfig-utils@8.37.0", "@typescript-eslint/tsconfig-utils@^8.37.0":
+  version "8.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.37.0.tgz#47a2760d265c6125f8e7864bc5c8537cad2bd053"
+  integrity sha512-1/YHvAVTimMM9mmlPvTec9NP4bobA1RkDbMydxG8omqwJJLEW/Iy2C4adsAESIXU3WGLXFHSZUU+C9EoFWl4Zg==
+
+"@typescript-eslint/type-utils@8.37.0":
+  version "8.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.37.0.tgz#2a682e4c6ff5886712dad57e9787b5e417124507"
+  integrity sha512-SPkXWIkVZxhgwSwVq9rqj/4VFo7MnWwVaRNznfQDc/xPYHjXnPfLWn+4L6FF1cAz6e7dsqBeMawgl7QjUMj4Ow==
+  dependencies:
+    "@typescript-eslint/types" "8.37.0"
+    "@typescript-eslint/typescript-estree" "8.37.0"
+    "@typescript-eslint/utils" "8.37.0"
    debug "^4.3.4"
-    globby "^11.1.0"
+    ts-api-utils "^2.1.0"
+
+"@typescript-eslint/types@8.37.0", "@typescript-eslint/types@^8.37.0":
+  version "8.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.37.0.tgz#09517aa9625eb3c68941dde3ac8835740587b6ff"
+  integrity sha512-ax0nv7PUF9NOVPs+lmQ7yIE7IQmAf8LGcXbMvHX5Gm+YJUYNAl340XkGnrimxZ0elXyoQJuN5sbg6C4evKA4SQ==
+
+"@typescript-eslint/typescript-estree@8.37.0":
+  version "8.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.37.0.tgz#a07e4574d8e6e4355a558f61323730c987f5fcbc"
+  integrity sha512-zuWDMDuzMRbQOM+bHyU4/slw27bAUEcKSKKs3hcv2aNnc/tvE/h7w60dwVw8vnal2Pub6RT1T7BI8tFZ1fE+yg==
+  dependencies:
+    "@typescript-eslint/project-service" "8.37.0"
+    "@typescript-eslint/tsconfig-utils" "8.37.0"
+    "@typescript-eslint/types" "8.37.0"
+    "@typescript-eslint/visitor-keys" "8.37.0"
+    debug "^4.3.4"
+    fast-glob "^3.3.2"
    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    ts-api-utils "^2.1.0"

-"@typescript-eslint/utils@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz"
-  integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
+"@typescript-eslint/utils@8.37.0":
+  version "8.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.37.0.tgz#189ea59b2709f5d898614611f091a776751ee335"
+  integrity sha512-TSFvkIW6gGjN2p6zbXo20FzCABbyUAuq6tBvNRGsKdsSQ6a7rnV6ADfZ7f4iI3lIiXc4F4WWvtUfDw9CJ9pO5A==
  dependencies:
-    "@eslint-community/eslint-utils" "^4.2.0"
-    "@types/json-schema" "^7.0.9"
-    "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.62.0"
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/typescript-estree" "5.62.0"
-    eslint-scope "^5.1.1"
-    semver "^7.3.7"
+    "@eslint-community/eslint-utils" "^4.7.0"
+    "@typescript-eslint/scope-manager" "8.37.0"
+    "@typescript-eslint/types" "8.37.0"
+    "@typescript-eslint/typescript-estree" "8.37.0"

-"@typescript-eslint/visitor-keys@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz"
-  integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==
+"@typescript-eslint/visitor-keys@8.37.0":
+  version "8.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.37.0.tgz#cdb6a6bd3e8d6dd69bd70c1bdda36e2d18737455"
+  integrity sha512-YzfhzcTnZVPiLfP/oeKtDp2evwvHLMe0LOy7oe+hb9KKIumLNohYS9Hgp1ifwpu42YWxhZE8yieggz6JpqO/1w==
  dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    eslint-visitor-keys "^3.3.0"
+    "@typescript-eslint/types" "8.37.0"
+    eslint-visitor-keys "^4.2.1"

-"@ungap/structured-clone@^1.0.0", "@ungap/structured-clone@^1.2.0":
+"@ungap/structured-clone@^1.0.0":
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.0.tgz#d06bbb384ebcf6c505fde1c3d0ed4ddffe0aaff8"
  integrity sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==
@@ -3914,11 +3978,16 @@ acorn-walk@^8.0.0:
  dependencies:
    acorn "^8.11.0"

-acorn@^8.0.0, acorn@^8.0.4, acorn@^8.11.0, acorn@^8.14.0, acorn@^8.8.2, acorn@^8.9.0:
+acorn@^8.0.0, acorn@^8.0.4, acorn@^8.11.0, acorn@^8.14.0, acorn@^8.8.2:
  version "8.14.1"
  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.1.tgz#721d5dc10f7d5b5609a891773d47731796935dfb"
  integrity sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==

+acorn@^8.15.0:
+  version "8.15.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816"
+  integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==
+
 address@^1.0.1:
  version "1.2.2"
  resolved "https://registry.yarnpkg.com/address/-/address-1.2.2.tgz#2b5248dac5485a6390532c6a517fda2e3faac89e"
@@ -4251,12 +4320,12 @@ available-typed-arrays@^1.0.7:
    possible-typed-array-names "^1.0.0"

 axios@^1.9.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.10.0.tgz#af320aee8632eaf2a400b6a1979fa75856f38d54"
-  integrity sha512-/1xYAC4MP/HEG+3duIhFr4ZQXR4sQXOIe+o6sdqzeykGLx6Upp/1p8MHqhINOvGeP7xyNHe7tsiJByc4SSVUxw==
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.11.0.tgz#c2ec219e35e414c025b2095e8b8280278478fdb6"
+  integrity sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==
  dependencies:
    follow-redirects "^1.15.6"
-    form-data "^4.0.0"
+    form-data "^4.0.4"
    proxy-from-env "^1.1.0"

 babel-loader@^9.2.1:
@@ -5006,7 +5075,7 @@ cosmiconfig@^8.1.3, cosmiconfig@^8.3.5:
    parse-json "^5.2.0"
    path-type "^4.0.0"

-cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+cross-spawn@^7.0.3, cross-spawn@^7.0.6:
  version "7.0.6"
  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
@@ -5704,13 +5773,6 @@ doctrine@^2.1.0:
  dependencies:
    esutils "^2.0.2"

-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
 docusaurus-plugin-less@^2.0.2:
  version "2.0.2"
  resolved "https://registry.npmjs.org/docusaurus-plugin-less/-/docusaurus-plugin-less-2.0.2.tgz"
@@ -6104,12 +6166,13 @@ eslint-config-prettier@^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-plugin-prettier@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz"
-  integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==
+eslint-plugin-prettier@^5.5.1:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.1.tgz#470820964de9aedb37e9ce62c3266d2d26d08d15"
+  integrity sha512-dobTkHT6XaEVOo8IO90Q4DOSxnm3Y151QxPJlM/vKC0bVy+d6cVWQZLlFiuZPP0wS6vZwSKeJgKkcS+KfMBlRw==
  dependencies:
    prettier-linter-helpers "^1.0.0"
+    synckit "^0.11.7"

 eslint-plugin-react@^7.37.5:
  version "7.37.5"
@@ -6135,7 +6198,7 @@ eslint-plugin-react@^7.37.5:
    string.prototype.matchall "^4.0.12"
    string.prototype.repeat "^1.0.0"

-eslint-scope@5.1.1, eslint-scope@^5.1.1:
+eslint-scope@5.1.1:
  version "5.1.1"
  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -6143,80 +6206,82 @@ eslint-scope@5.1.1, eslint-scope@^5.1.1:
    esrecurse "^4.3.0"
    estraverse "^4.1.1"

-eslint-scope@^7.2.2:
-  version "7.2.2"
-  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz"
-  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
+eslint-scope@^8.4.0:
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.4.0.tgz#88e646a207fad61436ffa39eb505147200655c82"
+  integrity sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==
  dependencies:
    esrecurse "^4.3.0"
    estraverse "^5.2.0"

-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+eslint-visitor-keys@^3.4.3:
  version "3.4.3"
  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz"
  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==

-eslint@^8.0.0:
-  version "8.57.1"
-  resolved "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz"
-  integrity sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==
+eslint-visitor-keys@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz#4cfea60fe7dd0ad8e816e1ed026c1d5251b512c1"
+  integrity sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==
+
+eslint@^9.31.0:
+  version "9.31.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.31.0.tgz#9a488e6da75bbe05785cd62e43c5ea99356d21ba"
+  integrity sha512-QldCVh/ztyKJJZLr4jXNUByx3gR+TDYZCRXEktiZoUR3PGy4qCmSbkxcIle8GEwGpb5JBZazlaJ/CxLidXdEbQ==
  dependencies:
    "@eslint-community/eslint-utils" "^4.2.0"
-    "@eslint-community/regexpp" "^4.6.1"
-    "@eslint/eslintrc" "^2.1.4"
-    "@eslint/js" "8.57.1"
-    "@humanwhocodes/config-array" "^0.13.0"
+    "@eslint-community/regexpp" "^4.12.1"
+    "@eslint/config-array" "^0.21.0"
+    "@eslint/config-helpers" "^0.3.0"
+    "@eslint/core" "^0.15.0"
+    "@eslint/eslintrc" "^3.3.1"
+    "@eslint/js" "9.31.0"
+    "@eslint/plugin-kit" "^0.3.1"
+    "@humanfs/node" "^0.16.6"
    "@humanwhocodes/module-importer" "^1.0.1"
-    "@nodelib/fs.walk" "^1.2.8"
-    "@ungap/structured-clone" "^1.2.0"
+    "@humanwhocodes/retry" "^0.4.2"
+    "@types/estree" "^1.0.6"
+    "@types/json-schema" "^7.0.15"
    ajv "^6.12.4"
    chalk "^4.0.0"
-    cross-spawn "^7.0.2"
+    cross-spawn "^7.0.6"
    debug "^4.3.2"
-    doctrine "^3.0.0"
    escape-string-regexp "^4.0.0"
-    eslint-scope "^7.2.2"
-    eslint-visitor-keys "^3.4.3"
-    espree "^9.6.1"
-    esquery "^1.4.2"
+    eslint-scope "^8.4.0"
+    eslint-visitor-keys "^4.2.1"
+    espree "^10.4.0"
+    esquery "^1.5.0"
    esutils "^2.0.2"
    fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
+    file-entry-cache "^8.0.0"
    find-up "^5.0.0"
    glob-parent "^6.0.2"
-    globals "^13.19.0"
-    graphemer "^1.4.0"
    ignore "^5.2.0"
    imurmurhash "^0.1.4"
    is-glob "^4.0.0"
-    is-path-inside "^3.0.3"
-    js-yaml "^4.1.0"
    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
    lodash.merge "^4.6.2"
    minimatch "^3.1.2"
    natural-compare "^1.4.0"
    optionator "^0.9.3"
-    strip-ansi "^6.0.1"
-    text-table "^0.2.0"

-espree@^9.6.0, espree@^9.6.1:
-  version "9.6.1"
-  resolved "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz"
-  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
+espree@^10.0.1, espree@^10.4.0:
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-10.4.0.tgz#d54f4949d4629005a1fa168d937c3ff1f7e2a837"
+  integrity sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==
  dependencies:
-    acorn "^8.9.0"
+    acorn "^8.15.0"
    acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.4.1"
+    eslint-visitor-keys "^4.2.1"

 esprima@^4.0.0:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==

-esquery@^1.4.2:
+esquery@^1.5.0:
  version "1.6.0"
-  resolved "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
  integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
  dependencies:
    estraverse "^5.1.0"
@@ -6411,7 +6476,7 @@ fast-diff@^1.1.2:
  resolved "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz"
  integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==

-fast-glob@^3.2.11, fast-glob@^3.2.9, fast-glob@^3.3.0:
+fast-glob@^3.2.11, fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.2:
  version "3.3.3"
  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.3.tgz#d06d585ce8dba90a16b0505c543c3ccfb3aeb818"
  integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==
@@ -6484,12 +6549,12 @@ figures@^3.2.0:
  dependencies:
    escape-string-regexp "^1.0.5"

-file-entry-cache@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"
-  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+file-entry-cache@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f"
+  integrity sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==
  dependencies:
-    flat-cache "^3.0.4"
+    flat-cache "^4.0.0"

 file-loader@^6.2.0:
  version "6.2.0"
@@ -6548,14 +6613,13 @@ find-up@^6.3.0:
    locate-path "^7.1.0"
    path-exists "^5.0.0"

-flat-cache@^3.0.4:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz"
-  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
+flat-cache@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz#0ece39fcb14ee012f4b0410bd33dd9c1f011127c"
+  integrity sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==
  dependencies:
    flatted "^3.2.9"
-    keyv "^4.5.3"
-    rimraf "^3.0.2"
+    keyv "^4.5.4"

 flat@^5.0.2:
  version "5.0.2"
@@ -6589,13 +6653,15 @@ form-data-encoder@^2.1.2:
  resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-2.1.4.tgz#261ea35d2a70d48d30ec7a9603130fa5515e9cd5"
  integrity sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==

-form-data@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz"
-  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+form-data@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4"
+  integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==
  dependencies:
    asynckit "^0.4.0"
    combined-stream "^1.0.8"
+    es-set-tostringtag "^2.1.0"
+    hasown "^2.0.2"
    mime-types "^2.1.12"

 format@^0.2.0:
@@ -6781,18 +6847,21 @@ globals@^11.1.0:
  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==

-globals@^13.19.0:
-  version "13.24.0"
-  resolved "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz"
-  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
-  dependencies:
-    type-fest "^0.20.2"
+globals@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
+  integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==

 globals@^15.14.0:
  version "15.15.0"
  resolved "https://registry.yarnpkg.com/globals/-/globals-15.15.0.tgz#7c4761299d41c32b075715a4ce1ede7897ff72a8"
  integrity sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==

+globals@^16.3.0:
+  version "16.3.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-16.3.0.tgz#66118e765ddaf9e2d880f7e17658543f93f1f667"
+  integrity sha512-bqWEnJ1Nt3neqx2q5SFfGS8r/ahumIakg3HcwtNlrVlwXIeNumWn/c7Pn/wKzGhf6SaW6H6uWXLqC30STCMchQ==
+
 globalthis@^1.0.4:
  version "1.0.4"
  resolved "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz"
@@ -7285,6 +7354,11 @@ ignore@^5.2.0, ignore@^5.2.4:
  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
  integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==

+ignore@^7.0.0:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-7.0.5.tgz#4cb5f6cd7d4c7ab0365738c7aea888baa6d7efd9"
+  integrity sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==
+
 image-size@^2.0.2:
  version "2.0.2"
  resolved "https://registry.yarnpkg.com/image-size/-/image-size-2.0.2.tgz#84a7b43704db5736f364bf0d1b029821299b4bdc"
@@ -7619,7 +7693,7 @@ is-obj@^2.0.0:
  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
  integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==

-is-path-inside@^3.0.2, is-path-inside@^3.0.3:
+is-path-inside@^3.0.2:
  version "3.0.3"
  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
@@ -7921,7 +7995,7 @@ katex@^0.16.9:
  dependencies:
    commander "^8.3.0"

-keyv@^4.5.3:
+keyv@^4.5.3, keyv@^4.5.4:
  version "4.5.4"
  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
@@ -8949,7 +9023,7 @@ minimalistic-assert@^1.0.0:
  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==

-minimatch@3.1.2, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@3.1.2, minimatch@^3.1.1, minimatch@^3.1.2:
  version "3.1.2"
  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -8963,6 +9037,13 @@ minimatch@^7.4.3:
  dependencies:
    brace-expansion "^2.0.1"

+minimatch@^9.0.4:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
+  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist@^1.2.0:
  version "1.2.8"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
@@ -9011,11 +9092,6 @@ nanoid@^3.3.11, nanoid@^3.3.8:
  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
  integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==

-natural-compare-lite@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz"
-  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
-
 natural-compare@^1.4.0:
  version "1.4.0"
  resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
@@ -10165,10 +10241,10 @@ prettier-linter-helpers@^1.0.0:
  dependencies:
    fast-diff "^1.1.2"

-prettier@^2.0.0:
-  version "2.8.8"
-  resolved "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz"
-  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
+prettier@^3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.6.2.tgz#ccda02a1003ebbb2bfda6f83a074978f608b9393"
+  integrity sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==

 pretty-error@^4.0.0:
  version "4.0.0"
@@ -11438,6 +11514,11 @@ semver@^7.3.5, semver@^7.3.7, semver@^7.5.4:
  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.1.tgz#abd5098d82b18c6c81f6074ff2647fd3e7220c9f"
  integrity sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==

+semver@^7.6.0:
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
+  integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
+
 send@0.19.0:
  version "0.19.0"
  resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
@@ -12058,6 +12139,13 @@ swagger-ui-react@^5.26.0:
    xml-but-prettier "^1.0.1"
    zenscroll "^4.0.2"

+synckit@^0.11.7:
+  version "0.11.8"
+  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.11.8.tgz#b2aaae998a4ef47ded60773ad06e7cb821f55457"
+  integrity sha512-+XZ+r1XGIJGeQk3VvXhT6xx/VpbHsRzsTkGgF6E5RX9TTXD0118l87puaEBZ566FhqblC6U0d4XnubznJDm30A==
+  dependencies:
+    "@pkgr/core" "^0.2.4"
+
 tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1:
  version "2.2.1"
  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
@@ -12084,11 +12172,6 @@ terser@^5.10.0, terser@^5.15.1, terser@^5.31.1:
    commander "^2.20.0"
    source-map-support "~0.5.20"

-text-table@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
-
 throttle-debounce@^5.0.0, throttle-debounce@^5.0.2:
  version "5.0.2"
  resolved "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-5.0.2.tgz"
@@ -12180,6 +12263,11 @@ trough@^2.0.0:
  resolved "https://registry.yarnpkg.com/trough/-/trough-2.2.0.tgz#94a60bd6bd375c152c1df911a4b11d5b0256f50f"
  integrity sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==

+ts-api-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.1.0.tgz#595f7094e46eed364c13fd23e75f9513d29baf91"
+  integrity sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==
+
 ts-dedent@^2.2.0:
  version "2.2.0"
  resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-2.2.0.tgz#39e4bd297cd036292ae2394eb3412be63f563bb5"
@@ -12195,23 +12283,11 @@ ts-toolbelt@^9.6.0:
  resolved "https://registry.npmjs.org/ts-toolbelt/-/ts-toolbelt-9.6.0.tgz"
  integrity sha512-nsZd8ZeNUzukXPlJmTBwUAuABDe/9qtVDelJeT/qW0ow3ZS3BsQJtNkan1802aM9Uf68/Y8ljw86Hu0h5IUW3w==

-tslib@^1.8.1:
-  version "1.14.1"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
 tslib@^2.0.3, tslib@^2.3.0, tslib@^2.6.0:
  version "2.8.1"
  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
  integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==

-tsutils@^3.21.0:
-  version "3.21.0"
-  resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"
-  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
-  dependencies:
-    tslib "^1.8.1"
-
 type-check@^0.4.0, type-check@~0.4.0:
  version "0.4.0"
  resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"
@@ -12306,6 +12382,16 @@ types-ramda@^0.30.0:
  dependencies:
    ts-toolbelt "^9.6.0"

+typescript-eslint@^8.37.0:
+  version "8.37.0"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.37.0.tgz#2235ddfa40cdbdadb1afb05f8bda688a2294b4c2"
+  integrity sha512-TnbEjzkE9EmcO0Q2zM+GE8NQLItNAJpMmED1BdgoBMYNdqMhzlbqfdSwiRlAzEK2pA9UzVW0gzaaIzXWg2BjfA==
+  dependencies:
+    "@typescript-eslint/eslint-plugin" "8.37.0"
+    "@typescript-eslint/parser" "8.37.0"
+    "@typescript-eslint/typescript-estree" "8.37.0"
+    "@typescript-eslint/utils" "8.37.0"
+
 typescript@~5.8.3:
  version "5.8.3"
  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.3.tgz#92f8a3e5e3cf497356f4178c34cd65a7f5e8440e"
--- a/helm/superset/Chart.yaml
+++ b/helm/superset/Chart.yaml
@@ -29,7 +29,7 @@ maintainers:
  - name: craig-rueda
    email: craig@craigrueda.com
    url: https://github.com/craig-rueda
-version: 0.14.2
+version: 0.14.3
 dependencies:
  - name: postgresql
    version: 13.4.4
--- a/helm/superset/README.md
+++ b/helm/superset/README.md
@@ -23,7 +23,7 @@ NOTE: This file is generated by helm-docs: https://github.com/norwoodj/helm-docs

 # superset

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

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

--- a/helm/superset/templates/init-job.yaml
+++ b/helm/superset/templates/init-job.yaml
@@ -28,9 +28,9 @@ metadata:
    chart: {{ template "superset.chart" . }}
    release: {{ .Release.Name }}
    heritage: {{ .Release.Service }}
-  {{- if .Values.extraLabels }}
-    {{- toYaml .Values.extraLabels | nindent 4 }}
-  {{- end }}
+    {{- if .Values.extraLabels }}
+      {{- toYaml .Values.extraLabels | nindent 4 }}
+    {{- end }}
  {{- if .Values.init.jobAnnotations }}
  annotations: {{- toYaml .Values.init.jobAnnotations | nindent 4 }}
  {{- end }}
@@ -44,10 +44,10 @@ spec:
      {{- if or .Values.extraLabels .Values.init.podLabels }}
      labels:
        {{- if .Values.extraLabels }}
-        {{- toYaml .Values.extraLabels | nindent 8 }}
+          {{- toYaml .Values.extraLabels | nindent 8 }}
        {{- end }}
        {{- if .Values.init.podLabels }}
-        {{- toYaml .Values.init.podLabels | nindent 8 }}
+          {{- toYaml .Values.init.podLabels | nindent 8 }}
        {{- end }}
      {{- end }}
    spec:
--- a/helm/superset/templates/pdb-beat.yaml
+++ b/helm/superset/templates/pdb-beat.yaml
@@ -20,7 +20,7 @@
 {{- with .Values.supersetCeleryBeat.podDisruptionBudget }}
 {{- if .enabled -}}
 {{- if and .minAvailable .maxUnavailable }}
-{{- fail "Only one of minAvailable or maxUnavailable should be set" }}
+  {{- fail "Only one of minAvailable or maxUnavailable should be set" }}
 {{- end}}
 apiVersion: policy/v1
 kind: PodDisruptionBudget
@@ -35,12 +35,12 @@ metadata:
      {{- toYaml $.Values.extraLabels | nindent 4 }}
    {{- end }}
 spec:
-{{- if .minAvailable }}
+  {{- if .minAvailable }}
  minAvailable: {{ .minAvailable }}
-{{- end }}
-{{- if .maxUnavailable }}
+  {{- end }}
+  {{- if .maxUnavailable }}
  maxUnavailable: {{ .maxUnavailable }}
-{{- end }}
+  {{- end }}
  selector:
    matchLabels:
    {{- include "supersetCeleryBeat.selectorLabels" $ | nindent 6 }}
--- a/helm/superset/templates/pdb-flower.yaml
+++ b/helm/superset/templates/pdb-flower.yaml
@@ -20,7 +20,7 @@
 {{- with .Values.supersetCeleryFlower.podDisruptionBudget }}
 {{- if .enabled -}}
 {{- if and .minAvailable .maxUnavailable }}
-{{- fail "Only one of minAvailable or maxUnavailable should be set" }}
+  {{- fail "Only one of minAvailable or maxUnavailable should be set" }}
 {{- end}}
 apiVersion: policy/v1
 kind: PodDisruptionBudget
@@ -35,12 +35,12 @@ metadata:
      {{- toYaml $.Values.extraLabels | nindent 4 }}
    {{- end }}
 spec:
-{{- if .minAvailable }}
+  {{- if .minAvailable }}
  minAvailable: {{ .minAvailable }}
-{{- end }}
-{{- if .maxUnavailable }}
+  {{- end }}
+  {{- if .maxUnavailable }}
  maxUnavailable: {{ .maxUnavailable }}
-{{- end }}
+  {{- end }}
  selector:
    matchLabels:
    {{- include "supersetCeleryFlower.selectorLabels" $ | nindent 6 }}
--- a/helm/superset/templates/pdb-worker.yaml
+++ b/helm/superset/templates/pdb-worker.yaml
@@ -20,7 +20,7 @@
 {{- with .Values.supersetWorker.podDisruptionBudget }}
 {{- if .enabled -}}
 {{- if and .minAvailable .maxUnavailable }}
-{{- fail "Only one of minAvailable or maxUnavailable should be set" }}
+  {{- fail "Only one of minAvailable or maxUnavailable should be set" }}
 {{- end}}
 apiVersion: policy/v1
 kind: PodDisruptionBudget
@@ -35,12 +35,12 @@ metadata:
      {{- toYaml $.Values.extraLabels | nindent 4 }}
    {{- end }}
 spec:
-{{- if .minAvailable }}
+  {{- if .minAvailable }}
  minAvailable: {{ .minAvailable }}
-{{- end }}
-{{- if .maxUnavailable }}
+  {{- end }}
+  {{- if .maxUnavailable }}
  maxUnavailable: {{ .maxUnavailable }}
-{{- end }}
+  {{- end }}
  selector:
    matchLabels:
    {{- include "supersetWorker.selectorLabels" $ | nindent 6 }}
--- a/helm/superset/templates/pdb-ws.yaml
+++ b/helm/superset/templates/pdb-ws.yaml
@@ -20,7 +20,7 @@
 {{- with .Values.supersetWebsockets.podDisruptionBudget }}
 {{- if .enabled -}}
 {{- if and .minAvailable .maxUnavailable }}
-{{- fail "Only one of minAvailable or maxUnavailable should be set" }}
+  {{- fail "Only one of minAvailable or maxUnavailable should be set" }}
 {{- end}}
 apiVersion: policy/v1
 kind: PodDisruptionBudget
@@ -35,12 +35,12 @@ metadata:
      {{- toYaml $.Values.extraLabels | nindent 4 }}
    {{- end }}
 spec:
-{{- if .minAvailable }}
+  {{- if .minAvailable }}
  minAvailable: {{ .minAvailable }}
-{{- end }}
-{{- if .maxUnavailable }}
+  {{- end }}
+  {{- if .maxUnavailable }}
  maxUnavailable: {{ .maxUnavailable }}
-{{- end }}
+  {{- end }}
  selector:
    matchLabels:
    {{- include "supersetWebsockets.selectorLabels" $ | nindent 6 }}
--- a/helm/superset/templates/pdb.yaml
+++ b/helm/superset/templates/pdb.yaml
@@ -20,7 +20,7 @@
 {{- with .Values.supersetNode.podDisruptionBudget }}
 {{- if .enabled -}}
 {{- if and .minAvailable .maxUnavailable }}
-{{- fail "Only one of minAvailable or maxUnavailable should be set" }}
+  {{- fail "Only one of minAvailable or maxUnavailable should be set" }}
 {{- end}}
 apiVersion: policy/v1
 kind: PodDisruptionBudget
@@ -35,12 +35,12 @@ metadata:
      {{- toYaml $.Values.extraLabels | nindent 4 }}
    {{- end }}
 spec:
-{{- if .minAvailable }}
+  {{- if .minAvailable }}
  minAvailable: {{ .minAvailable }}
-{{- end }}
-{{- if .maxUnavailable }}
+  {{- end }}
+  {{- if .maxUnavailable }}
  maxUnavailable: {{ .maxUnavailable }}
-{{- end }}
+  {{- end }}
  selector:
    matchLabels:
    {{- include "supersetNode.selectorLabels" $ | nindent 6 }}
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -95,7 +95,7 @@ dependencies = [
    "slack_sdk>=3.19.0, <4",
    "sqlalchemy>=1.4, <2",
    "sqlalchemy-utils>=0.38.3, <0.39",
-    "sqlglot>=26.1.3, <27",
+    "sqlglot>=27.3.0, <28",
    # newer pandas needs 0.9+
    "tabulate>=0.9.0, <1.0",
    "typing-extensions>=4, <5",
@@ -311,15 +311,16 @@ select = [
    "Q",
    "S",
    "T",
+    "TID",
    "W",
 ]
+
 ignore = [
    "S101",
    "PT006",
    "T201",
    "N999",
 ]
-
 extend-select = ["I"]

 # Allow fix for all enabled rules (when `--fix`) is provided.
@@ -329,6 +330,16 @@ unfixable = []
 # Allow unused variables when underscore-prefixed.
 dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"

+[tool.ruff.lint.per-file-ignores]
+"scripts/*" = ["TID251"]
+"setup.py" = ["TID251"]
+"superset/config.py" = ["TID251"]
+"superset/cli/update.py" = ["TID251"]
+"superset/key_value/types.py" = ["TID251"]
+"superset/translations/utils.py" = ["TID251"]
+"superset/extensions/__init__.py" = ["TID251"]
+"superset/utils/json.py" = ["TID251"]
+
 [tool.ruff.lint.isort]
 case-sensitive = false
 combine-as-imports = true
@@ -345,6 +356,9 @@ section-order = [
    "local-folder"
 ]

+[tool.ruff.lint.flake8-tidy-imports]
+banned-api = { json = { msg = "Use superset.utils.json instead" }, simplejson = { msg = "Use superset.utils.json instead" } }
+
 [tool.ruff.format]
 # Like Black, use double quotes for strings.
 quote-style = "double"
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -11,7 +11,9 @@ apispec==6.6.1
 apsw==3.50.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
@@ -97,6 +99,11 @@ email-validator==2.2.0
    # via flask-appbuilder
 et-xmlfile==2.0.0
    # via openpyxl
+exceptiongroup==1.3.0
+    # via
+    #   cattrs
+    #   trio
+    #   trio-websocket
 flask==2.3.3
    # via
    #   apache-superset (pyproject.toml)
@@ -154,6 +161,7 @@ greenlet==3.1.1
    # via
    #   apache-superset (pyproject.toml)
    #   shillelagh
+    #   sqlalchemy
 gunicorn==23.0.0
    # via apache-superset (pyproject.toml)
 h11==0.16.0
@@ -310,7 +318,7 @@ python-dateutil==2.9.0.post0
    #   holidays
    #   pandas
    #   shillelagh
-python-dotenv==1.1.0
+python-dotenv==1.1.1
    # via apache-superset (pyproject.toml)
 python-geohash==0.8.5
    # via apache-superset (pyproject.toml)
@@ -378,7 +386,7 @@ sqlalchemy-utils==0.38.3
    # via
    #   apache-superset (pyproject.toml)
    #   flask-appbuilder
-sqlglot==26.28.1
+sqlglot==27.3.0
    # via apache-superset (pyproject.toml)
 sshtunnel==0.4.0
    # via apache-superset (pyproject.toml)
@@ -395,9 +403,11 @@ typing-extensions==4.14.0
    #   apache-superset (pyproject.toml)
    #   alembic
    #   cattrs
+    #   exceptiongroup
    #   limits
    #   pyopenssl
    #   referencing
+    #   rich
    #   selenium
    #   shillelagh
 tzdata==2025.2
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -20,6 +20,10 @@ apsw==3.50.1.0
    #   shillelagh
 astroid==3.3.10
    # via pylint
+async-timeout==4.0.3
+    # via
+    #   -c requirements/base.txt
+    #   redis
 attrs==25.3.0
    # via
    #   -c requirements/base.txt
@@ -176,6 +180,13 @@ et-xmlfile==2.0.0
    # via
    #   -c requirements/base.txt
    #   openpyxl
+exceptiongroup==1.3.0
+    # via
+    #   -c requirements/base.txt
+    #   cattrs
+    #   pytest
+    #   trio
+    #   trio-websocket
 filelock==3.12.2
    # via virtualenv
 flask==2.3.3
@@ -313,6 +324,7 @@ greenlet==3.1.1
    #   apache-superset
    #   gevent
    #   shillelagh
+    #   sqlalchemy
 grpcio==1.71.0
    # via
    #   apache-superset
@@ -670,7 +682,7 @@ python-dateutil==2.9.0.post0
    #   pyhive
    #   shillelagh
    #   trino
-python-dotenv==1.1.0
+python-dotenv==1.1.1
    # via
    #   -c requirements/base.txt
    #   apache-superset
@@ -802,7 +814,7 @@ sqlalchemy-utils==0.38.3
    #   -c requirements/base.txt
    #   apache-superset
    #   flask-appbuilder
-sqlglot==26.28.1
+sqlglot==27.3.0
    # via
    #   -c requirements/base.txt
    #   apache-superset
@@ -818,6 +830,11 @@ tabulate==0.9.0
    # via
    #   -c requirements/base.txt
    #   apache-superset
+tomli==2.2.1
+    # via
+    #   coverage
+    #   pylint
+    #   pytest
 tomlkit==0.13.3
    # via pylint
 tqdm==4.67.1
@@ -840,10 +857,13 @@ typing-extensions==4.14.0
    #   -c requirements/base.txt
    #   alembic
    #   apache-superset
+    #   astroid
    #   cattrs
+    #   exceptiongroup
    #   limits
    #   pyopenssl
    #   referencing
+    #   rich
    #   selenium
    #   shillelagh
 tzdata==2025.2
--- a/scripts/check-type.js
+++ b/scripts/check-type.js
@@ -32,6 +32,10 @@ const PACKAGE_ARG_REGEX = /^package=/;
 const EXCLUDE_DECLARATION_DIR_REGEX = /^excludeDeclarationDir=/;
 const DECLARATION_FILE_REGEX = /\.d\.ts$/;

+// Configuration for batching and fallback
+const MAX_FILES_FOR_TARGETED_CHECK = 20; // Fallback to full check if more files
+const BATCH_SIZE = 10; // Process files in batches of this size
+
 void (async () => {
  const args = process.argv.slice(2);
  const {
@@ -45,27 +49,94 @@ void (async () => {
  }

  const packageRootDir = await getPackage(packageArg);
-  const updatedArgs = removePackageSegment(remainingArgs, packageRootDir);
-  const argsStr = updatedArgs.join(" ");
+  const changedFiles = removePackageSegment(remainingArgs, packageRootDir);

-  const excludedDeclarationDirs = getExcludedDeclarationDirs(
-    excludeDeclarationDirArg
+  // Filter to only TypeScript files
+  const tsFiles = changedFiles.filter(file =>
+    /\.(ts|tsx)$/.test(file) && !DECLARATION_FILE_REGEX.test(file)
  );
+
+  console.log(`Type checking ${tsFiles.length} changed TypeScript files...`);
+
+  if (tsFiles.length === 0) {
+    console.log("No TypeScript files to check.");
+    exit(0);
+  }
+
+  // Decide strategy based on number of files
+  if (tsFiles.length > MAX_FILES_FOR_TARGETED_CHECK) {
+    console.log(`Too many files (${tsFiles.length} > ${MAX_FILES_FOR_TARGETED_CHECK}), running full type check...`);
+    await runFullTypeCheck(packageRootDir, excludeDeclarationDirArg);
+  } else {
+    console.log(`Running targeted type check on ${tsFiles.length} files...`);
+    await runTargetedTypeCheck(packageRootDir, tsFiles, excludeDeclarationDirArg);
+  }
+})();
+
+/**
+ * Run full type check on the entire project
+ */
+async function runFullTypeCheck(packageRootDir, excludeDeclarationDirArg) {
+  const packageRootDirAbsolute = join(SUPERSET_ROOT, packageRootDir);
+  const tsConfig = getTsConfig(packageRootDirAbsolute);
+  // Use incremental compilation for better caching
+  const command = `--noEmit --allowJs --incremental --project ${tsConfig}`;
+
+  await executeTypeCheck(packageRootDirAbsolute, command);
+}
+
+/**
+ * Run targeted type check on specific files, with batching
+ */
+async function runTargetedTypeCheck(packageRootDir, tsFiles, excludeDeclarationDirArg) {
+  const excludedDeclarationDirs = getExcludedDeclarationDirs(excludeDeclarationDirArg);
  let declarationFiles = await getFilesRecursively(
-    packageRootDir,
+    join(SUPERSET_ROOT, packageRootDir),
    DECLARATION_FILE_REGEX,
    excludedDeclarationDirs
  );
  declarationFiles = removePackageSegment(declarationFiles, packageRootDir);
-  const declarationFilesStr = declarationFiles.join(" ");

  const packageRootDirAbsolute = join(SUPERSET_ROOT, packageRootDir);
  const tsConfig = getTsConfig(packageRootDirAbsolute);
-  const command = `--noEmit --allowJs --composite false --project ${tsConfig} ${argsStr} ${declarationFilesStr}`;

+  // Process files in batches to avoid command line length limits
+  const batches = [];
+  for (let i = 0; i < tsFiles.length; i += BATCH_SIZE) {
+    batches.push(tsFiles.slice(i, i + BATCH_SIZE));
+  }
+
+  let hasErrors = false;
+
+  for (const [batchIndex, batch] of batches.entries()) {
+    if (batches.length > 1) {
+      console.log(`\nProcessing batch ${batchIndex + 1}/${batches.length} (${batch.length} files)...`);
+    }
+
+    const argsStr = batch.join(" ");
+    const declarationFilesStr = declarationFiles.join(" ");
+    // For targeted checks, keep composite false since we're passing specific files
+    const command = `--noEmit --allowJs --composite false --project ${tsConfig} ${argsStr} ${declarationFilesStr}`;
+
+    try {
+      await executeTypeCheck(packageRootDirAbsolute, command);
+    } catch (error) {
+      hasErrors = true;
+      // Continue processing other batches to show all errors
+    }
+  }
+
+  if (hasErrors) {
+    exit(1);
+  }
+}
+
+/**
+ * Execute the TypeScript type check command
+ */
+async function executeTypeCheck(packageRootDirAbsolute, command) {
  try {
    chdir(packageRootDirAbsolute);
-    // Please ensure that tscw-config is installed in the package being type-checked.
    const tscw = packageRequire("tscw-config");
    const child = await tscw`${command}`;

@@ -77,14 +148,16 @@ void (async () => {
      console.error(child.stderr);
    }

-    exit(child.exitCode);
+    if (child.exitCode !== 0) {
+      throw new Error(`Type check failed with exit code ${child.exitCode}`);
+    }
  } catch (e) {
-    console.error("Failed to execute type checking:", e);
-    console.error("Package:", packageRootDir);
+    console.error("Failed to execute type checking:", e.message);
    console.error("Command:", `tscw ${command}`);
-    exit(1);
+    throw e;
  }
-})();
+}
+

 /**
 *
@@ -112,7 +185,6 @@ function shouldExcludeDir(fullPath, excludedDirs) {
 *
 * @returns {Promise<string[]>}
 */
-
 async function getFilesRecursively(dir, regex, excludedDirs) {
  try {
    const files = await readdir(dir, { withFileTypes: true });
@@ -186,7 +258,6 @@ function getExcludedDeclarationDirs(excludeDeclarationDirArg) {
 * @param {RegExp[]} regexes
 * @returns {{ matchedArgs: (string | undefined)[], remainingArgs: string[] }}
 */
-
 function extractArgs(args, regexes) {
  /**
   * @type {(string | undefined)[]}
--- a/superset-embedded-sdk/package-lock.json
+++ b/superset-embedded-sdk/package-lock.json
@@ -3251,20 +3251,6 @@
        "proxy-from-env": "^1.1.0"
      }
    },
-    "node_modules/axios/node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
    "node_modules/babel-jest": {
      "version": "29.7.0",
      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
@@ -3658,6 +3644,19 @@
      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
      "dev": true
    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
    "node_modules/callsites": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -4064,6 +4063,20 @@
        "node": ">=8"
      }
    },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "dev": true,
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
    "node_modules/electron-to-chromium": {
      "version": "1.5.19",
      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.19.tgz",
@@ -4124,12 +4137,57 @@
        "is-arrayish": "^0.2.1"
      }
    },
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
    "node_modules/es-module-lexer": {
      "version": "1.5.4",
      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
      "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
      "dev": true
    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
    "node_modules/escalade": {
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
@@ -4590,6 +4648,22 @@
        }
      }
    },
+    "node_modules/form-data": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
    "node_modules/fs-readdir-recursive": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
@@ -4617,10 +4691,13 @@
      }
    },
    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
    },
    "node_modules/gensync": {
      "version": "1.0.0-beta.2",
@@ -4640,6 +4717,30 @@
        "node": "6.* || 8.* || >= 10.*"
      }
    },
+    "node_modules/get-intrinsic": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
    "node_modules/get-package-type": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
@@ -4649,6 +4750,19 @@
        "node": ">=8.0.0"
      }
    },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "dev": true,
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
    "node_modules/get-stream": {
      "version": "6.0.1",
      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
@@ -4711,6 +4825,18 @@
        "node": ">=4"
      }
    },
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
    "node_modules/graceful-fs": {
      "version": "4.2.11",
      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
@@ -4739,6 +4865,45 @@
        "node": ">=4"
      }
    },
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
    "node_modules/html-escaper": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
@@ -6927,6 +7092,15 @@
        "tmpl": "1.0.5"
      }
    },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
    "node_modules/merge-stream": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -10565,19 +10739,6 @@
        "follow-redirects": "^1.15.6",
        "form-data": "^4.0.0",
        "proxy-from-env": "^1.1.0"
-      },
-      "dependencies": {
-        "form-data": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-          "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-          "dev": true,
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.8",
-            "mime-types": "^2.1.12"
-          }
-        }
      }
    },
    "babel-jest": {
@@ -10862,6 +11023,16 @@
      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
      "dev": true
    },
+    "call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "dev": true,
+      "requires": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      }
+    },
    "callsites": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -11140,6 +11311,17 @@
      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
      "dev": true
    },
+    "dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "dev": true,
+      "requires": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      }
+    },
    "electron-to-chromium": {
      "version": "1.5.19",
      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.19.tgz",
@@ -11183,12 +11365,45 @@
        "is-arrayish": "^0.2.1"
      }
    },
+    "es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "dev": true
+    },
+    "es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true
+    },
    "es-module-lexer": {
      "version": "1.5.4",
      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
      "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
      "dev": true
    },
+    "es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "dev": true,
+      "requires": {
+        "es-errors": "^1.3.0"
+      }
+    },
+    "es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "dev": true,
+      "requires": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      }
+    },
    "escalade": {
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
@@ -11503,6 +11718,19 @@
      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
      "dev": true
    },
+    "form-data": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
+      "dev": true,
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
+        "mime-types": "^2.1.12"
+      }
+    },
    "fs-readdir-recursive": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
@@ -11523,9 +11751,9 @@
      "optional": true
    },
    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
      "dev": true
    },
    "gensync": {
@@ -11540,12 +11768,40 @@
      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
      "dev": true
    },
+    "get-intrinsic": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "dev": true,
+      "requires": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      }
+    },
    "get-package-type": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
      "dev": true
    },
+    "get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "dev": true,
+      "requires": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      }
+    },
    "get-stream": {
      "version": "6.0.1",
      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
@@ -11588,6 +11844,12 @@
      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
      "dev": true
    },
+    "gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "dev": true
+    },
    "graceful-fs": {
      "version": "4.2.11",
      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
@@ -11609,6 +11871,30 @@
      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
      "dev": true
    },
+    "has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "dev": true
+    },
+    "has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.3"
+      }
+    },
+    "hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.2"
+      }
+    },
    "html-escaper": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
@@ -13219,6 +13505,12 @@
        "tmpl": "1.0.5"
      }
    },
+    "math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "dev": true
+    },
    "merge-stream": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
--- a/superset-frontend/cypress-base/cypress/e2e/dashboard/drillby.test.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/dashboard/drillby.test.ts
@@ -54,7 +54,7 @@ const drillBy = (targetDrillByColumn: string, isLegacy = false) => {
    interceptV1ChartData();
  }

-  cy.get('.ant-dropdown:not(.ant-dropdown-hidden)')
+  cy.get('.ant-dropdown:not(.ant-dropdown-hidden)', { timeout: 15000 })
    .should('be.visible')
    .find("[role='menu'] [role='menuitem']")
    .contains(/^Drill by$/)
@@ -529,7 +529,7 @@ describe('Drill by modal', () => {
      ]);
    });

-    it('Bar Chart', () => {
+    it.skip('Bar Chart', () => {
      testEchart('echarts_timeseries_bar', 'Bar Chart', [
        [85, 94],
        [490, 68],
@@ -612,7 +612,7 @@ describe('Drill by modal', () => {
      ]);
    });

-    it('Mixed Chart', () => {
+    it.skip('Mixed Chart', () => {
      cy.get('[data-test-viz-type="mixed_timeseries"] canvas').then($canvas => {
        // click 'boy'
        cy.wrap($canvas).scrollIntoView();
--- a/superset-frontend/cypress-base/cypress/e2e/dashboard/horizontalFilterBar.test.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/dashboard/horizontalFilterBar.test.ts
@@ -154,6 +154,7 @@ describe('Horizontal FilterBar', () => {
      { name: 'test_12', column: 'year', datasetId: 2 },
    ]);
    setFilterBarOrientation('horizontal');
+
    cy.get('.filter-item-wrapper').should('have.length', 3);
    openMoreFilters();
    cy.getBySel('form-item-value').should('have.length', 12);
--- a/superset-frontend/jest.config.js
+++ b/superset-frontend/jest.config.js
@@ -56,7 +56,7 @@ module.exports = {
  ],
  coverageReporters: ['lcov', 'json-summary', 'html', 'text'],
  transformIgnorePatterns: [
-    'node_modules/(?!d3-(interpolate|color|time)|remark-gfm|markdown-table|micromark-*.|decode-named-character-reference|character-entities|mdast-util-*.|unist-util-*.|ccount|escape-string-regexp|nanoid|@rjsf/*.|sinon|echarts|zrender|fetch-mock|pretty-ms|parse-ms|ol|@babel/runtime|@emotion|cheerio|cheerio/lib|parse5|dom-serializer|entities|htmlparser2|rehype-sanitize|hast-util-sanitize|unified|unist-.*|hast-.*|rehype-.*|remark-.*|mdast-.*|micromark-.*|parse-entities|property-information|space-separated-tokens|comma-separated-tokens|bail|devlop|zwitch|longest-streak|geostyler|geostyler-.*|react-error-boundary|react-json-tree|react-base16-styling|lodash-es)',
+    'node_modules/(?!d3-(interpolate|color|time|scale)|@mapbox/tiny-sdf|remark-gfm|(?!@ngrx|(?!deck.gl)|d3-scale)|markdown-table|micromark-*.|decode-named-character-reference|character-entities|mdast-util-*.|unist-util-*.|ccount|escape-string-regexp|nanoid|@rjsf/*.|sinon|echarts|zrender|fetch-mock|pretty-ms|parse-ms|ol|@babel/runtime|@emotion|cheerio|cheerio/lib|parse5|dom-serializer|entities|htmlparser2|rehype-sanitize|hast-util-sanitize|unified|unist-.*|hast-.*|rehype-.*|remark-.*|mdast-.*|micromark-.*|parse-entities|property-information|space-separated-tokens|comma-separated-tokens|bail|devlop|zwitch|longest-streak|geostyler|geostyler-.*|react-error-boundary|react-json-tree|react-base16-styling|lodash-es)',
  ],
  preset: 'ts-jest',
  transform: {
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
--- a/superset-frontend/package.json
+++ b/superset-frontend/package.json
@@ -72,7 +72,7 @@
    "test": "cross-env NODE_ENV=test NODE_OPTIONS=\"--max-old-space-size=8192\" jest --max-workers=80% --silent",
    "test-loud": "cross-env NODE_ENV=test NODE_OPTIONS=\"--max-old-space-size=8192\" jest --max-workers=80%",
    "type": "tsc --noEmit",
-    "update-maps": "jupyter nbconvert --to notebook --execute --inplace 'plugins/legacy-plugin-chart-country-map/scripts/Country Map GeoJSON Generator.ipynb' -Xfrozen_modules=off",
+    "update-maps": "cd plugins/legacy-plugin-chart-country-map/scripts && jupyter nbconvert --to notebook --execute --inplace --allow-errors --ExecutePreprocessor.timeout=1200 'Country Map GeoJSON Generator.ipynb'",
    "validate-release": "../RELEASING/validate_this_release.sh"
  },
  "browserslist": [
@@ -104,12 +104,12 @@
    "@superset-ui/legacy-plugin-chart-world-map": "file:./plugins/legacy-plugin-chart-world-map",
    "@superset-ui/legacy-preset-chart-deckgl": "file:./plugins/legacy-preset-chart-deckgl",
    "@superset-ui/legacy-preset-chart-nvd3": "file:./plugins/legacy-preset-chart-nvd3",
+    "@superset-ui/plugin-chart-ag-grid-table": "file:./plugins/plugin-chart-ag-grid-table",
    "@superset-ui/plugin-chart-cartodiagram": "file:./plugins/plugin-chart-cartodiagram",
    "@superset-ui/plugin-chart-echarts": "file:./plugins/plugin-chart-echarts",
    "@superset-ui/plugin-chart-handlebars": "file:./plugins/plugin-chart-handlebars",
    "@superset-ui/plugin-chart-pivot-table": "file:./plugins/plugin-chart-pivot-table",
    "@superset-ui/plugin-chart-table": "file:./plugins/plugin-chart-table",
-    "@superset-ui/plugin-chart-ag-grid-table": "file:./plugins/plugin-chart-ag-grid-table",
    "@superset-ui/plugin-chart-word-cloud": "file:./plugins/plugin-chart-word-cloud",
    "@superset-ui/switchboard": "file:./packages/superset-ui-switchboard",
    "@types/d3-format": "^3.0.1",
@@ -145,7 +145,6 @@
    "geostyler-style": "7.5.0",
    "geostyler-wfs-parser": "^2.0.3",
    "googleapis": "^130.0.0",
-    "html-webpack-plugin": "^5.6.3",
    "immer": "^10.1.1",
    "interweave": "^13.1.0",
    "jquery": "^3.7.1",
@@ -203,6 +202,7 @@
    "use-event-callback": "^0.1.0",
    "use-immer": "^0.9.0",
    "use-query-params": "^1.1.9",
+    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
    "yargs": "^17.7.2"
  },
  "devDependencies": {
@@ -316,7 +316,7 @@
    "mini-css-extract-plugin": "^2.9.0",
    "open-cli": "^8.0.0",
    "po2json": "^0.4.5",
-    "prettier": "3.5.3",
+    "prettier": "3.6.2",
    "prettier-plugin-packagejson": "^2.5.3",
    "process": "^0.11.10",
    "react-resizable": "^3.0.5",
@@ -349,7 +349,7 @@
    "regenerator-runtime": "^0.14.1"
  },
  "engines": {
-    "node": "^20.16.0",
+    "node": "^20.18.1",
    "npm": "^10.8.1"
  },
  "overrides": {
--- a/superset-frontend/packages/superset-ui-chart-controls/src/components/ControlHeader.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/components/ControlHeader.tsx
@@ -18,8 +18,7 @@
 */
 import { ReactNode } from 'react';
 import { t, css } from '@superset-ui/core';
-import { InfoCircleOutlined } from '@ant-design/icons';
-import { InfoTooltip, Tooltip } from '@superset-ui/core/components';
+import { InfoTooltip, Tooltip, Icons } from '@superset-ui/core/components';

 type ValidationError = string;

@@ -93,7 +92,7 @@ export function ControlHeader({
    <div className="ControlHeader" data-test={`${name}-header`}>
      <div className="pull-left">
        <label className="control-label" htmlFor={name}>
-          {leftNode && <span>{leftNode}</span>}
+          {leftNode && <>{leftNode}</>}
          <span
            role={onClick ? 'button' : undefined}
            {...(onClick ? { onClick, tabIndex: 0 } : {})}
@@ -104,9 +103,9 @@ export function ControlHeader({
          {warning && (
            <span>
              <Tooltip id="error-tooltip" placement="top" title={warning}>
-                <InfoCircleOutlined
+                <Icons.InfoCircleOutlined
+                  iconSize="m"
                  css={theme => css`
-                    font-size: ${theme.sizeUnit * 3}px;
                    color: ${theme.colorError};
                  `}
                />
@@ -116,9 +115,9 @@ export function ControlHeader({
          {danger && (
            <span>
              <Tooltip id="error-tooltip" placement="top" title={danger}>
-                <InfoCircleOutlined
+                <Icons.InfoCircleOutlined
+                  iconSize="m"
                  css={theme => css`
-                    font-size: ${theme.sizeUnit * 3}px;
                    color: ${theme.colorError};
                  `}
                />{' '}
@@ -132,9 +131,9 @@ export function ControlHeader({
                placement="top"
                title={validationErrors.join(' ')}
              >
-                <InfoCircleOutlined
+                <Icons.InfoCircleOutlined
+                  iconSize="m"
                  css={theme => css`
-                    font-size: ${theme.sizeUnit * 3}px;
                    color: ${theme.colorError};
                  `}
                />{' '}
--- a/superset-frontend/packages/superset-ui-chart-controls/src/components/Select.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/components/Select.tsx
@@ -86,7 +86,9 @@ export default function Select<VT extends string | number>({
        minWidth,
      }}
    >
-      {options?.map(([val, label]) => <Option value={val}>{label}</Option>)}
+      {options?.map(([val, label]) => (
+        <Option value={val}>{label}</Option>
+      ))}
      {children}
      {value && !optionsHasValue && (
        <Option key={value} value={value}>
--- a/superset-frontend/packages/superset-ui-chart-controls/src/sections/echartsTimeSeriesQuery.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/sections/echartsTimeSeriesQuery.tsx
@@ -30,7 +30,7 @@ const controlsWithoutXAxis: ControlSetRow[] = [
  ['groupby'],
  [contributionModeControl],
  ['adhoc_filters'],
-  ['limit'],
+  ['limit', 'group_others_when_limit_reached'],
  ['timeseries_limit_metric'],
  ['order_desc'],
  ['row_limit'],
--- a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/sharedControls.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/sharedControls.tsx
@@ -283,6 +283,19 @@ const series_limit: SharedControlConfig<'SelectControl'> = {
  ),
 };

+const group_others_when_limit_reached: SharedControlConfig<'CheckboxControl'> =
+  {
+    type: 'CheckboxControl',
+    label: t('Group remaining as "Others"'),
+    default: false,
+    description: t(
+      'Groups remaining series into an "Others" category when series limit is reached. ' +
+        'This prevents incomplete time series data from being displayed.',
+    ),
+    visibility: ({ form_data }: { form_data: any }) =>
+      Boolean(form_data?.limit || form_data?.series_limit),
+  };
+
 const y_axis_format: SharedControlConfig<'SelectControl', SelectDefaultOption> =
  {
    type: 'SelectControl',
@@ -446,6 +459,7 @@ export default {
  time_shift_color,
  series_columns: dndColumnsControl,
  series_limit,
+  group_others_when_limit_reached,
  series_limit_metric: dndSortByControl,
  legacy_order_by: dndSortByControl,
  truncate_metric,
--- a/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/index.tsx
@@ -35,6 +35,11 @@ import { useTheme, css } from '@superset-ui/core';
 import { Global } from '@emotion/react';

 export { getTooltipHTML } from './Tooltip';
+export { useJsonValidation } from './useJsonValidation';
+export type {
+  JsonValidationAnnotation,
+  UseJsonValidationOptions,
+} from './useJsonValidation';

 export interface AceCompleterKeywordData {
  name: string;
@@ -202,7 +207,7 @@ export function AsyncAceEditor(

                /* Basic editor styles with dark mode support */
                .ace_editor.ace-github,
-                .ace_editor.ace-textmate {
+                .ace_editor.ace-tm {
                  background-color: ${token.colorBgContainer} !important;
                  color: ${token.colorText} !important;
                }
@@ -265,7 +270,7 @@ export function AsyncAceEditor(
                /* Adjust tooltip styles */
                .ace_tooltip {
                  margin-left: ${token.margin}px;
-                  padding: 0px;
+                  padding: ${token.sizeUnit * 2}px;
                  background-color: ${token.colorBgElevated} !important;
                  color: ${token.colorText} !important;
                  border: 1px solid ${token.colorBorderSecondary};
--- a/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/useJsonValidation.test.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/useJsonValidation.test.ts
@@ -0,0 +1,75 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { renderHook } from '@testing-library/react-hooks';
+import { useJsonValidation } from './useJsonValidation';
+
+describe('useJsonValidation', () => {
+  it('returns empty array for valid JSON', () => {
+    const { result } = renderHook(() => useJsonValidation('{"key": "value"}'));
+    expect(result.current).toEqual([]);
+  });
+
+  it('returns empty array when disabled', () => {
+    const { result } = renderHook(() =>
+      useJsonValidation('invalid json', { enabled: false }),
+    );
+    expect(result.current).toEqual([]);
+  });
+
+  it('returns empty array for empty input', () => {
+    const { result } = renderHook(() => useJsonValidation(''));
+    expect(result.current).toEqual([]);
+  });
+
+  it('extracts line and column from error message with parentheses', () => {
+    // Since we can't control the exact error message from JSON.parse,
+    // let's test with a mock that demonstrates the pattern matching
+    const mockError = {
+      message:
+        "Expected ',' or '}' after property value in JSON at position 19 (line 3 column 2)",
+    };
+
+    // Test the regex pattern directly
+    const match = mockError.message.match(/\(line (\d+) column (\d+)\)/);
+    expect(match).toBeTruthy();
+    expect(match![1]).toBe('3');
+    expect(match![2]).toBe('2');
+  });
+
+  it('returns error on first line when no line/column info in message', () => {
+    const invalidJson = '{invalid}';
+    const { result } = renderHook(() => useJsonValidation(invalidJson));
+
+    expect(result.current).toHaveLength(1);
+    expect(result.current[0]).toMatchObject({
+      type: 'error',
+      row: 0,
+      column: 0,
+      text: expect.stringContaining('Invalid JSON'),
+    });
+  });
+
+  it('uses custom error prefix', () => {
+    const { result } = renderHook(() =>
+      useJsonValidation('{invalid}', { errorPrefix: 'Custom error' }),
+    );
+
+    expect(result.current[0].text).toContain('Custom error');
+  });
+});
--- a/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/useJsonValidation.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/useJsonValidation.ts
@@ -0,0 +1,82 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { useMemo } from 'react';
+
+export interface JsonValidationAnnotation {
+  type: 'error' | 'warning' | 'info';
+  row: number;
+  column: number;
+  text: string;
+}
+
+export interface UseJsonValidationOptions {
+  /** Whether to enable JSON validation. Default: true */
+  enabled?: boolean;
+  /** Custom error message prefix. Default: 'Invalid JSON' */
+  errorPrefix?: string;
+}
+
+/**
+ * Hook for JSON validation that returns AceEditor-compatible annotations.
+ * Based on the SQL Lab validation pattern.
+ *
+ * @param jsonValue - The JSON string to validate
+ * @param options - Validation options
+ * @returns Array of annotation objects for AceEditor
+ */
+export function useJsonValidation(
+  jsonValue?: string,
+  options: UseJsonValidationOptions = {},
+): JsonValidationAnnotation[] {
+  const { enabled = true, errorPrefix = 'Invalid JSON' } = options;
+
+  return useMemo(() => {
+    // Skip validation if disabled or empty value
+    if (!enabled || !jsonValue?.trim()) {
+      return [];
+    }
+
+    try {
+      JSON.parse(jsonValue);
+      return []; // Valid JSON - no annotations
+    } catch (error: any) {
+      const errorMessage = error.message || 'syntax error';
+
+      // Try to extract line/column from error message
+      // Look for pattern: (line X column Y) - often at the end of error messages
+      let row = 0;
+      let column = 0;
+
+      const match = errorMessage.match(/\(line (\d+) column (\d+)\)/);
+      if (match) {
+        row = parseInt(match[1], 10) - 1; // Convert to 0-based
+        column = parseInt(match[2], 10) - 1;
+      }
+
+      return [
+        {
+          type: 'error' as const,
+          row,
+          column,
+          text: `${errorPrefix}: ${errorMessage}`,
+        },
+      ];
+    }
+  }, [enabled, jsonValue, errorPrefix]);
+}
--- a/superset-frontend/packages/superset-ui-core/src/components/Button/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Button/index.tsx
@@ -17,7 +17,6 @@
 * under the License.
 */
 import { Children, ReactElement, Fragment } from 'react';
-
 import cx from 'classnames';
 import { Button as AntdButton } from 'antd';
 import { useTheme } from '@superset-ui/core';
@@ -70,7 +69,6 @@ export function Button(props: ButtonProps) {
  if (!buttonStyle || buttonStyle === 'primary') {
    variant = 'solid';
    antdType = 'primary';
-    color = 'primary';
  } else if (buttonStyle === 'secondary') {
    variant = 'filled';
    color = 'primary';
@@ -78,7 +76,6 @@ export function Button(props: ButtonProps) {
    variant = 'outlined';
    color = 'default';
  } else if (buttonStyle === 'dashed') {
-    color = 'primary';
    variant = 'dashed';
    antdType = 'dashed';
  } else if (buttonStyle === 'danger') {
@@ -90,6 +87,7 @@ export function Button(props: ButtonProps) {
  const element = children as ReactElement;

  let renderedChildren = [];
+
  if (element && element.type === Fragment) {
    renderedChildren = Children.toArray(element.props.children);
  } else {
@@ -120,7 +118,7 @@ export function Button(props: ButtonProps) {
        display: 'inline-flex',
        alignItems: 'center',
        justifyContent: 'center',
-        lineHeight: 1.5715,
+        lineHeight: 1,
        fontSize: fontSizeSM,
        fontWeight: fontWeightStrong,
        height,
@@ -134,6 +132,11 @@ export function Button(props: ButtonProps) {
        '& > span > :first-of-type': {
          marginRight: firstChildMargin,
        },
+        ':not(:hover)': effectiveButtonStyle === 'secondary' && {
+          // NOTE: This is the best we can do contrast wise for the secondary button using antd tokens
+          // and abusing the semantics. Should be revisited when possible. https://github.com/apache/superset/pull/34253#issuecomment-3104834692
+          color: `${theme.colorPrimaryTextHover} !important`,
+        },
      }}
      icon={icon}
      {...restProps}
--- a/superset-frontend/packages/superset-ui-core/src/components/CodeSyntaxHighlighter/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/CodeSyntaxHighlighter/index.tsx
@@ -20,7 +20,7 @@ import { useEffect, useState } from 'react';
 import SyntaxHighlighterBase from 'react-syntax-highlighter/dist/cjs/light';
 import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';
 import tomorrow from 'react-syntax-highlighter/dist/cjs/styles/hljs/tomorrow-night';
-import { themeObject } from '@superset-ui/core';
+import { useTheme, isThemeDark } from '@superset-ui/core';

 export type SupportedLanguage = 'sql' | 'htmlbars' | 'markdown' | 'json';

@@ -77,6 +77,7 @@ export const CodeSyntaxHighlighter: React.FC<CodeSyntaxHighlighterProps> = ({
  wrapLines = true,
  style: overrideStyle,
 }) => {
+  const theme = useTheme();
  const [isLanguageReady, setIsLanguageReady] = useState(
    registeredLanguages.has(language),
  );
@@ -92,14 +93,14 @@ export const CodeSyntaxHighlighter: React.FC<CodeSyntaxHighlighterProps> = ({
    loadLanguage();
  }, [language]);

-  const isDark = themeObject.isThemeDark();
+  const isDark = isThemeDark(theme);
  const themeStyle = overrideStyle || (isDark ? tomorrow : github);

  const defaultCustomStyle: React.CSSProperties = {
-    background: themeObject.theme.colorBgElevated,
-    padding: themeObject.theme.sizeUnit * 4,
+    background: theme.colorBgElevated,
+    padding: theme.sizeUnit * 4,
    border: 0,
-    borderRadius: themeObject.theme.borderRadius,
+    borderRadius: theme.borderRadius,
    ...customStyle,
  };

--- a/superset-frontend/packages/superset-ui-core/src/components/Collapse/CollapseLabelInModal.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Collapse/CollapseLabelInModal.tsx
@@ -15,7 +15,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-import { useTheme } from '@superset-ui/core';
+import { useTheme, css } from '@superset-ui/core';
 import { Typography } from '@superset-ui/core/components/Typography';
 import { Icons } from '@superset-ui/core/components';

@@ -29,7 +29,7 @@ interface CollapseLabelInModalProps {
 export const CollapseLabelInModal: React.FC<CollapseLabelInModalProps> = ({
  title,
  subtitle,
-  validateCheckStatus = false,
+  validateCheckStatus,
  testId,
 }) => {
  const theme = useTheme();
@@ -37,36 +37,38 @@ export const CollapseLabelInModal: React.FC<CollapseLabelInModalProps> = ({
  return (
    <div data-test={testId}>
      <Typography.Title
-        style={{
-          marginTop: 0,
-          marginBottom: theme.sizeUnit / 2,
-          fontSize: theme.fontSizeLG,
-        }}
+        css={css`
+          && {
+            margin-top: 0;
+            margin-bottom: ${theme.sizeUnit / 2}px;
+            font-size: ${theme.fontSizeLG}px;
+          }
+        `}
      >
        {title}{' '}
-        {validateCheckStatus ? (
-          <Icons.CheckCircleOutlined
-            style={{ color: theme.colorSuccess }}
-            aria-label="check-circle"
-            role="img"
-          />
-        ) : (
-          <span
-            style={{
-              color: theme.colorErrorText,
-              fontSize: theme.fontSizeLG,
-            }}
-          >
-            *
-          </span>
-        )}
+        {validateCheckStatus !== undefined &&
+          (validateCheckStatus ? (
+            <Icons.CheckCircleOutlined
+              iconColor={theme.colorSuccess}
+              aria-label="check-circle"
+            />
+          ) : (
+            <span
+              css={css`
+                color: ${theme.colorErrorText};
+                font-size: ${theme.fontSizeLG}px;
+              `}
+            >
+              *
+            </span>
+          ))}
      </Typography.Title>
      <Typography.Paragraph
-        style={{
-          margin: 0,
-          fontSize: theme.fontSizeSM,
-          color: theme.colorTextDescription,
-        }}
+        css={css`
+          margin: 0;
+          font-size: ${theme.fontSizeSM}px;
+          color: ${theme.colorTextDescription};
+        `}
      >
        {subtitle}
      </Typography.Paragraph>
--- a/superset-frontend/packages/superset-ui-core/src/components/ConfirmStatusChange/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ConfirmStatusChange/index.tsx
@@ -68,6 +68,7 @@ export function ConfirmStatusChange({
        onConfirm={confirm}
        onHide={hide}
        open={open}
+        name="please confirm"
        title={title}
      />
    </>
--- a/superset-frontend/packages/superset-ui-core/src/components/DeleteModal/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/DeleteModal/index.tsx
@@ -31,17 +31,13 @@ const StyledDiv = styled.div`
  }
 `;

-const DescriptionContainer = styled.div`
-  line-height: ${({ theme }) => theme.sizeUnit * 4}px;
-  padding-top: 16px;
-`;
-
 export function DeleteModal({
  description,
  onConfirm,
  onHide,
  open,
  title,
+  name,
 }: DeleteModalProps) {
  const [disableChange, setDisableChange] = useState(true);
  const [confirmation, setConfirmation] = useState<string>('');
@@ -81,12 +77,13 @@ export function DeleteModal({
      onHide={hide}
      onHandledPrimaryAction={confirm}
      primaryButtonName={t('Delete')}
-      primaryButtonType="danger"
+      primaryButtonStyle="danger"
      show={open}
+      name={name}
      title={title}
      centered
    >
-      <DescriptionContainer>{description}</DescriptionContainer>
+      {description}
      <StyledDiv>
        <FormLabel htmlFor="delete">
          {t('Type "%s" to confirm', t('DELETE'))}
--- a/superset-frontend/packages/superset-ui-core/src/components/DeleteModal/types.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/DeleteModal/types.ts
@@ -25,4 +25,5 @@ export interface DeleteModalProps {
  onHide: () => void;
  open: boolean;
  title: ReactNode;
+  name?: string;
 }
--- a/superset-frontend/packages/superset-ui-core/src/components/EmptyState/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/index.tsx
@@ -128,7 +128,7 @@ const ImageContainer = ({
      <Empty
        description={false}
        image={mappedImage}
-        imageStyle={getImageHeight(size)}
+        styles={{ image: getImageHeight(size) }}
      />
    </div>
  );
@@ -144,6 +144,7 @@ export const EmptyState: React.FC<EmptyStateProps> = ({
  description = t('There is currently no information to display.'),
  image = 'empty.svg',
  buttonText,
+  buttonIcon,
  buttonAction,
  size = 'medium',
  children,
@@ -165,6 +166,7 @@ export const EmptyState: React.FC<EmptyStateProps> = ({
      )}
      {buttonText && buttonAction && (
        <Button
+          icon={buttonIcon}
          buttonStyle="primary"
          onClick={buttonAction}
          onMouseDown={handleMouseDown}
--- a/superset-frontend/packages/superset-ui-core/src/components/EmptyState/types.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/types.ts
@@ -17,6 +17,7 @@
 * under the License.
 */
 import type { ReactNode, SyntheticEvent } from 'react';
+import type { IconType } from '@superset-ui/core/components';

 export type EmptyStateSize = 'small' | 'medium' | 'large';

@@ -25,6 +26,7 @@ export type EmptyStateProps = {
  description?: ReactNode;
  image?: ReactNode | string;
  buttonText?: ReactNode;
+  buttonIcon?: IconType;
  buttonAction?: (event: SyntheticEvent) => void;
  size?: EmptyStateSize;
  children?: ReactNode;
--- a/superset-frontend/packages/superset-ui-core/src/components/Icons/BaseIcon.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Icons/BaseIcon.tsx
@@ -17,7 +17,7 @@
 * under the License.
 */

-import { css, useTheme, themeObject } from '../..';
+import { css, useTheme, getFontSize } from '../..';
 import { AntdIconType, BaseIconProps, CustomIconType, IconType } from './types';

 const genAriaLabel = (fileName: string) => {
@@ -52,7 +52,7 @@ export const BaseIconComponent: React.FC<
  const style = {
    color: iconColor,
    fontSize: iconSize
-      ? `${themeObject.getFontSize(iconSize)}px`
+      ? `${getFontSize(theme, iconSize)}px`
      : `${theme.fontSize}px`,
    cursor: rest?.onClick ? 'pointer' : undefined,
  };
@@ -76,12 +76,12 @@ export const BaseIconComponent: React.FC<
        style={style}
        width={
          iconSize
-            ? `${themeObject.getFontSize(iconSize) || theme.fontSize}px`
+            ? `${getFontSize(theme, iconSize) || theme.fontSize}px`
            : `${theme.fontSize}px`
        }
        height={
          iconSize
-            ? `${themeObject.getFontSize(iconSize) || theme.fontSize}px`
+            ? `${getFontSize(theme, iconSize) || theme.fontSize}px`
            : `${theme.fontSize}px`
        }
        {...(rest as CustomIconType)}
--- a/superset-frontend/packages/superset-ui-core/src/components/InfoTooltip/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/InfoTooltip/index.tsx
@@ -19,7 +19,7 @@
 import { KeyboardEvent, useMemo } from 'react';
 import { SerializedStyles, CSSObject } from '@emotion/react';
 import { kebabCase } from 'lodash';
-import { css, t, useTheme, themeObject } from '@superset-ui/core';
+import { css, t, useTheme, getFontSize } from '@superset-ui/core';
 import {
  CloseCircleOutlined,
  InfoCircleOutlined,
@@ -68,7 +68,7 @@ export const InfoTooltip = ({

  const iconCss = css`
    color: ${variant?.color ?? theme.colorIcon};
-    font-size: ${themeObject.getFontSize(iconSize)}px;
+    font-size: ${getFontSize(theme, iconSize)}px;
  `;

  const handleKeyDown = (event: KeyboardEvent<HTMLSpanElement>) => {
--- a/superset-frontend/packages/superset-ui-core/src/components/Label/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Label/index.tsx
@@ -18,7 +18,7 @@
 */
 import { Tag } from '@superset-ui/core/components/Tag';
 import { css } from '@emotion/react';
-import { useTheme, themeObject } from '@superset-ui/core';
+import { useTheme, getColorVariants } from '@superset-ui/core';
 import { DatasetTypeLabel } from './reusable/DatasetTypeLabel';
 import { PublishedLabel } from './reusable/PublishedLabel';
 import type { LabelProps } from './types';
@@ -37,7 +37,7 @@ export function Label(props: LabelProps) {
    ...rest
  } = props;

-  const baseColor = themeObject.getColorVariants(type);
+  const baseColor = getColorVariants(theme, type);
  const color = baseColor.active;
  const borderColor = baseColor.border;
  const backgroundColor = baseColor.bg;
--- a/superset-frontend/packages/superset-ui-core/src/components/LastUpdated/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/LastUpdated/index.tsx
@@ -18,7 +18,7 @@
 */
 import { useEffect, useState, FunctionComponent } from 'react';

-import { t, styled, css } from '@superset-ui/core';
+import { t, styled, css, useTheme } from '@superset-ui/core';
 import dayjs from 'dayjs';
 import { extendedDayjs } from '../../utils/dates';
 import { Icons } from '../Icons';
@@ -38,24 +38,14 @@ extendedDayjs.updateLocale('en', {
 });

 const TextStyles = styled.span`
-  color: ${({ theme }) => theme.colors.grayscale.base};
-`;
-
-const RefreshIcon = styled(Icons.SyncOutlined)`
-  ${({ theme }) => `
-  width: auto;
-  height: ${theme.sizeUnit * 5}px;
-  position: relative;
-  top: ${theme.sizeUnit}px;
-  left: ${theme.sizeUnit}px;
-  cursor: pointer;
-`};
+  color: ${({ theme }) => theme.colorText};
 `;

 export const LastUpdated: FunctionComponent<LastUpdatedProps> = ({
  updatedAt,
  update,
 }) => {
+  const theme = useTheme();
  const [timeSince, setTimeSince] = useState<dayjs.Dayjs>(
    extendedDayjs(updatedAt),
  );
@@ -75,10 +65,9 @@ export const LastUpdated: FunctionComponent<LastUpdatedProps> = ({
    <TextStyles>
      {t('Last Updated %s', timeSince.isValid() ? timeSince.calendar() : '--')}
      {update && (
-        <RefreshIcon
-          iconSize="l"
+        <Icons.SyncOutlined
          css={css`
-            vertical-align: text-bottom;
+            margin-left: ${theme.sizeUnit * 2}px;
          `}
          onClick={update}
        />
--- a/superset-frontend/packages/superset-ui-core/src/components/Modal/FormModal.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Modal/FormModal.tsx
@@ -33,6 +33,7 @@ export function FormModal({
  formSubmitHandler,
  bodyStyle = {},
  requiredFields = [],
+  name,
 }: FormModalProps) {
  const [form] = Form.useForm();
  const [isSaving, setIsSaving] = useState(false);
@@ -78,6 +79,7 @@ export function FormModal({

  return (
    <Modal
+      name={name}
      show={show}
      title={title}
      onHide={handleClose}
--- a/superset-frontend/packages/superset-ui-core/src/components/Modal/Modal.stories.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Modal/Modal.stories.tsx
@@ -33,7 +33,7 @@ export const InteractiveModal = (props: ModalProps) => (
 InteractiveModal.args = {
  disablePrimaryButton: false,
  primaryButtonName: 'Danger',
-  primaryButtonType: 'danger',
+  primaryButtonStyle: 'danger',
  show: true,
  title: "I'm a modal!",
  resizable: false,
--- a/superset-frontend/packages/superset-ui-core/src/components/Modal/Modal.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Modal/Modal.tsx
@@ -77,7 +77,7 @@ export const StyledModal = styled(BaseModal)<StyledModalProps>`
    .ant-modal-header {
      flex: 0 0 auto;
      border-radius: ${theme.borderRadius}px ${theme.borderRadius}px 0 0;
-      padding: ${theme.sizeUnit * 4}px ${theme.sizeUnit * 6}px;
+      padding: ${theme.sizeUnit * 4}px ${theme.sizeUnit * 4}px;

      .ant-modal-title {
        font-weight: ${theme.fontWeightStrong};
@@ -121,7 +121,8 @@ export const StyledModal = styled(BaseModal)<StyledModalProps>`

    .ant-modal-body {
      flex: 0 1 auto;
-      padding: ${theme.sizeUnit * 4}px;
+      padding: ${theme.sizeUnit * 4}px ${theme.sizeUnit * 6}px;
+
      overflow: auto;
      ${!resizable && height && `height: ${height};`}
    }
@@ -208,7 +209,7 @@ const CustomModal = ({
  onHide,
  onHandledPrimaryAction,
  primaryButtonName = t('OK'),
-  primaryButtonType = 'primary',
+  primaryButtonStyle = 'primary',
  show,
  name,
  title,
@@ -261,7 +262,7 @@ const CustomModal = ({
        </Button>,
        <Button
          key="submit"
-          buttonStyle={primaryButtonType}
+          buttonStyle={primaryButtonStyle}
          disabled={disablePrimaryButton}
          tooltip={primaryTooltipMessage}
          loading={primaryButtonLoading}
@@ -332,7 +333,7 @@ const CustomModal = ({
      }
      footer={!hideFooter ? modalFooter : null}
      hideFooter={hideFooter}
-      wrapProps={{ 'data-test': `${name || title}-modal`, ...wrapProps }}
+      wrapProps={{ 'data-test': `${name || 'antd'}-modal`, ...wrapProps }}
      modalRender={modal =>
        resizable || draggable ? (
          <Draggable
--- a/superset-frontend/packages/superset-ui-core/src/components/Modal/types.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/Modal/types.ts
@@ -20,6 +20,7 @@ import type { CSSProperties, ReactNode } from 'react';
 import type { ModalFuncProps } from 'antd';
 import type { ResizableProps } from 're-resizable';
 import type { DraggableProps } from 'react-draggable';
+import { ButtonStyle } from '../Button/types';

 export interface ModalProps {
  className?: string;
@@ -30,7 +31,7 @@ export interface ModalProps {
  onHide: () => void;
  onHandledPrimaryAction?: () => void;
  primaryButtonName?: string;
-  primaryButtonType?: 'primary' | 'danger';
+  primaryButtonStyle?: ButtonStyle;
  show: boolean;
  name?: string;
  title: ReactNode;
--- a/superset-frontend/packages/superset-ui-core/src/components/ModalTrigger/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ModalTrigger/index.tsx
@@ -110,6 +110,7 @@ export const ModalTrigger = forwardRef(
          className={className}
          show={showModal}
          onHide={close}
+          name={modalTitle}
          title={modalTitle}
          footer={modalFooter}
          hideFooter={!modalFooter}
--- a/superset-frontend/packages/superset-ui-core/src/components/ThemeEditor/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ThemeEditor/index.tsx
@@ -1,150 +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 { Modal, Tooltip, Flex, Select } from 'antd';
-import { Button, JsonEditor } from '@superset-ui/core/components';
-import {
-  themeObject,
-  exampleThemes,
-  SerializableThemeConfig,
-  Theme,
-  AnyThemeConfig,
-} from '@superset-ui/core';
-import { useState } from 'react';
-import { Icons } from '@superset-ui/core/components/Icons';
-
-interface ThemeEditorProps {
-  tooltipTitle?: string;
-  modalTitle?: string;
-  theme?: Theme;
-  setTheme?: (config: AnyThemeConfig) => void;
-}
-
-const ThemeEditor: React.FC<ThemeEditorProps> = ({
-  tooltipTitle = 'Edit Theme',
-  modalTitle = 'Theme Editor',
-  theme,
-  setTheme,
-}) => {
-  const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
-  const jsonTheme =
-    JSON.stringify(theme?.toSerializedConfig(), null, 2) || '{}';
-  const [jsonMetadata, setJsonMetadata] = useState<string>(jsonTheme);
-  const [selectedTheme, setSelectedTheme] = useState<string | null>(null);
-
-  // Get theme names for the Select options
-  const themeOptions: { value: string; label: string }[] = Object.keys(
-    exampleThemes,
-  ).map(key => ({
-    value: key,
-    label: key,
-  }));
-
-  const handleOpenModal = (): void => {
-    setIsModalOpen(true);
-    setJsonMetadata(JSON.stringify(theme?.toSerializedConfig(), null, 2));
-  };
-
-  const handleCancel = (): void => {
-    setIsModalOpen(false);
-  };
-
-  const handleSave = (): void => {
-    try {
-      const parsedTheme = JSON.parse(jsonMetadata);
-      setTheme?.(parsedTheme);
-      setIsModalOpen(false);
-    } catch (error) {
-      console.error('Invalid JSON in theme editor:', error);
-      alert('Error parsing JSON. Please check your input.');
-    }
-  };
-
-  const handleThemeChange = (value: string): void => {
-    setSelectedTheme(value);
-    // When a theme is selected, update the JSON editor with the theme definition
-    const themeData = exampleThemes[value] || ({} as SerializableThemeConfig);
-    setJsonMetadata(JSON.stringify(themeData, null, 2));
-  };
-
-  return (
-    <>
-      <Tooltip title={tooltipTitle} placement="bottom">
-        <Button
-          buttonStyle="link"
-          icon={
-            <Icons.BgColorsOutlined
-              iconSize="l"
-              iconColor={themeObject.theme.colorPrimary}
-            />
-          }
-          onClick={handleOpenModal}
-          aria-label="Edit theme"
-          size="large"
-        />
-      </Tooltip>
-      <Modal
-        title={modalTitle}
-        open={isModalOpen}
-        onCancel={handleCancel}
-        width={800}
-        centered
-        styles={{
-          body: {
-            padding: '24px',
-          },
-        }}
-        footer={
-          <Flex justify="end" gap="small">
-            <Button onClick={handleCancel} buttonStyle="secondary">
-              Cancel
-            </Button>
-            <Button type="primary" onClick={handleSave}>
-              Apply Theme
-            </Button>
-          </Flex>
-        }
-      >
-        <Flex vertical gap="middle">
-          <div>
-            Select a theme template:
-            <Select
-              placeholder="Choose a theme"
-              style={{ width: '100%', marginTop: '8px' }}
-              options={themeOptions}
-              onChange={handleThemeChange}
-              value={selectedTheme}
-            />
-          </div>
-          <JsonEditor
-            showLoadingForImport
-            name="json_metadata"
-            value={jsonMetadata}
-            onChange={setJsonMetadata}
-            tabSize={2}
-            width="100%"
-            height="200px"
-            wrapEnabled
-          />
-        </Flex>
-      </Modal>
-    </>
-  );
-};
-
-export default ThemeEditor;
--- a/superset-frontend/packages/superset-ui-core/src/components/ThemeSelect/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ThemeSelect/index.tsx
@@ -16,22 +16,30 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-import { Tooltip } from 'antd';
 import { Dropdown, Icons } from '@superset-ui/core/components';
-import { t } from '@superset-ui/core';
+import type { MenuItem } from '@superset-ui/core/components/Menu';
+import { t, useTheme } from '@superset-ui/core';
 import { ThemeAlgorithm, ThemeMode } from '../../theme/types';

 export interface ThemeSelectProps {
  setThemeMode: (newMode: ThemeMode) => void;
  tooltipTitle?: string;
  themeMode: ThemeMode;
+  hasLocalOverride?: boolean;
+  onClearLocalSettings?: () => void;
+  allowOSPreference?: boolean;
 }

 const ThemeSelect: React.FC<ThemeSelectProps> = ({
  setThemeMode,
  tooltipTitle = 'Select theme',
  themeMode,
+  hasLocalOverride = false,
+  onClearLocalSettings,
+  allowOSPreference = true,
 }) => {
+  const theme = useTheme();
+
  const handleSelect = (mode: ThemeMode) => {
    setThemeMode(mode);
  };
@@ -43,36 +51,65 @@ const ThemeSelect: React.FC<ThemeSelectProps> = ({
    [ThemeAlgorithm.COMPACT]: <Icons.CompressOutlined />,
  };

+  // Use different icon when local theme is active
+  const triggerIcon = hasLocalOverride ? (
+    <Icons.FormatPainterOutlined style={{ color: theme.colorErrorText }} />
+  ) : (
+    themeIconMap[themeMode] || <Icons.FormatPainterOutlined />
+  );
+
+  const menuItems: MenuItem[] = [
+    {
+      type: 'group',
+      label: t('Theme'),
+    },
+    {
+      key: ThemeMode.DEFAULT,
+      label: t('Light'),
+      icon: <Icons.SunOutlined />,
+      onClick: () => handleSelect(ThemeMode.DEFAULT),
+    },
+    {
+      key: ThemeMode.DARK,
+      label: t('Dark'),
+      icon: <Icons.MoonOutlined />,
+      onClick: () => handleSelect(ThemeMode.DARK),
+    },
+    ...(allowOSPreference
+      ? [
+          {
+            key: ThemeMode.SYSTEM,
+            label: t('Match system'),
+            icon: <Icons.FormatPainterOutlined />,
+            onClick: () => handleSelect(ThemeMode.SYSTEM),
+          },
+        ]
+      : []),
+  ];
+
+  // Add clear settings option only when there's a local theme active
+  if (onClearLocalSettings && hasLocalOverride) {
+    menuItems.push(
+      { type: 'divider' } as MenuItem,
+      {
+        key: 'clear-local',
+        label: t('Clear local theme'),
+        icon: <Icons.ClearOutlined />,
+        onClick: onClearLocalSettings,
+      } as MenuItem,
+    );
+  }
+
  return (
-    <Tooltip title={tooltipTitle} placement="bottom">
-      <Dropdown
-        menu={{
-          items: [
-            {
-              key: ThemeMode.DEFAULT,
-              label: t('Light'),
-              onClick: () => handleSelect(ThemeMode.DEFAULT),
-              icon: <Icons.SunOutlined />,
-            },
-            {
-              key: ThemeMode.DARK,
-              label: t('Dark'),
-              onClick: () => handleSelect(ThemeMode.DARK),
-              icon: <Icons.MoonOutlined />,
-            },
-            {
-              key: ThemeMode.SYSTEM,
-              label: t('Match system'),
-              onClick: () => handleSelect(ThemeMode.SYSTEM),
-              icon: <Icons.FormatPainterOutlined />,
-            },
-          ],
-        }}
-        trigger={['click']}
-      >
-        {themeIconMap[themeMode] || <Icons.FormatPainterOutlined />}
-      </Dropdown>
-    </Tooltip>
+    <Dropdown
+      menu={{
+        items: menuItems,
+        selectedKeys: [themeMode],
+      }}
+      trigger={['hover']}
+    >
+      {triggerIcon}
+    </Dropdown>
  );
 };

--- a/superset-frontend/packages/superset-ui-core/src/components/Typography/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Typography/index.tsx
@@ -19,6 +19,7 @@
 import { styled, css } from '@superset-ui/core';
 import { Typography as AntdTypography } from 'antd';

+export type { TitleProps } from 'antd/es/typography/Title';
 export type { ParagraphProps } from 'antd/es/typography/Paragraph';

 const StyledLink = styled(AntdTypography.Link)`
--- a/superset-frontend/packages/superset-ui-core/src/components/UnsavedChangesModal/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/UnsavedChangesModal/index.tsx
@@ -16,52 +16,16 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-import { t, styled, css } from '@superset-ui/core';
-import { Icons, Modal, Typography } from '@superset-ui/core/components';
-import { Button } from '@superset-ui/core/components/Button';
+import { t, css, useTheme } from '@superset-ui/core';
+import {
+  Icons,
+  Modal,
+  Typography,
+  Button,
+  Flex,
+} from '@superset-ui/core/components';
 import type { FC, ReactElement } from 'react';

-const StyledModalTitle = styled(Typography.Title)`
-  && {
-    font-weight: 600;
-    margin: 0;
-  }
-`;
-
-const StyledModalBody = styled(Typography.Text)`
-  ${({ theme }) => css`
-    padding: 0 ${theme.sizeUnit * 2}px;
-
-    && {
-      margin: 0;
-    }
-  `}
-`;
-
-const StyledDiscardBtn = styled(Button)`
-  ${({ theme }) => css`
-    min-width: ${theme.sizeUnit * 22}px;
-    height: ${theme.sizeUnit * 8}px;
-  `}
-`;
-
-const StyledSaveBtn = styled(Button)`
-  ${({ theme }) => css`
-    min-width: ${theme.sizeUnit * 17}px;
-    height: ${theme.sizeUnit * 8}px;
-    span > :first-of-type {
-      margin-right: 0;
-    }
-  `}
-`;
-
-const StyledWarningIcon = styled(Icons.WarningOutlined)`
-  ${({ theme }) => css`
-    color: ${theme.colorWarning};
-    margin-right: ${theme.sizeUnit * 4}px;
-  `}
-`;
-
 export type UnsavedChangesModalProps = {
  showModal: boolean;
  onHide: () => void;
@@ -78,52 +42,66 @@ export const UnsavedChangesModal: FC<UnsavedChangesModalProps> = ({
  onConfirmNavigation,
  title = 'Unsaved Changes',
  body = "If you don't save, changes will be lost.",
-}: UnsavedChangesModalProps): ReactElement => (
-  <Modal
-    centered
-    responsive
-    onHide={onHide}
-    show={showModal}
-    width="444px"
-    title={
-      <div
-        css={css`
-          align-items: center;
-          display: flex;
-        `}
-      >
-        <StyledWarningIcon iconSize="xl" />
-        <StyledModalTitle type="secondary" level={5}>
-          {title}
-        </StyledModalTitle>
-      </div>
-    }
-    footer={
-      <div
-        css={css`
-          display: flex;
-          justify-content: flex-end;
-          width: 100%;
-        `}
-      >
-        <StyledDiscardBtn
-          htmlType="button"
-          buttonSize="small"
-          onClick={onConfirmNavigation}
+}): ReactElement => {
+  const theme = useTheme();
+
+  return (
+    <Modal
+      name={title}
+      centered
+      responsive
+      onHide={onHide}
+      show={showModal}
+      width="444px"
+      title={
+        <Flex>
+          <Icons.WarningOutlined
+            iconColor={theme.colorWarning}
+            css={css`
+              margin-right: ${theme.sizeUnit * 2}px;
+            `}
+            iconSize="l"
+          />
+          <Typography.Title
+            css={css`
+              && {
+                margin: 0;
+                margin-bottom: 0;
+              }
+            `}
+            level={5}
+          >
+            {title}
+          </Typography.Title>
+        </Flex>
+      }
+      footer={
+        <Flex
+          justify="flex-end"
+          css={css`
+            width: 100%;
+          `}
        >
-          {t('Discard')}
-        </StyledDiscardBtn>
-        <StyledSaveBtn
-          htmlType="button"
-          buttonSize="small"
-          buttonStyle="primary"
-          onClick={handleSave}
-        >
-          {t('Save')}
-        </StyledSaveBtn>
-      </div>
-    }
-  >
-    <StyledModalBody type="secondary">{body}</StyledModalBody>
-  </Modal>
-);
+          <Button
+            htmlType="button"
+            buttonSize="small"
+            buttonStyle="secondary"
+            onClick={onConfirmNavigation}
+          >
+            {t('Discard')}
+          </Button>
+          <Button
+            htmlType="button"
+            buttonSize="small"
+            buttonStyle="primary"
+            onClick={handleSave}
+          >
+            {t('Save')}
+          </Button>
+        </Flex>
+      }
+    >
+      <Typography.Text>{body}</Typography.Text>
+    </Modal>
+  );
+};
--- a/superset-frontend/packages/superset-ui-core/src/components/index.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/index.ts
@@ -148,6 +148,7 @@ export {
  Typography,
  type TypographyProps,
  type ParagraphProps,
+  type TitleProps,
 } from './Typography';

 export { Image, type ImageProps } from './Image';
--- a/superset-frontend/packages/superset-ui-core/src/connection/constants.ts
+++ b/superset-frontend/packages/superset-ui-core/src/connection/constants.ts
@@ -32,7 +32,7 @@ export const CACHE_KEY = '@SUPERSET-UI/CONNECTION';
 export const DEFAULT_FETCH_RETRY_OPTIONS: FetchRetryOptions = {
  retries: 3,
  retryDelay: 1000,
-  retryOn: [503],
+  retryOn: [502, 503, 504],
 };

 export const COMMON_ERR_MESSAGES = {
--- a/superset-frontend/packages/superset-ui-core/src/query/buildQueryObject.ts
+++ b/superset-frontend/packages/superset-ui-core/src/query/buildQueryObject.ts
@@ -63,6 +63,7 @@ export default function buildQueryObject<T extends QueryFormData>(
    series_columns,
    series_limit,
    series_limit_metric,
+    group_others_when_limit_reached,
    ...residualFormData
  } = formData;
  const {
@@ -128,6 +129,7 @@ export default function buildQueryObject<T extends QueryFormData>(
      normalizeSeriesLimitMetric(series_limit_metric) ??
      timeseries_limit_metric ??
      undefined,
+    group_others_when_limit_reached: group_others_when_limit_reached ?? false,
    order_desc: typeof order_desc === 'undefined' ? true : order_desc,
    url_params: url_params || undefined,
    custom_params,
--- a/superset-frontend/packages/superset-ui-core/src/theme/Theme.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/theme/Theme.test.tsx
@@ -189,24 +189,6 @@ describe('Theme', () => {
    });
  });

-  describe('getFontSize', () => {
-    it('returns correct font size for given key', () => {
-      const theme = Theme.fromConfig();
-
-      // Test different font size keys
-      expect(theme.getFontSize('xs')).toBe('8');
-      expect(theme.getFontSize('m')).toBeTruthy();
-      expect(theme.getFontSize('xxl')).toBe('28');
-    });
-
-    it('defaults to medium font size when no key is provided', () => {
-      const theme = Theme.fromConfig();
-      const mediumSize = theme.getFontSize('m');
-
-      expect(theme.getFontSize()).toBe(mediumSize);
-    });
-  });
-
  describe('toSerializedConfig', () => {
    it('serializes theme config correctly', () => {
      const theme = Theme.fromConfig({
--- a/superset-frontend/packages/superset-ui-core/src/theme/Theme.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/theme/Theme.tsx
@@ -20,7 +20,6 @@
 // eslint-disable-next-line no-restricted-syntax
 import React from 'react';
 import { theme as antdThemeImport, ConfigProvider } from 'antd';
-import tinycolor from 'tinycolor2';

 // @fontsource/* v5.1+ doesn't play nice with eslint-import plugin v2.31+
 /* eslint-disable import/extensions */
@@ -44,6 +43,7 @@ import {
 } from '@emotion/react';
 import createCache from '@emotion/cache';
 import { noop } from 'lodash';
+import { isThemeDark } from './utils/themeUtils';
 import { GlobalStyles } from './GlobalStyles';

 import {
@@ -53,9 +53,7 @@ import {
  SupersetTheme,
  allowedAntdTokens,
  SharedAntdTokens,
-  ColorVariants,
  DeprecatedThemeColors,
-  FontSizeKey,
 } from './types';

 import {
@@ -102,15 +100,6 @@ export class Theme {

  private antdConfig: AntdThemeConfig;

-  private static readonly sizeMap: Record<FontSizeKey, string> = {
-    xs: 'fontSizeXS',
-    s: 'fontSizeSM',
-    m: 'fontSize',
-    l: 'fontSizeLG',
-    xl: 'fontSizeXL',
-    xxl: 'fontSizeXXL',
-  };
-
  private constructor({ config }: { config?: AnyThemeConfig }) {
    this.SupersetThemeProvider = this.SupersetThemeProvider.bind(this);

@@ -183,7 +172,7 @@ export class Theme {
    // Second phase: Now that theme is initialized, we can determine if it's dark
    // and generate the legacy colors correctly
    const systemColors = getSystemColors(tokens);
-    const isDark = this.isThemeDark(); // Now we can safely call this
+    const isDark = isThemeDark(this.theme); // Use utility function with theme
    this.theme.colors = getDeprecatedColors(systemColors, isDark);

    // Update the providers with the fully formed theme
@@ -201,22 +190,6 @@ export class Theme {
    return serializeThemeConfig(this.antdConfig);
  }

-  private getToken(token: string): any {
-    return (this.theme as Record<string, any>)[token];
-  }
-
-  public getFontSize(size?: FontSizeKey): string {
-    const fontSizeKey = Theme.sizeMap[size || 'm'];
-    return this.getToken(fontSizeKey) || this.getToken('fontSize');
-  }
-
-  /**
-   * Check if the current theme is dark based on background color
-   */
-  isThemeDark(): boolean {
-    return tinycolor(this.theme.colorBgContainer).isDark();
-  }
-
  toggleDarkMode(isDark: boolean): void {
    // Create a new config based on the current one
    const newConfig = { ...this.antdConfig };
@@ -250,45 +223,6 @@ export class Theme {
    return JSON.stringify(serializeThemeConfig(this.antdConfig), null, 2);
  }

-  getColorVariants(color: string): ColorVariants {
-    const firstLetterCapped = color.charAt(0).toUpperCase() + color.slice(1);
-    if (color === 'default' || color === 'grayscale') {
-      const isDark = this.isThemeDark();
-
-      const flipBrightness = (baseColor: string): string => {
-        if (!isDark) return baseColor;
-        const { r, g, b } = tinycolor(baseColor).toRgb();
-        const invertedColor = tinycolor({ r: 255 - r, g: 255 - g, b: 255 - b });
-        return invertedColor.toHexString();
-      };
-
-      return {
-        active: flipBrightness('#222'),
-        textActive: flipBrightness('#444'),
-        text: flipBrightness('#555'),
-        textHover: flipBrightness('#666'),
-        hover: flipBrightness('#888'),
-        borderHover: flipBrightness('#AAA'),
-        border: flipBrightness('#CCC'),
-        bgHover: flipBrightness('#DDD'),
-        bg: flipBrightness('#F4F4F4'),
-      };
-    }
-
-    const theme = this.getToken.bind(this);
-    return {
-      active: theme(`color${firstLetterCapped}Active`),
-      textActive: theme(`color${firstLetterCapped}TextActive`),
-      text: theme(`color${firstLetterCapped}Text`),
-      textHover: theme(`color${firstLetterCapped}TextHover`),
-      hover: theme(`color${firstLetterCapped}Hover`),
-      borderHover: theme(`color${firstLetterCapped}BorderHover`),
-      border: theme(`color${firstLetterCapped}Border`),
-      bgHover: theme(`color${firstLetterCapped}BgHover`),
-      bg: theme(`color${firstLetterCapped}Bg`),
-    };
-  }
-
  private updateProviders(
    theme: SupersetTheme,
    antdConfig: AntdThemeConfig,
--- a/superset-frontend/packages/superset-ui-core/src/theme/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/theme/index.tsx
@@ -75,3 +75,6 @@ export type {
  ThemeControllerOptions,
  ThemeContextType,
 };
+
+// Export theme utility functions
+export * from './utils/themeUtils';
--- a/superset-frontend/packages/superset-ui-core/src/theme/types.ts
+++ b/superset-frontend/packages/superset-ui-core/src/theme/types.ts
@@ -411,6 +411,7 @@ export interface ThemeControllerOptions {
  onChange?: (theme: Theme) => void;
  canUpdateTheme?: () => boolean;
  canUpdateMode?: () => boolean;
+  isGlobalContext?: boolean;
 }

 export interface ThemeContextType {
@@ -419,4 +420,12 @@ export interface ThemeContextType {
  setTheme: (config: AnyThemeConfig) => void;
  setThemeMode: (newMode: ThemeMode) => void;
  resetTheme: () => void;
+  setTemporaryTheme: (config: AnyThemeConfig) => void;
+  clearLocalOverrides: () => void;
+  getCurrentCrudThemeId: () => string | null;
+  hasDevOverride: () => boolean;
+  canSetMode: () => boolean;
+  canSetTheme: () => boolean;
+  canDetectOSPreference: () => boolean;
+  createDashboardThemeProvider: (themeId: string) => Promise<Theme | null>;
 }
--- a/superset-frontend/packages/superset-ui-core/src/theme/utils/themeUtils.test.ts
+++ b/superset-frontend/packages/superset-ui-core/src/theme/utils/themeUtils.test.ts
@@ -0,0 +1,134 @@
+/**
+ * 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 { getFontSize, getColorVariants, isThemeDark } from './themeUtils';
+import { Theme } from '../Theme';
+import { ThemeAlgorithm } from '../types';
+
+// Mock emotion's cache to avoid actual DOM operations
+jest.mock('@emotion/cache', () => ({
+  __esModule: true,
+  default: jest.fn().mockReturnValue({}),
+}));
+
+describe('themeUtils', () => {
+  let lightTheme: Theme;
+  let darkTheme: Theme;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    // Create actual theme instances for testing
+    lightTheme = Theme.fromConfig({
+      token: {
+        colorPrimary: '#1890ff',
+        fontSizeXS: '8',
+        fontSize: '14',
+        fontSizeLG: '16',
+      },
+    });
+
+    darkTheme = Theme.fromConfig({
+      algorithm: ThemeAlgorithm.DARK,
+      token: {
+        colorPrimary: '#1890ff',
+        fontSizeXS: '8',
+        fontSize: '14',
+        fontSizeLG: '16',
+      },
+    });
+  });
+
+  describe('getFontSize', () => {
+    it('returns correct font size for given key', () => {
+      expect(getFontSize(lightTheme.theme, 'xs')).toBe('8');
+      expect(getFontSize(lightTheme.theme, 'm')).toBe('14');
+      expect(getFontSize(lightTheme.theme, 'l')).toBe('16');
+    });
+
+    it('defaults to medium font size when no key is provided', () => {
+      expect(getFontSize(lightTheme.theme)).toBe('14');
+    });
+
+    it('uses antd default when specific size not overridden', () => {
+      // Create theme with minimal config - antd will provide defaults
+      const minimalTheme = Theme.fromConfig({
+        token: { fontSize: '14' },
+      });
+
+      // Ant Design provides fontSizeXS: '8' by default
+      expect(getFontSize(minimalTheme.theme, 'xs')).toBe('8');
+      expect(getFontSize(minimalTheme.theme, 'm')).toBe('14');
+    });
+  });
+
+  describe('isThemeDark', () => {
+    it('returns false for light theme', () => {
+      expect(isThemeDark(lightTheme.theme)).toBe(false);
+    });
+
+    it('returns true for dark theme', () => {
+      expect(isThemeDark(darkTheme.theme)).toBe(true);
+    });
+  });
+
+  describe('getColorVariants', () => {
+    it('returns correct variants for primary color', () => {
+      const variants = getColorVariants(lightTheme.theme, 'primary');
+
+      expect(variants.text).toBeDefined();
+      expect(variants.bg).toBeDefined();
+      expect(variants.border).toBeDefined();
+      expect(variants.active).toBeDefined();
+    });
+
+    it('returns grayscale variants for default color in light theme', () => {
+      const variants = getColorVariants(lightTheme.theme, 'default');
+
+      expect(variants.active).toBe('#222');
+      expect(variants.textActive).toBe('#444');
+      expect(variants.text).toBe('#555');
+      expect(variants.bg).toBe('#F4F4F4');
+    });
+
+    it('returns inverted grayscale variants for default color in dark theme', () => {
+      const variants = getColorVariants(darkTheme.theme, 'default');
+
+      // In dark theme, colors should be inverted
+      expect(variants.active).toBe('#dddddd'); // Inverted #222
+      expect(variants.textActive).toBe('#bbbbbb'); // Inverted #444
+      expect(variants.text).toBe('#aaaaaa'); // Inverted #555
+    });
+
+    it('returns same variants for grayscale color as default', () => {
+      const defaultVariants = getColorVariants(lightTheme.theme, 'default');
+      const grayscaleVariants = getColorVariants(lightTheme.theme, 'grayscale');
+
+      expect(defaultVariants).toEqual(grayscaleVariants);
+    });
+
+    it('handles missing color tokens gracefully', () => {
+      const variants = getColorVariants(lightTheme.theme, 'nonexistent');
+
+      // Should return undefined for missing tokens
+      expect(variants.active).toBeUndefined();
+      expect(variants.text).toBeUndefined();
+      expect(variants.bg).toBeUndefined();
+    });
+  });
+});
--- a/superset-frontend/packages/superset-ui-core/src/theme/utils/themeUtils.ts
+++ b/superset-frontend/packages/superset-ui-core/src/theme/utils/themeUtils.ts
@@ -0,0 +1,113 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import tinycolor from 'tinycolor2';
+import type { SupersetTheme, FontSizeKey, ColorVariants } from '../types';
+
+const fontSizeMap: Record<FontSizeKey, keyof SupersetTheme> = {
+  xs: 'fontSizeXS',
+  s: 'fontSizeSM',
+  m: 'fontSize',
+  l: 'fontSizeLG',
+  xl: 'fontSizeXL',
+  xxl: 'fontSizeXXL',
+};
+
+/**
+ * Get font size from theme tokens based on size key
+ * @param theme - Theme tokens from useTheme()
+ * @param size - Font size key
+ * @returns Font size as string
+ */
+export function getFontSize(theme: SupersetTheme, size?: FontSizeKey): string {
+  const key = fontSizeMap[size || 'm'];
+  return String(theme[key] || theme.fontSize);
+}
+
+/**
+ * Get color variants for a given color type from theme tokens
+ * @param theme - Theme tokens from useTheme()
+ * @param color - Color type (e.g., 'primary', 'error', 'success')
+ * @returns ColorVariants object with bg, border, text colors etc.
+ */
+export function getColorVariants(
+  theme: SupersetTheme,
+  color: string,
+): ColorVariants {
+  const firstLetterCapped = color.charAt(0).toUpperCase() + color.slice(1);
+
+  if (color === 'default' || color === 'grayscale') {
+    const isDark = isThemeDark(theme);
+
+    const flipBrightness = (baseColor: string): string => {
+      if (!isDark) return baseColor;
+      const { r, g, b } = tinycolor(baseColor).toRgb();
+      const invertedColor = tinycolor({ r: 255 - r, g: 255 - g, b: 255 - b });
+      return invertedColor.toHexString();
+    };
+
+    return {
+      active: flipBrightness('#222'),
+      textActive: flipBrightness('#444'),
+      text: flipBrightness('#555'),
+      textHover: flipBrightness('#666'),
+      hover: flipBrightness('#888'),
+      borderHover: flipBrightness('#AAA'),
+      border: flipBrightness('#CCC'),
+      bgHover: flipBrightness('#DDD'),
+      bg: flipBrightness('#F4F4F4'),
+    };
+  }
+
+  return {
+    active: theme[
+      `color${firstLetterCapped}Active` as keyof SupersetTheme
+    ] as string,
+    textActive: theme[
+      `color${firstLetterCapped}TextActive` as keyof SupersetTheme
+    ] as string,
+    text: theme[
+      `color${firstLetterCapped}Text` as keyof SupersetTheme
+    ] as string,
+    textHover: theme[
+      `color${firstLetterCapped}TextHover` as keyof SupersetTheme
+    ] as string,
+    hover: theme[
+      `color${firstLetterCapped}Hover` as keyof SupersetTheme
+    ] as string,
+    borderHover: theme[
+      `color${firstLetterCapped}BorderHover` as keyof SupersetTheme
+    ] as string,
+    border: theme[
+      `color${firstLetterCapped}Border` as keyof SupersetTheme
+    ] as string,
+    bgHover: theme[
+      `color${firstLetterCapped}BgHover` as keyof SupersetTheme
+    ] as string,
+    bg: theme[`color${firstLetterCapped}Bg` as keyof SupersetTheme] as string,
+  };
+}
+
+/**
+ * Check if the current theme is dark mode based on background color
+ * @param theme - Theme tokens from useTheme()
+ * @returns true if theme is dark, false if light
+ */
+export function isThemeDark(theme: SupersetTheme): boolean {
+  return tinycolor(theme.colorBgContainer).isDark();
+}
--- a/superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts
+++ b/superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts
@@ -30,6 +30,7 @@ export enum FeatureFlag {
  AvoidColorsCollision = 'AVOID_COLORS_COLLISION',
  ChartPluginsExperimental = 'CHART_PLUGINS_EXPERIMENTAL',
  ConfirmDashboardDiff = 'CONFIRM_DASHBOARD_DIFF',
+  CssTemplates = 'CSS_TEMPLATES',
  DashboardVirtualization = 'DASHBOARD_VIRTUALIZATION',
  DashboardRbac = 'DASHBOARD_RBAC',
  DatapanelClosedByDefault = 'DATAPANEL_CLOSED_BY_DEFAULT',
@@ -53,8 +54,6 @@ export enum FeatureFlag {
  SqlValidatorsByEngine = 'SQL_VALIDATORS_BY_ENGINE',
  SshTunneling = 'SSH_TUNNELING',
  TaggingSystem = 'TAGGING_SYSTEM',
-  ThemeEnableDarkThemeSwitch = 'THEME_ENABLE_DARK_THEME_SWITCH',
-  ThemeAllowThemeEditorBeta = 'THEME_ALLOW_THEME_EDITOR_BETA',
  Thumbnails = 'THUMBNAILS',
  UseAnalogousColors = 'USE_ANALOGOUS_COLORS',
  ForceSqlLabRunAsync = 'SQLLAB_FORCE_RUN_ASYNC',
--- a/superset-frontend/packages/superset-ui-core/src/validator/validateMapboxStylesUrl.ts
+++ b/superset-frontend/packages/superset-ui-core/src/validator/validateMapboxStylesUrl.ts
@@ -19,18 +19,27 @@

 import { t } from '../translation';

+const VALIDE_OSM_URLS = ['https://tile.osm', 'https://tile.openstreetmap'];
+
 /**
 * Validate a [Mapbox styles URL](https://docs.mapbox.com/help/glossary/style-url/)
 * @param v
 */
 export default function validateMapboxStylesUrl(v: unknown) {
-  if (
-    typeof v === 'string' &&
-    v.trim().length > 0 &&
-    v.trim().startsWith('mapbox://styles/')
-  ) {
-    return false;
+  if (typeof v === 'string') {
+    const trimmed_v = v.trim();
+    if (
+      typeof v === 'string' &&
+      trimmed_v.length > 0 &&
+      (trimmed_v.startsWith('mapbox://styles/') ||
+        trimmed_v.startsWith('tile://http') ||
+        VALIDE_OSM_URLS.some(s => trimmed_v.startsWith(s)))
+    ) {
+      return false;
+    }
  }

-  return t('is expected to be a Mapbox URL');
+  return t(
+    'is expected to be a Mapbox/OSM URL (eg. mapbox://styles/...) or a tile server URL (eg. tile://http...)',
+  );
 }
--- a/superset-frontend/packages/superset-ui-core/test/validator/validateMapboxStylesUrl.test.ts
+++ b/superset-frontend/packages/superset-ui-core/test/validator/validateMapboxStylesUrl.test.ts
@@ -29,6 +29,11 @@ describe('validateMapboxStylesUrl', () => {
        'mapbox://styles/foobar/clp2dr5r4008a01pcg4ad45m8',
      ),
    ).toEqual(false);
+    expect(
+      validateMapboxStylesUrl(
+        'tile://https://c.tile.openstreetmap.org/{z}/{x}/{y}.png',
+      ),
+    ).toEqual(false);
  });

  [
@@ -40,7 +45,7 @@ describe('validateMapboxStylesUrl', () => {
  ].forEach(value => {
    it(`should not validate ${value}`, () => {
      expect(validateMapboxStylesUrl(value)).toEqual(
-        'is expected to be a Mapbox URL',
+        'is expected to be a Mapbox/OSM URL (eg. mapbox://styles/...) or a tile server URL (eg. tile://http...)',
      );
    });
  });
--- a/superset-frontend/plugins/legacy-plugin-chart-country-map/scripts/Country
+++ b/superset-frontend/plugins/legacy-plugin-chart-country-map/scripts/Country
--- a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/countries/latvia.geojson
+++ b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/countries/latvia.geojson
--- a/superset-frontend/plugins/legacy-plugin-chart-world-map/src/ReactWorldMap.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-world-map/src/ReactWorldMap.jsx
@@ -42,4 +42,8 @@ export default styled(WorldMapComponent)`
      background-color: ${({ theme }) => theme.colors.grayscale.light5};
    }
  }
+  .hoverinfo {
+    background-color: ${({ theme }) => theme.colorBgElevated};
+    color: ${({ theme }) => theme.colorTextSecondary};
+  }
 `;
--- a/superset-frontend/plugins/legacy-plugin-chart-world-map/src/WorldMap.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-world-map/src/WorldMap.js
@@ -24,7 +24,7 @@ import {
  getSequentialSchemeRegistry,
  CategoricalColorNamespace,
 } from '@superset-ui/core';
-import Datamap from 'datamaps/dist/datamaps.world.min';
+import Datamap from 'datamaps/dist/datamaps.all.min';
 import { ColorBy } from './utils';

 const propTypes = {
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/package.json
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/package.json
@@ -24,10 +24,17 @@
    "lib"
  ],
  "dependencies": {
-    "@deck.gl/aggregation-layers": "^9.0.38",
-    "@deck.gl/core": "^9.0.37",
-    "@deck.gl/layers": "^9.0.38",
-    "@deck.gl/react": "^9.1.4",
+    "@deck.gl/aggregation-layers": "^9.1.13",
+    "@deck.gl/core": "^9.1.13",
+    "@deck.gl/geo-layers": "^9.1.13",
+    "@deck.gl/layers": "^9.1.13",
+    "@deck.gl/react": "^9.1.13",
+    "@luma.gl/constants": "^9.1.9",
+    "@luma.gl/core": "^9.1.9",
+    "@luma.gl/engine": "^9.1.9",
+    "@luma.gl/shadertools": "^9.1.9",
+    "@luma.gl/webgl": "^9.1.9",
+    "@mapbox/tiny-sdf": "^2.0.6",
    "@mapbox/geojson-extent": "^1.0.1",
    "@math.gl/web-mercator": "^4.1.0",
    "@types/d3-array": "^2.0.0",
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/DeckGLContainer.tsx
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/DeckGLContainer.tsx
@@ -39,6 +39,12 @@ import { JsonObject, JsonValue, styled, usePrevious } from '@superset-ui/core';
 import Tooltip, { TooltipProps } from './components/Tooltip';
 import 'mapbox-gl/dist/mapbox-gl.css';
 import { Viewport } from './utils/fitViewport';
+import {
+  MAPBOX_LAYER_PREFIX,
+  OSM_LAYER_KEYWORDS,
+  TILE_LAYER_PREFIX,
+  buildTileLayer,
+} from './utils';

 const TICK = 250; // milliseconds

@@ -102,6 +108,20 @@ export const DeckGLContainer = memo(
    );

    const layers = useCallback(() => {
+      if (
+        (props.mapStyle?.startsWith(TILE_LAYER_PREFIX) ||
+          OSM_LAYER_KEYWORDS.some(tilek => props.mapStyle?.includes(tilek))) &&
+        props.layers.some(
+          l => typeof l !== 'function' && l?.id === 'tile-layer',
+        ) === false
+      ) {
+        props.layers.unshift(
+          buildTileLayer(
+            (props.mapStyle ?? '').replace(TILE_LAYER_PREFIX, ''),
+            'tile-layer',
+          ),
+        );
+      }
      // Support for layer factory
      if (props.layers.some(l => typeof l === 'function')) {
        return props.layers.map(l =>
@@ -110,7 +130,7 @@ export const DeckGLContainer = memo(
      }

      return props.layers as Layer[];
-    }, [props.layers]);
+    }, [props.layers, props.mapStyle]);

    const { children = null, height, width } = props;

@@ -134,11 +154,13 @@ export const DeckGLContainer = memo(
              glContextRef.current = context.gl;
            }}
          >
-            <StaticMap
-              preserveDrawingBuffer
-              mapStyle={props.mapStyle || 'light'}
-              mapboxApiAccessToken={props.mapboxApiAccessToken}
-            />
+            {props.mapStyle?.startsWith(MAPBOX_LAYER_PREFIX) && (
+              <StaticMap
+                preserveDrawingBuffer
+                mapStyle={props.mapStyle || 'light'}
+                mapboxApiAccessToken={props.mapboxApiAccessToken}
+              />
+            )}
          </DeckGL>
          {children}
        </div>
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/controlPanel.ts
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/controlPanel.ts
@@ -35,6 +35,7 @@ import {
  spatial,
  viewport,
 } from '../../utilities/Shared_DeckGL';
+import { COLOR_SCHEME_TYPES } from '../../utilities/utils';

 const config: ControlPanelConfig = {
  controlPanelSections: [
@@ -53,7 +54,10 @@ const config: ControlPanelConfig = {
      label: t('Map'),
      controlSetRows: [
        [mapboxStyle],
-        ...generateDeckGLColorSchemeControls({}),
+        ...generateDeckGLColorSchemeControls({
+          defaultSchemeType: COLOR_SCHEME_TYPES.categorical_palette,
+          disableCategoricalColumn: true,
+        }),
        [viewport],
        [autozoom],
        [gridSize],
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.tsx
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.tsx
@@ -48,6 +48,30 @@ const sequentialSchemeRegistry = getSequentialSchemeRegistry();

 export const DEFAULT_DECKGL_COLOR = { r: 158, g: 158, b: 158, a: 1 };

+let deckglTiles: string[][];
+
+export const DEFAULT_DECKGL_TILES = [
+  ['https://tile.openstreetmap.org/{z}/{x}/{y}.png', 'Streets (OSM)'],
+  ['https://tile.osm.ch/osm-swiss-style/{z}/{x}/{y}.png', 'Topography (OSM)'],
+  ['mapbox://styles/mapbox/streets-v9', 'Streets (Mapbox)'],
+  ['mapbox://styles/mapbox/dark-v9', 'Dark (Mapbox)'],
+  ['mapbox://styles/mapbox/light-v9', 'Light (Mapbox)'],
+  ['mapbox://styles/mapbox/satellite-streets-v9', 'Satellite Streets (Mapbox)'],
+  ['mapbox://styles/mapbox/satellite-v9', 'Satellite (Mapbox)'],
+  ['mapbox://styles/mapbox/outdoors-v9', 'Outdoors (Mapbox)'],
+];
+
+const getDeckGLTiles = () => {
+  if (!deckglTiles) {
+    const appContainer = document.getElementById('app');
+    const { common } = JSON.parse(
+      appContainer?.getAttribute('data-bootstrap') || '{}',
+    );
+    deckglTiles = common?.deckgl_tiles ?? DEFAULT_DECKGL_TILES;
+  }
+  return deckglTiles;
+};
+
 const DEFAULT_VIEWPORT = {
  longitude: 6.85236157047845,
  latitude: 31.222656842808707,
@@ -395,17 +419,11 @@ export const mapboxStyle = {
    renderTrigger: true,
    freeForm: true,
    validators: [validateMapboxStylesUrl],
-    choices: [
-      ['mapbox://styles/mapbox/streets-v9', t('Streets')],
-      ['mapbox://styles/mapbox/dark-v9', t('Dark')],
-      ['mapbox://styles/mapbox/light-v9', t('Light')],
-      ['mapbox://styles/mapbox/satellite-streets-v9', t('Satellite Streets')],
-      ['mapbox://styles/mapbox/satellite-v9', t('Satellite')],
-      ['mapbox://styles/mapbox/outdoors-v9', t('Outdoors')],
-    ],
-    default: 'mapbox://styles/mapbox/light-v9',
+    choices: getDeckGLTiles(),
+    default: getDeckGLTiles()[0][0],
    description: t(
      'Base layer map style. See Mapbox documentation: %s',
+      'Mapbox base layer map style (see Mapbox documentation: %s) or tile server URL.',
      'https://docs.mapbox.com/help/glossary/style-url/',
    ),
  },
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/utils.ts
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/utils.ts
@@ -37,4 +37,4 @@ export function formatSelectOptions(options: (string | number)[]) {
 export const isColorSchemeTypeVisible = (
  controls: ControlStateMapping,
  colorSchemeType: ColorSchemeType,
-) => controls.color_scheme_type.value === colorSchemeType;
+) => controls.color_scheme_type?.value === colorSchemeType;
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils.ts
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils.ts
@@ -26,11 +26,17 @@ import {
  SequentialScheme,
 } from '@superset-ui/core';
 import { Color } from '@deck.gl/core';
+import { GeoBoundingBox, TileLayer } from '@deck.gl/geo-layers';
+import { BitmapLayer, PathLayer } from '@deck.gl/layers';
 import { hexToRGB } from './utils/colors';
 import { ColorBreakpointType } from './types';

 const DEFAULT_NUM_BUCKETS = 10;

+export const MAPBOX_LAYER_PREFIX = 'mapbox://';
+export const TILE_LAYER_PREFIX = 'tile://';
+export const OSM_LAYER_KEYWORDS = ['openstreetmap', 'osm'];
+
 export type Buckets = {
  break_points: string[];
  num_buckets: string;
@@ -215,3 +221,42 @@ export function getColorBreakpointsBuckets(

  return buckets;
 }
+
+export function buildTileLayer(url: string, id: string) {
+  interface TileLayerProps {
+    id: string;
+    data: string;
+    minZoom: number;
+    maxZoom: number;
+    tileSize: number;
+    renderSubLayers: (props: any) => (BitmapLayer | PathLayer)[];
+  }
+
+  interface RenderSubLayerProps {
+    tile: {
+      bbox: GeoBoundingBox;
+    };
+    data: any;
+  }
+
+  return new TileLayer({
+    data: url,
+    id,
+    minZoom: 0,
+    maxZoom: 19,
+    tileSize: 256,
+
+    renderSubLayers: (props: RenderSubLayerProps): BitmapLayer[] => {
+      const { west, north, east, south } = props.tile.bbox as GeoBoundingBox;
+
+      // Ajouter une BitmapLayer
+      const bitmapLayer = new BitmapLayer(props, {
+        data: undefined,
+        image: props.data,
+        bounds: [west, south, east, north],
+      });
+
+      return [bitmapLayer];
+    },
+  } as TileLayerProps);
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
GitHub Action	f3fb775a17	chore(🦾): bump python python-dotenv 1.1.0 -> 1.1.1	2025-07-28 19:12:51 +00:00
Maxime Beauchemin	604d72cc98	feat: introducing a docker-compose-light.yml for lighter development (#34324 )	2025-07-28 09:27:07 -07:00
Enzo Martellucci	913e068113	style(FastVizSwitcher): Adjust padding for FastVizSwitcher selector (#34317 )	2025-07-28 14:39:10 +03:00
Geido	1a4e2173f5	fix(NavBar): Add brand text back (#34318 )	2025-07-28 12:19:14 +03:00
Ian McEwen	c49789167b	style(chart): restyle table pagination (#34311 )	2025-07-27 19:39:10 -07:00
Maxime Beauchemin	1be2287b3a	feat(timeseries): enhance 'Series Limit' to support grouping the long tail (#34308 )	2025-07-25 16:26:32 -07:00
Maxime Beauchemin	e741a3167f	feat: add a theme CRUD page to manage themes (#34182 ) Co-authored-by: Mehmet Salih Yavuz <salih.yavuz@proton.me>	2025-07-25 13:26:41 -07:00
Michael S. Molina	5f11f9097a	fix: Charts list is displaying empty dataset names when there's no schema (#34315 )	2025-07-25 14:07:50 -03:00
Jan Suleiman	8783579aa8	fix(cartodiagram): add missing locales for rendering echarts (#34268 )	2025-07-25 09:59:28 -07:00
Evan Rusackas	c25b4221f8	fix(npm): more reliable execution of `npm run update-maps` (#34305 )	2025-07-25 13:48:05 -03:00
Pius Iniobong	9c771fb2ba	fix: preserve correct column order when table layout is changed with time comparison enabled (#34300 )	2025-07-25 15:31:33 +03:00
sha174n	7f44992c4b	fix: enhance disallowed SQL functions list for improved security (#33084 )	2025-07-24 16:36:32 -07:00
Beto Dealmeida	8df5860826	chore: bump sqlglot to latest version (27.3.0) (#34302 )	2025-07-24 15:38:29 -07:00
Beto Dealmeida	b794b192d1	fix: return 422 on invalid SQL (#34303 )	2025-07-24 16:40:56 -04:00
Maxime Beauchemin	3177131d52	feat: re-order CRUD list view action buttons (#34294 )	2025-07-24 12:46:34 -07:00
Enzo Martellucci	89bf77b5c9	fix(theming): Fix visual regressions from theming P7 (#34237 )	2025-07-24 19:57:50 +02:00
Maxime Beauchemin	30e5684006	fix: address numerous long-standing console errors (python & web) (#34299 )	2025-07-24 09:50:26 -07:00
Maxime Beauchemin	3f8472ca7b	chore: move some rules from ruff -> pylint (#34292 )	2025-07-24 09:40:49 -07:00
Beto Dealmeida	efa8cb6fa4	chore: improve sqlglot parsing (#34270 )	2025-07-24 10:50:59 -04:00
Beto Dealmeida	ab59b7e9b0	feat: make `SupersetClient` retry on 502-504 (#34290 ) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-07-24 10:46:50 -04:00
Vitor Avila	c99843b13a	fix: Hide View in SQL Lab for users without access (#34293 )	2025-07-24 10:45:31 -03:00
Fardin Mustaque	da55a6c94a	fix(chart-download): ensure full table or handlebar chart is captured in image export (#34233 )	2025-07-24 15:47:44 +03:00
LisaHusband	7a1c056374	fix(charting): correctly categorize numeric columns with NULL values (#34213 )	2025-07-24 15:46:58 +03:00
Michael S. Molina	1e5a4e9bdc	fix: Saved queries list break if one query can't be parsed (#34289 )	2025-07-24 08:30:04 -03:00
Đỗ Trọng Hải	9b88527883	chore: remove supposedly dev dep `html-webpack-plugin` from lockfile (#34288 )	2025-07-24 15:53:16 +07:00
dependabot[bot]	800c1639ec	chore(deps-dev): bump prettier from 3.5.3 to 3.6.2 in /superset-frontend (#33997 )	2025-07-24 09:38:00 +07:00
Ahmed Habeeb	43775e9373	fix(sqllab_export): manually encode CSV output to support utf-8-sig (#34235 )	2025-07-23 18:44:56 -07:00
Maxime Beauchemin	9099b0f00d	fix: fix the pre-commit hook for tsc (#34275 ) Co-authored-by: Mehmet Salih Yavuz <salih.yavuz@proton.me>	2025-07-23 13:21:54 -07:00
dependabot[bot]	77ffe65773	chore(deps): bump axios from 1.10.0 to 1.11.0 in /docs (#34285 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-07-24 00:06:53 +07:00
Damian Pendrak	32f8f33a4f	fix(deckgl): fix deck.gl color breakpoints Control (#34244 )	2025-07-23 19:25:29 +03:00
Enzo Martellucci	710c277681	style(Button): Vertically align icons across all buttons (#34067 )	2025-07-23 19:24:55 +03:00
Michael S. Molina	11324607d0	fix: Bulk select is not respecting the TAGGING_SYSTEM feature flag (#34282 )	2025-07-23 11:33:06 -03:00
Mehmet Salih Yavuz	9c6271136d	fix(theming): Visual regressions p2 (#34279 )	2025-07-23 16:14:06 +02:00
Maxime Beauchemin	c444eed63e	chore(docker): use editable mode in docker images (#34146 )	2025-07-22 16:14:31 -07:00
Mehmet Salih Yavuz	1df5e59fdf	fix(theming): Theming visual fixes (#34253 )	2025-07-23 01:55:32 +03:00
Maxime Beauchemin	77f66e7434	fix: build issues on master with 'npm run dev' (#34272 )	2025-07-22 15:55:18 -07:00
Maxime Beauchemin	2c81eb6c39	feat(docker): do not include chromium (headless browser) by default in Dockerfile (#34258 )	2025-07-22 13:12:55 -07:00
Maxime Beauchemin	09c4afc894	feat: introduce comprehensive LLM context guides for AI-powered development (#34194 ) Co-authored-by: Claude <noreply@anthropic.com>	2025-07-22 12:22:13 -07:00
JUST.in DO IT	229d92590a	fix: Matching errorType on superset api error with SupersetError (#34261 )	2025-07-22 11:51:42 -07:00
Kamil Gabryjelski	f4f516c64c	fix: Missing ownState and isCached props in Chart.jsx (#34259 )	2025-07-22 18:58:28 +02:00
Đỗ Trọng Hải	fe1fddde05	feat(docs): migrate ESLint to v9 (#34207 )	2025-07-22 22:09:45 +07:00
dependabot[bot]	7e67deead7	chore(deps-dev): bump form-data from 4.0.0 to 4.0.4 in /superset-embedded-sdk (#34262 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-07-22 21:44:07 +07:00
dependabot[bot]	6e02603098	chore(deps): bump form-data from 4.0.0 to 4.0.4 in /docs (#34263 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-07-22 21:43:02 +07:00
dependabot[bot]	4518f6999c	chore(deps): bump form-data from 4.0.1 to 4.0.4 in /superset-frontend (#34265 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-07-22 21:42:23 +07:00
SBIN2010	aff847b3af	fix: database model Collapse state (#34126 )	2025-07-22 15:40:19 +03:00
SBIN2010	b24aca0304	fix: bug when updating dashboard (#34193 )	2025-07-21 12:02:25 -07:00
dependabot[bot]	2c453035e4	chore(deps): bump on-headers and morgan in /superset-websocket/utils/client-ws-app (#34215 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-07-21 11:51:18 -07:00
dependabot[bot]	4fe11869fc	chore(deps): bump on-headers and compression in /superset-frontend (#34216 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-07-21 11:38:33 -07:00
Maxime Beauchemin	a0a49f9300	feat: add Claude Code GitHub Action integration (#34231 )	2025-07-21 09:14:45 -07:00
Mehmet Salih Yavuz	29d2fac485	fix(Chart): Calculate chart height correctly (#34224 )	2025-07-21 14:12:16 +03:00
Mehmet Salih Yavuz	0c5da6cb5d	fix(theming): World map tooltip color (#34229 )	2025-07-19 01:32:53 +03:00
Paul Lavacquery	da6947d295	feat(deckgl): add support for OpenStreetMap as our new default and make "tile-providers" more configurable FIX (#34204 )	2025-07-18 15:25:32 -07:00
Maxime Beauchemin	2db8f809ba	fix: proper handling of boolean filters with snowflake (#34199 ) Co-authored-by: Beto Dealmeida <roberto@dealmeida.net>	2025-07-18 12:13:52 -07:00
Erkka Tahvanainen	5912fad745	fix(dashboard): Fix subitem selection on dashboard download menu (#33933 ) Co-authored-by: Erkka Tahvanainen <erkka.tahvanainen@confidently.fi>	2025-07-18 11:16:19 -07:00
mdusmanalvi	dc41c45bec	feat(pivot-table-chart): Download as pivoted excel (#33569 ) Co-authored-by: Mehmet Salih Yavuz <salih.yavuz@proton.me>	2025-07-18 11:12:14 -07:00
Joe Li	88ee90c579	chore: Updates files related to 4.1.3 release (#34217 )	2025-07-18 09:59:06 -07:00
Gabriel Torres Ruiz	bbb2279644	fix(theming): Superset theme configurations correctly applying to charts (#34218 )	2025-07-18 16:25:48 +03:00
Maxime Beauchemin	1958df6b83	fix: dataset endpoint `/rowlevelsecurity/related/tables` doesn't apply filters as expected (#34192 )	2025-07-17 15:51:03 -07:00
eriks47	58bd3bfcf0	fix(chart): update geographical info for latvia (#33450 )	2025-07-17 13:32:34 -07:00
Denis Krivenko	d6eb6e08d0	style(helm): Minor reformatting of helm chart templates (#33736 )	2025-07-17 11:33:09 -07:00