Update transformProps.ts

.cursor/rules/dev-standard.mdc

@@ -1,125 +0,0 @@
----
-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.

.devcontainer/Dockerfile

@@ -1,20 +0,0 @@
-# Keep this in sync with the base image in the main Dockerfile (ARG PY_VER)
-FROM python:3.11.13-bookworm AS base
-
-# Install system dependencies that Superset needs
-# This layer will be cached across Codespace sessions
-RUN apt-get update && apt-get install -y \
-    libsasl2-dev \
-    libldap2-dev \
-    libpq-dev \
-    tmux \
-    gh \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install uv for fast Python package management
-# This will also be cached in the image
-RUN curl -LsSf https://astral.sh/uv/install.sh | sh && \
-    echo 'export PATH="/root/.cargo/bin:$PATH"' >> /etc/bash.bashrc
-
-# Set the cargo/bin directory in PATH for all users
-ENV PATH="/root/.cargo/bin:${PATH}"

.devcontainer/README.md

@@ -1,16 +0,0 @@
-# Superset Development with GitHub Codespaces
-
-For complete documentation on using GitHub Codespaces with Apache Superset, please see:
-
-**[Setting up a Development Environment - GitHub Codespaces](https://superset.apache.org/docs/contributing/development#github-codespaces-cloud-development)**
-
-## Pre-installed Development Environment
-
-When you create a new Codespace from this repository, it automatically:
-
-1. **Creates a Python virtual environment** using `uv venv`
-2. **Installs all development dependencies** via `uv pip install -r requirements/development.txt`
-3. **Sets up pre-commit hooks** with `pre-commit install`
-4. **Activates the virtual environment** automatically in all terminals
-
-The virtual environment is located at `/workspaces/{repository-name}/.venv` and is automatically activated through environment variables set in the devcontainer configuration.

.devcontainer/bashrc-additions

@@ -1,62 +0,0 @@
-# Superset Codespaces environment setup
-# This file is appended to ~/.bashrc during Codespace setup
-
-# Find the workspace directory (handles both 'superset' and 'superset-2' names)
-WORKSPACE_DIR=$(find /workspaces -maxdepth 1 -name "superset*" -type d | head -1)
-
-if [ -n "$WORKSPACE_DIR" ]; then
-    # Check if virtual environment exists
-    if [ -d "$WORKSPACE_DIR/.venv" ]; then
-        # Activate the virtual environment
-        source "$WORKSPACE_DIR/.venv/bin/activate"
-        echo "✅ Python virtual environment activated"
-
-        # Verify pre-commit is installed and set up
-        if command -v pre-commit &> /dev/null; then
-            echo "✅ pre-commit is available ($(pre-commit --version))"
-            # Install git hooks if not already installed
-            if [ -d "$WORKSPACE_DIR/.git" ] && [ ! -f "$WORKSPACE_DIR/.git/hooks/pre-commit" ]; then
-                echo "🪝 Installing pre-commit hooks..."
-                cd "$WORKSPACE_DIR" && pre-commit install
-            fi
-        else
-            echo "⚠️  pre-commit not found. Run: pip install pre-commit"
-        fi
-    else
-        echo "⚠️  Python virtual environment not found at $WORKSPACE_DIR/.venv"
-        echo "   Run: cd $WORKSPACE_DIR && .devcontainer/setup-dev.sh"
-    fi
-
-    # Always cd to the workspace directory for convenience
-    cd "$WORKSPACE_DIR"
-fi
-
-# Add helpful aliases for Superset development
-alias start-superset="$WORKSPACE_DIR/.devcontainer/start-superset.sh"
-alias setup-dev="$WORKSPACE_DIR/.devcontainer/setup-dev.sh"
-
-# Show helpful message on login
-echo ""
-echo "🚀 Superset Codespaces Environment"
-echo "=================================="
-
-# Check if Superset is running
-if docker ps 2>/dev/null | grep -q "superset"; then
-    echo "✅ Superset is running!"
-    echo "   - Check the 'Ports' tab for your live Superset URL"
-    echo "   - Initial startup takes 10-20 minutes"
-    echo "   - Login: admin/admin"
-else
-    echo "⚠️  Superset is not running. Use: start-superset"
-    # Check if there's a startup log
-    if [ -f "/tmp/superset-startup.log" ]; then
-        echo "   📋 Startup log found: cat /tmp/superset-startup.log"
-    fi
-fi
-
-echo ""
-echo "Quick commands:"
-echo "  start-superset - Start Superset with Docker Compose"
-echo "  setup-dev      - Set up Python environment (if not already done)"
-echo "  pre-commit run - Run pre-commit checks on staged files"
-echo ""

.devcontainer/build-and-push-image.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-# Script to build and push the devcontainer image to GitHub Container Registry
-# This allows caching the image between Codespace sessions
-
-# You'll need to run this with appropriate GitHub permissions
-# gh auth login --scopes write:packages
-
-REGISTRY="ghcr.io"
-OWNER="apache"
-REPO="superset"
-TAG="devcontainer-base"
-
-echo "Building devcontainer image..."
-docker build -t $REGISTRY/$OWNER/$REPO:$TAG .devcontainer/
-
-echo "Pushing to GitHub Container Registry..."
-docker push $REGISTRY/$OWNER/$REPO:$TAG
-
-echo "Done! Update .devcontainer/devcontainer.json to use:"
-echo "  \"image\": \"$REGISTRY/$OWNER/$REPO:$TAG\""

.devcontainer/devcontainer.json

@@ -1,66 +0,0 @@
-{
-  "name": "Apache Superset Development",
-  // Option 1: Use pre-built image directly
-  // "image": "ghcr.io/apache/superset:devcontainer-base",
-
-  // Option 2: Build from Dockerfile with cache (current approach)
-  "build": {
-    "dockerfile": "Dockerfile",
-    "context": ".",
-    // Cache from the Apache registry image
-    "cacheFrom": ["ghcr.io/apache/superset:devcontainer-base"]
-  },
-
-  "features": {
-    "ghcr.io/devcontainers/features/docker-in-docker:2": {
-      "moby": true,
-      "dockerDashComposeVersion": "v2"
-    },
-    "ghcr.io/devcontainers/features/node:1": {
-      "version": "20"
-    },
-    "ghcr.io/devcontainers/features/git:1": {},
-    "ghcr.io/devcontainers/features/common-utils:2": {
-      "configureZshAsDefaultShell": true
-    },
-    "ghcr.io/devcontainers/features/sshd:1": {
-      "version": "latest"
-    }
-  },
-
-  // Forward ports for development
-  "forwardPorts": [9001],
-  "portsAttributes": {
-    "9001": {
-      "label": "Superset (via Webpack Dev Server)",
-      "onAutoForward": "notify",
-      "visibility": "public"
-    }
-  },
-
-  // Run commands after container is created
-  "postCreateCommand": "bash .devcontainer/setup-dev.sh || echo '⚠️ Setup had issues - run .devcontainer/setup-dev.sh manually'",
-
-  // Auto-start Superset after ensuring Docker is ready
-  // Run in foreground to see any errors, but don't block on failures
-  "postStartCommand": "bash -c 'echo \"Waiting 30s for services to initialize...\"; sleep 30; .devcontainer/start-superset.sh || echo \"⚠️ Auto-start failed - run start-superset manually\"'",
-
-  // Set environment variables
-  "remoteEnv": {
-    // Removed automatic venv activation to prevent startup issues
-    // The setup script will handle this
-  },
-
-  // VS Code customizations
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "ms-python.python",
-        "ms-python.vscode-pylance",
-        "charliermarsh.ruff",
-        "dbaeumer.vscode-eslint",
-        "esbenp.prettier-vscode"
-      ]
-    }
-  }
-}

.devcontainer/setup-dev.sh

@@ -1,78 +0,0 @@
-#!/bin/bash
-# Setup script for Superset Codespaces development environment
-
-echo "🔧 Setting up Superset development environment..."
-
-# System dependencies and uv are now pre-installed in the Docker image
-# This speeds up Codespace creation significantly!
-
-# Create virtual environment using uv
-echo "🐍 Creating Python virtual environment..."
-if ! uv venv; then
-    echo "❌ Failed to create virtual environment"
-    exit 1
-fi
-
-# Install Python dependencies
-echo "📦 Installing Python dependencies..."
-if ! uv pip install -r requirements/development.txt; then
-    echo "❌ Failed to install Python dependencies"
-    echo "💡 You may need to run this manually after the Codespace starts"
-    exit 1
-fi
-
-# Install pre-commit hooks
-echo "🪝 Installing pre-commit hooks..."
-if source .venv/bin/activate && pre-commit install; then
-    echo "✅ Pre-commit hooks installed"
-else
-    echo "⚠️  Pre-commit hooks installation failed (non-critical)"
-fi
-
-# Install Claude Code CLI via npm
-echo "🤖 Installing Claude Code..."
-if npm install -g @anthropic-ai/claude-code; then
-    echo "✅ Claude Code installed"
-else
-    echo "⚠️  Claude Code installation failed (non-critical)"
-fi
-
-# Make the start script executable
-chmod +x .devcontainer/start-superset.sh
-
-# Add bashrc additions for automatic venv activation
-echo "🔧 Setting up automatic environment activation..."
-if [ -f ~/.bashrc ]; then
-    # Check if we've already added our additions
-    if ! grep -q "Superset Codespaces environment setup" ~/.bashrc; then
-        echo "" >> ~/.bashrc
-        cat .devcontainer/bashrc-additions >> ~/.bashrc
-        echo "✅ Added automatic venv activation to ~/.bashrc"
-    else
-        echo "✅ Bashrc additions already present"
-    fi
-else
-    # Create bashrc if it doesn't exist
-    cat .devcontainer/bashrc-additions > ~/.bashrc
-    echo "✅ Created ~/.bashrc with automatic venv activation"
-fi
-
-# Also add to zshrc since that's the default shell
-if [ -f ~/.zshrc ] || [ -n "$ZSH_VERSION" ]; then
-    if ! grep -q "Superset Codespaces environment setup" ~/.zshrc; then
-        echo "" >> ~/.zshrc
-        cat .devcontainer/bashrc-additions >> ~/.zshrc
-        echo "✅ Added automatic venv activation to ~/.zshrc"
-    fi
-fi
-
-echo "✅ Development environment setup complete!"
-echo ""
-echo "📝 The virtual environment will be automatically activated in new terminals"
-echo ""
-echo "🔄 To activate in this terminal, run:"
-echo "   source ~/.bashrc"
-echo ""
-echo "🚀 To start Superset:"
-echo "   start-superset"
-echo ""

.devcontainer/start-superset.sh

@@ -1,108 +0,0 @@
-#!/bin/bash
-# Startup script for Superset in Codespaces
-
-# Log to a file for debugging
-LOG_FILE="/tmp/superset-startup.log"
-echo "[$(date)] Starting Superset startup script" >> "$LOG_FILE"
-echo "[$(date)] User: $(whoami), PWD: $(pwd)" >> "$LOG_FILE"
-
-echo "🚀 Starting Superset in Codespaces..."
-echo "🌐 Frontend will be available at port 9001"
-
-# Find the workspace directory (Codespaces clones as 'superset', not 'superset-2')
-WORKSPACE_DIR=$(find /workspaces -maxdepth 1 -name "superset*" -type d | head -1)
-if [ -n "$WORKSPACE_DIR" ]; then
-    cd "$WORKSPACE_DIR"
-    echo "📁 Working in: $WORKSPACE_DIR"
-else
-    echo "📁 Using current directory: $(pwd)"
-fi
-
-# Wait for Docker to be available
-echo "⏳ Waiting for Docker to start..."
-echo "[$(date)] Waiting for Docker..." >> "$LOG_FILE"
-max_attempts=30
-attempt=0
-while ! docker info > /dev/null 2>&1; do
-    if [ $attempt -eq $max_attempts ]; then
-        echo "❌ Docker failed to start after $max_attempts attempts"
-        echo "[$(date)] Docker failed to start after $max_attempts attempts" >> "$LOG_FILE"
-        echo "🔄 Please restart the Codespace or run this script manually later"
-        exit 1
-    fi
-    echo "   Attempt $((attempt + 1))/$max_attempts..."
-    echo "[$(date)] Docker check attempt $((attempt + 1))/$max_attempts" >> "$LOG_FILE"
-    sleep 2
-    attempt=$((attempt + 1))
-done
-echo "✅ Docker is ready!"
-echo "[$(date)] Docker is ready" >> "$LOG_FILE"
-
-# Check if Superset containers are already running
-if docker ps | grep -q "superset"; then
-    echo "✅ Superset containers are already running!"
-    echo ""
-    echo "🌐 To access Superset:"
-    echo "   1. Click the 'Ports' tab at the bottom of VS Code"
-    echo "   2. Find port 9001 and click the globe icon to open"
-    echo "   3. Wait 10-20 minutes for initial startup"
-    echo ""
-    echo "📝 Login credentials: admin/admin"
-    exit 0
-fi
-
-# Clean up any existing containers
-echo "🧹 Cleaning up existing containers..."
-docker-compose -f docker-compose-light.yml down
-
-# Start services
-echo "🏗️  Starting Superset in background (daemon mode)..."
-echo ""
-
-# Start in detached mode
-docker-compose -f docker-compose-light.yml up -d
-
-echo ""
-echo "✅ Docker Compose started successfully!"
-echo ""
-echo "📋 Important information:"
-echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-echo "⏱️  Initial startup takes 10-20 minutes"
-echo "🌐 Check the 'Ports' tab for your Superset URL (port 9001)"
-echo "👤 Login: admin / admin"
-echo ""
-echo "📊 Useful commands:"
-echo "   docker-compose -f docker-compose-light.yml logs -f    # Follow logs"
-echo "   docker-compose -f docker-compose-light.yml ps         # Check status"
-echo "   docker-compose -f docker-compose-light.yml down       # Stop services"
-echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-echo ""
-echo "💤 Keeping terminal open for 60 seconds to test persistence..."
-sleep 60
-echo "✅ Test complete - check if this terminal is still visible!"
-
-# Show final status
-docker-compose -f docker-compose-light.yml ps
-EXIT_CODE=$?
-
-# If it failed, provide helpful instructions
-if [ $EXIT_CODE -ne 0 ] && [ $EXIT_CODE -ne 130 ]; then  # 130 is Ctrl+C
-    echo ""
-    echo "❌ Superset startup failed (exit code: $EXIT_CODE)"
-    echo ""
-    echo "🔄 To restart Superset, run:"
-    echo "   .devcontainer/start-superset.sh"
-    echo ""
-    echo "🔧 For troubleshooting:"
-    echo "   # View logs:"
-    echo "   docker-compose -f docker-compose-light.yml logs"
-    echo ""
-    echo "   # Clean restart (removes volumes):"
-    echo "   docker-compose -f docker-compose-light.yml down -v"
-    echo "   .devcontainer/start-superset.sh"
-    echo ""
-    echo "   # Common issues:"
-    echo "   - Network timeouts: Just retry, often transient"
-    echo "   - Port conflicts: Check 'docker ps'"
-    echo "   - Database issues: Try clean restart with -v"
-fi

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -42,7 +42,7 @@ body:
       options:
         - master / latest-dev
         - "5.0.0"
-        - "4.1.3"
+        - "4.1.2"
     validations:
       required: true
   - type: dropdown

.github/copilot-instructions.md

@@ -1 +0,0 @@
-../LLMS.md

.github/workflows/claude.yml

@@ -1,82 +0,0 @@
-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"

.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=superset/sql/ ./tests/unit_tests/sql/ --cache-clear --cov-fail-under=100
+          pytest --durations-min=0.5 --cov-report= --cov=superset/sql/ ./tests/unit_tests/sql/ --cache-clear --cov-fail-under=100
       - name: Upload code coverage
         uses: codecov/codecov-action@v5
         with:

.github/workflows/welcome-new-users.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Welcome Message
-        uses: actions/first-interaction@v2
+        uses: actions/first-interaction@v1
         continue-on-error: true
         with:
           repo-token: ${{ github.token }}

.gitignore

@@ -92,7 +92,6 @@ scripts/*.zip
 # IntelliJ
 *.iml
 venv
-.venv
 @eaDir/
 
 # PyCharm
@@ -127,7 +126,4 @@ docker/*local*
 # Jest test report
 test-report.html
 superset/static/stats/statistics.html
-
-# LLM-related
-CLAUDE.local.md
 .aider*

.pre-commit-config.yaml

@@ -52,6 +52,14 @@ 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
@@ -68,7 +76,7 @@ repos:
       files: ^docs/.*\.(js|jsx|ts|tsx)$
     - id: type-checking-frontend
       name: Type-Checking (Frontend)
-      entry: ./scripts/check-type.js package=superset-frontend excludeDeclarationDir=cypress-base
+      entry: bash -c './scripts/check-type.js package=superset-frontend excludeDeclarationDir=cypress-base'
       language: system
       files: ^superset-frontend\/.*\.(js|jsx|ts|tsx)$
       exclude: ^superset-frontend/cypress-base\/
@@ -89,9 +97,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
@@ -105,10 +113,9 @@ repos:
         - |
           TARGET_BRANCH=${GITHUB_BASE_REF:-master}
           git fetch origin "$TARGET_BRANCH"
-          BASE=$(git merge-base origin/"$TARGET_BRANCH" HEAD)
-          files=$(git diff --name-only --diff-filter=ACM "$BASE"..HEAD | grep '^superset/.*\.py$' || true)
+          files=$(git diff --name-only --diff-filter=ACM origin/"$TARGET_BRANCH"..HEAD | grep '^superset/.*\.py$' || true)
           if [ -n "$files" ]; then
-            pylint --rcfile=.pylintrc --load-plugins=superset.extensions.pylint --reports=no $files
+            pylint --rcfile=.pylintrc --load-plugins=superset.extensions.pylint $files
           else
             echo "No Python files to lint."
           fi

.rat-excludes

@@ -76,11 +76,3 @@ ydb.svg
 erd.puml
 erd.svg
 intro_header.txt
-
-# for LLMs
-llm-context.md
-LLMS.md
-CLAUDE.md
-CURSOR.md
-GEMINI.md
-GPT.md

CHANGELOG/4.1.3.md

@@ -1,58 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-## 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)

CLAUDE.md

@@ -1 +0,0 @@
-LLMS.md

Dockerfile

@@ -59,7 +59,7 @@ RUN mkdir -p /app/superset/static/assets \
 # NOTE: we mount packages and plugins as they are referenced in package.json as workspaces
 # ideally we'd COPY only their package.json. Here npm ci will be cached as long
 # as the full content of these folders don't change, yielding a decent cache reuse rate.
-# Note that it's not possible to selectively COPY or mount using blobs.
+# Note that's it's not possible selectively COPY of mount using blobs.
 RUN --mount=type=bind,source=./superset-frontend/package.json,target=./package.json \
     --mount=type=bind,source=./superset-frontend/package-lock.json,target=./package-lock.json \
     --mount=type=cache,target=/root/.cache \
@@ -74,7 +74,7 @@ RUN --mount=type=bind,source=./superset-frontend/package.json,target=./package.j
 COPY superset-frontend /app/superset-frontend
 
 ######################################################################
-# superset-node is used for compiling frontend assets
+# superset-node used for compile frontend assets
 ######################################################################
 FROM superset-node-ci AS superset-node
 
@@ -90,7 +90,7 @@ RUN --mount=type=cache,target=/root/.npm \
 # Copy translation files
 COPY superset/translations /app/superset/translations
 
-# Build translations if enabled, then cleanup localization files
+# Build the frontend if not in dev mode
 RUN if [ "$BUILD_TRANSLATIONS" = "true" ]; then \
         npm run build-translation; \
     fi; \
@@ -167,7 +167,7 @@ RUN mkdir -p \
     && touch superset/static/version_info.json
 
 # Install Playwright and optionally setup headless browsers
-ARG INCLUDE_CHROMIUM="false"
+ARG INCLUDE_CHROMIUM="true"
 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 -e .
+    uv pip install .
 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 -e .
+    uv pip install .
 
 RUN uv pip install .[postgres]
 RUN python -m compileall /app/superset

GEMINI.md

@@ -1 +0,0 @@
-LLMS.md

GPT.md

@@ -1 +0,0 @@
-LLMS.md

LLMS.md

@@ -1,191 +0,0 @@
-# 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.

UPDATING.md

@@ -23,10 +23,7 @@ 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.

docker-compose-image-tag.yml

@@ -20,9 +20,6 @@
 # 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:

docker-compose-light.yml

@@ -1,157 +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.
-#
-
-# -----------------------------------------------------------------------
-# 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

docker-compose-non-dev.yml

@@ -20,9 +20,6 @@
 # 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

docker-compose.yml

@@ -20,9 +20,6 @@
 # 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

docker/.env

@@ -53,12 +53,7 @@ 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
@@ -71,3 +66,4 @@ 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

docker/frontend-mem-nag.sh

@@ -23,57 +23,25 @@ MIN_MEM_FREE_GB=3
 MIN_MEM_FREE_KB=$(($MIN_MEM_FREE_GB*1000000))
 
 echo_mem_warn() {
-  # Check if running in Codespaces first
-  if [[ -n "${CODESPACES}" ]]; then
-    echo "Memory available: Codespaces managed"
-    return
-  fi
+  MEM_FREE_KB=$(awk '/MemFree/ { printf "%s \n", $2 }' /proc/meminfo)
+  MEM_FREE_GB=$(awk '/MemFree/ { printf "%s \n", $2/1024/1024 }' /proc/meminfo)
 
-  # Check platform and get memory accordingly
-  if [[ -f /proc/meminfo ]]; then
-    # Linux
-    if grep -q MemAvailable /proc/meminfo; then
-      MEM_AVAIL_KB=$(awk '/MemAvailable/ { printf "%s \n", $2 }' /proc/meminfo)
-      MEM_AVAIL_GB=$(awk '/MemAvailable/ { printf "%s \n", $2/1024/1024 }' /proc/meminfo)
-    else
-      MEM_AVAIL_KB=$(awk '/MemFree/ { printf "%s \n", $2 }' /proc/meminfo)
-      MEM_AVAIL_GB=$(awk '/MemFree/ { printf "%s \n", $2/1024/1024 }' /proc/meminfo)
-    fi
-  elif [[ "$(uname)" == "Darwin" ]]; then
-    # macOS - use vm_stat to get free memory
-    # vm_stat reports in pages, typically 4096 bytes per page
-    PAGE_SIZE=$(pagesize)
-    FREE_PAGES=$(vm_stat | awk '/Pages free:/ {print $3}' | tr -d '.')
-    INACTIVE_PAGES=$(vm_stat | awk '/Pages inactive:/ {print $3}' | tr -d '.')
-    # Free + inactive pages give us available memory (similar to MemAvailable on Linux)
-    AVAIL_PAGES=$((FREE_PAGES + INACTIVE_PAGES))
-    MEM_AVAIL_KB=$((AVAIL_PAGES * PAGE_SIZE / 1024))
-    MEM_AVAIL_GB=$(echo "scale=2; $MEM_AVAIL_KB / 1024 / 1024" | bc)
-  else
-    # Other platforms
-    echo "Memory available: Unable to determine"
-    return
-  fi
-
-  if [[ "${MEM_AVAIL_KB}" -lt "${MIN_MEM_FREE_KB}" ]]; then
+  if [[ "${MEM_FREE_KB}" -lt "${MIN_MEM_FREE_KB}" ]]; then
     cat <<EOF
     ===============================================
     ========  Memory Insufficient Warning =========
     ===============================================
 
-    It looks like you only have ${MEM_AVAIL_GB}GB of
-    memory ${MEM_TYPE}. Please increase your Docker
+    It looks like you only have ${MEM_FREE_GB}GB of
+    memory free. Please increase your Docker
     resources to at least ${MIN_MEM_FREE_GB}GB
 
-    Note: During builds, available memory may be
-    temporarily low due to caching and compilation.
-
     ===============================================
     ========  Memory Insufficient Warning =========
     ===============================================
 EOF
   else
-    echo "Memory available: ${MEM_AVAIL_GB} GB"
+    echo "Memory check Ok [${MEM_FREE_GB}GB free]"
   fi
 }
 

docker/pythonpath_dev/.gitignore

@@ -20,5 +20,4 @@
 # DON'T ignore the .gitignore
 !.gitignore
 !superset_config.py
-!superset_config_docker_light.py
 !superset_config_local.example

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: F403
+    from superset_config_docker import *  # noqa
 
     logger.info(
         f"Loaded your Docker configuration at [{superset_config_docker.__file__}]"

docker/pythonpath_dev/superset_config_docker_light.py

@@ -1,37 +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.
-#
-# 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]

docs/.eslintrc.js

@@ -1,5 +1,4 @@
-import Owner from 'src/types/Owner';
-
+/* eslint-env node */
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,14 +17,31 @@ import Owner from 'src/types/Owner';
  * specific language governing permissions and limitations
  * under the License.
  */
-export type ThemeObject = {
-  id?: number;
-  uuid?: string;
-  is_system?: boolean;
-  changed_on_delta_humanized?: string;
-  created_on?: string;
-  changed_by?: Owner;
-  created_by?: Owner;
-  json_data?: string;
-  theme_name: string;
+module.exports = {
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:react/recommended',
+    'plugin:prettier/recommended',
+  ],
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    ecmaFeatures: {
+      jsx: true,
+    },
+    ecmaVersion: 2020,
+    sourceType: 'module',
+  },
+  plugins: ['@typescript-eslint', 'react', 'prettier'],
+  rules: {
+    'react/react-in-jsx-scope': 'off',
+    'react/prop-types': 'off',
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
+  },
+  settings: {
+    react: {
+      version: 'detect',
+    },
+  },
+  ignorePatterns: ['build/**/*', '.docusaurus/**/*', 'node_modules/**/*'],
 };

docs/docs/configuration/map-tiles.mdx

@@ -1,78 +0,0 @@
----
-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",
-        ],
-        ...
-}
-```

docs/docs/configuration/theming.mdx

@@ -10,143 +10,44 @@ 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.
 
-## Managing Themes via CRUD Interface
+## 1 — Create a theme
 
-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
+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.
 
 You can also extend with Superset-specific tokens (documented in the default theme object) before you import.
 
-### 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
+## 2 — Apply it instance-wide
 
 ```python
 # superset_config.py
-
-# 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
+THEME = {
+    # Paste your JSON theme definition here
 }
 ```
 
-### Copying Themes from CRUD Interface
+Restart Superset to apply changes
 
-To use a theme created via the CRUD interface as your system default:
-
-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
-
-Restart Superset to apply changes.
-
-## Theme Development Workflow
-
-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
-
-## Custom Fonts
-
-Superset supports custom fonts through runtime configuration, allowing you to use branded or custom typefaces without rebuilding the application.
-
-### Configuring Custom Fonts
-
-Add font URLs to your `superset_config.py`:
+## 3 — Tweak live in the app (beta)
 
+Set the feature flag in your `superset_config`
 ```python
-# Load fonts from Google Fonts, Adobe Fonts, or self-hosted sources
-CUSTOM_FONT_URLS = [
-    "https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap",
-    "https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@400;500&display=swap",
-]
-
-# Update CSP to allow font sources
-TALISMAN_CONFIG = {
-    "content_security_policy": {
-        "font-src": ["'self'", "https://fonts.googleapis.com", "https://fonts.gstatic.com"],
-        "style-src": ["'self'", "'unsafe-inline'", "https://fonts.googleapis.com"],
-    }
+DEFAULT_FEATURE_FLAGS: dict[str, bool] = {
+    {{ ... }}
+    THEME_ALLOW_THEME_EDITOR_BETA = True,
 }
 ```
 
-### Using Custom Fonts in Themes
+- 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
 
-Once configured, reference the fonts in your theme configuration:
+## 4 — Potential Next Steps
 
-```python
-THEME_DEFAULT = {
-    "token": {
-        "fontFamily": "Inter, -apple-system, BlinkMacSystemFont, sans-serif",
-        "fontFamilyCode": "JetBrains Mono, Monaco, monospace",
-        # ... other theme tokens
-    }
-}
-```
-
-Or in the CRUD interface theme JSON:
-
-```json
-{
-  "token": {
-    "fontFamily": "Inter, -apple-system, BlinkMacSystemFont, sans-serif",
-    "fontFamilyCode": "JetBrains Mono, Monaco, monospace"
-  }
-}
-```
-
-### Font Sources
-
-- **Google Fonts**: Free, CDN-hosted fonts with wide variety
-- **Adobe Fonts**: Premium fonts (requires subscription and kit ID)
-- **Self-hosted**: Place font files in `/static/assets/fonts/` and reference via CSS
-
-This feature works with the stock Docker image - no custom build required!
-
-## 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
-- **Custom Fonts**: Load external fonts via configuration without rebuilding
+- CRUD UI for managing multiple themes
+- Per-dashboard & per-workspace theme assignment
+- User-selectable theme preferences

docs/docs/contributing/development.mdx

@@ -120,78 +120,6 @@ docker volume rm superset_db_home
 docker-compose up
 ```
 
-## GitHub Codespaces (Cloud Development)
-
-GitHub Codespaces provides a complete, pre-configured development environment in the cloud. This is ideal for:
-- Quick contributions without local setup
-- Consistent development environments across team members
-- Working from devices that can't run Docker locally
-- Safe experimentation in isolated environments
-
-:::info
-We're grateful to GitHub for providing this excellent cloud development service that makes
-contributing to Apache Superset more accessible to developers worldwide.
-:::
-
-### Getting Started with Codespaces
-
-1. **Create a Codespace**: Use this pre-configured link that sets up everything you need:
-
-   [**Launch Superset Codespace →**](https://github.com/codespaces/new?skip_quickstart=true&machine=standardLinux32gb&repo=39464018&ref=master&devcontainer_path=.devcontainer%2Fdevcontainer.json&geo=UsWest)
-
-   :::caution
-   **Important**: You must select at least the **4 CPU / 16GB RAM** machine type (pre-selected in the link above).
-   Smaller instances will not have sufficient resources to run Superset effectively.
-   :::
-
-2. **Wait for Setup**: The initial setup takes several minutes. The Codespace will:
-   - Build the development container
-   - Install all dependencies
-   - Start all required services (PostgreSQL, Redis, etc.)
-   - Initialize the database with example data
-
-3. **Access Superset**: Once ready, check the **PORTS** tab in VS Code for port `9001`.
-   Click the globe icon to open Superset in your browser.
-   - Default credentials: `admin` / `admin`
-
-### Key Features
-
-- **Auto-reload**: Both Python and TypeScript files auto-refresh on save
-- **Pre-installed Extensions**: VS Code extensions for Python, TypeScript, and database tools
-- **Multiple Instances**: Run multiple Codespaces for different branches/features
-- **SSH Access**: Connect via terminal using `gh cs ssh` or through the GitHub web UI
-- **VS Code Integration**: Works seamlessly with VS Code desktop app
-
-### Managing Codespaces
-
-- **List active Codespaces**: `gh cs list`
-- **SSH into a Codespace**: `gh cs ssh`
-- **Stop a Codespace**: Via GitHub UI or `gh cs stop`
-- **Delete a Codespace**: Via GitHub UI or `gh cs delete`
-
-### Debugging and Logs
-
-Since Codespaces uses `docker-compose-light.yml`, you can monitor all services:
-
-```bash
-# Stream logs from all services
-docker compose -f docker-compose-light.yml logs -f
-
-# Stream logs from a specific service
-docker compose -f docker-compose-light.yml logs -f superset
-
-# View last 100 lines and follow
-docker compose -f docker-compose-light.yml logs --tail=100 -f
-
-# List all running services
-docker compose -f docker-compose-light.yml ps
-```
-
-:::tip
-Codespaces automatically stop after 30 minutes of inactivity to save resources.
-Your work is preserved and you can restart anytime.
-:::
-
 ## Installing Development Tools
 
 :::note
@@ -266,48 +194,6 @@ 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
@@ -421,6 +307,14 @@ Then make sure you run your WSGI server using the right worker type:
 gunicorn "superset.app:create_app()" -k "geventwebsocket.gunicorn.workers.GeventWebSocketWorker" -b 127.0.0.1:8088 --reload
 ```
 
+You can log anything to the browser console, including objects:
+
+```python
+from superset import app
+app.logger.error('An exception occurred!')
+app.logger.info(form_data)
+```
+
 ### Frontend
 
 Frontend assets (TypeScript, JavaScript, CSS, and images) must be compiled in order to properly display the web UI. The `superset-frontend` directory contains all NPM-managed frontend assets. Note that for some legacy pages there are additional frontend assets bundled with Flask-Appbuilder (e.g. jQuery and bootstrap). These are not managed by NPM and may be phased out in the future.

docs/docs/installation/docker-compose.mdx

@@ -26,14 +26,11 @@ 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 4 major ways we support to run `docker compose`:
+Note that there are 3 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
@@ -47,7 +44,7 @@ Note that there are 4 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 approaches after setting up the requirements for either.
+More on these two approaches after setting up the requirements for either.
 
 ## Requirements
 
@@ -106,36 +103,13 @@ 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 - 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
+### Option #2 - build a set of immutable images from the local branch
 
 ```bash
 docker compose -f docker-compose-non-dev.yml up
 ```
 
-### Option #4 - boot up an official release
+### Option #3 - boot up an official release
 
 ```bash
 # Set the version you want to run

docs/eslint.config.js

@@ -1,75 +0,0 @@
-/* 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([
-  {
-    files: ['**/*.{js,jsx,ts,tsx}'],
-  },
-  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',
-      },
-    },
-  },
-]);

docs/package.json

@@ -15,7 +15,7 @@
     "write-translations": "docusaurus write-translations",
     "write-heading-ids": "docusaurus write-heading-ids",
     "typecheck": "tsc",
-    "eslint": "eslint ."
+    "eslint": "eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "dependencies": {
     "@ant-design/icons": "^6.0.0",
@@ -26,33 +26,30 @@
     "@emotion/styled": "^10.0.27",
     "@saucelabs/theme-github-codeblock": "^0.3.0",
     "@superset-ui/style": "^0.14.23",
-    "antd": "^5.26.7",
+    "antd": "^5.26.3",
     "docusaurus-plugin-less": "^2.0.2",
-    "less": "^4.4.0",
+    "less": "^4.3.0",
     "less-loader": "^12.3.0",
     "prism-react-renderer": "^2.4.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-github-btn": "^1.4.0",
     "react-svg-pan-zoom": "^3.13.1",
-    "swagger-ui-react": "^5.27.1"
+    "swagger-ui-react": "^5.26.0"
   },
   "devDependencies": {
     "@docusaurus/module-type-aliases": "^3.8.1",
     "@docusaurus/tsconfig": "^3.8.1",
-    "@eslint/js": "^9.32.0",
     "@types/react": "^19.1.8",
-    "@typescript-eslint/eslint-plugin": "^8.37.0",
-    "@typescript-eslint/parser": "^8.37.0",
-    "eslint": "^9.31.0",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-prettier": "^5.5.1",
+    "@typescript-eslint/eslint-plugin": "^5.0.0",
+    "@typescript-eslint/parser": "^5.0.0",
+    "eslint": "^8.0.0",
+    "eslint-config-prettier": "^10.1.5",
+    "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.37.5",
-    "globals": "^16.3.0",
-    "prettier": "^3.6.2",
+    "prettier": "^2.0.0",
     "typescript": "~5.8.3",
-    "typescript-eslint": "^8.37.0",
-    "webpack": "^5.101.0"
+    "webpack": "^5.99.9"
   },
   "browserslist": {
     "production": [
@@ -65,6 +62,5 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
-  },
-  "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
+  }
 }

docs/src/pages/index.tsx

@@ -111,7 +111,7 @@ const StyledTitleContainer = styled('div')`
   }
 `;
 
-const StyledButton = styled(Link)`
+const StyledButton = styled(Link as React.ComponentType<any>)`
   border-radius: 10px;
   font-size: 20px;
   font-weight: bold;

docs/src/theme/Root.js

@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+/* eslint-disable no-undef */
 import { useEffect } from 'react';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 
@@ -49,9 +50,7 @@ export default function Root({ children }) {
 
       // Handle route changes for SPA
       const handleRouteChange = () => {
-        if (devMode) {
-          console.log('Route changed to:', window.location.pathname);
-        }
+        devMode && console.log('Route changed to:', window.location.pathname);
 
         // Short timeout to ensure the page has fully rendered
         setTimeout(() => {
@@ -59,9 +58,11 @@ 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',
@@ -84,22 +85,17 @@ export default function Root({ children }) {
         'routeDidUpdate',
       ];
 
-      if (devMode) {
-        console.log('Setting up Docusaurus route listeners');
-      }
+      devMode && console.log('Setting up Docusaurus route listeners');
       possibleEvents.forEach(eventName => {
         document.addEventListener(eventName, () => {
-          if (devMode) {
+          devMode &&
             console.log(`Docusaurus route update detected via ${eventName}`);
-          }
           handleRouteChange();
         });
       });
 
       // Also set up manual history tracking as fallback
-      if (devMode) {
-        console.log('Setting up manual history tracking as fallback');
-      }
+      devMode && console.log('Setting up manual history tracking as fallback');
       const originalPushState = window.history.pushState;
       window.history.pushState = function () {
         originalPushState.apply(this, arguments);

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.3
+version: 0.14.2
 dependencies:
   - name: postgresql
     version: 13.4.4

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.3](https://img.shields.io/badge/Version-0.14.3-informational?style=flat-square)
+![Version: 0.14.2](https://img.shields.io/badge/Version-0.14.2-informational?style=flat-square)
 
 Apache Superset is a modern, enterprise-ready business intelligence web application
 

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:

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 }}

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 }}

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 }}

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 }}

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 }}

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>=27.3.0, <28",
+    "sqlglot>=26.1.3, <27",
     # newer pandas needs 0.9+
     "tabulate>=0.9.0, <1.0",
     "typing-extensions>=4, <5",
@@ -111,7 +111,7 @@ athena = ["pyathena[pandas]>=2, <3"]
 aurora-data-api = ["preset-sqlalchemy-aurora-data-api>=0.2.8,<0.3"]
 bigquery = [
     "pandas-gbq>=0.19.1",
-    "sqlalchemy-bigquery>=1.15.0",
+    "sqlalchemy-bigquery>=1.6.1",
     "google-cloud-bigquery>=3.10.0",
 ]
 clickhouse = ["clickhouse-connect>=0.5.14, <1.0"]
@@ -311,16 +311,15 @@ select = [
     "Q",
     "S",
     "T",
-    "TID",
     "W",
 ]
-
 ignore = [
     "S101",
     "PT006",
     "T201",
     "N999",
 ]
+
 extend-select = ["I"]
 
 # Allow fix for all enabled rules (when `--fix`) is provided.
@@ -330,16 +329,6 @@ 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
@@ -356,9 +345,6 @@ 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"

requirements/base.txt

@@ -378,7 +378,7 @@ sqlalchemy-utils==0.38.3
     # via
     #   apache-superset (pyproject.toml)
     #   flask-appbuilder
-sqlglot==27.3.0
+sqlglot==26.28.1
     # via apache-superset (pyproject.toml)
 sshtunnel==0.4.0
     # via apache-superset (pyproject.toml)

requirements/development.txt

@@ -795,14 +795,14 @@ sqlalchemy==1.4.54
     #   shillelagh
     #   sqlalchemy-bigquery
     #   sqlalchemy-utils
-sqlalchemy-bigquery==1.15.0
+sqlalchemy-bigquery==1.12.0
     # via apache-superset
 sqlalchemy-utils==0.38.3
     # via
     #   -c requirements/base.txt
     #   apache-superset
     #   flask-appbuilder
-sqlglot==27.3.0
+sqlglot==26.28.1
     # via
     #   -c requirements/base.txt
     #   apache-superset

scripts/check-type.js

@@ -32,10 +32,6 @@ 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 {
@@ -49,94 +45,27 @@ void (async () => {
   }
 
   const packageRootDir = await getPackage(packageArg);
-  const changedFiles = removePackageSegment(remainingArgs, packageRootDir);
+  const updatedArgs = removePackageSegment(remainingArgs, packageRootDir);
+  const argsStr = updatedArgs.join(" ");
 
-  // Filter to only TypeScript files
-  const tsFiles = changedFiles.filter(file =>
-    /\.(ts|tsx)$/.test(file) && !DECLARATION_FILE_REGEX.test(file)
+  const excludedDeclarationDirs = getExcludedDeclarationDirs(
+    excludeDeclarationDirArg
   );
-
-  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(
-    join(SUPERSET_ROOT, packageRootDir),
+    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}`;
 
@@ -148,16 +77,14 @@ async function executeTypeCheck(packageRootDirAbsolute, command) {
       console.error(child.stderr);
     }
 
-    if (child.exitCode !== 0) {
-      throw new Error(`Type check failed with exit code ${child.exitCode}`);
-    }
+    exit(child.exitCode);
   } catch (e) {
-    console.error("Failed to execute type checking:", e.message);
+    console.error("Failed to execute type checking:", e);
+    console.error("Package:", packageRootDir);
     console.error("Command:", `tscw ${command}`);
-    throw e;
+    exit(1);
   }
-}
-
+})();
 
 /**
  *
@@ -185,6 +112,7 @@ function shouldExcludeDir(fullPath, excludedDirs) {
  *
  * @returns {Promise<string[]>}
  */
+
 async function getFilesRecursively(dir, regex, excludedDirs) {
   try {
     const files = await readdir(dir, { withFileTypes: true });
@@ -258,6 +186,7 @@ function getExcludedDeclarationDirs(excludeDeclarationDirArg) {
  * @param {RegExp[]} regexes
  * @returns {{ matchedArgs: (string | undefined)[], remainingArgs: string[] }}
  */
+
 function extractArgs(args, regexes) {
   /**
    * @type {(string | undefined)[]}

scripts/python_tests.sh

@@ -33,4 +33,4 @@ superset load-test-users
 
 echo "Running tests"
 
-pytest --durations-min=2 --cov-report= --cov=superset ./tests/integration_tests "$@"
+pytest --durations-min=2 --maxfail=1 --cov-report= --cov=superset ./tests/integration_tests "$@"

superset-embedded-sdk/package-lock.json

@@ -3251,6 +3251,20 @@
         "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",
@@ -3644,19 +3658,6 @@
       "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",
@@ -4063,20 +4064,6 @@
         "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",
@@ -4137,57 +4124,12 @@
         "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",
@@ -4648,22 +4590,6 @@
         }
       }
     },
-    "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",
@@ -4691,13 +4617,10 @@
       }
     },
     "node_modules/function-bind": {
-      "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"
-      }
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
     },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
@@ -4717,30 +4640,6 @@
         "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",
@@ -4750,19 +4649,6 @@
         "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",
@@ -4825,18 +4711,6 @@
         "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",
@@ -4865,45 +4739,6 @@
         "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",
@@ -7092,15 +6927,6 @@
         "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",
@@ -10739,6 +10565,19 @@
         "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": {
@@ -11023,16 +10862,6 @@
       "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",
@@ -11311,17 +11140,6 @@
       "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",
@@ -11365,45 +11183,12 @@
         "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",
@@ -11718,19 +11503,6 @@
       "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",
@@ -11751,9 +11523,9 @@
       "optional": true
     },
     "function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
     "gensync": {
@@ -11768,40 +11540,12 @@
       "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",
@@ -11844,12 +11588,6 @@
       "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",
@@ -11871,30 +11609,6 @@
       "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",
@@ -13505,12 +13219,6 @@
         "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",

superset-frontend/cypress-base/cypress/e2e/chart_list/list.test.ts

@@ -94,12 +94,67 @@ describe('Charts list', () => {
     });
   });
 
+  describe('list mode', () => {
+    before(() => {
+      visitChartList();
+      setGridMode('list');
+    });
+
+    it('should load rows in list mode', () => {
+      cy.getBySel('listview-table').should('be.visible');
+      cy.getBySel('sort-header').eq(1).contains('Name');
+      cy.getBySel('sort-header').eq(2).contains('Type');
+      cy.getBySel('sort-header').eq(3).contains('Dataset');
+      cy.getBySel('sort-header').eq(4).contains('On dashboards');
+      cy.getBySel('sort-header').eq(5).contains('Owners');
+      cy.getBySel('sort-header').eq(6).contains('Last modified');
+      cy.getBySel('sort-header').eq(7).contains('Actions');
+    });
+
+    it('should bulk select in list mode', () => {
+      toggleBulkSelect();
+      cy.get('[aria-label="Select all"]').click();
+      cy.get('input[type="checkbox"]:checked').should('have.length', 26);
+      cy.getBySel('bulk-select-copy').contains('25 Selected');
+      cy.getBySel('bulk-select-action')
+        .should('have.length', 2)
+        .then($btns => {
+          expect($btns).to.contain('Delete');
+          expect($btns).to.contain('Export');
+        });
+      cy.getBySel('bulk-select-deselect-all').click();
+      cy.get('input[type="checkbox"]:checked').should('have.length', 0);
+      cy.getBySel('bulk-select-copy').contains('0 Selected');
+      cy.getBySel('bulk-select-action').should('not.exist');
+    });
+  });
+
   describe('card mode', () => {
     before(() => {
       visitChartList();
       setGridMode('card');
     });
 
+    it('should load rows in card mode', () => {
+      cy.getBySel('listview-table').should('not.exist');
+      cy.getBySel('styled-card').should('have.length', 25);
+    });
+
+    it('should bulk select in card mode', () => {
+      toggleBulkSelect();
+      cy.getBySel('styled-card').click({ multiple: true });
+      cy.getBySel('bulk-select-copy').contains('25 Selected');
+      cy.getBySel('bulk-select-action')
+        .should('have.length', 2)
+        .then($btns => {
+          expect($btns).to.contain('Delete');
+          expect($btns).to.contain('Export');
+        });
+      cy.getBySel('bulk-select-deselect-all').click();
+      cy.getBySel('bulk-select-copy').contains('0 Selected');
+      cy.getBySel('bulk-select-action').should('not.exist');
+    });
+
     it('should preserve other filters when sorting', () => {
       cy.getBySel('styled-card').should('have.length', 25);
       setFilter('Type', 'Big Number');

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)', { timeout: 15000 })
+  cy.get('.ant-dropdown:not(.ant-dropdown-hidden)')
     .should('be.visible')
     .find("[role='menu'] [role='menuitem']")
     .contains(/^Drill by$/)
@@ -65,16 +65,11 @@ const drillBy = (targetDrillByColumn: string, isLegacy = false) => {
   )
     .should('be.visible')
     .find('[role="menuitem"]')
-    .contains(new RegExp(`^${targetDrillByColumn}$`))
-    .click();
-
-  cy.get(
-    '.ant-dropdown-menu-submenu:not(.ant-dropdown-menu-submenu-hidden) [data-test="drill-by-submenu"]',
-  ).trigger('mouseout', { clientX: 0, clientY: 0, force: true });
-
-  cy.get(
-    '.ant-dropdown-menu-submenu:not(.ant-dropdown-menu-submenu-hidden) [data-test="drill-by-submenu"]',
-  ).should('not.exist');
+    .then($el => {
+      cy.wrap($el)
+        .contains(new RegExp(`^${targetDrillByColumn}$`))
+        .trigger('keydown', { keyCode: 13, which: 13, force: true });
+    });
 
   if (isLegacy) {
     return cy.wait('@legacyData');
@@ -245,7 +240,7 @@ describe('Drill by modal', () => {
       SUPPORTED_TIER1_CHARTS.forEach(waitForChartLoad);
     });
 
-    it.only('opens the modal from the context menu', () => {
+    it('opens the modal from the context menu', () => {
       openTableContextMenu('boy');
       drillBy('state').then(intercepted => {
         verifyExpectedFormData(intercepted, {
@@ -534,7 +529,7 @@ describe('Drill by modal', () => {
       ]);
     });
 
-    it.skip('Bar Chart', () => {
+    it('Bar Chart', () => {
       testEchart('echarts_timeseries_bar', 'Bar Chart', [
         [85, 94],
         [490, 68],
@@ -617,7 +612,7 @@ describe('Drill by modal', () => {
       ]);
     });
 
-    it.skip('Mixed Chart', () => {
+    it('Mixed Chart', () => {
       cy.get('[data-test-viz-type="mixed_timeseries"] canvas').then($canvas => {
         // click 'boy'
         cy.wrap($canvas).scrollIntoView();

superset-frontend/cypress-base/cypress/e2e/dashboard/horizontalFilterBar.test.ts

@@ -154,7 +154,6 @@ 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);

superset-frontend/cypress-base/cypress/e2e/dashboard/nativeFilters.test.ts

@@ -22,7 +22,6 @@ import {
   dataTestChartName,
 } from 'cypress/support/directories';
 
-import { waitForChartLoad } from 'cypress/utils';
 import {
   addParentFilterWithValue,
   applyNativeFilterValueWithIndex,
@@ -161,74 +160,6 @@ describe('Native filters', () => {
       );
     });
 
-    it('Dependent filter selects first item based on parent filter selection', () => {
-      prepareDashboardFilters([
-        { name: 'region', column: 'region', datasetId: 2 },
-        { name: 'country_name', column: 'country_name', datasetId: 2 },
-      ]);
-
-      enterNativeFilterEditModal();
-
-      selectFilter(0);
-      cy.get(nativeFilters.filterConfigurationSections.displayedSection).within(
-        () => {
-          cy.contains('Select first filter value by default')
-            .should('be.visible')
-            .click();
-        },
-      );
-      cy.get(nativeFilters.filterConfigurationSections.displayedSection).within(
-        () => {
-          cy.contains('Can select multiple values ')
-            .should('be.visible')
-            .click();
-        },
-      );
-
-      selectFilter(1);
-      cy.get(nativeFilters.filterConfigurationSections.displayedSection).within(
-        () => {
-          cy.contains('Values are dependent on other filters')
-            .should('be.visible')
-            .click();
-        },
-      );
-      cy.get(nativeFilters.filterConfigurationSections.displayedSection).within(
-        () => {
-          cy.contains('Can select multiple values ')
-            .should('be.visible')
-            .click();
-        },
-      );
-      addParentFilterWithValue(0, testItems.topTenChart.filterColumnRegion);
-      cy.get(nativeFilters.filterConfigurationSections.displayedSection).within(
-        () => {
-          cy.contains('Select first filter value by default')
-            .should('be.visible')
-            .click();
-        },
-      );
-
-      // cannot use saveNativeFilterSettings because there is a bug which
-      // sometimes does not allow charts to load when enabling the 'Select first filter value by default'
-      // to be saved when using dependent filters so,
-      // you reload the window.
-      cy.get(nativeFilters.modal.footer)
-        .contains('Save')
-        .should('be.visible')
-        .click({ force: true });
-
-      cy.get(nativeFilters.modal.container).should('not.exist');
-      cy.reload();
-
-      applyNativeFilterValueWithIndex(0, 'North America');
-
-      // Check that dependent filter auto-selects the first item
-      cy.get(nativeFilters.filterFromDashboardView.filterContent)
-        .eq(1)
-        .should('contain.text', 'Bermuda');
-    });
-
     it('User can create filter depend on 2 other filters', () => {
       prepareDashboardFilters([
         { name: 'region', column: 'region', datasetId: 2 },

superset-frontend/cypress-base/cypress/e2e/explore/chart.test.js

@@ -68,13 +68,11 @@ function verifyDashboardSearch() {
 function verifyDashboardLink() {
   interceptDashboardGet();
   openDashboardsAddedTo();
-  cy.get('.ant-dropdown-menu-submenu-popup').trigger('mouseover', {
-    force: true,
-  });
+  cy.get('.ant-dropdown-menu-submenu-popup').trigger('mouseover');
   cy.get('.ant-dropdown-menu-submenu-popup a')
     .first()
     .invoke('removeAttr', 'target')
-    .click({ force: true });
+    .click();
   cy.wait('@get');
 }
 

superset-frontend/jest.config.js

@@ -56,7 +56,7 @@ module.exports = {
   ],
   coverageReporters: ['lcov', 'json-summary', 'html', 'text'],
   transformIgnorePatterns: [
-    '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)',
+    '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)',
   ],
   preset: 'ts-jest',
   transform: {

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": "cd plugins/legacy-plugin-chart-country-map/scripts && jupyter nbconvert --to notebook --execute --inplace --allow-errors --ExecutePreprocessor.timeout=1200 'Country Map GeoJSON Generator.ipynb'",
+    "update-maps": "jupyter nbconvert --to notebook --execute --inplace 'plugins/legacy-plugin-chart-country-map/scripts/Country Map GeoJSON Generator.ipynb' -Xfrozen_modules=off",
     "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",
@@ -121,8 +121,8 @@
     "@visx/scale": "^3.5.0",
     "@visx/tooltip": "^3.0.0",
     "@visx/xychart": "^3.5.1",
-    "ag-grid-community": "^34.0.2",
-    "ag-grid-react": "34.0.2",
+    "ag-grid-community": "33.1.1",
+    "ag-grid-react": "33.1.1",
     "antd": "^5.24.6",
     "chrono-node": "^2.7.8",
     "classnames": "^2.2.5",
@@ -145,6 +145,7 @@
     "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",
@@ -202,7 +203,6 @@
     "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.6.2",
+    "prettier": "3.5.3",
     "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.18.1",
+    "node": "^20.16.0",
     "npm": "^10.8.1"
   },
   "overrides": {

superset-frontend/packages/generator-superset/package.json

@@ -36,7 +36,7 @@
   "devDependencies": {
     "cross-env": "^7.0.3",
     "fs-extra": "^11.3.0",
-    "jest": "^30.0.4",
+    "jest": "^30.0.2",
     "yeoman-test": "^10.1.1"
   },
   "engines": {

superset-frontend/packages/superset-ui-chart-controls/src/components/ControlHeader.tsx

@@ -18,7 +18,8 @@
  */
 import { ReactNode } from 'react';
 import { t, css } from '@superset-ui/core';
-import { InfoTooltip, Tooltip, Icons } from '@superset-ui/core/components';
+import { InfoCircleOutlined } from '@ant-design/icons';
+import { InfoTooltip, Tooltip } from '@superset-ui/core/components';
 
 type ValidationError = string;
 
@@ -92,7 +93,7 @@ export function ControlHeader({
     <div className="ControlHeader" data-test={`${name}-header`}>
       <div className="pull-left">
         <label className="control-label" htmlFor={name}>
-          {leftNode && <>{leftNode}</>}
+          {leftNode && <span>{leftNode}</span>}
           <span
             role={onClick ? 'button' : undefined}
             {...(onClick ? { onClick, tabIndex: 0 } : {})}
@@ -103,9 +104,9 @@ export function ControlHeader({
           {warning && (
             <span>
               <Tooltip id="error-tooltip" placement="top" title={warning}>
-                <Icons.InfoCircleOutlined
-                  iconSize="m"
+                <InfoCircleOutlined
                   css={theme => css`
+                    font-size: ${theme.sizeUnit * 3}px;
                     color: ${theme.colorError};
                   `}
                 />
@@ -115,9 +116,9 @@ export function ControlHeader({
           {danger && (
             <span>
               <Tooltip id="error-tooltip" placement="top" title={danger}>
-                <Icons.InfoCircleOutlined
-                  iconSize="m"
+                <InfoCircleOutlined
                   css={theme => css`
+                    font-size: ${theme.sizeUnit * 3}px;
                     color: ${theme.colorError};
                   `}
                 />{' '}
@@ -131,9 +132,9 @@ export function ControlHeader({
                 placement="top"
                 title={validationErrors.join(' ')}
               >
-                <Icons.InfoCircleOutlined
-                  iconSize="m"
+                <InfoCircleOutlined
                   css={theme => css`
+                    font-size: ${theme.sizeUnit * 3}px;
                     color: ${theme.colorError};
                   `}
                 />{' '}

superset-frontend/packages/superset-ui-chart-controls/src/components/Select.tsx

@@ -86,9 +86,7 @@ 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}>

superset-frontend/packages/superset-ui-chart-controls/src/sections/echartsTimeSeriesQuery.tsx

@@ -30,7 +30,7 @@ const controlsWithoutXAxis: ControlSetRow[] = [
   ['groupby'],
   [contributionModeControl],
   ['adhoc_filters'],
-  ['limit', 'group_others_when_limit_reached'],
+  ['limit'],
   ['timeseries_limit_metric'],
   ['order_desc'],
   ['row_limit'],

superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/customControls.tsx

@@ -41,53 +41,6 @@ import {
 import { checkColumnType } from '../utils/checkColumnType';
 import { isSortable } from '../utils/isSortable';
 
-// Aggregation choices with computation methods for plugins and controls
-export const aggregationChoices = {
-  raw: {
-    label: 'Overall value',
-    compute: (data: number[]) => {
-      if (!data.length) return null;
-      return data[0];
-    },
-  },
-  LAST_VALUE: {
-    label: 'Last Value',
-    compute: (data: number[]) => {
-      if (!data.length) return null;
-      return data[0];
-    },
-  },
-  sum: {
-    label: 'Total (Sum)',
-    compute: (data: number[]) =>
-      data.length ? data.reduce((a, b) => a + b, 0) : null,
-  },
-  mean: {
-    label: 'Average (Mean)',
-    compute: (data: number[]) =>
-      data.length ? data.reduce((a, b) => a + b, 0) / data.length : null,
-  },
-  min: {
-    label: 'Minimum',
-    compute: (data: number[]) => (data.length ? Math.min(...data) : null),
-  },
-  max: {
-    label: 'Maximum',
-    compute: (data: number[]) => (data.length ? Math.max(...data) : null),
-  },
-  median: {
-    label: 'Median',
-    compute: (data: number[]) => {
-      if (!data.length) return null;
-      const sorted = [...data].sort((a, b) => a - b);
-      const mid = Math.floor(sorted.length / 2);
-      return sorted.length % 2 === 0
-        ? (sorted[mid - 1] + sorted[mid]) / 2
-        : sorted[mid];
-    },
-  },
-} as const;
-
 export const contributionModeControl = {
   name: 'contributionMode',
   config: {
@@ -116,12 +69,17 @@ export const aggregationControl = {
     default: 'LAST_VALUE',
     clearable: false,
     renderTrigger: false,
-    choices: Object.entries(aggregationChoices).map(([value, { label }]) => [
-      value,
-      t(label),
-    ]),
+    choices: [
+      ['raw', t('None')],
+      ['LAST_VALUE', t('Last Value')],
+      ['sum', t('Total (Sum)')],
+      ['mean', t('Average (Mean)')],
+      ['min', t('Minimum')],
+      ['max', t('Maximum')],
+      ['median', t('Median')],
+    ],
     description: t(
-      'Method to compute the displayed value. "Overall value" calculates a single metric across the entire filtered time period, ideal for non-additive metrics like ratios, averages, or distinct counts. Other methods operate over the time series data points.',
+      'Aggregation method used to compute the Big Number from the Trendline.For non-additive metrics like ratios, averages, distinct counts, etc use NONE.',
     ),
     provideFormDataToProps: true,
     mapStateToProps: ({ form_data }: ControlPanelState) => ({

superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/sharedControls.tsx

@@ -177,7 +177,6 @@ const granularity: SharedControlConfig<'SelectControl'> = {
       'can type and use simple natural language as in `10 seconds`, ' +
       '`1 day` or `56 weeks`',
   ),
-  sortComparator: () => 0, // Disable frontend sorting to preserve backend order
 };
 
 const time_grain_sqla: SharedControlConfig<'SelectControl'> = {
@@ -205,7 +204,6 @@ const time_grain_sqla: SharedControlConfig<'SelectControl'> = {
     choices: (datasource as Dataset)?.time_grain_sqla || [],
   }),
   visibility: displayTimeRelatedControls,
-  sortComparator: () => 0, // Disable frontend sorting to preserve backend order
 };
 
 const time_range: SharedControlConfig<'DateFilterControl'> = {
@@ -285,19 +283,6 @@ 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',
@@ -461,7 +446,6 @@ 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,

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

@@ -37,7 +37,7 @@
     "d3-format": "^1.3.2",
     "dayjs": "^1.11.13",
     "d3-interpolate": "^3.0.1",
-    "d3-scale": "^4.0.2",
+    "d3-scale": "^3.0.0",
     "d3-time": "^3.1.0",
     "d3-time-format": "^4.1.0",
     "dompurify": "^3.2.4",
@@ -59,7 +59,7 @@
     "rehype-raw": "^7.0.0",
     "rehype-sanitize": "^6.0.0",
     "remark-gfm": "^4.0.1",
-    "reselect": "^5.1.1",
+    "reselect": "^4.0.0",
     "rison": "^0.1.1",
     "seedrandom": "^3.0.5",
     "@visx/responsive": "^3.12.0",

superset-frontend/packages/superset-ui-core/src/chart/models/ChartProps.ts

@@ -17,8 +17,11 @@
  * under the License.
  */
 
+/** Type checking is disabled for this file due to reselect only supporting
+ * TS declarations for selectors with up to 12 arguments. */
+// @ts-nocheck
 import { RefObject } from 'react';
-import { createSelector, lruMemoize } from 'reselect';
+import { createSelector } from 'reselect';
 import {
   AppSection,
   Behavior,
@@ -34,7 +37,7 @@ import {
   SetDataMaskHook,
 } from '../types/Base';
 import { QueryData, DataRecordFilters } from '..';
-import { supersetTheme, SupersetTheme } from '../../theme';
+import { SupersetTheme } from '../../theme';
 
 // TODO: more specific typing for these fields of ChartProps
 type AnnotationData = PlainObject;
@@ -106,8 +109,6 @@ export interface ChartPropsConfig {
   theme: SupersetTheme;
   /* legend index */
   legendIndex?: number;
-  inContextMenu?: boolean;
-  emitCrossFilters?: boolean;
 }
 
 const DEFAULT_WIDTH = 800;
@@ -160,11 +161,7 @@ export default class ChartProps<FormData extends RawFormData = RawFormData> {
 
   theme: SupersetTheme;
 
-  constructor(
-    config: ChartPropsConfig & { formData?: FormData } = {
-      theme: supersetTheme,
-    },
-  ) {
+  constructor(config: ChartPropsConfig & { formData?: FormData } = {}) {
     const {
       annotationData = {},
       datasource = {},
@@ -279,16 +276,5 @@ ChartProps.createSelector = function create(): ChartPropsSelector {
         emitCrossFilters,
         theme,
       }),
-    // Below config is to retain usage of 1-sized `lruMemoize` object in Reselect v4
-    // Reselect v5 introduces `weakMapMemoize` which is more performant but potentially memory-leaky
-    // due to infinite cache size.
-    // Source: https://github.com/reduxjs/reselect/releases/tag/v5.0.1
-    {
-      memoize: lruMemoize,
-      argsMemoize: lruMemoize,
-      memoizeOptions: {
-        maxSize: 10,
-      },
-    },
   );
 };

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

@@ -35,11 +35,6 @@ 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;
@@ -207,7 +202,7 @@ export function AsyncAceEditor(
 
                 /* Basic editor styles with dark mode support */
                 .ace_editor.ace-github,
-                .ace_editor.ace-tm {
+                .ace_editor.ace-textmate {
                   background-color: ${token.colorBgContainer} !important;
                   color: ${token.colorText} !important;
                 }
@@ -270,7 +265,7 @@ export function AsyncAceEditor(
                 /* Adjust tooltip styles */
                 .ace_tooltip {
                   margin-left: ${token.margin}px;
-                  padding: ${token.sizeUnit * 2}px;
+                  padding: 0px;
                   background-color: ${token.colorBgElevated} !important;
                   color: ${token.colorText} !important;
                   border: 1px solid ${token.colorBorderSecondary};

superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/useJsonValidation.test.ts

@@ -1,75 +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 { 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');
-  });
-});

superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/useJsonValidation.ts

@@ -1,82 +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 { 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]);
-}

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

@@ -17,6 +17,7 @@
  * 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';
@@ -69,6 +70,7 @@ export function Button(props: ButtonProps) {
   if (!buttonStyle || buttonStyle === 'primary') {
     variant = 'solid';
     antdType = 'primary';
+    color = 'primary';
   } else if (buttonStyle === 'secondary') {
     variant = 'filled';
     color = 'primary';
@@ -76,6 +78,7 @@ export function Button(props: ButtonProps) {
     variant = 'outlined';
     color = 'default';
   } else if (buttonStyle === 'dashed') {
+    color = 'primary';
     variant = 'dashed';
     antdType = 'dashed';
   } else if (buttonStyle === 'danger') {
@@ -87,7 +90,6 @@ export function Button(props: ButtonProps) {
   const element = children as ReactElement;
 
   let renderedChildren = [];
-
   if (element && element.type === Fragment) {
     renderedChildren = Children.toArray(element.props.children);
   } else {
@@ -118,7 +120,7 @@ export function Button(props: ButtonProps) {
         display: 'inline-flex',
         alignItems: 'center',
         justifyContent: 'center',
-        lineHeight: 1,
+        lineHeight: 1.5715,
         fontSize: fontSizeSM,
         fontWeight: fontWeightStrong,
         height,
@@ -132,11 +134,6 @@ 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}

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 { useTheme, isThemeDark } from '@superset-ui/core';
+import { themeObject } from '@superset-ui/core';
 
 export type SupportedLanguage = 'sql' | 'htmlbars' | 'markdown' | 'json';
 
@@ -77,7 +77,6 @@ export const CodeSyntaxHighlighter: React.FC<CodeSyntaxHighlighterProps> = ({
   wrapLines = true,
   style: overrideStyle,
 }) => {
-  const theme = useTheme();
   const [isLanguageReady, setIsLanguageReady] = useState(
     registeredLanguages.has(language),
   );
@@ -93,14 +92,14 @@ export const CodeSyntaxHighlighter: React.FC<CodeSyntaxHighlighterProps> = ({
     loadLanguage();
   }, [language]);
 
-  const isDark = isThemeDark(theme);
+  const isDark = themeObject.isThemeDark();
   const themeStyle = overrideStyle || (isDark ? tomorrow : github);
 
   const defaultCustomStyle: React.CSSProperties = {
-    background: theme.colorBgElevated,
-    padding: theme.sizeUnit * 4,
+    background: themeObject.theme.colorBgElevated,
+    padding: themeObject.theme.sizeUnit * 4,
     border: 0,
-    borderRadius: theme.borderRadius,
+    borderRadius: themeObject.theme.borderRadius,
     ...customStyle,
   };
 

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, css } from '@superset-ui/core';
+import { useTheme } 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,
+  validateCheckStatus = false,
   testId,
 }) => {
   const theme = useTheme();
@@ -37,38 +37,36 @@ export const CollapseLabelInModal: React.FC<CollapseLabelInModalProps> = ({
   return (
     <div data-test={testId}>
       <Typography.Title
-        css={css`
-          && {
-            margin-top: 0;
-            margin-bottom: ${theme.sizeUnit / 2}px;
-            font-size: ${theme.fontSizeLG}px;
-          }
-        `}
+        style={{
+          marginTop: 0,
+          marginBottom: theme.sizeUnit / 2,
+          fontSize: theme.fontSizeLG,
+        }}
       >
         {title}{' '}
-        {validateCheckStatus !== undefined &&
-          (validateCheckStatus ? (
-            <Icons.CheckCircleOutlined
-              iconColor={theme.colorSuccess}
-              aria-label="check-circle"
-            />
-          ) : (
-            <span
-              css={css`
-                color: ${theme.colorErrorText};
-                font-size: ${theme.fontSizeLG}px;
-              `}
-            >
-              *
-            </span>
-          ))}
+        {validateCheckStatus ? (
+          <Icons.CheckCircleOutlined
+            style={{ color: theme.colorSuccess }}
+            aria-label="check-circle"
+            role="img"
+          />
+        ) : (
+          <span
+            style={{
+              color: theme.colorErrorText,
+              fontSize: theme.fontSizeLG,
+            }}
+          >
+            *
+          </span>
+        )}
       </Typography.Title>
       <Typography.Paragraph
-        css={css`
-          margin: 0;
-          font-size: ${theme.fontSizeSM}px;
-          color: ${theme.colorTextDescription};
-        `}
+        style={{
+          margin: 0,
+          fontSize: theme.fontSizeSM,
+          color: theme.colorTextDescription,
+        }}
       >
         {subtitle}
       </Typography.Paragraph>

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

@@ -68,7 +68,6 @@ export function ConfirmStatusChange({
         onConfirm={confirm}
         onHide={hide}
         open={open}
-        name="please confirm"
         title={title}
       />
     </>

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

@@ -31,13 +31,17 @@ 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>('');
@@ -77,13 +81,12 @@ export function DeleteModal({
       onHide={hide}
       onHandledPrimaryAction={confirm}
       primaryButtonName={t('Delete')}
-      primaryButtonStyle="danger"
+      primaryButtonType="danger"
       show={open}
-      name={name}
       title={title}
       centered
     >
-      {description}
+      <DescriptionContainer>{description}</DescriptionContainer>
       <StyledDiv>
         <FormLabel htmlFor="delete">
           {t('Type "%s" to confirm', t('DELETE'))}

superset-frontend/packages/superset-ui-core/src/components/DeleteModal/types.ts

@@ -25,5 +25,4 @@ export interface DeleteModalProps {
   onHide: () => void;
   open: boolean;
   title: ReactNode;
-  name?: string;
 }

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

@@ -128,7 +128,7 @@ const ImageContainer = ({
       <Empty
         description={false}
         image={mappedImage}
-        styles={{ image: getImageHeight(size) }}
+        imageStyle={getImageHeight(size)}
       />
     </div>
   );
@@ -144,7 +144,6 @@ export const EmptyState: React.FC<EmptyStateProps> = ({
   description = t('There is currently no information to display.'),
   image = 'empty.svg',
   buttonText,
-  buttonIcon,
   buttonAction,
   size = 'medium',
   children,
@@ -166,7 +165,6 @@ export const EmptyState: React.FC<EmptyStateProps> = ({
       )}
       {buttonText && buttonAction && (
         <Button
-          icon={buttonIcon}
           buttonStyle="primary"
           onClick={buttonAction}
           onMouseDown={handleMouseDown}

superset-frontend/packages/superset-ui-core/src/components/EmptyState/types.ts

@@ -17,7 +17,6 @@
  * under the License.
  */
 import type { ReactNode, SyntheticEvent } from 'react';
-import type { IconType } from '@superset-ui/core/components';
 
 export type EmptyStateSize = 'small' | 'medium' | 'large';
 
@@ -26,7 +25,6 @@ export type EmptyStateProps = {
   description?: ReactNode;
   image?: ReactNode | string;
   buttonText?: ReactNode;
-  buttonIcon?: IconType;
   buttonAction?: (event: SyntheticEvent) => void;
   size?: EmptyStateSize;
   children?: ReactNode;

superset-frontend/packages/superset-ui-core/src/components/Icons/BaseIcon.tsx

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { css, useTheme, getFontSize } from '../..';
+import { css, useTheme, themeObject } 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
-      ? `${getFontSize(theme, iconSize)}px`
+      ? `${themeObject.getFontSize(iconSize)}px`
       : `${theme.fontSize}px`,
     cursor: rest?.onClick ? 'pointer' : undefined,
   };
@@ -76,12 +76,12 @@ export const BaseIconComponent: React.FC<
         style={style}
         width={
           iconSize
-            ? `${getFontSize(theme, iconSize) || theme.fontSize}px`
+            ? `${themeObject.getFontSize(iconSize) || theme.fontSize}px`
             : `${theme.fontSize}px`
         }
         height={
           iconSize
-            ? `${getFontSize(theme, iconSize) || theme.fontSize}px`
+            ? `${themeObject.getFontSize(iconSize) || theme.fontSize}px`
             : `${theme.fontSize}px`
         }
         {...(rest as CustomIconType)}

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, getFontSize } from '@superset-ui/core';
+import { css, t, useTheme, themeObject } from '@superset-ui/core';
 import {
   CloseCircleOutlined,
   InfoCircleOutlined,
@@ -68,7 +68,7 @@ export const InfoTooltip = ({
 
   const iconCss = css`
     color: ${variant?.color ?? theme.colorIcon};
-    font-size: ${getFontSize(theme, iconSize)}px;
+    font-size: ${themeObject.getFontSize(iconSize)}px;
   `;
 
   const handleKeyDown = (event: KeyboardEvent<HTMLSpanElement>) => {

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, getColorVariants } from '@superset-ui/core';
+import { useTheme, themeObject } 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 = getColorVariants(theme, type);
+  const baseColor = themeObject.getColorVariants(type);
   const color = baseColor.active;
   const borderColor = baseColor.border;
   const backgroundColor = baseColor.bg;

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, useTheme } from '@superset-ui/core';
+import { t, styled, css } from '@superset-ui/core';
 import dayjs from 'dayjs';
 import { extendedDayjs } from '../../utils/dates';
 import { Icons } from '../Icons';
@@ -38,14 +38,24 @@ extendedDayjs.updateLocale('en', {
 });
 
 const TextStyles = styled.span`
-  color: ${({ theme }) => theme.colorText};
+  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;
+`};
 `;
 
 export const LastUpdated: FunctionComponent<LastUpdatedProps> = ({
   updatedAt,
   update,
 }) => {
-  const theme = useTheme();
   const [timeSince, setTimeSince] = useState<dayjs.Dayjs>(
     extendedDayjs(updatedAt),
   );
@@ -65,9 +75,10 @@ export const LastUpdated: FunctionComponent<LastUpdatedProps> = ({
     <TextStyles>
       {t('Last Updated %s', timeSince.isValid() ? timeSince.calendar() : '--')}
       {update && (
-        <Icons.SyncOutlined
+        <RefreshIcon
+          iconSize="l"
           css={css`
-            margin-left: ${theme.sizeUnit * 2}px;
+            vertical-align: text-bottom;
           `}
           onClick={update}
         />

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

@@ -33,7 +33,6 @@ export function FormModal({
   formSubmitHandler,
   bodyStyle = {},
   requiredFields = [],
-  name,
 }: FormModalProps) {
   const [form] = Form.useForm();
   const [isSaving, setIsSaving] = useState(false);
@@ -79,7 +78,6 @@ export function FormModal({
 
   return (
     <Modal
-      name={name}
       show={show}
       title={title}
       onHide={handleClose}

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',
-  primaryButtonStyle: 'danger',
+  primaryButtonType: 'danger',
   show: true,
   title: "I'm a modal!",
   resizable: false,

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 * 4}px;
+      padding: ${theme.sizeUnit * 4}px ${theme.sizeUnit * 6}px;
 
       .ant-modal-title {
         font-weight: ${theme.fontWeightStrong};
@@ -121,8 +121,7 @@ export const StyledModal = styled(BaseModal)<StyledModalProps>`
 
     .ant-modal-body {
       flex: 0 1 auto;
-      padding: ${theme.sizeUnit * 4}px ${theme.sizeUnit * 6}px;
-
+      padding: ${theme.sizeUnit * 4}px;
       overflow: auto;
       ${!resizable && height && `height: ${height};`}
     }
@@ -209,7 +208,7 @@ const CustomModal = ({
   onHide,
   onHandledPrimaryAction,
   primaryButtonName = t('OK'),
-  primaryButtonStyle = 'primary',
+  primaryButtonType = 'primary',
   show,
   name,
   title,
@@ -262,7 +261,7 @@ const CustomModal = ({
         </Button>,
         <Button
           key="submit"
-          buttonStyle={primaryButtonStyle}
+          buttonStyle={primaryButtonType}
           disabled={disablePrimaryButton}
           tooltip={primaryTooltipMessage}
           loading={primaryButtonLoading}
@@ -333,7 +332,7 @@ const CustomModal = ({
       }
       footer={!hideFooter ? modalFooter : null}
       hideFooter={hideFooter}
-      wrapProps={{ 'data-test': `${name || 'antd'}-modal`, ...wrapProps }}
+      wrapProps={{ 'data-test': `${name || title}-modal`, ...wrapProps }}
       modalRender={modal =>
         resizable || draggable ? (
           <Draggable

superset-frontend/packages/superset-ui-core/src/components/Modal/types.ts

@@ -20,7 +20,6 @@ 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;
@@ -31,7 +30,7 @@ export interface ModalProps {
   onHide: () => void;
   onHandledPrimaryAction?: () => void;
   primaryButtonName?: string;
-  primaryButtonStyle?: ButtonStyle;
+  primaryButtonType?: 'primary' | 'danger';
   show: boolean;
   name?: string;
   title: ReactNode;

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

@@ -110,7 +110,6 @@ export const ModalTrigger = forwardRef(
           className={className}
           show={showModal}
           onHide={close}
-          name={modalTitle}
           title={modalTitle}
           footer={modalFooter}
           hideFooter={!modalFooter}

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

@@ -17,7 +17,7 @@
  * under the License.
  */
 import { render } from '@superset-ui/core/spec';
-import { TelemetryPixel } from '.';
+import TelemetryPixel from '.';
 
 const OLD_ENV = process.env;
 

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

@@ -39,7 +39,7 @@ interface TelemetryPixelProps {
 
 const PIXEL_ID = '0d3461e1-abb1-4691-a0aa-5ed50de66af0';
 
-export const TelemetryPixel = ({
+const TelemetryPixel = ({
   version = 'unknownVersion',
   sha = 'unknownSHA',
   build = 'unknownBuild',
@@ -56,3 +56,4 @@ export const TelemetryPixel = ({
     />
   );
 };
+export default TelemetryPixel;

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

@@ -0,0 +1,150 @@
+/**
+ * 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;

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

@@ -0,0 +1,79 @@
+/**
+ * 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 { Tooltip } from 'antd';
+import { Dropdown, Icons } from '@superset-ui/core/components';
+import { t } from '@superset-ui/core';
+import { ThemeAlgorithm, ThemeMode } from '../../theme/types';
+
+export interface ThemeSelectProps {
+  setThemeMode: (newMode: ThemeMode) => void;
+  tooltipTitle?: string;
+  themeMode: ThemeMode;
+}
+
+const ThemeSelect: React.FC<ThemeSelectProps> = ({
+  setThemeMode,
+  tooltipTitle = 'Select theme',
+  themeMode,
+}) => {
+  const handleSelect = (mode: ThemeMode) => {
+    setThemeMode(mode);
+  };
+
+  const themeIconMap: Record<ThemeAlgorithm | ThemeMode, React.ReactNode> = {
+    [ThemeAlgorithm.DEFAULT]: <Icons.SunOutlined />,
+    [ThemeAlgorithm.DARK]: <Icons.MoonOutlined />,
+    [ThemeMode.SYSTEM]: <Icons.FormatPainterOutlined />,
+    [ThemeAlgorithm.COMPACT]: <Icons.CompressOutlined />,
+  };
+
+  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>
+  );
+};
+
+export default ThemeSelect;

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

@@ -1,273 +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 {
-  render,
-  screen,
-  userEvent,
-  waitFor,
-  within,
-} from '@superset-ui/core/spec';
-import { ThemeMode } from '@superset-ui/core';
-import { Menu } from '@superset-ui/core/components';
-import { ThemeSubMenu } from '.';
-
-// Mock the translation function
-jest.mock('@superset-ui/core', () => ({
-  ...jest.requireActual('@superset-ui/core'),
-  t: (key: string) => key,
-}));
-
-describe('ThemeSubMenu', () => {
-  const defaultProps = {
-    allowOSPreference: true,
-    setThemeMode: jest.fn(),
-    themeMode: ThemeMode.DEFAULT,
-    hasLocalOverride: false,
-    onClearLocalSettings: jest.fn(),
-  };
-
-  const renderThemeSubMenu = (props = defaultProps) =>
-    render(
-      <Menu>
-        <ThemeSubMenu {...props} />
-      </Menu>,
-    );
-
-  const findMenuWithText = async (text: string) => {
-    await waitFor(() => {
-      const found = screen
-        .getAllByRole('menu')
-        .some(m => within(m).queryByText(text));
-
-      if (!found) throw new Error(`Menu with text "${text}" not yet rendered`);
-    });
-
-    return screen.getAllByRole('menu').find(m => within(m).queryByText(text))!;
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('renders Light and Dark theme options by default', async () => {
-    renderThemeSubMenu();
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Light');
-
-    expect(within(menu!).getByText('Light')).toBeInTheDocument();
-    expect(within(menu!).getByText('Dark')).toBeInTheDocument();
-  });
-
-  it('does not render Match system option when allowOSPreference is false', async () => {
-    renderThemeSubMenu({ ...defaultProps, allowOSPreference: false });
-    userEvent.hover(await screen.findByRole('menuitem'));
-
-    await waitFor(() => {
-      expect(screen.queryByText('Match system')).not.toBeInTheDocument();
-    });
-  });
-
-  it('renders with allowOSPreference as true by default', async () => {
-    renderThemeSubMenu();
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Match system');
-
-    expect(within(menu).getByText('Match system')).toBeInTheDocument();
-  });
-
-  it('renders clear option when both hasLocalOverride and onClearLocalSettings are provided', async () => {
-    const mockClear = jest.fn();
-    renderThemeSubMenu({
-      ...defaultProps,
-      hasLocalOverride: true,
-      onClearLocalSettings: mockClear,
-    });
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Clear local theme');
-
-    expect(within(menu).getByText('Clear local theme')).toBeInTheDocument();
-  });
-
-  it('does not render clear option when hasLocalOverride is false', async () => {
-    const mockClear = jest.fn();
-    renderThemeSubMenu({
-      ...defaultProps,
-      hasLocalOverride: false,
-      onClearLocalSettings: mockClear,
-    });
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-
-    await waitFor(() => {
-      expect(screen.queryByText('Clear local theme')).not.toBeInTheDocument();
-    });
-  });
-
-  it('calls setThemeMode with DEFAULT when Light is clicked', async () => {
-    const mockSet = jest.fn();
-    renderThemeSubMenu({ ...defaultProps, setThemeMode: mockSet });
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Light');
-    userEvent.click(within(menu).getByText('Light'));
-
-    expect(mockSet).toHaveBeenCalledWith(ThemeMode.DEFAULT);
-  });
-
-  it('calls setThemeMode with DARK when Dark is clicked', async () => {
-    const mockSet = jest.fn();
-    renderThemeSubMenu({ ...defaultProps, setThemeMode: mockSet });
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Dark');
-    userEvent.click(within(menu).getByText('Dark'));
-
-    expect(mockSet).toHaveBeenCalledWith(ThemeMode.DARK);
-  });
-
-  it('calls setThemeMode with SYSTEM when Match system is clicked', async () => {
-    const mockSet = jest.fn();
-    renderThemeSubMenu({ ...defaultProps, setThemeMode: mockSet });
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Match system');
-    userEvent.click(within(menu).getByText('Match system'));
-
-    expect(mockSet).toHaveBeenCalledWith(ThemeMode.SYSTEM);
-  });
-
-  it('calls onClearLocalSettings when Clear local theme is clicked', async () => {
-    const mockClear = jest.fn();
-    renderThemeSubMenu({
-      ...defaultProps,
-      hasLocalOverride: true,
-      onClearLocalSettings: mockClear,
-    });
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Clear local theme');
-    userEvent.click(within(menu).getByText('Clear local theme'));
-
-    expect(mockClear).toHaveBeenCalledTimes(1);
-  });
-
-  it('displays sun icon for DEFAULT theme', () => {
-    renderThemeSubMenu({ ...defaultProps, themeMode: ThemeMode.DEFAULT });
-    expect(screen.getByTestId('sun')).toBeInTheDocument();
-  });
-
-  it('displays moon icon for DARK theme', () => {
-    renderThemeSubMenu({ ...defaultProps, themeMode: ThemeMode.DARK });
-    expect(screen.getByTestId('moon')).toBeInTheDocument();
-  });
-
-  it('displays format-painter icon for SYSTEM theme', () => {
-    renderThemeSubMenu({ ...defaultProps, themeMode: ThemeMode.SYSTEM });
-    expect(screen.getByTestId('format-painter')).toBeInTheDocument();
-  });
-
-  it('displays override icon when hasLocalOverride is true', () => {
-    renderThemeSubMenu({ ...defaultProps, hasLocalOverride: true });
-    expect(screen.getByTestId('format-painter')).toBeInTheDocument();
-  });
-
-  it('renders Theme group header', async () => {
-    renderThemeSubMenu();
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Theme');
-
-    expect(within(menu).getByText('Theme')).toBeInTheDocument();
-  });
-
-  it('renders sun icon for Light theme option', async () => {
-    renderThemeSubMenu();
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Light');
-    const lightOption = within(menu).getByText('Light').closest('li');
-
-    expect(within(lightOption!).getByTestId('sun')).toBeInTheDocument();
-  });
-
-  it('renders moon icon for Dark theme option', async () => {
-    renderThemeSubMenu();
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Dark');
-    const darkOption = within(menu).getByText('Dark').closest('li');
-
-    expect(within(darkOption!).getByTestId('moon')).toBeInTheDocument();
-  });
-
-  it('renders format-painter icon for Match system option', async () => {
-    renderThemeSubMenu({ ...defaultProps, allowOSPreference: true });
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Match system');
-    const matchOption = within(menu).getByText('Match system').closest('li');
-
-    expect(
-      within(matchOption!).getByTestId('format-painter'),
-    ).toBeInTheDocument();
-  });
-
-  it('renders clear icon for Clear local theme option', async () => {
-    renderThemeSubMenu({
-      ...defaultProps,
-      hasLocalOverride: true,
-      onClearLocalSettings: jest.fn(),
-    });
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Clear local theme');
-    const clearOption = within(menu)
-      .getByText('Clear local theme')
-      .closest('li');
-
-    expect(within(clearOption!).getByTestId('clear')).toBeInTheDocument();
-  });
-
-  it('renders divider before clear option when clear option is present', async () => {
-    renderThemeSubMenu({
-      ...defaultProps,
-      hasLocalOverride: true,
-      onClearLocalSettings: jest.fn(),
-    });
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-
-    const menu = await findMenuWithText('Clear local theme');
-    const divider = within(menu).queryByRole('separator');
-
-    expect(divider).toBeInTheDocument();
-  });
-
-  it('does not render divider when clear option is not present', async () => {
-    renderThemeSubMenu({ ...defaultProps });
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const divider = document.querySelector('.ant-menu-item-divider');
-
-    expect(divider).toBeNull();
-  });
-});

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

@@ -1,170 +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 { useMemo } from 'react';
-import { Icons, Menu } from '@superset-ui/core/components';
-import {
-  css,
-  styled,
-  t,
-  ThemeMode,
-  useTheme,
-  ThemeAlgorithm,
-} from '@superset-ui/core';
-
-const StyledThemeSubMenu = styled(Menu.SubMenu)`
-  ${({ theme }) => css`
-    [data-icon='caret-down'] {
-      color: ${theme.colorIcon};
-      font-size: ${theme.fontSizeXS}px;
-      margin-left: ${theme.sizeUnit}px;
-    }
-    &.ant-menu-submenu-active {
-      .ant-menu-title-content {
-        color: ${theme.colorPrimary};
-      }
-    }
-  `}
-`;
-
-const StyledThemeSubMenuItem = styled(Menu.Item)<{ selected: boolean }>`
-  ${({ theme, selected }) => css`
-    &:hover {
-      color: ${theme.colorPrimary} !important;
-      cursor: pointer !important;
-    }
-    ${selected &&
-    css`
-      background-color: ${theme.colors.primary.light4} !important;
-      color: ${theme.colors.primary.dark1} !important;
-    `}
-  `}
-`;
-
-export interface ThemeSubMenuOption {
-  key: ThemeMode;
-  label: string;
-  icon: React.ReactNode;
-  onClick: () => void;
-}
-
-export interface ThemeSubMenuProps {
-  setThemeMode: (newMode: ThemeMode) => void;
-  themeMode: ThemeMode;
-  hasLocalOverride?: boolean;
-  onClearLocalSettings?: () => void;
-  allowOSPreference?: boolean;
-}
-
-export const ThemeSubMenu: React.FC<ThemeSubMenuProps> = ({
-  setThemeMode,
-  themeMode,
-  hasLocalOverride = false,
-  onClearLocalSettings,
-  allowOSPreference = true,
-}: ThemeSubMenuProps) => {
-  const theme = useTheme();
-
-  const handleSelect = (mode: ThemeMode) => {
-    setThemeMode(mode);
-  };
-
-  const themeIconMap: Record<ThemeAlgorithm | ThemeMode, React.ReactNode> =
-    useMemo(
-      () => ({
-        [ThemeAlgorithm.DEFAULT]: <Icons.SunOutlined />,
-        [ThemeAlgorithm.DARK]: <Icons.MoonOutlined />,
-        [ThemeMode.SYSTEM]: <Icons.FormatPainterOutlined />,
-        [ThemeAlgorithm.COMPACT]: <Icons.CompressOutlined />,
-      }),
-      [],
-    );
-
-  const selectedThemeModeIcon = useMemo(
-    () =>
-      hasLocalOverride ? (
-        <Icons.FormatPainterOutlined
-          style={{ color: theme.colors.error.base }}
-        />
-      ) : (
-        themeIconMap[themeMode]
-      ),
-    [hasLocalOverride, theme.colors.error.base, themeIconMap, themeMode],
-  );
-
-  const themeOptions: ThemeSubMenuOption[] = [
-    {
-      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
-  const clearOption =
-    onClearLocalSettings && hasLocalOverride
-      ? {
-          key: 'clear-local',
-          label: t('Clear local theme'),
-          icon: <Icons.ClearOutlined />,
-          onClick: onClearLocalSettings,
-        }
-      : null;
-
-  return (
-    <StyledThemeSubMenu
-      key="theme-sub-menu"
-      title={selectedThemeModeIcon}
-      icon={<Icons.CaretDownOutlined iconSize="xs" />}
-    >
-      <Menu.ItemGroup title={t('Theme')} />
-      {themeOptions.map(option => (
-        <StyledThemeSubMenuItem
-          key={option.key}
-          onClick={option.onClick}
-          selected={option.key === themeMode}
-        >
-          {option.icon} {option.label}
-        </StyledThemeSubMenuItem>
-      ))}
-      {clearOption && [
-        <Menu.Divider key="theme-divider" />,
-        <Menu.Item key={clearOption.key} onClick={clearOption.onClick}>
-          {clearOption.icon} {clearOption.label}
-        </Menu.Item>,
-      ]}
-    </StyledThemeSubMenu>
-  );
-};

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

@@ -19,7 +19,6 @@
 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)`

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

@@ -16,10 +16,52 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { t } from '@superset-ui/core';
-import { Icons, Modal, Typography, Button } from '@superset-ui/core/components';
+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 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;
@@ -44,22 +86,44 @@ export const UnsavedChangesModal: FC<UnsavedChangesModalProps> = ({
     show={showModal}
     width="444px"
     title={
-      <>
-        <Icons.WarningOutlined iconSize="m" style={{ marginRight: 8 }} />
-        {title}
-      </>
+      <div
+        css={css`
+          align-items: center;
+          display: flex;
+        `}
+      >
+        <StyledWarningIcon iconSize="xl" />
+        <StyledModalTitle type="secondary" level={5}>
+          {title}
+        </StyledModalTitle>
+      </div>
     }
     footer={
-      <>
-        <Button buttonStyle="secondary" onClick={onConfirmNavigation}>
+      <div
+        css={css`
+          display: flex;
+          justify-content: flex-end;
+          width: 100%;
+        `}
+      >
+        <StyledDiscardBtn
+          htmlType="button"
+          buttonSize="small"
+          onClick={onConfirmNavigation}
+        >
           {t('Discard')}
-        </Button>
-        <Button buttonStyle="primary" onClick={handleSave}>
+        </StyledDiscardBtn>
+        <StyledSaveBtn
+          htmlType="button"
+          buttonSize="small"
+          buttonStyle="primary"
+          onClick={handleSave}
+        >
           {t('Save')}
-        </Button>
-      </>
+        </StyledSaveBtn>
+      </div>
     }
   >
-    <Typography.Text>{body}</Typography.Text>
+    <StyledModalBody type="secondary">{body}</StyledModalBody>
   </Modal>
 );