diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a73debe69d23..c7ebc2a8a261 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,6 +3,6 @@
 /superset/migrations/ @apache/superset-committers
 
 # Notify Preset team when ephemeral env settings are changed
-.github/workflows/ecs-task-definition.json @robdiciuccio @craig-rueda @benjreinhart
-.github/workflows/docker-ephemeral-env.yml @robdiciuccio @craig-rueda @benjreinhart
-.github/workflows/ephemeral*.yml @robdiciuccio @craig-rueda @benjreinhart
+.github/workflows/ecs-task-definition.json @robdiciuccio @craig-rueda @willbarrett @rusackas @eschutho @dpgaspar @nytai @mistercrunch
+.github/workflows/docker-ephemeral-env.yml @robdiciuccio @craig-rueda @willbarrett @rusackas @eschutho @dpgaspar @nytai @mistercrunch
+.github/workflows/ephemeral*.yml @robdiciuccio @craig-rueda @willbarrett @rusackas @eschutho @dpgaspar @nytai @mistercrunch
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index f57658a6e071..12fee9c96759 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -33,6 +33,7 @@ If applicable, add screenshots to help explain your problem.
 - superset version: `superset version`
 - python version: `python --version`
 - node.js version: `node -v`
+- any feature flags active:
 
 ### Checklist
 
diff --git a/.github/ISSUE_TEMPLATE/sip.md b/.github/ISSUE_TEMPLATE/sip.md
index d6a668f7a34b..6c526d6d1fa0 100644
--- a/.github/ISSUE_TEMPLATE/sip.md
+++ b/.github/ISSUE_TEMPLATE/sip.md
@@ -6,9 +6,9 @@ labels: "#SIP"
 ---
 
 *Please make sure you are familiar with the SIP process documented*
-(here)[https://github.com/apache/superset/issues/5602]
+(here)[https://github.com/apache/superset/issues/5602]. The SIP number should be the next number after the latest SIP listed [here](https://github.com/apache/superset/issues?q=is%3Aissue+label%3Asip).
 
-## [SIP] Proposal for XXX
+## [SIP-\<number>] Proposal for <title>
 
 ### Motivation
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index c5e50829ce50..2558dcd3e190 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -11,6 +11,7 @@
 <!--- Check any relevant boxes with "x" -->
 <!--- HINT: Include "Fixes #nnn" if you are fixing an existing issue -->
 - [ ] Has associated issue:
+- [ ] Required feature flags:
 - [ ] Changes UI
 - [ ] Includes DB Migration (follow approval process in [SIP-59](https://github.com/apache/superset/issues/13351))
   - [ ] Migration is atomic, supports rollback & is backwards-compatible
diff --git a/.github/workflows/bashlib.sh b/.github/workflows/bashlib.sh
index ff162de88950..bcb3b78e73b2 100644
--- a/.github/workflows/bashlib.sh
+++ b/.github/workflows/bashlib.sh
@@ -192,7 +192,7 @@ cypress-run-all() {
   say "::endgroup::"
 
   # Rerun SQL Lab tests with backend persist enabled
-  export SUPERSET_CONFIG=tests.superset_test_config_sqllab_backend_persist
+  export SUPERSET_CONFIG=tests.integration_tests.superset_test_config_sqllab_backend_persist
 
   # Restart Flask with new configs
   kill $flaskProcessId
diff --git a/.github/workflows/ephemeral-env.yml b/.github/workflows/ephemeral-env.yml
index 9c9aa230c4c9..c1945b3c2091 100644
--- a/.github/workflows/ephemeral-env.yml
+++ b/.github/workflows/ephemeral-env.yml
@@ -17,7 +17,6 @@ jobs:
     - name: Debug
       run: |
         echo "Comment on PR #${{ github.event.issue.number }} by ${{ github.event.issue.user.login }}, ${{ github.event.comment.author_association }}"
-        echo "Comment body: ${{ github.event.comment.body }}"
 
     - name: Eval comment body for /testenv slash command
       uses: actions/github-script@v3
diff --git a/.github/workflows/superset-e2e.yml b/.github/workflows/superset-e2e.yml
index 13564d51c2f1..3b3898b52091 100644
--- a/.github/workflows/superset-e2e.yml
+++ b/.github/workflows/superset-e2e.yml
@@ -25,7 +25,7 @@ jobs:
     env:
       FLASK_ENV: development
       ENABLE_REACT_CRUD_VIEWS: true
-      SUPERSET_CONFIG: tests.superset_test_config
+      SUPERSET_CONFIG: tests.integration_tests.superset_test_config
       SUPERSET__SQLALCHEMY_DATABASE_URI: postgresql+psycopg2://superset:superset@127.0.0.1:15432/superset
       PYTHONPATH: ${{ github.workspace }}
       REDIS_PORT: 16379
diff --git a/.github/workflows/superset-python-integrationtest.yml b/.github/workflows/superset-python-integrationtest.yml
new file mode 100644
index 000000000000..c006d22424ce
--- /dev/null
+++ b/.github/workflows/superset-python-integrationtest.yml
@@ -0,0 +1,193 @@
+# Python integration tests
+name: Python-Integration
+
+on:
+  push:
+    branches-ignore:
+      - "dependabot/npm_and_yarn/**"
+  pull_request:
+    types: [synchronize, opened, reopened, ready_for_review]
+
+jobs:
+  test-mysql:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        python-version: [3.7]
+    env:
+      PYTHONPATH: ${{ github.workspace }}
+      SUPERSET_CONFIG: tests.integration_tests.superset_test_config
+      REDIS_PORT: 16379
+      SUPERSET__SQLALCHEMY_DATABASE_URI: |
+        mysql+mysqldb://superset:superset@127.0.0.1:13306/superset?charset=utf8mb4&binary_prefix=true
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ROOT_PASSWORD: root
+        ports:
+          - 13306:3306
+      redis:
+        image: redis:5-alpine
+        options: --entrypoint redis-server
+        ports:
+          - 16379:6379
+    steps:
+      - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
+        uses: actions/checkout@v2
+        with:
+          persist-credentials: false
+          submodules: recursive
+      - name: Check if python changes are present
+        id: check
+        env:
+          GITHUB_REPO: ${{ github.repository }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        continue-on-error: true
+        run: ./scripts/ci_check_no_file_changes.sh python
+      - name: Setup Python
+        if: steps.check.outcome == 'failure'
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        if: steps.check.outcome == 'failure'
+        uses: ./.github/actions/cached-dependencies
+        with:
+          run: |
+            apt-get-install
+            pip-upgrade
+            pip install -r requirements/testing.txt
+            setup-mysql
+      - name: Run celery
+        if: steps.check.outcome == 'failure'
+        run: celery --app=superset.tasks.celery_app:app worker -Ofair -c 2 &
+      - name: Python integration tests (MySQL)
+        if: steps.check.outcome == 'failure'
+        run: |
+          ./scripts/python_tests.sh
+      - name: Upload code coverage
+        if: steps.check.outcome == 'failure'
+        run: |
+          bash .github/workflows/codecov.sh -c -F python -F mysql
+
+  test-postgres:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        python-version: [3.7, 3.8]
+    env:
+      PYTHONPATH: ${{ github.workspace }}
+      SUPERSET_CONFIG: tests.integration_tests.superset_test_config
+      REDIS_PORT: 16379
+      SUPERSET__SQLALCHEMY_DATABASE_URI: postgresql+psycopg2://superset:superset@127.0.0.1:15432/superset
+    services:
+      postgres:
+        image: postgres:10-alpine
+        env:
+          POSTGRES_USER: superset
+          POSTGRES_PASSWORD: superset
+        ports:
+          # Use custom ports for services to avoid accidentally connecting to
+          # GitHub action runner's default installations
+          - 15432:5432
+      redis:
+        image: redis:5-alpine
+        ports:
+          - 16379:6379
+    steps:
+      - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
+        uses: actions/checkout@v2
+        with:
+          persist-credentials: false
+          submodules: recursive
+      - name: Check if python changes are present
+        id: check
+        env:
+          GITHUB_REPO: ${{ github.repository }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        continue-on-error: true
+        run: ./scripts/ci_check_no_file_changes.sh python
+      - name: Setup Python
+        if: steps.check.outcome == 'failure'
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        if: steps.check.outcome == 'failure'
+        uses: ./.github/actions/cached-dependencies
+        with:
+          run: |
+            apt-get-install
+            pip-upgrade
+            pip install -r requirements/testing.txt
+            setup-postgres
+      - name: Run celery
+        if: steps.check.outcome == 'failure'
+        run: celery --app=superset.tasks.celery_app:app worker -Ofair -c 2 &
+      - name: Python integration tests (PostgreSQL)
+        if: steps.check.outcome == 'failure'
+        run: |
+          ./scripts/python_tests.sh
+      - name: Upload code coverage
+        if: steps.check.outcome == 'failure'
+        run: |
+          bash .github/workflows/codecov.sh -c -F python -F postgres
+
+  test-sqlite:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        python-version: [3.7]
+    env:
+      PYTHONPATH: ${{ github.workspace }}
+      SUPERSET_CONFIG: tests.integration_tests.superset_test_config
+      REDIS_PORT: 16379
+      SUPERSET__SQLALCHEMY_DATABASE_URI: |
+        sqlite:///${{ github.workspace }}/.temp/unittest.db
+    services:
+      redis:
+        image: redis:5-alpine
+        ports:
+          - 16379:6379
+    steps:
+      - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
+        uses: actions/checkout@v2
+        with:
+          persist-credentials: false
+          submodules: recursive
+      - name: Check if python changes are present
+        id: check
+        env:
+          GITHUB_REPO: ${{ github.repository }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        continue-on-error: true
+        run: ./scripts/ci_check_no_file_changes.sh python
+      - name: Setup Python
+        if: steps.check.outcome == 'failure'
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        if: steps.check.outcome == 'failure'
+        uses: ./.github/actions/cached-dependencies
+        with:
+          run: |
+            apt-get-install
+            pip-upgrade
+            pip install -r requirements/testing.txt
+            mkdir ${{ github.workspace }}/.temp
+      - name: Run celery
+        if: steps.check.outcome == 'failure'
+        run: celery --app=superset.tasks.celery_app:app worker -Ofair -c 2 &
+      - name: Python integration tests (SQLite)
+        if: steps.check.outcome == 'failure'
+        run: |
+          ./scripts/python_tests.sh
+      - name: Upload code coverage
+        if: steps.check.outcome == 'failure'
+        run: |
+          bash .github/workflows/codecov.sh -c -F python -F sqlite
diff --git a/.github/workflows/superset-python-presto-hive.yml b/.github/workflows/superset-python-presto-hive.yml
index 34d23e8833cc..917703782202 100644
--- a/.github/workflows/superset-python-presto-hive.yml
+++ b/.github/workflows/superset-python-presto-hive.yml
@@ -17,7 +17,7 @@ jobs:
         python-version: [3.8]
     env:
       PYTHONPATH: ${{ github.workspace }}
-      SUPERSET_CONFIG: tests.superset_test_config
+      SUPERSET_CONFIG: tests.integration_tests.superset_test_config
       REDIS_PORT: 16379
       SUPERSET__SQLALCHEMY_DATABASE_URI: postgresql+psycopg2://superset:superset@127.0.0.1:15432/superset
       SUPERSET__SQLALCHEMY_EXAMPLES_URI: presto://localhost:15433/memory/default
@@ -73,7 +73,7 @@ jobs:
             setup-postgres
       - name: Run celery
         if: steps.check.outcome == 'failure'
-        run: celery worker --app=superset.tasks.celery_app:app -Ofair -c 2 &
+        run: celery --app=superset.tasks.celery_app:app worker -Ofair -c 2 &
       - name: Python unit tests (PostgreSQL)
         if: steps.check.outcome == 'failure'
         run: |
@@ -91,7 +91,7 @@ jobs:
         python-version: [3.8]
     env:
       PYTHONPATH: ${{ github.workspace }}
-      SUPERSET_CONFIG: tests.superset_test_config
+      SUPERSET_CONFIG: tests.integration_tests.superset_test_config
       REDIS_PORT: 16379
       SUPERSET__SQLALCHEMY_DATABASE_URI: postgresql+psycopg2://superset:superset@127.0.0.1:15432/superset
       SUPERSET__SQLALCHEMY_EXAMPLES_URI: hive://localhost:10000/default
@@ -148,7 +148,7 @@ jobs:
             setup-postgres
       - name: Run celery
         if: steps.check.outcome == 'failure'
-        run: celery worker --app=superset.tasks.celery_app:app -Ofair -c 2 &
+        run: celery --app=superset.tasks.celery_app:app worker -Ofair -c 2 &
       - name: Python unit tests (PostgreSQL)
         if: steps.check.outcome == 'failure'
         run: |
diff --git a/.github/workflows/superset-python-unittest.yml b/.github/workflows/superset-python-unittest.yml
index 8d03fa8b443f..69f96bcb9b77 100644
--- a/.github/workflows/superset-python-unittest.yml
+++ b/.github/workflows/superset-python-unittest.yml
@@ -1,5 +1,5 @@
 # Python unit tests
-name: Python
+name: Python-Unit
 
 on:
   push:
@@ -9,150 +9,14 @@ on:
     types: [synchronize, opened, reopened, ready_for_review]
 
 jobs:
-  test-mysql:
+  unit-tests:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: [3.7]
+        python-version: [3.7,3.8]
     env:
       PYTHONPATH: ${{ github.workspace }}
-      SUPERSET_CONFIG: tests.superset_test_config
-      REDIS_PORT: 16379
-      SUPERSET__SQLALCHEMY_DATABASE_URI: |
-        mysql+mysqldb://superset:superset@127.0.0.1:13306/superset?charset=utf8mb4&binary_prefix=true
-    services:
-      mysql:
-        image: mysql:5.7
-        env:
-          MYSQL_ROOT_PASSWORD: root
-        ports:
-          - 13306:3306
-      redis:
-        image: redis:5-alpine
-        options: --entrypoint redis-server
-        ports:
-          - 16379:6379
-    steps:
-      - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v2
-        with:
-          persist-credentials: false
-          submodules: recursive
-      - name: Check if python changes are present
-        id: check
-        env:
-          GITHUB_REPO: ${{ github.repository }}
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-        continue-on-error: true
-        run: ./scripts/ci_check_no_file_changes.sh python
-      - name: Setup Python
-        if: steps.check.outcome == 'failure'
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        if: steps.check.outcome == 'failure'
-        uses: ./.github/actions/cached-dependencies
-        with:
-          run: |
-            apt-get-install
-            pip-upgrade
-            pip install -r requirements/testing.txt
-            setup-mysql
-      - name: Run celery
-        if: steps.check.outcome == 'failure'
-        run: celery worker --app=superset.tasks.celery_app:app -Ofair -c 2 &
-      - name: Python unit tests (MySQL)
-        if: steps.check.outcome == 'failure'
-        run: |
-          ./scripts/python_tests.sh
-      - name: Upload code coverage
-        if: steps.check.outcome == 'failure'
-        run: |
-          bash .github/workflows/codecov.sh -c -F python -F mysql
-
-  test-postgres:
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        python-version: [3.7, 3.8]
-    env:
-      PYTHONPATH: ${{ github.workspace }}
-      SUPERSET_CONFIG: tests.superset_test_config
-      REDIS_PORT: 16379
-      SUPERSET__SQLALCHEMY_DATABASE_URI: postgresql+psycopg2://superset:superset@127.0.0.1:15432/superset
-    services:
-      postgres:
-        image: postgres:10-alpine
-        env:
-          POSTGRES_USER: superset
-          POSTGRES_PASSWORD: superset
-        ports:
-          # Use custom ports for services to avoid accidentally connecting to
-          # GitHub action runner's default installations
-          - 15432:5432
-      redis:
-        image: redis:5-alpine
-        ports:
-          - 16379:6379
-    steps:
-      - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v2
-        with:
-          persist-credentials: false
-          submodules: recursive
-      - name: Check if python changes are present
-        id: check
-        env:
-          GITHUB_REPO: ${{ github.repository }}
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-        continue-on-error: true
-        run: ./scripts/ci_check_no_file_changes.sh python
-      - name: Setup Python
-        if: steps.check.outcome == 'failure'
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        if: steps.check.outcome == 'failure'
-        uses: ./.github/actions/cached-dependencies
-        with:
-          run: |
-            apt-get-install
-            pip-upgrade
-            pip install -r requirements/testing.txt
-            setup-postgres
-      - name: Run celery
-        if: steps.check.outcome == 'failure'
-        run: celery worker --app=superset.tasks.celery_app:app -Ofair -c 2 &
-      - name: Python unit tests (PostgreSQL)
-        if: steps.check.outcome == 'failure'
-        run: |
-          ./scripts/python_tests.sh
-      - name: Upload code coverage
-        if: steps.check.outcome == 'failure'
-        run: |
-          bash .github/workflows/codecov.sh -c -F python -F postgres
-
-  test-sqlite:
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        python-version: [3.7]
-    env:
-      PYTHONPATH: ${{ github.workspace }}
-      SUPERSET_CONFIG: tests.superset_test_config
-      REDIS_PORT: 16379
-      SUPERSET__SQLALCHEMY_DATABASE_URI: |
-        sqlite:///${{ github.workspace }}/.temp/unittest.db
-    services:
-      redis:
-        image: redis:5-alpine
-        ports:
-          - 16379:6379
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
         uses: actions/checkout@v2
@@ -171,6 +35,7 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+# TODO: separated requiermentes.txt file just for unit tests
       - name: Install dependencies
         if: steps.check.outcome == 'failure'
         uses: ./.github/actions/cached-dependencies
@@ -180,14 +45,11 @@ jobs:
             pip-upgrade
             pip install -r requirements/testing.txt
             mkdir ${{ github.workspace }}/.temp
-      - name: Run celery
-        if: steps.check.outcome == 'failure'
-        run: celery worker --app=superset.tasks.celery_app:app -Ofair -c 2 &
-      - name: Python unit tests (SQLite)
+      - name: Python unit tests
         if: steps.check.outcome == 'failure'
         run: |
-          ./scripts/python_tests.sh
+          pytest ./tests/unit_tests --cache-clear
       - name: Upload code coverage
         if: steps.check.outcome == 'failure'
         run: |
-          bash .github/workflows/codecov.sh -c -F python -F sqlite
+          bash .github/workflows/codecov.sh -c -F python -F unit
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index bca0923e8068..80202bebfab9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -24,9 +24,10 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.790
+    rev: v0.910
     hooks:
       - id: mypy
+        additional_dependencies: [types-all]
   - repo: https://github.com/peterdemin/pip-compile-multi
     rev: v2.4.1
     hooks:
diff --git a/.pylintrc b/.pylintrc
index 49b3984d1943..e3715334d145 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -70,7 +70,8 @@ confidence=
 # either give multiple identifier separated by comma (,) or put this option
 # multiple time (only on the command line, not in the configuration file where
 # it should appear only once). See also the "--disable" option for examples.
-#enable=
+enable=
+    useless-suppression,
 
 # Disable the message, report, category or checker with the given id(s). You
 # can either give multiple identifiers separated by comma (,) or put this
@@ -81,8 +82,10 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
-disable=long-builtin,dict-view-method,intern-builtin,suppressed-message,no-absolute-import,unpacking-in-except,apply-builtin,delslice-method,indexing-exception,old-raise-syntax,print-statement,cmp-builtin,reduce-builtin,useless-suppression,coerce-method,input-builtin,cmp-method,raw_input-builtin,nonzero-method,backtick,basestring-builtin,setslice-method,reload-builtin,oct-method,map-builtin-not-iterating,execfile-builtin,old-octal-literal,zip-builtin-not-iterating,buffer-builtin,getslice-method,metaclass-assignment,xrange-builtin,long-suffix,round-builtin,range-builtin-not-iterating,next-method-called,parameter-unpacking,unicode-builtin,unichr-builtin,import-star-module-level,raising-string,filter-builtin-not-iterating,using-cmp-argument,coerce-builtin,file-builtin,old-division,hex-method,missing-docstring,too-many-lines,ungrouped-imports,import-outside-toplevel,raise-missing-from,super-with-arguments,bad-option-value,too-few-public-methods,too-many-locals
-
+disable=
+    missing-docstring,
+    too-many-lines,
+    duplicate-code,
 
 [REPORTS]
 
@@ -209,7 +212,7 @@ max-nested-blocks=5
 [FORMAT]
 
 # Maximum number of characters on a single line.
-max-line-length=88
+max-line-length=90
 
 # Regexp for a line that is allowed to be longer than the limit.
 ignore-long-lines=^\s*(# )?<?https?://\S+>?$
@@ -308,7 +311,7 @@ generated-members=
 # List of decorators that produce context managers, such as
 # contextlib.contextmanager. Add to this list to register other decorators that
 # produce valid context managers.
-contextmanager-decorators=contextlib.contextmanager,contextlib2.contextmanager
+contextmanager-decorators=contextlib.contextmanager
 
 
 [VARIABLES]
@@ -365,7 +368,7 @@ max-locals=15
 max-returns=10
 
 # Maximum number of branch for function / method body
-max-branches=12
+max-branches=15
 
 # Maximum number of statements in function / method body
 max-statements=50
@@ -374,7 +377,7 @@ max-statements=50
 max-parents=7
 
 # Maximum number of attributes for a class (see R0902).
-max-attributes=7
+max-attributes=8
 
 # Minimum number of public methods for a class (see R0903).
 min-public-methods=2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66dc4ab841cd..9f16f500de29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,511 @@ specific language governing permissions and limitations
 under the License.
 -->
 ## Change Log
+### 1.2 (Date TBD)
+**Features**
+- [11498](https://github.com/apache/superset/pull/11498) feat(SIP-39): Websocket sidecar app (#11498) (@Rob DiCiuccio)
+- [13894](https://github.com/apache/superset/pull/13894) feat(alert/report): add ALERTS_ATTACH_REPORTS feature flags + feature (#13894) (@Lily Kuang)
+- [13828](https://github.com/apache/superset/pull/13828) feat(alert/report): chart as csv format attachment for email and slack (#13828) (@Lily Kuang)
+- [14235](https://github.com/apache/superset/pull/14235) feat(alert/report): update content format radio buttons (#14235) (@Lily Kuang)
+- [13752](https://github.com/apache/superset/pull/13752) feat(alerts & reports): Easier to read execution logs (#13752) (@Jack Fragassi)
+- [14076](https://github.com/apache/superset/pull/14076) feat(can_share): can share chart and dashboard (#14076) (@Amit Miran)
+- [13687](https://github.com/apache/superset/pull/13687) feat(cross-filter): Cross filter badge (#13687) (@simcha90)
+- [13625](https://github.com/apache/superset/pull/13625) feat(cross-filters): Add scoping for cross filters (#13625) (@simcha90)
+- [13523](https://github.com/apache/superset/pull/13523) feat(dashboard): dashboard/id/datasets endpoint (#13523) (@David Aaron Suddjian)
+- [13145](https://github.com/apache/superset/pull/13145) feat(dashboard_rbac): manage roles for dashboard (#13145) (@simcha90)
+- [13992](https://github.com/apache/superset/pull/13992) feat(dashboard_rbac): provide data access based on dashboard access (#13992) (@Amit Miran)
+- [14519](https://github.com/apache/superset/pull/14519) feat(dremio): implement convert_dttm method (#14519) (@Ville Brofeldt)
+- [13210](https://github.com/apache/superset/pull/13210) feat(explore): ColumnSelectControl with drag-and-drop (#13210) (@Yongjie Zhao)
+- [13598](https://github.com/apache/superset/pull/13598) feat(explore): Drag and drop UX improvements (#13598) (@Kamil Gabryjelski)
+- [13294](https://github.com/apache/superset/pull/13294) feat(explore): Postgres datatype conversion (#13294) (@Nikola Gigić)
+- [13758](https://github.com/apache/superset/pull/13758) feat(explore): adhoc column formatting for Table chart (#13758) (@Jesse Yang)
+- [14340](https://github.com/apache/superset/pull/14340) feat(filter-box): sort by metric on backend (#14340) (@Ville Brofeldt)
+- [13576](https://github.com/apache/superset/pull/13576) feat(filter-set): Filter set edge cases (#13576) (@simcha90)
+- [13529](https://github.com/apache/superset/pull/13529) feat(filter-set): Filter set history (#13529) (@simcha90)
+- [13545](https://github.com/apache/superset/pull/13545) feat(filter-set): Update existing filter set (#13545) (@simcha90)
+- [13515](https://github.com/apache/superset/pull/13515) feat(filter-set): adding new filters (#13515) (@simcha90)
+- [13678](https://github.com/apache/superset/pull/13678) feat(helm): Add optional apt-get install to superset_bootstrap.sh (#13678) (@Daniel Wood)
+- [14030](https://github.com/apache/superset/pull/14030) feat(helm): add pod and deployment annotations to template (#14030) (@Bruno FERNANDO)
+- [13683](https://github.com/apache/superset/pull/13683) feat(homescreen and cards): Toggle thumbnails off or on and feature flag (#13683) (@Phillip Kelley-Dotson)
+- [13726](https://github.com/apache/superset/pull/13726) feat(native-filters): Add default first value to select filter (#13726) (@simcha90)
+- [14461](https://github.com/apache/superset/pull/14461) feat(native-filters): Auto apply changes in FiltersConfigModal (#14461) (@simcha90)
+- [13507](https://github.com/apache/superset/pull/13507) feat(native-filters): Filter set tabs (#13507) (@simcha90)
+- [14313](https://github.com/apache/superset/pull/14313) feat(native-filters): Implement adhoc filters and time picker in Range and Select native filters (#14313) (@Kamil Gabryjelski)
+- [14261](https://github.com/apache/superset/pull/14261) feat(native-filters): Show/Hide filter bar by metdata ff (#14261) (@simcha90)
+- [13506](https://github.com/apache/superset/pull/13506) feat(native-filters): Update filter bar buttons (#13506) (@simcha90)
+- [14374](https://github.com/apache/superset/pull/14374) feat(native-filters): Use datasets in dashboard as default options for native filters (#14374) (@Kamil Gabryjelski)
+- [14314](https://github.com/apache/superset/pull/14314) feat(native-filters): add option to create value in select filter (#14314) (@Ville Brofeldt)
+- [14346](https://github.com/apache/superset/pull/14346) feat(native-filters): add optional sort metric to select filter (#14346) (@Ville Brofeldt)
+- [14375](https://github.com/apache/superset/pull/14375) feat(native-filters): add refresh button to default value picker (#14375) (@Ville Brofeldt)
+- [13569](https://github.com/apache/superset/pull/13569) feat(native-filters): add sort option to select filter (#13569) (@Ville Brofeldt)
+- [13622](https://github.com/apache/superset/pull/13622) feat(native-filters): add temporal support to select filter (#13622) (@Ville Brofeldt)
+- [13484](https://github.com/apache/superset/pull/13484) feat(native-filters): add timegrain and column filter (#13484) (@Ville Brofeldt)
+- [14312](https://github.com/apache/superset/pull/14312) feat(native-filters): add tooltip to control values (#14312) (@Ville Brofeldt)
+- [14217](https://github.com/apache/superset/pull/14217) feat(native-filters): select group by support (#14217) (@Amit Miran)
+- [13634](https://github.com/apache/superset/pull/13634) feat(reports): SLACK_API_TOKEN as callable or str (#13634) (@ʈᵃᵢ)
+- [13135](https://github.com/apache/superset/pull/13135) feat(reports): send notification on error with grace (#13135) (@Daniel Vaz Gaspar)
+- [13772](https://github.com/apache/superset/pull/13772) feat(rls): enable row level security by default (#13772) (@Ville Brofeldt)
+- [14197](https://github.com/apache/superset/pull/14197) feat(viz): add mixed and radar chart (#14197) (@Ville Brofeldt)
+- [13377](https://github.com/apache/superset/pull/13377) feat(viz): implement time picker on filter box (#13377) (@Yongjie Zhao)
+- [13144](https://github.com/apache/superset/pull/13144) feat: Add error pages (#13144) (@Sam Faber-Manning)
+- [14357](https://github.com/apache/superset/pull/14357) feat: Add etag caching to dashboard APIs (#14357) (@Erik Ritter)
+- [14110](https://github.com/apache/superset/pull/14110) feat: Add health endpoint to WebSocket server (#14110) (@Ben Reinhart)
+- [13190](https://github.com/apache/superset/pull/13190) feat: Added Rows Returned (#13190) (@AAfghahi)
+- [14109](https://github.com/apache/superset/pull/14109) feat: Adding encrypted field factory (#14109) (@Craig Rueda)
+- [14234](https://github.com/apache/superset/pull/14234) feat: Adding limiting_factor column to Query model (#14234) (@AAfghahi)
+- [14318](https://github.com/apache/superset/pull/14318) feat: Dynamic imports for the Icons component (#14318) (@Geido)
+- [13981](https://github.com/apache/superset/pull/13981) feat: FE: Export for Queries II (#13981) (@Lyndsi Kay Williams)
+- [14091](https://github.com/apache/superset/pull/14091) feat: FE: Import for Queries II (#14091) (@Lyndsi Kay Williams)
+- [13740](https://github.com/apache/superset/pull/13740) feat: Implement Celery SoftTimeLimit handling (#13740) (@Lily Kuang)
+- [13340](https://github.com/apache/superset/pull/13340) feat: Implement drag and drop columns for filters (#13340) (@Kamil Gabryjelski)
+- [13575](https://github.com/apache/superset/pull/13575) feat: Implement drag and drop for metrics (#13575) (@Kamil Gabryjelski)
+- [13521](https://github.com/apache/superset/pull/13521) feat: Logic added to limiting factor column in Query model (#13521) (@AAfghahi)
+- [14007](https://github.com/apache/superset/pull/14007) feat: Make async query JWT cookie domain configurable (#14007) (@Ben Reinhart)
+- [12862](https://github.com/apache/superset/pull/12862) feat: Make initial user configurable in helm chart (#12862) (@Andreas Eberle)
+- [13696](https://github.com/apache/superset/pull/13696) feat: Refactor asyncEvent middleware and add websocket support (#13696) (@Rob DiCiuccio)
+- [14256](https://github.com/apache/superset/pull/14256) feat: Setup `supersetText` configuration to overwrite errors (#14256) (@Hugh A. Miles II)
+- [14398](https://github.com/apache/superset/pull/14398) feat: Support env vars configuration for WebSocket server (#14398) (@Ben Reinhart)
+- [14008](https://github.com/apache/superset/pull/14008) feat: Support feature flag overrides in ephemeral test envs (#14008) (@Rob DiCiuccio)
+- [14122](https://github.com/apache/superset/pull/14122) feat: TrinoEngineSpec.adjust_database_uri (#14122) (@Đặng Minh Dũng)
+- [13662](https://github.com/apache/superset/pull/13662) feat: add 'extra' column to saved_queries GET (#13662) (@Maxime Beauchemin)
+- [13682](https://github.com/apache/superset/pull/13682) feat: add Databricks DB engine spec (#13682) (@Beto Dealmeida)
+- [14072](https://github.com/apache/superset/pull/14072) feat: add Echarts gauge chart (#14072) (@krsnik93)
+- [13584](https://github.com/apache/superset/pull/13584) feat: add ErrorBoundary to chart controls (#13584) (@Jesse Yang)
+- [14267](https://github.com/apache/superset/pull/14267) feat: add alerts & reports to docker compose (#14267) (@Daniel Vaz Gaspar)
+- [13152](https://github.com/apache/superset/pull/13152) feat: add connector for CrateDB (#13152) (@Srini Kadamati)
+- [13827](https://github.com/apache/superset/pull/13827) feat: add descriptions to report emails (#13827) (@Sam Faber-Manning)
+- [14208](https://github.com/apache/superset/pull/14208) feat: add endpoint to fetch available DBs (#14208) (@Beto Dealmeida)
+- [13468](https://github.com/apache/superset/pull/13468) feat: add event_logger to test_connection and create_database commands (#13468) (@Hugh A. Miles II)
+- [13997](https://github.com/apache/superset/pull/13997) feat: add extract_errors to Postgres (#13997) (@Beto Dealmeida)
+- [13586](https://github.com/apache/superset/pull/13586) feat: add more big data for testing (#13586) (@Beto Dealmeida)
+- [13448](https://github.com/apache/superset/pull/13448) feat: add option to load big/wide tables (#13448) (@Beto Dealmeida)
+- [13364](https://github.com/apache/superset/pull/13364) feat: add unit test for LimitMethod.FETCH_MANY (#13364) (@Beto Dealmeida)
+- [13606](https://github.com/apache/superset/pull/13606) feat: add warning metadata to tables and metrics (#13606) (@Erik Ritter)
+- [13610](https://github.com/apache/superset/pull/13610) feat: added support to configure the default explorer viz (#13610) (@cccs-jc)
+- [13601](https://github.com/apache/superset/pull/13601) feat: better error message when adding DBs (#13601) (@Beto Dealmeida)
+- [14250](https://github.com/apache/superset/pull/14250) feat: catch errors on do_ping (#14250) (@Beto Dealmeida)
+- [13893](https://github.com/apache/superset/pull/13893) feat: create backend routes and API for importing saved queries (#13893) (@AAfghahi)
+- [13487](https://github.com/apache/superset/pull/13487) feat: create hooks to redux component (#13487) (@AAfghahi)
+- [13871](https://github.com/apache/superset/pull/13871) feat: create table with long name (#13871) (@Beto Dealmeida)
+- [14172](https://github.com/apache/superset/pull/14172) feat: error messages for Presto connections  (#14172) (@Beto Dealmeida)
+- [14093](https://github.com/apache/superset/pull/14093) feat: error messages when connecting to MSSQL (#14093) (@Beto Dealmeida)
+- [14171](https://github.com/apache/superset/pull/14171) feat: error messages when connecting to mssql (#14171) (@AAfghahi)
+- [14040](https://github.com/apache/superset/pull/14040) feat: handle chart/data API errors (#14040) (@Erik Ritter)
+- [14204](https://github.com/apache/superset/pull/14204) feat: improve engine spec discoverability (#14204) (@Beto Dealmeida)
+- [13960](https://github.com/apache/superset/pull/13960) feat: initial work to make v1 API compatible with SIP-40 and SIP-41 (#13960) (@Beto Dealmeida)
+- [14146](https://github.com/apache/superset/pull/14146) feat: invalid DB name error messages (MySQL/Postgres/Redshift)  (#14146) (@AAfghahi)
+- [14089](https://github.com/apache/superset/pull/14089) feat: invalid hostname and password error messages (MySQL) (#14089) (@AAfghahi)
+- [14111](https://github.com/apache/superset/pull/14111) feat: invalid hostname and password error messages (Redshift) (#14111) (@AAfghahi)
+- [14038](https://github.com/apache/superset/pull/14038) feat: invalid password error message (Postgres) (#14038) (@Beto Dealmeida)
+- [13862](https://github.com/apache/superset/pull/13862) feat: only send alert error emails to owners of the alert (#13862) (@Sam Faber-Manning)
+- [14163](https://github.com/apache/superset/pull/14163) feat: publish superset helm chart (#14163) (@jawabuu)
+- [13441](https://github.com/apache/superset/pull/13441) feat: refactor on DBEventLogger to allow for context management (#13441) (@Hugh A. Miles II)
+- [14092](https://github.com/apache/superset/pull/14092) feat: restyle database modal (#14092) (@Elizabeth Thompson)
+- [13561](https://github.com/apache/superset/pull/13561) feat: script to benchmark DB migrations (#13561) (@Beto Dealmeida)
+- [13720](https://github.com/apache/superset/pull/13720) feat: sort time grain configs (#13720) (@Elizabeth Thompson)
+- [13743](https://github.com/apache/superset/pull/13743) feat: use cross-env when running dev-server (#13743) (@Cemre Mengu)
+
+**Fixes**
+- [13585](https://github.com/apache/superset/pull/13585) fix antd select dropdown issue (#13585) (@Lily Kuang)
+- [14369](https://github.com/apache/superset/pull/14369) fix error getting partitionQuery from table.partition (#14369) (@eriendeng)
+- [13878](https://github.com/apache/superset/pull/13878) fix(#13378): Ensure g.user is set for impersonation (#13878) (@Ben Reinhart)
+- [13756](https://github.com/apache/superset/pull/13756) fix(CI): use presto docker image from starburst (#13756) (@Jesse Yang)
+- [13718](https://github.com/apache/superset/pull/13718) fix(alerts and reports): Unify timestamp format on execution log view (#13718) (@Jack Fragassi)
+- [13436](https://github.com/apache/superset/pull/13436) fix(alerts&reports): add celery soft timeout support (#13436) (@Daniel Vaz Gaspar)
+- [13911](https://github.com/apache/superset/pull/13911) fix(alerts/reports): working timeout with celery kill and logic fix (#13911) (@Daniel Vaz Gaspar)
+- [14483](https://github.com/apache/superset/pull/14483) fix(annotations): pass force param to annotation request (#14483) (@Ville Brofeldt)
+- [14526](https://github.com/apache/superset/pull/14526) fix(chart-data): handle url_params in csv export and native filters (#14526) (@Ville Brofeldt)
+- [13945](https://github.com/apache/superset/pull/13945) fix(colors): fix color schemes (#13945) (@simcha90)
+- [14063](https://github.com/apache/superset/pull/14063) fix(country-map): update geojson and control layout (#14063) (@Jesse Yang)
+- [13665](https://github.com/apache/superset/pull/13665) fix(cross-filter): fix scheme py (#13665) (@simcha90)
+- [14220](https://github.com/apache/superset/pull/14220) fix(cross-filters): Fix missed metadata (#14220) (@simcha90)
+- [13692](https://github.com/apache/superset/pull/13692) fix(cross-filters): add a control panel to range filter (#13692) (@Ville Brofeldt)
+- [13703](https://github.com/apache/superset/pull/13703) fix(cross-filters): expand relevant indicator sections (#13703) (@Ville Brofeldt)
+- [13704](https://github.com/apache/superset/pull/13704) fix(cross-filters): only apply filters if ff is set (#13704) (@Ville Brofeldt)
+- [13825](https://github.com/apache/superset/pull/13825) fix(cypress): avoid referencing detached dom nodes (#13825) (@David Aaron Suddjian)
+- [14306](https://github.com/apache/superset/pull/14306) fix(dashboard): Add caching for dashboard datasets (#14306) (@David Aaron Suddjian)
+- [13352](https://github.com/apache/superset/pull/13352) fix(dashboard): Get dashboard by slug (#13352) (@David Aaron Suddjian)
+- [14207](https://github.com/apache/superset/pull/14207) fix(dashboard): draft dashboards should be viewable (#14207) (@Jesse Yang)
+- [14129](https://github.com/apache/superset/pull/14129) fix(dashboard): filter set hydration not working (#14129) (@Ville Brofeldt)
+- [14148](https://github.com/apache/superset/pull/14148) fix(dashboard): incorrect perm for users with multiple roles (#14148) (@Jesse Yang)
+- [13691](https://github.com/apache/superset/pull/13691) fix(dashboard): missing parents in directPathToFilter (#13691) (@Ville Brofeldt)
+- [13769](https://github.com/apache/superset/pull/13769) fix(dashboard): rename native filter configuration property (#13769) (@Ville Brofeldt)
+- [13652](https://github.com/apache/superset/pull/13652) fix(datasets): log create exceptions as warning (#13652) (@ʈᵃᵢ)
+- [14295](https://github.com/apache/superset/pull/14295) fix(db2): change name and add legacy alias (#14295) (@Ville Brofeldt)
+- [14362](https://github.com/apache/superset/pull/14362) fix(emotion): add separate namespace for menu app (#14362) (@ʈᵃᵢ)
+- [13826](https://github.com/apache/superset/pull/13826) fix(errors): Downgrade error on stop query to a warning (#13826) (@Will Barrett)
+- [13621](https://github.com/apache/superset/pull/13621) fix(explore): Add int and bool regex pattern (#13621) (@Nikola Gigić)
+- [14194](https://github.com/apache/superset/pull/14194) fix(explore): CUSTOM SQL tab should automatically update (#14194) (@Yaozong Liu)
+- [13566](https://github.com/apache/superset/pull/13566) fix(explore): make horizontal scroll appears in data panel (#13566) (@Yaozong Liu)
+- [13473](https://github.com/apache/superset/pull/13473) fix(explore): make sure sort by metric is not duplicated (#13473) (@Jesse Yang)
+- [13801](https://github.com/apache/superset/pull/13801) fix(explore): strip semicolons in virtual table SQL (#13801) (@Phillip Kelley-Dotson)
+- [13613](https://github.com/apache/superset/pull/13613) fix(helm): Add missing extraConfigs template volume mapping and fix type error on template. (#13613) (@Daniel Wood)
+- [14255](https://github.com/apache/superset/pull/14255) fix(hive): Update CSV to Hive upload prefix (#14255) (@John Bodley)
+- [14240](https://github.com/apache/superset/pull/14240) fix(hive): Use parquet rather than textfile when uploading CSV files to Hive (#14240) (@John Bodley)
+- [13906](https://github.com/apache/superset/pull/13906) fix(listview): update listview feature flag (#13906) (@Phillip Kelley-Dotson)
+- [14332](https://github.com/apache/superset/pull/14332) fix(native-filters): Fix first loading of charts (#14332) (@simcha90)
+- [14334](https://github.com/apache/superset/pull/14334) fix(native-filters): Fix indicators (#14334) (@simcha90)
+- [14370](https://github.com/apache/superset/pull/14370) fix(native-filters): Update filter saving (#14370) (@simcha90)
+- [13837](https://github.com/apache/superset/pull/13837) fix(native-filters): add global async query support to native filters (#13837) (@Ville Brofeldt)
+- [14353](https://github.com/apache/superset/pull/14353) fix(native-filters): allowClear only when required not checked (#14353) (@Ville Brofeldt)
+- [14409](https://github.com/apache/superset/pull/14409) fix(native-filters): always show filters without dataset (#14409) (@Ville Brofeldt)
+- [14401](https://github.com/apache/superset/pull/14401) fix(native-filters): default value not populated on second opening (#14401) (@Ville Brofeldt)
+- [14426](https://github.com/apache/superset/pull/14426) fix(native-filters): fix filter scope error (#14426) (@Ville Brofeldt)
+- [14387](https://github.com/apache/superset/pull/14387) fix(native-filters): fix lint (#14387) (@simcha90)
+- [14218](https://github.com/apache/superset/pull/14218) fix(native-filters): fix remove native filters (#14218) (@simcha90)
+- [13688](https://github.com/apache/superset/pull/13688) fix(native-filters): fix removing native filter (#13688) (@simcha90)
+- [14385](https://github.com/apache/superset/pull/14385) fix(native-filters): force update control value on change (#14385) (@Ville Brofeldt)
+- [13794](https://github.com/apache/superset/pull/13794) fix(native-filters): improve loading styles for filter component (#13794) (@Ville Brofeldt)
+- [14244](https://github.com/apache/superset/pull/14244) fix(native-filters): merge_extra_form_data extras processing (#14244) (@Ville Brofeldt)
+- [13434](https://github.com/apache/superset/pull/13434) fix(query): order by adhoc metrics should trigger group by (#13434) (@Jesse Yang)
+- [13331](https://github.com/apache/superset/pull/13331) fix(query-object): extra time-range-endpoints (#13331) (@John Bodley)
+- [14014](https://github.com/apache/superset/pull/14014) fix(sqla): apply sqla type on calculated columns (#14014) (@Ville Brofeldt)
+- [14095](https://github.com/apache/superset/pull/14095) fix(sqla): labels_expected contains mutated label (#14095) (@Ville Brofeldt)
+- [14297](https://github.com/apache/superset/pull/14297) fix(sqla): timeseries limit not applied when using columns (#14297) (@Ville Brofeldt)
+- [13739](https://github.com/apache/superset/pull/13739) fix(sqla-query): order by aggregations in Presto and Hive (#13739) (@Jesse Yang)
+- [13636](https://github.com/apache/superset/pull/13636) fix(sqllab): Table name and schema are encoded twice during fetching table metadata on SQL Lab page. (#13636) (@Dmytro Mudrov)
+- [14390](https://github.com/apache/superset/pull/14390) fix(sqllab): fix error due to anonymous user (#14390) (@Ville Brofeldt)
+- [13288](https://github.com/apache/superset/pull/13288) fix(sqllab): per-tab hide left bar (#13288) (@Beto Dealmeida)
+- [13841](https://github.com/apache/superset/pull/13841) fix(sqllab): warning message when rows limited (#13841) (@zuzana-vej)
+- [14045](https://github.com/apache/superset/pull/14045) fix(viz): bump superset-ui 0.17.30 (#14045) (@Ville Brofeldt)
+- [14438](https://github.com/apache/superset/pull/14438) fix(viz): bump superset-ui to fix bugs in table and graph chart (#14438) (@Jesse Yang)
+- [14191](https://github.com/apache/superset/pull/14191) fix(viz): time shift read-only error (#14191) (@Ville Brofeldt)
+- [13657](https://github.com/apache/superset/pull/13657) fix: 'Run in SQL Lab' redirect bug (#13657) (@Maxime Beauchemin)
+- [13444](https://github.com/apache/superset/pull/13444) fix: API to allow importing old exports (JSON/YAML) (#13444) (@Beto Dealmeida)
+- [14180](https://github.com/apache/superset/pull/14180) fix: Add extra requires for shillelagh (#14180) (@Erik Ritter)
+- [14192](https://github.com/apache/superset/pull/14192) fix: Center each import icon and add a tooltip II (#14192) (@Lyndsi Kay Williams)
+- [13859](https://github.com/apache/superset/pull/13859) fix: Check for permissions in FilterBox (#13859) (@Erik Ritter)
+- [14317](https://github.com/apache/superset/pull/14317) fix: Cleanup serialization and hashing code (#14317) (@Ben Reinhart)
+- [13972](https://github.com/apache/superset/pull/13972) fix: Data table z index in sql Editor (#13972) (@AAfghahi)
+- [13749](https://github.com/apache/superset/pull/13749) fix: Disallows negative options remaining (#13749) (@Michael S. Molina)
+- [14291](https://github.com/apache/superset/pull/14291) fix: Fix unintended cache misses with async queries (#14291) (@Ben Reinhart)
+- [14086](https://github.com/apache/superset/pull/14086) fix: Fixed saved query export (#14086) (@Lyndsi Kay Williams)
+- [13858](https://github.com/apache/superset/pull/13858) fix: Floating Menu in SQL Left Bar (#13858) (@AAfghahi)
+- [14147](https://github.com/apache/superset/pull/14147) fix: Handle bad permission errors for bigquery test connections (#14147) (@Hugh A. Miles II)
+- [13980](https://github.com/apache/superset/pull/13980) fix: Issue 13956 (#13980) (@John Bodley)
+- [13602](https://github.com/apache/superset/pull/13602) fix: ParsedQuery subselect edge case (#13602) (@Erik Ritter)
+- [13987](https://github.com/apache/superset/pull/13987) fix: Pie chart not displayed in viz (#13987) (@Yongjie Zhao)
+- [13852](https://github.com/apache/superset/pull/13852) fix: Pin Prophet dependency after breaking changes (#13852) (@Étienne Boisseau-Sierra)
+- [13469](https://github.com/apache/superset/pull/13469) fix: Remove view in sql lab from druid datasources (#13469) (@Erik Ritter)
+- [13464](https://github.com/apache/superset/pull/13464) fix: SHOW is not DML (#13464) (@Beto Dealmeida)
+- [13946](https://github.com/apache/superset/pull/13946) fix: SQL -> Explore Overwrite flow (#13946) (@Hugh A. Miles II)
+- [14358](https://github.com/apache/superset/pull/14358) fix: SQL Statement on QUERY_LOGGER prints none to log (#14358) (@cccs-rc)
+- [14372](https://github.com/apache/superset/pull/14372) fix: SQLLab role permissions (#14372) (@Daniel Vaz Gaspar)
+- [13655](https://github.com/apache/superset/pull/13655) fix: Slack dashboard has stale charts (#13655) (@Beto Dealmeida)
+- [14170](https://github.com/apache/superset/pull/14170) fix: Switching to local codecov script (#14170) (@Craig Rueda)
+- [13974](https://github.com/apache/superset/pull/13974) fix: Use superset generic db to catch external_metadata queries (#13974) (@Hugh A. Miles II)
+- [13830](https://github.com/apache/superset/pull/13830) fix: Use utils.json_iso_dttm_ser to dump jsons when async query execution (#13830) (@Carlos Fidel Selva Ochoa)
+- [13496](https://github.com/apache/superset/pull/13496) fix: `IS NULL` filter operator for numeric columns (#13496) (@Jesse Yang)
+- [14036](https://github.com/apache/superset/pull/14036) fix: add exception to catch session not having JWT (#14036) (@Hugh A. Miles II)
+- [13822](https://github.com/apache/superset/pull/13822) fix: adjusted tab height (#13822) (@AAfghahi)
+- [13488](https://github.com/apache/superset/pull/13488) fix: allow option to generate new query (#13488) (@Elizabeth Thompson)
+- [13800](https://github.com/apache/superset/pull/13800) fix: allow spaces in DB names (#13800) (@Beto Dealmeida)
+- [13563](https://github.com/apache/superset/pull/13563) fix: always pass a string as a value to ace editor (#13563) (@Elizabeth Thompson)
+- [12341](https://github.com/apache/superset/pull/12341) fix: annotation layer modal err handling (#12341) (@Moriah Kreeger)
+- [13969](https://github.com/apache/superset/pull/13969) fix: annotation modal dateRangePicker saved invalid value (#13969) (@Yongjie Zhao)
+- [13790](https://github.com/apache/superset/pull/13790) fix: bad copy-and-paste in API spec (#13790) (@Beto Dealmeida)
+- [13578](https://github.com/apache/superset/pull/13578) fix: better handle datasource exceptions (#13578) (@Daniel Vaz Gaspar)
+- [13642](https://github.com/apache/superset/pull/13642) fix: bump FAB to 3.2.1, SQLAlchemy fix (#13642) (@Daniel Vaz Gaspar)
+- [13868](https://github.com/apache/superset/pull/13868) fix: change status code for generic errors to 400 (#13868) (@Hugh A. Miles II)
+- [13681](https://github.com/apache/superset/pull/13681) fix: clean up incorrect usage of TypeScript type in PropTypes (#13681) (@Jesse Yang)
+- [14084](https://github.com/apache/superset/pull/14084) fix: custom TimeRange can not input value (#14084) (@Yongjie Zhao)
+- [13695](https://github.com/apache/superset/pull/13695) fix: dashboard filter scope bug (#13695) (@Grace Guo)
+- [13624](https://github.com/apache/superset/pull/13624) fix: data column in SQL lab left panel open by default  (#13624) (@AAfghahi)
+- [13330](https://github.com/apache/superset/pull/13330) fix: date picker support date unit with singular and plural (#13330) (@Yongjie Zhao)
+- [13603](https://github.com/apache/superset/pull/13603) fix: default when adding tab_state.hide_left_bar (#13603) (@Beto Dealmeida)
+- [13389](https://github.com/apache/superset/pull/13389) fix: delete dataset columns and metrics on the REST API (#13389) (@Daniel Vaz Gaspar)
+- [13917](https://github.com/apache/superset/pull/13917) fix: do not run containers as root by default in Helm chart (#13917) (@Stanislav Simovski)
+- [13926](https://github.com/apache/superset/pull/13926) fix: enable installing docker/requirements-local.txt in docker-compose-non-dev.yml (#13926) (@ʈᵃᵢ)
+- [13998](https://github.com/apache/superset/pull/13998) fix: execution log crashes for logs with no uuid (#13998) (@Jack Fragassi)
+- [14081](https://github.com/apache/superset/pull/14081) fix: fix bug when remove chart not  removing it's related cross filter data (#14081) (@simcha90)
+- [13546](https://github.com/apache/superset/pull/13546) fix: fix initial filter loading (#13546) (@simcha90)
+- [14082](https://github.com/apache/superset/pull/14082) fix: flacky test in test_update_dataset_item_w_override_columns (#14082) (@Hugh A. Miles II)
+- [14347](https://github.com/apache/superset/pull/14347) fix: flaky test for alerts and reports (#14347) (@Daniel Vaz Gaspar)
+- [13979](https://github.com/apache/superset/pull/13979) fix: import dataset/dashboard empty keys (#13979) (@Beto Dealmeida)
+- [14258](https://github.com/apache/superset/pull/14258) fix: incorrect module reference (#14258) (@Yongjie Zhao)
+- [13737](https://github.com/apache/superset/pull/13737) fix: log exceptions for thumbnail generation as warnings (#13737) (@Sam Faber-Manning)
+- [14057](https://github.com/apache/superset/pull/14057) fix: logs table - user_id is NULL (#14057) (@Hugh A. Miles II)
+- [13493](https://github.com/apache/superset/pull/13493) fix: merge 67da9ef1ef9c and 1412ec1e5a7b migrations (#13493) (@Hugh A. Miles II)
+- [13921](https://github.com/apache/superset/pull/13921) fix: new import/export CLI (#13921) (@Beto Dealmeida)
+- [13955](https://github.com/apache/superset/pull/13955) fix: null exception from adhoc metric popover (#13955) (@Grace Guo)
+- [14509](https://github.com/apache/superset/pull/14509) fix: parameterize titles correctly (#14509) (@David Aaron Suddjian)
+- [14338](https://github.com/apache/superset/pull/14338) fix: pybabel extract fails (#14338) (@ume)
+- [13780](https://github.com/apache/superset/pull/13780) fix: restart superset container in test script (#13780) (@Ben Reinhart)
+- [13694](https://github.com/apache/superset/pull/13694) fix: select table overlay (#13694) (@AAfghahi)
+- [14074](https://github.com/apache/superset/pull/14074) fix: unable to apply logging format (#14074) (@Yongjie Zhao)
+- [14319](https://github.com/apache/superset/pull/14319) fix: unbreak CI (#14319) (@Erik Ritter)
+- [13679](https://github.com/apache/superset/pull/13679) fix: use FeatureFlags in @superset-ui/core (#13679) (@Jesse Yang)
+- [14099](https://github.com/apache/superset/pull/14099) fix:fix get permission function (#14099) (@simcha90)
+
+**Documentation**
+- [13770](https://github.com/apache/superset/pull/13770) docs(contributing): fix backend port (#13770) (@Cemre Mengu)
+- [13813](https://github.com/apache/superset/pull/13813) docs: Documenting how to debug Flask app (#13813) (@cccs-jc)
+- [13455](https://github.com/apache/superset/pull/13455) docs: Fix typo in footer (#13455) (@Holger Stitz)
+- [14304](https://github.com/apache/superset/pull/14304) docs: add publish step (#14304) (@ʈᵃᵢ)
+- [13611](https://github.com/apache/superset/pull/13611) docs: correct sentence (#13611) (@Erfan Mirzapour)
+- [13440](https://github.com/apache/superset/pull/13440) docs: deprecate old alerts and dash/charts reports (#13440) (@Daniel Vaz Gaspar)
+- [14394](https://github.com/apache/superset/pull/14394) docs: improved clickhouse connection details (#14394) (@Srini Kadamati)
+- [14321](https://github.com/apache/superset/pull/14321) docs: multiple small fixes around databases (#14321) (@Srini Kadamati)
+- [12932](https://github.com/apache/superset/pull/12932) docs: update helm documentation (#12932) (@Anthony Corletti)
+- [14027](https://github.com/apache/superset/pull/14027) docs: update outdated country map tools instructions (#14027) (@Jesse Yang)
+- [13781](https://github.com/apache/superset/pull/13781) docs: update setup instructions (#13781) (@Ben Reinhart)
+
+**Other**
+- [13759](https://github.com/apache/superset/pull/13759) Add CODEOWNERS (#13759) (@Rob DiCiuccio)
+- [14238](https://github.com/apache/superset/pull/14238) Add Preset code owners for ephemeral test env workflows (#14238) (@Rob DiCiuccio)
+- [13553](https://github.com/apache/superset/pull/13553) Add dedicated dir and storybook (#13553) (@Geido)
+- [13961](https://github.com/apache/superset/pull/13961) Add docs for configuring Docker Compose setup (#13961) (@Alex Kreidler)
+- [13728](https://github.com/apache/superset/pull/13728) Add extraSecrets config to allow specifying extra secret files (#13728) (@Andreas Eberle)
+- [14223](https://github.com/apache/superset/pull/14223) Add superset helm repository (#14223) (@jawabuu)
+- [13778](https://github.com/apache/superset/pull/13778) Add tests (#13778) (@Geido)
+- [13950](https://github.com/apache/superset/pull/13950) Add tests for FilterBar CascadeFilterControl (#13950) (@Geido)
+- [13425](https://github.com/apache/superset/pull/13425) Adding v0 import/export fields to dashboard metadata schema (#13425) (@michellethomas)
+- [13359](https://github.com/apache/superset/pull/13359) Adds tests and storybook to CopyToClipboard component (#13359) (@Michael S. Molina)
+- [13658](https://github.com/apache/superset/pull/13658) Bump pyyaml to latest (#13658) (@Rob DiCiuccio)
+- [13854](https://github.com/apache/superset/pull/13854) Displays row limit warning with Alert component (#13854) (@Michael S. Molina)
+- [14187](https://github.com/apache/superset/pull/14187) Enable the new pivot table (#14187) (@Kamil Gabryjelski)
+- [13861](https://github.com/apache/superset/pull/13861) Fix broken link (#13861) (@Eric Anderson)
+- [14039](https://github.com/apache/superset/pull/14039) Fix broken port-forward instructions (#14039) (@Caleb Collins-Parks)
+- [14243](https://github.com/apache/superset/pull/14243) Fix filter edit popover not opening in DnD mode (#14243) (@Kamil Gabryjelski)
+- [13608](https://github.com/apache/superset/pull/13608) Fix: Add SASL dependency module (#13608) (@Daniel Wood)
+- [13505](https://github.com/apache/superset/pull/13505) Fixed KeyError by making kwarg explicit (#13505) (@Richard Nordin)
+- [13905](https://github.com/apache/superset/pull/13905) Fixing condition around left margin for dashboard layout. Fixes #13863 (#13905) (@Evan Rusackas)
+- [14323](https://github.com/apache/superset/pull/14323) Fixing spelling: `clint` -> `client` (#14323) (@Chris Carini)
+- [13570](https://github.com/apache/superset/pull/13570) Given port in dockerfile set to same port in config (#13570) (@İbrahim Ercan)
+- [13273](https://github.com/apache/superset/pull/13273) Improves ButtonGroup tests (#13273) (@Michael S. Molina)
+- [14046](https://github.com/apache/superset/pull/14046) Make chart exclude itself from cross filtering (#14046) (@Kamil Gabryjelski)
+- [14287](https://github.com/apache/superset/pull/14287) Make g.user attribute access safe for public users (#14287) (@Rob DiCiuccio)
+- [13643](https://github.com/apache/superset/pull/13643) Make preliminary suggested changes to CONTRIBUTING.md (#13643) (@Kris Stern)
+- [13314](https://github.com/apache/superset/pull/13314) Moves AsyncSelect component and tests to own folder (#13314) (@Michael S. Molina)
+- [13901](https://github.com/apache/superset/pull/13901) Revert "fix: select table overlay (#13694)" (#13901) (@Erik Ritter)
+- [13876](https://github.com/apache/superset/pull/13876) Tests for "CrossFilterScopingModal/utils" (#13876) (@Bruno Motta)
+- [13991](https://github.com/apache/superset/pull/13991) Tests for ColumnSelect (#13991) (@Bruno Motta)
+- [13975](https://github.com/apache/superset/pull/13975) Tests for ControlItems (#13975) (@Bruno Motta)
+- [13872](https://github.com/apache/superset/pull/13872) Tests for DetailsPanel (#13872) (@Bruno Motta)
+- [14025](https://github.com/apache/superset/pull/14025) Update CONTRIBUTING.md (#14025) (@Hugh A. Miles II)
+- [13607](https://github.com/apache/superset/pull/13607) Update UPDATING.md (#13607) (@Beto Dealmeida)
+- [13934](https://github.com/apache/superset/pull/13934) Update docs to use the newer WEBDRIVER_TYPE name (#13934) (@Octavian)
+- [14219](https://github.com/apache/superset/pull/14219) Update trino connection docs (#14219) (@Aakash Nand)
+- [14031](https://github.com/apache/superset/pull/14031) Use consistent chart value (#14031) (@Tom Vendetta)
+- [13323](https://github.com/apache/superset/pull/13323) Use redis:latest in docker-compose workflow (#13323) (@Rob DiCiuccio)
+- [13730](https://github.com/apache/superset/pull/13730) Use stringData instead of data in Secrets and remove manual base64 encoding (#13730) (@Andreas Eberle)
+- [13936](https://github.com/apache/superset/pull/13936) Use the right variable for Celery results in Redis (#13936) (@Octavian)
+- [14252](https://github.com/apache/superset/pull/14252) WIP (#14252) (@Beto Dealmeida)
+- [14446](https://github.com/apache/superset/pull/14446) add migration (#14446) (@Ville Brofeldt)
+- [13365](https://github.com/apache/superset/pull/13365) add more documentation around python testing and linting (#13365) (@Elizabeth Thompson)
+- [13527](https://github.com/apache/superset/pull/13527) build(deps): bump elliptic from 6.5.3 to 6.5.4 in /docs (#13527) (@dependabot[bot])
+- [12636](https://github.com/apache/superset/pull/12636) build(deps): bump socket.io from 2.3.0 to 2.4.1 in /docs (#12636) (@dependabot[bot])
+- [13391](https://github.com/apache/superset/pull/13391) build(deps): bump three from 0.68.87 to 0.125.0 in /docs (#13391) (@dependabot[bot])
+- [13393](https://github.com/apache/superset/pull/13393) build(deps): bump urijs from 1.19.4 to 1.19.6 in /superset-frontend (#13393) (@dependabot[bot])
+- [13874](https://github.com/apache/superset/pull/13874) build(deps): bump y18n from 4.0.0 to 4.0.1 in /docs (#13874) (@dependabot[bot])
+- [13886](https://github.com/apache/superset/pull/13886) build(deps): bump y18n from 4.0.0 to 4.0.1 in /superset-frontend (#13886) (@dependabot[bot])
+- [13452](https://github.com/apache/superset/pull/13452) build(test env): Shutdown test environments on PR close (#13452) (@Rob DiCiuccio)
+- [13189](https://github.com/apache/superset/pull/13189) build: Ephemeral environments for PRs via slash command (#13189) (@Rob DiCiuccio)
+- [13498](https://github.com/apache/superset/pull/13498) build: check potential db migration conflict for open PRs (#13498) (@Jesse Yang)
+- [13375](https://github.com/apache/superset/pull/13375) build: fix codecov informational config (#13375) (@Jesse Yang)
+- [13421](https://github.com/apache/superset/pull/13421) build: ignore Storybook stories in CodeCov (#13421) (@Jesse Yang)
+- [13677](https://github.com/apache/superset/pull/13677) build: implement codecov carryforward flags (#13677) (@Jack Fragassi)
+- [13927](https://github.com/apache/superset/pull/13927) catch collapse onchange (#13927) (@Elizabeth Thompson)
+- [13757](https://github.com/apache/superset/pull/13757) chore(CI): dont run Hive tests on Py 3.7 (#13757) (@Jesse Yang)
+- [13784](https://github.com/apache/superset/pull/13784) chore(cypress): Make the e2e tests more behavior-driven (#13784) (@David Aaron Suddjian)
+- [13939](https://github.com/apache/superset/pull/13939) chore(dashboard): Datasource -> Dataset (#13939) (@David Aaron Suddjian)
+- [14342](https://github.com/apache/superset/pull/14342) chore(docker-compose): use dev image for docker-compose-non-dev.yml (#14342) (@ʈᵃᵢ)
+- [14331](https://github.com/apache/superset/pull/14331) chore(docs):  remove .py from db migrate -m (#14331) (@Amit Miran)
+- [13660](https://github.com/apache/superset/pull/13660) chore(explore): added debounce in DateFilter (#13660) (@Yongjie Zhao)
+- [13593](https://github.com/apache/superset/pull/13593) chore(explore): bump superset-ui 0.17.19 (#13593) (@Yongjie Zhao)
+- [13767](https://github.com/apache/superset/pull/13767) chore(git): ignore superset/app/ folder (#13767) (@Cemre Mengu)
+- [13500](https://github.com/apache/superset/pull/13500) chore(homepage): separate out api calls to make homepage load more dynamically (#13500) (@Phillip Kelley-Dotson)
+- [14228](https://github.com/apache/superset/pull/14228) chore(prophet): bump prophet to 1.0.1 (#14228) (@Ville Brofeldt)
+- [13306](https://github.com/apache/superset/pull/13306) chore(spa refactor): refactoring dashboard to use api's instead of bootstrapdata (#13306) (@Phillip Kelley-Dotson)
+- [14013](https://github.com/apache/superset/pull/14013) chore(toggle thumbnails): use localstorage for toggle (#14013) (@Phillip Kelley-Dotson)
+- [14274](https://github.com/apache/superset/pull/14274) chore: Add Redis password option to helm chart (#14274) (@Rob DiCiuccio)
+- [13418](https://github.com/apache/superset/pull/13418) chore: Added rockset and firebird (#13418) (@Srini Kadamati)
+- [13951](https://github.com/apache/superset/pull/13951) chore: Adds dataMask reducer to reducerIndex (#13951) (@Michael S. Molina)
+- [14203](https://github.com/apache/superset/pull/14203) chore: Bumping lodash version in Superset (#14203) (@Evan Rusackas)
+- [14196](https://github.com/apache/superset/pull/14196) chore: Code cleanup in DatabaseModal (#14196) (@Lyndsi Kay Williams)
+- [14164](https://github.com/apache/superset/pull/14164) chore: Configures Jest to ignore storybook files when collecting coverage statistics (#14164) (@Michael S. Molina)
+- [14339](https://github.com/apache/superset/pull/14339) chore: Improve Japanese translation (#14339) (@ume)
+- [13722](https://github.com/apache/superset/pull/13722) chore: Improve Korean translation (#13722) (@김세환)
+- [13376](https://github.com/apache/superset/pull/13376) chore: Improve japannese translation (#13376) (@Tetsushi Watanabe)
+- [14193](https://github.com/apache/superset/pull/14193) chore: Improves Icons storybook (#14193) (@Michael S. Molina)
+- [13274](https://github.com/apache/superset/pull/13274) chore: Migrates RefreshChartOverlay into Chart (#13274) (@Michael S. Molina)
+- [13361](https://github.com/apache/superset/pull/13361) chore: Migrating dashboard/components/menu from jsx to tsx (#13361) (@Ayan Ginet)
+- [13460](https://github.com/apache/superset/pull/13460) chore: Moves BootstrapSliderWrapper to own folder (#13460) (@Michael S. Molina)
+- [14139](https://github.com/apache/superset/pull/14139) chore: Moves Card to the components folder (#14139) (@Michael S. Molina)
+- [13454](https://github.com/apache/superset/pull/13454) chore: Moves ChartIcon to own folder (#13454) (@Michael S. Molina)
+- [13459](https://github.com/apache/superset/pull/13459) chore: Moves CheckboxIcons to Checkbox folder (#13459) (@Michael S. Molina)
+- [14124](https://github.com/apache/superset/pull/14124) chore: Moves Collapse to the components folder (#14124) (@Michael S. Molina)
+- [14125](https://github.com/apache/superset/pull/14125) chore: Moves CronPicker to the components folder (#14125) (@Michael S. Molina)
+- [14126](https://github.com/apache/superset/pull/14126) chore: Moves Dropdown to the components folder (#14126) (@Michael S. Molina)
+- [14127](https://github.com/apache/superset/pull/14127) chore: Moves DropdownButton to the components folder (#14127) (@Michael S. Molina)
+- [13458](https://github.com/apache/superset/pull/13458) chore: Moves Fade component into TableElement (#13458) (@Michael S. Molina)
+- [13322](https://github.com/apache/superset/pull/13322) chore: Moves FilterableTable test to component folder (#13322) (@Michael S. Molina)
+- [13485](https://github.com/apache/superset/pull/13485) chore: Moves InfoTooltip component to own folder (#13485) (@Michael S. Molina)
+- [14128](https://github.com/apache/superset/pull/14128) chore: Moves InfoTooltip to the components folder (#14128) (@Michael S. Molina)
+- [13324](https://github.com/apache/superset/pull/13324) chore: Moves ListView test to component folder (#13324) (@Michael S. Molina)
+- [14130](https://github.com/apache/superset/pull/14130) chore: Moves Modal to the components folder (#14130) (@Michael S. Molina)
+- [13338](https://github.com/apache/superset/pull/13338) chore: Moves OnPasteSelect tests to component's folder (#13338) (@Michael S. Molina)
+- [14133](https://github.com/apache/superset/pull/14133) chore: Moves Radio to the components folder (#14133) (@Michael S. Molina)
+- [14135](https://github.com/apache/superset/pull/14135) chore: Moves Switch to the components folder (#14135) (@Michael S. Molina)
+- [13411](https://github.com/apache/superset/pull/13411) chore: Moves TableSelector tests to component's folder (#13411) (@Michael S. Molina)
+- [14136](https://github.com/apache/superset/pull/14136) chore: Moves Tabs to the components folder (#14136) (@Michael S. Molina)
+- [14137](https://github.com/apache/superset/pull/14137) chore: Moves Tooltip to the components folder (#14137) (@Michael S. Molina)
+- [14123](https://github.com/apache/superset/pull/14123) chore: Moves WarningIconWithTooltip to own folder (#14123) (@Michael S. Molina)
+- [14200](https://github.com/apache/superset/pull/14200) chore: Moves spec files to the src folder - iteration 1 (#14200) (@Michael S. Molina)
+- [14201](https://github.com/apache/superset/pull/14201) chore: Moves spec files to the src folder - iteration 2 (#14201) (@Michael S. Molina)
+- [14202](https://github.com/apache/superset/pull/14202) chore: Moves spec files to the src folder - iteration 3 (#14202) (@Michael S. Molina)
+- [14166](https://github.com/apache/superset/pull/14166) chore: Moves the branding folder to the assets folder (#14166) (@Michael S. Molina)
+- [14167](https://github.com/apache/superset/pull/14167) chore: Moves the staticPages folder to the assets folder (#14167) (@Michael S. Molina)
+- [13462](https://github.com/apache/superset/pull/13462) chore: Removes Popover duplication (#13462) (@Michael S. Molina)
+- [13477](https://github.com/apache/superset/pull/13477) chore: Removes Select duplication (#13477) (@Michael S. Molina)
+- [13408](https://github.com/apache/superset/pull/13408) chore: Removes unused Hotkeys component (#13408) (@Michael S. Molina)
+- [14298](https://github.com/apache/superset/pull/14298) chore: SQLLab row limit warning using Alert component (#14298) (@zuzana-vej)
+- [13332](https://github.com/apache/superset/pull/13332) chore: Update OAuth2 configuration guide to match with FlaskAppBuilder (#13332) (@Liam)
+- [13855](https://github.com/apache/superset/pull/13855) chore: Update PR template for SIP-59 DB migrations process (#13855) (@Rob DiCiuccio)
+- [13738](https://github.com/apache/superset/pull/13738) chore: Update presto.mdx (#13738) (@Hugh A. Miles II)
+- [14257](https://github.com/apache/superset/pull/14257) chore: WebSocket server improvements (#14257) (@Ben Reinhart)
+- [14354](https://github.com/apache/superset/pull/14354) chore: add some basic instrumentation to Node WebSocket server (#14354) (@Ben Reinhart)
+- [13811](https://github.com/apache/superset/pull/13811) chore: add success log whenever a connection is working (#13811) (@Hugh A. Miles II)
+- [14355](https://github.com/apache/superset/pull/14355) chore: bump 0.17.38 (#14355) (@Amit Miran)
+- [13953](https://github.com/apache/superset/pull/13953) chore: bump @superset-ui/plugin-chart-table to 0.17.28 (#13953) (@Jesse Yang)
+- [14222](https://github.com/apache/superset/pull/14222) chore: bump package.json (#14222) (@Amit Miran)
+- [14253](https://github.com/apache/superset/pull/14253) chore: bump superset-ui (#14253) (@Erik Ritter)
+- [14460](https://github.com/apache/superset/pull/14460) chore: bump table plugin to 0.17.42 (#14460) (@Amit Miran)
+- [13932](https://github.com/apache/superset/pull/13932) chore: bump to new superset-ui version (#13932) (@Amit Miran)
+- [13374](https://github.com/apache/superset/pull/13374) chore: convert chartReducer to TypeScript (#13374) (@Jesse Yang)
+- [13450](https://github.com/apache/superset/pull/13450) chore: disable drag metrics and columns in datasourcePanel (#13450) (@Yongjie Zhao)
+- [13342](https://github.com/apache/superset/pull/13342) chore: improve modal error handling (#13342) (@Lily Kuang)
+- [13596](https://github.com/apache/superset/pull/13596) chore: metric refactor iteration 1 (#13596) (@Yongjie Zhao)
+- [13296](https://github.com/apache/superset/pull/13296) chore: migrating some LESS (#13296) (@Evan Rusackas)
+- [14169](https://github.com/apache/superset/pull/14169) chore: rename connection errors (#14169) (@Beto Dealmeida)
+- [13970](https://github.com/apache/superset/pull/13970) chore: starter make file (#13970) (@Hugh A. Miles II)
+- [14088](https://github.com/apache/superset/pull/14088) chore: stop logging `SupersetExceptions` if status < 500 (#14088) (@Hugh A. Miles II)
+- [14178](https://github.com/apache/superset/pull/14178) chore: type some SQL Lab components (#14178) (@Erik Ritter)
+- [14152](https://github.com/apache/superset/pull/14152) chore: update RELEASING readme (#14152) (@Lily Kuang)
+- [13104](https://github.com/apache/superset/pull/13104) chore: update docs for new alerts and reporting feature (#13104) (@leocape)
+- [14033](https://github.com/apache/superset/pull/14033) chore: well component to card component(Updating PR #12200) (#14033) (@Bruno Motta)
+- [13518](https://github.com/apache/superset/pull/13518) ci: increase page size of GH PR API call (#13518) (@Ville Brofeldt)
+- [14350](https://github.com/apache/superset/pull/14350) ci: set remote URL to https and bump sha (#14350) (@Daniel Vaz Gaspar)
+- [14211](https://github.com/apache/superset/pull/14211) ci: use git submodules for  Chart Actions (#14211) (@jawabuu)
+- [13587](https://github.com/apache/superset/pull/13587) create better link for badge (#13587) (@Elizabeth Thompson)
+- [13626](https://github.com/apache/superset/pull/13626) dynamic dttm fix for test_convert_dttm (#13626) (@Nikola Gigić)
+- [14140](https://github.com/apache/superset/pull/14140) horizontal scroll (#14140) (@AAfghahi)
+- [13367](https://github.com/apache/superset/pull/13367) npm audit security updates (#13367) (@Elizabeth Thompson)
+- [14443](https://github.com/apache/superset/pull/14443) perf(native-filters): Load native filters after charts (#14443) (@simcha90)
+- [14408](https://github.com/apache/superset/pull/14408) perf(native-filters): avoid unnecessary reloading of charts (#14408) (@simcha90)
+- [14035](https://github.com/apache/superset/pull/14035) refactor(addslicecontainer): move slice container panel from bootstrap panel to ant-d (#14035) (@Phillip Kelley-Dotson)
+- [14366](https://github.com/apache/superset/pull/14366) refactor(db_engine_specs): Removing top-level import of app (#14366) (@John Bodley)
+- [13221](https://github.com/apache/superset/pull/13221) refactor(explore): convert ControlPanelsContainer to typescript (#13221) (@Jesse Yang)
+- [13437](https://github.com/apache/superset/pull/13437) refactor(native-filters): Move `filtersState` to `dataMask` redux root  (#13437) (@simcha90)
+- [14441](https://github.com/apache/superset/pull/14441) refactor(native-filters): allow cascading only for filter_select (#14441) (@simcha90)
+- [13723](https://github.com/apache/superset/pull/13723) refactor(native-filters): refactor filter bar (#13723) (@simcha90)
+- [13983](https://github.com/apache/superset/pull/13983) refactor(native-filters): update dataMask and ExtraFormData schema (#13983) (@simcha90)
+- [13137](https://github.com/apache/superset/pull/13137) refactor(self-trigger): Split native filters state (#13137) (@simcha90)
+- [14090](https://github.com/apache/superset/pull/14090) refactor(userInfo): userinfo panel to styled component (#14090) (@Phillip Kelley-Dotson)
+- [14100](https://github.com/apache/superset/pull/14100) refactor: Boostrap to AntD - Row/Col (#14100) (@Michael S. Molina)
+- [14048](https://github.com/apache/superset/pull/14048) refactor: Boostrap to AntD - Tabs (#14048) (@Michael S. Molina)
+- [14106](https://github.com/apache/superset/pull/14106) refactor: Bootstrap to AntD - Form - iteration 1 (#14106) (@Michael S. Molina)
+- [13996](https://github.com/apache/superset/pull/13996) refactor: Bootstrap to AntD - ListGroup (#13996) (@Michael S. Molina)
+- [13989](https://github.com/apache/superset/pull/13989) refactor: Bootstrap to AntD - Slider (#13989) (@Michael S. Molina)
+- [13218](https://github.com/apache/superset/pull/13218) refactor: Introduce api resource hooks, fetch owners for chart errors (#13218) (@David Aaron Suddjian)
+- [12229](https://github.com/apache/superset/pull/12229) refactor: New Icon system with Enhanced Antd Custom Icon (#12229) (@Geido)
+- [13797](https://github.com/apache/superset/pull/13797) refactor: New schedule query button (#13797) (@AAfghahi)
+- [13102](https://github.com/apache/superset/pull/13102) refactor: Query search into functional component (#13102) (@AAfghahi)
+- [13785](https://github.com/apache/superset/pull/13785) refactor: Revert "refactor: ScheduleQueryButton into functional component (#134… (#13785) (@Hugh A. Miles II)
+- [13443](https://github.com/apache/superset/pull/13443) refactor: ScheduleQueryButton into functional component (#13443) (@AAfghahi)
+- [13630](https://github.com/apache/superset/pull/13630) refactor: Share sql lab query (#13630) (@AAfghahi)
+- [13676](https://github.com/apache/superset/pull/13676) refactor: SouthPane into functional component (#13676) (@AAfghahi)
+- [13417](https://github.com/apache/superset/pull/13417) refactor: add set data mask to build query (#13417) (@simcha90)
+- [13401](https://github.com/apache/superset/pull/13401) refactor: convert controlUtils to TypeScript (1 of 2) (#13401) (@Jesse Yang)
+- [13520](https://github.com/apache/superset/pull/13520) refactor: convert controlUtils to TypeScript (2 of 2) (#13520) (@Jesse Yang)
+- [13877](https://github.com/apache/superset/pull/13877) refactor: move CTAS/CVAS field II (#13877) (@Hugh A. Miles II)
+- [14309](https://github.com/apache/superset/pull/14309) refactor: reorganize dateFilterUtils.tx (#14309) (@Yongjie Zhao)
+- [13174](https://github.com/apache/superset/pull/13174) sql Lab buttons (#13174) (@AAfghahi)
+- [13537](https://github.com/apache/superset/pull/13537) switch message content between chart and dashboard  AlertReportModal (#13537) (@Lily Kuang)
+- [14371](https://github.com/apache/superset/pull/14371) test(maximize-chart): Add tests to maximize chart action (#14371) (@simcha90)
+- [14245](https://github.com/apache/superset/pull/14245) test(native-filters): Filter config modal test (#14245) (@simcha90)
+- [14098](https://github.com/apache/superset/pull/14098) test(native-filters): add integration tests for filter bar (#14098) (@simcha90)
+- [13973](https://github.com/apache/superset/pull/13973) test: Add tests for Dashboard Header and HeaderActionsDropdown components (#13973) (@Geido)
+- [13517](https://github.com/apache/superset/pull/13517) test: Adds storybook and tests to AsyncEsmComponent (#13517) (@Michael S. Molina)
+- [13547](https://github.com/apache/superset/pull/13547) test: Adds storybook and tests to PopoverDropdown component (#13547) (@Michael S. Molina)
+- [13516](https://github.com/apache/superset/pull/13516) test: Adds storybook to AlteredSliceTag component (#13516) (@Michael S. Molina)
+- [13406](https://github.com/apache/superset/pull/13406) test: Adds storybook to AnchorLink component (#13406) (@Michael S. Molina)
+- [13412](https://github.com/apache/superset/pull/13412) test: Adds storybook to ConfirmStatusChange component (#13412) (@Michael S. Molina)
+- [13482](https://github.com/apache/superset/pull/13482) test: Adds storybook to Dropdown and DropdownButton components (#13482) (@Michael S. Molina)
+- [13362](https://github.com/apache/superset/pull/13362) test: Adds storybook to EditableTitle component (#13362) (@Michael S. Molina)
+- [13407](https://github.com/apache/superset/pull/13407) test: Adds storybook to FormRow component (#13407) (@Michael S. Molina)
+- [13415](https://github.com/apache/superset/pull/13415) test: Adds storybook to IconTooltip component (#13415) (@Michael S. Molina)
+- [13410](https://github.com/apache/superset/pull/13410) test: Adds storybook to SearchInput component (#13410) (@Michael S. Molina)
+- [13479](https://github.com/apache/superset/pull/13479) test: Adds storybook to Switch component (#13479) (@Michael S. Molina)
+- [13343](https://github.com/apache/superset/pull/13343) test: Adds storybook to Timer component (#13343) (@Michael S. Molina)
+- [13457](https://github.com/apache/superset/pull/13457) test: Adds tests and storybook to CertifiedIcon component (#13457) (@Michael S. Molina)
+- [13438](https://github.com/apache/superset/pull/13438) test: Adds tests and storybook to PopoverSection component (#13438) (@Michael S. Molina)
+- [13409](https://github.com/apache/superset/pull/13409) test: Adds tests and storybook to RefreshLabel (#13409) (@Michael S. Molina)
+- [13705](https://github.com/apache/superset/pull/13705) test: Adds tests for the FixedOrMetricControl component (#13705) (@Michael S. Molina)
+- [13299](https://github.com/apache/superset/pull/13299) test: Adds tests to TableLoader component (#13299) (@Michael S. Molina)
+- [13319](https://github.com/apache/superset/pull/13319) test: Adds tests to URLShortLinkButton component (#13319) (@Michael S. Molina)
+- [13650](https://github.com/apache/superset/pull/13650) test: Adds tests to dnd controls (#13650) (@Michael S. Molina)
+- [13664](https://github.com/apache/superset/pull/13664) test: Adds tests to the AdvancedFrame component (#13664) (@Michael S. Molina)
+- [13748](https://github.com/apache/superset/pull/13748) test: Adds tests to the AnnotationLayer component (#13748) (@Michael S. Molina)
+- [13933](https://github.com/apache/superset/pull/13933) test: Adds tests to the CssEditor component (#13933) (@Michael S. Molina)
+- [13675](https://github.com/apache/superset/pull/13675) test: Adds tests to the CustomFrame component (#13675) (@Michael S. Molina)
+- [13729](https://github.com/apache/superset/pull/13729) test: Adds tests to the OptionControls component (#13729) (@Michael S. Molina)
+- [13892](https://github.com/apache/superset/pull/13892) test: Adds tests to the PublishedStatus component (#13892) (@Michael S. Molina)
+- [13712](https://github.com/apache/superset/pull/13712) test: Adds tests to the TimeSeriesColumnControl component (#13712) (@Michael S. Molina)
+- [13919](https://github.com/apache/superset/pull/13919) test: Adds tests to the UndoRedoKeyListeners component (#13919) (@Michael S. Molina)
+- [13887](https://github.com/apache/superset/pull/13887) test: Adds tests to the filter scope components (#13887) (@Michael S. Molina)
+- [13787](https://github.com/apache/superset/pull/13787) test: AdhocMetricEditPopover (#13787) (@Bruno Motta)
+- [13318](https://github.com/apache/superset/pull/13318) test: CacheLabel (#13318) (@Bruno Motta)
+- [13656](https://github.com/apache/superset/pull/13656) test: CollectionControl (#13656) (@Bruno Motta)
+- [13549](https://github.com/apache/superset/pull/13549) test: CronPicker (#13549) (@Bruno Motta)
+- [13875](https://github.com/apache/superset/pull/13875) test: CrossFilterScopingForm (#13875) (@Bruno Motta)
+- [13668](https://github.com/apache/superset/pull/13668) test: DataTableControl (#13668) (@Bruno Motta)
+- [13736](https://github.com/apache/superset/pull/13736) test: DataTablesPane (#13736) (@Bruno Motta)
+- [13581](https://github.com/apache/superset/pull/13581) test: DatabaseSelector (#13581) (@Bruno Motta)
+- [13605](https://github.com/apache/superset/pull/13605) test: DatasourceControl (#13605) (@Bruno Motta)
+- [13627](https://github.com/apache/superset/pull/13627) test: DatasourcePanelDragWrapper (#13627) (@Bruno Motta)
+- [13750](https://github.com/apache/superset/pull/13750) test: DisplayQueryButton (#13750) (@Bruno Motta)
+- [13745](https://github.com/apache/superset/pull/13745) test: Enhance tests and directory structure for FilterControl components (#13745) (@Geido)
+- [13276](https://github.com/apache/superset/pull/13276) test: ErrorBoundary dedicated directory and tests (#13276) (@Geido)
+- [13358](https://github.com/apache/superset/pull/13358) test: ErrorMessage components tests (#13358) (@Geido)
+- [13753](https://github.com/apache/superset/pull/13753) test: FilterBoxItemControl (#13753) (@Bruno Motta)
+- [14028](https://github.com/apache/superset/pull/14028) test: FilterSets-utils (#14028) (@Bruno Motta)
+- [13548](https://github.com/apache/superset/pull/13548) test: Fixes PropertiesModal_spec (#13548) (@Michael S. Molina)
+- [13270](https://github.com/apache/superset/pull/13270) test: FormLabel dedicated directory and tests (#13270) (@Geido)
+- [13302](https://github.com/apache/superset/pull/13302) test: Menu component tests (#13302) (@Geido)
+- [13277](https://github.com/apache/superset/pull/13277) test: Pagination component (#13277) (@Bruno Motta)
+- [13818](https://github.com/apache/superset/pull/13818) test: PropertiesModal (#13818) (@Bruno Motta)
+- [13931](https://github.com/apache/superset/pull/13931) test: PropertiesModal (Dashboard) (#13931) (@Bruno Motta)
+- [13799](https://github.com/apache/superset/pull/13799) test: Refactor and enhance tests for the Explore DatasourcePanel Component (#13799) (@Geido)
+- [13638](https://github.com/apache/superset/pull/13638) test: SelectAsyncControl (#13638) (@Bruno Motta)
+- [13860](https://github.com/apache/superset/pull/13860) test: ShareMenuItems (#13860) (@Bruno Motta)
+- [13888](https://github.com/apache/superset/pull/13888) test: SliceHeader (#13888) (@Bruno Motta)
+- [13895](https://github.com/apache/superset/pull/13895) test: SliceHeaderControls (#13895) (@Bruno Motta)
+- [13937](https://github.com/apache/superset/pull/13937) test: Tab (#13937) (@Bruno Motta)
+- [13583](https://github.com/apache/superset/pull/13583) test: TableCollection  (#13583) (@Bruno Motta)
+- [13941](https://github.com/apache/superset/pull/13941) test: Tabs (#13941) (@Bruno Motta)
+- [13502](https://github.com/apache/superset/pull/13502) test: Tests and Storybook entry for the IndeterminateCheckbox Component (#13502) (@Geido)
+- [13501](https://github.com/apache/superset/pull/13501) test: Tests and Storybook entry for the TableView Component (#13501) (@Geido)
+- [13508](https://github.com/apache/superset/pull/13508) test: Tests and dedicated directory for the SupersetResourceSelect Component (#13508) (@Geido)
+- [13916](https://github.com/apache/superset/pull/13916) test: Tests audit for the Dashboard FilterBar (#13916) (@Geido)
+- [13286](https://github.com/apache/superset/pull/13286) test: Tests for DeleteModal component (#13286) (@Bruno Motta)
+- [13305](https://github.com/apache/superset/pull/13305) test: Tests for OmniContainer (#13305) (@Bruno Motta)
+- [13513](https://github.com/apache/superset/pull/13513) test: Tests, dedicated directory and Storybook for the Badge component (#13513) (@Geido)
+- [13534](https://github.com/apache/superset/pull/13534) test: Tests, dedicated directory and Storybook for the ProgressBar component (#13534) (@Geido)
+- [13751](https://github.com/apache/superset/pull/13751) test: changing logger.exception to logger.errors in databases api (#13751) (@AAfghahi)
+- [13719](https://github.com/apache/superset/pull/13719) test: exploreUtils (#13719) (@Bruno Motta)
+- [13329](https://github.com/apache/superset/pull/13329) test: optimize codecov config (#13329) (@Jesse Yang)
+- [13984](https://github.com/apache/superset/pull/13984) test: prevent flaky frontend unit test case (#13984) (@Yongjie Zhao)
+- [13320](https://github.com/apache/superset/pull/13320) test: tests for component FaveStar (#13320) (@Bruno Motta)
+- [13555](https://github.com/apache/superset/pull/13555) test: useChangeEffect (#13555) (@Bruno Motta)
+- [13554](https://github.com/apache/superset/pull/13554) test: usePrevious hook (#13554) (@Bruno Motta)
+- [13873](https://github.com/apache/superset/pull/13873) tests for FilterIndicator (#13873) (@Bruno Motta)
+- [13896](https://github.com/apache/superset/pull/13896) tests for function handleScroll (#13896) (@Bruno Motta)
+- [14363](https://github.com/apache/superset/pull/14363) update default cron settings for new alerts and reports (#14363) (@Sam Faber-Manning)
+- [13463](https://github.com/apache/superset/pull/13463) update test (#13463) (@Lily Kuang)
+- [13897](https://github.com/apache/superset/pull/13897) updates load_examples to load-examples (#13897) (@Alex Simoes)
+- [14009](https://github.com/apache/superset/pull/14009) use dynamic time_grains for schema (#14009) (@Elizabeth Thompson)
+- [13424](https://github.com/apache/superset/pull/13424) use semver for badge sort (#13424) (@Elizabeth Thompson)
 
 ### 1.1 (Wed Feb 24 12:08:28 2021 +0200)
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e8a20d1c1e04..ff9475858f83 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -77,6 +77,8 @@ little bit helps, and credit will always be given.
     - [Python Testing](#python-testing)
     - [Frontend Testing](#frontend-testing)
     - [Integration Testing](#integration-testing)
+    - [Debugging Server App](#debugging-server-app)
+    - [Debugging Server App in Kubernetes Environment](#debugging-server-app-in-kubernetes-environment)
     - [Storybook](#storybook)
   - [Translating](#translating)
     - [Enabling language selection](#enabling-language-selection)
@@ -418,22 +420,23 @@ For example, the image referenced above actually lives in `superset-frontend/ima
 
 #### OS Dependencies
 
-Make sure your machine meets the [OS dependencies](https://superset.apache.org/docs/installation/installing-superset-from-scratch#os-dependencies) before following these steps.
+Make sure your machine meets the [OS dependencies](https://superset.apache.org/docs/installation/installing-superset-from-scratch#os-dependencies) before following these steps.  
+You also need to install MySQL or [MariaDB](https://mariadb.com/downloads).
 
-Ensure Python versions >3.7, Then proceed with:
+Ensure that you are using Python version 3.7 or 3.8, then proceed with:
 
-```bash
+````bash
 # Create a virtual environment and activate it (recommended)
 python3 -m venv venv # setup a python3 virtualenv
 source venv/bin/activate
 
 # Install external dependencies
-pip install -r requirements/local.txt
+pip install -r requirements/testing.txt
 
 # Install Superset in editable (development) mode
 pip install -e .
 
-# Create an admin user in your metadata database
+# Create an admin user in your metadata database (use `admin` as username to be able to load the examples)
 superset fab create-admin
 
 # Initialize the database
@@ -442,13 +445,15 @@ superset db upgrade
 # Create default roles and permissions
 superset init
 
-# Load some data to play with (you must create an Admin user with the username `admin` for this command to work)
+# Load some data to play with.
+# Note: you MUST have previously created an admin user with the username `admin` for this command to work.
 superset load-examples
 
 # Start the Flask dev web server from inside your virtualenv.
-# Note that your page may not have css at this point.
+# Note that your page may not have CSS at this point.
 # See instructions below how to build the front-end assets.
 FLASK_ENV=development superset run -p 8088 --with-threads --reload --debugger
+```
 
 Or you can install via our Makefile
 
@@ -465,7 +470,7 @@ $ make superset
 
 # Setup pre-commit only
 $ make pre-commit
-```
+````
 
 **Note: the FLASK_APP env var should not need to be set, as it's currently controlled
 via `.flaskenv`, however if needed, it should be set to `superset.app:create_app()`**
@@ -473,6 +478,17 @@ via `.flaskenv`, however if needed, it should be set to `superset.app:create_app
 If you have made changes to the FAB-managed templates, which are not built the same way as the newer, React-powered front-end assets, you need to start the app without the `--with-threads` argument like so:
 `FLASK_ENV=development superset run -p 8088 --reload --debugger`
 
+#### Dependencies
+
+If you add a new requirement or update an existing requirement (per the `install_requires` section in `setup.py`) you must recompile (freeze) the Python dependencies to ensure that for CI, testing, etc. the build is deterministic. This can be achieved via,
+
+```bash
+$ python3 -m venv venv
+$ source venv/bin/activate
+$ python3 -m pip install -r requirements/integration.txt
+$ pip-compile-multi --no-upgrade
+```
+
 #### Logging to the browser console
 
 This feature is only available on Python 3. When debugging your application, you can have the server logs sent directly to the browser console using the [ConsoleLog](https://github.com/betodealmeida/consolelog) package. You need to mutate the app, by adding the following to your `config.py` or `superset_config.py`:
@@ -517,6 +533,7 @@ nvm use --lts
 ```
 
 Or if you use the default macOS starting with Catalina shell `zsh`, try:
+
 ```zsh
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.0/install.sh)"
 ```
@@ -596,7 +613,7 @@ FEATURE_FLAGS = {
 }
 ```
 
-If you want to use the same flag in the client code, also add it to the FeatureFlag TypeScript enum in `superset-frontend/src/featureFlags.ts`. For example,
+If you want to use the same flag in the client code, also add it to the FeatureFlag TypeScript enum in [@superset-ui/core](https://github.com/apache-superset/superset-ui/blob/master/packages/superset-ui-core/src/utils/featureFlags.ts). For example,
 
 ```typescript
 export enum FeatureFlag {
@@ -628,6 +645,7 @@ tox -e pre-commit
 ```
 
 Or by running pre-commit manually:
+
 ```bash
 pre-commit run --all-files
 ```
@@ -655,7 +673,7 @@ npm run lint
 
 ### Python
 
-Parameters in the `config.py` (which are accessible via the Flask app.config dictionary) are assummed to always be defined and thus should be accessed directly via,
+Parameters in the `config.py` (which are accessible via the Flask app.config dictionary) are assumed to always be defined and thus should be accessed directly via,
 
 ```python
 blueprints = app.config["BLUEPRINTS"]
@@ -740,6 +758,7 @@ There is also a utility script included in the Superset codebase to run python t
 found here](https://github.com/apache/superset/tree/master/scripts/tests)
 
 To run all tests for example, run this script from the root directory:
+
 ```bash
 scripts/tests/run.sh
 ```
@@ -764,7 +783,7 @@ npm run test -- path/to/file.js
 We use [Cypress](https://www.cypress.io/) for integration tests. Tests can be run by `tox -e cypress`. To open Cypress and explore tests first setup and run test server:
 
 ```bash
-export SUPERSET_CONFIG=tests.superset_test_config
+export SUPERSET_CONFIG=tests.integration_tests.superset_test_config
 export SUPERSET_TESTENV=true
 export ENABLE_REACT_CRUD_VIEWS=true
 export CYPRESS_BASE_URL="http://localhost:8081"
@@ -851,6 +870,7 @@ superset:
 ```
 
 Start Superset as usual
+
 ```bash
 docker-compose up
 ```
@@ -858,12 +878,14 @@ docker-compose up
 Install the required libraries and packages to the docker container
 
 Enter the superset_app container
+
 ```bash
 docker exec -it superset_app /bin/bash
 root@39ce8cf9d6ab:/app#
 ```
 
 Run the following commands inside the container
+
 ```bash
 apt update
 apt install -y gdb
@@ -883,11 +905,13 @@ root        10     6  7 14:09 ?        00:00:07 /usr/local/bin/python /usr/bin/f
 ```
 
 Inject debugpy into the running Flask process. In this case PID 6.
+
 ```bash
 python3 -m debugpy --listen 0.0.0.0:5678 --pid 6
 ```
 
 Verify that debugpy is listening on port 5678
+
 ```bash
 netstat -tunap
 
@@ -898,6 +922,7 @@ tcp        0      0 0.0.0.0:8088            0.0.0.0:*               LISTEN
 ```
 
 You are now ready to attach a debugger to the process. Using VSCode you can configure a launch configuration file .vscode/launch.json like so.
+
 ```
 {
     "version": "0.2.0",
@@ -923,7 +948,6 @@ You are now ready to attach a debugger to the process. Using VSCode you can conf
 
 VSCode will not stop on breakpoints right away. We've attached to PID 6 however it does not yet know of any sub-processes. In order to "wakeup" the debugger you need to modify a python file. This will trigger Flask to reload the code and create a new sub-process. This new sub-process will be detected by VSCode and breakpoints will be activated.
 
-
 ### Debugging Server App in Kubernetes Environment
 
 To debug Flask running in POD inside kubernetes cluster. You'll need to make sure the pod runs as root and is granted the SYS_TRACE capability.These settings should not be used in production environments.
@@ -948,7 +972,6 @@ kubectl port-forward  pod/superset-<some random id> 5678:5678
 
 You can now launch your VSCode debugger with the same config as above. VSCode will connect to to 127.0.0.1:5678 which is forwarded by kubectl to your remote kubernetes POD.
 
-
 ### Storybook
 
 Superset includes a [Storybook](https://storybook.js.org/) to preview the layout/styling of various Superset components, and variations thereof. To open and view the Storybook:
@@ -1264,7 +1287,7 @@ To do this, you'll need to:
 - Start up a celery worker
 
   ```shell script
-  celery worker --app=superset.tasks.celery_app:app -Ofair
+  celery --app=superset.tasks.celery_app:app worker -Ofair
   ```
 
 Note that:
@@ -1364,6 +1387,7 @@ Note not all fields are correctly catagorized. The fields vary based on visualiz
 | Field                                                                                                  | Type                                              | Notes                                             |
 | ------------------------------------------------------------------------------------------------------ | ------------------------------------------------- | ------------------------------------------------- |
 | `adhoc_filters`                                                                                        | _array(object)_                                   | The **Filters** widget                            |
+| `extra_filters`                                                                                        | _array(object)_                                   | Another pathway to the **Filters** widget.<br/>It is generally used to pass dashboard filter parameters to a chart.<br/>It can be used for appending additional filters to a chart that has been saved with its own filters on an ad-hoc basis if the chart is being used as a standalone widget.<br/><br/>For implementation examples see : [utils test.py](https://github.com/apache/superset/blob/66a4c94a1ed542e69fe6399bab4c01d4540486cf/tests/utils_tests.py#L181)<br/>For insight into how superset processes the contents of this parameter see: [exploreUtils/index.js](https://github.com/apache/superset/blob/93c7f5bb446ec6895d7702835f3157426955d5a9/superset-frontend/src/explore/exploreUtils/index.js#L159)                         |
 | `columns`                                                                                              | _array(string)_                                   | The **Breakdowns** widget                         |
 | `groupby`                                                                                              | _array(string)_                                   | The **Group by** or **Series** widget             |
 | `limit`                                                                                                | _number_                                          | The **Series Limit** widget                       |
@@ -1410,7 +1434,6 @@ Note the `y_axis_format` is defined under various section for some charts.
 | `default_filters`             | _N/A_ |       |
 | `entity`                      | _N/A_ |       |
 | `expanded_slices`             | _N/A_ |       |
-| `extra_filters`               | _N/A_ |       |
 | `filter_immune_slice_fields`  | _N/A_ |       |
 | `filter_immune_slices`        | _N/A_ |       |
 | `flt_col_0`                   | _N/A_ |       |
diff --git a/Dockerfile b/Dockerfile
index 6ca89e889fd7..c73e6cad6198 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -64,7 +64,7 @@ RUN /frontend-mem-nag.sh \
 
 # Next, copy in the rest and let webpack do its thing
 COPY ./superset-frontend /app/superset-frontend
-# This is BY FAR the most expensive step (thanks Terser!)
+# This seems to be the most expensive step
 RUN cd /app/superset-frontend \
         && npm run ${BUILD_CMD} \
         && rm -rf node_modules
diff --git a/INSTALL.md b/INSTALL.md
index c96ba33a8a65..afe091241f8a 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -18,6 +18,6 @@ under the License.
 -->
 # INSTALL / BUILD instructions for Apache Superset
 
-At this time, the docker file at RELEASING/Dockerfile.from_tarball
+At this time, the docker file at RELEASING/Dockerfile.from_local_tarball
 constitutes the recipe on how to get to a working release from a source
 release tarball.
diff --git a/Makefile b/Makefile
index a51b96fdb23f..ef0d3edbec13 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,9 @@
 # limitations under the License.
 #
 
+# Python version installed; we need 3.8 or 3.7
+PYTHON=`command -v python3.8 || command -v python3.7`
+
 .PHONY: install superset venv pre-commit
 
 install: superset pre-commit
@@ -55,12 +58,13 @@ update-py:
 
 update-js:
 	# Install js packages
-	cd superset-frontend; npm install
+	cd superset-frontend; npm ci
 
 venv:
 	# Create a virtual environment and activate it (recommended)
-	python3 -m venv venv # setup a python3 virtualenv
-	source venv/bin/activate
+	if ! [ -x "${PYTHON}" ]; then echo "You need Python 3.7 or 3.8 installed"; exit 1; fi
+	test -d venv || ${PYTHON} -m venv venv # setup a python3 virtualenv
+	. venv/bin/activate
 
 pre-commit:
 	# setup pre commit dependencies
@@ -72,5 +76,14 @@ format: py-format js-format
 py-format: pre-commit
 	pre-commit run black --all-files
 
+py-lint: pre-commit
+	pylint -j 0 superset
+
 js-format:
 	cd superset-frontend; npm run prettier
+
+flask-app:
+	flask run -p 8088 --with-threads --reload --debugger
+
+node-app:
+	cd superset-frontend; npm run dev-server
diff --git a/README.md b/README.md
index d1cb206a65c0..a2992d1a341f 100644
--- a/README.md
+++ b/README.md
@@ -121,6 +121,7 @@ Here are some of the major database solutions that are supported:
   <img src="superset-frontend/images/monet-db.png" alt="monet-db" border="0" width="106" height="46" />
   <img src="superset-frontend/images/apache-kylin.png" alt="apache-kylin" border="0" width="56" height="64"/>
   <img src="superset-frontend/images/hologres.png" alt="hologres" border="0" width="71" height="64"/>
+  <img src="superset-frontend/images/netezza.png" alt="netezza" border="0" width="64" height="64"/>
 </p>
 
 **A more comprehensive list of supported databases** along with the configuration instructions can be found
diff --git a/RELEASING/README.md b/RELEASING/README.md
index 3f5fc291a284..a33835893737 100644
--- a/RELEASING/README.md
+++ b/RELEASING/README.md
@@ -29,7 +29,9 @@ on the Superset Slack. People crafting releases and those interested in
 partaking in the process should join the channel.
 
 ## Release notes for recent releases
-- [1.0.0](release-notes-1-0/README.md)
+- [1.2](release-notes-1-2/README.md)
+- [1.1](release-notes-1-1/README.md)
+- [1.0](release-notes-1-0/README.md)
 - [0.38](release-notes-0-38/README.md)
 
 ## Release setup (First Time Only)
@@ -56,6 +58,9 @@ need to be done at every release.
 
     # Commit the changes
     svn commit -m "Add PGP keys of new Superset committer"
+
+    # push the changes
+    svn update
 ```
 
 ## Setting up the release environment (do every time)
@@ -194,6 +199,7 @@ Now let's ship this RC into svn's dev folder
 cd ~/svn/superset_dev/
 svn add ${SUPERSET_VERSION_RC}
 svn commit -m "Release ${SUPERSET_VERSION_RC}"
+svn update
 ```
 
 ### Build and test from SVN source tarball
@@ -267,6 +273,7 @@ cd ~/svn/superset/
 for f in ${SUPERSET_VERSION}/*; do mv "$f" "${f/${SUPERSET_VERSION_RC}/${SUPERSET_VERSION}}"; done
 svn add ${SUPERSET_VERSION}
 svn commit -m "Release ${SUPERSET_VERSION}"
+svn update
 ```
 
 Then tag the final release:
diff --git a/RELEASING/changelog.py b/RELEASING/changelog.py
index 109ff738ae90..e9ff2de041a2 100644
--- a/RELEASING/changelog.py
+++ b/RELEASING/changelog.py
@@ -24,6 +24,7 @@
 from typing import Any, Dict, Iterator, List, Optional, Union
 
 import click
+from click.core import Context
 
 try:
     from github import BadCredentialsException, Github, PullRequest, Repository
@@ -50,7 +51,7 @@ class GitLog:
     author_email: str = ""
 
     def __eq__(self, other: object) -> bool:
-        """ A log entry is considered equal if it has the same PR number """
+        """A log entry is considered equal if it has the same PR number"""
         if isinstance(other, self.__class__):
             return other.pr_number == self.pr_number
         return False
@@ -170,7 +171,7 @@ def _get_changelog_version_head(self) -> str:
 
     def _parse_change_log(
         self, changelog: Dict[str, str], pr_info: Dict[str, str], github_login: str,
-    ):
+    ) -> None:
         formatted_pr = (
             f"- [#{pr_info.get('id')}]"
             f"(https://github.com/{SUPERSET_REPO}/pull/{pr_info.get('id')}) "
@@ -324,8 +325,8 @@ def print_title(message: str) -> None:
 @click.pass_context
 @click.option("--previous_version", help="The previous release version", required=True)
 @click.option("--current_version", help="The current release version", required=True)
-def cli(ctx, previous_version: str, current_version: str) -> None:
-    """ Welcome to change log generator  """
+def cli(ctx: Context, previous_version: str, current_version: str) -> None:
+    """Welcome to change log generator"""
     previous_logs = GitLogs(previous_version)
     current_logs = GitLogs(current_version)
     previous_logs.fetch()
@@ -337,7 +338,7 @@ def cli(ctx, previous_version: str, current_version: str) -> None:
 @cli.command("compare")
 @click.pass_obj
 def compare(base_parameters: BaseParameters) -> None:
-    """ Compares both versions (by PR) """
+    """Compares both versions (by PR)"""
     previous_logs = base_parameters.previous_logs
     current_logs = base_parameters.current_logs
     print_title(
@@ -369,7 +370,7 @@ def compare(base_parameters: BaseParameters) -> None:
 def change_log(
     base_parameters: BaseParameters, csv: str, access_token: str, risk: bool
 ) -> None:
-    """ Outputs a changelog (by PR) """
+    """Outputs a changelog (by PR)"""
     previous_logs = base_parameters.previous_logs
     current_logs = base_parameters.current_logs
     previous_diff_logs = previous_logs.diff(current_logs)
@@ -383,12 +384,12 @@ def change_log(
         with open(csv, "w") as csv_file:
             log_items = list(logs)
             field_names = log_items[0].keys()
-            writer = lib_csv.DictWriter(
+            writer = lib_csv.DictWriter(  # type: ignore
                 csv_file,
                 delimiter=",",
                 quotechar='"',
                 quoting=lib_csv.QUOTE_ALL,
-                fieldnames=field_names,
+                fieldnames=field_names,  # type: ignore
             )
             writer.writeheader()
             for log in logs:
diff --git a/RELEASING/release-notes-1-2/README.md b/RELEASING/release-notes-1-2/README.md
new file mode 100644
index 000000000000..2ae0a728f34f
--- /dev/null
+++ b/RELEASING/release-notes-1-2/README.md
@@ -0,0 +1,122 @@
+<!--
+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.
+-->
+
+# Release Notes for Superset 1.2
+
+Superset 1.2 continues the Apache ECharts migration by introducing several chart types. It also brings with it tons of user experience improvements, API improvements, bug fixes, and continued development of experimental features included in previous releases. Keep reading for more details on these categories:
+
+- [**User Experience**](#user-experience)
+- [**Dashboard Level Security**](#dashboard-level-security)
+- [**Database Connectivity**](#database-connectivity)
+- [**Developer Experience**](#developer-experience)
+- [**PR Highlights**](#pr-highlights)
+- [**Breaking Changes and Full Changelog**](#breaking-changes-and-full-changelog)
+
+# User Experience
+
+The migration to Apache ECharts continues by introducing several new high-quality visualizations in this release.
+
+The mixed time-series multi chart allows different kinds of time-series visualization to be overlayed.
+
+![mixed time series](media/time_series_multichart.png)
+
+The radar chart provides a good way to compare two or more groups over various features of interest.
+
+![radar chart](media/radar_chart.png)
+
+By popular demand, we have introduced a new and improved version of the pivot table visualization as well.
+
+![pivot table](media/pivot_table_v2.png)
+
+Several UI tweaks in Explore and SQL Lab made it into this release as well, including new buttons and menu options to make common workflows easier, as well as more communicative error messages, particularly in the database connection menus.
+
+The dashboard native filter feature, [while still behind a feature flag in this release](https://github.com/apache/superset/blob/master/RELEASING/release-notes-1-0/README.md#feature-flags), has received plenty of new functionality and is closer than ever to being ready for prime-time. This feature provides a way to apply and manipulate filters over many charts at the dashboard level. 1.2 adds more controls, more options for aggregations, and better support for temporal filters, among other things.
+
+![Native Filter](media/native_filters.png)
+
+![Native Filter](media/native_filters_temporal.png)
+
+Last but not least, the alerts and reports feature and its dependencies have been added to the [docker-compose](https://superset.apache.org/docs/installation/installing-superset-using-docker-compose) setup, making it easier to use outside of well-supported enterprise deployments.
+
+
+# Dashboard Level Security
+
+Superset has so far relied on a role-based access system implemented at the dataset level. While this provides granular security options that satisfy many use cases, some organizations need more options. [SIP-51](https://github.com/apache/superset/issues/10408) lays out a vision for dashboard-level role-based access control as a fully backwards compatible extension to Superset's security options.
+
+The 1.1 release saw steps taken in the direction of this vision, and 1.2 builds on that with new permissions for sharing charts and dashboards that can be assigned to roles. **Note that this functionality is still experimental and hidden behind a feature flag as of 1.2.**
+
+![dashboard rbac](media/dashboard_rbac.png)
+
+# Database Connectivity
+The 1.2 release adds support for [Crate DB](https://github.com/apache/superset/pull/13152) and the [Databricks DB](https://github.com/apache/superset/pull/13682) engine spec.
+
+
+# Developer Experience
+Expanding the API has been an ongoing effort, and 1.2 introduces several new API routes to allow developers to get available databases, get a given dashboard's charts, and import saved queries, among other things.
+
+# PR Highlights
+
+**New Charts and User Experience**
+
+- [14197](https://github.com/apache/superset/pull/14197) feat(viz): add mixed and radar chart (#14197) (@Ville Brofeldt)
+- [14187](https://github.com/apache/superset/pull/14187) Enable the new pivot table (#14187) (@Kamil Gabryjelski)
+- [13210](https://github.com/apache/superset/pull/13210) feat(explore): ColumnSelectControl with drag-and-drop (#13210) (@Yongjie Zhao)
+- [13598](https://github.com/apache/superset/pull/13598) feat(explore): Drag and drop UX improvements (#13598) (@Kamil Gabryjelski)
+- [13294](https://github.com/apache/superset/pull/13294) feat(explore): Postgres datatype conversion (#13294) (@Nikola Gigić)
+- [13758](https://github.com/apache/superset/pull/13758) feat(explore): adhoc column formatting for Table chart (#13758) (@Jesse Yang)
+
+**Progress On Dashboard Native Filters**
+
+- [13726](https://github.com/apache/superset/pull/13726) feat(native-filters): Add default first value to select filter (#13726) (@simcha90)
+- [14461](https://github.com/apache/superset/pull/14461) feat(native-filters): Auto apply changes in FiltersConfigModal (#14461) (@simcha90)
+- [13507](https://github.com/apache/superset/pull/13507) feat(native-filters): Filter set tabs (#13507) (@simcha90)
+- [14313](https://github.com/apache/superset/pull/14313) feat(native-filters): Implement adhoc filters and time picker in Range and Select native filters (#14313) (@Kamil Gabryjelski)
+- [14261](https://github.com/apache/superset/pull/14261) feat(native-filters): Show/Hide filter bar by metdata ff (#14261) (@simcha90)
+- [13506](https://github.com/apache/superset/pull/13506) feat(native-filters): Update filter bar buttons (#13506) (@simcha90)
+- [14374](https://github.com/apache/superset/pull/14374) feat(native-filters): Use datasets in dashboard as default options for native filters (#14374) (@Kamil Gabryjelski)
+- [14314](https://github.com/apache/superset/pull/14314) feat(native-filters): add option to create value in select filter (#14314) (@Ville Brofeldt)
+- [14346](https://github.com/apache/superset/pull/14346) feat(native-filters): add optional sort metric to select filter (#14346) (@Ville Brofeldt)
+- [14375](https://github.com/apache/superset/pull/14375) feat(native-filters): add refresh button to default value picker (#14375) (@Ville Brofeldt)
+- [13569](https://github.com/apache/superset/pull/13569) feat(native-filters): add sort option to select filter (#13569) (@Ville Brofeldt)
+- [13622](https://github.com/apache/superset/pull/13622) feat(native-filters): add temporal support to select filter (#13622) (@Ville Brofeldt)
+- [13484](https://github.com/apache/superset/pull/13484) feat(native-filters): add timegrain and column filter (#13484) (@Ville Brofeldt)
+- [14312](https://github.com/apache/superset/pull/14312) feat(native-filters): add tooltip to control values (#14312) (@Ville Brofeldt)
+- [14217](https://github.com/apache/superset/pull/14217) feat(native-filters): select group by support (#14217) (@Amit Miran)
+
+**Progress On Dashboard Level Access**
+
+- [13145](https://github.com/apache/superset/pull/13145) feat(dashboard_rbac): manage roles for dashboard (#13145) (@simcha90)
+- [13992](https://github.com/apache/superset/pull/13992) feat(dashboard_rbac): provide data access based on dashboard access (#13992) (@Amit Miran)
+- [#12865](https://github.com/apache/superset/pull/12865) feat(dashboard_rbac): dashboards API support for roles create/update + roles validation (@amitmiran137)
+
+
+**Improvements to Developer Experience**
+
+- [14208](https://github.com/apache/superset/pull/14208) feat: add endpoint to fetch available DBs (#14208) (@Beto Dealmeida)
+- [13331](https://github.com/apache/superset/pull/13331) fix(query-object): extra time-range-endpoints (#13331) (@John Bodley)
+- [13893](https://github.com/apache/superset/pull/13893) feat: create backend routes and API for importing saved queries (#13893) (@AAfghahi)
+- [13960](https://github.com/apache/superset/pull/13960) feat: initial work to make v1 API compatible with SIP-40 and SIP-41 (#13960) (@Beto Dealmeida)
+- [13444](https://github.com/apache/superset/pull/13444) fix: API to allow importing old exports (JSON/YAML) (#13444) (@Beto Dealmeida)
+- [13893](https://github.com/apache/superset/pull/13893) feat: create backend routes and API for importing saved queries (#13893) (@AAfghahi)
+
+
+## Breaking Changes and Full Changelog
+
+- To see the complete changelog in this release, head to [CHANGELOG.MD](https://github.com/apache/superset/blob/master/CHANGELOG.md).
+- In line with the semantic versioning scheme adopted by the community, 1.2.0 does not contain any backwards incompatible changes.
diff --git a/RELEASING/release-notes-1-2/media/dashboard_rbac.png b/RELEASING/release-notes-1-2/media/dashboard_rbac.png
new file mode 100644
index 000000000000..01e7678313db
Binary files /dev/null and b/RELEASING/release-notes-1-2/media/dashboard_rbac.png differ
diff --git a/RELEASING/release-notes-1-2/media/native_filters.png b/RELEASING/release-notes-1-2/media/native_filters.png
new file mode 100644
index 000000000000..275a2c6cb831
Binary files /dev/null and b/RELEASING/release-notes-1-2/media/native_filters.png differ
diff --git a/RELEASING/release-notes-1-2/media/native_filters_temporal.png b/RELEASING/release-notes-1-2/media/native_filters_temporal.png
new file mode 100644
index 000000000000..8d7c54974329
Binary files /dev/null and b/RELEASING/release-notes-1-2/media/native_filters_temporal.png differ
diff --git a/RELEASING/release-notes-1-2/media/pivot_table_v2.png b/RELEASING/release-notes-1-2/media/pivot_table_v2.png
new file mode 100644
index 000000000000..88b13d87d056
Binary files /dev/null and b/RELEASING/release-notes-1-2/media/pivot_table_v2.png differ
diff --git a/RELEASING/release-notes-1-2/media/radar_chart.png b/RELEASING/release-notes-1-2/media/radar_chart.png
new file mode 100644
index 000000000000..b532f145cacb
Binary files /dev/null and b/RELEASING/release-notes-1-2/media/radar_chart.png differ
diff --git a/RELEASING/release-notes-1-2/media/time_series_multichart.png b/RELEASING/release-notes-1-2/media/time_series_multichart.png
new file mode 100644
index 000000000000..3c3de4e797d8
Binary files /dev/null and b/RELEASING/release-notes-1-2/media/time_series_multichart.png differ
diff --git a/RELEASING/send_email.py b/RELEASING/send_email.py
index 409672e3461a..ddf823f1c92b 100755
--- a/RELEASING/send_email.py
+++ b/RELEASING/send_email.py
@@ -17,7 +17,9 @@
 #
 import smtplib
 import ssl
-from typing import List
+from typing import Any, Dict, List, Optional
+
+from click.core import Context
 
 try:
     import jinja2
@@ -50,7 +52,7 @@ def send_email(
     sender_email: str,
     receiver_email: str,
     message: str,
-):
+) -> None:
     """
     Send a simple text email (SMTP)
     """
@@ -61,7 +63,7 @@ def send_email(
         server.sendmail(sender_email, receiver_email, message)
 
 
-def render_template(template_file: str, **kwargs) -> str:
+def render_template(template_file: str, **kwargs: Any) -> str:
     """
     Simple render template based on named parameters
 
@@ -73,7 +75,9 @@ def render_template(template_file: str, **kwargs) -> str:
     return template.render(kwargs)
 
 
-def inter_send_email(username, password, sender_email, receiver_email, message):
+def inter_send_email(
+    username: str, password: str, sender_email: str, receiver_email: str, message: str
+) -> None:
     print("--------------------------")
     print("SMTP Message")
     print("--------------------------")
@@ -102,16 +106,16 @@ def inter_send_email(username, password, sender_email, receiver_email, message):
 
 class BaseParameters(object):
     def __init__(
-        self, email=None, username=None, password=None, version=None, version_rc=None
-    ):
+        self, email: str, username: str, password: str, version: str, version_rc: str,
+    ) -> None:
         self.email = email
         self.username = username
         self.password = password
         self.version = version
         self.version_rc = version_rc
-        self.template_arguments = dict()
+        self.template_arguments: Dict[str, Any] = {}
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"Apache Credentials: {self.email}/{self.username}/{self.version}/{self.version_rc}"
 
 
@@ -133,8 +137,15 @@ def __repr__(self):
 )
 @click.option("--version", envvar="SUPERSET_VERSION")
 @click.option("--version_rc", envvar="SUPERSET_VERSION_RC")
-def cli(ctx, apache_email, apache_username, apache_password, version, version_rc):
-    """ Welcome to releasing send email CLI interface!  """
+def cli(
+    ctx: Context,
+    apache_email: str,
+    apache_username: str,
+    apache_password: str,
+    version: str,
+    version_rc: str,
+) -> None:
+    """Welcome to releasing send email CLI interface!"""
     base_parameters = BaseParameters(
         apache_email, apache_username, apache_password, version, version_rc
     )
@@ -155,7 +166,7 @@ def cli(ctx, apache_email, apache_username, apache_password, version, version_rc
     prompt="The receiver email (To:)",
 )
 @click.pass_obj
-def vote_pmc(base_parameters, receiver_email):
+def vote_pmc(base_parameters: BaseParameters, receiver_email: str) -> None:
     template_file = "email_templates/vote_pmc.j2"
     base_parameters.template_arguments["receiver_email"] = receiver_email
     message = render_template(template_file, **base_parameters.template_arguments)
@@ -202,13 +213,13 @@ def vote_pmc(base_parameters, receiver_email):
 )
 @click.pass_obj
 def result_pmc(
-    base_parameters,
-    receiver_email,
-    vote_bindings,
-    vote_nonbindings,
-    vote_negatives,
-    vote_thread,
-):
+    base_parameters: BaseParameters,
+    receiver_email: str,
+    vote_bindings: str,
+    vote_nonbindings: str,
+    vote_negatives: str,
+    vote_thread: str,
+) -> None:
     template_file = "email_templates/result_pmc.j2"
     base_parameters.template_arguments["receiver_email"] = receiver_email
     base_parameters.template_arguments["vote_bindings"] = string_comma_to_list(
@@ -239,7 +250,7 @@ def result_pmc(
     prompt="The receiver email (To:)",
 )
 @click.pass_obj
-def announce(base_parameters, receiver_email):
+def announce(base_parameters: BaseParameters, receiver_email: str) -> None:
     template_file = "email_templates/announce.j2"
     base_parameters.template_arguments["receiver_email"] = receiver_email
     message = render_template(template_file, **base_parameters.template_arguments)
diff --git a/RESOURCES/FEATURE_FLAGS.md b/RESOURCES/FEATURE_FLAGS.md
index 5461db70a140..c19fac7b0694 100644
--- a/RESOURCES/FEATURE_FLAGS.md
+++ b/RESOURCES/FEATURE_FLAGS.md
@@ -25,7 +25,6 @@ These features are considered **unfinished** and should only be used on developm
 - CLIENT_CACHE
 - DASHBOARD_CACHE
 - DASHBOARD_NATIVE_FILTERS_SET
-- DASHBOARD_RBAC
 - DISABLE_DATASET_SOURCE_EDIT
 - ENABLE_EXPLORE_JSON_CSRF_PROTECTION
 - KV_STORE
@@ -49,6 +48,7 @@ These features are **finished** but currently being tested. They are usable, but
 These features flags are **safe for production** and have been tested.
 
 - DASHBOARD_CROSS_FILTERS
+- DASHBOARD_RBAC [(docs)](https://superset.apache.org/docs/creating-charts-dashboards/first-dashboard#manage-access-to-dashboards)
 - ESCAPE_MARKDOWN_HTML
 - ENABLE_TEMPLATE_PROCESSING
 - LISTVIEWS_DEFAULT_CARD_VIEW
diff --git a/RESOURCES/INTHEWILD.md b/RESOURCES/INTHEWILD.md
index 46a8d4fa0e22..98827c4b4b17 100644
--- a/RESOURCES/INTHEWILD.md
+++ b/RESOURCES/INTHEWILD.md
@@ -32,6 +32,7 @@ Join our growing community!
 - [Hostnfly](https://www.hostnfly.com/) [@alexisrosuel]
 - [Lime](https://www.limebike.com/) [@cxmcc]
 - [Lyft](https://www.lyft.com/)
+- [Ontruck](https://www.ontruck.com/)
 
 ### Financial Services
 - [Aktia Bank plc](https://www.aktia.com) [@villebro]
@@ -60,6 +61,7 @@ Join our growing community!
 - [Tails.com](https://tails.com) [@alanmcruickshank]
 - [THE ICONIC](http://theiconic.com.au/) [@ksaagariconic]
 - [Utair](https://www.utair.ru) [@utair-digital]
+- [VkusVill](https://www.vkusvill.ru) [@ETselikov]
 - [Zalando](https://www.zalando.com) [@dmigo]
 - [Zalora](https://www.zalora.com) [@ksaagariconic]
 
@@ -78,6 +80,7 @@ Join our growing community!
 - [FBK - ICT center](http://ict.fbk.eu)
 - [GfK Data Lab](http://datalab.gfk.com) [@mherr]
 - [GrowthSimple](https://growthsimple.ai/)
+- [Hydrolix](https://www.hydrolix.io/)
 - [Intercom](https://www.intercom.com/) [@kate-gallo]
 - [jampp](https://jampp.com/)
 - [Konfío](http://konfio.mx) [@uis-rodriguez]
@@ -94,6 +97,7 @@ Join our growing community!
 - [Showmax](https://tech.showmax.com) [@bobek]
 - [source{d}](https://www.sourced.tech) [@marnovo]
 - [Steamroot](https://streamroot.io/)
+- [TechAudit](https://www.techaudit.info) [@ETselikov]
 - [Tenable](https://www.tenable.com) [@dflionis]
 - [timbr.ai](https://timbr.ai/) [@semantiDan]
 - [Tobii](http://www.tobii.com/) [@dwa]
@@ -102,14 +106,13 @@ Join our growing community!
 - [Windsor.ai](https://www.windsor.ai/) [@octaviancorlade]
 - [Zeta](https://www.zeta.tech/) [@shaikidris]
 
-
 ### Entertainment
 - [6play](https://www.6play.fr) [@CoryChaplin]
 - [bilibili](https://www.bilibili.com) [@Moinheart]
 - [Douban](https://www.douban.com/) [@luchuan]
 - [Kuaishou](https://www.kuaishou.com/) [@zhaoyu89730105]
 - [Netflix](https://www.netflix.com/)
-- [TME QQMUSIC/WESING](https://www.tencentmusic.com/)
+- [TME QQMUSIC/WESING](https://www.tencentmusic.com/)[@shenyuanli,@marklaw]
 - [Xite](https://xite.com/) [@shashankkoppar]
 - [Zaihang](http://www.zaih.com/)
 
@@ -117,6 +120,7 @@ Join our growing community!
 - [Brilliant.org](https://brilliant.org/)
 - [Udemy](https://www.udemy.com/) [@sungjuly]
 - [VIPKID](https://www.vipkid.com.cn/) [@illpanda]
+- [Sunbird](https://www.sunbird.org/) [@eksteporg]
 
 ### Energy
 - [Airboxlab](https://foobot.io) [@antoine-galataud]
@@ -126,6 +130,7 @@ Join our growing community!
 
 ### Healthcare
 - [Amino](https://amino.com) [@shkr]
+- [Care](https://www.getcare.io/)[@alandao2021]
 - [Living Goods](https://www.livinggoods.org) [@chelule]
 - [Maieutical Labs](https://maieuticallabs.it) [@xrmx]
 - [QPID Health](http://www.qpidhealth.com/)
diff --git a/UPDATING.md b/UPDATING.md
index a24280e9db01..0e4c3a0577d8 100644
--- a/UPDATING.md
+++ b/UPDATING.md
@@ -23,6 +23,9 @@ This file documents any backwards-incompatible changes in Superset and
 assists people when migrating to a new version.
 
 ## Next
+- [15909](https://github.com/apache/incubator-superset/pull/15909): a change which
+drops a uniqueness criterion (which may or may not have existed) to the tables table. This constraint was obsolete as it is handled by the ORM due to differences in how MySQL, PostgreSQL, etc. handle uniqueness for NULL values.
+
 - [13772](https://github.com/apache/superset/pull/13772): Row level security (RLS) is now enabled by default. To activate the feature, please run `superset init` to expose the RLS menus to Admin users.
 
 - [13980](https://github.com/apache/superset/pull/13980): Data health checks no longer use the metadata database as an interim cache. Though non-breaking, deployments which implement complex logic should likely memoize the callback function. Refer to documentation in the confg.py file for more detail.
diff --git a/docker-compose-non-dev.yml b/docker-compose-non-dev.yml
index b28174a062e8..84bbc3b7a8e5 100644
--- a/docker-compose-non-dev.yml
+++ b/docker-compose-non-dev.yml
@@ -33,7 +33,7 @@ services:
       - redis:/data
 
   db:
-    env_file: docker/.env
+    env_file: docker/.env-non-dev
     image: postgres:10
     container_name: superset_db
     restart: unless-stopped
diff --git a/docker-compose.yml b/docker-compose.yml
index 8b94f7017222..93a79809178e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -118,6 +118,9 @@ services:
     depends_on: *superset-depends-on
     user: *superset-user
     volumes: *superset-volumes
+    # Bump memory limit if processing selenium / thumbails on superset-worker
+    # mem_limit: 2038m
+    # mem_reservation: 128M
 
   superset-worker-beat:
     image: *superset-image
diff --git a/docker/README.md b/docker/README.md
index 5cda2aa47258..c867121daece 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -24,58 +24,52 @@ Docker is an easy way to get started with Superset.
 ## Prerequisites
 
 1. Docker! [link](https://www.docker.com/get-started)
-1. Docker-compose [link](https://docs.docker.com/compose/install/)
+2. Docker-compose [link](https://docs.docker.com/compose/install/)
 
 ## Configuration
 
-The `/app/pythonpath` folder is mounted from [./docker/pythonpath_dev](./docker/pythonpath_dev)
-which contains a base configuration [./docker/pythonpath_dev/superset_config.py](./docker/pythonpath_dev/superset_config.py)
+The `/app/pythonpath` folder is mounted from [`./docker/pythonpath_dev`](./pythonpath_dev)
+which contains a base configuration [`./docker/pythonpath_dev/superset_config.py`](./pythonpath_dev/superset_config.py)
 intended for use with local development.
 
 ### Local overrides
 
-In order to override configuration settings locally, simply make a copy of [./docker/pythonpath_dev/superset_config_local.example](./docker/pythonpath_dev/superset_config_local.example)
-into [./docker/pythonpath_dev/superset_config_docker.py](./docker/pythonpath_dev/superset_config_docker.py) (git ignored) and fill in your overrides.
+In order to override configuration settings locally, simply make a copy of [`./docker/pythonpath_dev/superset_config_local.example`](./pythonpath_dev/superset_config_local.example)
+into `./docker/pythonpath_dev/superset_config_docker.py` (git ignored) and fill in your overrides.
 
 ### Local packages
 
-If you want to add python packages in order to test things like DBs locally, you can simply add a local requirements.txt (./docker/requirements-local.txt)
-and rebuild your docker stack.
+If you want to add Python packages in order to test things like databases locally, you can simply add a local requirements.txt (`./docker/requirements-local.txt`)
+and rebuild your Docker stack.
 
 Steps:
-    1. Create ./docker/requirements-local.txt
-    2. Add your new packages
-    3. Rebuild docker-compose
-        a. `docker-compose down -v`
-        b. `docker-compose up`
+
+1. Create `./docker/requirements-local.txt`
+2. Add your new packages
+3. Rebuild docker-compose
+    1. `docker-compose down -v`
+    2. `docker-compose up`
 
 ## Initializing Database
 
-The DB will initialize itself upon startup via the init container (superset-init)
-(This may take a minute.)
+The database will initialize itself upon startup via the init container ([`superset-init`](./docker-init.sh)). This may take a minute.
 
 ## Normal Operation
 
-To run the container, simply run:
-
-```bash
-docker-compose up
-```
+To run the container, simply run: `docker-compose up`
 
-After several minutes for superset initialization to finish, you can open a browser and view [`http://localhost:8088`](http://localhost:8088)
+After waiting several minutes for Superset initialization to finish, you can open a browser and view [`http://localhost:8088`](http://localhost:8088)
 to start your journey.
 
 ## Developing
 
-While running, the container server will reload on modification of the superset python and javascript source code.
+While running, the container server will reload on modification of the Superset Python and JavaScript source code.
 Don't forget to reload the page to take the new frontend into account though.
 
 ## Production
 
-It is also possible to run Superset in non-development mode: in the `docker-compose.yml` file remove
-the volumes needed for development and change the variable `SUPERSET_ENV` to `production`.
+It is possible to run Superset in non-development mode by using [`docker-compose-non-dev.yml`](../docker-compose-non-dev.yml). This file excludes the volumes needed for development and uses [`./docker/.env-non-dev`](./.env-non-dev) which sets the variable `SUPERSET_ENV` to `production`.
 
 ## Resource Constraints
 
-If you are attempting to build on a Mac and it exits with 137 you need to increase your docker resources.
-OSX instructions: https://docs.docker.com/docker-for-mac/#advanced (Search for memory)
+If you are attempting to build on macOS and it exits with 137 you need to increase your Docker resources. See instructions [here](https://docs.docker.com/docker-for-mac/#advanced) (search for memory)
diff --git a/docker/docker-bootstrap.sh b/docker/docker-bootstrap.sh
index 57163ccfe4c4..4a8e27966424 100755
--- a/docker/docker-bootstrap.sh
+++ b/docker/docker-bootstrap.sh
@@ -21,7 +21,7 @@ set -eo pipefail
 REQUIREMENTS_LOCAL="/app/docker/requirements-local.txt"
 # If Cypress run – overwrite the password for admin and export env variables
 if [ "$CYPRESS_CONFIG" == "true" ]; then
-    export SUPERSET_CONFIG=tests.superset_test_config
+    export SUPERSET_CONFIG=tests.integration_tests.superset_test_config
     export SUPERSET_TESTENV=true
     export ENABLE_REACT_CRUD_VIEWS=true
     export SUPERSET__SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://superset:superset@db:5432/superset
@@ -38,10 +38,10 @@ fi
 
 if [[ "${1}" == "worker" ]]; then
   echo "Starting Celery worker..."
-  celery worker --app=superset.tasks.celery_app:app -Ofair -l INFO
+  celery --app=superset.tasks.celery_app:app worker -Ofair -l INFO
 elif [[ "${1}" == "beat" ]]; then
   echo "Starting Celery beat..."
-  celery beat --app=superset.tasks.celery_app:app --pidfile /tmp/celerybeat.pid -l INFO -s "${SUPERSET_HOME}"/celerybeat-schedule
+  celery --app=superset.tasks.celery_app:app beat --pidfile /tmp/celerybeat.pid -l INFO -s "${SUPERSET_HOME}"/celerybeat-schedule
 elif [[ "${1}" == "app" ]]; then
   echo "Starting web app..."
   flask run -p 8088 --with-threads --reload --debugger --host=0.0.0.0
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 99f89564a6a6..57ed13d9cf24 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -27,7 +27,7 @@ else
         --workers 1 \
         --worker-class gthread \
         --threads 20 \
-        --timeout 60 \
+        --timeout ${GUNICORN_TIMEOUT:-60} \
         --limit-request-line 0 \
         --limit-request-field_size 0 \
         "${FLASK_APP}"
diff --git a/docker/docker-frontend.sh b/docker/docker-frontend.sh
index b88215ca826b..4c0d01e07935 100755
--- a/docker/docker-frontend.sh
+++ b/docker/docker-frontend.sh
@@ -18,6 +18,7 @@
 set -e
 
 cd /app/superset-frontend
+npm install -g npm@7
 npm install -f --no-optional --global webpack webpack-cli
 npm install -f --no-optional
 
diff --git a/docker/pythonpath_dev/superset_config.py b/docker/pythonpath_dev/superset_config.py
index a3ca8b1ec6c9..6c58bec79c17 100644
--- a/docker/pythonpath_dev/superset_config.py
+++ b/docker/pythonpath_dev/superset_config.py
@@ -23,6 +23,7 @@
 import logging
 import os
 from datetime import timedelta
+from typing import Optional
 
 from cachelib.file import FileSystemCache
 from celery.schedules import crontab
@@ -30,7 +31,7 @@
 logger = logging.getLogger()
 
 
-def get_env_variable(var_name, default=None):
+def get_env_variable(var_name: str, default: Optional[str] = None) -> str:
     """Get the environment variable or raise exception."""
     try:
         return os.environ[var_name]
@@ -63,8 +64,8 @@ def get_env_variable(var_name, default=None):
 
 REDIS_HOST = get_env_variable("REDIS_HOST")
 REDIS_PORT = get_env_variable("REDIS_PORT")
-REDIS_CELERY_DB = get_env_variable("REDIS_CELERY_DB", 0)
-REDIS_RESULTS_DB = get_env_variable("REDIS_RESULTS_DB", 1)
+REDIS_CELERY_DB = get_env_variable("REDIS_CELERY_DB", "0")
+REDIS_RESULTS_DB = get_env_variable("REDIS_RESULTS_DB", "1")
 
 RESULTS_BACKEND = FileSystemCache("/app/superset_home/sqllab")
 
diff --git a/docs/.asf.yaml b/docs/.asf.yaml
new file mode 100644
index 000000000000..6d232bb2ad1c
--- /dev/null
+++ b/docs/.asf.yaml
@@ -0,0 +1,22 @@
+# 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.
+
+publish:
+  whoami: asf-site
+
+staging:
+  whoami: asf-site
diff --git a/docs/installation.rst b/docs/installation.rst
index edfedce43965..9a696b356422 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -342,7 +342,7 @@ as well as the default values in place.
 
 Since ``superset_config.py`` acts as a Flask configuration module, it
 can be used to alter the settings Flask itself,
-as well as Flask extensions like ``flask-wtf``, ``flask-cache``,
+as well as Flask extensions like ``flask-wtf``, ``flask-caching``,
 ``flask-migrate``, and ``flask-appbuilder``. Flask App Builder, the web
 framework used by Superset offers many configuration settings. Please consult
 the `Flask App Builder Documentation
@@ -365,12 +365,12 @@ auth postback endpoint, you can add them to *WTF_CSRF_EXEMPT_LIST*
 Caching
 -------
 
-Superset uses `Flask-Cache <https://pythonhosted.org/Flask-Cache/>`_ for
+Superset uses `Flask-Caching <https://flask-caching.readthedocs.io/>`_ for
 caching purpose. Configuring your caching backend is as easy as providing
 ``CACHE_CONFIG`` and ``DATA_CACHE_CONFIG`, constants in ``superset_config.py``
-that complies with `the Flask-Cache specifications <https://flask-caching.readthedocs.io/en/latest/#configuring-flask-caching>`_.
+that complies with `the Flask-Caching specifications <https://flask-caching.readthedocs.io/en/latest/#configuring-flask-caching>`_.
 
-Flask-Cache supports multiple caching backends (Redis, Memcached,
+Flask-Caching supports multiple caching backends (Redis, Memcached,
 SimpleCache (in-memory), or the local filesystem). If you are going to use
 Memcached please use the `pylibmc` client library as `python-memcached` does
 not handle storing binary data correctly. If you use Redis, please install
@@ -393,7 +393,7 @@ defined in ``DATA_CACHE_CONFIG``.
 
 It is also possible to pass a custom cache initialization function in the
 config to handle additional caching use cases. The function must return an
-object that is compatible with the `Flask-Cache <https://pythonhosted.org/Flask-Cache/>`_ API.
+object that is compatible with the `Flask-Caching <https://flask-caching.readthedocs.io/>`_ API.
 
 .. code-block:: python
 
@@ -443,7 +443,7 @@ This is an optional feature that can be turned on by activating its feature flag
     }
 
 
-For this feature you will need a cache system and celery workers. All thumbnails are store on cache and are processed
+For this feature you will need a cache system and celery workers. All thumbnails are stored on cache and are processed
 asynchronously by the workers.
 
 An example config where images are stored on S3 could be:
@@ -1080,11 +1080,11 @@ have the same configuration.
 
 * To start a Celery worker to leverage the configuration run: ::
 
-    celery worker --app=superset.tasks.celery_app:app --pool=prefork -O fair -c 4
+    celery --app=superset.tasks.celery_app:app worker --pool=prefork -O fair -c 4
 
 * To start a job which schedules periodic background jobs, run ::
 
-    celery beat --app=superset.tasks.celery_app:app
+    celery --app=superset.tasks.celery_app:app beat
 
 To setup a result backend, you need to pass an instance of a derivative
 of ``from cachelib.base.BaseCache`` to the ``RESULTS_BACKEND``
@@ -1465,7 +1465,7 @@ install from pip: ::
 
 and run via: ::
 
-    celery flower --app=superset.tasks.celery_app:app
+    celery --app=superset.tasks.celery_app:app flower
 
 Building from source
 ---------------------
@@ -1571,6 +1571,7 @@ Second step: Create a `CustomSsoSecurityManager` that extends `SupersetSecurityM
 
 .. code-block:: python
 
+    import logging
     from superset.security import SupersetSecurityManager
 
     class CustomSsoSecurityManager(SupersetSecurityManager):
diff --git a/docs/package.json b/docs/package.json
index 9458f576d0ed..32559144facb 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -52,7 +52,7 @@
   ],
   "license": "0BSD",
   "scripts": {
-    "build": "gatsby build && cp .htaccess public/",
+    "build": "gatsby build && cp .htaccess .asf.yaml public/",
     "develop": "gatsby develop",
     "develop-ga": "GATSBY_GTAG_DEBUG=true gatsby develop",
     "format": "prettier --write \"**/*.{js,jsx,ts,tsx,json,md,mdx}\"",
diff --git a/docs/src/images/databases/netezza.png b/docs/src/images/databases/netezza.png
new file mode 100644
index 000000000000..2658d8629bf1
Binary files /dev/null and b/docs/src/images/databases/netezza.png differ
diff --git a/docs/src/pages/docs/Connecting to Databases/ascend.mdx b/docs/src/pages/docs/Connecting to Databases/ascend.mdx
new file mode 100644
index 000000000000..eb0d6c387af9
--- /dev/null
+++ b/docs/src/pages/docs/Connecting to Databases/ascend.mdx	
@@ -0,0 +1,17 @@
+---
+name: Ascend.io
+menu: Connecting to Databases
+route: /docs/databases/ascend
+index: 7
+version: 1
+---
+
+## Ascend.io
+
+The recommended connector library to Ascend.io is [impyla](https://github.com/cloudera/impyla).
+
+The expected connection string is formatted as follows:
+
+```
+ascend://{username}:{password}@{hostname}:{port}/{database}?auth_mechanism=PLAIN;use_ssl=true
+```
diff --git a/docs/src/pages/docs/Connecting to Databases/docker-add-drivers.mdx b/docs/src/pages/docs/Connecting to Databases/docker-add-drivers.mdx
index cf3892f6f3e4..e54d9a94a0be 100644
--- a/docs/src/pages/docs/Connecting to Databases/docker-add-drivers.mdx	
+++ b/docs/src/pages/docs/Connecting to Databases/docker-add-drivers.mdx	
@@ -53,12 +53,18 @@ Rebuild your local image with the new driver baked in:
 docker-compose build --force-rm
 ```
 
-After the rebuild is complete, which make take a few minutes, relaunch:
+After the rebuild of the Docker images is complete (which make take a few minutes) you can relaunch using the following command:
 
 ```
 docker-compose up
 ```
 
+The other option is to start Superset via Docker Compose is using the recipe in `docker-compose-non-dev.yml`, which will use pre-built frontend assets and skip the building of front-end assets:
+
+```
+docker-compose -f docker-compose-non-dev.yml up
+```
+
 ### 3. Connect to MySQL
 
 Now that you've got a MySQL driver installed locally, you should be able to test it out.
diff --git a/docs/src/pages/docs/Connecting to Databases/dremio.mdx b/docs/src/pages/docs/Connecting to Databases/dremio.mdx
index 7281f69462ca..6efc17c1f54f 100644
--- a/docs/src/pages/docs/Connecting to Databases/dremio.mdx	
+++ b/docs/src/pages/docs/Connecting to Databases/dremio.mdx	
@@ -14,7 +14,7 @@ The recommended connector library for Dremio is
 The expected connection string for ODBC (Default port is 31010) is formatted as follows:
 
 ```
-dremio://{username}:{password}@{host}:{port}/dremio
+dremio://{username}:{password}@{host}:{port}/{database_name}/dremio?SSL=1
 ```
 The expected connection string for Arrow Flight (Dremio 4.9.1+. Default port is 32010) is formatted as follows:
 
diff --git a/docs/src/pages/docs/Connecting to Databases/index.mdx b/docs/src/pages/docs/Connecting to Databases/index.mdx
index 40082f76e7bc..4460d5e4b1df 100644
--- a/docs/src/pages/docs/Connecting to Databases/index.mdx	
+++ b/docs/src/pages/docs/Connecting to Databases/index.mdx	
@@ -33,6 +33,7 @@ A list of some of the recommended packages.
 |[Apache Pinot](/docs/databases/pinot)|```pip install pinotdb```|```pinot://BROKER:5436/query?server=http://CONTROLLER:5983/```|
 |[Apache Solr](/docs/databases/solr)|```pip install sqlalchemy-solr```|```solr://{username}:{password}@{hostname}:{port}/{server_path}/{collection}```
 |[Apache Spark SQL](/docs/databases/spark-sql)|```pip install pyhive```|```hive://hive@{hostname}:{port}/{database}```
+|[Ascend.io](/docs/databases/ascend)|```pip install impyla```|```ascend://{username}:{password}@{hostname}:{port}/{database}?auth_mechanism=PLAIN;use_ssl=true```|
 |[Azure MS SQL](/docs/databases/sql-server)|```pip install pymssql``` |```mssql+pymssql://UserName@presetSQL:TestPassword@presetSQL.database.windows.net:1433/TestSchema```
 |[Big Query](/docs/databases/bigquery)|```pip install pybigquery```|```bigquery://{project_id}```|
 |[ClickHouse](/docs/databases/clickhouse)|```pip install clickhouse-driver==0.2.0 && pip install clickhouse-sqlalchemy==0.1.6```|```clickhouse+native://{username}:{password}@{hostname}:{port}/{database}```|
@@ -43,9 +44,10 @@ A list of some of the recommended packages.
 |[Google Sheets](/docs/databases/google-sheets)|```pip install shillelagh[gsheetsapi]```|```gsheets://```|
 |[Hologres](/docs/databases/hologres)|```pip install psycopg2```|```postgresql+psycopg2://<UserName>:<DBPassword>@<Database Host>/<Database Name>```|
 |[IBM Db2](/docs/databases/ibm-db2)|```pip install ibm_db_sa```|```db2+ibm_db://```|
+|[IBM Netezza Performance Server](/docs/databases/netezza)|```pip install nzalchemy```|```netezza+nzpy://<UserName>:<DBPassword>@<Database Host>/<Database Name>```|
 |[MySQL](/docs/databases/mysql)|```pip install mysqlclient```|```mysql://<UserName>:<DBPassword>@<Database Host>/<Database Name>```|
 |[Oracle](/docs/databases/oracle)|```pip install cx_Oracle```|```oracle://```|
-|[PostgreSQL](/docs/databases/postgresql)|```pip install psycopg2```|```postgresql://<UserName>:<DBPassword>@<Database Host>/<Database Name>```|
+|[PostgreSQL](/docs/databases/postgres)|```pip install psycopg2```|```postgresql://<UserName>:<DBPassword>@<Database Host>/<Database Name>```|
 |[Trino](/docs/databases/trino)|```pip install sqlalchemy-trino```|```trino://{username}:{password}@{hostname}:{port}/{catalog}```|
 |[Presto](/docs/databases/presto)|```pip install pyhive```|```presto://```|
 |[SAP Hana](/docs/databases/hana)|```pip install hdbcli sqlalchemy-hana or pip install apache-superset[hana]```|```hana://{username}:{password}@{host}:{port}```|
diff --git a/docs/src/pages/docs/Connecting to Databases/netezza.mdx b/docs/src/pages/docs/Connecting to Databases/netezza.mdx
new file mode 100644
index 000000000000..76fa77fcca07
--- /dev/null
+++ b/docs/src/pages/docs/Connecting to Databases/netezza.mdx	
@@ -0,0 +1,18 @@
+---
+name: IBM Netezza Performance Server
+menu: Connecting to Databases
+route: /docs/databases/netezza
+index: 19
+version: 1
+---
+
+## IBM Netezza Performance Server
+
+The [nzalchemy](https://pypi.org/project/nzalchemy/) library provides a
+Python / SQLAlchemy interface to IBM Netezza Performance Server (aka Netezza).
+
+Here's the recommended connection string:
+
+```
+netezza+nzpy://{username}:{password}@{hostname}:{port}/{database}
+```
diff --git a/docs/src/pages/docs/Connecting to Databases/postgres.mdx b/docs/src/pages/docs/Connecting to Databases/postgres.mdx
index e62e02853c4b..38f7a1d028df 100644
--- a/docs/src/pages/docs/Connecting to Databases/postgres.mdx	
+++ b/docs/src/pages/docs/Connecting to Databases/postgres.mdx	
@@ -8,8 +8,8 @@ version: 1
 
 ## Postgres
 
-Note that the Postgres connector library [psycopg2](https://www.psycopg.org/docs/) comes out of the
-box with Superset.
+Note that, if you're using docker-compose, the Postgres connector library [psycopg2](https://www.psycopg.org/docs/)
+comes out of the box with Superset.
 
 Postgres sample connection parameters:
 
diff --git a/docs/src/pages/docs/Connecting to Databases/ui.mdx b/docs/src/pages/docs/Connecting to Databases/ui.mdx
new file mode 100644
index 000000000000..0646235526d3
--- /dev/null
+++ b/docs/src/pages/docs/Connecting to Databases/ui.mdx	
@@ -0,0 +1,77 @@
+---
+name: Using Database Connection UI
+menu: Connecting to Databases
+route: /docs/databases/db-connection-ui
+index: 1
+version: 1
+---
+
+Here is the documentation on how to leverage the new DB Connection UI. This will provide admins the ability to enhance the UX for users who want to connect to new databases.
+
+![db-conn-docs](https://user-images.githubusercontent.com/27827808/125499607-94e300aa-1c0f-4c60-b199-3f9de41060a3.gif)
+
+There are now 3 steps when connecting to a database in the new UI:
+
+Step 1: First the admin must inform superset what engine they want to connect to. This page is powered by the `/available` endpoint which pulls on the engines currently installed in your environment, so that only supported databases are shown.
+
+Step 2: Next, the admin is prompted to enter database specific parameters. Depending on whether there is a dynamic form available for that specific engine, the admin will either see the new custom form or the legacy SQLAlchemy form. We currently have built dynamic forms for (Redshift, MySQL, Postgres, and BigQuery). The new form prompts the user for the parameters needed to connect (for example, username, password, host, port, etc.) and provides immediate feedback on errors.
+
+Step 3: Finally, once the admin has connected to their DB using the dynamic form they have the opportunity to update any optional advanced settings.
+
+We hope this feature will help eliminate a huge bottleneck for users to get into the application and start crafting datasets.
+
+### How to setup up preferred database options and images
+
+We added a new configuration option where the admin can define their preferred databases, in order:
+
+```python
+# A list of preferred databases, in order. These databases will be
+# displayed prominently in the "Add Database" dialog. You should
+# use the "engine_name" attribute of the corresponding DB engine spec
+# in `superset/db_engine_specs/`.
+PREFERRED_DATABASES: List[str] = [
+    "PostgreSQL",
+    "Presto",
+    "MySQL",
+    "SQLite",
+]
+```
+
+For copyright reasons the logos for each database are not distributed with Superset.
+
+### Setting images
+
+- To set the images of your preferred database, admins must create a mapping in the `superset_text.yml` file with engine and location of the image. The image can be host locally inside your static/file directory or online (e.g. S3)
+
+```python
+DB_IMAGES:
+  postgresql: "path/to/image/postgres.jpg"
+  bigquery: "path/to/s3bucket/bigquery.jpg"
+  snowflake: "path/to/image/snowflake.jpg"
+```
+
+### How to add new database engines to available endpoint
+
+Currently the new modal supports the following databases:
+
+- Postgres
+- Redshift
+- MySQL
+- BigQuery
+
+When the user selects a database not in this list they will see the old dialog asking for the SQLAlchemy URI. New databases can be added gradually to the new flow. In order to support the rich configuration a DB engine spec needs to have the following attributes:
+
+1. `parameters_schema`: a Marshmallow schema defining the parameters needed to configure the database. For Postgres this includes username, password, host, port, etc. ([see](https://github.com/apache/superset/blob/accee507c0819cd0d7bcfb5a3e1199bc81eeebf2/superset/db_engine_specs/base.py#L1309-L1320)).
+2. `default_driver`: the name of the recommended driver for the DB engine spec. Many SQLAlchemy dialects support multiple drivers, but usually one is the official recommendation. For Postgres we use "psycopg2".
+3. `sqlalchemy_uri_placeholder`: a string that helps the user in case they want to type the URI directly.
+4. `encryption_parameters`: parameters used to build the URI when the user opts for an encrypted connection. For Postgres this is `{"sslmode": "require"}`.
+
+In addition, the DB engine spec must implement these class methods:
+
+- `build_sqlalchemy_uri(cls, parameters, encrypted_extra)`: this method receives the distinct parameters and builds the URI from them.
+- `get_parameters_from_uri(cls, uri, encrypted_extra)`: this method does the opposite, extracting the parameters from a given URI.
+- `validate_parameters(cls, parameters)`: this method is used for `onBlur` validation of the form. It should return a list of `SupersetError` indicating which parameters are missing, and which parameters are definitely incorrect ([example](https://github.com/apache/superset/blob/accee507c0819cd0d7bcfb5a3e1199bc81eeebf2/superset/db_engine_specs/base.py#L1404)).
+
+For databases like MySQL and Postgres that use the standard format of `engine+driver://user:password@host:port/dbname` all you need to do is add the `BasicParametersMixin` to the DB engine spec, and then define the parameters 2-4 (`parameters_schema` is already present in the mixin).
+
+For other databases you need to implement these methods yourself. The BigQuery DB engine spec is a good example of how to do that.
diff --git a/docs/src/pages/docs/Creating Charts and Dashboards/index.mdx b/docs/src/pages/docs/Creating Charts and Dashboards/index.mdx
index fa665f2298dd..ae7dd1da3b55 100644
--- a/docs/src/pages/docs/Creating Charts and Dashboards/index.mdx	
+++ b/docs/src/pages/docs/Creating Charts and Dashboards/index.mdx	
@@ -172,3 +172,19 @@ into a position you like onto the underlying grid.
 Congrats! You’ve successfully linked, analyzed, and visualized data in Superset. There are a wealth
 of other table configuration and visualization options, so please start exploring and creating
 slices and dashboards of your own
+
+ֿ
+### Manage access to Dashboards
+
+
+Access to dashboards is managed via owners (users that have edit permissions to the dashboard)
+
+Non-owner users access can be managed two different ways:
+
+1. Dataset permissions - if you add to the relevant role permissions to datasets it automatically grants implict access to all dashboards that uses those permitted datasets
+2. Dashboard roles - if you enable **DASHBOARD_RBAC** feature flag  then you be able to manage which roles can access the dashboard
+- Having dashboard access implicitly grants read access to the associated datasets, therefore
+all charts will load their data even if feature flag is turned on and no roles assigned
+to roles the access will fallback to **Dataset permissions**
+
+<img src="/images/tutorial_dashboard_access.png" />
diff --git a/docs/src/pages/docs/Miscellaneous/issue_codes.mdx b/docs/src/pages/docs/Miscellaneous/issue_codes.mdx
index ad26c70a798e..9666dcfdbd36 100644
--- a/docs/src/pages/docs/Miscellaneous/issue_codes.mdx
+++ b/docs/src/pages/docs/Miscellaneous/issue_codes.mdx
@@ -207,3 +207,131 @@ The submitted payload has the incorrect schema.
 ```
 
 Please check that the request payload has the expected schema.
+
+## Issue 1021
+
+```
+Results backend needed for asynchronous queries is not configured.
+```
+
+Your instance of Superset doesn't have a results backend configured, which is needed for asynchronous queries. Please contact an administrator for further assistance.
+
+## Issue 1022
+
+```
+Database does not allow data manipulation.
+```
+
+Only `SELECT` statements are allowed against this database. Please contact an administrator if you need to run DML (data manipulation language) on this database.
+
+## Issue 1023
+
+```
+CTAS (create table as select) doesn't have a SELECT statement at the end.
+```
+
+The last statement in a query run as CTAS (create table as select) MUST be a SELECT statement. Please make sure the last statement in the query is a SELECT.
+
+## Issue 1024
+
+```
+CVAS (create view as select) query has more than one statement.
+```
+
+When running a CVAS (create view as select) the query should have a single statement. Please make sure the query has a single statement, and no extra semi-colons other than the last one.
+
+## Issue 1025
+
+```
+CVAS (create view as select) query is not a SELECT statement.
+```
+
+When running a CVAS (create view as select) the query should be a SELECT statement. Please make sure the query has a single statement and it's a SELECT statement.
+
+## Issue 1026
+
+```
+Query is too complex and takes too long to run.
+```
+
+The submitted query might be too complex to run under the time limit defined by your Superset administrator. Please double check your query and verify if it can be optimized. Alternatively, contact your administrator to increase the timeout period.
+
+## Issue 1027
+
+```
+The database is currently running too many queries.
+```
+
+The database might be under heavy load, running too many queries. Please try again later, or contact an administrator for further assistance.
+
+## Issue 1028
+
+```
+One or more parameters specified in the query are malformatted.
+```
+
+The query contains one or more malformed template parameters. Please check your query and confirm that all template parameters are surround by double braces, for example, "{{ ds }}". Then, try running your query again.
+
+## Issue 1029
+
+```
+The object does not exist in this database.
+```
+
+Either the schema, column, or table do not exist in the database.
+
+## Issue 1030
+
+```
+The query potentially has a syntax error.
+```
+
+The query might have a syntax error. Please check and run again.
+
+## Issue 1031
+
+```
+The results backend no longer has the data from the query.
+```
+
+The results from the query might have been deleted from the results backend after some period. Please re-run your query.
+
+## Issue 1032
+
+```
+The query associated with the results was deleted.
+```
+
+The query associated with the stored results no longer exists. Please re-run your query.
+
+## Issue 1033
+
+```
+The results stored in the backend were stored in a different format, and no longer can be deserialized.
+```
+
+The query results were stored in a format that is no longer supported. Please re-run your query.
+
+## Issue 1034
+
+```
+The database port provided is invalid.
+```
+
+Please check that the provided database port is an integer between 0 and 65535 (inclusive).
+
+## Issue 1035
+
+```
+Failed to start remote query on a worker.
+```
+
+The query was not started by an asynchronous worker. Please reach out to your administrator for further assistance.
+
+## Issue 1036
+
+```
+The database was deleted.
+```
+
+The operation failed because the database referenced no longer exists. Please reach out to your administrator for further assistance.
diff --git a/docs/src/pages/docs/frequently-asked-questions-page.mdx b/docs/src/pages/docs/frequently-asked-questions-page.mdx
index 5b4ab72fb3a1..1a2e83d324f0 100644
--- a/docs/src/pages/docs/frequently-asked-questions-page.mdx
+++ b/docs/src/pages/docs/frequently-asked-questions-page.mdx
@@ -76,7 +76,7 @@ SUPERSET_WEBSERVER_TIMEOUT = 60
 
 ### Why is the map not visible in the geospatial visualization?
 
-You need to register a free account at [Mapbox.com](www.mapbox.com), obtain an API key, and add it
+You need to register a free account at [Mapbox.com](https://www.mapbox.com), obtain an API key, and add it
 to **superset_config.py** at the key MAPBOX_API_KEY:
 
 ```
diff --git a/docs/src/pages/docs/installation/alerts_reports.mdx b/docs/src/pages/docs/installation/alerts_reports.mdx
index 6ac292b1a3fa..f81cf7e43de4 100644
--- a/docs/src/pages/docs/installation/alerts_reports.mdx
+++ b/docs/src/pages/docs/installation/alerts_reports.mdx
@@ -38,6 +38,7 @@ To send alerts and reports to Slack channels, you need to create a new Slack App
 3. Go to "OAuth & Permissions" section, and give the following scopes to your app:
     - `incoming-webhook`
     - `files:write`
+    - `chat:write`
 4. At the top of the "OAuth and Permissions" section, click "install to workspace".
 5. Select a default channel for your app and continue.
 (You can post to any channel by inviting your Superset app into that channel).
@@ -246,7 +247,7 @@ services:
       - superset
       - postgres
       - redis
-    command: "celery worker --app=superset.tasks.celery_app:app --pool=gevent --concurrency=500"
+    command: "celery --app=superset.tasks.celery_app:app worker --pool=gevent --concurrency=500"
     volumes:
       - ./config/:/app/pythonpath/
   beat:
@@ -258,7 +259,7 @@ services:
       - superset
       - postgres
       - redis
-    command: "celery beat --app=superset.tasks.celery_app:app --pidfile /tmp/celerybeat.pid --schedule /tmp/celerybeat-schedule"
+    command: "celery --app=superset.tasks.celery_app:app beat --pidfile /tmp/celerybeat.pid --schedule /tmp/celerybeat-schedule"
     volumes:
       - ./config/:/app/pythonpath/
   superset:
diff --git a/docs/src/pages/docs/installation/async_queries_celery.mdx b/docs/src/pages/docs/installation/async_queries_celery.mdx
index a95fcf0bdcfa..e97acc6a23cd 100644
--- a/docs/src/pages/docs/installation/async_queries_celery.mdx
+++ b/docs/src/pages/docs/installation/async_queries_celery.mdx
@@ -57,13 +57,13 @@ CELERY_CONFIG = CeleryConfig
 To start a Celery worker to leverage the configuration, run the following command:
 
 ```
-celery worker --app=superset.tasks.celery_app:app --pool=prefork -O fair -c 4
+celery --app=superset.tasks.celery_app:app worker --pool=prefork -O fair -c 4
 ```
 
 To start a job which schedules periodic background jobs, run the following command:
 
 ```
-celery beat --app=superset.tasks.celery_app:app
+celery --app=superset.tasks.celery_app:app beat
 ```
 
 To setup a result backend, you need to pass an instance of a derivative of from
@@ -114,5 +114,5 @@ pip install flower
 You can run flower using:
 
 ```
-celery flower --app=superset.tasks.celery_app:app
+celery --app=superset.tasks.celery_app:app flower
 ```
diff --git a/docs/src/pages/docs/installation/caching.mdx b/docs/src/pages/docs/installation/caching.mdx
index 4c9a22dae20b..e599553dde74 100644
--- a/docs/src/pages/docs/installation/caching.mdx
+++ b/docs/src/pages/docs/installation/caching.mdx
@@ -8,15 +8,15 @@ version: 1
 
 ## Caching
 
-Superset uses [Flask-Cache](https://pythonhosted.org/Flask-Cache/) for caching purpose. For security reasons,
+Superset uses [Flask-Caching](https://flask-caching.readthedocs.io/) for caching purpose. For security reasons,
 there are two separate cache configs for Superset's own metadata (`CACHE_CONFIG`) and charting data queried from
 connected datasources (`DATA_CACHE_CONFIG`). However, Query results from SQL Lab are stored in another backend
 called `RESULTS_BACKEND`, See [Async Queries via Celery](/docs/installation/async-queries-celery) for details.
 
 Configuring caching is as easy as providing `CACHE_CONFIG` and `DATA_CACHE_CONFIG` in your
-`superset_config.py` that complies with [the Flask-Cache specifications](https://flask-caching.readthedocs.io/en/latest/#configuring-flask-caching).
+`superset_config.py` that complies with [the Flask-Caching specifications](https://flask-caching.readthedocs.io/en/latest/#configuring-flask-caching).
 
-Flask-Cache supports various caching backends, including Redis, Memcached, SimpleCache (in-memory), or the
+Flask-Caching supports various caching backends, including Redis, Memcached, SimpleCache (in-memory), or the
 local filesystem.
 
 - Memcached: we recommend using [pylibmc](https://pypi.org/project/pylibmc/) client library as
@@ -71,7 +71,7 @@ FEATURE_FLAGS = {
 }
 ```
 
-For this feature you will need a cache system and celery workers. All thumbnails are store on cache
+For this feature you will need a cache system and celery workers. All thumbnails are stored on cache
 and are processed asynchronously by the workers.
 
 An example config where images are stored on S3 could be:
diff --git a/docs/src/pages/docs/installation/configuring.mdx b/docs/src/pages/docs/installation/configuring.mdx
index d4fc778f5889..707aaeef7209 100644
--- a/docs/src/pages/docs/installation/configuring.mdx
+++ b/docs/src/pages/docs/installation/configuring.mdx
@@ -47,7 +47,7 @@ can be altered in your local `superset_config.py`. Administrators will want to r
 to understand what can be configured locally as well as the default values in place.
 
 Since `superset_config.py` acts as a Flask configuration module, it can be used to alter the
-settings Flask itself, as well as Flask extensions like `flask-wtf`, `flask-cache`, `flask-migrate`,
+settings Flask itself, as well as Flask extensions like `flask-wtf`, `flask-caching`, `flask-migrate`,
 and `flask-appbuilder`. Flask App Builder, the web framework used by Superset, offers many
 configuration settings. Please consult the
 [Flask App Builder Documentation](https://flask-appbuilder.readthedocs.org/en/latest/config.html)
@@ -154,6 +154,7 @@ Then, create a `CustomSsoSecurityManager` that extends `SupersetSecurityManager`
 `oauth_user_info`:
 
 ```python
+import logging
 from superset.security import SupersetSecurityManager
 
 class CustomSsoSecurityManager(SupersetSecurityManager):
@@ -177,9 +178,47 @@ from custom_sso_security_manager import CustomSsoSecurityManager
 CUSTOM_SECURITY_MANAGER = CustomSsoSecurityManager
 ```
 
-Notice that the redirect URL will be `https://<superset-webserver>/oauth-authorized/<provider-name>`
-When configuring an OAuth2 authorization provider if needed. For instance, the redirect URL will
-be `https://<superset-webserver>/oauth-authorized/egaSSO` for the above configuration.
+**Notes**
+
+- The redirect URL will be `https://<superset-webserver>/oauth-authorized/<provider-name>`
+  When configuring an OAuth2 authorization provider if needed. For instance, the redirect URL will
+  be `https://<superset-webserver>/oauth-authorized/egaSSO` for the above configuration.
+
+- If an OAuth2 authorization server supports OpenID Connect 1.0, you could configure its configuration
+  document URL only without providing `api_base_url`, `access_token_url`, `authorize_url` and other
+  required options like user info endpoint, jwks uri etc. For instance:
+  ```python
+  OAUTH_PROVIDERS = [
+    {   'name':'egaSSO',
+        'token_key':'access_token', # Name of the token in the response of access_token_url
+        'icon':'fa-address-card',   # Icon for the provider
+        'remote_app': {
+            'client_id':'myClientId',  # Client Id (Identify Superset application)
+            'client_secret':'MySecret', # Secret for this Client Id (Identify Superset application)
+            'server_metadata_url': 'https://myAuthorizationServer/.well-known/openid-configuration'
+        }
+    }
+  ]
+  ```
+
+### Flask app Configuration Hook
+
+`FLASK_APP_MUTATOR` is a configuration function that can be provided in your environment, receives
+the app object and can alter it in any way. For example, add `FLASK_APP_MUTATOR` into your
+`superset_config.py` to setup session cookie expiration time to 24 hours:
+
+```
+def make_session_permanent():
+    '''
+    Enable maxAge for the cookie 'session'
+    '''
+    session.permanent = True
+
+# Set up max age of session to 24 hours
+PERMANENT_SESSION_LIFETIME = timedelta(hours=24)
+def FLASK_APP_MUTATOR(app: Flask) -> None:
+    app.before_request_funcs.setdefault(None, []).append(make_session_permanent)
+```
 
 ### Feature Flags
 
diff --git a/docs/src/pages/docs/installation/index.mdx b/docs/src/pages/docs/installation/index.mdx
index 81bbf600a28a..508fa27d14fe 100644
--- a/docs/src/pages/docs/installation/index.mdx
+++ b/docs/src/pages/docs/installation/index.mdx
@@ -100,3 +100,13 @@ username: admin
 ```bash
 password: admin
 ```
+
+
+### 5. Connecting your local database instance to superset
+
+When running Superset using `docker` or `docker-compose` it runs in its own docker container, as if the Superset was running in a separate machine entirely. Therefore attempts to connect to your local database with hostname `localhost` won't work as `localhost` refers to the docker container Superset is running in, and not your actual host machine. Fortunately, docker provides an easy way to access network resources in the host machine from inside a container, and we will leverage this capability to connect to our local database instance.
+
+Here the instructions are for connecting to postgresql (which is running on your host machine) from Superset (which is running in its docker container). Other databases may have slightly different configurations but gist would be same and boils down to 2 steps -
+
+1. **(Mac users may skip this step)** Configuring the local postgresql/database instance to accept public incoming connections. By default postgresql only allows incoming connections from `localhost` only, but re-iterating once again, `localhosts` are different for host machine and docker container. For postgresql this involves make one-line changes to the files `postgresql.conf` and `pg_hba.conf`, you can find helpful links tailored to your OS / PG version on the web easily for this task. For docker it suffices to only whitelist IPs `172.0.0.0/8` instead of `*`, but in any case you are *warned* that doing this in a production database *may* have disastrous consequences as you are opening your database to the public internet.
+2. Instead of `localhost`, try using `host.docker.internal` (Mac users) or `172.18.0.1` (Linux users) as the host name when attempting to connect to the database. This is docker internal detail, what is happening is that in Mac systems docker creates a dns entry for the host name `host.docker.internal` which resolves to the correct address for the host machine, whereas in linux this is not the case (at least by default). If neither of these 2 hostnames work then you may want to find the exact host name you want to use, for that you can do `ifconfig` or `ip addr show` and look at the IP address of `docker0` interface that must have been created by docker for you. Alternately if you don't even see the `docker0` interface try (if needed with sudo) `docker network inspect bridge` and see if there is an entry for `"Gateway"` and note the IP address.
diff --git a/docs/src/pages/docs/installation/installing_scratch.mdx b/docs/src/pages/docs/installation/installing_scratch.mdx
index 11126aecead7..2fb1b7a814ea 100644
--- a/docs/src/pages/docs/installation/installing_scratch.mdx
+++ b/docs/src/pages/docs/installation/installing_scratch.mdx
@@ -36,6 +36,18 @@ Install the following packages using the `yum` package manager:
 sudo yum install gcc gcc-c++ libffi-devel python-devel python-pip python-wheel openssl-devel cyrus-sasl-devel openldap-devel
 ```
 
+In more recent versions of CentOS and Fedora, you may need to install a slightly different set of packages using `dnf`:
+
+```
+sudo dnf install gcc gcc-c++ libffi-devel python3-devel python3-pip python3-wheel openssl-devel cyrus-sasl-devel openldap-devel
+```
+
+Also, on CentOS, you may need to upgrade pip for the install to work:
+
+```
+pip3 install --upgrade pip
+```
+
 **Mac OS X**
 
 If you're not on the latest version of OS X, we recommend upgrading because we've found that many
diff --git a/docs/src/pages/docs/installation/networking_settings.mdx b/docs/src/pages/docs/installation/networking_settings.mdx
index 6d2781925a6b..dc0c49c09fd0 100644
--- a/docs/src/pages/docs/installation/networking_settings.mdx
+++ b/docs/src/pages/docs/installation/networking_settings.mdx
@@ -32,7 +32,7 @@ cross-domain request).
 
 Add the following setting in your `superset_config.py` file:
 
-- `SUPERSET_WEBSERVER_DOMAINS`: list of allowed hostnames for domain shareding feature.
+- `SUPERSET_WEBSERVER_DOMAINS`: list of allowed hostnames for domain sharding feature.
 
 ### Middleware
 
diff --git a/docs/src/pages/docs/installation/sql_templating.mdx b/docs/src/pages/docs/installation/sql_templating.mdx
index 76f6f94c857e..68d1ca682d12 100644
--- a/docs/src/pages/docs/installation/sql_templating.mdx
+++ b/docs/src/pages/docs/installation/sql_templating.mdx
@@ -87,3 +87,167 @@ FEATURE_FLAGS = {
 
 The available validators and names can be found in
 [sql_validators](https://github.com/apache/superset/tree/master/superset/sql_validators).
+
+### Available Macros
+
+In this section, we'll walkthrough the  pre-defined Jinja macros in Superset.
+
+**Current Username**
+
+The `{{ current_username() }}` macro returns the username of the currently logged in user.
+
+If you have caching enabled in your Superset configuration, then by defaul the the `username` value will be used
+by Superset when calculating the cache key. A cache key is a unique identifer that determines if there's a
+cache hit in the future and Superset can retrieve cached data.
+
+You can disable the inclusion of the `username` value in the calculation of the
+cache key by adding the following parameter to your Jinja code:
+
+```
+{{ current_username(add_to_cache_keys=False) }}
+```
+
+**Current User ID**
+
+The `{{ current_user_id()}}` macro returns the user_id of the currently logged in user.
+
+If you have caching enabled in your Superset configuration, then by defaul the the `user_id` value will be used
+by Superset when calculating the cache key. A cache key is a unique identifer that determines if there's a
+cache hit in the future and Superset can retrieve cached data.
+
+You can disable the inclusion of the `user_id` value in the calculation of the
+cache key by adding the following parameter to your Jinja code:
+
+```
+{{ current_user_id(add_to_cache_keys=False) }}
+```
+
+**Custom URL Parameters**
+
+The `{{ url_param('custom_variable') }}` macro lets you define arbitrary URL
+parameters and reference them in your SQL code.
+
+Here's a concrete example:
+
+- You write the following query in SQL Lab:
+
+    ```
+    SELECT count(*)
+    FROM ORDERS
+    WHERE country_code = '{{ url_param('countrycode') }}'
+    ```
+
+- You're hosting Superset at the domain www.example.com and you send your
+coworker in Spain the following SQL Lab URL `www.example.com/superset/sqllab?countrycode=ES`
+and your coworker in the USA the following SQL Lab URL `www.example.com/superset/sqllab?countrycode=US`
+- For your coworker in Spain, the SQL Lab query will be rendered as:
+
+    ```
+    SELECT count(*)
+    FROM ORDERS
+    WHERE country_code = 'ES'
+    ```
+
+- For your coworker in the USA, the SQL Lab query will be rendered as:
+
+    ```
+    SELECT count(*)
+    FROM ORDERS
+    WHERE country_code = 'US'
+    ```
+
+**Explicitly Including Values in Cache Key**
+
+The `{{ cache_key_wrapper() }}` function explicitly instructs Superset to add a value to the
+accumulated list of values used in the the calculation of the cache key.
+
+This function is only needed when you want to wrap your own custom function return values
+in the cache key. You can gain more context
+[here](https://github.com/apache/superset/blob/efd70077014cbed62e493372d33a2af5237eaadf/superset/jinja_context.py#L133-L148).
+
+Note that this function powers the caching of the `user_id` and `username` values
+in the `current_user_id()` and `current_username()` function calls (if you have caching enabled).
+
+**Filter Values**
+
+You can retrieve the value for a specific filter as a list using `{{ filter_values() }}`.
+
+This is useful if:
+- you want to use a filter component to filter a query where the name of filter component column doesn't match the one in the select statement
+- you want to have the ability for filter inside the main query for speed purposes
+
+Here's a concrete example:
+
+```
+SELECT action, count(*) as times
+FROM logs
+WHERE
+    action in ({{ "'" + "','".join(filter_values('action_type')) + "'" }})
+GROUP BY action
+```
+
+You can use thisfeature to reference the start & end datetimes from a time filter using:
+
+- `{{ from_dttm }}`: start datetime value
+- `{{ to_dttm }}`: end datetime value
+
+**Filters for a Specific Column**
+
+The `{{ get_filters() }}` macro returns the filters applied to a given column. In addition to
+returning the values (similar to how `filter_values()` does), the `get_filters()` macro
+returns the operator specified in the Explore UI.
+
+ This is useful if:
+- you want to handle more than the IN operator in your SQL clause
+- you want to handle generating custom SQL conditions for a filter
+- you want to have the ability to filter inside the main query for speed purposes
+
+Here's a concrete example:
+
+```
+ WITH RECURSIVE
+    superiors(employee_id, manager_id, full_name, level, lineage) AS (
+    SELECT
+        employee_id,
+        manager_id,
+        full_name,
+    1 as level,
+    employee_id as lineage
+    FROM
+        employees
+    WHERE
+    1=1
+
+    {# Render a blank line #}
+    {%- for filter in get_filters('full_name', remove_filter=True) -%}
+
+    {%- if filter.get('op') == 'IN' -%}
+        AND
+        full_name IN ( {{ "'" + "', '".join(filter.get('val')) + "'" }} )
+    {%- endif -%}
+
+    {%- if filter.get('op') == 'LIKE' -%}
+        AND
+        full_name LIKE {{ "'" + filter.get('val') + "'" }}
+    {%- endif -%}
+
+    {%- endfor -%}
+    UNION ALL
+        SELECT
+            e.employee_id,
+            e.manager_id,
+            e.full_name,
+    s.level + 1 as level,
+    s.lineage
+        FROM
+            employees e,
+        superiors s
+        WHERE s.manager_id = e.employee_id
+    )
+
+    SELECT
+    employee_id, manager_id, full_name, level, lineage
+    FROM
+    superiors
+    order by lineage, level
+```
diff --git a/docs/src/resources/data.js b/docs/src/resources/data.js
index aae3b075b6bb..28b9e5e5db9b 100644
--- a/docs/src/resources/data.js
+++ b/docs/src/resources/data.js
@@ -235,4 +235,9 @@ export const Databases = [
     href: 'https://www.alibabacloud.com/product/hologres',
     imgName: 'hologres.png',
   },
+  {
+    title: 'IBM Netezza Performance Server',
+    href: 'https://www.ibm.com/products/netezza',
+    imgName: 'netezza.png',
+  },
 ];
diff --git a/docs/src/resources/openapi.json b/docs/src/resources/openapi.json
index a86724ead90d..c0486d597bc9 100644
--- a/docs/src/resources/openapi.json
+++ b/docs/src/resources/openapi.json
@@ -724,12 +724,15 @@
             "description": "To what level of granularity should the temporal column be aggregated. Supports [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601#Durations) durations.",
             "enum": [
               "PT1S",
+              "PT5S",
+              "PT30S",
               "PT1M",
               "PT5M",
               "PT10M",
               "PT15M",
               "PT0.5H",
               "PT1H",
+              "PT6H",
               "P1D",
               "P1W",
               "P1M",
@@ -745,15 +748,7 @@
             "type": "string"
           },
           "time_range_endpoints": {
-            "items": {
-              "description": "A list with two values, stating if start/end should be inclusive/exclusive.",
-              "enum": [
-                "unknown",
-                "inclusive",
-                "exclusive"
-              ],
-              "type": "string"
-            },
+            "items": {},
             "type": "array"
           },
           "where": {
@@ -780,11 +775,14 @@
               ">=",
               "<=",
               "LIKE",
+              "ILIKE",
               "IS NULL",
               "IS NOT NULL",
               "IN",
               "NOT IN",
-              "REGEX"
+              "REGEX",
+              "IS TRUE",
+              "IS FALSE"
             ],
             "example": "IN",
             "type": "string"
@@ -935,7 +933,9 @@
               "prophet",
               "rolling",
               "select",
-              "sort"
+              "sort",
+              "diff",
+              "compare"
             ],
             "example": "aggregate",
             "type": "string"
@@ -992,12 +992,15 @@
             "description": "Time grain used to specify time period increments in prediction. Supports [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601#Durations) durations.",
             "enum": [
               "PT1S",
+              "PT5S",
+              "PT30S",
               "PT1M",
               "PT5M",
               "PT10M",
               "PT15M",
               "PT0.5H",
               "PT1H",
+              "PT6H",
               "P1D",
               "P1W",
               "P1M",
@@ -1042,24 +1045,8 @@
             },
             "type": "array"
           },
-          "result_format": {
-            "description": "Format of result payload",
-            "enum": [
-              "json",
-              "csv"
-            ],
-            "type": "string"
-          },
-          "result_type": {
-            "description": "Type of results to return",
-            "enum": [
-              "full",
-              "query",
-              "results",
-              "samples"
-            ],
-            "type": "string"
-          }
+          "result_format": {},
+          "result_type": {}
         },
         "type": "object"
       },
@@ -1078,8 +1065,14 @@
             "example": {
               "__time_range": "1 year ago : now"
             },
+            "nullable": true,
             "type": "object"
           },
+          "apply_fetch_values_predicate": {
+            "description": "Add fetch values predicate (where clause) to query if defined in datasource",
+            "nullable": true,
+            "type": "boolean"
+          },
           "columns": {
             "description": "Columns which to select in the query.",
             "items": {
@@ -1088,6 +1081,14 @@
             "nullable": true,
             "type": "array"
           },
+          "datasource": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ChartDataDatasource"
+              }
+            ],
+            "nullable": true
+          },
           "druid_time_origin": {
             "description": "Starting point for time grain counting on legacy Druid datasources. Used to change e.g. Monday/Sunday first-day-of-week. This field is deprecated and should be passed to `extras` as `druid_time_origin`.",
             "nullable": true,
@@ -1099,20 +1100,24 @@
                 "$ref": "#/components/schemas/ChartDataExtras"
               }
             ],
-            "description": "Extra parameters to add to the query."
+            "description": "Extra parameters to add to the query.",
+            "nullable": true
           },
           "filters": {
             "items": {
               "$ref": "#/components/schemas/ChartDataFilter"
             },
+            "nullable": true,
             "type": "array"
           },
           "granularity": {
             "description": "Name of temporal column used for time filtering. For legacy Druid datasources this defines the time grain.",
+            "nullable": true,
             "type": "string"
           },
           "granularity_sqla": {
             "description": "Name of temporal column used for time filtering for SQL datasources. This field is deprecated, use `granularity` instead.",
+            "nullable": true,
             "type": "string"
           },
           "groupby": {
@@ -1125,6 +1130,7 @@
           },
           "having": {
             "description": "HAVING clause to be added to aggregate queries using AND operator. This field is deprecated and should be passed to `extras`.",
+            "nullable": true,
             "type": "string"
           },
           "having_filters": {
@@ -1132,19 +1138,28 @@
             "items": {
               "$ref": "#/components/schemas/ChartDataFilter"
             },
+            "nullable": true,
             "type": "array"
           },
+          "is_rowcount": {
+            "description": "Should the rowcount of the actual query be returned",
+            "nullable": true,
+            "type": "boolean"
+          },
           "is_timeseries": {
             "description": "Is the `query_object` a timeseries.",
+            "nullable": true,
             "type": "boolean"
           },
           "metrics": {
             "description": "Aggregate expressions. Metrics can be passed as both references to datasource metrics (strings), or ad-hoc metricswhich are defined only within the query object. See `ChartDataAdhocMetricSchema` for the structure of ad-hoc metrics.",
             "items": {},
+            "nullable": true,
             "type": "array"
           },
           "order_desc": {
             "description": "Reverse order. Default: `false`",
+            "nullable": true,
             "type": "boolean"
           },
           "orderby": {
@@ -1159,10 +1174,8 @@
                 true
               ]
             ],
-            "items": {
-              "items": {},
-              "type": "array"
-            },
+            "items": {},
+            "nullable": true,
             "type": "array"
           },
           "post_processing": {
@@ -1175,32 +1188,48 @@
               ],
               "nullable": true
             },
+            "nullable": true,
             "type": "array"
           },
+          "result_type": {
+            "nullable": true
+          },
           "row_limit": {
-            "description": "Maximum row count. Default: `config[\"ROW_LIMIT\"]`",
+            "description": "Maximum row count (0=disabled). Default: `config[\"ROW_LIMIT\"]`",
             "format": "int32",
-            "minimum": 1,
+            "minimum": 0,
+            "nullable": true,
             "type": "integer"
           },
           "row_offset": {
             "description": "Number of rows to skip. Default: `0`",
             "format": "int32",
             "minimum": 0,
+            "nullable": true,
             "type": "integer"
           },
+          "time_offsets": {
+            "items": {
+              "type": "string"
+            },
+            "nullable": true,
+            "type": "array"
+          },
           "time_range": {
             "description": "A time rage, either expressed as a colon separated string `since : until` or human readable freeform. Valid formats for `since` and `until` are: \n- ISO 8601\n- X days/years/hours/day/year/weeks\n- X days/years/hours/day/year/weeks ago\n- X days/years/hours/day/year/weeks from now\n\nAdditionally, the following freeform can be used:\n\n- Last day\n- Last week\n- Last month\n- Last quarter\n- Last year\n- No filter\n- Last X seconds/minutes/hours/days/weeks/months/years\n- Next X seconds/minutes/hours/days/weeks/months/years\n",
             "example": "Last week",
+            "nullable": true,
             "type": "string"
           },
           "time_shift": {
             "description": "A human-readable date/time string. Please refer to [parsdatetime](https://github.com/bear/parsedatetime) documentation for details on valid values.",
+            "nullable": true,
             "type": "string"
           },
           "timeseries_limit": {
             "description": "Maximum row count for timeseries queries. Default: `0`",
             "format": "int32",
+            "nullable": true,
             "type": "integer"
           },
           "timeseries_limit_metric": {
@@ -1218,6 +1247,7 @@
           },
           "where": {
             "description": "WHERE clause to be added to queries using AND operator.This field is deprecated and should be passed to `extras`.",
+            "nullable": true,
             "type": "string"
           }
         },
@@ -1477,6 +1507,51 @@
         ],
         "type": "object"
       },
+      "ChartEntityResponseSchema": {
+        "properties": {
+          "cache_timeout": {
+            "description": "Duration (in seconds) of the caching timeout for this chart. Note this defaults to the datasource/table timeout if undefined.",
+            "format": "int32",
+            "type": "integer"
+          },
+          "changed_on": {
+            "description": "The ISO date that the chart was last changed.",
+            "type": "string"
+          },
+          "datasource": {
+            "description": "The datasource name.",
+            "type": "string"
+          },
+          "description": {
+            "description": "A description of the chart propose.",
+            "type": "string"
+          },
+          "description_markeddown": {
+            "description": "Sanitized HTML version of the chart description.",
+            "type": "string"
+          },
+          "form_data": {
+            "description": "Form data from the Explore controls used to form the chart's data query.",
+            "type": "object"
+          },
+          "modified": {
+            "type": "string"
+          },
+          "slice_id": {
+            "format": "int32",
+            "type": "integer"
+          },
+          "slice_name": {
+            "description": "The name of the chart.",
+            "type": "string"
+          },
+          "slice_url": {
+            "description": "The URL of the chart.",
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
       "ChartFavStarResponseResult": {
         "properties": {
           "id": {
@@ -1552,6 +1627,10 @@
             "nullable": true,
             "type": "string"
           },
+          "query_context": {
+            "nullable": true,
+            "type": "string"
+          },
           "slice_name": {
             "maxLength": 250,
             "nullable": true,
@@ -1573,7 +1652,7 @@
             "type": "integer"
           },
           "changed_by": {
-            "$ref": "#/components/schemas/Meta5"
+            "$ref": "#/components/schemas/Meta8"
           },
           "changed_by_name": {
             "readOnly": true
@@ -1588,7 +1667,7 @@
             "readOnly": true
           },
           "created_by": {
-            "$ref": "#/components/schemas/Meta6"
+            "$ref": "#/components/schemas/Meta5"
           },
           "datasource_id": {
             "format": "int32",
@@ -1633,7 +1712,7 @@
             "type": "string"
           },
           "table": {
-            "$ref": "#/components/schemas/Meta8"
+            "$ref": "#/components/schemas/Meta6"
           },
           "thumbnail_url": {
             "readOnly": true
@@ -1702,6 +1781,11 @@
             "nullable": true,
             "type": "string"
           },
+          "query_context": {
+            "description": "The query context represents the queries that need to run in order to generate the data the visualization, and in what format the data should be returned.",
+            "nullable": true,
+            "type": "string"
+          },
           "slice_name": {
             "description": "The name of the chart.",
             "maxLength": 250,
@@ -1778,6 +1862,11 @@
             "nullable": true,
             "type": "string"
           },
+          "query_context": {
+            "description": "The query context represents the queries that need to run in order to generate the data the visualization, and in what format the data should be returned.",
+            "nullable": true,
+            "type": "string"
+          },
           "slice_name": {
             "description": "The name of the chart.",
             "maxLength": 250,
@@ -1882,86 +1971,245 @@
         },
         "type": "object"
       },
-      "DashboardRestApi.get": {
+      "DashboardDatasetSchema": {
         "properties": {
-          "changed_by": {
-            "$ref": "#/components/schemas/Meta17"
+          "cache_timeout": {
+            "format": "int32",
+            "type": "integer"
           },
-          "changed_by_name": {
-            "readOnly": true
+          "column_formats": {
+            "type": "object"
           },
-          "changed_by_url": {
-            "readOnly": true
+          "column_types": {
+            "items": {
+              "format": "int32",
+              "type": "integer"
+            },
+            "type": "array"
           },
-          "changed_on": {
-            "format": "date-time",
-            "nullable": true,
+          "columns": {
+            "items": {
+              "type": "object"
+            },
+            "type": "array"
+          },
+          "database": {
+            "$ref": "#/components/schemas/Database"
+          },
+          "datasource_name": {
             "type": "string"
           },
-          "charts": {
-            "readOnly": true
+          "default_endpoint": {
+            "type": "string"
           },
-          "css": {
-            "nullable": true,
+          "edit_url": {
             "type": "string"
           },
-          "dashboard_title": {
-            "maxLength": 500,
-            "nullable": true,
+          "fetch_values_predicate": {
+            "type": "string"
+          },
+          "filter_select": {
+            "type": "boolean"
+          },
+          "filter_select_enabled": {
+            "type": "boolean"
+          },
+          "granularity_sqla": {
+            "items": {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "type": "array"
+          },
+          "health_check_message": {
             "type": "string"
           },
           "id": {
             "format": "int32",
             "type": "integer"
           },
-          "json_metadata": {
-            "nullable": true,
+          "is_sqllab_view": {
+            "type": "boolean"
+          },
+          "main_dttm_col": {
+            "type": "string"
+          },
+          "metrics": {
+            "items": {
+              "type": "object"
+            },
+            "type": "array"
+          },
+          "name": {
             "type": "string"
           },
+          "offset": {
+            "format": "int32",
+            "type": "integer"
+          },
+          "order_by_choices": {
+            "items": {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "type": "array"
+          },
           "owners": {
-            "$ref": "#/components/schemas/Meta18"
+            "items": {
+              "format": "int32",
+              "type": "integer"
+            },
+            "type": "array"
           },
-          "position_json": {
-            "nullable": true,
+          "params": {
             "type": "string"
           },
-          "published": {
-            "nullable": true,
-            "type": "boolean"
+          "perm": {
+            "type": "string"
           },
-          "slug": {
-            "maxLength": 255,
-            "nullable": true,
+          "schema": {
             "type": "string"
           },
-          "table_names": {
-            "readOnly": true
+          "select_star": {
+            "type": "string"
           },
-          "thumbnail_url": {
-            "readOnly": true
+          "sql": {
+            "type": "string"
           },
-          "url": {
-            "readOnly": true
+          "table_name": {
+            "type": "string"
+          },
+          "template_params": {
+            "type": "string"
+          },
+          "time_grain_sqla": {
+            "items": {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            "type": "array"
+          },
+          "type": {
+            "type": "string"
+          },
+          "uid": {
+            "type": "string"
+          },
+          "verbose_map": {
+            "additionalProperties": {
+              "type": "string"
+            },
+            "type": "object"
           }
         },
         "type": "object"
       },
-      "DashboardRestApi.get_list": {
+      "DashboardGetResponseSchema": {
         "properties": {
           "changed_by": {
-            "$ref": "#/components/schemas/Meta15"
+            "$ref": "#/components/schemas/User"
           },
           "changed_by_name": {
-            "readOnly": true
+            "type": "string"
           },
           "changed_by_url": {
-            "readOnly": true
+            "type": "string"
+          },
+          "changed_on": {
+            "format": "date-time",
+            "type": "string"
           },
           "changed_on_delta_humanized": {
-            "readOnly": true
+            "type": "string"
           },
-          "changed_on_utc": {
-            "readOnly": true
+          "charts": {
+            "items": {
+              "description": "The names of the dashboard's charts. Names are used for legacy reasons.",
+              "type": "string"
+            },
+            "type": "array"
+          },
+          "css": {
+            "description": "Override CSS for the dashboard.",
+            "type": "string"
+          },
+          "dashboard_title": {
+            "description": "A title for the dashboard.",
+            "type": "string"
+          },
+          "id": {
+            "format": "int32",
+            "type": "integer"
+          },
+          "json_metadata": {
+            "description": "This JSON object is generated dynamically when clicking the save or overwrite button in the dashboard view. It is exposed here for reference and for power users who may want to alter  specific parameters.",
+            "type": "string"
+          },
+          "owners": {
+            "items": {
+              "$ref": "#/components/schemas/User"
+            },
+            "type": "array"
+          },
+          "position_json": {
+            "description": "This json object describes the positioning of the widgets in the dashboard. It is dynamically generated when adjusting the widgets size and positions by using drag & drop in the dashboard view",
+            "type": "string"
+          },
+          "published": {
+            "type": "boolean"
+          },
+          "roles": {
+            "items": {
+              "$ref": "#/components/schemas/Roles"
+            },
+            "type": "array"
+          },
+          "slug": {
+            "type": "string"
+          },
+          "table_names": {
+            "type": "string"
+          },
+          "thumbnail_url": {
+            "type": "string"
+          },
+          "url": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "DashboardRestApi.get": {
+        "properties": {
+          "id": {
+            "format": "int32",
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
+      "DashboardRestApi.get_list": {
+        "properties": {
+          "changed_by": {
+            "$ref": "#/components/schemas/Meta15"
+          },
+          "changed_by_name": {
+            "readOnly": true
+          },
+          "changed_by_url": {
+            "readOnly": true
+          },
+          "changed_on_delta_humanized": {
+            "readOnly": true
+          },
+          "changed_on_utc": {
+            "readOnly": true
           },
           "created_by": {
             "$ref": "#/components/schemas/Meta14"
@@ -1984,7 +2232,7 @@
             "type": "string"
           },
           "owners": {
-            "$ref": "#/components/schemas/Meta16"
+            "$ref": "#/components/schemas/Meta17"
           },
           "position_json": {
             "nullable": true,
@@ -1994,11 +2242,17 @@
             "nullable": true,
             "type": "boolean"
           },
+          "roles": {
+            "$ref": "#/components/schemas/Meta16"
+          },
           "slug": {
             "maxLength": 255,
             "nullable": true,
             "type": "string"
           },
+          "status": {
+            "readOnly": true
+          },
           "thumbnail_url": {
             "readOnly": true
           },
@@ -2040,6 +2294,14 @@
             "description": "Determines whether or not this dashboard is visible in the list of all dashboards.",
             "type": "boolean"
           },
+          "roles": {
+            "items": {
+              "description": "Roles is a list which defines access to the dashboard. These roles are always applied in addition to restrictions on dataset level access. If no roles defined then the dashboard is available to all roles.",
+              "format": "int32",
+              "type": "integer"
+            },
+            "type": "array"
+          },
           "slug": {
             "description": "Unique identifying part for the web address of the dashboard.",
             "maxLength": 255,
@@ -2088,6 +2350,15 @@
             "nullable": true,
             "type": "boolean"
           },
+          "roles": {
+            "items": {
+              "description": "Roles is a list which defines access to the dashboard. These roles are always applied in addition to restrictions on dataset level access. If no roles defined then the dashboard is available to all roles.",
+              "format": "int32",
+              "nullable": true,
+              "type": "integer"
+            },
+            "type": "array"
+          },
           "slug": {
             "description": "Unique identifying part for the web address of the dashboard.",
             "maxLength": 255,
@@ -2098,6 +2369,48 @@
         },
         "type": "object"
       },
+      "Database": {
+        "properties": {
+          "allow_multi_schema_metadata_fetch": {
+            "type": "boolean"
+          },
+          "allows_cost_estimate": {
+            "type": "boolean"
+          },
+          "allows_subquery": {
+            "type": "boolean"
+          },
+          "allows_virtual_table_explore": {
+            "type": "boolean"
+          },
+          "backend": {
+            "type": "string"
+          },
+          "explore_database_id": {
+            "format": "int32",
+            "type": "integer"
+          },
+          "id": {
+            "format": "int32",
+            "type": "integer"
+          },
+          "name": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "DatabaseFunctionNamesResponse": {
+        "properties": {
+          "function_names": {
+            "items": {
+              "type": "string"
+            },
+            "type": "array"
+          }
+        },
+        "type": "object"
+      },
       "DatabaseRelatedChart": {
         "properties": {
           "id": {
@@ -2202,11 +2515,19 @@
             "nullable": true,
             "type": "boolean"
           },
+          "backend": {
+            "readOnly": true
+          },
           "cache_timeout": {
             "format": "int32",
             "nullable": true,
             "type": "integer"
           },
+          "configuration_method": {
+            "maxLength": 255,
+            "nullable": true,
+            "type": "string"
+          },
           "database_name": {
             "maxLength": 250,
             "type": "string"
@@ -2236,6 +2557,9 @@
             "nullable": true,
             "type": "boolean"
           },
+          "parameters": {
+            "readOnly": true
+          },
           "server_cert": {
             "nullable": true,
             "type": "string"
@@ -2298,7 +2622,7 @@
             "readOnly": true
           },
           "created_by": {
-            "$ref": "#/components/schemas/Meta19"
+            "$ref": "#/components/schemas/Meta18"
           },
           "database_name": {
             "maxLength": 250,
@@ -2311,14 +2635,15 @@
             "nullable": true,
             "type": "boolean"
           },
+          "extra": {
+            "nullable": true,
+            "type": "string"
+          },
           "force_ctas_schema": {
             "maxLength": 250,
             "nullable": true,
             "type": "string"
           },
-          "function_names": {
-            "readOnly": true
-          },
           "id": {
             "format": "int32",
             "type": "integer"
@@ -2361,6 +2686,10 @@
             "nullable": true,
             "type": "integer"
           },
+          "configuration_method": {
+            "default": "sqlalchemy_form",
+            "description": "Configuration_method is used on the frontend to inform the backend whether to explode parameters or to provide only a sqlalchemy_uri."
+          },
           "database_name": {
             "description": "A database name to identify this connection.",
             "maxLength": 250,
@@ -2372,6 +2701,11 @@
             "nullable": true,
             "type": "string"
           },
+          "engine": {
+            "description": "SQLAlchemy engine to use",
+            "nullable": true,
+            "type": "string"
+          },
           "expose_in_sqllab": {
             "description": "Expose this database to SQLLab",
             "type": "boolean"
@@ -2391,6 +2725,11 @@
             "description": "If Presto, all the queries in SQL Lab are going to be executed as the currently logged on user who must have permission to run them.<br/>If Hive and hive.server2.enable.doAs is enabled, will run the queries as service account, but impersonate the currently logged on user via hive.server2.proxy.user property.",
             "type": "boolean"
           },
+          "parameters": {
+            "additionalProperties": {},
+            "description": "DB-specific parameters for configuration",
+            "type": "object"
+          },
           "server_cert": {
             "description": "<p>Optional CA_BUNDLE contents to validate HTTPS requests. Only available on certain database engines.</p>",
             "nullable": true,
@@ -2404,8 +2743,7 @@
           }
         },
         "required": [
-          "database_name",
-          "sqlalchemy_uri"
+          "database_name"
         ],
         "type": "object"
       },
@@ -2441,6 +2779,10 @@
             "nullable": true,
             "type": "integer"
           },
+          "configuration_method": {
+            "default": "sqlalchemy_form",
+            "description": "Configuration_method is used on the frontend to inform the backend whether to explode parameters or to provide only a sqlalchemy_uri."
+          },
           "database_name": {
             "description": "A database name to identify this connection.",
             "maxLength": 250,
@@ -2453,6 +2795,11 @@
             "nullable": true,
             "type": "string"
           },
+          "engine": {
+            "description": "SQLAlchemy engine to use",
+            "nullable": true,
+            "type": "string"
+          },
           "expose_in_sqllab": {
             "description": "Expose this database to SQLLab",
             "type": "boolean"
@@ -2472,6 +2819,11 @@
             "description": "If Presto, all the queries in SQL Lab are going to be executed as the currently logged on user who must have permission to run them.<br/>If Hive and hive.server2.enable.doAs is enabled, will run the queries as service account, but impersonate the currently logged on user via hive.server2.proxy.user property.",
             "type": "boolean"
           },
+          "parameters": {
+            "additionalProperties": {},
+            "description": "DB-specific parameters for configuration",
+            "type": "object"
+          },
           "server_cert": {
             "description": "<p>Optional CA_BUNDLE contents to validate HTTPS requests. Only available on certain database engines.</p>",
             "nullable": true,
@@ -2481,7 +2833,6 @@
             "description": "<p>Refer to the <a href=\"https://docs.sqlalchemy.org/en/rel_1_2/core/engines.html#database-urls\">SqlAlchemy docs</a> for more information on how to structure your URI.</p>",
             "maxLength": 1024,
             "minLength": 0,
-            "nullable": true,
             "type": "string"
           }
         },
@@ -2489,6 +2840,10 @@
       },
       "DatabaseTestConnectionSchema": {
         "properties": {
+          "configuration_method": {
+            "default": "sqlalchemy_form",
+            "description": "Configuration_method is used on the frontend to inform the backend whether to explode parameters or to provide only a sqlalchemy_uri."
+          },
           "database_name": {
             "description": "A database name to identify this connection.",
             "maxLength": 250,
@@ -2501,6 +2856,11 @@
             "nullable": true,
             "type": "string"
           },
+          "engine": {
+            "description": "SQLAlchemy engine to use",
+            "nullable": true,
+            "type": "string"
+          },
           "extra": {
             "description": "<p>JSON string containing extra configuration elements.<br>1. The <code>engine_params</code> object gets unpacked into the <a href=\"https://docs.sqlalchemy.org/en/latest/core/engines.html#sqlalchemy.create_engine\">sqlalchemy.create_engine</a> call, while the <code>metadata_params</code> gets unpacked into the <a href=\"https://docs.sqlalchemy.org/en/rel_1_0/core/metadata.html#sqlalchemy.schema.MetaData\">sqlalchemy.MetaData</a> call.<br>2. The <code>metadata_cache_timeout</code> is a cache timeout setting in seconds for metadata fetch of this database. Specify it as <strong>\"metadata_cache_timeout\": {\"schema_cache_timeout\": 600, \"table_cache_timeout\": 600}</strong>. If unset, cache will not be enabled for the functionality. A timeout of 0 indicates that the cache never expires.<br>3. The <code>schemas_allowed_for_csv_upload</code> is a comma separated list of schemas that CSVs are allowed to upload to. Specify it as <strong>\"schemas_allowed_for_csv_upload\": [\"public\", \"csv_upload\"]</strong>. If database flavor does not support schema or any schema is allowed to be accessed, just leave the list empty<br>4. the <code>version</code> field is a string specifying the this db's version. This should be used with Presto DBs so that the syntax is correct<br>5. The <code>allows_virtual_table_explore</code> field is a boolean specifying whether or not the Explore button in SQL Lab results is shown.</p>",
             "type": "string"
@@ -2509,6 +2869,11 @@
             "description": "If Presto, all the queries in SQL Lab are going to be executed as the currently logged on user who must have permission to run them.<br/>If Hive and hive.server2.enable.doAs is enabled, will run the queries as service account, but impersonate the currently logged on user via hive.server2.proxy.user property.",
             "type": "boolean"
           },
+          "parameters": {
+            "additionalProperties": {},
+            "description": "DB-specific parameters for configuration",
+            "type": "object"
+          },
           "server_cert": {
             "description": "<p>Optional CA_BUNDLE contents to validate HTTPS requests. Only available on certain database engines.</p>",
             "nullable": true,
@@ -2521,8 +2886,53 @@
             "type": "string"
           }
         },
+        "type": "object"
+      },
+      "DatabaseValidateParametersSchema": {
+        "properties": {
+          "configuration_method": {
+            "description": "Configuration_method is used on the frontend to inform the backend whether to explode parameters or to provide only a sqlalchemy_uri."
+          },
+          "database_name": {
+            "description": "A database name to identify this connection.",
+            "maxLength": 250,
+            "minLength": 1,
+            "nullable": true,
+            "type": "string"
+          },
+          "encrypted_extra": {
+            "description": "<p>JSON string containing additional connection configuration.<br>This is used to provide connection information for systems like Hive, Presto, and BigQuery, which do not conform to the username:password syntax normally used by SQLAlchemy.</p>",
+            "nullable": true,
+            "type": "string"
+          },
+          "engine": {
+            "description": "SQLAlchemy engine to use",
+            "type": "string"
+          },
+          "extra": {
+            "description": "<p>JSON string containing extra configuration elements.<br>1. The <code>engine_params</code> object gets unpacked into the <a href=\"https://docs.sqlalchemy.org/en/latest/core/engines.html#sqlalchemy.create_engine\">sqlalchemy.create_engine</a> call, while the <code>metadata_params</code> gets unpacked into the <a href=\"https://docs.sqlalchemy.org/en/rel_1_0/core/metadata.html#sqlalchemy.schema.MetaData\">sqlalchemy.MetaData</a> call.<br>2. The <code>metadata_cache_timeout</code> is a cache timeout setting in seconds for metadata fetch of this database. Specify it as <strong>\"metadata_cache_timeout\": {\"schema_cache_timeout\": 600, \"table_cache_timeout\": 600}</strong>. If unset, cache will not be enabled for the functionality. A timeout of 0 indicates that the cache never expires.<br>3. The <code>schemas_allowed_for_csv_upload</code> is a comma separated list of schemas that CSVs are allowed to upload to. Specify it as <strong>\"schemas_allowed_for_csv_upload\": [\"public\", \"csv_upload\"]</strong>. If database flavor does not support schema or any schema is allowed to be accessed, just leave the list empty<br>4. the <code>version</code> field is a string specifying the this db's version. This should be used with Presto DBs so that the syntax is correct<br>5. The <code>allows_virtual_table_explore</code> field is a boolean specifying whether or not the Explore button in SQL Lab results is shown.</p>",
+            "type": "string"
+          },
+          "impersonate_user": {
+            "description": "If Presto, all the queries in SQL Lab are going to be executed as the currently logged on user who must have permission to run them.<br/>If Hive and hive.server2.enable.doAs is enabled, will run the queries as service account, but impersonate the currently logged on user via hive.server2.proxy.user property.",
+            "type": "boolean"
+          },
+          "parameters": {
+            "additionalProperties": {
+              "nullable": true
+            },
+            "description": "DB-specific parameters for configuration",
+            "type": "object"
+          },
+          "server_cert": {
+            "description": "<p>Optional CA_BUNDLE contents to validate HTTPS requests. Only available on certain database engines.</p>",
+            "nullable": true,
+            "type": "string"
+          }
+        },
         "required": [
-          "sqlalchemy_uri"
+          "configuration_method",
+          "engine"
         ],
         "type": "object"
       },
@@ -2582,6 +2992,78 @@
         ],
         "type": "object"
       },
+      "DatasetColumnsRestApi.get": {
+        "properties": {
+          "id": {
+            "format": "int32",
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
+      "DatasetColumnsRestApi.get_list": {
+        "properties": {
+          "id": {
+            "format": "int32",
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
+      "DatasetColumnsRestApi.post": {
+        "properties": {
+          "id": {
+            "format": "int32",
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
+      "DatasetColumnsRestApi.put": {
+        "properties": {
+          "id": {
+            "format": "int32",
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
+      "DatasetMetricRestApi.get": {
+        "properties": {
+          "id": {
+            "format": "int32",
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
+      "DatasetMetricRestApi.get_list": {
+        "properties": {
+          "id": {
+            "format": "int32",
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
+      "DatasetMetricRestApi.post": {
+        "properties": {
+          "id": {
+            "format": "int32",
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
+      "DatasetMetricRestApi.put": {
+        "properties": {
+          "id": {
+            "format": "int32",
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
       "DatasetMetricsPut": {
         "properties": {
           "d3format": {
@@ -2709,10 +3191,10 @@
             "type": "integer"
           },
           "columns": {
-            "$ref": "#/components/schemas/Meta23"
+            "$ref": "#/components/schemas/Meta22"
           },
           "database": {
-            "$ref": "#/components/schemas/Meta26"
+            "$ref": "#/components/schemas/Meta23"
           },
           "datasource_type": {
             "readOnly": true
@@ -2794,7 +3276,7 @@
       "DatasetRestApi.get_list": {
         "properties": {
           "changed_by": {
-            "$ref": "#/components/schemas/Meta21"
+            "$ref": "#/components/schemas/Meta19"
           },
           "changed_by_name": {
             "readOnly": true
@@ -2809,7 +3291,7 @@
             "readOnly": true
           },
           "database": {
-            "$ref": "#/components/schemas/Meta22"
+            "$ref": "#/components/schemas/Meta21"
           },
           "default_endpoint": {
             "nullable": true,
@@ -3073,7 +3555,7 @@
             "type": "integer"
           },
           "user": {
-            "$ref": "#/components/schemas/Meta44"
+            "$ref": "#/components/schemas/Meta43"
           },
           "user_id": {
             "format": "int32",
@@ -3120,7 +3602,7 @@
             "type": "integer"
           },
           "user": {
-            "$ref": "#/components/schemas/Meta43"
+            "$ref": "#/components/schemas/Meta42"
           },
           "user_id": {
             "format": "int32",
@@ -3375,65 +3857,60 @@
       },
       "Meta16": {
         "properties": {
-          "first_name": {
-            "maxLength": 64,
-            "type": "string"
-          },
           "id": {
             "format": "int32",
             "type": "integer"
           },
-          "last_name": {
-            "maxLength": 64,
-            "type": "string"
-          },
-          "username": {
+          "name": {
             "maxLength": 64,
             "type": "string"
           }
         },
         "required": [
-          "first_name",
-          "last_name",
-          "username"
+          "name"
         ],
         "type": "object"
       },
       "Meta17": {
         "properties": {
+          "first_name": {
+            "maxLength": 64,
+            "type": "string"
+          },
+          "id": {
+            "format": "int32",
+            "type": "integer"
+          },
+          "last_name": {
+            "maxLength": 64,
+            "type": "string"
+          },
           "username": {
             "maxLength": 64,
             "type": "string"
           }
         },
         "required": [
+          "first_name",
+          "last_name",
           "username"
         ],
         "type": "object"
       },
-      "Meta18": {
-        "properties": {
-          "first_name": {
-            "maxLength": 64,
-            "type": "string"
-          },
-          "id": {
-            "format": "int32",
-            "type": "integer"
-          },
-          "last_name": {
+      "Meta18": {
+        "properties": {
+          "first_name": {
             "maxLength": 64,
             "type": "string"
           },
-          "username": {
+          "last_name": {
             "maxLength": 64,
             "type": "string"
           }
         },
         "required": [
           "first_name",
-          "last_name",
-          "username"
+          "last_name"
         ],
         "type": "object"
       },
@@ -3443,14 +3920,14 @@
             "maxLength": 64,
             "type": "string"
           },
-          "last_name": {
+          "username": {
             "maxLength": 64,
             "type": "string"
           }
         },
         "required": [
           "first_name",
-          "last_name"
+          "username"
         ],
         "type": "object"
       },
@@ -3495,23 +3972,6 @@
         "type": "object"
       },
       "Meta21": {
-        "properties": {
-          "first_name": {
-            "maxLength": 64,
-            "type": "string"
-          },
-          "username": {
-            "maxLength": 64,
-            "type": "string"
-          }
-        },
-        "required": [
-          "first_name",
-          "username"
-        ],
-        "type": "object"
-      },
-      "Meta22": {
         "properties": {
           "database_name": {
             "maxLength": 250,
@@ -3527,7 +3987,7 @@
         ],
         "type": "object"
       },
-      "Meta23": {
+      "Meta22": {
         "properties": {
           "changed_on": {
             "format": "date-time",
@@ -3581,6 +4041,9 @@
             "nullable": true,
             "type": "string"
           },
+          "type_generic": {
+            "readOnly": true
+          },
           "uuid": {
             "format": "uuid",
             "nullable": true,
@@ -3597,6 +4060,22 @@
         ],
         "type": "object"
       },
+      "Meta23": {
+        "properties": {
+          "database_name": {
+            "maxLength": 250,
+            "type": "string"
+          },
+          "id": {
+            "format": "int32",
+            "type": "integer"
+          }
+        },
+        "required": [
+          "database_name"
+        ],
+        "type": "object"
+      },
       "Meta24": {
         "properties": {
           "first_name": {
@@ -3686,22 +4165,6 @@
         "type": "object"
       },
       "Meta26": {
-        "properties": {
-          "database_name": {
-            "maxLength": 250,
-            "type": "string"
-          },
-          "id": {
-            "format": "int32",
-            "type": "integer"
-          }
-        },
-        "required": [
-          "database_name"
-        ],
-        "type": "object"
-      },
-      "Meta27": {
         "properties": {
           "first_name": {
             "maxLength": 64,
@@ -3727,7 +4190,7 @@
         ],
         "type": "object"
       },
-      "Meta28": {
+      "Meta27": {
         "properties": {
           "database_name": {
             "maxLength": 250,
@@ -3739,7 +4202,7 @@
         ],
         "type": "object"
       },
-      "Meta29": {
+      "Meta28": {
         "properties": {
           "id": {
             "format": "int32",
@@ -3748,12 +4211,16 @@
         },
         "type": "object"
       },
-      "Meta3": {
+      "Meta29": {
         "properties": {
           "first_name": {
             "maxLength": 64,
             "type": "string"
           },
+          "id": {
+            "format": "int32",
+            "type": "integer"
+          },
           "last_name": {
             "maxLength": 64,
             "type": "string"
@@ -3765,16 +4232,12 @@
         ],
         "type": "object"
       },
-      "Meta30": {
+      "Meta3": {
         "properties": {
           "first_name": {
             "maxLength": 64,
             "type": "string"
           },
-          "id": {
-            "format": "int32",
-            "type": "integer"
-          },
           "last_name": {
             "maxLength": 64,
             "type": "string"
@@ -3786,7 +4249,7 @@
         ],
         "type": "object"
       },
-      "Meta31": {
+      "Meta30": {
         "properties": {
           "database_name": {
             "maxLength": 250,
@@ -3802,7 +4265,7 @@
         ],
         "type": "object"
       },
-      "Meta32": {
+      "Meta31": {
         "properties": {
           "first_name": {
             "maxLength": 64,
@@ -3823,7 +4286,7 @@
         ],
         "type": "object"
       },
-      "Meta33": {
+      "Meta32": {
         "properties": {
           "database_name": {
             "maxLength": 250,
@@ -3839,23 +4302,24 @@
         ],
         "type": "object"
       },
-      "Meta34": {
+      "Meta33": {
         "properties": {
-          "id": {
-            "format": "int32",
-            "type": "integer"
+          "first_name": {
+            "maxLength": 64,
+            "type": "string"
           },
-          "type": {
-            "maxLength": 50,
+          "last_name": {
+            "maxLength": 64,
             "type": "string"
           }
         },
         "required": [
-          "type"
+          "first_name",
+          "last_name"
         ],
         "type": "object"
       },
-      "Meta35": {
+      "Meta34": {
         "properties": {
           "first_name": {
             "maxLength": 64,
@@ -3872,12 +4336,32 @@
         ],
         "type": "object"
       },
+      "Meta35": {
+        "properties": {
+          "id": {
+            "format": "int32",
+            "type": "integer"
+          },
+          "type": {
+            "maxLength": 50,
+            "type": "string"
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "type": "object"
+      },
       "Meta36": {
         "properties": {
           "first_name": {
             "maxLength": 64,
             "type": "string"
           },
+          "id": {
+            "format": "int32",
+            "type": "integer"
+          },
           "last_name": {
             "maxLength": 64,
             "type": "string"
@@ -3891,22 +4375,17 @@
       },
       "Meta37": {
         "properties": {
-          "first_name": {
-            "maxLength": 64,
+          "database_name": {
+            "maxLength": 250,
             "type": "string"
           },
           "id": {
             "format": "int32",
             "type": "integer"
-          },
-          "last_name": {
-            "maxLength": 64,
-            "type": "string"
           }
         },
         "required": [
-          "first_name",
-          "last_name"
+          "database_name"
         ],
         "type": "object"
       },
@@ -3915,17 +4394,40 @@
           "id": {
             "format": "int32",
             "type": "integer"
+          },
+          "recipient_config_json": {
+            "nullable": true,
+            "type": "string"
+          },
+          "type": {
+            "maxLength": 50,
+            "type": "string"
           }
         },
+        "required": [
+          "type"
+        ],
         "type": "object"
       },
       "Meta39": {
         "properties": {
+          "first_name": {
+            "maxLength": 64,
+            "type": "string"
+          },
           "id": {
             "format": "int32",
             "type": "integer"
+          },
+          "last_name": {
+            "maxLength": 64,
+            "type": "string"
           }
         },
+        "required": [
+          "first_name",
+          "last_name"
+        ],
         "type": "object"
       },
       "Meta4": {
@@ -3951,51 +4453,34 @@
             "format": "int32",
             "type": "integer"
           },
-          "recipient_config_json": {
+          "slice_name": {
+            "maxLength": 250,
             "nullable": true,
             "type": "string"
           },
-          "type": {
-            "maxLength": 50,
+          "viz_type": {
+            "maxLength": 250,
+            "nullable": true,
             "type": "string"
           }
         },
-        "required": [
-          "type"
-        ],
         "type": "object"
       },
       "Meta41": {
         "properties": {
-          "first_name": {
-            "maxLength": 64,
+          "dashboard_title": {
+            "maxLength": 500,
+            "nullable": true,
             "type": "string"
           },
           "id": {
             "format": "int32",
             "type": "integer"
-          },
-          "last_name": {
-            "maxLength": 64,
-            "type": "string"
           }
         },
-        "required": [
-          "first_name",
-          "last_name"
-        ],
         "type": "object"
       },
       "Meta42": {
-        "properties": {
-          "id": {
-            "format": "int32",
-            "type": "integer"
-          }
-        },
-        "type": "object"
-      },
-      "Meta43": {
         "properties": {
           "username": {
             "maxLength": 64,
@@ -4007,7 +4492,7 @@
         ],
         "type": "object"
       },
-      "Meta44": {
+      "Meta43": {
         "properties": {
           "username": {
             "maxLength": 64,
@@ -4025,6 +4510,10 @@
             "maxLength": 64,
             "type": "string"
           },
+          "id": {
+            "format": "int32",
+            "type": "integer"
+          },
           "last_name": {
             "maxLength": 64,
             "type": "string"
@@ -4038,22 +4527,17 @@
       },
       "Meta6": {
         "properties": {
-          "first_name": {
-            "maxLength": 64,
+          "default_endpoint": {
+            "nullable": true,
             "type": "string"
           },
-          "id": {
-            "format": "int32",
-            "type": "integer"
-          },
-          "last_name": {
-            "maxLength": 64,
+          "table_name": {
+            "maxLength": 250,
             "type": "string"
           }
         },
         "required": [
-          "first_name",
-          "last_name"
+          "table_name"
         ],
         "type": "object"
       },
@@ -4085,17 +4569,18 @@
       },
       "Meta8": {
         "properties": {
-          "default_endpoint": {
-            "nullable": true,
+          "first_name": {
+            "maxLength": 64,
             "type": "string"
           },
-          "table_name": {
-            "maxLength": 250,
+          "last_name": {
+            "maxLength": 64,
             "type": "string"
           }
         },
         "required": [
-          "table_name"
+          "first_name",
+          "last_name"
         ],
         "type": "object"
       },
@@ -4125,7 +4610,7 @@
             "type": "string"
           },
           "database": {
-            "$ref": "#/components/schemas/Meta29"
+            "$ref": "#/components/schemas/Meta28"
           },
           "end_result_backend_time": {
             "nullable": true,
@@ -4240,7 +4725,7 @@
             "type": "string"
           },
           "database": {
-            "$ref": "#/components/schemas/Meta28"
+            "$ref": "#/components/schemas/Meta27"
           },
           "end_time": {
             "nullable": true,
@@ -4295,7 +4780,7 @@
             "type": "string"
           },
           "user": {
-            "$ref": "#/components/schemas/Meta27"
+            "$ref": "#/components/schemas/Meta26"
           }
         },
         "required": [
@@ -4379,6 +4864,11 @@
             "maxLength": 50,
             "type": "string"
           },
+          "uuid": {
+            "format": "uuid",
+            "nullable": true,
+            "type": "string"
+          },
           "value": {
             "format": "float",
             "nullable": true,
@@ -4423,6 +4913,11 @@
             "maxLength": 50,
             "type": "string"
           },
+          "uuid": {
+            "format": "uuid",
+            "nullable": true,
+            "type": "string"
+          },
           "value": {
             "format": "float",
             "nullable": true,
@@ -4491,21 +4986,26 @@
             "type": "boolean"
           },
           "chart": {
-            "$ref": "#/components/schemas/Meta39"
+            "$ref": "#/components/schemas/Meta40"
           },
           "context_markdown": {
             "nullable": true,
             "type": "string"
           },
+          "creation_method": {
+            "maxLength": 255,
+            "nullable": true,
+            "type": "string"
+          },
           "crontab": {
             "maxLength": 1000,
             "type": "string"
           },
           "dashboard": {
-            "$ref": "#/components/schemas/Meta38"
+            "$ref": "#/components/schemas/Meta41"
           },
           "database": {
-            "$ref": "#/components/schemas/Meta42"
+            "$ref": "#/components/schemas/Meta37"
           },
           "description": {
             "nullable": true,
@@ -4549,15 +5049,24 @@
             "type": "string"
           },
           "owners": {
-            "$ref": "#/components/schemas/Meta41"
+            "$ref": "#/components/schemas/Meta39"
           },
           "recipients": {
-            "$ref": "#/components/schemas/Meta40"
+            "$ref": "#/components/schemas/Meta38"
+          },
+          "report_format": {
+            "maxLength": 50,
+            "nullable": true,
+            "type": "string"
           },
           "sql": {
             "nullable": true,
             "type": "string"
           },
+          "timezone": {
+            "maxLength": 100,
+            "type": "string"
+          },
           "type": {
             "maxLength": 50,
             "type": "string"
@@ -4592,7 +5101,7 @@
             "type": "boolean"
           },
           "changed_by": {
-            "$ref": "#/components/schemas/Meta36"
+            "$ref": "#/components/schemas/Meta34"
           },
           "changed_on": {
             "format": "date-time",
@@ -4603,13 +5112,18 @@
             "readOnly": true
           },
           "created_by": {
-            "$ref": "#/components/schemas/Meta35"
+            "$ref": "#/components/schemas/Meta33"
           },
           "created_on": {
             "format": "date-time",
             "nullable": true,
             "type": "string"
           },
+          "creation_method": {
+            "maxLength": 255,
+            "nullable": true,
+            "type": "string"
+          },
           "crontab": {
             "maxLength": 1000,
             "type": "string"
@@ -4617,6 +5131,10 @@
           "crontab_humanized": {
             "readOnly": true
           },
+          "description": {
+            "nullable": true,
+            "type": "string"
+          },
           "id": {
             "format": "int32",
             "type": "integer"
@@ -4636,10 +5154,14 @@
             "type": "string"
           },
           "owners": {
-            "$ref": "#/components/schemas/Meta37"
+            "$ref": "#/components/schemas/Meta36"
           },
           "recipients": {
-            "$ref": "#/components/schemas/Meta34"
+            "$ref": "#/components/schemas/Meta35"
+          },
+          "timezone": {
+            "maxLength": 100,
+            "type": "string"
           },
           "type": {
             "maxLength": 50,
@@ -4661,6 +5183,7 @@
           },
           "chart": {
             "format": "int32",
+            "nullable": true,
             "type": "integer"
           },
           "context_markdown": {
@@ -4668,6 +5191,9 @@
             "nullable": true,
             "type": "string"
           },
+          "creation_method": {
+            "description": "Creation method is used to inform the frontend whether the report/alert was created in the dashboard, chart, or alerts and reports UI."
+          },
           "crontab": {
             "description": "A CRON expression.[Crontab Guru](https://crontab.guru/) is a helpful resource that can help you craft a CRON expression.",
             "example": "*/5 * * * *",
@@ -4677,6 +5203,7 @@
           },
           "dashboard": {
             "format": "int32",
+            "nullable": true,
             "type": "integer"
           },
           "database": {
@@ -4693,12 +5220,14 @@
             "description": "Once an alert is triggered, how long, in seconds, before Superset nags you again. (in seconds)",
             "example": 14400,
             "format": "int32",
+            "minimum": 1,
             "type": "integer"
           },
           "log_retention": {
             "description": "How long to keep the logs around for this report (in days)",
             "example": 90,
             "format": "int32",
+            "minimum": 1,
             "type": "integer"
           },
           "name": {
@@ -4722,11 +5251,23 @@
             },
             "type": "array"
           },
+          "report_format": {
+            "enum": [
+              "PNG",
+              "CSV",
+              "TEXT"
+            ],
+            "type": "string"
+          },
           "sql": {
             "description": "A SQL statement that defines whether the alert should get triggered or not. The query is expected to return either NULL or a number value.",
             "example": "SELECT value FROM time_series_table",
             "type": "string"
           },
+          "timezone": {
+            "description": "A timezone string that represents the location of the timezone.",
+            "type": "string"
+          },
           "type": {
             "description": "The report schedule type",
             "enum": [
@@ -4750,6 +5291,7 @@
             "description": "If an alert is staled at a working state, how long until it's state is reseted to error",
             "example": 3600,
             "format": "int32",
+            "minimum": 1,
             "type": "integer"
           }
         },
@@ -4767,6 +5309,7 @@
           },
           "chart": {
             "format": "int32",
+            "nullable": true,
             "type": "integer"
           },
           "context_markdown": {
@@ -4774,6 +5317,10 @@
             "nullable": true,
             "type": "string"
           },
+          "creation_method": {
+            "description": "Creation method is used to inform the frontend whether the report/alert was created in the dashboard, chart, or alerts and reports UI.",
+            "nullable": true
+          },
           "crontab": {
             "description": "A CRON expression.[Crontab Guru](https://crontab.guru/) is a helpful resource that can help you craft a CRON expression.",
             "maxLength": 1000,
@@ -4782,6 +5329,7 @@
           },
           "dashboard": {
             "format": "int32",
+            "nullable": true,
             "type": "integer"
           },
           "database": {
@@ -4798,12 +5346,14 @@
             "description": "Once an alert is triggered, how long, in seconds, before Superset nags you again. (in seconds)",
             "example": 14400,
             "format": "int32",
+            "minimum": 1,
             "type": "integer"
           },
           "log_retention": {
             "description": "How long to keep the logs around for this report (in days)",
             "example": 90,
             "format": "int32",
+            "minimum": 1,
             "type": "integer"
           },
           "name": {
@@ -4826,12 +5376,24 @@
             },
             "type": "array"
           },
+          "report_format": {
+            "enum": [
+              "PNG",
+              "CSV",
+              "TEXT"
+            ],
+            "type": "string"
+          },
           "sql": {
             "description": "A SQL statement that defines whether the alert should get triggered or not. The query is expected to return either NULL or a number value.",
             "example": "SELECT value FROM time_series_table",
             "nullable": true,
             "type": "string"
           },
+          "timezone": {
+            "description": "A timezone string that represents the location of the timezone.",
+            "type": "string"
+          },
           "type": {
             "description": "The report schedule type",
             "enum": [
@@ -4856,19 +5418,32 @@
             "description": "If an alert is staled at a working state, how long until it's state is reseted to error",
             "example": 3600,
             "format": "int32",
+            "minimum": 1,
             "nullable": true,
             "type": "integer"
           }
         },
         "type": "object"
       },
+      "Roles": {
+        "properties": {
+          "id": {
+            "format": "int32",
+            "type": "integer"
+          },
+          "name": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
       "SavedQueryRestApi.get": {
         "properties": {
           "created_by": {
-            "$ref": "#/components/schemas/Meta32"
+            "$ref": "#/components/schemas/Meta31"
           },
           "database": {
-            "$ref": "#/components/schemas/Meta33"
+            "$ref": "#/components/schemas/Meta32"
           },
           "description": {
             "nullable": true,
@@ -4904,7 +5479,7 @@
             "readOnly": true
           },
           "created_by": {
-            "$ref": "#/components/schemas/Meta30"
+            "$ref": "#/components/schemas/Meta29"
           },
           "created_on": {
             "format": "date-time",
@@ -4912,7 +5487,7 @@
             "type": "string"
           },
           "database": {
-            "$ref": "#/components/schemas/Meta31"
+            "$ref": "#/components/schemas/Meta30"
           },
           "db_id": {
             "format": "int32",
@@ -4923,6 +5498,9 @@
             "nullable": true,
             "type": "string"
           },
+          "extra": {
+            "readOnly": true
+          },
           "id": {
             "format": "int32",
             "type": "integer"
@@ -5174,6 +5752,24 @@
         },
         "type": "object"
       },
+      "User": {
+        "properties": {
+          "first_name": {
+            "type": "string"
+          },
+          "id": {
+            "format": "int32",
+            "type": "integer"
+          },
+          "last_name": {
+            "type": "string"
+          },
+          "username": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
       "ValidatorConfigJSON": {
         "properties": {
           "op": {
@@ -5374,6 +5970,12 @@
           "filter": {
             "type": "string"
           },
+          "include_ids": {
+            "items": {
+              "type": "integer"
+            },
+            "type": "array"
+          },
           "page": {
             "type": "integer"
           },
@@ -7052,13 +7654,16 @@
               "schema": {
                 "properties": {
                   "formData": {
+                    "description": "upload file (ZIP)",
                     "format": "binary",
                     "type": "string"
                   },
                   "overwrite": {
-                    "type": "bool"
+                    "description": "overwrite existing databases?",
+                    "type": "boolean"
                   },
                   "passwords": {
+                    "description": "JSON map of passwords for each file",
                     "type": "string"
                   }
                 },
@@ -7109,7 +7714,7 @@
     },
     "/chart/related/{column_name}": {
       "get": {
-        "description": "Get a list of all possible owners for a chart.",
+        "description": "Get a list of all possible owners for a chart. Use `owners` has the `column_name` parameter",
         "parameters": [
           {
             "in": "path",
@@ -7451,6 +8056,77 @@
         ]
       }
     },
+    "/chart/{pk}/data/": {
+      "get": {
+        "description": "Takes a chart ID and uses the query context stored when the chart was saved to return payload data response.",
+        "parameters": [
+          {
+            "description": "The chart ID",
+            "in": "path",
+            "name": "pk",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "description": "The format in which the data should be returned",
+            "in": "query",
+            "name": "format",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "description": "The type in which the data should be returned",
+            "in": "query",
+            "name": "type",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ChartDataResponseSchema"
+                }
+              }
+            },
+            "description": "Query result"
+          },
+          "202": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ChartDataAsyncResponseSchema"
+                }
+              }
+            },
+            "description": "Async job details"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "Charts"
+        ]
+      }
+    },
     "/chart/{pk}/screenshot/{digest}/": {
       "get": {
         "description": "Get a computed screenshot from cache.",
@@ -8560,13 +9236,16 @@
               "schema": {
                 "properties": {
                   "formData": {
+                    "description": "upload file (ZIP or JSON)",
                     "format": "binary",
                     "type": "string"
                   },
                   "overwrite": {
-                    "type": "bool"
+                    "description": "overwrite existing databases?",
+                    "type": "boolean"
                   },
                   "passwords": {
+                    "description": "JSON map of passwords for each file",
                     "type": "string"
                   }
                 },
@@ -8648,7 +9327,118 @@
                 }
               }
             },
-            "description": "Related column data"
+            "description": "Related column data"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "Dashboards"
+        ]
+      }
+    },
+    "/dashboard/{id_or_slug}": {
+      "get": {
+        "description": "Get a dashboard detail information.",
+        "parameters": [
+          {
+            "description": "Either the id of the dashboard, or its slug",
+            "in": "path",
+            "name": "id_or_slug",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "result": {
+                      "$ref": "#/components/schemas/DashboardGetResponseSchema"
+                    }
+                  },
+                  "type": "object"
+                }
+              }
+            },
+            "description": "Dashboard"
+          },
+          "302": {
+            "description": "Redirects to the current digest"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "Dashboards"
+        ]
+      }
+    },
+    "/dashboard/{id_or_slug}/charts": {
+      "get": {
+        "description": "Get the chart definitions for a given dashboard",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "id_or_slug",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "result": {
+                      "items": {
+                        "$ref": "#/components/schemas/ChartEntityResponseSchema"
+                      },
+                      "type": "array"
+                    }
+                  },
+                  "type": "object"
+                }
+              }
+            },
+            "description": "Dashboard chart definitions"
+          },
+          "302": {
+            "description": "Redirects to the current digest"
           },
           "400": {
             "$ref": "#/components/responses/400"
@@ -8658,9 +9448,6 @@
           },
           "404": {
             "$ref": "#/components/responses/404"
-          },
-          "500": {
-            "$ref": "#/components/responses/500"
           }
         },
         "security": [
@@ -8673,16 +9460,17 @@
         ]
       }
     },
-    "/dashboard/{pk}": {
-      "delete": {
-        "description": "Deletes a Dashboard.",
+    "/dashboard/{id_or_slug}/datasets": {
+      "get": {
+        "description": "Returns a list of a dashboard's datasets. Each dataset includes only the information necessary to render the dashboard's charts.",
         "parameters": [
           {
+            "description": "Either the id of the dashboard, or its slug",
             "in": "path",
-            "name": "pk",
+            "name": "id_or_slug",
             "required": true,
             "schema": {
-              "type": "integer"
+              "type": "string"
             }
           }
         ],
@@ -8692,30 +9480,30 @@
               "application/json": {
                 "schema": {
                   "properties": {
-                    "message": {
-                      "type": "string"
+                    "result": {
+                      "items": {
+                        "$ref": "#/components/schemas/DashboardDatasetSchema"
+                      },
+                      "type": "array"
                     }
                   },
                   "type": "object"
                 }
               }
             },
-            "description": "Dashboard deleted"
+            "description": "Dashboard dataset definitions"
+          },
+          "302": {
+            "description": "Redirects to the current digest"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
           },
           "401": {
             "$ref": "#/components/responses/401"
           },
-          "403": {
-            "$ref": "#/components/responses/403"
-          },
           "404": {
             "$ref": "#/components/responses/404"
-          },
-          "422": {
-            "$ref": "#/components/responses/422"
-          },
-          "500": {
-            "$ref": "#/components/responses/500"
           }
         },
         "security": [
@@ -8726,9 +9514,11 @@
         "tags": [
           "Dashboards"
         ]
-      },
-      "get": {
-        "description": "Get a dashboard detail information.",
+      }
+    },
+    "/dashboard/{pk}": {
+      "delete": {
+        "description": "Deletes a Dashboard.",
         "parameters": [
           {
             "in": "path",
@@ -8737,17 +9527,6 @@
             "schema": {
               "type": "integer"
             }
-          },
-          {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/get_item_schema"
-                }
-              }
-            },
-            "in": "query",
-            "name": "q"
           }
         ],
         "responses": {
@@ -8756,43 +9535,7 @@
               "application/json": {
                 "schema": {
                   "properties": {
-                    "description_columns": {
-                      "properties": {
-                        "column_name": {
-                          "description": "The description for the column name. Will be translated by babel",
-                          "example": "A Nice description for the column",
-                          "type": "string"
-                        }
-                      },
-                      "type": "object"
-                    },
-                    "id": {
-                      "description": "The item id",
-                      "type": "string"
-                    },
-                    "label_columns": {
-                      "properties": {
-                        "column_name": {
-                          "description": "The label for the column name. Will be translated by babel",
-                          "example": "A Nice label for the column",
-                          "type": "string"
-                        }
-                      },
-                      "type": "object"
-                    },
-                    "result": {
-                      "$ref": "#/components/schemas/DashboardRestApi.get"
-                    },
-                    "show_columns": {
-                      "description": "A list of columns",
-                      "items": {
-                        "type": "string"
-                      },
-                      "type": "array"
-                    },
-                    "show_title": {
-                      "description": "A title to render. Will be translated by babel",
-                      "example": "Show Item Details",
+                    "message": {
                       "type": "string"
                     }
                   },
@@ -8800,14 +9543,14 @@
                 }
               }
             },
-            "description": "Item from Model"
-          },
-          "400": {
-            "$ref": "#/components/responses/400"
+            "description": "Dashboard deleted"
           },
           "401": {
             "$ref": "#/components/responses/401"
           },
+          "403": {
+            "$ref": "#/components/responses/403"
+          },
           "404": {
             "$ref": "#/components/responses/404"
           },
@@ -9233,6 +9976,73 @@
         ]
       }
     },
+    "/database/available/": {
+      "get": {
+        "description": "Get names of databases currently available",
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "items": {
+                    "properties": {
+                      "available_drivers": {
+                        "description": "Installed drivers for the engine",
+                        "items": {
+                          "type": "string"
+                        },
+                        "type": "array"
+                      },
+                      "default_driver": {
+                        "description": "Default driver for the engine",
+                        "type": "string"
+                      },
+                      "engine": {
+                        "description": "Name of the SQLAlchemy engine",
+                        "type": "string"
+                      },
+                      "name": {
+                        "description": "Name of the database",
+                        "type": "string"
+                      },
+                      "parameters": {
+                        "description": "JSON schema defining the needed parameters",
+                        "type": "object"
+                      },
+                      "preferred": {
+                        "description": "Is the database preferred?",
+                        "type": "boolean"
+                      },
+                      "sqlalchemy_uri_placeholder": {
+                        "description": "Example placeholder for the SQLAlchemy URI",
+                        "type": "string"
+                      }
+                    },
+                    "type": "object"
+                  },
+                  "type": "array"
+                }
+              }
+            },
+            "description": "Database names"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "Database"
+        ]
+      }
+    },
     "/database/export/": {
       "get": {
         "description": "Download database(s) and associated dataset(s) as a zip file",
@@ -9289,13 +10099,16 @@
               "schema": {
                 "properties": {
                   "formData": {
+                    "description": "upload file (ZIP)",
                     "format": "binary",
                     "type": "string"
                   },
                   "overwrite": {
-                    "type": "bool"
+                    "description": "overwrite existing databases?",
+                    "type": "boolean"
                   },
                   "passwords": {
+                    "description": "JSON map of passwords for each file",
                     "type": "string"
                   }
                 },
@@ -9394,6 +10207,56 @@
         ]
       }
     },
+    "/database/validate_parameters": {
+      "post": {
+        "description": "Validates parameters used to connect to a database",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DatabaseValidateParametersSchema"
+              }
+            }
+          },
+          "description": "DB-specific parameters",
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "message": {
+                      "type": "string"
+                    }
+                  },
+                  "type": "object"
+                }
+              }
+            },
+            "description": "Database Test Connection"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "Database"
+        ]
+      }
+    },
     "/database/{pk}": {
       "delete": {
         "description": "Deletes a Database.",
@@ -9547,9 +10410,81 @@
         "tags": [
           "Database"
         ]
-      },
-      "put": {
-        "description": "Changes a Database.",
+      },
+      "put": {
+        "description": "Changes a Database.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "pk",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DatabaseRestApi.put"
+              }
+            }
+          },
+          "description": "Database schema",
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "id": {
+                      "type": "number"
+                    },
+                    "result": {
+                      "$ref": "#/components/schemas/DatabaseRestApi.put"
+                    }
+                  },
+                  "type": "object"
+                }
+              }
+            },
+            "description": "Database changed"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "403": {
+            "$ref": "#/components/responses/403"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "Database"
+        ]
+      }
+    },
+    "/database/{pk}/function_names/": {
+      "get": {
+        "description": "Get function names supported by a database",
         "parameters": [
           {
             "in": "path",
@@ -9560,51 +10495,23 @@
             }
           }
         ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/DatabaseRestApi.put"
-              }
-            }
-          },
-          "description": "Database schema",
-          "required": true
-        },
         "responses": {
           "200": {
             "content": {
               "application/json": {
                 "schema": {
-                  "properties": {
-                    "id": {
-                      "type": "number"
-                    },
-                    "result": {
-                      "$ref": "#/components/schemas/DatabaseRestApi.put"
-                    }
-                  },
-                  "type": "object"
+                  "$ref": "#/components/schemas/DatabaseFunctionNamesResponse"
                 }
               }
             },
-            "description": "Database changed"
-          },
-          "400": {
-            "$ref": "#/components/responses/400"
+            "description": "Query result"
           },
           "401": {
             "$ref": "#/components/responses/401"
           },
-          "403": {
-            "$ref": "#/components/responses/403"
-          },
           "404": {
             "$ref": "#/components/responses/404"
           },
-          "422": {
-            "$ref": "#/components/responses/422"
-          },
           "500": {
             "$ref": "#/components/responses/500"
           }
@@ -10352,13 +11259,16 @@
               "schema": {
                 "properties": {
                   "formData": {
+                    "description": "upload file (ZIP or YAML)",
                     "format": "binary",
                     "type": "string"
                   },
                   "overwrite": {
-                    "type": "bool"
+                    "description": "overwrite existing datasets?",
+                    "type": "boolean"
                   },
                   "passwords": {
+                    "description": "JSON map of passwords for each file",
                     "type": "string"
                   }
                 },
@@ -10630,11 +11540,10 @@
             }
           },
           {
-            "in": "path",
+            "in": "query",
             "name": "override_columns",
-            "required": true,
             "schema": {
-              "type": "bool"
+              "type": "boolean"
             }
           }
         ],
@@ -10697,6 +11606,136 @@
         ]
       }
     },
+    "/dataset/{pk}/column/{column_id}": {
+      "delete": {
+        "description": "Delete a Dataset column",
+        "parameters": [
+          {
+            "description": "The dataset pk for this column",
+            "in": "path",
+            "name": "pk",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "description": "The column id for this dataset",
+            "in": "path",
+            "name": "column_id",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "message": {
+                      "type": "string"
+                    }
+                  },
+                  "type": "object"
+                }
+              }
+            },
+            "description": "Column deleted"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "403": {
+            "$ref": "#/components/responses/403"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "Datasets"
+        ]
+      }
+    },
+    "/dataset/{pk}/metric/{metric_id}": {
+      "delete": {
+        "description": "Delete a Dataset metric",
+        "parameters": [
+          {
+            "description": "The dataset pk for this column",
+            "in": "path",
+            "name": "pk",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "description": "The metric id for this dataset",
+            "in": "path",
+            "name": "metric_id",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "message": {
+                      "type": "string"
+                    }
+                  },
+                  "type": "object"
+                }
+              }
+            },
+            "description": "Metric deleted"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "403": {
+            "$ref": "#/components/responses/403"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "Datasets"
+        ]
+      }
+    },
     "/dataset/{pk}/refresh": {
       "put": {
         "description": "Refreshes and updates columns of a dataset",
@@ -12639,6 +13678,72 @@
         ]
       }
     },
+    "/saved_query/import/": {
+      "post": {
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "properties": {
+                  "formData": {
+                    "description": "upload file (ZIP)",
+                    "format": "binary",
+                    "type": "string"
+                  },
+                  "overwrite": {
+                    "description": "overwrite existing saved queries?",
+                    "type": "boolean"
+                  },
+                  "passwords": {
+                    "description": "JSON map of passwords for each file",
+                    "type": "string"
+                  }
+                },
+                "type": "object"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "message": {
+                      "type": "string"
+                    }
+                  },
+                  "type": "object"
+                }
+              }
+            },
+            "description": "Saved Query import result"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "Queries"
+        ]
+      }
+    },
     "/saved_query/related/{column_name}": {
       "get": {
         "parameters": [
@@ -12909,6 +14014,42 @@
         ]
       }
     },
+    "/security/csrf_token/": {
+      "get": {
+        "description": "Fetch the CSRF token",
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "result": {
+                      "type": "string"
+                    }
+                  },
+                  "type": "object"
+                }
+              }
+            },
+            "description": "Result contains the CSRF token"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "Security"
+        ]
+      }
+    },
     "/security/login": {
       "post": {
         "description": "Authenticate and get a JWT access and refresh token",
diff --git a/docs/static/images/tutorial_dashboard_access.png b/docs/static/images/tutorial_dashboard_access.png
new file mode 100644
index 000000000000..f1ce5d6273a1
Binary files /dev/null and b/docs/static/images/tutorial_dashboard_access.png differ
diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml
index d06eff1859fd..30a409e083d8 100644
--- a/helm/superset/Chart.yaml
+++ b/helm/superset/Chart.yaml
@@ -22,13 +22,13 @@ maintainers:
   - name: craig-rueda
     email: craig@craigrueda.com
     url: https://github.com/craig-rueda
-version: 0.1.3
+version: 0.3.6
 dependencies:
 - name: postgresql
   version: 10.2.0
   repository: https://charts.bitnami.com/bitnami
   condition: postgresql.enabled
 - name: redis
-  version: 12.3.0
+  version: 12.3.3
   repository: https://charts.bitnami.com/bitnami
   condition: redis.enabled
diff --git a/helm/superset/templates/deployment-beat.yaml b/helm/superset/templates/deployment-beat.yaml
index 0ec76da15e88..2775d287498c 100644
--- a/helm/superset/templates/deployment-beat.yaml
+++ b/helm/superset/templates/deployment-beat.yaml
@@ -69,7 +69,7 @@ spec:
           env:
             - name: "SUPERSET_PORT"
               value: {{ .Values.service.port | quote}}
-          {{ if .Values.extraEnv }}
+          {{- if .Values.extraEnv }}
             {{- range $key, $value := .Values.extraEnv }}
             - name: {{ $key | quote}}
               value: {{ $value | quote }}
@@ -78,10 +78,17 @@ spec:
           envFrom:
             - secretRef:
                 name: {{ tpl .Values.envFromSecret . | quote }}
+            {{- range .Values.envFromSecrets }}
+            - secretRef:
+                name: {{ tpl . $ | quote }}
+            {{- end }}
           volumeMounts:
             - name: superset-config
               mountPath: {{ .Values.configMountPath | quote }}
               readOnly: true
+          {{- with .Values.extraVolumeMounts }}
+          {{- tpl (toYaml .) $ | nindent 12 -}}
+          {{- end }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
     {{- with .Values.nodeSelector }}
@@ -104,4 +111,7 @@ spec:
         - name: superset-config
           secret:
             secretName: {{ tpl .Values.configFromSecret . }}
+      {{- with .Values.extraVolumes }}
+      {{- tpl (toYaml .) $ | nindent 8 -}}
+      {{- end }}
 {{- end -}}
diff --git a/helm/superset/templates/deployment-worker.yaml b/helm/superset/templates/deployment-worker.yaml
index fe0ce20d8580..8bb2cc81c15d 100644
--- a/helm/superset/templates/deployment-worker.yaml
+++ b/helm/superset/templates/deployment-worker.yaml
@@ -53,6 +53,9 @@ spec:
         app: {{ template "superset.name" . }}-worker
         release: {{ .Release.Name }}
     spec:
+      {{- if .Values.serviceAccountName }}
+      serviceAccountName: {{ .Values.serviceAccountName }}
+      {{- end }}
       securityContext:
         runAsUser: {{ .Values.runAsUser }}
       {{- if .Values.supersetWorker.initContainers }}
@@ -67,7 +70,7 @@ spec:
           env:
             - name: "SUPERSET_PORT"
               value: {{ .Values.service.port | quote}}
-          {{ if .Values.extraEnv }}
+          {{- if .Values.extraEnv }}
             {{- range $key, $value := .Values.extraEnv }}
             - name: {{ $key | quote}}
               value: {{ $value | quote }}
@@ -76,10 +79,17 @@ spec:
           envFrom:
             - secretRef:
                 name: {{ tpl .Values.envFromSecret . | quote }}
+            {{- range .Values.envFromSecrets }}
+            - secretRef:
+                name: {{ tpl . $ | quote }}
+            {{- end }}
           volumeMounts:
             - name: superset-config
               mountPath: {{ .Values.configMountPath | quote }}
               readOnly: true
+          {{- with .Values.extraVolumeMounts }}
+          {{- tpl (toYaml .) $ | nindent 12 -}}
+          {{- end }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
     {{- with .Values.nodeSelector }}
@@ -102,3 +112,6 @@ spec:
         - name: superset-config
           secret:
             secretName: {{ tpl .Values.configFromSecret . }}
+      {{- with .Values.extraVolumes }}
+      {{- tpl (toYaml .) $ | nindent 8 -}}
+      {{- end }}
diff --git a/helm/superset/templates/deployment.yaml b/helm/superset/templates/deployment.yaml
index 8e807daf15e8..ec6b4f453ea5 100644
--- a/helm/superset/templates/deployment.yaml
+++ b/helm/superset/templates/deployment.yaml
@@ -56,6 +56,9 @@ spec:
         app: {{ template "superset.name" . }}
         release: {{ .Release.Name }}
     spec:
+      {{- if .Values.serviceAccountName }}
+      serviceAccountName: {{ .Values.serviceAccountName }}
+      {{- end }}
       securityContext:
         runAsUser: {{ .Values.runAsUser }}
       {{- if .Values.supersetNode.initContainers }}
@@ -70,7 +73,7 @@ spec:
           env:
             - name: "SUPERSET_PORT"
               value: {{ .Values.service.port | quote}}
-          {{ if .Values.extraEnv }}
+          {{- if .Values.extraEnv }}
             {{- range $key, $value := .Values.extraEnv }}
             - name: {{ $key | quote}}
               value: {{ $value | quote }}
@@ -79,6 +82,10 @@ spec:
           envFrom:
             - secretRef:
                 name: {{ tpl .Values.envFromSecret . | quote }}
+            {{- range .Values.envFromSecrets }}
+            - secretRef:
+                name: {{ tpl . $ | quote }}
+            {{- end }}
           volumeMounts:
             - name: superset-config
               mountPath: {{ .Values.configMountPath | quote }}
@@ -88,6 +95,9 @@ spec:
               mountPath: {{ .Values.extraConfigMountPath | quote }}
               readOnly: true
           {{- end }}
+          {{- with .Values.extraVolumeMounts }}
+          {{- tpl (toYaml .) $ | nindent 12 -}}
+          {{- end }}
           ports:
             - name: http
               containerPort: {{ .Values.service.port }}
@@ -120,3 +130,6 @@ spec:
           configMap:
             name: {{ template "superset.fullname" . }}-extra-config
         {{- end }}
+        {{- with .Values.extraVolumes }}
+        {{- tpl (toYaml .) $ | nindent 8 -}}
+        {{- end }}
diff --git a/helm/superset/templates/ingress.yaml b/helm/superset/templates/ingress.yaml
index b0888e4ede04..7c1dd72f0ebe 100644
--- a/helm/superset/templates/ingress.yaml
+++ b/helm/superset/templates/ingress.yaml
@@ -16,8 +16,7 @@
 #
 {{ if .Values.ingress.enabled -}}
 {{- $fullName := include "superset.fullname" . -}}
-{{- $ingressPath := .Values.ingress.path -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -46,9 +45,12 @@ spec:
     - host: {{ . }}
       http:
         paths:
-          - path: {{ $ingressPath }}
+          - path: {{ $.Values.ingress.path }}
+            pathType: {{ $.Values.ingress.pathType }}
             backend:
-              serviceName: {{ $fullName }}
-              servicePort: http
+              service:
+                name: {{ $fullName }}
+                port:
+                  name: http
   {{- end }}
 {{- end }}
diff --git a/helm/superset/templates/init-job.yaml b/helm/superset/templates/init-job.yaml
index b3c4fd42f67a..fb30abc8cef2 100644
--- a/helm/superset/templates/init-job.yaml
+++ b/helm/superset/templates/init-job.yaml
@@ -46,16 +46,23 @@ spec:
         envFrom:
           - secretRef:
               name: {{ tpl .Values.envFromSecret . }}
+          {{- range .Values.envFromSecrets }}
+          - secretRef:
+              name: {{ tpl . $ }}
+          {{- end }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         volumeMounts:
           - name: superset-config
             mountPath: {{ .Values.configMountPath | quote }}
             readOnly: true
-        {{ if .Values.extraConfigs }}
+        {{- if .Values.extraConfigs }}
           - name: superset-extra-config
             mountPath: {{ .Values.extraConfigMountPath | quote }}
             readOnly: true
         {{- end }}
+        {{- with .Values.extraVolumeMounts }}
+        {{- tpl (toYaml .) $ | nindent 10 -}}
+        {{- end }}
         command: {{  tpl (toJson .Values.init.command) . }}
         resources:
 {{ toYaml .Values.init.resources | indent 10 }}
@@ -72,5 +79,8 @@ spec:
           configMap:
             name: {{ template "superset.fullname" . }}-extra-config
         {{- end }}
+        {{- with .Values.extraVolumes }}
+        {{- tpl (toYaml .) $ | nindent 8 -}}
+        {{- end }}
       restartPolicy: Never
 {{- end }}
diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml
index 58e9faaef5fa..c8577774afb8 100644
--- a/helm/superset/values.yaml
+++ b/helm/superset/values.yaml
@@ -29,10 +29,10 @@ runAsUser: 0
 # For production clusters it's recommended to build own image with this step done in CI
 bootstrapScript: |
   #!/bin/bash
-  apt-get update -y &&\
-   apt-get install -y --no-install-recommends nano &&\
-   rm -rf /var/lib/apt/lists/*
-  pip install psycopg2==2.8.5 redis==3.2.1
+  rm -rf /var/lib/apt/lists/* && \
+  pip install \
+    psycopg2==2.8.5 \
+    redis==3.2.1 && \
   if [ ! -f ~/bootstrap ]; then echo "Running Superset with uid {{ .Values.runAsUser }}" > ~/bootstrap; fi
 
 ## The name of the secret which we will use to generate a superset_config.py file
@@ -44,15 +44,26 @@ configFromSecret: '{{ template "superset.fullname" . }}-config'
 ## This can be useful for secret keys, etc.
 ##
 envFromSecret: '{{ template "superset.fullname" . }}-env'
+## This can be a list of template strings
+envFromSecrets: []
 
 ## Extra environment variables that will be passed into pods
 ##
 extraEnv: {}
+  # Extend timeout to allow long running queries.
+  # GUNICORN_TIMEOUT: 300
+
+
+   # OAUTH_HOME_DOMAIN: ..
+  # # If a whitelist is not set, any address that can use your OAuth2 endpoint will be able to login.
+  # #   this includes any random Gmail address if your OAuth2 Web App is set to External.
+  # OAUTH_WHITELIST_REGEX: ...
 
 ## Extra environment variables to pass as secrets
 ##
 extraSecretEnv: {}
   # MAPBOX_API_KEY: ...
+  # # Google API Keys: https://console.cloud.google.com/apis/credentials
   # GOOGLE_KEY: ...
   # GOOGLE_SECRET: ...
 
@@ -69,20 +80,38 @@ extraConfigs: {}
   #       sqlalchemy_uri: example://example-db.local
   #       tables: []
 
-
 extraSecrets: {}
 
+extraVolumes: []
+ # - name: customConfig
+ #   configMap:
+ #     name: '{{ template "superset.fullname" . }}-custom-config'
+ # - name: additionalSecret
+ #   secret:
+ #     secretName: my-secret
+ #     defaultMode: 0600
+
+extraVolumeMounts: []
+ # - name: customConfig
+ #   mountPath: /mnt/config
+ #   readOnly: true
+ # - name: additionalSecret:
+ #   mountPath: /mnt/secret
 
 # A dictionary of overrides to append at the end of superset_config.py - the name does not matter
 # WARNING: the order is not guaranteed
 configOverrides: {}
+  #  extend_timeout: |
+  #    # Extend timeout to allow long running queries.
+  #    SUPERSET_WEBSERVER_TIMEOUT = ...
   # enable_oauth: |
-  #   from flask_appbuilder.security.manager import AUTH_DB
+  #   from flask_appbuilder.security.manager import (AUTH_DB, AUTH_OAUTH)
   #   AUTH_TYPE = AUTH_OAUTH
 
   #   OAUTH_PROVIDERS = [
   #       {
   #           "name": "google",
+  #           "whitelist": [ os.getenv("OAUTH_WHITELIST_REGEX", "") ],
   #           "icon": "fa-google",
   #           "token_key": "access_token",
   #           "remote_app": {
@@ -93,9 +122,17 @@ configOverrides: {}
   #               "request_token_url": None,
   #               "access_token_url": "https://accounts.google.com/o/oauth2/token",
   #               "authorize_url": "https://accounts.google.com/o/oauth2/auth",
-  #           },
+  #               "authorize_params": {"hd": os.getenv("OAUTH_HOME_DOMAIN", "")}
+  #           }
   #       }
   #   ]
+  #   # Map Authlib roles to superset roles
+  #   AUTH_ROLE_ADMIN = 'Admin'
+  #   AUTH_ROLE_PUBLIC = 'Public'
+  #   # Will allow user self registration, allowing to create Flask users from Authorized User
+  #   AUTH_USER_REGISTRATION = True
+  #   # The default user self registration role
+  #   AUTH_USER_REGISTRATION_ROLE = "Admin"
 
 configMountPath: "/app/pythonpath"
 
@@ -121,7 +158,12 @@ ingress:
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
+    ## Extend timeout to allow long running queries.
+    # nginx.ingress.kubernetes.io/proxy-connect-timeout: "300"
+    # nginx.ingress.kubernetes.io/proxy-read-timeout: "300"
+    # nginx.ingress.kubernetes.io/proxy-send-timeout: "300"
   path: /
+  pathType: ImplementationSpecific
   hosts:
     - chart-example.local
   tls: []
@@ -165,10 +207,8 @@ supersetNode:
         - secretRef:
             name: '{{ tpl .Values.envFromSecret . }}'
       command: [ "/bin/sh", "-c", "until nc -zv $DB_HOST $DB_PORT -w1; do echo 'waiting for db'; sleep 1; done" ]
-
   ## Annotations to be added to supersetNode deployment
   deploymentAnnotations: {}
-
   ## Annotations to be added to supersetNode pods
   podAnnotations: {}
 
@@ -188,10 +228,8 @@ supersetWorker:
         - secretRef:
             name: '{{ tpl .Values.envFromSecret . }}'
       command: [ "/bin/sh", "-c", "until nc -zv $DB_HOST $DB_PORT -w1; do echo 'waiting for db'; sleep 1; done" ]
-
   ## Annotations to be added to supersetWorker deployment
   deploymentAnnotations: {}
-
   ## Annotations to be added to supersetWorker pods
   podAnnotations: {}
 
@@ -203,7 +241,7 @@ supersetCeleryBeat:
   command:
     - "/bin/sh"
     - "-c"
-    - ". {{ .Values.configMountPath }}/superset_bootstrap.sh; celery beat --app=superset.tasks.celery_app:app --pidfile /tmp/celerybeat.pid --schedule /tmp/celerybeat-schedule"
+    - ". {{ .Values.configMountPath }}/superset_bootstrap.sh; celery --app=superset.tasks.celery_app:app beat --pidfile /tmp/celerybeat.pid --schedule /tmp/celerybeat-schedule"
   forceReload: false # If true, forces deployment to reload on each upgrade
   initContainers:
     - name: wait-for-postgres
@@ -213,10 +251,8 @@ supersetCeleryBeat:
         - secretRef:
             name: '{{ tpl .Values.envFromSecret . }}'
       command: [ "/bin/sh", "-c", "until nc -zv $DB_HOST $DB_PORT -w1; do echo 'waiting for db'; sleep 1; done" ]
-
   ## Annotations to be added to supersetCeleryBeat deployment
   deploymentAnnotations: {}
-
   ## Annotations to be added to supersetCeleryBeat pods
   podAnnotations: {}
 
@@ -224,7 +260,7 @@ supersetCeleryBeat:
 ## Init job configuration
 init:
   # Configure resources
-  # Warning: fab commant consumes a lot of ram and can
+  # Warning: fab command consumes a lot of ram and can
   # cause the process to be killed due to OOM if it exceeds limit
   resources: {}
     # limits:
@@ -239,6 +275,7 @@ init:
     - ". {{ .Values.configMountPath }}/superset_bootstrap.sh; . {{ .Values.configMountPath }}/superset_init.sh"
   enabled: true
   loadExamples: false
+  createAdmin: true
   adminUser:
     username: admin
     firstname: Superset
@@ -259,6 +296,7 @@ init:
     superset db upgrade
     echo "Initializing roles..."
     superset init
+    {{ if .Values.init.createAdmin }}
     echo "Creating admin user..."
     superset fab create-admin \
                     --username {{ .Values.init.adminUser.username }} \
@@ -267,10 +305,15 @@ init:
                     --email {{ .Values.init.adminUser.email }} \
                     --password {{ .Values.init.adminUser.password }} \
                     || true
+    {{- end }}
     {{ if .Values.init.loadExamples }}
     echo "Loading examples..."
     superset load_examples
     {{- end }}
+    if [ -f "{{ .Values.extraConfigMountPath }}/import_datasources.yaml" ]; then
+      echo "Importing database connections.... "
+      superset import_datasources -p {{ .Values.extraConfigMountPath }}/import_datasources.yaml
+    fi
 ##
 ## Configuration values for the postgresql dependency.
 ## ref: https://github.com/kubernetes/charts/blob/master/stable/postgresql/README.md
@@ -279,14 +322,11 @@ postgresql:
   ## Use the PostgreSQL chart dependency.
   ## Set to false if bringing your own PostgreSQL.
   enabled: true
-
   ##
   ## The name of an existing secret that contains the postgres password.
   existingSecret:
-
   ## Name of the key containing the secret.
   existingSecretKey: postgresql-password
-
   ##
   ## If you are bringing your own PostgreSQL, you should set postgresHost and
   ## also probably service.port, postgresqlUsername, postgresqlPassword, and postgresqlDatabase
@@ -326,16 +366,12 @@ redis:
   ## Use the redis chart dependency.
   ## Set to false if bringing your own redis.
   enabled: true
-
   usePassword: false
-
   ##
   ## The name of an existing secret that contains the redis password.
   existingSecret:
-
   ## Name of the key containing the secret.
   existingSecretKey: redis-password
-
   ##
   ## If you are bringing your own redis, you can set the host in redisHost.
   ## redisHost:
diff --git a/requirements/base.in b/requirements/base.in
index 294583801824..00071c4ac8f1 100644
--- a/requirements/base.in
+++ b/requirements/base.in
@@ -18,3 +18,4 @@
 -e file:.
 pyrsistent>=0.16.1,<0.17
 zipp==3.4.1
+sasl==0.2.1
diff --git a/requirements/base.txt b/requirements/base.txt
index 0f433e0d6647..6c903a098df4 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,4 +1,4 @@
-# SHA1:0862095245a068ae2fc00217da78331e1e7ae505
+# SHA1:57a754a4cf09b58d8e02c45bfb1058d2ce4286a6
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -7,9 +7,9 @@
 #
 -e file:.
     # via -r requirements/base.in
-aiohttp==3.7.2
+aiohttp==3.7.4.post0
     # via slackclient
-alembic==1.4.3
+alembic==1.6.5
     # via flask-migrate
 amqp==2.6.1
     # via kombu
@@ -17,17 +17,17 @@ apispec[yaml]==3.3.2
     # via flask-appbuilder
 async-timeout==3.0.1
     # via aiohttp
-attrs==20.2.0
+attrs==21.2.0
     # via
     #   aiohttp
     #   jsonschema
-babel==2.8.0
+babel==2.9.1
     # via flask-babel
-backoff==1.10.0
+backoff==1.11.1
     # via apache-superset
-billiard==3.6.3.0
+billiard==3.6.4.0
     # via celery
-bleach==3.3.0
+bleach==3.3.1
     # via apache-superset
 brotli==1.0.9
     # via flask-compress
@@ -35,9 +35,9 @@ cachelib==0.1.1
     # via apache-superset
 celery==4.4.7
     # via apache-superset
-cffi==1.14.3
+cffi==1.14.6
     # via cryptography
-chardet==3.0.4
+chardet==4.0.0
     # via aiohttp
 click==7.1.2
     # via
@@ -48,66 +48,64 @@ colorama==0.4.4
     # via
     #   apache-superset
     #   flask-appbuilder
-contextlib2==0.6.0.post1
-    # via apache-superset
-convertdate==2.3.0
+convertdate==2.3.2
     # via holidays
 cron-descriptor==1.2.24
     # via apache-superset
-croniter==0.3.36
+croniter==1.0.15
     # via apache-superset
-cryptography==3.3.2
+cryptography==3.4.7
     # via apache-superset
-decorator==4.4.2
-    # via retry
-defusedxml==0.6.0
+defusedxml==0.7.1
     # via python3-openid
-dnspython==2.0.0
+deprecation==2.1.0
+    # via apache-superset
+dnspython==2.1.0
     # via email-validator
-email-validator==1.1.1
+email-validator==1.1.3
     # via flask-appbuilder
-flask-appbuilder==3.3.0
+flask==1.1.4
+    # via
+    #   apache-superset
+    #   flask-appbuilder
+    #   flask-babel
+    #   flask-caching
+    #   flask-compress
+    #   flask-jwt-extended
+    #   flask-login
+    #   flask-migrate
+    #   flask-openid
+    #   flask-sqlalchemy
+    #   flask-wtf
+flask-appbuilder==3.3.2
     # via apache-superset
 flask-babel==1.0.0
     # via flask-appbuilder
-flask-caching==1.9.0
+flask-caching==1.10.1
     # via apache-superset
-flask-compress==1.8.0
+flask-compress==1.10.1
     # via apache-superset
-flask-jwt-extended==3.24.1
+flask-jwt-extended==3.25.1
     # via flask-appbuilder
 flask-login==0.4.1
     # via flask-appbuilder
-flask-migrate==2.5.3
+flask-migrate==3.1.0
     # via apache-superset
 flask-openid==1.2.5
     # via flask-appbuilder
-flask-sqlalchemy==2.4.4
+flask-sqlalchemy==2.5.1
     # via
     #   flask-appbuilder
     #   flask-migrate
-flask-talisman==0.7.0
+flask-talisman==0.8.1
     # via apache-superset
 flask-wtf==0.14.3
     # via
     #   apache-superset
     #   flask-appbuilder
-flask==1.1.2
-    # via
-    #   apache-superset
-    #   flask-appbuilder
-    #   flask-babel
-    #   flask-caching
-    #   flask-compress
-    #   flask-jwt-extended
-    #   flask-login
-    #   flask-migrate
-    #   flask-openid
-    #   flask-sqlalchemy
-    #   flask-wtf
-geographiclib==1.50
+geographiclib==1.52
     # via geopy
-geopy==2.0.0
+geopy==2.2.0
     # via apache-superset
 graphlib-backport==1.0.3
     # via apache-superset
@@ -115,17 +113,12 @@ gunicorn==20.0.4
     # via apache-superset
 holidays==0.10.3
     # via apache-superset
-humanize==3.1.0
+humanize==3.11.0
     # via apache-superset
-idna==2.10
+idna==3.2
     # via
     #   email-validator
     #   yarl
-importlib-metadata==2.1.1
-    # via
-    #   jsonschema
-    #   kombu
-    #   markdown
 isodate==0.6.0
     # via apache-superset
 itsdangerous==1.1.0
@@ -143,53 +136,49 @@ kombu==4.6.11
     # via celery
 korean-lunar-calendar==0.2.1
     # via holidays
-mako==1.1.3
+mako==1.1.4
     # via alembic
-markdown==3.3.3
+markdown==3.3.4
     # via apache-superset
-markupsafe==1.1.1
+markupsafe==2.0.1
     # via
     #   jinja2
     #   mako
     #   wtforms
-marshmallow-enum==1.5.1
-    # via flask-appbuilder
-marshmallow-sqlalchemy==0.23.1
-    # via flask-appbuilder
-marshmallow==3.9.0
+marshmallow==3.13.0
     # via
     #   flask-appbuilder
     #   marshmallow-enum
     #   marshmallow-sqlalchemy
-msgpack==1.0.0
+marshmallow-enum==1.5.1
+    # via flask-appbuilder
+marshmallow-sqlalchemy==0.23.1
+    # via flask-appbuilder
+msgpack==1.0.2
     # via apache-superset
-multidict==5.0.0
+multidict==5.1.0
     # via
     #   aiohttp
     #   yarl
-natsort==7.0.1
-    # via croniter
-numpy==1.19.4
+numpy==1.21.1
     # via
     #   pandas
     #   pyarrow
-packaging==20.4
-    # via bleach
-pandas==1.2.2
+packaging==21.0
+    # via
+    #   bleach
+    #   deprecation
+pandas==1.2.5
     # via apache-superset
 parsedatetime==2.6
     # via apache-superset
-pathlib2==2.3.5
-    # via apache-superset
 pgsanity==0.2.9
     # via apache-superset
 polyline==1.4.0
     # via apache-superset
 prison==0.1.3
     # via flask-appbuilder
-py==1.9.0
-    # via retry
-pyarrow==3.0.0
+pyarrow==4.0.1
     # via apache-superset
 pycparser==2.20
     # via cffi
@@ -198,7 +187,7 @@ pyjwt==1.7.1
     #   apache-superset
     #   flask-appbuilder
     #   flask-jwt-extended
-pymeeus==0.3.7
+pymeeus==0.5.11
     # via convertdate
 pyparsing==2.4.7
     # via
@@ -208,7 +197,7 @@ pyrsistent==0.16.1
     # via
     #   -r requirements/base.in
     #   jsonschema
-python-dateutil==2.8.1
+python-dateutil==2.8.2
     # via
     #   alembic
     #   apache-superset
@@ -216,7 +205,7 @@ python-dateutil==2.8.1
     #   flask-appbuilder
     #   holidays
     #   pandas
-python-dotenv==0.15.0
+python-dotenv==0.19.0
     # via apache-superset
 python-editor==1.0.4
     # via alembic
@@ -224,7 +213,7 @@ python-geohash==0.8.5
     # via apache-superset
 python3-openid==3.2.0
     # via flask-openid
-pytz==2020.4
+pytz==2021.1
     # via
     #   babel
     #   celery
@@ -237,36 +226,30 @@ pyyaml==5.4.1
     #   apispec
 redis==3.5.3
     # via apache-superset
-retry==0.9.2
-    # via apache-superset
+sasl==0.2.1
+    # via -r requirements/base.in
 selenium==3.141.0
     # via apache-superset
-simplejson==3.17.2
+simplejson==3.17.3
     # via apache-superset
-six==1.15.0
+six==1.16.0
     # via
     #   bleach
-    #   cryptography
     #   flask-jwt-extended
     #   flask-talisman
     #   holidays
     #   isodate
     #   jsonschema
-    #   packaging
-    #   pathlib2
     #   polyline
     #   prison
     #   pyrsistent
     #   python-dateutil
+    #   sasl
     #   sqlalchemy-utils
     #   wtforms-json
 slackclient==2.5.0
     # via apache-superset
-sqlalchemy-utils==0.36.8
-    # via
-    #   apache-superset
-    #   flask-appbuilder
-sqlalchemy==1.3.20
+sqlalchemy==1.3.24
     # via
     #   alembic
     #   apache-superset
@@ -274,14 +257,19 @@ sqlalchemy==1.3.20
     #   flask-sqlalchemy
     #   marshmallow-sqlalchemy
     #   sqlalchemy-utils
+sqlalchemy-utils==0.36.8
+    # via
+    #   apache-superset
+    #   flask-appbuilder
 sqlparse==0.3.0
     # via apache-superset
-typing-extensions==3.7.4.3
+tabulate==0.8.9
+    # via apache-superset
+typing-extensions==3.10.0.0
     # via
     #   aiohttp
     #   apache-superset
-    #   yarl
-urllib3==1.25.11
+urllib3==1.26.6
     # via selenium
 vine==1.3.0
     # via
@@ -293,18 +281,16 @@ werkzeug==1.0.1
     # via
     #   flask
     #   flask-jwt-extended
-wtforms-json==0.3.3
-    # via apache-superset
 wtforms==2.3.3
     # via
     #   flask-wtf
     #   wtforms-json
-yarl==1.6.2
+wtforms-json==0.3.3
+    # via apache-superset
+yarl==1.6.3
     # via aiohttp
 zipp==3.4.1
-    # via
-    #   -r requirements/base.in
-    #   importlib-metadata
+    # via -r requirements/base.in
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/requirements/development.in b/requirements/development.in
index 5ac06dc54339..db2162341dac 100644
--- a/requirements/development.in
+++ b/requirements/development.in
@@ -24,4 +24,5 @@ pyhive[hive]>=0.6.1
 psycopg2-binary==2.8.5
 tableschema
 thrift>=0.11.0,<1.0.0
-pygithub>=1.54.1,<2.0.0
+progress>=1.5,<2
+pyinstrument>=4.0.2,<5
diff --git a/requirements/development.txt b/requirements/development.txt
index 7b6ca3ffb7a5..82133b43a320 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -1,4 +1,4 @@
-# SHA1:1b4d15a41f3498d2eb930ac3d3d4ce5d1f218a2f
+# SHA1:e4f3ea65026a8aec3735d6d9977f89fef4a1a4f9
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -8,82 +8,77 @@
 -r base.txt
 -e file:.
     # via -r requirements/base.in
-boto3==1.16.10
+boto3==1.18.19
     # via tabulator
-botocore==1.19.10
+botocore==1.21.19
     # via
     #   boto3
     #   s3transfer
 cached-property==1.5.2
     # via tableschema
-certifi==2020.6.20
+certifi==2021.5.30
     # via requests
-deprecated==1.2.11
-    # via pygithub
-et-xmlfile==1.0.1
+charset-normalizer==2.0.4
+    # via requests
+et-xmlfile==1.1.0
     # via openpyxl
-flask-cors==3.0.9
+flask-cors==3.0.10
     # via -r requirements/development.in
 future==0.18.2
     # via pyhive
-ijson==3.1.2.post0
+ijson==3.1.4
     # via tabulator
-jdcal==1.4.1
-    # via openpyxl
 jmespath==0.10.0
     # via
     #   boto3
     #   botocore
-jsonlines==1.2.0
+jsonlines==2.0.0
     # via tabulator
 linear-tsv==1.1.0
     # via tabulator
 mysqlclient==1.4.2.post1
     # via -r requirements/development.in
-openpyxl==3.0.5
+openpyxl==3.0.7
     # via tabulator
 pillow==7.2.0
     # via -r requirements/development.in
+progress==1.6
+    # via -r requirements/development.in
 psycopg2-binary==2.8.5
     # via -r requirements/development.in
-pydruid==0.6.1
+pure-sasl==0.6.2
+    # via thrift-sasl
+pydruid==0.6.2
     # via -r requirements/development.in
-pygithub==1.54.1
+pyhive[hive]==0.6.4
     # via -r requirements/development.in
-pyhive[hive]==0.6.3
+pyinstrument==4.0.2
     # via -r requirements/development.in
-requests==2.24.0
+requests==2.26.0
     # via
     #   pydruid
-    #   pygithub
     #   tableschema
     #   tabulator
-rfc3986==1.4.0
+rfc3986==1.5.0
     # via tableschema
-s3transfer==0.3.3
+s3transfer==0.5.0
     # via boto3
-sasl==0.2.1
-    # via
-    #   pyhive
-    #   thrift-sasl
-tableschema==1.20.0
+tableschema==1.20.2
     # via -r requirements/development.in
-tabulator==1.52.5
+tabulator==1.53.5
     # via tableschema
-thrift-sasl==0.4.2
-    # via pyhive
 thrift==0.13.0
     # via
     #   -r requirements/development.in
     #   pyhive
     #   thrift-sasl
+thrift-sasl==0.4.3
+    # via pyhive
 unicodecsv==0.14.1
     # via
     #   tableschema
     #   tabulator
-wrapt==1.12.1
-    # via deprecated
-xlrd==1.2.0
+xlrd==2.0.1
     # via tabulator
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements/docker.txt b/requirements/docker.txt
index e1d3f07003ab..545e919791bd 100644
--- a/requirements/docker.txt
+++ b/requirements/docker.txt
@@ -8,15 +8,15 @@
 -r base.txt
 -e file:.
     # via -r requirements/base.in
-gevent==20.9.0
+gevent==21.8.0
     # via -r requirements/docker.in
-greenlet==0.4.17
+greenlet==1.1.1
     # via gevent
-psycopg2-binary==2.8.6
+psycopg2-binary==2.9.1
     # via -r requirements/docker.in
 zope.event==4.5.0
     # via gevent
-zope.interface==5.1.2
+zope.interface==5.4.0
     # via gevent
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements/integration.in b/requirements/integration.in
index 1aaee9255f97..1bc94c7fb71d 100644
--- a/requirements/integration.in
+++ b/requirements/integration.in
@@ -17,3 +17,6 @@
 pip-compile-multi!=1.5.9
 pre-commit
 tox
+py>=1.10.0
+click==7.1.2
+packaging==21.0
diff --git a/requirements/integration.txt b/requirements/integration.txt
index e1cb0edb3e2a..b7da99e3da36 100644
--- a/requirements/integration.txt
+++ b/requirements/integration.txt
@@ -1,70 +1,74 @@
-# SHA1:f95c1152ed0bcc554f3668440d63eec2a7d1567c
+# SHA1:17ab2346746deadfc557e1df96014e77c8337f4b
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
 #
 #    pip-compile-multi
 #
-appdirs==1.4.4
+backports.entry-points-selectable==1.1.0
     # via virtualenv
-cfgv==3.2.0
+cfgv==3.3.0
     # via pre-commit
 click==7.1.2
     # via
+    #   -r requirements/integration.in
     #   pip-compile-multi
     #   pip-tools
-distlib==0.3.1
+distlib==0.3.2
     # via virtualenv
 filelock==3.0.12
     # via
     #   tox
     #   virtualenv
-identify==1.5.9
+identify==2.2.13
     # via pre-commit
-importlib-metadata==2.1.1
+nodeenv==1.6.0
+    # via pre-commit
+packaging==21.0
     # via
-    #   pluggy
-    #   pre-commit
+    #   -r requirements/integration.in
     #   tox
-    #   virtualenv
-nodeenv==1.5.0
-    # via pre-commit
-packaging==20.4
-    # via tox
+pep517==0.11.0
+    # via pip-tools
 pip-compile-multi==2.4.1
     # via -r requirements/integration.in
-pip-tools==5.3.1
+pip-tools==6.2.0
     # via pip-compile-multi
+platformdirs==2.2.0
+    # via virtualenv
 pluggy==0.13.1
     # via tox
-pre-commit==2.8.2
+pre-commit==2.14.0
     # via -r requirements/integration.in
-py==1.9.0
-    # via tox
+py==1.10.0
+    # via
+    #   -r requirements/integration.in
+    #   tox
 pyparsing==2.4.7
     # via packaging
 pyyaml==5.4.1
     # via pre-commit
-six==1.15.0
+six==1.16.0
     # via
-    #   packaging
-    #   pip-tools
     #   tox
     #   virtualenv
 toml==0.10.2
     # via
     #   pre-commit
     #   tox
-toposort==1.5
+tomli==1.2.1
+    # via pep517
+toposort==1.6
     # via pip-compile-multi
-tox==3.20.1
+tox==3.24.1
     # via -r requirements/integration.in
-virtualenv==20.1.0
+virtualenv==20.7.2
     # via
     #   pre-commit
     #   tox
-zipp==3.4.1
-    # via importlib-metadata
+wheel==0.37.0
+    # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip
+# setuptools
diff --git a/requirements/testing.in b/requirements/testing.in
index e95cab68f04c..3355d71fa433 100644
--- a/requirements/testing.in
+++ b/requirements/testing.in
@@ -22,13 +22,15 @@ freezegun
 ipdb
 # pinning ipython as pip-compile-multi was bringing higher version
 # of the ipython that was not found in CI
-ipython==7.16.1
+ipython
 openapi-spec-validator
 openpyxl
 parameterized
 pyfakefs
 pyhive[presto]>=0.6.3
-pylint
+pylint==2.6.0
 pytest
 pytest-cov
 statsd
+pytest-mock
+packaging==21.0
diff --git a/requirements/testing.txt b/requirements/testing.txt
index 87b87060e8ca..ccbd88989e6a 100644
--- a/requirements/testing.txt
+++ b/requirements/testing.txt
@@ -1,4 +1,4 @@
-# SHA1:dba8c39bbdcb85b86e83af855d023b55a2674e87
+# SHA1:5bfcfb5d0ab31dd532ce58caa2aab91d6807b123
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -9,78 +9,91 @@
 -r integration.txt
 -e file:.
     # via -r requirements/base.in
-appnope==0.1.0
+appnope==0.1.2
     # via ipython
-astroid==2.4.2
+astroid==2.6.6
     # via pylint
 backcall==0.2.0
     # via ipython
-coverage==5.3
+coverage==5.5
     # via pytest-cov
-docker==4.3.1
+decorator==5.0.9
+    # via
+    #   ipdb
+    #   ipython
+docker==5.0.0
     # via -r requirements/testing.in
-flask-testing==0.8.0
+flask-testing==0.8.1
     # via -r requirements/testing.in
-freezegun==1.0.0
+freezegun==1.1.0
     # via -r requirements/testing.in
 iniconfig==1.1.1
     # via pytest
-ipdb==0.13.4
+ipdb==0.13.9
     # via -r requirements/testing.in
-ipython-genutils==0.2.0
-    # via traitlets
-ipython==7.16.1
+ipython==7.26.0
     # via
     #   -r requirements/testing.in
     #   ipdb
-isort==5.6.4
+ipython-genutils==0.2.0
+    # via traitlets
+isort==5.9.3
     # via pylint
-jedi==0.17.2
+jedi==0.18.0
     # via ipython
-lazy-object-proxy==1.4.3
+lazy-object-proxy==1.6.0
     # via astroid
+matplotlib-inline==0.1.2
+    # via ipython
 mccabe==0.6.1
     # via pylint
-openapi-spec-validator==0.2.9
+openapi-schema-validator==0.1.5
+    # via openapi-spec-validator
+openapi-spec-validator==0.3.1
     # via -r requirements/testing.in
-parameterized==0.7.4
+parameterized==0.8.1
     # via -r requirements/testing.in
-parso==0.7.1
+parso==0.8.2
     # via jedi
 pexpect==4.8.0
     # via ipython
 pickleshare==0.7.5
     # via ipython
-prompt-toolkit==3.0.8
+prompt-toolkit==3.0.19
     # via ipython
-ptyprocess==0.6.0
+ptyprocess==0.7.0
     # via pexpect
-pyfakefs==4.4.0
+pyfakefs==4.5.0
     # via -r requirements/testing.in
-pygments==2.7.2
+pygments==2.9.0
     # via ipython
-pyhive[hive,presto]==0.6.3
+pyhive[hive,presto]==0.6.4
     # via
     #   -r requirements/development.in
     #   -r requirements/testing.in
-pylint==2.6.0
+pylint==2.9.6
     # via -r requirements/testing.in
-pytest-cov==2.10.1
-    # via -r requirements/testing.in
-pytest==6.1.2
+pytest==6.2.4
     # via
     #   -r requirements/testing.in
     #   pytest-cov
+    #   pytest-mock
+pytest-cov==2.12.1
+    # via -r requirements/testing.in
+pytest-mock==3.6.1
+    # via -r requirements/testing.in
 statsd==3.3.0
     # via -r requirements/testing.in
 traitlets==5.0.5
-    # via ipython
-typed-ast==1.4.3
-    # via astroid
+    # via
+    #   ipython
+    #   matplotlib-inline
 wcwidth==0.2.5
     # via prompt-toolkit
-websocket-client==0.57.0
+websocket-client==1.2.0
     # via docker
+wrapt==1.12.1
+    # via astroid
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip
diff --git a/scripts/benchmark_migration.py b/scripts/benchmark_migration.py
index 0faa92a88552..27670b5d4d72 100644
--- a/scripts/benchmark_migration.py
+++ b/scripts/benchmark_migration.py
@@ -25,10 +25,13 @@
 from typing import Dict, List, Set, Type
 
 import click
+from flask import current_app
 from flask_appbuilder import Model
 from flask_migrate import downgrade, upgrade
 from graphlib import TopologicalSorter  # pylint: disable=wrong-import-order
-from sqlalchemy import inspect
+from progress.bar import ChargingBar
+from sqlalchemy import create_engine, inspect
+from sqlalchemy.ext.automap import automap_base
 
 from superset import db
 from superset.utils.mock_data import add_sample_rows
@@ -41,9 +44,13 @@ def import_migration_script(filepath: Path) -> ModuleType:
     Import migration script as if it were a module.
     """
     spec = importlib.util.spec_from_file_location(filepath.stem, filepath)
-    module = importlib.util.module_from_spec(spec)
-    spec.loader.exec_module(module)  # type: ignore
-    return module
+    if spec:
+        module = importlib.util.module_from_spec(spec)
+        spec.loader.exec_module(module)  # type: ignore
+        return module
+    raise Exception(
+        "No module spec found in location: `{path}`".format(path=str(filepath))
+    )
 
 
 def extract_modified_tables(module: ModuleType) -> Set[str]:
@@ -83,11 +90,29 @@ def find_models(module: ModuleType) -> List[Type[Model]]:
         elif isinstance(obj, dict):
             queue.extend(obj.values())
 
-    # add implicit models
-    # pylint: disable=no-member, protected-access
-    for obj in Model._decl_class_registry.values():
-        if hasattr(obj, "__table__") and obj.__table__.fullname in tables:
-            models.append(obj)
+    # build models by automapping the existing tables, instead of using current
+    # code; this is needed for migrations that modify schemas (eg, add a column),
+    # where the current model is out-of-sync with the existing table after a
+    # downgrade
+    sqlalchemy_uri = current_app.config["SQLALCHEMY_DATABASE_URI"]
+    engine = create_engine(sqlalchemy_uri)
+    Base = automap_base()
+    Base.prepare(engine, reflect=True)
+    seen = set()
+    while tables:
+        table = tables.pop()
+        seen.add(table)
+        model = getattr(Base.classes, table)
+        model.__tablename__ = table
+        models.append(model)
+
+        # add other models referenced in foreign keys
+        inspector = inspect(model)
+        for column in inspector.columns.values():
+            for foreign_key in column.foreign_keys:
+                table = foreign_key.column.table.name
+                if table not in seen:
+                    tables.add(table)
 
     # sort topologically so we can create entities in order and
     # maintain relationships (eg, create a database before creating
@@ -98,7 +123,8 @@ def find_models(module: ModuleType) -> List[Type[Model]]:
         dependent_tables: List[str] = []
         for column in inspector.columns.values():
             for foreign_key in column.foreign_keys:
-                dependent_tables.append(foreign_key.target_fullname.split(".")[0])
+                if foreign_key.column.table.name != model.__tablename__:
+                    dependent_tables.append(foreign_key.column.table.name)
         sorter.add(model.__tablename__, *dependent_tables)
     order = list(sorter.static_order())
     models.sort(key=lambda model: order.index(model.__tablename__))
@@ -133,15 +159,6 @@ def main(
     ).scalar()
     print(f"Current version of the DB is {current_revision}")
 
-    print("\nIdentifying models used in the migration:")
-    models = find_models(module)
-    model_rows: Dict[Type[Model], int] = {}
-    for model in models:
-        rows = session.query(model).count()
-        print(f"- {model.__name__} ({rows} rows in table {model.__tablename__})")
-        model_rows[model] = rows
-    session.close()
-
     if current_revision != down_revision:
         if not force:
             click.confirm(
@@ -152,6 +169,15 @@ def main(
             )
         downgrade(revision=down_revision)
 
+    print("\nIdentifying models used in the migration:")
+    models = find_models(module)
+    model_rows: Dict[Type[Model], int] = {}
+    for model in models:
+        rows = session.query(model).count()
+        print(f"- {model.__name__} ({rows} rows in table {model.__tablename__})")
+        model_rows[model] = rows
+    session.close()
+
     print("Benchmarking migration")
     results: Dict[str, float] = {}
     start = time.time()
@@ -168,18 +194,23 @@ def main(
         for model in models:
             missing = min_entities - model_rows[model]
             if missing > 0:
+                entities: List[Model] = []
                 print(f"- Adding {missing} entities to the {model.__name__} model")
+                bar = ChargingBar("Processing", max=missing)
                 try:
-                    added_models = add_sample_rows(session, model, missing)
+                    for entity in add_sample_rows(session, model, missing):
+                        entities.append(entity)
+                        bar.next()
                 except Exception:
                     session.rollback()
                     raise
+                bar.finish()
                 model_rows[model] = min_entities
+                session.add_all(entities)
                 session.commit()
 
                 if auto_cleanup:
-                    new_models[model].extend(added_models)
-
+                    new_models[model].extend(entities)
         start = time.time()
         upgrade(revision=revision)
         duration = time.time() - start
@@ -187,6 +218,10 @@ def main(
         results[f"{min_entities}+"] = duration
         min_entities *= 10
 
+    print("\nResults:\n")
+    for label, duration in results.items():
+        print(f"{label}: {duration:.2f} s")
+
     if auto_cleanup:
         print("Cleaning up DB")
         # delete in reverse order of creation to handle relationships
@@ -201,10 +236,6 @@ def main(
         upgrade(revision=revision)
         print("Reverted")
 
-    print("\nResults:\n")
-    for label, duration in results.items():
-        print(f"{label}: {duration:.2f} s")
-
 
 if __name__ == "__main__":
     from superset.app import create_app
diff --git a/scripts/cancel_github_workflows.py b/scripts/cancel_github_workflows.py
index 84acda0979d2..90087fa4f736 100755
--- a/scripts/cancel_github_workflows.py
+++ b/scripts/cancel_github_workflows.py
@@ -33,7 +33,7 @@
   ./cancel_github_workflows.py 1024 --include-last
 """
 import os
-from typing import Iterable, List, Optional, Union
+from typing import Any, Dict, Iterable, Iterator, List, Optional, Union
 
 import click
 import requests
@@ -45,7 +45,9 @@
 github_repo = os.environ.get("GITHUB_REPOSITORY", "apache/superset")
 
 
-def request(method: Literal["GET", "POST", "DELETE", "PUT"], endpoint: str, **kwargs):
+def request(
+    method: Literal["GET", "POST", "DELETE", "PUT"], endpoint: str, **kwargs: Any
+) -> Dict[str, Any]:
     resp = requests.request(
         method,
         f"https://api.github.com/{endpoint.lstrip('/')}",
@@ -57,10 +59,14 @@ def request(method: Literal["GET", "POST", "DELETE", "PUT"], endpoint: str, **kw
     return resp
 
 
-def list_runs(repo: str, params=None):
+def list_runs(
+    repo: str, params: Optional[Dict[str, str]] = None,
+) -> Iterator[Dict[str, Any]]:
     """List all github workflow runs.
     Returns:
       An iterator that will iterate through all pages of matching runs."""
+    if params is None:
+        params = {}
     page = 1
     total_count = 10000
     while page * 100 < total_count:
@@ -75,11 +81,11 @@ def list_runs(repo: str, params=None):
         page += 1
 
 
-def cancel_run(repo: str, run_id: Union[str, int]):
+def cancel_run(repo: str, run_id: Union[str, int]) -> Dict[str, Any]:
     return request("POST", f"/repos/{repo}/actions/runs/{run_id}/cancel")
 
 
-def get_pull_request(repo: str, pull_number: Union[str, int]):
+def get_pull_request(repo: str, pull_number: Union[str, int]) -> Dict[str, Any]:
     return request("GET", f"/repos/{repo}/pulls/{pull_number}")
 
 
@@ -89,7 +95,7 @@ def get_runs(
     user: Optional[str] = None,
     statuses: Iterable[str] = ("queued", "in_progress"),
     events: Iterable[str] = ("pull_request", "push"),
-):
+) -> List[Dict[str, Any]]:
     """Get workflow runs associated with the given branch"""
     return [
         item
@@ -101,7 +107,7 @@ def get_runs(
     ]
 
 
-def print_commit(commit, branch):
+def print_commit(commit: Dict[str, Any], branch: str) -> None:
     """Print out commit message for verification"""
     indented_message = "    \n".join(commit["message"].split("\n"))
     date_str = (
@@ -151,7 +157,7 @@ def cancel_github_workflows(
     event: List[str],
     include_last: bool,
     include_running: bool,
-):
+) -> None:
     """Cancel running or queued GitHub workflows by branch or pull request ID"""
     if not github_token:
         raise ClickException("Please provide GITHUB_TOKEN as an env variable")
@@ -231,7 +237,7 @@ def cancel_github_workflows(
         try:
             print(f"[{entry['status']}] {entry['name']}", end="\r")
             cancel_run(repo, entry["id"])
-            print(f"[Cancled] {entry['name']}     ")
+            print(f"[Canceled] {entry['name']}     ")
         except ClickException as error:
             print(f"[Error: {error.message}] {entry['name']}    ")
     print("")
diff --git a/scripts/ci_check_no_file_changes.sh b/scripts/ci_check_no_file_changes.sh
index e03a6aca54c6..592faa54628b 100755
--- a/scripts/ci_check_no_file_changes.sh
+++ b/scripts/ci_check_no_file_changes.sh
@@ -34,7 +34,7 @@ REGEXES=()
 for CHECK in "$@"
 do
   if [[ ${CHECK} == "python" ]]; then
-    REGEX="(^\.github\/workflows\/.*python|^tests\/|^superset\/|^setup\.py|^requirements\/.+\.txt)"
+    REGEX="(^\.github\/workflows\/.*python|^tests\/|^superset\/|^setup\.py|^requirements\/.+\.txt|^\.pylintrc)"
     echo "Searching for changes in python files"
   elif [[ ${CHECK} == "frontend" ]]; then
     REGEX="(^\.github\/workflows\/.*(frontend|e2e)|^superset-frontend\/)"
diff --git a/scripts/permissions_cleanup.py b/scripts/permissions_cleanup.py
index 3656aaa43dcc..99d192919c6c 100644
--- a/scripts/permissions_cleanup.py
+++ b/scripts/permissions_cleanup.py
@@ -19,7 +19,7 @@
 from superset import security_manager
 
 
-def cleanup_permissions():
+def cleanup_permissions() -> None:
     # 1. Clean up duplicates.
     pvms = security_manager.get_session.query(
         security_manager.permissionview_model
diff --git a/scripts/python_tests.sh b/scripts/python_tests.sh
index d34e605a21ca..b9ef2cee2104 100755
--- a/scripts/python_tests.sh
+++ b/scripts/python_tests.sh
@@ -18,7 +18,7 @@
 #
 set -e
 
-export SUPERSET_CONFIG=${SUPERSET_CONFIG:-tests.superset_test_config}
+export SUPERSET_CONFIG=${SUPERSET_CONFIG:-tests.integration_tests.superset_test_config}
 export SUPERSET_TESTENV=true
 echo "Superset config module: $SUPERSET_CONFIG"
 
diff --git a/scripts/tests/run.sh b/scripts/tests/run.sh
index be1a11988e97..9f78318b72b5 100755
--- a/scripts/tests/run.sh
+++ b/scripts/tests/run.sh
@@ -62,7 +62,7 @@ DB_NAME="test"
 DB_USER="superset"
 DB_PASSWORD="superset"
 export SUPERSET__SQLALCHEMY_DATABASE_URI=${SUPERSET__SQLALCHEMY_DATABASE_URI:-postgresql+psycopg2://"${DB_USER}":"${DB_PASSWORD}"@localhost/"${DB_NAME}"}
-export SUPERSET_CONFIG=${SUPERSET_CONFIG:-tests.superset_test_config}
+export SUPERSET_CONFIG=${SUPERSET_CONFIG:-tests.integration_tests.superset_test_config}
 RUN_INIT=1
 RUN_RESET_DB=1
 RUN_TESTS=1
diff --git a/setup.cfg b/setup.cfg
index 8fd75a0bd6c5..9a108f76a480 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -30,21 +30,23 @@ combine_as_imports = true
 include_trailing_comma = true
 line_length = 88
 known_first_party = superset
-known_third_party =alembic,apispec,backoff,bleach,cachelib,celery,click,colorama,contextlib2,cron_descriptor,croniter,cryptography,dateutil,flask,flask_appbuilder,flask_babel,flask_caching,flask_compress,flask_jwt_extended,flask_login,flask_migrate,flask_sqlalchemy,flask_talisman,flask_testing,flask_wtf,freezegun,geohash,geopy,graphlib,holidays,humanize,isodate,jinja2,jwt,markdown,markupsafe,marshmallow,marshmallow_enum,msgpack,numpy,pandas,parameterized,parsedatetime,pathlib2,pgsanity,pkg_resources,polyline,prison,pyarrow,pyhive,pyparsing,pytest,pytz,redis,requests,retry,selenium,setuptools,simplejson,slack,sqlalchemy,sqlalchemy_utils,sqlparse,typing_extensions,werkzeug,wtforms,wtforms_json,yaml
+known_third_party =alembic,apispec,backoff,bleach,cachelib,celery,click,colorama,cron_descriptor,croniter,cryptography,dateutil,deprecation,flask,flask_appbuilder,flask_babel,flask_caching,flask_compress,flask_jwt_extended,flask_login,flask_migrate,flask_sqlalchemy,flask_talisman,flask_testing,flask_wtf,freezegun,geohash,geopy,graphlib,holidays,humanize,isodate,jinja2,jwt,markdown,markupsafe,marshmallow,marshmallow_enum,msgpack,numpy,pandas,parameterized,parsedatetime,pgsanity,pkg_resources,polyline,prison,progress,pyarrow,pyhive,pyparsing,pytest,pytest_mock,pytz,redis,requests,selenium,setuptools,simplejson,slack,sqlalchemy,sqlalchemy_utils,sqlparse,typing_extensions,urllib3,werkzeug,wtforms,wtforms_json,yaml
 multi_line_output = 3
 order_by_type = false
 
 [mypy]
+check_untyped_defs = true
 disallow_any_generics = true
+disallow_untyped_calls = true
+disallow_untyped_defs = true
 ignore_missing_imports = true
 no_implicit_optional = true
 warn_unused_ignores = true
 
-[mypy-superset.*]
-check_untyped_defs = true
-disallow_untyped_calls = true
-disallow_untyped_defs = true
-warn_unused_ignores = false
-
 [mypy-superset.migrations.versions.*]
 ignore_errors = true
+
+[mypy-tests.*]
+check_untyped_defs = false
+disallow_untyped_calls = false
+disallow_untyped_defs = false
diff --git a/setup.py b/setup.py
index 30e4c5479f7e..19a08951df0b 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@
     long_description = f.read()
 
 
-def get_git_sha():
+def get_git_sha() -> str:
     try:
         s = subprocess.check_output(["git", "rev-parse", "HEAD"])
         return s.decode().strip()
@@ -70,13 +70,13 @@ def get_git_sha():
         "celery>=4.3.0, <5.0.0, !=4.4.1",
         "click<8",
         "colorama",
-        "contextlib2",
         "croniter>=0.3.28",
         "cron-descriptor",
         "cryptography>=3.3.2",
+        "deprecation>=2.1.0, <2.2.0",
         "flask>=1.1.0, <2.0.0",
         "flask-appbuilder>=3.3.0, <4.0.0",
-        "flask-caching",
+        "flask-caching>=1.10.0",
         "flask-compress",
         "flask-talisman",
         "flask-migrate",
@@ -84,37 +84,36 @@ def get_git_sha():
         "geopy",
         "graphlib-backport",
         "gunicorn>=20.0.2, <20.1",
+        "holidays==0.10.3",  # PINNED! https://github.com/dr-prodigy/python-holidays/issues/406
         "humanize",
-        "itsdangerous>=1.0.0, <2.0.0",
+        "itsdangerous>=1.0.0, <2.0.0",  # https://github.com/apache/superset/pull/14627
         "isodate",
         "markdown>=3.0",
         "msgpack>=1.0.0, <1.1",
         "pandas>=1.2.2, <1.3",
         "parsedatetime",
-        "pathlib2",
         "pgsanity",
         "polyline",
+        "pyparsing>=2.4.7, <3.0.0",
         "python-dateutil",
         "python-dotenv",
         "python-geohash",
-        "pyarrow>=3.0.0, <3.1",
+        "pyarrow>=4.0.1, <4.1",
         "pyyaml>=5.4",
         "PyJWT>=1.7.1, <2",
         "redis",
-        "retry>=0.9.2",
         "selenium>=3.141.0",
         "simplejson>=3.15.0",
         "slackclient==2.5.0",  # PINNED! slack changes file upload api in the future versions
         "sqlalchemy>=1.3.16, <1.4, !=1.3.21",
-        "sqlalchemy-utils>=0.36.6,<0.37",
+        "sqlalchemy-utils>=0.36.6, <0.37",
         "sqlparse==0.3.0",  # PINNED! see https://github.com/andialbrecht/sqlparse/issues/562
-        "typing-extensions>=3.7.4.3,<4",  # needed to support typing.Literal on py37
+        "tabulate==0.8.9",
+        "typing-extensions>=3.10, <4",  # needed to support Literal (3.8) and TypeGuard (3.10)
         "wtforms-json",
-        "pyparsing>=2.4.7, <3.0.0",
-        "holidays==0.10.3",  # PINNED! https://github.com/dr-prodigy/python-holidays/issues/406
     ],
     extras_require={
-        "athena": ["pyathena>=1.10.8,<1.11"],
+        "athena": ["pyathena>=1.10.8, <1.11"],
         "bigquery": [
             "pandas_gbq>=0.10.0",
             "pybigquery>=0.4.10",
@@ -134,7 +133,7 @@ def get_git_sha():
         "exasol": ["sqlalchemy-exasol>=2.1.0, <2.2"],
         "excel": ["xlrd>=1.2.0, <1.3"],
         "firebird": ["sqlalchemy-firebird>=0.7.0, <0.8"],
-        "gsheets": ["shillelagh[gsheetsapi]>=0.5, <0.6"],
+        "gsheets": ["shillelagh[gsheetsapi]>=0.7.1, <0.8"],
         "hana": ["hdbcli==2.4.162", "sqlalchemy_hana==0.4.0"],
         "hive": ["pyhive[hive]>=0.6.1", "tableschema", "thrift>=0.11.0, <1.0.0"],
         "impala": ["impyla>0.16.2, <0.17"],
@@ -148,10 +147,12 @@ def get_git_sha():
         "trino": ["sqlalchemy-trino>=0.2"],
         "prophet": ["prophet>=1.0.1, <1.1", "pystan<3.0"],
         "redshift": ["sqlalchemy-redshift>=0.8.1, < 0.9"],
+        "rockset": ["rockset>=0.7.68, <0.8"],
         "snowflake": ["snowflake-sqlalchemy>=1.2.3, <1.3"],
         "teradata": ["sqlalchemy-teradata==0.9.0.dev0"],
         "thumbnails": ["Pillow>=7.0.0, <8.0.0"],
         "vertica": ["sqlalchemy-vertica-python>=0.5.9, < 0.6"],
+        "netezza": ["nzalchemy>=11.0.2"],
     },
     python_requires="~=3.7",
     author="Apache Software Foundation",
diff --git a/superset-frontend/.storybook/main.js b/superset-frontend/.storybook/main.js
index 7d31e0f4f620..7b15d57dae7e 100644
--- a/superset-frontend/.storybook/main.js
+++ b/superset-frontend/.storybook/main.js
@@ -18,11 +18,11 @@
  */
 const path = require('path');
 
-// Suerset's webpack.config.js
+// Superset's webpack.config.js
 const customConfig = require('../webpack.config.js');
 
 module.exports = {
-stories: ['../src/@(components|common|filters)/**/*.stories.@(t|j)sx'],
+  stories: ['../src/@(components|common|filters)/**/*.stories.@(t|j)sx'],
   addons: [
     '@storybook/addon-essentials',
     '@storybook/addon-links',
@@ -43,4 +43,7 @@ stories: ['../src/@(components|common|filters)/**/*.stories.@(t|j)sx'],
     },
     plugins: [...config.plugins, ...customConfig.plugins],
   }),
+  typescript: {
+    reactDocgen: 'none',
+  },
 };
diff --git a/superset-frontend/babel.config.js b/superset-frontend/babel.config.js
index 5aa3420cf1ac..1d0cae25843d 100644
--- a/superset-frontend/babel.config.js
+++ b/superset-frontend/babel.config.js
@@ -45,6 +45,7 @@ module.exports = {
     ['@babel/plugin-proposal-class-properties', { loose: true }],
     ['@babel/plugin-proposal-optional-chaining', { loose: true }],
     ['@babel/plugin-proposal-private-methods', { loose: true }],
+    ['@babel/plugin-proposal-nullish-coalescing-operator', { loose: true }],
     ['@babel/plugin-transform-runtime', { corejs: 3 }],
     'react-hot-loader/babel',
   ],
@@ -81,5 +82,8 @@ module.exports = {
         ],
       ],
     },
+    testableProduction: {
+      plugins: [],
+    },
   },
 };
diff --git a/superset-frontend/cypress-base/cypress/integration/chart_list/card_view.test.ts b/superset-frontend/cypress-base/cypress/integration/chart_list/card_view.test.ts
index 22da71912af1..1335fcb42220 100644
--- a/superset-frontend/cypress-base/cypress/integration/chart_list/card_view.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/chart_list/card_view.test.ts
@@ -22,7 +22,7 @@ describe('chart card view', () => {
   beforeEach(() => {
     cy.login();
     cy.visit(CHART_LIST);
-    cy.get('[data-test="card-view"]').click();
+    cy.get('[aria-label="card-view"]').click();
   });
 
   it('should load cards', () => {
@@ -34,36 +34,36 @@ describe('chart card view', () => {
   it('should allow to favorite/unfavorite chart card', () => {
     cy.get("[data-test='card-actions']")
       .first()
-      .find("[data-test='favorite-selected']")
+      .find("[aria-label='favorite-selected']")
       .should('not.exist');
     cy.get("[data-test='card-actions']")
-      .find("[data-test='favorite-unselected']")
+      .find("[aria-label='favorite-unselected']")
       .first()
       .click();
     cy.get("[data-test='card-actions']")
       .first()
-      .find("[data-test='favorite-selected']")
+      .find("[aria-label='favorite-selected']")
       .should('be.visible');
     cy.get("[data-test='card-actions']")
       .first()
-      .find("[data-test='favorite-unselected']")
+      .find("[aria-label='favorite-unselected']")
       .should('not.exist');
 
     cy.get("[data-test='card-actions']")
       .first()
-      .find("[data-test='favorite-unselected']")
+      .find("[aria-label='favorite-unselected']")
       .should('not.exist');
     cy.get("[data-test='card-actions']")
       .first()
-      .find("[data-test='favorite-selected']")
+      .find("[aria-label='favorite-selected']")
       .click();
     cy.get("[data-test='card-actions']")
       .first()
-      .find("[data-test='favorite-unselected']")
+      .find("[aria-label='favorite-unselected']")
       .should('be.visible');
     cy.get("[data-test='card-actions']")
       .first()
-      .find("[data-test='favorite-selected']")
+      .find("[aria-label='favorite-selected']")
       .should('not.exist');
   });
 
diff --git a/superset-frontend/cypress-base/cypress/integration/chart_list/filter.test.ts b/superset-frontend/cypress-base/cypress/integration/chart_list/filter.test.ts
index dd9b573ebaf9..6892651e00ef 100644
--- a/superset-frontend/cypress-base/cypress/integration/chart_list/filter.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/chart_list/filter.test.ts
@@ -22,7 +22,7 @@ describe('chart card view filters', () => {
   beforeEach(() => {
     cy.login();
     cy.visit(CHART_LIST);
-    cy.get('[data-test="card-view"]').click();
+    cy.get('[aria-label="card-view"]').click();
   });
 
   it('should filter by owners correctly', () => {
@@ -89,7 +89,7 @@ describe('chart list view filters', () => {
   beforeEach(() => {
     cy.login();
     cy.visit(CHART_LIST);
-    cy.get('[data-test="list-view"]').click();
+    cy.get('[aria-label="list-view"]').click();
   });
 
   it('should filter by owners correctly', () => {
diff --git a/superset-frontend/cypress-base/cypress/integration/chart_list/list_view.test.ts b/superset-frontend/cypress-base/cypress/integration/chart_list/list_view.test.ts
index 915bf15f0ae8..6da5d90106d1 100644
--- a/superset-frontend/cypress-base/cypress/integration/chart_list/list_view.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/chart_list/list_view.test.ts
@@ -22,7 +22,7 @@ describe('chart list view', () => {
   beforeEach(() => {
     cy.login();
     cy.visit(CHART_LIST);
-    cy.get('[data-test="list-view"]').click();
+    cy.get('[aria-label="list-view"]').click();
   });
 
   it('should load rows', () => {
@@ -51,11 +51,11 @@ describe('chart list view', () => {
   it('should bulk delete correctly', () => {
     cy.get('[data-test="listview-table"]').should('be.visible');
     cy.get('[data-test="bulk-select"]').eq(0).click();
-    cy.get('[data-test="checkbox-off"]').eq(1).siblings('input').click();
-    cy.get('[data-test="checkbox-off"]').eq(2).siblings('input').click();
+    cy.get('[aria-label="checkbox-off"]').eq(1).siblings('input').click();
+    cy.get('[aria-label="checkbox-off"]').eq(2).siblings('input').click();
     cy.get('[data-test="bulk-select-action"]').eq(0).click();
     cy.get('[data-test="delete-modal-input"]').eq(0).type('DELETE');
     cy.get('[data-test="modal-confirm-button"]').eq(0).click();
-    cy.get('[data-test="checkbox-on"]').should('not.exist');
+    cy.get('[aria-label="checkbox-on"]').should('not.exist');
   });
 });
diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/controls.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard/controls.test.ts
index 73587ee3acd9..5ba40db499e3 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard/controls.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard/controls.test.ts
@@ -63,7 +63,7 @@ describe('Dashboard top-level controls', () => {
     // should allow force refresh
     WORLD_HEALTH_CHARTS.forEach(waitForChartLoad);
     getChartAliasesBySpec(WORLD_HEALTH_CHARTS).then(aliases => {
-      cy.get('[data-test="more-horiz"]').click();
+      cy.get('[aria-label="more-horiz"]').click();
       cy.get('[data-test="refresh-dashboard-menu-item"]').should(
         'not.have.class',
         'ant-dropdown-menu-item-disabled',
@@ -92,7 +92,7 @@ describe('Dashboard top-level controls', () => {
         });
       });
     });
-    cy.get('[data-test="more-horiz"]').click();
+    cy.get('[aria-label="more-horiz"]').click();
     cy.get('[data-test="refresh-dashboard-menu-item"]').and(
       'not.have.class',
       'ant-dropdown-menu-item-disabled',
diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/edit_mode.test.js b/superset-frontend/cypress-base/cypress/integration/dashboard/edit_mode.test.js
index 62f40c6162f4..d799dccd3bb6 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard/edit_mode.test.js
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard/edit_mode.test.js
@@ -23,7 +23,7 @@ describe('Dashboard edit mode', () => {
     cy.login();
     cy.visit(WORLD_HEALTH_DASHBOARD);
     cy.get('[data-test="dashboard-header"]')
-      .find('[data-test=edit-alt]')
+      .find('[aria-label=edit-alt]')
       .click();
   });
 
@@ -96,7 +96,7 @@ describe('Dashboard edit mode', () => {
       .click();
     cy.get('[data-test="dashboard-header"]').within(() => {
       cy.get('[data-test="dashboard-edit-actions"]').should('not.be.visible');
-      cy.get('[data-test="edit-alt"]').should('be.visible');
+      cy.get('[aria-label="edit-alt"]').should('be.visible');
     });
   });
 });
diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/edit_properties.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard/edit_properties.test.ts
index ad20010a824d..c5cbfb7bba66 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard/edit_properties.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard/edit_properties.test.ts
@@ -77,7 +77,7 @@ describe('Dashboard edit action', () => {
     cy.get('.dashboard-grid', { timeout: 50000 })
       .should('be.visible') // wait for 50 secs to load dashboard
       .then(() => {
-        cy.get('.dashboard-header [data-test=edit-alt]')
+        cy.get('.dashboard-header [aria-label=edit-alt]')
           .should('be.visible')
           .click();
         openDashboardEditProperties();
diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/fav_star.test.js b/superset-frontend/cypress-base/cypress/integration/dashboard/fav_star.test.js
index 812a3c9e7851..a20b1eb3f597 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard/fav_star.test.js
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard/fav_star.test.js
@@ -38,23 +38,23 @@ describe('Dashboard add to favorite', () => {
   it('should allow favor/unfavor', () => {
     if (!isFavoriteDashboard) {
       cy.get('[data-test="fave-unfave-icon"]')
-        .find('svg')
-        .should('have.attr', 'data-test', 'favorite-unselected');
+        .find('span')
+        .should('have.attr', 'aria-label', 'favorite-unselected');
       cy.get('[data-test="fave-unfave-icon"]').trigger('click');
       cy.get('[data-test="fave-unfave-icon"]')
-        .find('svg')
-        .should('have.attr', 'data-test', 'favorite-selected')
-        .and('not.have.attr', 'data-test', 'favorite-unselected');
+        .find('span')
+        .should('have.attr', 'aria-label', 'favorite-selected')
+        .and('not.have.attr', 'aria-label', 'favorite-unselected');
     } else {
       cy.get('[data-test="fave-unfave-icon"]')
-        .find('svg')
-        .should('have.attr', 'data-test', 'favorite-unselected')
-        .and('not.have.attr', 'data-test', 'favorite-selected');
+        .find('span')
+        .should('have.attr', 'aria-label', 'favorite-unselected')
+        .and('not.have.attr', 'aria-label', 'favorite-selected');
       cy.get('[data-test="fave-unfave-icon"]').trigger('click');
       cy.get('[data-test="fave-unfave-icon"]')
-        .find('svg')
-        .should('have.attr', 'data-test', 'favorite-unselected')
-        .and('not.have.attr', 'data-test', 'favorite-selected');
+        .find('span')
+        .should('have.attr', 'aria-label', 'favorite-unselected')
+        .and('not.have.attr', 'aria-label', 'favorite-selected');
     }
 
     // reset to original fav state
diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/filter.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard/filter.test.ts
index 375f14dacdd8..9b30639c24b6 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard/filter.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard/filter.test.ts
@@ -38,7 +38,7 @@ describe('Dashboard filter', () => {
       cy.get('.Select__placeholder:first').click();
 
       // should show the filter indicator
-      cy.get('svg[data-test="filter"]:visible').should(nodes => {
+      cy.get('span[aria-label="filter"]:visible').should(nodes => {
         expect(nodes.length).to.least(9);
       });
 
@@ -50,7 +50,7 @@ describe('Dashboard filter', () => {
       cy.get('.Select__menu').first().contains('South Asia').click();
 
       // should still have all filter indicators
-      cy.get('svg[data-test="filter"]:visible').should(nodes => {
+      cy.get('span[aria-label="filter"]:visible').should(nodes => {
         expect(nodes.length).to.least(9);
       });
 
diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/markdown.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard/markdown.test.ts
index a13a1c91460a..3f69c9f804f8 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard/markdown.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard/markdown.test.ts
@@ -30,12 +30,12 @@ describe('Dashboard edit markdown', () => {
       numScripts = nodes.length;
     });
     cy.get('[data-test="dashboard-header"]')
-      .find('[data-test="edit-alt"]')
+      .find('[aria-label="edit-alt"]')
       .click();
 
     // lazy load - need to open dropdown for the scripts to load
     cy.get('[data-test="dashboard-header"]')
-      .find('[data-test="more-horiz"]')
+      .find('[aria-label="more-horiz"]')
       .click();
     cy.get('script').then(nodes => {
       // load 5 new script chunks for css editor
@@ -70,7 +70,7 @@ describe('Dashboard edit markdown', () => {
       .type('Test resize');
 
     resize(
-      '[data-test="dashboard-markdown-editor"] .resizable-container span div',
+      '[data-test="dashboard-markdown-editor"] .resizable-container span div:last-child',
     ).to(500, 600);
 
     cy.get('[data-test="dashboard-markdown-editor"]').contains('Test resize');
@@ -78,7 +78,7 @@ describe('Dashboard edit markdown', () => {
     // entering edit mode does not add new scripts
     // (though scripts may still be removed by others)
     cy.get('script').then(nodes => {
-      expect(nodes.length).to.most(numScripts);
+      expect(nodes.length).to.greaterThan(numScripts);
     });
 
     cy.get('@component-background-first').click('right');
diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/save.test.js b/superset-frontend/cypress-base/cypress/integration/dashboard/save.test.js
index b56da45b89e8..2555730c38bd 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard/save.test.js
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard/save.test.js
@@ -25,7 +25,7 @@ import {
 } from './dashboard.helper';
 
 function openDashboardEditProperties() {
-  cy.get('.dashboard-header [data-test=edit-alt]').click();
+  cy.get('.dashboard-header [aria-label=edit-alt]').click();
   cy.get('#save-dash-split-button').trigger('click', { force: true });
   cy.get('.dropdown-menu').contains('Edit dashboard properties').click();
 }
@@ -42,7 +42,7 @@ describe('Dashboard save action', () => {
           'copyRequest',
         );
 
-        cy.get('[data-test="more-horiz"]').trigger('click', { force: true });
+        cy.get('[aria-label="more-horiz"]').trigger('click', { force: true });
         cy.get('[data-test="save-as-menu-item"]').trigger('click', {
           force: true,
         });
@@ -68,7 +68,7 @@ describe('Dashboard save action', () => {
     WORLD_HEALTH_CHARTS.forEach(waitForChartLoad);
 
     // remove box_plot chart from dashboard
-    cy.get('[data-test="edit-alt"]').click({ timeout: 5000 });
+    cy.get('[aria-label="edit-alt"]').click({ timeout: 5000 });
     cy.get('[data-test="dashboard-delete-component-button"]')
       .last()
       .trigger('moustenter')
@@ -87,7 +87,7 @@ describe('Dashboard save action', () => {
     // go back to view mode
     cy.wait('@saveRequest');
     cy.get('[data-test="dashboard-header"]')
-      .find('[data-test="edit-alt"]')
+      .find('[aria-label="edit-alt"]')
       .click();
 
     // deleted boxplot should still not exist
diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard_list/card_view.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard_list/card_view.test.ts
index 841fb560b127..8bfc35d71c84 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard_list/card_view.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard_list/card_view.test.ts
@@ -22,7 +22,7 @@ describe('Dashboard card view', () => {
   beforeEach(() => {
     cy.login();
     cy.visit(DASHBOARD_LIST);
-    cy.get('[data-test="card-view"]').click();
+    cy.get('[aria-label="card-view"]').click();
   });
 
   xit('should load cards', () => {
@@ -34,36 +34,36 @@ describe('Dashboard card view', () => {
   it('should allow to favorite/unfavorite dashboard card', () => {
     cy.get("[data-test='card-actions']")
       .first()
-      .find("[data-test='favorite-selected']")
+      .find("[aria-label='favorite-selected']")
       .should('not.exist');
     cy.get("[data-test='card-actions']")
-      .find("[data-test='favorite-unselected']")
+      .find("[aria-label='favorite-unselected']")
       .first()
       .click();
     cy.get("[data-test='card-actions']")
       .first()
-      .find("[data-test='favorite-selected']")
+      .find("[aria-label='favorite-selected']")
       .should('be.visible');
     cy.get("[data-test='card-actions']")
       .first()
-      .find("[data-test='favorite-unselected']")
+      .find("[aria-label='favorite-unselected']")
       .should('not.exist');
 
     cy.get("[data-test='card-actions']")
       .first()
-      .find("[data-test='favorite-unselected']")
+      .find("[aria-label='favorite-unselected']")
       .should('not.exist');
     cy.get("[data-test='card-actions']")
       .first()
-      .find("[data-test='favorite-selected']")
+      .find("[aria-label='favorite-selected']")
       .click();
     cy.get("[data-test='card-actions']")
       .first()
-      .find("[data-test='favorite-unselected']")
+      .find("[aria-label='favorite-unselected']")
       .should('be.visible');
     cy.get("[data-test='card-actions']")
       .first()
-      .find("[data-test='favorite-selected']")
+      .find("[aria-label='favorite-selected']")
       .should('not.exist');
   });
 
diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard_list/filter.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard_list/filter.test.ts
index caff4c03f675..aede8e7d5466 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard_list/filter.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard_list/filter.test.ts
@@ -22,7 +22,7 @@ describe('dashboard filters card view', () => {
   beforeEach(() => {
     cy.login();
     cy.visit(DASHBOARD_LIST);
-    cy.get('[data-test="card-view"]').click();
+    cy.get('[aria-label="card-view"]').click();
   });
 
   it('should filter by owners correctly', () => {
@@ -59,13 +59,13 @@ describe('dashboard filters card view', () => {
     // filter by published
     cy.get('.Select__control').eq(2).click();
     cy.get('.Select__menu').contains('Published').click({ timeout: 5000 });
-    cy.get('[data-test="styled-card"]').should('have.length', 2);
+    cy.get('[data-test="styled-card"]').should('have.length', 3);
     cy.get('[data-test="styled-card"]')
       .contains('USA Births Names')
       .should('be.visible');
     cy.get('.Select__control').eq(1).click();
     cy.get('.Select__control').eq(1).type('unpub{enter}');
-    cy.get('[data-test="styled-card"]').should('have.length', 2);
+    cy.get('[data-test="styled-card"]').should('have.length', 3);
   });
 });
 
@@ -73,7 +73,7 @@ describe('dashboard filters list view', () => {
   beforeEach(() => {
     cy.login();
     cy.visit(DASHBOARD_LIST);
-    cy.get('[data-test="list-view"]').click();
+    cy.get('[aria-label="list-view"]').click();
   });
 
   it('should filter by owners correctly', () => {
@@ -110,12 +110,12 @@ describe('dashboard filters list view', () => {
     // filter by published
     cy.get('.Select__control').eq(2).click();
     cy.get('.Select__menu').contains('Published').click();
-    cy.get('[data-test="table-row"]').should('have.length', 2);
+    cy.get('[data-test="table-row"]').should('have.length', 3);
     cy.get('[data-test="table-row"]')
       .contains('USA Births Names')
       .should('be.visible');
     cy.get('.Select__control').eq(2).click();
     cy.get('.Select__control').eq(2).type('unpub{enter}');
-    cy.get('[data-test="table-row"]').should('have.length', 2);
+    cy.get('[data-test="table-row"]').should('have.length', 3);
   });
 });
diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard_list/list_view.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard_list/list_view.test.ts
index 924cf84b6e46..a758552481f9 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard_list/list_view.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard_list/list_view.test.ts
@@ -22,7 +22,7 @@ describe('dashboard list view', () => {
   beforeEach(() => {
     cy.login();
     cy.visit(DASHBOARD_LIST);
-    cy.get('[data-test="list-view"]').click();
+    cy.get('[aria-label="list-view"]').click();
   });
 
   xit('should load rows', () => {
@@ -51,11 +51,11 @@ describe('dashboard list view', () => {
   it('should bulk delete correctly', () => {
     cy.get('[data-test="listview-table"]').should('be.visible');
     cy.get('[data-test="bulk-select"]').eq(0).click();
-    cy.get('[data-test="checkbox-off"]').eq(1).siblings('input').click();
-    cy.get('[data-test="checkbox-off"]').eq(2).siblings('input').click();
+    cy.get('[aria-label="checkbox-off"]').eq(1).siblings('input').click();
+    cy.get('[aria-label="checkbox-off"]').eq(2).siblings('input').click();
     cy.get('[data-test="bulk-select-action"]').eq(0).click();
     cy.get('[data-test="delete-modal-input"]').eq(0).type('DELETE');
     cy.get('[data-test="modal-confirm-button"]').eq(0).click();
-    cy.get('[data-test="checkbox-on"]').should('not.exist');
+    cy.get('[aria-label="checkbox-on"]').should('not.exist');
   });
 });
diff --git a/superset-frontend/cypress-base/cypress/integration/database/modal.test.ts b/superset-frontend/cypress-base/cypress/integration/database/modal.test.ts
index e29ec48a9479..225502167656 100644
--- a/superset-frontend/cypress-base/cypress/integration/database/modal.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/database/modal.test.ts
@@ -21,71 +21,50 @@ import { DATABASE_LIST } from './helper';
 describe('Add database', () => {
   beforeEach(() => {
     cy.login();
-  });
-
-  it('should keep create modal open when error', () => {
     cy.visit(DATABASE_LIST);
-
-    // open modal
+    cy.wait(3000);
     cy.get('[data-test="btn-create-database"]').click();
+  });
 
-    // values should be blank
-    cy.get('[data-test="database-modal"] input[name="database_name"]').should(
-      'have.value',
-      '',
-    );
-    cy.get('[data-test="database-modal"] input[name="sqlalchemy_uri"]').should(
-      'have.value',
-      '',
-    );
-
-    // type values
-    cy.get('[data-test="database-modal"] input[name="database_name"]')
-      .focus()
-      .type('cypress');
-    cy.get('[data-test="database-modal"] input[name="sqlalchemy_uri"]')
-      .focus()
-      .type('bad_db_uri');
-
-    // click save
-    cy.get('[data-test="modal-confirm-button"]:not(:disabled)').click();
-
-    // should show error alerts and keep modal open
-    cy.get('.toast').contains('error');
-    cy.wait(1000); // wait for potential (incorrect) closing annimation
-    cy.get('[data-test="database-modal"]').should('be.visible');
+  it('should open dynamic form', () => {
+    // click postgres dynamic form
+    cy.get('.preferred > :nth-child(1)').click();
 
-    // should be able to close modal
-    cy.get('[data-test="modal-cancel-button"]').click();
-    cy.get('[data-test="database-modal"]').should('not.be.visible');
+    // make sure all the fields are rendering
+    cy.get('input[name="host"]').should('have.value', '');
+    cy.get('input[name="port"]').should('have.value', '');
+    cy.get('input[name="database"]').should('have.value', '');
+    cy.get('input[name="password"]').should('have.value', '');
+    cy.get('input[name="database_name"]').should('have.value', '');
   });
 
-  it('should keep update modal open when error', () => {
-    // open modal
-    cy.get('[data-test="database-edit"]:last').click();
-
-    // it should show saved values
-    cy.get('[data-test="database-modal"]:last input[name="sqlalchemy_uri"]')
-      .invoke('val')
-      .should('not.be.empty');
-    cy.get('[data-test="database-modal"] input[name="database_name"]')
-      .invoke('val')
-      .should('not.be.empty');
+  it('should open sqlalchemy form', () => {
+    // click postgres dynamic form
+    cy.get('.preferred > :nth-child(1)').click();
 
-    cy.get('[data-test="database-modal"]:last input[name="sqlalchemy_uri"]')
-      .focus()
-      .dblclick()
-      .type('{selectall}{backspace}bad_uri');
+    cy.get('[data-test="sqla-connect-btn"]').click();
 
-    // click save
-    cy.get('[data-test="modal-confirm-button"]:not(:disabled)').click();
+    // check if the sqlalchemy form is showing up
+    cy.get('[data-test=database-name-input]').should('be.visible');
+    cy.get('[data-test="sqlalchemy-uri-input"]').should('be.visible');
+  });
 
-    // should show error alerts
-    // TODO(hugh): Update this test
-    // cy.get('.toast').contains('error').should('be.visible');
+  it('show error alerts on dynamic form for bad host', () => {
+    // click postgres dynamic form
+    cy.get('.preferred > :nth-child(1)').click();
+    cy.get('input[name="host"]').focus().type('badhost');
+    cy.get('input[name="port"]').focus().type('5432');
+    cy.get('.ant-form-item-explain-error').contains(
+      "The hostname provided can't be resolved",
+    );
+  });
 
-    // modal should still be open
-    // cy.wait(1000); // wait for potential (incorrect) closing annimation
-    // cy.get('[data-test="database-modal"]').should('be.visible');
+  it('show error alerts on dynamic form for bad port', () => {
+    // click postgres dynamic form
+    cy.get('.preferred > :nth-child(1)').click();
+    cy.get('input[name="host"]').focus().type('localhost');
+    cy.get('input[name="port"]').focus().type('123');
+    cy.get('input[name="database"]').focus();
+    cy.get('.ant-form-item-explain-error').contains('The port is closed');
   });
 });
diff --git a/superset-frontend/cypress-base/cypress/integration/explore/control.test.ts b/superset-frontend/cypress-base/cypress/integration/explore/control.test.ts
index e6d8b5676ebd..fc81c92dde00 100644
--- a/superset-frontend/cypress-base/cypress/integration/explore/control.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/explore/control.test.ts
@@ -99,20 +99,14 @@ describe('VizType control', () => {
     cy.visitChartByName('Daily Totals');
     cy.verifySliceSuccess({ waitAlias: '@tableChartData' });
 
-    let numScripts = 0;
-    cy.get('script').then(nodes => {
-      numScripts = nodes.length;
-    });
-
     cy.get('[data-test="visualization-type"]').contains('Table').click();
 
+    cy.get('button').contains('Evolution').click(); // change categories
     cy.get('[role="button"]').contains('Line Chart').click();
+    cy.get('button').contains('Select').click();
 
     // should load mathjs for line chart
     cy.get('script[src*="mathjs"]').should('have.length', 1);
-    cy.get('script').then(nodes => {
-      expect(nodes.length).to.greaterThan(numScripts);
-    });
 
     cy.get('button[data-test="run-query-button"]').click();
     cy.verifySliceSuccess({
diff --git a/superset-frontend/cypress-base/cypress/integration/explore/visualizations/line.test.ts b/superset-frontend/cypress-base/cypress/integration/explore/visualizations/line.test.ts
index 26660bc5fa67..f75fe77cceed 100644
--- a/superset-frontend/cypress-base/cypress/integration/explore/visualizations/line.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/explore/visualizations/line.test.ts
@@ -73,13 +73,12 @@ describe('Visualization > Line', () => {
   it('should allow type to search color schemes', () => {
     cy.get('#controlSections-tab-display').click();
     cy.get('.Control[data-test="color_scheme"]').scrollIntoView();
-    cy.get('.Control[data-test="color_scheme"] input[type="text"]')
+    cy.get('.Control[data-test="color_scheme"] input[type="search"]')
       .focus()
-      .type('air{enter}');
-    cy.get('input[name="select-color_scheme"]').should(
-      'have.value',
-      'bnbColors',
-    );
+      .type('bnbColors{enter}');
+    cy.get(
+      '.Control[data-test="color_scheme"] .ant-select-selection-item > ul[data-test="bnbColors"]',
+    ).should('exist');
   });
 
   it('should work with adhoc metric', () => {
diff --git a/superset-frontend/images/icons/alert_solid_small.svg b/superset-frontend/images/icons/alert_solid_small.svg
index 092c37f1ce9a..b590be2a0e60 100644
--- a/superset-frontend/images/icons/alert_solid_small.svg
+++ b/superset-frontend/images/icons/alert_solid_small.svg
@@ -17,6 +17,6 @@ specific language governing permissions and limitations
 under the License.
 -->
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.335 8.735L7.30998 1.735C7.04507 1.26004 6.54382 0.965683 5.99998 0.965683C5.45614 0.965683 4.9549 1.26004 4.68998 1.735L0.689984 8.735C0.416009 9.19706 0.410037 9.77036 0.674327 10.238C0.938617 10.7057 1.43282 10.9963 1.96998 11H10.03C10.5716 11.0053 11.0741 10.7182 11.3445 10.2489C11.6149 9.77957 11.6113 9.20091 11.335 8.735Z" fill="currentColor"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M5.5 4.5C5.5 4.22386 5.72386 4 6 4C6.27614 4 6.5 4.22386 6.5 4.5V6.5C6.5 6.77614 6.27614 7 6 7C5.72386 7 5.5 6.77614 5.5 6.5V4.5ZM5.5 8.5C5.5 8.22386 5.72386 8 6 8C6.27614 8 6.5 8.22386 6.5 8.5C6.5 8.77614 6.27614 9 6 9C5.72386 9 5.5 8.77614 5.5 8.5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.345929226875306,14.745929226875305 L13.320909226875305,7.7459292268753055 C13.055999226875306,7.270969226875306 12.554749226875305,6.9766122268753055 12.010909226875306,6.9766122268753055 C11.467069226875305,6.9766122268753055 10.965829226875307,7.270969226875306 10.700909226875304,7.7459292268753055 L6.700913226875306,14.745929226875305 C6.426938226875307,15.207989226875306 6.420966226875306,15.781289226875305 6.685256226875307,16.248929226875305 C6.949546226875305,16.716629226875305 7.443749226875305,17.007229226875303 7.980909226875305,17.010929226875305 H16.040929226875306 C16.582529226875305,17.016229226875307 17.085029226875307,16.729129226875305 17.355429226875305,16.259829226875304 C17.625829226875304,15.790499226875305 17.622229226875305,15.211839226875306 17.345929226875306,14.745929226875305 z" fill="currentColor" />
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.510929226875305,10.510929226875305 C11.510929226875305,10.234789226875305 11.734789226875307,10.010929226875307 12.010929226875305,10.010929226875307 C12.287069226875303,10.010929226875307 12.510929226875305,10.234789226875305 12.510929226875305,10.510929226875305 V12.510929226875305 C12.510929226875305,12.787069226875305 12.287069226875303,13.010929226875307 12.010929226875305,13.010929226875307 C11.734789226875307,13.010929226875307 11.510929226875305,12.787069226875305 11.510929226875305,12.510929226875305 V10.510929226875305 zM11.510929226875305,14.510929226875305 C11.510929226875305,14.234789226875305 11.734789226875307,14.010929226875307 12.010929226875305,14.010929226875307 C12.287069226875303,14.010929226875307 12.510929226875305,14.234789226875305 12.510929226875305,14.510929226875305 C12.510929226875305,14.787069226875305 12.287069226875303,15.010929226875307 12.010929226875305,15.010929226875307 C11.734789226875307,15.010929226875307 11.510929226875305,14.787069226875305 11.510929226875305,14.510929226875305 z" fill="white" />
 </svg>
diff --git a/superset-frontend/images/icons/ballot.svg b/superset-frontend/images/icons/ballot.svg
new file mode 100644
index 000000000000..00d1a235ce11
--- /dev/null
+++ b/superset-frontend/images/icons/ballot.svg
@@ -0,0 +1,22 @@
+<!--
+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.
+-->
+
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.66667 5H12V6.33333H8.66667V5ZM8.66667 9.66667H12V11H8.66667V9.66667ZM12.6667 2H3.33333C2.6 2 2 2.6 2 3.33333V12.6667C2 13.4 2.6 14 3.33333 14H12.6667C13.4 14 14 13.4 14 12.6667V3.33333C14 2.6 13.4 2 12.6667 2ZM12.6667 12.6667H3.33333V3.33333H12.6667V12.6667ZM7.33333 4H4V7.33333H7.33333V4ZM6.66667 6.66667H4.66667V4.66667H6.66667V6.66667ZM7.33333 8.66667H4V12H7.33333V8.66667ZM6.66667 11.3333H4.66667V9.33333H6.66667V11.3333Z" fill="currentColor"/>
+</svg>
diff --git a/superset-frontend/images/icons/category.svg b/superset-frontend/images/icons/category.svg
new file mode 100644
index 000000000000..471cf254d022
--- /dev/null
+++ b/superset-frontend/images/icons/category.svg
@@ -0,0 +1,22 @@
+<!--
+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.
+-->
+
+<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.73967 1.7002L4.04888 7.79629H11.4305L7.73967 1.7002ZM7.73967 4.3012L9.0348 6.4416H6.43783L7.73967 4.3012ZM11.4305 9.15098C9.75954 9.15098 8.41072 10.5124 8.41072 12.199C8.41072 13.8856 9.75954 15.2471 11.4305 15.2471C13.1014 15.2471 14.4502 13.8856 14.4502 12.199C14.4502 10.5124 13.1014 9.15098 11.4305 9.15098ZM11.4305 13.8924C10.5044 13.8924 9.75283 13.1338 9.75283 12.199C9.75283 11.2643 10.5044 10.5057 11.4305 10.5057C12.3565 10.5057 13.1081 11.2643 13.1081 12.199C13.1081 13.1338 12.3565 13.8924 11.4305 13.8924ZM1.7002 14.9084H7.06862V9.48965H1.7002V14.9084ZM3.0423 10.8443H5.72651V13.5537H3.0423V10.8443Z" fill="currentColor" fill-opacity="0.85"/>
+</svg>
diff --git a/superset-frontend/images/icons/default_db_image.svg b/superset-frontend/images/icons/default_db_image.svg
new file mode 100644
index 000000000000..f8892bb31241
--- /dev/null
+++ b/superset-frontend/images/icons/default_db_image.svg
@@ -0,0 +1,21 @@
+<!--
+  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.
+-->
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M15.9942 14.9661C16.0473 14.9256 16.0843 14.893 16.1094 14.8686V12.3207C15.7158 12.5563 15.2568 12.7608 14.7565 12.9359C13.2501 13.4632 11.2149 13.7763 8.99998 13.7763C6.78508 13.7763 4.74988 13.4632 3.24347 12.9359C2.74318 12.7608 2.28418 12.5563 1.89058 12.3207V14.8686C1.91568 14.893 1.95268 14.9256 2.00578 14.9661C2.26078 15.1603 2.71837 15.3956 3.40987 15.6184C4.77707 16.059 6.75368 16.3544 8.99998 16.3544C11.2463 16.3544 13.2229 16.059 14.5901 15.6184C15.2816 15.3956 15.7392 15.1603 15.9942 14.9661ZM15.7503 10.8614C16.0622 10.6033 16.1094 10.4232 16.1094 10.3388V8.41454C15.7158 8.65004 15.2568 8.85464 14.7565 9.02974C13.2501 9.55694 11.2149 9.87004 8.99998 9.87004C6.78508 9.87004 4.74988 9.55694 3.24347 9.02974C2.74318 8.85464 2.28418 8.65004 1.89058 8.41454V10.3388C1.89058 10.4232 1.93777 10.6033 2.24967 10.8614C2.55707 11.1158 3.04418 11.3763 3.70798 11.6086C5.02918 12.071 6.90007 12.37 8.99998 12.37C11.0999 12.37 12.9708 12.071 14.292 11.6086C14.9558 11.3763 15.4429 11.1158 15.7503 10.8614ZM0.484375 6.43254V10.3388V15.0165C0.484375 16.5321 4.29698 17.7607 8.99998 17.7607C13.703 17.7607 17.5156 16.5321 17.5156 15.0165V10.3388V6.43254V3.31734C17.5156 1.80174 13.703 0.573242 8.99998 0.573242H8.99508H8.99018C4.29258 0.573242 0.484375 1.80174 0.484375 3.31734V6.43254ZM16.1094 6.43254V4.81964C14.59 5.56754 11.9689 6.06144 8.99018 6.06144C6.02428 6.06144 3.41288 5.57174 1.89058 4.82924V6.43254C1.89058 6.51694 1.93777 6.69714 2.24967 6.95524C2.55707 7.20954 3.04418 7.47004 3.70798 7.70244C5.02918 8.16484 6.90007 8.46384 8.99998 8.46384C11.0999 8.46384 12.9708 8.16484 14.292 7.70244C14.9558 7.47004 15.4429 7.20954 15.7503 6.95524C16.0622 6.69714 16.1094 6.51694 16.1094 6.43254ZM2.07487 3.31764C2.33937 3.50124 2.77558 3.71554 3.40748 3.91944C4.77268 4.35984 6.74668 4.65524 8.99018 4.65524C11.2337 4.65524 13.2078 4.35984 14.573 3.91944C15.2053 3.71544 15.6416 3.50104 15.9061 3.31734C15.6416 3.13364 15.2053 2.91924 14.573 2.71524C13.2087 2.27514 11.2366 1.97984 8.99508 1.97944C6.75078 1.97984 4.77607 2.27514 3.40987 2.71544C2.77677 2.91944 2.33977 3.13384 2.07487 3.31764ZM16.1561 14.8151C16.1565 14.8152 16.1546 14.8186 16.1493 14.8253C16.1532 14.8185 16.1558 14.8151 16.1561 14.8151ZM1.84998 3.50934C1.84668 3.51524 1.84438 3.51814 1.84408 3.51804H1.84398C1.84458 3.51684 1.84648 3.51394 1.84998 3.50934ZM1.84387 14.8151C1.84417 14.8151 1.84678 14.8185 1.85068 14.8253C1.84538 14.8186 1.84347 14.8152 1.84387 14.8151Z" fill="#444E7C"/>
+</svg>
diff --git a/superset-frontend/images/icons/more_vert.svg b/superset-frontend/images/icons/more_vert.svg
new file mode 100644
index 000000000000..2fbe6287d86e
--- /dev/null
+++ b/superset-frontend/images/icons/more_vert.svg
@@ -0,0 +1,21 @@
+<!--
+  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.
+-->
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 12C10 13.1046 10.8954 14 12 14C13.1046 14 14 13.1046 14 12C14 10.8954 13.1046 10 12 10C10.8954 10 10 10.8954 10 12ZM10 19C10 20.1046 10.8954 21 12 21C13.1046 21 14 20.1046 14 19C14 17.8954 13.1046 17 12 17C10.8954 17 10 17.8954 10 19ZM10 5C10 6.10457 10.8954 7 12 7C13.1046 7 14 6.10457 14 5C14 3.89543 13.1046 3 12 3C10.8954 3 10 3.89543 10 5Z" fill="currentColor"/>
+</svg>
diff --git a/superset-frontend/images/icons/tags.svg b/superset-frontend/images/icons/tags.svg
new file mode 100644
index 000000000000..36a061ecf33b
--- /dev/null
+++ b/superset-frontend/images/icons/tags.svg
@@ -0,0 +1,22 @@
+<!--
+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.
+-->
+
+<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.1668 7.0835V5.66683H11.3335V2.8335H9.91683V5.66683H7.0835V2.8335H5.66683V5.66683H2.8335V7.0835H5.66683V9.91683H2.8335V11.3335H5.66683V14.1668H7.0835V11.3335H9.91683V14.1668H11.3335V11.3335H14.1668V9.91683H11.3335V7.0835H14.1668ZM9.91683 9.91683H7.0835V7.0835H9.91683V9.91683Z" fill="currentColor" fill-opacity="0.85"/>
+</svg>
diff --git a/superset-frontend/images/netezza.png b/superset-frontend/images/netezza.png
new file mode 100644
index 000000000000..2658d8629bf1
Binary files /dev/null and b/superset-frontend/images/netezza.png differ
diff --git a/superset-frontend/jest.config.js b/superset-frontend/jest.config.js
index 99a121561bf3..191f7a5e1df1 100644
--- a/superset-frontend/jest.config.js
+++ b/superset-frontend/jest.config.js
@@ -20,7 +20,7 @@ module.exports = {
   testRegex: '(\\/spec|\\/src)\\/.*(_spec|\\.test)\\.(j|t)sx?$',
   moduleNameMapper: {
     '\\.(css|less)$': '<rootDir>/spec/__mocks__/styleMock.js',
-    '\\.(gif|ttf|eot|png)$': '<rootDir>/spec/__mocks__/fileMock.js',
+    '\\.(gif|ttf|eot|png|jpg)$': '<rootDir>/spec/__mocks__/fileMock.js',
     '\\.svg$': '<rootDir>/spec/__mocks__/svgrMock.tsx',
     '^src/(.*)$': '<rootDir>/src/$1',
     '^spec/(.*)$': '<rootDir>/spec/$1',
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
index 2649abee8eb2..1ef93bce0e86 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "superset",
-  "version": "0.999.0dev",
+  "version": "0.0.0dev",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "superset",
-      "version": "0.999.0dev",
+      "version": "0.0.0dev",
       "license": "Apache-2.0",
       "dependencies": {
         "@ant-design/icons": "^4.2.2",
@@ -15,35 +15,35 @@
         "@emotion/babel-preset-css-prop": "^11.2.0",
         "@emotion/cache": "^11.1.3",
         "@emotion/react": "^11.1.5",
-        "@superset-ui/chart-controls": "^0.17.53",
-        "@superset-ui/core": "^0.17.53",
-        "@superset-ui/legacy-plugin-chart-calendar": "^0.17.53",
-        "@superset-ui/legacy-plugin-chart-chord": "^0.17.53",
-        "@superset-ui/legacy-plugin-chart-country-map": "^0.17.53",
-        "@superset-ui/legacy-plugin-chart-event-flow": "^0.17.53",
-        "@superset-ui/legacy-plugin-chart-force-directed": "^0.17.53",
-        "@superset-ui/legacy-plugin-chart-heatmap": "^0.17.53",
-        "@superset-ui/legacy-plugin-chart-histogram": "^0.17.53",
-        "@superset-ui/legacy-plugin-chart-horizon": "^0.17.53",
-        "@superset-ui/legacy-plugin-chart-map-box": "^0.17.53",
-        "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.17.53",
-        "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.17.53",
-        "@superset-ui/legacy-plugin-chart-partition": "^0.17.53",
-        "@superset-ui/legacy-plugin-chart-pivot-table": "^0.17.53",
-        "@superset-ui/legacy-plugin-chart-rose": "^0.17.53",
-        "@superset-ui/legacy-plugin-chart-sankey": "^0.17.53",
-        "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.17.53",
-        "@superset-ui/legacy-plugin-chart-sunburst": "^0.17.53",
-        "@superset-ui/legacy-plugin-chart-treemap": "^0.17.53",
-        "@superset-ui/legacy-plugin-chart-world-map": "^0.17.53",
-        "@superset-ui/legacy-preset-chart-big-number": "^0.17.53",
-        "@superset-ui/legacy-preset-chart-deckgl": "^0.4.7",
-        "@superset-ui/legacy-preset-chart-nvd3": "^0.17.53",
-        "@superset-ui/plugin-chart-echarts": "^0.17.53",
-        "@superset-ui/plugin-chart-pivot-table": "^0.17.53",
-        "@superset-ui/plugin-chart-table": "^0.17.53",
-        "@superset-ui/plugin-chart-word-cloud": "^0.17.53",
-        "@superset-ui/preset-chart-xy": "^0.17.53",
+        "@superset-ui/chart-controls": "^0.17.85",
+        "@superset-ui/core": "^0.17.81",
+        "@superset-ui/legacy-plugin-chart-calendar": "^0.17.85",
+        "@superset-ui/legacy-plugin-chart-chord": "^0.17.85",
+        "@superset-ui/legacy-plugin-chart-country-map": "^0.17.85",
+        "@superset-ui/legacy-plugin-chart-event-flow": "^0.17.85",
+        "@superset-ui/legacy-plugin-chart-force-directed": "^0.17.85",
+        "@superset-ui/legacy-plugin-chart-heatmap": "^0.17.85",
+        "@superset-ui/legacy-plugin-chart-histogram": "^0.17.85",
+        "@superset-ui/legacy-plugin-chart-horizon": "^0.17.85",
+        "@superset-ui/legacy-plugin-chart-map-box": "^0.17.85",
+        "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.17.85",
+        "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.17.85",
+        "@superset-ui/legacy-plugin-chart-partition": "^0.17.85",
+        "@superset-ui/legacy-plugin-chart-pivot-table": "^0.17.85",
+        "@superset-ui/legacy-plugin-chart-rose": "^0.17.85",
+        "@superset-ui/legacy-plugin-chart-sankey": "^0.17.85",
+        "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.17.85",
+        "@superset-ui/legacy-plugin-chart-sunburst": "^0.17.85",
+        "@superset-ui/legacy-plugin-chart-treemap": "^0.17.85",
+        "@superset-ui/legacy-plugin-chart-world-map": "^0.17.85",
+        "@superset-ui/legacy-preset-chart-big-number": "^0.17.86",
+        "@superset-ui/legacy-preset-chart-deckgl": "^0.4.11",
+        "@superset-ui/legacy-preset-chart-nvd3": "^0.17.85",
+        "@superset-ui/plugin-chart-echarts": "^0.17.85",
+        "@superset-ui/plugin-chart-pivot-table": "^0.17.85",
+        "@superset-ui/plugin-chart-table": "^0.17.85",
+        "@superset-ui/plugin-chart-word-cloud": "^0.17.85",
+        "@superset-ui/preset-chart-xy": "^0.17.85",
         "@vx/responsive": "^0.0.195",
         "abortcontroller-polyfill": "^1.1.9",
         "antd": "^4.9.4",
@@ -58,8 +58,10 @@
         "d3-color": "^1.2.0",
         "d3-scale": "^2.1.2",
         "dom-to-image": "^2.6.0",
+        "emotion-rgba": "0.0.9",
         "fontsource-fira-code": "^3.0.5",
         "fontsource-inter": "^3.0.5",
+        "fuse.js": "^6.4.6",
         "geolib": "^2.0.24",
         "global-box": "^1.2.0",
         "html-webpack-plugin": "^4.5.1",
@@ -77,6 +79,7 @@
         "mathjs": "^8.0.1",
         "memoize-one": "^5.1.1",
         "moment": "^2.26.0",
+        "moment-timezone": "^0.5.33",
         "mousetrap": "^1.6.1",
         "mustache": "^2.2.1",
         "omnibar": "^2.1.1",
@@ -94,10 +97,10 @@
         "react-dom": "^16.13.0",
         "react-gravatar": "^2.6.1",
         "react-hot-loader": "^4.12.20",
-        "react-icons": "^4.2.0",
         "react-js-cron": "^1.2.0",
         "react-json-tree": "^0.11.2",
         "react-jsonschema-form": "^1.2.0",
+        "react-lines-ellipsis": "^0.15.0",
         "react-loadable": "^5.5.0",
         "react-markdown": "^4.3.1",
         "react-redux": "^7.2.0",
@@ -124,6 +127,7 @@
         "redux-undo": "^1.0.0-beta9-9-7",
         "regenerator-runtime": "^0.13.5",
         "rison": "^0.1.1",
+        "scroll-into-view-if-needed": "^2.2.28",
         "shortid": "^2.2.6",
         "urijs": "^1.19.6",
         "use-immer": "^0.4.2",
@@ -243,12 +247,11 @@
         "storybook-addon-jsx": "^7.3.3",
         "storybook-addon-paddings": "^3.2.0",
         "style-loader": "^1.0.0",
-        "terser-webpack-plugin": "^1.1.0",
         "thread-loader": "^1.2.0",
         "transform-loader": "^0.2.3",
         "ts-jest": "^26.4.2",
         "ts-loader": "^8.0.7",
-        "typescript": "^4.0.3",
+        "typescript": "^4.1.6",
         "url-loader": "^1.0.1",
         "webpack": "^4.42.0",
         "webpack-bundle-analyzer": "^3.6.1",
@@ -480,11 +483,14 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
-      "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
+      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
       "dependencies": {
-        "@babel/highlight": "^7.0.0"
+        "@babel/highlight": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
@@ -497,6 +503,7 @@
       "version": "7.12.10",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz",
       "integrity": "sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==",
+      "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/generator": "^7.12.10",
@@ -518,125 +525,11 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/core/node_modules/@babel/code-frame": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/core/node_modules/@babel/generator": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
-      "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
-      "dependencies": {
-        "@babel/types": "^7.12.11",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@babel/core/node_modules/@babel/helper-function-name": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz",
-      "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==",
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.10",
-        "@babel/template": "^7.12.7",
-        "@babel/types": "^7.12.11"
-      }
-    },
-    "node_modules/@babel/core/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz",
-      "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==",
-      "dependencies": {
-        "@babel/types": "^7.12.10"
-      }
-    },
-    "node_modules/@babel/core/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz",
-      "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==",
-      "dependencies": {
-        "@babel/types": "^7.12.11"
-      }
-    },
-    "node_modules/@babel/core/node_modules/@babel/highlight": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/core/node_modules/@babel/parser": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
-      "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==",
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/core/node_modules/@babel/template": {
-      "version": "7.12.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
-      "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.12.7",
-        "@babel/types": "^7.12.7"
-      }
-    },
-    "node_modules/@babel/core/node_modules/@babel/traverse": {
-      "version": "7.12.12",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz",
-      "integrity": "sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.11",
-        "@babel/generator": "^7.12.11",
-        "@babel/helper-function-name": "^7.12.11",
-        "@babel/helper-split-export-declaration": "^7.12.11",
-        "@babel/parser": "^7.12.11",
-        "@babel/types": "^7.12.12",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
-      }
-    },
-    "node_modules/@babel/core/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/core/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/core/node_modules/convert-source-map": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
       "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "dev": true,
       "dependencies": {
         "safe-buffer": "~5.1.1"
       }
@@ -645,6 +538,7 @@
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
       "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -656,6 +550,7 @@
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
       "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
+      "dev": true,
       "dependencies": {
         "minimist": "^1.2.5"
       },
@@ -669,59 +564,32 @@
     "node_modules/@babel/core/node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/@babel/core/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "node_modules/@babel/generator": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.3.tgz",
-      "integrity": "sha512-drt8MUHbEqRzNR0xnF8nMehbY11b1SDkRw03PSNH/3Rb2Z35oxkddVSi3rcaak0YJQ86PCuE7Qx1jSFhbLNBMA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.5.tgz",
+      "integrity": "sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.10.3",
+        "@babel/types": "^7.14.5",
         "jsesc": "^2.5.1",
-        "lodash": "^4.17.13",
         "source-map": "^0.5.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz",
-      "integrity": "sha512-ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.10.1"
-      }
-    },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.1.tgz",
-      "integrity": "sha512-cQpVq48EkYxUU0xozpGCLla3wlkdRRqLWu1ksFMXA9CM5KQmyyRpSEsYXbao7JUkOw/tAaYKCaYyZq6HOFYtyw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.10.1",
-        "@babel/types": "^7.10.1"
-      }
-    },
-    "node_modules/@babel/helper-builder-react-jsx-experimental": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.1.tgz",
-      "integrity": "sha512-irQJ8kpQUV3JasXPSFQ+LCCtJSc5ceZrPFVj6TElR6XCHssi3jV8ch3odIrNtjJFRZZVbrOEfJMI79TPU/h1pQ==",
-      "dev": true,
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz",
+      "integrity": "sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-module-imports": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
@@ -783,202 +651,20 @@
       "dev": true
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz",
-      "integrity": "sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-member-expression-to-functions": "^7.12.1",
-        "@babel/helper-optimise-call-expression": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.12.1",
-        "@babel/helper-split-export-declaration": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/code-frame": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/generator": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
-      "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.11",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-function-name": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz",
-      "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.10",
-        "@babel/template": "^7.12.7",
-        "@babel/types": "^7.12.11"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz",
-      "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.10"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.12.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz",
-      "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.7"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz",
-      "integrity": "sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.10"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-replace-supers": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz",
-      "integrity": "sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.12.7",
-        "@babel/helper-optimise-call-expression": "^7.12.10",
-        "@babel/traverse": "^7.12.10",
-        "@babel/types": "^7.12.11"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz",
-      "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.11"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/highlight": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/parser": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
-      "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/template": {
-      "version": "7.12.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
-      "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.12.7",
-        "@babel/types": "^7.12.7"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/traverse": {
-      "version": "7.12.12",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz",
-      "integrity": "sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.11",
-        "@babel/generator": "^7.12.11",
-        "@babel/helper-function-name": "^7.12.11",
-        "@babel/helper-split-export-declaration": "^7.12.11",
-        "@babel/parser": "^7.12.11",
-        "@babel/types": "^7.12.12",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.6.tgz",
+      "integrity": "sha512-Z6gsfGofTxH/+LQXqYEK45kxmcensbzmk/oi8DmaQytlQCgqNZt9XQF8iqlI/SeXWVjaMNxvYvzaYw+kh42mDg==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-member-expression-to-functions": "^7.14.5",
+        "@babel/helper-optimise-call-expression": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5",
+        "@babel/helper-split-export-declaration": "^7.14.5"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
@@ -1036,63 +722,54 @@
         "regjsparser": "bin/parser"
       }
     },
-    "node_modules/@babel/helper-define-map": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.1.tgz",
-      "integrity": "sha512-+5odWpX+OnvkD0Zmq7panrMuAGQBu6aPUgvMzuMGo4R+jUOvealEj2hiqI6WhxgKrTpFoFj0+VdsuA8KDxHBDg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/types": "^7.10.1",
-        "lodash": "^4.17.13"
-      }
-    },
-    "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.1.tgz",
-      "integrity": "sha512-vcUJ3cDjLjvkKzt6rHrl767FeE7pMEYfPanq5L16GRtrXIoznc0HykNW2aEYkcnP76P0isoqJ34dDMFZwzEpJg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1"
-      }
-    },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.3.tgz",
-      "integrity": "sha512-FvSj2aiOd8zbeqijjgqdMDSyxsGHaMt5Tr0XjQsGKHD3/1FP3wksjnLAWzxw7lvXiej8W1Jt47SKTZ6upQNiRw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
+      "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-get-function-arity": "^7.10.3",
-        "@babel/template": "^7.10.3",
-        "@babel/types": "^7.10.3"
+        "@babel/helper-get-function-arity": "^7.14.5",
+        "@babel/template": "^7.14.5",
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-get-function-arity": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.3.tgz",
-      "integrity": "sha512-iUD/gFsR+M6uiy69JA6fzM5seno8oE85IYZdbVVEuQaZlEzMO2MXblh+KSPJgsZAUx0EEbWXU0yJaW7C9CdAVg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
+      "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.10.3"
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz",
-      "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
+      "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz",
-      "integrity": "sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz",
+      "integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.10.1"
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
@@ -1107,6 +784,7 @@
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz",
       "integrity": "sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-module-imports": "^7.12.1",
         "@babel/helper-replace-supers": "^7.12.1",
@@ -1119,189 +797,26 @@
         "lodash": "^4.17.19"
       }
     },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/generator": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
-      "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
-      "dependencies": {
-        "@babel/types": "^7.12.11",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-function-name": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz",
-      "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==",
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.10",
-        "@babel/template": "^7.12.7",
-        "@babel/types": "^7.12.11"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz",
-      "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==",
-      "dependencies": {
-        "@babel/types": "^7.12.10"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.12.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz",
-      "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==",
-      "dependencies": {
-        "@babel/types": "^7.12.7"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz",
-      "integrity": "sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==",
-      "dependencies": {
-        "@babel/types": "^7.12.10"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-replace-supers": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz",
-      "integrity": "sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==",
-      "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.12.7",
-        "@babel/helper-optimise-call-expression": "^7.12.10",
-        "@babel/traverse": "^7.12.10",
-        "@babel/types": "^7.12.11"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz",
-      "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==",
-      "dependencies": {
-        "@babel/types": "^7.12.11"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/highlight": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/parser": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
-      "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==",
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/template": {
-      "version": "7.12.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
-      "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.12.7",
-        "@babel/types": "^7.12.7"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/traverse": {
-      "version": "7.12.12",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz",
-      "integrity": "sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.11",
-        "@babel/generator": "^7.12.11",
-        "@babel/helper-function-name": "^7.12.11",
-        "@babel/helper-split-export-declaration": "^7.12.11",
-        "@babel/parser": "^7.12.11",
-        "@babel/types": "^7.12.12",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+    "node_modules/@babel/helper-optimise-call-expression": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz",
+      "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==",
+      "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "@babel/types": "^7.14.5"
       },
       "engines": {
-        "node": ">=6.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-module-transforms/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
+      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz",
-      "integrity": "sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.10.1"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ=="
-    },
     "node_modules/@babel/helper-regex": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz",
@@ -1322,31 +837,26 @@
         "@babel/types": "^7.12.1"
       }
     },
-    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz",
-      "integrity": "sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.10"
-      }
-    },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz",
-      "integrity": "sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz",
+      "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.10.1",
-        "@babel/helper-optimise-call-expression": "^7.10.1",
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "@babel/helper-member-expression-to-functions": "^7.14.5",
+        "@babel/helper-optimise-call-expression": "^7.14.5",
+        "@babel/traverse": "^7.14.5",
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-simple-access": {
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz",
       "integrity": "sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==",
+      "dev": true,
       "dependencies": {
         "@babel/types": "^7.12.1"
       }
@@ -1361,18 +871,24 @@
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
-      "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
+      "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.10.1"
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.14.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
-      "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A=="
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz",
+      "integrity": "sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
     "node_modules/@babel/helper-validator-option": {
       "version": "7.12.1",
@@ -1392,111 +908,34 @@
         "@babel/types": "^7.10.4"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/code-frame": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/generator": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
-      "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.11",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/helper-function-name": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz",
-      "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.10",
-        "@babel/template": "^7.12.7",
-        "@babel/types": "^7.12.11"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz",
-      "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.10"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz",
-      "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==",
+    "node_modules/@babel/helpers": {
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz",
+      "integrity": "sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.12.11"
+        "@babel/template": "^7.10.4",
+        "@babel/traverse": "^7.12.5",
+        "@babel/types": "^7.12.5"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/highlight": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-      "dev": true,
+    "node_modules/@babel/highlight": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.4",
+        "@babel/helper-validator-identifier": "^7.14.5",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/parser": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
-      "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
       },
       "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": {
-      "version": "7.12.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
-      "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.12.7",
-        "@babel/types": "^7.12.7"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/traverse": {
-      "version": "7.12.12",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz",
-      "integrity": "sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.11",
-        "@babel/generator": "^7.12.11",
-        "@babel/helper-function-name": "^7.12.11",
-        "@babel/helper-split-export-declaration": "^7.12.11",
-        "@babel/parser": "^7.12.11",
-        "@babel/types": "^7.12.12",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/ansi-styles": {
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -1504,11 +943,10 @@
         "node": ">=4"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/chalk": {
+    "node_modules/@babel/highlight/node_modules/chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -1518,29 +956,10 @@
         "node": ">=4"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-wrap-function/node_modules/supports-color": {
+    "node_modules/@babel/highlight/node_modules/supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -1548,219 +967,22 @@
         "node": ">=4"
       }
     },
-    "node_modules/@babel/helpers": {
-      "version": "7.12.5",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz",
-      "integrity": "sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==",
-      "dependencies": {
-        "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.12.5",
-        "@babel/types": "^7.12.5"
-      }
-    },
-    "node_modules/@babel/helpers/node_modules/@babel/code-frame": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+    "node_modules/@babel/node": {
+      "version": "7.12.10",
+      "resolved": "https://registry.npmjs.org/@babel/node/-/node-7.12.10.tgz",
+      "integrity": "sha512-lJT1sXp1bEfAZ7B2ChEOOiUxaGbIWkcAixqZDpbHnJWUqIjoofOGo5ON1bJ9HOmtMdF7rqKiOoM7zZSI87El3g==",
+      "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/helpers/node_modules/@babel/generator": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
-      "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
-      "dependencies": {
-        "@babel/types": "^7.12.11",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@babel/helpers/node_modules/@babel/helper-function-name": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz",
-      "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==",
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.10",
-        "@babel/template": "^7.12.7",
-        "@babel/types": "^7.12.11"
-      }
-    },
-    "node_modules/@babel/helpers/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz",
-      "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==",
-      "dependencies": {
-        "@babel/types": "^7.12.10"
-      }
-    },
-    "node_modules/@babel/helpers/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz",
-      "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==",
-      "dependencies": {
-        "@babel/types": "^7.12.11"
-      }
-    },
-    "node_modules/@babel/helpers/node_modules/@babel/highlight": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/helpers/node_modules/@babel/parser": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
-      "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==",
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/helpers/node_modules/@babel/template": {
-      "version": "7.12.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
-      "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.12.7",
-        "@babel/types": "^7.12.7"
-      }
-    },
-    "node_modules/@babel/helpers/node_modules/@babel/traverse": {
-      "version": "7.12.12",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz",
-      "integrity": "sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.11",
-        "@babel/generator": "^7.12.11",
-        "@babel/helper-function-name": "^7.12.11",
-        "@babel/helper-split-export-declaration": "^7.12.11",
-        "@babel/parser": "^7.12.11",
-        "@babel/types": "^7.12.12",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
-      }
-    },
-    "node_modules/@babel/helpers/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helpers/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helpers/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/@babel/helpers/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/@babel/helpers/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
-      "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
-      "dependencies": {
-        "chalk": "^2.0.0",
-        "esutils": "^2.0.2",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/node": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/node/-/node-7.12.10.tgz",
-      "integrity": "sha512-lJT1sXp1bEfAZ7B2ChEOOiUxaGbIWkcAixqZDpbHnJWUqIjoofOGo5ON1bJ9HOmtMdF7rqKiOoM7zZSI87El3g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/register": "^7.12.10",
-        "commander": "^4.0.1",
-        "core-js": "^3.2.1",
-        "lodash": "^4.17.19",
-        "node-environment-flags": "^1.0.5",
-        "regenerator-runtime": "^0.13.4",
-        "v8flags": "^3.1.1"
-      },
-      "bin": {
-        "babel-node": "bin/babel-node.js"
+        "@babel/register": "^7.12.10",
+        "commander": "^4.0.1",
+        "core-js": "^3.2.1",
+        "lodash": "^4.17.19",
+        "node-environment-flags": "^1.0.5",
+        "regenerator-runtime": "^0.13.4",
+        "v8flags": "^3.1.1"
+      },
+      "bin": {
+        "babel-node": "bin/babel-node.js"
       }
     },
     "node_modules/@babel/node/node_modules/commander": {
@@ -1773,9 +995,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.3.tgz",
-      "integrity": "sha512-oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.7.tgz",
+      "integrity": "sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -1816,205 +1038,6 @@
         "@babel/plugin-syntax-decorators": "^7.12.13"
       }
     },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/code-frame": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/generator": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz",
-      "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.13.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.8.tgz",
-      "integrity": "sha512-qioaRrKHQbn4hkRKDHbnuQ6kAxmmOF+kzKGnIfxPK4j2rckSJCpKzr/SSTlohSCiE3uAQpNDJ9FIh4baeE8W+w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-member-expression-to-functions": "^7.13.0",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.13.0",
-        "@babel/helper-split-export-declaration": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/helper-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz",
-      "integrity": "sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.13.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
-      "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/helper-replace-supers": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz",
-      "integrity": "sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.13.0",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/highlight": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-      "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/parser": {
-      "version": "7.13.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz",
-      "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/template": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/parser": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/traverse": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-      "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.0",
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/parser": "^7.13.0",
-        "@babel/types": "^7.13.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/plugin-proposal-dynamic-import": {
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz",
@@ -2084,37 +1107,6 @@
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.1.tgz",
-      "integrity": "sha512-jjfym4N9HtCiNfyyLAVD8WqPYeHUrw4ihxuAynWj6zzp2gf9Ey2f7ImhFm6ikB3CLf5Z/zmcJDri6B4+9j9RsA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.1"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz",
-      "integrity": "sha512-Z+Qri55KiQkHh7Fc4BW6o+QBuTagbOp9txE+4U1i79u9oWlf2npkiDx+Rf3iK3lbcHBuNy9UOkwuR5wOMH3LIQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-transform-parameters": "^7.10.1"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-object-rest-spread/node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz",
-      "integrity": "sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
     "node_modules/@babel/plugin-proposal-optional-catch-binding": {
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz",
@@ -2137,27 +1129,16 @@
       }
     },
     "node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.1.tgz",
-      "integrity": "sha512-RZecFFJjDiQ2z6maFprLgrdnm0OzoC23Mx89xf1CcEsxmHuzuXOdniEuI+S3v7vjQG4F5sa6YtUp+19sZuSxHg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-private-methods/node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz",
-      "integrity": "sha512-5C/QhkGFh1vqcziq1vAL6SI9ymzUp8BCYjFpvYVhWP4DlATIb3u5q3iUd35mvlyGs8fO7hckkW7i0tmH+5+bvQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz",
+      "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/helper-member-expression-to-functions": "^7.10.1",
-        "@babel/helper-optimise-call-expression": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-replace-supers": "^7.10.1",
-        "@babel/helper-split-export-declaration": "^7.10.1"
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/plugin-proposal-unicode-property-regex": {
@@ -2269,9 +1250,6 @@
       "integrity": "sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
@@ -2384,22 +1362,6 @@
         "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
-    "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz",
-      "integrity": "sha512-P9V0YIh+ln/B3RStPoXpEQ/CoAxQIhRSUn7aXqQ+FZJ2u8+oCtjIXR3+X0vsSD8zv+mb56K7wZW1XiDTDGiDRQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-define-map": "^7.10.1",
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/helper-optimise-call-expression": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-replace-supers": "^7.10.1",
-        "@babel/helper-split-export-declaration": "^7.10.1",
-        "globals": "^11.1.0"
-      }
-    },
     "node_modules/@babel/plugin-transform-computed-properties": {
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz",
@@ -2437,16 +1399,6 @@
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz",
-      "integrity": "sha512-lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
     "node_modules/@babel/plugin-transform-flow-strip-types": {
       "version": "7.13.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.13.0.tgz",
@@ -2476,107 +1428,6 @@
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/code-frame": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/helper-function-name": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz",
-      "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.10",
-        "@babel/template": "^7.12.7",
-        "@babel/types": "^7.12.11"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz",
-      "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.10"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/highlight": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/parser": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
-      "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/template": {
-      "version": "7.12.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
-      "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.12.7",
-        "@babel/types": "^7.12.7"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/plugin-transform-literals": {
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz",
@@ -2586,15 +1437,6 @@
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz",
-      "integrity": "sha512-UmaWhDokOFT2GcgU6MkHC11i0NQcL63iqeufXWfRy6pUOGYeCGEKhvfFO6Vz70UfYJYHwveg62GS83Rvpxn+NA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
     "node_modules/@babel/plugin-transform-modules-amd": {
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz",
@@ -2641,15 +1483,6 @@
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz",
-      "integrity": "sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.8.3"
-      }
-    },
     "node_modules/@babel/plugin-transform-new-target": {
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz",
@@ -2669,349 +1502,118 @@
         "@babel/helper-replace-supers": "^7.12.1"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/code-frame": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+    "node_modules/@babel/plugin-transform-parameters": {
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz",
+      "integrity": "sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/generator": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
-      "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
+    "node_modules/@babel/plugin-transform-react-constant-elements": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.14.5.tgz",
+      "integrity": "sha512-NBqLEx1GxllIOXJInJAQbrnwwYJsV3WaMHIcOwD8rhYS0AabTWn7kHdHgPgu5RmHLU0q4DMxhAMu8ue/KampgQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.12.11",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/helper-function-name": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz",
-      "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==",
+    "node_modules/@babel/plugin-transform-react-display-name": {
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz",
+      "integrity": "sha512-cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.10",
-        "@babel/template": "^7.12.7",
-        "@babel/types": "^7.12.11"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz",
-      "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==",
-      "dev": true,
+    "node_modules/@babel/plugin-transform-react-jsx": {
+      "version": "7.12.17",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.17.tgz",
+      "integrity": "sha512-mwaVNcXV+l6qJOuRhpdTEj8sT/Z0owAVWf9QujTZ0d2ye9X/K+MTOTSizcgKOj18PGnTc/7g1I4+cIUjsKhBcw==",
       "dependencies": {
-        "@babel/types": "^7.12.10"
+        "@babel/helper-annotate-as-pure": "^7.12.13",
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.12.13",
+        "@babel/plugin-syntax-jsx": "^7.12.13",
+        "@babel/types": "^7.12.17"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.12.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz",
-      "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==",
+    "node_modules/@babel/plugin-transform-regenerator": {
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz",
+      "integrity": "sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.12.7"
+        "regenerator-transform": "^0.14.2"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz",
-      "integrity": "sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==",
+    "node_modules/@babel/plugin-transform-reserved-words": {
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz",
+      "integrity": "sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.12.10"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/helper-replace-supers": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz",
-      "integrity": "sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==",
+    "node_modules/@babel/plugin-transform-runtime": {
+      "version": "7.12.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz",
+      "integrity": "sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.12.7",
-        "@babel/helper-optimise-call-expression": "^7.12.10",
-        "@babel/traverse": "^7.12.10",
-        "@babel/types": "^7.12.11"
+        "@babel/helper-module-imports": "^7.12.5",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "semver": "^5.5.1"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz",
-      "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==",
+    "node_modules/@babel/plugin-transform-shorthand-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz",
+      "integrity": "sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.12.11"
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/highlight": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+    "node_modules/@babel/plugin-transform-spread": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz",
+      "integrity": "sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/parser": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
-      "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/template": {
+    "node_modules/@babel/plugin-transform-sticky-regex": {
       "version": "7.12.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
-      "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz",
+      "integrity": "sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.12.7",
-        "@babel/types": "^7.12.7"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/traverse": {
-      "version": "7.12.12",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz",
-      "integrity": "sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==",
+    "node_modules/@babel/plugin-transform-typeof-symbol": {
+      "version": "7.12.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz",
+      "integrity": "sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.12.11",
-        "@babel/generator": "^7.12.11",
-        "@babel/helper-function-name": "^7.12.11",
-        "@babel/helper-split-export-declaration": "^7.12.11",
-        "@babel/parser": "^7.12.11",
-        "@babel/types": "^7.12.12",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz",
-      "integrity": "sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz",
-      "integrity": "sha512-Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-constant-elements": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.10.1.tgz",
-      "integrity": "sha512-V4os6bkWt/jbrzfyVcZn2ZpuHZkvj3vyBU0U/dtS8SZuMS7Rfx5oknTrtfyXJ2/QZk8gX7Yls5Z921ItNpE30Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-display-name": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz",
-      "integrity": "sha512-cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.12.17",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.17.tgz",
-      "integrity": "sha512-mwaVNcXV+l6qJOuRhpdTEj8sT/Z0owAVWf9QujTZ0d2ye9X/K+MTOTSizcgKOj18PGnTc/7g1I4+cIUjsKhBcw==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.12.13",
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13",
-        "@babel/plugin-syntax-jsx": "^7.12.13",
-        "@babel/types": "^7.12.17"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-jsx-development": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.10.1.tgz",
-      "integrity": "sha512-XwDy/FFoCfw9wGFtdn5Z+dHh6HXKHkC6DwKNWpN74VWinUagZfDcEJc3Y8Dn5B3WMVnAllX8Kviaw7MtC5Epwg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-builder-react-jsx-experimental": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-jsx": "^7.10.1"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-jsx/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz",
-      "integrity": "sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==",
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.1.tgz",
-      "integrity": "sha512-mfhoiai083AkeewsBHUpaS/FM1dmUENHBMpS/tugSJ7VXqXO5dCN1Gkint2YvM1Cdv1uhmAKt1ZOuAjceKmlLA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz",
-      "integrity": "sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==",
-      "dev": true,
-      "dependencies": {
-        "regenerator-transform": "^0.14.2"
-      }
-    },
-    "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz",
-      "integrity": "sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz",
-      "integrity": "sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.12.5",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "semver": "^5.5.1"
-      }
-    },
-    "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz",
-      "integrity": "sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz",
-      "integrity": "sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1"
-      }
-    },
-    "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.12.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz",
-      "integrity": "sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz",
-      "integrity": "sha512-t7B/3MQf5M1T9hPCRG28DNGZUuxAuDqLYS03rJrIk2prj/UV7Z6FOneijhQhnv/Xa039vidXeVbvjK2SK5f7Gg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz",
-      "integrity": "sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.13.tgz",
-      "integrity": "sha512-z1VWskPJxK9tfxoYvePWvzSJC+4pxXr8ArmRm5ofqgi+mwpKg6lvtomkIngBYMJVnKhsFYVysCQLDn//v2RHcg==",
+    "node_modules/@babel/plugin-transform-typescript": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.13.tgz",
+      "integrity": "sha512-z1VWskPJxK9tfxoYvePWvzSJC+4pxXr8ArmRm5ofqgi+mwpKg6lvtomkIngBYMJVnKhsFYVysCQLDn//v2RHcg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-create-class-features-plugin": "^7.12.13",
@@ -3019,214 +1621,6 @@
         "@babel/plugin-syntax-typescript": "^7.12.13"
       }
     },
-    "node_modules/@babel/plugin-transform-typescript/node_modules/@babel/code-frame": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript/node_modules/@babel/generator": {
-      "version": "7.12.15",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.15.tgz",
-      "integrity": "sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript/node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.13.tgz",
-      "integrity": "sha512-Vs/e9wv7rakKYeywsmEBSRC9KtmE7Px+YBlESekLeJOF0zbGUicGfXSNi3o+tfXSNS48U/7K9mIOOCR79Cl3+Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-member-expression-to-functions": "^7.12.13",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript/node_modules/@babel/helper-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript/node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.13.tgz",
-      "integrity": "sha512-B+7nN0gIL8FZ8SvMcF+EPyB21KnCcZHQZFczCxbiNGV/O0rsrSBlWGLzmtBJ3GMjSVMIm4lpFhR+VdVBuIsUcQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript/node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
-      "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript/node_modules/@babel/helper-replace-supers": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz",
-      "integrity": "sha512-pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.12.13",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/traverse": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript/node_modules/@babel/highlight": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz",
-      "integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript/node_modules/@babel/parser": {
-      "version": "7.12.15",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.15.tgz",
-      "integrity": "sha512-AQBOU2Z9kWwSZMd6lNjCX0GUgFonL1wAM1db8L8PMk9UDaGsRCArBkU4Sc+UCM3AE4hjbXx+h58Lb3QT4oRmrA==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript/node_modules/@babel/template": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/parser": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript/node_modules/@babel/traverse": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.13.tgz",
-      "integrity": "sha512-3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.12.13",
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/parser": "^7.12.13",
-        "@babel/types": "^7.12.13",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@babel/plugin-transform-typescript/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.1.tgz",
-      "integrity": "sha512-zZ0Poh/yy1d4jeDWpx/mNwbKJVwUYJX73q+gyh4bwtG0/iUlzdEu0sLMda8yuDFS6LBQlT/ST1SJAR6zYwXWgw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
     "node_modules/@babel/plugin-transform-unicode-regex": {
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz",
@@ -3237,15 +1631,6 @@
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "node_modules/@babel/plugin-transform-unicode-regex/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz",
-      "integrity": "sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.10"
-      }
-    },
     "node_modules/@babel/plugin-transform-unicode-regex/node_modules/@babel/helper-create-regexp-features-plugin": {
       "version": "7.12.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz",
@@ -3388,47 +1773,6 @@
         "semver": "^5.5.0"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/@babel/code-frame": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "node_modules/@babel/preset-env/node_modules/@babel/generator": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
-      "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.11",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@babel/preset-env/node_modules/@babel/generator/node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/preset-env/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz",
-      "integrity": "sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.10"
-      }
-    },
     "node_modules/@babel/preset-env/node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz",
@@ -3469,94 +1813,12 @@
         "@babel/types": "^7.12.1"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/@babel/helper-function-name": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz",
-      "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.10",
-        "@babel/template": "^7.12.7",
-        "@babel/types": "^7.12.11"
-      }
-    },
-    "node_modules/@babel/preset-env/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz",
-      "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.10"
-      }
-    },
-    "node_modules/@babel/preset-env/node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.12.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz",
-      "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.7"
-      }
-    },
-    "node_modules/@babel/preset-env/node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz",
-      "integrity": "sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.10"
-      }
-    },
-    "node_modules/@babel/preset-env/node_modules/@babel/helper-replace-supers": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz",
-      "integrity": "sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.12.7",
-        "@babel/helper-optimise-call-expression": "^7.12.10",
-        "@babel/traverse": "^7.12.10",
-        "@babel/types": "^7.12.11"
-      }
-    },
-    "node_modules/@babel/preset-env/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz",
-      "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.11"
-      }
-    },
     "node_modules/@babel/preset-env/node_modules/@babel/helper-validator-option": {
       "version": "7.12.11",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz",
       "integrity": "sha512-TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw==",
       "dev": true
     },
-    "node_modules/@babel/preset-env/node_modules/@babel/highlight": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/preset-env/node_modules/@babel/parser": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
-      "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/@babel/preset-env/node_modules/@babel/plugin-proposal-numeric-separator": {
       "version": "7.12.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz",
@@ -3578,16 +1840,6 @@
         "@babel/plugin-transform-parameters": "^7.12.1"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz",
-      "integrity": "sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.12.1",
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
     "node_modules/@babel/preset-env/node_modules/@babel/plugin-proposal-unicode-property-regex": {
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz",
@@ -3755,46 +2007,6 @@
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/@babel/template": {
-      "version": "7.12.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
-      "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.12.7",
-        "@babel/types": "^7.12.7"
-      }
-    },
-    "node_modules/@babel/preset-env/node_modules/@babel/traverse": {
-      "version": "7.12.12",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz",
-      "integrity": "sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.11",
-        "@babel/generator": "^7.12.11",
-        "@babel/helper-function-name": "^7.12.11",
-        "@babel/helper-split-export-declaration": "^7.12.11",
-        "@babel/parser": "^7.12.11",
-        "@babel/types": "^7.12.12",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
-      }
-    },
-    "node_modules/@babel/preset-env/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/preset-env/node_modules/browserslist": {
       "version": "4.16.1",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.1.tgz",
@@ -3820,20 +2032,6 @@
       "integrity": "sha512-R3aqmjrICdGCTAnSXtNyvWYMK3YtV5jwudbq0T7nN9k4kmE4CBuwPqyJ+KBzepSTh0huivV2gLbSMEzTTmfeYw==",
       "dev": true
     },
-    "node_modules/@babel/preset-env/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/preset-env/node_modules/core-js-compat": {
       "version": "3.8.2",
       "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.2.tgz",
@@ -3853,18 +2051,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
     "node_modules/@babel/preset-env/node_modules/electron-to-chromium": {
       "version": "1.3.635",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.635.tgz",
@@ -3889,12 +2075,6 @@
         "jsesc": "bin/jsesc"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/@babel/preset-env/node_modules/node-releases": {
       "version": "1.1.69",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.69.tgz",
@@ -3936,18 +2116,6 @@
         "regjsparser": "bin/parser"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/preset-flow": {
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.12.13.tgz",
@@ -3984,15 +2152,6 @@
         "@babel/plugin-transform-react-pure-annotations": "^7.12.1"
       }
     },
-    "node_modules/@babel/preset-react/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz",
-      "integrity": "sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.10"
-      }
-    },
     "node_modules/@babel/preset-react/node_modules/@babel/plugin-transform-react-jsx": {
       "version": "7.12.12",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.12.tgz",
@@ -4087,171 +2246,64 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.3.tgz",
-      "integrity": "sha512-5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
+      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.10.3",
-        "@babel/parser": "^7.10.3",
-        "@babel/types": "^7.10.3"
+        "@babel/code-frame": "^7.14.5",
+        "@babel/parser": "^7.14.5",
+        "@babel/types": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/template/node_modules/@babel/code-frame": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz",
-      "integrity": "sha512-fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.10.3"
+    "node_modules/@babel/traverse": {
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.7.tgz",
+      "integrity": "sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.14.5",
+        "@babel/generator": "^7.14.5",
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-hoist-variables": "^7.14.5",
+        "@babel/helper-split-export-declaration": "^7.14.5",
+        "@babel/parser": "^7.14.7",
+        "@babel/types": "^7.14.5",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/template/node_modules/@babel/highlight": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz",
-      "integrity": "sha512-Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==",
+    "node_modules/@babel/traverse/node_modules/debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.3",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "ms": "^2.1.1"
       }
     },
-    "node_modules/@babel/template/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
+    "node_modules/@babel/traverse/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@babel/types": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz",
+      "integrity": "sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg==",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "@babel/helper-validator-identifier": "^7.14.5",
+        "to-fast-properties": "^2.0.0"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/template/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/template/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.3.tgz",
-      "integrity": "sha512-qO6623eBFhuPm0TmmrUFMT1FulCmsSeJuVGhiLodk2raUDFhhTECLd9E9jC4LBIWziqt4wgF6KuXE4d+Jz9yug==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.3",
-        "@babel/generator": "^7.10.3",
-        "@babel/helper-function-name": "^7.10.3",
-        "@babel/helper-split-export-declaration": "^7.10.1",
-        "@babel/parser": "^7.10.3",
-        "@babel/types": "^7.10.3",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.13"
-      }
-    },
-    "node_modules/@babel/traverse/node_modules/@babel/code-frame": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz",
-      "integrity": "sha512-fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.10.3"
-      }
-    },
-    "node_modules/@babel/traverse/node_modules/@babel/highlight": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz",
-      "integrity": "sha512-Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.3",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/traverse/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/traverse/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/traverse/node_modules/debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/@babel/traverse/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@babel/traverse/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/types": {
-      "version": "7.14.1",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.1.tgz",
-      "integrity": "sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.0",
-        "to-fast-properties": "^2.0.0"
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@base2/pretty-print-object": {
@@ -4969,81 +3021,186 @@
       "integrity": "sha512-M2AelyJDVR/oLnToJLtuDJRBBWUGUvvGigj1411hXhAdyFWqMaqHp7TixW3FpiLuVaikIcR1QL+zqoJoZlOgpg=="
     },
     "node_modules/@deck.gl/aggregation-layers": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/@deck.gl/aggregation-layers/-/aggregation-layers-7.1.11.tgz",
-      "integrity": "sha512-CHsr+UJhf06Mqb/q60iP7ftHQv3ftHUhJbVO4550PRo+QMFFhHfhxo53gQDDgrQ3stxpAcLT3lXRSNghMoU34g==",
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/aggregation-layers/-/aggregation-layers-8.5.2.tgz",
+      "integrity": "sha512-oiqXPmyn2v0lX9tWCvgmWs29stHSLS3tje71Ff2FVXDNmvP5FoZItFa8y7O7KSTkej2/rSwZeSte/a9pri6Njg==",
       "dependencies": {
+        "@luma.gl/shadertools": "^8.5.4",
+        "@math.gl/web-mercator": "^3.5.3",
         "d3-hexbin": "^0.2.1"
+      },
+      "peerDependencies": {
+        "@deck.gl/core": "^8.0.0",
+        "@deck.gl/layers": "^8.0.0"
       }
     },
-    "node_modules/@deck.gl/core": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/@deck.gl/core/-/core-7.1.11.tgz",
-      "integrity": "sha512-jUi1CcsnF5KPL2sv7Z0H3x+8amee5csqliZXGbXEBYox1l8naC4PhHg5jTgLaB0ZOHfVDsldPwGdPC+Mi4jP/Q==",
+    "node_modules/@deck.gl/carto": {
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/carto/-/carto-8.5.2.tgz",
+      "integrity": "sha512-Kw/3NUM+2NcHjxH6b7IOUYXEwmJ4SNQujFzAVFW5amG4Lut8074NGSF5XHi+4M/zgk7vXDFsGRxLqspsA/dg8w==",
+      "dependencies": {
+        "@loaders.gl/loader-utils": "^3.0.6",
+        "@loaders.gl/mvt": "^3.0.6",
+        "@loaders.gl/tiles": "^3.0.6",
+        "@math.gl/web-mercator": "^3.5.3",
+        "cartocolor": "^4.0.2",
+        "d3-scale": "^3.2.3"
+      },
+      "peerDependencies": {
+        "@deck.gl/core": "^8.0.0",
+        "@deck.gl/geo-layers": "^8.0.0",
+        "@deck.gl/layers": "^8.0.0",
+        "@loaders.gl/core": "^3.0.0"
+      }
+    },
+    "node_modules/@deck.gl/carto/node_modules/d3-array": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
+      "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
+      "dependencies": {
+        "internmap": "^1.0.0"
+      }
+    },
+    "node_modules/@deck.gl/carto/node_modules/d3-scale": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz",
+      "integrity": "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==",
+      "dependencies": {
+        "d3-array": "^2.3.0",
+        "d3-format": "1 - 2",
+        "d3-interpolate": "1.2.0 - 2",
+        "d3-time": "^2.1.1",
+        "d3-time-format": "2 - 3"
+      }
+    },
+    "node_modules/@deck.gl/carto/node_modules/d3-time": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz",
+      "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==",
       "dependencies": {
-        "@luma.gl/core": "^7.1.0",
+        "d3-array": "2"
+      }
+    },
+    "node_modules/@deck.gl/core": {
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/core/-/core-8.5.2.tgz",
+      "integrity": "sha512-SAFv7fKx6k1Rj8R4qTMQO2wEhEfixROzbcoSS6RivxrfES00KYYj6jJ7iNEnq3dFn6qc37LPpxqtYYHO4BcvYA==",
+      "dependencies": {
+        "@loaders.gl/core": "^3.0.6",
+        "@loaders.gl/images": "^3.0.6",
+        "@luma.gl/core": "^8.5.4",
+        "@math.gl/web-mercator": "^3.5.3",
         "gl-matrix": "^3.0.0",
-        "math.gl": "^2.3.0",
-        "mjolnir.js": "^2.1.2",
-        "probe.gl": "^3.0.1",
-        "seer": "^0.2.4",
-        "viewport-mercator-project": "^6.1.0"
+        "math.gl": "^3.5.3",
+        "mjolnir.js": "^2.5.0",
+        "probe.gl": "^3.4.0"
       }
     },
-    "node_modules/@deck.gl/geo-layers": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/@deck.gl/geo-layers/-/geo-layers-7.1.11.tgz",
-      "integrity": "sha512-gIJ1K98IFSZ12hB+zHyQC+9pMncb9BKVhJTA7pjUpxwcmEkkroqet9zkYQQMeSInK0a67BR9GXjebb/N0U04qA==",
+    "node_modules/@deck.gl/extensions": {
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/extensions/-/extensions-8.5.2.tgz",
+      "integrity": "sha512-VhbQsMNPM7RCR/ERwb1u1x0rEWAxgXfcCWttW+gYvbiagW/LrAJ22jhOghlRW/wilEmupHYbXQlWkW2V/mYfsg==",
       "dependencies": {
-        "h3-js": "^3.4.3",
+        "@luma.gl/shadertools": "^8.5.4"
+      },
+      "peerDependencies": {
+        "@deck.gl/core": "^8.0.0",
+        "gl-matrix": "^3.0.0"
+      }
+    },
+    "node_modules/@deck.gl/geo-layers": {
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/geo-layers/-/geo-layers-8.5.2.tgz",
+      "integrity": "sha512-t6+TgAdbKWDw8g9UX1y6D+5twcdJuKaXw4qSib/0yVurWi/Mil5Plihybt1l9uBZuwkr+UcpxPR73zzo+qd9MA==",
+      "dependencies": {
+        "@loaders.gl/3d-tiles": "^3.0.6",
+        "@loaders.gl/gis": "^3.0.6",
+        "@loaders.gl/loader-utils": "^3.0.6",
+        "@loaders.gl/mvt": "^3.0.6",
+        "@loaders.gl/terrain": "^3.0.6",
+        "@loaders.gl/tiles": "^3.0.6",
+        "@luma.gl/experimental": "^8.5.4",
+        "@math.gl/culling": "^3.5.3",
+        "@math.gl/web-mercator": "^3.5.3",
+        "h3-js": "^3.6.0",
         "long": "^3.2.0",
-        "s2-geometry": "^1.2.10"
+        "math.gl": "^3.5.3"
+      },
+      "peerDependencies": {
+        "@deck.gl/core": "^8.0.0",
+        "@deck.gl/extensions": "^8.0.0",
+        "@deck.gl/layers": "^8.0.0",
+        "@deck.gl/mesh-layers": "^8.0.0",
+        "@loaders.gl/core": "^3.0.0"
       }
     },
     "node_modules/@deck.gl/google-maps": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/@deck.gl/google-maps/-/google-maps-7.1.11.tgz",
-      "integrity": "sha512-gYp3NFIsyT5p65HgKjXFWTDzFf7K8+6ce9d9MIqaNgVWFZdsjUy9JL5TttDMQXshaQ1aZpxtLL6ZO3BiI1w8fw=="
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/google-maps/-/google-maps-8.5.2.tgz",
+      "integrity": "sha512-Dk3ozenBWgt9nFSYOT4N82urNW/JhiMszfFq6zLt3jUp0N7EJ9d2XO81hclM59BhjIdGWb6drTe96NvtbabVLQ==",
+      "peerDependencies": {
+        "@deck.gl/core": "^8.0.0"
+      }
     },
     "node_modules/@deck.gl/json": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/@deck.gl/json/-/json-7.1.11.tgz",
-      "integrity": "sha512-obYAXq5VZ0qCTVS8hopS64aXGicUeBNg0/03AAfo+Q5z62cNqagAktGKVZMUsJ13bV8CPohJ2zRWMXO+mAJtew==",
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/json/-/json-8.5.2.tgz",
+      "integrity": "sha512-lVS16bvPfLUSidgBURZvGbWEjgK8GjLWlp1iGuLvua2W6TnWIyiKa6a3XoebgeXd8kqwSbQxhNnuSVPX+Di6Rg==",
       "dependencies": {
-        "d3-dsv": "^1.0.8"
+        "d3-dsv": "^1.0.8",
+        "expression-eval": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@deck.gl/core": "^8.0.0"
       }
     },
     "node_modules/@deck.gl/layers": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/@deck.gl/layers/-/layers-7.1.11.tgz",
-      "integrity": "sha512-hOylm7Pf3CSvqpDoiCJLnqLAU3PAePISskJ5jjhpXtgHBrm1/Gk4boP4/7t7kFZdbSvVIXin13pPRbT0SWCRPw==",
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/layers/-/layers-8.5.2.tgz",
+      "integrity": "sha512-HmpE3qf9CI7sU/xa2DMCNg31pzpzK5XuUHyC70dsLq8AV7Sm3vZQz17KMU/CWSZpVr7yQ8uxTeSQARiv/zeOFQ==",
       "dependencies": {
-        "@loaders.gl/core": "^1.0.3",
-        "@loaders.gl/images": "^1.0.3",
+        "@loaders.gl/images": "^3.0.6",
         "@mapbox/tiny-sdf": "^1.1.0",
+        "@math.gl/polygon": "^3.5.3",
         "earcut": "^2.0.6"
+      },
+      "peerDependencies": {
+        "@deck.gl/core": "^8.0.0",
+        "@loaders.gl/core": "^3.0.0"
       }
     },
     "node_modules/@deck.gl/mapbox": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/@deck.gl/mapbox/-/mapbox-7.1.11.tgz",
-      "integrity": "sha512-V4cc9vwXzAOBtWV8x+WtvPVXElGChogkvQketeR2uhz6wIHuH+3sBBRg/Ma476w/II+DKjeHg2AzAZeX3SK7yQ=="
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/mapbox/-/mapbox-8.5.2.tgz",
+      "integrity": "sha512-nMpzfdPFBVthT+EMgIcKo4YO6bZCqADQtqnxIFtfofZIiKS6R5OSuJ3sXPSNZ9ReCJGzdmndEz7/Qtm9Sia/bA==",
+      "peerDependencies": {
+        "@deck.gl/core": "^8.0.0"
+      }
     },
     "node_modules/@deck.gl/mesh-layers": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/@deck.gl/mesh-layers/-/mesh-layers-7.1.11.tgz",
-      "integrity": "sha512-rI8ffUNh7ac2GpMcGLEiKyRarOPeLfVRlMRKjl9LXU61Wgx6DaHqsMmeqxzjoXEzgiRlY/XgCjepVg0dY6btlQ==",
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/mesh-layers/-/mesh-layers-8.5.2.tgz",
+      "integrity": "sha512-dUfQyGjm5CYQg9AQdRsGtEEXGSGHxifPlws0zWWoj1r757wjqM0aZ663TUJEsJQDTLNOvbBLGTiuFeCBUoKO4Q==",
       "dependencies": {
-        "@loaders.gl/core": "^1.0.3",
-        "@loaders.gl/images": "^1.0.3"
+        "@loaders.gl/gltf": "^3.0.6",
+        "@luma.gl/experimental": "^8.5.4",
+        "@luma.gl/shadertools": "^8.5.4"
+      },
+      "peerDependencies": {
+        "@deck.gl/core": "^8.0.0"
       }
     },
     "node_modules/@deck.gl/react": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/@deck.gl/react/-/react-7.1.11.tgz",
-      "integrity": "sha512-WUzxhvM3jZIZkBAQgdQR+tFBAVDm5opLCKMWI9YkJUsdJzdv9uwiWCsk3Se1pCTFIa5Asb8U6YAi1CHl+OOFyA==",
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/react/-/react-8.5.2.tgz",
+      "integrity": "sha512-h7AJ9nPY1PTjrAVP7T1fvWDChWZrVOsEfYIoEP4W6ILSjvDqEQfVL0+9RhjUwQV2nKrg0QmpqCmbfOrgKQQbYw==",
       "dependencies": {
         "prop-types": "^15.6.0"
+      },
+      "peerDependencies": {
+        "@deck.gl/core": "^8.0.0",
+        "react": ">=16.3",
+        "react-dom": ">=16.3"
       }
     },
     "node_modules/@emotion/babel-plugin": {
@@ -5063,9 +3220,6 @@
         "find-root": "^1.1.0",
         "source-map": "^0.5.7",
         "stylis": "^4.0.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@emotion/babel-plugin-jsx-pragmatic": {
@@ -5109,9 +3263,6 @@
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/@emotion/babel-preset-css-prop": {
@@ -5123,9 +3274,6 @@
         "@babel/runtime": "^7.7.2",
         "@emotion/babel-plugin": "^11.2.0",
         "@emotion/babel-plugin-jsx-pragmatic": "^0.1.5"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@emotion/cache": {
@@ -5161,9 +3309,6 @@
         "@emotion/serialize": "^0.11.15",
         "@emotion/sheet": "0.9.4",
         "@emotion/utils": "0.11.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.3.0"
       }
     },
     "node_modules/@emotion/core/node_modules/@emotion/cache": {
@@ -5239,18 +3384,6 @@
         "chalk": "^4.1.0",
         "specificity": "^0.4.1",
         "stylis": "^4.0.3"
-      },
-      "peerDependencies": {
-        "@types/jest": "^26.0.14",
-        "enzyme-to-json": "^3.2.1"
-      },
-      "peerDependenciesMeta": {
-        "@types/jest": {
-          "optional": true
-        },
-        "enzyme-to-json": {
-          "optional": true
-        }
       }
     },
     "node_modules/@emotion/jest/node_modules/ansi-styles": {
@@ -5263,9 +3396,6 @@
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/@emotion/jest/node_modules/chalk": {
@@ -5279,9 +3409,6 @@
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/@emotion/jest/node_modules/color-convert": {
@@ -7272,9 +5399,6 @@
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/@jest/types/node_modules/chalk": {
@@ -7288,9 +5412,6 @@
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/@jest/types/node_modules/color-convert": {
@@ -7332,93 +5453,227 @@
         "node": ">=8"
       }
     },
+    "node_modules/@loaders.gl/3d-tiles": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/3d-tiles/-/3d-tiles-3.0.8.tgz",
+      "integrity": "sha512-jZeOyDPGD2wEkTLW4Do9A4UUQ+OGjhhNXztB0AsttZ69OpkmsxJXb76xxwevf+eThrsTgSTjZ06eC5DHX0kyXA==",
+      "dependencies": {
+        "@loaders.gl/core": "3.0.8",
+        "@loaders.gl/draco": "3.0.8",
+        "@loaders.gl/gltf": "3.0.8",
+        "@loaders.gl/loader-utils": "3.0.8",
+        "@loaders.gl/math": "3.0.8",
+        "@loaders.gl/tiles": "3.0.8",
+        "@math.gl/core": "^3.5.1",
+        "@math.gl/geospatial": "^3.5.1"
+      }
+    },
     "node_modules/@loaders.gl/core": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/@loaders.gl/core/-/core-1.3.7.tgz",
-      "integrity": "sha512-dFZkJQc+i2PoqlBMz/aO8Gnn0y6ICafQp8u6cTpCm96h/HHulE8qDBodQlHGHn9EMJDSgVl/zjni+QhqIK31dg==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/core/-/core-3.0.8.tgz",
+      "integrity": "sha512-FIfbhMkoRX2JonEHXHgClC7jwOSsEwvvmjlaTMRAY+gFKvJPGmegkp4VgUZquLFf6GedJt/1TuMMvAX6gdq1pg==",
       "dependencies": {
-        "@babel/runtime": "^7.3.1"
+        "@babel/runtime": "^7.3.1",
+        "@loaders.gl/loader-utils": "3.0.8",
+        "@loaders.gl/worker-utils": "3.0.8",
+        "probe.gl": "^3.4.0"
+      }
+    },
+    "node_modules/@loaders.gl/draco": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/draco/-/draco-3.0.8.tgz",
+      "integrity": "sha512-ZCXzXNHWQ7H0qk/kC+rWzjMWjLzZGzQcDbdpIuy8xJdp4rTpmMkLUseFPby8vhkmIaqxWPwPB6mx/vM7L6JENg==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
+        "@loaders.gl/loader-utils": "3.0.8",
+        "@loaders.gl/schema": "3.0.8",
+        "@loaders.gl/worker-utils": "3.0.8",
+        "draco3d": "1.4.1"
+      }
+    },
+    "node_modules/@loaders.gl/gis": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/gis/-/gis-3.0.8.tgz",
+      "integrity": "sha512-7NL+lIb7NezlMupYskVil6M3RZunXJl+TyaVAW82GLbzPSOq+m/G7h3+z0GBa8iv/U/I+cB5BhSN+GZmvFwqEA==",
+      "dependencies": {
+        "@loaders.gl/loader-utils": "3.0.8",
+        "@loaders.gl/schema": "3.0.8",
+        "@mapbox/vector-tile": "^1.3.1",
+        "pbf": "^3.2.1"
+      }
+    },
+    "node_modules/@loaders.gl/gltf": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/gltf/-/gltf-3.0.8.tgz",
+      "integrity": "sha512-4PXWTlqyvlbZE2Vp4iQ+Y87ZO1WuRvSlbImDhygd0hoINfmJ9ObxrFS3yJcpJTu007nWxXorNVEOKyuoo+4Iyw==",
+      "dependencies": {
+        "@loaders.gl/core": "3.0.8",
+        "@loaders.gl/draco": "3.0.8",
+        "@loaders.gl/images": "3.0.8",
+        "@loaders.gl/loader-utils": "3.0.8"
       }
     },
     "node_modules/@loaders.gl/images": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/@loaders.gl/images/-/images-1.3.7.tgz",
-      "integrity": "sha512-TKqW94vjvWc4RIChhr0Yx6HaVTe8K6h6GFeXcahsKeCxq9/k2qpcigRkXfmb6/37dkp2Qy5COHp73ECgN/q+NA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/images/-/images-3.0.8.tgz",
+      "integrity": "sha512-rO2cIYJYlMs/uO9YSoF4/BEA4p/9xQ3gHZ1sIJkPYVnDqzpbu8nvUjWTQqIdL/MkQBTW8tz3twCdM+B6G9Fa2w==",
+      "dependencies": {
+        "@loaders.gl/loader-utils": "3.0.8"
+      }
     },
-    "node_modules/@luma.gl/constants": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/@luma.gl/constants/-/constants-7.3.2.tgz",
-      "integrity": "sha512-hr6JOOwsGPjjoHnil4sQ6AWsc8P6XXYtRL10TwNYfFTcNxrhSrjQvutYoCzXHH5U0vfHBfPMMUyLASK9FqiHOA=="
+    "node_modules/@loaders.gl/loader-utils": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/loader-utils/-/loader-utils-3.0.8.tgz",
+      "integrity": "sha512-PW1WyyQ+LXkqoGHBZHsmfNQkKiLAYf1gok+kHnHvY9fCzhJeA1iTNEUKPXGXKgS00m/k5cBTkOWAaOG9KRvBCQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
+        "@loaders.gl/worker-utils": "3.0.8",
+        "@probe.gl/stats": "^3.4.0"
+      }
     },
-    "node_modules/@luma.gl/core": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/@luma.gl/core/-/core-7.3.2.tgz",
-      "integrity": "sha512-XyQPSUJRkZcc//gVX0AgjLLNTkCOO68NRnm7RkIhikRBEUdovb4IOcpmWMCB1/Gyj4hzg/Z1FOAVT4pG1E+agw==",
+    "node_modules/@loaders.gl/math": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/math/-/math-3.0.8.tgz",
+      "integrity": "sha512-jfFpxxr4Bq5JfOPqLVJc4JJGoGGvVTOCWiJhnTtSAKhaNSwldmNWaZ0w8E2nlgPKPMAHiTRKOQnd9sSY5m66Cw==",
       "dependencies": {
-        "@babel/runtime": "^7.0.0",
-        "@luma.gl/constants": "7.3.2",
-        "@luma.gl/shadertools": "7.3.2",
-        "@luma.gl/webgl": "7.3.2",
-        "@luma.gl/webgl-state-tracker": "7.3.2",
-        "@luma.gl/webgl2-polyfill": "7.3.2",
-        "math.gl": "^3.0.0",
-        "probe.gl": "^3.1.1",
-        "seer": "^0.2.4"
+        "@loaders.gl/images": "3.0.8",
+        "@loaders.gl/loader-utils": "3.0.8",
+        "@math.gl/core": "^3.5.1"
       }
     },
-    "node_modules/@luma.gl/core/node_modules/math.gl": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/math.gl/-/math.gl-3.4.1.tgz",
-      "integrity": "sha512-D33ZXryVFcHu1YJ+fgcNp2MkyK+mEfHesHMdQUZBz2hFqIsAwXovM1sJ+0rTcs8IyTFmuRJ2ayHf1igEJEOM2g==",
+    "node_modules/@loaders.gl/mvt": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/mvt/-/mvt-3.0.8.tgz",
+      "integrity": "sha512-Jk1QTHgpxMsUT01w5IJJ2en9qq0yOZcL2wGXVc7CFp2h6inB22rC3drUwq1mUNGe6iy3EWIo7EeJVd9B+5JyTQ==",
       "dependencies": {
-        "@math.gl/core": "3.4.1"
+        "@loaders.gl/gis": "3.0.8",
+        "@loaders.gl/loader-utils": "3.0.8",
+        "@math.gl/polygon": "^3.5.1",
+        "pbf": "^3.2.1"
       }
     },
-    "node_modules/@luma.gl/shadertools": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/@luma.gl/shadertools/-/shadertools-7.3.2.tgz",
-      "integrity": "sha512-GiOZTvdEr164zYFy1DNRc7mzduSWLNJ34s+YbkJ/0i07E6tK7gHgM29QNCZ/gROvUDDJ5CHxngZqGkb+XquOMQ==",
+    "node_modules/@loaders.gl/schema": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/schema/-/schema-3.0.8.tgz",
+      "integrity": "sha512-yne5WE7fZZWFl2zF8fzDlYhPVJua6h6mTCSmlQ5pryaMXTZS9mfzXXIFWRL3kswqnQTu/QNFdyFj1mP0haF24w==",
+      "dependencies": {
+        "@types/geojson": "^7946.0.7",
+        "apache-arrow": "^4.0.0",
+        "d3-dsv": "^1.2.0"
+      }
+    },
+    "node_modules/@loaders.gl/terrain": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/terrain/-/terrain-3.0.8.tgz",
+      "integrity": "sha512-MtOAYEB/xJB4CN4B0YNPkO4v1ZY332joxiOHQI1x37x4sWVAqOrKLr9jB42sZCB8aINi2WMWGiErtf9wh9L5Pg==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
+        "@loaders.gl/loader-utils": "3.0.8",
+        "@loaders.gl/schema": "3.0.8",
+        "@mapbox/martini": "^0.2.0"
+      }
+    },
+    "node_modules/@loaders.gl/tiles": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/tiles/-/tiles-3.0.8.tgz",
+      "integrity": "sha512-Rc+yHFdQg2sYmcYkwvszukFWdm9EW354F9HUR7y/oauos6tsdo4YTj31zgytaYR63/EqWQ7kwI29/eePEcutzg==",
+      "dependencies": {
+        "@loaders.gl/core": "3.0.8",
+        "@loaders.gl/loader-utils": "3.0.8",
+        "@loaders.gl/math": "3.0.8",
+        "@math.gl/core": "^3.5.1",
+        "@math.gl/culling": "^3.5.1",
+        "@math.gl/geospatial": "^3.5.1",
+        "@math.gl/web-mercator": "^3.5.1",
+        "@probe.gl/stats": "^3.4.0"
+      }
+    },
+    "node_modules/@loaders.gl/worker-utils": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/worker-utils/-/worker-utils-3.0.8.tgz",
+      "integrity": "sha512-Pg72HuXPcL725TrOlOr83xloVUHj6OMWmno1dI8ccuqfOBsgoRjxNZrcSvwBzfK8tFCzuN2X30I+mHl3BkuYLw==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1"
+      }
+    },
+    "node_modules/@luma.gl/constants": {
+      "version": "8.5.4",
+      "resolved": "https://registry.npmjs.org/@luma.gl/constants/-/constants-8.5.4.tgz",
+      "integrity": "sha512-lrA4ja92om/gDHYOvM9itL5S7FVzjKulyknDz6S+Y7gmgHgXk2ln1Xar5zUCsLnhAYx4glHITXGH5Y5rdWgT1Q=="
+    },
+    "node_modules/@luma.gl/core": {
+      "version": "8.5.4",
+      "resolved": "https://registry.npmjs.org/@luma.gl/core/-/core-8.5.4.tgz",
+      "integrity": "sha512-+saDz1D3mcPd53vgbG60ryg1w5CF9Z2wdakKHzR810VoJLw97t4aNdg/eNgyWOvbOHxaKJBPm8K0sGjej67+jw==",
       "dependencies": {
         "@babel/runtime": "^7.0.0",
-        "math.gl": "^3.0.0"
+        "@luma.gl/constants": "8.5.4",
+        "@luma.gl/engine": "8.5.4",
+        "@luma.gl/gltools": "8.5.4",
+        "@luma.gl/shadertools": "8.5.4",
+        "@luma.gl/webgl": "8.5.4"
       }
     },
-    "node_modules/@luma.gl/shadertools/node_modules/math.gl": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/math.gl/-/math.gl-3.4.1.tgz",
-      "integrity": "sha512-D33ZXryVFcHu1YJ+fgcNp2MkyK+mEfHesHMdQUZBz2hFqIsAwXovM1sJ+0rTcs8IyTFmuRJ2ayHf1igEJEOM2g==",
+    "node_modules/@luma.gl/engine": {
+      "version": "8.5.4",
+      "resolved": "https://registry.npmjs.org/@luma.gl/engine/-/engine-8.5.4.tgz",
+      "integrity": "sha512-Sfv972IzvR9s9kKWugs67XQUh9jC0e/PpBrzvyGVnPU4XvFq42RZVF73pzEklVU6AlpR8Zg5CPtxGdhyOHtT7w==",
       "dependencies": {
-        "@math.gl/core": "3.4.1"
+        "@babel/runtime": "^7.0.0",
+        "@luma.gl/constants": "8.5.4",
+        "@luma.gl/gltools": "8.5.4",
+        "@luma.gl/shadertools": "8.5.4",
+        "@luma.gl/webgl": "8.5.4",
+        "@math.gl/core": "^3.5.0",
+        "probe.gl": "^3.4.0"
       }
     },
-    "node_modules/@luma.gl/webgl": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/@luma.gl/webgl/-/webgl-7.3.2.tgz",
-      "integrity": "sha512-eWoPPRJOF5xSpqgggdwspsm8exclwxz20c8vqu8D1b3LJTY7cEpq57CMLvITHcJMMJ834TX/r598efTcF76lpw==",
+    "node_modules/@luma.gl/experimental": {
+      "version": "8.5.4",
+      "resolved": "https://registry.npmjs.org/@luma.gl/experimental/-/experimental-8.5.4.tgz",
+      "integrity": "sha512-09waqRhgIrw+Sq0/in4tw4jPag5YsFfV1nEHJaLAg5RFv92S53IEubSJgkuG02HoOBkPxQ7KYvs9VNmriisnYg==",
+      "dependencies": {
+        "@luma.gl/constants": "8.5.4",
+        "@math.gl/core": "^3.5.0",
+        "earcut": "^2.0.6"
+      },
+      "peerDependencies": {
+        "@loaders.gl/gltf": "^3.0.0",
+        "@loaders.gl/images": "^3.0.0",
+        "@luma.gl/engine": "^8.4.0",
+        "@luma.gl/gltools": "^8.4.0",
+        "@luma.gl/shadertools": "^8.4.0",
+        "@luma.gl/webgl": "^8.4.0"
+      }
+    },
+    "node_modules/@luma.gl/gltools": {
+      "version": "8.5.4",
+      "resolved": "https://registry.npmjs.org/@luma.gl/gltools/-/gltools-8.5.4.tgz",
+      "integrity": "sha512-JotiPuymQz2Xc41AYlS2moJC/EHxU+OX/OMKi0+/MeOlEFLsdochgTA0I64j8yofLTXdeiGCneGtD1Ao8fk+bw==",
       "dependencies": {
         "@babel/runtime": "^7.0.0",
-        "@luma.gl/constants": "7.3.2",
-        "@luma.gl/webgl-state-tracker": "7.3.2",
-        "@luma.gl/webgl2-polyfill": "7.3.2",
-        "probe.gl": "^3.1.1"
+        "@luma.gl/constants": "8.5.4",
+        "probe.gl": "^3.4.0"
       }
     },
-    "node_modules/@luma.gl/webgl-state-tracker": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/@luma.gl/webgl-state-tracker/-/webgl-state-tracker-7.3.2.tgz",
-      "integrity": "sha512-0LuK3veReSm2UPOiDwC2CRDeE2xk4irqXdhyFO0WSAU1w+YhzbD1hGbjizGczvgfkbz8dFl9h98LbbH75efcKw==",
+    "node_modules/@luma.gl/shadertools": {
+      "version": "8.5.4",
+      "resolved": "https://registry.npmjs.org/@luma.gl/shadertools/-/shadertools-8.5.4.tgz",
+      "integrity": "sha512-rwLBLrACi75aWnuJm8rVKCQnJR2sMTCxHuexfjHJ7Uecl0vVcVJZT7c9EnCFaz5LUTNbdupvuhq0SKNckKiKmw==",
       "dependencies": {
         "@babel/runtime": "^7.0.0",
-        "@luma.gl/constants": "7.3.2"
+        "@math.gl/core": "^3.5.0"
       }
     },
-    "node_modules/@luma.gl/webgl2-polyfill": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/@luma.gl/webgl2-polyfill/-/webgl2-polyfill-7.3.2.tgz",
-      "integrity": "sha512-PMt5xqQ+u7tIqfUaL3s4nuWl604WFNcl1F1ohSUFeEzIIuxFiF6gsdEEvC5VqGoMFxI8T4FOTSeHYIr6uP4+4w==",
+    "node_modules/@luma.gl/webgl": {
+      "version": "8.5.4",
+      "resolved": "https://registry.npmjs.org/@luma.gl/webgl/-/webgl-8.5.4.tgz",
+      "integrity": "sha512-dWy4dhTbtvDO9zQBdx1Yb+DxNx/1JWV9rhhJxJUtTKbGZSX0RjkASTT6GBWMl5jrH1JYJefS1wswHmmPVXjK0Q==",
       "dependencies": {
         "@babel/runtime": "^7.0.0",
-        "@luma.gl/constants": "7.3.2"
+        "@luma.gl/constants": "8.5.4",
+        "@luma.gl/gltools": "8.5.4",
+        "probe.gl": "^3.4.0"
       }
     },
     "node_modules/@mapbox/geojson-area": {
@@ -7461,15 +5716,20 @@
       "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-1.5.0.tgz",
       "integrity": "sha512-/PT1P6DNf7vjEEiPkVIRJkvibbqWtqnyGaBz3nfRdcxclNSnSdaLU5tfAgcD7I8Yt5i+L19s406YLl1koLnLbg=="
     },
+    "node_modules/@mapbox/martini": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@mapbox/martini/-/martini-0.2.0.tgz",
+      "integrity": "sha512-7hFhtkb0KTLEls+TRw/rWayq5EeHtTaErgm/NskVoXmtgAQu/9D299aeyj6mzAR/6XUnYRp2lU+4IcrYRFjVsQ=="
+    },
     "node_modules/@mapbox/point-geometry": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz",
       "integrity": "sha1-ioP5M1x4YO/6Lu7KJUMyqgru2PI="
     },
     "node_modules/@mapbox/tiny-sdf": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-1.1.1.tgz",
-      "integrity": "sha512-Ihn1nZcGIswJ5XGbgFAvVumOgWpvIjBX9jiRlIl46uQG9vJOF51ViBYHF95rEZupuyQbEmhLaDPLQlU7fUTsBg=="
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-1.2.5.tgz",
+      "integrity": "sha512-cD8A/zJlm6fdJOk6DqPUV8mcpyJkRz2x2R+/fYcWDYG3oWbG7/L7Yl/WqQ1VZCjnL9OTIMAn6c+BC5Eru4sQEw=="
     },
     "node_modules/@mapbox/unitbezier": {
       "version": "0.0.0",
@@ -7493,18 +5753,46 @@
       }
     },
     "node_modules/@math.gl/core": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/@math.gl/core/-/core-3.4.1.tgz",
-      "integrity": "sha512-miAZL/WPU0B5hKrcg1K2nPU2GnOK6X84bwLoD0eTt2n7qT46ffh51Xu21V9kQp/cisE3l1ypukqSV/VHeaNxhQ==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/@math.gl/core/-/core-3.5.3.tgz",
+      "integrity": "sha512-TaSnvG0qFh1VxeNW5L58jSx0nJUMWMpUl6zo6Z3ScQzFySG5cicGOBzk/D40RkIZWPazCKCZ+ZThg5npSK9y3g==",
+      "dependencies": {
+        "@babel/runtime": "^7.12.0",
+        "gl-matrix": "^3.0.0"
+      }
+    },
+    "node_modules/@math.gl/culling": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/@math.gl/culling/-/culling-3.5.3.tgz",
+      "integrity": "sha512-ABpAcrvoIOLSm1EUkwgDem4RfO28HWPBs/+taZ/ZSpJG6KiVPklpKU1NCK+05HuJStkpFZ+XlWtehWU6FAMCyA==",
+      "dependencies": {
+        "@babel/runtime": "^7.12.0",
+        "@math.gl/core": "3.5.3",
+        "gl-matrix": "^3.0.0"
+      }
+    },
+    "node_modules/@math.gl/geospatial": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/@math.gl/geospatial/-/geospatial-3.5.3.tgz",
+      "integrity": "sha512-cnc8VMQrt30JmlG200VDJmmvSjaGW57gY9KEZ+raapxyyFyfDNuAuIrIxe+zbK66FbvFWTbJlDaNmKqVG+ohyw==",
       "dependencies": {
         "@babel/runtime": "^7.12.0",
+        "@math.gl/core": "3.5.3",
         "gl-matrix": "^3.0.0"
       }
     },
+    "node_modules/@math.gl/polygon": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/@math.gl/polygon/-/polygon-3.5.3.tgz",
+      "integrity": "sha512-VktscmyQg/Rd56nJk0Nj/UyvnPDbsnZNMWCdl3G5AYenYzLWy6h4FEWhLx8pD+Xw7VuFot8LR4WAK2TPzXzrWw==",
+      "dependencies": {
+        "@math.gl/core": "3.5.3"
+      }
+    },
     "node_modules/@math.gl/web-mercator": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/@math.gl/web-mercator/-/web-mercator-3.4.1.tgz",
-      "integrity": "sha512-5LAVmo5U25GY5YIxbI3D0J7r97B9AM5pAcWxnF9YhJx44DSVAYfMdiSISOfS+ivKuBFX44mFZvV9j75QY5aDkQ==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/@math.gl/web-mercator/-/web-mercator-3.5.3.tgz",
+      "integrity": "sha512-WZE9ALeTS4n3HDgkqTxcNLBU7DL0mjmPXSrcqSZIUeDY00+LCtNvMQWUAwqolpB7nD71vD6HLW8delzVuy4teA==",
       "dependencies": {
         "@babel/runtime": "^7.12.0",
         "gl-matrix": "^3.0.0"
@@ -7586,15 +5874,6 @@
         "unist-util-visit": "2.0.3"
       }
     },
-    "node_modules/@mdx-js/mdx/node_modules/@babel/code-frame": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.12.13"
-      }
-    },
     "node_modules/@mdx-js/mdx/node_modules/@babel/core": {
       "version": "7.12.9",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz",
@@ -7622,69 +5901,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@mdx-js/mdx/node_modules/@babel/generator": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz",
-      "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.13.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@mdx-js/mdx/node_modules/@babel/helper-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@mdx-js/mdx/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@mdx-js/mdx/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@mdx-js/mdx/node_modules/@babel/highlight": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-      "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@mdx-js/mdx/node_modules/@babel/parser": {
-      "version": "7.13.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz",
-      "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/@mdx-js/mdx/node_modules/@babel/plugin-syntax-jsx": {
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz",
@@ -7694,60 +5910,6 @@
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "node_modules/@mdx-js/mdx/node_modules/@babel/template": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/parser": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@mdx-js/mdx/node_modules/@babel/traverse": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-      "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.0",
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/parser": "^7.13.0",
-        "@babel/types": "^7.13.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
-      }
-    },
-    "node_modules/@mdx-js/mdx/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@mdx-js/mdx/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@mdx-js/mdx/node_modules/convert-source-map": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
@@ -7846,18 +6008,6 @@
         "xtend": "^4.0.1"
       }
     },
-    "node_modules/@mdx-js/mdx/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@mdx-js/mdx/node_modules/unified": {
       "version": "9.2.0",
       "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz",
@@ -8186,9 +6336,9 @@
       "dev": true
     },
     "node_modules/@probe.gl/stats": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@probe.gl/stats/-/stats-3.3.0.tgz",
-      "integrity": "sha512-CV4c3EgallqZTO88u34/u9L5asL0nCVP1BEkb4qcXlh8Qz2Vmygbyjz1ViQsct6rSi2lJ52lo6W0PnlpZJJvcA==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@probe.gl/stats/-/stats-3.4.0.tgz",
+      "integrity": "sha512-Gl37r9qGuiKadIvTZdSZvzCNOttJYw6RcY1oT0oDuB8r2uhuZAdSMQRQTy9FTinp6MY6O9wngGnV6EpQ8wSBAw==",
       "dependencies": {
         "@babel/runtime": "^7.0.0"
       }
@@ -8220,6 +6370,11 @@
       "resolved": "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz",
       "integrity": "sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg=="
     },
+    "node_modules/@react-icons/all-files": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@react-icons/all-files/-/all-files-4.1.0.tgz",
+      "integrity": "sha512-hxBI2UOuVaI3O/BhQfhtb4kcGn9ft12RWAFVMUeNjqqhLsHvFtzIkFaptBJpFDANTKoDfdVoHTKZDlwKCACbMQ=="
+    },
     "node_modules/@seznam/compose-react-refs": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@seznam/compose-react-refs/-/compose-react-refs-1.0.4.tgz",
@@ -8887,29 +7042,6 @@
         "util-deprecate": "^1.0.2"
       }
     },
-    "node_modules/@storybook/addon-docs/node_modules/@babel/generator": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz",
-      "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.13.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@storybook/addon-docs/node_modules/@babel/parser": {
-      "version": "7.13.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz",
-      "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/@storybook/addon-docs/node_modules/@storybook/addons": {
       "version": "6.1.20",
       "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -10539,41 +8671,12 @@
         "core-js": "^3.0.1"
       }
     },
-    "node_modules/@storybook/core/node_modules/@babel/code-frame": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.12.13"
-      }
-    },
     "node_modules/@storybook/core/node_modules/@babel/compat-data": {
       "version": "7.13.8",
       "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.8.tgz",
       "integrity": "sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog==",
       "dev": true
     },
-    "node_modules/@storybook/core/node_modules/@babel/generator": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz",
-      "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.13.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@storybook/core/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz",
-      "integrity": "sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
     "node_modules/@storybook/core/node_modules/@babel/helper-compilation-targets": {
       "version": "7.13.8",
       "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.8.tgz",
@@ -10586,121 +8689,12 @@
         "semver": "^6.3.0"
       }
     },
-    "node_modules/@storybook/core/node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.8.tgz",
-      "integrity": "sha512-qioaRrKHQbn4hkRKDHbnuQ6kAxmmOF+kzKGnIfxPK4j2rckSJCpKzr/SSTlohSCiE3uAQpNDJ9FIh4baeE8W+w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-member-expression-to-functions": "^7.13.0",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.13.0",
-        "@babel/helper-split-export-declaration": "^7.12.13"
-      }
-    },
-    "node_modules/@storybook/core/node_modules/@babel/helper-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@storybook/core/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@storybook/core/node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz",
-      "integrity": "sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.13.0"
-      }
-    },
-    "node_modules/@storybook/core/node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
-      "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@storybook/core/node_modules/@babel/helper-replace-supers": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz",
-      "integrity": "sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.13.0",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0"
-      }
-    },
-    "node_modules/@storybook/core/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
     "node_modules/@storybook/core/node_modules/@babel/helper-validator-option": {
       "version": "7.12.17",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz",
       "integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==",
       "dev": true
     },
-    "node_modules/@storybook/core/node_modules/@babel/highlight": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-      "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@storybook/core/node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@storybook/core/node_modules/@babel/parser": {
-      "version": "7.13.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz",
-      "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/@storybook/core/node_modules/@babel/plugin-proposal-object-rest-spread": {
       "version": "7.13.8",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz",
@@ -10723,16 +8717,6 @@
         "@babel/helper-plugin-utils": "^7.13.0"
       }
     },
-    "node_modules/@storybook/core/node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz",
-      "integrity": "sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0"
-      }
-    },
     "node_modules/@storybook/core/node_modules/@babel/plugin-transform-classes": {
       "version": "7.13.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz",
@@ -10757,34 +8741,6 @@
         "@babel/helper-plugin-utils": "^7.13.0"
       }
     },
-    "node_modules/@storybook/core/node_modules/@babel/template": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/parser": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@storybook/core/node_modules/@babel/traverse": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-      "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.0",
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/parser": "^7.13.0",
-        "@babel/types": "^7.13.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
-      }
-    },
     "node_modules/@storybook/core/node_modules/@storybook/addons": {
       "version": "6.1.20",
       "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -11285,18 +9241,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/@storybook/core/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
     "node_modules/@storybook/core/node_modules/ejs": {
       "version": "3.1.6",
       "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz",
@@ -11845,12 +9789,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/@storybook/core/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/@storybook/core/node_modules/negotiator": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
@@ -12911,88 +10849,6 @@
         "fork-ts-checker-webpack-plugin": "^4.1.0"
       }
     },
-    "node_modules/@storybook/preset-typescript/node_modules/@babel/code-frame": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.12.13"
-      }
-    },
-    "node_modules/@storybook/preset-typescript/node_modules/@babel/highlight": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz",
-      "integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@storybook/preset-typescript/node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@storybook/preset-typescript/node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@storybook/preset-typescript/node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@storybook/preset-typescript/node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/@storybook/preset-typescript/node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@storybook/preset-typescript/node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@storybook/preset-typescript/node_modules/@storybook/node-logger": {
       "version": "5.3.21",
       "resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-5.3.21.tgz",
@@ -14103,29 +11959,28 @@
       }
     },
     "node_modules/@superset-ui/chart-controls": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/chart-controls/-/chart-controls-0.17.53.tgz",
-      "integrity": "sha512-PjIDka4/lUwXUNEGjkQOIMwVWF2WfknqM6pKFNDPO0/nG4S4faQk96z/ABOXp8GYwIbBshnmmbmW4TCrCQ10Xw==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/chart-controls/-/chart-controls-0.17.85.tgz",
+      "integrity": "sha512-RNk6za6IfcnAKoDFA8XpWgK5AdwPCEprKauv29Z+8VkHrMT8DkoEwDtgl0vutEmLRPECAL+lR76g5B9Z33iCJQ==",
       "dependencies": {
-        "@superset-ui/core": "0.17.53",
+        "@react-icons/all-files": "^4.1.0",
+        "@superset-ui/core": "0.17.81",
         "lodash": "^4.17.15",
         "prop-types": "^15.7.2"
       },
       "peerDependencies": {
+        "@emotion/react": "^11.1.5",
         "@types/react": "*",
         "antd": "^4.9.4",
-        "react": "^16.13.1",
-        "react-icons": "^4.2.0"
+        "react": "^16.13.1"
       }
     },
     "node_modules/@superset-ui/core": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.17.53.tgz",
-      "integrity": "sha512-2bIRrK3Y+4ZSNu6drc1EzHTq6fO3aWfdjCh43ytju88nlADHheQXgwxEKnmjzI141qxiVL2+oSL2kC6pSTkW8A==",
+      "version": "0.17.81",
+      "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.17.81.tgz",
+      "integrity": "sha512-CaDihqqwFnqtO9yWHxPbZh3MKTot66Zd27ifdIYQCVEMQwz5OpP6zUbULekq7NAbPMHwf7Ju3FOzN0uEzWwSmw==",
       "dependencies": {
         "@babel/runtime": "^7.1.2",
-        "@emotion/cache": "^11.1.3",
-        "@emotion/react": "^11.1.5",
         "@emotion/styled": "^11.3.0",
         "@types/d3-format": "^1.3.0",
         "@types/d3-interpolate": "^1.3.1",
@@ -14154,6 +12009,8 @@
         "whatwg-fetch": "^3.0.0"
       },
       "peerDependencies": {
+        "@emotion/cache": "^11.1.3",
+        "@emotion/react": "^11.1.5",
         "@types/react": "*",
         "@types/react-loadable": "*",
         "react": "^16.13.1",
@@ -14195,19 +12052,6 @@
         "@emotion/is-prop-valid": "^1.1.0",
         "@emotion/serialize": "^1.0.2",
         "@emotion/utils": "^1.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0",
-        "@emotion/react": "^11.0.0-rc.0",
-        "react": ">=16.8.0"
-      },
-      "peerDependenciesMeta": {
-        "@babel/core": {
-          "optional": true
-        },
-        "@types/react": {
-          "optional": true
-        }
       }
     },
     "node_modules/@superset-ui/core/node_modules/@emotion/utils": {
@@ -14236,24 +12080,32 @@
       }
     },
     "node_modules/@superset-ui/core/node_modules/d3-scale": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.4.tgz",
-      "integrity": "sha512-PG6gtpbPCFqKbvdBEswQcJcTzHC8VEd/XzezF5e68KlkT4/ggELw/nR1tv863jY6ufKTvDlzCMZvhe06codbbA==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz",
+      "integrity": "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==",
       "dependencies": {
         "d3-array": "^2.3.0",
         "d3-format": "1 - 2",
         "d3-interpolate": "1.2.0 - 2",
-        "d3-time": "1 - 2",
+        "d3-time": "^2.1.1",
         "d3-time-format": "2 - 3"
       }
     },
+    "node_modules/@superset-ui/core/node_modules/d3-scale/node_modules/d3-time": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz",
+      "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==",
+      "dependencies": {
+        "d3-array": "2"
+      }
+    },
     "node_modules/@superset-ui/legacy-plugin-chart-calendar": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.17.53.tgz",
-      "integrity": "sha512-NLevYzzhQyRgP+vdEfhJyDxJIBbGM/bJTJfFw1iRllny3WQax6iU/X5hUw/iWZqruVNkwSnUA39+EGcjU1aIjg==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.17.85.tgz",
+      "integrity": "sha512-bmPvflt73ncje+22YTDTkPGIbfylPcqksiCB74/dh/cjUy39lCEpBdL1iYYee6z2vmFdn6uNWuHtpENDKTG83g==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3-array": "^2.0.3",
         "d3-selection": "^1.4.0",
         "d3-tip": "^0.9.1",
@@ -14272,24 +12124,24 @@
       }
     },
     "node_modules/@superset-ui/legacy-plugin-chart-chord": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-chord/-/legacy-plugin-chart-chord-0.17.53.tgz",
-      "integrity": "sha512-a3Y8b/1nSuFvzEzUDTVVmad5/YjTBhz0qU2rcVGrdKp2kzuSVXVVljdN7KVisDUNHhYqrttLM8RQrqGw9f7x1A==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-chord/-/legacy-plugin-chart-chord-0.17.85.tgz",
+      "integrity": "sha512-raQUDM3Dgcld7UIvXe9XGr4NEJV6x8J+gjVUQLlkvsttA32VN+J1tUhevxmT2eMMxifaaLnGWiBA678Q2ENVfg==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "prop-types": "^15.6.2",
         "react": "^16.13.1"
       }
     },
     "node_modules/@superset-ui/legacy-plugin-chart-country-map": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-country-map/-/legacy-plugin-chart-country-map-0.17.53.tgz",
-      "integrity": "sha512-zTImQdeBT8raXnxafBIHvaVqOqKoECfyDwgFlPKhs4M7EXPG7U8/VLg0Oi2dCA7/SFZA/ASrJwc/KxW399vJhw==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-country-map/-/legacy-plugin-chart-country-map-0.17.85.tgz",
+      "integrity": "sha512-g8OAwInPI9r/k/0ip9pXvQR7L6PInQhN8KfMb4j5VgC4+eUl04BQDpsclVoYOz5KqthkxPvGhdlOH0zHybv3Vg==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "d3-array": "^2.0.3",
         "prop-types": "^15.6.2"
@@ -14304,13 +12156,13 @@
       }
     },
     "node_modules/@superset-ui/legacy-plugin-chart-event-flow": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-event-flow/-/legacy-plugin-chart-event-flow-0.17.53.tgz",
-      "integrity": "sha512-QYL0Feyfu7ZH1GeQ9sfEaEgnW2IQG93sJnM29NO53CjSvdbbZItfU9v6xVnAo6jMwcam7JLNYRtuIPgJevNThw==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-event-flow/-/legacy-plugin-chart-event-flow-0.17.85.tgz",
+      "integrity": "sha512-O2DiLUO0lkkpemtjwJ845veW4vFwZUkb13TkfV1ef37HBDDdEJkUa6Ls8zh7C4aybqn4HG4mr32IHg3DV2WgYg==",
       "dependencies": {
         "@data-ui/event-flow": "^0.0.84",
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "prop-types": "^15.6.2"
       },
       "peerDependencies": {
@@ -14318,12 +12170,12 @@
       }
     },
     "node_modules/@superset-ui/legacy-plugin-chart-force-directed": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-force-directed/-/legacy-plugin-chart-force-directed-0.17.53.tgz",
-      "integrity": "sha512-F7hkrBxC7EWrClQ1jb7anzj1SmIjqXVMz2JKhzwEUk++Tafnn0mrB7Yo51u3twFFOY5bwn+KcI1NObzBRkXguQ==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-force-directed/-/legacy-plugin-chart-force-directed-0.17.85.tgz",
+      "integrity": "sha512-8QB2IPNadJ5pha2PPs0AQe5zHEnpaIcTY+JGH8LFxUFtuDLjGSuGJJNbIyM/QT63zMp0WCn5VCwgeMuKnuU9Xw==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "prop-types": "^15.7.2"
       },
@@ -14332,12 +12184,12 @@
       }
     },
     "node_modules/@superset-ui/legacy-plugin-chart-heatmap": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-heatmap/-/legacy-plugin-chart-heatmap-0.17.53.tgz",
-      "integrity": "sha512-NXx/E3AiTxkL+qwaj8B0IDrhWo6P5u5EuXXx1xaWqMTH18YomyeA9l4NBPwsjCfhAMqrEeT0hzeY2/WSoPq5KQ==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-heatmap/-/legacy-plugin-chart-heatmap-0.17.85.tgz",
+      "integrity": "sha512-zuxkDDTxxVtDkg9iu7GtcNuG9URh9GmNRM5lH2wsOdKD/UTlZrkt0Lf4tp5kKycknyHWdWFixe1CSLaLzuwwOA==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "d3-svg-legend": "^1.x",
         "d3-tip": "^0.9.1",
@@ -14345,14 +12197,14 @@
       }
     },
     "node_modules/@superset-ui/legacy-plugin-chart-histogram": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-histogram/-/legacy-plugin-chart-histogram-0.17.53.tgz",
-      "integrity": "sha512-EQ/VvG+qCec+IqnwYHA90iHAjkhnPNGkKbTuKlsRyL3ONfxg3n6L4EQOlAA0HvELKkFAZXBxh8TA8Qc3j+g4Fw==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-histogram/-/legacy-plugin-chart-histogram-0.17.85.tgz",
+      "integrity": "sha512-dqrTTDeMvdm4Lgb7Cav5lm86GgiQxYda1yXWoXFlqXvwZt40EJqCxYUAAHYKD5JmlqjzIn1wuvCHzJQsDxANDQ==",
       "dependencies": {
         "@data-ui/histogram": "^0.0.84",
         "@data-ui/theme": "^0.0.84",
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "@vx/legend": "^0.0.198",
         "@vx/responsive": "^0.0.199",
         "@vx/scale": "^0.0.197",
@@ -14421,12 +12273,12 @@
       }
     },
     "node_modules/@superset-ui/legacy-plugin-chart-horizon": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-horizon/-/legacy-plugin-chart-horizon-0.17.53.tgz",
-      "integrity": "sha512-LsM4HOuOkiabRNxMUjjietbFx99admne59Mm5zQdsRPNEpN/EKEWu8R4G4crSSqxxzD9KVnveRPE7OD0n91k/A==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-horizon/-/legacy-plugin-chart-horizon-0.17.85.tgz",
+      "integrity": "sha512-lVzXqqLFgZ80I/fDbf2TT3cXCEW+xYKvna4Ldod/dUDFWjVIy3rzP7HicHsS7XCLPpeUHgZUFZhx8NEvTWhDqg==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3-array": "^2.0.3",
         "d3-scale": "^3.0.1",
         "prop-types": "^15.6.2"
@@ -14456,12 +12308,12 @@
       }
     },
     "node_modules/@superset-ui/legacy-plugin-chart-map-box": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-map-box/-/legacy-plugin-chart-map-box-0.17.53.tgz",
-      "integrity": "sha512-JuM77arnxECuSiHkdLMry4JruuVTAfTKTtR8F4qGOpiYiXzGEv4K+y12eqBe1o94ckJF43Esz9e1fdPLDkjqTw==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-map-box/-/legacy-plugin-chart-map-box-0.17.85.tgz",
+      "integrity": "sha512-YJIZjcfpMDaJtve6EfEr1lUgCGnsutTxyKEOj3b6wjYMfoLhSUproDoW9TUQtBR3tFrY3PrLrZg+O41L9grDIA==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "immutable": "^3.8.2",
         "mapbox-gl": "^0.53.0",
         "prop-types": "^15.6.2",
@@ -14482,12 +12334,12 @@
       }
     },
     "node_modules/@superset-ui/legacy-plugin-chart-paired-t-test": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-paired-t-test/-/legacy-plugin-chart-paired-t-test-0.17.53.tgz",
-      "integrity": "sha512-QkRVm0XGoOxqOX0nRvHnGon2gG8MmV+dbBBpmPkmspxCWKrn183Wzq5SiMlM4vgo2HaroWUIPuBgLBd7rYZtGw==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-paired-t-test/-/legacy-plugin-chart-paired-t-test-0.17.85.tgz",
+      "integrity": "sha512-JIOvvGUlVzbk2zWyQMD8WE1UN95HdOuM1I7py5LIEqJH3CwWN5SGmtDG50DAvKAhEt5InmdQkm7ihr0Uw2LoQw==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "distributions": "^1.0.0",
         "prop-types": "^15.6.2",
         "reactable": "^1.1.0"
@@ -14497,12 +12349,12 @@
       }
     },
     "node_modules/@superset-ui/legacy-plugin-chart-parallel-coordinates": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-parallel-coordinates/-/legacy-plugin-chart-parallel-coordinates-0.17.53.tgz",
-      "integrity": "sha512-NcwuEd+rXfmwPshPby0jEgnJnbYfKruM7l0Hb3lIw6iMTc1IV21d1CMftQPvYYdwagam0FapBO2YcSvnvj2rDw==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-parallel-coordinates/-/legacy-plugin-chart-parallel-coordinates-0.17.85.tgz",
+      "integrity": "sha512-ecSKIBL7806jD+sQu6ub+92tI8W1OfLZWMUW7SeupDphlDJkrQEIQ63FQOCwWEAI9xJhn+hoxIe6M2Y9Um0FwQ==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "prop-types": "^15.7.2"
       },
@@ -14511,12 +12363,12 @@
       }
     },
     "node_modules/@superset-ui/legacy-plugin-chart-partition": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-partition/-/legacy-plugin-chart-partition-0.17.53.tgz",
-      "integrity": "sha512-CTzKjaKCdT/+bFlXUDD4nXC2CO7mXmIPJ2K/M94rY2G2gdAWRZJ1i2HlcvTP+RY/AItzZm3C+E7hYdAQ6toBkA==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-partition/-/legacy-plugin-chart-partition-0.17.85.tgz",
+      "integrity": "sha512-seF8oZ5lRdrqGzQBDqcQIrIV9QHp6IH7e9+pyG0F4BzSY8WNKIjFVkd92HcNcm/KeqkzID1mqGv1aCzlDQNaiw==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "d3-hierarchy": "^1.1.8",
         "prop-types": "^15.6.2"
@@ -14526,24 +12378,24 @@
       }
     },
     "node_modules/@superset-ui/legacy-plugin-chart-pivot-table": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-pivot-table/-/legacy-plugin-chart-pivot-table-0.17.53.tgz",
-      "integrity": "sha512-bk7mttnZFGgGmWCfj0kO++65XsMNyQJch0dgfRRnLVTlSnY89/kGqszTKybbCZhsbx4T5bJ+bn6hZKAGH+FnUA==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-pivot-table/-/legacy-plugin-chart-pivot-table-0.17.85.tgz",
+      "integrity": "sha512-oXBXgzi4uBKG1FsOd9ZFIhPQvaBIYanzHdqwthafsRDG9kgKL9b//+MCIZgRlqlSJK+vsf4EMxXucFKJtoLDuA==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "datatables.net-bs": "^1.10.15",
         "prop-types": "^15.6.2"
       }
     },
     "node_modules/@superset-ui/legacy-plugin-chart-rose": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-rose/-/legacy-plugin-chart-rose-0.17.53.tgz",
-      "integrity": "sha512-ppvQuKAS0rMhniKenLXSKczmAsHX4igYc0bVZAvfFDmLNW3tnlmivL+zYSw/sQ9PAhjMGDbTBlSio1oJ+91wiA==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-rose/-/legacy-plugin-chart-rose-0.17.85.tgz",
+      "integrity": "sha512-NilJNxC49YM+j7WqGmna/+G1m0/VXb1hoj2Z2PXPy8KYGMKrLQAwNE0ce7yBnQqSljvxq5Memfjqzqjoio5aoA==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "nvd3": "1.8.6",
         "prop-types": "^15.6.2"
@@ -14553,12 +12405,12 @@
       }
     },
     "node_modules/@superset-ui/legacy-plugin-chart-sankey": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey/-/legacy-plugin-chart-sankey-0.17.53.tgz",
-      "integrity": "sha512-3tvMghg5WUAq40su8cZrjJHoc/TsK1WWx6UFu+j2mPOh/BJJZb8wh7A63X82ubLdyzEqdjxsEs9pzZWzs7kUHw==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey/-/legacy-plugin-chart-sankey-0.17.85.tgz",
+      "integrity": "sha512-MV47pYL5QkVAT8rfYrLT9joJF8a48mLiS3suVT+u4vHv3rrsWNTa00irD1HqNoWLDCuZr+U7pCt+UbW/0w2yGw==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "d3-sankey": "^0.4.2",
         "prop-types": "^15.6.2"
@@ -14568,47 +12420,47 @@
       }
     },
     "node_modules/@superset-ui/legacy-plugin-chart-sankey-loop": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey-loop/-/legacy-plugin-chart-sankey-loop-0.17.53.tgz",
-      "integrity": "sha512-60aGflqOi5+XDE3BR/p+Pw0xVp7OHsjwroX77CwkwBtFkw1AFVWczaTJH6CYeeCJZXCLYjrbc5OFMuaxIJ+j+Q==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey-loop/-/legacy-plugin-chart-sankey-loop-0.17.85.tgz",
+      "integrity": "sha512-z3I/NCQa64LXKiel+AswpdnUuhsS/0hiziY+T+BuN2geeVrWC+LMQya1hMDg+dDR3RgpkKqgpI9lEf1KTuhHaQ==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3-sankey-diagram": "^0.7.3",
         "d3-selection": "^1.4.0",
         "prop-types": "^15.6.2"
       }
     },
     "node_modules/@superset-ui/legacy-plugin-chart-sunburst": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sunburst/-/legacy-plugin-chart-sunburst-0.17.53.tgz",
-      "integrity": "sha512-t0z7XPsDtDpnZ+fIpn57w9Vi3oWQ7ximDdjmag1WGhC6+dwR3XxEpNcicI6P6xfNX078RT8Iz89PZQBtagAAkA==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sunburst/-/legacy-plugin-chart-sunburst-0.17.85.tgz",
+      "integrity": "sha512-L6rRXhEasNQpFN9SQ0ZB6qfa94XIVlCxyEmy8DOR2N39nlLncCweiHtgvgS4Su9H86nidZ/6ryNZ4fKxmm2mBg==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "prop-types": "^15.6.2"
       }
     },
     "node_modules/@superset-ui/legacy-plugin-chart-treemap": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-treemap/-/legacy-plugin-chart-treemap-0.17.53.tgz",
-      "integrity": "sha512-LV16Qwiz7ahfhCmuWIGk6f54KpdRJDAyLtr/ifFi8a2AcoG27Lf7hZZ3mCI9Jl5X6c7LLBmvAHfxdbBnLGa8+g==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-treemap/-/legacy-plugin-chart-treemap-0.17.85.tgz",
+      "integrity": "sha512-X4HVCOuhe45qaqUzTfjrKxAr9RoSbdwmWlCWLK2djVJDAFYGqhTxcpNEXxSv+cMqpyMBLhwXqZ5SMV5u0Gu+Eg==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3-hierarchy": "^1.1.8",
         "d3-selection": "^1.4.0",
         "prop-types": "^15.6.2"
       }
     },
     "node_modules/@superset-ui/legacy-plugin-chart-world-map": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-world-map/-/legacy-plugin-chart-world-map-0.17.53.tgz",
-      "integrity": "sha512-gnDBTyWPctqucyQzAObH6N+3f9GUQq9qpQ4cNbtvpIoVgXowYA5Q5dIfXBPnq525t78o3eiWqclTYf2Xcd62Kw==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-world-map/-/legacy-plugin-chart-world-map-0.17.85.tgz",
+      "integrity": "sha512-bxO1/tY2FI1MzfircbjwuwbLzI+jg2puIlKFek6vkbQuxA9+gCtxKD0SLOlxadNQXW4kUrU2DxhfPlr6th55bA==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "d3-array": "^2.4.0",
         "d3-color": "^1.4.1",
@@ -14627,19 +12479,14 @@
         "internmap": "^1.0.0"
       }
     },
-    "node_modules/@superset-ui/legacy-plugin-chart-world-map/node_modules/d3-color": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz",
-      "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="
-    },
     "node_modules/@superset-ui/legacy-preset-chart-big-number": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-big-number/-/legacy-preset-chart-big-number-0.17.53.tgz",
-      "integrity": "sha512-HUlE6IZUjFvPMiXCj1cdRiR4avFLVhT5qwIQZk1l30kycl8/73rTm37Y/syBfZMPrfCrIW3nyReqfcnAaNqw9g==",
+      "version": "0.17.86",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-big-number/-/legacy-preset-chart-big-number-0.17.86.tgz",
+      "integrity": "sha512-b9TZ7VJ3IK+ii6VDllfOCDujLR++rYNXcnNW/XgCZP9+ZwbHBIzGqC7APdUid7qDJM/PZwN6USXSnYf5MIYPLw==",
       "dependencies": {
         "@data-ui/xy-chart": "^0.0.84",
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "@types/d3-color": "^1.2.2",
         "@types/shortid": "^0.0.29",
         "d3-color": "^1.2.3",
@@ -14650,43 +12497,178 @@
       }
     },
     "node_modules/@superset-ui/legacy-preset-chart-deckgl": {
-      "version": "0.4.7",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-deckgl/-/legacy-preset-chart-deckgl-0.4.7.tgz",
-      "integrity": "sha512-TaAX1PlZ5DhsNelgoOjCfPBlFtHZDFcozJEIAV2qXzXUo6rfIgskqIq4X3VbMuYnngZw5of4hAtOH1+Tgv+Wmw==",
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-deckgl/-/legacy-preset-chart-deckgl-0.4.11.tgz",
+      "integrity": "sha512-N4l8zavJ3kQUyoPFqG6zXQT8EELFcXtD/GNRy3aJzSgHObRhK8+aqFaWIn3ncQrBuEiUzGDnHLNni/LRAxz7vA==",
       "dependencies": {
         "@math.gl/web-mercator": "^3.2.2",
         "@types/d3-array": "^2.0.0",
         "bootstrap-slider": "^10.0.0",
         "d3-array": "^1.2.4",
-        "d3-color": "^1.2.0",
-        "d3-scale": "^2.1.2",
-        "deck.gl": "7.1.11",
+        "d3-color": "^1.4.1",
+        "d3-scale": "^3.0.0",
+        "deck.gl": "8.5.2",
         "jquery": "^3.4.1",
         "lodash": "^4.17.15",
-        "mapbox-gl": "^0.53.0",
+        "mapbox-gl": "^2.4.0",
         "moment": "^2.20.1",
         "mousetrap": "^1.6.1",
         "prop-types": "^15.6.0",
         "react-bootstrap-slider": "2.1.5",
-        "react-map-gl": "^4.0.10",
+        "react-map-gl": "^6.1.16",
         "underscore": "^1.8.3",
         "urijs": "^1.18.10",
         "xss": "^1.0.6"
       },
       "peerDependencies": {
-        "@superset-ui/chart-controls": "^0.17.12",
-        "@superset-ui/core": "^0.17.11",
-        "react": "^15 || ^16"
+        "@superset-ui/chart-controls": "^0.17.80",
+        "@superset-ui/core": "^0.17.80",
+        "react": "^16.13.1"
+      }
+    },
+    "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/@mapbox/geojson-rewind": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.1.tgz",
+      "integrity": "sha512-eL7fMmfTBKjrb+VFHXCGv9Ot0zc3C0U+CwXo1IrP+EPwDczLoXv34Tgq3y+2mPSFNVUXgU42ILWJTC7145KPTA==",
+      "dependencies": {
+        "get-stream": "^6.0.1",
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "geojson-rewind": "geojson-rewind"
+      }
+    },
+    "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/@mapbox/mapbox-gl-supported": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.0.tgz",
+      "integrity": "sha512-zu4udqYiBrKMQKwpKJ4hhPON7tz0QR/JZ3iGpHnNWFmH3Sv/ysxlICATUtGCFpsyJf2v1WpFhlzaZ3GhhKmPMA=="
+    },
+    "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/d3-scale": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz",
+      "integrity": "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==",
+      "dependencies": {
+        "d3-array": "^2.3.0",
+        "d3-format": "1 - 2",
+        "d3-interpolate": "1.2.0 - 2",
+        "d3-time": "^2.1.1",
+        "d3-time-format": "2 - 3"
+      }
+    },
+    "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/d3-scale/node_modules/d3-array": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
+      "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
+      "dependencies": {
+        "internmap": "^1.0.0"
+      }
+    },
+    "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/d3-time": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz",
+      "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==",
+      "dependencies": {
+        "d3-array": "2"
+      }
+    },
+    "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/d3-time/node_modules/d3-array": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
+      "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
+      "dependencies": {
+        "internmap": "^1.0.0"
+      }
+    },
+    "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/mapbox-gl": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-2.4.0.tgz",
+      "integrity": "sha512-oH5fkh209U2Zqvgs1bBS+SQVhrj8rUT9OTgZmg+20GaNthDJFYDCXvGidVAkgacuCHSIALTZKzMV1DFgO+isFQ==",
+      "dependencies": {
+        "@mapbox/geojson-rewind": "^0.5.0",
+        "@mapbox/geojson-types": "^1.0.2",
+        "@mapbox/jsonlint-lines-primitives": "^2.0.2",
+        "@mapbox/mapbox-gl-supported": "^2.0.0",
+        "@mapbox/point-geometry": "^0.1.0",
+        "@mapbox/tiny-sdf": "^1.2.5",
+        "@mapbox/unitbezier": "^0.0.0",
+        "@mapbox/vector-tile": "^1.3.1",
+        "@mapbox/whoots-js": "^3.1.0",
+        "csscolorparser": "~1.0.3",
+        "earcut": "^2.2.2",
+        "geojson-vt": "^3.2.1",
+        "gl-matrix": "^3.3.0",
+        "grid-index": "^1.1.0",
+        "minimist": "^1.2.5",
+        "murmurhash-js": "^1.0.0",
+        "pbf": "^3.2.1",
+        "potpack": "^1.0.1",
+        "quickselect": "^2.0.0",
+        "rw": "^1.3.3",
+        "supercluster": "^7.1.3",
+        "tinyqueue": "^2.0.3",
+        "vt-pbf": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=14.15.4"
+      }
+    },
+    "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/react-map-gl": {
+      "version": "6.1.16",
+      "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-6.1.16.tgz",
+      "integrity": "sha512-d/4kFMMh2hDeZNeQOUm2wC1/as9q93EZiDmM5mGBx0LIch+9pTFgO6ZINIuUD9Zz4JqWGpthyjoKr3QKgrGiRA==",
+      "dependencies": {
+        "@babel/runtime": "^7.0.0",
+        "@types/geojson": "^7946.0.7",
+        "@types/mapbox-gl": "^2.0.3",
+        "mapbox-gl": "^2.3.0",
+        "mjolnir.js": "^2.5.0",
+        "prop-types": "^15.7.2",
+        "resize-observer-polyfill": "^1.5.1",
+        "viewport-mercator-project": "^7.0.3"
+      },
+      "engines": {
+        "node": ">= 4",
+        "npm": ">= 3"
+      },
+      "peerDependencies": {
+        "react": ">=16.3.0"
+      }
+    },
+    "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/supercluster": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.3.tgz",
+      "integrity": "sha512-7+bR4FbF5SYsmkHfDp61QiwCKtwNDyPsddk9TzfsDA5DQr5Goii5CVD2SXjglweFCxjrzVZf945ahqYfUIk8UA==",
+      "dependencies": {
+        "kdbush": "^3.0.0"
+      }
+    },
+    "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/viewport-mercator-project": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/viewport-mercator-project/-/viewport-mercator-project-7.0.3.tgz",
+      "integrity": "sha512-5nSgVK8jKTSKzOvsa8TSSd2IeQCpHfSNiBOOOMQLvzlxgWD0YoF4xRmyZio3GaLtKSE+50UB892X3R1SAMbaww==",
+      "dependencies": {
+        "@math.gl/web-mercator": "^3.4.3"
       }
     },
     "node_modules/@superset-ui/legacy-preset-chart-nvd3": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-nvd3/-/legacy-preset-chart-nvd3-0.17.53.tgz",
-      "integrity": "sha512-wTbQRCZDrnb16tLJzXYbIiCFbHddRJ3fo5DKsbv6MFNrfOLWWx1SjAZ5C60e57u33XpKdTE5jGpEuGdq7BZ55w==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-nvd3/-/legacy-preset-chart-nvd3-0.17.85.tgz",
+      "integrity": "sha512-KoC8kIqP6zwtGzXBUj6yMaF3Cz2TXygAe7ZCG5XeavgrjgKsWqOXAdQzJ9oBrCPXPQBC5hF7TruBB/Xd839TDA==",
       "dependencies": {
         "@data-ui/xy-chart": "^0.0.84",
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "d3-tip": "^0.9.1",
         "dompurify": "^2.0.6",
@@ -14703,15 +12685,15 @@
       }
     },
     "node_modules/@superset-ui/plugin-chart-echarts": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-echarts/-/plugin-chart-echarts-0.17.53.tgz",
-      "integrity": "sha512-XXKqhr2CwZfi02qW55d9SQnNmdewTsAJT6xePBjci0SXAZRmi/T8vRbq2OCDJ7mQ0de7kjVBydAuOEEU/Y554A==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-echarts/-/plugin-chart-echarts-0.17.85.tgz",
+      "integrity": "sha512-dAqRzVVm7Shn2fgKoj2puX0jefe2r14dOQThJ8CG/hRlpmXsKmLnSywwLvQVxq1oUhh+uQYsemdYBCsrQAuxcg==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "@types/mathjs": "^6.0.7",
         "d3-array": "^1.2.0",
-        "echarts": "^5.1.1",
+        "echarts": "^5.1.2",
         "lodash": "^4.17.15",
         "mathjs": "^8.0.1"
       },
@@ -14720,25 +12702,27 @@
       }
     },
     "node_modules/@superset-ui/plugin-chart-pivot-table": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-pivot-table/-/plugin-chart-pivot-table-0.17.53.tgz",
-      "integrity": "sha512-18CTaM1sRgK5laFwHlKV+1A7+l9YWwPAvb7XrMjS8CQq0T2aEqNSQm7KWByG+LEj2x86idM8gaWghNes27yVtQ==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-pivot-table/-/plugin-chart-pivot-table-0.17.85.tgz",
+      "integrity": "sha512-tTU79c/C7g5sdZxRNVcl6QFbwqhsv0Bi/XeYOwhTNAe7qf7LmkvwQB78fvh7WW+U2FBltkhHmOxOb/HIJscXVg==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
-        "@superset-ui/react-pivottable": "^0.12.8"
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
+        "@superset-ui/react-pivottable": "^0.12.12"
       },
       "peerDependencies": {
+        "@ant-design/icons": "^4.2.2",
         "react": "^16.13.1"
       }
     },
     "node_modules/@superset-ui/plugin-chart-table": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-table/-/plugin-chart-table-0.17.53.tgz",
-      "integrity": "sha512-PSeL/zQSTvQyztjUMMm4U4G6oEM3xk3wkC4HTpuLEpjQ7qyGme39M1JeCGvNG4pPZRm0nO4pU+0U/36oR0lAjw==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-table/-/plugin-chart-table-0.17.85.tgz",
+      "integrity": "sha512-RGeIGAQuiiOy6JgpnQC+rtVDWR8jGZF1DOER+WkgbfTeKiRmVGyo7wOSb7dvQlsaitUg2Y30962arOGeEcgvpA==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@react-icons/all-files": "^4.1.0",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "@types/d3-array": "^2.9.0",
         "@types/react-table": "^7.0.29",
         "d3-array": "^2.4.0",
@@ -14751,8 +12735,7 @@
       "peerDependencies": {
         "@types/react": "*",
         "react": "^16.13.1",
-        "react-dom": "^16.13.1",
-        "react-icons": "^4.2.0"
+        "react-dom": "^16.13.1"
       }
     },
     "node_modules/@superset-ui/plugin-chart-table/node_modules/d3-array": {
@@ -14764,12 +12747,12 @@
       }
     },
     "node_modules/@superset-ui/plugin-chart-word-cloud": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.17.53.tgz",
-      "integrity": "sha512-lQTr9UpeoGgX1B0SkjrvtL0zjgYVoJbm6RVv8ELG+efCG1oYAoIVgw2sahJI4zLqNiHcNeWqHUcu7NK06uc4mA==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.17.85.tgz",
+      "integrity": "sha512-nCbmndNxUoHWkYRCARD1C4XjzxXtk/OkCUVdB3EKaPNWbi0QuQHUuAZUh3ROIewxd3KAMoSUYRIjTVYDbetnJQ==",
       "dependencies": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "@types/d3-cloud": "^1.2.1",
         "@types/d3-scale": "^2.0.2",
         "d3-cloud": "^1.2.5",
@@ -14802,14 +12785,14 @@
       }
     },
     "node_modules/@superset-ui/preset-chart-xy": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/preset-chart-xy/-/preset-chart-xy-0.17.53.tgz",
-      "integrity": "sha512-nmqif4Zd7Tdx4hLoDiiRiNFUFn1kliumjp9RQK68eMaefWcl1vTMT7nPmyFvgUH5390HJygpC3up50+j5Bngkg==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/preset-chart-xy/-/preset-chart-xy-0.17.85.tgz",
+      "integrity": "sha512-Cd2Ji1trP6aHuOfHK0GDza8iQUVkJNbtIFSReb240ViewICH/7mtsrj8jLAvf3tyOORLD3AW2j8s68UDCrBi6g==",
       "dependencies": {
         "@data-ui/theme": "^0.0.84",
         "@data-ui/xy-chart": "^0.0.84",
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "@vx/axis": "^0.0.198",
         "@vx/legend": "^0.0.198",
         "@vx/scale": "^0.0.197",
@@ -14929,9 +12912,9 @@
       }
     },
     "node_modules/@superset-ui/react-pivottable": {
-      "version": "0.12.8",
-      "resolved": "https://registry.npmjs.org/@superset-ui/react-pivottable/-/react-pivottable-0.12.8.tgz",
-      "integrity": "sha512-7DRxX/w1uSQE1pibSe64t1o+fmiP7ZWT2FJkjK510bSJm8NUIPCXtmpK+NKtNZuCteE9sqE7bQxd54SSq2xWKw==",
+      "version": "0.12.12",
+      "resolved": "https://registry.npmjs.org/@superset-ui/react-pivottable/-/react-pivottable-0.12.12.tgz",
+      "integrity": "sha512-4+wx2kQy3IRKoWHTf2bIkXjlzDA0u/eN2k0FfLfJ5bdER2GuqZErWuKtiZzARsn5kSS9hPIrvt77uv52R3FnfQ==",
       "dependencies": {
         "immutability-helper": "^3.1.1",
         "prop-types": "^15.7.2",
@@ -15008,18 +12991,18 @@
       }
     },
     "node_modules/@svgr/babel-plugin-transform-svg-component": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.4.0.tgz",
-      "integrity": "sha512-zLl4Fl3NvKxxjWNkqEcpdSOpQ3LGVH2BNFQ6vjaK6sFo2IrSznrhURIPI0HAphKiiIwNYjAfE0TNoQDSZv0U9A==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz",
+      "integrity": "sha512-q4jSH1UUvbrsOtlo/tKcgSeiCHRSBdXoIoqX1pgcKK/aU3JD27wmMKwGtpB8qRYUYoyXvfGxUVKchLuR5pB3rQ==",
       "dev": true,
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/@svgr/babel-preset": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.4.0.tgz",
-      "integrity": "sha512-Gyx7cCxua04DBtyILTYdQxeO/pwfTBev6+eXTbVbxe4HTGhOUW6yo7PSbG2p6eJMl44j6XSequ0ZDP7bl0nu9A==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.5.0.tgz",
+      "integrity": "sha512-4FiXBjvQ+z2j7yASeGPEi8VD/5rrGQk4Xrq3EdJmoZgz/tpqChpo5hgXDvmEauwtvOc52q8ghhZK4Oy7qph4ig==",
       "dev": true,
       "dependencies": {
         "@svgr/babel-plugin-add-jsx-attribute": "^5.4.0",
@@ -15029,55 +13012,55 @@
         "@svgr/babel-plugin-svg-dynamic-title": "^5.4.0",
         "@svgr/babel-plugin-svg-em-dimensions": "^5.4.0",
         "@svgr/babel-plugin-transform-react-native-svg": "^5.4.0",
-        "@svgr/babel-plugin-transform-svg-component": "^5.4.0"
+        "@svgr/babel-plugin-transform-svg-component": "^5.5.0"
       },
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/@svgr/core": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/core/-/core-5.4.0.tgz",
-      "integrity": "sha512-hWGm1DCCvd4IEn7VgDUHYiC597lUYhFau2lwJBYpQWDirYLkX4OsXu9IslPgJ9UpP7wsw3n2Ffv9sW7SXJVfqQ==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/core/-/core-5.5.0.tgz",
+      "integrity": "sha512-q52VOcsJPvV3jO1wkPtzTuKlvX7Y3xIcWRpCMtBF3MrteZJtBfQw/+u0B1BHy5ColpQc1/YVTrPEtSYIMNZlrQ==",
       "dev": true,
       "dependencies": {
-        "@svgr/plugin-jsx": "^5.4.0",
-        "camelcase": "^6.0.0",
-        "cosmiconfig": "^6.0.0"
+        "@svgr/plugin-jsx": "^5.5.0",
+        "camelcase": "^6.2.0",
+        "cosmiconfig": "^7.0.0"
       },
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/@svgr/core/node_modules/camelcase": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
-      "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
       "dev": true,
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/@svgr/core/node_modules/cosmiconfig": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-      "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
+      "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
       "dev": true,
       "dependencies": {
         "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.1.0",
+        "import-fresh": "^3.2.1",
         "parse-json": "^5.0.0",
         "path-type": "^4.0.0",
-        "yaml": "^1.7.2"
+        "yaml": "^1.10.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
     "node_modules/@svgr/core/node_modules/import-fresh": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
       "dependencies": {
         "parent-module": "^1.0.0",
@@ -15088,14 +13071,14 @@
       }
     },
     "node_modules/@svgr/core/node_modules/parse-json": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
-      "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1",
+        "json-parse-even-better-errors": "^2.3.0",
         "lines-and-columns": "^1.1.6"
       },
       "engines": {
@@ -15112,26 +13095,26 @@
       }
     },
     "node_modules/@svgr/hast-util-to-babel-ast": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.4.0.tgz",
-      "integrity": "sha512-+U0TZZpPsP2V1WvVhqAOSTk+N+CjYHdZx+x9UBa1eeeZDXwH8pt0CrQf2+SvRl/h2CAPRFkm+Ey96+jKP8Bsgg==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz",
+      "integrity": "sha512-cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.9.5"
+        "@babel/types": "^7.12.6"
       },
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/@svgr/plugin-jsx": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.4.0.tgz",
-      "integrity": "sha512-SGzO4JZQ2HvGRKDzRga9YFSqOqaNrgLlQVaGvpZ2Iht2gwRp/tq+18Pvv9kS9ZqOMYgyix2LLxZMY1LOe9NPqw==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz",
+      "integrity": "sha512-V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "^7.7.5",
-        "@svgr/babel-preset": "^5.4.0",
-        "@svgr/hast-util-to-babel-ast": "^5.4.0",
+        "@babel/core": "^7.12.3",
+        "@svgr/babel-preset": "^5.5.0",
+        "@svgr/hast-util-to-babel-ast": "^5.5.0",
         "svg-parser": "^2.0.2"
       },
       "engines": {
@@ -15139,13 +13122,13 @@
       }
     },
     "node_modules/@svgr/plugin-svgo": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.4.0.tgz",
-      "integrity": "sha512-3Cgv3aYi1l6SHyzArV9C36yo4kgwVdF3zPQUC6/aCDUeXAofDYwE5kk3e3oT5ZO2a0N3lB+lLGvipBG6lnG8EA==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz",
+      "integrity": "sha512-r5swKk46GuQl4RrVejVwpeeJaydoxkdwkM1mBKOgJLBUJPGaLci6ylg/IjhrRsREKDkr4kbMWdgOtbXEh0fyLQ==",
       "dev": true,
       "dependencies": {
-        "cosmiconfig": "^6.0.0",
-        "merge-deep": "^3.0.2",
+        "cosmiconfig": "^7.0.0",
+        "deepmerge": "^4.2.2",
         "svgo": "^1.2.2"
       },
       "engines": {
@@ -15153,25 +13136,34 @@
       }
     },
     "node_modules/@svgr/plugin-svgo/node_modules/cosmiconfig": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-      "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
+      "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
       "dev": true,
       "dependencies": {
         "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.1.0",
+        "import-fresh": "^3.2.1",
         "parse-json": "^5.0.0",
         "path-type": "^4.0.0",
-        "yaml": "^1.7.2"
+        "yaml": "^1.10.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      }
+    },
+    "node_modules/@svgr/plugin-svgo/node_modules/deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/@svgr/plugin-svgo/node_modules/import-fresh": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
       "dependencies": {
         "parent-module": "^1.0.0",
@@ -15182,14 +13174,14 @@
       }
     },
     "node_modules/@svgr/plugin-svgo/node_modules/parse-json": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
-      "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1",
+        "json-parse-even-better-errors": "^2.3.0",
         "lines-and-columns": "^1.1.6"
       },
       "engines": {
@@ -15206,1203 +13198,348 @@
       }
     },
     "node_modules/@svgr/webpack": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-5.4.0.tgz",
-      "integrity": "sha512-LjepnS/BSAvelnOnnzr6Gg0GcpLmnZ9ThGFK5WJtm1xOqdBE/1IACZU7MMdVzjyUkfFqGz87eRE4hFaSLiUwYg==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-5.5.0.tgz",
+      "integrity": "sha512-DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "^7.9.0",
-        "@babel/plugin-transform-react-constant-elements": "^7.9.0",
-        "@babel/preset-env": "^7.9.5",
-        "@babel/preset-react": "^7.9.4",
-        "@svgr/core": "^5.4.0",
-        "@svgr/plugin-jsx": "^5.4.0",
-        "@svgr/plugin-svgo": "^5.4.0",
+        "@babel/core": "^7.12.3",
+        "@babel/plugin-transform-react-constant-elements": "^7.12.1",
+        "@babel/preset-env": "^7.12.1",
+        "@babel/preset-react": "^7.12.5",
+        "@svgr/core": "^5.5.0",
+        "@svgr/plugin-jsx": "^5.5.0",
+        "@svgr/plugin-svgo": "^5.5.0",
         "loader-utils": "^2.0.0"
       },
       "engines": {
         "node": ">=10"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/code-frame": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-      "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/compat-data": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.1.tgz",
-      "integrity": "sha512-CHvCj7So7iCkGKPRFUfryXIkU2gSBw7VSZFYLsqVhrS47269VK2Hfi9S/YcublPMW8k1u2bQBlbDruoQEm4fgw==",
+    "node_modules/@svgr/webpack/node_modules/emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
       "dev": true,
-      "dependencies": {
-        "browserslist": "^4.12.0",
-        "invariant": "^2.2.4",
-        "semver": "^5.5.0"
+      "engines": {
+        "node": ">= 4"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/core": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.2.tgz",
-      "integrity": "sha512-KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ==",
+    "node_modules/@svgr/webpack/node_modules/json5": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
+      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.10.1",
-        "@babel/generator": "^7.10.2",
-        "@babel/helper-module-transforms": "^7.10.1",
-        "@babel/helpers": "^7.10.1",
-        "@babel/parser": "^7.10.2",
-        "@babel/template": "^7.10.1",
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.2",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.1",
-        "json5": "^2.1.2",
-        "lodash": "^4.17.13",
-        "resolve": "^1.3.2",
-        "semver": "^5.4.1",
-        "source-map": "^0.5.0"
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
       },
       "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/helper-builder-react-jsx": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.1.tgz",
-      "integrity": "sha512-KXzzpyWhXgzjXIlJU1ZjIXzUPdej1suE6vzqgImZ/cpAsR/CC8gUcX4EWRmDfWz/cs6HOCPMBIJ3nKoXt3BFuw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "node": ">=6"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/helper-compilation-targets": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz",
-      "integrity": "sha512-hYgOhF4To2UTB4LTaZepN/4Pl9LD4gfbJx8A34mqoluT8TLbof1mhUlYuNWTEebONa8+UlCC4X0TEXu7AOUyGA==",
+    "node_modules/@svgr/webpack/node_modules/loader-utils": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.10.1",
-        "browserslist": "^4.12.0",
-        "invariant": "^2.2.4",
-        "levenary": "^1.1.1",
-        "semver": "^5.5.0"
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz",
-      "integrity": "sha512-5C/QhkGFh1vqcziq1vAL6SI9ymzUp8BCYjFpvYVhWP4DlATIb3u5q3iUd35mvlyGs8fO7hckkW7i0tmH+5+bvQ==",
+    "node_modules/@testing-library/dom": {
+      "version": "7.29.4",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.29.4.tgz",
+      "integrity": "sha512-CtrJRiSYEfbtNGtEsd78mk1n1v2TUbeABlNIcOCJdDfkN5/JTOwQEbbQpoSRxGqzcWPgStMvJ4mNolSuBRv1NA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/helper-member-expression-to-functions": "^7.10.1",
-        "@babel/helper-optimise-call-expression": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-replace-supers": "^7.10.1",
-        "@babel/helper-split-export-declaration": "^7.10.1"
+        "@babel/code-frame": "^7.10.4",
+        "@babel/runtime": "^7.12.5",
+        "@types/aria-query": "^4.2.0",
+        "aria-query": "^4.2.2",
+        "chalk": "^4.1.0",
+        "dom-accessibility-api": "^0.5.4",
+        "lz-string": "^1.4.4",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz",
-      "integrity": "sha512-Rx4rHS0pVuJn5pJOqaqcZR4XSgeF9G/pO/79t+4r7380tXFJdzImFnxMU19f83wjSrmKHq6myrM10pFHTGzkUA==",
+    "node_modules/@testing-library/dom/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-regex": "^7.10.1",
-        "regexpu-core": "^4.7.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/helper-hoist-variables": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz",
-      "integrity": "sha512-vLm5srkU8rI6X3+aQ1rQJyfjvCBLXP8cAGeuw04zeAM2ItKb1e7pmVmLyHb4sDaAYnLL13RHOZPLEtcGZ5xvjg==",
+    "node_modules/@testing-library/dom/node_modules/chalk/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.10.1"
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/helper-module-transforms": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz",
-      "integrity": "sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==",
+    "node_modules/@testing-library/dom/node_modules/chalk/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.10.1",
-        "@babel/helper-replace-supers": "^7.10.1",
-        "@babel/helper-simple-access": "^7.10.1",
-        "@babel/helper-split-export-declaration": "^7.10.1",
-        "@babel/template": "^7.10.1",
-        "@babel/types": "^7.10.1",
-        "lodash": "^4.17.13"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/helper-regex": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.1.tgz",
-      "integrity": "sha512-7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g==",
+    "node_modules/@testing-library/dom/node_modules/chalk/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.13"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz",
-      "integrity": "sha512-RfX1P8HqsfgmJ6CwaXGKMAqbYdlleqglvVtht0HGPMSsy2V6MqLlOJVF/0Qyb/m2ZCi2z3q3+s6Pv7R/dQuZ6A==",
+    "node_modules/@testing-library/dom/node_modules/chalk/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-wrap-function": "^7.10.1",
-        "@babel/template": "^7.10.1",
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/helper-simple-access": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz",
-      "integrity": "sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.10.1",
-        "@babel/types": "^7.10.1"
-      }
+    "node_modules/@testing-library/dom/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/helper-wrap-function": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz",
-      "integrity": "sha512-C0MzRGteVDn+H32/ZgbAv5r56f2o1fZSA/rj/TYo8JEJNHg+9BdSmKBUND0shxWRztWhjlT2cvHYuynpPsVJwQ==",
+    "node_modules/@testing-library/jest-dom": {
+      "version": "5.11.6",
+      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.11.6.tgz",
+      "integrity": "sha512-cVZyUNRWwUKI0++yepYpYX7uhrP398I+tGz4zOlLVlUYnZS+Svuxv4fwLeCIy7TnBYKXUaOlQr3vopxL8ZfEnA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/template": "^7.10.1",
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "@babel/runtime": "^7.9.2",
+        "@types/testing-library__jest-dom": "^5.9.1",
+        "aria-query": "^4.2.2",
+        "chalk": "^3.0.0",
+        "css": "^3.0.0",
+        "css.escape": "^1.5.1",
+        "lodash": "^4.17.15",
+        "redent": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8",
+        "npm": ">=6",
+        "yarn": ">=1"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/helpers": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz",
-      "integrity": "sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==",
+    "node_modules/@testing-library/jest-dom/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.10.1",
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/highlight": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-      "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
+    "node_modules/@testing-library/jest-dom/node_modules/chalk": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.1",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz",
-      "integrity": "sha512-vzZE12ZTdB336POZjmpblWfNNRpMSua45EYnRigE2XsZxcXcIyly2ixnTJasJE4Zq3U7t2d8rRF7XRUuzHxbOw==",
+    "node_modules/@testing-library/jest-dom/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-remap-async-to-generator": "^7.10.1",
-        "@babel/plugin-syntax-async-generators": "^7.8.0"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-proposal-class-properties": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.1.tgz",
-      "integrity": "sha512-sqdGWgoXlnOdgMXU+9MbhzwFRgxVLeiGBqTrnuS7LC2IBU31wSsESbTUreT2O418obpfPdGUR2GbEufZF1bpqw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
+    "node_modules/@testing-library/jest-dom/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz",
-      "integrity": "sha512-Cpc2yUVHTEGPlmiQzXj026kqwjEQAD9I4ZC16uzdbgWgitg/UHKHLffKNCQZ5+y8jpIZPJcKcwsr2HwPh+w3XA==",
+    "node_modules/@testing-library/jest-dom/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz",
-      "integrity": "sha512-m8r5BmV+ZLpWPtMY2mOKN7wre6HIO4gfIiV+eOmsnZABNenrt/kzYBwrh+KOfgumSWpnlGs5F70J8afYMSJMBg==",
+    "node_modules/@testing-library/jest-dom/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-json-strings": "^7.8.0"
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz",
-      "integrity": "sha512-56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA==",
+    "node_modules/@testing-library/react": {
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.0.tgz",
+      "integrity": "sha512-90xKYJzskZ7q/AoSuWraQL4EGZlr75uZvDt3nrO4M+rugN02zjO45tmOBq/JBOgDiMIL1tkhHioKXjJsVaSINA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
+        "@babel/runtime": "^7.12.5",
+        "@testing-library/dom": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz",
-      "integrity": "sha512-VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA==",
+    "node_modules/@testing-library/react-hooks": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/@testing-library/react-hooks/-/react-hooks-5.0.3.tgz",
+      "integrity": "sha512-UrnnRc5II7LMH14xsYNm/WRch/67cBafmrSQcyFh0v+UUmSf1uzfB7zn5jQXSettGwOSxJwdQUN7PgkT0w22Lg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
+        "@babel/runtime": "^7.12.5",
+        "@types/react": ">=16.9.0",
+        "@types/react-dom": ">=16.9.0",
+        "@types/react-test-renderer": ">=16.9.0",
+        "filter-console": "^0.1.1",
+        "react-error-boundary": "^3.1.0"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz",
-      "integrity": "sha512-dqQj475q8+/avvok72CF3AOSV/SGEcH29zT5hhohqqvvZ2+boQoOr7iGldBG5YXTO2qgCgc2B3WvVLUdbeMlGA==",
+    "node_modules/@testing-library/react-hooks/node_modules/react-error-boundary": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-3.1.0.tgz",
+      "integrity": "sha512-lmPrdi5SLRJR+AeJkqdkGlW/CRkAUvZnETahK58J4xb5wpbfDngasEGu+w0T1iXEhVrYBJZeW+c4V1hILCnMWQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
+        "@babel/runtime": "^7.12.5"
+      },
+      "engines": {
+        "node": ">=10",
+        "npm": ">=6"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz",
-      "integrity": "sha512-JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ==",
+    "node_modules/@testing-library/user-event": {
+      "version": "12.7.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-12.7.0.tgz",
+      "integrity": "sha512-KzRM1KNDoW8pJ2HTenrUhTjV6wJMHvWAagDs8DDrYSWz6y4PN+K2jSvlm2bMHWNRk5LTJPo9jqIjNjJ3FlqXNw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/runtime": "^7.12.5"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10",
+        "npm": ">=6"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz",
-      "integrity": "sha512-hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
+    "node_modules/@types/anymatch": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz",
+      "integrity": "sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz",
-      "integrity": "sha512-6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
+    "node_modules/@types/aria-query": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.0.tgz",
+      "integrity": "sha512-iIgQNzCm0v7QMhhe4Jjn9uRh+I6GoPmt03CbEtwx3ao8/EfoQcmgtqH4vQ5Db/lxiIGaWDv6nwvunuh0RyX0+A==",
+      "dev": true
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz",
-      "integrity": "sha512-XCgYjJ8TY2slj6SReBUyamJn3k2JLUIiiR5b6t1mNCMSvv7yx+jJpaewakikp0uWFQSF7ChPPoe3dHmXLpISkg==",
+    "node_modules/@types/babel__core": {
+      "version": "7.1.9",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.9.tgz",
+      "integrity": "sha512-sY2RsIJ5rpER1u3/aQ8OFSI7qGIy8o1NEEbgb2UaJcvOtXOMpd39ko723NBpjQFg9SIX7TXtjejZVGeIMLhoOw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-remap-async-to-generator": "^7.10.1"
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz",
-      "integrity": "sha512-B7K15Xp8lv0sOJrdVAoukKlxP9N59HS48V1J3U/JGj+Ad+MHq+am6xJVs85AgXrQn4LV8vaYFOB+pr/yIuzW8Q==",
+    "node_modules/@types/babel__generator": {
+      "version": "7.6.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz",
+      "integrity": "sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/types": "^7.0.0"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz",
-      "integrity": "sha512-8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw==",
+    "node_modules/@types/babel__template": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz",
+      "integrity": "sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "lodash": "^4.17.13"
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz",
-      "integrity": "sha512-mqSrGjp3IefMsXIenBfGcPXxJxweQe2hEIwMQvjtiDQ9b1IBvDUjkAtV/HMXX47/vXf14qDNedXsIiNd1FmkaQ==",
+    "node_modules/@types/babel__traverse": {
+      "version": "7.0.12",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.12.tgz",
+      "integrity": "sha512-t4CoEokHTfcyfb4hUaF9oOHu9RmmNWnm1CP0YmMqOOfClKascOmvlEM736vlqeScuGvBDsHkf8R2INd4DWreQA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/types": "^7.3.0"
       }
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz",
-      "integrity": "sha512-V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
+    "node_modules/@types/braces": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/braces/-/braces-3.0.0.tgz",
+      "integrity": "sha512-TbH79tcyi9FHwbyboOKeRachRq63mSuWYXOflsNO9ZyE5ClQ/JaozNKl+aWUq87qPNsXasXxi2AbgfwIJ+8GQw==",
+      "dev": true
     },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz",
-      "integrity": "sha512-19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA==",
+    "node_modules/@types/cheerio": {
+      "version": "0.22.21",
+      "resolved": "https://registry.npmjs.org/@types/cheerio/-/cheerio-0.22.21.tgz",
+      "integrity": "sha512-aGI3DfswwqgKPiEOTaiHV2ZPC9KEhprpgEbJnv0fZl3SGX0cGgEva1126dGrMC6AJM6v/aihlUgJn9M5DbDZ/Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz",
-      "integrity": "sha512-wIEpkX4QvX8Mo9W6XF3EdGttrIPZWozHfEaDTU0WJD/TDnXMvdDh30mzUl/9qWhnf7naicYartcEfUghTCSNpA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz",
-      "integrity": "sha512-US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz",
-      "integrity": "sha512-//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-literals": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz",
-      "integrity": "sha512-qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz",
-      "integrity": "sha512-31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz",
-      "integrity": "sha512-AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-simple-access": "^7.10.1",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz",
-      "integrity": "sha512-ewNKcj1TQZDL3YnO85qh9zo1YF1CHgmSTlRQgHqe63oTrMI85cthKtZjAiZSsSNjPQ5NCaYo5QkbYqEw1ZBgZA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-hoist-variables": "^7.10.1",
-        "@babel/helper-module-transforms": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz",
-      "integrity": "sha512-EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz",
-      "integrity": "sha512-MBlzPc1nJvbmO9rPr1fQwXOM2iGut+JC92ku6PbiJMMK7SnQc1rytgpopveE3Evn47gzvGYeCdgfCDbZo0ecUw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz",
-      "integrity": "sha512-WnnStUDN5GL+wGQrJylrnnVlFhFmeArINIR9gjhSeYyvroGhBrSAXYg/RHsnfzmsa+onJrTJrEClPzgNmmQ4Gw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-replace-supers": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz",
-      "integrity": "sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-react-display-name": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.1.tgz",
-      "integrity": "sha512-rBjKcVwjk26H3VX8pavMxGf33LNlbocMHdSeldIEswtQ/hrjyTG8fKKILW1cSkODyRovckN/uZlGb2+sAV9JUQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.1.tgz",
-      "integrity": "sha512-MBVworWiSRBap3Vs39eHt+6pJuLUAaK4oxGc8g+wY+vuSJvLiEQjW1LSTqKb8OUPtDvHCkdPhk7d6sjC19xyFw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-builder-react-jsx": "^7.10.1",
-        "@babel/helper-builder-react-jsx-experimental": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-jsx": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-react-jsx-self": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.1.tgz",
-      "integrity": "sha512-4p+RBw9d1qV4S749J42ZooeQaBomFPrSxa9JONLHJ1TxCBo3TzJ79vtmG2S2erUT8PDDrPdw4ZbXGr2/1+dILA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-jsx": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-react-jsx-source": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.1.tgz",
-      "integrity": "sha512-neAbaKkoiL+LXYbGDvh6PjPG+YeA67OsZlE78u50xbWh2L1/C81uHiNP5d1fw+uqUIoiNdCC8ZB+G4Zh3hShJA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-jsx": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz",
-      "integrity": "sha512-B3+Y2prScgJ2Bh/2l9LJxKbb8C8kRfsG4AdPT+n7ixBHIxJaIG8bi8tgjxUMege1+WqSJ+7gu1YeoMVO3gPWzw==",
-      "dev": true,
-      "dependencies": {
-        "regenerator-transform": "^0.14.2"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz",
-      "integrity": "sha512-qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz",
-      "integrity": "sha512-AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-spread": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz",
-      "integrity": "sha512-8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz",
-      "integrity": "sha512-j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-regex": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz",
-      "integrity": "sha512-qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz",
-      "integrity": "sha512-Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/preset-env": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.2.tgz",
-      "integrity": "sha512-MjqhX0RZaEgK/KueRzh+3yPSk30oqDKJ5HP5tqTSB1e2gzGS3PLy7K0BIpnp78+0anFuSwOeuCf1zZO7RzRvEA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.10.1",
-        "@babel/helper-compilation-targets": "^7.10.2",
-        "@babel/helper-module-imports": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-proposal-async-generator-functions": "^7.10.1",
-        "@babel/plugin-proposal-class-properties": "^7.10.1",
-        "@babel/plugin-proposal-dynamic-import": "^7.10.1",
-        "@babel/plugin-proposal-json-strings": "^7.10.1",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.1",
-        "@babel/plugin-proposal-numeric-separator": "^7.10.1",
-        "@babel/plugin-proposal-object-rest-spread": "^7.10.1",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.10.1",
-        "@babel/plugin-proposal-optional-chaining": "^7.10.1",
-        "@babel/plugin-proposal-private-methods": "^7.10.1",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.10.1",
-        "@babel/plugin-syntax-async-generators": "^7.8.0",
-        "@babel/plugin-syntax-class-properties": "^7.10.1",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.0",
-        "@babel/plugin-syntax-json-strings": "^7.8.0",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.1",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.0",
-        "@babel/plugin-syntax-top-level-await": "^7.10.1",
-        "@babel/plugin-transform-arrow-functions": "^7.10.1",
-        "@babel/plugin-transform-async-to-generator": "^7.10.1",
-        "@babel/plugin-transform-block-scoped-functions": "^7.10.1",
-        "@babel/plugin-transform-block-scoping": "^7.10.1",
-        "@babel/plugin-transform-classes": "^7.10.1",
-        "@babel/plugin-transform-computed-properties": "^7.10.1",
-        "@babel/plugin-transform-destructuring": "^7.10.1",
-        "@babel/plugin-transform-dotall-regex": "^7.10.1",
-        "@babel/plugin-transform-duplicate-keys": "^7.10.1",
-        "@babel/plugin-transform-exponentiation-operator": "^7.10.1",
-        "@babel/plugin-transform-for-of": "^7.10.1",
-        "@babel/plugin-transform-function-name": "^7.10.1",
-        "@babel/plugin-transform-literals": "^7.10.1",
-        "@babel/plugin-transform-member-expression-literals": "^7.10.1",
-        "@babel/plugin-transform-modules-amd": "^7.10.1",
-        "@babel/plugin-transform-modules-commonjs": "^7.10.1",
-        "@babel/plugin-transform-modules-systemjs": "^7.10.1",
-        "@babel/plugin-transform-modules-umd": "^7.10.1",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
-        "@babel/plugin-transform-new-target": "^7.10.1",
-        "@babel/plugin-transform-object-super": "^7.10.1",
-        "@babel/plugin-transform-parameters": "^7.10.1",
-        "@babel/plugin-transform-property-literals": "^7.10.1",
-        "@babel/plugin-transform-regenerator": "^7.10.1",
-        "@babel/plugin-transform-reserved-words": "^7.10.1",
-        "@babel/plugin-transform-shorthand-properties": "^7.10.1",
-        "@babel/plugin-transform-spread": "^7.10.1",
-        "@babel/plugin-transform-sticky-regex": "^7.10.1",
-        "@babel/plugin-transform-template-literals": "^7.10.1",
-        "@babel/plugin-transform-typeof-symbol": "^7.10.1",
-        "@babel/plugin-transform-unicode-escapes": "^7.10.1",
-        "@babel/plugin-transform-unicode-regex": "^7.10.1",
-        "@babel/preset-modules": "^0.1.3",
-        "@babel/types": "^7.10.2",
-        "browserslist": "^4.12.0",
-        "core-js-compat": "^3.6.2",
-        "invariant": "^2.2.2",
-        "levenary": "^1.1.1",
-        "semver": "^5.5.0"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/@babel/preset-react": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.10.1.tgz",
-      "integrity": "sha512-Rw0SxQ7VKhObmFjD/cUcKhPTtzpeviEFX1E6PgP+cYOhQ98icNqtINNFANlsdbQHrmeWnqdxA4Tmnl1jy5tp3Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-transform-react-display-name": "^7.10.1",
-        "@babel/plugin-transform-react-jsx": "^7.10.1",
-        "@babel/plugin-transform-react-jsx-development": "^7.10.1",
-        "@babel/plugin-transform-react-jsx-self": "^7.10.1",
-        "@babel/plugin-transform-react-jsx-source": "^7.10.1",
-        "@babel/plugin-transform-react-pure-annotations": "^7.10.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/babel-plugin-dynamic-import-node": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-      "dev": true,
-      "dependencies": {
-        "object.assign": "^4.1.0"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/browserslist": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
-      "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
-      "dev": true,
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001043",
-        "electron-to-chromium": "^1.3.413",
-        "node-releases": "^1.1.53",
-        "pkg-up": "^2.0.0"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/caniuse-lite": {
-      "version": "1.0.30001084",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001084.tgz",
-      "integrity": "sha512-ftdc5oGmhEbLUuMZ/Qp3mOpzfZLCxPYKcvGv6v2dJJ+8EdqcvZRbAGOiLmkM/PV1QGta/uwBs8/nCl6sokDW6w==",
-      "dev": true
-    },
-    "node_modules/@svgr/webpack/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/electron-to-chromium": {
-      "version": "1.3.474",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.474.tgz",
-      "integrity": "sha512-fPkSgT9IBKmVJz02XioNsIpg0WYmkPrvU1lUJblMMJALxyE7/32NGvbJQKKxpNokozPvqfqkuUqVClYsvetcLw==",
-      "dev": true
-    },
-    "node_modules/@svgr/webpack/node_modules/emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/json5": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@svgr/webpack/node_modules/node-releases": {
-      "version": "1.1.58",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz",
-      "integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==",
-      "dev": true
-    },
-    "node_modules/@svgr/webpack/node_modules/regexpu-core": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
-      "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
-      "dev": true,
-      "dependencies": {
-        "regenerate": "^1.4.0",
-        "regenerate-unicode-properties": "^8.2.0",
-        "regjsgen": "^0.5.1",
-        "regjsparser": "^0.6.4",
-        "unicode-match-property-ecmascript": "^1.0.4",
-        "unicode-match-property-value-ecmascript": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/regjsgen": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
-      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
-      "dev": true
-    },
-    "node_modules/@svgr/webpack/node_modules/regjsparser": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
-      "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
-      "dev": true,
-      "dependencies": {
-        "jsesc": "~0.5.0"
-      },
-      "bin": {
-        "regjsparser": "bin/parser"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      }
-    },
-    "node_modules/@svgr/webpack/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@testing-library/dom": {
-      "version": "7.29.4",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.29.4.tgz",
-      "integrity": "sha512-CtrJRiSYEfbtNGtEsd78mk1n1v2TUbeABlNIcOCJdDfkN5/JTOwQEbbQpoSRxGqzcWPgStMvJ4mNolSuBRv1NA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/runtime": "^7.12.5",
-        "@types/aria-query": "^4.2.0",
-        "aria-query": "^4.2.2",
-        "chalk": "^4.1.0",
-        "dom-accessibility-api": "^0.5.4",
-        "lz-string": "^1.4.4",
-        "pretty-format": "^26.6.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/@babel/code-frame": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/@babel/highlight": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/chalk/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/chalk/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/chalk/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/chalk/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@testing-library/dom/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@testing-library/jest-dom": {
-      "version": "5.11.6",
-      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.11.6.tgz",
-      "integrity": "sha512-cVZyUNRWwUKI0++yepYpYX7uhrP398I+tGz4zOlLVlUYnZS+Svuxv4fwLeCIy7TnBYKXUaOlQr3vopxL8ZfEnA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.9.2",
-        "@types/testing-library__jest-dom": "^5.9.1",
-        "aria-query": "^4.2.2",
-        "chalk": "^3.0.0",
-        "css": "^3.0.0",
-        "css.escape": "^1.5.1",
-        "lodash": "^4.17.15",
-        "redent": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8",
-        "npm": ">=6",
-        "yarn": ">=1"
-      }
-    },
-    "node_modules/@testing-library/jest-dom/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@testing-library/jest-dom/node_modules/chalk": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@testing-library/jest-dom/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@testing-library/jest-dom/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@testing-library/jest-dom/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@testing-library/jest-dom/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@testing-library/react": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.0.tgz",
-      "integrity": "sha512-90xKYJzskZ7q/AoSuWraQL4EGZlr75uZvDt3nrO4M+rugN02zjO45tmOBq/JBOgDiMIL1tkhHioKXjJsVaSINA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.12.5",
-        "@testing-library/dom": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@testing-library/react-hooks": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/@testing-library/react-hooks/-/react-hooks-5.0.3.tgz",
-      "integrity": "sha512-UrnnRc5II7LMH14xsYNm/WRch/67cBafmrSQcyFh0v+UUmSf1uzfB7zn5jQXSettGwOSxJwdQUN7PgkT0w22Lg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.12.5",
-        "@types/react": ">=16.9.0",
-        "@types/react-dom": ">=16.9.0",
-        "@types/react-test-renderer": ">=16.9.0",
-        "filter-console": "^0.1.1",
-        "react-error-boundary": "^3.1.0"
-      }
-    },
-    "node_modules/@testing-library/react-hooks/node_modules/react-error-boundary": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-3.1.0.tgz",
-      "integrity": "sha512-lmPrdi5SLRJR+AeJkqdkGlW/CRkAUvZnETahK58J4xb5wpbfDngasEGu+w0T1iXEhVrYBJZeW+c4V1hILCnMWQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.12.5"
-      },
-      "engines": {
-        "node": ">=10",
-        "npm": ">=6"
-      }
-    },
-    "node_modules/@testing-library/user-event": {
-      "version": "12.7.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-12.7.0.tgz",
-      "integrity": "sha512-KzRM1KNDoW8pJ2HTenrUhTjV6wJMHvWAagDs8DDrYSWz6y4PN+K2jSvlm2bMHWNRk5LTJPo9jqIjNjJ3FlqXNw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.12.5"
-      },
-      "engines": {
-        "node": ">=10",
-        "npm": ">=6"
-      }
-    },
-    "node_modules/@types/anymatch": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz",
-      "integrity": "sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="
-    },
-    "node_modules/@types/aria-query": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.0.tgz",
-      "integrity": "sha512-iIgQNzCm0v7QMhhe4Jjn9uRh+I6GoPmt03CbEtwx3ao8/EfoQcmgtqH4vQ5Db/lxiIGaWDv6nwvunuh0RyX0+A==",
-      "dev": true
-    },
-    "node_modules/@types/babel__core": {
-      "version": "7.1.9",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.9.tgz",
-      "integrity": "sha512-sY2RsIJ5rpER1u3/aQ8OFSI7qGIy8o1NEEbgb2UaJcvOtXOMpd39ko723NBpjQFg9SIX7TXtjejZVGeIMLhoOw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
-      }
-    },
-    "node_modules/@types/babel__generator": {
-      "version": "7.6.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz",
-      "integrity": "sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "node_modules/@types/babel__template": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz",
-      "integrity": "sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "node_modules/@types/babel__traverse": {
-      "version": "7.0.12",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.12.tgz",
-      "integrity": "sha512-t4CoEokHTfcyfb4hUaF9oOHu9RmmNWnm1CP0YmMqOOfClKascOmvlEM736vlqeScuGvBDsHkf8R2INd4DWreQA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.3.0"
-      }
-    },
-    "node_modules/@types/braces": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/braces/-/braces-3.0.0.tgz",
-      "integrity": "sha512-TbH79tcyi9FHwbyboOKeRachRq63mSuWYXOflsNO9ZyE5ClQ/JaozNKl+aWUq87qPNsXasXxi2AbgfwIJ+8GQw==",
-      "dev": true
-    },
-    "node_modules/@types/cheerio": {
-      "version": "0.22.21",
-      "resolved": "https://registry.npmjs.org/@types/cheerio/-/cheerio-0.22.21.tgz",
-      "integrity": "sha512-aGI3DfswwqgKPiEOTaiHV2ZPC9KEhprpgEbJnv0fZl3SGX0cGgEva1126dGrMC6AJM6v/aihlUgJn9M5DbDZ/Q==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
+        "@types/node": "*"
       }
     },
     "node_modules/@types/classnames": {
@@ -16528,6 +13665,16 @@
       "integrity": "sha512-NCEfv49jmDsBAixjMjEHKVgmVQlJ+uK56FOc+2roYPExnXCZDpi6mJOHQ3v23BiO84hBDStND9R2itJr7PNoow==",
       "dev": true
     },
+    "node_modules/@types/flatbuffers": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@types/flatbuffers/-/flatbuffers-1.10.0.tgz",
+      "integrity": "sha512-7btbphLrKvo5yl/5CC2OCxUSMx1wV1wvGT1qDXkSt7yi00/YW7E8k6qzXqJHsp+WU0eoG7r6MTQQXI9lIvd0qA=="
+    },
+    "node_modules/@types/geojson": {
+      "version": "7946.0.8",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.8.tgz",
+      "integrity": "sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA=="
+    },
     "node_modules/@types/glob": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
@@ -16669,6 +13816,14 @@
         "@types/lodash": "*"
       }
     },
+    "node_modules/@types/mapbox-gl": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.4.0.tgz",
+      "integrity": "sha512-Na5vXw6Ez0L5To/+pL78dWPNoG6QlPdEDdnkSmIL5HWxemD+s0pTmTWDbMj7tcqJ2hnVyOyukVIveR9HPi7eeA==",
+      "dependencies": {
+        "@types/geojson": "*"
+      }
+    },
     "node_modules/@types/markdown-to-jsx": {
       "version": "6.11.3",
       "resolved": "https://registry.npmjs.org/@types/markdown-to-jsx/-/markdown-to-jsx-6.11.3.tgz",
@@ -16711,9 +13866,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "10.12.15",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.15.tgz",
-      "integrity": "sha512-9kROxduaN98QghwwHmxXO2Xz3MaWf+I1sLVAA6KJDF5xix+IyXVhds0MAfdNwtcpSrzhaTsNB0/jnL86fgUhqA=="
+      "version": "15.12.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.4.tgz",
+      "integrity": "sha512-zrNj1+yqYF4WskCMOHwN+w9iuD12+dGm0rQ35HLl9/Ouuq52cEtd0CH9qMgrdNmi5ejC1/V7vKEXYubB+65DkA=="
     },
     "node_modules/@types/node-fetch": {
       "version": "2.5.8",
@@ -17059,9 +14214,9 @@
       "integrity": "sha512-mE3eRK0fpTN/GnNBOIg2tGq2cFhchQXF6fCbrLxus75TgnoOECbdHikr948FGO/UAml7/ZhLMa5FbGkF5PKvmw=="
     },
     "node_modules/@types/seedrandom": {
-      "version": "2.4.29",
-      "resolved": "https://registry.npmjs.org/@types/seedrandom/-/seedrandom-2.4.29.tgz",
-      "integrity": "sha512-nSjRNBaE9y5Zzv6CCwDWH6DVC0E+g8/1Nu7LOSntusxQaHZOv9GJ7rrnS5G1dSGd2k1Ovvg5+JJG6idjuGtpDA=="
+      "version": "2.4.30",
+      "resolved": "https://registry.npmjs.org/@types/seedrandom/-/seedrandom-2.4.30.tgz",
+      "integrity": "sha512-AnxLHewubLVzoF/A4qdxBGHCKifw8cY32iro3DQX9TPcetE95zBeVt3jnsvtvAUf1vwzMfwzp4t/L2yqPlnjkQ=="
     },
     "node_modules/@types/shortid": {
       "version": "0.0.29",
@@ -17090,9 +14245,9 @@
       "dev": true
     },
     "node_modules/@types/sortablejs": {
-      "version": "1.10.6",
-      "resolved": "https://registry.npmjs.org/@types/sortablejs/-/sortablejs-1.10.6.tgz",
-      "integrity": "sha512-QRz8Z+uw2Y4Gwrtxw8hD782zzuxxugdcq8X/FkPsXUa1kfslhGzy13+4HugO9FXNo+jlWVcE6DYmmegniIQ30A==",
+      "version": "1.10.7",
+      "resolved": "https://registry.npmjs.org/@types/sortablejs/-/sortablejs-1.10.7.tgz",
+      "integrity": "sha512-lGCwwgpj8zW/ZmaueoPVSP7nnc9t8VqVWXS+ASX3eoUUENmiazv0rlXyTRludXzuX9ALjPsMqBu85TgJNWbTOg==",
       "peer": true
     },
     "node_modules/@types/source-list-map": {
@@ -17120,6 +14275,11 @@
         "@types/jest": "*"
       }
     },
+    "node_modules/@types/text-encoding-utf-8": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@types/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz",
+      "integrity": "sha512-AQ6zewa0ucLJvtUi5HsErbOFKAcQfRLt9zFLlUOvcXBy2G36a+ZDpCHSGdzJVUD8aNURtIjh9aSjCStNMRCcRQ=="
+    },
     "node_modules/@types/uglify-js": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.0.4.tgz",
@@ -18808,6 +15968,36 @@
         "normalize-path": "^2.1.1"
       }
     },
+    "node_modules/apache-arrow": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/apache-arrow/-/apache-arrow-4.0.1.tgz",
+      "integrity": "sha512-DyF7GXCbSjsw4P5C8b+qW7OnJKa6w9mJI0mhV0+EfZbVZCmhfiF6ffqcnrI/kzBrRqn9hH/Ft9n5+m4DTbBJpg==",
+      "dependencies": {
+        "@types/flatbuffers": "^1.10.0",
+        "@types/node": "^14.14.37",
+        "@types/text-encoding-utf-8": "^1.0.1",
+        "command-line-args": "5.1.1",
+        "command-line-usage": "6.1.1",
+        "flatbuffers": "1.12.0",
+        "json-bignum": "^0.0.3",
+        "pad-left": "^2.1.0",
+        "text-encoding-utf-8": "^1.0.2",
+        "tslib": "^2.2.0"
+      },
+      "bin": {
+        "arrow2csv": "bin/arrow2csv.js"
+      }
+    },
+    "node_modules/apache-arrow/node_modules/@types/node": {
+      "version": "14.17.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.9.tgz",
+      "integrity": "sha512-CMjgRNsks27IDwI785YMY0KLt3co/c0cQ5foxHYv/shC2w8oOnVwz5Ubq1QG5KzrcW+AXk6gzdnxIkDnTvzu3g=="
+    },
+    "node_modules/apache-arrow/node_modules/tslib": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+    },
     "node_modules/aphrodite": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/aphrodite/-/aphrodite-1.2.5.tgz",
@@ -18898,6 +16088,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/array-back": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
+      "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/array-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
@@ -21655,6 +18853,14 @@
         "cdl": "bin/cdl.js"
       }
     },
+    "node_modules/cartocolor": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/cartocolor/-/cartocolor-4.0.2.tgz",
+      "integrity": "sha512-+Gh9mb6lFxsDOLQlBLPxAHCnWXlg2W8q3AcVwqRcy95TdBbcOU89Wrb6h2Hd/6Ww1Kc1pzXmUdpnWD+xeCG0dg==",
+      "dependencies": {
+        "colorbrewer": "1.0.0"
+      }
+    },
     "node_modules/case-sensitive-paths-webpack-plugin": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz",
@@ -21795,6 +19001,73 @@
       "version": "1.2.9",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
       "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
+      "bundleDependencies": [
+        "abbrev",
+        "ansi-regex",
+        "aproba",
+        "are-we-there-yet",
+        "balanced-match",
+        "brace-expansion",
+        "chownr",
+        "code-point-at",
+        "concat-map",
+        "console-control-strings",
+        "core-util-is",
+        "debug",
+        "deep-extend",
+        "delegates",
+        "detect-libc",
+        "fs-minipass",
+        "fs.realpath",
+        "gauge",
+        "glob",
+        "has-unicode",
+        "iconv-lite",
+        "ignore-walk",
+        "inflight",
+        "inherits",
+        "ini",
+        "is-fullwidth-code-point",
+        "isarray",
+        "minimatch",
+        "minimist",
+        "minipass",
+        "minizlib",
+        "mkdirp",
+        "ms",
+        "needle",
+        "node-pre-gyp",
+        "nopt",
+        "npm-bundled",
+        "npm-packlist",
+        "npmlog",
+        "number-is-nan",
+        "object-assign",
+        "once",
+        "os-homedir",
+        "os-tmpdir",
+        "osenv",
+        "path-is-absolute",
+        "process-nextick-args",
+        "rc",
+        "readable-stream",
+        "rimraf",
+        "safe-buffer",
+        "safer-buffer",
+        "sax",
+        "semver",
+        "set-blocking",
+        "signal-exit",
+        "string-width",
+        "string_decoder",
+        "strip-ansi",
+        "strip-json-comments",
+        "tar",
+        "util-deprecate",
+        "wide-align",
+        "wrappy",
+        "yallist"
+      ],
       "dev": true,
       "hasInstallScript": true,
       "optional": true,
@@ -21811,14 +19084,16 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/abbrev": {
       "version": "1.1.1",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/ansi-regex": {
       "version": "2.1.1",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=0.10.0"
@@ -21826,14 +19101,16 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/aproba": {
       "version": "1.2.0",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/are-we-there-yet": {
       "version": "1.1.5",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true,
       "dependencies": {
         "delegates": "^1.0.0",
@@ -21842,25 +19119,34 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/balanced-match": {
       "version": "1.0.0",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/brace-expansion": {
       "version": "1.1.11",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
+    "node_modules/chokidar/node_modules/fsevents/node_modules/chownr": {
+      "version": "1.1.1",
+      "dev": true,
+      "inBundle": true,
+      "license": "ISC",
+      "optional": true
+    },
     "node_modules/chokidar/node_modules/fsevents/node_modules/code-point-at": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=0.10.0"
@@ -21868,30 +19154,30 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/concat-map": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/console-control-strings": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/core-util-is": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/debug": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "ms": "^2.1.1"
@@ -21899,9 +19185,9 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/deep-extend": {
       "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=4.0.0"
@@ -21909,15 +19195,16 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/delegates": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/detect-libc": {
       "version": "1.0.3",
-      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
       "dev": true,
+      "inBundle": true,
+      "license": "Apache-2.0",
       "optional": true,
       "bin": {
         "detect-libc": "bin/detect-libc.js"
@@ -21926,18 +19213,28 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/chokidar/node_modules/fsevents/node_modules/fs-minipass": {
+      "version": "1.2.5",
+      "dev": true,
+      "inBundle": true,
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "minipass": "^2.2.1"
+      }
+    },
     "node_modules/chokidar/node_modules/fsevents/node_modules/fs.realpath": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/gauge": {
       "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true,
       "dependencies": {
         "aproba": "^1.0.3",
@@ -21952,9 +19249,9 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/glob": {
       "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -21970,16 +19267,16 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/has-unicode": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/iconv-lite": {
       "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
@@ -21990,9 +19287,9 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/ignore-walk": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
-      "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true,
       "dependencies": {
         "minimatch": "^3.0.4"
@@ -22000,9 +19297,9 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/inflight": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true,
       "dependencies": {
         "once": "^1.3.0",
@@ -22011,16 +19308,26 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/inherits": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true
     },
+    "node_modules/chokidar/node_modules/fsevents/node_modules/ini": {
+      "version": "1.3.5",
+      "dev": true,
+      "inBundle": true,
+      "license": "ISC",
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/chokidar/node_modules/fsevents/node_modules/is-fullwidth-code-point": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "number-is-nan": "^1.0.0"
@@ -22031,16 +19338,16 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/isarray": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/minimatch": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -22050,23 +19357,58 @@
       }
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "0.0.8",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true
     },
+    "node_modules/chokidar/node_modules/fsevents/node_modules/minipass": {
+      "version": "2.3.5",
+      "dev": true,
+      "inBundle": true,
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.0"
+      }
+    },
+    "node_modules/chokidar/node_modules/fsevents/node_modules/minizlib": {
+      "version": "1.2.1",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "minipass": "^2.2.1"
+      }
+    },
+    "node_modules/chokidar/node_modules/fsevents/node_modules/mkdirp": {
+      "version": "0.5.1",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "minimist": "0.0.8"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
     "node_modules/chokidar/node_modules/fsevents/node_modules/ms": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/needle": {
       "version": "2.3.0",
-      "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "debug": "^4.1.0",
@@ -22082,8 +19424,9 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/node-pre-gyp": {
       "version": "0.12.0",
-      "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
       "dev": true,
+      "inBundle": true,
+      "license": "BSD-3-Clause",
       "optional": true,
       "dependencies": {
         "detect-libc": "^1.0.2",
@@ -22103,8 +19446,9 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/nopt": {
       "version": "4.0.1",
-      "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true,
       "dependencies": {
         "abbrev": "1",
@@ -22116,16 +19460,16 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/npm-bundled": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
-      "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/npm-packlist": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
-      "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true,
       "dependencies": {
         "ignore-walk": "^3.0.1",
@@ -22134,9 +19478,9 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/npmlog": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true,
       "dependencies": {
         "are-we-there-yet": "~1.1.2",
@@ -22147,9 +19491,9 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/number-is-nan": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=0.10.0"
@@ -22157,9 +19501,9 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/object-assign": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=0.10.0"
@@ -22167,9 +19511,9 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/once": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true,
       "dependencies": {
         "wrappy": "1"
@@ -22177,9 +19521,9 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/os-homedir": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=0.10.0"
@@ -22187,9 +19531,9 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/os-tmpdir": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=0.10.0"
@@ -22197,9 +19541,9 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/osenv": {
       "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true,
       "dependencies": {
         "os-homedir": "^1.0.0",
@@ -22208,9 +19552,9 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/path-is-absolute": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=0.10.0"
@@ -22218,15 +19562,16 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/process-nextick-args": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/rc": {
       "version": "1.2.8",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
+      "inBundle": true,
+      "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
       "optional": true,
       "dependencies": {
         "deep-extend": "^0.6.0",
@@ -22238,11 +19583,18 @@
         "rc": "cli.js"
       }
     },
+    "node_modules/chokidar/node_modules/fsevents/node_modules/rc/node_modules/minimist": {
+      "version": "1.2.0",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/chokidar/node_modules/fsevents/node_modules/readable-stream": {
       "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "core-util-is": "~1.0.0",
@@ -22256,8 +19608,9 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/rimraf": {
       "version": "2.6.3",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true,
       "dependencies": {
         "glob": "^7.1.3"
@@ -22268,29 +19621,30 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/safe-buffer": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/safer-buffer": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/sax": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/semver": {
       "version": "5.7.0",
-      "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true,
       "bin": {
         "semver": "bin/semver"
@@ -22298,23 +19652,23 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/set-blocking": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/signal-exit": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/string_decoder": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "safe-buffer": "~5.1.0"
@@ -22322,9 +19676,9 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/string-width": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "code-point-at": "^1.0.0",
@@ -22337,9 +19691,9 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/strip-ansi": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "ansi-regex": "^2.0.0"
@@ -22350,26 +19704,45 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/strip-json-comments": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/chokidar/node_modules/fsevents/node_modules/tar": {
+      "version": "4.4.8",
+      "dev": true,
+      "inBundle": true,
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "fs-minipass": "^1.2.5",
+        "minipass": "^2.3.4",
+        "minizlib": "^1.1.1",
+        "mkdirp": "^0.5.0",
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=4.5"
+      }
+    },
     "node_modules/chokidar/node_modules/fsevents/node_modules/util-deprecate": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true,
+      "inBundle": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/wide-align": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true,
       "dependencies": {
         "string-width": "^1.0.2 || 2"
@@ -22377,9 +19750,16 @@
     },
     "node_modules/chokidar/node_modules/fsevents/node_modules/wrappy": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
       "dev": true,
+      "inBundle": true,
+      "license": "ISC",
+      "optional": true
+    },
+    "node_modules/chokidar/node_modules/fsevents/node_modules/yallist": {
+      "version": "3.0.3",
+      "dev": true,
+      "inBundle": true,
+      "license": "ISC",
       "optional": true
     },
     "node_modules/chokidar/node_modules/glob-parent": {
@@ -22404,19 +19784,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/chokidar/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
     "node_modules/chownr": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
@@ -22720,34 +20087,6 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/clone-deep": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
-      "integrity": "sha1-TnPdCen7lxzDhnDF3O2cGJZIHMY=",
-      "dev": true,
-      "dependencies": {
-        "for-own": "^0.1.3",
-        "is-plain-object": "^2.0.1",
-        "kind-of": "^3.0.2",
-        "lazy-cache": "^1.0.3",
-        "shallow-clone": "^0.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clone-deep/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -22875,6 +20214,11 @@
         "simple-swizzle": "^0.2.2"
       }
     },
+    "node_modules/colorbrewer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/colorbrewer/-/colorbrewer-1.0.0.tgz",
+      "integrity": "sha1-T5czO5abp2Ejgr5LwzlLNB+0yKI="
+    },
     "node_modules/colorette": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz",
@@ -22911,6 +20255,85 @@
         "trim": "0.0.1"
       }
     },
+    "node_modules/command-line-args": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz",
+      "integrity": "sha512-hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg==",
+      "dependencies": {
+        "array-back": "^3.0.1",
+        "find-replace": "^3.0.0",
+        "lodash.camelcase": "^4.3.0",
+        "typical": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/command-line-usage": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.1.tgz",
+      "integrity": "sha512-F59pEuAR9o1SF/bD0dQBDluhpT4jJQNWUHEuVBqpDmCUo6gPjCi+m9fCWnWZVR/oG6cMTUms4h+3NPl74wGXvA==",
+      "dependencies": {
+        "array-back": "^4.0.1",
+        "chalk": "^2.4.2",
+        "table-layout": "^1.0.1",
+        "typical": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/command-line-usage/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/command-line-usage/node_modules/array-back": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz",
+      "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/command-line-usage/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/command-line-usage/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/command-line-usage/node_modules/typical": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz",
+      "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/commander": {
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
@@ -22968,9 +20391,9 @@
       }
     },
     "node_modules/compute-scroll-into-view": {
-      "version": "1.0.16",
-      "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.16.tgz",
-      "integrity": "sha512-a85LHKY81oQnikatZYA90pufpZ6sQx++BoCxOEMsjpZx+ZnaKGQnCyCehTRr/1p9GBIAHTjcU9k71kSYWloLiQ=="
+      "version": "1.0.17",
+      "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz",
+      "integrity": "sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg=="
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
@@ -23646,45 +21069,6 @@
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
       "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
     },
-    "node_modules/core-js-compat": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.4.tgz",
-      "integrity": "sha512-zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.8.3",
-        "semver": "7.0.0"
-      }
-    },
-    "node_modules/core-js-compat/node_modules/browserslist": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz",
-      "integrity": "sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==",
-      "dev": true,
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001030",
-        "electron-to-chromium": "^1.3.363",
-        "node-releases": "^1.1.50"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      }
-    },
-    "node_modules/core-js-compat/node_modules/caniuse-lite": {
-      "version": "1.0.30001035",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz",
-      "integrity": "sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==",
-      "dev": true
-    },
-    "node_modules/core-js-compat/node_modules/semver": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/core-js-pure": {
       "version": "3.6.4",
       "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.4.tgz",
@@ -24617,9 +22001,9 @@
       "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A=="
     },
     "node_modules/d3-color": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.2.3.tgz",
-      "integrity": "sha512-x37qq3ChOTLd26hnps36lexMRhNXEtVxZ4B25rL0DVdDsGQIJGB18S7y9XDwlDD6MD/ZBzITCf4JjGMM10TZkw=="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz",
+      "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="
     },
     "node_modules/d3-dispatch": {
       "version": "1.0.6",
@@ -24970,19 +22354,21 @@
       "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw=="
     },
     "node_modules/deck.gl": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/deck.gl/-/deck.gl-7.1.11.tgz",
-      "integrity": "sha512-OUj9JE544N6Y/DCdfdnsbqKn9o72bWgRfsKhyi8aZ8v76hq7XyelmO2GljBmHGYmuMNVLrKcymNMV0m8EEgpZA==",
-      "dependencies": {
-        "@deck.gl/aggregation-layers": "7.1.11",
-        "@deck.gl/core": "7.1.11",
-        "@deck.gl/geo-layers": "7.1.11",
-        "@deck.gl/google-maps": "7.1.11",
-        "@deck.gl/json": "7.1.11",
-        "@deck.gl/layers": "7.1.11",
-        "@deck.gl/mapbox": "7.1.11",
-        "@deck.gl/mesh-layers": "7.1.11",
-        "@deck.gl/react": "7.1.11"
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/deck.gl/-/deck.gl-8.5.2.tgz",
+      "integrity": "sha512-tsEyv62Zzc+GT3By0Y1R2gqEJ8K3tGBDaLprAoeAsg7fvIa5ikFBdWEBFHa1UDbgE2UEmYbcBK/yK4GAL8Ia4A==",
+      "dependencies": {
+        "@deck.gl/aggregation-layers": "8.5.2",
+        "@deck.gl/carto": "8.5.2",
+        "@deck.gl/core": "8.5.2",
+        "@deck.gl/extensions": "8.5.2",
+        "@deck.gl/geo-layers": "8.5.2",
+        "@deck.gl/google-maps": "8.5.2",
+        "@deck.gl/json": "8.5.2",
+        "@deck.gl/layers": "8.5.2",
+        "@deck.gl/mapbox": "8.5.2",
+        "@deck.gl/mesh-layers": "8.5.2",
+        "@deck.gl/react": "8.5.2"
       }
     },
     "node_modules/decode-uri-component": {
@@ -25041,6 +22427,14 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
     "node_modules/deep-is": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
@@ -25343,6 +22737,16 @@
         "mathfn": "^1.0.0"
       }
     },
+    "node_modules/dnd-core": {
+      "version": "11.1.3",
+      "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-11.1.3.tgz",
+      "integrity": "sha512-QugF55dNW+h+vzxVJ/LSJeTeUw9MCJ2cllhmVThVPEtF16ooBkxj0WBE5RB+AceFxMFo1rO6bJKXtqKl+JNnyA==",
+      "dependencies": {
+        "@react-dnd/asap": "^4.0.0",
+        "@react-dnd/invariant": "^2.0.0",
+        "redux": "^4.0.4"
+      }
+    },
     "node_modules/dns-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
@@ -25554,6 +22958,11 @@
       "integrity": "sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==",
       "dev": true
     },
+    "node_modules/draco3d": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/draco3d/-/draco3d-1.4.1.tgz",
+      "integrity": "sha512-9Rxonc70xiovBC+Bq1h57SNZIHzWTibU1VfIGp5z3Xx8dPtv4yT5uGhiH7P5uvJRR2jkrvHafRxR7bTANkvfpg=="
+    },
     "node_modules/duplexer": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
@@ -25596,12 +23005,12 @@
       }
     },
     "node_modules/echarts": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.1.1.tgz",
-      "integrity": "sha512-b3nP8M9XwZM2jISuA+fP0EuJv8lcfgWrinel185Npy8bE/UhXTDIPJcqgQOCWdvk0c5CeT6Dsm1xBjmJXAGlxQ==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.1.2.tgz",
+      "integrity": "sha512-okUhO4sw22vwZp+rTPNjd/bvTdpug4K4sHNHyrV8NdAncIX9/AarlolFqtJCAYKGFYhUBNjIWu1EznFrSWTFxg==",
       "dependencies": {
         "tslib": "2.0.3",
-        "zrender": "5.1.0"
+        "zrender": "5.1.1"
       }
     },
     "node_modules/echarts/node_modules/tslib": {
@@ -25619,9 +23028,6 @@
         "lru-cache": "^4.1.5",
         "semver": "^5.6.0",
         "sigmund": "^1.0.1"
-      },
-      "bin": {
-        "editorconfig": "bin/editorconfig"
       }
     },
     "node_modules/editorconfig/node_modules/lru-cache": {
@@ -25709,6 +23115,11 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/emotion-rgba": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/emotion-rgba/-/emotion-rgba-0.0.9.tgz",
+      "integrity": "sha512-fSt51Lh4a1fppXY3nQrMUC00p1jIYMSaRRkUhPiOJ3s9oumae1tY41AJytRK9d4YmJDP9njJBndgdDn9j7CbsA=="
+    },
     "node_modules/emotion-theming": {
       "version": "10.0.27",
       "resolved": "https://registry.npmjs.org/emotion-theming/-/emotion-theming-10.0.27.tgz",
@@ -28144,6 +25555,14 @@
       "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
       "dev": true
     },
+    "node_modules/expression-eval": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/expression-eval/-/expression-eval-2.1.0.tgz",
+      "integrity": "sha512-FUJO/Akvl/JOWkvlqZaqbkhsEWlCJWDeZG4tzX96UH68D9FeRgYgtb55C2qtqbORC0Q6x5419EDjWu4IT9kQfg==",
+      "dependencies": {
+        "jsep": "^0.3.0"
+      }
+    },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -28445,9 +25864,9 @@
       "dev": true
     },
     "node_modules/fetch-retry": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-4.1.0.tgz",
-      "integrity": "sha512-FUc9XZuhyE3ka3m53lec29PXVhdRf59QG01nE+OZdfl0M/R0E7Pk6k6qeWzHhX1pHl/f2JPA97sjjbHRgSg/9A=="
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-4.1.1.tgz",
+      "integrity": "sha512-e6eB7zN6UBSwGVwrbWVH+gdLnkW9WwHhmq2YDK1Sh30pzx1onRVGBvogTlUeWxwTa+L86NYdo4hFkh7O8ZjSnA=="
     },
     "node_modules/figgy-pudding": {
       "version": "3.5.1",
@@ -28688,6 +26107,17 @@
         "node": ">=6"
       }
     },
+    "node_modules/find-replace": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz",
+      "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==",
+      "dependencies": {
+        "array-back": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
     "node_modules/find-root": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
@@ -28745,6 +26175,11 @@
         "rimraf": "bin.js"
       }
     },
+    "node_modules/flatbuffers": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/flatbuffers/-/flatbuffers-1.12.0.tgz",
+      "integrity": "sha512-c7CZADjRcl6j0PlvFy0ZqXQ67qSEZfrVPynmnL+2zPc+NtMvrF8Y0QceMo7QqnSPc7+uWjUIAbvCQ5WIKlMVdQ=="
+    },
     "node_modules/flatted": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz",
@@ -28789,18 +26224,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/for-own": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-      "dev": true,
-      "dependencies": {
-        "for-in": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/foreach": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
@@ -29038,9 +26461,12 @@
       "dev": true
     },
     "node_modules/fuse.js": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-3.3.0.tgz",
-      "integrity": "sha512-ESBRkGLWMuVkapqYCcNO1uqMg5qbCKkgb+VS6wsy17Rix0/cMS9kSOZoYkjH8Ko//pgJ/EEGu0GTjk2mjX2LGQ=="
+      "version": "6.4.6",
+      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.6.tgz",
+      "integrity": "sha512-/gYxR/0VpXmWSfZOIPS3rWwU8SHgsRTwWuXhyb2O6s7aRuVtHtxCkR33bNYu3wyLyNx/Wpv0vU7FZy8Vj53VNw==",
+      "engines": {
+        "node": ">=10"
+      }
     },
     "node_modules/gauge": {
       "version": "2.7.4",
@@ -29062,6 +26488,7 @@
       "version": "1.0.0-beta.1",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
       "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
+      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -29343,6 +26770,7 @@
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -29438,9 +26866,9 @@
       }
     },
     "node_modules/h3-js": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/h3-js/-/h3-js-3.7.0.tgz",
-      "integrity": "sha512-EcH/qGU4khZsAEG39Uu8MvaCing0JFcuoe3K4Xmg5MofDIu1cNJl7z2AQS8ggvXGxboiLJqsGirhEqFKdd2gAA==",
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/h3-js/-/h3-js-3.7.2.tgz",
+      "integrity": "sha512-LPjlHSwB9zQZrMqKloCZmmmt3yZzIK7nqPcXqwU93zT3TtYG6jP4tZBzAPouxut7lLjdFbMQ75wRBiKfpsnY7w==",
       "engines": {
         "node": ">=4",
         "npm": ">=3",
@@ -32102,9 +29530,6 @@
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/jest-diff/node_modules/chalk": {
@@ -32118,9 +29543,6 @@
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/jest-diff/node_modules/color-convert": {
@@ -36077,10 +33499,19 @@
         "node": ">=10"
       }
     },
+    "node_modules/jsep": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/jsep/-/jsep-0.3.5.tgz",
+      "integrity": "sha512-AoRLBDc6JNnKjNcmonituEABS5bcfqDhQAWWXNTFrqu6nVXBpBAGfcoTGZMFlIrh9FjmE1CQyX9CTNwZrXMMDA==",
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true,
       "bin": {
         "jsesc": "bin/jsesc"
       },
@@ -36096,6 +33527,14 @@
         "bignumber.js": "^9.0.0"
       }
     },
+    "node_modules/json-bignum": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/json-bignum/-/json-bignum-0.0.3.tgz",
+      "integrity": "sha1-QRY7UENsdz2CQk28IO1w23YEuNc=",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -36398,15 +33837,6 @@
         "webpack-sources": "^1.1.0"
       }
     },
-    "node_modules/lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/lazy-universal-dotenv": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lazy-universal-dotenv/-/lazy-universal-dotenv-3.0.1.tgz",
@@ -36518,18 +33948,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/levenary": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
-      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
-      "dev": true,
-      "dependencies": {
-        "leven": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -36980,12 +34398,11 @@
       "integrity": "sha512-L0j0tFVZBQQLeEjmWOvDLoRciIY8gQGWahvkztXUal8jH8R5Rlqo9GCvgqvXcy9LQhEWdQCVvzqAbxgYNt4blQ=="
     },
     "node_modules/math.gl": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/math.gl/-/math.gl-2.3.3.tgz",
-      "integrity": "sha512-wZhx7574KHUpJVMzkaQ559zfn3R8iB0BOilwNrfL/fOLQfPo2TPWsKX96PdfS4svKA2XIGi3yfizrv2Redcv0g==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/math.gl/-/math.gl-3.5.3.tgz",
+      "integrity": "sha512-cRQRZlc+XvNHd3bIfu3kdPPPAW0vwDelZJmkjn2TDvCyPcmyDtAiZ2Poo1aFoINP7HzN6oHYxapc/0wV3q6Opg==",
       "dependencies": {
-        "@babel/runtime": "^7.0.0",
-        "gl-matrix": "^3.0.0"
+        "@math.gl/core": "3.5.3"
       }
     },
     "node_modules/mathfn": {
@@ -37235,32 +34652,6 @@
       "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
       "dev": true
     },
-    "node_modules/merge-deep": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.2.tgz",
-      "integrity": "sha512-T7qC8kg4Zoti1cFd8Cr0M+qaZfOwjlPDEdZIIPPB2JZctjaPM4fX+i7HOId69tAti2fvO6X5ldfYUONDODsrkA==",
-      "dev": true,
-      "dependencies": {
-        "arr-union": "^3.1.0",
-        "clone-deep": "^0.2.4",
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/merge-deep/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -37564,27 +34955,6 @@
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true
     },
-    "node_modules/minizlib": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
-      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "minipass": "^2.9.0"
-      }
-    },
-    "node_modules/minizlib/node_modules/minipass": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
-      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.0"
-      }
-    },
     "node_modules/mississippi": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
@@ -37631,28 +35001,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/mixin-object": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
-      "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
-      "dev": true,
-      "dependencies": {
-        "for-in": "^0.1.3",
-        "is-extendable": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mixin-object/node_modules/for-in": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
-      "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/mjolnir.js": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/mjolnir.js/-/mjolnir.js-2.5.0.tgz",
@@ -37698,6 +35046,17 @@
         "node": "*"
       }
     },
+    "node_modules/moment-timezone": {
+      "version": "0.5.33",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.33.tgz",
+      "integrity": "sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w==",
+      "dependencies": {
+        "moment": ">= 2.9.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/moo": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/moo/-/moo-0.4.3.tgz",
@@ -38828,6 +36187,17 @@
         "node": ">=4"
       }
     },
+    "node_modules/pad-left": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/pad-left/-/pad-left-2.1.0.tgz",
+      "integrity": "sha1-FuajstRKjhOMsIOMx8tAOk/J6ZQ=",
+      "dependencies": {
+        "repeat-string": "^1.5.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/pako": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.7.tgz",
@@ -39196,18 +36566,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
-      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/pn": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
@@ -42127,9 +39485,6 @@
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/pretty-format/node_modules/color-convert": {
@@ -42195,12 +39550,12 @@
       }
     },
     "node_modules/probe.gl": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/probe.gl/-/probe.gl-3.3.0.tgz",
-      "integrity": "sha512-59E6AEw4N8sU4PKfAl7S2UBYJCOa064WpEFcXfeFOB/36FJtplYY+261DqLjLAvOqRRHiKVEQUBo63PQ3jKeWA==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/probe.gl/-/probe.gl-3.4.0.tgz",
+      "integrity": "sha512-9CLByZATuhuG/Viq3ckfWU+dAhb7dMmjzsyCy4s7ds9ueTejcVRENxL197/XacOK/AN61YrEERB0QnouB0Qc0Q==",
       "dependencies": {
         "@babel/runtime": "^7.0.0",
-        "@probe.gl/stats": "3.3.0"
+        "@probe.gl/stats": "3.4.0"
       }
     },
     "node_modules/process": {
@@ -43612,17 +40967,6 @@
         "@babel/highlight": "^7.10.4"
       }
     },
-    "node_modules/react-dev-utils/node_modules/@babel/highlight": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-      "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
     "node_modules/react-dev-utils/node_modules/@nodelib/fs.stat": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz",
@@ -44159,26 +41503,6 @@
         "dnd-core": "^11.1.3"
       }
     },
-    "node_modules/react-dnd-html5-backend/node_modules/dnd-core": {
-      "version": "11.1.3",
-      "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-11.1.3.tgz",
-      "integrity": "sha512-QugF55dNW+h+vzxVJ/LSJeTeUw9MCJ2cllhmVThVPEtF16ooBkxj0WBE5RB+AceFxMFo1rO6bJKXtqKl+JNnyA==",
-      "dependencies": {
-        "@react-dnd/asap": "^4.0.0",
-        "@react-dnd/invariant": "^2.0.0",
-        "redux": "^4.0.4"
-      }
-    },
-    "node_modules/react-dnd/node_modules/dnd-core": {
-      "version": "11.1.3",
-      "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-11.1.3.tgz",
-      "integrity": "sha512-QugF55dNW+h+vzxVJ/LSJeTeUw9MCJ2cllhmVThVPEtF16ooBkxj0WBE5RB+AceFxMFo1rO6bJKXtqKl+JNnyA==",
-      "dependencies": {
-        "@react-dnd/asap": "^4.0.0",
-        "@react-dnd/invariant": "^2.0.0",
-        "redux": "^4.0.4"
-      }
-    },
     "node_modules/react-docgen": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/react-docgen/-/react-docgen-5.3.1.tgz",
@@ -44463,11 +41787,6 @@
         "prop-types": "^15.6.1"
       }
     },
-    "node_modules/react-icons": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.2.0.tgz",
-      "integrity": "sha512-rmzEDFt+AVXRzD7zDE21gcxyBizD/3NqjbX6cmViAgdqfJ2UiLer8927/QhhrXQV7dEj/1EGuOTPp7JnLYVJKQ=="
-    },
     "node_modules/react-input-autosize": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-2.2.2.tgz",
@@ -44559,6 +41878,11 @@
       "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
       "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
     },
+    "node_modules/react-lines-ellipsis": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/react-lines-ellipsis/-/react-lines-ellipsis-0.15.0.tgz",
+      "integrity": "sha512-8kWpEmu7ijmB6Gz5t+eSjNux2SpVXZBsmfeFE8LjMS7tU3H8ai475CyNc0dH0RDTwt4Esr7c06Xq4SB7Gpl9yQ=="
+    },
     "node_modules/react-loadable": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/react-loadable/-/react-loadable-5.5.0.tgz",
@@ -44741,11 +42065,7 @@
     "node_modules/react-reverse-portal": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/react-reverse-portal/-/react-reverse-portal-2.0.1.tgz",
-      "integrity": "sha512-sj/D9nSHspqV8i8hWkTSZ5Ohnrqk2A5fkDKw4Xe/zV4OfF1UYwmbzrxLdmNRdKkWgQwnXIxaa2E3FC7QYdZAeA==",
-      "peerDependencies": {
-        "react": "^16.0.0",
-        "react-dom": "^16.0.0"
-      }
+      "integrity": "sha512-sj/D9nSHspqV8i8hWkTSZ5Ohnrqk2A5fkDKw4Xe/zV4OfF1UYwmbzrxLdmNRdKkWgQwnXIxaa2E3FC7QYdZAeA=="
     },
     "node_modules/react-router": {
       "version": "5.1.2",
@@ -44800,6 +42120,14 @@
         "prop-types": "^15.5.8"
       }
     },
+    "node_modules/react-search-input/node_modules/fuse.js": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-3.6.1.tgz",
+      "integrity": "sha512-hT9yh/tiinkmirKrlv4KWOjztdoZo1mx9Qh4KvWqC7isoXwdUY3PNWUxceF4/qO9R6riA2C29jdTOeQOIROjgw==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/react-select": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/react-select/-/react-select-3.1.0.tgz",
@@ -45409,6 +42737,14 @@
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
       "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
     },
+    "node_modules/reduce-flatten": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz",
+      "integrity": "sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/reduce-function-call": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.3.tgz",
@@ -45781,15 +43117,6 @@
         "unified": "9.2.0"
       }
     },
-    "node_modules/remark-mdx/node_modules/@babel/code-frame": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.12.13"
-      }
-    },
     "node_modules/remark-mdx/node_modules/@babel/core": {
       "version": "7.12.9",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz",
@@ -45817,75 +43144,12 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/remark-mdx/node_modules/@babel/generator": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz",
-      "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.13.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/remark-mdx/node_modules/@babel/helper-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/remark-mdx/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
     "node_modules/remark-mdx/node_modules/@babel/helper-plugin-utils": {
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
       "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
       "dev": true
     },
-    "node_modules/remark-mdx/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/remark-mdx/node_modules/@babel/highlight": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-      "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/remark-mdx/node_modules/@babel/parser": {
-      "version": "7.13.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz",
-      "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/remark-mdx/node_modules/@babel/plugin-proposal-object-rest-spread": {
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz",
@@ -45906,60 +43170,6 @@
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "node_modules/remark-mdx/node_modules/@babel/template": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/parser": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/remark-mdx/node_modules/@babel/traverse": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-      "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.0",
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/parser": "^7.13.0",
-        "@babel/types": "^7.13.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
-      }
-    },
-    "node_modules/remark-mdx/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/remark-mdx/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/remark-mdx/node_modules/convert-source-map": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
@@ -46064,18 +43274,6 @@
         "xtend": "^4.0.1"
       }
     },
-    "node_modules/remark-mdx/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/remark-mdx/node_modules/unified": {
       "version": "9.2.0",
       "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz",
@@ -46642,14 +43840,6 @@
         "npm": ">=2.0.0"
       }
     },
-    "node_modules/s2-geometry": {
-      "version": "1.2.10",
-      "resolved": "https://registry.npmjs.org/s2-geometry/-/s2-geometry-1.2.10.tgz",
-      "integrity": "sha1-xv8i8+zK/Q7qSRtgtEwUG5iHrKs=",
-      "dependencies": {
-        "long": "^3.2.0"
-      }
-    },
     "node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -46734,11 +43924,11 @@
       }
     },
     "node_modules/scroll-into-view-if-needed": {
-      "version": "2.2.26",
-      "resolved": "https://registry.npmjs.org/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.26.tgz",
-      "integrity": "sha512-SQ6AOKfABaSchokAmmaxVnL9IArxEnLEX9j4wAZw+x4iUTb40q7irtHG3z4GtAWz5veVZcCnubXDBRyLVQaohw==",
+      "version": "2.2.28",
+      "resolved": "https://registry.npmjs.org/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.28.tgz",
+      "integrity": "sha512-8LuxJSuFVc92+0AdNv4QOxRL4Abeo1DgLnGNkn1XlaujPH/3cCFz3QI60r2VNu4obJJROzgnIUw5TKQkZvZI1w==",
       "dependencies": {
-        "compute-scroll-into-view": "^1.0.16"
+        "compute-scroll-into-view": "^1.0.17"
       }
     },
     "node_modules/seedrandom": {
@@ -46746,11 +43936,6 @@
       "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
       "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg=="
     },
-    "node_modules/seer": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/seer/-/seer-0.2.5.tgz",
-      "integrity": "sha512-//0Zwt0x97KQhIWrp4oq9AVNvGA2ctCx4dmFddpkORjRr6bW+hyC8eOhWBVIhiU3uHv1XLU1dekfFKOi28RGHA=="
-    },
     "node_modules/select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
@@ -46776,6 +43961,7 @@
       "version": "5.6.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
       "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+      "dev": true,
       "bin": {
         "semver": "bin/semver"
       }
@@ -46942,42 +44128,6 @@
         "sha.js": "bin.js"
       }
     },
-    "node_modules/shallow-clone": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
-      "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.1",
-        "kind-of": "^2.0.1",
-        "lazy-cache": "^0.2.3",
-        "mixin-object": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/shallow-clone/node_modules/kind-of": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-      "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/shallow-clone/node_modules/lazy-cache": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
-      "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/shallow-copy": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz",
@@ -47519,9 +44669,9 @@
       }
     },
     "node_modules/sortablejs": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.13.0.tgz",
-      "integrity": "sha512-RBJirPY0spWCrU5yCmWM1eFs/XgX2J5c6b275/YyxFRgnzPhKl/TDeU2hNR8Dt7ITq66NRPM4UlOt+e5O4CFHg=="
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz",
+      "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="
     },
     "node_modules/source-list-map": {
       "version": "2.0.1",
@@ -47823,11 +44973,6 @@
         "safer-buffer": "^2.0.2",
         "tweetnacl": "~0.14.0"
       },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
@@ -49551,6 +46696,36 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/table-layout": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-1.0.2.tgz",
+      "integrity": "sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A==",
+      "dependencies": {
+        "array-back": "^4.0.1",
+        "deep-extend": "~0.6.0",
+        "typical": "^5.2.0",
+        "wordwrapjs": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/table-layout/node_modules/array-back": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz",
+      "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/table-layout/node_modules/typical": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz",
+      "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/table/node_modules/ajv": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.0.3.tgz",
@@ -49628,46 +46803,6 @@
         "node": ">=0.6"
       }
     },
-    "node_modules/tar": {
-      "version": "4.4.13",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
-      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "chownr": "^1.1.1",
-        "fs-minipass": "^1.2.5",
-        "minipass": "^2.8.6",
-        "minizlib": "^1.2.1",
-        "mkdirp": "^0.5.0",
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.3"
-      },
-      "engines": {
-        "node": ">=4.5"
-      }
-    },
-    "node_modules/tar/node_modules/fs-minipass": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
-      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "minipass": "^2.6.0"
-      }
-    },
-    "node_modules/tar/node_modules/minipass": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
-      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.0"
-      }
-    },
     "node_modules/telejson": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/telejson/-/telejson-5.1.0.tgz",
@@ -49880,6 +47015,11 @@
         "node": "*"
       }
     },
+    "node_modules/text-encoding-utf-8": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz",
+      "integrity": "sha512-8bw4MY9WjdsD2aMtO0OzOCY3pXGYNx2d2FfHRVUKkiCPDWjKuOlhLVASS+pD7VkLTVjW268LYJHwsnPFlBpbAg=="
+    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -50549,9 +47689,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz",
-      "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
+      "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -50561,6 +47701,14 @@
         "node": ">=4.2.0"
       }
     },
+    "node_modules/typical": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz",
+      "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/ua-parser-js": {
       "version": "0.7.25",
       "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.25.tgz",
@@ -53364,6 +50512,26 @@
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
       "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
     },
+    "node_modules/wordwrapjs": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.1.tgz",
+      "integrity": "sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA==",
+      "dependencies": {
+        "reduce-flatten": "^2.0.0",
+        "typical": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/wordwrapjs/node_modules/typical": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz",
+      "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/worker-farm": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
@@ -53730,9 +50898,9 @@
       }
     },
     "node_modules/zrender": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.1.0.tgz",
-      "integrity": "sha512-c+8VRx52ycbmqwHeHLlo/BAfIHBl/JZNLM6cfDQFgzIH05yb+f5J9F/fbRsP+zGc8dW9XHuhdt8/iqukgMZSeg==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.1.1.tgz",
+      "integrity": "sha512-oeWlmUZPQdS9f5hK4pV21tHPqA3wgQ7CkKkw7l0CCBgWlJ/FP+lRgLFtUBW6yam4JX8y9CdHJo1o587VVrbcoQ==",
       "dependencies": {
         "tslib": "2.0.3"
       }
@@ -53921,11 +51089,11 @@
       }
     },
     "@babel/code-frame": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
-      "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
+      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
       "requires": {
-        "@babel/highlight": "^7.0.0"
+        "@babel/highlight": "^7.14.5"
       }
     },
     "@babel/compat-data": {
@@ -53938,6 +51106,7 @@
       "version": "7.12.10",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz",
       "integrity": "sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==",
+      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.10.4",
         "@babel/generator": "^7.12.10",
@@ -53956,113 +51125,11 @@
         "source-map": "^0.5.0"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-          "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-          "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
-          "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
-          "requires": {
-            "@babel/types": "^7.12.11",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz",
-          "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==",
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.10",
-            "@babel/template": "^7.12.7",
-            "@babel/types": "^7.12.11"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz",
-          "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==",
-          "requires": {
-            "@babel/types": "^7.12.10"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz",
-          "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==",
-          "requires": {
-            "@babel/types": "^7.12.11"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
-          "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg=="
-        },
-        "@babel/template": {
-          "version": "7.12.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
-          "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.12.7",
-            "@babel/types": "^7.12.7"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.12.12",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz",
-          "integrity": "sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==",
-          "requires": {
-            "@babel/code-frame": "^7.12.11",
-            "@babel/generator": "^7.12.11",
-            "@babel/helper-function-name": "^7.12.11",
-            "@babel/helper-split-export-declaration": "^7.12.11",
-            "@babel/parser": "^7.12.11",
-            "@babel/types": "^7.12.12",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
         "convert-source-map": {
           "version": "1.7.0",
           "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
           "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+          "dev": true,
           "requires": {
             "safe-buffer": "~5.1.1"
           }
@@ -54071,6 +51138,7 @@
           "version": "4.3.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
           "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
           "requires": {
             "ms": "2.1.2"
           }
@@ -54079,6 +51147,7 @@
           "version": "2.1.3",
           "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
           "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
+          "dev": true,
           "requires": {
             "minimist": "^1.2.5"
           }
@@ -54086,58 +51155,28 @@
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         }
       }
     },
     "@babel/generator": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.3.tgz",
-      "integrity": "sha512-drt8MUHbEqRzNR0xnF8nMehbY11b1SDkRw03PSNH/3Rb2Z35oxkddVSi3rcaak0YJQ86PCuE7Qx1jSFhbLNBMA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.5.tgz",
+      "integrity": "sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.3",
+        "@babel/types": "^7.14.5",
         "jsesc": "^2.5.1",
-        "lodash": "^4.17.13",
         "source-map": "^0.5.0"
       }
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz",
-      "integrity": "sha512-ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.10.1"
-      }
-    },
-    "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.1.tgz",
-      "integrity": "sha512-cQpVq48EkYxUU0xozpGCLla3wlkdRRqLWu1ksFMXA9CM5KQmyyRpSEsYXbao7JUkOw/tAaYKCaYyZq6HOFYtyw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.10.1",
-        "@babel/types": "^7.10.1"
-      }
-    },
-    "@babel/helper-builder-react-jsx-experimental": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.1.tgz",
-      "integrity": "sha512-irQJ8kpQUV3JasXPSFQ+LCCtJSc5ceZrPFVj6TElR6XCHssi3jV8ch3odIrNtjJFRZZVbrOEfJMI79TPU/h1pQ==",
-      "dev": true,
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz",
+      "integrity": "sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-module-imports": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-compilation-targets": {
@@ -54152,228 +51191,59 @@
         "semver": "^5.5.0"
       },
       "dependencies": {
-        "browserslist": {
-          "version": "4.16.1",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.1.tgz",
-          "integrity": "sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30001173",
-            "colorette": "^1.2.1",
-            "electron-to-chromium": "^1.3.634",
-            "escalade": "^3.1.1",
-            "node-releases": "^1.1.69"
-          }
-        },
-        "caniuse-lite": {
-          "version": "1.0.30001173",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001173.tgz",
-          "integrity": "sha512-R3aqmjrICdGCTAnSXtNyvWYMK3YtV5jwudbq0T7nN9k4kmE4CBuwPqyJ+KBzepSTh0huivV2gLbSMEzTTmfeYw==",
-          "dev": true
-        },
-        "electron-to-chromium": {
-          "version": "1.3.635",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.635.tgz",
-          "integrity": "sha512-RRriZOLs9CpW6KTLmgBqyUdnY0QNqqWs0HOtuQGGEMizOTNNn1P7sGRBxARnUeLejOsgwjDyRqT3E/CSst02ZQ==",
-          "dev": true
-        },
-        "escalade": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-          "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-          "dev": true
-        },
-        "node-releases": {
-          "version": "1.1.69",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.69.tgz",
-          "integrity": "sha512-DGIjo79VDEyAnRlfSqYTsy+yoHd2IOjJiKUozD2MV2D85Vso6Bug56mb9tT/fY5Urt0iqk01H7x+llAruDR2zA==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/helper-create-class-features-plugin": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz",
-      "integrity": "sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-member-expression-to-functions": "^7.12.1",
-        "@babel/helper-optimise-call-expression": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.12.1",
-        "@babel/helper-split-export-declaration": "^7.10.4"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-          "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
-          "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.11",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz",
-          "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.10",
-            "@babel/template": "^7.12.7",
-            "@babel/types": "^7.12.11"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz",
-          "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.10"
-          }
-        },
-        "@babel/helper-member-expression-to-functions": {
-          "version": "7.12.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz",
-          "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.7"
-          }
-        },
-        "@babel/helper-optimise-call-expression": {
-          "version": "7.12.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz",
-          "integrity": "sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.10"
-          }
-        },
-        "@babel/helper-replace-supers": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz",
-          "integrity": "sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-member-expression-to-functions": "^7.12.7",
-            "@babel/helper-optimise-call-expression": "^7.12.10",
-            "@babel/traverse": "^7.12.10",
-            "@babel/types": "^7.12.11"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz",
-          "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.11"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
-          "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
-          "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.12.7",
-            "@babel/types": "^7.12.7"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.12.12",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz",
-          "integrity": "sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.11",
-            "@babel/generator": "^7.12.11",
-            "@babel/helper-function-name": "^7.12.11",
-            "@babel/helper-split-export-declaration": "^7.12.11",
-            "@babel/parser": "^7.12.11",
-            "@babel/types": "^7.12.12",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+        "browserslist": {
+          "version": "4.16.1",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.1.tgz",
+          "integrity": "sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "caniuse-lite": "^1.0.30001173",
+            "colorette": "^1.2.1",
+            "electron-to-chromium": "^1.3.634",
+            "escalade": "^3.1.1",
+            "node-releases": "^1.1.69"
           }
         },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
+        "caniuse-lite": {
+          "version": "1.0.30001173",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001173.tgz",
+          "integrity": "sha512-R3aqmjrICdGCTAnSXtNyvWYMK3YtV5jwudbq0T7nN9k4kmE4CBuwPqyJ+KBzepSTh0huivV2gLbSMEzTTmfeYw==",
+          "dev": true
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "electron-to-chromium": {
+          "version": "1.3.635",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.635.tgz",
+          "integrity": "sha512-RRriZOLs9CpW6KTLmgBqyUdnY0QNqqWs0HOtuQGGEMizOTNNn1P7sGRBxARnUeLejOsgwjDyRqT3E/CSst02ZQ==",
           "dev": true
         },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
+        "escalade": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+          "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "1.1.69",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.69.tgz",
+          "integrity": "sha512-DGIjo79VDEyAnRlfSqYTsy+yoHd2IOjJiKUozD2MV2D85Vso6Bug56mb9tT/fY5Urt0iqk01H7x+llAruDR2zA==",
+          "dev": true
         }
       }
     },
+    "@babel/helper-create-class-features-plugin": {
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.6.tgz",
+      "integrity": "sha512-Z6gsfGofTxH/+LQXqYEK45kxmcensbzmk/oi8DmaQytlQCgqNZt9XQF8iqlI/SeXWVjaMNxvYvzaYw+kh42mDg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-member-expression-to-functions": "^7.14.5",
+        "@babel/helper-optimise-call-expression": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5",
+        "@babel/helper-split-export-declaration": "^7.14.5"
+      }
+    },
     "@babel/helper-create-regexp-features-plugin": {
       "version": "7.8.8",
       "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz",
@@ -54422,63 +51292,42 @@
         }
       }
     },
-    "@babel/helper-define-map": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.1.tgz",
-      "integrity": "sha512-+5odWpX+OnvkD0Zmq7panrMuAGQBu6aPUgvMzuMGo4R+jUOvealEj2hiqI6WhxgKrTpFoFj0+VdsuA8KDxHBDg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/types": "^7.10.1",
-        "lodash": "^4.17.13"
-      }
-    },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.1.tgz",
-      "integrity": "sha512-vcUJ3cDjLjvkKzt6rHrl767FeE7pMEYfPanq5L16GRtrXIoznc0HykNW2aEYkcnP76P0isoqJ34dDMFZwzEpJg==",
-      "dev": true,
-      "requires": {
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1"
-      }
-    },
     "@babel/helper-function-name": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.3.tgz",
-      "integrity": "sha512-FvSj2aiOd8zbeqijjgqdMDSyxsGHaMt5Tr0XjQsGKHD3/1FP3wksjnLAWzxw7lvXiej8W1Jt47SKTZ6upQNiRw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
+      "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "^7.10.3",
-        "@babel/template": "^7.10.3",
-        "@babel/types": "^7.10.3"
+        "@babel/helper-get-function-arity": "^7.14.5",
+        "@babel/template": "^7.14.5",
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-get-function-arity": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.3.tgz",
-      "integrity": "sha512-iUD/gFsR+M6uiy69JA6fzM5seno8oE85IYZdbVVEuQaZlEzMO2MXblh+KSPJgsZAUx0EEbWXU0yJaW7C9CdAVg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
+      "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.3"
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz",
-      "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
+      "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz",
-      "integrity": "sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz",
+      "integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.1"
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-module-imports": {
@@ -54493,6 +51342,7 @@
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz",
       "integrity": "sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==",
+      "dev": true,
       "requires": {
         "@babel/helper-module-imports": "^7.12.1",
         "@babel/helper-replace-supers": "^7.12.1",
@@ -54503,174 +51353,21 @@
         "@babel/traverse": "^7.12.1",
         "@babel/types": "^7.12.1",
         "lodash": "^4.17.19"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-          "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-          "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
-          "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
-          "requires": {
-            "@babel/types": "^7.12.11",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz",
-          "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==",
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.10",
-            "@babel/template": "^7.12.7",
-            "@babel/types": "^7.12.11"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz",
-          "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==",
-          "requires": {
-            "@babel/types": "^7.12.10"
-          }
-        },
-        "@babel/helper-member-expression-to-functions": {
-          "version": "7.12.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz",
-          "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==",
-          "requires": {
-            "@babel/types": "^7.12.7"
-          }
-        },
-        "@babel/helper-optimise-call-expression": {
-          "version": "7.12.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz",
-          "integrity": "sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==",
-          "requires": {
-            "@babel/types": "^7.12.10"
-          }
-        },
-        "@babel/helper-replace-supers": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz",
-          "integrity": "sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==",
-          "requires": {
-            "@babel/helper-member-expression-to-functions": "^7.12.7",
-            "@babel/helper-optimise-call-expression": "^7.12.10",
-            "@babel/traverse": "^7.12.10",
-            "@babel/types": "^7.12.11"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz",
-          "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==",
-          "requires": {
-            "@babel/types": "^7.12.11"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
-          "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg=="
-        },
-        "@babel/template": {
-          "version": "7.12.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
-          "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.12.7",
-            "@babel/types": "^7.12.7"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.12.12",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz",
-          "integrity": "sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==",
-          "requires": {
-            "@babel/code-frame": "^7.12.11",
-            "@babel/generator": "^7.12.11",
-            "@babel/helper-function-name": "^7.12.11",
-            "@babel/helper-split-export-declaration": "^7.12.11",
-            "@babel/parser": "^7.12.11",
-            "@babel/types": "^7.12.12",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz",
-      "integrity": "sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz",
+      "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.1"
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ=="
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
+      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ=="
     },
     "@babel/helper-regex": {
       "version": "7.8.3",
@@ -54690,35 +51387,25 @@
         "@babel/helper-annotate-as-pure": "^7.10.4",
         "@babel/helper-wrap-function": "^7.10.4",
         "@babel/types": "^7.12.1"
-      },
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.12.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz",
-          "integrity": "sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.10"
-          }
-        }
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz",
-      "integrity": "sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz",
+      "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==",
       "dev": true,
       "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.10.1",
-        "@babel/helper-optimise-call-expression": "^7.10.1",
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "@babel/helper-member-expression-to-functions": "^7.14.5",
+        "@babel/helper-optimise-call-expression": "^7.14.5",
+        "@babel/traverse": "^7.14.5",
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-simple-access": {
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz",
       "integrity": "sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==",
+      "dev": true,
       "requires": {
         "@babel/types": "^7.12.1"
       }
@@ -54733,18 +51420,18 @@
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
-      "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
+      "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.1"
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.14.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
-      "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A=="
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz",
+      "integrity": "sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg=="
     },
     "@babel/helper-validator-option": {
       "version": "7.12.1",
@@ -54762,525 +51449,33 @@
         "@babel/template": "^7.10.4",
         "@babel/traverse": "^7.10.4",
         "@babel/types": "^7.10.4"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-          "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
-          "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.11",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz",
-          "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.10",
-            "@babel/template": "^7.12.7",
-            "@babel/types": "^7.12.11"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz",
-          "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.10"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz",
-          "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.11"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
-          "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
-          "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.12.7",
-            "@babel/types": "^7.12.7"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.12.12",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz",
-          "integrity": "sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.11",
-            "@babel/generator": "^7.12.11",
-            "@babel/helper-function-name": "^7.12.11",
-            "@babel/helper-split-export-declaration": "^7.12.11",
-            "@babel/parser": "^7.12.11",
-            "@babel/types": "^7.12.12",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "@babel/helpers": {
       "version": "7.12.5",
       "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz",
       "integrity": "sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==",
+      "dev": true,
       "requires": {
         "@babel/template": "^7.10.4",
         "@babel/traverse": "^7.12.5",
         "@babel/types": "^7.12.5"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-          "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-          "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
-          "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
-          "requires": {
-            "@babel/types": "^7.12.11",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz",
-          "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==",
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.10",
-            "@babel/template": "^7.12.7",
-            "@babel/types": "^7.12.11"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz",
-          "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==",
-          "requires": {
-            "@babel/types": "^7.12.10"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz",
-          "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==",
-          "requires": {
-            "@babel/types": "^7.12.11"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
-          "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg=="
-        },
-        "@babel/template": {
-          "version": "7.12.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
-          "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.12.7",
-            "@babel/types": "^7.12.7"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.12.12",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz",
-          "integrity": "sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==",
-          "requires": {
-            "@babel/code-frame": "^7.12.11",
-            "@babel/generator": "^7.12.11",
-            "@babel/helper-function-name": "^7.12.11",
-            "@babel/helper-split-export-declaration": "^7.12.11",
-            "@babel/parser": "^7.12.11",
-            "@babel/types": "^7.12.12",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@babel/highlight": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
-      "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
-      "requires": {
-        "chalk": "^2.0.0",
-        "esutils": "^2.0.2",
-        "js-tokens": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@babel/node": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/node/-/node-7.12.10.tgz",
-      "integrity": "sha512-lJT1sXp1bEfAZ7B2ChEOOiUxaGbIWkcAixqZDpbHnJWUqIjoofOGo5ON1bJ9HOmtMdF7rqKiOoM7zZSI87El3g==",
-      "dev": true,
-      "requires": {
-        "@babel/register": "^7.12.10",
-        "commander": "^4.0.1",
-        "core-js": "^3.2.1",
-        "lodash": "^4.17.19",
-        "node-environment-flags": "^1.0.5",
-        "regenerator-runtime": "^0.13.4",
-        "v8flags": "^3.1.1"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-          "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/parser": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.3.tgz",
-      "integrity": "sha512-oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA==",
-      "dev": true
-    },
-    "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.12.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz",
-      "integrity": "sha512-nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-remap-async-to-generator": "^7.12.1",
-        "@babel/plugin-syntax-async-generators": "^7.8.0"
-      }
-    },
-    "@babel/plugin-proposal-class-properties": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz",
-      "integrity": "sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.12.1",
-        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "@babel/plugin-proposal-decorators": {
-      "version": "7.13.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.13.5.tgz",
-      "integrity": "sha512-i0GDfVNuoapwiheevUOuSW67mInqJ8qw7uWfpjNVeHMn143kXblEy/bmL9AdZ/0yf/4BMQeWXezK0tQIvNPqag==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/plugin-syntax-decorators": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz",
-          "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.13.0",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-create-class-features-plugin": {
-          "version": "7.13.8",
-          "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.8.tgz",
-          "integrity": "sha512-qioaRrKHQbn4hkRKDHbnuQ6kAxmmOF+kzKGnIfxPK4j2rckSJCpKzr/SSTlohSCiE3uAQpNDJ9FIh4baeE8W+w==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-function-name": "^7.12.13",
-            "@babel/helper-member-expression-to-functions": "^7.13.0",
-            "@babel/helper-optimise-call-expression": "^7.12.13",
-            "@babel/helper-replace-supers": "^7.13.0",
-            "@babel/helper-split-export-declaration": "^7.12.13"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-member-expression-to-functions": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz",
-          "integrity": "sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.13.0"
-          }
-        },
-        "@babel/helper-optimise-call-expression": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
-          "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-replace-supers": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz",
-          "integrity": "sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-member-expression-to-functions": "^7.13.0",
-            "@babel/helper-optimise-call-expression": "^7.12.13",
-            "@babel/traverse": "^7.13.0",
-            "@babel/types": "^7.13.0"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.13.8",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-          "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.13.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz",
-          "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-          "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/generator": "^7.13.0",
-            "@babel/helper-function-name": "^7.12.13",
-            "@babel/helper-split-export-declaration": "^7.12.13",
-            "@babel/parser": "^7.13.0",
-            "@babel/types": "^7.13.0",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
+    "@babel/highlight": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.14.5",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "dependencies": {
         "ansi-styles": {
           "version": "3.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
           "requires": {
             "color-convert": "^1.9.0"
           }
@@ -55289,39 +51484,83 @@
           "version": "2.4.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
           "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
           "requires": {
             "ansi-styles": "^3.2.1",
             "escape-string-regexp": "^1.0.5",
             "supports-color": "^5.3.0"
           }
         },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
         "supports-color": {
           "version": "5.5.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
           "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
           "requires": {
             "has-flag": "^3.0.0"
           }
         }
       }
     },
+    "@babel/node": {
+      "version": "7.12.10",
+      "resolved": "https://registry.npmjs.org/@babel/node/-/node-7.12.10.tgz",
+      "integrity": "sha512-lJT1sXp1bEfAZ7B2ChEOOiUxaGbIWkcAixqZDpbHnJWUqIjoofOGo5ON1bJ9HOmtMdF7rqKiOoM7zZSI87El3g==",
+      "dev": true,
+      "requires": {
+        "@babel/register": "^7.12.10",
+        "commander": "^4.0.1",
+        "core-js": "^3.2.1",
+        "lodash": "^4.17.19",
+        "node-environment-flags": "^1.0.5",
+        "regenerator-runtime": "^0.13.4",
+        "v8flags": "^3.1.1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+          "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/parser": {
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.7.tgz",
+      "integrity": "sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA==",
+      "dev": true
+    },
+    "@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.12.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz",
+      "integrity": "sha512-nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-remap-async-to-generator": "^7.12.1",
+        "@babel/plugin-syntax-async-generators": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-class-properties": {
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz",
+      "integrity": "sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.12.1",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-proposal-decorators": {
+      "version": "7.13.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.13.5.tgz",
+      "integrity": "sha512-i0GDfVNuoapwiheevUOuSW67mInqJ8qw7uWfpjNVeHMn143kXblEy/bmL9AdZ/0yf/4BMQeWXezK0tQIvNPqag==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-decorators": "^7.12.13"
+      }
+    },
     "@babel/plugin-proposal-dynamic-import": {
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz",
@@ -55393,39 +51632,6 @@
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
       }
     },
-    "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.1.tgz",
-      "integrity": "sha512-jjfym4N9HtCiNfyyLAVD8WqPYeHUrw4ihxuAynWj6zzp2gf9Ey2f7ImhFm6ikB3CLf5Z/zmcJDri6B4+9j9RsA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.1"
-      }
-    },
-    "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz",
-      "integrity": "sha512-Z+Qri55KiQkHh7Fc4BW6o+QBuTagbOp9txE+4U1i79u9oWlf2npkiDx+Rf3iK3lbcHBuNy9UOkwuR5wOMH3LIQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-transform-parameters": "^7.10.1"
-      },
-      "dependencies": {
-        "@babel/plugin-transform-parameters": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz",
-          "integrity": "sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.10.1",
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        }
-      }
-    },
     "@babel/plugin-proposal-optional-catch-binding": {
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz",
@@ -55448,29 +51654,13 @@
       }
     },
     "@babel/plugin-proposal-private-methods": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.1.tgz",
-      "integrity": "sha512-RZecFFJjDiQ2z6maFprLgrdnm0OzoC23Mx89xf1CcEsxmHuzuXOdniEuI+S3v7vjQG4F5sa6YtUp+19sZuSxHg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz",
+      "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
-      },
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz",
-          "integrity": "sha512-5C/QhkGFh1vqcziq1vAL6SI9ymzUp8BCYjFpvYVhWP4DlATIb3u5q3iUd35mvlyGs8fO7hckkW7i0tmH+5+bvQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-function-name": "^7.10.1",
-            "@babel/helper-member-expression-to-functions": "^7.10.1",
-            "@babel/helper-optimise-call-expression": "^7.10.1",
-            "@babel/helper-plugin-utils": "^7.10.1",
-            "@babel/helper-replace-supers": "^7.10.1",
-            "@babel/helper-split-export-declaration": "^7.10.1"
-          }
-        }
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
@@ -55691,22 +51881,6 @@
         "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
-    "@babel/plugin-transform-classes": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz",
-      "integrity": "sha512-P9V0YIh+ln/B3RStPoXpEQ/CoAxQIhRSUn7aXqQ+FZJ2u8+oCtjIXR3+X0vsSD8zv+mb56K7wZW1XiDTDGiDRQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-define-map": "^7.10.1",
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/helper-optimise-call-expression": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-replace-supers": "^7.10.1",
-        "@babel/helper-split-export-declaration": "^7.10.1",
-        "globals": "^11.1.0"
-      }
-    },
     "@babel/plugin-transform-computed-properties": {
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz",
@@ -55744,16 +51918,6 @@
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz",
-      "integrity": "sha512-lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
     "@babel/plugin-transform-flow-strip-types": {
       "version": "7.13.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.13.0.tgz",
@@ -55781,94 +51945,6 @@
       "requires": {
         "@babel/helper-function-name": "^7.10.4",
         "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-          "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz",
-          "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.10",
-            "@babel/template": "^7.12.7",
-            "@babel/types": "^7.12.11"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz",
-          "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.10"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
-          "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
-          "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.12.7",
-            "@babel/types": "^7.12.7"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "@babel/plugin-transform-literals": {
@@ -55880,15 +51956,6 @@
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz",
-      "integrity": "sha512-UmaWhDokOFT2GcgU6MkHC11i0NQcL63iqeufXWfRy6pUOGYeCGEKhvfFO6Vz70UfYJYHwveg62GS83Rvpxn+NA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
     "@babel/plugin-transform-modules-amd": {
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz",
@@ -55935,15 +52002,6 @@
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz",
-      "integrity": "sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.8.3"
-      }
-    },
     "@babel/plugin-transform-new-target": {
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz",
@@ -55961,176 +52019,6 @@
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/helper-replace-supers": "^7.12.1"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-          "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
-          "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.11",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz",
-          "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.10",
-            "@babel/template": "^7.12.7",
-            "@babel/types": "^7.12.11"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz",
-          "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.10"
-          }
-        },
-        "@babel/helper-member-expression-to-functions": {
-          "version": "7.12.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz",
-          "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.7"
-          }
-        },
-        "@babel/helper-optimise-call-expression": {
-          "version": "7.12.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz",
-          "integrity": "sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.10"
-          }
-        },
-        "@babel/helper-replace-supers": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz",
-          "integrity": "sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-member-expression-to-functions": "^7.12.7",
-            "@babel/helper-optimise-call-expression": "^7.12.10",
-            "@babel/traverse": "^7.12.10",
-            "@babel/types": "^7.12.11"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz",
-          "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.11"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
-          "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
-          "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.12.7",
-            "@babel/types": "^7.12.7"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.12.12",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz",
-          "integrity": "sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.11",
-            "@babel/generator": "^7.12.11",
-            "@babel/helper-function-name": "^7.12.11",
-            "@babel/helper-split-export-declaration": "^7.12.11",
-            "@babel/parser": "^7.12.11",
-            "@babel/types": "^7.12.12",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "@babel/plugin-transform-parameters": {
@@ -56142,22 +52030,13 @@
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "@babel/plugin-transform-property-literals": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz",
-      "integrity": "sha512-Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
     "@babel/plugin-transform-react-constant-elements": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.10.1.tgz",
-      "integrity": "sha512-V4os6bkWt/jbrzfyVcZn2ZpuHZkvj3vyBU0U/dtS8SZuMS7Rfx5oknTrtfyXJ2/QZk8gX7Yls5Z921ItNpE30Q==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.14.5.tgz",
+      "integrity": "sha512-NBqLEx1GxllIOXJInJAQbrnwwYJsV3WaMHIcOwD8rhYS0AabTWn7kHdHgPgu5RmHLU0q4DMxhAMu8ue/KampgQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-react-display-name": {
@@ -56179,37 +52058,6 @@
         "@babel/helper-plugin-utils": "^7.12.13",
         "@babel/plugin-syntax-jsx": "^7.12.13",
         "@babel/types": "^7.12.17"
-      },
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz",
-          "integrity": "sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==",
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        }
-      }
-    },
-    "@babel/plugin-transform-react-jsx-development": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.10.1.tgz",
-      "integrity": "sha512-XwDy/FFoCfw9wGFtdn5Z+dHh6HXKHkC6DwKNWpN74VWinUagZfDcEJc3Y8Dn5B3WMVnAllX8Kviaw7MtC5Epwg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-builder-react-jsx-experimental": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-jsx": "^7.10.1"
-      }
-    },
-    "@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.1.tgz",
-      "integrity": "sha512-mfhoiai083AkeewsBHUpaS/FM1dmUENHBMpS/tugSJ7VXqXO5dCN1Gkint2YvM1Cdv1uhmAKt1ZOuAjceKmlLA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-regenerator": {
@@ -56269,16 +52117,6 @@
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "@babel/plugin-transform-template-literals": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz",
-      "integrity": "sha512-t7B/3MQf5M1T9hPCRG28DNGZUuxAuDqLYS03rJrIk2prj/UV7Z6FOneijhQhnv/Xa039vidXeVbvjK2SK5f7Gg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
     "@babel/plugin-transform-typeof-symbol": {
       "version": "7.12.10",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz",
@@ -56297,198 +52135,6 @@
         "@babel/helper-create-class-features-plugin": "^7.12.13",
         "@babel/helper-plugin-utils": "^7.12.13",
         "@babel/plugin-syntax-typescript": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.12.15",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.15.tgz",
-          "integrity": "sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-create-class-features-plugin": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.13.tgz",
-          "integrity": "sha512-Vs/e9wv7rakKYeywsmEBSRC9KtmE7Px+YBlESekLeJOF0zbGUicGfXSNi3o+tfXSNS48U/7K9mIOOCR79Cl3+Q==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-function-name": "^7.12.13",
-            "@babel/helper-member-expression-to-functions": "^7.12.13",
-            "@babel/helper-optimise-call-expression": "^7.12.13",
-            "@babel/helper-replace-supers": "^7.12.13",
-            "@babel/helper-split-export-declaration": "^7.12.13"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-member-expression-to-functions": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.13.tgz",
-          "integrity": "sha512-B+7nN0gIL8FZ8SvMcF+EPyB21KnCcZHQZFczCxbiNGV/O0rsrSBlWGLzmtBJ3GMjSVMIm4lpFhR+VdVBuIsUcQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-optimise-call-expression": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
-          "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-replace-supers": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz",
-          "integrity": "sha512-pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-member-expression-to-functions": "^7.12.13",
-            "@babel/helper-optimise-call-expression": "^7.12.13",
-            "@babel/traverse": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz",
-          "integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.12.15",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.15.tgz",
-          "integrity": "sha512-AQBOU2Z9kWwSZMd6lNjCX0GUgFonL1wAM1db8L8PMk9UDaGsRCArBkU4Sc+UCM3AE4hjbXx+h58Lb3QT4oRmrA==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.13.tgz",
-          "integrity": "sha512-3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/generator": "^7.12.13",
-            "@babel/helper-function-name": "^7.12.13",
-            "@babel/helper-split-export-declaration": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.1.tgz",
-      "integrity": "sha512-zZ0Poh/yy1d4jeDWpx/mNwbKJVwUYJX73q+gyh4bwtG0/iUlzdEu0sLMda8yuDFS6LBQlT/ST1SJAR6zYwXWgw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
@@ -56501,15 +52147,6 @@
         "@babel/helper-plugin-utils": "^7.10.4"
       },
       "dependencies": {
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.12.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz",
-          "integrity": "sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.10"
-          }
-        },
         "@babel/helper-create-regexp-features-plugin": {
           "version": "7.12.7",
           "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz",
@@ -56647,43 +52284,6 @@
         "semver": "^5.5.0"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-          "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
-          "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.11",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          },
-          "dependencies": {
-            "jsesc": {
-              "version": "2.5.2",
-              "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-              "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-              "dev": true
-            }
-          }
-        },
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.12.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz",
-          "integrity": "sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.10"
-          }
-        },
         "@babel/helper-builder-binary-assignment-operator-visitor": {
           "version": "7.10.4",
           "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz",
@@ -56724,88 +52324,12 @@
             "@babel/types": "^7.12.1"
           }
         },
-        "@babel/helper-function-name": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz",
-          "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.10",
-            "@babel/template": "^7.12.7",
-            "@babel/types": "^7.12.11"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz",
-          "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.10"
-          }
-        },
-        "@babel/helper-member-expression-to-functions": {
-          "version": "7.12.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz",
-          "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.7"
-          }
-        },
-        "@babel/helper-optimise-call-expression": {
-          "version": "7.12.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz",
-          "integrity": "sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.10"
-          }
-        },
-        "@babel/helper-replace-supers": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz",
-          "integrity": "sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-member-expression-to-functions": "^7.12.7",
-            "@babel/helper-optimise-call-expression": "^7.12.10",
-            "@babel/traverse": "^7.12.10",
-            "@babel/types": "^7.12.11"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz",
-          "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.11"
-          }
-        },
         "@babel/helper-validator-option": {
           "version": "7.12.11",
           "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz",
           "integrity": "sha512-TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw==",
           "dev": true
         },
-        "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
-          "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==",
-          "dev": true
-        },
         "@babel/plugin-proposal-numeric-separator": {
           "version": "7.12.7",
           "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz",
@@ -56827,16 +52351,6 @@
             "@babel/plugin-transform-parameters": "^7.12.1"
           }
         },
-        "@babel/plugin-proposal-private-methods": {
-          "version": "7.12.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz",
-          "integrity": "sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-create-class-features-plugin": "^7.12.1",
-            "@babel/helper-plugin-utils": "^7.10.4"
-          }
-        },
         "@babel/plugin-proposal-unicode-property-regex": {
           "version": "7.12.1",
           "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz",
@@ -57001,43 +52515,6 @@
             "@babel/helper-plugin-utils": "^7.10.4"
           }
         },
-        "@babel/template": {
-          "version": "7.12.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
-          "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.12.7",
-            "@babel/types": "^7.12.7"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.12.12",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz",
-          "integrity": "sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.11",
-            "@babel/generator": "^7.12.11",
-            "@babel/helper-function-name": "^7.12.11",
-            "@babel/helper-split-export-declaration": "^7.12.11",
-            "@babel/parser": "^7.12.11",
-            "@babel/types": "^7.12.12",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
         "browserslist": {
           "version": "4.16.1",
           "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.1.tgz",
@@ -57057,17 +52534,6 @@
           "integrity": "sha512-R3aqmjrICdGCTAnSXtNyvWYMK3YtV5jwudbq0T7nN9k4kmE4CBuwPqyJ+KBzepSTh0huivV2gLbSMEzTTmfeYw==",
           "dev": true
         },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
         "core-js-compat": {
           "version": "3.8.2",
           "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.2.tgz",
@@ -57086,15 +52552,6 @@
             }
           }
         },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
         "electron-to-chromium": {
           "version": "1.3.635",
           "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.635.tgz",
@@ -57113,12 +52570,6 @@
           "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
           "dev": true
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
         "node-releases": {
           "version": "1.1.69",
           "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.69.tgz",
@@ -57153,15 +52604,6 @@
           "requires": {
             "jsesc": "~0.5.0"
           }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -57201,15 +52643,6 @@
         "@babel/plugin-transform-react-pure-annotations": "^7.12.1"
       },
       "dependencies": {
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.12.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz",
-          "integrity": "sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.10"
-          }
-        },
         "@babel/plugin-transform-react-jsx": {
           "version": "7.12.12",
           "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.12.tgz",
@@ -57310,124 +52743,33 @@
       }
     },
     "@babel/template": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.3.tgz",
-      "integrity": "sha512-5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
+      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.10.3",
-        "@babel/parser": "^7.10.3",
-        "@babel/types": "^7.10.3"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.10.3",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz",
-          "integrity": "sha512-fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.3"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.10.3",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz",
-          "integrity": "sha512-Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.3",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
+        "@babel/code-frame": "^7.14.5",
+        "@babel/parser": "^7.14.5",
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/traverse": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.3.tgz",
-      "integrity": "sha512-qO6623eBFhuPm0TmmrUFMT1FulCmsSeJuVGhiLodk2raUDFhhTECLd9E9jC4LBIWziqt4wgF6KuXE4d+Jz9yug==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.10.3",
-        "@babel/generator": "^7.10.3",
-        "@babel/helper-function-name": "^7.10.3",
-        "@babel/helper-split-export-declaration": "^7.10.1",
-        "@babel/parser": "^7.10.3",
-        "@babel/types": "^7.10.3",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.7.tgz",
+      "integrity": "sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.14.5",
+        "@babel/generator": "^7.14.5",
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-hoist-variables": "^7.14.5",
+        "@babel/helper-split-export-declaration": "^7.14.5",
+        "@babel/parser": "^7.14.7",
+        "@babel/types": "^7.14.5",
         "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.13"
+        "globals": "^11.1.0"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.10.3",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz",
-          "integrity": "sha512-fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.3"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.10.3",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz",
-          "integrity": "sha512-Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.3",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -57442,24 +52784,15 @@
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
     "@babel/types": {
-      "version": "7.14.1",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.1.tgz",
-      "integrity": "sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz",
+      "integrity": "sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.14.0",
+        "@babel/helper-validator-identifier": "^7.14.5",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -58184,79 +53517,146 @@
       }
     },
     "@deck.gl/aggregation-layers": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/@deck.gl/aggregation-layers/-/aggregation-layers-7.1.11.tgz",
-      "integrity": "sha512-CHsr+UJhf06Mqb/q60iP7ftHQv3ftHUhJbVO4550PRo+QMFFhHfhxo53gQDDgrQ3stxpAcLT3lXRSNghMoU34g==",
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/aggregation-layers/-/aggregation-layers-8.5.2.tgz",
+      "integrity": "sha512-oiqXPmyn2v0lX9tWCvgmWs29stHSLS3tje71Ff2FVXDNmvP5FoZItFa8y7O7KSTkej2/rSwZeSte/a9pri6Njg==",
       "requires": {
+        "@luma.gl/shadertools": "^8.5.4",
+        "@math.gl/web-mercator": "^3.5.3",
         "d3-hexbin": "^0.2.1"
       }
     },
-    "@deck.gl/core": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/@deck.gl/core/-/core-7.1.11.tgz",
-      "integrity": "sha512-jUi1CcsnF5KPL2sv7Z0H3x+8amee5csqliZXGbXEBYox1l8naC4PhHg5jTgLaB0ZOHfVDsldPwGdPC+Mi4jP/Q==",
+    "@deck.gl/carto": {
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/carto/-/carto-8.5.2.tgz",
+      "integrity": "sha512-Kw/3NUM+2NcHjxH6b7IOUYXEwmJ4SNQujFzAVFW5amG4Lut8074NGSF5XHi+4M/zgk7vXDFsGRxLqspsA/dg8w==",
       "requires": {
-        "@luma.gl/core": "^7.1.0",
+        "@loaders.gl/loader-utils": "^3.0.6",
+        "@loaders.gl/mvt": "^3.0.6",
+        "@loaders.gl/tiles": "^3.0.6",
+        "@math.gl/web-mercator": "^3.5.3",
+        "cartocolor": "^4.0.2",
+        "d3-scale": "^3.2.3"
+      },
+      "dependencies": {
+        "d3-array": {
+          "version": "2.12.1",
+          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
+          "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
+          "requires": {
+            "internmap": "^1.0.0"
+          }
+        },
+        "d3-scale": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz",
+          "integrity": "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==",
+          "requires": {
+            "d3-array": "^2.3.0",
+            "d3-format": "1 - 2",
+            "d3-interpolate": "1.2.0 - 2",
+            "d3-time": "^2.1.1",
+            "d3-time-format": "2 - 3"
+          }
+        },
+        "d3-time": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz",
+          "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==",
+          "requires": {
+            "d3-array": "2"
+          }
+        }
+      }
+    },
+    "@deck.gl/core": {
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/core/-/core-8.5.2.tgz",
+      "integrity": "sha512-SAFv7fKx6k1Rj8R4qTMQO2wEhEfixROzbcoSS6RivxrfES00KYYj6jJ7iNEnq3dFn6qc37LPpxqtYYHO4BcvYA==",
+      "requires": {
+        "@loaders.gl/core": "^3.0.6",
+        "@loaders.gl/images": "^3.0.6",
+        "@luma.gl/core": "^8.5.4",
+        "@math.gl/web-mercator": "^3.5.3",
         "gl-matrix": "^3.0.0",
-        "math.gl": "^2.3.0",
-        "mjolnir.js": "^2.1.2",
-        "probe.gl": "^3.0.1",
-        "seer": "^0.2.4",
-        "viewport-mercator-project": "^6.1.0"
+        "math.gl": "^3.5.3",
+        "mjolnir.js": "^2.5.0",
+        "probe.gl": "^3.4.0"
       }
     },
-    "@deck.gl/geo-layers": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/@deck.gl/geo-layers/-/geo-layers-7.1.11.tgz",
-      "integrity": "sha512-gIJ1K98IFSZ12hB+zHyQC+9pMncb9BKVhJTA7pjUpxwcmEkkroqet9zkYQQMeSInK0a67BR9GXjebb/N0U04qA==",
+    "@deck.gl/extensions": {
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/extensions/-/extensions-8.5.2.tgz",
+      "integrity": "sha512-VhbQsMNPM7RCR/ERwb1u1x0rEWAxgXfcCWttW+gYvbiagW/LrAJ22jhOghlRW/wilEmupHYbXQlWkW2V/mYfsg==",
       "requires": {
-        "h3-js": "^3.4.3",
+        "@luma.gl/shadertools": "^8.5.4"
+      }
+    },
+    "@deck.gl/geo-layers": {
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/geo-layers/-/geo-layers-8.5.2.tgz",
+      "integrity": "sha512-t6+TgAdbKWDw8g9UX1y6D+5twcdJuKaXw4qSib/0yVurWi/Mil5Plihybt1l9uBZuwkr+UcpxPR73zzo+qd9MA==",
+      "requires": {
+        "@loaders.gl/3d-tiles": "^3.0.6",
+        "@loaders.gl/gis": "^3.0.6",
+        "@loaders.gl/loader-utils": "^3.0.6",
+        "@loaders.gl/mvt": "^3.0.6",
+        "@loaders.gl/terrain": "^3.0.6",
+        "@loaders.gl/tiles": "^3.0.6",
+        "@luma.gl/experimental": "^8.5.4",
+        "@math.gl/culling": "^3.5.3",
+        "@math.gl/web-mercator": "^3.5.3",
+        "h3-js": "^3.6.0",
         "long": "^3.2.0",
-        "s2-geometry": "^1.2.10"
+        "math.gl": "^3.5.3"
       }
     },
     "@deck.gl/google-maps": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/@deck.gl/google-maps/-/google-maps-7.1.11.tgz",
-      "integrity": "sha512-gYp3NFIsyT5p65HgKjXFWTDzFf7K8+6ce9d9MIqaNgVWFZdsjUy9JL5TttDMQXshaQ1aZpxtLL6ZO3BiI1w8fw=="
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/google-maps/-/google-maps-8.5.2.tgz",
+      "integrity": "sha512-Dk3ozenBWgt9nFSYOT4N82urNW/JhiMszfFq6zLt3jUp0N7EJ9d2XO81hclM59BhjIdGWb6drTe96NvtbabVLQ==",
+      "requires": {}
     },
     "@deck.gl/json": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/@deck.gl/json/-/json-7.1.11.tgz",
-      "integrity": "sha512-obYAXq5VZ0qCTVS8hopS64aXGicUeBNg0/03AAfo+Q5z62cNqagAktGKVZMUsJ13bV8CPohJ2zRWMXO+mAJtew==",
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/json/-/json-8.5.2.tgz",
+      "integrity": "sha512-lVS16bvPfLUSidgBURZvGbWEjgK8GjLWlp1iGuLvua2W6TnWIyiKa6a3XoebgeXd8kqwSbQxhNnuSVPX+Di6Rg==",
       "requires": {
-        "d3-dsv": "^1.0.8"
+        "d3-dsv": "^1.0.8",
+        "expression-eval": "^2.0.0"
       }
     },
     "@deck.gl/layers": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/@deck.gl/layers/-/layers-7.1.11.tgz",
-      "integrity": "sha512-hOylm7Pf3CSvqpDoiCJLnqLAU3PAePISskJ5jjhpXtgHBrm1/Gk4boP4/7t7kFZdbSvVIXin13pPRbT0SWCRPw==",
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/layers/-/layers-8.5.2.tgz",
+      "integrity": "sha512-HmpE3qf9CI7sU/xa2DMCNg31pzpzK5XuUHyC70dsLq8AV7Sm3vZQz17KMU/CWSZpVr7yQ8uxTeSQARiv/zeOFQ==",
       "requires": {
-        "@loaders.gl/core": "^1.0.3",
-        "@loaders.gl/images": "^1.0.3",
+        "@loaders.gl/images": "^3.0.6",
         "@mapbox/tiny-sdf": "^1.1.0",
+        "@math.gl/polygon": "^3.5.3",
         "earcut": "^2.0.6"
       }
     },
     "@deck.gl/mapbox": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/@deck.gl/mapbox/-/mapbox-7.1.11.tgz",
-      "integrity": "sha512-V4cc9vwXzAOBtWV8x+WtvPVXElGChogkvQketeR2uhz6wIHuH+3sBBRg/Ma476w/II+DKjeHg2AzAZeX3SK7yQ=="
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/mapbox/-/mapbox-8.5.2.tgz",
+      "integrity": "sha512-nMpzfdPFBVthT+EMgIcKo4YO6bZCqADQtqnxIFtfofZIiKS6R5OSuJ3sXPSNZ9ReCJGzdmndEz7/Qtm9Sia/bA==",
+      "requires": {}
     },
     "@deck.gl/mesh-layers": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/@deck.gl/mesh-layers/-/mesh-layers-7.1.11.tgz",
-      "integrity": "sha512-rI8ffUNh7ac2GpMcGLEiKyRarOPeLfVRlMRKjl9LXU61Wgx6DaHqsMmeqxzjoXEzgiRlY/XgCjepVg0dY6btlQ==",
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/mesh-layers/-/mesh-layers-8.5.2.tgz",
+      "integrity": "sha512-dUfQyGjm5CYQg9AQdRsGtEEXGSGHxifPlws0zWWoj1r757wjqM0aZ663TUJEsJQDTLNOvbBLGTiuFeCBUoKO4Q==",
       "requires": {
-        "@loaders.gl/core": "^1.0.3",
-        "@loaders.gl/images": "^1.0.3"
+        "@loaders.gl/gltf": "^3.0.6",
+        "@luma.gl/experimental": "^8.5.4",
+        "@luma.gl/shadertools": "^8.5.4"
       }
     },
     "@deck.gl/react": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/@deck.gl/react/-/react-7.1.11.tgz",
-      "integrity": "sha512-WUzxhvM3jZIZkBAQgdQR+tFBAVDm5opLCKMWI9YkJUsdJzdv9uwiWCsk3Se1pCTFIa5Asb8U6YAi1CHl+OOFyA==",
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/@deck.gl/react/-/react-8.5.2.tgz",
+      "integrity": "sha512-h7AJ9nPY1PTjrAVP7T1fvWDChWZrVOsEfYIoEP4W6ILSjvDqEQfVL0+9RhjUwQV2nKrg0QmpqCmbfOrgKQQbYw==",
       "requires": {
         "prop-types": "^15.6.0"
       }
@@ -60150,97 +55550,219 @@
         }
       }
     },
+    "@loaders.gl/3d-tiles": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/3d-tiles/-/3d-tiles-3.0.8.tgz",
+      "integrity": "sha512-jZeOyDPGD2wEkTLW4Do9A4UUQ+OGjhhNXztB0AsttZ69OpkmsxJXb76xxwevf+eThrsTgSTjZ06eC5DHX0kyXA==",
+      "requires": {
+        "@loaders.gl/core": "3.0.8",
+        "@loaders.gl/draco": "3.0.8",
+        "@loaders.gl/gltf": "3.0.8",
+        "@loaders.gl/loader-utils": "3.0.8",
+        "@loaders.gl/math": "3.0.8",
+        "@loaders.gl/tiles": "3.0.8",
+        "@math.gl/core": "^3.5.1",
+        "@math.gl/geospatial": "^3.5.1"
+      }
+    },
     "@loaders.gl/core": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/@loaders.gl/core/-/core-1.3.7.tgz",
-      "integrity": "sha512-dFZkJQc+i2PoqlBMz/aO8Gnn0y6ICafQp8u6cTpCm96h/HHulE8qDBodQlHGHn9EMJDSgVl/zjni+QhqIK31dg==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/core/-/core-3.0.8.tgz",
+      "integrity": "sha512-FIfbhMkoRX2JonEHXHgClC7jwOSsEwvvmjlaTMRAY+gFKvJPGmegkp4VgUZquLFf6GedJt/1TuMMvAX6gdq1pg==",
       "requires": {
-        "@babel/runtime": "^7.3.1"
+        "@babel/runtime": "^7.3.1",
+        "@loaders.gl/loader-utils": "3.0.8",
+        "@loaders.gl/worker-utils": "3.0.8",
+        "probe.gl": "^3.4.0"
+      }
+    },
+    "@loaders.gl/draco": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/draco/-/draco-3.0.8.tgz",
+      "integrity": "sha512-ZCXzXNHWQ7H0qk/kC+rWzjMWjLzZGzQcDbdpIuy8xJdp4rTpmMkLUseFPby8vhkmIaqxWPwPB6mx/vM7L6JENg==",
+      "requires": {
+        "@babel/runtime": "^7.3.1",
+        "@loaders.gl/loader-utils": "3.0.8",
+        "@loaders.gl/schema": "3.0.8",
+        "@loaders.gl/worker-utils": "3.0.8",
+        "draco3d": "1.4.1"
+      }
+    },
+    "@loaders.gl/gis": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/gis/-/gis-3.0.8.tgz",
+      "integrity": "sha512-7NL+lIb7NezlMupYskVil6M3RZunXJl+TyaVAW82GLbzPSOq+m/G7h3+z0GBa8iv/U/I+cB5BhSN+GZmvFwqEA==",
+      "requires": {
+        "@loaders.gl/loader-utils": "3.0.8",
+        "@loaders.gl/schema": "3.0.8",
+        "@mapbox/vector-tile": "^1.3.1",
+        "pbf": "^3.2.1"
+      }
+    },
+    "@loaders.gl/gltf": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/gltf/-/gltf-3.0.8.tgz",
+      "integrity": "sha512-4PXWTlqyvlbZE2Vp4iQ+Y87ZO1WuRvSlbImDhygd0hoINfmJ9ObxrFS3yJcpJTu007nWxXorNVEOKyuoo+4Iyw==",
+      "requires": {
+        "@loaders.gl/core": "3.0.8",
+        "@loaders.gl/draco": "3.0.8",
+        "@loaders.gl/images": "3.0.8",
+        "@loaders.gl/loader-utils": "3.0.8"
       }
     },
     "@loaders.gl/images": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/@loaders.gl/images/-/images-1.3.7.tgz",
-      "integrity": "sha512-TKqW94vjvWc4RIChhr0Yx6HaVTe8K6h6GFeXcahsKeCxq9/k2qpcigRkXfmb6/37dkp2Qy5COHp73ECgN/q+NA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/images/-/images-3.0.8.tgz",
+      "integrity": "sha512-rO2cIYJYlMs/uO9YSoF4/BEA4p/9xQ3gHZ1sIJkPYVnDqzpbu8nvUjWTQqIdL/MkQBTW8tz3twCdM+B6G9Fa2w==",
+      "requires": {
+        "@loaders.gl/loader-utils": "3.0.8"
+      }
+    },
+    "@loaders.gl/loader-utils": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/loader-utils/-/loader-utils-3.0.8.tgz",
+      "integrity": "sha512-PW1WyyQ+LXkqoGHBZHsmfNQkKiLAYf1gok+kHnHvY9fCzhJeA1iTNEUKPXGXKgS00m/k5cBTkOWAaOG9KRvBCQ==",
+      "requires": {
+        "@babel/runtime": "^7.3.1",
+        "@loaders.gl/worker-utils": "3.0.8",
+        "@probe.gl/stats": "^3.4.0"
+      }
+    },
+    "@loaders.gl/math": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/math/-/math-3.0.8.tgz",
+      "integrity": "sha512-jfFpxxr4Bq5JfOPqLVJc4JJGoGGvVTOCWiJhnTtSAKhaNSwldmNWaZ0w8E2nlgPKPMAHiTRKOQnd9sSY5m66Cw==",
+      "requires": {
+        "@loaders.gl/images": "3.0.8",
+        "@loaders.gl/loader-utils": "3.0.8",
+        "@math.gl/core": "^3.5.1"
+      }
+    },
+    "@loaders.gl/mvt": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/mvt/-/mvt-3.0.8.tgz",
+      "integrity": "sha512-Jk1QTHgpxMsUT01w5IJJ2en9qq0yOZcL2wGXVc7CFp2h6inB22rC3drUwq1mUNGe6iy3EWIo7EeJVd9B+5JyTQ==",
+      "requires": {
+        "@loaders.gl/gis": "3.0.8",
+        "@loaders.gl/loader-utils": "3.0.8",
+        "@math.gl/polygon": "^3.5.1",
+        "pbf": "^3.2.1"
+      }
+    },
+    "@loaders.gl/schema": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/schema/-/schema-3.0.8.tgz",
+      "integrity": "sha512-yne5WE7fZZWFl2zF8fzDlYhPVJua6h6mTCSmlQ5pryaMXTZS9mfzXXIFWRL3kswqnQTu/QNFdyFj1mP0haF24w==",
+      "requires": {
+        "@types/geojson": "^7946.0.7",
+        "apache-arrow": "^4.0.0",
+        "d3-dsv": "^1.2.0"
+      }
+    },
+    "@loaders.gl/terrain": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/terrain/-/terrain-3.0.8.tgz",
+      "integrity": "sha512-MtOAYEB/xJB4CN4B0YNPkO4v1ZY332joxiOHQI1x37x4sWVAqOrKLr9jB42sZCB8aINi2WMWGiErtf9wh9L5Pg==",
+      "requires": {
+        "@babel/runtime": "^7.3.1",
+        "@loaders.gl/loader-utils": "3.0.8",
+        "@loaders.gl/schema": "3.0.8",
+        "@mapbox/martini": "^0.2.0"
+      }
+    },
+    "@loaders.gl/tiles": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/tiles/-/tiles-3.0.8.tgz",
+      "integrity": "sha512-Rc+yHFdQg2sYmcYkwvszukFWdm9EW354F9HUR7y/oauos6tsdo4YTj31zgytaYR63/EqWQ7kwI29/eePEcutzg==",
+      "requires": {
+        "@loaders.gl/core": "3.0.8",
+        "@loaders.gl/loader-utils": "3.0.8",
+        "@loaders.gl/math": "3.0.8",
+        "@math.gl/core": "^3.5.1",
+        "@math.gl/culling": "^3.5.1",
+        "@math.gl/geospatial": "^3.5.1",
+        "@math.gl/web-mercator": "^3.5.1",
+        "@probe.gl/stats": "^3.4.0"
+      }
+    },
+    "@loaders.gl/worker-utils": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@loaders.gl/worker-utils/-/worker-utils-3.0.8.tgz",
+      "integrity": "sha512-Pg72HuXPcL725TrOlOr83xloVUHj6OMWmno1dI8ccuqfOBsgoRjxNZrcSvwBzfK8tFCzuN2X30I+mHl3BkuYLw==",
+      "requires": {
+        "@babel/runtime": "^7.3.1"
+      }
     },
     "@luma.gl/constants": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/@luma.gl/constants/-/constants-7.3.2.tgz",
-      "integrity": "sha512-hr6JOOwsGPjjoHnil4sQ6AWsc8P6XXYtRL10TwNYfFTcNxrhSrjQvutYoCzXHH5U0vfHBfPMMUyLASK9FqiHOA=="
+      "version": "8.5.4",
+      "resolved": "https://registry.npmjs.org/@luma.gl/constants/-/constants-8.5.4.tgz",
+      "integrity": "sha512-lrA4ja92om/gDHYOvM9itL5S7FVzjKulyknDz6S+Y7gmgHgXk2ln1Xar5zUCsLnhAYx4glHITXGH5Y5rdWgT1Q=="
     },
     "@luma.gl/core": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/@luma.gl/core/-/core-7.3.2.tgz",
-      "integrity": "sha512-XyQPSUJRkZcc//gVX0AgjLLNTkCOO68NRnm7RkIhikRBEUdovb4IOcpmWMCB1/Gyj4hzg/Z1FOAVT4pG1E+agw==",
+      "version": "8.5.4",
+      "resolved": "https://registry.npmjs.org/@luma.gl/core/-/core-8.5.4.tgz",
+      "integrity": "sha512-+saDz1D3mcPd53vgbG60ryg1w5CF9Z2wdakKHzR810VoJLw97t4aNdg/eNgyWOvbOHxaKJBPm8K0sGjej67+jw==",
       "requires": {
         "@babel/runtime": "^7.0.0",
-        "@luma.gl/constants": "7.3.2",
-        "@luma.gl/shadertools": "7.3.2",
-        "@luma.gl/webgl": "7.3.2",
-        "@luma.gl/webgl-state-tracker": "7.3.2",
-        "@luma.gl/webgl2-polyfill": "7.3.2",
-        "math.gl": "^3.0.0",
-        "probe.gl": "^3.1.1",
-        "seer": "^0.2.4"
-      },
-      "dependencies": {
-        "math.gl": {
-          "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/math.gl/-/math.gl-3.4.1.tgz",
-          "integrity": "sha512-D33ZXryVFcHu1YJ+fgcNp2MkyK+mEfHesHMdQUZBz2hFqIsAwXovM1sJ+0rTcs8IyTFmuRJ2ayHf1igEJEOM2g==",
-          "requires": {
-            "@math.gl/core": "3.4.1"
-          }
-        }
+        "@luma.gl/constants": "8.5.4",
+        "@luma.gl/engine": "8.5.4",
+        "@luma.gl/gltools": "8.5.4",
+        "@luma.gl/shadertools": "8.5.4",
+        "@luma.gl/webgl": "8.5.4"
       }
     },
-    "@luma.gl/shadertools": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/@luma.gl/shadertools/-/shadertools-7.3.2.tgz",
-      "integrity": "sha512-GiOZTvdEr164zYFy1DNRc7mzduSWLNJ34s+YbkJ/0i07E6tK7gHgM29QNCZ/gROvUDDJ5CHxngZqGkb+XquOMQ==",
+    "@luma.gl/engine": {
+      "version": "8.5.4",
+      "resolved": "https://registry.npmjs.org/@luma.gl/engine/-/engine-8.5.4.tgz",
+      "integrity": "sha512-Sfv972IzvR9s9kKWugs67XQUh9jC0e/PpBrzvyGVnPU4XvFq42RZVF73pzEklVU6AlpR8Zg5CPtxGdhyOHtT7w==",
       "requires": {
         "@babel/runtime": "^7.0.0",
-        "math.gl": "^3.0.0"
-      },
-      "dependencies": {
-        "math.gl": {
-          "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/math.gl/-/math.gl-3.4.1.tgz",
-          "integrity": "sha512-D33ZXryVFcHu1YJ+fgcNp2MkyK+mEfHesHMdQUZBz2hFqIsAwXovM1sJ+0rTcs8IyTFmuRJ2ayHf1igEJEOM2g==",
-          "requires": {
-            "@math.gl/core": "3.4.1"
-          }
-        }
+        "@luma.gl/constants": "8.5.4",
+        "@luma.gl/gltools": "8.5.4",
+        "@luma.gl/shadertools": "8.5.4",
+        "@luma.gl/webgl": "8.5.4",
+        "@math.gl/core": "^3.5.0",
+        "probe.gl": "^3.4.0"
       }
     },
-    "@luma.gl/webgl": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/@luma.gl/webgl/-/webgl-7.3.2.tgz",
-      "integrity": "sha512-eWoPPRJOF5xSpqgggdwspsm8exclwxz20c8vqu8D1b3LJTY7cEpq57CMLvITHcJMMJ834TX/r598efTcF76lpw==",
+    "@luma.gl/experimental": {
+      "version": "8.5.4",
+      "resolved": "https://registry.npmjs.org/@luma.gl/experimental/-/experimental-8.5.4.tgz",
+      "integrity": "sha512-09waqRhgIrw+Sq0/in4tw4jPag5YsFfV1nEHJaLAg5RFv92S53IEubSJgkuG02HoOBkPxQ7KYvs9VNmriisnYg==",
+      "requires": {
+        "@luma.gl/constants": "8.5.4",
+        "@math.gl/core": "^3.5.0",
+        "earcut": "^2.0.6"
+      }
+    },
+    "@luma.gl/gltools": {
+      "version": "8.5.4",
+      "resolved": "https://registry.npmjs.org/@luma.gl/gltools/-/gltools-8.5.4.tgz",
+      "integrity": "sha512-JotiPuymQz2Xc41AYlS2moJC/EHxU+OX/OMKi0+/MeOlEFLsdochgTA0I64j8yofLTXdeiGCneGtD1Ao8fk+bw==",
       "requires": {
         "@babel/runtime": "^7.0.0",
-        "@luma.gl/constants": "7.3.2",
-        "@luma.gl/webgl-state-tracker": "7.3.2",
-        "@luma.gl/webgl2-polyfill": "7.3.2",
-        "probe.gl": "^3.1.1"
+        "@luma.gl/constants": "8.5.4",
+        "probe.gl": "^3.4.0"
       }
     },
-    "@luma.gl/webgl-state-tracker": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/@luma.gl/webgl-state-tracker/-/webgl-state-tracker-7.3.2.tgz",
-      "integrity": "sha512-0LuK3veReSm2UPOiDwC2CRDeE2xk4irqXdhyFO0WSAU1w+YhzbD1hGbjizGczvgfkbz8dFl9h98LbbH75efcKw==",
+    "@luma.gl/shadertools": {
+      "version": "8.5.4",
+      "resolved": "https://registry.npmjs.org/@luma.gl/shadertools/-/shadertools-8.5.4.tgz",
+      "integrity": "sha512-rwLBLrACi75aWnuJm8rVKCQnJR2sMTCxHuexfjHJ7Uecl0vVcVJZT7c9EnCFaz5LUTNbdupvuhq0SKNckKiKmw==",
       "requires": {
         "@babel/runtime": "^7.0.0",
-        "@luma.gl/constants": "7.3.2"
+        "@math.gl/core": "^3.5.0"
       }
     },
-    "@luma.gl/webgl2-polyfill": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/@luma.gl/webgl2-polyfill/-/webgl2-polyfill-7.3.2.tgz",
-      "integrity": "sha512-PMt5xqQ+u7tIqfUaL3s4nuWl604WFNcl1F1ohSUFeEzIIuxFiF6gsdEEvC5VqGoMFxI8T4FOTSeHYIr6uP4+4w==",
+    "@luma.gl/webgl": {
+      "version": "8.5.4",
+      "resolved": "https://registry.npmjs.org/@luma.gl/webgl/-/webgl-8.5.4.tgz",
+      "integrity": "sha512-dWy4dhTbtvDO9zQBdx1Yb+DxNx/1JWV9rhhJxJUtTKbGZSX0RjkASTT6GBWMl5jrH1JYJefS1wswHmmPVXjK0Q==",
       "requires": {
         "@babel/runtime": "^7.0.0",
-        "@luma.gl/constants": "7.3.2"
+        "@luma.gl/constants": "8.5.4",
+        "@luma.gl/gltools": "8.5.4",
+        "probe.gl": "^3.4.0"
       }
     },
     "@mapbox/geojson-area": {
@@ -60277,15 +55799,20 @@
       "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-1.5.0.tgz",
       "integrity": "sha512-/PT1P6DNf7vjEEiPkVIRJkvibbqWtqnyGaBz3nfRdcxclNSnSdaLU5tfAgcD7I8Yt5i+L19s406YLl1koLnLbg=="
     },
+    "@mapbox/martini": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@mapbox/martini/-/martini-0.2.0.tgz",
+      "integrity": "sha512-7hFhtkb0KTLEls+TRw/rWayq5EeHtTaErgm/NskVoXmtgAQu/9D299aeyj6mzAR/6XUnYRp2lU+4IcrYRFjVsQ=="
+    },
     "@mapbox/point-geometry": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz",
       "integrity": "sha1-ioP5M1x4YO/6Lu7KJUMyqgru2PI="
     },
     "@mapbox/tiny-sdf": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-1.1.1.tgz",
-      "integrity": "sha512-Ihn1nZcGIswJ5XGbgFAvVumOgWpvIjBX9jiRlIl46uQG9vJOF51ViBYHF95rEZupuyQbEmhLaDPLQlU7fUTsBg=="
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-1.2.5.tgz",
+      "integrity": "sha512-cD8A/zJlm6fdJOk6DqPUV8mcpyJkRz2x2R+/fYcWDYG3oWbG7/L7Yl/WqQ1VZCjnL9OTIMAn6c+BC5Eru4sQEw=="
     },
     "@mapbox/unitbezier": {
       "version": "0.0.0",
@@ -60306,18 +55833,46 @@
       "integrity": "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q=="
     },
     "@math.gl/core": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/@math.gl/core/-/core-3.4.1.tgz",
-      "integrity": "sha512-miAZL/WPU0B5hKrcg1K2nPU2GnOK6X84bwLoD0eTt2n7qT46ffh51Xu21V9kQp/cisE3l1ypukqSV/VHeaNxhQ==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/@math.gl/core/-/core-3.5.3.tgz",
+      "integrity": "sha512-TaSnvG0qFh1VxeNW5L58jSx0nJUMWMpUl6zo6Z3ScQzFySG5cicGOBzk/D40RkIZWPazCKCZ+ZThg5npSK9y3g==",
       "requires": {
         "@babel/runtime": "^7.12.0",
         "gl-matrix": "^3.0.0"
       }
     },
+    "@math.gl/culling": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/@math.gl/culling/-/culling-3.5.3.tgz",
+      "integrity": "sha512-ABpAcrvoIOLSm1EUkwgDem4RfO28HWPBs/+taZ/ZSpJG6KiVPklpKU1NCK+05HuJStkpFZ+XlWtehWU6FAMCyA==",
+      "requires": {
+        "@babel/runtime": "^7.12.0",
+        "@math.gl/core": "3.5.3",
+        "gl-matrix": "^3.0.0"
+      }
+    },
+    "@math.gl/geospatial": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/@math.gl/geospatial/-/geospatial-3.5.3.tgz",
+      "integrity": "sha512-cnc8VMQrt30JmlG200VDJmmvSjaGW57gY9KEZ+raapxyyFyfDNuAuIrIxe+zbK66FbvFWTbJlDaNmKqVG+ohyw==",
+      "requires": {
+        "@babel/runtime": "^7.12.0",
+        "@math.gl/core": "3.5.3",
+        "gl-matrix": "^3.0.0"
+      }
+    },
+    "@math.gl/polygon": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/@math.gl/polygon/-/polygon-3.5.3.tgz",
+      "integrity": "sha512-VktscmyQg/Rd56nJk0Nj/UyvnPDbsnZNMWCdl3G5AYenYzLWy6h4FEWhLx8pD+Xw7VuFot8LR4WAK2TPzXzrWw==",
+      "requires": {
+        "@math.gl/core": "3.5.3"
+      }
+    },
     "@math.gl/web-mercator": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/@math.gl/web-mercator/-/web-mercator-3.4.1.tgz",
-      "integrity": "sha512-5LAVmo5U25GY5YIxbI3D0J7r97B9AM5pAcWxnF9YhJx44DSVAYfMdiSISOfS+ivKuBFX44mFZvV9j75QY5aDkQ==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/@math.gl/web-mercator/-/web-mercator-3.5.3.tgz",
+      "integrity": "sha512-WZE9ALeTS4n3HDgkqTxcNLBU7DL0mjmPXSrcqSZIUeDY00+LCtNvMQWUAwqolpB7nD71vD6HLW8delzVuy4teA==",
       "requires": {
         "@babel/runtime": "^7.12.0",
         "gl-matrix": "^3.0.0"
@@ -60389,15 +55944,6 @@
         "unist-util-visit": "2.0.3"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
         "@babel/core": {
           "version": "7.12.9",
           "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz",
@@ -60422,63 +55968,6 @@
             "source-map": "^0.5.0"
           }
         },
-        "@babel/generator": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz",
-          "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.13.0",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.13.8",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-          "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.13.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz",
-          "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==",
-          "dev": true
-        },
         "@babel/plugin-syntax-jsx": {
           "version": "7.12.1",
           "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz",
@@ -60488,54 +55977,6 @@
             "@babel/helper-plugin-utils": "^7.10.4"
           }
         },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-          "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/generator": "^7.13.0",
-            "@babel/helper-function-name": "^7.12.13",
-            "@babel/helper-split-export-declaration": "^7.12.13",
-            "@babel/parser": "^7.13.0",
-            "@babel/types": "^7.13.0",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
         "convert-source-map": {
           "version": "1.7.0",
           "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
@@ -60619,15 +56060,6 @@
             "xtend": "^4.0.1"
           }
         },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        },
         "unified": {
           "version": "9.2.0",
           "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz",
@@ -60927,9 +56359,9 @@
       "dev": true
     },
     "@probe.gl/stats": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@probe.gl/stats/-/stats-3.3.0.tgz",
-      "integrity": "sha512-CV4c3EgallqZTO88u34/u9L5asL0nCVP1BEkb4qcXlh8Qz2Vmygbyjz1ViQsct6rSi2lJ52lo6W0PnlpZJJvcA==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@probe.gl/stats/-/stats-3.4.0.tgz",
+      "integrity": "sha512-Gl37r9qGuiKadIvTZdSZvzCNOttJYw6RcY1oT0oDuB8r2uhuZAdSMQRQTy9FTinp6MY6O9wngGnV6EpQ8wSBAw==",
       "requires": {
         "@babel/runtime": "^7.0.0"
       }
@@ -60961,6 +56393,11 @@
       "resolved": "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz",
       "integrity": "sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg=="
     },
+    "@react-icons/all-files": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@react-icons/all-files/-/all-files-4.1.0.tgz",
+      "integrity": "sha512-hxBI2UOuVaI3O/BhQfhtb4kcGn9ft12RWAFVMUeNjqqhLsHvFtzIkFaptBJpFDANTKoDfdVoHTKZDlwKCACbMQ=="
+    },
     "@seznam/compose-react-refs": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@seznam/compose-react-refs/-/compose-react-refs-1.0.4.tgz",
@@ -61619,23 +57056,6 @@
         "util-deprecate": "^1.0.2"
       },
       "dependencies": {
-        "@babel/generator": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz",
-          "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.13.0",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.13.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz",
-          "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==",
-          "dev": true
-        },
         "@storybook/addons": {
           "version": "6.1.20",
           "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -63208,41 +58628,12 @@
         "webpack-virtual-modules": "^0.2.2"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
         "@babel/compat-data": {
           "version": "7.13.8",
           "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.8.tgz",
           "integrity": "sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog==",
           "dev": true
         },
-        "@babel/generator": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz",
-          "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.13.0",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz",
-          "integrity": "sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
         "@babel/helper-compilation-targets": {
           "version": "7.13.8",
           "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.8.tgz",
@@ -63255,114 +58646,12 @@
             "semver": "^6.3.0"
           }
         },
-        "@babel/helper-create-class-features-plugin": {
-          "version": "7.13.8",
-          "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.8.tgz",
-          "integrity": "sha512-qioaRrKHQbn4hkRKDHbnuQ6kAxmmOF+kzKGnIfxPK4j2rckSJCpKzr/SSTlohSCiE3uAQpNDJ9FIh4baeE8W+w==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-function-name": "^7.12.13",
-            "@babel/helper-member-expression-to-functions": "^7.13.0",
-            "@babel/helper-optimise-call-expression": "^7.12.13",
-            "@babel/helper-replace-supers": "^7.13.0",
-            "@babel/helper-split-export-declaration": "^7.12.13"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-member-expression-to-functions": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz",
-          "integrity": "sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.13.0"
-          }
-        },
-        "@babel/helper-optimise-call-expression": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
-          "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-replace-supers": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz",
-          "integrity": "sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-member-expression-to-functions": "^7.13.0",
-            "@babel/helper-optimise-call-expression": "^7.12.13",
-            "@babel/traverse": "^7.13.0",
-            "@babel/types": "^7.13.0"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
         "@babel/helper-validator-option": {
           "version": "7.12.17",
           "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz",
           "integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==",
           "dev": true
         },
-        "@babel/highlight": {
-          "version": "7.13.8",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-          "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          },
-          "dependencies": {
-            "chalk": {
-              "version": "2.4.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-              "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^3.2.1",
-                "escape-string-regexp": "^1.0.5",
-                "supports-color": "^5.3.0"
-              }
-            }
-          }
-        },
-        "@babel/parser": {
-          "version": "7.13.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz",
-          "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==",
-          "dev": true
-        },
         "@babel/plugin-proposal-object-rest-spread": {
           "version": "7.13.8",
           "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz",
@@ -63387,16 +58676,6 @@
             }
           }
         },
-        "@babel/plugin-proposal-private-methods": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz",
-          "integrity": "sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-create-class-features-plugin": "^7.13.0",
-            "@babel/helper-plugin-utils": "^7.13.0"
-          }
-        },
         "@babel/plugin-transform-classes": {
           "version": "7.13.0",
           "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz",
@@ -63421,34 +58700,6 @@
             "@babel/helper-plugin-utils": "^7.13.0"
           }
         },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-          "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/generator": "^7.13.0",
-            "@babel/helper-function-name": "^7.12.13",
-            "@babel/helper-split-export-declaration": "^7.12.13",
-            "@babel/parser": "^7.13.0",
-            "@babel/types": "^7.13.0",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
         "@storybook/addons": {
           "version": "6.1.20",
           "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.20.tgz",
@@ -63887,15 +59138,6 @@
           "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
           "dev": true
         },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
         "ejs": {
           "version": "3.1.6",
           "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz",
@@ -64339,12 +59581,6 @@
           "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
           "dev": true
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
         "negotiator": {
           "version": "0.6.2",
           "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
@@ -65229,78 +60465,6 @@
         "fork-ts-checker-webpack-plugin": "^4.1.0"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz",
-          "integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "3.2.1",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-              "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^1.9.0"
-              }
-            },
-            "chalk": {
-              "version": "2.4.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-              "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^3.2.1",
-                "escape-string-regexp": "^1.0.5",
-                "supports-color": "^5.3.0"
-              }
-            },
-            "color-convert": {
-              "version": "1.9.3",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-              "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-              "dev": true,
-              "requires": {
-                "color-name": "1.1.3"
-              }
-            },
-            "color-name": {
-              "version": "1.1.3",
-              "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-              "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-              "dev": true
-            },
-            "has-flag": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-              "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
         "@storybook/node-logger": {
           "version": "5.3.21",
           "resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-5.3.21.tgz",
@@ -66285,23 +61449,22 @@
       }
     },
     "@superset-ui/chart-controls": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/chart-controls/-/chart-controls-0.17.53.tgz",
-      "integrity": "sha512-PjIDka4/lUwXUNEGjkQOIMwVWF2WfknqM6pKFNDPO0/nG4S4faQk96z/ABOXp8GYwIbBshnmmbmW4TCrCQ10Xw==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/chart-controls/-/chart-controls-0.17.85.tgz",
+      "integrity": "sha512-RNk6za6IfcnAKoDFA8XpWgK5AdwPCEprKauv29Z+8VkHrMT8DkoEwDtgl0vutEmLRPECAL+lR76g5B9Z33iCJQ==",
       "requires": {
-        "@superset-ui/core": "0.17.53",
+        "@react-icons/all-files": "^4.1.0",
+        "@superset-ui/core": "0.17.81",
         "lodash": "^4.17.15",
         "prop-types": "^15.7.2"
       }
     },
     "@superset-ui/core": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.17.53.tgz",
-      "integrity": "sha512-2bIRrK3Y+4ZSNu6drc1EzHTq6fO3aWfdjCh43ytju88nlADHheQXgwxEKnmjzI141qxiVL2+oSL2kC6pSTkW8A==",
+      "version": "0.17.81",
+      "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.17.81.tgz",
+      "integrity": "sha512-CaDihqqwFnqtO9yWHxPbZh3MKTot66Zd27ifdIYQCVEMQwz5OpP6zUbULekq7NAbPMHwf7Ju3FOzN0uEzWwSmw==",
       "requires": {
         "@babel/runtime": "^7.1.2",
-        "@emotion/cache": "^11.1.3",
-        "@emotion/react": "^11.1.5",
         "@emotion/styled": "^11.3.0",
         "@types/d3-format": "^1.3.0",
         "@types/d3-interpolate": "^1.3.1",
@@ -66395,26 +61558,36 @@
           }
         },
         "d3-scale": {
-          "version": "3.2.4",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.4.tgz",
-          "integrity": "sha512-PG6gtpbPCFqKbvdBEswQcJcTzHC8VEd/XzezF5e68KlkT4/ggELw/nR1tv863jY6ufKTvDlzCMZvhe06codbbA==",
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz",
+          "integrity": "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==",
           "requires": {
             "d3-array": "^2.3.0",
             "d3-format": "1 - 2",
             "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
+            "d3-time": "^2.1.1",
             "d3-time-format": "2 - 3"
+          },
+          "dependencies": {
+            "d3-time": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz",
+              "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==",
+              "requires": {
+                "d3-array": "2"
+              }
+            }
           }
         }
       }
     },
     "@superset-ui/legacy-plugin-chart-calendar": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.17.53.tgz",
-      "integrity": "sha512-NLevYzzhQyRgP+vdEfhJyDxJIBbGM/bJTJfFw1iRllny3WQax6iU/X5hUw/iWZqruVNkwSnUA39+EGcjU1aIjg==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.17.85.tgz",
+      "integrity": "sha512-bmPvflt73ncje+22YTDTkPGIbfylPcqksiCB74/dh/cjUy39lCEpBdL1iYYee6z2vmFdn6uNWuHtpENDKTG83g==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3-array": "^2.0.3",
         "d3-selection": "^1.4.0",
         "d3-tip": "^0.9.1",
@@ -66432,24 +61605,24 @@
       }
     },
     "@superset-ui/legacy-plugin-chart-chord": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-chord/-/legacy-plugin-chart-chord-0.17.53.tgz",
-      "integrity": "sha512-a3Y8b/1nSuFvzEzUDTVVmad5/YjTBhz0qU2rcVGrdKp2kzuSVXVVljdN7KVisDUNHhYqrttLM8RQrqGw9f7x1A==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-chord/-/legacy-plugin-chart-chord-0.17.85.tgz",
+      "integrity": "sha512-raQUDM3Dgcld7UIvXe9XGr4NEJV6x8J+gjVUQLlkvsttA32VN+J1tUhevxmT2eMMxifaaLnGWiBA678Q2ENVfg==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "prop-types": "^15.6.2",
         "react": "^16.13.1"
       }
     },
     "@superset-ui/legacy-plugin-chart-country-map": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-country-map/-/legacy-plugin-chart-country-map-0.17.53.tgz",
-      "integrity": "sha512-zTImQdeBT8raXnxafBIHvaVqOqKoECfyDwgFlPKhs4M7EXPG7U8/VLg0Oi2dCA7/SFZA/ASrJwc/KxW399vJhw==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-country-map/-/legacy-plugin-chart-country-map-0.17.85.tgz",
+      "integrity": "sha512-g8OAwInPI9r/k/0ip9pXvQR7L6PInQhN8KfMb4j5VgC4+eUl04BQDpsclVoYOz5KqthkxPvGhdlOH0zHybv3Vg==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "d3-array": "^2.0.3",
         "prop-types": "^15.6.2"
@@ -66466,34 +61639,34 @@
       }
     },
     "@superset-ui/legacy-plugin-chart-event-flow": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-event-flow/-/legacy-plugin-chart-event-flow-0.17.53.tgz",
-      "integrity": "sha512-QYL0Feyfu7ZH1GeQ9sfEaEgnW2IQG93sJnM29NO53CjSvdbbZItfU9v6xVnAo6jMwcam7JLNYRtuIPgJevNThw==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-event-flow/-/legacy-plugin-chart-event-flow-0.17.85.tgz",
+      "integrity": "sha512-O2DiLUO0lkkpemtjwJ845veW4vFwZUkb13TkfV1ef37HBDDdEJkUa6Ls8zh7C4aybqn4HG4mr32IHg3DV2WgYg==",
       "requires": {
         "@data-ui/event-flow": "^0.0.84",
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "prop-types": "^15.6.2"
       }
     },
     "@superset-ui/legacy-plugin-chart-force-directed": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-force-directed/-/legacy-plugin-chart-force-directed-0.17.53.tgz",
-      "integrity": "sha512-F7hkrBxC7EWrClQ1jb7anzj1SmIjqXVMz2JKhzwEUk++Tafnn0mrB7Yo51u3twFFOY5bwn+KcI1NObzBRkXguQ==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-force-directed/-/legacy-plugin-chart-force-directed-0.17.85.tgz",
+      "integrity": "sha512-8QB2IPNadJ5pha2PPs0AQe5zHEnpaIcTY+JGH8LFxUFtuDLjGSuGJJNbIyM/QT63zMp0WCn5VCwgeMuKnuU9Xw==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "prop-types": "^15.7.2"
       }
     },
     "@superset-ui/legacy-plugin-chart-heatmap": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-heatmap/-/legacy-plugin-chart-heatmap-0.17.53.tgz",
-      "integrity": "sha512-NXx/E3AiTxkL+qwaj8B0IDrhWo6P5u5EuXXx1xaWqMTH18YomyeA9l4NBPwsjCfhAMqrEeT0hzeY2/WSoPq5KQ==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-heatmap/-/legacy-plugin-chart-heatmap-0.17.85.tgz",
+      "integrity": "sha512-zuxkDDTxxVtDkg9iu7GtcNuG9URh9GmNRM5lH2wsOdKD/UTlZrkt0Lf4tp5kKycknyHWdWFixe1CSLaLzuwwOA==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "d3-svg-legend": "^1.x",
         "d3-tip": "^0.9.1",
@@ -66501,14 +61674,14 @@
       }
     },
     "@superset-ui/legacy-plugin-chart-histogram": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-histogram/-/legacy-plugin-chart-histogram-0.17.53.tgz",
-      "integrity": "sha512-EQ/VvG+qCec+IqnwYHA90iHAjkhnPNGkKbTuKlsRyL3ONfxg3n6L4EQOlAA0HvELKkFAZXBxh8TA8Qc3j+g4Fw==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-histogram/-/legacy-plugin-chart-histogram-0.17.85.tgz",
+      "integrity": "sha512-dqrTTDeMvdm4Lgb7Cav5lm86GgiQxYda1yXWoXFlqXvwZt40EJqCxYUAAHYKD5JmlqjzIn1wuvCHzJQsDxANDQ==",
       "requires": {
         "@data-ui/histogram": "^0.0.84",
         "@data-ui/theme": "^0.0.84",
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "@vx/legend": "^0.0.198",
         "@vx/responsive": "^0.0.199",
         "@vx/scale": "^0.0.197",
@@ -66576,12 +61749,12 @@
       }
     },
     "@superset-ui/legacy-plugin-chart-horizon": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-horizon/-/legacy-plugin-chart-horizon-0.17.53.tgz",
-      "integrity": "sha512-LsM4HOuOkiabRNxMUjjietbFx99admne59Mm5zQdsRPNEpN/EKEWu8R4G4crSSqxxzD9KVnveRPE7OD0n91k/A==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-horizon/-/legacy-plugin-chart-horizon-0.17.85.tgz",
+      "integrity": "sha512-lVzXqqLFgZ80I/fDbf2TT3cXCEW+xYKvna4Ldod/dUDFWjVIy3rzP7HicHsS7XCLPpeUHgZUFZhx8NEvTWhDqg==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3-array": "^2.0.3",
         "d3-scale": "^3.0.1",
         "prop-types": "^15.6.2"
@@ -66610,12 +61783,12 @@
       }
     },
     "@superset-ui/legacy-plugin-chart-map-box": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-map-box/-/legacy-plugin-chart-map-box-0.17.53.tgz",
-      "integrity": "sha512-JuM77arnxECuSiHkdLMry4JruuVTAfTKTtR8F4qGOpiYiXzGEv4K+y12eqBe1o94ckJF43Esz9e1fdPLDkjqTw==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-map-box/-/legacy-plugin-chart-map-box-0.17.85.tgz",
+      "integrity": "sha512-YJIZjcfpMDaJtve6EfEr1lUgCGnsutTxyKEOj3b6wjYMfoLhSUproDoW9TUQtBR3tFrY3PrLrZg+O41L9grDIA==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "immutable": "^3.8.2",
         "mapbox-gl": "^0.53.0",
         "prop-types": "^15.6.2",
@@ -66632,118 +61805,118 @@
       }
     },
     "@superset-ui/legacy-plugin-chart-paired-t-test": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-paired-t-test/-/legacy-plugin-chart-paired-t-test-0.17.53.tgz",
-      "integrity": "sha512-QkRVm0XGoOxqOX0nRvHnGon2gG8MmV+dbBBpmPkmspxCWKrn183Wzq5SiMlM4vgo2HaroWUIPuBgLBd7rYZtGw==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-paired-t-test/-/legacy-plugin-chart-paired-t-test-0.17.85.tgz",
+      "integrity": "sha512-JIOvvGUlVzbk2zWyQMD8WE1UN95HdOuM1I7py5LIEqJH3CwWN5SGmtDG50DAvKAhEt5InmdQkm7ihr0Uw2LoQw==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "distributions": "^1.0.0",
         "prop-types": "^15.6.2",
         "reactable": "^1.1.0"
       }
     },
     "@superset-ui/legacy-plugin-chart-parallel-coordinates": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-parallel-coordinates/-/legacy-plugin-chart-parallel-coordinates-0.17.53.tgz",
-      "integrity": "sha512-NcwuEd+rXfmwPshPby0jEgnJnbYfKruM7l0Hb3lIw6iMTc1IV21d1CMftQPvYYdwagam0FapBO2YcSvnvj2rDw==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-parallel-coordinates/-/legacy-plugin-chart-parallel-coordinates-0.17.85.tgz",
+      "integrity": "sha512-ecSKIBL7806jD+sQu6ub+92tI8W1OfLZWMUW7SeupDphlDJkrQEIQ63FQOCwWEAI9xJhn+hoxIe6M2Y9Um0FwQ==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "prop-types": "^15.7.2"
       }
     },
     "@superset-ui/legacy-plugin-chart-partition": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-partition/-/legacy-plugin-chart-partition-0.17.53.tgz",
-      "integrity": "sha512-CTzKjaKCdT/+bFlXUDD4nXC2CO7mXmIPJ2K/M94rY2G2gdAWRZJ1i2HlcvTP+RY/AItzZm3C+E7hYdAQ6toBkA==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-partition/-/legacy-plugin-chart-partition-0.17.85.tgz",
+      "integrity": "sha512-seF8oZ5lRdrqGzQBDqcQIrIV9QHp6IH7e9+pyG0F4BzSY8WNKIjFVkd92HcNcm/KeqkzID1mqGv1aCzlDQNaiw==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "d3-hierarchy": "^1.1.8",
         "prop-types": "^15.6.2"
       }
     },
     "@superset-ui/legacy-plugin-chart-pivot-table": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-pivot-table/-/legacy-plugin-chart-pivot-table-0.17.53.tgz",
-      "integrity": "sha512-bk7mttnZFGgGmWCfj0kO++65XsMNyQJch0dgfRRnLVTlSnY89/kGqszTKybbCZhsbx4T5bJ+bn6hZKAGH+FnUA==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-pivot-table/-/legacy-plugin-chart-pivot-table-0.17.85.tgz",
+      "integrity": "sha512-oXBXgzi4uBKG1FsOd9ZFIhPQvaBIYanzHdqwthafsRDG9kgKL9b//+MCIZgRlqlSJK+vsf4EMxXucFKJtoLDuA==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "datatables.net-bs": "^1.10.15",
         "prop-types": "^15.6.2"
       }
     },
     "@superset-ui/legacy-plugin-chart-rose": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-rose/-/legacy-plugin-chart-rose-0.17.53.tgz",
-      "integrity": "sha512-ppvQuKAS0rMhniKenLXSKczmAsHX4igYc0bVZAvfFDmLNW3tnlmivL+zYSw/sQ9PAhjMGDbTBlSio1oJ+91wiA==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-rose/-/legacy-plugin-chart-rose-0.17.85.tgz",
+      "integrity": "sha512-NilJNxC49YM+j7WqGmna/+G1m0/VXb1hoj2Z2PXPy8KYGMKrLQAwNE0ce7yBnQqSljvxq5Memfjqzqjoio5aoA==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "nvd3": "1.8.6",
         "prop-types": "^15.6.2"
       }
     },
     "@superset-ui/legacy-plugin-chart-sankey": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey/-/legacy-plugin-chart-sankey-0.17.53.tgz",
-      "integrity": "sha512-3tvMghg5WUAq40su8cZrjJHoc/TsK1WWx6UFu+j2mPOh/BJJZb8wh7A63X82ubLdyzEqdjxsEs9pzZWzs7kUHw==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey/-/legacy-plugin-chart-sankey-0.17.85.tgz",
+      "integrity": "sha512-MV47pYL5QkVAT8rfYrLT9joJF8a48mLiS3suVT+u4vHv3rrsWNTa00irD1HqNoWLDCuZr+U7pCt+UbW/0w2yGw==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "d3-sankey": "^0.4.2",
         "prop-types": "^15.6.2"
       }
     },
     "@superset-ui/legacy-plugin-chart-sankey-loop": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey-loop/-/legacy-plugin-chart-sankey-loop-0.17.53.tgz",
-      "integrity": "sha512-60aGflqOi5+XDE3BR/p+Pw0xVp7OHsjwroX77CwkwBtFkw1AFVWczaTJH6CYeeCJZXCLYjrbc5OFMuaxIJ+j+Q==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey-loop/-/legacy-plugin-chart-sankey-loop-0.17.85.tgz",
+      "integrity": "sha512-z3I/NCQa64LXKiel+AswpdnUuhsS/0hiziY+T+BuN2geeVrWC+LMQya1hMDg+dDR3RgpkKqgpI9lEf1KTuhHaQ==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3-sankey-diagram": "^0.7.3",
         "d3-selection": "^1.4.0",
         "prop-types": "^15.6.2"
       }
     },
     "@superset-ui/legacy-plugin-chart-sunburst": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sunburst/-/legacy-plugin-chart-sunburst-0.17.53.tgz",
-      "integrity": "sha512-t0z7XPsDtDpnZ+fIpn57w9Vi3oWQ7ximDdjmag1WGhC6+dwR3XxEpNcicI6P6xfNX078RT8Iz89PZQBtagAAkA==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sunburst/-/legacy-plugin-chart-sunburst-0.17.85.tgz",
+      "integrity": "sha512-L6rRXhEasNQpFN9SQ0ZB6qfa94XIVlCxyEmy8DOR2N39nlLncCweiHtgvgS4Su9H86nidZ/6ryNZ4fKxmm2mBg==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "prop-types": "^15.6.2"
       }
     },
     "@superset-ui/legacy-plugin-chart-treemap": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-treemap/-/legacy-plugin-chart-treemap-0.17.53.tgz",
-      "integrity": "sha512-LV16Qwiz7ahfhCmuWIGk6f54KpdRJDAyLtr/ifFi8a2AcoG27Lf7hZZ3mCI9Jl5X6c7LLBmvAHfxdbBnLGa8+g==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-treemap/-/legacy-plugin-chart-treemap-0.17.85.tgz",
+      "integrity": "sha512-X4HVCOuhe45qaqUzTfjrKxAr9RoSbdwmWlCWLK2djVJDAFYGqhTxcpNEXxSv+cMqpyMBLhwXqZ5SMV5u0Gu+Eg==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3-hierarchy": "^1.1.8",
         "d3-selection": "^1.4.0",
         "prop-types": "^15.6.2"
       }
     },
     "@superset-ui/legacy-plugin-chart-world-map": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-world-map/-/legacy-plugin-chart-world-map-0.17.53.tgz",
-      "integrity": "sha512-gnDBTyWPctqucyQzAObH6N+3f9GUQq9qpQ4cNbtvpIoVgXowYA5Q5dIfXBPnq525t78o3eiWqclTYf2Xcd62Kw==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-world-map/-/legacy-plugin-chart-world-map-0.17.85.tgz",
+      "integrity": "sha512-bxO1/tY2FI1MzfircbjwuwbLzI+jg2puIlKFek6vkbQuxA9+gCtxKD0SLOlxadNQXW4kUrU2DxhfPlr6th55bA==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "d3-array": "^2.4.0",
         "d3-color": "^1.4.1",
@@ -66758,22 +61931,17 @@
           "requires": {
             "internmap": "^1.0.0"
           }
-        },
-        "d3-color": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz",
-          "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="
         }
       }
     },
     "@superset-ui/legacy-preset-chart-big-number": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-big-number/-/legacy-preset-chart-big-number-0.17.53.tgz",
-      "integrity": "sha512-HUlE6IZUjFvPMiXCj1cdRiR4avFLVhT5qwIQZk1l30kycl8/73rTm37Y/syBfZMPrfCrIW3nyReqfcnAaNqw9g==",
+      "version": "0.17.86",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-big-number/-/legacy-preset-chart-big-number-0.17.86.tgz",
+      "integrity": "sha512-b9TZ7VJ3IK+ii6VDllfOCDujLR++rYNXcnNW/XgCZP9+ZwbHBIzGqC7APdUid7qDJM/PZwN6USXSnYf5MIYPLw==",
       "requires": {
         "@data-ui/xy-chart": "^0.0.84",
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "@types/d3-color": "^1.2.2",
         "@types/shortid": "^0.0.29",
         "d3-color": "^1.2.3",
@@ -66781,38 +61949,160 @@
       }
     },
     "@superset-ui/legacy-preset-chart-deckgl": {
-      "version": "0.4.7",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-deckgl/-/legacy-preset-chart-deckgl-0.4.7.tgz",
-      "integrity": "sha512-TaAX1PlZ5DhsNelgoOjCfPBlFtHZDFcozJEIAV2qXzXUo6rfIgskqIq4X3VbMuYnngZw5of4hAtOH1+Tgv+Wmw==",
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-deckgl/-/legacy-preset-chart-deckgl-0.4.11.tgz",
+      "integrity": "sha512-N4l8zavJ3kQUyoPFqG6zXQT8EELFcXtD/GNRy3aJzSgHObRhK8+aqFaWIn3ncQrBuEiUzGDnHLNni/LRAxz7vA==",
       "requires": {
         "@math.gl/web-mercator": "^3.2.2",
         "@types/d3-array": "^2.0.0",
         "bootstrap-slider": "^10.0.0",
         "d3-array": "^1.2.4",
-        "d3-color": "^1.2.0",
-        "d3-scale": "^2.1.2",
-        "deck.gl": "7.1.11",
+        "d3-color": "^1.4.1",
+        "d3-scale": "^3.0.0",
+        "deck.gl": "8.5.2",
         "jquery": "^3.4.1",
         "lodash": "^4.17.15",
-        "mapbox-gl": "^0.53.0",
+        "mapbox-gl": "^2.4.0",
         "moment": "^2.20.1",
         "mousetrap": "^1.6.1",
         "prop-types": "^15.6.0",
         "react-bootstrap-slider": "2.1.5",
-        "react-map-gl": "^4.0.10",
+        "react-map-gl": "^6.1.16",
         "underscore": "^1.8.3",
         "urijs": "^1.18.10",
         "xss": "^1.0.6"
+      },
+      "dependencies": {
+        "@mapbox/geojson-rewind": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.1.tgz",
+          "integrity": "sha512-eL7fMmfTBKjrb+VFHXCGv9Ot0zc3C0U+CwXo1IrP+EPwDczLoXv34Tgq3y+2mPSFNVUXgU42ILWJTC7145KPTA==",
+          "requires": {
+            "get-stream": "^6.0.1",
+            "minimist": "^1.2.5"
+          }
+        },
+        "@mapbox/mapbox-gl-supported": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.0.tgz",
+          "integrity": "sha512-zu4udqYiBrKMQKwpKJ4hhPON7tz0QR/JZ3iGpHnNWFmH3Sv/ysxlICATUtGCFpsyJf2v1WpFhlzaZ3GhhKmPMA=="
+        },
+        "d3-scale": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz",
+          "integrity": "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==",
+          "requires": {
+            "d3-array": "^2.3.0",
+            "d3-format": "1 - 2",
+            "d3-interpolate": "1.2.0 - 2",
+            "d3-time": "^2.1.1",
+            "d3-time-format": "2 - 3"
+          },
+          "dependencies": {
+            "d3-array": {
+              "version": "2.12.1",
+              "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
+              "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
+              "requires": {
+                "internmap": "^1.0.0"
+              }
+            }
+          }
+        },
+        "d3-time": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz",
+          "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==",
+          "requires": {
+            "d3-array": "2"
+          },
+          "dependencies": {
+            "d3-array": {
+              "version": "2.12.1",
+              "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
+              "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
+              "requires": {
+                "internmap": "^1.0.0"
+              }
+            }
+          }
+        },
+        "get-stream": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
+        },
+        "mapbox-gl": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-2.4.0.tgz",
+          "integrity": "sha512-oH5fkh209U2Zqvgs1bBS+SQVhrj8rUT9OTgZmg+20GaNthDJFYDCXvGidVAkgacuCHSIALTZKzMV1DFgO+isFQ==",
+          "requires": {
+            "@mapbox/geojson-rewind": "^0.5.0",
+            "@mapbox/geojson-types": "^1.0.2",
+            "@mapbox/jsonlint-lines-primitives": "^2.0.2",
+            "@mapbox/mapbox-gl-supported": "^2.0.0",
+            "@mapbox/point-geometry": "^0.1.0",
+            "@mapbox/tiny-sdf": "^1.2.5",
+            "@mapbox/unitbezier": "^0.0.0",
+            "@mapbox/vector-tile": "^1.3.1",
+            "@mapbox/whoots-js": "^3.1.0",
+            "csscolorparser": "~1.0.3",
+            "earcut": "^2.2.2",
+            "geojson-vt": "^3.2.1",
+            "gl-matrix": "^3.3.0",
+            "grid-index": "^1.1.0",
+            "minimist": "^1.2.5",
+            "murmurhash-js": "^1.0.0",
+            "pbf": "^3.2.1",
+            "potpack": "^1.0.1",
+            "quickselect": "^2.0.0",
+            "rw": "^1.3.3",
+            "supercluster": "^7.1.3",
+            "tinyqueue": "^2.0.3",
+            "vt-pbf": "^3.1.1"
+          }
+        },
+        "react-map-gl": {
+          "version": "6.1.16",
+          "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-6.1.16.tgz",
+          "integrity": "sha512-d/4kFMMh2hDeZNeQOUm2wC1/as9q93EZiDmM5mGBx0LIch+9pTFgO6ZINIuUD9Zz4JqWGpthyjoKr3QKgrGiRA==",
+          "requires": {
+            "@babel/runtime": "^7.0.0",
+            "@types/geojson": "^7946.0.7",
+            "@types/mapbox-gl": "^2.0.3",
+            "mapbox-gl": "^2.3.0",
+            "mjolnir.js": "^2.5.0",
+            "prop-types": "^15.7.2",
+            "resize-observer-polyfill": "^1.5.1",
+            "viewport-mercator-project": "^7.0.3"
+          }
+        },
+        "supercluster": {
+          "version": "7.1.3",
+          "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.3.tgz",
+          "integrity": "sha512-7+bR4FbF5SYsmkHfDp61QiwCKtwNDyPsddk9TzfsDA5DQr5Goii5CVD2SXjglweFCxjrzVZf945ahqYfUIk8UA==",
+          "requires": {
+            "kdbush": "^3.0.0"
+          }
+        },
+        "viewport-mercator-project": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/viewport-mercator-project/-/viewport-mercator-project-7.0.3.tgz",
+          "integrity": "sha512-5nSgVK8jKTSKzOvsa8TSSd2IeQCpHfSNiBOOOMQLvzlxgWD0YoF4xRmyZio3GaLtKSE+50UB892X3R1SAMbaww==",
+          "requires": {
+            "@math.gl/web-mercator": "^3.4.3"
+          }
+        }
       }
     },
     "@superset-ui/legacy-preset-chart-nvd3": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-nvd3/-/legacy-preset-chart-nvd3-0.17.53.tgz",
-      "integrity": "sha512-wTbQRCZDrnb16tLJzXYbIiCFbHddRJ3fo5DKsbv6MFNrfOLWWx1SjAZ5C60e57u33XpKdTE5jGpEuGdq7BZ55w==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-nvd3/-/legacy-preset-chart-nvd3-0.17.85.tgz",
+      "integrity": "sha512-KoC8kIqP6zwtGzXBUj6yMaF3Cz2TXygAe7ZCG5XeavgrjgKsWqOXAdQzJ9oBrCPXPQBC5hF7TruBB/Xd839TDA==",
       "requires": {
         "@data-ui/xy-chart": "^0.0.84",
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "d3": "^3.5.17",
         "d3-tip": "^0.9.1",
         "dompurify": "^2.0.6",
@@ -66826,36 +62116,37 @@
       }
     },
     "@superset-ui/plugin-chart-echarts": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-echarts/-/plugin-chart-echarts-0.17.53.tgz",
-      "integrity": "sha512-XXKqhr2CwZfi02qW55d9SQnNmdewTsAJT6xePBjci0SXAZRmi/T8vRbq2OCDJ7mQ0de7kjVBydAuOEEU/Y554A==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-echarts/-/plugin-chart-echarts-0.17.85.tgz",
+      "integrity": "sha512-dAqRzVVm7Shn2fgKoj2puX0jefe2r14dOQThJ8CG/hRlpmXsKmLnSywwLvQVxq1oUhh+uQYsemdYBCsrQAuxcg==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "@types/mathjs": "^6.0.7",
         "d3-array": "^1.2.0",
-        "echarts": "^5.1.1",
+        "echarts": "^5.1.2",
         "lodash": "^4.17.15",
         "mathjs": "^8.0.1"
       }
     },
     "@superset-ui/plugin-chart-pivot-table": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-pivot-table/-/plugin-chart-pivot-table-0.17.53.tgz",
-      "integrity": "sha512-18CTaM1sRgK5laFwHlKV+1A7+l9YWwPAvb7XrMjS8CQq0T2aEqNSQm7KWByG+LEj2x86idM8gaWghNes27yVtQ==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-pivot-table/-/plugin-chart-pivot-table-0.17.85.tgz",
+      "integrity": "sha512-tTU79c/C7g5sdZxRNVcl6QFbwqhsv0Bi/XeYOwhTNAe7qf7LmkvwQB78fvh7WW+U2FBltkhHmOxOb/HIJscXVg==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
-        "@superset-ui/react-pivottable": "^0.12.8"
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
+        "@superset-ui/react-pivottable": "^0.12.12"
       }
     },
     "@superset-ui/plugin-chart-table": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-table/-/plugin-chart-table-0.17.53.tgz",
-      "integrity": "sha512-PSeL/zQSTvQyztjUMMm4U4G6oEM3xk3wkC4HTpuLEpjQ7qyGme39M1JeCGvNG4pPZRm0nO4pU+0U/36oR0lAjw==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-table/-/plugin-chart-table-0.17.85.tgz",
+      "integrity": "sha512-RGeIGAQuiiOy6JgpnQC+rtVDWR8jGZF1DOER+WkgbfTeKiRmVGyo7wOSb7dvQlsaitUg2Y30962arOGeEcgvpA==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@react-icons/all-files": "^4.1.0",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "@types/d3-array": "^2.9.0",
         "@types/react-table": "^7.0.29",
         "d3-array": "^2.4.0",
@@ -66877,12 +62168,12 @@
       }
     },
     "@superset-ui/plugin-chart-word-cloud": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.17.53.tgz",
-      "integrity": "sha512-lQTr9UpeoGgX1B0SkjrvtL0zjgYVoJbm6RVv8ELG+efCG1oYAoIVgw2sahJI4zLqNiHcNeWqHUcu7NK06uc4mA==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.17.85.tgz",
+      "integrity": "sha512-nCbmndNxUoHWkYRCARD1C4XjzxXtk/OkCUVdB3EKaPNWbi0QuQHUuAZUh3ROIewxd3KAMoSUYRIjTVYDbetnJQ==",
       "requires": {
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "@types/d3-cloud": "^1.2.1",
         "@types/d3-scale": "^2.0.2",
         "d3-cloud": "^1.2.5",
@@ -66913,14 +62204,14 @@
       }
     },
     "@superset-ui/preset-chart-xy": {
-      "version": "0.17.53",
-      "resolved": "https://registry.npmjs.org/@superset-ui/preset-chart-xy/-/preset-chart-xy-0.17.53.tgz",
-      "integrity": "sha512-nmqif4Zd7Tdx4hLoDiiRiNFUFn1kliumjp9RQK68eMaefWcl1vTMT7nPmyFvgUH5390HJygpC3up50+j5Bngkg==",
+      "version": "0.17.85",
+      "resolved": "https://registry.npmjs.org/@superset-ui/preset-chart-xy/-/preset-chart-xy-0.17.85.tgz",
+      "integrity": "sha512-Cd2Ji1trP6aHuOfHK0GDza8iQUVkJNbtIFSReb240ViewICH/7mtsrj8jLAvf3tyOORLD3AW2j8s68UDCrBi6g==",
       "requires": {
         "@data-ui/theme": "^0.0.84",
         "@data-ui/xy-chart": "^0.0.84",
-        "@superset-ui/chart-controls": "0.17.53",
-        "@superset-ui/core": "0.17.53",
+        "@superset-ui/chart-controls": "0.17.85",
+        "@superset-ui/core": "0.17.81",
         "@vx/axis": "^0.0.198",
         "@vx/legend": "^0.0.198",
         "@vx/scale": "^0.0.197",
@@ -67039,9 +62330,9 @@
       }
     },
     "@superset-ui/react-pivottable": {
-      "version": "0.12.8",
-      "resolved": "https://registry.npmjs.org/@superset-ui/react-pivottable/-/react-pivottable-0.12.8.tgz",
-      "integrity": "sha512-7DRxX/w1uSQE1pibSe64t1o+fmiP7ZWT2FJkjK510bSJm8NUIPCXtmpK+NKtNZuCteE9sqE7bQxd54SSq2xWKw==",
+      "version": "0.12.12",
+      "resolved": "https://registry.npmjs.org/@superset-ui/react-pivottable/-/react-pivottable-0.12.12.tgz",
+      "integrity": "sha512-4+wx2kQy3IRKoWHTf2bIkXjlzDA0u/eN2k0FfLfJ5bdER2GuqZErWuKtiZzARsn5kSS9hPIrvt77uv52R3FnfQ==",
       "requires": {
         "immutability-helper": "^3.1.1",
         "prop-types": "^15.7.2",
@@ -67093,15 +62384,15 @@
       "dev": true
     },
     "@svgr/babel-plugin-transform-svg-component": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.4.0.tgz",
-      "integrity": "sha512-zLl4Fl3NvKxxjWNkqEcpdSOpQ3LGVH2BNFQ6vjaK6sFo2IrSznrhURIPI0HAphKiiIwNYjAfE0TNoQDSZv0U9A==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz",
+      "integrity": "sha512-q4jSH1UUvbrsOtlo/tKcgSeiCHRSBdXoIoqX1pgcKK/aU3JD27wmMKwGtpB8qRYUYoyXvfGxUVKchLuR5pB3rQ==",
       "dev": true
     },
     "@svgr/babel-preset": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.4.0.tgz",
-      "integrity": "sha512-Gyx7cCxua04DBtyILTYdQxeO/pwfTBev6+eXTbVbxe4HTGhOUW6yo7PSbG2p6eJMl44j6XSequ0ZDP7bl0nu9A==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.5.0.tgz",
+      "integrity": "sha512-4FiXBjvQ+z2j7yASeGPEi8VD/5rrGQk4Xrq3EdJmoZgz/tpqChpo5hgXDvmEauwtvOc52q8ghhZK4Oy7qph4ig==",
       "dev": true,
       "requires": {
         "@svgr/babel-plugin-add-jsx-attribute": "^5.4.0",
@@ -67111,43 +62402,43 @@
         "@svgr/babel-plugin-svg-dynamic-title": "^5.4.0",
         "@svgr/babel-plugin-svg-em-dimensions": "^5.4.0",
         "@svgr/babel-plugin-transform-react-native-svg": "^5.4.0",
-        "@svgr/babel-plugin-transform-svg-component": "^5.4.0"
+        "@svgr/babel-plugin-transform-svg-component": "^5.5.0"
       }
     },
     "@svgr/core": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/core/-/core-5.4.0.tgz",
-      "integrity": "sha512-hWGm1DCCvd4IEn7VgDUHYiC597lUYhFau2lwJBYpQWDirYLkX4OsXu9IslPgJ9UpP7wsw3n2Ffv9sW7SXJVfqQ==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/core/-/core-5.5.0.tgz",
+      "integrity": "sha512-q52VOcsJPvV3jO1wkPtzTuKlvX7Y3xIcWRpCMtBF3MrteZJtBfQw/+u0B1BHy5ColpQc1/YVTrPEtSYIMNZlrQ==",
       "dev": true,
       "requires": {
-        "@svgr/plugin-jsx": "^5.4.0",
-        "camelcase": "^6.0.0",
-        "cosmiconfig": "^6.0.0"
+        "@svgr/plugin-jsx": "^5.5.0",
+        "camelcase": "^6.2.0",
+        "cosmiconfig": "^7.0.0"
       },
       "dependencies": {
         "camelcase": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
-          "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
           "dev": true
         },
         "cosmiconfig": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-          "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
+          "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
           "dev": true,
           "requires": {
             "@types/parse-json": "^4.0.0",
-            "import-fresh": "^3.1.0",
+            "import-fresh": "^3.2.1",
             "parse-json": "^5.0.0",
             "path-type": "^4.0.0",
-            "yaml": "^1.7.2"
+            "yaml": "^1.10.0"
           }
         },
         "import-fresh": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-          "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+          "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
           "dev": true,
           "requires": {
             "parent-module": "^1.0.0",
@@ -67155,14 +62446,14 @@
           }
         },
         "parse-json": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
-          "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+          "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
           "dev": true,
           "requires": {
             "@babel/code-frame": "^7.0.0",
             "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1",
+            "json-parse-even-better-errors": "^2.3.0",
             "lines-and-columns": "^1.1.6"
           }
         },
@@ -67175,54 +62466,60 @@
       }
     },
     "@svgr/hast-util-to-babel-ast": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.4.0.tgz",
-      "integrity": "sha512-+U0TZZpPsP2V1WvVhqAOSTk+N+CjYHdZx+x9UBa1eeeZDXwH8pt0CrQf2+SvRl/h2CAPRFkm+Ey96+jKP8Bsgg==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz",
+      "integrity": "sha512-cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.9.5"
+        "@babel/types": "^7.12.6"
       }
     },
     "@svgr/plugin-jsx": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.4.0.tgz",
-      "integrity": "sha512-SGzO4JZQ2HvGRKDzRga9YFSqOqaNrgLlQVaGvpZ2Iht2gwRp/tq+18Pvv9kS9ZqOMYgyix2LLxZMY1LOe9NPqw==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz",
+      "integrity": "sha512-V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.7.5",
-        "@svgr/babel-preset": "^5.4.0",
-        "@svgr/hast-util-to-babel-ast": "^5.4.0",
+        "@babel/core": "^7.12.3",
+        "@svgr/babel-preset": "^5.5.0",
+        "@svgr/hast-util-to-babel-ast": "^5.5.0",
         "svg-parser": "^2.0.2"
       }
     },
     "@svgr/plugin-svgo": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.4.0.tgz",
-      "integrity": "sha512-3Cgv3aYi1l6SHyzArV9C36yo4kgwVdF3zPQUC6/aCDUeXAofDYwE5kk3e3oT5ZO2a0N3lB+lLGvipBG6lnG8EA==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz",
+      "integrity": "sha512-r5swKk46GuQl4RrVejVwpeeJaydoxkdwkM1mBKOgJLBUJPGaLci6ylg/IjhrRsREKDkr4kbMWdgOtbXEh0fyLQ==",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^6.0.0",
-        "merge-deep": "^3.0.2",
+        "cosmiconfig": "^7.0.0",
+        "deepmerge": "^4.2.2",
         "svgo": "^1.2.2"
       },
       "dependencies": {
         "cosmiconfig": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-          "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
+          "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
           "dev": true,
           "requires": {
             "@types/parse-json": "^4.0.0",
-            "import-fresh": "^3.1.0",
+            "import-fresh": "^3.2.1",
             "parse-json": "^5.0.0",
             "path-type": "^4.0.0",
-            "yaml": "^1.7.2"
+            "yaml": "^1.10.0"
           }
         },
+        "deepmerge": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+          "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+          "dev": true
+        },
         "import-fresh": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-          "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+          "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
           "dev": true,
           "requires": {
             "parent-module": "^1.0.0",
@@ -67230,14 +62527,14 @@
           }
         },
         "parse-json": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
-          "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+          "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
           "dev": true,
           "requires": {
             "@babel/code-frame": "^7.0.0",
             "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1",
+            "json-parse-even-better-errors": "^2.3.0",
             "lines-and-columns": "^1.1.6"
           }
         },
@@ -67250,735 +62547,21 @@
       }
     },
     "@svgr/webpack": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-5.4.0.tgz",
-      "integrity": "sha512-LjepnS/BSAvelnOnnzr6Gg0GcpLmnZ9ThGFK5WJtm1xOqdBE/1IACZU7MMdVzjyUkfFqGz87eRE4hFaSLiUwYg==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-5.5.0.tgz",
+      "integrity": "sha512-DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.9.0",
-        "@babel/plugin-transform-react-constant-elements": "^7.9.0",
-        "@babel/preset-env": "^7.9.5",
-        "@babel/preset-react": "^7.9.4",
-        "@svgr/core": "^5.4.0",
-        "@svgr/plugin-jsx": "^5.4.0",
-        "@svgr/plugin-svgo": "^5.4.0",
+        "@babel/core": "^7.12.3",
+        "@babel/plugin-transform-react-constant-elements": "^7.12.1",
+        "@babel/preset-env": "^7.12.1",
+        "@babel/preset-react": "^7.12.5",
+        "@svgr/core": "^5.5.0",
+        "@svgr/plugin-jsx": "^5.5.0",
+        "@svgr/plugin-svgo": "^5.5.0",
         "loader-utils": "^2.0.0"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.1"
-          }
-        },
-        "@babel/compat-data": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.1.tgz",
-          "integrity": "sha512-CHvCj7So7iCkGKPRFUfryXIkU2gSBw7VSZFYLsqVhrS47269VK2Hfi9S/YcublPMW8k1u2bQBlbDruoQEm4fgw==",
-          "dev": true,
-          "requires": {
-            "browserslist": "^4.12.0",
-            "invariant": "^2.2.4",
-            "semver": "^5.5.0"
-          }
-        },
-        "@babel/core": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.2.tgz",
-          "integrity": "sha512-KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.1",
-            "@babel/generator": "^7.10.2",
-            "@babel/helper-module-transforms": "^7.10.1",
-            "@babel/helpers": "^7.10.1",
-            "@babel/parser": "^7.10.2",
-            "@babel/template": "^7.10.1",
-            "@babel/traverse": "^7.10.1",
-            "@babel/types": "^7.10.2",
-            "convert-source-map": "^1.7.0",
-            "debug": "^4.1.0",
-            "gensync": "^1.0.0-beta.1",
-            "json5": "^2.1.2",
-            "lodash": "^4.17.13",
-            "resolve": "^1.3.2",
-            "semver": "^5.4.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-builder-react-jsx": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.1.tgz",
-          "integrity": "sha512-KXzzpyWhXgzjXIlJU1ZjIXzUPdej1suE6vzqgImZ/cpAsR/CC8gUcX4EWRmDfWz/cs6HOCPMBIJ3nKoXt3BFuw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-annotate-as-pure": "^7.10.1",
-            "@babel/types": "^7.10.1"
-          }
-        },
-        "@babel/helper-compilation-targets": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz",
-          "integrity": "sha512-hYgOhF4To2UTB4LTaZepN/4Pl9LD4gfbJx8A34mqoluT8TLbof1mhUlYuNWTEebONa8+UlCC4X0TEXu7AOUyGA==",
-          "dev": true,
-          "requires": {
-            "@babel/compat-data": "^7.10.1",
-            "browserslist": "^4.12.0",
-            "invariant": "^2.2.4",
-            "levenary": "^1.1.1",
-            "semver": "^5.5.0"
-          }
-        },
-        "@babel/helper-create-class-features-plugin": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz",
-          "integrity": "sha512-5C/QhkGFh1vqcziq1vAL6SI9ymzUp8BCYjFpvYVhWP4DlATIb3u5q3iUd35mvlyGs8fO7hckkW7i0tmH+5+bvQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-function-name": "^7.10.1",
-            "@babel/helper-member-expression-to-functions": "^7.10.1",
-            "@babel/helper-optimise-call-expression": "^7.10.1",
-            "@babel/helper-plugin-utils": "^7.10.1",
-            "@babel/helper-replace-supers": "^7.10.1",
-            "@babel/helper-split-export-declaration": "^7.10.1"
-          }
-        },
-        "@babel/helper-create-regexp-features-plugin": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz",
-          "integrity": "sha512-Rx4rHS0pVuJn5pJOqaqcZR4XSgeF9G/pO/79t+4r7380tXFJdzImFnxMU19f83wjSrmKHq6myrM10pFHTGzkUA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-annotate-as-pure": "^7.10.1",
-            "@babel/helper-regex": "^7.10.1",
-            "regexpu-core": "^4.7.0"
-          }
-        },
-        "@babel/helper-hoist-variables": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz",
-          "integrity": "sha512-vLm5srkU8rI6X3+aQ1rQJyfjvCBLXP8cAGeuw04zeAM2ItKb1e7pmVmLyHb4sDaAYnLL13RHOZPLEtcGZ5xvjg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.1"
-          }
-        },
-        "@babel/helper-module-transforms": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz",
-          "integrity": "sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-module-imports": "^7.10.1",
-            "@babel/helper-replace-supers": "^7.10.1",
-            "@babel/helper-simple-access": "^7.10.1",
-            "@babel/helper-split-export-declaration": "^7.10.1",
-            "@babel/template": "^7.10.1",
-            "@babel/types": "^7.10.1",
-            "lodash": "^4.17.13"
-          }
-        },
-        "@babel/helper-regex": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.1.tgz",
-          "integrity": "sha512-7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g==",
-          "dev": true,
-          "requires": {
-            "lodash": "^4.17.13"
-          }
-        },
-        "@babel/helper-remap-async-to-generator": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz",
-          "integrity": "sha512-RfX1P8HqsfgmJ6CwaXGKMAqbYdlleqglvVtht0HGPMSsy2V6MqLlOJVF/0Qyb/m2ZCi2z3q3+s6Pv7R/dQuZ6A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-annotate-as-pure": "^7.10.1",
-            "@babel/helper-wrap-function": "^7.10.1",
-            "@babel/template": "^7.10.1",
-            "@babel/traverse": "^7.10.1",
-            "@babel/types": "^7.10.1"
-          }
-        },
-        "@babel/helper-simple-access": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz",
-          "integrity": "sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.10.1",
-            "@babel/types": "^7.10.1"
-          }
-        },
-        "@babel/helper-wrap-function": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz",
-          "integrity": "sha512-C0MzRGteVDn+H32/ZgbAv5r56f2o1fZSA/rj/TYo8JEJNHg+9BdSmKBUND0shxWRztWhjlT2cvHYuynpPsVJwQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-function-name": "^7.10.1",
-            "@babel/template": "^7.10.1",
-            "@babel/traverse": "^7.10.1",
-            "@babel/types": "^7.10.1"
-          }
-        },
-        "@babel/helpers": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz",
-          "integrity": "sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.10.1",
-            "@babel/traverse": "^7.10.1",
-            "@babel/types": "^7.10.1"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-          "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.1",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/plugin-proposal-async-generator-functions": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz",
-          "integrity": "sha512-vzZE12ZTdB336POZjmpblWfNNRpMSua45EYnRigE2XsZxcXcIyly2ixnTJasJE4Zq3U7t2d8rRF7XRUuzHxbOw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1",
-            "@babel/helper-remap-async-to-generator": "^7.10.1",
-            "@babel/plugin-syntax-async-generators": "^7.8.0"
-          }
-        },
-        "@babel/plugin-proposal-class-properties": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.1.tgz",
-          "integrity": "sha512-sqdGWgoXlnOdgMXU+9MbhzwFRgxVLeiGBqTrnuS7LC2IBU31wSsESbTUreT2O418obpfPdGUR2GbEufZF1bpqw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-create-class-features-plugin": "^7.10.1",
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/plugin-proposal-dynamic-import": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz",
-          "integrity": "sha512-Cpc2yUVHTEGPlmiQzXj026kqwjEQAD9I4ZC16uzdbgWgitg/UHKHLffKNCQZ5+y8jpIZPJcKcwsr2HwPh+w3XA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1",
-            "@babel/plugin-syntax-dynamic-import": "^7.8.0"
-          }
-        },
-        "@babel/plugin-proposal-json-strings": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz",
-          "integrity": "sha512-m8r5BmV+ZLpWPtMY2mOKN7wre6HIO4gfIiV+eOmsnZABNenrt/kzYBwrh+KOfgumSWpnlGs5F70J8afYMSJMBg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1",
-            "@babel/plugin-syntax-json-strings": "^7.8.0"
-          }
-        },
-        "@babel/plugin-proposal-nullish-coalescing-operator": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz",
-          "integrity": "sha512-56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1",
-            "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
-          }
-        },
-        "@babel/plugin-proposal-optional-catch-binding": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz",
-          "integrity": "sha512-VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1",
-            "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
-          }
-        },
-        "@babel/plugin-proposal-optional-chaining": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz",
-          "integrity": "sha512-dqQj475q8+/avvok72CF3AOSV/SGEcH29zT5hhohqqvvZ2+boQoOr7iGldBG5YXTO2qgCgc2B3WvVLUdbeMlGA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1",
-            "@babel/plugin-syntax-optional-chaining": "^7.8.0"
-          }
-        },
-        "@babel/plugin-proposal-unicode-property-regex": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz",
-          "integrity": "sha512-JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/plugin-syntax-top-level-await": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz",
-          "integrity": "sha512-hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-arrow-functions": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz",
-          "integrity": "sha512-6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-async-to-generator": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz",
-          "integrity": "sha512-XCgYjJ8TY2slj6SReBUyamJn3k2JLUIiiR5b6t1mNCMSvv7yx+jJpaewakikp0uWFQSF7ChPPoe3dHmXLpISkg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-module-imports": "^7.10.1",
-            "@babel/helper-plugin-utils": "^7.10.1",
-            "@babel/helper-remap-async-to-generator": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-block-scoped-functions": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz",
-          "integrity": "sha512-B7K15Xp8lv0sOJrdVAoukKlxP9N59HS48V1J3U/JGj+Ad+MHq+am6xJVs85AgXrQn4LV8vaYFOB+pr/yIuzW8Q==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-block-scoping": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz",
-          "integrity": "sha512-8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1",
-            "lodash": "^4.17.13"
-          }
-        },
-        "@babel/plugin-transform-computed-properties": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz",
-          "integrity": "sha512-mqSrGjp3IefMsXIenBfGcPXxJxweQe2hEIwMQvjtiDQ9b1IBvDUjkAtV/HMXX47/vXf14qDNedXsIiNd1FmkaQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-destructuring": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz",
-          "integrity": "sha512-V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-dotall-regex": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz",
-          "integrity": "sha512-19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-duplicate-keys": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz",
-          "integrity": "sha512-wIEpkX4QvX8Mo9W6XF3EdGttrIPZWozHfEaDTU0WJD/TDnXMvdDh30mzUl/9qWhnf7naicYartcEfUghTCSNpA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-for-of": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz",
-          "integrity": "sha512-US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-function-name": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz",
-          "integrity": "sha512-//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-function-name": "^7.10.1",
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-literals": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz",
-          "integrity": "sha512-qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-modules-amd": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz",
-          "integrity": "sha512-31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-module-transforms": "^7.10.1",
-            "@babel/helper-plugin-utils": "^7.10.1",
-            "babel-plugin-dynamic-import-node": "^2.3.3"
-          }
-        },
-        "@babel/plugin-transform-modules-commonjs": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz",
-          "integrity": "sha512-AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-module-transforms": "^7.10.1",
-            "@babel/helper-plugin-utils": "^7.10.1",
-            "@babel/helper-simple-access": "^7.10.1",
-            "babel-plugin-dynamic-import-node": "^2.3.3"
-          }
-        },
-        "@babel/plugin-transform-modules-systemjs": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz",
-          "integrity": "sha512-ewNKcj1TQZDL3YnO85qh9zo1YF1CHgmSTlRQgHqe63oTrMI85cthKtZjAiZSsSNjPQ5NCaYo5QkbYqEw1ZBgZA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-hoist-variables": "^7.10.1",
-            "@babel/helper-module-transforms": "^7.10.1",
-            "@babel/helper-plugin-utils": "^7.10.1",
-            "babel-plugin-dynamic-import-node": "^2.3.3"
-          }
-        },
-        "@babel/plugin-transform-modules-umd": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz",
-          "integrity": "sha512-EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-module-transforms": "^7.10.1",
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-new-target": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz",
-          "integrity": "sha512-MBlzPc1nJvbmO9rPr1fQwXOM2iGut+JC92ku6PbiJMMK7SnQc1rytgpopveE3Evn47gzvGYeCdgfCDbZo0ecUw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-object-super": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz",
-          "integrity": "sha512-WnnStUDN5GL+wGQrJylrnnVlFhFmeArINIR9gjhSeYyvroGhBrSAXYg/RHsnfzmsa+onJrTJrEClPzgNmmQ4Gw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1",
-            "@babel/helper-replace-supers": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-parameters": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz",
-          "integrity": "sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.10.1",
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-react-display-name": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.1.tgz",
-          "integrity": "sha512-rBjKcVwjk26H3VX8pavMxGf33LNlbocMHdSeldIEswtQ/hrjyTG8fKKILW1cSkODyRovckN/uZlGb2+sAV9JUQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-react-jsx": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.1.tgz",
-          "integrity": "sha512-MBVworWiSRBap3Vs39eHt+6pJuLUAaK4oxGc8g+wY+vuSJvLiEQjW1LSTqKb8OUPtDvHCkdPhk7d6sjC19xyFw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-builder-react-jsx": "^7.10.1",
-            "@babel/helper-builder-react-jsx-experimental": "^7.10.1",
-            "@babel/helper-plugin-utils": "^7.10.1",
-            "@babel/plugin-syntax-jsx": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-react-jsx-self": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.1.tgz",
-          "integrity": "sha512-4p+RBw9d1qV4S749J42ZooeQaBomFPrSxa9JONLHJ1TxCBo3TzJ79vtmG2S2erUT8PDDrPdw4ZbXGr2/1+dILA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1",
-            "@babel/plugin-syntax-jsx": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-react-jsx-source": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.1.tgz",
-          "integrity": "sha512-neAbaKkoiL+LXYbGDvh6PjPG+YeA67OsZlE78u50xbWh2L1/C81uHiNP5d1fw+uqUIoiNdCC8ZB+G4Zh3hShJA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1",
-            "@babel/plugin-syntax-jsx": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-regenerator": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz",
-          "integrity": "sha512-B3+Y2prScgJ2Bh/2l9LJxKbb8C8kRfsG4AdPT+n7ixBHIxJaIG8bi8tgjxUMege1+WqSJ+7gu1YeoMVO3gPWzw==",
-          "dev": true,
-          "requires": {
-            "regenerator-transform": "^0.14.2"
-          }
-        },
-        "@babel/plugin-transform-reserved-words": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz",
-          "integrity": "sha512-qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-shorthand-properties": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz",
-          "integrity": "sha512-AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-spread": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz",
-          "integrity": "sha512-8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-sticky-regex": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz",
-          "integrity": "sha512-j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1",
-            "@babel/helper-regex": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-typeof-symbol": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz",
-          "integrity": "sha512-qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/plugin-transform-unicode-regex": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz",
-          "integrity": "sha512-Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-            "@babel/helper-plugin-utils": "^7.10.1"
-          }
-        },
-        "@babel/preset-env": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.2.tgz",
-          "integrity": "sha512-MjqhX0RZaEgK/KueRzh+3yPSk30oqDKJ5HP5tqTSB1e2gzGS3PLy7K0BIpnp78+0anFuSwOeuCf1zZO7RzRvEA==",
-          "dev": true,
-          "requires": {
-            "@babel/compat-data": "^7.10.1",
-            "@babel/helper-compilation-targets": "^7.10.2",
-            "@babel/helper-module-imports": "^7.10.1",
-            "@babel/helper-plugin-utils": "^7.10.1",
-            "@babel/plugin-proposal-async-generator-functions": "^7.10.1",
-            "@babel/plugin-proposal-class-properties": "^7.10.1",
-            "@babel/plugin-proposal-dynamic-import": "^7.10.1",
-            "@babel/plugin-proposal-json-strings": "^7.10.1",
-            "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.1",
-            "@babel/plugin-proposal-numeric-separator": "^7.10.1",
-            "@babel/plugin-proposal-object-rest-spread": "^7.10.1",
-            "@babel/plugin-proposal-optional-catch-binding": "^7.10.1",
-            "@babel/plugin-proposal-optional-chaining": "^7.10.1",
-            "@babel/plugin-proposal-private-methods": "^7.10.1",
-            "@babel/plugin-proposal-unicode-property-regex": "^7.10.1",
-            "@babel/plugin-syntax-async-generators": "^7.8.0",
-            "@babel/plugin-syntax-class-properties": "^7.10.1",
-            "@babel/plugin-syntax-dynamic-import": "^7.8.0",
-            "@babel/plugin-syntax-json-strings": "^7.8.0",
-            "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
-            "@babel/plugin-syntax-numeric-separator": "^7.10.1",
-            "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-            "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
-            "@babel/plugin-syntax-optional-chaining": "^7.8.0",
-            "@babel/plugin-syntax-top-level-await": "^7.10.1",
-            "@babel/plugin-transform-arrow-functions": "^7.10.1",
-            "@babel/plugin-transform-async-to-generator": "^7.10.1",
-            "@babel/plugin-transform-block-scoped-functions": "^7.10.1",
-            "@babel/plugin-transform-block-scoping": "^7.10.1",
-            "@babel/plugin-transform-classes": "^7.10.1",
-            "@babel/plugin-transform-computed-properties": "^7.10.1",
-            "@babel/plugin-transform-destructuring": "^7.10.1",
-            "@babel/plugin-transform-dotall-regex": "^7.10.1",
-            "@babel/plugin-transform-duplicate-keys": "^7.10.1",
-            "@babel/plugin-transform-exponentiation-operator": "^7.10.1",
-            "@babel/plugin-transform-for-of": "^7.10.1",
-            "@babel/plugin-transform-function-name": "^7.10.1",
-            "@babel/plugin-transform-literals": "^7.10.1",
-            "@babel/plugin-transform-member-expression-literals": "^7.10.1",
-            "@babel/plugin-transform-modules-amd": "^7.10.1",
-            "@babel/plugin-transform-modules-commonjs": "^7.10.1",
-            "@babel/plugin-transform-modules-systemjs": "^7.10.1",
-            "@babel/plugin-transform-modules-umd": "^7.10.1",
-            "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
-            "@babel/plugin-transform-new-target": "^7.10.1",
-            "@babel/plugin-transform-object-super": "^7.10.1",
-            "@babel/plugin-transform-parameters": "^7.10.1",
-            "@babel/plugin-transform-property-literals": "^7.10.1",
-            "@babel/plugin-transform-regenerator": "^7.10.1",
-            "@babel/plugin-transform-reserved-words": "^7.10.1",
-            "@babel/plugin-transform-shorthand-properties": "^7.10.1",
-            "@babel/plugin-transform-spread": "^7.10.1",
-            "@babel/plugin-transform-sticky-regex": "^7.10.1",
-            "@babel/plugin-transform-template-literals": "^7.10.1",
-            "@babel/plugin-transform-typeof-symbol": "^7.10.1",
-            "@babel/plugin-transform-unicode-escapes": "^7.10.1",
-            "@babel/plugin-transform-unicode-regex": "^7.10.1",
-            "@babel/preset-modules": "^0.1.3",
-            "@babel/types": "^7.10.2",
-            "browserslist": "^4.12.0",
-            "core-js-compat": "^3.6.2",
-            "invariant": "^2.2.2",
-            "levenary": "^1.1.1",
-            "semver": "^5.5.0"
-          }
-        },
-        "@babel/preset-react": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.10.1.tgz",
-          "integrity": "sha512-Rw0SxQ7VKhObmFjD/cUcKhPTtzpeviEFX1E6PgP+cYOhQ98icNqtINNFANlsdbQHrmeWnqdxA4Tmnl1jy5tp3Q==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.10.1",
-            "@babel/plugin-transform-react-display-name": "^7.10.1",
-            "@babel/plugin-transform-react-jsx": "^7.10.1",
-            "@babel/plugin-transform-react-jsx-development": "^7.10.1",
-            "@babel/plugin-transform-react-jsx-self": "^7.10.1",
-            "@babel/plugin-transform-react-jsx-source": "^7.10.1",
-            "@babel/plugin-transform-react-pure-annotations": "^7.10.1"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "babel-plugin-dynamic-import-node": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-          "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-          "dev": true,
-          "requires": {
-            "object.assign": "^4.1.0"
-          }
-        },
-        "browserslist": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
-          "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30001043",
-            "electron-to-chromium": "^1.3.413",
-            "node-releases": "^1.1.53",
-            "pkg-up": "^2.0.0"
-          }
-        },
-        "caniuse-lite": {
-          "version": "1.0.30001084",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001084.tgz",
-          "integrity": "sha512-ftdc5oGmhEbLUuMZ/Qp3mOpzfZLCxPYKcvGv6v2dJJ+8EdqcvZRbAGOiLmkM/PV1QGta/uwBs8/nCl6sokDW6w==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "convert-source-map": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-          "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.1"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "electron-to-chromium": {
-          "version": "1.3.474",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.474.tgz",
-          "integrity": "sha512-fPkSgT9IBKmVJz02XioNsIpg0WYmkPrvU1lUJblMMJALxyE7/32NGvbJQKKxpNokozPvqfqkuUqVClYsvetcLw==",
-          "dev": true
-        },
         "emojis-list": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
@@ -68004,64 +62587,6 @@
             "emojis-list": "^3.0.0",
             "json5": "^2.1.2"
           }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "node-releases": {
-          "version": "1.1.58",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz",
-          "integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==",
-          "dev": true
-        },
-        "regexpu-core": {
-          "version": "4.7.0",
-          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
-          "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
-          "dev": true,
-          "requires": {
-            "regenerate": "^1.4.0",
-            "regenerate-unicode-properties": "^8.2.0",
-            "regjsgen": "^0.5.1",
-            "regjsparser": "^0.6.4",
-            "unicode-match-property-ecmascript": "^1.0.4",
-            "unicode-match-property-value-ecmascript": "^1.2.0"
-          }
-        },
-        "regjsgen": {
-          "version": "0.5.2",
-          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
-          "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
-          "dev": true
-        },
-        "regjsparser": {
-          "version": "0.6.4",
-          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
-          "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
-          "dev": true,
-          "requires": {
-            "jsesc": "~0.5.0"
-          },
-          "dependencies": {
-            "jsesc": {
-              "version": "0.5.0",
-              "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-              "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -68081,48 +62606,6 @@
         "pretty-format": "^26.6.2"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          },
-          "dependencies": {
-            "chalk": {
-              "version": "2.4.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-              "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^3.2.1",
-                "escape-string-regexp": "^1.0.5",
-                "supports-color": "^5.3.0"
-              }
-            }
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
         "chalk": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
@@ -68173,15 +62656,6 @@
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -68486,6 +62960,16 @@
       "integrity": "sha512-NCEfv49jmDsBAixjMjEHKVgmVQlJ+uK56FOc+2roYPExnXCZDpi6mJOHQ3v23BiO84hBDStND9R2itJr7PNoow==",
       "dev": true
     },
+    "@types/flatbuffers": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@types/flatbuffers/-/flatbuffers-1.10.0.tgz",
+      "integrity": "sha512-7btbphLrKvo5yl/5CC2OCxUSMx1wV1wvGT1qDXkSt7yi00/YW7E8k6qzXqJHsp+WU0eoG7r6MTQQXI9lIvd0qA=="
+    },
+    "@types/geojson": {
+      "version": "7946.0.8",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.8.tgz",
+      "integrity": "sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA=="
+    },
     "@types/glob": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
@@ -68627,6 +63111,14 @@
         "@types/lodash": "*"
       }
     },
+    "@types/mapbox-gl": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.4.0.tgz",
+      "integrity": "sha512-Na5vXw6Ez0L5To/+pL78dWPNoG6QlPdEDdnkSmIL5HWxemD+s0pTmTWDbMj7tcqJ2hnVyOyukVIveR9HPi7eeA==",
+      "requires": {
+        "@types/geojson": "*"
+      }
+    },
     "@types/markdown-to-jsx": {
       "version": "6.11.3",
       "resolved": "https://registry.npmjs.org/@types/markdown-to-jsx/-/markdown-to-jsx-6.11.3.tgz",
@@ -68669,9 +63161,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "10.12.15",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.15.tgz",
-      "integrity": "sha512-9kROxduaN98QghwwHmxXO2Xz3MaWf+I1sLVAA6KJDF5xix+IyXVhds0MAfdNwtcpSrzhaTsNB0/jnL86fgUhqA=="
+      "version": "15.12.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.4.tgz",
+      "integrity": "sha512-zrNj1+yqYF4WskCMOHwN+w9iuD12+dGm0rQ35HLl9/Ouuq52cEtd0CH9qMgrdNmi5ejC1/V7vKEXYubB+65DkA=="
     },
     "@types/node-fetch": {
       "version": "2.5.8",
@@ -69019,9 +63511,9 @@
       "integrity": "sha512-mE3eRK0fpTN/GnNBOIg2tGq2cFhchQXF6fCbrLxus75TgnoOECbdHikr948FGO/UAml7/ZhLMa5FbGkF5PKvmw=="
     },
     "@types/seedrandom": {
-      "version": "2.4.29",
-      "resolved": "https://registry.npmjs.org/@types/seedrandom/-/seedrandom-2.4.29.tgz",
-      "integrity": "sha512-nSjRNBaE9y5Zzv6CCwDWH6DVC0E+g8/1Nu7LOSntusxQaHZOv9GJ7rrnS5G1dSGd2k1Ovvg5+JJG6idjuGtpDA=="
+      "version": "2.4.30",
+      "resolved": "https://registry.npmjs.org/@types/seedrandom/-/seedrandom-2.4.30.tgz",
+      "integrity": "sha512-AnxLHewubLVzoF/A4qdxBGHCKifw8cY32iro3DQX9TPcetE95zBeVt3jnsvtvAUf1vwzMfwzp4t/L2yqPlnjkQ=="
     },
     "@types/shortid": {
       "version": "0.0.29",
@@ -69050,9 +63542,9 @@
       "dev": true
     },
     "@types/sortablejs": {
-      "version": "1.10.6",
-      "resolved": "https://registry.npmjs.org/@types/sortablejs/-/sortablejs-1.10.6.tgz",
-      "integrity": "sha512-QRz8Z+uw2Y4Gwrtxw8hD782zzuxxugdcq8X/FkPsXUa1kfslhGzy13+4HugO9FXNo+jlWVcE6DYmmegniIQ30A==",
+      "version": "1.10.7",
+      "resolved": "https://registry.npmjs.org/@types/sortablejs/-/sortablejs-1.10.7.tgz",
+      "integrity": "sha512-lGCwwgpj8zW/ZmaueoPVSP7nnc9t8VqVWXS+ASX3eoUUENmiazv0rlXyTRludXzuX9ALjPsMqBu85TgJNWbTOg==",
       "peer": true
     },
     "@types/source-list-map": {
@@ -69080,6 +63572,11 @@
         "@types/jest": "*"
       }
     },
+    "@types/text-encoding-utf-8": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@types/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz",
+      "integrity": "sha512-AQ6zewa0ucLJvtUi5HsErbOFKAcQfRLt9zFLlUOvcXBy2G36a+ZDpCHSGdzJVUD8aNURtIjh9aSjCStNMRCcRQ=="
+    },
     "@types/uglify-js": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.0.4.tgz",
@@ -70558,6 +65055,35 @@
         "normalize-path": "^2.1.1"
       }
     },
+    "apache-arrow": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/apache-arrow/-/apache-arrow-4.0.1.tgz",
+      "integrity": "sha512-DyF7GXCbSjsw4P5C8b+qW7OnJKa6w9mJI0mhV0+EfZbVZCmhfiF6ffqcnrI/kzBrRqn9hH/Ft9n5+m4DTbBJpg==",
+      "requires": {
+        "@types/flatbuffers": "^1.10.0",
+        "@types/node": "^14.14.37",
+        "@types/text-encoding-utf-8": "^1.0.1",
+        "command-line-args": "5.1.1",
+        "command-line-usage": "6.1.1",
+        "flatbuffers": "1.12.0",
+        "json-bignum": "^0.0.3",
+        "pad-left": "^2.1.0",
+        "text-encoding-utf-8": "^1.0.2",
+        "tslib": "^2.2.0"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "14.17.9",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.9.tgz",
+          "integrity": "sha512-CMjgRNsks27IDwI785YMY0KLt3co/c0cQ5foxHYv/shC2w8oOnVwz5Ubq1QG5KzrcW+AXk6gzdnxIkDnTvzu3g=="
+        },
+        "tslib": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+          "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+        }
+      }
+    },
     "aphrodite": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/aphrodite/-/aphrodite-1.2.5.tgz",
@@ -70638,6 +65164,11 @@
       "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
       "dev": true
     },
+    "array-back": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
+      "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q=="
+    },
     "array-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
@@ -73047,6 +67578,14 @@
         "redeyed": "~0.4.0"
       }
     },
+    "cartocolor": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/cartocolor/-/cartocolor-4.0.2.tgz",
+      "integrity": "sha512-+Gh9mb6lFxsDOLQlBLPxAHCnWXlg2W8q3AcVwqRcy95TdBbcOU89Wrb6h2Hd/6Ww1Kc1pzXmUdpnWD+xeCG0dg==",
+      "requires": {
+        "colorbrewer": "1.0.0"
+      }
+    },
     "case-sensitive-paths-webpack-plugin": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz",
@@ -73181,25 +67720,25 @@
           "dependencies": {
             "abbrev": {
               "version": "1.1.1",
-              "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "ansi-regex": {
               "version": "2.1.1",
-              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "aproba": {
               "version": "1.2.0",
-              "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "are-we-there-yet": {
               "version": "1.1.5",
-              "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73209,13 +67748,13 @@
             },
             "balanced-match": {
               "version": "1.0.0",
-              "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "brace-expansion": {
               "version": "1.1.11",
-              "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73223,38 +67762,39 @@
                 "concat-map": "0.0.1"
               }
             },
+            "chownr": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
             "code-point-at": {
               "version": "1.1.0",
-              "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-              "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
-              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-              "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "console-control-strings": {
               "version": "1.1.0",
-              "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-              "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-              "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "debug": {
               "version": "4.1.1",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-              "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73263,35 +67803,40 @@
             },
             "deep-extend": {
               "version": "0.6.0",
-              "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-              "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "delegates": {
               "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-              "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "detect-libc": {
               "version": "1.0.3",
-              "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
+            "fs-minipass": {
+              "version": "1.2.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.2.1"
+              }
+            },
             "fs.realpath": {
               "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-              "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "gauge": {
               "version": "2.7.4",
-              "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-              "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73307,8 +67852,7 @@
             },
             "glob": {
               "version": "7.1.3",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-              "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73322,15 +67866,13 @@
             },
             "has-unicode": {
               "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-              "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "iconv-lite": {
               "version": "0.4.24",
-              "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-              "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73339,8 +67881,7 @@
             },
             "ignore-walk": {
               "version": "3.0.1",
-              "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
-              "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73349,8 +67890,7 @@
             },
             "inflight": {
               "version": "1.0.6",
-              "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-              "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73360,15 +67900,19 @@
             },
             "inherits": {
               "version": "2.0.3",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-              "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "ini": {
+              "version": "1.3.5",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "is-fullwidth-code-point": {
               "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-              "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73377,15 +67921,13 @@
             },
             "isarray": {
               "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-              "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "minimatch": {
               "version": "3.0.4",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-              "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73393,22 +67935,48 @@
               }
             },
             "minimist": {
-              "version": "1.2.5",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-              "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+              "version": "0.0.8",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
+            "minipass": {
+              "version": "2.3.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            },
+            "minizlib": {
+              "version": "1.2.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.2.1"
+              }
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minimist": "0.0.8"
+              }
+            },
             "ms": {
               "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-              "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "needle": {
               "version": "2.3.0",
-              "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73419,7 +67987,7 @@
             },
             "node-pre-gyp": {
               "version": "0.12.0",
-              "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73437,7 +68005,7 @@
             },
             "nopt": {
               "version": "4.0.1",
-              "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73447,15 +68015,13 @@
             },
             "npm-bundled": {
               "version": "1.0.6",
-              "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
-              "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "npm-packlist": {
               "version": "1.4.1",
-              "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
-              "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73465,8 +68031,7 @@
             },
             "npmlog": {
               "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-              "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73478,22 +68043,19 @@
             },
             "number-is-nan": {
               "version": "1.0.1",
-              "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-              "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
-              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-              "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "once": {
               "version": "1.4.0",
-              "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-              "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73502,22 +68064,19 @@
             },
             "os-homedir": {
               "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-              "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "os-tmpdir": {
               "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-              "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "osenv": {
               "version": "0.1.5",
-              "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-              "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73527,21 +68086,19 @@
             },
             "path-is-absolute": {
               "version": "1.0.1",
-              "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-              "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "process-nextick-args": {
               "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-              "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "rc": {
               "version": "1.2.8",
-              "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73549,12 +68106,19 @@
                 "ini": "~1.3.0",
                 "minimist": "^1.2.0",
                 "strip-json-comments": "~2.0.1"
+              },
+              "dependencies": {
+                "minimist": {
+                  "version": "1.2.0",
+                  "bundled": true,
+                  "dev": true,
+                  "optional": true
+                }
               }
             },
             "readable-stream": {
               "version": "2.3.6",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-              "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73569,7 +68133,7 @@
             },
             "rimraf": {
               "version": "2.6.3",
-              "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73578,49 +68142,43 @@
             },
             "safe-buffer": {
               "version": "5.1.2",
-              "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-              "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "safer-buffer": {
               "version": "2.1.2",
-              "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-              "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "sax": {
               "version": "1.2.4",
-              "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-              "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "semver": {
               "version": "5.7.0",
-              "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "set-blocking": {
               "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-              "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "signal-exit": {
               "version": "3.0.2",
-              "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-              "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "string_decoder": {
               "version": "1.1.1",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-              "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73629,8 +68187,7 @@
             },
             "string-width": {
               "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73641,8 +68198,7 @@
             },
             "strip-ansi": {
               "version": "3.0.1",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-              "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73651,22 +68207,34 @@
             },
             "strip-json-comments": {
               "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-              "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
+            "tar": {
+              "version": "4.4.8",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "chownr": "^1.1.1",
+                "fs-minipass": "^1.2.5",
+                "minipass": "^2.3.4",
+                "minizlib": "^1.1.1",
+                "mkdirp": "^0.5.0",
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.2"
+              }
+            },
             "util-deprecate": {
               "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-              "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+              "bundled": true,
               "dev": true,
               "optional": true
             },
             "wide-align": {
               "version": "1.1.3",
-              "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-              "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+              "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
@@ -73675,8 +68243,13 @@
             },
             "wrappy": {
               "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-              "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "yallist": {
+              "version": "3.0.3",
+              "bundled": true,
               "dev": true,
               "optional": true
             }
@@ -73702,16 +68275,6 @@
               }
             }
           }
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
         }
       }
     },
@@ -73966,30 +68529,6 @@
       "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
       "dev": true
     },
-    "clone-deep": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
-      "integrity": "sha1-TnPdCen7lxzDhnDF3O2cGJZIHMY=",
-      "dev": true,
-      "requires": {
-        "for-own": "^0.1.3",
-        "is-plain-object": "^2.0.1",
-        "kind-of": "^3.0.2",
-        "lazy-cache": "^1.0.3",
-        "shallow-clone": "^0.1.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -74097,6 +68636,11 @@
         "simple-swizzle": "^0.2.2"
       }
     },
+    "colorbrewer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/colorbrewer/-/colorbrewer-1.0.0.tgz",
+      "integrity": "sha1-T5czO5abp2Ejgr5LwzlLNB+0yKI="
+    },
     "colorette": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz",
@@ -74127,6 +68671,66 @@
         "trim": "0.0.1"
       }
     },
+    "command-line-args": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz",
+      "integrity": "sha512-hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg==",
+      "requires": {
+        "array-back": "^3.0.1",
+        "find-replace": "^3.0.0",
+        "lodash.camelcase": "^4.3.0",
+        "typical": "^4.0.0"
+      }
+    },
+    "command-line-usage": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.1.tgz",
+      "integrity": "sha512-F59pEuAR9o1SF/bD0dQBDluhpT4jJQNWUHEuVBqpDmCUo6gPjCi+m9fCWnWZVR/oG6cMTUms4h+3NPl74wGXvA==",
+      "requires": {
+        "array-back": "^4.0.1",
+        "chalk": "^2.4.2",
+        "table-layout": "^1.0.1",
+        "typical": "^5.2.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "array-back": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz",
+          "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg=="
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
+        "typical": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz",
+          "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg=="
+        }
+      }
+    },
     "commander": {
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
@@ -74177,9 +68781,9 @@
       }
     },
     "compute-scroll-into-view": {
-      "version": "1.0.16",
-      "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.16.tgz",
-      "integrity": "sha512-a85LHKY81oQnikatZYA90pufpZ6sQx++BoCxOEMsjpZx+ZnaKGQnCyCehTRr/1p9GBIAHTjcU9k71kSYWloLiQ=="
+      "version": "1.0.17",
+      "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz",
+      "integrity": "sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg=="
     },
     "concat-map": {
       "version": "0.0.1",
@@ -74715,41 +69319,6 @@
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
       "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
     },
-    "core-js-compat": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.4.tgz",
-      "integrity": "sha512-zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.8.3",
-        "semver": "7.0.0"
-      },
-      "dependencies": {
-        "browserslist": {
-          "version": "4.9.1",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz",
-          "integrity": "sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30001030",
-            "electron-to-chromium": "^1.3.363",
-            "node-releases": "^1.1.50"
-          }
-        },
-        "caniuse-lite": {
-          "version": "1.0.30001035",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz",
-          "integrity": "sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==",
-          "dev": true
-        },
-        "semver": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-          "dev": true
-        }
-      }
-    },
     "core-js-pure": {
       "version": "3.6.4",
       "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.4.tgz",
@@ -75542,9 +70111,9 @@
       "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A=="
     },
     "d3-color": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.2.3.tgz",
-      "integrity": "sha512-x37qq3ChOTLd26hnps36lexMRhNXEtVxZ4B25rL0DVdDsGQIJGB18S7y9XDwlDD6MD/ZBzITCf4JjGMM10TZkw=="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz",
+      "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="
     },
     "d3-dispatch": {
       "version": "1.0.6",
@@ -75862,19 +70431,21 @@
       "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw=="
     },
     "deck.gl": {
-      "version": "7.1.11",
-      "resolved": "https://registry.npmjs.org/deck.gl/-/deck.gl-7.1.11.tgz",
-      "integrity": "sha512-OUj9JE544N6Y/DCdfdnsbqKn9o72bWgRfsKhyi8aZ8v76hq7XyelmO2GljBmHGYmuMNVLrKcymNMV0m8EEgpZA==",
-      "requires": {
-        "@deck.gl/aggregation-layers": "7.1.11",
-        "@deck.gl/core": "7.1.11",
-        "@deck.gl/geo-layers": "7.1.11",
-        "@deck.gl/google-maps": "7.1.11",
-        "@deck.gl/json": "7.1.11",
-        "@deck.gl/layers": "7.1.11",
-        "@deck.gl/mapbox": "7.1.11",
-        "@deck.gl/mesh-layers": "7.1.11",
-        "@deck.gl/react": "7.1.11"
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/deck.gl/-/deck.gl-8.5.2.tgz",
+      "integrity": "sha512-tsEyv62Zzc+GT3By0Y1R2gqEJ8K3tGBDaLprAoeAsg7fvIa5ikFBdWEBFHa1UDbgE2UEmYbcBK/yK4GAL8Ia4A==",
+      "requires": {
+        "@deck.gl/aggregation-layers": "8.5.2",
+        "@deck.gl/carto": "8.5.2",
+        "@deck.gl/core": "8.5.2",
+        "@deck.gl/extensions": "8.5.2",
+        "@deck.gl/geo-layers": "8.5.2",
+        "@deck.gl/google-maps": "8.5.2",
+        "@deck.gl/json": "8.5.2",
+        "@deck.gl/layers": "8.5.2",
+        "@deck.gl/mapbox": "8.5.2",
+        "@deck.gl/mesh-layers": "8.5.2",
+        "@deck.gl/react": "8.5.2"
       }
     },
     "decode-uri-component": {
@@ -75931,6 +70502,11 @@
         }
       }
     },
+    "deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
+    },
     "deep-is": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
@@ -76175,6 +70751,16 @@
         "mathfn": "^1.0.0"
       }
     },
+    "dnd-core": {
+      "version": "11.1.3",
+      "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-11.1.3.tgz",
+      "integrity": "sha512-QugF55dNW+h+vzxVJ/LSJeTeUw9MCJ2cllhmVThVPEtF16ooBkxj0WBE5RB+AceFxMFo1rO6bJKXtqKl+JNnyA==",
+      "requires": {
+        "@react-dnd/asap": "^4.0.0",
+        "@react-dnd/invariant": "^2.0.0",
+        "redux": "^4.0.4"
+      }
+    },
     "dns-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
@@ -76378,6 +70964,11 @@
         }
       }
     },
+    "draco3d": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/draco3d/-/draco3d-1.4.1.tgz",
+      "integrity": "sha512-9Rxonc70xiovBC+Bq1h57SNZIHzWTibU1VfIGp5z3Xx8dPtv4yT5uGhiH7P5uvJRR2jkrvHafRxR7bTANkvfpg=="
+    },
     "duplexer": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
@@ -76420,12 +71011,12 @@
       }
     },
     "echarts": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.1.1.tgz",
-      "integrity": "sha512-b3nP8M9XwZM2jISuA+fP0EuJv8lcfgWrinel185Npy8bE/UhXTDIPJcqgQOCWdvk0c5CeT6Dsm1xBjmJXAGlxQ==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.1.2.tgz",
+      "integrity": "sha512-okUhO4sw22vwZp+rTPNjd/bvTdpug4K4sHNHyrV8NdAncIX9/AarlolFqtJCAYKGFYhUBNjIWu1EznFrSWTFxg==",
       "requires": {
         "tslib": "2.0.3",
-        "zrender": "5.1.0"
+        "zrender": "5.1.1"
       },
       "dependencies": {
         "tslib": {
@@ -76525,6 +71116,11 @@
       "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
       "dev": true
     },
+    "emotion-rgba": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/emotion-rgba/-/emotion-rgba-0.0.9.tgz",
+      "integrity": "sha512-fSt51Lh4a1fppXY3nQrMUC00p1jIYMSaRRkUhPiOJ3s9oumae1tY41AJytRK9d4YmJDP9njJBndgdDn9j7CbsA=="
+    },
     "emotion-theming": {
       "version": "10.0.27",
       "resolved": "https://registry.npmjs.org/emotion-theming/-/emotion-theming-10.0.27.tgz",
@@ -78534,6 +73130,14 @@
         }
       }
     },
+    "expression-eval": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/expression-eval/-/expression-eval-2.1.0.tgz",
+      "integrity": "sha512-FUJO/Akvl/JOWkvlqZaqbkhsEWlCJWDeZG4tzX96UH68D9FeRgYgtb55C2qtqbORC0Q6x5419EDjWu4IT9kQfg==",
+      "requires": {
+        "jsep": "^0.3.0"
+      }
+    },
     "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -78805,9 +73409,9 @@
       }
     },
     "fetch-retry": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-4.1.0.tgz",
-      "integrity": "sha512-FUc9XZuhyE3ka3m53lec29PXVhdRf59QG01nE+OZdfl0M/R0E7Pk6k6qeWzHhX1pHl/f2JPA97sjjbHRgSg/9A=="
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-4.1.1.tgz",
+      "integrity": "sha512-e6eB7zN6UBSwGVwrbWVH+gdLnkW9WwHhmq2YDK1Sh30pzx1onRVGBvogTlUeWxwTa+L86NYdo4hFkh7O8ZjSnA=="
     },
     "figgy-pudding": {
       "version": "3.5.1",
@@ -79013,6 +73617,14 @@
         "pkg-dir": "^3.0.0"
       }
     },
+    "find-replace": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz",
+      "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==",
+      "requires": {
+        "array-back": "^3.0.1"
+      }
+    },
     "find-root": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
@@ -79060,6 +73672,11 @@
         }
       }
     },
+    "flatbuffers": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/flatbuffers/-/flatbuffers-1.12.0.tgz",
+      "integrity": "sha512-c7CZADjRcl6j0PlvFy0ZqXQ67qSEZfrVPynmnL+2zPc+NtMvrF8Y0QceMo7QqnSPc7+uWjUIAbvCQ5WIKlMVdQ=="
+    },
     "flatted": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz",
@@ -79098,15 +73715,6 @@
       "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
       "dev": true
     },
-    "for-own": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-      "dev": true,
-      "requires": {
-        "for-in": "^1.0.1"
-      }
-    },
     "foreach": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
@@ -79298,9 +73906,9 @@
       "dev": true
     },
     "fuse.js": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-3.3.0.tgz",
-      "integrity": "sha512-ESBRkGLWMuVkapqYCcNO1uqMg5qbCKkgb+VS6wsy17Rix0/cMS9kSOZoYkjH8Ko//pgJ/EEGu0GTjk2mjX2LGQ=="
+      "version": "6.4.6",
+      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.6.tgz",
+      "integrity": "sha512-/gYxR/0VpXmWSfZOIPS3rWwU8SHgsRTwWuXhyb2O6s7aRuVtHtxCkR33bNYu3wyLyNx/Wpv0vU7FZy8Vj53VNw=="
     },
     "gauge": {
       "version": "2.7.4",
@@ -79321,7 +73929,8 @@
     "gensync": {
       "version": "1.0.0-beta.1",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
-      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg=="
+      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
+      "dev": true
     },
     "geojson-vt": {
       "version": "3.2.1",
@@ -79559,7 +74168,8 @@
     "globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true
     },
     "globalthis": {
       "version": "1.0.2",
@@ -79642,9 +74252,9 @@
       }
     },
     "h3-js": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/h3-js/-/h3-js-3.7.0.tgz",
-      "integrity": "sha512-EcH/qGU4khZsAEG39Uu8MvaCing0JFcuoe3K4Xmg5MofDIu1cNJl7z2AQS8ggvXGxboiLJqsGirhEqFKdd2gAA=="
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/h3-js/-/h3-js-3.7.2.tgz",
+      "integrity": "sha512-LPjlHSwB9zQZrMqKloCZmmmt3yZzIK7nqPcXqwU93zT3TtYG6jP4tZBzAPouxut7lLjdFbMQ75wRBiKfpsnY7w=="
     },
     "hammerjs": {
       "version": "2.0.8",
@@ -85007,10 +79617,16 @@
         }
       }
     },
+    "jsep": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/jsep/-/jsep-0.3.5.tgz",
+      "integrity": "sha512-AoRLBDc6JNnKjNcmonituEABS5bcfqDhQAWWXNTFrqu6nVXBpBAGfcoTGZMFlIrh9FjmE1CQyX9CTNwZrXMMDA=="
+    },
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true
     },
     "json-bigint": {
       "version": "1.0.0",
@@ -85020,6 +79636,11 @@
         "bignumber.js": "^9.0.0"
       }
     },
+    "json-bignum": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/json-bignum/-/json-bignum-0.0.3.tgz",
+      "integrity": "sha1-QRY7UENsdz2CQk28IO1w23YEuNc="
+    },
     "json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -85279,12 +79900,6 @@
         "webpack-sources": "^1.1.0"
       }
     },
-    "lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-      "dev": true
-    },
     "lazy-universal-dotenv": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lazy-universal-dotenv/-/lazy-universal-dotenv-3.0.1.tgz",
@@ -85371,15 +79986,6 @@
       "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
       "dev": true
     },
-    "levenary": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
-      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
-      "dev": true,
-      "requires": {
-        "leven": "^3.1.0"
-      }
-    },
     "levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -85787,12 +80393,11 @@
       "integrity": "sha512-L0j0tFVZBQQLeEjmWOvDLoRciIY8gQGWahvkztXUal8jH8R5Rlqo9GCvgqvXcy9LQhEWdQCVvzqAbxgYNt4blQ=="
     },
     "math.gl": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/math.gl/-/math.gl-2.3.3.tgz",
-      "integrity": "sha512-wZhx7574KHUpJVMzkaQ559zfn3R8iB0BOilwNrfL/fOLQfPo2TPWsKX96PdfS4svKA2XIGi3yfizrv2Redcv0g==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/math.gl/-/math.gl-3.5.3.tgz",
+      "integrity": "sha512-cRQRZlc+XvNHd3bIfu3kdPPPAW0vwDelZJmkjn2TDvCyPcmyDtAiZ2Poo1aFoINP7HzN6oHYxapc/0wV3q6Opg==",
       "requires": {
-        "@babel/runtime": "^7.0.0",
-        "gl-matrix": "^3.0.0"
+        "@math.gl/core": "3.5.3"
       }
     },
     "mathfn": {
@@ -86026,28 +80631,6 @@
       "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
       "dev": true
     },
-    "merge-deep": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.2.tgz",
-      "integrity": "sha512-T7qC8kg4Zoti1cFd8Cr0M+qaZfOwjlPDEdZIIPPB2JZctjaPM4fX+i7HOId69tAti2fvO6X5ldfYUONDODsrkA==",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "clone-deep": "^0.2.4",
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -86297,29 +80880,6 @@
         "minipass": "^3.0.0"
       }
     },
-    "minizlib": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
-      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "minipass": "^2.9.0"
-      },
-      "dependencies": {
-        "minipass": {
-          "version": "2.9.0",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
-          "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.0"
-          }
-        }
-      }
-    },
     "mississippi": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
@@ -86359,24 +80919,6 @@
         }
       }
     },
-    "mixin-object": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
-      "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
-      "dev": true,
-      "requires": {
-        "for-in": "^0.1.3",
-        "is-extendable": "^0.1.1"
-      },
-      "dependencies": {
-        "for-in": {
-          "version": "0.1.8",
-          "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
-          "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=",
-          "dev": true
-        }
-      }
-    },
     "mjolnir.js": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/mjolnir.js/-/mjolnir.js-2.5.0.tgz",
@@ -86409,6 +80951,14 @@
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
       "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
     },
+    "moment-timezone": {
+      "version": "0.5.33",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.33.tgz",
+      "integrity": "sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w==",
+      "requires": {
+        "moment": ">= 2.9.0"
+      }
+    },
     "moo": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/moo/-/moo-0.4.3.tgz",
@@ -87348,6 +81898,14 @@
       "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
       "dev": true
     },
+    "pad-left": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/pad-left/-/pad-left-2.1.0.tgz",
+      "integrity": "sha1-FuajstRKjhOMsIOMx8tAOk/J6ZQ=",
+      "requires": {
+        "repeat-string": "^1.5.4"
+      }
+    },
     "pako": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.7.tgz",
@@ -87652,15 +82210,6 @@
         }
       }
     },
-    "pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
-      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
-      "dev": true,
-      "requires": {
-        "find-up": "^2.1.0"
-      }
-    },
     "pn": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
@@ -90074,12 +84623,12 @@
       "dev": true
     },
     "probe.gl": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/probe.gl/-/probe.gl-3.3.0.tgz",
-      "integrity": "sha512-59E6AEw4N8sU4PKfAl7S2UBYJCOa064WpEFcXfeFOB/36FJtplYY+261DqLjLAvOqRRHiKVEQUBo63PQ3jKeWA==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/probe.gl/-/probe.gl-3.4.0.tgz",
+      "integrity": "sha512-9CLByZATuhuG/Viq3ckfWU+dAhb7dMmjzsyCy4s7ds9ueTejcVRENxL197/XacOK/AN61YrEERB0QnouB0Qc0Q==",
       "requires": {
         "@babel/runtime": "^7.0.0",
-        "@probe.gl/stats": "3.3.0"
+        "@probe.gl/stats": "3.4.0"
       }
     },
     "process": {
@@ -91377,17 +85926,6 @@
             "@babel/highlight": "^7.10.4"
           }
         },
-        "@babel/highlight": {
-          "version": "7.13.8",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-          "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
         "@nodelib/fs.stat": {
           "version": "2.0.4",
           "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz",
@@ -91782,18 +86320,6 @@
         "@types/hoist-non-react-statics": "^3.3.1",
         "dnd-core": "^11.1.3",
         "hoist-non-react-statics": "^3.3.0"
-      },
-      "dependencies": {
-        "dnd-core": {
-          "version": "11.1.3",
-          "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-11.1.3.tgz",
-          "integrity": "sha512-QugF55dNW+h+vzxVJ/LSJeTeUw9MCJ2cllhmVThVPEtF16ooBkxj0WBE5RB+AceFxMFo1rO6bJKXtqKl+JNnyA==",
-          "requires": {
-            "@react-dnd/asap": "^4.0.0",
-            "@react-dnd/invariant": "^2.0.0",
-            "redux": "^4.0.4"
-          }
-        }
       }
     },
     "react-dnd-html5-backend": {
@@ -91802,18 +86328,6 @@
       "integrity": "sha512-/1FjNlJbW/ivkUxlxQd7o3trA5DE33QiRZgxent3zKme8DwF4Nbw3OFVhTRFGaYhHFNL1rZt6Rdj1D78BjnNLw==",
       "requires": {
         "dnd-core": "^11.1.3"
-      },
-      "dependencies": {
-        "dnd-core": {
-          "version": "11.1.3",
-          "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-11.1.3.tgz",
-          "integrity": "sha512-QugF55dNW+h+vzxVJ/LSJeTeUw9MCJ2cllhmVThVPEtF16ooBkxj0WBE5RB+AceFxMFo1rO6bJKXtqKl+JNnyA==",
-          "requires": {
-            "@react-dnd/asap": "^4.0.0",
-            "@react-dnd/invariant": "^2.0.0",
-            "redux": "^4.0.4"
-          }
-        }
       }
     },
     "react-docgen": {
@@ -92070,11 +86584,6 @@
         "prop-types": "^15.6.1"
       }
     },
-    "react-icons": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.2.0.tgz",
-      "integrity": "sha512-rmzEDFt+AVXRzD7zDE21gcxyBizD/3NqjbX6cmViAgdqfJ2UiLer8927/QhhrXQV7dEj/1EGuOTPp7JnLYVJKQ=="
-    },
     "react-input-autosize": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-2.2.2.tgz",
@@ -92164,6 +86673,11 @@
       "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
       "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
     },
+    "react-lines-ellipsis": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/react-lines-ellipsis/-/react-lines-ellipsis-0.15.0.tgz",
+      "integrity": "sha512-8kWpEmu7ijmB6Gz5t+eSjNux2SpVXZBsmfeFE8LjMS7tU3H8ai475CyNc0dH0RDTwt4Esr7c06Xq4SB7Gpl9yQ=="
+    },
     "react-loadable": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/react-loadable/-/react-loadable-5.5.0.tgz",
@@ -92341,8 +86855,7 @@
     "react-reverse-portal": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/react-reverse-portal/-/react-reverse-portal-2.0.1.tgz",
-      "integrity": "sha512-sj/D9nSHspqV8i8hWkTSZ5Ohnrqk2A5fkDKw4Xe/zV4OfF1UYwmbzrxLdmNRdKkWgQwnXIxaa2E3FC7QYdZAeA==",
-      "requires": {}
+      "integrity": "sha512-sj/D9nSHspqV8i8hWkTSZ5Ohnrqk2A5fkDKw4Xe/zV4OfF1UYwmbzrxLdmNRdKkWgQwnXIxaa2E3FC7QYdZAeA=="
     },
     "react-router": {
       "version": "5.1.2",
@@ -92397,6 +86910,13 @@
       "requires": {
         "fuse.js": "^3.0.0",
         "prop-types": "^15.5.8"
+      },
+      "dependencies": {
+        "fuse.js": {
+          "version": "3.6.1",
+          "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-3.6.1.tgz",
+          "integrity": "sha512-hT9yh/tiinkmirKrlv4KWOjztdoZo1mx9Qh4KvWqC7isoXwdUY3PNWUxceF4/qO9R6riA2C29jdTOeQOIROjgw=="
+        }
       }
     },
     "react-select": {
@@ -92963,6 +87483,11 @@
         }
       }
     },
+    "reduce-flatten": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz",
+      "integrity": "sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w=="
+    },
     "reduce-function-call": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.3.tgz",
@@ -93297,15 +87822,6 @@
         "unified": "9.2.0"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
         "@babel/core": {
           "version": "7.12.9",
           "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz",
@@ -93330,69 +87846,12 @@
             "source-map": "^0.5.0"
           }
         },
-        "@babel/generator": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz",
-          "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.13.0",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
         "@babel/helper-plugin-utils": {
           "version": "7.10.4",
           "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
           "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
           "dev": true
         },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.13.8",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-          "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.13.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz",
-          "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==",
-          "dev": true
-        },
         "@babel/plugin-proposal-object-rest-spread": {
           "version": "7.12.1",
           "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz",
@@ -93413,54 +87872,6 @@
             "@babel/helper-plugin-utils": "^7.10.4"
           }
         },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-          "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/generator": "^7.13.0",
-            "@babel/helper-function-name": "^7.12.13",
-            "@babel/helper-split-export-declaration": "^7.12.13",
-            "@babel/parser": "^7.13.0",
-            "@babel/types": "^7.13.0",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
         "convert-source-map": {
           "version": "1.7.0",
           "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
@@ -93550,15 +87961,6 @@
             "xtend": "^4.0.1"
           }
         },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        },
         "unified": {
           "version": "9.2.0",
           "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz",
@@ -94065,14 +88467,6 @@
         "tslib": "^1.9.0"
       }
     },
-    "s2-geometry": {
-      "version": "1.2.10",
-      "resolved": "https://registry.npmjs.org/s2-geometry/-/s2-geometry-1.2.10.tgz",
-      "integrity": "sha1-xv8i8+zK/Q7qSRtgtEwUG5iHrKs=",
-      "requires": {
-        "long": "^3.2.0"
-      }
-    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -94145,11 +88539,11 @@
       }
     },
     "scroll-into-view-if-needed": {
-      "version": "2.2.26",
-      "resolved": "https://registry.npmjs.org/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.26.tgz",
-      "integrity": "sha512-SQ6AOKfABaSchokAmmaxVnL9IArxEnLEX9j4wAZw+x4iUTb40q7irtHG3z4GtAWz5veVZcCnubXDBRyLVQaohw==",
+      "version": "2.2.28",
+      "resolved": "https://registry.npmjs.org/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.28.tgz",
+      "integrity": "sha512-8LuxJSuFVc92+0AdNv4QOxRL4Abeo1DgLnGNkn1XlaujPH/3cCFz3QI60r2VNu4obJJROzgnIUw5TKQkZvZI1w==",
       "requires": {
-        "compute-scroll-into-view": "^1.0.16"
+        "compute-scroll-into-view": "^1.0.17"
       }
     },
     "seedrandom": {
@@ -94157,11 +88551,6 @@
       "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
       "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg=="
     },
-    "seer": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/seer/-/seer-0.2.5.tgz",
-      "integrity": "sha512-//0Zwt0x97KQhIWrp4oq9AVNvGA2ctCx4dmFddpkORjRr6bW+hyC8eOhWBVIhiU3uHv1XLU1dekfFKOi28RGHA=="
-    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
@@ -94186,7 +88575,8 @@
     "semver": {
       "version": "5.6.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
+      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+      "dev": true
     },
     "send": {
       "version": "0.16.2",
@@ -94335,35 +88725,6 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "shallow-clone": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
-      "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=",
-      "dev": true,
-      "requires": {
-        "is-extendable": "^0.1.1",
-        "kind-of": "^2.0.1",
-        "lazy-cache": "^0.2.3",
-        "mixin-object": "^2.0.1"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-          "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.0.2"
-          }
-        },
-        "lazy-cache": {
-          "version": "0.2.7",
-          "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
-          "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=",
-          "dev": true
-        }
-      }
-    },
     "shallow-copy": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz",
@@ -94828,9 +89189,9 @@
       }
     },
     "sortablejs": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.13.0.tgz",
-      "integrity": "sha512-RBJirPY0spWCrU5yCmWM1eFs/XgX2J5c6b275/YyxFRgnzPhKl/TDeU2hNR8Dt7ITq66NRPM4UlOt+e5O4CFHg=="
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz",
+      "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="
     },
     "source-list-map": {
       "version": "2.0.1",
@@ -96612,51 +90973,35 @@
         }
       }
     },
-    "tapable": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
-      "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
-      "dev": true
-    },
-    "tar": {
-      "version": "4.4.13",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
-      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
-      "dev": true,
-      "optional": true,
+    "table-layout": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-1.0.2.tgz",
+      "integrity": "sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A==",
       "requires": {
-        "chownr": "^1.1.1",
-        "fs-minipass": "^1.2.5",
-        "minipass": "^2.8.6",
-        "minizlib": "^1.2.1",
-        "mkdirp": "^0.5.0",
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.3"
+        "array-back": "^4.0.1",
+        "deep-extend": "~0.6.0",
+        "typical": "^5.2.0",
+        "wordwrapjs": "^4.0.0"
       },
       "dependencies": {
-        "fs-minipass": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
-          "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.6.0"
-          }
+        "array-back": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz",
+          "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg=="
         },
-        "minipass": {
-          "version": "2.9.0",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
-          "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.0"
-          }
+        "typical": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz",
+          "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg=="
         }
       }
     },
+    "tapable": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
+      "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
+      "dev": true
+    },
     "telejson": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/telejson/-/telejson-5.1.0.tgz",
@@ -96835,6 +91180,11 @@
         }
       }
     },
+    "text-encoding-utf-8": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz",
+      "integrity": "sha512-8bw4MY9WjdsD2aMtO0OzOCY3pXGYNx2d2FfHRVUKkiCPDWjKuOlhLVASS+pD7VkLTVjW268LYJHwsnPFlBpbAg=="
+    },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -97375,11 +91725,16 @@
       }
     },
     "typescript": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz",
-      "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
+      "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
       "dev": true
     },
+    "typical": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz",
+      "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw=="
+    },
     "ua-parser-js": {
       "version": "0.7.25",
       "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.25.tgz",
@@ -99800,6 +94155,22 @@
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
       "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
     },
+    "wordwrapjs": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.1.tgz",
+      "integrity": "sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA==",
+      "requires": {
+        "reduce-flatten": "^2.0.0",
+        "typical": "^5.2.0"
+      },
+      "dependencies": {
+        "typical": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz",
+          "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg=="
+        }
+      }
+    },
     "worker-farm": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
@@ -100097,9 +94468,9 @@
       "dev": true
     },
     "zrender": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.1.0.tgz",
-      "integrity": "sha512-c+8VRx52ycbmqwHeHLlo/BAfIHBl/JZNLM6cfDQFgzIH05yb+f5J9F/fbRsP+zGc8dW9XHuhdt8/iqukgMZSeg==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.1.1.tgz",
+      "integrity": "sha512-oeWlmUZPQdS9f5hK4pV21tHPqA3wgQ7CkKkw7l0CCBgWlJ/FP+lRgLFtUBW6yam4JX8y9CdHJo1o587VVrbcoQ==",
       "requires": {
         "tslib": "2.0.3"
       },
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
index 120644c2b81f..20e1afc52bb4 100644
--- a/superset-frontend/package.json
+++ b/superset-frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "superset",
-  "version": "0.999.0dev",
+  "version": "0.0.0dev",
   "description": "Superset is a data exploration platform designed to be visual, intuitive, and interactive.",
   "license": "Apache-2.0",
   "directories": {
@@ -17,7 +17,7 @@
     "prod": "npm run build",
     "build-dev": "cross-env NODE_OPTIONS=--max_old_space_size=8192 NODE_ENV=development webpack --mode=development --colors",
     "build-instrumented": "cross-env NODE_ENV=development BABEL_ENV=instrumented webpack --mode=development --colors",
-    "build": "cross-env NODE_OPTIONS=--max_old_space_size=8192 NODE_ENV=production BABEL_ENV=production webpack --mode=production --colors",
+    "build": "cross-env NODE_OPTIONS=--max_old_space_size=8192 NODE_ENV=production BABEL_ENV=\"${BABEL_ENV:=production}\" webpack --mode=production --colors",
     "lint": "eslint --ignore-path=.eslintignore --ext .js,.jsx,.ts,.tsx . && npm run type",
     "prettier-check": "prettier --check '{src,stylesheets}/**/*.{css,less,sass,scss}'",
     "lint-fix": "eslint --fix --ignore-path=.eslintignore --ext .js,.jsx,.ts,tsx . && npm run clean-css && npm run type",
@@ -67,35 +67,35 @@
     "@emotion/babel-preset-css-prop": "^11.2.0",
     "@emotion/cache": "^11.1.3",
     "@emotion/react": "^11.1.5",
-    "@superset-ui/chart-controls": "^0.17.53",
-    "@superset-ui/core": "^0.17.53",
-    "@superset-ui/legacy-plugin-chart-calendar": "^0.17.53",
-    "@superset-ui/legacy-plugin-chart-chord": "^0.17.53",
-    "@superset-ui/legacy-plugin-chart-country-map": "^0.17.53",
-    "@superset-ui/legacy-plugin-chart-event-flow": "^0.17.53",
-    "@superset-ui/legacy-plugin-chart-force-directed": "^0.17.53",
-    "@superset-ui/legacy-plugin-chart-heatmap": "^0.17.53",
-    "@superset-ui/legacy-plugin-chart-histogram": "^0.17.53",
-    "@superset-ui/legacy-plugin-chart-horizon": "^0.17.53",
-    "@superset-ui/legacy-plugin-chart-map-box": "^0.17.53",
-    "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.17.53",
-    "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.17.53",
-    "@superset-ui/legacy-plugin-chart-partition": "^0.17.53",
-    "@superset-ui/legacy-plugin-chart-pivot-table": "^0.17.53",
-    "@superset-ui/legacy-plugin-chart-rose": "^0.17.53",
-    "@superset-ui/legacy-plugin-chart-sankey": "^0.17.53",
-    "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.17.53",
-    "@superset-ui/legacy-plugin-chart-sunburst": "^0.17.53",
-    "@superset-ui/legacy-plugin-chart-treemap": "^0.17.53",
-    "@superset-ui/legacy-plugin-chart-world-map": "^0.17.53",
-    "@superset-ui/legacy-preset-chart-big-number": "^0.17.53",
-    "@superset-ui/legacy-preset-chart-deckgl": "^0.4.7",
-    "@superset-ui/legacy-preset-chart-nvd3": "^0.17.53",
-    "@superset-ui/plugin-chart-echarts": "^0.17.53",
-    "@superset-ui/plugin-chart-pivot-table": "^0.17.53",
-    "@superset-ui/plugin-chart-table": "^0.17.53",
-    "@superset-ui/plugin-chart-word-cloud": "^0.17.53",
-    "@superset-ui/preset-chart-xy": "^0.17.53",
+    "@superset-ui/chart-controls": "^0.17.85",
+    "@superset-ui/core": "^0.17.81",
+    "@superset-ui/legacy-plugin-chart-calendar": "^0.17.85",
+    "@superset-ui/legacy-plugin-chart-chord": "^0.17.85",
+    "@superset-ui/legacy-plugin-chart-country-map": "^0.17.85",
+    "@superset-ui/legacy-plugin-chart-event-flow": "^0.17.85",
+    "@superset-ui/legacy-plugin-chart-force-directed": "^0.17.85",
+    "@superset-ui/legacy-plugin-chart-heatmap": "^0.17.85",
+    "@superset-ui/legacy-plugin-chart-histogram": "^0.17.85",
+    "@superset-ui/legacy-plugin-chart-horizon": "^0.17.85",
+    "@superset-ui/legacy-plugin-chart-map-box": "^0.17.85",
+    "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.17.85",
+    "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.17.85",
+    "@superset-ui/legacy-plugin-chart-partition": "^0.17.85",
+    "@superset-ui/legacy-plugin-chart-pivot-table": "^0.17.85",
+    "@superset-ui/legacy-plugin-chart-rose": "^0.17.85",
+    "@superset-ui/legacy-plugin-chart-sankey": "^0.17.85",
+    "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.17.85",
+    "@superset-ui/legacy-plugin-chart-sunburst": "^0.17.85",
+    "@superset-ui/legacy-plugin-chart-treemap": "^0.17.85",
+    "@superset-ui/legacy-plugin-chart-world-map": "^0.17.85",
+    "@superset-ui/legacy-preset-chart-big-number": "^0.17.86",
+    "@superset-ui/legacy-preset-chart-deckgl": "^0.4.11",
+    "@superset-ui/legacy-preset-chart-nvd3": "^0.17.85",
+    "@superset-ui/plugin-chart-echarts": "^0.17.85",
+    "@superset-ui/plugin-chart-pivot-table": "^0.17.85",
+    "@superset-ui/plugin-chart-table": "^0.17.85",
+    "@superset-ui/plugin-chart-word-cloud": "^0.17.85",
+    "@superset-ui/preset-chart-xy": "^0.17.85",
     "@vx/responsive": "^0.0.195",
     "abortcontroller-polyfill": "^1.1.9",
     "antd": "^4.9.4",
@@ -110,8 +110,10 @@
     "d3-color": "^1.2.0",
     "d3-scale": "^2.1.2",
     "dom-to-image": "^2.6.0",
+    "emotion-rgba": "0.0.9",
     "fontsource-fira-code": "^3.0.5",
     "fontsource-inter": "^3.0.5",
+    "fuse.js": "^6.4.6",
     "geolib": "^2.0.24",
     "global-box": "^1.2.0",
     "html-webpack-plugin": "^4.5.1",
@@ -129,6 +131,7 @@
     "mathjs": "^8.0.1",
     "memoize-one": "^5.1.1",
     "moment": "^2.26.0",
+    "moment-timezone": "^0.5.33",
     "mousetrap": "^1.6.1",
     "mustache": "^2.2.1",
     "omnibar": "^2.1.1",
@@ -146,10 +149,10 @@
     "react-dom": "^16.13.0",
     "react-gravatar": "^2.6.1",
     "react-hot-loader": "^4.12.20",
-    "react-icons": "^4.2.0",
     "react-js-cron": "^1.2.0",
     "react-json-tree": "^0.11.2",
     "react-jsonschema-form": "^1.2.0",
+    "react-lines-ellipsis": "^0.15.0",
     "react-loadable": "^5.5.0",
     "react-markdown": "^4.3.1",
     "react-redux": "^7.2.0",
@@ -176,6 +179,7 @@
     "redux-undo": "^1.0.0-beta9-9-7",
     "regenerator-runtime": "^0.13.5",
     "rison": "^0.1.1",
+    "scroll-into-view-if-needed": "^2.2.28",
     "shortid": "^2.2.6",
     "urijs": "^1.19.6",
     "use-immer": "^0.4.2",
@@ -295,12 +299,11 @@
     "storybook-addon-jsx": "^7.3.3",
     "storybook-addon-paddings": "^3.2.0",
     "style-loader": "^1.0.0",
-    "terser-webpack-plugin": "^1.1.0",
     "thread-loader": "^1.2.0",
     "transform-loader": "^0.2.3",
     "ts-jest": "^26.4.2",
     "ts-loader": "^8.0.7",
-    "typescript": "^4.0.3",
+    "typescript": "^4.1.6",
     "url-loader": "^1.0.1",
     "webpack": "^4.42.0",
     "webpack-bundle-analyzer": "^3.6.1",
diff --git a/superset-frontend/spec/fixtures/mockDashboardLayout.js b/superset-frontend/spec/fixtures/mockDashboardLayout.js
index 90918d388fc9..404b415d78d8 100644
--- a/superset-frontend/spec/fixtures/mockDashboardLayout.js
+++ b/superset-frontend/spec/fixtures/mockDashboardLayout.js
@@ -129,7 +129,7 @@ export const dashboardLayoutWithTabs = {
       children: ['ROW_ID2'],
       parents: ['ROOT_ID', 'TABS_ID'],
       meta: {
-        text: 'tab2',
+        text: '',
         defaultText: 'tab2',
       },
     },
diff --git a/superset-frontend/spec/fixtures/mockDatasource.js b/superset-frontend/spec/fixtures/mockDatasource.js
index e434ad73b067..55d95ebde222 100644
--- a/superset-frontend/spec/fixtures/mockDatasource.js
+++ b/superset-frontend/spec/fixtures/mockDatasource.js
@@ -164,6 +164,7 @@ export default {
         column_name: 'num_girls',
       },
     ],
+    column_types: [0, 1, 2],
     id,
     granularity_sqla: [['ds', 'ds']],
     name: 'birth_names',
diff --git a/superset-frontend/spec/fixtures/mockNativeFilters.ts b/superset-frontend/spec/fixtures/mockNativeFilters.ts
index afc4959d39fa..e087072bfa73 100644
--- a/superset-frontend/spec/fixtures/mockNativeFilters.ts
+++ b/superset-frontend/spec/fixtures/mockNativeFilters.ts
@@ -45,7 +45,6 @@ export const nativeFilters: NativeFiltersState = {
         rootPath: ['ROOT_ID'],
         excluded: [],
       },
-      isInstant: true,
       controlValues: {
         multiSelect: false,
         enableEmptyFilter: false,
@@ -79,7 +78,6 @@ export const nativeFilters: NativeFiltersState = {
         enableEmptyFilter: false,
         inverseSelection: false,
       },
-      isInstant: true,
     },
   },
 };
@@ -136,7 +134,6 @@ export const singleNativeFiltersState = {
       cascadeParentIds: [],
       scope: { rootPath: ['ROOT_ID'], excluded: [227, 229] },
       inverseSelection: false,
-      isInstant: true,
       allowsMultipleValues: false,
       isRequired: false,
     },
diff --git a/superset-frontend/spec/fixtures/mockReportState.js b/superset-frontend/spec/fixtures/mockReportState.js
new file mode 100644
index 000000000000..075af8bfe096
--- /dev/null
+++ b/superset-frontend/spec/fixtures/mockReportState.js
@@ -0,0 +1,38 @@
+/**
+ * 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 dashboardInfo from './mockDashboardInfo';
+import { user } from '../javascripts/sqllab/fixtures';
+
+export default {
+  active: true,
+  creation_method: 'dashboards',
+  crontab: '0 12 * * 1',
+  dashboard: dashboardInfo.id,
+  name: 'Weekly Report',
+  owners: [user.userId],
+  recipients: [
+    {
+      recipient_config_json: {
+        target: user.email,
+      },
+      type: 'Email',
+    },
+  ],
+  type: 'Report',
+};
diff --git a/superset-frontend/spec/fixtures/mockState.js b/superset-frontend/spec/fixtures/mockState.js
index dfa77fdf477a..36870045eecf 100644
--- a/superset-frontend/spec/fixtures/mockState.js
+++ b/superset-frontend/spec/fixtures/mockState.js
@@ -28,6 +28,7 @@ import dashboardInfo from './mockDashboardInfo';
 import { emptyFilters } from './mockDashboardFilters';
 import dashboardState from './mockDashboardState';
 import { sliceEntitiesForChart } from './mockSliceEntities';
+import { user } from '../javascripts/sqllab/fixtures';
 
 export default {
   datasources,
@@ -40,5 +41,6 @@ export default {
   dashboardState,
   dashboardLayout,
   messageToasts,
+  user,
   impressionId: 'mock_impression_id',
 };
diff --git a/superset-frontend/spec/fixtures/mockStateWithoutUser.tsx b/superset-frontend/spec/fixtures/mockStateWithoutUser.tsx
new file mode 100644
index 000000000000..bc92df4df75d
--- /dev/null
+++ b/superset-frontend/spec/fixtures/mockStateWithoutUser.tsx
@@ -0,0 +1,46 @@
+/**
+ * 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 datasources from 'spec/fixtures/mockDatasource';
+import messageToasts from 'spec/javascripts/messageToasts/mockMessageToasts';
+import {
+  nativeFiltersInfo,
+  mockDataMaskInfo,
+} from 'spec/javascripts/dashboard/fixtures/mockNativeFilters';
+import chartQueries from 'spec/fixtures/mockChartQueries';
+import { dashboardLayout } from 'spec/fixtures/mockDashboardLayout';
+import dashboardInfo from 'spec/fixtures/mockDashboardInfo';
+import { emptyFilters } from 'spec/fixtures/mockDashboardFilters';
+import dashboardState from 'spec/fixtures/mockDashboardState';
+import { sliceEntitiesForChart } from 'spec/fixtures/mockSliceEntities';
+import reports from 'spec/fixtures/mockReportState';
+
+export default {
+  datasources,
+  sliceEntities: sliceEntitiesForChart,
+  charts: chartQueries,
+  nativeFilters: nativeFiltersInfo,
+  dataMask: mockDataMaskInfo,
+  dashboardInfo,
+  dashboardFilters: emptyFilters,
+  dashboardState,
+  dashboardLayout,
+  messageToasts,
+  impressionId: 'mock_impression_id',
+  reports,
+};
diff --git a/superset-frontend/src/dashboard/stylesheets/buttons.less b/superset-frontend/spec/helpers/IntersectionObserver.ts
similarity index 66%
rename from superset-frontend/src/dashboard/stylesheets/buttons.less
rename to superset-frontend/spec/helpers/IntersectionObserver.ts
index 9cec645b95bb..95bcab8836ed 100644
--- a/superset-frontend/src/dashboard/stylesheets/buttons.less
+++ b/superset-frontend/spec/helpers/IntersectionObserver.ts
@@ -16,28 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-@import '../../../stylesheets/less/variables.less';
+class IntersectionObserver {
+  disconnect() {
+    return null;
+  }
 
-.icon-button {
-  color: @gray;
-  font-size: @font-size-l;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  outline: none;
+  observe() {
+    return null;
+  }
 
-  &:hover,
-  &:active,
-  &:focus {
-    color: @almost-black;
-    outline: none;
-    text-decoration: none;
+  takeRecords() {
+    return null;
   }
-}
 
-.icon-button-label {
-  color: @gray-dark;
-  padding-left: 8px;
-  font-size: @font-size-m;
+  unobserve() {
+    return null;
+  }
 }
+
+export { IntersectionObserver };
diff --git a/superset-frontend/spec/helpers/reducerIndex.ts b/superset-frontend/spec/helpers/reducerIndex.ts
index e84b7f6f5119..113368389509 100644
--- a/superset-frontend/spec/helpers/reducerIndex.ts
+++ b/superset-frontend/spec/helpers/reducerIndex.ts
@@ -30,6 +30,7 @@ import saveModal from 'src/explore/reducers/saveModalReducer';
 import explore from 'src/explore/reducers/exploreReducer';
 import sqlLab from 'src/SqlLab/reducers/sqlLab';
 import localStorageUsageInKilobytes from 'src/SqlLab/reducers/localStorageUsage';
+import reports from 'src/reports/reducers/reports';
 
 const impressionId = (state = '') => state;
 
@@ -53,5 +54,6 @@ export default {
   explore,
   sqlLab,
   localStorageUsageInKilobytes,
+  reports,
   common: () => common,
 };
diff --git a/superset-frontend/spec/helpers/shim.ts b/superset-frontend/spec/helpers/shim.ts
index 32f3f27fb81b..e2cef968ca76 100644
--- a/superset-frontend/spec/helpers/shim.ts
+++ b/superset-frontend/spec/helpers/shim.ts
@@ -25,6 +25,7 @@ import { configure } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 import { configure as configureTranslation } from '@superset-ui/core';
 import { Worker } from './Worker';
+import { IntersectionObserver } from './IntersectionObserver';
 import setupSupersetClient from './setupSupersetClient';
 
 configure({ adapter: new Adapter() });
@@ -46,6 +47,7 @@ g.window = g.window || {};
 g.window.location = { href: 'about:blank' };
 g.window.performance = { now: () => new Date().getTime() };
 g.window.Worker = Worker;
+g.window.IntersectionObserver = IntersectionObserver;
 g.URL.createObjectURL = () => '';
 
 Object.defineProperty(window, 'matchMedia', {
diff --git a/superset-frontend/spec/helpers/testing-library.tsx b/superset-frontend/spec/helpers/testing-library.tsx
index 7366b8d4c642..56489cce8471 100644
--- a/superset-frontend/spec/helpers/testing-library.tsx
+++ b/superset-frontend/spec/helpers/testing-library.tsx
@@ -20,6 +20,7 @@ import '@testing-library/jest-dom/extend-expect';
 import React, { ReactNode, ReactElement } from 'react';
 import { render, RenderOptions } from '@testing-library/react';
 import { ThemeProvider, supersetTheme } from '@superset-ui/core';
+import { BrowserRouter } from 'react-router-dom';
 import { Provider } from 'react-redux';
 import { combineReducers, createStore, applyMiddleware, compose } from 'redux';
 import thunk from 'redux-thunk';
@@ -32,13 +33,20 @@ type Options = Omit<RenderOptions, 'queries'> & {
   useRedux?: boolean;
   useDnd?: boolean;
   useQueryParams?: boolean;
+  useRouter?: boolean;
   initialState?: {};
   reducers?: {};
 };
 
 function createWrapper(options?: Options) {
-  const { useDnd, useRedux, useQueryParams, initialState, reducers } =
-    options || {};
+  const {
+    useDnd,
+    useRedux,
+    useQueryParams,
+    useRouter,
+    initialState,
+    reducers,
+  } = options || {};
 
   return ({ children }: { children?: ReactNode }) => {
     let result = (
@@ -63,6 +71,10 @@ function createWrapper(options?: Options) {
       result = <QueryParamProvider>{result}</QueryParamProvider>;
     }
 
+    if (useRouter) {
+      result = <BrowserRouter>{result}</BrowserRouter>;
+    }
+
     return result;
   };
 }
diff --git a/superset-frontend/spec/javascripts/dashboard/components/DashboardBuilder_spec.jsx b/superset-frontend/spec/javascripts/dashboard/components/DashboardBuilder_spec.jsx
index 20f63a6fcabd..937012a9f8be 100644
--- a/superset-frontend/spec/javascripts/dashboard/components/DashboardBuilder_spec.jsx
+++ b/superset-frontend/spec/javascripts/dashboard/components/DashboardBuilder_spec.jsx
@@ -23,7 +23,6 @@ import sinon from 'sinon';
 import fetchMock from 'fetch-mock';
 import { ParentSize } from '@vx/responsive';
 import { supersetTheme, ThemeProvider } from '@superset-ui/core';
-import { Sticky, StickyContainer } from 'react-sticky';
 import Tabs from 'src/components/Tabs';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
@@ -50,21 +49,21 @@ jest.mock('src/dashboard/actions/dashboardState');
 
 describe('DashboardBuilder', () => {
   let favStarStub;
-  let focusedTabStub;
+  let activeTabsStub;
 
   beforeAll(() => {
     // this is invoked on mount, so we stub it instead of making a request
     favStarStub = sinon
       .stub(dashboardStateActions, 'fetchFaveStar')
       .returns({ type: 'mock-action' });
-    focusedTabStub = sinon
-      .stub(dashboardStateActions, 'setLastFocusedTab')
+    activeTabsStub = sinon
+      .stub(dashboardStateActions, 'setActiveTabs')
       .returns({ type: 'mock-action' });
   });
 
   afterAll(() => {
     favStarStub.restore();
-    focusedTabStub.restore();
+    activeTabsStub.restore();
   });
 
   function setup(overrideState = {}, overrideStore) {
@@ -90,14 +89,14 @@ describe('DashboardBuilder', () => {
 
   it('should render a StickyContainer with class "dashboard"', () => {
     const wrapper = setup();
-    const stickyContainer = wrapper.find(StickyContainer);
+    const stickyContainer = wrapper.find('[data-test="dashboard-content"]');
     expect(stickyContainer).toHaveLength(1);
     expect(stickyContainer.prop('className')).toBe('dashboard');
   });
 
   it('should add the "dashboard--editing" class if editMode=true', () => {
     const wrapper = setup({ dashboardState: { editMode: true } });
-    const stickyContainer = wrapper.find(StickyContainer).first();
+    const stickyContainer = wrapper.find('[data-test="dashboard-content"]');
     expect(stickyContainer.prop('className')).toBe(
       'dashboard dashboard--editing',
     );
@@ -113,12 +112,12 @@ describe('DashboardBuilder', () => {
       { dashboardLayout: undoableDashboardLayoutWithTabs },
       mockStoreWithTabs,
     );
-    const sticky = wrapper.find(Sticky);
+
+    const sticky = wrapper.find('[data-test="top-level-tabs"]');
     const dashboardComponent = sticky.find(DashboardComponent);
 
     const tabChildren =
       undoableDashboardLayoutWithTabs.present.TABS_ID.children;
-    expect(sticky).toHaveLength(1);
     expect(dashboardComponent).toHaveLength(1 + tabChildren.length); // tab + tabs
     expect(dashboardComponent.at(0).prop('id')).toBe('TABS_ID');
     tabChildren.forEach((tabId, i) => {
diff --git a/superset-frontend/spec/javascripts/dashboard/components/FiltersBadge_spec.tsx b/superset-frontend/spec/javascripts/dashboard/components/FiltersBadge_spec.tsx
index d6bd4974d548..f24b973199de 100644
--- a/superset-frontend/spec/javascripts/dashboard/components/FiltersBadge_spec.tsx
+++ b/superset-frontend/spec/javascripts/dashboard/components/FiltersBadge_spec.tsx
@@ -20,10 +20,15 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { supersetTheme } from '@superset-ui/core';
 import { Provider } from 'react-redux';
+import { Store } from 'redux';
 import * as SupersetUI from '@superset-ui/core';
-import { CHART_UPDATE_SUCCEEDED } from 'src/chart/chartAction';
+import { styledMount as mount } from 'spec/helpers/theming';
+import {
+  CHART_RENDERING_SUCCEEDED,
+  CHART_UPDATE_SUCCEEDED,
+} from 'src/chart/chartAction';
 import { buildActiveFilters } from 'src/dashboard/util/activeDashboardFilters';
-import FiltersBadge from 'src/dashboard/containers/FiltersBadge';
+import { FiltersBadge } from 'src/dashboard/components/FiltersBadge';
 import {
   getMockStoreWithFilters,
   getMockStoreWithNativeFilters,
@@ -34,6 +39,15 @@ import { dashboardWithFilter } from 'spec/fixtures/mockDashboardLayout';
 import Icons from 'src/components/Icons';
 import { FeatureFlag } from 'src/featureFlags';
 
+const defaultStore = getMockStoreWithFilters();
+function setup(store: Store = defaultStore) {
+  return mount(
+    <Provider store={store}>
+      <FiltersBadge chartId={sliceId} />
+    </Provider>,
+  );
+}
+
 describe('FiltersBadge', () => {
   // there's this bizarre "active filters" thing
   // that doesn't actually use any kind of state management.
@@ -71,9 +85,7 @@ describe('FiltersBadge', () => {
           <FiltersBadge chartId={sliceId} />,
         </Provider>,
       );
-      expect(
-        wrapper.dive().find('[data-test="applied-filter-count"]'),
-      ).not.toExist();
+      expect(wrapper.find('[data-test="applied-filter-count"]')).not.toExist();
     });
 
     it('shows the indicator when filters have been applied', () => {
@@ -91,14 +103,13 @@ describe('FiltersBadge', () => {
         ],
         dashboardFilters,
       });
-      const wrapper = shallow(
-        <FiltersBadge {...{ store }} chartId={sliceId} />,
-      ).dive();
-      expect(wrapper.dive().find('DetailsPanelPopover')).toExist();
-      expect(
-        wrapper.dive().find('[data-test="applied-filter-count"]'),
-      ).toHaveText('1');
-      expect(wrapper.dive().find('WarningFilled')).not.toExist();
+      store.dispatch({ type: CHART_RENDERING_SUCCEEDED, key: sliceId });
+      const wrapper = setup(store);
+      expect(wrapper.find('DetailsPanelPopover')).toExist();
+      expect(wrapper.find('[data-test="applied-filter-count"]')).toHaveText(
+        '1',
+      );
+      expect(wrapper.find('WarningFilled')).not.toExist();
     });
 
     it("shows a warning when there's a rejected filter", () => {
@@ -118,19 +129,18 @@ describe('FiltersBadge', () => {
         ],
         dashboardFilters,
       });
-      const wrapper = shallow(
-        <FiltersBadge {...{ store }} chartId={sliceId} />,
-      ).dive();
-      expect(wrapper.dive().find('DetailsPanelPopover')).toExist();
-      expect(
-        wrapper.dive().find('[data-test="applied-filter-count"]'),
-      ).toHaveText('0');
+      store.dispatch({ type: CHART_RENDERING_SUCCEEDED, key: sliceId });
+      const wrapper = setup(store);
+      expect(wrapper.find('DetailsPanelPopover')).toExist();
+      expect(wrapper.find('[data-test="applied-filter-count"]')).toHaveText(
+        '0',
+      );
       expect(
-        wrapper.dive().find('[data-test="incompatible-filter-count"]'),
+        wrapper.find('[data-test="incompatible-filter-count"]'),
       ).toHaveText('1');
       // to look at the shape of the wrapper use:
-      // console.log(wrapper.dive().debug())
-      expect(wrapper.dive().find(Icons.AlertSolid)).toExist();
+      // console.log(wrapper.debug())
+      expect(wrapper.find(Icons.AlertSolid)).toExist();
     });
   });
 
@@ -149,14 +159,9 @@ describe('FiltersBadge', () => {
           },
         ],
       });
-      const wrapper = shallow(
-        <Provider store={store}>
-          <FiltersBadge chartId={sliceId} />,
-        </Provider>,
-      );
-      expect(
-        wrapper.dive().find('[data-test="applied-filter-count"]'),
-      ).not.toExist();
+      store.dispatch({ type: CHART_RENDERING_SUCCEEDED, key: sliceId });
+      const wrapper = setup(store);
+      expect(wrapper.find('[data-test="applied-filter-count"]')).not.toExist();
     });
 
     it('shows the indicator when filters have been applied', () => {
@@ -177,14 +182,13 @@ describe('FiltersBadge', () => {
           },
         ],
       });
-      const wrapper = shallow(
-        <FiltersBadge {...{ store }} chartId={sliceId} />,
-      ).dive();
-      expect(wrapper.dive().find('DetailsPanelPopover')).toExist();
-      expect(
-        wrapper.dive().find('[data-test="applied-filter-count"]'),
-      ).toHaveText('1');
-      expect(wrapper.dive().find('WarningFilled')).not.toExist();
+      store.dispatch({ type: CHART_RENDERING_SUCCEEDED, key: sliceId });
+      const wrapper = setup(store);
+      expect(wrapper.find('DetailsPanelPopover')).toExist();
+      expect(wrapper.find('[data-test="applied-filter-count"]')).toHaveText(
+        '1',
+      );
+      expect(wrapper.find('WarningFilled')).not.toExist();
     });
 
     it("shows a warning when there's a rejected filter", () => {
@@ -207,17 +211,16 @@ describe('FiltersBadge', () => {
           },
         ],
       });
-      const wrapper = shallow(
-        <FiltersBadge {...{ store }} chartId={sliceId} />,
-      ).dive();
-      expect(wrapper.dive().find('DetailsPanelPopover')).toExist();
-      expect(
-        wrapper.dive().find('[data-test="applied-filter-count"]'),
-      ).toHaveText('0');
+      store.dispatch({ type: CHART_RENDERING_SUCCEEDED, key: sliceId });
+      const wrapper = setup(store);
+      expect(wrapper.find('DetailsPanelPopover')).toExist();
+      expect(wrapper.find('[data-test="applied-filter-count"]')).toHaveText(
+        '0',
+      );
       expect(
-        wrapper.dive().find('[data-test="incompatible-filter-count"]'),
+        wrapper.find('[data-test="incompatible-filter-count"]'),
       ).toHaveText('1');
-      expect(wrapper.dive().find(Icons.AlertSolid)).toExist();
+      expect(wrapper.find(Icons.AlertSolid)).toExist();
     });
   });
 });
diff --git a/superset-frontend/spec/javascripts/dashboard/components/RefreshIntervalModal_spec.jsx b/superset-frontend/spec/javascripts/dashboard/components/RefreshIntervalModal_spec.jsx
index fd6952ba1c74..711dc45f120f 100644
--- a/superset-frontend/spec/javascripts/dashboard/components/RefreshIntervalModal_spec.jsx
+++ b/superset-frontend/spec/javascripts/dashboard/components/RefreshIntervalModal_spec.jsx
@@ -54,7 +54,7 @@ describe('RefreshIntervalModal', () => {
   });
   it('should change refreshFrequency with edit mode', () => {
     const wrapper = getMountWrapper(mockedProps);
-    wrapper.instance().handleFrequencyChange({ value: 30 });
+    wrapper.instance().handleFrequencyChange(30);
     wrapper.instance().onSave();
     expect(mockedProps.onChange).toHaveBeenCalled();
     expect(mockedProps.onChange).toHaveBeenCalledWith(30, mockedProps.editMode);
@@ -69,11 +69,11 @@ describe('RefreshIntervalModal', () => {
     const wrapper = getMountWrapper(props);
     wrapper.find('span[role="button"]').simulate('click');
 
-    wrapper.instance().handleFrequencyChange({ value: 30 });
+    wrapper.instance().handleFrequencyChange(30);
     wrapper.update();
     expect(wrapper.find(ModalTrigger).find(Alert)).toExist();
 
-    wrapper.instance().handleFrequencyChange({ value: 3601 });
+    wrapper.instance().handleFrequencyChange(3601);
     wrapper.update();
     expect(wrapper.find(ModalTrigger).find(Alert)).not.toExist();
   });
diff --git a/superset-frontend/spec/javascripts/dashboard/components/SliceAdder_spec.jsx b/superset-frontend/spec/javascripts/dashboard/components/SliceAdder_spec.jsx
index 2a0cb55cadd5..16703d0505ce 100644
--- a/superset-frontend/spec/javascripts/dashboard/components/SliceAdder_spec.jsx
+++ b/superset-frontend/spec/javascripts/dashboard/components/SliceAdder_spec.jsx
@@ -155,10 +155,10 @@ describe('SliceAdder', () => {
     });
 
     it('handleSelect', () => {
-      const newSortBy = { value: 'viz_type' };
+      const newSortBy = 'viz_type';
       wrapper.instance().handleSelect(newSortBy);
       expect(spy.calledOnce).toBe(true);
-      expect(spy.lastCall.args[1]).toBe(newSortBy.value);
+      expect(spy.lastCall.args[1]).toBe(newSortBy);
     });
 
     it('handleKeyPress', () => {
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/ChartHolder_spec.jsx b/superset-frontend/spec/javascripts/dashboard/components/gridComponents/ChartHolder_spec.jsx
index 2a1d0bc98b2b..3f7d0bfaa246 100644
--- a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/ChartHolder_spec.jsx
+++ b/superset-frontend/spec/javascripts/dashboard/components/gridComponents/ChartHolder_spec.jsx
@@ -36,6 +36,7 @@ import { sliceId } from 'spec/fixtures/mockChartQueries';
 import dashboardInfo from 'spec/fixtures/mockDashboardInfo';
 import { dashboardLayout as mockLayout } from 'spec/fixtures/mockDashboardLayout';
 import { sliceEntitiesForChart } from 'spec/fixtures/mockSliceEntities';
+import { initialState } from 'spec/javascripts/sqllab/fixtures';
 import { nativeFiltersInfo } from '../../fixtures/mockNativeFilters';
 
 describe('ChartHolder', () => {
@@ -61,6 +62,7 @@ describe('ChartHolder', () => {
 
   function setup(overrideProps) {
     const mockStore = getMockStore({
+      ...initialState,
       sliceEntities: sliceEntitiesForChart,
     });
 
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Chart_spec.jsx b/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Chart_spec.jsx
index 513fe4923fc0..fdbd766f7607 100644
--- a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Chart_spec.jsx
+++ b/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Chart_spec.jsx
@@ -23,7 +23,7 @@ import sinon from 'sinon';
 import Chart from 'src/dashboard/components/gridComponents/Chart';
 import SliceHeader from 'src/dashboard/components/SliceHeader';
 import ChartContainer from 'src/chart/ChartContainer';
-
+import * as exploreUtils from 'src/explore/exploreUtils';
 import { sliceEntitiesForChart as sliceEntities } from 'spec/fixtures/mockSliceEntities';
 import mockDatasource from 'spec/fixtures/mockDatasource';
 import chartQueries, {
@@ -38,6 +38,7 @@ describe('Chart', () => {
     updateSliceName() {},
 
     // from redux
+    maxRows: 666,
     chart: chartQueries[queryId],
     formData: chartQueries[queryId].formData,
     datasource: mockDatasource[sliceEntities.slices[queryId].datasource],
@@ -59,6 +60,8 @@ describe('Chart', () => {
     unsetFocusedFilterField() {},
     addSuccessToast() {},
     addDangerToast() {},
+    exportCSV() {},
+    exportFullCSV() {},
     componentId: 'test',
     dashboardId: 111,
     editMode: false,
@@ -86,7 +89,6 @@ describe('Chart', () => {
   it('should render a description if it has one and isExpanded=true', () => {
     const wrapper = setup();
     expect(wrapper.find('.slice_description')).not.toExist();
-
     wrapper.setProps({ ...props, isExpanded: true });
     expect(wrapper.find('.slice_description')).toExist();
   });
@@ -104,4 +106,30 @@ describe('Chart', () => {
     wrapper.instance().changeFilter();
     expect(changeFilter.callCount).toBe(1);
   });
+  it('should call exportChart when exportCSV is clicked', () => {
+    const stubbedExportCSV = sinon
+      .stub(exploreUtils, 'exportChart')
+      .returns(() => {});
+    const wrapper = setup();
+    wrapper.instance().exportCSV(props.slice.sliceId);
+    expect(stubbedExportCSV.calledOnce).toBe(true);
+    expect(stubbedExportCSV.lastCall.args[0]).toEqual(
+      expect.objectContaining({
+        formData: expect.anything(),
+        resultType: 'results',
+        resultFormat: 'csv',
+      }),
+    );
+    exploreUtils.exportChart.restore();
+  });
+  it('should call exportChart with row_limit props.maxRows when exportFullCSV is clicked', () => {
+    const stubbedExportCSV = sinon
+      .stub(exploreUtils, 'exportChart')
+      .returns(() => {});
+    const wrapper = setup();
+    wrapper.instance().exportFullCSV(props.slice.sliceId);
+    expect(stubbedExportCSV.calledOnce).toBe(true);
+    expect(stubbedExportCSV.lastCall.args[0].formData.row_limit).toEqual(666);
+    exploreUtils.exportChart.restore();
+  });
 });
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Column_spec.jsx b/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Column_spec.jsx
index 7ce170ae4d21..2e05c4c70f53 100644
--- a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Column_spec.jsx
+++ b/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Column_spec.jsx
@@ -34,8 +34,9 @@ import IconButton from 'src/dashboard/components/IconButton';
 import ResizableContainer from 'src/dashboard/components/resizable/ResizableContainer';
 import WithPopoverMenu from 'src/dashboard/components/menu/WithPopoverMenu';
 
-import { mockStore } from 'spec/fixtures/mockStore';
+import { getMockStore } from 'spec/fixtures/mockStore';
 import { dashboardLayout as mockLayout } from 'spec/fixtures/mockDashboardLayout';
+import { initialState } from 'spec/javascripts/sqllab/fixtures';
 
 describe('Column', () => {
   const columnWithoutChildren = {
@@ -65,6 +66,9 @@ describe('Column', () => {
   function setup(overrideProps) {
     // We have to wrap provide DragDropContext for the underlying DragDroppable
     // otherwise we cannot assert on DragDroppable children
+    const mockStore = getMockStore({
+      ...initialState,
+    });
     const wrapper = mount(
       <Provider store={mockStore}>
         <DndProvider backend={HTML5Backend}>
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Divider_spec.jsx b/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Divider_spec.jsx
index 3ab795265d0c..6331f6883295 100644
--- a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Divider_spec.jsx
+++ b/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Divider_spec.jsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React from 'react';
-import { mount } from 'enzyme';
+import { styledMount as mount } from 'spec/helpers/theming';
 import sinon from 'sinon';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Row_spec.jsx b/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Row_spec.jsx
index 9ece06e18013..c9bb21ba1672 100644
--- a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Row_spec.jsx
+++ b/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Row_spec.jsx
@@ -34,8 +34,9 @@ import WithPopoverMenu from 'src/dashboard/components/menu/WithPopoverMenu';
 import { DASHBOARD_GRID_ID } from 'src/dashboard/util/constants';
 import { supersetTheme, ThemeProvider } from '@superset-ui/core';
 
-import { mockStore } from 'spec/fixtures/mockStore';
+import { getMockStore } from 'spec/fixtures/mockStore';
 import { dashboardLayout as mockLayout } from 'spec/fixtures/mockDashboardLayout';
+import { initialState } from 'spec/javascripts/sqllab/fixtures';
 
 describe('Row', () => {
   const rowWithoutChildren = { ...mockLayout.present.ROW_ID, children: [] };
@@ -61,6 +62,9 @@ describe('Row', () => {
   function setup(overrideProps) {
     // We have to wrap provide DragDropContext for the underlying DragDroppable
     // otherwise we cannot assert on DragDroppable children
+    const mockStore = getMockStore({
+      ...initialState,
+    });
     const wrapper = mount(
       <Provider store={mockStore}>
         <DndProvider backend={HTML5Backend}>
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Tab_spec.jsx b/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Tab_spec.jsx
index 6fb564337cea..c0f15c35d8bc 100644
--- a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Tab_spec.jsx
+++ b/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Tab_spec.jsx
@@ -31,7 +31,8 @@ import Tab, {
   RENDER_TAB_CONTENT,
 } from 'src/dashboard/components/gridComponents/Tab';
 import { dashboardLayoutWithTabs } from 'spec/fixtures/mockDashboardLayout';
-import { mockStoreWithTabs } from 'spec/fixtures/mockStore';
+import { getMockStore } from 'spec/fixtures/mockStore';
+import { initialState } from 'spec/javascripts/sqllab/fixtures';
 
 describe('Tabs', () => {
   const props = {
@@ -62,8 +63,13 @@ describe('Tabs', () => {
   function setup(overrideProps) {
     // We have to wrap provide DragDropContext for the underlying DragDroppable
     // otherwise we cannot assert on DragDroppable children
+    const mockStore = getMockStore({
+      ...initialState,
+      dashboardLayout: dashboardLayoutWithTabs,
+      dashboardFilters: {},
+    });
     const wrapper = mount(
-      <Provider store={mockStoreWithTabs}>
+      <Provider store={mockStore}>
         <DndProvider backend={HTML5Backend}>
           <Tab {...props} {...overrideProps} />
         </DndProvider>
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Tabs_spec.jsx b/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Tabs_spec.jsx
index 2f15359c7f19..0985fd6ed930 100644
--- a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Tabs_spec.jsx
+++ b/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Tabs_spec.jsx
@@ -31,12 +31,13 @@ import DashboardComponent from 'src/dashboard/containers/DashboardComponent';
 import DeleteComponentButton from 'src/dashboard/components/DeleteComponentButton';
 import HoverMenu from 'src/dashboard/components/menu/HoverMenu';
 import DragDroppable from 'src/dashboard/components/dnd/DragDroppable';
-import Tabs from 'src/dashboard/components/gridComponents/Tabs';
+import { Tabs } from 'src/dashboard/components/gridComponents/Tabs';
 import { DASHBOARD_ROOT_ID } from 'src/dashboard/util/constants';
 import emptyDashboardLayout from 'src/dashboard/fixtures/emptyDashboardLayout';
 import { dashboardLayoutWithTabs } from 'spec/fixtures/mockDashboardLayout';
-import { mockStoreWithTabs } from 'spec/fixtures/mockStore';
+import { getMockStore } from 'spec/fixtures/mockStore';
 import { nativeFilters } from 'spec/fixtures/mockNativeFilters';
+import { initialState } from 'spec/javascripts/sqllab/fixtures';
 
 describe('Tabs', () => {
   fetchMock.post('glob:*/r/shortner/', {});
@@ -65,11 +66,17 @@ describe('Tabs', () => {
     nativeFilters: nativeFilters.filters,
   };
 
+  const mockStore = getMockStore({
+    ...initialState,
+    dashboardLayout: dashboardLayoutWithTabs,
+    dashboardFilters: {},
+  });
+
   function setup(overrideProps) {
     // We have to wrap provide DragDropContext for the underlying DragDroppable
     // otherwise we cannot assert on DragDroppable children
     const wrapper = mount(
-      <Provider store={mockStoreWithTabs}>
+      <Provider store={mockStore}>
         <DndProvider backend={HTML5Backend}>
           <Tabs {...props} {...overrideProps} />
         </DndProvider>
diff --git a/superset-frontend/spec/javascripts/dashboard/components/nativeFilters/NativeFiltersModal_spec.tsx b/superset-frontend/spec/javascripts/dashboard/components/nativeFilters/NativeFiltersModal_spec.tsx
index 5c355109676d..7fc0d7e2c74d 100644
--- a/superset-frontend/spec/javascripts/dashboard/components/nativeFilters/NativeFiltersModal_spec.tsx
+++ b/superset-frontend/spec/javascripts/dashboard/components/nativeFilters/NativeFiltersModal_spec.tsx
@@ -119,22 +119,12 @@ describe('FiltersConfigModal', () => {
       expect(onCancel.mock.calls).toHaveLength(1);
     });
 
-    it('shows correct alert message for an unsaved filter', async () => {
+    it('shows correct alert message for unsaved filters', async () => {
       addFilter();
       await clickCancel();
       expect(onCancel.mock.calls).toHaveLength(0);
       expect(wrapper.find(Alert).text()).toContain(
-        'Are you sure you want to cancel? "New filter" will not be saved.',
-      );
-    });
-
-    it('shows correct alert message for 2 unsaved filters', async () => {
-      addFilter();
-      addFilter();
-      await clickCancel();
-      expect(onCancel.mock.calls).toHaveLength(0);
-      expect(wrapper.find(Alert).text()).toContain(
-        'Are you sure you want to cancel? "New filter" and "New filter" will not be saved.',
+        'There are unsaved changes.',
       );
     });
   });
diff --git a/superset-frontend/spec/javascripts/dashboard/fixtures/mockNativeFilters.ts b/superset-frontend/spec/javascripts/dashboard/fixtures/mockNativeFilters.ts
index 8a106a2b5e88..0bf022d55fe8 100644
--- a/superset-frontend/spec/javascripts/dashboard/fixtures/mockNativeFilters.ts
+++ b/superset-frontend/spec/javascripts/dashboard/fixtures/mockNativeFilters.ts
@@ -62,7 +62,6 @@ export const nativeFiltersInfo: NativeFiltersState = {
         rootPath: [],
         excluded: [],
       },
-      isInstant: true,
       controlValues: {
         allowsMultipleValues: true,
         isRequired: false,
diff --git a/superset-frontend/spec/javascripts/dashboard/util/getDashboardUrl_spec.js b/superset-frontend/spec/javascripts/dashboard/util/getDashboardUrl_spec.js
index 77a19c771724..8ceac1ab296e 100644
--- a/superset-frontend/spec/javascripts/dashboard/util/getDashboardUrl_spec.js
+++ b/superset-frontend/spec/javascripts/dashboard/util/getDashboardUrl_spec.js
@@ -34,35 +34,64 @@ describe('getChartIdsFromLayout', () => {
   });
 
   it('should encode filters', () => {
-    const url = getDashboardUrl('path', filters);
+    const url = getDashboardUrl({ pathname: 'path', filters });
     expect(url).toBe(
       'path?preselect_filters=%7B%2235%22%3A%7B%22key%22%3A%5B%22value%22%5D%7D%7D',
     );
   });
 
   it('should encode filters with hash', () => {
-    const urlWithHash = getDashboardUrl('path', filters, 'iamhashtag');
+    const urlWithHash = getDashboardUrl({
+      pathname: 'path',
+      filters,
+      hash: 'iamhashtag',
+    });
     expect(urlWithHash).toBe(
       'path?preselect_filters=%7B%2235%22%3A%7B%22key%22%3A%5B%22value%22%5D%7D%7D#iamhashtag',
     );
   });
 
   it('should encode filters with standalone', () => {
-    const urlWithStandalone = getDashboardUrl(
-      'path',
+    const urlWithStandalone = getDashboardUrl({
+      pathname: 'path',
       filters,
-      '',
-      DashboardStandaloneMode.HIDE_NAV,
-    );
+      standalone: DashboardStandaloneMode.HIDE_NAV,
+    });
     expect(urlWithStandalone).toBe(
       `path?preselect_filters=%7B%2235%22%3A%7B%22key%22%3A%5B%22value%22%5D%7D%7D&standalone=${DashboardStandaloneMode.HIDE_NAV}`,
     );
   });
 
   it('should encode filters with missing standalone', () => {
-    const urlWithStandalone = getDashboardUrl('path', filters, '', null);
+    const urlWithStandalone = getDashboardUrl({
+      pathname: 'path',
+      filters,
+      standalone: null,
+    });
     expect(urlWithStandalone).toBe(
       'path?preselect_filters=%7B%2235%22%3A%7B%22key%22%3A%5B%22value%22%5D%7D%7D',
     );
   });
+
+  it('should encode native filters', () => {
+    const urlWithNativeFilters = getDashboardUrl({
+      pathname: 'path',
+      dataMask: {
+        'NATIVE_FILTER-foo123': {
+          filterState: {
+            label: 'custom label',
+            value: ['a', 'b'],
+          },
+        },
+        'NATIVE_FILTER-bar456': {
+          filterState: {
+            value: undefined,
+          },
+        },
+      },
+    });
+    expect(urlWithNativeFilters).toBe(
+      'path?preselect_filters=%7B%7D&native_filters=%28NATIVE_FILTER-bar456%3A%28filterState%3A%28value%3A%21n%29%29%2CNATIVE_FILTER-foo123%3A%28filterState%3A%28label%3A%27custom+label%27%2Cvalue%3A%21%28a%2Cb%29%29%29%29',
+    );
+  });
 });
diff --git a/superset-frontend/spec/javascripts/dashboard/util/getFormDataWithExtraFilters_spec.ts b/superset-frontend/spec/javascripts/dashboard/util/getFormDataWithExtraFilters_spec.ts
index 6561b60b6ab1..ddcb3cf55f48 100644
--- a/superset-frontend/spec/javascripts/dashboard/util/getFormDataWithExtraFilters_spec.ts
+++ b/superset-frontend/spec/javascripts/dashboard/util/getFormDataWithExtraFilters_spec.ts
@@ -48,6 +48,7 @@ describe('getFormDataWithExtraFilters', () => {
           val: ['United States'],
         },
       ],
+      datasource: '123',
     },
   };
   const mockArgs: GetFormDataWithExtraFiltersArguments = {
diff --git a/superset-frontend/spec/javascripts/datasource/ChangeDatasourceModal_spec.jsx b/superset-frontend/spec/javascripts/datasource/ChangeDatasourceModal_spec.jsx
index 4e7e9346f882..77a35eba895a 100644
--- a/superset-frontend/spec/javascripts/datasource/ChangeDatasourceModal_spec.jsx
+++ b/superset-frontend/spec/javascripts/datasource/ChangeDatasourceModal_spec.jsx
@@ -48,7 +48,7 @@ const datasourceData = {
 };
 
 const DATASOURCES_ENDPOINT =
-  'glob:*/api/v1/dataset/?q=(order_column:changed_on_delta_humanized,order_direction:asc,page:0,page_size:20)';
+  'glob:*/api/v1/dataset/?q=(order_column:changed_on_delta_humanized,order_direction:desc,page:0,page_size:25)';
 const DATASOURCE_ENDPOINT = `glob:*/datasource/get/${datasourceData.type}/${datasourceData.id}`;
 const DATASOURCE_PAYLOAD = { new: 'data' };
 
diff --git a/superset-frontend/spec/javascripts/datasource/DatasourceEditor_spec.jsx b/superset-frontend/spec/javascripts/datasource/DatasourceEditor_spec.jsx
index 39bcfad8658e..247d04a706ff 100644
--- a/superset-frontend/spec/javascripts/datasource/DatasourceEditor_spec.jsx
+++ b/superset-frontend/spec/javascripts/datasource/DatasourceEditor_spec.jsx
@@ -26,7 +26,7 @@ import { render, screen } from 'spec/helpers/testing-library';
 
 import { Radio } from 'src/components/Radio';
 
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import Tabs from 'src/components/Tabs';
 import DatasourceEditor from 'src/datasource/DatasourceEditor';
 import Field from 'src/CRUD/Field';
@@ -40,8 +40,7 @@ const props = {
   addDangerToast: () => {},
   onChange: () => {},
 };
-
-const DATASOURCE_ENDPOINT = 'glob:*/datasource/external_metadata/*';
+const DATASOURCE_ENDPOINT = 'glob:*/datasource/external_metadata_by_name/*';
 
 describe('DatasourceEditor', () => {
   const mockStore = configureStore([thunk]);
@@ -174,8 +173,8 @@ describe('DatasourceEditor', () => {
       const sourceTab = wrapper.find(Tabs.TabPane).first();
       expect(sourceTab.find(Radio).first().prop('disabled')).toBe(false);
 
-      const icon = sourceTab.find(Icon);
-      expect(icon.prop('name')).toBe('lock-unlocked');
+      const icon = wrapper.find(Icons.LockUnlocked);
+      expect(icon).toExist();
 
       const tableSelector = sourceTab.find(Field).shallow().find(TableSelector);
       expect(tableSelector.length).toBe(1);
@@ -187,8 +186,8 @@ describe('DatasourceEditor', () => {
       expect(sourceTab.find(Radio).length).toBe(2);
       expect(sourceTab.find(Radio).first().prop('disabled')).toBe(true);
 
-      const icon = sourceTab.find(Icon);
-      expect(icon.prop('name')).toBe('lock-locked');
+      const icon = wrapper.find(Icons.LockLocked);
+      expect(icon).toExist();
       icon.parent().simulate('click');
       expect(wrapper.state('isEditMode')).toBe(true);
 
@@ -210,7 +209,7 @@ describe('DatasourceEditor', () => {
     expect(sourceTab.find(Radio).length).toBe(2);
     expect(sourceTab.find(Radio).first().prop('disabled')).toBe(true);
 
-    const icon = sourceTab.find(Icon);
+    const icon = sourceTab.find(Icons.LockLocked);
     expect(icon).toHaveLength(0);
 
     isFeatureEnabledMock.mockRestore();
@@ -233,4 +232,21 @@ describe('DatasourceEditor RTL', () => {
     );
     expect(warningMarkdown.value).toEqual('someone');
   });
+  it('properly updates the metric information', async () => {
+    render(<DatasourceEditor {...props} />, {
+      useRedux: true,
+    });
+    const metricButton = screen.getByTestId('collection-tab-Metrics');
+    userEvent.click(metricButton);
+    const expandToggle = await screen.findAllByLabelText(/toggle expand/i);
+    userEvent.click(expandToggle[1]);
+    const certifiedBy = await screen.findByPlaceholderText(/certified by/i);
+    userEvent.type(certifiedBy, 'I am typing a new name');
+    const certificationDetails = await screen.findByPlaceholderText(
+      /certification details/i,
+    );
+    expect(certifiedBy.value).toEqual('I am typing a new name');
+    userEvent.type(certificationDetails, 'I am typing something new');
+    expect(certificationDetails.value).toEqual('I am typing something new');
+  });
 });
diff --git a/superset-frontend/spec/javascripts/explore/components/BoundsControl_spec.jsx b/superset-frontend/spec/javascripts/explore/components/BoundsControl_spec.jsx
index 2e25d130f02a..53e1cdc0f2d1 100644
--- a/superset-frontend/spec/javascripts/explore/components/BoundsControl_spec.jsx
+++ b/superset-frontend/spec/javascripts/explore/components/BoundsControl_spec.jsx
@@ -51,3 +51,12 @@ test('calls onChange with correct values', async () => {
     expect(defaultProps.onChange).toHaveBeenLastCalledWith([1, 2]),
   );
 });
+
+test('receives 0 value', async () => {
+  render(<BoundsControl {...defaultProps} />);
+  const minInput = screen.getAllByRole('spinbutton')[0];
+  userEvent.type(minInput, '0');
+  await waitFor(() =>
+    expect(defaultProps.onChange).toHaveBeenLastCalledWith([0, null]),
+  );
+});
diff --git a/superset-frontend/spec/javascripts/explore/components/ColorScheme_spec.jsx b/superset-frontend/spec/javascripts/explore/components/ColorScheme_spec.jsx
index ab776da70d6c..565c4f9f28b5 100644
--- a/superset-frontend/spec/javascripts/explore/components/ColorScheme_spec.jsx
+++ b/superset-frontend/spec/javascripts/explore/components/ColorScheme_spec.jsx
@@ -18,7 +18,7 @@
  */
 /* eslint-disable no-unused-expressions */
 import React from 'react';
-import { Select } from 'src/components/Select';
+import { Select } from 'src/components';
 import { getCategoricalSchemeRegistry } from '@superset-ui/core';
 import { styledMount as mount } from 'spec/helpers/theming';
 import ColorSchemeControl from 'src/explore/components/controls/ColorSchemeControl';
@@ -37,7 +37,7 @@ describe('ColorSchemeControl', () => {
     wrapper = mount(<ColorSchemeControl {...defaultProps} />);
   });
 
-  it('renders a Creatable', () => {
+  it('renders a Select', () => {
     expect(wrapper.find(Select)).toExist();
   });
 });
diff --git a/superset-frontend/spec/javascripts/explore/components/ExploreChartHeader_spec.jsx b/superset-frontend/spec/javascripts/explore/components/ExploreChartHeader_spec.jsx
deleted file mode 100644
index afa33d0d0647..000000000000
--- a/superset-frontend/spec/javascripts/explore/components/ExploreChartHeader_spec.jsx
+++ /dev/null
@@ -1,74 +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 React from 'react';
-import { shallow } from 'enzyme';
-
-import { ExploreChartHeader } from 'src/explore/components/ExploreChartHeader';
-import ExploreActionButtons from 'src/explore/components/ExploreActionButtons';
-import EditableTitle from 'src/components/EditableTitle';
-
-const saveSliceStub = jest.fn();
-const updateChartTitleStub = jest.fn();
-const mockProps = {
-  actions: {
-    saveSlice: saveSliceStub,
-    updateChartTitle: updateChartTitleStub,
-  },
-  can_overwrite: true,
-  can_download: true,
-  isStarred: true,
-  slice: {
-    form_data: {
-      viz_type: 'line',
-    },
-  },
-  table_name: 'foo',
-  form_data: {
-    viz_type: 'table',
-  },
-  timeout: 1000,
-  chart: {
-    id: 0,
-    queryResponse: {},
-  },
-  chartHeight: '30px',
-};
-
-describe('ExploreChartHeader', () => {
-  let wrapper;
-  beforeEach(() => {
-    wrapper = shallow(<ExploreChartHeader {...mockProps} />);
-  });
-
-  it('is valid', () => {
-    expect(React.isValidElement(<ExploreChartHeader {...mockProps} />)).toBe(
-      true,
-    );
-  });
-
-  it('renders', () => {
-    expect(wrapper.find(EditableTitle)).toExist();
-    expect(wrapper.find(ExploreActionButtons)).toExist();
-  });
-
-  it('should update title but not save', () => {
-    const editableTitle = wrapper.find(EditableTitle);
-    expect(editableTitle.props().onSaveTitle).toBe(updateChartTitleStub);
-  });
-});
diff --git a/superset-frontend/spec/javascripts/explore/components/MetricsControl_spec.jsx b/superset-frontend/spec/javascripts/explore/components/MetricsControl_spec.jsx
index 188469876c39..c255e6a62b53 100644
--- a/superset-frontend/spec/javascripts/explore/components/MetricsControl_spec.jsx
+++ b/superset-frontend/spec/javascripts/explore/components/MetricsControl_spec.jsx
@@ -67,60 +67,14 @@ const sumValueAdhocMetric = new AdhocMetric({
   label: 'SUM(value)',
 });
 
-describe('MetricsControl', () => {
+// TODO: rewrite the tests to RTL
+describe.skip('MetricsControl', () => {
   it('renders Select', () => {
     const { component } = setup();
     expect(component.find(LabelsContainer)).toExist();
   });
 
   describe('constructor', () => {
-    it('unifies options for the dropdown select with aggregates', () => {
-      const { component } = setup();
-      expect(component.state('options')).toEqual([
-        {
-          optionName: '_col_source',
-          type: 'VARCHAR(255)',
-          column_name: 'source',
-        },
-        {
-          optionName: '_col_target',
-          type: 'VARCHAR(255)',
-          column_name: 'target',
-        },
-        { optionName: '_col_value', type: 'DOUBLE', column_name: 'value' },
-        ...Object.keys(AGGREGATES).map(aggregate => ({
-          aggregate_name: aggregate,
-          optionName: `_aggregate_${aggregate}`,
-        })),
-        {
-          optionName: 'sum__value',
-          metric_name: 'sum__value',
-          expression: 'SUM(energy_usage.value)',
-        },
-        {
-          optionName: 'avg__value',
-          metric_name: 'avg__value',
-          expression: 'AVG(energy_usage.value)',
-        },
-      ]);
-    });
-
-    it('does not show aggregates in options if no columns', () => {
-      const { component } = setup({ columns: [] });
-      expect(component.state('options')).toEqual([
-        {
-          optionName: 'sum__value',
-          metric_name: 'sum__value',
-          expression: 'SUM(energy_usage.value)',
-        },
-        {
-          optionName: 'avg__value',
-          metric_name: 'avg__value',
-          expression: 'AVG(energy_usage.value)',
-        },
-      ]);
-    });
-
     it('coerces Adhoc Metrics from form data into instances of the AdhocMetric class and leaves saved metrics', () => {
       const { component } = setup({
         value: [
@@ -178,194 +132,7 @@ describe('MetricsControl', () => {
     });
   });
 
-  describe('checkIfAggregateInInput', () => {
-    it('handles an aggregate in the input', () => {
-      const { component } = setup();
-
-      expect(component.state('aggregateInInput')).toBeNull();
-      component.instance().checkIfAggregateInInput('AVG(');
-      expect(component.state('aggregateInInput')).toBe(AGGREGATES.AVG);
-    });
-
-    it('handles no aggregate in the input', () => {
-      const { component } = setup();
-
-      expect(component.state('aggregateInInput')).toBeNull();
-      component.instance().checkIfAggregateInInput('colu');
-      expect(component.state('aggregateInInput')).toBeNull();
-    });
-  });
-
   describe('option filter', () => {
-    it('includes user defined metrics', () => {
-      const { component } = setup({ datasourceType: 'druid' });
-
-      expect(
-        !!component.instance().selectFilterOption(
-          {
-            data: {
-              metric_name: 'a_metric',
-              optionName: 'a_metric',
-              expression: 'SUM(FANCY(metric))',
-            },
-          },
-          'a',
-        ),
-      ).toBe(true);
-    });
-
-    it('includes auto generated avg metrics for druid', () => {
-      const { component } = setup({ datasourceType: 'druid' });
-
-      expect(
-        !!component.instance().selectFilterOption(
-          {
-            data: {
-              metric_name: 'avg__metric',
-              optionName: 'avg__metric',
-              expression: 'AVG(metric)',
-            },
-          },
-          'a',
-        ),
-      ).toBe(true);
-    });
-
-    it('includes columns and aggregates', () => {
-      const { component } = setup();
-
-      expect(
-        !!component.instance().selectFilterOption(
-          {
-            data: {
-              type: 'VARCHAR(255)',
-              column_name: 'source',
-              optionName: '_col_source',
-            },
-          },
-          'sou',
-        ),
-      ).toBe(true);
-
-      expect(
-        !!component
-          .instance()
-          .selectFilterOption(
-            { data: { aggregate_name: 'AVG', optionName: '_aggregate_AVG' } },
-            'av',
-          ),
-      ).toBe(true);
-    });
-
-    it('includes columns based on verbose_name', () => {
-      const { component } = setup();
-
-      expect(
-        !!component.instance().selectFilterOption(
-          {
-            data: {
-              metric_name: 'sum__num',
-              verbose_name: 'babies',
-              optionName: '_col_sum_num',
-            },
-          },
-          'bab',
-        ),
-      ).toBe(true);
-    });
-
-    it('excludes auto generated avg metrics for sqla', () => {
-      const { component } = setup();
-
-      expect(
-        !!component.instance().selectFilterOption(
-          {
-            data: {
-              metric_name: 'avg__metric',
-              optionName: 'avg__metric',
-              expression: 'AVG(metric)',
-            },
-          },
-          'a',
-        ),
-      ).toBe(false);
-    });
-
-    it('includes custom made simple saved metrics', () => {
-      const { component } = setup();
-
-      expect(
-        !!component.instance().selectFilterOption(
-          {
-            data: {
-              metric_name: 'my_fancy_sum_metric',
-              optionName: 'my_fancy_sum_metric',
-              expression: 'SUM(value)',
-            },
-          },
-          'sum',
-        ),
-      ).toBe(true);
-    });
-
-    it('excludes auto generated metrics', () => {
-      const { component } = setup();
-
-      expect(
-        !!component.instance().selectFilterOption(
-          {
-            data: {
-              metric_name: 'sum__value',
-              optionName: 'sum__value',
-              expression: 'SUM(value)',
-            },
-          },
-          'sum',
-        ),
-      ).toBe(false);
-
-      expect(
-        !!component.instance().selectFilterOption(
-          {
-            data: {
-              metric_name: 'sum__value',
-              optionName: 'sum__value',
-              expression: 'SUM("table"."value")',
-            },
-          },
-          'sum',
-        ),
-      ).toBe(false);
-    });
-
-    it('filters out metrics if the input begins with an aggregate', () => {
-      const { component } = setup();
-      component.setState({ aggregateInInput: true });
-
-      expect(
-        !!component.instance().selectFilterOption(
-          {
-            data: { metric_name: 'metric', expression: 'SUM(FANCY(metric))' },
-          },
-          'SUM(',
-        ),
-      ).toBe(false);
-    });
-
-    it('includes columns if the input begins with an aggregate', () => {
-      const { component } = setup();
-      component.setState({ aggregateInInput: true });
-
-      expect(
-        !!component
-          .instance()
-          .selectFilterOption(
-            { data: { type: 'DOUBLE', column_name: 'value' } },
-            'SUM(',
-          ),
-      ).toBe(true);
-    });
-
     it('Removes metrics if savedMetrics changes', () => {
       const { props, component, onChange } = setup({
         value: [
diff --git a/superset-frontend/spec/javascripts/explore/components/VizTypeControl_spec.jsx b/superset-frontend/spec/javascripts/explore/components/VizTypeControl_spec.jsx
index 0a47e6b2bf99..c027fd0c3dff 100644
--- a/superset-frontend/spec/javascripts/explore/components/VizTypeControl_spec.jsx
+++ b/superset-frontend/spec/javascripts/explore/components/VizTypeControl_spec.jsx
@@ -18,22 +18,31 @@
  */
 import React from 'react';
 import sinon from 'sinon';
-import { shallow } from 'enzyme';
+import userEvent from '@testing-library/user-event';
 import { getChartMetadataRegistry, ChartMetadata } from '@superset-ui/core';
+import { render, screen } from 'spec/helpers/testing-library';
 import VizTypeControl from 'src/explore/components/controls/VizTypeControl';
-import Modal from 'src/components/Modal';
-import { Input } from 'src/common/components';
+import { DynamicPluginProvider } from 'src/components/DynamicPlugins';
+import { act } from 'react-dom/test-utils';
 
 const defaultProps = {
   name: 'viz_type',
   label: 'Visualization Type',
   value: 'vis1',
   onChange: sinon.spy(),
+  isModalOpenInit: true,
 };
 
-describe('VizTypeControl', () => {
-  let wrapper;
+/**
+ * AntD and/or the Icon component seems to be doing some kind of async changes,
+ * so even though the test passes, there is a warning an update to Icon was not
+ * wrapped in act(). This sufficiently act-ifies whatever side effects are going
+ * on and prevents those warnings.
+ */
+const waitForEffects = () =>
+  act(() => new Promise(resolve => setTimeout(resolve, 0)));
 
+describe('VizTypeControl', () => {
   const registry = getChartMetadataRegistry();
   registry
     .registerValue(
@@ -41,6 +50,7 @@ describe('VizTypeControl', () => {
       new ChartMetadata({
         name: 'vis1',
         thumbnail: '',
+        tags: ['Popular'],
       }),
     )
     .registerValue(
@@ -48,29 +58,37 @@ describe('VizTypeControl', () => {
       new ChartMetadata({
         name: 'vis2',
         thumbnail: '',
+        tags: ['foobar'],
       }),
     );
 
-  beforeEach(() => {
-    wrapper = shallow(<VizTypeControl {...defaultProps} />);
-  });
-
-  it('renders a Modal', () => {
-    expect(wrapper.find(Modal)).toExist();
+  beforeEach(async () => {
+    render(
+      <DynamicPluginProvider>
+        <VizTypeControl {...defaultProps} />
+      </DynamicPluginProvider>,
+    );
+    await waitForEffects();
   });
 
-  it('calls onChange when toggled', () => {
-    const select = wrapper.find('.viztype-selector-container').first();
-    select.simulate('click');
+  it('calls onChange when submitted', () => {
+    const thumbnail = screen.getAllByTestId('viztype-selector-container')[0];
+    const submit = screen.getByText('Select');
+    userEvent.click(thumbnail);
+    expect(defaultProps.onChange.called).toBe(false);
+    userEvent.click(submit);
     expect(defaultProps.onChange.called).toBe(true);
   });
-  it('filters images based on text input', () => {
-    expect(wrapper.find('img')).toHaveLength(2);
-    wrapper.find(Input).simulate('change', {
-      target: {
-        value: 'vis2',
-      },
-    });
-    expect(wrapper.find('img')).toExist();
+
+  it('filters images based on text input', async () => {
+    const thumbnails = screen.getByTestId('viztype-selector-container');
+    expect(thumbnails).toBeInTheDocument();
+
+    const searchInput = screen.getByPlaceholderText('Search all charts');
+    userEvent.type(searchInput, 'foo');
+    await waitForEffects();
+
+    const thumbnail = screen.getByTestId('viztype-selector-container');
+    expect(thumbnail).toBeInTheDocument();
   });
 });
diff --git a/superset-frontend/spec/javascripts/messageToasts/components/Toast_spec.jsx b/superset-frontend/spec/javascripts/messageToasts/components/Toast_spec.jsx
index fa5cae1f8214..0686f82f9fd7 100644
--- a/superset-frontend/spec/javascripts/messageToasts/components/Toast_spec.jsx
+++ b/superset-frontend/spec/javascripts/messageToasts/components/Toast_spec.jsx
@@ -18,6 +18,7 @@
  */
 import React from 'react';
 import { mount } from 'enzyme';
+import { ThemeProvider, supersetTheme } from '@superset-ui/core';
 import Toast from 'src/messageToasts/components/Toast';
 import { act } from 'react-dom/test-utils';
 import mockMessageToasts from '../mockMessageToasts';
@@ -27,7 +28,11 @@ const props = {
   onCloseToast() {},
 };
 
-const setup = overrideProps => mount(<Toast {...props} {...overrideProps} />);
+const setup = overrideProps =>
+  mount(<Toast {...props} {...overrideProps} />, {
+    wrappingComponent: ThemeProvider,
+    wrappingComponentProps: { theme: supersetTheme },
+  });
 
 describe('Toast', () => {
   it('should render', () => {
diff --git a/superset-frontend/spec/javascripts/sqllab/SqlEditorLeftBar_spec.jsx b/superset-frontend/spec/javascripts/sqllab/SqlEditorLeftBar_spec.jsx
index 1ba1ac821fb1..b153c148394c 100644
--- a/superset-frontend/spec/javascripts/sqllab/SqlEditorLeftBar_spec.jsx
+++ b/superset-frontend/spec/javascripts/sqllab/SqlEditorLeftBar_spec.jsx
@@ -81,9 +81,13 @@ describe('Left Panel Expansion', () => {
         </Provider>
       </ThemeProvider>,
     );
-    const dbSelect = screen.getByText(/select a database/i);
-    const schemaSelect = screen.getByText(/select a schema \(0\)/i);
-    const dropdown = screen.getByText(/Select table/i);
+    const dbSelect = screen.getByRole('combobox', {
+      name: 'Select a database',
+    });
+    const schemaSelect = screen.getByRole('combobox', {
+      name: 'Select a schema',
+    });
+    const dropdown = screen.getByText(/Select a table/i);
     const abUser = screen.getByText(/ab_user/i);
     expect(dbSelect).toBeInTheDocument();
     expect(schemaSelect).toBeInTheDocument();
diff --git a/superset-frontend/spec/javascripts/sqllab/TableElement_spec.jsx b/superset-frontend/spec/javascripts/sqllab/TableElement_spec.jsx
index 8c07008815ae..c10e12048ed2 100644
--- a/superset-frontend/spec/javascripts/sqllab/TableElement_spec.jsx
+++ b/superset-frontend/spec/javascripts/sqllab/TableElement_spec.jsx
@@ -55,7 +55,7 @@ describe('TableElement', () => {
         },
       },
     );
-    expect(wrapper.find(IconTooltip)).toHaveLength(5);
+    expect(wrapper.find(IconTooltip)).toHaveLength(4);
   });
   it('has 14 columns', () => {
     const wrapper = shallow(<TableElement {...mockedProps} />);
@@ -112,20 +112,20 @@ describe('TableElement', () => {
       },
     );
     expect(
-      wrapper.find(IconTooltip).at(2).hasClass('fa-sort-alpha-asc'),
+      wrapper.find(IconTooltip).at(1).hasClass('fa-sort-alpha-asc'),
     ).toEqual(true);
     expect(
-      wrapper.find(IconTooltip).at(2).hasClass('fa-sort-numeric-asc'),
+      wrapper.find(IconTooltip).at(1).hasClass('fa-sort-numeric-asc'),
     ).toEqual(false);
     wrapper.find('.header-container').hostNodes().simulate('click');
     expect(wrapper.find(ColumnElement).first().props().column.name).toBe('id');
     wrapper.find('.header-container').simulate('mouseEnter');
     wrapper.find('.sort-cols').hostNodes().simulate('click');
     expect(
-      wrapper.find(IconTooltip).at(2).hasClass('fa-sort-numeric-asc'),
+      wrapper.find(IconTooltip).at(1).hasClass('fa-sort-numeric-asc'),
     ).toEqual(true);
     expect(
-      wrapper.find(IconTooltip).at(2).hasClass('fa-sort-alpha-asc'),
+      wrapper.find(IconTooltip).at(1).hasClass('fa-sort-alpha-asc'),
     ).toEqual(false);
     expect(wrapper.find(ColumnElement).first().props().column.name).toBe(
       'active',
diff --git a/superset-frontend/src/CRUD/CollectionTable.tsx b/superset-frontend/src/CRUD/CollectionTable.tsx
index 6efe2e6a61ed..85380a553b68 100644
--- a/superset-frontend/src/CRUD/CollectionTable.tsx
+++ b/superset-frontend/src/CRUD/CollectionTable.tsx
@@ -42,24 +42,45 @@ interface CRUDCollectionProps {
   ) => ReactNode)[];
   onChange?: (arg0: any) => void;
   tableColumns: Array<any>;
+  sortColumns: Array<string>;
   stickyHeader?: boolean;
 }
 
+type Sort = number | string | boolean | any;
+
+enum SortOrder {
+  asc = 1,
+  desc = 2,
+  unsort = 0,
+}
+
 interface CRUDCollectionState {
   collection: object;
+  collectionArray: Array<object>;
   expandedColumns: object;
+  sortColumn: string;
+  sort: SortOrder;
+}
+
+function createCollectionArray(collection: object) {
+  return Object.keys(collection).map(k => collection[k]);
 }
 
 function createKeyedCollection(arr: Array<object>) {
-  const newArr = arr.map((o: any) => ({
+  const collectionArray = arr.map((o: any) => ({
     ...o,
     id: o.id || shortid.generate(),
   }));
-  const map = {};
-  newArr.forEach((o: any) => {
-    map[o.id] = o;
+
+  const collection = {};
+  collectionArray.forEach((o: any) => {
+    collection[o.id] = o;
   });
-  return map;
+
+  return {
+    collection,
+    collectionArray,
+  };
 }
 
 const CrudTableWrapper = styled.div<{ stickyHeader?: boolean }>`
@@ -67,15 +88,23 @@ const CrudTableWrapper = styled.div<{ stickyHeader?: boolean }>`
     stickyHeader &&
     `
       height: 350px;
-      overflow: auto;
+      overflow-y: auto;
+      overflow-x: auto;
 
+      .table {
+        min-width: 800px;
+      }
       thead th {
         background: #fff;
         position: sticky;
         top: 0;
         z-index: 9;
+        min
       }
     `}
+  th span {
+    vertical-align: ${({ theme }) => theme.gridUnit * -2}px;
+  }
 `;
 
 const CrudButtonWrapper = styled.div`
@@ -89,9 +118,16 @@ export default class CRUDCollection extends React.PureComponent<
 > {
   constructor(props: CRUDCollectionProps) {
     super(props);
+
+    const { collection, collectionArray } = createKeyedCollection(
+      props.collection,
+    );
     this.state = {
       expandedColumns: {},
-      collection: createKeyedCollection(props.collection),
+      collection,
+      collectionArray,
+      sortColumn: '',
+      sort: 0,
     };
     this.renderItem = this.renderItem.bind(this);
     this.onAddItem = this.onAddItem.bind(this);
@@ -100,12 +136,18 @@ export default class CRUDCollection extends React.PureComponent<
     this.onFieldsetChange = this.onFieldsetChange.bind(this);
     this.renderTableBody = this.renderTableBody.bind(this);
     this.changeCollection = this.changeCollection.bind(this);
+    this.sortColumn = this.sortColumn.bind(this);
+    this.renderSortIcon = this.renderSortIcon.bind(this);
   }
 
   UNSAFE_componentWillReceiveProps(nextProps: CRUDCollectionProps) {
     if (nextProps.collection !== this.props.collection) {
+      const { collection, collectionArray } = createKeyedCollection(
+        nextProps.collection,
+      );
       this.setState({
-        collection: createKeyedCollection(nextProps.collection),
+        collection,
+        collectionArray,
       });
     }
   }
@@ -126,10 +168,7 @@ export default class CRUDCollection extends React.PureComponent<
       if (!newItem.id) {
         newItem = { ...newItem, id: shortid.generate() };
       }
-      this.changeCollection({
-        ...this.state.collection,
-        [newItem.id]: newItem,
-      });
+      this.changeCollection(this.state.collection, newItem);
     }
   }
 
@@ -150,10 +189,18 @@ export default class CRUDCollection extends React.PureComponent<
     return label;
   }
 
-  changeCollection(collection: any) {
+  changeCollection(collection: any, newItem?: object) {
     this.setState({ collection });
     if (this.props.onChange) {
-      this.props.onChange(Object.keys(collection).map(k => collection[k]));
+      const collectionArray = this.state.collectionArray
+        .map((c: { id: number }) => collection[c.id])
+        // filter out removed items
+        .filter(c => c !== undefined);
+
+      if (newItem) {
+        collectionArray.unshift(newItem);
+      }
+      this.props.onChange(collectionArray);
     }
   }
 
@@ -181,15 +228,73 @@ export default class CRUDCollection extends React.PureComponent<
     }));
   }
 
+  sortColumn(col: string, sort = SortOrder.unsort) {
+    const { sortColumns } = this.props;
+    // default sort logic sorting string, boolean and number
+    const compareSort = (m: Sort, n: Sort) => {
+      if (typeof m === 'string') {
+        return (m || ' ').localeCompare(n);
+      }
+      return m - n;
+    };
+    return () => {
+      if (sortColumns?.includes(col)) {
+        // display in unsorted order if no sort specified
+        if (sort === SortOrder.unsort) {
+          const { collection } = createKeyedCollection(this.props.collection);
+          const collectionArray = createCollectionArray(collection);
+          this.setState({
+            collectionArray,
+            sortColumn: '',
+            sort,
+          });
+          return;
+        }
+
+        // newly ordered collection
+        const sorted = [
+          ...this.state.collectionArray,
+        ].sort((a: object, b: object) => compareSort(a[col], b[col]));
+        const newCollection =
+          sort === SortOrder.asc ? sorted : sorted.reverse();
+
+        this.setState(prevState => ({
+          ...prevState,
+          collectionArray: newCollection,
+          sortColumn: col,
+          sort,
+        }));
+      }
+    };
+  }
+
+  renderSortIcon(col: string) {
+    if (this.state.sortColumn === col && this.state.sort === SortOrder.asc) {
+      return <Icons.SortAsc onClick={this.sortColumn(col, 2)} />;
+    }
+    if (this.state.sortColumn === col && this.state.sort === SortOrder.desc) {
+      return <Icons.SortDesc onClick={this.sortColumn(col, 0)} />;
+    }
+    return <Icons.Sort onClick={this.sortColumn(col, 1)} />;
+  }
+
   renderHeaderRow() {
     const cols = this.effectiveTableColumns();
-    const { allowDeletes, expandFieldset, extraButtons } = this.props;
+    const {
+      allowDeletes,
+      expandFieldset,
+      extraButtons,
+      sortColumns,
+    } = this.props;
     return (
       <thead>
         <tr>
           {expandFieldset && <th aria-label="Expand" className="tiny-cell" />}
           {cols.map(col => (
-            <th key={col}>{this.getLabel(col)}</th>
+            <th key={col}>
+              {this.getLabel(col)}
+              {sortColumns?.includes(col) && this.renderSortIcon(col)}
+            </th>
           ))}
           {extraButtons}
           {allowDeletes && (
@@ -261,7 +366,6 @@ export default class CRUDCollection extends React.PureComponent<
             aria-label="Delete item"
             className="pointer"
             data-test="crud-delete-icon"
-            iconSize="m"
             role="button"
             tabIndex={0}
             onClick={this.deleteItem.bind(this, record.id)}
@@ -298,9 +402,7 @@ export default class CRUDCollection extends React.PureComponent<
   }
 
   renderTableBody() {
-    const data = Object.keys(this.state.collection).map(
-      k => this.state.collection[k],
-    );
+    const data = this.state.collectionArray;
     const content = data.length
       ? data.map(d => this.renderItem(d))
       : this.renderEmptyCell();
@@ -315,7 +417,7 @@ export default class CRUDCollection extends React.PureComponent<
             <span className="m-t-10 m-r-10">
               <Button
                 buttonSize="small"
-                buttonStyle="primary"
+                buttonStyle="tertiary"
                 onClick={this.onAddItem}
                 data-test="add-item-button"
               >
diff --git a/superset-frontend/src/SqlLab/actions/sqlLab.js b/superset-frontend/src/SqlLab/actions/sqlLab.js
index 18d2141bf36f..94391e0ac8a3 100644
--- a/superset-frontend/src/SqlLab/actions/sqlLab.js
+++ b/superset-frontend/src/SqlLab/actions/sqlLab.js
@@ -250,18 +250,22 @@ export function queryFailed(query, msg, link, errors) {
           })
         : Promise.resolve();
 
-    return sync
-      .then(() => dispatch({ type: QUERY_FAILED, query, msg, link, errors }))
-      .catch(() =>
-        dispatch(
-          addDangerToast(
-            t(
-              'An error occurred while storing the latest query id in the backend. ' +
-                'Please contact your administrator if this problem persists.',
+    return (
+      sync
+        .catch(() =>
+          dispatch(
+            addDangerToast(
+              t(
+                'An error occurred while storing the latest query id in the backend. ' +
+                  'Please contact your administrator if this problem persists.',
+              ),
             ),
           ),
-        ),
-      );
+        )
+        // We should always show the error message, even if we couldn't sync the
+        // state to the backend
+        .then(() => dispatch({ type: QUERY_FAILED, query, msg, link, errors }))
+    );
   };
 }
 
diff --git a/superset-frontend/src/SqlLab/components/HighlightedSql.tsx b/superset-frontend/src/SqlLab/components/HighlightedSql.tsx
index 2682f83a05eb..e4f40d8fa645 100644
--- a/superset-frontend/src/SqlLab/components/HighlightedSql.tsx
+++ b/superset-frontend/src/SqlLab/components/HighlightedSql.tsx
@@ -80,7 +80,7 @@ function HighlightSqlModal({ rawSql, sql }: HighlightedSqlModalTypes) {
       </SyntaxHighlighter>
       {rawSql && rawSql !== sql && (
         <div>
-          <h4>{t('Raw SQL')}</h4>
+          <h4>{t('Executed SQL')}</h4>
           <SyntaxHighlighter language="sql" style={github}>
             {rawSql}
           </SyntaxHighlighter>
diff --git a/superset-frontend/src/SqlLab/components/QueryTable/index.jsx b/superset-frontend/src/SqlLab/components/QueryTable/index.jsx
index d23fd49ca6d2..596cbe257f4e 100644
--- a/superset-frontend/src/SqlLab/components/QueryTable/index.jsx
+++ b/superset-frontend/src/SqlLab/components/QueryTable/index.jsx
@@ -22,13 +22,12 @@ import moment from 'moment';
 import Card from 'src/components/Card';
 import ProgressBar from 'src/components/ProgressBar';
 import Label from 'src/components/Label';
-import { t, styled } from '@superset-ui/core';
+import { t, useTheme } from '@superset-ui/core';
 import { useSelector } from 'react-redux';
 import TableView from 'src/components/TableView';
 import Button from 'src/components/Button';
 import { fDuration } from 'src/modules/dates';
 import Icons from 'src/components/Icons';
-import Icon from 'src/components/Icon';
 import { Tooltip } from 'src/components/Tooltip';
 import ResultSet from '../ResultSet';
 import ModalTrigger from '../../../components/ModalTrigger';
@@ -55,81 +54,65 @@ const openQuery = id => {
   window.open(url);
 };
 
-const statusAttributes = {
-  success: {
-    color: ({ theme }) => theme.colors.success.base,
-    config: {
-      name: 'check',
-      label: t('Success'),
-      status: 'success',
+const QueryTable = props => {
+  const theme = useTheme();
+  const statusAttributes = {
+    success: {
+      config: {
+        icon: <Icons.Check iconColor={theme.colors.success.base} />,
+        label: t('Success'),
+      },
     },
-  },
-  failed: {
-    color: ({ theme }) => theme.colors.error.base,
-    config: {
-      name: 'x-small',
-      label: t('Failed'),
-      status: 'failed',
+    failed: {
+      config: {
+        icon: <Icons.XSmall iconColor={theme.colors.error.base} />,
+        label: t('Failed'),
+      },
     },
-  },
-  stopped: {
-    color: ({ theme }) => theme.colors.error.base,
-    config: {
-      name: 'x-small',
-      label: t('Failed'),
-      status: 'failed',
+    stopped: {
+      config: {
+        icon: <Icons.XSmall iconColor={theme.colors.error.base} />,
+        label: t('Failed'),
+      },
     },
-  },
-  running: {
-    color: ({ theme }) => theme.colors.primary.base,
-    config: {
-      name: 'running',
-      label: t('Running'),
-      status: 'running',
+    running: {
+      config: {
+        icon: <Icons.Running iconColor={theme.colors.primary.base} />,
+        label: t('Running'),
+      },
     },
-  },
-  fetching: {
-    color: ({ theme }) => theme.colors.primary.base,
-    config: {
-      name: 'queued',
-      label: t('fetching'),
-      status: 'fetching',
+    fetching: {
+      config: {
+        icon: <Icons.Queued iconColor={theme.colors.primary.base} />,
+        label: t('fetching'),
+      },
     },
-  },
-  timed_out: {
-    color: ({ theme }) => theme.colors.grayscale.light1,
-    config: {
-      name: 'offline',
-      label: t('Offline'),
-      status: 'offline',
+    timed_out: {
+      config: {
+        icon: <Icons.Offline iconColor={theme.colors.grayscale.light1} />,
+        label: t('Offline'),
+      },
     },
-  },
-  scheduled: {
-    color: ({ theme }) => theme.colors.greyscale.base,
-    config: {
-      name: 'queued',
-      label: t('Scheduled'),
-      status: 'queued',
+    scheduled: {
+      config: {
+        icon: <Icons.Queued iconColor={theme.colors.grayscale.base} />,
+        label: t('Scheduled'),
+      },
     },
-  },
-  pending: {
-    color: ({ theme }) => theme.colors.greyscale.base,
-    config: {
-      name: 'queued',
-      label: t('Scheduled'),
-      status: 'queued',
+    pending: {
+      config: {
+        icon: <Icons.Queued iconColor={theme.colors.grayscale.base} />,
+        label: t('Scheduled'),
+      },
     },
-  },
-};
-
-const StatusIcon = styled(Icon, {
-  shouldForwardProp: prop => prop !== 'status',
-})`
-  color: ${({ status, theme }) =>
-    statusAttributes[status]?.color || theme.colors.grayscale.base};
-`;
+    error: {
+      config: {
+        icon: <Icons.Error iconColor={theme.colors.error.base} />,
+        label: t('Unknown Status'),
+      },
+    },
+  };
 
-const QueryTable = props => {
   const setHeaders = column => {
     if (column === 'sql') {
       return column.toUpperCase();
@@ -172,6 +155,8 @@ const QueryTable = props => {
     return props.queries
       .map(query => {
         const q = { ...query };
+        const status = statusAttributes[q.state] || statusAttributes.error;
+
         if (q.endDttm) {
           q.duration = fDuration(q.startDttm, q.endDttm);
         }
@@ -268,16 +253,8 @@ const QueryTable = props => {
             />
           );
         q.state = (
-          <Tooltip
-            title={statusAttributes[q.state].config.label}
-            placement="bottom"
-          >
-            <span>
-              <StatusIcon
-                name={statusAttributes[q.state].config.name}
-                status={statusAttributes[q.state].config.status}
-              />
-            </span>
+          <Tooltip title={status.config.label} placement="bottom">
+            <span>{status.config.icon}</span>
           </Tooltip>
         );
         q.actions = (
diff --git a/superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx b/superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx
index 9d22ce5b7c70..076904386294 100644
--- a/superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx
+++ b/superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx
@@ -21,7 +21,7 @@ import { t, styled, supersetTheme } from '@superset-ui/core';
 
 import { Menu } from 'src/common/components';
 import Button, { ButtonProps } from 'src/components/Button';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import {
   DropdownButton,
   DropdownButtonProps,
@@ -77,6 +77,10 @@ const StyledButton = styled.span`
     &:last-of-type {
       margin-right: ${({ theme }) => theme.gridUnit * 2}px;
     }
+    span[name='caret-down'] {
+      display: flex;
+      margin-right: ${({ theme }) => theme.gridUnit * -2}px;
+    }
   }
 `;
 
@@ -116,8 +120,8 @@ const RunQueryActionButton = ({
           ? {
               overlay: overlayCreateAsMenu,
               icon: (
-                <Icon
-                  color={
+                <Icons.CaretDown
+                  iconColor={
                     isDisabled
                       ? supersetTheme.colors.grayscale.base
                       : supersetTheme.colors.grayscale.light5
diff --git a/superset-frontend/src/SqlLab/components/SaveQuery.tsx b/superset-frontend/src/SqlLab/components/SaveQuery.tsx
index 6b589b758677..1c0dee426940 100644
--- a/superset-frontend/src/SqlLab/components/SaveQuery.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveQuery.tsx
@@ -18,15 +18,21 @@
  */
 import React, { useState } from 'react';
 import { Row, Col, Input, TextArea } from 'src/common/components';
-import { t, supersetTheme, styled } from '@superset-ui/core';
+import { t, styled } from '@superset-ui/core';
 import Button from 'src/components/Button';
 import { Form, FormItem } from 'src/components/Form';
 import Modal from 'src/components/Modal';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 
 const Styles = styled.span`
-  svg {
-    vertical-align: -${supersetTheme.gridUnit * 1.25}px;
+  span[role='img'] {
+    display: flex;
+    margin: 0;
+    color: ${({ theme }) => theme.colors.grayscale.base};
+    svg {
+      vertical-align: -${({ theme }) => theme.gridUnit * 1.25}px;
+      margin: 0;
+    }
   }
 `;
 
@@ -150,12 +156,7 @@ export default function SaveQuery({
   return (
     <Styles className="SaveQuery">
       <Button buttonSize="small" onClick={toggleSave}>
-        <Icon
-          name="save"
-          color={supersetTheme.colors.primary.base}
-          width={20}
-          height={20}
-        />{' '}
+        <Icons.Save iconSize="xl" />
         {isSaved ? t('Save') : t('Save as')}
       </Button>
       <Modal
diff --git a/superset-frontend/src/SqlLab/components/ShareSqlLabQuery.tsx b/superset-frontend/src/SqlLab/components/ShareSqlLabQuery.tsx
index 10e3e43c31c2..5f6c89c7b73c 100644
--- a/superset-frontend/src/SqlLab/components/ShareSqlLabQuery.tsx
+++ b/superset-frontend/src/SqlLab/components/ShareSqlLabQuery.tsx
@@ -17,11 +17,11 @@
  * under the License.
  */
 import React from 'react';
-import { t, useTheme } from '@superset-ui/core';
+import { t, useTheme, styled } from '@superset-ui/core';
 
 import Button from 'src/components/Button';
 import withToasts from 'src/messageToasts/enhancers/withToasts';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import CopyToClipboard from 'src/components/CopyToClipboard';
 import { storeQuery } from 'src/utils/common';
 import { getClientErrorObject } from 'src/utils/getClientErrorObject';
@@ -39,6 +39,16 @@ interface ShareSqlLabQueryPropTypes {
   addDangerToast: (msg: string) => void;
 }
 
+const StyledIcon = styled(Icons.Link)`
+  &:first-of-type {
+    margin: 0;
+    display: flex;
+    svg {
+      margin: 0;
+    }
+  }
+`;
+
 function ShareSqlLabQuery({
   queryEditor,
   addDangerToast,
@@ -86,14 +96,12 @@ function ShareSqlLabQuery({
       : t('Save the query to enable this feature');
     return (
       <Button buttonSize="small" tooltip={tooltip} disabled={!canShare}>
-        <Icon
-          name="link"
-          color={
+        <StyledIcon
+          iconColor={
             canShare ? theme.colors.primary.base : theme.colors.grayscale.base
           }
-          width={20}
-          height={20}
-        />{' '}
+          iconSize="xl"
+        />
         {t('Copy link')}
       </Button>
     );
diff --git a/superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx b/superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx
index f084fc4384fe..80f9e2d7985c 100644
--- a/superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx
+++ b/superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx
@@ -118,6 +118,9 @@ export default function SouthPane({
     }
     let results;
     if (latestQuery) {
+      if (latestQuery?.extra?.errors) {
+        latestQuery.errors = latestQuery.extra.errors;
+      }
       if (
         isFeatureEnabled(FeatureFlag.SQLLAB_BACKEND_PERSISTENCE) &&
         latestQuery.state === 'success' &&
diff --git a/superset-frontend/src/SqlLab/components/SqlEditor.jsx b/superset-frontend/src/SqlLab/components/SqlEditor.jsx
index 61efad9bfa6a..540cfb77f3f4 100644
--- a/superset-frontend/src/SqlLab/components/SqlEditor.jsx
+++ b/superset-frontend/src/SqlLab/components/SqlEditor.jsx
@@ -24,7 +24,7 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import PropTypes from 'prop-types';
 import Split from 'react-split';
-import { t, styled, supersetTheme } from '@superset-ui/core';
+import { t, styled, supersetTheme, withTheme } from '@superset-ui/core';
 import debounce from 'lodash/debounce';
 import throttle from 'lodash/throttle';
 import StyledModal from 'src/components/Modal';
@@ -38,7 +38,7 @@ import {
   Switch,
   Input,
 } from 'src/common/components';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import { detectOS } from 'src/utils/common';
 import {
   addQueryEditor,
@@ -194,6 +194,7 @@ class SqlEditor extends React.PureComponent {
       WINDOW_RESIZE_THROTTLE_MS,
     );
 
+    this.onBeforeUnload = this.onBeforeUnload.bind(this);
     this.renderDropdown = this.renderDropdown.bind(this);
   }
 
@@ -212,6 +213,7 @@ class SqlEditor extends React.PureComponent {
     this.setState({ height: this.getSqlEditorHeight() });
 
     window.addEventListener('resize', this.handleWindowResize);
+    window.addEventListener('beforeunload', this.onBeforeUnload);
 
     // setup hotkeys
     const hotkeys = this.getHotkeyConfig();
@@ -222,6 +224,7 @@ class SqlEditor extends React.PureComponent {
 
   componentWillUnmount() {
     window.removeEventListener('resize', this.handleWindowResize);
+    window.removeEventListener('beforeunload', this.onBeforeUnload);
   }
 
   onResizeStart() {
@@ -242,6 +245,16 @@ class SqlEditor extends React.PureComponent {
     }
   }
 
+  onBeforeUnload(event) {
+    if (
+      this.props.database?.extra_json?.cancel_query_on_windows_unload &&
+      this.props.latestQuery?.state === 'running'
+    ) {
+      event.preventDefault();
+      this.stopQuery();
+    }
+  }
+
   onSqlChanged(sql) {
     this.setState({ sql });
     this.setQueryEditorSqlWithDebounce(sql);
@@ -564,7 +577,7 @@ class SqlEditor extends React.PureComponent {
       this.props.database || {};
 
     const showMenu = allowCTAS || allowCVAS;
-
+    const { theme } = this.props;
     const runMenuBtn = (
       <Menu>
         {allowCTAS && (
@@ -639,7 +652,7 @@ class SqlEditor extends React.PureComponent {
                         this.props.defaultQueryLimit,
                     )}
                   </span>
-                  <Icon name="triangle-down" />
+                  <Icons.TriangleDown iconColor={theme.colors.grayscale.base} />
                 </a>
               </Dropdown>
             </LimitSelectStyled>
@@ -667,7 +680,7 @@ class SqlEditor extends React.PureComponent {
             <ShareSqlLabQuery queryEditor={qe} />
           </span>
           <Dropdown overlay={this.renderDropdown()} trigger="click">
-            <Icon name="more-horiz" />
+            <Icons.MoreHoriz iconColor={theme.colors.grayscale.base} />
           </Dropdown>
         </div>
       </StyledToolbar>
@@ -783,4 +796,5 @@ function mapDispatchToProps(dispatch) {
   );
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(SqlEditor);
+const themedSqlEditor = withTheme(SqlEditor);
+export default connect(mapStateToProps, mapDispatchToProps)(themedSqlEditor);
diff --git a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx
index 59af1d345da1..3989a23b6a76 100644
--- a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx
+++ b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx
@@ -21,8 +21,10 @@ import PropTypes from 'prop-types';
 import Button from 'src/components/Button';
 import { t, styled, css } from '@superset-ui/core';
 import Collapse from 'src/components/Collapse';
+import Icons from 'src/components/Icons';
 import TableElement from './TableElement';
 import TableSelector from '../../components/TableSelector';
+import { IconTooltip } from '../../components/IconTooltip';
 
 const propTypes = {
   queryEditor: PropTypes.object.isRequired,
@@ -134,6 +136,23 @@ export default class SqlEditorLeftBar extends React.PureComponent {
     this.props.actions.addTable(this.props.queryEditor, tableName, schemaName);
   }
 
+  renderExpandIconWithTooltip = ({ isActive }) => (
+    <IconTooltip
+      css={css`
+        transform: rotate(90deg);
+      `}
+      aria-label="Collapse"
+      tooltip={t(`${isActive ? 'Collapse' : 'Expand'} table preview`)}
+    >
+      <Icons.RightOutlined
+        iconSize="s"
+        css={css`
+          transform: ${isActive ? 'rotateY(180deg)' : ''};
+        `}
+      />
+    </IconTooltip>
+  );
+
   render() {
     const shouldShowReset = window.location.search === '?reset=1';
     const tableMetaDataHeight = this.props.height - 130; // 130 is the height of the selects above
@@ -184,6 +203,7 @@ export default class SqlEditorLeftBar extends React.PureComponent {
               expandIconPosition="right"
               ghost
               onChange={this.onToggleTable}
+              expandIcon={this.renderExpandIconWithTooltip}
             >
               {this.props.tables.map(table => (
                 <TableElement
diff --git a/superset-frontend/src/SqlLab/components/TableElement.jsx b/superset-frontend/src/SqlLab/components/TableElement.tsx
similarity index 76%
rename from superset-frontend/src/SqlLab/components/TableElement.jsx
rename to superset-frontend/src/SqlLab/components/TableElement.tsx
index 384771a96e83..d64ce2157fba 100644
--- a/superset-frontend/src/SqlLab/components/TableElement.jsx
+++ b/superset-frontend/src/SqlLab/components/TableElement.tsx
@@ -17,7 +17,6 @@
  * under the License.
  */
 import React, { useState } from 'react';
-import PropTypes from 'prop-types';
 import Collapse from 'src/components/Collapse';
 import Card from 'src/components/Card';
 import ButtonGroup from 'src/components/ButtonGroup';
@@ -25,23 +24,42 @@ import { t, styled } from '@superset-ui/core';
 import { debounce } from 'lodash';
 
 import { Tooltip } from 'src/components/Tooltip';
-import Icons from 'src/components/Icons';
 import CopyToClipboard from '../../components/CopyToClipboard';
 import { IconTooltip } from '../../components/IconTooltip';
-import ColumnElement from './ColumnElement';
+import ColumnElement, { ColumnKeyTypeType } from './ColumnElement';
 import ShowSQL from './ShowSQL';
 import ModalTrigger from '../../components/ModalTrigger';
 import Loading from '../../components/Loading';
 
-const propTypes = {
-  table: PropTypes.object,
-  actions: PropTypes.object,
-};
+interface Column {
+  name: string;
+  keys?: { type: ColumnKeyTypeType }[];
+  type: string;
+}
 
-const defaultProps = {
-  actions: {},
-  table: null,
-};
+interface Table {
+  id: string;
+  name: string;
+  partitions?: {
+    partitionQuery: string;
+    latest: object[];
+  };
+  metadata?: Record<string, string>;
+  indexes?: object[];
+  selectStar?: string;
+  view?: string;
+  isMetadataLoading: boolean;
+  isExtraMetadataLoading: boolean;
+  columns: Column[];
+}
+
+interface TableElementProps {
+  table: Table;
+  actions: {
+    removeDataPreview: (table: Table) => void;
+    removeTable: (table: Table) => void;
+  };
+}
 
 const StyledSpan = styled.span`
   color: ${({ theme }) => theme.colors.primary.dark1};
@@ -53,16 +71,14 @@ const StyledSpan = styled.span`
 
 const Fade = styled.div`
   transition: all ${({ theme }) => theme.transitionTiming}s;
-  opacity: ${props => (props.hovered ? 1 : 0)};
+  opacity: ${(props: { hovered: boolean }) => (props.hovered ? 1 : 0)};
 `;
 
-const TableElement = props => {
+const TableElement = ({ table, actions, ...props }: TableElementProps) => {
   const [sortColumns, setSortColumns] = useState(false);
   const [hovered, setHovered] = useState(false);
 
-  const { table, actions, isActive } = props;
-
-  const setHover = hovered => {
+  const setHover = (hovered: boolean) => {
     debounce(() => setHovered(hovered), 100)();
   };
 
@@ -76,7 +92,8 @@ const TableElement = props => {
   };
 
   const renderWell = () => {
-    let header;
+    let partitions;
+    let metadata;
     if (table.partitions) {
       let partitionQuery;
       let partitionClipBoard;
@@ -92,22 +109,41 @@ const TableElement = props => {
           />
         );
       }
-      let latest = Object.entries(table.partitions?.latest || []).map(
-        ([key, value]) => `${key}=${value}`,
-      );
-      latest = latest.join('/');
-      header = (
-        <Card size="small">
-          <div>
-            <small>
-              {t('latest partition:')} {latest}
-            </small>{' '}
-            {partitionClipBoard}
-          </div>
-        </Card>
+      const latest = Object.entries(table.partitions?.latest || [])
+        .map(([key, value]) => `${key}=${value}`)
+        .join('/');
+
+      partitions = (
+        <div>
+          <small>
+            {t('latest partition:')} {latest}
+          </small>{' '}
+          {partitionClipBoard}
+        </div>
       );
     }
-    return header;
+
+    if (table.metadata) {
+      metadata = Object.entries(table.metadata).map(([key, value]) => (
+        <div>
+          <small>
+            <strong>{key}:</strong> {value}
+          </small>
+        </div>
+      ));
+    }
+
+    if (!partitions && (!metadata || !metadata.length)) {
+      // hide partition and metadata card view
+      return null;
+    }
+
+    return (
+      <Card size="small">
+        {partitions}
+        {metadata}
+      </Card>
+    );
   };
 
   const renderControls = () => {
@@ -142,9 +178,9 @@ const TableElement = props => {
           }
           onClick={toggleSortColumns}
           tooltip={
-            !sortColumns
-              ? t('Sort columns alphabetically')
-              : t('Original table column order')
+            sortColumns
+              ? t('Original table column order')
+              : t('Sort columns alphabetically')
           }
         />
         {table.selectStar && (
@@ -216,16 +252,10 @@ const TableElement = props => {
     if (table.columns) {
       cols = table.columns.slice();
       if (sortColumns) {
-        cols.sort((a, b) => {
+        cols.sort((a: Column, b: Column) => {
           const colA = a.name.toUpperCase();
           const colB = b.name.toUpperCase();
-          if (colA < colB) {
-            return -1;
-          }
-          if (colA > colB) {
-            return 1;
-          }
-          return 0;
+          return colA < colB ? -1 : colA > colB ? 1 : 0;
         });
       }
     }
@@ -247,41 +277,17 @@ const TableElement = props => {
     return metadata;
   };
 
-  const collapseExpandIcon = () => (
-    <IconTooltip
-      style={{
-        position: 'fixed',
-        right: '16px',
-        left: 'auto',
-        fontSize: '12px',
-        transform: 'rotate(90deg)',
-        display: 'flex',
-        alignItems: 'center',
-      }}
-      aria-label="Collapse"
-      tooltip={t(`${isActive ? 'Collapse' : 'Expand'} table preview`)}
-    >
-      <Icons.RightOutlined
-        iconSize="s"
-        style={isActive ? { transform: 'rotateY(180deg)' } : null}
-      />
-    </IconTooltip>
-  );
-
   return (
     <Collapse.Panel
       {...props}
+      key={table.id}
       header={renderHeader()}
       className="TableElement"
       forceRender
-      expandIcon={collapseExpandIcon}
     >
       {renderBody()}
     </Collapse.Panel>
   );
 };
 
-TableElement.propTypes = propTypes;
-TableElement.defaultProps = defaultProps;
-
 export default TableElement;
diff --git a/superset-frontend/src/SqlLab/reducers/getInitialState.js b/superset-frontend/src/SqlLab/reducers/getInitialState.js
index 8052476f9bd6..92ffa0d6decf 100644
--- a/superset-frontend/src/SqlLab/reducers/getInitialState.js
+++ b/superset-frontend/src/SqlLab/reducers/getInitialState.js
@@ -117,6 +117,8 @@ export default function getInitialState({
           foreignKeys,
           indexes,
           dataPreviewQueryId,
+          partitions,
+          metadata,
         } = tableSchema.description;
         const table = {
           dbId: tableSchema.database_id,
@@ -133,6 +135,8 @@ export default function getInitialState({
           primaryKey,
           foreignKeys,
           indexes,
+          partitions,
+          metadata,
         };
         tables.push(table);
       });
diff --git a/superset-frontend/src/SqlLab/reducers/sqlLab.js b/superset-frontend/src/SqlLab/reducers/sqlLab.js
index daa06a97c88d..9e423ba7c65b 100644
--- a/superset-frontend/src/SqlLab/reducers/sqlLab.js
+++ b/superset-frontend/src/SqlLab/reducers/sqlLab.js
@@ -499,7 +499,10 @@ export default function sqlLabReducer(state = {}, action) {
     [actions.SET_DATABASES]() {
       const databases = {};
       action.databases.forEach(db => {
-        databases[db.id] = db;
+        databases[db.id] = {
+          ...db,
+          extra_json: JSON.parse(db.extra || ''),
+        };
       });
       return { ...state, databases };
     },
diff --git a/superset-frontend/src/SqlLab/types.ts b/superset-frontend/src/SqlLab/types.ts
index 593695919c58..a50d66401971 100644
--- a/superset-frontend/src/SqlLab/types.ts
+++ b/superset-frontend/src/SqlLab/types.ts
@@ -30,6 +30,7 @@ export type QueryState =
   | 'running'
   | 'scheduled'
   | 'success'
+  | 'fetching'
   | 'timed_out';
 
 export type Query = {
diff --git a/superset-frontend/src/addSlice/AddSliceContainer.test.tsx b/superset-frontend/src/addSlice/AddSliceContainer.test.tsx
index c3b8bac8a4b9..00e7276a5864 100644
--- a/superset-frontend/src/addSlice/AddSliceContainer.test.tsx
+++ b/superset-frontend/src/addSlice/AddSliceContainer.test.tsx
@@ -19,19 +19,18 @@
 import React from 'react';
 import { ReactWrapper } from 'enzyme';
 import Button from 'src/components/Button';
-import Select from 'src/components/Select';
+import { Select } from 'src/components';
 import AddSliceContainer, {
   AddSliceContainerProps,
   AddSliceContainerState,
 } from 'src/addSlice/AddSliceContainer';
-import VizTypeControl from 'src/explore/components/controls/VizTypeControl';
+import VizTypeGallery from 'src/explore/components/controls/VizTypeControl/VizTypeGallery';
 import { styledMount as mount } from 'spec/helpers/theming';
+import { act } from 'spec/helpers/testing-library';
 
-const defaultProps = {
-  datasources: [
-    { label: 'my first table', value: '1__table' },
-    { label: 'another great table', value: '2__table' },
-  ],
+const datasource = {
+  value: '1',
+  label: 'table',
 };
 
 describe('AddSliceContainer', () => {
@@ -41,21 +40,19 @@ describe('AddSliceContainer', () => {
     AddSliceContainer
   >;
 
-  beforeEach(() => {
-    wrapper = mount(<AddSliceContainer {...defaultProps} />) as ReactWrapper<
+  beforeEach(async () => {
+    wrapper = mount(<AddSliceContainer />) as ReactWrapper<
       AddSliceContainerProps,
       AddSliceContainerState,
       AddSliceContainer
     >;
-  });
-
-  it('uses table as default visType', () => {
-    expect(wrapper.state().visType).toBe('table');
+    // suppress a warning caused by some unusual async behavior in Icon
+    await act(() => new Promise(resolve => setTimeout(resolve, 0)));
   });
 
   it('renders a select and a VizTypeControl', () => {
     expect(wrapper.find(Select)).toExist();
-    expect(wrapper.find(VizTypeControl)).toExist();
+    expect(wrapper.find(VizTypeGallery)).toExist();
   });
 
   it('renders a button', () => {
@@ -68,12 +65,10 @@ describe('AddSliceContainer', () => {
     ).toHaveLength(1);
   });
 
-  it('renders an enabled button if datasource is selected', () => {
-    const datasourceValue = defaultProps.datasources[0].value;
+  it('renders an enabled button if datasource and viz type is selected', () => {
     wrapper.setState({
-      datasourceValue,
-      datasourceId: datasourceValue.split('__')[0],
-      datasourceType: datasourceValue.split('__')[1],
+      datasource,
+      visType: 'table',
     });
     expect(
       wrapper.find(Button).find({ disabled: true }).hostNodes(),
@@ -81,14 +76,12 @@ describe('AddSliceContainer', () => {
   });
 
   it('formats explore url', () => {
-    const datasourceValue = defaultProps.datasources[0].value;
     wrapper.setState({
-      datasourceValue,
-      datasourceId: datasourceValue.split('__')[0],
-      datasourceType: datasourceValue.split('__')[1],
+      datasource,
+      visType: 'table',
     });
     const formattedUrl =
-      '/superset/explore/?form_data=%7B%22viz_type%22%3A%22table%22%2C%22datasource%22%3A%221__table%22%7D';
+      '/superset/explore/?form_data=%7B%22viz_type%22%3A%22table%22%2C%22datasource%22%3A%221%22%7D';
     expect(wrapper.instance().exploreUrl()).toBe(formattedUrl);
   });
 });
diff --git a/superset-frontend/src/addSlice/AddSliceContainer.tsx b/superset-frontend/src/addSlice/AddSliceContainer.tsx
index 22230cd0a2d6..8440cecf5a3c 100644
--- a/superset-frontend/src/addSlice/AddSliceContainer.tsx
+++ b/superset-frontend/src/addSlice/AddSliceContainer.tsx
@@ -17,36 +17,165 @@
  * under the License.
  */
 import React from 'react';
+import rison from 'rison';
+import { styled, t, SupersetClient, JsonResponse } from '@superset-ui/core';
+import { Steps } from 'src/common/components';
 import Button from 'src/components/Button';
-import Select from 'src/components/Select';
-import { styled, t } from '@superset-ui/core';
+import { Select } from 'src/components';
+import { FormLabel } from 'src/components/Form';
+import { Tooltip } from 'src/components/Tooltip';
 
-import VizTypeControl from '../explore/components/controls/VizTypeControl';
+import VizTypeGallery, {
+  MAX_ADVISABLE_VIZ_GALLERY_WIDTH,
+} from 'src/explore/components/controls/VizTypeControl/VizTypeGallery';
 
-interface Datasource {
-  label: string;
-  value: string;
-}
-
-export type AddSliceContainerProps = {
-  datasources: Datasource[];
+type Dataset = {
+  id: number;
+  table_name: string;
+  description: string;
+  datasource_type: string;
 };
 
+export type AddSliceContainerProps = {};
+
 export type AddSliceContainerState = {
-  datasourceId?: string;
-  datasourceType?: string;
-  datasourceValue?: string;
-  visType: string;
+  datasource?: { label: string; value: string };
+  visType: string | null;
 };
 
-const styleSelectContainer = { width: 600, marginBottom: '10px' };
+const ESTIMATED_NAV_HEIGHT = 56;
+const ELEMENTS_EXCEPT_VIZ_GALLERY = ESTIMATED_NAV_HEIGHT + 250;
+
 const StyledContainer = styled.div`
-  border-radius: ${({ theme }) => theme.gridUnit}px;
-  background-color: ${({ theme }) => theme.colors.grayscale.light5};
-  padding: ${({ theme }) => theme.gridUnit * 6}px;
-  h3 {
-    padding-bottom: ${({ theme }) => theme.gridUnit * 3}px;
-  }
+  ${({ theme }) => `
+    flex: 1 1 auto;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 100%;
+    max-width: ${MAX_ADVISABLE_VIZ_GALLERY_WIDTH}px;
+    max-height: calc(100vh - ${ESTIMATED_NAV_HEIGHT}px);
+    border-radius: ${theme.gridUnit}px;
+    background-color: ${theme.colors.grayscale.light5};
+    margin-left: auto;
+    margin-right: auto;
+    padding-left: ${theme.gridUnit * 4}px;
+    padding-right: ${theme.gridUnit * 4}px;
+    padding-bottom: ${theme.gridUnit * 4}px;
+
+    h3 {
+      padding-bottom: ${theme.gridUnit * 3}px;
+    }
+
+    & .dataset {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      margin-bottom: ${theme.gridUnit * 2}px;
+
+      & > div {
+        min-width: 200px;
+        width: 300px;
+      }
+
+      & > span {
+        color: ${theme.colors.grayscale.light1};
+        margin-left: ${theme.gridUnit * 4}px;
+      }
+    }
+
+    & .viz-gallery {
+      border: 1px solid ${theme.colors.grayscale.light2};
+      border-radius: ${theme.gridUnit}px;
+      margin: ${theme.gridUnit}px 0px;
+      max-height: calc(100vh - ${ELEMENTS_EXCEPT_VIZ_GALLERY}px);
+      flex: 1;
+    }
+
+    & .footer {
+      flex: 1;
+      display: flex;
+      flex-direction: row;
+      justify-content: flex-end;
+      align-items: center;
+
+      & > span {
+        color: ${theme.colors.grayscale.light1};
+        margin-right: ${theme.gridUnit * 4}px;
+      }
+    }
+
+    /* The following extra ampersands (&&&&) are used to boost selector specificity */
+
+    &&&& .ant-steps-item-tail {
+      display: none;
+    }
+
+    &&&& .ant-steps-item-icon {
+      margin-right: ${theme.gridUnit * 2}px;
+      width: ${theme.gridUnit * 5}px;
+      height: ${theme.gridUnit * 5}px;
+      line-height: ${theme.gridUnit * 5}px;
+    }
+
+    &&&& .ant-steps-item-title {
+      line-height: ${theme.gridUnit * 5}px;
+    }
+
+    &&&& .ant-steps-item-content {
+      overflow: unset;
+
+      .ant-steps-item-description {
+        margin-top: ${theme.gridUnit}px;
+      }
+    }
+
+    &&&& .ant-tooltip-open {
+      display: inline;
+    }
+
+    &&&& .ant-select-selector {
+      padding: 0;
+    }
+
+    &&&& .ant-select-selection-placeholder {
+      padding-left: ${theme.gridUnit * 3}px;
+    }
+  `}
+`;
+
+const TooltipContent = styled.div<{ hasDescription: boolean }>`
+  ${({ theme, hasDescription }) => `
+    .tooltip-header {
+      font-size: ${
+        hasDescription ? theme.typography.sizes.l : theme.typography.sizes.s
+      }px;
+      font-weight: ${
+        hasDescription
+          ? theme.typography.weights.bold
+          : theme.typography.weights.normal
+      };
+    }
+
+    .tooltip-description {
+      margin-top: ${theme.gridUnit * 2}px;
+      display: -webkit-box;
+      -webkit-line-clamp: 20;
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  `}
+`;
+
+const StyledLabel = styled.span`
+  ${({ theme }) => `
+    position: absolute;
+    left: ${theme.gridUnit * 3}px;
+    right: ${theme.gridUnit * 3}px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  `}
 `;
 
 export default class AddSliceContainer extends React.PureComponent<
@@ -56,19 +185,22 @@ export default class AddSliceContainer extends React.PureComponent<
   constructor(props: AddSliceContainerProps) {
     super(props);
     this.state = {
-      visType: 'table',
+      visType: null,
     };
 
     this.changeDatasource = this.changeDatasource.bind(this);
     this.changeVisType = this.changeVisType.bind(this);
     this.gotoSlice = this.gotoSlice.bind(this);
+    this.newLabel = this.newLabel.bind(this);
+    this.loadDatasources = this.loadDatasources.bind(this);
+    this.handleFilterOption = this.handleFilterOption.bind(this);
   }
 
   exploreUrl() {
     const formData = encodeURIComponent(
       JSON.stringify({
         viz_type: this.state.visType,
-        datasource: this.state.datasourceValue,
+        datasource: this.state.datasource?.value,
       }),
     );
     return `/superset/explore/?form_data=${formData}`;
@@ -78,79 +210,140 @@ export default class AddSliceContainer extends React.PureComponent<
     window.location.href = this.exploreUrl();
   }
 
-  changeDatasource(option: { value: string }) {
-    this.setState({
-      datasourceValue: option.value,
-      datasourceId: option.value.split('__')[0],
-    });
+  changeDatasource(datasource: { label: string; value: string }) {
+    this.setState({ datasource });
   }
 
-  changeVisType(visType: string) {
+  changeVisType(visType: string | null) {
     this.setState({ visType });
   }
 
   isBtnDisabled() {
-    return !(this.state.datasourceId && this.state.visType);
+    return !(this.state.datasource?.value && this.state.visType);
+  }
+
+  newLabel(item: Dataset) {
+    return (
+      <Tooltip
+        mouseEnterDelay={1}
+        placement="right"
+        title={
+          <TooltipContent hasDescription={!!item.description}>
+            <div className="tooltip-header">{item.table_name}</div>
+            {item.description && (
+              <div className="tooltip-description">{item.description}</div>
+            )}
+          </TooltipContent>
+        }
+      >
+        <StyledLabel>{item.table_name}</StyledLabel>
+      </Tooltip>
+    );
+  }
+
+  loadDatasources(search: string, page: number, pageSize: number) {
+    const query = rison.encode({
+      columns: ['id', 'table_name', 'description', 'datasource_type'],
+      filters: [{ col: 'table_name', opr: 'ct', value: search }],
+      page,
+      page_size: pageSize,
+      order_column: 'table_name',
+      order_direction: 'asc',
+    });
+    return SupersetClient.get({
+      endpoint: `/api/v1/dataset/?q=${query}`,
+    }).then((response: JsonResponse) => {
+      const list: {
+        label: string;
+        value: string;
+      }[] = response.json.result
+        .map((item: Dataset) => ({
+          value: `${item.id}__${item.datasource_type}`,
+          label: this.newLabel(item),
+          labelText: item.table_name,
+        }))
+        .sort((a: { labelText: string }, b: { labelText: string }) =>
+          a.labelText.localeCompare(b.labelText),
+        );
+      return {
+        data: list,
+        totalCount: response.json.count,
+      };
+    });
+  }
+
+  handleFilterOption(
+    search: string,
+    option: { label: string; value: number; labelText: string },
+  ) {
+    const searchValue = search.trim().toLowerCase();
+    const { labelText } = option;
+    return labelText.toLowerCase().includes(searchValue);
   }
 
   render() {
+    const isButtonDisabled = this.isBtnDisabled();
     return (
-      <StyledContainer className="container">
+      <StyledContainer>
         <h3>{t('Create a new chart')}</h3>
-        <div>
-          <p>{t('Choose a dataset')}</p>
-          <div style={styleSelectContainer}>
-            <Select
-              clearable={false}
-              ignoreAccents={false}
-              name="select-datasource"
-              onChange={this.changeDatasource}
-              options={this.props.datasources}
-              placeholder={t('Choose a dataset')}
-              value={
-                this.state.datasourceValue
-                  ? {
-                      value: this.state.datasourceValue,
-                    }
-                  : undefined
-              }
-              width={600}
-            />
-          </div>
-          <span className="text-muted">
-            {t(
-              'If the dataset you are looking for is not available in the list, follow the instructions on how to add it in the Superset tutorial.',
-            )}{' '}
-            <a
-              href="https://superset.apache.org/docs/creating-charts-dashboards/first-dashboard#adding-a-new-table"
-              rel="noopener noreferrer"
-              target="_blank"
-            >
-              <i className="fa fa-external-link" />
-            </a>
-          </span>
-        </div>
-        <br />
-        <div>
-          <p>{t('Choose a visualization type')}</p>
-          <VizTypeControl
-            name="select-vis-type"
-            onChange={this.changeVisType}
-            value={this.state.visType}
-            labelType="primary"
+        <Steps direction="vertical" size="small">
+          <Steps.Step
+            title={<FormLabel>{t('Choose a dataset')}</FormLabel>}
+            status={this.state.datasource?.value ? 'finish' : 'process'}
+            description={
+              <div className="dataset">
+                <Select
+                  autoFocus
+                  ariaLabel={t('Dataset')}
+                  name="select-datasource"
+                  filterOption={this.handleFilterOption}
+                  onChange={this.changeDatasource}
+                  options={this.loadDatasources}
+                  placeholder={t('Choose a dataset')}
+                  showSearch
+                  value={this.state.datasource}
+                />
+                <span>
+                  {t(
+                    'Instructions to add a dataset are available in the Superset tutorial.',
+                  )}{' '}
+                  <a
+                    href="https://superset.apache.org/docs/creating-charts-dashboards/first-dashboard#adding-a-new-table"
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    <i className="fa fa-external-link" />
+                  </a>
+                </span>
+              </div>
+            }
+          />
+          <Steps.Step
+            title={<FormLabel>{t('Choose chart type')}</FormLabel>}
+            status={this.state.visType ? 'finish' : 'process'}
+            description={
+              <VizTypeGallery
+                className="viz-gallery"
+                onChange={this.changeVisType}
+                selectedViz={this.state.visType}
+              />
+            }
           />
+        </Steps>
+        <div className="footer">
+          {isButtonDisabled && (
+            <span>
+              {t('Please select both a Dataset and a Chart type to proceed')}
+            </span>
+          )}
+          <Button
+            buttonStyle="primary"
+            disabled={isButtonDisabled}
+            onClick={this.gotoSlice}
+          >
+            {t('Create new chart')}
+          </Button>
         </div>
-        <br />
-        <hr />
-        <Button
-          buttonStyle="primary"
-          disabled={this.isBtnDisabled()}
-          onClick={this.gotoSlice}
-        >
-          {t('Create new chart')}
-        </Button>
-        <br />
-        <br />
       </StyledContainer>
     );
   }
diff --git a/superset-frontend/src/addSlice/App.tsx b/superset-frontend/src/addSlice/App.tsx
index 9602670a0890..900cc36f446c 100644
--- a/superset-frontend/src/addSlice/App.tsx
+++ b/superset-frontend/src/addSlice/App.tsx
@@ -39,7 +39,7 @@ initFeatureFlags(bootstrapData.common.feature_flags);
 const App = () => (
   <ThemeProvider theme={theme}>
     <DynamicPluginProvider>
-      <AddSliceContainer datasources={bootstrapData.datasources} />
+      <AddSliceContainer />
     </DynamicPluginProvider>
   </ThemeProvider>
 );
diff --git a/superset-frontend/src/chart/Chart.jsx b/superset-frontend/src/chart/Chart.jsx
index d9f7e93ccf7b..d66dd86b15e0 100644
--- a/superset-frontend/src/chart/Chart.jsx
+++ b/superset-frontend/src/chart/Chart.jsx
@@ -22,8 +22,9 @@ import Alert from 'src/components/Alert';
 import { styled, logging, t } from '@superset-ui/core';
 
 import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags';
+import { PLACEHOLDER_DATASOURCE } from 'src/dashboard/constants';
 import Button from 'src/components/Button';
-import Loading from '../components/Loading';
+import Loading from 'src/components/Loading';
 import ErrorBoundary from '../components/ErrorBoundary';
 import ChartRenderer from './ChartRenderer';
 import { ChartErrorMessage } from './ChartErrorMessage';
@@ -33,7 +34,7 @@ const propTypes = {
   annotationData: PropTypes.object,
   actions: PropTypes.object,
   chartId: PropTypes.number.isRequired,
-  datasource: PropTypes.object.isRequired,
+  datasource: PropTypes.object,
   // current chart is included by dashboard
   dashboardId: PropTypes.number,
   // original selected values for FilterBox viz
@@ -164,10 +165,32 @@ class Chart extends React.PureComponent {
   }
 
   renderErrorMessage(queryResponse) {
-    const { chartId, chartAlert, chartStackTrace, dashboardId } = this.props;
+    const {
+      chartId,
+      chartAlert,
+      chartStackTrace,
+      datasource,
+      dashboardId,
+      height,
+    } = this.props;
 
     const error = queryResponse?.errors?.[0];
     const message = chartAlert || queryResponse?.message;
+
+    // if datasource is still loading, don't render JS errors
+    if (chartAlert && datasource === PLACEHOLDER_DATASOURCE) {
+      return (
+        <Styles
+          data-ui-anchor="chart"
+          className="chart-container"
+          data-test="chart-container"
+          height={height}
+        >
+          <Loading />
+        </Styles>
+      );
+    }
+
     return (
       <ChartErrorMessage
         chartId={chartId}
@@ -198,6 +221,7 @@ class Chart extends React.PureComponent {
     if (chartStatus === 'failed') {
       return queriesResponse.map(item => this.renderErrorMessage(item));
     }
+
     if (errorMessage) {
       return (
         <Alert
diff --git a/superset-frontend/src/chart/ChartRenderer.jsx b/superset-frontend/src/chart/ChartRenderer.jsx
index f40e46e83cba..bbc4213817c3 100644
--- a/superset-frontend/src/chart/ChartRenderer.jsx
+++ b/superset-frontend/src/chart/ChartRenderer.jsx
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { snakeCase } from 'lodash';
+import { snakeCase, isEqual } from 'lodash';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { SuperChart, logging, Behavior } from '@superset-ui/core';
-import { Logger, LOG_ACTIONS_RENDER_CHART } from '../logger/LogUtils';
+import { Logger, LOG_ACTIONS_RENDER_CHART } from 'src/logger/LogUtils';
 
 const propTypes = {
   annotationData: PropTypes.object,
   actions: PropTypes.object,
   chartId: PropTypes.number.isRequired,
-  datasource: PropTypes.object.isRequired,
+  datasource: PropTypes.object,
   initialValues: PropTypes.object,
   formData: PropTypes.object.isRequired,
   height: PropTypes.number,
@@ -93,6 +93,7 @@ class ChartRenderer extends React.Component {
         nextProps.queriesResponse !== this.props.queriesResponse;
       return (
         this.hasQueryResponseChange ||
+        !isEqual(nextProps.datasource, this.props.datasource) ||
         nextProps.annotationData !== this.props.annotationData ||
         nextProps.ownState !== this.props.ownState ||
         nextProps.filterState !== this.props.filterState ||
@@ -182,8 +183,8 @@ class ChartRenderer extends React.Component {
     const {
       width,
       height,
-      annotationData,
       datasource,
+      annotationData,
       initialValues,
       ownState,
       filterState,
diff --git a/superset-frontend/src/chart/chartAction.js b/superset-frontend/src/chart/chartAction.js
index 9be1b6a6c6d1..5052416df37e 100644
--- a/superset-frontend/src/chart/chartAction.js
+++ b/superset-frontend/src/chart/chartAction.js
@@ -145,11 +145,12 @@ const legacyChartDataRequest = async (
     'GET' && isFeatureEnabled(FeatureFlag.CLIENT_CACHE)
       ? SupersetClient.get
       : SupersetClient.post;
-  return clientMethod(querySettings).then(({ json }) =>
+  return clientMethod(querySettings).then(({ json, response }) =>
     // Make the legacy endpoint return a payload that corresponds to the
     // V1 chart data endpoint response signature.
     ({
-      result: [json],
+      response,
+      json: { result: [json] },
     }),
   );
 };
@@ -196,7 +197,8 @@ const v1ChartDataRequest = async (
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify(payload),
   };
-  return SupersetClient.post(querySettings).then(({ json }) => json);
+
+  return SupersetClient.post(querySettings);
 };
 
 export async function getChartDataRequest({
@@ -390,14 +392,25 @@ export function exploreJSON(
     dispatch(chartUpdateStarted(controller, formData, key));
 
     const chartDataRequestCaught = chartDataRequest
-      .then(response => {
-        const queriesResponse = response.result;
+      .then(({ response, json }) => {
         if (isFeatureEnabled(FeatureFlag.GLOBAL_ASYNC_QUERIES)) {
           // deal with getChartDataRequest transforming the response data
-          const result = 'result' in response ? response.result[0] : response;
-          return waitForAsyncData(result);
+          const result = 'result' in json ? json.result[0] : json;
+          switch (response.status) {
+            case 200:
+              // Query results returned synchronously, meaning query was already cached.
+              return Promise.resolve([result]);
+            case 202:
+              // Query is running asynchronously and we must await the results
+              return waitForAsyncData(result);
+            default:
+              throw new Error(
+                `Received unexpected response status (${response.status}) while fetching chart data`,
+              );
+          }
         }
-        return queriesResponse;
+
+        return json.result;
       })
       .then(queriesResponse => {
         queriesResponse.forEach(resultItem =>
@@ -541,11 +554,11 @@ export function postChartFormData(
 export function redirectSQLLab(formData) {
   return dispatch => {
     getChartDataRequest({ formData, resultFormat: 'json', resultType: 'query' })
-      .then(({ result }) => {
+      .then(({ json }) => {
         const redirectUrl = '/superset/sqllab/';
         const payload = {
           datasourceKey: formData.datasource,
-          sql: result[0].query,
+          sql: json.result[0].query,
         };
         postForm(redirectUrl, payload);
       })
diff --git a/superset-frontend/src/chart/chartReducer.ts b/superset-frontend/src/chart/chartReducer.ts
index d6e42dfa87f6..b0de1a668053 100644
--- a/superset-frontend/src/chart/chartReducer.ts
+++ b/superset-frontend/src/chart/chartReducer.ts
@@ -19,6 +19,7 @@
 /* eslint camelcase: 0 */
 import { t } from '@superset-ui/core';
 import { HYDRATE_DASHBOARD } from 'src/dashboard/actions/hydrate';
+import { DatasourcesAction } from 'src/dashboard/actions/datasources';
 import { ChartState } from 'src/explore/types';
 import { getFormDataFromControls } from 'src/explore/controlUtils';
 import { now } from 'src/modules/dates';
@@ -196,6 +197,24 @@ export default function chartReducer(
   if (action.type === HYDRATE_DASHBOARD) {
     return { ...action.data.charts };
   }
+  if (action.type === DatasourcesAction.SET_DATASOURCES) {
+    return Object.fromEntries(
+      Object.entries(charts).map(([chartId, chart]) => [
+        chartId,
+        // if render has failed, clear error message,
+        // which will trigger a re-render
+        chart.chartStatus === 'failed'
+          ? {
+              ...chart,
+              chartStatus: '',
+              chartStackTrace: null,
+              chartAlert: null,
+            }
+          : chart,
+      ]),
+    );
+  }
+
   if (action.type in actionHandlers) {
     return {
       ...charts,
diff --git a/superset-frontend/src/common/components/index.tsx b/superset-frontend/src/common/components/index.tsx
index c98099645a7b..04c3142c7f70 100644
--- a/superset-frontend/src/common/components/index.tsx
+++ b/superset-frontend/src/common/components/index.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React from 'react';
+import React, { RefObject } from 'react';
 import { styled } from '@superset-ui/core';
 import {
   Dropdown,
@@ -42,7 +42,6 @@ export {
   Dropdown,
   Form,
   Empty,
-  Modal,
   Typography,
   Tree,
   Popover,
@@ -50,13 +49,16 @@ export {
   Row,
   Space,
   Skeleton,
+  Steps,
   Switch,
   Tag,
   Tabs,
   Tooltip,
+  Upload,
   Input as AntdInput,
 } from 'antd';
 export { Card as AntdCard } from 'antd';
+export { default as Modal, ModalProps } from 'antd/lib/modal';
 export { FormInstance } from 'antd/lib/form';
 export { RadioChangeEvent } from 'antd/lib/radio';
 export { TreeProps } from 'antd/lib/tree';
@@ -180,11 +182,14 @@ export const StyledSubMenu = styled(AntdMenu.SubMenu)`
   & > .ant-menu-submenu-title {
     padding: 0 ${({ theme }) => theme.gridUnit * 6}px 0
       ${({ theme }) => theme.gridUnit * 3}px !important;
-    svg {
+    span[role='img'] {
       position: absolute;
-      top: ${({ theme }) => theme.gridUnit * 4 + 7}px;
-      right: ${({ theme }) => theme.gridUnit}px;
-      width: ${({ theme }) => theme.gridUnit * 6}px;
+      right: ${({ theme }) => -theme.gridUnit + -2}px;
+      top: ${({ theme }) => theme.gridUnit * 5.25}px;
+      svg {
+        font-size: ${({ theme }) => theme.gridUnit * 6}px;
+        color: ${({ theme }) => theme.colors.grayscale.base};
+      }
     }
     & > span {
       position: relative;
@@ -213,6 +218,10 @@ export const MainNav = Object.assign(StyledNav, {
   ItemGroup: AntdMenu.ItemGroup,
 });
 
+interface ExtendedDropDownProps extends DropDownProps {
+  ref?: RefObject<HTMLDivElement>;
+}
+
 export const Input = styled(AntdInput)`
   border: 1px solid ${({ theme }) => theme.colors.secondary.light3};
   border-radius: ${({ theme }) => theme.borderRadius}px;
@@ -228,11 +237,11 @@ export const TextArea = styled(AntdInput.TextArea)`
   border-radius: ${({ theme }) => theme.borderRadius}px;
 `;
 
-export const NoAnimationDropdown = (props: DropDownProps) => (
-  <Dropdown
-    overlayStyle={{ zIndex: 4000, animationDuration: '0s' }}
-    {...props}
-  />
+// @z-index-below-dashboard-header (100) - 1 = 99
+export const NoAnimationDropdown = (
+  props: ExtendedDropDownProps & { children?: React.ReactNode },
+) => (
+  <Dropdown overlayStyle={{ zIndex: 99, animationDuration: '0s' }} {...props} />
 );
 
 export const ThinSkeleton = styled(Skeleton)`
diff --git a/superset-frontend/src/common/hooks/apiResources/dashboards.ts b/superset-frontend/src/common/hooks/apiResources/dashboards.ts
index 553049aac6a7..99707c19f6f8 100644
--- a/superset-frontend/src/common/hooks/apiResources/dashboards.ts
+++ b/superset-frontend/src/common/hooks/apiResources/dashboards.ts
@@ -17,7 +17,8 @@
  * under the License.
  */
 
-import Dashboard from 'src/types/Dashboard';
+import { Dashboard, Datasource } from 'src/dashboard/types';
+import { Chart } from 'src/types/Chart';
 import { useApiV1Resource, useTransformedResource } from './apiResources';
 
 export const useDashboard = (idOrSlug: string | number) =>
@@ -33,10 +34,10 @@ export const useDashboard = (idOrSlug: string | number) =>
 
 // gets the chart definitions for a dashboard
 export const useDashboardCharts = (idOrSlug: string | number) =>
-  useApiV1Resource(`/api/v1/dashboard/${idOrSlug}/charts`);
+  useApiV1Resource<Chart[]>(`/api/v1/dashboard/${idOrSlug}/charts`);
 
 // gets the datasets for a dashboard
 // important: this endpoint only returns the fields in the dataset
 // that are necessary for rendering the given dashboard
 export const useDashboardDatasets = (idOrSlug: string | number) =>
-  useApiV1Resource(`/api/v1/dashboard/${idOrSlug}/datasets`);
+  useApiV1Resource<Datasource[]>(`/api/v1/dashboard/${idOrSlug}/datasets`);
diff --git a/superset-frontend/src/common/hooks/useComponentDidUpdate/index.ts b/superset-frontend/src/common/hooks/useComponentDidUpdate/index.ts
new file mode 100644
index 000000000000..fa0105807cdd
--- /dev/null
+++ b/superset-frontend/src/common/hooks/useComponentDidUpdate/index.ts
@@ -0,0 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './useComponentDidUpdate';
diff --git a/superset-frontend/src/common/hooks/useComponentDidUpdate/useComponentDidUpdate.test.ts b/superset-frontend/src/common/hooks/useComponentDidUpdate/useComponentDidUpdate.test.ts
new file mode 100644
index 000000000000..a1615ec2793c
--- /dev/null
+++ b/superset-frontend/src/common/hooks/useComponentDidUpdate/useComponentDidUpdate.test.ts
@@ -0,0 +1,31 @@
+/**
+ * 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 { useComponentDidUpdate } from './useComponentDidUpdate';
+
+test('the effect should not be executed on the first render', () => {
+  const effect = jest.fn();
+  const hook = renderHook(props => useComponentDidUpdate(props.effect), {
+    initialProps: { effect },
+  });
+  expect(effect).toBeCalledTimes(0);
+  const changedEffect = jest.fn();
+  hook.rerender({ effect: changedEffect });
+  expect(changedEffect).toBeCalledTimes(1);
+});
diff --git a/superset-frontend/src/common/hooks/useComponentDidUpdate/useComponentDidUpdate.ts b/superset-frontend/src/common/hooks/useComponentDidUpdate/useComponentDidUpdate.ts
new file mode 100644
index 000000000000..aa84568e293c
--- /dev/null
+++ b/superset-frontend/src/common/hooks/useComponentDidUpdate/useComponentDidUpdate.ts
@@ -0,0 +1,31 @@
+/**
+ * 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 { EffectCallback, useEffect, useRef } from 'react';
+
+export const useComponentDidUpdate = (effect: EffectCallback) => {
+  const isMountedRef = useRef(false);
+  useEffect(() => {
+    if (isMountedRef.current) {
+      effect();
+    } else {
+      isMountedRef.current = true;
+    }
+  }, [effect]);
+};
diff --git a/superset-frontend/src/common/hooks/useElementOnScreen/index.ts b/superset-frontend/src/common/hooks/useElementOnScreen/index.ts
new file mode 100644
index 000000000000..6d2c66eb457d
--- /dev/null
+++ b/superset-frontend/src/common/hooks/useElementOnScreen/index.ts
@@ -0,0 +1,46 @@
+/**
+ * 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 { useEffect, useRef, useState, RefObject } from 'react';
+
+export function useElementOnScreen<T extends Element>(
+  options: IntersectionObserverInit,
+): [RefObject<T>, boolean] {
+  const containerRef = useRef<T>(null);
+  const [isSticky, setIsSticky] = useState(false);
+
+  const callback = (entries: IntersectionObserverEntry[]) => {
+    const [entry] = entries;
+    setIsSticky(entry.intersectionRatio < 1);
+  };
+
+  useEffect(() => {
+    const observer = new IntersectionObserver(callback, options);
+    const element = containerRef.current;
+    if (element) {
+      observer.observe(element);
+    }
+    return () => {
+      if (element) {
+        observer.unobserve(element);
+      }
+    };
+  }, [containerRef, options]);
+
+  return [containerRef, isSticky];
+}
diff --git a/superset-frontend/src/components/Alert/index.tsx b/superset-frontend/src/components/Alert/index.tsx
index 89a782f75b09..6ed9003cef45 100644
--- a/superset-frontend/src/components/Alert/index.tsx
+++ b/superset-frontend/src/components/Alert/index.tsx
@@ -22,7 +22,6 @@ import {
   AlertProps as AntdAlertProps,
 } from 'src/common/components';
 import { useTheme } from '@superset-ui/core';
-import Icon from 'src/components/Icon';
 import Icons from 'src/components/Icons';
 
 export type AlertProps = PropsWithChildren<
@@ -61,7 +60,7 @@ export default function Alert(props: AlertProps) {
       role="alert"
       showIcon={showIcon}
       icon={<AlertIcon aria-label={`${type} icon`} />}
-      closeText={closable && <Icon name="x-small" aria-label="close icon" />}
+      closeText={closable && <Icons.XSmall aria-label="close icon" />}
       css={{
         marginBottom: roomBelow ? gridUnit * 4 : 0,
         padding: `${gridUnit * 2}px ${gridUnit * 3}px`,
diff --git a/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.test.jsx b/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.test.jsx
index 17941445c9ac..6f3d5e33ab2a 100644
--- a/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.test.jsx
+++ b/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.test.jsx
@@ -128,8 +128,8 @@ describe('AlteredSliceTag', () => {
       );
       const th = getTableWrapperFromModalBody(modalBody).find('th');
       expect(th).toHaveLength(3);
-      ['Control', 'Before', 'After'].forEach((v, i) => {
-        expect(th.find('span').get(i).props.children[0]).toBe(v);
+      ['Control', 'Before', 'After'].forEach(async (v, i) => {
+        await expect(th.find('span').get(i).props.children[0]).toBe(v);
       });
     });
 
diff --git a/superset-frontend/src/components/AnchorLink/index.jsx b/superset-frontend/src/components/AnchorLink/index.jsx
index 42f93c35371d..16be622bdc03 100644
--- a/superset-frontend/src/components/AnchorLink/index.jsx
+++ b/superset-frontend/src/components/AnchorLink/index.jsx
@@ -80,11 +80,11 @@ class AnchorLink extends React.PureComponent {
       <span className="anchor-link-container" id={anchorLinkId}>
         {showShortLinkButton && (
           <URLShortLinkButton
-            url={getDashboardUrl(
-              window.location.pathname,
+            url={getDashboardUrl({
+              pathname: window.location.pathname,
               filters,
-              anchorLinkId,
-            )}
+              hash: anchorLinkId,
+            })}
             emailSubject={t('Superset chart')}
             emailContent={t('Check out this chart in dashboard:')}
             placement={placement}
diff --git a/superset-frontend/src/components/Button/index.tsx b/superset-frontend/src/components/Button/index.tsx
index 1f9d737836b0..62e1214d3dff 100644
--- a/superset-frontend/src/components/Button/index.tsx
+++ b/superset-frontend/src/components/Button/index.tsx
@@ -62,6 +62,7 @@ export interface ButtonProps {
   href?: string;
   htmlType?: 'button' | 'submit' | 'reset';
   cta?: boolean;
+  loading?: boolean | { delay?: number | undefined } | undefined;
 }
 
 export default function Button(props: ButtonProps) {
diff --git a/superset-frontend/src/components/CertifiedIcon/index.tsx b/superset-frontend/src/components/CertifiedIcon/index.tsx
index 49278a6cbce5..4aa0dad236b1 100644
--- a/superset-frontend/src/components/CertifiedIcon/index.tsx
+++ b/superset-frontend/src/components/CertifiedIcon/index.tsx
@@ -18,19 +18,19 @@
  */
 import React from 'react';
 import { t, supersetTheme } from '@superset-ui/core';
-import Icon from 'src/components/Icon';
+import Icons, { IconType } from 'src/components/Icons';
 import { Tooltip } from 'src/components/Tooltip';
 
 export interface CertifiedIconProps {
   certifiedBy?: string;
   details?: string;
-  size?: number;
+  size?: IconType['iconSize'];
 }
 
 function CertifiedIcon({
   certifiedBy,
   details,
-  size = 24,
+  size = 'l',
 }: CertifiedIconProps) {
   return (
     <Tooltip
@@ -46,11 +46,9 @@ function CertifiedIcon({
         </>
       }
     >
-      <Icon
-        color={supersetTheme.colors.primary.base}
-        height={size}
-        width={size}
-        name="certified"
+      <Icons.Certified
+        iconColor={supersetTheme.colors.primary.base}
+        iconSize={size}
       />
     </Tooltip>
   );
diff --git a/superset-frontend/src/components/CopyToClipboard/CopyToClipboard.stories.tsx b/superset-frontend/src/components/CopyToClipboard/CopyToClipboard.stories.tsx
index e932b4593859..875d5f734d87 100644
--- a/superset-frontend/src/components/CopyToClipboard/CopyToClipboard.stories.tsx
+++ b/superset-frontend/src/components/CopyToClipboard/CopyToClipboard.stories.tsx
@@ -17,8 +17,9 @@
  * under the License.
  */
 import React from 'react';
+import { useTheme } from '@superset-ui/core';
 import Button from 'src/components/Button';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import ToastPresenter from 'src/messageToasts/containers/ToastPresenter';
 import CopyToClipboard from '.';
 
@@ -28,9 +29,10 @@ export default {
 };
 
 export const InteractiveCopyToClipboard = ({ copyNode, ...rest }: any) => {
+  const theme = useTheme();
   let node = <Button>Copy</Button>;
   if (copyNode === 'Icon') {
-    node = <Icon name="copy" />;
+    node = <Icons.Copy iconColor={theme.colors.grayscale.base} />;
   } else if (copyNode === 'Text') {
     node = <span role="button">Copy</span>;
   }
diff --git a/superset-frontend/src/components/CronPicker/CronPicker.tsx b/superset-frontend/src/components/CronPicker/CronPicker.tsx
index d85964064408..631f7f24b430 100644
--- a/superset-frontend/src/components/CronPicker/CronPicker.tsx
+++ b/superset-frontend/src/components/CronPicker/CronPicker.tsx
@@ -31,7 +31,7 @@ export const LOCALE: Locale = {
   emptyWeekDays: t('every day of the week'),
   emptyWeekDaysShort: t('day of the week'),
   emptyHours: t('every hour'),
-  emptyMinutes: t('every minute UTC'),
+  emptyMinutes: t('every minute'),
   emptyMinutesForHourPeriod: t('every'),
   yearOption: t('year'),
   monthOption: t('month'),
@@ -48,7 +48,7 @@ export const LOCALE: Locale = {
   prefixHours: t('at'),
   prefixMinutes: t(':'),
   prefixMinutesForHourPeriod: t('at'),
-  suffixMinutesForHourPeriod: t('minute(s) UTC'),
+  suffixMinutesForHourPeriod: t('minute(s)'),
   errorInvalidCron: t('Invalid cron expression'),
   clearButtonText: t('Clear'),
   weekDays: [
diff --git a/superset-frontend/src/components/DatabaseSelector/DatabaseSelector.test.tsx b/superset-frontend/src/components/DatabaseSelector/DatabaseSelector.test.tsx
index 32c2bce0b8d1..6d4abb3fd963 100644
--- a/superset-frontend/src/components/DatabaseSelector/DatabaseSelector.test.tsx
+++ b/superset-frontend/src/components/DatabaseSelector/DatabaseSelector.test.tsx
@@ -26,11 +26,11 @@ import DatabaseSelector from '.';
 const SupersetClientGet = jest.spyOn(SupersetClient, 'get');
 
 const createProps = () => ({
-  dbId: 1,
+  db: { id: 1, database_name: 'test', backend: 'postgresql' },
   formMode: false,
   isDatabaseSelectEnabled: true,
   readOnly: false,
-  schema: 'public',
+  schema: undefined,
   sqlLabMode: true,
   getDbList: jest.fn(),
   getTableList: jest.fn(),
@@ -38,7 +38,7 @@ const createProps = () => ({
   onDbChange: jest.fn(),
   onSchemaChange: jest.fn(),
   onSchemasLoad: jest.fn(),
-  onChange: jest.fn(),
+  onUpdate: jest.fn(),
 });
 
 beforeEach(() => {
@@ -129,7 +129,7 @@ beforeEach(() => {
               changed_on: '2021-03-09T19:02:07.141095',
               changed_on_delta_humanized: 'a day ago',
               created_by: null,
-              database_name: 'examples',
+              database_name: 'test',
               explore_database_id: 1,
               expose_in_sqllab: true,
               force_ctas_schema: null,
@@ -153,50 +153,62 @@ test('Refresh should work', async () => {
 
   render(<DatabaseSelector {...props} />);
 
+  const select = screen.getByRole('combobox', {
+    name: 'Select a schema',
+  });
+
+  userEvent.click(select);
+
   await waitFor(() => {
-    expect(SupersetClientGet).toBeCalledTimes(2);
-    expect(props.getDbList).toBeCalledTimes(1);
+    expect(SupersetClientGet).toBeCalledTimes(1);
+    expect(props.getDbList).toBeCalledTimes(0);
     expect(props.getTableList).toBeCalledTimes(0);
     expect(props.handleError).toBeCalledTimes(0);
     expect(props.onDbChange).toBeCalledTimes(0);
     expect(props.onSchemaChange).toBeCalledTimes(0);
-    expect(props.onSchemasLoad).toBeCalledTimes(1);
-    expect(props.onChange).toBeCalledTimes(0);
+    expect(props.onSchemasLoad).toBeCalledTimes(0);
+    expect(props.onUpdate).toBeCalledTimes(0);
   });
 
-  userEvent.click(screen.getByRole('button'));
+  userEvent.click(screen.getByRole('button', { name: 'refresh' }));
 
   await waitFor(() => {
-    expect(SupersetClientGet).toBeCalledTimes(3);
-    expect(props.getDbList).toBeCalledTimes(1);
+    expect(SupersetClientGet).toBeCalledTimes(2);
+    expect(props.getDbList).toBeCalledTimes(0);
     expect(props.getTableList).toBeCalledTimes(0);
     expect(props.handleError).toBeCalledTimes(0);
-    expect(props.onDbChange).toBeCalledTimes(1);
-    expect(props.onSchemaChange).toBeCalledTimes(1);
+    expect(props.onDbChange).toBeCalledTimes(0);
+    expect(props.onSchemaChange).toBeCalledTimes(0);
     expect(props.onSchemasLoad).toBeCalledTimes(2);
-    expect(props.onChange).toBeCalledTimes(1);
+    expect(props.onUpdate).toBeCalledTimes(0);
   });
 });
 
 test('Should database select display options', async () => {
   const props = createProps();
   render(<DatabaseSelector {...props} />);
-  const selector = await screen.findByText('Database:');
-  expect(selector).toBeInTheDocument();
-  expect(selector.parentElement).toHaveTextContent(
-    'Database:postgresql examples',
-  );
+  const select = screen.getByRole('combobox', {
+    name: 'Select a database',
+  });
+  expect(select).toBeInTheDocument();
+  userEvent.click(select);
+  expect(
+    await screen.findByRole('option', { name: 'postgresql: test' }),
+  ).toBeInTheDocument();
 });
 
 test('Should schema select display options', async () => {
   const props = createProps();
   render(<DatabaseSelector {...props} />);
-
-  const selector = await screen.findByText('Schema:');
-  expect(selector).toBeInTheDocument();
-  expect(selector.parentElement).toHaveTextContent('Schema: public');
-
-  userEvent.click(screen.getByRole('button'));
-
-  expect(await screen.findByText('Select a schema (2)')).toBeInTheDocument();
+  const select = screen.getByRole('combobox', {
+    name: 'Select a schema',
+  });
+  expect(select).toBeInTheDocument();
+  userEvent.click(select);
+  expect(
+    await screen.findByRole('option', { name: 'public' }),
+  ).toBeInTheDocument();
+  expect(
+    await screen.findByRole('option', { name: 'information_schema' }),
+  ).toBeInTheDocument();
 });
diff --git a/superset-frontend/src/components/DatabaseSelector/index.tsx b/superset-frontend/src/components/DatabaseSelector/index.tsx
index 75103aac3ce0..c96fba7c81e3 100644
--- a/superset-frontend/src/components/DatabaseSelector/index.tsx
+++ b/superset-frontend/src/components/DatabaseSelector/index.tsx
@@ -16,63 +16,56 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { ReactNode, useEffect, useState } from 'react';
+import React, { ReactNode, useState, useMemo } from 'react';
 import { styled, SupersetClient, t } from '@superset-ui/core';
 import rison from 'rison';
-import { Select } from 'src/components/Select';
-import Label from 'src/components/Label';
+import { Select } from 'src/components';
+import { FormLabel } from 'src/components/Form';
 import RefreshLabel from 'src/components/RefreshLabel';
-import SupersetAsyncSelect from 'src/components/AsyncSelect';
-
-const FieldTitle = styled.p`
-  color: ${({ theme }) => theme.colors.secondary.light2};
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
-  margin: 20px 0 10px 0;
-  text-transform: uppercase;
-`;
 
 const DatabaseSelectorWrapper = styled.div`
-  .fa-refresh {
-    padding-left: 9px;
-  }
+  ${({ theme }) => `
+    .refresh {
+      display: flex;
+      align-items: center;
+      width: 30px;
+      margin-left: ${theme.gridUnit}px;
+      margin-top: ${theme.gridUnit * 5}px;
+    }
 
-  .refresh-col {
-    display: flex;
-    align-items: center;
-    width: 30px;
-    margin-left: ${({ theme }) => theme.gridUnit}px;
-  }
+    .section {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+    }
 
-  .section {
-    padding-bottom: 5px;
-    display: flex;
-    flex-direction: row;
-  }
+    .select {
+      flex: 1;
+    }
 
-  .select {
-    flex-grow: 1;
-  }
+    & > div {
+      margin-bottom: ${theme.gridUnit * 4}px;
+    }
+  `}
 `;
 
-const DatabaseOption = styled.span`
-  display: inline-flex;
-  align-items: center;
-`;
+type DatabaseValue = { label: string; value: number };
+
+type SchemaValue = { label: string; value: string };
 
 interface DatabaseSelectorProps {
-  dbId: number;
+  db?: { id: number; database_name: string; backend: string };
   formMode?: boolean;
   getDbList?: (arg0: any) => {};
-  getTableList?: (dbId: number, schema: string, force: boolean) => {};
   handleError: (msg: string) => void;
   isDatabaseSelectEnabled?: boolean;
   onDbChange?: (db: any) => void;
-  onSchemaChange?: (arg0?: any) => {};
+  onSchemaChange?: (schema?: string) => void;
   onSchemasLoad?: (schemas: Array<object>) => void;
   readOnly?: boolean;
   schema?: string;
   sqlLabMode?: boolean;
-  onChange?: ({
+  onUpdate?: ({
     dbId,
     schema,
   }: {
@@ -83,13 +76,12 @@ interface DatabaseSelectorProps {
 }
 
 export default function DatabaseSelector({
-  dbId,
+  db,
   formMode = false,
   getDbList,
-  getTableList,
   handleError,
   isDatabaseSelectEnabled = true,
-  onChange,
+  onUpdate,
   onDbChange,
   onSchemaChange,
   onSchemasLoad,
@@ -97,193 +89,189 @@ export default function DatabaseSelector({
   schema,
   sqlLabMode = false,
 }: DatabaseSelectorProps) {
-  const [currentDbId, setCurrentDbId] = useState(dbId);
-  const [currentSchema, setCurrentSchema] = useState<string | undefined>(
-    schema,
+  const [currentDb, setCurrentDb] = useState(
+    db
+      ? { label: `${db.backend}: ${db.database_name}`, value: db.id }
+      : undefined,
+  );
+  const [currentSchema, setCurrentSchema] = useState<SchemaValue | undefined>(
+    schema ? { label: schema, value: schema } : undefined,
   );
-  const [schemaLoading, setSchemaLoading] = useState(false);
-  const [schemaOptions, setSchemaOptions] = useState([]);
+  const [refresh, setRefresh] = useState(0);
 
-  function fetchSchemas(databaseId: number, forceRefresh = false) {
-    const actualDbId = databaseId || dbId;
-    if (actualDbId) {
-      setSchemaLoading(true);
-      const queryParams = rison.encode({
-        force: Boolean(forceRefresh),
-      });
-      const endpoint = `/api/v1/database/${actualDbId}/schemas/?q=${queryParams}`;
-      return SupersetClient.get({ endpoint })
-        .then(({ json }) => {
+  const loadSchemas = useMemo(
+    () => async (): Promise<{
+      data: SchemaValue[];
+      totalCount: number;
+    }> => {
+      if (currentDb) {
+        const queryParams = rison.encode({ force: refresh > 0 });
+        const endpoint = `/api/v1/database/${currentDb.value}/schemas/?q=${queryParams}`;
+
+        // TODO: Would be nice to add pagination in a follow-up. Needs endpoint changes.
+        return SupersetClient.get({ endpoint }).then(({ json }) => {
           const options = json.result.map((s: string) => ({
             value: s,
             label: s,
             title: s,
           }));
-          setSchemaOptions(options);
-          setSchemaLoading(false);
           if (onSchemasLoad) {
             onSchemasLoad(options);
           }
-        })
-        .catch(() => {
-          setSchemaOptions([]);
-          setSchemaLoading(false);
-          handleError(t('Error while fetching schema list'));
+          return {
+            data: options,
+            totalCount: options.length,
+          };
         });
-    }
-    return Promise.resolve();
-  }
-
-  useEffect(() => {
-    if (currentDbId) {
-      fetchSchemas(currentDbId);
-    }
-  }, [currentDbId]);
+      }
+      return {
+        data: [],
+        totalCount: 0,
+      };
+    },
+    [currentDb, refresh, onSchemasLoad],
+  );
 
-  function onSelectChange({ dbId, schema }: { dbId: number; schema?: string }) {
-    setCurrentDbId(dbId);
+  function onSelectChange({
+    db,
+    schema,
+  }: {
+    db: DatabaseValue;
+    schema?: SchemaValue;
+  }) {
+    setCurrentDb(db);
     setCurrentSchema(schema);
-    if (onChange) {
-      onChange({ dbId, schema, tableName: undefined });
-    }
-  }
-
-  function dbMutator(data: any) {
-    if (getDbList) {
-      getDbList(data.result);
-    }
-    if (data.result.length === 0) {
-      handleError(t("It seems you don't have access to any database"));
+    if (onUpdate) {
+      onUpdate({
+        dbId: db.value,
+        schema: schema?.value,
+        tableName: undefined,
+      });
     }
-    return data.result.map((row: any) => ({
-      ...row,
-      // label is used for the typeahead
-      label: `${row.backend} ${row.database_name}`,
-    }));
   }
 
-  function changeDataBase(db: any, force = false) {
-    const dbId = db ? db.id : null;
-    setSchemaOptions([]);
+  function changeDataBase(selectedValue: DatabaseValue) {
+    const actualDb = selectedValue || db;
     if (onSchemaChange) {
-      onSchemaChange(null);
+      onSchemaChange(undefined);
     }
     if (onDbChange) {
       onDbChange(db);
     }
-    fetchSchemas(dbId, force);
-    onSelectChange({ dbId, schema: undefined });
+    onSelectChange({ db: actualDb, schema: undefined });
   }
 
-  function changeSchema(schemaOpt: any, force = false) {
-    const schema = schemaOpt ? schemaOpt.value : null;
+  function changeSchema(schema: SchemaValue) {
     if (onSchemaChange) {
-      onSchemaChange(schema);
+      onSchemaChange(schema.value);
     }
-    setCurrentSchema(schema);
-    onSelectChange({ dbId: currentDbId, schema });
-    if (getTableList) {
-      getTableList(currentDbId, schema, force);
+    if (currentDb) {
+      onSelectChange({ db: currentDb, schema });
     }
   }
 
-  function renderDatabaseOption(db: any) {
-    return (
-      <DatabaseOption title={db.database_name}>
-        <Label type="default">{db.backend}</Label> {db.database_name}
-      </DatabaseOption>
-    );
-  }
-
   function renderSelectRow(select: ReactNode, refreshBtn: ReactNode) {
     return (
       <div className="section">
         <span className="select">{select}</span>
-        <span className="refresh-col">{refreshBtn}</span>
+        <span className="refresh">{refreshBtn}</span>
       </div>
     );
   }
 
-  function renderDatabaseSelect() {
-    const queryParams = rison.encode({
-      order_columns: 'database_name',
-      order_direction: 'asc',
-      page: 0,
-      page_size: -1,
-      ...(formMode || !sqlLabMode
-        ? {}
-        : {
-            filters: [
-              {
-                col: 'expose_in_sqllab',
-                opr: 'eq',
-                value: true,
-              },
-            ],
+  const loadDatabases = useMemo(
+    () => async (
+      search: string,
+      page: number,
+      pageSize: number,
+    ): Promise<{
+      data: DatabaseValue[];
+      totalCount: number;
+    }> => {
+      const queryParams = rison.encode({
+        order_columns: 'database_name',
+        order_direction: 'asc',
+        page,
+        page_size: pageSize,
+        ...(formMode || !sqlLabMode
+          ? { filters: [{ col: 'database_name', opr: 'ct', value: search }] }
+          : {
+              filters: [
+                { col: 'database_name', opr: 'ct', value: search },
+                {
+                  col: 'expose_in_sqllab',
+                  opr: 'eq',
+                  value: true,
+                },
+              ],
+            }),
+      });
+      const endpoint = `/api/v1/database/?q=${queryParams}`;
+      return SupersetClient.get({ endpoint }).then(({ json }) => {
+        const { result } = json;
+        if (getDbList) {
+          getDbList(result);
+        }
+        if (result.length === 0) {
+          handleError(t("It seems you don't have access to any database"));
+        }
+        const options = result.map(
+          (row: { backend: string; database_name: string; id: number }) => ({
+            label: `${row.backend}: ${row.database_name}`,
+            value: row.id,
           }),
-    });
+        );
+        return {
+          data: options,
+          totalCount: options.length,
+        };
+      });
+    },
+    [formMode, getDbList, handleError, sqlLabMode],
+  );
 
+  function renderDatabaseSelect() {
     return renderSelectRow(
-      <SupersetAsyncSelect
+      <Select
+        ariaLabel={t('Select a database')}
         data-test="select-database"
-        dataEndpoint={`/api/v1/database/?q=${queryParams}`}
-        onChange={(db: any) => changeDataBase(db)}
-        onAsyncError={() =>
-          handleError(t('Error while fetching database list'))
-        }
-        clearable={false}
-        value={currentDbId}
-        valueKey="id"
-        valueRenderer={(db: any) => (
-          <div>
-            <span className="text-muted m-r-5">{t('Database:')}</span>
-            {renderDatabaseOption(db)}
-          </div>
-        )}
-        optionRenderer={renderDatabaseOption}
-        mutator={dbMutator}
+        header={<FormLabel>{t('Database')}</FormLabel>}
+        onChange={changeDataBase}
+        value={currentDb}
         placeholder={t('Select a database')}
-        autoSelect
-        isDisabled={!isDatabaseSelectEnabled || readOnly}
+        disabled={!isDatabaseSelectEnabled || readOnly}
+        options={loadDatabases}
       />,
       null,
     );
   }
 
   function renderSchemaSelect() {
-    const value = schemaOptions.filter(({ value }) => currentSchema === value);
-    const refresh = !formMode && !readOnly && (
+    const refreshIcon = !formMode && !readOnly && (
       <RefreshLabel
-        onClick={() => changeDataBase({ id: dbId }, true)}
+        onClick={() => setRefresh(refresh + 1)}
         tooltipContent={t('Force refresh schema list')}
       />
     );
 
     return renderSelectRow(
       <Select
+        ariaLabel={t('Select a schema')}
+        disabled={readOnly}
+        header={<FormLabel>{t('Schema')}</FormLabel>}
         name="select-schema"
-        placeholder={t('Select a schema (%s)', schemaOptions.length)}
-        options={schemaOptions}
-        value={value}
-        valueRenderer={o => (
-          <div>
-            <span className="text-muted">{t('Schema:')}</span> {o.label}
-          </div>
-        )}
-        isLoading={schemaLoading}
-        autosize={false}
-        onChange={item => changeSchema(item)}
-        isDisabled={readOnly}
+        placeholder={t('Select a schema')}
+        onChange={item => changeSchema(item as SchemaValue)}
+        options={loadSchemas}
+        value={currentSchema}
       />,
-      refresh,
+      refreshIcon,
     );
   }
 
   return (
     <DatabaseSelectorWrapper data-test="DatabaseSelector">
-      {formMode && <FieldTitle>{t('datasource')}</FieldTitle>}
       {renderDatabaseSelect()}
-      {formMode && <FieldTitle>{t('schema')}</FieldTitle>}
       {renderSchemaSelect()}
     </DatabaseSelectorWrapper>
   );
diff --git a/superset-frontend/src/components/DynamicPlugins/index.tsx b/superset-frontend/src/components/DynamicPlugins/index.tsx
index 90f4ba7fb546..b11798fbd87c 100644
--- a/superset-frontend/src/components/DynamicPlugins/index.tsx
+++ b/superset-frontend/src/components/DynamicPlugins/index.tsx
@@ -17,30 +17,45 @@
  * under the License.
  */
 import React, { useContext, useEffect, useReducer } from 'react';
-import { defineSharedModules, logging, makeApi } from '@superset-ui/core';
+import {
+  ChartMetadata,
+  defineSharedModules,
+  getChartMetadataRegistry,
+  logging,
+  makeApi,
+} from '@superset-ui/core';
 import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags';
+import { omitBy } from 'lodash';
+
+const metadataRegistry = getChartMetadataRegistry();
 
 export type PluginContextType = {
   loading: boolean;
-  plugins: {
+  /** These are actually only the dynamic plugins */
+  dynamicPlugins: {
     [key: string]: {
       key: string;
-      loading: boolean;
+      mounting: boolean;
       error: null | Error;
     };
   };
+  keys: string[];
+  /** Mounted means the plugin's js bundle has been imported */
+  mountedPluginMetadata: Record<string, ChartMetadata>;
   fetchAll: () => void;
 };
 
 const dummyPluginContext: PluginContextType = {
   loading: true,
-  plugins: {},
+  dynamicPlugins: {},
+  keys: [],
+  mountedPluginMetadata: {},
   fetchAll: () => {},
 };
 
 /**
- * It is highly recommended to use the useDynamicPluginContext hook instead.
- * @see useDynamicPluginContext
+ * It is highly recommended to use the usePluginContext hook instead.
+ * @see usePluginContext
  */
 export const PluginContext = React.createContext(dummyPluginContext);
 
@@ -52,7 +67,7 @@ export const PluginContext = React.createContext(dummyPluginContext);
  * Those are compiled into the Superset bundle at build time.
  * Dynamic plugins are added by the end user and can be any webhosted javascript.
  */
-export const useDynamicPluginContext = () => useContext(PluginContext);
+export const usePluginContext = () => useContext(PluginContext);
 
 // the plugin returned from the API
 type Plugin = {
@@ -75,38 +90,60 @@ type BeginAction = {
   keys: string[];
 };
 
+type ChangedKeysAction = {
+  type: 'changed keys';
+};
+
+type PluginAction = BeginAction | CompleteAction | ChangedKeysAction;
+
+function getRegistryData() {
+  return {
+    keys: metadataRegistry.keys(),
+    mountedPluginMetadata: omitBy(
+      metadataRegistry.getMap(),
+      value => value === undefined,
+    ) as Record<string, ChartMetadata>, // cast required to get rid of undefined values
+  };
+}
+
 function pluginContextReducer(
   state: PluginContextType,
-  action: BeginAction | CompleteAction,
+  action: PluginAction,
 ): PluginContextType {
   switch (action.type) {
     case 'begin': {
-      const plugins = { ...state.plugins };
+      const plugins = { ...state.dynamicPlugins };
       action.keys.forEach(key => {
-        plugins[key] = { key, error: null, loading: true };
+        plugins[key] = { key, error: null, mounting: true };
       });
       return {
         ...state,
         loading: action.keys.length > 0,
-        plugins,
+        dynamicPlugins: plugins,
       };
     }
     case 'complete': {
       return {
         ...state,
-        loading: Object.values(state.plugins).some(
-          plugin => plugin.loading && plugin.key !== action.key,
+        loading: Object.values(state.dynamicPlugins).some(
+          plugin => plugin.mounting && plugin.key !== action.key,
         ),
-        plugins: {
-          ...state.plugins,
+        dynamicPlugins: {
+          ...state.dynamicPlugins,
           [action.key]: {
             key: action.key,
-            loading: false,
+            mounting: false,
             error: action.error,
           },
         },
       };
     }
+    case 'changed keys': {
+      return {
+        ...state,
+        ...getRegistryData(),
+      };
+    }
     default:
       return state;
   }
@@ -126,14 +163,18 @@ const sharedModules = {
 };
 
 export const DynamicPluginProvider: React.FC = ({ children }) => {
-  const [pluginState, dispatch] = useReducer(pluginContextReducer, {
-    // use the dummy plugin context, and override the methods
-    ...dummyPluginContext,
-    // eslint-disable-next-line @typescript-eslint/no-use-before-define
-    fetchAll,
-    loading: isFeatureEnabled(FeatureFlag.DYNAMIC_PLUGINS),
-    // TODO: Write fetchByKeys
-  });
+  const [pluginState, dispatch] = useReducer(
+    pluginContextReducer,
+    dummyPluginContext,
+    state => ({
+      ...state,
+      ...getRegistryData(),
+      // eslint-disable-next-line @typescript-eslint/no-use-before-define
+      fetchAll,
+      loading: isFeatureEnabled(FeatureFlag.DYNAMIC_PLUGINS),
+      // TODO: Write fetchByKeys
+    }),
+  );
 
   // For now, we fetch all the plugins at the same time.
   // In the future it would be nice to fetch on an as-needed basis.
@@ -171,6 +212,13 @@ export const DynamicPluginProvider: React.FC = ({ children }) => {
     if (isFeatureEnabled(FeatureFlag.DYNAMIC_PLUGINS)) {
       fetchAll();
     }
+    const registryListener = () => {
+      dispatch({ type: 'changed keys' });
+    };
+    metadataRegistry.addListener(registryListener);
+    return () => {
+      metadataRegistry.removeListener(registryListener);
+    };
   }, []);
 
   return (
diff --git a/superset-frontend/src/components/EditableTitle/index.tsx b/superset-frontend/src/components/EditableTitle/index.tsx
index ec2245b05ef8..86c0350615ff 100644
--- a/superset-frontend/src/components/EditableTitle/index.tsx
+++ b/superset-frontend/src/components/EditableTitle/index.tsx
@@ -70,6 +70,13 @@ export default function EditableTitle({
   useEffect(() => {
     if (isEditing) {
       contentRef.current.focus();
+      // move cursor and scroll to the end
+      if (contentRef.current.setSelectionRange) {
+        const { length } = contentRef.current.value;
+        contentRef.current.setSelectionRange(length, length);
+        contentRef.current.scrollLeft = contentRef.current.scrollWidth;
+        contentRef.current.scrollTop = contentRef.current.scrollHeight;
+      }
     }
   }, [isEditing]);
 
diff --git a/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.test.tsx b/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.test.tsx
index 99db37d92796..b6be9a1b9f8c 100644
--- a/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.test.tsx
+++ b/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.test.tsx
@@ -29,13 +29,6 @@ const mockedProps = {
   title: 'Error title',
 };
 
-jest.mock('../Icon', () => ({
-  __esModule: true,
-  default: ({ name }: { name: string }) => (
-    <div data-test="icon" data-name={name} />
-  ),
-}));
-
 test('should render', () => {
   const { container } = render(<BasicErrorAlert {...mockedProps} />);
   expect(container).toBeInTheDocument();
@@ -43,11 +36,9 @@ test('should render', () => {
 
 test('should render warning icon', () => {
   render(<BasicErrorAlert {...mockedProps} />);
-  expect(screen.getByTestId('icon')).toBeInTheDocument();
-  expect(screen.getByTestId('icon')).toHaveAttribute(
-    'data-name',
-    'warning-solid',
-  );
+  expect(
+    screen.getByRole('img', { name: 'warning-solid' }),
+  ).toBeInTheDocument();
 });
 
 test('should render error icon', () => {
@@ -56,11 +47,7 @@ test('should render error icon', () => {
     level: 'error' as ErrorLevel,
   };
   render(<BasicErrorAlert {...errorProps} />);
-  expect(screen.getByTestId('icon')).toBeInTheDocument();
-  expect(screen.getByTestId('icon')).toHaveAttribute(
-    'data-name',
-    'error-solid',
-  );
+  expect(screen.getByRole('img', { name: 'error-solid' })).toBeInTheDocument();
 });
 
 test('should render the error title', () => {
diff --git a/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.tsx b/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.tsx
index 6c460096ad7d..0d5d99305dc6 100644
--- a/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.tsx
+++ b/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.tsx
@@ -18,7 +18,7 @@
  */
 import React from 'react';
 import { styled, supersetTheme } from '@superset-ui/core';
-import Icon from '../Icon';
+import Icons from 'src/components/Icons';
 import { ErrorLevel } from './types';
 
 const StyledContainer = styled.div<{ level: ErrorLevel }>`
@@ -56,10 +56,11 @@ export default function BasicErrorAlert({
 }: BasicErrorAlertProps) {
   return (
     <StyledContainer level={level} role="alert">
-      <Icon
-        name={level === 'error' ? 'error-solid' : 'warning-solid'}
-        color={supersetTheme.colors[level].base}
-      />
+      {level === 'error' ? (
+        <Icons.ErrorSolid iconColor={supersetTheme.colors[level].base} />
+      ) : (
+        <Icons.WarningSolid iconColor={supersetTheme.colors[level].base} />
+      )}
       <StyledContent>
         <StyledTitle>{title}</StyledTitle>
         <p>{body}</p>
diff --git a/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.test.tsx b/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.test.tsx
index 0b2386635214..6959c5351a7e 100644
--- a/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.test.tsx
+++ b/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.test.tsx
@@ -44,6 +44,7 @@ const mockedProps = {
     message: 'Error message',
   },
   source: 'dashboard' as ErrorSource,
+  subtitle: 'Error message',
 };
 
 test('should render', () => {
diff --git a/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx b/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx
index 0454aca59ef0..9a131f1e2112 100644
--- a/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx
+++ b/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx
@@ -35,12 +35,13 @@ interface DatabaseErrorExtra {
 function DatabaseErrorMessage({
   error,
   source = 'dashboard',
+  subtitle,
 }: ErrorMessageComponentProps<DatabaseErrorExtra>) {
   const { extra, level, message } = error;
 
   const isVisualization = ['dashboard', 'explore'].includes(source);
 
-  const body = (
+  const body = extra && (
     <>
       <p>
         {t('This may be triggered by:')}
@@ -74,14 +75,17 @@ function DatabaseErrorMessage({
     </>
   );
 
-  const copyText = `${message}
+  const copyText =
+    extra && extra.issue_codes
+      ? `${message}
 ${t('This may be triggered by:')}
-${extra.issue_codes.map(issueCode => issueCode.message).join('\n')}`;
+${extra.issue_codes.map(issueCode => issueCode.message).join('\n')}`
+      : message;
 
   return (
     <ErrorAlert
-      title={t('%s Error', extra.engine_name || t('DB engine'))}
-      subtitle={message}
+      title={t('%s Error', (extra && extra.engine_name) || t('DB engine'))}
+      subtitle={subtitle}
       level={level}
       source={source}
       copyText={copyText}
diff --git a/superset-frontend/src/components/ErrorMessage/ErrorAlert.test.tsx b/superset-frontend/src/components/ErrorMessage/ErrorAlert.test.tsx
index f9c54e9be744..7133f25c9e5e 100644
--- a/superset-frontend/src/components/ErrorMessage/ErrorAlert.test.tsx
+++ b/superset-frontend/src/components/ErrorMessage/ErrorAlert.test.tsx
@@ -33,13 +33,6 @@ const mockedProps = {
   source: 'dashboard' as ErrorSource,
 };
 
-jest.mock('../Icon', () => ({
-  __esModule: true,
-  default: ({ name }: { name: string }) => (
-    <div data-test="icon" data-name={name} />
-  ),
-}));
-
 test('should render', () => {
   const { container } = render(<ErrorAlert {...mockedProps} />);
   expect(container).toBeInTheDocument();
@@ -47,11 +40,9 @@ test('should render', () => {
 
 test('should render warning icon', () => {
   render(<ErrorAlert {...mockedProps} />);
-  expect(screen.getByTestId('icon')).toBeInTheDocument();
-  expect(screen.getByTestId('icon')).toHaveAttribute(
-    'data-name',
-    'warning-solid',
-  );
+  expect(
+    screen.getByRole('img', { name: 'warning-solid' }),
+  ).toBeInTheDocument();
 });
 
 test('should render error icon', () => {
@@ -60,11 +51,7 @@ test('should render error icon', () => {
     level: 'error' as ErrorLevel,
   };
   render(<ErrorAlert {...errorProps} />);
-  expect(screen.getByTestId('icon')).toBeInTheDocument();
-  expect(screen.getByTestId('icon')).toHaveAttribute(
-    'data-name',
-    'error-solid',
-  );
+  expect(screen.getByRole('img', { name: 'error-solid' })).toBeInTheDocument();
 });
 
 test('should render the error title', () => {
diff --git a/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx b/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx
index bd5ec4c2cb4f..3298fcf0561a 100644
--- a/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx
+++ b/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx
@@ -22,7 +22,7 @@ import { noOp } from 'src/utils/common';
 import Modal from 'src/components/Modal';
 import Button from 'src/components/Button';
 
-import Icon from '../Icon';
+import Icons from 'src/components/Icons';
 import { ErrorLevel, ErrorSource } from './types';
 import CopyToClipboard from '../CopyToClipboard';
 
@@ -106,11 +106,17 @@ export default function ErrorAlert({
     <ErrorAlertDiv level={level} role="alert">
       <div className="top-row">
         <LeftSideContent>
-          <Icon
-            className="icon"
-            name={level === 'error' ? 'error-solid' : 'warning-solid'}
-            color={supersetTheme.colors[level].base}
-          />
+          {level === 'error' ? (
+            <Icons.ErrorSolid
+              className="icon"
+              iconColor={supersetTheme.colors[level].base}
+            />
+          ) : (
+            <Icons.WarningSolid
+              className="icon"
+              iconColor={supersetTheme.colors[level].base}
+            />
+          )}
           <strong>{title}</strong>
         </LeftSideContent>
         {!isExpandable && (
@@ -163,11 +169,17 @@ export default function ErrorAlert({
           onHide={() => setIsModalOpen(false)}
           title={
             <div className="header">
-              <Icon
-                className="icon"
-                name={level === 'error' ? 'error-solid' : 'warning-solid'}
-                color={supersetTheme.colors[level].base}
-              />
+              {level === 'error' ? (
+                <Icons.ErrorSolid
+                  className="icon"
+                  iconColor={supersetTheme.colors[level].base}
+                />
+              ) : (
+                <Icons.WarningSolid
+                  className="icon"
+                  iconColor={supersetTheme.colors[level].base}
+                />
+              )}
               <div className="title">{title}</div>
             </div>
           }
diff --git a/superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.tsx b/superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.tsx
index 29bd73cb3ccb..c073cf0461b4 100644
--- a/superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.tsx
+++ b/superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.tsx
@@ -50,7 +50,13 @@ export default function ErrorMessageWithStackTrace({
       error.error_type,
     );
     if (ErrorMessageComponent) {
-      return <ErrorMessageComponent error={error} source={source} />;
+      return (
+        <ErrorMessageComponent
+          error={error}
+          source={source}
+          subtitle={subtitle}
+        />
+      );
     }
   }
 
diff --git a/superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.test.tsx b/superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.test.tsx
index d4664d53c62e..17f38c4d23c5 100644
--- a/superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.test.tsx
+++ b/superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.test.tsx
@@ -44,6 +44,7 @@ const mockedProps = {
     message: 'Error message',
   },
   source: 'dashboard' as ErrorSource,
+  subtitle: 'Error message',
 };
 
 test('should render', () => {
diff --git a/superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.tsx b/superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.tsx
index 1eb44371ed7e..666ad32169ad 100644
--- a/superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.tsx
+++ b/superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.tsx
@@ -54,6 +54,7 @@ const findMatches = (undefinedParameters: string[], templateKeys: string[]) => {
 function ParameterErrorMessage({
   error,
   source = 'sqllab',
+  subtitle,
 }: ErrorMessageComponentProps<ParameterErrorExtra>) {
   const { extra, level, message } = error;
 
@@ -112,7 +113,7 @@ ${extra.issue_codes.map(issueCode => issueCode.message).join('\n')}`;
   return (
     <ErrorAlert
       title={t('Parameter error')}
-      subtitle={message}
+      subtitle={subtitle}
       level={level}
       source={source}
       copyText={copyText}
diff --git a/superset-frontend/src/components/ErrorMessage/types.ts b/superset-frontend/src/components/ErrorMessage/types.ts
index a2ce66b594b1..496a9b4cefe5 100644
--- a/superset-frontend/src/components/ErrorMessage/types.ts
+++ b/superset-frontend/src/components/ErrorMessage/types.ts
@@ -33,12 +33,15 @@ export const ErrorTypeEnum = {
   CONNECTION_INVALID_PASSWORD_ERROR: 'CONNECTION_INVALID_PASSWORD_ERROR',
   CONNECTION_INVALID_HOSTNAME_ERROR: 'CONNECTION_INVALID_HOSTNAME_ERROR',
   CONNECTION_PORT_CLOSED_ERROR: 'CONNECTION_PORT_CLOSED_ERROR',
+  CONNECTION_INVALID_PORT_ERROR: 'CONNECTION_INVALID_PORT_ERROR',
   CONNECTION_HOST_DOWN_ERROR: 'CONNECTION_HOST_DOWN_ERROR',
   CONNECTION_ACCESS_DENIED_ERROR: 'CONNECTION_ACCESS_DENIED_ERROR',
   CONNECTION_UNKNOWN_DATABASE_ERROR: 'CONNECTION_UNKNOWN_DATABASE_ERROR',
   CONNECTION_DATABASE_PERMISSIONS_ERROR:
     'CONNECTION_DATABASE_PERMISSIONS_ERROR',
   CONNECTION_MISSING_PARAMETERS_ERRORS: 'CONNECTION_MISSING_PARAMETERS_ERRORS',
+  OBJECT_DOES_NOT_EXIST_ERROR: 'OBJECT_DOES_NOT_EXIST_ERROR',
+  SYNTAX_ERROR: 'SYNTAX_ERROR',
 
   // Viz errors
   VIZ_GET_DF_ERROR: 'VIZ_GET_DF_ERROR',
@@ -50,13 +53,23 @@ export const ErrorTypeEnum = {
   TABLE_SECURITY_ACCESS_ERROR: 'TABLE_SECURITY_ACCESS_ERROR',
   DATASOURCE_SECURITY_ACCESS_ERROR: 'DATASOURCE_SECURITY_ACCESS_ERROR',
   DATABASE_SECURITY_ACCESS_ERROR: 'DATABASE_SECURITY_ACCESS_ERROR',
+  QUERY_SECURITY_ACCESS_ERROR: 'QUERY_SECURITY_ACCESS_ERROR',
   MISSING_OWNERSHIP_ERROR: 'MISSING_OWNERSHIP_ERROR',
 
   // Other errors
   BACKEND_TIMEOUT_ERROR: 'BACKEND_TIMEOUT_ERROR',
+  DATABASE_NOT_FOUND_ERROR: 'DATABASE_NOT_FOUND_ERROR',
 
   // Sqllab error
   MISSING_TEMPLATE_PARAMS_ERROR: 'MISSING_TEMPLATE_PARAMS_ERROR',
+  INVALID_TEMPLATE_PARAMS_ERROR: 'INVALID_TEMPLATE_PARAMS_ERROR',
+  RESULTS_BACKEND_NOT_CONFIGURED_ERROR: 'RESULTS_BACKEND_NOT_CONFIGURED_ERROR',
+  DML_NOT_ALLOWED_ERROR: 'DML_NOT_ALLOWED_ERROR',
+  INVALID_CTAS_QUERY_ERROR: 'INVALID_CTAS_QUERY_ERROR',
+  INVALID_CVAS_QUERY_ERROR: 'INVALID_CVAS_QUERY_ERROR',
+  SQLLAB_TIMEOUT_ERROR: 'SQLLAB_TIMEOUT_ERROR',
+  RESULTS_BACKEND_ERROR: 'RESULTS_BACKEND_ERROR',
+  ASYNC_WORKERS_ERROR: 'ASYNC_WORKERS_ERROR',
 
   // Generic errors
   GENERIC_COMMAND_ERROR: 'GENERIC_COMMAND_ERROR',
@@ -88,6 +101,7 @@ export type ErrorMessageComponentProps<
 > = {
   error: SupersetError<ExtraType>;
   source?: ErrorSource;
+  subtitle?: React.ReactNode;
 };
 
 export type ErrorMessageComponent = React.ComponentType<ErrorMessageComponentProps>;
diff --git a/superset-frontend/src/components/FaveStar/FaveStar.test.tsx b/superset-frontend/src/components/FaveStar/FaveStar.test.tsx
index 443cb1e41c43..68433db96ea4 100644
--- a/superset-frontend/src/components/FaveStar/FaveStar.test.tsx
+++ b/superset-frontend/src/components/FaveStar/FaveStar.test.tsx
@@ -22,13 +22,6 @@ import { render, screen } from 'spec/helpers/testing-library';
 import userEvent from '@testing-library/user-event';
 import FaveStar from '.';
 
-jest.mock('../Icon', () => ({
-  __esModule: true,
-  default: ({ name }: { name: string }) => (
-    <div data-test="icon" data-name={name} />
-  ),
-}));
-
 jest.mock('src/components/Tooltip', () => ({
   Tooltip: (props: any) => <div data-test="tooltip" {...props} />,
 }));
@@ -41,11 +34,9 @@ test('render right content', () => {
 
   const { rerender } = render(<FaveStar {...props} isStarred />);
   expect(screen.getByRole('button')).toBeInTheDocument();
-  expect(screen.getByTestId('icon')).toBeInTheDocument();
-  expect(screen.getByTestId('icon')).toHaveAttribute(
-    'data-name',
-    'favorite-selected',
-  );
+  expect(
+    screen.getByRole('img', { name: 'favorite-selected' }),
+  ).toBeInTheDocument();
 
   expect(props.saveFaveStar).toBeCalledTimes(0);
   userEvent.click(screen.getByRole('button'));
@@ -53,11 +44,9 @@ test('render right content', () => {
   expect(props.saveFaveStar).toBeCalledWith(props.itemId, true);
 
   rerender(<FaveStar {...props} />);
-  expect(screen.getByTestId('icon')).toBeInTheDocument();
-  expect(screen.getByTestId('icon')).toHaveAttribute(
-    'data-name',
-    'favorite-unselected',
-  );
+  expect(
+    screen.getByRole('img', { name: 'favorite-unselected' }),
+  ).toBeInTheDocument();
 
   expect(props.saveFaveStar).toBeCalledTimes(1);
   userEvent.click(screen.getByRole('button'));
diff --git a/superset-frontend/src/components/FaveStar/index.tsx b/superset-frontend/src/components/FaveStar/index.tsx
index 8a0903372f0a..1f7a74b1acfb 100644
--- a/superset-frontend/src/components/FaveStar/index.tsx
+++ b/superset-frontend/src/components/FaveStar/index.tsx
@@ -21,7 +21,7 @@ import React, { useCallback } from 'react';
 import { t, styled } from '@superset-ui/core';
 import { Tooltip } from 'src/components/Tooltip';
 import { useComponentDidMount } from 'src/common/hooks/useComponentDidMount';
-import Icon from '../Icon';
+import Icons from 'src/components/Icons';
 
 interface FaveStarProps {
   itemId: number;
@@ -66,7 +66,11 @@ const FaveStar = ({
       data-test="fave-unfave-icon"
       role="button"
     >
-      <Icon name={isStarred ? 'favorite-selected' : 'favorite-unselected'} />
+      {isStarred ? (
+        <Icons.FavoriteSelected iconSize="xxl" />
+      ) : (
+        <Icons.FavoriteUnselected iconSize="xxl" />
+      )}
     </StyledLink>
   );
 
diff --git a/superset-frontend/src/components/FilterableTable/FilterableTable.tsx b/superset-frontend/src/components/FilterableTable/FilterableTable.tsx
index ed85daef6e44..0e7f7e349e46 100644
--- a/superset-frontend/src/components/FilterableTable/FilterableTable.tsx
+++ b/superset-frontend/src/components/FilterableTable/FilterableTable.tsx
@@ -396,7 +396,7 @@ export default class FilterableTable extends PureComponent<
           }}
           className={`${className} grid-cell grid-header-cell`}
         >
-          {label}
+          <div>{label}</div>
         </div>
       </Tooltip>
     );
@@ -428,7 +428,7 @@ export default class FilterableTable extends PureComponent<
         }}
         className={`grid-cell ${this.rowClassName({ index: rowIndex })}`}
       >
-        {content}
+        <div>{content}</div>
       </div>
     );
 
diff --git a/superset-frontend/src/components/Form/Form.tsx b/superset-frontend/src/components/Form/Form.tsx
index 946324549ad3..1fc25e6c498b 100644
--- a/superset-frontend/src/components/Form/Form.tsx
+++ b/superset-frontend/src/components/Form/Form.tsx
@@ -32,3 +32,5 @@ const StyledForm = styled(AntDForm)`
 export default function Form(props: FormProps) {
   return <StyledForm {...props} />;
 }
+
+export { FormProps };
diff --git a/superset-frontend/src/components/Form/LabeledErrorBoundInput.stories.tsx b/superset-frontend/src/components/Form/LabeledErrorBoundInput.stories.tsx
index 6061848d8501..d1c81b9af3a6 100644
--- a/superset-frontend/src/components/Form/LabeledErrorBoundInput.stories.tsx
+++ b/superset-frontend/src/components/Form/LabeledErrorBoundInput.stories.tsx
@@ -32,6 +32,7 @@ export const InteractiveLabeledErrorBoundInput = ({
   placeholder,
   type,
   id,
+  tooltipText,
 }: LabeledErrorBoundInputProps) => {
   const [currentValue, setCurrentValue] = useState(value);
 
@@ -58,6 +59,8 @@ export const InteractiveLabeledErrorBoundInput = ({
       placeholder={placeholder}
       type={type}
       required
+      hasTooltip
+      tooltipText={tooltipText}
     />
   );
 };
@@ -66,6 +69,7 @@ InteractiveLabeledErrorBoundInput.args = {
   name: 'Username',
   placeholder: 'Example placeholder text...',
   id: 1,
+  tooltipText: 'This is a tooltip',
 };
 
 InteractiveLabeledErrorBoundInput.argTypes = {
diff --git a/superset-frontend/src/components/Form/LabeledErrorBoundInput.test.jsx b/superset-frontend/src/components/Form/LabeledErrorBoundInput.test.jsx
index 15f956fd5773..ebfd2b30e42b 100644
--- a/superset-frontend/src/components/Form/LabeledErrorBoundInput.test.jsx
+++ b/superset-frontend/src/components/Form/LabeledErrorBoundInput.test.jsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React from 'react';
-import { render, screen } from 'spec/helpers/testing-library';
+import { render, fireEvent, screen } from 'spec/helpers/testing-library';
 import LabeledErrorBoundInput from 'src/components/Form/LabeledErrorBoundInput';
 
 const defaultProps = {
@@ -27,6 +27,8 @@ const defaultProps = {
   validationMethods: () => {},
   errorMessage: '',
   helpText: 'This is a line of example help text',
+  hasTooltip: false,
+  tooltipText: 'This is a tooltip',
   value: '',
   placeholder: 'Example placeholder text...',
   type: 'textbox',
@@ -58,4 +60,19 @@ describe('LabeledErrorBoundInput', () => {
     expect(textboxInput).toBeVisible();
     expect(errorText).toBeVisible();
   });
+  it('renders a LabledErrorBoundInput with a InfoTooltip', async () => {
+    defaultProps.hasTooltip = true;
+    render(<LabeledErrorBoundInput {...defaultProps} />);
+
+    const label = screen.getByText(/username/i);
+    const textboxInput = screen.getByRole('textbox');
+    const tooltipIcon = screen.getByRole('img');
+
+    fireEvent.mouseOver(tooltipIcon);
+
+    expect(tooltipIcon).toBeVisible();
+    expect(label).toBeVisible();
+    expect(textboxInput).toBeVisible();
+    expect(await screen.findByText('This is a tooltip')).toBeInTheDocument();
+  });
 });
diff --git a/superset-frontend/src/components/Form/LabeledErrorBoundInput.tsx b/superset-frontend/src/components/Form/LabeledErrorBoundInput.tsx
index 75df2bb088cb..10138cd5593a 100644
--- a/superset-frontend/src/components/Form/LabeledErrorBoundInput.tsx
+++ b/superset-frontend/src/components/Form/LabeledErrorBoundInput.tsx
@@ -19,6 +19,8 @@
 import React from 'react';
 import { Input } from 'antd';
 import { styled, css, SupersetTheme } from '@superset-ui/core';
+import InfoTooltip from 'src/components/InfoTooltip';
+import errorIcon from 'images/icons/error.svg';
 import FormItem from './FormItem';
 import FormLabel from './FormLabel';
 
@@ -30,6 +32,8 @@ export interface LabeledErrorBoundInputProps {
   errorMessage: string | null;
   helpText?: string;
   required?: boolean;
+  hasTooltip?: boolean;
+  tooltipText?: string | null;
   id?: string;
   classname?: string;
   [x: string]: any;
@@ -46,42 +50,63 @@ const alertIconStyles = (theme: SupersetTheme, hasError: boolean) => css`
   ${hasError &&
   `.ant-form-item-control-input-content {
       position: relative;
-
       &:after {
         content: ' ';
         display: inline-block;
         background: ${theme.colors.error.base};
-        mask: url('/images/icons/error.svg');
+        mask: url(${errorIcon});
         mask-size: cover;
         width: ${theme.gridUnit * 4}px;
         height: ${theme.gridUnit * 4}px;
         position: absolute;
-        right: 7px;
-        top: 15px;
+        right: ${theme.gridUnit * 1.25}px;
+        top: ${theme.gridUnit * 2.75}px;
       }
     }`}
 `;
+
 const StyledFormGroup = styled('div')`
-  margin-bottom: ${({ theme }) => theme.gridUnit * 5}px;
+  input::-webkit-outer-spin-button,
+  input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+  }
+  margin-bottom: ${({ theme }) => theme.gridUnit * 3}px;
   .ant-form-item {
     margin-bottom: 0;
   }
 `;
 
+const StyledAlignment = styled.div`
+  display: flex;
+  align-items: center;
+`;
+
+const StyledFormLabel = styled(FormLabel)`
+  margin-bottom: 0;
+`;
+
 const LabeledErrorBoundInput = ({
   label,
   validationMethods,
   errorMessage,
   helpText,
   required = false,
+  hasTooltip = false,
+  tooltipText,
   id,
   className,
   ...props
 }: LabeledErrorBoundInputProps) => (
   <StyledFormGroup className={className}>
-    <FormLabel htmlFor={id} required={required}>
-      {label}
-    </FormLabel>
+    <StyledAlignment>
+      <StyledFormLabel htmlFor={id} required={required}>
+        {label}
+      </StyledFormLabel>
+      {hasTooltip && (
+        <InfoTooltip tooltip={`${tooltipText}`} viewBox="0 -1 24 24" />
+      )}
+    </StyledAlignment>
     <FormItem
       css={(theme: SupersetTheme) => alertIconStyles(theme, !!errorMessage)}
       validateTrigger={Object.keys(validationMethods)}
diff --git a/superset-frontend/src/components/Form/index.tsx b/superset-frontend/src/components/Form/index.tsx
index 7d7a60745df8..1aa62ae56708 100644
--- a/superset-frontend/src/components/Form/index.tsx
+++ b/superset-frontend/src/components/Form/index.tsx
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Form from './Form';
+import Form, { FormProps } from './Form';
 import FormItem from './FormItem';
 import FormLabel from './FormLabel';
 import LabeledErrorBoundInput from './LabeledErrorBoundInput';
 
-export { Form, FormItem, FormLabel, LabeledErrorBoundInput };
+export { Form, FormItem, FormLabel, LabeledErrorBoundInput, FormProps };
diff --git a/superset-frontend/src/components/Icon/icon.stories.jsx b/superset-frontend/src/components/Icon/icon.stories.jsx
deleted file mode 100644
index fbe09516c173..000000000000
--- a/superset-frontend/src/components/Icon/icon.stories.jsx
+++ /dev/null
@@ -1,84 +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 React from 'react';
-import { withKnobs, select } from '@storybook/addon-knobs';
-import { styled, supersetTheme } from '@superset-ui/core';
-import Icon, { iconsRegistry } from '.';
-
-export default {
-  title: 'Icon',
-  component: Icon,
-  decorators: [withKnobs],
-};
-
-const palette = {};
-Object.entries(supersetTheme.colors).forEach(([familyName, family]) => {
-  Object.entries(family).forEach(([colorName, colorValue]) => {
-    palette[`${familyName} / ${colorName}`] = colorValue;
-  });
-});
-
-const colorKnob = {
-  label: 'Color',
-  options: {
-    Default: null,
-    ...palette,
-  },
-  defaultValue: null,
-};
-
-const IconSet = styled.div`
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-`;
-
-const IconBlock = styled.div`
-  flex-grow: 0;
-  flex-shrink: 0;
-  flex-basis: 10%;
-  text-align: center;
-  padding: ${({ theme }) => theme.gridUnit * 2}px;
-  div {
-    white-space: nowrap;
-    font-size: ${({ theme }) => theme.typography.sizes.s}px;
-  }
-`;
-
-export const SupersetIcon = () => (
-  <IconSet>
-    {Object.keys(iconsRegistry)
-      .sort()
-      .map(iconName => (
-        <IconBlock key={iconName}>
-          <Icon
-            name={iconName}
-            key={iconName}
-            color={select(
-              colorKnob.label,
-              colorKnob.options,
-              colorKnob.defaultValue,
-              colorKnob.groupId,
-            )}
-          />
-          <div>{iconName}</div>
-        </IconBlock>
-      ))}
-  </IconSet>
-);
diff --git a/superset-frontend/src/components/Icon/index.tsx b/superset-frontend/src/components/Icon/index.tsx
deleted file mode 100644
index 693354d9a736..000000000000
--- a/superset-frontend/src/components/Icon/index.tsx
+++ /dev/null
@@ -1,437 +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 React, { SVGProps } from 'react';
-
-import { ReactComponent as AlertIcon } from 'images/icons/alert.svg';
-import { ReactComponent as AlertSolidIcon } from 'images/icons/alert_solid.svg';
-import { ReactComponent as AlertSolidSmallIcon } from 'images/icons/alert_solid_small.svg';
-import { ReactComponent as BinocularsIcon } from 'images/icons/binoculars.svg';
-import { ReactComponent as BoltIcon } from 'images/icons/bolt.svg';
-import { ReactComponent as BoltSmallIcon } from 'images/icons/bolt_small.svg';
-import { ReactComponent as CrossFilterBadge } from 'images/icons/cross-filter-badge.svg';
-import { ReactComponent as BoltSmallRunIcon } from 'images/icons/bolt_small_run.svg';
-import { ReactComponent as CalendarIcon } from 'images/icons/calendar.svg';
-import { ReactComponent as CancelIcon } from 'images/icons/cancel.svg';
-import { ReactComponent as CancelSolidIcon } from 'images/icons/cancel_solid.svg';
-import { ReactComponent as CancelXIcon } from 'images/icons/cancel-x.svg';
-import { ReactComponent as CardViewIcon } from 'images/icons/card_view.svg';
-import { ReactComponent as CardsIcon } from 'images/icons/cards.svg';
-import { ReactComponent as CardsLockedIcon } from 'images/icons/cards_locked.svg';
-import { ReactComponent as CaretDownIcon } from 'images/icons/caret_down.svg';
-import { ReactComponent as CaretLeftIcon } from 'images/icons/caret_left.svg';
-import { ReactComponent as CaretRightIcon } from 'images/icons/caret_right.svg';
-import { ReactComponent as CaretUpIcon } from 'images/icons/caret_up.svg';
-import { ReactComponent as CertifiedIcon } from 'images/icons/certified.svg';
-import { ReactComponent as CheckIcon } from 'images/icons/check.svg';
-import { ReactComponent as CheckboxHalfIcon } from 'images/icons/checkbox-half.svg';
-import { ReactComponent as CheckboxOffIcon } from 'images/icons/checkbox-off.svg';
-import { ReactComponent as CheckboxOnIcon } from 'images/icons/checkbox-on.svg';
-import { ReactComponent as CircleCheckIcon } from 'images/icons/circle_check.svg';
-import { ReactComponent as CircleCheckSolidIcon } from 'images/icons/circle_check_solid.svg';
-import { ReactComponent as CircleIcon } from 'images/icons/circle.svg';
-import { ReactComponent as ClockIcon } from 'images/icons/clock.svg';
-import { ReactComponent as CloseIcon } from 'images/icons/close.svg';
-import { ReactComponent as CodeIcon } from 'images/icons/code.svg';
-import { ReactComponent as CogIcon } from 'images/icons/cog.svg';
-import { ReactComponent as CollapseIcon } from 'images/icons/collapse.svg';
-import { ReactComponent as ColorPaletteIcon } from 'images/icons/color_palette.svg';
-import { ReactComponent as ComponentsIcon } from 'images/icons/components.svg';
-import { ReactComponent as CopyIcon } from 'images/icons/copy.svg';
-import { ReactComponent as CursorTargeIcon } from 'images/icons/cursor_target.svg';
-import { ReactComponent as DatabaseIcon } from 'images/icons/database.svg';
-import { ReactComponent as DatasetPhysicalIcon } from 'images/icons/dataset_physical.svg';
-import { ReactComponent as DatasetVirtualGreyscaleIcon } from 'images/icons/dataset_virtual_greyscale.svg';
-import { ReactComponent as DatasetVirtualIcon } from 'images/icons/dataset_virtual.svg';
-import { ReactComponent as DownloadIcon } from 'images/icons/download.svg';
-import { ReactComponent as EditAltIcon } from 'images/icons/edit_alt.svg';
-import { ReactComponent as EditIcon } from 'images/icons/edit.svg';
-import { ReactComponent as EmailIcon } from 'images/icons/email.svg';
-import { ReactComponent as ErrorIcon } from 'images/icons/error.svg';
-import { ReactComponent as ErrorSolidIcon } from 'images/icons/error_solid.svg';
-import { ReactComponent as ErrorSolidSmallIcon } from 'images/icons/error_solid_small.svg';
-import { ReactComponent as ExclamationIcon } from 'images/icons/exclamation.svg';
-import { ReactComponent as ExpandIcon } from 'images/icons/expand.svg';
-import { ReactComponent as EyeIcon } from 'images/icons/eye.svg';
-import { ReactComponent as EyeSlashIcon } from 'images/icons/eye_slash.svg';
-import { ReactComponent as FavoriteSelectedIcon } from 'images/icons/favorite-selected.svg';
-import { ReactComponent as FavoriteSmallSelectedIcon } from 'images/icons/favorite_small_selected.svg';
-import { ReactComponent as FavoriteUnselectedIcon } from 'images/icons/favorite-unselected.svg';
-import { ReactComponent as FieldABCIcon } from 'images/icons/field_abc.svg';
-import { ReactComponent as FieldBooleanIcon } from 'images/icons/field_boolean.svg';
-import { ReactComponent as FieldDateIcon } from 'images/icons/field_date.svg';
-import { ReactComponent as FieldDerivedIcon } from 'images/icons/field_derived.svg';
-import { ReactComponent as FieldNumIcon } from 'images/icons/field_num.svg';
-import { ReactComponent as FieldStructIcon } from 'images/icons/field_struct.svg';
-import { ReactComponent as FileIcon } from 'images/icons/file.svg';
-import { ReactComponent as FilterIcon } from 'images/icons/filter.svg';
-import { ReactComponent as FilterSmallIcon } from 'images/icons/filter_small.svg';
-import { ReactComponent as FolderIcon } from 'images/icons/folder.svg';
-import { ReactComponent as FullIcon } from 'images/icons/full.svg';
-import { ReactComponent as FunctionIcon } from 'images/icons/function_x.svg';
-import { ReactComponent as GearIcon } from 'images/icons/gear.svg';
-import { ReactComponent as GridIcon } from 'images/icons/grid.svg';
-import { ReactComponent as ImageIcon } from 'images/icons/image.svg';
-import { ReactComponent as ImportIcon } from 'images/icons/import.svg';
-import { ReactComponent as InfoIcon } from 'images/icons/info.svg';
-import { ReactComponent as InfoSolidIcon } from 'images/icons/info-solid.svg';
-import { ReactComponent as InfoSolidSmallIcon } from 'images/icons/info_solid_small.svg';
-import { ReactComponent as JoinIcon } from 'images/icons/join.svg';
-import { ReactComponent as KeyboardIcon } from 'images/icons/keyboard.svg';
-import { ReactComponent as LayersIcon } from 'images/icons/layers.svg';
-import { ReactComponent as LightbulbIcon } from 'images/icons/lightbulb.svg';
-import { ReactComponent as LinkIcon } from 'images/icons/link.svg';
-import { ReactComponent as ListIcon } from 'images/icons/list.svg';
-import { ReactComponent as ListViewIcon } from 'images/icons/list_view.svg';
-import { ReactComponent as LocationIcon } from 'images/icons/location.svg';
-import { ReactComponent as LockLockedIcon } from 'images/icons/lock_locked.svg';
-import { ReactComponent as LockUnlockedIcon } from 'images/icons/lock_unlocked.svg';
-import { ReactComponent as MapIcon } from 'images/icons/map.svg';
-import { ReactComponent as MessageIcon } from 'images/icons/message.svg';
-import { ReactComponent as MinusIcon } from 'images/icons/minus.svg';
-import { ReactComponent as MinusSolidIcon } from 'images/icons/minus_solid.svg';
-import { ReactComponent as MoreHorizIcon } from 'images/icons/more_horiz.svg';
-import { ReactComponent as MoveIcon } from 'images/icons/move.svg';
-import { ReactComponent as NavChartsIcon } from 'images/icons/nav_charts.svg';
-import { ReactComponent as NavDashboardIcon } from 'images/icons/nav_dashboard.svg';
-import { ReactComponent as NavDataIcon } from 'images/icons/nav_data.svg';
-import { ReactComponent as NavExploreIcon } from 'images/icons/nav_explore.svg';
-import { ReactComponent as NavHomeIcon } from 'images/icons/nav_home.svg';
-import { ReactComponent as NavLabIcon } from 'images/icons/nav_lab.svg';
-import { ReactComponent as NoteIcon } from 'images/icons/note.svg';
-import { ReactComponent as OfflineIcon } from 'images/icons/offline.svg';
-import { ReactComponent as PaperclipIcon } from 'images/icons/paperclip.svg';
-import { ReactComponent as PlaceholderIcon } from 'images/icons/placeholder.svg';
-import { ReactComponent as PlusIcon } from 'images/icons/plus.svg';
-import { ReactComponent as PlusLargeIcon } from 'images/icons/plus_large.svg';
-import { ReactComponent as PlusSmallIcon } from 'images/icons/plus_small.svg';
-import { ReactComponent as PlusSolidIcon } from 'images/icons/plus_solid.svg';
-import { ReactComponent as QueuedIcon } from 'images/icons/queued.svg';
-import { ReactComponent as RefreshIcon } from 'images/icons/refresh.svg';
-import { ReactComponent as RunningIcon } from 'images/icons/running.svg';
-import { ReactComponent as SaveIcon } from 'images/icons/save.svg';
-import { ReactComponent as SQLIcon } from 'images/icons/sql.svg';
-import { ReactComponent as SearchIcon } from 'images/icons/search.svg';
-import { ReactComponent as ServerIcon } from 'images/icons/server.svg';
-import { ReactComponent as ShareIcon } from 'images/icons/share.svg';
-import { ReactComponent as SlackIcon } from 'images/icons/slack.svg';
-import { ReactComponent as SortAscIcon } from 'images/icons/sort_asc.svg';
-import { ReactComponent as SortDescIcon } from 'images/icons/sort_desc.svg';
-import { ReactComponent as SortIcon } from 'images/icons/sort.svg';
-import { ReactComponent as TableIcon } from 'images/icons/table.svg';
-import { ReactComponent as TagIcon } from 'images/icons/tag.svg';
-import { ReactComponent as TrashIcon } from 'images/icons/trash.svg';
-import { ReactComponent as TriangleChangeIcon } from 'images/icons/triangle_change.svg';
-import { ReactComponent as TriangleDownIcon } from 'images/icons/triangle_down.svg';
-import { ReactComponent as TriangleUpIcon } from 'images/icons/triangle_up.svg';
-import { ReactComponent as UpLevelIcon } from 'images/icons/up-level.svg';
-import { ReactComponent as UserIcon } from 'images/icons/user.svg';
-import { ReactComponent as WarningIcon } from 'images/icons/warning.svg';
-import { ReactComponent as WarningSolidIcon } from 'images/icons/warning_solid.svg';
-import { ReactComponent as XLargeIcon } from 'images/icons/x-large.svg';
-import { ReactComponent as XSmallIcon } from 'images/icons/x-small.svg';
-
-export type IconName =
-  | 'alert'
-  | 'alert-solid'
-  | 'alert-solid-small'
-  | 'binoculars'
-  | 'bolt'
-  | 'bolt-small'
-  | 'bolt-small-run'
-  | 'calendar'
-  | 'cancel'
-  | 'cancel-solid'
-  | 'cancel-x'
-  | 'card-view'
-  | 'cards'
-  | 'cards-locked'
-  | 'caret-down'
-  | 'caret-left'
-  | 'caret-right'
-  | 'caret-up'
-  | 'certified'
-  | 'cross-filter-badge'
-  | 'check'
-  | 'checkbox-half'
-  | 'checkbox-off'
-  | 'checkbox-on'
-  | 'circle'
-  | 'circle-check'
-  | 'circle-check-solid'
-  | 'clock'
-  | 'close'
-  | 'code'
-  | 'cog'
-  | 'collapse'
-  | 'color-palette'
-  | 'components'
-  | 'copy'
-  | 'cursor-target'
-  | 'database'
-  | 'dataset-physical'
-  | 'dataset-virtual'
-  | 'dataset-virtual-greyscale'
-  | 'download'
-  | 'edit'
-  | 'edit-alt'
-  | 'email'
-  | 'error'
-  | 'error-solid'
-  | 'error-solid-small'
-  | 'exclamation'
-  | 'expand'
-  | 'eye'
-  | 'eye-slash'
-  | 'favorite-selected'
-  | 'favorite-small-selected'
-  | 'favorite-unselected'
-  | 'field-abc'
-  | 'field-boolean'
-  | 'field-date'
-  | 'field-derived'
-  | 'field-num'
-  | 'field-struct'
-  | 'file'
-  | 'filter'
-  | 'filter-small'
-  | 'folder'
-  | 'full'
-  | 'function'
-  | 'gear'
-  | 'grid'
-  | 'image'
-  | 'import'
-  | 'info'
-  | 'info-solid'
-  | 'info-solid-small'
-  | 'join'
-  | 'keyboard'
-  | 'layers'
-  | 'link'
-  | 'lightbulb'
-  | 'list'
-  | 'list-view'
-  | 'location'
-  | 'lock-locked'
-  | 'lock-unlocked'
-  | 'map'
-  | 'message'
-  | 'minus'
-  | 'minus-solid'
-  | 'more-horiz'
-  | 'move'
-  | 'nav-charts'
-  | 'nav-dashboard'
-  | 'nav-data'
-  | 'nav-explore'
-  | 'nav-home'
-  | 'nav-lab'
-  | 'note'
-  | 'offline'
-  | 'paperclip'
-  | 'placeholder'
-  | 'plus'
-  | 'plus-large'
-  | 'plus-small'
-  | 'plus-solid'
-  | 'queued'
-  | 'refresh'
-  | 'running'
-  | 'save'
-  | 'search'
-  | 'server'
-  | 'share'
-  | 'slack'
-  | 'sort'
-  | 'sort-asc'
-  | 'sort-desc'
-  | 'sql'
-  | 'table'
-  | 'tag'
-  | 'trash'
-  | 'triangle-change'
-  | 'triangle-down'
-  | 'triangle-up'
-  | 'up-level'
-  | 'user'
-  | 'warning'
-  | 'warning-solid'
-  | 'x-large'
-  | 'x-small';
-
-export const iconsRegistry: Record<
-  IconName,
-  React.ComponentType<SVGProps<SVGSVGElement>>
-> = {
-  'alert-solid': AlertSolidIcon,
-  'alert-solid-small': AlertSolidSmallIcon,
-  'bolt-small': BoltSmallIcon,
-  'bolt-small-run': BoltSmallRunIcon,
-  'cross-filter-badge': CrossFilterBadge,
-  'cancel-solid': CancelSolidIcon,
-  'cancel-x': CancelXIcon,
-  'card-view': CardViewIcon,
-  'cards-locked': CardsLockedIcon,
-  'caret-down': CaretDownIcon,
-  'caret-left': CaretLeftIcon,
-  'caret-right': CaretRightIcon,
-  'caret-up': CaretUpIcon,
-  'checkbox-half': CheckboxHalfIcon,
-  'checkbox-off': CheckboxOffIcon,
-  'checkbox-on': CheckboxOnIcon,
-  'circle-check': CircleCheckIcon,
-  'circle-check-solid': CircleCheckSolidIcon,
-  'color-palette': ColorPaletteIcon,
-  'cursor-target': CursorTargeIcon,
-  'dataset-physical': DatasetPhysicalIcon,
-  'dataset-virtual': DatasetVirtualIcon,
-  'dataset-virtual-greyscale': DatasetVirtualGreyscaleIcon,
-  'edit-alt': EditAltIcon,
-  'error-solid': ErrorSolidIcon,
-  'error-solid-small': ErrorSolidSmallIcon,
-  'eye-slash': EyeSlashIcon,
-  'favorite-selected': FavoriteSelectedIcon,
-  'favorite-small-selected': FavoriteSmallSelectedIcon,
-  'favorite-unselected': FavoriteUnselectedIcon,
-  'field-abc': FieldABCIcon,
-  'field-boolean': FieldBooleanIcon,
-  'field-date': FieldDateIcon,
-  'field-derived': FieldDerivedIcon,
-  'field-num': FieldNumIcon,
-  'field-struct': FieldStructIcon,
-  'filter-small': FilterSmallIcon,
-  'info-solid': InfoSolidIcon,
-  'info-solid-small': InfoSolidSmallIcon,
-  'list-view': ListViewIcon,
-  'lock-locked': LockLockedIcon,
-  'lock-unlocked': LockUnlockedIcon,
-  'minus-solid': MinusSolidIcon,
-  'more-horiz': MoreHorizIcon,
-  'nav-charts': NavChartsIcon,
-  'nav-dashboard': NavDashboardIcon,
-  'nav-data': NavDataIcon,
-  'nav-explore': NavExploreIcon,
-  'nav-home': NavHomeIcon,
-  'nav-lab': NavLabIcon,
-  'plus-large': PlusLargeIcon,
-  'plus-small': PlusSmallIcon,
-  'plus-solid': PlusSolidIcon,
-  'sort-asc': SortAscIcon,
-  'sort-desc': SortDescIcon,
-  'triangle-change': TriangleChangeIcon,
-  'triangle-down': TriangleDownIcon,
-  'triangle-up': TriangleUpIcon,
-  'up-level': UpLevelIcon,
-  'warning-solid': WarningSolidIcon,
-  'x-large': XLargeIcon,
-  'x-small': XSmallIcon,
-  alert: AlertIcon,
-  binoculars: BinocularsIcon,
-  bolt: BoltIcon,
-  calendar: CalendarIcon,
-  cancel: CancelIcon,
-  cards: CardsIcon,
-  certified: CertifiedIcon,
-  check: CheckIcon,
-  circle: CircleIcon,
-  clock: ClockIcon,
-  close: CloseIcon,
-  code: CodeIcon,
-  cog: CogIcon,
-  collapse: CollapseIcon,
-  components: ComponentsIcon,
-  copy: CopyIcon,
-  database: DatabaseIcon,
-  download: DownloadIcon,
-  edit: EditIcon,
-  email: EmailIcon,
-  error: ErrorIcon,
-  exclamation: ExclamationIcon,
-  expand: ExpandIcon,
-  eye: EyeIcon,
-  file: FileIcon,
-  filter: FilterIcon,
-  folder: FolderIcon,
-  full: FullIcon,
-  function: FunctionIcon,
-  gear: GearIcon,
-  grid: GridIcon,
-  image: ImageIcon,
-  import: ImportIcon,
-  info: InfoIcon,
-  join: JoinIcon,
-  keyboard: KeyboardIcon,
-  layers: LayersIcon,
-  link: LinkIcon,
-  lightbulb: LightbulbIcon,
-  list: ListIcon,
-  location: LocationIcon,
-  map: MapIcon,
-  message: MessageIcon,
-  minus: MinusIcon,
-  move: MoveIcon,
-  note: NoteIcon,
-  offline: OfflineIcon,
-  paperclip: PaperclipIcon,
-  placeholder: PlaceholderIcon,
-  plus: PlusIcon,
-  queued: QueuedIcon,
-  refresh: RefreshIcon,
-  running: RunningIcon,
-  save: SaveIcon,
-  search: SearchIcon,
-  server: ServerIcon,
-  share: ShareIcon,
-  slack: SlackIcon,
-  sort: SortIcon,
-  sql: SQLIcon,
-  table: TableIcon,
-  tag: TagIcon,
-  trash: TrashIcon,
-  user: UserIcon,
-  warning: WarningIcon,
-};
-
-export interface IconProps extends SVGProps<SVGSVGElement> {
-  name: IconName;
-  'data-test'?: string;
-}
-
-const Icon = ({
-  name,
-  color = '#666666',
-  viewBox = '0 0 24 24',
-  'data-test': dataTest,
-  ...rest
-}: IconProps) => {
-  const Component = iconsRegistry[name];
-
-  return (
-    <Component
-      role="img"
-      aria-label={name}
-      color={color}
-      viewBox={viewBox}
-      data-test={dataTest ?? name}
-      {...rest}
-    />
-  );
-};
-
-export default Icon;
diff --git a/superset-frontend/src/components/IconButton/index.tsx b/superset-frontend/src/components/IconButton/index.tsx
index e7f9c2d89d52..0d80911bf7e9 100644
--- a/superset-frontend/src/components/IconButton/index.tsx
+++ b/superset-frontend/src/components/IconButton/index.tsx
@@ -20,6 +20,8 @@ import React from 'react';
 import { styled } from '@superset-ui/core';
 import Button from 'src/components/Button';
 import { ButtonProps as AntdButtonProps } from 'antd/lib/button';
+import Icons from 'src/components/Icons';
+import LinesEllipsis from 'react-lines-ellipsis';
 
 export interface IconButtonProps extends AntdButtonProps {
   buttonText: string;
@@ -33,17 +35,34 @@ const StyledButton = styled(Button)`
   flex-direction: column;
   padding: 0;
 `;
+
 const StyledImage = styled.div`
-  margin: ${({ theme }) => theme.gridUnit * 8}px 0;
   padding: ${({ theme }) => theme.gridUnit * 4}px;
+  height: ${({ theme }) => theme.gridUnit * 18}px;
+  margin: ${({ theme }) => theme.gridUnit * 3}px 0;
+
+  .default-db-icon {
+    font-size: 36px;
+    color: ${({ theme }) => theme.colors.grayscale.base};
+    margin-right: 0;
+    span:first-of-type {
+      margin-right: 0;
+    }
+  }
 
   &:first-of-type {
     margin-right: 0;
   }
 
   img {
-    width: fit-content;
-
+    width: ${({ theme }) => theme.gridUnit * 10}px;
+    height: ${({ theme }) => theme.gridUnit * 10}px;
+    margin: 0;
+    &:first-of-type {
+      margin-right: 0;
+    }
+  }
+  svg {
     &:first-of-type {
       margin-right: 0;
     }
@@ -52,32 +71,21 @@ const StyledImage = styled.div`
 
 const StyledInner = styled.div`
   max-height: calc(1.5em * 2);
-  overflow: hidden;
-  padding-right: 1rem;
-  position: relative;
   white-space: break-spaces;
 
-  &::before {
-    content: '...';
-    inset-block-end: 0; /* "bottom" */
-    inset-inline-end: 8px; /* "right" */
-    position: absolute;
+  &:first-of-type {
+    margin-right: 0;
   }
 
-  &::after {
-    background-color: ${({ theme }) => theme.colors.grayscale.light4};
-    content: '';
-    height: 1rem;
-    inset-inline-end: 8px; /* "right" */
-    position: absolute;
-    top: 4px;
-    width: 1rem;
+  .LinesEllipsis {
+    &:first-of-type {
+      margin-right: 0;
+    }
   }
 `;
 
 const StyledBottom = styled.div`
-  padding: ${({ theme }) => theme.gridUnit * 6}px
-    ${({ theme }) => theme.gridUnit * 4}px;
+  padding: ${({ theme }) => theme.gridUnit * 4}px 0;
   border-radius: 0 0 ${({ theme }) => theme.borderRadius}px
     ${({ theme }) => theme.borderRadius}px;
   background-color: ${({ theme }) => theme.colors.grayscale.light4};
@@ -96,10 +104,24 @@ const IconButton = styled(
   ({ icon, altText, buttonText, ...props }: IconButtonProps) => (
     <StyledButton {...props}>
       <StyledImage>
-        <img src={icon} alt={altText} />
+        {icon && <img src={icon} alt={altText} />}
+        {!icon && (
+          <Icons.DatabaseOutlined
+            className="default-db-icon"
+            aria-label="default-icon"
+          />
+        )}
       </StyledImage>
+
       <StyledBottom>
-        <StyledInner>{buttonText}</StyledInner>
+        <StyledInner>
+          <LinesEllipsis
+            text={buttonText}
+            maxLine="2"
+            basedOn="words"
+            trimRight
+          />
+        </StyledInner>
       </StyledBottom>
     </StyledButton>
   ),
@@ -117,6 +139,7 @@ const IconButton = styled(
     background-color: ${({ theme }) => theme.colors.grayscale.light5};
     color: ${({ theme }) => theme.colors.grayscale.dark2};
     border: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
+    box-shadow: 4px 4px 20px ${({ theme }) => theme.colors.grayscale.light2};
   }
 `;
 
diff --git a/superset-frontend/src/components/IconTooltip/IconTooltip.stories.tsx b/superset-frontend/src/components/IconTooltip/IconTooltip.stories.tsx
index 99e55f06050b..a2f2109bb0b8 100644
--- a/superset-frontend/src/components/IconTooltip/IconTooltip.stories.tsx
+++ b/superset-frontend/src/components/IconTooltip/IconTooltip.stories.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React from 'react';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import { IconTooltip, Props } from '.';
 
 export default {
@@ -42,7 +42,7 @@ const PLACEMENTS = [
 export const InteractiveIconTooltip = (args: Props) => (
   <div css={{ margin: '40px 70px' }}>
     <IconTooltip {...args}>
-      <Icon name="info" />
+      <Icons.Info />
     </IconTooltip>
   </div>
 );
diff --git a/superset-frontend/src/components/Icons/Icon.tsx b/superset-frontend/src/components/Icons/Icon.tsx
index 9e3d0e1878ec..efb78dc65cc1 100644
--- a/superset-frontend/src/components/Icons/Icon.tsx
+++ b/superset-frontend/src/components/Icons/Icon.tsx
@@ -53,15 +53,21 @@ export const Icon = (props: IconProps) => {
   const name = fileName.replace('_', '-');
 
   useEffect(() => {
+    let cancelled = false;
     async function importIcon(): Promise<void> {
       ImportedSVG.current = (
         await import(
           `!!@svgr/webpack?-svgo,+titleProp,+ref!images/icons/${fileName}.svg`
         )
       ).default;
-      setLoaded(true);
+      if (!cancelled) {
+        setLoaded(true);
+      }
     }
     importIcon();
+    return () => {
+      cancelled = true;
+    };
   }, [fileName, ImportedSVG]);
 
   return (
diff --git a/superset-frontend/src/components/Icons/Icons.stories.tsx b/superset-frontend/src/components/Icons/Icons.stories.tsx
index c40dbad295de..e2a3944eb4f1 100644
--- a/superset-frontend/src/components/Icons/Icons.stories.tsx
+++ b/superset-frontend/src/components/Icons/Icons.stories.tsx
@@ -72,7 +72,7 @@ InteractiveIcons.argTypes = {
   },
   iconSize: {
     defaultValue: 'xl',
-    control: { type: 'inline-radio' },
+    control: { type: 'inline-radio', options: ['s', 'l', 'm', 'xl', 'xxl'] },
   },
   iconColor: {
     defaultValue: null,
diff --git a/superset-frontend/src/components/Icons/index.tsx b/superset-frontend/src/components/Icons/index.tsx
index 312891ca8acd..f281e9018254 100644
--- a/superset-frontend/src/components/Icons/index.tsx
+++ b/superset-frontend/src/components/Icons/index.tsx
@@ -111,6 +111,7 @@ const IconFileNames = [
   'minus',
   'minus_solid',
   'more_horiz',
+  'more_vert',
   'move',
   'nav_charts',
   'nav_dashboard',
@@ -150,6 +151,9 @@ const IconFileNames = [
   'warning_solid',
   'x-large',
   'x-small',
+  'tags',
+  'ballot',
+  'category',
 ];
 
 const iconOverrides: Record<string, React.FC> = {};
@@ -160,6 +164,8 @@ IconFileNames.forEach(fileName => {
   );
 });
 
+export { IconType };
+
 export default {
   ...AntdEnhancedIcons,
   ...iconOverrides,
diff --git a/superset-frontend/src/components/ImportModal/ImportModal.test.tsx b/superset-frontend/src/components/ImportModal/ImportModal.test.tsx
index 478fd599b377..d4e3723b4495 100644
--- a/superset-frontend/src/components/ImportModal/ImportModal.test.tsx
+++ b/superset-frontend/src/components/ImportModal/ImportModal.test.tsx
@@ -17,10 +17,12 @@
  * under the License.
  */
 import React from 'react';
+import { act } from 'react-dom/test-utils';
 import thunk from 'redux-thunk';
 import configureStore from 'redux-mock-store';
 import { styledMount as mount } from 'spec/helpers/theming';
 import { ReactWrapper } from 'enzyme';
+import { Upload } from 'src/common/components';
 import Button from 'src/components/Button';
 import { ImportResourceName } from 'src/views/CRUD/types';
 import ImportModelsModal from 'src/components/ImportModal';
@@ -66,29 +68,37 @@ describe('ImportModelsModal', () => {
     expect(wrapper.find('h4').text()).toEqual('Import database');
   });
 
-  it('renders a label and a file input field', () => {
+  it('renders a file input field', () => {
     expect(wrapper.find('input[type="file"]')).toExist();
-    expect(wrapper.find('label')).toExist();
   });
 
-  it('should attach the label to the input field', () => {
-    const id = 'modelFile';
-    expect(wrapper.find('label').prop('htmlFor')).toBe(id);
-    expect(wrapper.find('input').prop('id')).toBe(id);
-  });
-
-  it('should render the close, import and cancel buttons', () => {
-    expect(wrapper.find('button')).toHaveLength(3);
+  it('should render the close, file, import and cancel buttons', () => {
+    expect(wrapper.find('button')).toHaveLength(4);
   });
 
   it('should render the import button initially disabled', () => {
-    expect(wrapper.find(Button).at(1).prop('disabled')).toBe(true);
+    expect(wrapper.find(Button).at(2).prop('disabled')).toBe(true);
   });
 
   it('should render the import button enabled when a file is selected', () => {
     const file = new File([new ArrayBuffer(1)], 'model_export.zip');
-    wrapper.find('input').simulate('change', { target: { files: [file] } });
-    expect(wrapper.find(Button).at(1).prop('disabled')).toBe(false);
+    act(() => {
+      const handler = wrapper.find(Upload).prop('onChange');
+      if (handler) {
+        handler({
+          fileList: [],
+          file: {
+            name: 'model_export.zip',
+            originFileObj: file,
+            uid: '-1',
+            size: 0,
+            type: 'zip',
+          },
+        });
+      }
+    });
+    wrapper.update();
+    expect(wrapper.find(Button).at(2).prop('disabled')).toBe(false);
   });
 
   it('should render password fields when needed for import', () => {
diff --git a/superset-frontend/src/components/ImportModal/index.tsx b/superset-frontend/src/components/ImportModal/index.tsx
index f9dffcbab9ec..58b6724778e9 100644
--- a/superset-frontend/src/components/ImportModal/index.tsx
+++ b/superset-frontend/src/components/ImportModal/index.tsx
@@ -16,18 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { FunctionComponent, useEffect, useRef, useState } from 'react';
+import React, { FunctionComponent, useEffect, useState } from 'react';
+import { UploadChangeParam, UploadFile } from 'antd/lib/upload/interface';
 import { styled, t } from '@superset-ui/core';
 
-import Icon from 'src//components/Icon';
+import Button from 'src/components/Button';
 import Modal from 'src/components/Modal';
+import { Upload } from 'src/common/components';
 import { useImportResource } from 'src/views/CRUD/hooks';
 import { ImportResourceName } from 'src/views/CRUD/types';
 
-export const StyledIcon = styled(Icon)`
-  margin: auto ${({ theme }) => theme.gridUnit * 2}px auto 0;
-`;
-
 const HelperMessage = styled.div`
   display: block;
   color: ${({ theme }) => theme.colors.grayscale.base};
@@ -127,24 +125,21 @@ const ImportModelsModal: FunctionComponent<ImportModelsModalProps> = ({
   setPasswordFields = () => {},
 }) => {
   const [isHidden, setIsHidden] = useState<boolean>(true);
-  const [uploadFile, setUploadFile] = useState<File | null>(null);
   const [passwords, setPasswords] = useState<Record<string, string>>({});
   const [needsOverwriteConfirm, setNeedsOverwriteConfirm] = useState<boolean>(
     false,
   );
   const [confirmedOverwrite, setConfirmedOverwrite] = useState<boolean>(false);
-
-  const fileInputRef = useRef<HTMLInputElement>(null);
+  const [fileList, setFileList] = useState<UploadFile[]>([]);
+  const [importingModel, setImportingModel] = useState<boolean>(false);
 
   const clearModal = () => {
-    setUploadFile(null);
+    setFileList([]);
     setPasswordFields([]);
     setPasswords({});
     setNeedsOverwriteConfirm(false);
     setConfirmedOverwrite(false);
-    if (fileInputRef && fileInputRef.current) {
-      fileInputRef.current.value = '';
-    }
+    setImportingModel(false);
   };
 
   const handleErrorMsg = (msg: string) => {
@@ -159,10 +154,16 @@ const ImportModelsModal: FunctionComponent<ImportModelsModalProps> = ({
 
   useEffect(() => {
     setPasswordFields(passwordsNeeded);
+    if (passwordsNeeded.length > 0) {
+      setImportingModel(false);
+    }
   }, [passwordsNeeded, setPasswordFields]);
 
   useEffect(() => {
     setNeedsOverwriteConfirm(alreadyExists.length > 0);
+    if (alreadyExists.length > 0) {
+      setImportingModel(false);
+    }
   }, [alreadyExists, setNeedsOverwriteConfirm]);
 
   // Functions
@@ -173,11 +174,16 @@ const ImportModelsModal: FunctionComponent<ImportModelsModalProps> = ({
   };
 
   const onUpload = () => {
-    if (uploadFile === null) {
+    if (!(fileList[0]?.originFileObj instanceof File)) {
       return;
     }
 
-    importResource(uploadFile, passwords, confirmedOverwrite).then(result => {
+    setImportingModel(true);
+    importResource(
+      fileList[0].originFileObj,
+      passwords,
+      confirmedOverwrite,
+    ).then(result => {
       if (result) {
         addSuccessToast(t('The import was successful'));
         clearModal();
@@ -186,9 +192,18 @@ const ImportModelsModal: FunctionComponent<ImportModelsModalProps> = ({
     });
   };
 
-  const changeFile = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const { files } = event.target as HTMLInputElement;
-    setUploadFile((files && files[0]) || null);
+  const changeFile = (info: UploadChangeParam) => {
+    setFileList([
+      {
+        ...info.file,
+        status: 'done',
+      },
+    ]);
+  };
+
+  const removeFile = (removedFile: UploadFile) => {
+    setFileList(fileList.filter(file => file.uid !== removedFile.uid));
+    return false;
   };
 
   const confirmOverwrite = (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -259,7 +274,9 @@ const ImportModelsModal: FunctionComponent<ImportModelsModalProps> = ({
       name="model"
       className="import-model-modal"
       disablePrimaryButton={
-        uploadFile === null || (needsOverwriteConfirm && !confirmedOverwrite)
+        fileList.length === 0 ||
+        (needsOverwriteConfirm && !confirmedOverwrite) ||
+        importingModel
       }
       onHandledPrimaryAction={onUpload}
       onHide={hide}
@@ -270,21 +287,19 @@ const ImportModelsModal: FunctionComponent<ImportModelsModalProps> = ({
       title={<h4>{t('Import %s', resourceLabel)}</h4>}
     >
       <StyledInputContainer>
-        <div className="control-label">
-          <label htmlFor="modelFile">
-            {t('File')}
-            <span className="required">*</span>
-          </label>
-        </div>
-        <input
-          ref={fileInputRef}
-          data-test="model-file-input"
+        <Upload
           name="modelFile"
           id="modelFile"
-          type="file"
+          data-test="model-file-input"
           accept=".yaml,.json,.yml,.zip"
+          fileList={fileList}
           onChange={changeFile}
-        />
+          onRemove={removeFile}
+          // upload is handled by hook
+          customRequest={() => {}}
+        >
+          <Button loading={importingModel}>Select file</Button>
+        </Upload>
       </StyledInputContainer>
       {renderPasswordFields()}
       {renderOverwriteConfirmation()}
diff --git a/superset-frontend/src/components/IndeterminateCheckbox/index.tsx b/superset-frontend/src/components/IndeterminateCheckbox/index.tsx
index 4056cac14b67..b29b243775c8 100644
--- a/superset-frontend/src/components/IndeterminateCheckbox/index.tsx
+++ b/superset-frontend/src/components/IndeterminateCheckbox/index.tsx
@@ -18,7 +18,7 @@
  */
 import React from 'react';
 import { styled } from '@superset-ui/core';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 
 export interface IndeterminateCheckboxProps {
   indeterminate: boolean;
@@ -35,8 +35,18 @@ const CheckboxLabel = styled.label`
   margin-bottom: 0;
 `;
 
-const IconWithColor = styled(Icon)`
-  color: ${({ theme }) => theme.colors.primary.dark1};
+const CheckboxHalf = styled(Icons.CheckboxHalf)`
+  color: ${({ theme }) => theme.colors.primary.base};
+  cursor: pointer;
+`;
+
+const CheckboxOff = styled(Icons.CheckboxOff)`
+  color: ${({ theme }) => theme.colors.grayscale.base};
+  cursor: pointer;
+`;
+
+const CheckboxOn = styled(Icons.CheckboxOn)`
+  color: ${({ theme }) => theme.colors.primary.base};
   cursor: pointer;
 `;
 
@@ -79,9 +89,9 @@ const IndeterminateCheckbox = React.forwardRef(
     return (
       <>
         <InputContainer>
-          {indeterminate && <IconWithColor name="checkbox-half" />}
-          {!indeterminate && checked && <IconWithColor name="checkbox-on" />}
-          {!indeterminate && !checked && <Icon name="checkbox-off" />}
+          {indeterminate && <CheckboxHalf />}
+          {!indeterminate && checked && <CheckboxOn />}
+          {!indeterminate && !checked && <CheckboxOff />}
           <HiddenInput
             name={id}
             id={id}
diff --git a/superset-frontend/src/components/InfoTooltip/index.tsx b/superset-frontend/src/components/InfoTooltip/index.tsx
index b3558593973f..e27c3729a4e9 100644
--- a/superset-frontend/src/components/InfoTooltip/index.tsx
+++ b/superset-frontend/src/components/InfoTooltip/index.tsx
@@ -20,7 +20,7 @@
 import React from 'react';
 import { styled } from '@superset-ui/core';
 import { Tooltip } from 'src/components/Tooltip';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 
 export interface InfoTooltipProps {
   className?: string;
@@ -42,16 +42,24 @@ export interface InfoTooltipProps {
   trigger?: string | Array<string>;
   overlayStyle?: any;
   bgColor?: string;
+  viewBox?: string;
 }
 
 const StyledTooltip = styled(Tooltip)`
   cursor: pointer;
-
   path:first-of-type {
     fill: #999999;
   }
 `;
 
+const StyledTooltipTitle = styled.span`
+  display: -webkit-box;
+  -webkit-line-clamp: 20;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;
+`;
+
 const defaultOverlayStyle = {
   fontSize: '12px',
   lineHeight: '16px',
@@ -65,16 +73,17 @@ export default function InfoTooltip({
   trigger = 'hover',
   overlayStyle = defaultOverlayStyle,
   bgColor = defaultColor,
+  viewBox = '0 -2 24 24',
 }: InfoTooltipProps) {
   return (
     <StyledTooltip
-      title={tooltip}
+      title={<StyledTooltipTitle>{tooltip}</StyledTooltipTitle>}
       placement={placement}
       trigger={trigger}
       overlayStyle={overlayStyle}
       color={bgColor}
     >
-      <Icon name="info-solid-small" />
+      <Icons.InfoSolidSmall className="info-solid-small" viewBox={viewBox} />
     </StyledTooltip>
   );
 }
diff --git a/superset-frontend/src/components/LastUpdated/LastUpdated.test.tsx b/superset-frontend/src/components/LastUpdated/LastUpdated.test.tsx
index 18014d49cec3..830695918057 100644
--- a/superset-frontend/src/components/LastUpdated/LastUpdated.test.tsx
+++ b/superset-frontend/src/components/LastUpdated/LastUpdated.test.tsx
@@ -34,7 +34,7 @@ describe('LastUpdated', () => {
   it('renders a refresh action', () => {
     const mockAction = jest.fn();
     wrapper = mount(<LastUpdated updatedAt={updatedAt} update={mockAction} />);
-    const props = wrapper.find('[data-test="refresh"]').first().props();
+    const props = wrapper.find('[aria-label="refresh"]').first().props();
     if (props.onClick) {
       props.onClick({} as React.MouseEvent);
     }
diff --git a/superset-frontend/src/components/LastUpdated/index.tsx b/superset-frontend/src/components/LastUpdated/index.tsx
index dc55957300ed..1b838b5034b5 100644
--- a/superset-frontend/src/components/LastUpdated/index.tsx
+++ b/superset-frontend/src/components/LastUpdated/index.tsx
@@ -19,13 +19,13 @@
 import React, { useEffect, useState, FunctionComponent } from 'react';
 import moment, { Moment, MomentInput } from 'moment';
 import { t, styled } from '@superset-ui/core';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 
 const REFRESH_INTERVAL = 60000; // every minute
 
 interface LastUpdatedProps {
   updatedAt: MomentInput;
-  update?: React.MouseEventHandler<SVGSVGElement>;
+  update?: React.MouseEventHandler<HTMLSpanElement>;
 }
 moment.updateLocale('en', {
   calendar: {
@@ -42,7 +42,7 @@ const TextStyles = styled.span`
   color: ${({ theme }) => theme.colors.grayscale.base};
 `;
 
-const Refresh = styled(Icon)`
+const Refresh = styled(Icons.Refresh)`
   color: ${({ theme }) => theme.colors.primary.base};
   width: auto;
   height: ${({ theme }) => theme.gridUnit * 5}px;
@@ -72,7 +72,7 @@ export const LastUpdated: FunctionComponent<LastUpdatedProps> = ({
   return (
     <TextStyles>
       {t('Last Updated %s', timeSince.isValid() ? timeSince.calendar() : '--')}
-      {update && <Refresh name="refresh" onClick={update} />}
+      {update && <Refresh onClick={update} />}
     </TextStyles>
   );
 };
diff --git a/superset-frontend/src/components/ListView/ActionsBar.tsx b/superset-frontend/src/components/ListView/ActionsBar.tsx
index ad4553e89f8f..d4e1e675c805 100644
--- a/superset-frontend/src/components/ListView/ActionsBar.tsx
+++ b/superset-frontend/src/components/ListView/ActionsBar.tsx
@@ -19,7 +19,6 @@
 import React from 'react';
 import { styled } from '@superset-ui/core';
 import { Tooltip } from 'src/components/Tooltip';
-import { IconName } from 'src/components/Icon';
 import Icons from 'src/components/Icons';
 import { TooltipPlacement } from 'antd/lib/tooltip';
 
@@ -27,7 +26,7 @@ export type ActionProps = {
   label: string;
   tooltip?: string | React.ReactElement;
   placement?: TooltipPlacement;
-  icon: IconName;
+  icon: string;
   onClick: () => void;
 };
 
diff --git a/superset-frontend/src/components/ListView/CardCollection.tsx b/superset-frontend/src/components/ListView/CardCollection.tsx
index a0a0a98ce9a1..d91498c91474 100644
--- a/superset-frontend/src/components/ListView/CardCollection.tsx
+++ b/superset-frontend/src/components/ListView/CardCollection.tsx
@@ -27,12 +27,21 @@ interface CardCollectionProps {
   prepareRow: TableInstance['prepareRow'];
   renderCard?: (row: any) => React.ReactNode;
   rows: TableInstance['rows'];
+  showThumbnails?: boolean;
 }
 
-const CardContainer = styled.div`
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(459px, 1fr));
-  grid-gap: ${({ theme }) => theme.gridUnit * 8}px;
+const CardContainer = styled.div<{ showThumbnails?: boolean }>`
+  ${({ theme, showThumbnails }) => `
+    display: grid;
+    grid-gap: ${theme.gridUnit * 12}px ${theme.gridUnit * 4}px;
+    grid-template-columns: repeat(auto-fit, 300px);
+    margin-top: ${theme.gridUnit * -6}px;
+    padding: ${
+      showThumbnails
+        ? `${theme.gridUnit * 8 + 3}px ${theme.gridUnit * 9}px`
+        : `${theme.gridUnit * 8 + 1}px ${theme.gridUnit * 9}px`
+    };
+  `}
 `;
 
 const CardWrapper = styled.div`
@@ -51,6 +60,7 @@ export default function CardCollection({
   prepareRow,
   renderCard,
   rows,
+  showThumbnails,
 }: CardCollectionProps) {
   function handleClick(
     event: React.MouseEvent<HTMLDivElement, MouseEvent>,
@@ -65,7 +75,7 @@ export default function CardCollection({
 
   if (!renderCard) return null;
   return (
-    <CardContainer>
+    <CardContainer showThumbnails={showThumbnails}>
       {loading &&
         rows.length === 0 &&
         [...new Array(25)].map((e, i) => (
diff --git a/superset-frontend/src/components/ListView/Filters/Search.tsx b/superset-frontend/src/components/ListView/Filters/Search.tsx
index 329cf7949972..23a8e6900a41 100644
--- a/superset-frontend/src/components/ListView/Filters/Search.tsx
+++ b/superset-frontend/src/components/ListView/Filters/Search.tsx
@@ -35,7 +35,7 @@ export default function SearchFilter({
   const [value, setValue] = useState(initialValue || '');
   const handleSubmit = () => {
     if (value) {
-      onSubmit(value);
+      onSubmit(value.trim());
     }
   };
   const onClear = () => {
diff --git a/superset-frontend/src/components/ListView/ListView.tsx b/superset-frontend/src/components/ListView/ListView.tsx
index 8d9182ac70e4..195cae2d465f 100644
--- a/superset-frontend/src/components/ListView/ListView.tsx
+++ b/superset-frontend/src/components/ListView/ListView.tsx
@@ -23,7 +23,7 @@ import Alert from 'src/components/Alert';
 import { ReactComponent as EmptyImage } from 'images/empty.svg';
 import cx from 'classnames';
 import Button from 'src/components/Button';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import IndeterminateCheckbox from 'src/components/IndeterminateCheckbox';
 import { TableCollection, Pagination } from 'src/components/dataViewCommon';
 import CardCollection from './CardCollection';
@@ -114,6 +114,10 @@ const BulkSelectWrapper = styled(Alert)`
     vertical-align: middle;
     position: relative;
   }
+
+  .ant-alert-close-icon {
+    margin-top: ${({ theme }) => theme.gridUnit * 1.5}px;
+  }
 `;
 
 const bulkSelectColumnConfig = {
@@ -138,7 +142,7 @@ const ViewModeContainer = styled.div`
     display: inline-block;
     border-radius: ${({ theme }) => theme.gridUnit / 2}px;
     padding: ${({ theme }) => theme.gridUnit}px;
-    padding-bottom: 0;
+    padding-bottom: ${({ theme }) => theme.gridUnit * 0.5}px;
 
     &:first-of-type {
       margin-right: ${({ theme }) => theme.gridUnit * 2}px;
@@ -178,7 +182,7 @@ const ViewModeToggle = ({
       }}
       className={cx('toggle-button', { active: mode === 'card' })}
     >
-      <Icon name="card-view" />
+      <Icons.CardView />
     </div>
     <div
       role="button"
@@ -189,7 +193,7 @@ const ViewModeToggle = ({
       }}
       className={cx('toggle-button', { active: mode === 'table' })}
     >
-      <Icon name="list-view" />
+      <Icons.ListView />
     </div>
   </ViewModeContainer>
 );
@@ -217,6 +221,7 @@ export interface ListViewProps<T extends object = any> {
   cardSortSelectOptions?: Array<CardSortSelectOption>;
   defaultViewMode?: ViewModeType;
   highlightRowId?: number;
+  showThumbnails?: boolean;
   emptyState?: {
     message?: string;
     slot?: React.ReactNode;
@@ -238,6 +243,7 @@ function ListView<T extends object = any>({
   disableBulkSelect = () => {},
   renderBulkSelectCopy = selected => t('%s Selected', selected.length),
   renderCard,
+  showThumbnails,
   cardSortSelectOptions,
   defaultViewMode = 'card',
   highlightRowId,
@@ -372,6 +378,7 @@ function ListView<T extends object = any>({
               renderCard={renderCard}
               rows={rows}
               loading={loading}
+              showThumbnails={showThumbnails}
             />
           )}
           {viewMode === 'table' && (
diff --git a/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx b/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx
index fdd3778d5dc4..27857ce1fbdf 100644
--- a/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx
+++ b/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx
@@ -22,7 +22,6 @@ import { withKnobs, boolean, select, text } from '@storybook/addon-knobs';
 import DashboardImg from 'images/dashboard-card-fallback.svg';
 import ChartImg from 'images/chart-card-fallback.svg';
 import { Dropdown, Menu } from 'src/common/components';
-import Icon from 'src/components/Icon';
 import Icons from 'src/components/Icons';
 import FaveStar from 'src/components/FaveStar';
 import ListViewCard from '.';
@@ -76,7 +75,7 @@ export const SupersetListViewCard = () => (
             </Menu>
           }
         >
-          <Icon name="more-horiz" />
+          <Icons.MoreHoriz />
         </Dropdown>
       </ListViewCard.Actions>
     }
diff --git a/superset-frontend/src/components/ListViewCard/index.tsx b/superset-frontend/src/components/ListViewCard/index.tsx
index fad515110c09..bfd6d6a82da3 100644
--- a/superset-frontend/src/components/ListViewCard/index.tsx
+++ b/superset-frontend/src/components/ListViewCard/index.tsx
@@ -18,7 +18,6 @@
  */
 import React from 'react';
 import { styled, useTheme } from '@superset-ui/core';
-import Icon, { IconName } from 'src/components/Icon';
 import { AntdCard, Skeleton, ThinSkeleton } from 'src/common/components';
 import { Tooltip } from 'src/components/Tooltip';
 import ImageLoader, { BackgroundPosition } from './ImageLoader';
@@ -93,22 +92,28 @@ const TitleContainer = styled.div`
   .card-actions {
     margin-left: auto;
     align-self: flex-end;
-    padding-left: ${({ theme }) => theme.gridUnit * 8}px;
+    padding-left: ${({ theme }) => theme.gridUnit}px;
+    span[role='img'] {
+      display: flex;
+      align-items: center;
+    }
   }
 `;
 
 const TitleLink = styled.span`
+  overflow: hidden;
+  text-overflow: ellipsis;
   & a {
     color: ${({ theme }) => theme.colors.grayscale.dark1} !important;
-    overflow: hidden;
-    text-overflow: ellipsis;
-
-    & + .title-right {
-      margin-left: ${({ theme }) => theme.gridUnit * 2}px;
-    }
   }
 `;
 
+const TitleRight = styled.span`
+  position: absolute;
+  right: -1px;
+  bottom: ${({ theme }) => theme.gridUnit}px;
+`;
+
 const CoverFooter = styled.div`
   display: flex;
   flex-wrap: nowrap;
@@ -154,7 +159,7 @@ interface CardProps {
   coverRight?: React.ReactNode;
   actions?: React.ReactNode | null;
   rows?: number | string;
-  avatar?: string;
+  avatar?: React.ReactElement | null;
   cover?: React.ReactNode | null;
 }
 
@@ -247,14 +252,14 @@ function ListViewCard({
                   <Link to={url!}>{title}</Link>
                 </TitleLink>
               </Tooltip>
-              {titleRight && <div className="title-right"> {titleRight}</div>}
+              {titleRight && <TitleRight>{titleRight}</TitleRight>}
               <div className="card-actions" data-test="card-actions">
                 {actions}
               </div>
             </TitleContainer>
           }
           description={description}
-          avatar={avatar ? <Icon name={avatar as IconName} /> : null}
+          avatar={avatar || null}
         />
       )}
     </StyledCard>
diff --git a/superset-frontend/src/components/Menu/LanguagePicker.tsx b/superset-frontend/src/components/Menu/LanguagePicker.tsx
index 1f0f49d9bbc5..faba09a87ffa 100644
--- a/superset-frontend/src/components/Menu/LanguagePicker.tsx
+++ b/superset-frontend/src/components/Menu/LanguagePicker.tsx
@@ -19,7 +19,7 @@
 import React from 'react';
 import { MainNav as Menu } from 'src/common/components';
 import { styled } from '@superset-ui/core';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 
 const { SubMenu } = Menu;
 
@@ -66,7 +66,7 @@ export default function LanguagePicker(props: LanguagePickerProps) {
           <StyledFlag className={`flag ${languages[locale].flag}`} />
         </div>
       }
-      icon={<Icon name="triangle-down" />}
+      icon={<Icons.TriangleDown />}
       {...rest}
     >
       {Object.keys(languages).map(langKey => (
diff --git a/superset-frontend/src/components/Menu/Menu.test.tsx b/superset-frontend/src/components/Menu/Menu.test.tsx
index daeb5262f726..212521bd4e82 100644
--- a/superset-frontend/src/components/Menu/Menu.test.tsx
+++ b/superset-frontend/src/components/Menu/Menu.test.tsx
@@ -75,8 +75,11 @@ const mockedProps = {
       icon: '/static/assets/images/superset-logo-horiz.png',
       alt: 'Superset',
       width: '126',
+      tooltip: '',
+      text: '',
     },
     navbar_right: {
+      show_watermark: false,
       bug_report_url: '/report/',
       documentation_url: '/docs/',
       languages: {
diff --git a/superset-frontend/src/components/Menu/Menu.tsx b/superset-frontend/src/components/Menu/Menu.tsx
index 0875b85f8a66..098aa3acdd5b 100644
--- a/superset-frontend/src/components/Menu/Menu.tsx
+++ b/superset-frontend/src/components/Menu/Menu.tsx
@@ -22,21 +22,25 @@ import { debounce } from 'lodash';
 import { Global } from '@emotion/react';
 import { getUrlParam } from 'src/utils/urlUtils';
 import { MainNav as DropdownMenu, MenuMode } from 'src/common/components';
+import { Tooltip } from 'src/components/Tooltip';
 import { Link } from 'react-router-dom';
 import { Row, Col, Grid } from 'antd';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
+import { URL_PARAMS } from 'src/constants';
 import RightMenu from './MenuRight';
 import { Languages } from './LanguagePicker';
-import { URL_PARAMS } from '../../constants';
 
 interface BrandProps {
   path: string;
   icon: string;
   alt: string;
   width: string | number;
+  tooltip: string;
+  text: string;
 }
 
 export interface NavBarProps {
+  show_watermark: boolean;
   bug_report_url?: string;
   version_string?: string;
   version_sha?: string;
@@ -78,7 +82,6 @@ export interface MenuObjectProps extends MenuObjectChildProps {
 const StyledHeader = styled.header`
   background-color: white;
   margin-bottom: 2px;
-  border-bottom: 2px solid ${({ theme }) => theme.colors.grayscale.light4}px;
   &:nth-last-of-type(2) nav {
     margin-bottom: 2px;
   }
@@ -91,6 +94,33 @@ const StyledHeader = styled.header`
     flex-direction: column;
     justify-content: center;
   }
+  .navbar-brand-text {
+    border-left: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
+    border-right: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
+    height: 100%;
+    color: ${({ theme }) => theme.colors.grayscale.dark1};
+    padding-left: ${({ theme }) => theme.gridUnit * 4}px;
+    padding-right: ${({ theme }) => theme.gridUnit * 4}px;
+    margin-right: ${({ theme }) => theme.gridUnit * 6}px;
+    font-size: ${({ theme }) => theme.gridUnit * 4}px;
+    float: left;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+
+    span {
+      max-width: ${({ theme }) => theme.gridUnit * 58}px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    @media (max-width: 1127px) {
+      display: none;
+    }
+  }
+  .main-nav .ant-menu-submenu-title > svg {
+    top: ${({ theme }) => theme.gridUnit * 5.25}px;
+  }
   @media (max-width: 767px) {
     .navbar-brand {
       float: none;
@@ -186,7 +216,11 @@ export function Menu({
       );
     }
     return (
-      <SubMenu key={index} title={label} icon={<Icon name="triangle-down" />}>
+      <SubMenu
+        key={index}
+        title={label}
+        icon={showMenu === 'inline' ? <></> : <Icons.TriangleDown />}
+      >
         {childs?.map((child: MenuObjectChildProps | string, index1: number) => {
           if (typeof child === 'string' && child === '-') {
             return <DropdownMenu.Divider key={`$${index1}`} />;
@@ -221,9 +255,21 @@ export function Menu({
       />
       <Row>
         <Col md={16} xs={24}>
-          <a className="navbar-brand" href={brand.path}>
-            <img width={brand.width} src={brand.icon} alt={brand.alt} />
-          </a>
+          <Tooltip
+            id="brand-tooltip"
+            placement="bottomLeft"
+            title={brand.tooltip}
+            arrowPointAtCenter
+          >
+            <a className="navbar-brand" href={brand.path}>
+              <img width={brand.width} src={brand.icon} alt={brand.alt} />
+            </a>
+          </Tooltip>
+          {brand.text && (
+            <div className="navbar-brand-text">
+              <span>{brand.text}</span>
+            </div>
+          )}
           <DropdownMenu
             mode={showMenu}
             data-test="navbar-top"
diff --git a/superset-frontend/src/components/Menu/MenuRight.tsx b/superset-frontend/src/components/Menu/MenuRight.tsx
index a722834bdf44..35d2cb0fcf3c 100644
--- a/superset-frontend/src/components/Menu/MenuRight.tsx
+++ b/superset-frontend/src/components/Menu/MenuRight.tsx
@@ -20,7 +20,7 @@ import React from 'react';
 import { MainNav as Menu } from 'src/common/components';
 import { t, styled, css, SupersetTheme } from '@superset-ui/core';
 import { Link } from 'react-router-dom';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import LanguagePicker from './LanguagePicker';
 import { NavBarProps, MenuObjectProps } from './Menu';
 
@@ -59,6 +59,9 @@ const StyledDiv = styled.div<{ align: string }>`
   justify-content: ${({ align }) => align};
   align-items: center;
   margin-right: ${({ theme }) => theme.gridUnit}px;
+  .ant-menu-submenu-title > svg {
+    top: ${({ theme }) => theme.gridUnit * 5.25}px;
+  }
 `;
 
 const StyledAnchor = styled.a`
@@ -89,7 +92,7 @@ const RightMenu = ({
           title={
             <StyledI data-test="new-dropdown-icon" className="fa fa-plus" />
           }
-          icon={<Icon name="triangle-down" />}
+          icon={<Icons.TriangleDown />}
         >
           {dropdownItems.map(menu => (
             <Menu.Item key={menu.label}>
@@ -104,7 +107,7 @@ const RightMenu = ({
           ))}
         </SubMenu>
       )}
-      <SubMenu title="Settings" icon={<Icon name="triangle-down" />}>
+      <SubMenu title="Settings" icon={<Icons.TriangleDown iconSize="xl" />}>
         {settings.map((section, index) => [
           <Menu.ItemGroup key={`${section.label}`} title={section.label}>
             {section.childs?.map(child => {
@@ -133,9 +136,11 @@ const RightMenu = ({
                 <a href={navbarRight.user_profile_url}>{t('Profile')}</a>
               </Menu.Item>
             )}
-            <Menu.Item key="info">
-              <a href={navbarRight.user_info_url}>{t('Info')}</a>
-            </Menu.Item>
+            {navbarRight.user_info_url && (
+              <Menu.Item key="info">
+                <a href={navbarRight.user_info_url}>{t('Info')}</a>
+              </Menu.Item>
+            )}
             <Menu.Item key="logout">
               <a href={navbarRight.user_logout_url}>{t('Logout')}</a>
             </Menu.Item>
@@ -145,6 +150,11 @@ const RightMenu = ({
           <Menu.Divider key="version-info-divider" />,
           <Menu.ItemGroup key="about-section" title={t('About')}>
             <div className="about-section">
+              {navbarRight.show_watermark && (
+                <div css={versionInfoStyles}>
+                  {t('Powered by Apache Superset')}
+                </div>
+              )}
               {navbarRight.version_string && (
                 <div css={versionInfoStyles}>
                   Version: {navbarRight.version_string}
diff --git a/superset-frontend/src/components/Modal/Modal.tsx b/superset-frontend/src/components/Modal/Modal.tsx
index 661d216ce4f8..a23f40a5360f 100644
--- a/superset-frontend/src/components/Modal/Modal.tsx
+++ b/superset-frontend/src/components/Modal/Modal.tsx
@@ -20,7 +20,10 @@ import React from 'react';
 import { isNil } from 'lodash';
 import { styled, t } from '@superset-ui/core';
 import { css } from '@emotion/react';
-import { Modal as BaseModal } from 'src/common/components';
+import {
+  Modal as AntdModal,
+  ModalProps as AntdModalProps,
+} from 'src/common/components';
 import Button from 'src/components/Button';
 
 export interface ModalProps {
@@ -52,6 +55,12 @@ interface StyledModalProps {
   hideFooter?: boolean;
 }
 
+const BaseModal = (props: AntdModalProps) => (
+  // Removes mask animation. Fixed in 4.6.0.
+  // https://github.com/ant-design/ant-design/issues/27192
+  <AntdModal {...props} maskTransitionName="" />
+);
+
 export const StyledModal = styled(BaseModal)<StyledModalProps>`
   ${({ theme, responsive, maxWidth }) =>
     responsive &&
@@ -188,10 +197,10 @@ CustomModal.displayName = 'Modal';
 // and demote it as the default export.
 // We should start using AntD component interfaces going forward.
 const Modal = Object.assign(CustomModal, {
-  error: BaseModal.error,
-  warning: BaseModal.warning,
-  confirm: BaseModal.confirm,
-  useModal: BaseModal.useModal,
+  error: AntdModal.error,
+  warning: AntdModal.warning,
+  confirm: AntdModal.confirm,
+  useModal: AntdModal.useModal,
 });
 
 export default Modal;
diff --git a/superset-frontend/src/components/OmniContainer/OmniContainer.test.tsx b/superset-frontend/src/components/OmniContainer/OmniContainer.test.tsx
index 0e46993f45eb..61dd7be394a4 100644
--- a/superset-frontend/src/components/OmniContainer/OmniContainer.test.tsx
+++ b/superset-frontend/src/components/OmniContainer/OmniContainer.test.tsx
@@ -84,40 +84,6 @@ test('Open Omnibar with ctrl + k with featureflag enabled', () => {
   ).not.toBeVisible();
 });
 
-test('Open Omnibar with ctrl + s with featureflag enabled', () => {
-  (isFeatureEnabled as jest.Mock).mockImplementation(
-    (ff: string) => ff === 'OMNIBAR',
-  );
-  const logEvent = jest.fn();
-  render(
-    <div data-test="test">
-      <OmniContainer logEvent={logEvent} />
-    </div>,
-  );
-
-  expect(
-    screen.queryByPlaceholderText('Search all dashboards'),
-  ).not.toBeInTheDocument();
-
-  // show Omnibar
-  fireEvent.keyDown(screen.getByTestId('test'), {
-    ctrlKey: true,
-    code: 'KeyS',
-  });
-  expect(
-    screen.queryByPlaceholderText('Search all dashboards'),
-  ).toBeInTheDocument();
-
-  // hide Omnibar
-  fireEvent.keyDown(screen.getByTestId('test'), {
-    ctrlKey: true,
-    code: 'KeyS',
-  });
-  expect(
-    screen.queryByPlaceholderText('Search all dashboards'),
-  ).not.toBeVisible();
-});
-
 test('Open Omnibar with Command + k with featureflag enabled', () => {
   (isFeatureEnabled as jest.Mock).mockImplementation(
     (ff: string) => ff === 'OMNIBAR',
@@ -152,7 +118,7 @@ test('Open Omnibar with Command + k with featureflag enabled', () => {
   ).not.toBeVisible();
 });
 
-test('Open Omnibar with Command + s with featureflag enabled', () => {
+test('Open Omnibar with Cmd/Ctrl-K and close with ESC', () => {
   (isFeatureEnabled as jest.Mock).mockImplementation(
     (ff: string) => ff === 'OMNIBAR',
   );
@@ -169,17 +135,17 @@ test('Open Omnibar with Command + s with featureflag enabled', () => {
 
   // show Omnibar
   fireEvent.keyDown(screen.getByTestId('test'), {
-    metaKey: true,
-    code: 'KeyS',
+    ctrlKey: true,
+    code: 'KeyK',
   });
   expect(
     screen.queryByPlaceholderText('Search all dashboards'),
   ).toBeInTheDocument();
 
-  // hide Omnibar
+  // Close Omnibar
   fireEvent.keyDown(screen.getByTestId('test'), {
-    metaKey: true,
-    code: 'KeyS',
+    key: 'Escape',
+    code: 'Escape',
   });
   expect(
     screen.queryByPlaceholderText('Search all dashboards'),
diff --git a/superset-frontend/src/components/OmniContainer/index.tsx b/superset-frontend/src/components/OmniContainer/index.tsx
index 338661f7a43b..5a18d5e4e44d 100644
--- a/superset-frontend/src/components/OmniContainer/index.tsx
+++ b/superset-frontend/src/components/OmniContainer/index.tsx
@@ -31,6 +31,7 @@ const OmniModal = styled(Modal)`
 
   .ant-modal-body {
     padding: 0;
+    overflow: visible;
   }
 `;
 
@@ -47,7 +48,16 @@ export default function OmniContainer({ logEvent }: Props) {
     function handleKeydown(event: KeyboardEvent) {
       if (!isFeatureEnabled(FeatureFlag.OMNIBAR)) return;
       const controlOrCommand = event.ctrlKey || event.metaKey;
-      const isOk = ['KeyK', 'KeyS'].includes(event.code); // valid keys "s" or "k"
+      const isOk = ['KeyK'].includes(event.code);
+      const isEsc = event.key === 'Escape';
+      if (isEsc && showOmni.current) {
+        logEvent(LOG_ACTIONS_OMNIBAR_TRIGGERED, {
+          show_omni: false,
+        });
+        showOmni.current = false;
+        setShowModal(false);
+        return;
+      }
       if (controlOrCommand && isOk) {
         logEvent(LOG_ACTIONS_OMNIBAR_TRIGGERED, {
           show_omni: !!showOmni.current,
diff --git a/superset-frontend/src/components/PopoverDropdown/index.tsx b/superset-frontend/src/components/PopoverDropdown/index.tsx
index 1bef4c65218f..1f3f1747bae1 100644
--- a/superset-frontend/src/components/PopoverDropdown/index.tsx
+++ b/superset-frontend/src/components/PopoverDropdown/index.tsx
@@ -20,7 +20,7 @@ import React from 'react';
 import cx from 'classnames';
 import { styled, useTheme } from '@superset-ui/core';
 import { Dropdown, Menu } from 'src/common/components';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 
 export interface OptionProps {
   value: string;
@@ -109,7 +109,10 @@ const PopoverDropdown = (props: PopoverDropdownProps) => {
     >
       <div role="button" css={{ display: 'flex', alignItems: 'center' }}>
         {selected && renderButton(selected)}
-        <Icon name="caret-down" css={{ marginTop: theme.gridUnit }} />
+        <Icons.CaretDown
+          iconColor={theme.colors.grayscale.base}
+          css={{ marginTop: theme.gridUnit * 0.5 }}
+        />
       </div>
     </Dropdown>
   );
diff --git a/superset-frontend/src/components/PopoverSection/index.tsx b/superset-frontend/src/components/PopoverSection/index.tsx
index ec45f178614a..b2877e1efcd6 100644
--- a/superset-frontend/src/components/PopoverSection/index.tsx
+++ b/superset-frontend/src/components/PopoverSection/index.tsx
@@ -19,7 +19,7 @@
 import React, { MouseEventHandler, ReactNode } from 'react';
 import { useTheme } from '@superset-ui/core';
 import { Tooltip } from 'src/components/Tooltip';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 
 export interface PopoverSectionProps {
   title: string;
@@ -57,19 +57,17 @@ export default function PopoverSection({
         <strong data-test="popover-title">{title}</strong>
         {info && (
           <Tooltip title={info} css={{ marginLeft: theme.gridUnit }}>
-            <Icon
+            <Icons.InfoSolidSmall
               role="img"
-              name="info-solid"
               width={14}
               height={14}
-              color={theme.colors.grayscale.light1}
+              iconColor={theme.colors.grayscale.light1}
             />
           </Tooltip>
         )}
-        <Icon
+        <Icons.Check
           role="img"
-          name="check"
-          color={
+          iconColor={
             isSelected ? theme.colors.primary.base : theme.colors.grayscale.base
           }
         />
diff --git a/superset-frontend/src/components/RefreshLabel/index.tsx b/superset-frontend/src/components/RefreshLabel/index.tsx
index 69bb213a3ae9..40b3215eb6d2 100644
--- a/superset-frontend/src/components/RefreshLabel/index.tsx
+++ b/superset-frontend/src/components/RefreshLabel/index.tsx
@@ -19,17 +19,17 @@
 import React, { MouseEventHandler } from 'react';
 import { SupersetTheme } from '@superset-ui/core';
 import { Tooltip } from 'src/components/Tooltip';
-import Icon, { IconProps } from 'src/components/Icon';
+import Icons, { IconType } from 'src/components/Icons';
 
 export interface RefreshLabelProps {
-  onClick: MouseEventHandler<SVGSVGElement>;
+  onClick: MouseEventHandler<HTMLSpanElement>;
   tooltipContent: string;
 }
 
 const RefreshLabel = ({ onClick, tooltipContent }: RefreshLabelProps) => {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const IconWithoutRef = React.forwardRef((props: IconProps, ref: any) => (
-    <Icon {...props} />
+  const IconWithoutRef = React.forwardRef((props: IconType, ref: any) => (
+    <Icons.Refresh {...props} />
   ));
 
   return (
@@ -37,7 +37,6 @@ const RefreshLabel = ({ onClick, tooltipContent }: RefreshLabelProps) => {
       <IconWithoutRef
         role="button"
         onClick={onClick}
-        name="refresh"
         css={(theme: SupersetTheme) => ({
           cursor: 'pointer',
           color: theme.colors.grayscale.base,
diff --git a/superset-frontend/src/components/ReportModal/HeaderReportActionsDropdown/index.tsx b/superset-frontend/src/components/ReportModal/HeaderReportActionsDropdown/index.tsx
new file mode 100644
index 000000000000..2ffc6f28600e
--- /dev/null
+++ b/superset-frontend/src/components/ReportModal/HeaderReportActionsDropdown/index.tsx
@@ -0,0 +1,117 @@
+/**
+ * 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 React, { useState } from 'react';
+import { useSelector } from 'react-redux';
+import { t, SupersetTheme, css, useTheme } from '@superset-ui/core';
+import Icons from 'src/components/Icons';
+import { Switch } from 'src/components/Switch';
+import { AlertObject } from 'src/views/CRUD/alert/types';
+import { Menu, NoAnimationDropdown } from 'src/common/components';
+import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags';
+
+import DeleteModal from 'src/components/DeleteModal';
+
+const deleteColor = (theme: SupersetTheme) => css`
+  color: ${theme.colors.error.base};
+`;
+
+export default function HeaderReportActionsDropDown({
+  showReportModal,
+  toggleActive,
+  deleteActiveReport,
+}: {
+  showReportModal: () => void;
+  toggleActive: (data: AlertObject, checked: boolean) => void;
+  deleteActiveReport: (data: AlertObject) => void;
+}) {
+  const reports = useSelector<any, AlertObject>(state => state.reports);
+  const reportsIds = Object.keys(reports);
+  const report = reports[reportsIds[0]];
+  const [
+    currentReportDeleting,
+    setCurrentReportDeleting,
+  ] = useState<AlertObject | null>(null);
+  const theme = useTheme();
+
+  const toggleActiveKey = async (data: AlertObject, checked: boolean) => {
+    if (data?.id) {
+      toggleActive(data, checked);
+    }
+  };
+
+  const handleReportDelete = (report: AlertObject) => {
+    deleteActiveReport(report);
+    setCurrentReportDeleting(null);
+  };
+
+  const menu = () => (
+    <Menu selectable={false} css={{ width: '200px' }}>
+      <Menu.Item>
+        {t('Email reports active')}
+        <Switch
+          data-test="toggle-active"
+          checked={report?.active}
+          onClick={(checked: boolean) => toggleActiveKey(report, checked)}
+          size="small"
+          css={{ marginLeft: theme.gridUnit * 2 }}
+        />
+      </Menu.Item>
+      <Menu.Item onClick={showReportModal}>{t('Edit email report')}</Menu.Item>
+      <Menu.Item
+        onClick={() => setCurrentReportDeleting(report)}
+        css={deleteColor}
+      >
+        {t('Delete email report')}
+      </Menu.Item>
+    </Menu>
+  );
+
+  return isFeatureEnabled(FeatureFlag.ALERT_REPORTS) ? (
+    <>
+      <NoAnimationDropdown
+        // ref={ref}
+        overlay={menu()}
+        trigger={['click']}
+        getPopupContainer={(triggerNode: any) =>
+          triggerNode.closest('.action-button')
+        }
+      >
+        <span role="button" className="action-button" tabIndex={0}>
+          <Icons.Calendar />
+        </span>
+      </NoAnimationDropdown>
+      {currentReportDeleting && (
+        <DeleteModal
+          description={t(
+            'This action will permanently delete %s.',
+            currentReportDeleting.name,
+          )}
+          onConfirm={() => {
+            if (currentReportDeleting) {
+              handleReportDelete(currentReportDeleting);
+            }
+          }}
+          onHide={() => setCurrentReportDeleting(null)}
+          open
+          title={t('Delete Report?')}
+        />
+      )}
+    </>
+  ) : null;
+}
diff --git a/superset-frontend/src/components/ReportModal/index.test.tsx b/superset-frontend/src/components/ReportModal/index.test.tsx
new file mode 100644
index 000000000000..44e3d0ef65c5
--- /dev/null
+++ b/superset-frontend/src/components/ReportModal/index.test.tsx
@@ -0,0 +1,110 @@
+/**
+ * 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 React from 'react';
+import userEvent from '@testing-library/user-event';
+import { render, screen } from 'spec/helpers/testing-library';
+import * as featureFlags from 'src/featureFlags';
+import { FeatureFlag } from '@superset-ui/core';
+import ReportModal from '.';
+
+let isFeatureEnabledMock: jest.MockInstance<boolean, [string]>;
+
+const NOOP = () => {};
+
+const defaultProps = {
+  addDangerToast: NOOP,
+  addSuccessToast: NOOP,
+  addReport: NOOP,
+  onHide: NOOP,
+  onReportAdd: NOOP,
+  show: true,
+  userId: 1,
+  userEmail: 'test@test.com',
+  dashboardId: 1,
+  creationMethod: 'charts_dashboards',
+  props: {
+    chart: {
+      sliceFormData: {
+        viz_type: 'table',
+      },
+    },
+  },
+};
+
+describe('Email Report Modal', () => {
+  beforeAll(() => {
+    isFeatureEnabledMock = jest
+      .spyOn(featureFlags, 'isFeatureEnabled')
+      .mockImplementation(
+        (featureFlag: FeatureFlag) => featureFlag === FeatureFlag.ALERT_REPORTS,
+      );
+  });
+
+  beforeEach(() => {
+    render(<ReportModal {...defaultProps} />, { useRedux: true });
+  });
+
+  afterAll(() => {
+    // @ts-ignore
+    isFeatureEnabledMock.restore();
+  });
+
+  it('inputs respond correctly', () => {
+    // ----- Report name textbox
+    // Initial value
+    const reportNameTextbox = screen.getByTestId('report-name-test');
+    expect(reportNameTextbox).toHaveDisplayValue('Weekly Report');
+    // Type in the textbox and assert that it worked
+    userEvent.type(reportNameTextbox, 'Report name text test');
+    expect(reportNameTextbox).toHaveDisplayValue('Report name text test');
+
+    // ----- Report description textbox
+    // Initial value
+    const reportDescriptionTextbox = screen.getByTestId(
+      'report-description-test',
+    );
+    expect(reportDescriptionTextbox).toHaveDisplayValue('');
+    // Type in the textbox and assert that it worked
+    userEvent.type(reportDescriptionTextbox, 'Report description text test');
+    expect(reportDescriptionTextbox).toHaveDisplayValue(
+      'Report description text test',
+    );
+
+    // ----- Crontab
+    const crontabInputs = screen.getAllByRole('combobox');
+    expect(crontabInputs).toHaveLength(5);
+  });
+
+  it('does not allow user to create a report without a name', () => {
+    // Grab name textbox and add button
+    const reportNameTextbox = screen.getByTestId('report-name-test');
+    const addButton = screen.getByRole('button', { name: /add/i });
+
+    // Add button should be enabled while name textbox has text
+    expect(reportNameTextbox).toHaveDisplayValue('Weekly Report');
+    expect(addButton).toBeEnabled();
+
+    // Clear the text from the name textbox
+    userEvent.clear(reportNameTextbox);
+
+    // Add button should now be disabled, blocking user from creation
+    expect(reportNameTextbox).toHaveDisplayValue('');
+    expect(addButton).toBeDisabled();
+  });
+});
diff --git a/superset-frontend/src/components/ReportModal/index.tsx b/superset-frontend/src/components/ReportModal/index.tsx
new file mode 100644
index 000000000000..e24d1d756c63
--- /dev/null
+++ b/superset-frontend/src/components/ReportModal/index.tsx
@@ -0,0 +1,398 @@
+/**
+ * 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 React, {
+  useState,
+  useEffect,
+  useCallback,
+  useReducer,
+  Reducer,
+  FunctionComponent,
+} from 'react';
+import { t, SupersetTheme } from '@superset-ui/core';
+import { bindActionCreators } from 'redux';
+import { connect, useDispatch, useSelector } from 'react-redux';
+import { addReport, editReport } from 'src/reports/actions/reports';
+import { AlertObject } from 'src/views/CRUD/alert/types';
+
+import TimezoneSelector from 'src/components/TimezoneSelector';
+import LabeledErrorBoundInput from 'src/components/Form/LabeledErrorBoundInput';
+import Icons from 'src/components/Icons';
+import withToasts from 'src/messageToasts/enhancers/withToasts';
+import { CronError } from 'src/components/CronPicker';
+import { RadioChangeEvent } from 'src/common/components';
+import {
+  StyledModal,
+  StyledTopSection,
+  StyledBottomSection,
+  StyledIconWrapper,
+  StyledScheduleTitle,
+  StyledCronPicker,
+  StyledCronError,
+  noBottomMargin,
+  StyledFooterButton,
+  TimezoneHeaderStyle,
+  SectionHeaderStyle,
+  StyledMessageContentTitle,
+  StyledRadio,
+  StyledRadioGroup,
+} from './styles';
+
+export interface ReportObject {
+  id?: number;
+  active: boolean;
+  crontab: string;
+  dashboard?: number;
+  chart?: number;
+  description?: string;
+  log_retention: number;
+  name: string;
+  owners: number[];
+  recipients: [{ recipient_config_json: { target: string }; type: string }];
+  report_format: string;
+  timezone: string;
+  type: string;
+  validator_config_json: {} | null;
+  validator_type: string;
+  working_timeout: number;
+  creation_method: string;
+}
+
+interface ChartObject {
+  id: number;
+  chartAlert: string;
+  chartStatus: string;
+  chartUpdateEndTime: number;
+  chartUpdateStartTime: number;
+  latestQueryFormData: object;
+  queryController: { abort: () => {} };
+  queriesResponse: object;
+  triggerQuery: boolean;
+  lastRendered: number;
+}
+
+interface ReportProps {
+  addDangerToast: (msg: string) => void;
+  addSuccessToast: (msg: string) => void;
+  addReport: (report?: ReportObject) => {};
+  onHide: () => {};
+  onReportAdd: (report?: ReportObject) => {};
+  show: boolean;
+  userId: number;
+  userEmail: string;
+  dashboardId?: number;
+  chart?: ChartObject;
+  creationMethod: string;
+  props: any;
+}
+
+interface ReportPayloadType {
+  name: string;
+  value: string;
+}
+
+enum ActionType {
+  inputChange,
+  fetched,
+  reset,
+}
+
+type ReportActionType =
+  | {
+      type: ActionType.inputChange;
+      payload: ReportPayloadType;
+    }
+  | {
+      type: ActionType.fetched;
+      payload: Partial<ReportObject>;
+    }
+  | {
+      type: ActionType.reset;
+    };
+
+const TEXT_BASED_VISUALIZATION_TYPES = [
+  'pivot_table',
+  'pivot_table_v2',
+  'table',
+  'paired_ttest',
+];
+
+const NOTIFICATION_FORMATS = {
+  TEXT: 'TEXT',
+  PNG: 'PNG',
+  CSV: 'CSV',
+};
+
+const reportReducer = (
+  state: Partial<ReportObject> | null,
+  action: ReportActionType,
+): Partial<ReportObject> | null => {
+  const initialState = {
+    name: 'Weekly Report',
+  };
+
+  switch (action.type) {
+    case ActionType.inputChange:
+      return {
+        ...initialState,
+        ...state,
+        [action.payload.name]: action.payload.value,
+      };
+    case ActionType.fetched:
+      return {
+        ...initialState,
+        ...action.payload,
+      };
+    case ActionType.reset:
+      return { ...initialState };
+    default:
+      return state;
+  }
+};
+
+const ReportModal: FunctionComponent<ReportProps> = ({
+  onReportAdd,
+  onHide,
+  show = false,
+  ...props
+}) => {
+  const vizType = props.props.chart?.sliceFormData?.viz_type;
+  const isChart = !!props.props.chart;
+  const defaultNotificationFormat =
+    isChart && TEXT_BASED_VISUALIZATION_TYPES.includes(vizType)
+      ? NOTIFICATION_FORMATS.TEXT
+      : NOTIFICATION_FORMATS.PNG;
+  const [currentReport, setCurrentReport] = useReducer<
+    Reducer<Partial<ReportObject> | null, ReportActionType>
+  >(reportReducer, null);
+  const onChange = useCallback((type: any, payload: any) => {
+    setCurrentReport({ type, payload });
+  }, []);
+  const [error, setError] = useState<CronError>();
+  // const [isLoading, setLoading] = useState<boolean>(false);
+  const dispatch = useDispatch();
+  // Report fetch logic
+  const reports = useSelector<any, AlertObject>(state => state.reports);
+  const isEditMode = reports && Object.keys(reports).length;
+
+  useEffect(() => {
+    if (isEditMode) {
+      const reportsIds = Object.keys(reports);
+      const report = reports[reportsIds[0]];
+      setCurrentReport({
+        type: ActionType.fetched,
+        payload: report,
+      });
+    } else {
+      setCurrentReport({
+        type: ActionType.reset,
+      });
+    }
+  }, [reports]);
+  const onClose = () => {
+    onHide();
+  };
+  const onSave = async () => {
+    // Create new Report
+    const newReportValues: Partial<ReportObject> = {
+      crontab: currentReport?.crontab,
+      dashboard: props.props.dashboardId,
+      chart: props.props.chart?.id,
+      description: currentReport?.description,
+      name: currentReport?.name,
+      owners: [props.props.userId],
+      recipients: [
+        {
+          recipient_config_json: { target: props.props.userEmail },
+          type: 'Email',
+        },
+      ],
+      type: 'Report',
+      creation_method: props.props.creationMethod,
+      active: true,
+      report_format: currentReport?.report_format || defaultNotificationFormat,
+      timezone: currentReport?.timezone,
+    };
+
+    if (isEditMode) {
+      await dispatch(
+        editReport(currentReport?.id, newReportValues as ReportObject),
+      );
+    } else {
+      await dispatch(addReport(newReportValues as ReportObject));
+    }
+
+    if (onReportAdd) {
+      onReportAdd();
+    }
+
+    onClose();
+  };
+
+  const wrappedTitle = (
+    <StyledIconWrapper>
+      <Icons.Calendar />
+      <span className="text">
+        {isEditMode ? t('Edit Email Report') : t('New Email Report')}
+      </span>
+    </StyledIconWrapper>
+  );
+
+  const renderModalFooter = (
+    <>
+      <StyledFooterButton key="back" onClick={onClose}>
+        {t('Cancel')}
+      </StyledFooterButton>
+      <StyledFooterButton
+        key="submit"
+        buttonStyle="primary"
+        onClick={onSave}
+        disabled={!currentReport?.name}
+      >
+        {isEditMode ? t('Save') : t('Add')}
+      </StyledFooterButton>
+    </>
+  );
+
+  const renderMessageContentSection = (
+    <>
+      <StyledMessageContentTitle>
+        <h4>{t('Message Content')}</h4>
+      </StyledMessageContentTitle>
+      <div className="inline-container">
+        <StyledRadioGroup
+          onChange={(event: RadioChangeEvent) => {
+            onChange(ActionType.inputChange, {
+              name: 'report_format',
+              value: event.target.value,
+            });
+          }}
+          value={currentReport?.report_format || defaultNotificationFormat}
+        >
+          {TEXT_BASED_VISUALIZATION_TYPES.includes(vizType) && (
+            <StyledRadio value={NOTIFICATION_FORMATS.TEXT}>
+              {t('Text embedded in email')}
+            </StyledRadio>
+          )}
+          <StyledRadio value={NOTIFICATION_FORMATS.PNG}>
+            {t('Image (PNG) embedded in email')}
+          </StyledRadio>
+          <StyledRadio value={NOTIFICATION_FORMATS.CSV}>
+            {t('Formatted CSV attached in email')}
+          </StyledRadio>
+        </StyledRadioGroup>
+      </div>
+    </>
+  );
+
+  return (
+    <StyledModal
+      show={show}
+      onHide={onClose}
+      title={wrappedTitle}
+      footer={renderModalFooter}
+      width="432"
+      centered
+    >
+      <StyledTopSection>
+        <LabeledErrorBoundInput
+          id="name"
+          name="name"
+          value={currentReport?.name || ''}
+          placeholder="Weekly Report"
+          required
+          validationMethods={{
+            onChange: ({ target }: { target: HTMLInputElement }) =>
+              onChange(ActionType.inputChange, {
+                name: target.name,
+                value: target.value,
+              }),
+          }}
+          errorMessage={
+            currentReport?.name === 'error' ? t('REPORT NAME ERROR') : ''
+          }
+          label="Report Name"
+          data-test="report-name-test"
+        />
+
+        <LabeledErrorBoundInput
+          id="description"
+          name="description"
+          value={currentReport?.description || ''}
+          validationMethods={{
+            onChange: ({ target }: { target: HTMLInputElement }) =>
+              onChange(ActionType.inputChange, {
+                name: target.name,
+                value: target.value,
+              }),
+          }}
+          errorMessage={
+            currentReport?.description === 'error' ? t('DESCRIPTION ERROR') : ''
+          }
+          label="Description"
+          placeholder="Include a description that will be sent with your report"
+          css={noBottomMargin}
+          data-test="report-description-test"
+        />
+      </StyledTopSection>
+
+      <StyledBottomSection>
+        <StyledScheduleTitle>
+          <h4 css={(theme: SupersetTheme) => SectionHeaderStyle(theme)}>
+            {t('Schedule')}
+          </h4>
+          <p>{t('Scheduled reports will be sent to your email as a PNG')}</p>
+        </StyledScheduleTitle>
+
+        <StyledCronPicker
+          clearButton={false}
+          value={currentReport?.crontab || '0 12 * * 1'}
+          setValue={(newValue: string) => {
+            onChange(ActionType.inputChange, {
+              name: 'crontab',
+              value: newValue,
+            });
+          }}
+          onError={setError}
+        />
+        <StyledCronError>{error}</StyledCronError>
+        <div
+          className="control-label"
+          css={(theme: SupersetTheme) => TimezoneHeaderStyle(theme)}
+        >
+          {t('Timezone')}
+        </div>
+        <TimezoneSelector
+          onTimezoneChange={value => {
+            setCurrentReport({
+              type: ActionType.inputChange,
+              payload: { name: 'timezone', value },
+            });
+          }}
+          timezone={currentReport?.timezone}
+        />
+        {isChart && renderMessageContentSection}
+      </StyledBottomSection>
+    </StyledModal>
+  );
+};
+
+const mapDispatchToProps = (dispatch: any) =>
+  bindActionCreators({ addReport, editReport }, dispatch);
+
+export default connect(null, mapDispatchToProps)(withToasts(ReportModal));
diff --git a/superset-frontend/src/components/ReportModal/styles.tsx b/superset-frontend/src/components/ReportModal/styles.tsx
new file mode 100644
index 000000000000..cd68b271ebb4
--- /dev/null
+++ b/superset-frontend/src/components/ReportModal/styles.tsx
@@ -0,0 +1,113 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { styled, css, SupersetTheme } from '@superset-ui/core';
+import Modal from 'src/components/Modal';
+import Button from 'src/components/Button';
+import { Radio } from 'src/components/Radio';
+import { CronPicker } from 'src/components/CronPicker';
+
+export const StyledModal = styled(Modal)`
+  .ant-modal-body {
+    padding: 0;
+  }
+
+  h4 {
+    font-weight: 600;
+  }
+`;
+
+export const StyledTopSection = styled.div`
+  padding: ${({ theme }) =>
+    `${theme.gridUnit * 3}px ${theme.gridUnit * 4}px ${theme.gridUnit * 2}px`};
+  label {
+    font-size: ${({ theme }) => theme.typography.sizes.s - 1}px;
+    color: ${({ theme }) => theme.colors.grayscale.light1};
+  }
+`;
+
+export const StyledBottomSection = styled.div`
+  border-top: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
+  padding: ${({ theme }) =>
+    `${theme.gridUnit * 4}px ${theme.gridUnit * 4}px ${theme.gridUnit * 6}px`};
+  .ant-select {
+    width: 100%;
+  }
+  .control-label {
+    font-size: ${({ theme }) => theme.typography.sizes.s - 1}px;
+    color: ${({ theme }) => theme.colors.grayscale.light1};
+  }
+`;
+
+export const StyledIconWrapper = styled.span`
+  span {
+    margin-right: ${({ theme }) => theme.gridUnit * 2}px;
+    vertical-align: middle;
+  }
+  .text {
+    vertical-align: middle;
+  }
+`;
+
+export const StyledScheduleTitle = styled.div`
+  margin-bottom: ${({ theme }) => theme.gridUnit * 7}px;
+
+  h4 {
+    margin-bottom: ${({ theme }) => theme.gridUnit * 3}px;
+  }
+`;
+
+export const StyledCronPicker = styled(CronPicker)`
+  margin-bottom: ${({ theme }) => theme.gridUnit * 3}px;
+`;
+
+export const StyledCronError = styled.p`
+  color: ${({ theme }) => theme.colors.error.base};
+`;
+
+export const noBottomMargin = css`
+  margin-bottom: 0;
+`;
+
+export const StyledFooterButton = styled(Button)`
+  width: ${({ theme }) => theme.gridUnit * 40}px;
+`;
+
+export const TimezoneHeaderStyle = (theme: SupersetTheme) => css`
+  margin: ${theme.gridUnit * 3}px 0 ${theme.gridUnit * 2}px;
+`;
+
+export const SectionHeaderStyle = (theme: SupersetTheme) => css`
+  margin: ${theme.gridUnit * 3}px 0;
+  font-weight: ${theme.typography.weights.bold};
+`;
+
+export const StyledMessageContentTitle = styled.div`
+  margin: ${({ theme }) => theme.gridUnit * 8}px 0
+    ${({ theme }) => theme.gridUnit * 4}px;
+`;
+
+export const StyledRadio = styled(Radio)`
+  display: block;
+  line-height: ${({ theme }) => theme.gridUnit * 8}px;
+`;
+
+export const StyledRadioGroup = styled(Radio.Group)`
+  margin-left: ${({ theme }) => theme.gridUnit * 0.5}px;
+`;
diff --git a/superset-frontend/src/components/SearchInput/SearchInput.test.jsx b/superset-frontend/src/components/SearchInput/SearchInput.test.jsx
index a5d324d1005b..8de2794d4e09 100644
--- a/superset-frontend/src/components/SearchInput/SearchInput.test.jsx
+++ b/superset-frontend/src/components/SearchInput/SearchInput.test.jsx
@@ -17,7 +17,8 @@
  * under the License.
  */
 import React from 'react';
-import { shallow } from 'enzyme';
+import { mount } from 'enzyme';
+import { ThemeProvider, supersetTheme } from '@superset-ui/core';
 
 import SearchInput from 'src/components/SearchInput';
 
@@ -31,7 +32,11 @@ describe('SearchInput', () => {
 
   const factory = overrideProps => {
     const props = { ...defaultProps, ...(overrideProps || {}) };
-    return shallow(<SearchInput {...props} />);
+    return mount(
+      <ThemeProvider theme={supersetTheme}>
+        <SearchInput {...props} />
+      </ThemeProvider>,
+    );
   };
 
   let wrapper;
@@ -53,6 +58,7 @@ describe('SearchInput', () => {
   const typeSearchInput = value => {
     wrapper
       .find('[data-test="search-input"]')
+      .first()
       .props()
       .onChange({ currentTarget: { value } });
   };
@@ -62,6 +68,7 @@ describe('SearchInput', () => {
 
     wrapper
       .find('[data-test="search-input"]')
+      .first()
       .props()
       .onKeyDown({ key: 'Enter' });
 
@@ -72,14 +79,14 @@ describe('SearchInput', () => {
   it('submits on search icon click', () => {
     typeSearchInput('bar');
 
-    wrapper.find('[data-test="search-submit"]').props().onClick();
+    wrapper.find('[data-test="search-submit"]').first().props().onClick();
 
     expect(defaultProps.onSubmit).toHaveBeenCalled();
   });
 
   it('clears on clear icon click', () => {
     const wrapper2 = factory({ value: 'fizz' });
-    wrapper2.find('[data-test="search-clear"]').props().onClick();
+    wrapper2.find('[data-test="search-clear"]').first().props().onClick();
 
     expect(defaultProps.onClear).toHaveBeenCalled();
   });
diff --git a/superset-frontend/src/components/SearchInput/index.tsx b/superset-frontend/src/components/SearchInput/index.tsx
index ba7eb2d95fc3..7ca7026f333c 100644
--- a/superset-frontend/src/components/SearchInput/index.tsx
+++ b/superset-frontend/src/components/SearchInput/index.tsx
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { styled } from '@superset-ui/core';
+import { styled, useTheme } from '@superset-ui/core';
 import React from 'react';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 
 export interface SearchInputProps {
   onSubmit: () => void;
@@ -53,13 +53,13 @@ const commonStyles = `
   display: block;
   cursor: pointer;
 `;
-const SearchIcon = styled(Icon)`
+const SearchIcon = styled(Icons.Search)`
   ${commonStyles};
   top: 4px;
   left: 2px;
 `;
 
-const ClearIcon = styled(Icon)`
+const ClearIcon = styled(Icons.CancelX)`
   ${commonStyles};
   right: 0px;
   top: 4px;
@@ -73,12 +73,13 @@ export default function SearchInput({
   name,
   value,
 }: SearchInputProps) {
+  const theme = useTheme();
   return (
     <SearchInputWrapper>
       <SearchIcon
+        iconColor={theme.colors.grayscale.base}
         data-test="search-submit"
         role="button"
-        name="search"
         onClick={() => onSubmit()}
       />
       <StyledInput
@@ -98,7 +99,7 @@ export default function SearchInput({
         <ClearIcon
           data-test="search-clear"
           role="button"
-          name="cancel-x"
+          iconColor={theme.colors.grayscale.base}
           onClick={() => onClear()}
         />
       )}
diff --git a/superset-frontend/src/components/Select/DeprecatedSelect.stories.tsx b/superset-frontend/src/components/Select/DeprecatedSelect.stories.tsx
new file mode 100644
index 000000000000..191ee81e00e0
--- /dev/null
+++ b/superset-frontend/src/components/Select/DeprecatedSelect.stories.tsx
@@ -0,0 +1,143 @@
+/**
+ * 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 React from 'react';
+import { useArgs } from '@storybook/client-api';
+import { OptionTypeBase } from 'react-select';
+import Select from '.';
+
+const OPTIONS = [
+  { label: 'Blue', value: 'blue' },
+  { label: 'Red', value: 'red' },
+  { label: 'Orange', value: 'orange' },
+];
+
+export default {
+  title: 'DeprecatedSelect',
+  argTypes: {
+    options: {
+      type: 'select',
+      options: OPTIONS,
+    },
+    multi: {
+      type: 'boolean',
+    },
+    value: {
+      type: 'string',
+    },
+    clearable: {
+      type: 'boolean',
+    },
+    placeholder: {
+      type: 'string',
+    },
+  },
+};
+
+export const SelectGallery = ({ value }: { value: OptionTypeBase }) => (
+  <>
+    <h4>With default value</h4>
+    <Select
+      value={OPTIONS[0]}
+      ignoreAccents={false}
+      name="select-datasource"
+      onChange={() => {}}
+      options={OPTIONS}
+      placeholder="choose one"
+      width={600}
+    />
+    <hr />
+    <h4>With no value</h4>
+    <Select
+      ignoreAccents={false}
+      name="select-datasource"
+      onChange={() => {}}
+      options={OPTIONS}
+      placeholder="choose one"
+      width={600}
+      value={value}
+    />
+    <hr />
+    <h4>Multi select</h4>
+    <Select
+      ignoreAccents={false}
+      name="select-datasource"
+      onChange={() => {}}
+      options={OPTIONS}
+      placeholder="choose one or more values"
+      width={600}
+      value={[OPTIONS[0]]}
+      multi
+    />
+  </>
+);
+
+SelectGallery.args = {
+  value: '',
+  options: OPTIONS,
+};
+
+SelectGallery.story = {
+  parameters: {
+    knobs: {
+      disabled: true,
+    },
+  },
+};
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const InteractiveSelect = (args: any) => {
+  const [{ value, multi, clearable, placeholder }, updateArgs] = useArgs();
+  const onSelect = (selection: {}) => {
+    const { value }: { value?: any } = selection || {};
+    if (multi) {
+      updateArgs({ value: selection });
+      return;
+    }
+    updateArgs({ value });
+  };
+
+  return (
+    <Select
+      clearable={clearable}
+      onChange={onSelect}
+      name="interactive-select"
+      options={OPTIONS}
+      placeholder={placeholder}
+      with={600}
+      value={value}
+      multi={multi}
+    />
+  );
+};
+
+InteractiveSelect.args = {
+  value: '',
+  multi: false,
+  options: OPTIONS,
+  clearable: false,
+  placeholder: "I'm interactive",
+};
+
+InteractiveSelect.story = {
+  parameters: {
+    knobs: {
+      disabled: true,
+    },
+  },
+};
diff --git a/superset-frontend/src/components/Select/DeprecatedSelect.tsx b/superset-frontend/src/components/Select/DeprecatedSelect.tsx
new file mode 100644
index 000000000000..20afd0ee2d7c
--- /dev/null
+++ b/superset-frontend/src/components/Select/DeprecatedSelect.tsx
@@ -0,0 +1,322 @@
+/**
+ * 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 React, { SyntheticEvent, MutableRefObject, ComponentType } from 'react';
+import { merge } from 'lodash';
+import BasicSelect, {
+  OptionTypeBase,
+  MultiValueProps,
+  FormatOptionLabelMeta,
+  ValueType,
+  SelectComponentsConfig,
+  components as defaultComponents,
+  createFilter,
+} from 'react-select';
+import Async from 'react-select/async';
+import Creatable from 'react-select/creatable';
+import AsyncCreatable from 'react-select/async-creatable';
+import { withAsyncPaginate } from 'react-select-async-paginate';
+
+import { SelectComponents } from 'react-select/src/components';
+import {
+  SortableContainer,
+  SortableElement,
+  SortableContainerProps,
+} from 'react-sortable-hoc';
+import arrayMove from 'array-move';
+import { Props as SelectProps } from 'react-select/src/Select';
+import { useTheme } from '@superset-ui/core';
+import {
+  WindowedSelectComponentType,
+  WindowedSelectProps,
+  WindowedSelect,
+  WindowedAsyncSelect,
+  WindowedCreatableSelect,
+  WindowedAsyncCreatableSelect,
+} from './WindowedSelect';
+import {
+  DEFAULT_CLASS_NAME,
+  DEFAULT_CLASS_NAME_PREFIX,
+  DEFAULT_STYLES,
+  DEFAULT_COMPONENTS,
+  VALUE_LABELED_STYLES,
+  PartialThemeConfig,
+  PartialStylesConfig,
+  SelectComponentsType,
+  InputProps,
+  defaultTheme,
+} from './styles';
+import { findValue } from './utils';
+
+type AnyReactSelect<OptionType extends OptionTypeBase> =
+  | BasicSelect<OptionType>
+  | Async<OptionType>
+  | Creatable<OptionType>
+  | AsyncCreatable<OptionType>;
+
+export type SupersetStyledSelectProps<
+  OptionType extends OptionTypeBase,
+  T extends WindowedSelectProps<OptionType> = WindowedSelectProps<OptionType>
+> = T & {
+  // additional props for easier usage or backward compatibility
+  labelKey?: string;
+  valueKey?: string;
+  assistiveText?: string;
+  multi?: boolean;
+  clearable?: boolean;
+  sortable?: boolean;
+  ignoreAccents?: boolean;
+  creatable?: boolean;
+  selectRef?:
+    | React.RefCallback<AnyReactSelect<OptionType>>
+    | MutableRefObject<AnyReactSelect<OptionType>>;
+  getInputValue?: (selectBalue: ValueType<OptionType>) => string | undefined;
+  optionRenderer?: (option: OptionType) => React.ReactNode;
+  valueRenderer?: (option: OptionType) => React.ReactNode;
+  valueRenderedAsLabel?: boolean;
+  // callback for paste event
+  onPaste?: (e: SyntheticEvent) => void;
+  forceOverflow?: boolean;
+  // for simplier theme overrides
+  themeConfig?: PartialThemeConfig;
+  stylesConfig?: PartialStylesConfig;
+};
+
+function styled<
+  OptionType extends OptionTypeBase,
+  SelectComponentType extends
+    | WindowedSelectComponentType<OptionType>
+    | ComponentType<
+        SelectProps<OptionType>
+      > = WindowedSelectComponentType<OptionType>
+>(SelectComponent: SelectComponentType) {
+  type SelectProps = SupersetStyledSelectProps<OptionType>;
+  type Components = SelectComponents<OptionType>;
+
+  const SortableSelectComponent = SortableContainer(SelectComponent, {
+    withRef: true,
+  });
+
+  // default components for the given OptionType
+  const supersetDefaultComponents: SelectComponentsConfig<OptionType> = DEFAULT_COMPONENTS;
+
+  const getSortableMultiValue = (MultiValue: Components['MultiValue']) =>
+    SortableElement((props: MultiValueProps<OptionType>) => {
+      const onMouseDown = (e: SyntheticEvent) => {
+        e.preventDefault();
+        e.stopPropagation();
+      };
+      const innerProps = { onMouseDown };
+      return <MultiValue {...props} innerProps={innerProps} />;
+    });
+
+  /**
+   * Superset styled `Select` component. Apply Superset themed stylesheets and
+   * consolidate props API for backward compatibility with react-select v1.
+   */
+  function StyledSelect(selectProps: SelectProps) {
+    let stateManager: AnyReactSelect<OptionType>; // reference to react-select StateManager
+    const {
+      // additional props for Superset Select
+      selectRef,
+      labelKey = 'label',
+      valueKey = 'value',
+      themeConfig,
+      stylesConfig = {},
+      optionRenderer,
+      valueRenderer,
+      // whether value is rendered as `option-label` in input,
+      // useful for AdhocMetric and AdhocFilter
+      valueRenderedAsLabel: valueRenderedAsLabel_,
+      onPaste,
+      multi = false, // same as `isMulti`, used for backward compatibility
+      clearable, // same as `isClearable`
+      sortable = true, // whether to enable drag & drop sorting
+      forceOverflow, // whether the dropdown should be forcefully overflowing
+
+      // react-select props
+      className = DEFAULT_CLASS_NAME,
+      classNamePrefix = DEFAULT_CLASS_NAME_PREFIX,
+      options,
+      value: value_,
+      components: components_,
+      isMulti: isMulti_,
+      isClearable: isClearable_,
+      minMenuHeight = 100, // apply different defaults
+      maxMenuHeight = 220,
+      filterOption,
+      ignoreAccents = false, // default is `true`, but it is slow
+
+      getOptionValue = option =>
+        typeof option === 'string' ? option : option[valueKey],
+
+      getOptionLabel = option =>
+        typeof option === 'string'
+          ? option
+          : option[labelKey] || option[valueKey],
+
+      formatOptionLabel = (
+        option: OptionType,
+        { context }: FormatOptionLabelMeta<OptionType>,
+      ) => {
+        if (context === 'value') {
+          return valueRenderer ? valueRenderer(option) : getOptionLabel(option);
+        }
+        return optionRenderer ? optionRenderer(option) : getOptionLabel(option);
+      },
+
+      ...restProps
+    } = selectProps;
+
+    // `value` may be rendered values (strings), we want option objects
+    const value: OptionType[] = findValue(value_, options || [], valueKey);
+
+    // Add backward compability to v1 API
+    const isMulti = isMulti_ === undefined ? multi : isMulti_;
+    const isClearable = isClearable_ === undefined ? clearable : isClearable_;
+
+    // Sort is only applied when there are multiple selected values
+    const shouldAllowSort =
+      isMulti && sortable && Array.isArray(value) && value.length > 1;
+
+    const MaybeSortableSelect = shouldAllowSort
+      ? SortableSelectComponent
+      : SelectComponent;
+    const components = { ...supersetDefaultComponents, ...components_ };
+
+    // Make multi-select sortable as per https://react-select.netlify.app/advanced
+    if (shouldAllowSort) {
+      components.MultiValue = getSortableMultiValue(
+        components.MultiValue || defaultComponents.MultiValue,
+      );
+
+      const sortableContainerProps: Partial<SortableContainerProps> = {
+        getHelperDimensions: ({ node }) => node.getBoundingClientRect(),
+        axis: 'xy',
+        onSortEnd: ({ oldIndex, newIndex }) => {
+          const newValue = arrayMove(value, oldIndex, newIndex);
+          if (restProps.onChange) {
+            restProps.onChange(newValue, { action: 'set-value' });
+          }
+        },
+        distance: 4,
+      };
+      Object.assign(restProps, sortableContainerProps);
+    }
+
+    // When values are rendered as labels, adjust valueContainer padding
+    const valueRenderedAsLabel =
+      valueRenderedAsLabel_ === undefined ? isMulti : valueRenderedAsLabel_;
+    if (valueRenderedAsLabel && !stylesConfig.valueContainer) {
+      Object.assign(stylesConfig, VALUE_LABELED_STYLES);
+    }
+
+    // Handle onPaste event
+    if (onPaste) {
+      const Input =
+        (components.Input as SelectComponentsType['Input']) ||
+        (defaultComponents.Input as SelectComponentsType['Input']);
+      components.Input = (props: InputProps) => (
+        <Input {...props} onPaste={onPaste} />
+      );
+    }
+    // for CreaTable
+    if (SelectComponent === WindowedCreatableSelect) {
+      restProps.getNewOptionData = (inputValue: string, label: string) => ({
+        label: label || inputValue,
+        [valueKey]: inputValue,
+        isNew: true,
+      });
+    }
+
+    // handle forcing dropdown overflow
+    // use only when setting overflow:visible isn't possible on the container element
+    if (forceOverflow) {
+      Object.assign(restProps, {
+        closeMenuOnScroll: (e: Event) => {
+          const target = e.target as HTMLElement;
+          return target && !target.classList?.contains('Select__menu-list');
+        },
+        menuPosition: 'fixed',
+      });
+    }
+
+    // Make sure always return StateManager for the refs.
+    // To get the real `Select` component, keep tap into `obj.select`:
+    //   - for normal <Select /> component: StateManager -> Select,
+    //   - for <Creatable />: StateManager -> Creatable -> Select
+    const setRef = (instance: any) => {
+      stateManager =
+        shouldAllowSort && instance && 'refs' in instance
+          ? instance.refs.wrappedInstance // obtain StateManger from SortableContainer
+          : instance;
+      if (typeof selectRef === 'function') {
+        selectRef(stateManager);
+      } else if (selectRef && 'current' in selectRef) {
+        selectRef.current = stateManager;
+      }
+    };
+
+    const theme = useTheme();
+
+    return (
+      <MaybeSortableSelect
+        ref={setRef}
+        className={className}
+        classNamePrefix={classNamePrefix}
+        isMulti={isMulti}
+        isClearable={isClearable}
+        options={options}
+        value={value}
+        minMenuHeight={minMenuHeight}
+        maxMenuHeight={maxMenuHeight}
+        filterOption={
+          // filterOption may be NULL
+          filterOption !== undefined
+            ? filterOption
+            : createFilter({ ignoreAccents })
+        }
+        styles={{ ...DEFAULT_STYLES, ...stylesConfig } as SelectProps['styles']}
+        // merge default theme from `react-select`, default theme for Superset,
+        // and the theme from props.
+        theme={reactSelectTheme =>
+          merge(reactSelectTheme, defaultTheme(theme), themeConfig)
+        }
+        formatOptionLabel={formatOptionLabel}
+        getOptionLabel={getOptionLabel}
+        getOptionValue={getOptionValue}
+        components={components}
+        {...restProps}
+      />
+    );
+  }
+
+  // React.memo makes sure the component does no rerender given the same props
+  return React.memo(StyledSelect);
+}
+
+export const Select = styled(WindowedSelect);
+export const AsyncSelect = styled(WindowedAsyncSelect);
+export const CreatableSelect = styled(WindowedCreatableSelect);
+export const AsyncCreatableSelect = styled(WindowedAsyncCreatableSelect);
+export const PaginatedSelect = withAsyncPaginate(
+  styled<OptionTypeBase, ComponentType<SelectProps<OptionTypeBase>>>(
+    BasicSelect,
+  ),
+);
+export default Select;
diff --git a/superset-frontend/src/components/Select/NativeSelect.tsx b/superset-frontend/src/components/Select/NativeSelect.tsx
index 604496701eb3..2f690b1ba6d8 100644
--- a/superset-frontend/src/components/Select/NativeSelect.tsx
+++ b/superset-frontend/src/components/Select/NativeSelect.tsx
@@ -20,6 +20,11 @@ import React from 'react';
 import { styled } from '@superset-ui/core';
 import Select, { SelectProps } from 'antd/lib/select';
 
+export {
+  OptionType as NativeSelectOptionType,
+  SelectProps as NativeSelectProps,
+} from 'antd/lib/select';
+
 const StyledNativeSelect = styled((props: SelectProps<any>) => (
   <Select getPopupContainer={(trigger: any) => trigger.parentNode} {...props} />
 ))`
diff --git a/superset-frontend/src/components/Select/Select.stories.tsx b/superset-frontend/src/components/Select/Select.stories.tsx
index 125f66778649..e6dd867d972c 100644
--- a/superset-frontend/src/components/Select/Select.stories.tsx
+++ b/superset-frontend/src/components/Select/Select.stories.tsx
@@ -16,128 +16,444 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React from 'react';
-import { useArgs } from '@storybook/client-api';
-import { OptionTypeBase } from 'react-select';
-import Select from '.';
-
-const OPTIONS = [
-  { label: 'Blue', value: 'blue' },
-  { label: 'Red', value: 'red' },
-  { label: 'Orange', value: 'orange' },
-];
+import React, { ReactNode, useState, useCallback } from 'react';
+import ControlHeader from 'src/explore/components/ControlHeader';
+import Select, { SelectProps, OptionsTypePage } from './Select';
 
 export default {
   title: 'Select',
-  argTypes: {
-    options: {
-      type: 'select',
-      options: OPTIONS,
+  component: Select,
+};
+
+const DEFAULT_WIDTH = 200;
+
+const options = [
+  {
+    label: 'Such an incredibly awesome long long label',
+    value: 'Such an incredibly awesome long long label',
+  },
+  {
+    label: 'Another incredibly awesome long long label',
+    value: 'Another incredibly awesome long long label',
+  },
+  { label: 'Just a label', value: 'Just a label' },
+  { label: 'A', value: 'A' },
+  { label: 'B', value: 'B' },
+  { label: 'C', value: 'C' },
+  { label: 'D', value: 'D' },
+  { label: 'E', value: 'E' },
+  { label: 'F', value: 'F' },
+  { label: 'G', value: 'G' },
+  { label: 'H', value: 'H' },
+  { label: 'I', value: 'I' },
+];
+
+const selectPositions = [
+  {
+    id: 'topLeft',
+    style: { top: '0', left: '0' },
+  },
+  {
+    id: 'topRight',
+    style: { top: '0', right: '0' },
+  },
+  {
+    id: 'bottomLeft',
+    style: { bottom: '0', left: '0' },
+  },
+  {
+    id: 'bottomRight',
+    style: { bottom: '0', right: '0' },
+  },
+];
+
+const ARG_TYPES = {
+  options: {
+    defaultValue: options,
+    table: {
+      disable: true,
+    },
+  },
+  ariaLabel: {
+    table: {
+      disable: true,
+    },
+  },
+  name: {
+    table: {
+      disable: true,
     },
-    multi: {
-      type: 'boolean',
+  },
+  notFoundContent: {
+    table: {
+      disable: true,
+    },
+  },
+  mode: {
+    defaultValue: 'single',
+    control: {
+      type: 'inline-radio',
+      options: ['single', 'multiple'],
     },
-    value: {
-      type: 'string',
+  },
+};
+
+const mountHeader = (type: String) => {
+  let header;
+  if (type === 'text') {
+    header = 'Text header';
+  } else if (type === 'control') {
+    header = (
+      <ControlHeader
+        label="Control header"
+        warning="Example of warning messsage"
+      />
+    );
+  }
+  return header;
+};
+
+export const InteractiveSelect = (args: SelectProps & { header: string }) => (
+  <div
+    style={{
+      width: DEFAULT_WIDTH,
+    }}
+  >
+    <Select {...args} header={mountHeader(args.header)} />
+  </div>
+);
+
+InteractiveSelect.args = {
+  autoFocus: false,
+  allowNewOptions: false,
+  allowClear: false,
+  showSearch: false,
+  disabled: false,
+  invertSelection: false,
+  placeholder: 'Select ...',
+};
+
+InteractiveSelect.argTypes = {
+  ...ARG_TYPES,
+  header: {
+    defaultValue: 'none',
+    control: { type: 'inline-radio', options: ['none', 'text', 'control'] },
+  },
+  pageSize: {
+    table: {
+      disable: true,
     },
-    clearable: {
-      type: 'boolean',
+  },
+  fetchOnlyOnSearch: {
+    table: {
+      disable: true,
     },
-    placeholder: {
-      type: 'string',
+  },
+};
+
+InteractiveSelect.story = {
+  parameters: {
+    knobs: {
+      disable: true,
     },
   },
 };
 
-export const SelectGallery = ({ value }: { value: OptionTypeBase }) => (
+export const AtEveryCorner = () => (
   <>
-    <h4>With default value</h4>
-    <Select
-      value={OPTIONS[0]}
-      ignoreAccents={false}
-      name="select-datasource"
-      onChange={() => {}}
-      options={OPTIONS}
-      placeholder="choose one"
-      width={600}
-    />
-    <hr />
-    <h4>With no value</h4>
-    <Select
-      ignoreAccents={false}
-      name="select-datasource"
-      onChange={() => {}}
-      options={OPTIONS}
-      placeholder="choose one"
-      width={600}
-      value={value}
-    />
-    <hr />
-    <h4>Multi select</h4>
-    <Select
-      ignoreAccents={false}
-      name="select-datasource"
-      onChange={() => {}}
-      options={OPTIONS}
-      placeholder="choose one or more values"
-      width={600}
-      value={[OPTIONS[0]]}
-      multi
-    />
+    {selectPositions.map(position => (
+      <div
+        key={position.id}
+        style={{
+          ...position.style,
+          margin: 30,
+          width: DEFAULT_WIDTH,
+          position: 'absolute',
+        }}
+      >
+        <Select ariaLabel={`gallery-${position.id}`} options={options} />
+      </div>
+    ))}
+    <p style={{ position: 'absolute', top: '40%', left: '33%', width: 500 }}>
+      The objective of this panel is to show how the Select behaves when in
+      touch with the viewport extremities. In particular, how the drop-down is
+      displayed and if the tooltips of truncated items are correctly positioned.
+    </p>
   </>
 );
 
-SelectGallery.args = {
-  value: '',
-  options: OPTIONS,
+AtEveryCorner.story = {
+  parameters: {
+    actions: {
+      disable: true,
+    },
+    controls: {
+      disable: true,
+    },
+    knobs: {
+      disable: true,
+    },
+  },
 };
 
-SelectGallery.story = {
+export const PageScroll = () => (
+  <div style={{ height: 2000, overflowY: 'auto' }}>
+    <div
+      style={{
+        width: DEFAULT_WIDTH,
+        position: 'absolute',
+        top: 30,
+        right: 30,
+      }}
+    >
+      <Select ariaLabel="page-scroll-select-1" options={options} />
+    </div>
+    <div
+      style={{
+        width: DEFAULT_WIDTH,
+        position: 'absolute',
+        bottom: 30,
+        right: 30,
+      }}
+    >
+      <Select ariaLabel="page-scroll-select-2" options={options} />
+    </div>
+    <p
+      style={{
+        position: 'absolute',
+        top: '40%',
+        left: 30,
+        width: 500,
+      }}
+    >
+      The objective of this panel is to show how the Select behaves when there's
+      a scroll on the page. In particular, how the drop-down is displayed.
+    </p>
+  </div>
+);
+
+PageScroll.story = {
   parameters: {
+    actions: {
+      disable: true,
+    },
+    controls: {
+      disable: true,
+    },
     knobs: {
-      disabled: true,
+      disable: true,
     },
   },
 };
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export const InteractiveSelect = (args: any) => {
-  const [{ value, multi, clearable, placeholder }, updateArgs] = useArgs();
-  const onSelect = (selection: {}) => {
-    const { value }: { value?: any } = selection || {};
-    if (multi) {
-      updateArgs({ value: selection });
-      return;
+const USERS = [
+  'John',
+  'Liam',
+  'Olivia',
+  'Emma',
+  'Noah',
+  'Ava',
+  'Oliver',
+  'Elijah',
+  'Charlotte',
+  'Diego',
+  'Evan',
+  'Michael',
+  'Giovanni',
+  'Luca',
+  'Paolo',
+  'Francesca',
+  'Chiara',
+  'Sara',
+  'Valentina',
+  'Jessica',
+  'Angelica',
+  'Mario',
+  'Marco',
+  'Andrea',
+  'Luigi',
+  'Quarto',
+  'Quinto',
+  'Sesto',
+  'Franco',
+  'Sandro',
+  'Alehandro',
+  'Johnny',
+  'Nikole',
+  'Igor',
+  'Sipatha',
+  'Thami',
+  'Munei',
+  'Guilherme',
+  'Umair',
+  'Ashfaq',
+  'Amna',
+  'Irfan',
+  'George',
+  'Naseer',
+  'Mohammad',
+  'Rick',
+  'Saliya',
+  'Claire',
+  'Benedetta',
+  'Ilenia',
+];
+
+export const AsyncSelect = ({
+  withError,
+  withInitialValue,
+  responseTime,
+  ...rest
+}: SelectProps & {
+  withError: boolean;
+  withInitialValue: boolean;
+  responseTime: number;
+}) => {
+  const [requests, setRequests] = useState<ReactNode[]>([]);
+
+  const getResults = (username?: string) => {
+    let results: { label: string; value: string }[] = [];
+
+    if (!username) {
+      results = USERS.map(u => ({
+        label: u,
+        value: u,
+      }));
+    } else {
+      const foundUsers = USERS.filter(u => u.toLowerCase().includes(username));
+      if (foundUsers) {
+        results = foundUsers.map(u => ({ label: u, value: u }));
+      } else {
+        results = [];
+      }
     }
-    updateArgs({ value });
+    return results;
+  };
+
+  const setRequestLog = (results: number, total: number, username?: string) => {
+    const request = (
+      <>
+        Emulating network request with search <b>{username || 'empty'}</b> ...{' '}
+        <b>
+          {results}/{total}
+        </b>{' '}
+        results
+      </>
+    );
+
+    setRequests(requests => [request, ...requests]);
   };
 
+  const fetchUserListPage = useCallback(
+    (
+      search: string,
+      page: number,
+      pageSize: number,
+    ): Promise<OptionsTypePage> => {
+      const username = search.trim().toLowerCase();
+      return new Promise(resolve => {
+        let results = getResults(username);
+        const totalCount = results.length;
+        const start = page * pageSize;
+        const deleteCount =
+          start + pageSize < totalCount ? pageSize : totalCount - start;
+        results = results.splice(start, deleteCount);
+        setRequestLog(start + results.length, totalCount, username);
+        setTimeout(() => {
+          resolve({ data: results, totalCount });
+        }, responseTime * 1000);
+      });
+    },
+    [responseTime],
+  );
+
+  const fetchUserListError = async (): Promise<OptionsTypePage> =>
+    new Promise((_, reject) => {
+      reject(new Error('Error while fetching the names from the server'));
+    });
+
   return (
-    <Select
-      clearable={clearable}
-      onChange={onSelect}
-      name="interactive-select"
-      options={OPTIONS}
-      placeholder={placeholder}
-      with={600}
-      value={value}
-      multi={multi}
-    />
+    <>
+      <div
+        style={{
+          width: DEFAULT_WIDTH,
+        }}
+      >
+        <Select
+          {...rest}
+          options={withError ? fetchUserListError : fetchUserListPage}
+          value={
+            withInitialValue
+              ? { label: 'Valentina', value: 'Valentina' }
+              : undefined
+          }
+        />
+      </div>
+      <div
+        style={{
+          position: 'absolute',
+          top: 32,
+          left: DEFAULT_WIDTH + 100,
+          height: 400,
+          width: 600,
+          overflowY: 'auto',
+          border: '1px solid #d9d9d9',
+          padding: 20,
+        }}
+      >
+        {requests.map((request, index) => (
+          <p key={`request-${index}`}>{request}</p>
+        ))}
+      </div>
+    </>
   );
 };
 
-InteractiveSelect.args = {
-  value: '',
-  multi: false,
-  options: OPTIONS,
-  clearable: false,
-  placeholder: "I'm interactive",
+AsyncSelect.args = {
+  allowNewOptions: false,
+  fetchOnlyOnSearch: false,
+  pageSize: 10,
+  withError: false,
+  withInitialValue: false,
 };
 
-InteractiveSelect.story = {
+AsyncSelect.argTypes = {
+  ...ARG_TYPES,
+  header: {
+    table: {
+      disable: true,
+    },
+  },
+  invertSelection: {
+    table: {
+      disable: true,
+    },
+  },
+  pageSize: {
+    defaultValue: 10,
+    control: {
+      type: 'range',
+      min: 10,
+      max: 50,
+      step: 10,
+    },
+  },
+  responseTime: {
+    defaultValue: 0.5,
+    name: 'responseTime (seconds)',
+    control: {
+      type: 'range',
+      min: 0.5,
+      max: 5,
+      step: 0.5,
+    },
+  },
+};
+
+AsyncSelect.story = {
   parameters: {
     knobs: {
-      disabled: true,
+      disable: true,
     },
   },
 };
diff --git a/superset-frontend/src/components/Select/Select.test.tsx b/superset-frontend/src/components/Select/Select.test.tsx
new file mode 100644
index 000000000000..dc39899af792
--- /dev/null
+++ b/superset-frontend/src/components/Select/Select.test.tsx
@@ -0,0 +1,82 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React from 'react';
+import { render, screen } from 'spec/helpers/testing-library';
+import { Select } from 'src/components';
+
+test('renders with default props', () => {
+  const ariaLabel = 'test';
+  render(
+    <Select
+      ariaLabel={ariaLabel}
+      options={[
+        { label: 'A', value: 0 },
+        { label: 'B', value: 1 },
+      ]}
+    />,
+  );
+
+  expect(screen.getByRole('combobox', { name: ariaLabel })).toBeInTheDocument();
+});
+
+/*
+Tests for the sync version of the select:
+- Opens the select without any data
+- Makes a selection in single mode
+- Makes multiple selections in multiple mode
+- Changes the selected item in single mode
+- Deselects an item in multiple mode
+- Adds a header to the select
+- Adds a new option if none is available and allowNewValue is true
+- Does not add a new option if the option already exists
+- Does not add a new option if allowNewValue is false
+- Inverts the selection
+- Sets a initial value in single mode
+- Sets a initial value in multiple mode
+- Searches for an item
+- Displays the selected items first
+- Searches for label or value
+- Clear all the values
+
+Tests for the async version of the select:
+- Opens the select without any data
+- Makes a selection in single mode
+- Makes multiple selections in multiple mode
+- Changes the selected item in single mode
+- Deselects an item in multiple mode
+- Adds a new option if none is available and allowNewValue is true
+- Does not add a new option if the option already exists
+- Does not add a new option if allowNewValue is false
+- Sets a initial value in single mode
+- Sets a initial value in multiple mode
+- Searches for an item already loaded
+- Searches for an item in a page not loaded
+- Displays the loading indicator
+- Fetches more data when scrolling and more data is available
+- Doesn't fetch more data when no more data is available
+- Requests the correct page and page size
+- Fetches only after a search input is entered if fetchOnlyOnSearch is true
+- Does not fetch data when rendering
+- Fetches data when opening the select
+- Displays an error message when an exception is thrown while fetching
+- Does not fire a new request for the same search input
+- Displays the selected items first
+- Sets the page to zero when a new search is made
+- Clear all the values
+*/
diff --git a/superset-frontend/src/components/Select/Select.tsx b/superset-frontend/src/components/Select/Select.tsx
index 20afd0ee2d7c..655a6569afac 100644
--- a/superset-frontend/src/components/Select/Select.tsx
+++ b/superset-frontend/src/components/Select/Select.tsx
@@ -16,307 +16,517 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { SyntheticEvent, MutableRefObject, ComponentType } from 'react';
-import { merge } from 'lodash';
-import BasicSelect, {
-  OptionTypeBase,
-  MultiValueProps,
-  FormatOptionLabelMeta,
-  ValueType,
-  SelectComponentsConfig,
-  components as defaultComponents,
-  createFilter,
-} from 'react-select';
-import Async from 'react-select/async';
-import Creatable from 'react-select/creatable';
-import AsyncCreatable from 'react-select/async-creatable';
-import { withAsyncPaginate } from 'react-select-async-paginate';
-
-import { SelectComponents } from 'react-select/src/components';
-import {
-  SortableContainer,
-  SortableElement,
-  SortableContainerProps,
-} from 'react-sortable-hoc';
-import arrayMove from 'array-move';
-import { Props as SelectProps } from 'react-select/src/Select';
-import { useTheme } from '@superset-ui/core';
-import {
-  WindowedSelectComponentType,
-  WindowedSelectProps,
-  WindowedSelect,
-  WindowedAsyncSelect,
-  WindowedCreatableSelect,
-  WindowedAsyncCreatableSelect,
-} from './WindowedSelect';
-import {
-  DEFAULT_CLASS_NAME,
-  DEFAULT_CLASS_NAME_PREFIX,
-  DEFAULT_STYLES,
-  DEFAULT_COMPONENTS,
-  VALUE_LABELED_STYLES,
-  PartialThemeConfig,
-  PartialStylesConfig,
-  SelectComponentsType,
-  InputProps,
-  defaultTheme,
-} from './styles';
-import { findValue } from './utils';
-
-type AnyReactSelect<OptionType extends OptionTypeBase> =
-  | BasicSelect<OptionType>
-  | Async<OptionType>
-  | Creatable<OptionType>
-  | AsyncCreatable<OptionType>;
-
-export type SupersetStyledSelectProps<
-  OptionType extends OptionTypeBase,
-  T extends WindowedSelectProps<OptionType> = WindowedSelectProps<OptionType>
-> = T & {
-  // additional props for easier usage or backward compatibility
-  labelKey?: string;
-  valueKey?: string;
-  assistiveText?: string;
-  multi?: boolean;
-  clearable?: boolean;
-  sortable?: boolean;
-  ignoreAccents?: boolean;
-  creatable?: boolean;
-  selectRef?:
-    | React.RefCallback<AnyReactSelect<OptionType>>
-    | MutableRefObject<AnyReactSelect<OptionType>>;
-  getInputValue?: (selectBalue: ValueType<OptionType>) => string | undefined;
-  optionRenderer?: (option: OptionType) => React.ReactNode;
-  valueRenderer?: (option: OptionType) => React.ReactNode;
-  valueRenderedAsLabel?: boolean;
-  // callback for paste event
-  onPaste?: (e: SyntheticEvent) => void;
-  forceOverflow?: boolean;
-  // for simplier theme overrides
-  themeConfig?: PartialThemeConfig;
-  stylesConfig?: PartialStylesConfig;
+import React, {
+  ReactElement,
+  ReactNode,
+  RefObject,
+  UIEvent,
+  useEffect,
+  useMemo,
+  useState,
+  useRef,
+  useCallback,
+} from 'react';
+import { styled, t } from '@superset-ui/core';
+import AntdSelect, {
+  SelectProps as AntdSelectProps,
+  SelectValue as AntdSelectValue,
+  LabeledValue as AntdLabeledValue,
+} from 'antd/lib/select';
+import { DownOutlined, SearchOutlined } from '@ant-design/icons';
+import debounce from 'lodash/debounce';
+import { isEqual } from 'lodash';
+import { Spin } from 'antd';
+import Icons from 'src/components/Icons';
+import { getClientErrorObject } from 'src/utils/getClientErrorObject';
+import { hasOption } from './utils';
+
+type AntdSelectAllProps = AntdSelectProps<AntdSelectValue>;
+
+type PickedSelectProps = Pick<
+  AntdSelectAllProps,
+  | 'allowClear'
+  | 'autoFocus'
+  | 'value'
+  | 'disabled'
+  | 'filterOption'
+  | 'notFoundContent'
+  | 'onChange'
+  | 'placeholder'
+  | 'showSearch'
+  | 'value'
+>;
+
+export type OptionsType = Exclude<AntdSelectAllProps['options'], undefined>;
+
+export type OptionsTypePage = {
+  data: OptionsType;
+  totalCount: number;
 };
 
-function styled<
-  OptionType extends OptionTypeBase,
-  SelectComponentType extends
-    | WindowedSelectComponentType<OptionType>
-    | ComponentType<
-        SelectProps<OptionType>
-      > = WindowedSelectComponentType<OptionType>
->(SelectComponent: SelectComponentType) {
-  type SelectProps = SupersetStyledSelectProps<OptionType>;
-  type Components = SelectComponents<OptionType>;
-
-  const SortableSelectComponent = SortableContainer(SelectComponent, {
-    withRef: true,
-  });
-
-  // default components for the given OptionType
-  const supersetDefaultComponents: SelectComponentsConfig<OptionType> = DEFAULT_COMPONENTS;
-
-  const getSortableMultiValue = (MultiValue: Components['MultiValue']) =>
-    SortableElement((props: MultiValueProps<OptionType>) => {
-      const onMouseDown = (e: SyntheticEvent) => {
-        e.preventDefault();
-        e.stopPropagation();
-      };
-      const innerProps = { onMouseDown };
-      return <MultiValue {...props} innerProps={innerProps} />;
-    });
+export type OptionsPagePromise = (
+  search: string,
+  page: number,
+  pageSize: number,
+) => Promise<OptionsTypePage>;
+
+export interface SelectProps extends PickedSelectProps {
+  allowNewOptions?: boolean;
+  ariaLabel: string;
+  header?: ReactNode;
+  mode?: 'single' | 'multiple';
+  name?: string; // discourage usage
+  options: OptionsType | OptionsPagePromise;
+  pageSize?: number;
+  invertSelection?: boolean;
+  fetchOnlyOnSearch?: boolean;
+}
+
+const StyledContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+`;
+
+const StyledSelect = styled(AntdSelect)`
+  ${({ theme }) => `
+    width: 100%;
+
+    && .ant-select-selector {
+      border-radius: ${theme.gridUnit}px;
+    }
+
+    // Open the dropdown when clicking on the suffix
+    // This is fixed in version 4.16
+    .ant-select-arrow .anticon:not(.ant-select-suffix) {
+      pointer-events: none;
+    }
+  `}
+`;
+
+const StyledStopOutlined = styled(Icons.StopOutlined)`
+  vertical-align: 0;
+`;
+
+const StyledCheckOutlined = styled(Icons.CheckOutlined)`
+  vertical-align: 0;
+`;
+
+const StyledError = styled.div`
+  ${({ theme }) => `
+    display: flex;
+    justify-content: center;
+    align-items: flex-start;
+    width: 100%;
+    padding: ${theme.gridUnit * 2}px;
+    color: ${theme.colors.error.base};
+
+    & svg {
+      margin-right: ${theme.gridUnit * 2}px;
+    }
+  `}
+`;
 
-  /**
-   * Superset styled `Select` component. Apply Superset themed stylesheets and
-   * consolidate props API for backward compatibility with react-select v1.
-   */
-  function StyledSelect(selectProps: SelectProps) {
-    let stateManager: AnyReactSelect<OptionType>; // reference to react-select StateManager
-    const {
-      // additional props for Superset Select
-      selectRef,
-      labelKey = 'label',
-      valueKey = 'value',
-      themeConfig,
-      stylesConfig = {},
-      optionRenderer,
-      valueRenderer,
-      // whether value is rendered as `option-label` in input,
-      // useful for AdhocMetric and AdhocFilter
-      valueRenderedAsLabel: valueRenderedAsLabel_,
-      onPaste,
-      multi = false, // same as `isMulti`, used for backward compatibility
-      clearable, // same as `isClearable`
-      sortable = true, // whether to enable drag & drop sorting
-      forceOverflow, // whether the dropdown should be forcefully overflowing
-
-      // react-select props
-      className = DEFAULT_CLASS_NAME,
-      classNamePrefix = DEFAULT_CLASS_NAME_PREFIX,
-      options,
-      value: value_,
-      components: components_,
-      isMulti: isMulti_,
-      isClearable: isClearable_,
-      minMenuHeight = 100, // apply different defaults
-      maxMenuHeight = 220,
-      filterOption,
-      ignoreAccents = false, // default is `true`, but it is slow
-
-      getOptionValue = option =>
-        typeof option === 'string' ? option : option[valueKey],
-
-      getOptionLabel = option =>
-        typeof option === 'string'
-          ? option
-          : option[labelKey] || option[valueKey],
-
-      formatOptionLabel = (
-        option: OptionType,
-        { context }: FormatOptionLabelMeta<OptionType>,
-      ) => {
-        if (context === 'value') {
-          return valueRenderer ? valueRenderer(option) : getOptionLabel(option);
+const StyledErrorMessage = styled.div`
+  overflow: hidden;
+  text-overflow: ellipsis;
+`;
+
+const StyledSpin = styled(Spin)`
+  margin-top: ${({ theme }) => -theme.gridUnit}px;
+`;
+
+const MAX_TAG_COUNT = 4;
+const TOKEN_SEPARATORS = [',', '\n', '\t', ';'];
+const DEBOUNCE_TIMEOUT = 500;
+const DEFAULT_PAGE_SIZE = 100;
+const EMPTY_OPTIONS: OptionsType = [];
+
+const Error = ({ error }: { error: string }) => (
+  <StyledError>
+    <Icons.ErrorSolid /> <StyledErrorMessage>{error}</StyledErrorMessage>
+  </StyledError>
+);
+
+const Select = ({
+  allowNewOptions = false,
+  ariaLabel,
+  fetchOnlyOnSearch,
+  filterOption = true,
+  header = null,
+  invertSelection = false,
+  mode = 'single',
+  name,
+  options,
+  pageSize = DEFAULT_PAGE_SIZE,
+  placeholder = t('Select ...'),
+  showSearch,
+  value,
+  ...props
+}: SelectProps) => {
+  const isAsync = typeof options === 'function';
+  const isSingleMode = mode === 'single';
+  const shouldShowSearch = isAsync || allowNewOptions ? true : showSearch;
+  const initialOptions =
+    options && Array.isArray(options) ? options : EMPTY_OPTIONS;
+  const [selectOptions, setSelectOptions] = useState<OptionsType>(
+    initialOptions,
+  );
+  const [selectValue, setSelectValue] = useState(value);
+  const [searchedValue, setSearchedValue] = useState('');
+  const [isLoading, setLoading] = useState(false);
+  const [error, setError] = useState('');
+  const [isDropdownVisible, setIsDropdownVisible] = useState(false);
+  const [page, setPage] = useState(0);
+  const [totalCount, setTotalCount] = useState(0);
+  const [loadingEnabled, setLoadingEnabled] = useState(false);
+  const fetchedQueries = useRef(new Map<string, number>());
+  const mappedMode = isSingleMode
+    ? undefined
+    : allowNewOptions
+    ? 'tags'
+    : 'multiple';
+
+  useEffect(() => {
+    fetchedQueries.current.clear();
+    setSelectOptions(
+      options && Array.isArray(options) ? options : EMPTY_OPTIONS,
+    );
+  }, [options]);
+
+  useEffect(() => {
+    if (isAsync && value) {
+      const array: AntdLabeledValue[] = Array.isArray(value)
+        ? (value as AntdLabeledValue[])
+        : [value as AntdLabeledValue];
+      const options: AntdLabeledValue[] = [];
+      array.forEach(element => {
+        const found = selectOptions.find(
+          option => option.value === element.value,
+        );
+        if (!found) {
+          options.push(element);
         }
-        return optionRenderer ? optionRenderer(option) : getOptionLabel(option);
-      },
+      });
+      if (options.length > 0) {
+        setSelectOptions([...selectOptions, ...options]);
+      }
+    }
+  }, [isAsync, selectOptions, value]);
 
-      ...restProps
-    } = selectProps;
+  useEffect(() => {
+    setSelectValue(value);
+  }, [value]);
 
-    // `value` may be rendered values (strings), we want option objects
-    const value: OptionType[] = findValue(value_, options || [], valueKey);
+  const handleTopOptions = useCallback(
+    (selectedValue: AntdSelectValue | undefined) => {
+      // bringing selected options to the top of the list
+      if (selectedValue !== undefined && selectedValue !== null) {
+        const topOptions: OptionsType = [];
+        const otherOptions: OptionsType = [];
 
-    // Add backward compability to v1 API
-    const isMulti = isMulti_ === undefined ? multi : isMulti_;
-    const isClearable = isClearable_ === undefined ? clearable : isClearable_;
+        selectOptions.forEach(opt => {
+          let found = false;
+          if (Array.isArray(selectedValue)) {
+            if (isAsync) {
+              found =
+                (selectedValue as AntdLabeledValue[]).find(
+                  element => element.value === opt.value,
+                ) !== undefined;
+            } else {
+              found = selectedValue.includes(opt.value);
+            }
+          } else {
+            found = isAsync
+              ? (selectedValue as AntdLabeledValue).value === opt.value
+              : selectedValue === opt.value;
+          }
 
-    // Sort is only applied when there are multiple selected values
-    const shouldAllowSort =
-      isMulti && sortable && Array.isArray(value) && value.length > 1;
+          if (found) {
+            topOptions.push(opt);
+          } else {
+            otherOptions.push(opt);
+          }
+        });
 
-    const MaybeSortableSelect = shouldAllowSort
-      ? SortableSelectComponent
-      : SelectComponent;
-    const components = { ...supersetDefaultComponents, ...components_ };
+        // fallback for custom options in tags mode as they
+        // do not appear in the selectOptions state
+        if (!isSingleMode && Array.isArray(selectedValue)) {
+          selectedValue.forEach((val: string | number | AntdLabeledValue) => {
+            if (
+              !topOptions.find(
+                tOpt =>
+                  tOpt.value ===
+                  (isAsync ? (val as AntdLabeledValue)?.value : val),
+              )
+            ) {
+              if (isAsync) {
+                const labelValue = val as AntdLabeledValue;
+                topOptions.push({
+                  label: labelValue.label,
+                  value: labelValue.value,
+                });
+              } else {
+                const value = val as string | number;
+                topOptions.push({ label: String(value), value });
+              }
+            }
+          });
+        }
 
-    // Make multi-select sortable as per https://react-select.netlify.app/advanced
-    if (shouldAllowSort) {
-      components.MultiValue = getSortableMultiValue(
-        components.MultiValue || defaultComponents.MultiValue,
-      );
+        const sortedOptions = [...topOptions, ...otherOptions];
+        if (!isEqual(sortedOptions, selectOptions)) {
+          setSelectOptions(sortedOptions);
+        }
+      }
+    },
+    [isAsync, isSingleMode, selectOptions],
+  );
+
+  const handleOnSelect = (
+    selectedValue: string | number | AntdLabeledValue,
+  ) => {
+    if (isSingleMode) {
+      setSelectValue(selectedValue);
+    } else {
+      const currentSelected = selectValue
+        ? Array.isArray(selectValue)
+          ? selectValue
+          : [selectValue]
+        : [];
+      if (
+        typeof selectedValue === 'number' ||
+        typeof selectedValue === 'string'
+      ) {
+        setSelectValue([
+          ...(currentSelected as (string | number)[]),
+          selectedValue as string | number,
+        ]);
+      } else {
+        setSelectValue([
+          ...(currentSelected as AntdLabeledValue[]),
+          selectedValue as AntdLabeledValue,
+        ]);
+      }
+    }
+    setSearchedValue('');
+  };
+
+  const handleOnDeselect = (value: string | number | AntdLabeledValue) => {
+    if (Array.isArray(selectValue)) {
+      if (typeof value === 'number' || typeof value === 'string') {
+        const array = selectValue as (string | number)[];
+        setSelectValue(array.filter(element => element !== value));
+      } else {
+        const array = selectValue as AntdLabeledValue[];
+        setSelectValue(array.filter(element => element.value !== value.value));
+      }
+    }
+    setSearchedValue('');
+  };
+
+  const onError = (response: Response) =>
+    getClientErrorObject(response).then(e => {
+      const { error } = e;
+      setError(error);
+    });
+
+  const handleData = (data: OptionsType) => {
+    if (data && Array.isArray(data) && data.length) {
+      // merges with existing and creates unique options
+      setSelectOptions(prevOptions => [
+        ...prevOptions,
+        ...data.filter(
+          newOpt =>
+            !prevOptions.find(prevOpt => prevOpt.value === newOpt.value),
+        ),
+      ]);
+    }
+  };
 
-      const sortableContainerProps: Partial<SortableContainerProps> = {
-        getHelperDimensions: ({ node }) => node.getBoundingClientRect(),
-        axis: 'xy',
-        onSortEnd: ({ oldIndex, newIndex }) => {
-          const newValue = arrayMove(value, oldIndex, newIndex);
-          if (restProps.onChange) {
-            restProps.onChange(newValue, { action: 'set-value' });
+  const handlePaginatedFetch = useMemo(
+    () => (value: string, page: number, pageSize: number) => {
+      const key = `${value};${page};${pageSize}`;
+      const cachedCount = fetchedQueries.current.get(key);
+      if (cachedCount) {
+        setTotalCount(cachedCount);
+        return;
+      }
+      setLoading(true);
+      const fetchOptions = options as OptionsPagePromise;
+      fetchOptions(value, page, pageSize)
+        .then(({ data, totalCount }: OptionsTypePage) => {
+          handleData(data);
+          fetchedQueries.current.set(key, totalCount);
+          setTotalCount(totalCount);
+        })
+        .catch(onError)
+        .finally(() => setLoading(false));
+    },
+    [options],
+  );
+
+  const handleOnSearch = useMemo(
+    () =>
+      debounce((search: string) => {
+        const searchValue = search.trim();
+        // enables option creation
+        if (allowNewOptions && isSingleMode) {
+          const firstOption =
+            selectOptions.length > 0 && selectOptions[0].value;
+          // replaces the last search value entered with the new one
+          // only when the value wasn't part of the original options
+          if (
+            searchValue &&
+            firstOption === searchedValue &&
+            !initialOptions.find(o => o.value === searchedValue)
+          ) {
+            selectOptions.shift();
+            setSelectOptions(selectOptions);
+          }
+          if (searchValue && !hasOption(searchValue, selectOptions)) {
+            const newOption = {
+              label: searchValue,
+              value: searchValue,
+            };
+            // adds a custom option
+            const newOptions = [...selectOptions, newOption];
+            setSelectOptions(newOptions);
+            setSelectValue(searchValue);
           }
-        },
-        distance: 4,
-      };
-      Object.assign(restProps, sortableContainerProps);
+        }
+        setSearchedValue(searchValue);
+      }, DEBOUNCE_TIMEOUT),
+    [
+      allowNewOptions,
+      initialOptions,
+      isSingleMode,
+      searchedValue,
+      selectOptions,
+    ],
+  );
+
+  const handlePagination = (e: UIEvent<HTMLElement>) => {
+    const vScroll = e.currentTarget;
+    const thresholdReached =
+      vScroll.scrollTop > (vScroll.scrollHeight - vScroll.offsetHeight) * 0.7;
+    const hasMoreData = page * pageSize + pageSize < totalCount;
+
+    if (!isLoading && isAsync && hasMoreData && thresholdReached) {
+      const newPage = page + 1;
+      handlePaginatedFetch(searchedValue, newPage, pageSize);
+      setPage(newPage);
     }
+  };
 
-    // When values are rendered as labels, adjust valueContainer padding
-    const valueRenderedAsLabel =
-      valueRenderedAsLabel_ === undefined ? isMulti : valueRenderedAsLabel_;
-    if (valueRenderedAsLabel && !stylesConfig.valueContainer) {
-      Object.assign(stylesConfig, VALUE_LABELED_STYLES);
+  const handleFilterOption = (search: string, option: AntdLabeledValue) => {
+    if (typeof filterOption === 'function') {
+      return filterOption(search, option);
     }
 
-    // Handle onPaste event
-    if (onPaste) {
-      const Input =
-        (components.Input as SelectComponentsType['Input']) ||
-        (defaultComponents.Input as SelectComponentsType['Input']);
-      components.Input = (props: InputProps) => (
-        <Input {...props} onPaste={onPaste} />
+    if (filterOption) {
+      const searchValue = search.trim().toLowerCase();
+      const { value, label } = option;
+      const valueText = String(value);
+      const labelText = String(label);
+      return (
+        valueText.toLowerCase().includes(searchValue) ||
+        labelText.toLowerCase().includes(searchValue)
       );
     }
-    // for CreaTable
-    if (SelectComponent === WindowedCreatableSelect) {
-      restProps.getNewOptionData = (inputValue: string, label: string) => ({
-        label: label || inputValue,
-        [valueKey]: inputValue,
-        isNew: true,
-      });
+
+    return false;
+  };
+
+  const handleOnDropdownVisibleChange = (isDropdownVisible: boolean) => {
+    setIsDropdownVisible(isDropdownVisible);
+
+    if (isAsync && !loadingEnabled) {
+      setLoadingEnabled(true);
     }
 
-    // handle forcing dropdown overflow
-    // use only when setting overflow:visible isn't possible on the container element
-    if (forceOverflow) {
-      Object.assign(restProps, {
-        closeMenuOnScroll: (e: Event) => {
-          const target = e.target as HTMLElement;
-          return target && !target.classList?.contains('Select__menu-list');
-        },
-        menuPosition: 'fixed',
-      });
+    // multiple or tags mode keep the dropdown visible while selecting options
+    // this waits for the dropdown to be closed before sorting the top options
+    if (!isSingleMode && !isDropdownVisible) {
+      handleTopOptions(selectValue);
     }
+  };
 
-    // Make sure always return StateManager for the refs.
-    // To get the real `Select` component, keep tap into `obj.select`:
-    //   - for normal <Select /> component: StateManager -> Select,
-    //   - for <Creatable />: StateManager -> Creatable -> Select
-    const setRef = (instance: any) => {
-      stateManager =
-        shouldAllowSort && instance && 'refs' in instance
-          ? instance.refs.wrappedInstance // obtain StateManger from SortableContainer
-          : instance;
-      if (typeof selectRef === 'function') {
-        selectRef(stateManager);
-      } else if (selectRef && 'current' in selectRef) {
-        selectRef.current = stateManager;
-      }
-    };
-
-    const theme = useTheme();
-
-    return (
-      <MaybeSortableSelect
-        ref={setRef}
-        className={className}
-        classNamePrefix={classNamePrefix}
-        isMulti={isMulti}
-        isClearable={isClearable}
-        options={options}
-        value={value}
-        minMenuHeight={minMenuHeight}
-        maxMenuHeight={maxMenuHeight}
-        filterOption={
-          // filterOption may be NULL
-          filterOption !== undefined
-            ? filterOption
-            : createFilter({ ignoreAccents })
-        }
-        styles={{ ...DEFAULT_STYLES, ...stylesConfig } as SelectProps['styles']}
-        // merge default theme from `react-select`, default theme for Superset,
-        // and the theme from props.
-        theme={reactSelectTheme =>
-          merge(reactSelectTheme, defaultTheme(theme), themeConfig)
+  useEffect(() => {
+    const allowFetch = !fetchOnlyOnSearch || searchedValue;
+    if (isAsync && loadingEnabled && allowFetch) {
+      const page = 0;
+      handlePaginatedFetch(searchedValue, page, pageSize);
+      setPage(page);
+    }
+  }, [
+    isAsync,
+    searchedValue,
+    pageSize,
+    handlePaginatedFetch,
+    loadingEnabled,
+    fetchOnlyOnSearch,
+  ]);
+
+  useEffect(() => {
+    if (isSingleMode) {
+      handleTopOptions(selectValue);
+    }
+  }, [handleTopOptions, isSingleMode, selectValue]);
+
+  const dropdownRender = (
+    originNode: ReactElement & { ref?: RefObject<HTMLElement> },
+  ) => {
+    if (!isDropdownVisible) {
+      originNode.ref?.current?.scrollTo({ top: 0 });
+    }
+    return error ? <Error error={error} /> : originNode;
+  };
+
+  const SuffixIcon = () => {
+    if (isLoading) {
+      return <StyledSpin size="small" />;
+    }
+    if (shouldShowSearch && isDropdownVisible) {
+      return <SearchOutlined />;
+    }
+    return <DownOutlined />;
+  };
+
+  return (
+    <StyledContainer>
+      {header}
+      <StyledSelect
+        aria-label={ariaLabel || name}
+        dropdownRender={dropdownRender}
+        filterOption={handleFilterOption}
+        getPopupContainer={triggerNode => triggerNode.parentNode}
+        labelInValue={isAsync}
+        maxTagCount={MAX_TAG_COUNT}
+        mode={mappedMode}
+        onDeselect={handleOnDeselect}
+        onDropdownVisibleChange={handleOnDropdownVisibleChange}
+        onPopupScroll={isAsync ? handlePagination : undefined}
+        onSearch={shouldShowSearch ? handleOnSearch : undefined}
+        onSelect={handleOnSelect}
+        onClear={() => setSelectValue(undefined)}
+        options={selectOptions}
+        placeholder={placeholder}
+        showSearch={shouldShowSearch}
+        showArrow
+        tokenSeparators={TOKEN_SEPARATORS}
+        value={selectValue}
+        suffixIcon={<SuffixIcon />}
+        menuItemSelectedIcon={
+          invertSelection ? (
+            <StyledStopOutlined iconSize="m" />
+          ) : (
+            <StyledCheckOutlined iconSize="m" />
+          )
         }
-        formatOptionLabel={formatOptionLabel}
-        getOptionLabel={getOptionLabel}
-        getOptionValue={getOptionValue}
-        components={components}
-        {...restProps}
+        {...props}
       />
-    );
-  }
-
-  // React.memo makes sure the component does no rerender given the same props
-  return React.memo(StyledSelect);
-}
+    </StyledContainer>
+  );
+};
 
-export const Select = styled(WindowedSelect);
-export const AsyncSelect = styled(WindowedAsyncSelect);
-export const CreatableSelect = styled(WindowedCreatableSelect);
-export const AsyncCreatableSelect = styled(WindowedAsyncCreatableSelect);
-export const PaginatedSelect = withAsyncPaginate(
-  styled<OptionTypeBase, ComponentType<SelectProps<OptionTypeBase>>>(
-    BasicSelect,
-  ),
-);
 export default Select;
diff --git a/superset-frontend/src/components/Select/index.ts b/superset-frontend/src/components/Select/index.ts
index 009e8edf220b..e8f30eb7e4cb 100644
--- a/superset-frontend/src/components/Select/index.ts
+++ b/superset-frontend/src/components/Select/index.ts
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-export * from './Select';
+export * from './DeprecatedSelect';
 export * from './styles';
-export { default } from './Select';
+export { default } from './DeprecatedSelect';
 export { default as OnPasteSelect } from './OnPasteSelect';
 export { NativeSelect, NativeGraySelect } from './NativeSelect';
diff --git a/superset-frontend/src/components/Select/styles.tsx b/superset-frontend/src/components/Select/styles.tsx
index b1603e6473e1..015c9bbc471f 100644
--- a/superset-frontend/src/components/Select/styles.tsx
+++ b/superset-frontend/src/components/Select/styles.tsx
@@ -30,7 +30,7 @@ import { Props as SelectProps } from 'react-select/src/Select';
 import { colors as reactSelectColors } from 'react-select/src/theme';
 import { DeepNonNullable } from 'react-select/src/components';
 import { OptionType } from 'antd/lib/select';
-import { SupersetStyledSelectProps } from './Select';
+import { SupersetStyledSelectProps } from './DeprecatedSelect';
 
 export const DEFAULT_CLASS_NAME = 'Select';
 export const DEFAULT_CLASS_NAME_PREFIX = 'Select';
diff --git a/superset-frontend/src/components/Select/utils.ts b/superset-frontend/src/components/Select/utils.ts
index 497791b62d75..54a7caf9b18d 100644
--- a/superset-frontend/src/components/Select/utils.ts
+++ b/superset-frontend/src/components/Select/utils.ts
@@ -23,6 +23,8 @@ import {
   GroupedOptionsType,
 } from 'react-select';
 
+import { OptionsType as AntdOptionsType } from './Select';
+
 /**
  * Find Option value that matches a possibly string value.
  *
@@ -57,3 +59,16 @@ export function findValue<OptionType extends OptionTypeBase>(
   // empty: https://github.com/JedWatson/react-select/blob/32ad5c040bdd96cd1ca71010c2558842d684629c/packages/react-select/src/utils.js#L64
   return (Array.isArray(value) ? value : [value]).map(find);
 }
+
+export function hasOption(search: string, options: AntdOptionsType) {
+  const searchOption = search.trim().toLowerCase();
+  return options.find(opt => {
+    const { label, value } = opt;
+    const labelText = String(label);
+    const valueText = String(value);
+    return (
+      valueText.toLowerCase().includes(searchOption) ||
+      labelText.toLowerCase().includes(searchOption)
+    );
+  });
+}
diff --git a/superset-frontend/src/components/SupersetResourceSelect/SupersetResourceSelect.test.tsx b/superset-frontend/src/components/SupersetResourceSelect/SupersetResourceSelect.test.tsx
deleted file mode 100644
index ad5d688030ab..000000000000
--- a/superset-frontend/src/components/SupersetResourceSelect/SupersetResourceSelect.test.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import React from 'react';
-import { render, screen } from 'spec/helpers/testing-library';
-import userEvent from '@testing-library/user-event';
-import fetchMock from 'fetch-mock';
-import SupersetResourceSelect from '.';
-
-const mockedProps = {
-  resource: 'dataset',
-  searchColumn: 'table_name',
-  onError: () => {},
-};
-
-fetchMock.get('glob:*/api/v1/dataset/?q=*', {});
-
-test('should render', () => {
-  const { container } = render(<SupersetResourceSelect {...mockedProps} />);
-  expect(container).toBeInTheDocument();
-});
-
-test('should render the Select... placeholder', () => {
-  render(<SupersetResourceSelect {...mockedProps} />);
-  expect(screen.getByText('Select...')).toBeInTheDocument();
-});
-
-test('should render the Loading... message', () => {
-  render(<SupersetResourceSelect {...mockedProps} />);
-  const select = screen.getByText('Select...');
-  userEvent.click(select);
-  expect(screen.getByText('Loading...')).toBeInTheDocument();
-});
-
-test('should render the No options message', async () => {
-  render(<SupersetResourceSelect {...mockedProps} />);
-  const select = screen.getByText('Select...');
-  userEvent.click(select);
-  expect(await screen.findByText('No options')).toBeInTheDocument();
-});
-
-test('should render the typed text', async () => {
-  render(<SupersetResourceSelect {...mockedProps} />);
-  const select = screen.getByText('Select...');
-  userEvent.click(select);
-  userEvent.type(select, 'typed text');
-  expect(await screen.findByText('typed text')).toBeInTheDocument();
-});
diff --git a/superset-frontend/src/components/SupersetResourceSelect/index.tsx b/superset-frontend/src/components/SupersetResourceSelect/index.tsx
deleted file mode 100644
index d11b365059e9..000000000000
--- a/superset-frontend/src/components/SupersetResourceSelect/index.tsx
+++ /dev/null
@@ -1,121 +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 React, { useEffect } from 'react';
-import rison from 'rison';
-import { SupersetClient } from '@superset-ui/core';
-import { AsyncSelect } from 'src/components/Select';
-import {
-  ClientErrorObject,
-  getClientErrorObject,
-} from 'src/utils/getClientErrorObject';
-import { cacheWrapper } from 'src/utils/cacheWrapper';
-
-export type Value<V> = { value: V; label: string };
-
-export interface SupersetResourceSelectProps<T = unknown, V = string> {
-  value?: Value<V> | null;
-  initialId?: number | string;
-  onChange?: (value?: Value<V>) => void;
-  isMulti?: boolean;
-  searchColumn?: string;
-  resource?: string; // e.g. "dataset", "dashboard/related/owners"
-  transformItem?: (item: T) => Value<V>;
-  onError: (error: ClientErrorObject) => void;
-  defaultOptions?: { value: number; label: string }[] | boolean;
-}
-
-/**
- * This is a special-purpose select component for when you're selecting
- * items from one of the standard Superset resource APIs.
- * Such as selecting a datasource, a chart, or users.
- *
- * If you're selecting a "related" resource (such as dashboard/related/owners),
- * leave the searchColumn prop unset.
- * The api doesn't do columns on related resources for some reason.
- *
- * If you're doing anything more complex than selecting a standard resource,
- * we'll all be better off if you use AsyncSelect directly instead.
- */
-
-const localCache = new Map<string, any>();
-
-export const cachedSupersetGet = cacheWrapper(
-  SupersetClient.get,
-  localCache,
-  ({ endpoint }) => endpoint || '',
-);
-
-export default function SupersetResourceSelect<T, V>({
-  value,
-  initialId,
-  onChange,
-  isMulti,
-  resource,
-  searchColumn,
-  transformItem,
-  onError,
-  defaultOptions = true,
-}: SupersetResourceSelectProps<T, V>) {
-  useEffect(() => {
-    if (initialId == null) return;
-    cachedSupersetGet({
-      endpoint: `/api/v1/${resource}/${initialId}`,
-    })
-      .then(response => {
-        const { result } = response.json;
-        const value = transformItem ? transformItem(result) : result;
-        if (onChange) onChange(value);
-      })
-      .catch(response => {
-        if (response?.status === 404 && onChange) onChange(undefined);
-      });
-  }, [resource, initialId]); // eslint-disable-line react-hooks/exhaustive-deps
-
-  function loadOptions(input: string) {
-    const query = searchColumn
-      ? rison.encode({
-          filters: [{ col: searchColumn, opr: 'ct', value: input }],
-        })
-      : rison.encode({ filter: value });
-    return cachedSupersetGet({
-      endpoint: `/api/v1/${resource}/?q=${query}`,
-    }).then(
-      response =>
-        response.json.result
-          .map(transformItem)
-          .sort((a: Value<V>, b: Value<V>) => a.label.localeCompare(b.label)),
-      async badResponse => {
-        onError(await getClientErrorObject(badResponse));
-        return [];
-      },
-    );
-  }
-
-  return (
-    <AsyncSelect
-      value={value}
-      onChange={onChange}
-      isMulti={isMulti}
-      loadOptions={loadOptions}
-      defaultOptions={defaultOptions} // true - load options on render
-      cacheOptions
-      filterOption={null} // options are filtered at the api
-    />
-  );
-}
diff --git a/superset-frontend/src/components/TableSelector/TableSelector.test.jsx b/superset-frontend/src/components/TableSelector/TableSelector.test.jsx
deleted file mode 100644
index e1fa66b70709..000000000000
--- a/superset-frontend/src/components/TableSelector/TableSelector.test.jsx
+++ /dev/null
@@ -1,291 +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 React from 'react';
-import configureStore from 'redux-mock-store';
-import { mount } from 'enzyme';
-import { act } from 'react-dom/test-utils';
-import sinon from 'sinon';
-import fetchMock from 'fetch-mock';
-import thunk from 'redux-thunk';
-import { supersetTheme, ThemeProvider } from '@superset-ui/core';
-
-import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint';
-
-import DatabaseSelector from 'src/components/DatabaseSelector';
-import TableSelector from 'src/components/TableSelector';
-import { initialState, tables } from 'spec/javascripts/sqllab/fixtures';
-
-const mockStore = configureStore([thunk]);
-const store = mockStore(initialState);
-
-const FETCH_SCHEMAS_ENDPOINT = 'glob:*/api/v1/database/*/schemas/*';
-const GET_TABLE_ENDPOINT = 'glob:*/superset/tables/1/*/*';
-const GET_TABLE_NAMES_ENDPOINT = 'glob:*/superset/tables/1/main/*';
-
-const mockedProps = {
-  clearable: false,
-  database: { id: 1, database_name: 'main' },
-  dbId: 1,
-  formMode: false,
-  getDbList: sinon.stub(),
-  handleError: sinon.stub(),
-  horizontal: false,
-  onChange: sinon.stub(),
-  onDbChange: sinon.stub(),
-  onSchemaChange: sinon.stub(),
-  onTableChange: sinon.stub(),
-  sqlLabMode: true,
-  tableName: '',
-  tableNameSticky: true,
-};
-
-const schemaOptions = {
-  result: ['main', 'erf', 'superset'],
-};
-const selectedSchema = { label: 'main', title: 'main', value: 'main' };
-const selectedTable = {
-  extra: null,
-  label: 'birth_names',
-  schema: 'main',
-  title: 'birth_names',
-  type: undefined,
-  value: 'birth_names',
-};
-
-async function mountAndWait(props = mockedProps) {
-  const mounted = mount(<TableSelector {...props} />, {
-    context: { store },
-    wrappingComponent: ThemeProvider,
-    wrappingComponentProps: { theme: supersetTheme },
-  });
-  await waitForComponentToPaint(mounted);
-
-  return mounted;
-}
-
-describe('TableSelector', () => {
-  let wrapper;
-
-  beforeEach(async () => {
-    fetchMock.reset();
-    wrapper = await mountAndWait();
-  });
-
-  it('renders', () => {
-    expect(wrapper.find(TableSelector)).toExist();
-    expect(wrapper.find(DatabaseSelector)).toExist();
-  });
-
-  describe('change database', () => {
-    afterEach(fetchMock.resetHistory);
-    afterAll(fetchMock.reset);
-
-    it('should fetch schemas', async () => {
-      fetchMock.get(FETCH_SCHEMAS_ENDPOINT, { overwriteRoutes: true });
-      act(() => {
-        wrapper.find('[data-test="select-database"]').first().props().onChange({
-          id: 1,
-          database_name: 'main',
-        });
-      });
-      await waitForComponentToPaint(wrapper);
-      expect(fetchMock.calls(FETCH_SCHEMAS_ENDPOINT)).toHaveLength(1);
-    });
-
-    it('should fetch schema options', async () => {
-      fetchMock.get(FETCH_SCHEMAS_ENDPOINT, schemaOptions, {
-        overwriteRoutes: true,
-      });
-      act(() => {
-        wrapper.find('[data-test="select-database"]').first().props().onChange({
-          id: 1,
-          database_name: 'main',
-        });
-      });
-      await waitForComponentToPaint(wrapper);
-      wrapper.update();
-      expect(fetchMock.calls(FETCH_SCHEMAS_ENDPOINT)).toHaveLength(1);
-
-      expect(
-        wrapper.find('[name="select-schema"]').first().props().options,
-      ).toEqual([
-        { value: 'main', label: 'main', title: 'main' },
-        { value: 'erf', label: 'erf', title: 'erf' },
-        { value: 'superset', label: 'superset', title: 'superset' },
-      ]);
-    });
-
-    it('should clear table options', async () => {
-      act(() => {
-        wrapper.find('[data-test="select-database"]').first().props().onChange({
-          id: 1,
-          database_name: 'main',
-        });
-      });
-      await waitForComponentToPaint(wrapper);
-      const props = wrapper.find('[name="async-select-table"]').first().props();
-      expect(props.isDisabled).toBe(true);
-      expect(props.value).toEqual(undefined);
-    });
-  });
-
-  describe('change schema', () => {
-    beforeEach(async () => {
-      fetchMock.get(FETCH_SCHEMAS_ENDPOINT, schemaOptions, {
-        overwriteRoutes: true,
-      });
-    });
-
-    afterEach(fetchMock.resetHistory);
-    afterAll(fetchMock.reset);
-
-    it('should fetch table', async () => {
-      fetchMock.get(GET_TABLE_NAMES_ENDPOINT, { overwriteRoutes: true });
-      act(() => {
-        wrapper.find('[data-test="select-database"]').first().props().onChange({
-          id: 1,
-          database_name: 'main',
-        });
-      });
-      await waitForComponentToPaint(wrapper);
-      act(() => {
-        wrapper
-          .find('[name="select-schema"]')
-          .first()
-          .props()
-          .onChange(selectedSchema);
-      });
-      await waitForComponentToPaint(wrapper);
-      expect(fetchMock.calls(GET_TABLE_NAMES_ENDPOINT)).toHaveLength(1);
-    });
-
-    it('should fetch table options', async () => {
-      fetchMock.get(GET_TABLE_NAMES_ENDPOINT, tables, {
-        overwriteRoutes: true,
-      });
-      act(() => {
-        wrapper.find('[data-test="select-database"]').first().props().onChange({
-          id: 1,
-          database_name: 'main',
-        });
-      });
-      await waitForComponentToPaint(wrapper);
-      act(() => {
-        wrapper
-          .find('[name="select-schema"]')
-          .first()
-          .props()
-          .onChange(selectedSchema);
-      });
-      await waitForComponentToPaint(wrapper);
-      expect(
-        wrapper.find('[name="select-schema"]').first().props().value[0],
-      ).toEqual(selectedSchema);
-      expect(fetchMock.calls(GET_TABLE_NAMES_ENDPOINT)).toHaveLength(1);
-      const { options } = wrapper.find('[name="select-table"]').first().props();
-      expect({ options }).toEqual(tables);
-    });
-  });
-
-  describe('change table', () => {
-    beforeEach(async () => {
-      fetchMock.get(GET_TABLE_NAMES_ENDPOINT, tables, {
-        overwriteRoutes: true,
-      });
-    });
-
-    it('should change table value', async () => {
-      act(() => {
-        wrapper
-          .find('[name="select-schema"]')
-          .first()
-          .props()
-          .onChange(selectedSchema);
-      });
-      await waitForComponentToPaint(wrapper);
-      act(() => {
-        wrapper
-          .find('[name="select-table"]')
-          .first()
-          .props()
-          .onChange(selectedTable);
-      });
-      await waitForComponentToPaint(wrapper);
-      expect(
-        wrapper.find('[name="select-table"]').first().props().value,
-      ).toEqual('birth_names');
-    });
-
-    it('should call onTableChange with schema from table object', async () => {
-      act(() => {
-        wrapper
-          .find('[name="select-schema"]')
-          .first()
-          .props()
-          .onChange(selectedSchema);
-      });
-      await waitForComponentToPaint(wrapper);
-      act(() => {
-        wrapper
-          .find('[name="select-table"]')
-          .first()
-          .props()
-          .onChange(selectedTable);
-      });
-      await waitForComponentToPaint(wrapper);
-      expect(mockedProps.onTableChange.getCall(0).args[0]).toBe('birth_names');
-      expect(mockedProps.onTableChange.getCall(0).args[1]).toBe('main');
-    });
-  });
-
-  describe('getTableNamesBySubStr', () => {
-    afterEach(fetchMock.resetHistory);
-    afterAll(fetchMock.reset);
-
-    it('should handle empty', async () => {
-      act(() => {
-        wrapper
-          .find('[name="async-select-table"]')
-          .first()
-          .props()
-          .loadOptions();
-      });
-      await waitForComponentToPaint(wrapper);
-      const props = wrapper.find('[name="async-select-table"]').first().props();
-      expect(props.isDisabled).toBe(true);
-      expect(props.value).toEqual('');
-    });
-
-    it('should handle table name', async () => {
-      wrapper.setProps({ schema: 'main' });
-      fetchMock.get(GET_TABLE_ENDPOINT, tables, {
-        overwriteRoutes: true,
-      });
-      act(() => {
-        wrapper
-          .find('[name="async-select-table"]')
-          .first()
-          .props()
-          .loadOptions();
-      });
-      await waitForComponentToPaint(wrapper);
-      expect(fetchMock.calls(GET_TABLE_ENDPOINT)).toHaveLength(1);
-    });
-  });
-});
diff --git a/superset-frontend/src/components/TableSelector/TableSelector.test.tsx b/superset-frontend/src/components/TableSelector/TableSelector.test.tsx
new file mode 100644
index 000000000000..3b8b61715399
--- /dev/null
+++ b/superset-frontend/src/components/TableSelector/TableSelector.test.tsx
@@ -0,0 +1,91 @@
+/**
+ * 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 React from 'react';
+import { render, screen, waitFor } from 'spec/helpers/testing-library';
+import { SupersetClient } from '@superset-ui/core';
+import userEvent from '@testing-library/user-event';
+import TableSelector from '.';
+
+const SupersetClientGet = jest.spyOn(SupersetClient, 'get');
+
+const createProps = () => ({
+  dbId: 1,
+  schema: 'test_schema',
+  handleError: jest.fn(),
+});
+
+beforeAll(() => {
+  SupersetClientGet.mockImplementation(
+    async () =>
+      ({
+        json: {
+          options: [
+            { label: 'table_a', value: 'table_a' },
+            { label: 'table_b', value: 'table_b' },
+          ],
+        },
+      } as any),
+  );
+});
+
+test('renders with default props', async () => {
+  const props = createProps();
+  render(<TableSelector {...props} />);
+  const databaseSelect = screen.getByRole('combobox', {
+    name: 'Select a database',
+  });
+  const schemaSelect = screen.getByRole('combobox', {
+    name: 'Select a database',
+  });
+  const tableSelect = screen.getByRole('combobox', {
+    name: 'Select a table',
+  });
+  await waitFor(() => {
+    expect(databaseSelect).toBeInTheDocument();
+    expect(schemaSelect).toBeInTheDocument();
+    expect(tableSelect).toBeInTheDocument();
+  });
+});
+
+test('renders table options', async () => {
+  const props = createProps();
+  render(<TableSelector {...props} />);
+  const tableSelect = screen.getByRole('combobox', {
+    name: 'Select a table',
+  });
+  userEvent.click(tableSelect);
+  expect(
+    await screen.findByRole('option', { name: 'table_a' }),
+  ).toBeInTheDocument();
+  expect(
+    await screen.findByRole('option', { name: 'table_b' }),
+  ).toBeInTheDocument();
+});
+
+test('renders disabled without schema', async () => {
+  const props = createProps();
+  render(<TableSelector {...props} schema={undefined} />);
+  const tableSelect = screen.getByRole('combobox', {
+    name: 'Select a table',
+  });
+  await waitFor(() => {
+    expect(tableSelect).toBeDisabled();
+  });
+});
diff --git a/superset-frontend/src/components/TableSelector/index.tsx b/superset-frontend/src/components/TableSelector/index.tsx
index 56d3b2157294..5f68a94dfe56 100644
--- a/superset-frontend/src/components/TableSelector/index.tsx
+++ b/superset-frontend/src/components/TableSelector/index.tsx
@@ -18,53 +18,49 @@
  */
 import React, {
   FunctionComponent,
-  useEffect,
   useState,
   ReactNode,
+  useMemo,
+  useEffect,
 } from 'react';
 import { styled, SupersetClient, t } from '@superset-ui/core';
-import { AsyncSelect, CreatableSelect, Select } from 'src/components/Select';
-
+import { Select } from 'src/components';
 import { FormLabel } from 'src/components/Form';
-
+import Icons from 'src/components/Icons';
 import DatabaseSelector from 'src/components/DatabaseSelector';
 import RefreshLabel from 'src/components/RefreshLabel';
 import CertifiedIcon from 'src/components/CertifiedIcon';
 import WarningIconWithTooltip from 'src/components/WarningIconWithTooltip';
 
-const FieldTitle = styled.p`
-  color: ${({ theme }) => theme.colors.secondary.light2};
-  font-size: ${({ theme }) => theme.typography.sizes.s}px;
-  margin: 20px 0 10px 0;
-  text-transform: uppercase;
-`;
-
 const TableSelectorWrapper = styled.div`
-  .fa-refresh {
-    padding-left: 9px;
-  }
+  ${({ theme }) => `
+    .refresh {
+      display: flex;
+      align-items: center;
+      width: 30px;
+      margin-left: ${theme.gridUnit}px;
+      margin-top: ${theme.gridUnit * 5}px;
+    }
 
-  .refresh-col {
-    display: flex;
-    align-items: center;
-    width: 30px;
-    margin-left: ${({ theme }) => theme.gridUnit}px;
-  }
+    .section {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+    }
 
-  .section {
-    padding-bottom: 5px;
-    display: flex;
-    flex-direction: row;
-  }
+    .divider {
+      border-bottom: 1px solid ${theme.colors.secondary.light5};
+      margin: 15px 0;
+    }
 
-  .select {
-    flex-grow: 1;
-  }
+    .table-length {
+      color: ${theme.colors.grayscale.light1};
+    }
 
-  .divider {
-    border-bottom: 1px solid ${({ theme }) => theme.colors.secondary.light5};
-    margin: 15px 0;
-  }
+    .select {
+      flex: 1;
+    }
+  `}
 `;
 
 const TableLabel = styled.span`
@@ -72,8 +68,8 @@ const TableLabel = styled.span`
   display: flex;
   white-space: nowrap;
 
-  > svg,
-  > small {
+  svg,
+  small {
     margin-right: ${({ theme }) => theme.gridUnit}px;
   }
 `;
@@ -86,7 +82,7 @@ interface TableSelectorProps {
   getDbList?: (arg0: any) => {};
   handleError: (msg: string) => void;
   isDatabaseSelectEnabled?: boolean;
-  onChange?: ({
+  onUpdate?: ({
     dbId,
     schema,
   }: {
@@ -94,7 +90,15 @@ interface TableSelectorProps {
     schema?: string;
     tableName?: string;
   }) => void;
-  onDbChange?: (db: any) => void;
+  onDbChange?: (
+    db:
+      | {
+          id: number;
+          database_name: string;
+          backend: string;
+        }
+      | undefined,
+  ) => void;
   onSchemaChange?: (arg0?: any) => {};
   onSchemasLoad?: () => void;
   onTableChange?: (tableName: string, schema: string) => void;
@@ -106,6 +110,52 @@ interface TableSelectorProps {
   tableNameSticky?: boolean;
 }
 
+interface Table {
+  label: string;
+  value: string;
+  type: string;
+  extra?: {
+    certification?: {
+      certified_by: string;
+      details: string;
+    };
+    warning_markdown?: string;
+  };
+}
+
+interface TableOption {
+  label: JSX.Element;
+  text: string;
+  value: string;
+}
+
+const TableOption = ({ table }: { table: Table }) => {
+  const { label, type, extra } = table;
+  return (
+    <TableLabel title={label}>
+      {type === 'view' ? (
+        <Icons.Eye iconSize="m" />
+      ) : (
+        <Icons.Table iconSize="m" />
+      )}
+      {extra?.certification && (
+        <CertifiedIcon
+          certifiedBy={extra.certification.certified_by}
+          details={extra.certification.details}
+          size="l"
+        />
+      )}
+      {extra?.warning_markdown && (
+        <WarningIconWithTooltip
+          warningMarkdown={extra.warning_markdown}
+          size="l"
+        />
+      )}
+      {label}
+    </TableLabel>
+  );
+};
+
 const TableSelector: FunctionComponent<TableSelectorProps> = ({
   database,
   dbId,
@@ -113,7 +163,7 @@ const TableSelector: FunctionComponent<TableSelectorProps> = ({
   getDbList,
   handleError,
   isDatabaseSelectEnabled = true,
-  onChange,
+  onUpdate,
   onDbChange,
   onSchemaChange,
   onSchemasLoad,
@@ -125,179 +175,187 @@ const TableSelector: FunctionComponent<TableSelectorProps> = ({
   tableName,
   tableNameSticky = true,
 }) => {
+  const [currentDbId, setCurrentDbId] = useState<number | undefined>(dbId);
   const [currentSchema, setCurrentSchema] = useState<string | undefined>(
     schema,
   );
-  const [currentTableName, setCurrentTableName] = useState<string | undefined>(
-    tableName,
-  );
-  const [tableLoading, setTableLoading] = useState(false);
-  const [tableOptions, setTableOptions] = useState([]);
-
-  function fetchTables(
-    databaseId?: number,
-    schema?: string,
-    forceRefresh = false,
-    substr = 'undefined',
-  ) {
-    const dbSchema = schema || currentSchema;
-    const actualDbId = databaseId || dbId;
-    if (actualDbId && dbSchema) {
-      const encodedSchema = encodeURIComponent(dbSchema);
-      const encodedSubstr = encodeURIComponent(substr);
-      setTableLoading(true);
-      setTableOptions([]);
+  const [currentTable, setCurrentTable] = useState<TableOption | undefined>();
+  const [refresh, setRefresh] = useState(0);
+  const [previousRefresh, setPreviousRefresh] = useState(0);
+
+  const loadTable = useMemo(
+    () => async (dbId: number, schema: string, tableName: string) => {
       const endpoint = encodeURI(
-        `/superset/tables/${actualDbId}/${encodedSchema}/${encodedSubstr}/${!!forceRefresh}/`,
+        `/superset/tables/${dbId}/${schema}/${encodeURIComponent(
+          tableName,
+        )}/false/true`,
       );
-      return SupersetClient.get({ endpoint })
-        .then(({ json }) => {
-          const options = json.options.map((o: any) => ({
-            value: o.value,
-            schema: o.schema,
-            label: o.label,
-            title: o.title,
-            type: o.type,
-            extra: o?.extra,
-          }));
-          setTableLoading(false);
-          setTableOptions(options);
+
+      if (previousRefresh !== refresh) {
+        setPreviousRefresh(refresh);
+      }
+
+      return SupersetClient.get({ endpoint }).then(({ json }) => {
+        const options = json.options as Table[];
+        if (options && options.length > 0) {
+          return options[0];
+        }
+        return null;
+      });
+    },
+    [], // eslint-disable-line react-hooks/exhaustive-deps
+  );
+
+  const loadTables = useMemo(
+    () => async (search: string) => {
+      const dbSchema = schema || currentSchema;
+      if (currentDbId && dbSchema) {
+        const encodedSchema = encodeURIComponent(dbSchema);
+        const encodedSubstr = encodeURIComponent(search || 'undefined');
+        const forceRefresh = refresh !== previousRefresh;
+        const endpoint = encodeURI(
+          `/superset/tables/${currentDbId}/${encodedSchema}/${encodedSubstr}/${forceRefresh}/`,
+        );
+
+        if (previousRefresh !== refresh) {
+          setPreviousRefresh(refresh);
+        }
+
+        return SupersetClient.get({ endpoint }).then(({ json }) => {
+          const options = json.options
+            .map((table: Table) => ({
+              value: table.value,
+              label: <TableOption table={table} />,
+              text: table.label,
+            }))
+            .sort((a: { text: string }, b: { text: string }) =>
+              a.text.localeCompare(b.text),
+            );
+
           if (onTablesLoad) {
             onTablesLoad(json.options);
           }
-        })
-        .catch(() => {
-          setTableLoading(false);
-          setTableOptions([]);
-          handleError(t('Error while fetching table list'));
+
+          return {
+            data: options,
+            totalCount: options.length,
+          };
         });
-    }
-    setTableLoading(false);
-    setTableOptions([]);
-    return Promise.resolve();
-  }
+      }
+      return { data: [], totalCount: 0 };
+    },
+    // We are using the refresh state to re-trigger the query
+    // previousRefresh should be out of dependencies array
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [currentDbId, currentSchema, onTablesLoad, schema, refresh],
+  );
 
   useEffect(() => {
-    if (dbId && schema) {
-      fetchTables();
+    async function fetchTable() {
+      if (schema && tableName) {
+        const table = await loadTable(dbId, schema, tableName);
+        if (table) {
+          setCurrentTable({
+            label: <TableOption table={table} />,
+            text: table.label,
+            value: table.value,
+          });
+        }
+      }
     }
-  }, [dbId, schema]);
+    fetchTable();
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
   function onSelectionChange({
     dbId,
     schema,
-    tableName,
+    table,
   }: {
     dbId: number;
     schema?: string;
-    tableName?: string;
+    table?: TableOption;
   }) {
-    setCurrentTableName(tableName);
+    setCurrentTable(table);
+    setCurrentDbId(dbId);
     setCurrentSchema(schema);
-    if (onChange) {
-      onChange({ dbId, schema, tableName });
-    }
-  }
-
-  function getTableNamesBySubStr(substr = 'undefined') {
-    if (!dbId || !substr) {
-      const options: any[] = [];
-      return Promise.resolve({ options });
+    if (onUpdate) {
+      onUpdate({ dbId, schema, tableName: table?.value });
     }
-    const encodedSchema = encodeURIComponent(schema || '');
-    const encodedSubstr = encodeURIComponent(substr);
-    return SupersetClient.get({
-      endpoint: encodeURI(
-        `/superset/tables/${dbId}/${encodedSchema}/${encodedSubstr}`,
-      ),
-    }).then(({ json }) => {
-      const options = json.options.map((o: any) => ({
-        value: o.value,
-        schema: o.schema,
-        label: o.label,
-        title: o.title,
-        type: o.type,
-      }));
-      return { options };
-    });
   }
 
-  function changeTable(tableOpt: any) {
-    if (!tableOpt) {
-      setCurrentTableName('');
+  function changeTable(table: TableOption) {
+    if (!table) {
+      setCurrentTable(undefined);
       return;
     }
-    const schemaName = tableOpt.schema;
-    const tableOptTableName = tableOpt.value;
-    if (tableNameSticky) {
+    const tableOptTableName = table.value;
+    if (currentDbId && tableNameSticky) {
       onSelectionChange({
-        dbId,
-        schema: schemaName,
-        tableName: tableOptTableName,
+        dbId: currentDbId,
+        schema: currentSchema,
+        table,
       });
     }
-    if (onTableChange) {
-      onTableChange(tableOptTableName, schemaName);
+    if (onTableChange && currentSchema) {
+      onTableChange(tableOptTableName, currentSchema);
     }
   }
 
-  function changeSchema(schemaOpt: any, force = false) {
-    const value = schemaOpt ? schemaOpt.value : null;
+  function onRefresh() {
     if (onSchemaChange) {
-      onSchemaChange(value);
+      onSchemaChange(currentSchema);
     }
-    onSelectionChange({
-      dbId,
-      schema: value,
-      tableName: undefined,
-    });
-    fetchTables(dbId, currentSchema, force);
-  }
-
-  function renderTableOption(option: any) {
-    return (
-      <TableLabel title={option.label}>
-        <small className="text-muted">
-          <i className={`fa fa-${option.type === 'view' ? 'eye' : 'table'}`} />
-        </small>
-        {option.extra?.certification && (
-          <CertifiedIcon
-            certifiedBy={option.extra.certification.certified_by}
-            details={option.extra.certification.details}
-            size={20}
-          />
-        )}
-        {option.extra?.warning_markdown && (
-          <WarningIconWithTooltip
-            warningMarkdown={option.extra.warning_markdown}
-            size={20}
-          />
-        )}
-        {option.label}
-      </TableLabel>
-    );
+    if (currentDbId && currentSchema) {
+      onSelectionChange({
+        dbId: currentDbId,
+        schema: currentSchema,
+        table: currentTable,
+      });
+    }
+    setRefresh(refresh + 1);
   }
 
   function renderSelectRow(select: ReactNode, refreshBtn: ReactNode) {
     return (
       <div className="section">
         <span className="select">{select}</span>
-        <span className="refresh-col">{refreshBtn}</span>
+        <span className="refresh">{refreshBtn}</span>
       </div>
     );
   }
 
+  const internalDbChange = (
+    db:
+      | {
+          id: number;
+          database_name: string;
+          backend: string;
+        }
+      | undefined,
+  ) => {
+    setCurrentDbId(db?.id);
+    if (onDbChange) {
+      onDbChange(db);
+    }
+  };
+
+  const internalSchemaChange = (schema?: string) => {
+    setCurrentSchema(schema);
+    if (onSchemaChange) {
+      onSchemaChange(schema);
+    }
+  };
+
   function renderDatabaseSelector() {
     return (
       <DatabaseSelector
-        dbId={dbId}
+        db={database}
         formMode={formMode}
         getDbList={getDbList}
-        getTableList={fetchTables}
         handleError={handleError}
-        onChange={onSelectionChange}
-        onDbChange={readOnly ? undefined : onDbChange}
-        onSchemaChange={readOnly ? undefined : onSchemaChange}
+        onUpdate={onSelectionChange}
+        onDbChange={readOnly ? undefined : internalDbChange}
+        onSchemaChange={readOnly ? undefined : internalSchemaChange}
         onSchemasLoad={onSchemasLoad}
         schema={currentSchema}
         sqlLabMode={sqlLabMode}
@@ -307,97 +365,54 @@ const TableSelector: FunctionComponent<TableSelectorProps> = ({
     );
   }
 
+  const handleFilterOption = useMemo(
+    () => (search: string, option: TableOption) => {
+      const searchValue = search.trim().toLowerCase();
+      const { text } = option;
+      return text.toLowerCase().includes(searchValue);
+    },
+    [],
+  );
+
   function renderTableSelect() {
-    const options = tableOptions;
-    let select = null;
-    if (currentSchema && !formMode) {
-      // dataset editor
-      select = (
-        <Select
-          name="select-table"
-          isLoading={tableLoading}
-          ignoreAccents={false}
-          placeholder={t('Select table or type table name')}
-          autosize={false}
-          onChange={changeTable}
-          options={options}
-          // @ts-ignore
-          value={currentTableName}
-          optionRenderer={renderTableOption}
-          valueRenderer={renderTableOption}
-          isDisabled={readOnly}
-        />
-      );
-    } else if (formMode) {
-      select = (
-        <CreatableSelect
-          name="select-table"
-          isLoading={tableLoading}
-          ignoreAccents={false}
-          placeholder={t('Select table or type table name')}
-          autosize={false}
-          onChange={changeTable}
-          options={options}
-          // @ts-ignore
-          value={currentTableName}
-          optionRenderer={renderTableOption}
-        />
-      );
-    } else {
-      // sql lab
-      let tableSelectPlaceholder;
-      let tableSelectDisabled = false;
-      if (database && database.allow_multi_schema_metadata_fetch) {
-        tableSelectPlaceholder = t('Type to search ...');
-      } else {
-        tableSelectPlaceholder = t('Select table ');
-        tableSelectDisabled = true;
-      }
-      select = (
-        <AsyncSelect
-          name="async-select-table"
-          placeholder={tableSelectPlaceholder}
-          isDisabled={tableSelectDisabled}
-          autosize={false}
-          onChange={changeTable}
-          // @ts-ignore
-          value={currentTableName}
-          loadOptions={getTableNamesBySubStr}
-          optionRenderer={renderTableOption}
-        />
-      );
-    }
+    const disabled =
+      (currentSchema && !formMode && readOnly) ||
+      (!currentSchema && !database?.allow_multi_schema_metadata_fetch);
+
+    const header = sqlLabMode ? (
+      <FormLabel>{t('See table schema')}</FormLabel>
+    ) : (
+      <FormLabel>{t('Table')}</FormLabel>
+    );
+
+    const select = (
+      <Select
+        ariaLabel={t('Select a table')}
+        disabled={disabled}
+        filterOption={handleFilterOption}
+        header={header}
+        name="select-table"
+        onChange={changeTable}
+        options={loadTables}
+        placeholder={t('Select a table')}
+        value={currentTable}
+      />
+    );
+
     const refresh = !formMode && !readOnly && (
       <RefreshLabel
-        onClick={() => changeSchema({ value: schema }, true)}
+        onClick={onRefresh}
         tooltipContent={t('Force refresh table list')}
       />
     );
-    return renderSelectRow(select, refresh);
-  }
 
-  function renderSeeTableLabel() {
-    return (
-      <div className="section">
-        <FormLabel>
-          {t('See table schema')}{' '}
-          {schema && (
-            <small>
-              {tableOptions.length} in
-              <i>{schema}</i>
-            </small>
-          )}
-        </FormLabel>
-      </div>
-    );
+    return renderSelectRow(select, refresh);
   }
 
   return (
     <TableSelectorWrapper>
       {renderDatabaseSelector()}
-      {!formMode && <div className="divider" />}
-      {sqlLabMode && renderSeeTableLabel()}
-      {formMode && <FieldTitle>{t('Table')}</FieldTitle>}
+      {sqlLabMode && !formMode && <div className="divider" />}
       {renderTableSelect()}
     </TableSelectorWrapper>
   );
diff --git a/superset-frontend/src/components/TableView/TableView.tsx b/superset-frontend/src/components/TableView/TableView.tsx
index bc3517f5bd90..ff3fee1cbacf 100644
--- a/superset-frontend/src/components/TableView/TableView.tsx
+++ b/superset-frontend/src/components/TableView/TableView.tsx
@@ -16,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React from 'react';
+import React, { useEffect } from 'react';
+import isEqual from 'lodash/isEqual';
 import { styled, t } from '@superset-ui/core';
 import { useFilters, usePagination, useSortBy, useTable } from 'react-table';
 import { Empty } from 'src/common/components';
 import { TableCollection, Pagination } from 'src/components/dataViewCommon';
-import { SortColumns } from './types';
+import { SortByType, ServerPagination } from './types';
 
 const DEFAULT_PAGE_SIZE = 10;
 
@@ -34,8 +35,11 @@ export interface TableViewProps {
   columns: any[];
   data: any[];
   pageSize?: number;
+  totalCount?: number;
+  serverPagination?: boolean;
+  onServerPagination?: (args: ServerPagination) => void;
   initialPageIndex?: number;
-  initialSortBy?: SortColumns;
+  initialSortBy?: SortByType;
   loading?: boolean;
   withPagination?: boolean;
   emptyWrapperType?: EmptyWrapperType;
@@ -44,6 +48,7 @@ export interface TableViewProps {
   isPaginationSticky?: boolean;
   showRowCount?: boolean;
   scrollTable?: boolean;
+  small?: boolean;
 }
 
 const EmptyWrapper = styled.div`
@@ -53,34 +58,54 @@ const EmptyWrapper = styled.div`
 const TableViewStyles = styled.div<{
   isPaginationSticky?: boolean;
   scrollTable?: boolean;
+  small?: boolean;
 }>`
   ${({ scrollTable, theme }) =>
     scrollTable &&
     `
-    height: 300px;
+    flex: 1 1 auto;
     margin-bottom: ${theme.gridUnit * 4}px;
     overflow: auto;
   `}
 
-  .table-cell.table-cell {
-    vertical-align: top;
+  .table-row {
+    ${({ theme, small }) => !small && `height: ${theme.gridUnit * 11 - 1}px;`}
+
+    .table-cell {
+      ${({ theme, small }) =>
+        small &&
+        `
+        padding-top: ${theme.gridUnit + 1}px;
+        padding-bottom: ${theme.gridUnit + 1}px;
+        line-height: 1.45;
+      `}
+    }
   }
 
-  .pagination-container {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    background-color: ${({ theme }) => theme.colors.grayscale.light5};
+  th[role='columnheader'] {
+    z-index: 1;
+    border-bottom: ${({ theme }) =>
+      `${theme.gridUnit - 2}px solid ${theme.colors.grayscale.light2}`};
+    ${({ small }) => small && `padding-bottom: 0;`}
+  }
+`;
 
-    ${({ theme, isPaginationSticky }) =>
-      isPaginationSticky &&
-      `
+const PaginationStyles = styled.div<{
+  isPaginationSticky?: boolean;
+}>`
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  background-color: ${({ theme }) => theme.colors.grayscale.light5};
+
+  ${({ isPaginationSticky }) =>
+    isPaginationSticky &&
+    `
         position: sticky;
         bottom: 0;
         left: 0;
     `};
-  }
 
   .row-count-container {
     margin-top: ${({ theme }) => theme.gridUnit * 2}px;
@@ -92,6 +117,7 @@ const TableView = ({
   columns,
   data,
   pageSize: initialPageSize,
+  totalCount = data.length,
   initialPageIndex,
   initialSortBy = [],
   loading = false,
@@ -99,6 +125,8 @@ const TableView = ({
   emptyWrapperType = EmptyWrapperType.Default,
   noDataText,
   showRowCount = true,
+  serverPagination = false,
+  onServerPagination = () => {},
   ...props
 }: TableViewProps) => {
   const initialState = {
@@ -116,18 +144,38 @@ const TableView = ({
     prepareRow,
     pageCount,
     gotoPage,
-    state: { pageIndex, pageSize },
+    state: { pageIndex, pageSize, sortBy },
   } = useTable(
     {
       columns,
       data,
       initialState,
+      manualPagination: serverPagination,
+      manualSortBy: serverPagination,
+      pageCount: Math.ceil(totalCount / initialState.pageSize),
     },
     useFilters,
     useSortBy,
     usePagination,
   );
 
+  useEffect(() => {
+    if (serverPagination && pageIndex !== initialState.pageIndex) {
+      onServerPagination({
+        pageIndex,
+      });
+    }
+  }, [pageIndex]);
+
+  useEffect(() => {
+    if (serverPagination && !isEqual(sortBy, initialState.sortBy)) {
+      onServerPagination({
+        pageIndex: 0,
+        sortBy,
+      });
+    }
+  }, [sortBy]);
+
   const content = withPagination ? page : rows;
 
   let EmptyWrapperComponent;
@@ -143,32 +191,38 @@ const TableView = ({
   }
 
   const isEmpty = !loading && content.length === 0;
+  const hasPagination = pageCount > 1 && withPagination;
 
   return (
-    <TableViewStyles {...props}>
-      <TableCollection
-        getTableProps={getTableProps}
-        getTableBodyProps={getTableBodyProps}
-        prepareRow={prepareRow}
-        headerGroups={headerGroups}
-        rows={content}
-        columns={columns}
-        loading={loading}
-      />
-      {isEmpty && (
-        <EmptyWrapperComponent>
-          {noDataText ? (
-            <Empty
-              image={Empty.PRESENTED_IMAGE_SIMPLE}
-              description={noDataText}
-            />
-          ) : (
-            <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
-          )}
-        </EmptyWrapperComponent>
-      )}
-      {pageCount > 1 && withPagination && (
-        <div className="pagination-container">
+    <>
+      <TableViewStyles {...props}>
+        <TableCollection
+          getTableProps={getTableProps}
+          getTableBodyProps={getTableBodyProps}
+          prepareRow={prepareRow}
+          headerGroups={headerGroups}
+          rows={content}
+          columns={columns}
+          loading={loading}
+        />
+        {isEmpty && (
+          <EmptyWrapperComponent>
+            {noDataText ? (
+              <Empty
+                image={Empty.PRESENTED_IMAGE_SIMPLE}
+                description={noDataText}
+              />
+            ) : (
+              <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
+            )}
+          </EmptyWrapperComponent>
+        )}
+      </TableViewStyles>
+      {hasPagination && (
+        <PaginationStyles
+          className="pagination-container"
+          isPaginationSticky={props.isPaginationSticky}
+        >
           <Pagination
             totalPages={pageCount || 0}
             currentPage={pageCount ? pageIndex + 1 : 0}
@@ -182,13 +236,13 @@ const TableView = ({
                   '%s-%s of %s',
                   pageSize * pageIndex + (page.length && 1),
                   pageSize * pageIndex + page.length,
-                  data.length,
+                  totalCount,
                 )}
             </div>
           )}
-        </div>
+        </PaginationStyles>
       )}
-    </TableViewStyles>
+    </>
   );
 };
 
diff --git a/superset-frontend/src/components/TableView/types.ts b/superset-frontend/src/components/TableView/types.ts
index 974cb2496233..dceb27573b7e 100644
--- a/superset-frontend/src/components/TableView/types.ts
+++ b/superset-frontend/src/components/TableView/types.ts
@@ -16,9 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-export interface SortColumn {
-  id: string;
-  desc?: boolean;
-}
+import { SortingRule } from 'react-table';
+
+export type SortByType = SortingRule<string>[];
 
-export type SortColumns = SortColumn[];
+export interface ServerPagination {
+  pageIndex: number;
+  sortBy?: SortByType;
+}
diff --git a/superset-frontend/src/components/Tabs/Tabs.tsx b/superset-frontend/src/components/Tabs/Tabs.tsx
index 704d84b5220f..b55d91707da3 100644
--- a/superset-frontend/src/components/Tabs/Tabs.tsx
+++ b/superset-frontend/src/components/Tabs/Tabs.tsx
@@ -19,7 +19,7 @@
 import React from 'react';
 import { css, styled } from '@superset-ui/core';
 import AntDTabs, { TabsProps as AntDTabsProps } from 'antd/lib/tabs';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 
 export interface TabsProps extends AntDTabsProps {
   fullWidth?: boolean;
@@ -119,6 +119,9 @@ const StyledEditableTabs = styled(StyledTabs)`
     `}
 `;
 
+const StyledCancelXIcon = styled(Icons.CancelX)`
+  color: ${({ theme }) => theme.colors.grayscale.base};
+`;
 export const EditableTabs = Object.assign(StyledEditableTabs, {
   TabPane: StyledTabPane,
 });
@@ -130,9 +133,7 @@ EditableTabs.defaultProps = {
 };
 
 EditableTabs.TabPane.defaultProps = {
-  closeIcon: (
-    <Icon role="button" tabIndex={0} cursor="pointer" name="cancel-x" />
-  ),
+  closeIcon: <StyledCancelXIcon role="button" tabIndex={0} />,
 };
 
 export const StyledLineEditableTabs = styled(EditableTabs)`
diff --git a/superset-frontend/src/components/TimezoneSelector/TimezoneSelector.stories.tsx b/superset-frontend/src/components/TimezoneSelector/TimezoneSelector.stories.tsx
new file mode 100644
index 000000000000..cf9d1d6e730e
--- /dev/null
+++ b/superset-frontend/src/components/TimezoneSelector/TimezoneSelector.stories.tsx
@@ -0,0 +1,41 @@
+/**
+ * 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 React from 'react';
+import { useArgs } from '@storybook/client-api';
+import TimezoneSelector, { TimezoneProps } from './index';
+
+export default {
+  title: 'TimezoneSelector',
+  component: TimezoneSelector,
+};
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const InteractiveTimezoneSelector = (args: TimezoneProps) => {
+  const [{ timezone }, updateArgs] = useArgs();
+  const onTimezoneChange = (value: string) => {
+    updateArgs({ timezone: value });
+  };
+  return (
+    <TimezoneSelector timezone={timezone} onTimezoneChange={onTimezoneChange} />
+  );
+};
+
+InteractiveTimezoneSelector.args = {
+  timezone: 'America/Los_Angeles',
+};
diff --git a/superset-frontend/src/components/TimezoneSelector/TimezoneSelector.test.tsx b/superset-frontend/src/components/TimezoneSelector/TimezoneSelector.test.tsx
new file mode 100644
index 000000000000..f0b12d477753
--- /dev/null
+++ b/superset-frontend/src/components/TimezoneSelector/TimezoneSelector.test.tsx
@@ -0,0 +1,48 @@
+/**
+ * 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 React from 'react';
+import moment from 'moment-timezone';
+import { render } from 'spec/helpers/testing-library';
+import TimezoneSelector from './index';
+
+describe('TimezoneSelector', () => {
+  let timezone: string;
+  const onTimezoneChange = jest.fn(zone => {
+    timezone = zone;
+  });
+  it('renders a TimezoneSelector with a default if undefined', () => {
+    jest.spyOn(moment.tz, 'guess').mockReturnValue('America/New_York');
+    render(
+      <TimezoneSelector
+        onTimezoneChange={onTimezoneChange}
+        timezone={timezone}
+      />,
+    );
+    expect(onTimezoneChange).toHaveBeenCalledWith('America/Nassau');
+  });
+  it('renders a TimezoneSelector with the closest value if passed in', async () => {
+    render(
+      <TimezoneSelector
+        onTimezoneChange={onTimezoneChange}
+        timezone="America/Los_Angeles"
+      />,
+    );
+    expect(onTimezoneChange).toHaveBeenLastCalledWith('America/Vancouver');
+  });
+});
diff --git a/superset-frontend/src/components/TimezoneSelector/index.tsx b/superset-frontend/src/components/TimezoneSelector/index.tsx
new file mode 100644
index 000000000000..73c6f1fc8696
--- /dev/null
+++ b/superset-frontend/src/components/TimezoneSelector/index.tsx
@@ -0,0 +1,132 @@
+/**
+ * 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 React, { useEffect, useRef } from 'react';
+import moment from 'moment-timezone';
+
+import { NativeGraySelect as Select } from 'src/components/Select';
+
+const DEFAULT_TIMEZONE = 'GMT Standard Time';
+const MIN_SELECT_WIDTH = '400px';
+
+const offsetsToName = {
+  '-300-240': ['Eastern Standard Time', 'Eastern Daylight Time'],
+  '-360-300': ['Central Standard Time', 'Central Daylight Time'],
+  '-420-360': ['Mountain Standard Time', 'Mountain Daylight Time'],
+  '-420-420': [
+    'Mountain Standard Time - Phoenix',
+    'Mountain Standard Time - Phoenix',
+  ],
+  '-480-420': ['Pacific Standard Time', 'Pacific Daylight Time'],
+  '-540-480': ['Alaska Standard Time', 'Alaska Daylight Time'],
+  '-600-600': ['Hawaii Standard Time', 'Hawaii Daylight Time'],
+  '60120': ['Central European Time', 'Central European Daylight Time'],
+  '00': [DEFAULT_TIMEZONE, DEFAULT_TIMEZONE],
+  '060': ['GMT Standard Time - London', 'British Summer Time'],
+};
+
+const currentDate = moment();
+const JANUARY = moment([2021, 1]);
+const JULY = moment([2021, 7]);
+
+const getOffsetKey = (name: string) =>
+  JANUARY.tz(name).utcOffset().toString() +
+  JULY.tz(name).utcOffset().toString();
+
+const getTimezoneName = (name: string) => {
+  const offsets = getOffsetKey(name);
+  return (
+    (currentDate.tz(name).isDST()
+      ? offsetsToName[offsets]?.[1]
+      : offsetsToName[offsets]?.[0]) || name
+  );
+};
+
+export interface TimezoneProps {
+  onTimezoneChange: (value: string) => void;
+  timezone?: string | null;
+}
+
+const ALL_ZONES = moment.tz
+  .countries()
+  .map(country => moment.tz.zonesForCountry(country, true))
+  .flat();
+
+const TIMEZONES: moment.MomentZoneOffset[] = [];
+ALL_ZONES.forEach(zone => {
+  if (
+    !TIMEZONES.find(
+      option => getOffsetKey(option.name) === getOffsetKey(zone.name),
+    )
+  ) {
+    TIMEZONES.push(zone); // dedupe zones by offsets
+  }
+});
+
+const TIMEZONE_OPTIONS = TIMEZONES.sort(
+  // sort by offset
+  (a, b) =>
+    moment.tz(currentDate, a.name).utcOffset() -
+    moment.tz(currentDate, b.name).utcOffset(),
+).map(zone => ({
+  label: `GMT ${moment
+    .tz(currentDate, zone.name)
+    .format('Z')} (${getTimezoneName(zone.name)})`,
+  value: zone.name,
+  offsets: getOffsetKey(zone.name),
+}));
+
+const timezoneOptions = TIMEZONE_OPTIONS.map(option => (
+  <Select.Option key={option.value} value={option.value}>
+    {option.label}
+  </Select.Option>
+));
+
+const TimezoneSelector = ({ onTimezoneChange, timezone }: TimezoneProps) => {
+  const prevTimezone = useRef(timezone);
+  const matchTimezoneToOptions = (timezone: string) =>
+    TIMEZONE_OPTIONS.find(option => option.offsets === getOffsetKey(timezone))
+      ?.value || DEFAULT_TIMEZONE;
+
+  const updateTimezone = (tz: string) => {
+    // update the ref to track changes
+    prevTimezone.current = tz;
+    // the parent component contains the state for the value
+    onTimezoneChange(tz);
+  };
+
+  useEffect(() => {
+    const updatedTz = matchTimezoneToOptions(timezone || moment.tz.guess());
+    if (prevTimezone.current !== updatedTz) {
+      updateTimezone(updatedTz);
+    }
+  }, [timezone]);
+
+  return (
+    <Select
+      css={{ minWidth: MIN_SELECT_WIDTH }} // smallest size for current values
+      onChange={onTimezoneChange}
+      value={timezone || DEFAULT_TIMEZONE}
+    >
+      {timezoneOptions}
+    </Select>
+  );
+};
+
+export default TimezoneSelector;
diff --git a/superset-frontend/src/components/Tooltip/index.tsx b/superset-frontend/src/components/Tooltip/index.tsx
index 5ec24bb3a60f..926750268280 100644
--- a/superset-frontend/src/components/Tooltip/index.tsx
+++ b/superset-frontend/src/components/Tooltip/index.tsx
@@ -17,17 +17,32 @@
  * under the License.
  */
 import React from 'react';
-import { useTheme } from '@superset-ui/core';
+import { useTheme, css } from '@superset-ui/core';
 import { Tooltip as AntdTooltip } from 'antd';
 import { TooltipProps } from 'antd/lib/tooltip';
+import { Global } from '@emotion/react';
 
 export const Tooltip = (props: TooltipProps) => {
   const theme = useTheme();
   return (
-    <AntdTooltip
-      overlayStyle={{ fontSize: theme.typography.sizes.s, lineHeight: '1.6' }}
-      color={`${theme.colors.grayscale.dark2}e6`}
-      {...props}
-    />
+    <>
+      {/* Safari hack to hide browser default tooltips */}
+      <Global
+        styles={css`
+          .ant-tooltip-open {
+            display: inline-block;
+            &::after {
+              content: '';
+              display: block;
+            }
+          }
+        `}
+      />
+      <AntdTooltip
+        overlayStyle={{ fontSize: theme.typography.sizes.s, lineHeight: '1.6' }}
+        color={`${theme.colors.grayscale.dark2}e6`}
+        {...props}
+      />
+    </>
   );
 };
diff --git a/superset-frontend/src/components/WarningIconWithTooltip/index.tsx b/superset-frontend/src/components/WarningIconWithTooltip/index.tsx
index 640397e5c65c..f732554e15aa 100644
--- a/superset-frontend/src/components/WarningIconWithTooltip/index.tsx
+++ b/superset-frontend/src/components/WarningIconWithTooltip/index.tsx
@@ -18,16 +18,17 @@
  */
 import React from 'react';
 import { useTheme, SafeMarkdown } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import Icons, { IconType } from 'src/components/Icons';
 import { Tooltip } from 'src/components/Tooltip';
 
 export interface WarningIconWithTooltipProps {
   warningMarkdown: string;
-  size?: number;
+  size?: IconType['iconSize'];
 }
 
 function WarningIconWithTooltip({
   warningMarkdown,
+  size,
 }: WarningIconWithTooltipProps) {
   const theme = useTheme();
   return (
@@ -35,7 +36,11 @@ function WarningIconWithTooltip({
       id="warning-tooltip"
       title={<SafeMarkdown source={warningMarkdown} />}
     >
-      <Icons.AlertSolid iconColor={theme.colors.alert.base} />
+      <Icons.AlertSolid
+        iconColor={theme.colors.alert.base}
+        iconSize={size}
+        css={{ marginRight: theme.gridUnit * 2 }}
+      />
     </Tooltip>
   );
 }
diff --git a/superset-frontend/src/components/dataViewCommon/TableCollection.tsx b/superset-frontend/src/components/dataViewCommon/TableCollection.tsx
index e6f46609d99d..b8f644fe656f 100644
--- a/superset-frontend/src/components/dataViewCommon/TableCollection.tsx
+++ b/superset-frontend/src/components/dataViewCommon/TableCollection.tsx
@@ -20,7 +20,7 @@ import React from 'react';
 import cx from 'classnames';
 import { TableInstance } from 'react-table';
 import { styled } from '@superset-ui/core';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 
 interface TableCollectionProps {
   getTableProps: (userProps?: any) => any;
@@ -187,7 +187,7 @@ export const Table = styled.table`
     text-overflow: ellipsis;
     overflow: hidden;
     white-space: nowrap;
-    max-width: 300px;
+    max-width: 320px;
     line-height: 1;
     vertical-align: middle;
     &:first-of-type {
@@ -228,11 +228,11 @@ export default React.memo(
         {headerGroups.map(headerGroup => (
           <tr {...headerGroup.getHeaderGroupProps()}>
             {headerGroup.headers.map(column => {
-              let sortIcon = <Icon name="sort" />;
+              let sortIcon = <Icons.Sort />;
               if (column.isSorted && column.isSortedDesc) {
-                sortIcon = <Icon name="sort-desc" />;
+                sortIcon = <Icons.SortDesc />;
               } else if (column.isSorted && !column.isSortedDesc) {
-                sortIcon = <Icon name="sort-asc" />;
+                sortIcon = <Icons.SortAsc />;
               }
               return column.hidden ? null : (
                 <th
diff --git a/superset-frontend/src/components/index.ts b/superset-frontend/src/components/index.ts
new file mode 100644
index 000000000000..596fbb435b0d
--- /dev/null
+++ b/superset-frontend/src/components/index.ts
@@ -0,0 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { default as Select } from './Select/Select';
diff --git a/superset-frontend/src/constants.ts b/superset-frontend/src/constants.ts
index bfa7033697cb..a525106189ec 100644
--- a/superset-frontend/src/constants.ts
+++ b/superset-frontend/src/constants.ts
@@ -31,6 +31,14 @@ export const URL_PARAMS = {
     name: 'preselect_filters',
     type: 'object',
   },
+  nativeFilters: {
+    name: 'native_filters',
+    type: 'rison',
+  },
+  filterSet: {
+    name: 'filter_set',
+    type: 'string',
+  },
   showFilters: {
     name: 'show_filters',
     type: 'boolean',
diff --git a/superset-frontend/src/dashboard/actions/dashboardState.js b/superset-frontend/src/dashboard/actions/dashboardState.js
index d0b39e2ff14d..36868b85d56d 100644
--- a/superset-frontend/src/dashboard/actions/dashboardState.js
+++ b/superset-frontend/src/dashboard/actions/dashboardState.js
@@ -275,6 +275,32 @@ export function fetchCharts(
   };
 }
 
+const refreshCharts = (chartList, force, interval, dashboardId, dispatch) =>
+  new Promise(resolve => {
+    dispatch(fetchCharts(chartList, force, interval, dashboardId));
+    resolve();
+  });
+
+export const ON_REFRESH_SUCCESS = 'ON_REFRESH_SUCCESS';
+export function onRefreshSuccess() {
+  return { type: ON_REFRESH_SUCCESS };
+}
+
+export const ON_REFRESH = 'ON_REFRESH';
+export function onRefresh(
+  chartList = [],
+  force = false,
+  interval = 0,
+  dashboardId,
+) {
+  return dispatch => {
+    dispatch({ type: ON_REFRESH });
+    refreshCharts(chartList, force, interval, dashboardId, dispatch).then(() =>
+      dispatch({ type: ON_REFRESH_SUCCESS }),
+    );
+  };
+}
+
 export const SHOW_BUILDER_PANE = 'SHOW_BUILDER_PANE';
 export function showBuilderPane() {
   return { type: SHOW_BUILDER_PANE };
@@ -344,9 +370,9 @@ export function setDirectPathToChild(path) {
   return { type: SET_DIRECT_PATH, path };
 }
 
-export const SET_LAST_FOCUSED_TAB = 'SET_LAST_FOCUSED_TAB';
-export function setLastFocusedTab(tabId) {
-  return { type: SET_LAST_FOCUSED_TAB, tabId };
+export const SET_ACTIVE_TABS = 'SET_ACTIVE_TABS';
+export function setActiveTabs(tabIds) {
+  return { type: SET_ACTIVE_TABS, tabIds };
 }
 
 export const SET_FOCUSED_FILTER_FIELD = 'SET_FOCUSED_FILTER_FIELD';
@@ -359,6 +385,11 @@ export function unsetFocusedFilterField(chartId, column) {
   return { type: UNSET_FOCUSED_FILTER_FIELD, chartId, column };
 }
 
+export const SET_FULL_SIZE_CHART_ID = 'SET_FULL_SIZE_CHART_ID';
+export function setFullSizeChartId(chartId) {
+  return { type: SET_FULL_SIZE_CHART_ID, chartId };
+}
+
 // Undo history ---------------------------------------------------------------
 export const SET_MAX_UNDO_HISTORY_EXCEEDED = 'SET_MAX_UNDO_HISTORY_EXCEEDED';
 export function setMaxUndoHistoryExceeded(maxUndoHistoryExceeded = true) {
diff --git a/superset-frontend/src/dashboard/actions/datasources.js b/superset-frontend/src/dashboard/actions/datasources.ts
similarity index 53%
rename from superset-frontend/src/dashboard/actions/datasources.js
rename to superset-frontend/src/dashboard/actions/datasources.ts
index 4277edc661fc..42004272ccb0 100644
--- a/superset-frontend/src/dashboard/actions/datasources.js
+++ b/superset-frontend/src/dashboard/actions/datasources.ts
@@ -16,26 +16,44 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { Dispatch } from 'redux';
 import { SupersetClient } from '@superset-ui/core';
-import { getClientErrorObject } from '../../utils/getClientErrorObject';
+import { Datasource, RootState } from 'src/dashboard/types';
 
-export const SET_DATASOURCE = 'SET_DATASOURCE';
-export function setDatasource(datasource, key) {
-  return { type: SET_DATASOURCE, datasource, key };
+// update datasources index for Dashboard
+export enum DatasourcesAction {
+  SET_DATASOURCES = 'SET_DATASOURCES',
+  SET_DATASOURCE = 'SET_DATASOURCE',
 }
 
-export const FETCH_DATASOURCE_STARTED = 'FETCH_DATASOURCE_STARTED';
-export function fetchDatasourceStarted(key) {
-  return { type: FETCH_DATASOURCE_STARTED, key };
+export type DatasourcesActionPayload =
+  | {
+      type: DatasourcesAction.SET_DATASOURCES;
+      datasources: Datasource[] | null;
+    }
+  | {
+      type: DatasourcesAction.SET_DATASOURCE;
+      key: Datasource['uid'];
+      datasource: Datasource;
+    };
+
+export function setDatasources(datasources: Datasource[] | null) {
+  return {
+    type: DatasourcesAction.SET_DATASOURCES,
+    datasources,
+  };
 }
 
-export const FETCH_DATASOURCE_FAILED = 'FETCH_DATASOURCE_FAILED';
-export function fetchDatasourceFailed(error, key) {
-  return { type: FETCH_DATASOURCE_FAILED, error, key };
+export function setDatasource(datasource: Datasource, key: string) {
+  return {
+    type: DatasourcesAction.SET_DATASOURCE,
+    key,
+    datasource,
+  };
 }
 
-export function fetchDatasourceMetadata(key) {
-  return (dispatch, getState) => {
+export function fetchDatasourceMetadata(key: string) {
+  return (dispatch: Dispatch, getState: () => RootState) => {
     const { datasources } = getState();
     const datasource = datasources[key];
 
@@ -45,12 +63,6 @@ export function fetchDatasourceMetadata(key) {
 
     return SupersetClient.get({
       endpoint: `/superset/fetch_datasource_metadata?datasourceKey=${key}`,
-    })
-      .then(({ json }) => dispatch(setDatasource(json, key)))
-      .catch(response =>
-        getClientErrorObject(response).then(({ error }) =>
-          dispatch(fetchDatasourceFailed(error, key)),
-        ),
-      );
+    }).then(({ json }) => dispatch(setDatasource(json as Datasource, key)));
   };
 }
diff --git a/superset-frontend/src/dashboard/actions/hydrate.js b/superset-frontend/src/dashboard/actions/hydrate.js
index 62751033ad67..9c524e2d05be 100644
--- a/superset-frontend/src/dashboard/actions/hydrate.js
+++ b/superset-frontend/src/dashboard/actions/hydrate.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 /* eslint-disable camelcase */
-import { isString, keyBy } from 'lodash';
+import { isString } from 'lodash';
 import {
   Behavior,
   CategoricalColorNamespace,
@@ -60,7 +60,7 @@ import extractUrlParams from '../util/extractUrlParams';
 
 export const HYDRATE_DASHBOARD = 'HYDRATE_DASHBOARD';
 
-export const hydrateDashboard = (dashboardData, chartData, datasourcesData) => (
+export const hydrateDashboard = (dashboardData, chartData) => (
   dispatch,
   getState,
 ) => {
@@ -288,7 +288,8 @@ export const hydrateDashboard = (dashboardData, chartData, datasourcesData) => (
   }
 
   metadata.show_native_filters =
-    dashboardData?.metadata?.show_native_filters ?? true;
+    dashboardData?.metadata?.show_native_filters ??
+    isFeatureEnabled(FeatureFlag.DASHBOARD_NATIVE_FILTERS);
 
   if (isFeatureEnabled(FeatureFlag.DASHBOARD_CROSS_FILTERS)) {
     // If user just added cross filter to dashboard it's not saving it scope on server,
@@ -328,14 +329,13 @@ export const hydrateDashboard = (dashboardData, chartData, datasourcesData) => (
   return dispatch({
     type: HYDRATE_DASHBOARD,
     data: {
-      datasources: keyBy(datasourcesData, 'uid'),
       sliceEntities: { ...initSliceEntities, slices, isLoading: false },
       charts: chartQueries,
       // read-only data
       dashboardInfo: {
         ...dashboardData,
         metadata,
-        userId: String(user.userId), // legacy, please use state.user instead
+        userId: user.userId ? String(user.userId) : null, // legacy, please use state.user instead
         dash_edit_perm: canEdit,
         dash_save_perm: findPermission('can_save_dash', 'Superset', roles),
         dash_share_perm: findPermission(
@@ -360,6 +360,7 @@ export const hydrateDashboard = (dashboardData, chartData, datasourcesData) => (
       dashboardFilters,
       nativeFilters,
       dashboardState: {
+        preselectNativeFilters: getUrlParam(URL_PARAMS.nativeFilters),
         sliceIds: Array.from(sliceIds),
         directPathToChild,
         directPathLastUpdated: Date.now(),
@@ -377,7 +378,8 @@ export const hydrateDashboard = (dashboardData, chartData, datasourcesData) => (
         hasUnsavedChanges: false,
         maxUndoHistoryExceeded: false,
         lastModifiedTime: dashboardData.changed_on,
-        lastFocusedTabId: null,
+        isRefreshing: false,
+        activeTabs: [],
       },
       dashboardLayout,
     },
diff --git a/superset-frontend/src/dashboard/actions/nativeFilters.ts b/superset-frontend/src/dashboard/actions/nativeFilters.ts
index e01a5a67244e..150b8857ae6e 100644
--- a/superset-frontend/src/dashboard/actions/nativeFilters.ts
+++ b/superset-frontend/src/dashboard/actions/nativeFilters.ts
@@ -49,6 +49,11 @@ export interface SetFilterConfigFail {
   type: typeof SET_FILTER_CONFIG_FAIL;
   filterConfig: FilterConfiguration;
 }
+export const SET_IN_SCOPE_STATUS_OF_FILTERS = 'SET_IN_SCOPE_STATUS_OF_FILTERS';
+export interface SetInScopeStatusOfFilters {
+  type: typeof SET_IN_SCOPE_STATUS_OF_FILTERS;
+  filterConfig: FilterConfiguration;
+}
 export const SET_FILTER_SETS_CONFIG_BEGIN = 'SET_FILTER_SETS_CONFIG_BEGIN';
 export interface SetFilterSetsConfigBegin {
   type: typeof SET_FILTER_SETS_CONFIG_BEGIN;
@@ -124,6 +129,25 @@ export const setFilterConfiguration = (
   }
 };
 
+export const setInScopeStatusOfFilters = (
+  filterScopes: {
+    filterId: string;
+    chartsInScope: number[];
+    tabsInScope: string[];
+  }[],
+) => async (dispatch: Dispatch, getState: () => any) => {
+  const filters = getState().nativeFilters?.filters;
+  const filtersWithScopes = filterScopes.map(scope => ({
+    ...filters[scope.filterId],
+    chartsInScope: scope.chartsInScope,
+    tabsInScope: scope.tabsInScope,
+  }));
+  dispatch({
+    type: SET_IN_SCOPE_STATUS_OF_FILTERS,
+    filterConfig: filtersWithScopes,
+  });
+};
+
 type BootstrapData = {
   nativeFilters: {
     filters: Filters;
@@ -227,6 +251,7 @@ export type AnyFilterAction =
   | SetFilterSetsConfigBegin
   | SetFilterSetsConfigComplete
   | SetFilterSetsConfigFail
+  | SetInScopeStatusOfFilters
   | SaveFilterSets
   | SetBootstrapData
   | SetFocusedNativeFilter
diff --git a/superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingForm/CrossFilterScopingForm.test.tsx b/superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingForm/CrossFilterScopingForm.test.tsx
index 581ac8e31e3c..39cb6f92e102 100644
--- a/superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingForm/CrossFilterScopingForm.test.tsx
+++ b/superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingForm/CrossFilterScopingForm.test.tsx
@@ -43,9 +43,9 @@ test('Should send correct props', () => {
   expect(FilterScope).toHaveBeenCalledWith(
     expect.objectContaining({
       chartId: 123,
-      scope: 'Scope',
-      formScope: 'scope',
-      formScoping: 'scoping',
+      filterScope: 'Scope',
+      formFilterScope: 'scope',
+      formScopingType: 'scoping',
     }),
     {},
   );
diff --git a/superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingForm/index.tsx b/superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingForm/index.tsx
index c184f9e0d3e9..d1364f372988 100644
--- a/superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingForm/index.tsx
+++ b/superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingForm/index.tsx
@@ -45,11 +45,11 @@ const CrossFilterScopingForm: FC<CrossFilterScopingFormProps> = ({
           ...values,
         });
       }}
-      scope={scope}
+      filterScope={scope}
       chartId={chartId}
-      formScope={formScope}
+      formFilterScope={formScope}
       forceUpdate={forceUpdate}
-      formScoping={formScoping}
+      formScopingType={formScoping}
     />
   );
 };
diff --git a/superset-frontend/src/dashboard/components/CssEditor/CssEditor.test.tsx b/superset-frontend/src/dashboard/components/CssEditor/CssEditor.test.tsx
index 86730fedebed..e96291c9b64c 100644
--- a/superset-frontend/src/dashboard/components/CssEditor/CssEditor.test.tsx
+++ b/superset-frontend/src/dashboard/components/CssEditor/CssEditor.test.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React from 'react';
-import { render, screen } from 'spec/helpers/testing-library';
+import { render, screen, waitFor } from 'spec/helpers/testing-library';
 import { CssEditor as AceCssEditor } from 'src/components/AsyncAceEditor';
 import { AceEditorProps } from 'react-ace';
 import userEvent from '@testing-library/user-event';
@@ -32,6 +32,12 @@ jest.mock('src/components/AsyncAceEditor', () => ({
   ),
 }));
 
+const templates = [
+  { label: 'Template A', css: 'background-color: red;' },
+  { label: 'Template B', css: 'background-color: blue;' },
+  { label: 'Template C', css: 'background-color: yellow;' },
+];
+
 AceCssEditor.preload = () => new Promise(() => {});
 
 test('renders with default props', () => {
@@ -46,14 +52,15 @@ test('renders with initial CSS', () => {
   expect(screen.getByText(initialCss)).toBeInTheDocument();
 });
 
-test('renders with templates', () => {
-  const templates = ['Template A', 'Template B', 'Template C'];
+test('renders with templates', async () => {
   render(<CssEditor triggerNode={<>Click</>} templates={templates} />);
   userEvent.click(screen.getByRole('button', { name: 'Click' }));
-  userEvent.click(screen.getByText('Load a CSS template'));
-  templates.forEach(template =>
-    expect(screen.getByText(template)).toBeInTheDocument(),
-  );
+  userEvent.hover(screen.getByText('Load a CSS template'));
+  await waitFor(() => {
+    templates.forEach(template =>
+      expect(screen.getByText(template.label)).toBeInTheDocument(),
+    );
+  });
 });
 
 test('triggers onChange when using the editor', () => {
@@ -73,9 +80,8 @@ test('triggers onChange when using the editor', () => {
   expect(onChange).toHaveBeenLastCalledWith(initialCss.concat(additionalCss));
 });
 
-test('triggers onChange when selecting a template', () => {
+test('triggers onChange when selecting a template', async () => {
   const onChange = jest.fn();
-  const templates = ['Template A', 'Template B', 'Template C'];
   render(
     <CssEditor
       triggerNode={<>Click</>}
@@ -86,6 +92,6 @@ test('triggers onChange when selecting a template', () => {
   userEvent.click(screen.getByRole('button', { name: 'Click' }));
   userEvent.click(screen.getByText('Load a CSS template'));
   expect(onChange).not.toHaveBeenCalled();
-  userEvent.click(screen.getByText('Template A'));
+  userEvent.click(await screen.findByText('Template A'));
   expect(onChange).toHaveBeenCalledTimes(1);
 });
diff --git a/superset-frontend/src/dashboard/components/CssEditor/index.jsx b/superset-frontend/src/dashboard/components/CssEditor/index.jsx
index da0b4320447f..995dc081fe2b 100644
--- a/superset-frontend/src/dashboard/components/CssEditor/index.jsx
+++ b/superset-frontend/src/dashboard/components/CssEditor/index.jsx
@@ -18,11 +18,30 @@
  */
 import React from 'react';
 import PropTypes from 'prop-types';
-import Select from 'src/components/Select';
-import { t } from '@superset-ui/core';
+import { Menu, Dropdown } from 'src/common/components';
+import Button from 'src/components/Button';
+import { t, styled } from '@superset-ui/core';
 import ModalTrigger from 'src/components/ModalTrigger';
 import { CssEditor as AceCssEditor } from 'src/components/AsyncAceEditor';
 
+const StyledWrapper = styled.div`
+  ${({ theme }) => `
+    .css-editor-header {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      margin-bottom: ${theme.gridUnit * 2}px;
+
+      h5 {
+        margin-top: ${theme.gridUnit}px;
+      }
+    }
+    .css-editor {
+      border: 1px solid ${theme.colors.grayscale.light1};
+    }
+  `}
+`;
+
 const propTypes = {
   initialCss: PropTypes.string,
   triggerNode: PropTypes.node.isRequired,
@@ -55,21 +74,24 @@ class CssEditor extends React.PureComponent {
     });
   }
 
-  changeCssTemplate(opt) {
-    this.changeCss(opt.css);
+  changeCssTemplate({ key }) {
+    this.changeCss(key);
   }
 
   renderTemplateSelector() {
     if (this.props.templates) {
+      const menu = (
+        <Menu onClick={this.changeCssTemplate}>
+          {this.props.templates.map(template => (
+            <Menu.Item key={template.css}>{template.label}</Menu.Item>
+          ))}
+        </Menu>
+      );
+
       return (
-        <div style={{ zIndex: 10 }}>
-          <h5>{t('Load a template')}</h5>
-          <Select
-            options={this.props.templates}
-            placeholder={t('Load a CSS template')}
-            onChange={this.changeCssTemplate}
-          />
-        </div>
+        <Dropdown overlay={menu} placement="bottomRight">
+          <Button>{t('Load a CSS template')}</Button>
+        </Dropdown>
       );
     }
     return null;
@@ -81,24 +103,23 @@ class CssEditor extends React.PureComponent {
         triggerNode={this.props.triggerNode}
         modalTitle={t('CSS')}
         modalBody={
-          <div>
-            {this.renderTemplateSelector()}
-            <div style={{ zIndex: 1 }}>
+          <StyledWrapper>
+            <div className="css-editor-header">
               <h5>{t('Live CSS editor')}</h5>
-              <div style={{ border: 'solid 1px grey' }}>
-                <AceCssEditor
-                  minLines={12}
-                  maxLines={30}
-                  onChange={this.changeCss}
-                  height="200px"
-                  width="100%"
-                  editorProps={{ $blockScrolling: true }}
-                  enableLiveAutocompletion
-                  value={this.state.css || ''}
-                />
-              </div>
+              {this.renderTemplateSelector()}
             </div>
-          </div>
+            <AceCssEditor
+              className="css-editor"
+              minLines={12}
+              maxLines={30}
+              onChange={this.changeCss}
+              height="200px"
+              width="100%"
+              editorProps={{ $blockScrolling: true }}
+              enableLiveAutocompletion
+              value={this.state.css || ''}
+            />
+          </StyledWrapper>
         }
       />
     );
diff --git a/superset-frontend/src/dashboard/components/Dashboard.jsx b/superset-frontend/src/dashboard/components/Dashboard.jsx
index 4a5c8831dce0..21bd809e1397 100644
--- a/superset-frontend/src/dashboard/components/Dashboard.jsx
+++ b/superset-frontend/src/dashboard/components/Dashboard.jsx
@@ -132,6 +132,11 @@ class Dashboard extends React.PureComponent {
     const currentChartIds = getChartIdsFromLayout(this.props.layout);
     const nextChartIds = getChartIdsFromLayout(nextProps.layout);
 
+    if (this.props.dashboardInfo.id !== nextProps.dashboardInfo.id) {
+      // single-page-app navigation check
+      return;
+    }
+
     if (currentChartIds.length < nextChartIds.length) {
       const newChartIds = nextChartIds.filter(
         key => currentChartIds.indexOf(key) === -1,
diff --git a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx
index 9873dfbd4ff9..cc897b8df574 100644
--- a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx
+++ b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx
@@ -19,15 +19,14 @@
 /* eslint-env browser */
 import cx from 'classnames';
 import React, { FC } from 'react';
-import { Sticky, StickyContainer } from 'react-sticky';
-import { JsonObject, styled } from '@superset-ui/core';
+import { JsonObject, styled, css } from '@superset-ui/core';
 import ErrorBoundary from 'src/components/ErrorBoundary';
 import BuilderComponentPane from 'src/dashboard/components/BuilderComponentPane';
 import DashboardHeader from 'src/dashboard/containers/DashboardHeader';
+import Icons from 'src/components/Icons';
 import IconButton from 'src/dashboard/components/IconButton';
 import DragDroppable from 'src/dashboard/components/dnd/DragDroppable';
 import DashboardComponent from 'src/dashboard/containers/DashboardComponent';
-import ToastPresenter from 'src/messageToasts/containers/ToastPresenter';
 import WithPopoverMenu from 'src/dashboard/components/menu/WithPopoverMenu';
 import getDirectPathToTabIndex from 'src/dashboard/util/getDirectPathToTabIndex';
 import { URL_PARAMS } from 'src/constants';
@@ -35,6 +34,8 @@ import { useDispatch, useSelector } from 'react-redux';
 import { getUrlParam } from 'src/utils/urlUtils';
 import { DashboardLayout, RootState } from 'src/dashboard/types';
 import { setDirectPathToChild } from 'src/dashboard/actions/dashboardState';
+import { useElementOnScreen } from 'src/common/hooks/useElementOnScreen';
+import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags';
 import {
   deleteTopLevelTabs,
   handleComponentDrop,
@@ -47,22 +48,69 @@ import {
 } from 'src/dashboard/util/constants';
 import FilterBar from 'src/dashboard/components/nativeFilters/FilterBar';
 import Loading from 'src/components/Loading';
-import { StickyVerticalBar } from '../StickyVerticalBar';
+import { Global } from '@emotion/react';
 import { shouldFocusTabs, getRootLevelTabsComponent } from './utils';
 import DashboardContainer from './DashboardContainer';
 import { useNativeFilters } from './state';
 
-const TABS_HEIGHT = 47;
-const HEADER_HEIGHT = 67;
+const MAIN_HEADER_HEIGHT = 53;
+const TABS_HEIGHT = 50;
+const HEADER_HEIGHT = 72;
+const CLOSED_FILTER_BAR_WIDTH = 32;
+const OPEN_FILTER_BAR_WIDTH = 260;
+const FILTER_BAR_HEADER_HEIGHT = 80;
+const FILTER_BAR_TABS_HEIGHT = 46;
 
 type DashboardBuilderProps = {};
 
-const StyledDashboardContent = styled.div<{ dashboardFiltersOpen: boolean }>`
+const StyledDiv = styled.div`
+  display: grid;
+  grid-template-columns: auto 1fr;
+  grid-template-rows: auto 1fr;
+  flex: 1;
+`;
+
+// @z-index-above-dashboard-charts + 1 = 11
+const FiltersPanel = styled.div`
+  grid-column: 1;
+  grid-row: 1 / span 2;
+  z-index: 11;
+`;
+
+const StickyPanel = styled.div<{ width: number }>`
+  position: sticky;
+  top: -1px;
+  width: ${({ width }) => width}px;
+  flex: 0 0 ${({ width }) => width}px;
+`;
+
+// @z-index-above-dashboard-popovers (99) + 1 = 100
+const StyledHeader = styled.div`
+  grid-column: 2;
+  grid-row: 1;
+  position: sticky;
+  top: 0px;
+  z-index: 100;
+`;
+
+const StyledContent = styled.div<{
+  fullSizeChartId: number | null;
+}>`
+  grid-column: 2;
+  grid-row: 2;
+  // @z-index-above-dashboard-header (100) + 1 = 101
+  ${({ fullSizeChartId }) => fullSizeChartId && `z-index: 101;`}
+`;
+
+const StyledDashboardContent = styled.div<{
+  dashboardFiltersOpen: boolean;
+  editMode: boolean;
+}>`
   display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
   height: auto;
-  flex-grow: 1;
+  flex: 1;
 
   .grid-container .dashboard-component-tabs {
     box-shadow: none;
@@ -71,17 +119,18 @@ const StyledDashboardContent = styled.div<{ dashboardFiltersOpen: boolean }>`
 
   .grid-container {
     /* without this, the grid will not get smaller upon toggling the builder panel on */
-    min-width: 0;
-    width: 100%;
-    flex-grow: 1;
+    width: 0px;
+    flex: 1;
     position: relative;
-    margin: ${({ theme }) => theme.gridUnit * 6}px
-      ${({ theme }) => theme.gridUnit * 8}px
-      ${({ theme }) => theme.gridUnit * 6}px
-      ${({ theme, dashboardFiltersOpen }) => {
-        if (dashboardFiltersOpen) return theme.gridUnit * 8;
+    margin-top: ${({ theme }) => theme.gridUnit * 6}px;
+    margin-right: ${({ theme }) => theme.gridUnit * 8}px;
+    margin-bottom: ${({ theme }) => theme.gridUnit * 6}px;
+    margin-left: ${({ theme, dashboardFiltersOpen, editMode }) => {
+      if (!dashboardFiltersOpen && !editMode) {
         return 0;
-      }}px;
+      }
+      return theme.gridUnit * 8;
+    }}px;
   }
 
   .dashboard-component-chart-holder {
@@ -104,6 +153,9 @@ const DashboardBuilder: FC<DashboardBuilderProps> = () => {
   const directPathToChild = useSelector<RootState, string[]>(
     state => state.dashboardState.directPathToChild,
   );
+  const fullSizeChartId = useSelector<RootState, number | null>(
+    state => state.dashboardState.fullSizeChartId,
+  );
 
   const handleChangeTab = ({
     pathToTabIndex,
@@ -129,10 +181,10 @@ const DashboardBuilder: FC<DashboardBuilderProps> = () => {
     rootChildId !== DASHBOARD_GRID_ID
       ? dashboardLayout[rootChildId]
       : undefined;
-
+  const StandaloneMode = getUrlParam(URL_PARAMS.standalone);
+  const isReport = StandaloneMode === DashboardStandaloneMode.REPORT;
   const hideDashboardHeader =
-    getUrlParam(URL_PARAMS.standalone) ===
-    DashboardStandaloneMode.HIDE_NAV_AND_TITLE;
+    StandaloneMode === DashboardStandaloneMode.HIDE_NAV_AND_TITLE || isReport;
 
   const barTopOffset =
     (hideDashboardHeader ? 0 : HEADER_HEIGHT) +
@@ -145,89 +197,121 @@ const DashboardBuilder: FC<DashboardBuilderProps> = () => {
     nativeFiltersEnabled,
   } = useNativeFilters();
 
+  const filterBarWidth = dashboardFiltersOpen
+    ? OPEN_FILTER_BAR_WIDTH
+    : CLOSED_FILTER_BAR_WIDTH;
+
+  const [containerRef, isSticky] = useElementOnScreen<HTMLDivElement>({
+    threshold: [1],
+  });
+
+  const filterSetEnabled = isFeatureEnabled(
+    FeatureFlag.DASHBOARD_NATIVE_FILTERS_SET,
+  );
+
+  const offset =
+    FILTER_BAR_HEADER_HEIGHT +
+    (isSticky || StandaloneMode ? 0 : MAIN_HEADER_HEIGHT) +
+    (filterSetEnabled ? FILTER_BAR_TABS_HEIGHT : 0);
+
+  const filterBarHeight = `calc(100vh - ${offset}px)`;
+  const filterBarOffset = dashboardFiltersOpen ? 0 : barTopOffset + 20;
+
   return (
-    <StickyContainer
-      className={cx('dashboard', editMode && 'dashboard--editing')}
-    >
-      <Sticky>
-        {({ style }) => (
-          // @ts-ignore
-          <DragDroppable
-            component={dashboardRoot}
-            parentComponent={null}
-            depth={DASHBOARD_ROOT_DEPTH}
-            index={0}
-            orientation="column"
-            onDrop={dropResult => dispatch(handleComponentDrop(dropResult))}
-            editMode={editMode}
-            // you cannot drop on/displace tabs if they already exist
-            disableDragdrop={!!topLevelTabs}
-            style={{
-              zIndex: 100,
-              ...style,
-            }}
-          >
-            {({ dropIndicatorProps }: { dropIndicatorProps: JsonObject }) => (
-              <div>
-                {!hideDashboardHeader && <DashboardHeader />}
-                {dropIndicatorProps && <div {...dropIndicatorProps} />}
-                {topLevelTabs && (
-                  <WithPopoverMenu
-                    shouldFocus={shouldFocusTabs}
-                    menuItems={[
-                      <IconButton
-                        className="fa fa-level-down"
-                        label="Collapse tab content"
-                        onClick={handleDeleteTopLevelTabs}
-                      />,
-                    ]}
-                    editMode={editMode}
-                  >
-                    {/*
-                    // @ts-ignore */}
-                    <DashboardComponent
-                      id={topLevelTabs?.id}
-                      parentId={DASHBOARD_ROOT_ID}
-                      depth={DASHBOARD_ROOT_DEPTH + 1}
-                      index={0}
-                      renderTabContent={false}
-                      renderHoverMenu={false}
-                      onChangeTab={handleChangeTab}
-                    />
-                  </WithPopoverMenu>
-                )}
-              </div>
-            )}
-          </DragDroppable>
-        )}
-      </Sticky>
-      <StyledDashboardContent
-        className="dashboard-content"
-        dashboardFiltersOpen={dashboardFiltersOpen}
-      >
-        {nativeFiltersEnabled && !editMode && (
-          <StickyVerticalBar
-            filtersOpen={dashboardFiltersOpen}
-            topOffset={barTopOffset}
-          >
+    <StyledDiv>
+      {nativeFiltersEnabled && !editMode && (
+        <FiltersPanel>
+          <StickyPanel ref={containerRef} width={filterBarWidth}>
             <ErrorBoundary>
               <FilterBar
                 filtersOpen={dashboardFiltersOpen}
                 toggleFiltersBar={toggleDashboardFiltersOpen}
                 directPathToChild={directPathToChild}
+                width={filterBarWidth}
+                height={filterBarHeight}
+                offset={filterBarOffset}
               />
             </ErrorBoundary>
-          </StickyVerticalBar>
-        )}
-        {showDashboard ? (
-          <DashboardContainer topLevelTabs={topLevelTabs} />
-        ) : (
-          <Loading />
-        )}
-        {editMode && <BuilderComponentPane topOffset={barTopOffset} />}
-      </StyledDashboardContent>
-      <ToastPresenter />
-    </StickyContainer>
+          </StickyPanel>
+        </FiltersPanel>
+      )}
+      <StyledHeader>
+        {/* @ts-ignore */}
+        <DragDroppable
+          data-test="top-level-tabs"
+          component={dashboardRoot}
+          parentComponent={null}
+          depth={DASHBOARD_ROOT_DEPTH}
+          index={0}
+          orientation="column"
+          onDrop={dropResult => dispatch(handleComponentDrop(dropResult))}
+          editMode={editMode}
+          // you cannot drop on/displace tabs if they already exist
+          disableDragDrop={!!topLevelTabs}
+          style={{
+            marginLeft: dashboardFiltersOpen || editMode ? 0 : -32,
+          }}
+        >
+          {({ dropIndicatorProps }: { dropIndicatorProps: JsonObject }) => (
+            <div>
+              {!hideDashboardHeader && <DashboardHeader />}
+              {dropIndicatorProps && <div {...dropIndicatorProps} />}
+              {!isReport && topLevelTabs && (
+                <WithPopoverMenu
+                  shouldFocus={shouldFocusTabs}
+                  menuItems={[
+                    <IconButton
+                      icon={<Icons.FallOutlined iconSize="xl" />}
+                      label="Collapse tab content"
+                      onClick={handleDeleteTopLevelTabs}
+                    />,
+                  ]}
+                  editMode={editMode}
+                >
+                  {/*
+                      // @ts-ignore */}
+                  <DashboardComponent
+                    id={topLevelTabs?.id}
+                    parentId={DASHBOARD_ROOT_ID}
+                    depth={DASHBOARD_ROOT_DEPTH + 1}
+                    index={0}
+                    renderTabContent={false}
+                    renderHoverMenu={false}
+                    onChangeTab={handleChangeTab}
+                  />
+                </WithPopoverMenu>
+              )}
+            </div>
+          )}
+        </DragDroppable>
+      </StyledHeader>
+      <StyledContent fullSizeChartId={fullSizeChartId}>
+        <Global
+          styles={css`
+            // @z-index-above-dashboard-header (100) + 1 = 101
+            ${fullSizeChartId &&
+            `div > .filterStatusPopover.ant-popover{z-index: 101}`}
+          `}
+        />
+        <div
+          data-test="dashboard-content"
+          className={cx('dashboard', editMode && 'dashboard--editing')}
+        >
+          <StyledDashboardContent
+            className="dashboard-content"
+            dashboardFiltersOpen={dashboardFiltersOpen}
+            editMode={editMode}
+          >
+            {showDashboard ? (
+              <DashboardContainer topLevelTabs={topLevelTabs} />
+            ) : (
+              <Loading />
+            )}
+            {editMode && <BuilderComponentPane topOffset={barTopOffset} />}
+          </StyledDashboardContent>
+        </div>
+      </StyledContent>
+    </StyledDiv>
   );
 };
 
diff --git a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.tsx b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.tsx
index 00c5d73ae5b7..933843337a85 100644
--- a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.tsx
+++ b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.tsx
@@ -18,10 +18,11 @@
  */
 // ParentSize uses resize observer so the dashboard will update size
 // when its container size changes, due to e.g., builder side panel opening
-import { ParentSize } from '@vx/responsive';
-import Tabs from 'src/components/Tabs';
 import React, { FC, useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
+import { FeatureFlag, isFeatureEnabled } from '@superset-ui/core';
+import { ParentSize } from '@vx/responsive';
+import Tabs from 'src/components/Tabs';
 import DashboardGrid from 'src/dashboard/containers/DashboardGrid';
 import getLeafComponentIdFromPath from 'src/dashboard/util/getLeafComponentIdFromPath';
 import { DashboardLayout, LayoutItem, RootState } from 'src/dashboard/types';
@@ -29,11 +30,12 @@ import {
   DASHBOARD_GRID_ID,
   DASHBOARD_ROOT_DEPTH,
 } from 'src/dashboard/util/constants';
-import { getRootLevelTabIndex } from './utils';
+import { getRootLevelTabIndex, getRootLevelTabsComponent } from './utils';
 import { Filters } from '../../reducers/types';
 import { getChartIdsInFilterScope } from '../../util/activeDashboardFilters';
+import findTabIndexByComponentId from '../../util/findTabIndexByComponentId';
 import { findTabsWithChartsInScope } from '../nativeFilters/utils';
-import { setFilterConfiguration } from '../../actions/nativeFilters';
+import { setInScopeStatusOfFilters } from '../../actions/nativeFilters';
 
 type DashboardContainerProps = {
   topLevelTabs?: LayoutItem;
@@ -43,9 +45,9 @@ const DashboardContainer: FC<DashboardContainerProps> = ({ topLevelTabs }) => {
   const dashboardLayout = useSelector<RootState, DashboardLayout>(
     state => state.dashboardLayout.present,
   );
-  const nativeFilters = useSelector<RootState, Filters>(
-    state => state.nativeFilters.filters,
-  );
+  const nativeFilters =
+    useSelector<RootState, Filters>(state => state.nativeFilters?.filters) ??
+    {};
   const directPathToChild = useSelector<RootState, string[]>(
     state => state.dashboardState.directPathToChild,
   );
@@ -56,33 +58,48 @@ const DashboardContainer: FC<DashboardContainerProps> = ({ topLevelTabs }) => {
   const dispatch = useDispatch();
 
   useEffect(() => {
-    setTabIndex(getRootLevelTabIndex(dashboardLayout, directPathToChild));
+    const nextTabIndex = findTabIndexByComponentId({
+      currentComponent: getRootLevelTabsComponent(dashboardLayout),
+      directPathToChild,
+    });
+    if (nextTabIndex > -1) {
+      setTabIndex(nextTabIndex);
+    }
   }, [getLeafComponentIdFromPath(directPathToChild)]);
 
   // recalculate charts and tabs in scopes of native filters only when a scope or dashboard layout changes
-  const nativeFiltersValues = Object.values(nativeFilters);
-  const scopes = nativeFiltersValues.map(filter => filter.scope);
+  const filterScopes = Object.values(nativeFilters).map(filter => ({
+    id: filter.id,
+    scope: filter.scope,
+  }));
   useEffect(() => {
-    nativeFiltersValues.forEach(filter => {
-      const filterScope = filter.scope;
-      const chartsInScope = getChartIdsInFilterScope({
+    if (
+      !isFeatureEnabled(FeatureFlag.DASHBOARD_NATIVE_FILTERS) ||
+      filterScopes.length === 0
+    ) {
+      return;
+    }
+    const scopes = filterScopes.map(filterScope => {
+      const { scope } = filterScope;
+      const chartsInScope: number[] = getChartIdsInFilterScope({
         filterScope: {
-          scope: filterScope.rootPath,
+          scope: scope.rootPath,
           // @ts-ignore
-          immune: filterScope.excluded,
+          immune: scope.excluded,
         },
       });
       const tabsInScope = findTabsWithChartsInScope(
         dashboardLayout,
         chartsInScope,
       );
-      Object.assign(filter, {
-        chartsInScope,
+      return {
+        filterId: filterScope.id,
         tabsInScope: Array.from(tabsInScope),
-      });
+        chartsInScope,
+      };
     });
-    dispatch(setFilterConfiguration(nativeFiltersValues));
-  }, [JSON.stringify(scopes), JSON.stringify(dashboardLayout)]);
+    dispatch(setInScopeStatusOfFilters(scopes));
+  }, [JSON.stringify(filterScopes), dashboardLayout, dispatch]);
 
   const childIds: string[] = topLevelTabs
     ? topLevelTabs.children
diff --git a/superset-frontend/src/dashboard/components/DashboardBuilder/state.ts b/superset-frontend/src/dashboard/components/DashboardBuilder/state.ts
index 874525d93d48..71b4cca38d28 100644
--- a/superset-frontend/src/dashboard/components/DashboardBuilder/state.ts
+++ b/superset-frontend/src/dashboard/components/DashboardBuilder/state.ts
@@ -50,7 +50,7 @@ export const useNativeFilters = () => {
     (canEdit || (!canEdit && filterValues.length !== 0));
 
   const requiredFirstFilter = filterValues.filter(
-    ({ requiredFirst }) => requiredFirst,
+    filter => filter.requiredFirst,
   );
   const dataMask = useNativeFiltersDataMask();
   const showDashboard =
diff --git a/superset-frontend/src/dashboard/components/DashboardBuilder/utils.ts b/superset-frontend/src/dashboard/components/DashboardBuilder/utils.ts
index 999adf62a7c8..f2aa381136b4 100644
--- a/superset-frontend/src/dashboard/components/DashboardBuilder/utils.ts
+++ b/superset-frontend/src/dashboard/components/DashboardBuilder/utils.ts
@@ -37,8 +37,7 @@ export const shouldFocusTabs = (
 ) =>
   // don't focus the tabs when we click on a tab
   event.target.className === 'ant-tabs-nav-wrap' ||
-  (/icon-button/.test(event.target.className) &&
-    container.contains(event.target));
+  container.contains(event.target);
 
 export const getRootLevelTabIndex = (
   dashboardLayout: DashboardLayout,
diff --git a/superset-frontend/src/dashboard/components/DeleteComponentButton.jsx b/superset-frontend/src/dashboard/components/DeleteComponentButton.jsx
index 4e3e10d3b0b1..d3936f3ed647 100644
--- a/superset-frontend/src/dashboard/components/DeleteComponentButton.jsx
+++ b/superset-frontend/src/dashboard/components/DeleteComponentButton.jsx
@@ -18,7 +18,7 @@
  */
 import React from 'react';
 import PropTypes from 'prop-types';
-
+import Icons from 'src/components/Icons';
 import IconButton from './IconButton';
 
 const propTypes = {
@@ -30,7 +30,9 @@ const defaultProps = {};
 export default class DeleteComponentButton extends React.PureComponent {
   render() {
     const { onDelete } = this.props;
-    return <IconButton onClick={onDelete} className="fa fa-trash" />;
+    return (
+      <IconButton onClick={onDelete} icon={<Icons.Trash iconSize="xl" />} />
+    );
   }
 }
 
diff --git a/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/DetailsPanel.test.tsx b/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/DetailsPanel.test.tsx
index 239df0f54d70..12efe2c3e5d6 100644
--- a/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/DetailsPanel.test.tsx
+++ b/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/DetailsPanel.test.tsx
@@ -96,6 +96,7 @@ test('Should render "appliedCrossFilterIndicators"', () => {
     <DetailsPanel {...props}>
       <div data-test="details-panel-content">Content</div>
     </DetailsPanel>,
+    { useRedux: true },
   );
 
   userEvent.click(screen.getByTestId('details-panel-content'));
@@ -129,6 +130,7 @@ test('Should render "appliedIndicators"', () => {
     <DetailsPanel {...props}>
       <div data-test="details-panel-content">Content</div>
     </DetailsPanel>,
+    { useRedux: true },
   );
 
   userEvent.click(screen.getByTestId('details-panel-content'));
@@ -160,6 +162,7 @@ test('Should render "incompatibleIndicators"', () => {
     <DetailsPanel {...props}>
       <div data-test="details-panel-content">Content</div>
     </DetailsPanel>,
+    { useRedux: true },
   );
 
   userEvent.click(screen.getByTestId('details-panel-content'));
@@ -193,6 +196,7 @@ test('Should render "unsetIndicators"', () => {
     <DetailsPanel {...props}>
       <div data-test="details-panel-content">Content</div>
     </DetailsPanel>,
+    { useRedux: true },
   );
 
   userEvent.click(screen.getByTestId('details-panel-content'));
@@ -227,6 +231,7 @@ test('Should render empty', () => {
     <DetailsPanel {...props}>
       <div data-test="details-panel-content">Content</div>
     </DetailsPanel>,
+    { useRedux: true },
   );
 
   expect(screen.getByTestId('details-panel-content')).toBeInTheDocument();
diff --git a/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx b/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx
index 5ad9b7838891..54058236c1d2 100644
--- a/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx
+++ b/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
 import { Global, css } from '@emotion/react';
 import { t, useTheme } from '@superset-ui/core';
 import {
@@ -26,7 +27,7 @@ import {
 } from '@ant-design/icons';
 import Popover from 'src/components/Popover';
 import Collapse from 'src/components/Collapse';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import {
   Indent,
   Panel,
@@ -35,6 +36,7 @@ import {
 } from 'src/dashboard/components/FiltersBadge/Styles';
 import { Indicator } from 'src/dashboard/components/FiltersBadge/selectors';
 import FilterIndicator from 'src/dashboard/components/FiltersBadge/FilterIndicator';
+import { RootState } from 'src/dashboard/types';
 
 export interface DetailsPanelProps {
   appliedCrossFilterIndicators: Indicator[];
@@ -53,7 +55,25 @@ const DetailsPanelPopover = ({
   onHighlightFilterSource,
   children,
 }: DetailsPanelProps) => {
+  const [visible, setVisible] = useState(false);
   const theme = useTheme();
+  const activeTabs = useSelector<RootState>(
+    state => state.dashboardState?.activeTabs,
+  );
+
+  // we don't need to clean up useEffect, setting { once: true } removes the event listener after handle function is called
+  useEffect(() => {
+    if (visible) {
+      window.addEventListener('resize', () => setVisible(false), {
+        once: true,
+      });
+    }
+  }, [visible]);
+
+  // if tabs change, popover doesn't close automatically
+  useEffect(() => {
+    setVisible(false);
+  }, [activeTabs]);
 
   const getDefaultActivePanel = () => {
     const result = [];
@@ -77,6 +97,7 @@ const DetailsPanelPopover = ({
   ]);
 
   function handlePopoverStatus(isOpen: boolean) {
+    setVisible(isOpen);
     // every time the popover opens, make sure the most relevant panel is active
     if (isOpen) {
       setActivePanels(getDefaultActivePanel());
@@ -141,6 +162,7 @@ const DetailsPanelPopover = ({
             }
             &.ant-popover {
               color: ${theme.colors.grayscale.light4};
+              z-index: 99;
             }
           }
         `}
@@ -157,9 +179,9 @@ const DetailsPanelPopover = ({
               key="appliedCrossFilters"
               header={
                 <Title bold color={theme.colors.primary.light1}>
-                  <Icon
-                    name="cross-filter-badge"
+                  <Icons.CursorTarget
                     css={{ fill: theme.colors.primary.light1 }}
+                    iconSize="xl"
                   />
                   {t(
                     'Applied Cross Filters (%d)',
@@ -255,6 +277,7 @@ const DetailsPanelPopover = ({
     <Popover
       overlayClassName="filterStatusPopover"
       content={content}
+      visible={visible}
       onVisibleChange={handlePopoverStatus}
       placement="bottom"
       trigger="click"
diff --git a/superset-frontend/src/dashboard/components/FiltersBadge/FilterIndicator/index.tsx b/superset-frontend/src/dashboard/components/FiltersBadge/FilterIndicator/index.tsx
index f962a72e478e..e94bca37751d 100644
--- a/superset-frontend/src/dashboard/components/FiltersBadge/FilterIndicator/index.tsx
+++ b/superset-frontend/src/dashboard/components/FiltersBadge/FilterIndicator/index.tsx
@@ -21,6 +21,7 @@ import { SearchOutlined } from '@ant-design/icons';
 import React, { FC } from 'react';
 import { getFilterValueForDisplay } from 'src/dashboard/components/nativeFilters/FilterBar/FilterSets/utils';
 import {
+  FilterIndicatorText,
   FilterValue,
   Item,
   ItemIcon,
@@ -31,24 +32,29 @@ import { Indicator } from 'src/dashboard/components/FiltersBadge/selectors';
 export interface IndicatorProps {
   indicator: Indicator;
   onClick?: (path: string[]) => void;
+  text?: string;
 }
 
 const FilterIndicator: FC<IndicatorProps> = ({
   indicator: { column, name, value, path = [] },
   onClick = () => {},
+  text,
 }) => {
   const resultValue = getFilterValueForDisplay(value);
   return (
-    <Item onClick={() => onClick([...path, `LABEL-${column}`])}>
-      <Title bold>
-        <ItemIcon>
-          <SearchOutlined />
-        </ItemIcon>
-        {name}
-        {resultValue ? ': ' : ''}
-      </Title>
-      <FilterValue>{resultValue}</FilterValue>
-    </Item>
+    <>
+      <Item onClick={() => onClick([...path, `LABEL-${column}`])}>
+        <Title bold>
+          <ItemIcon>
+            <SearchOutlined />
+          </ItemIcon>
+          {name}
+          {resultValue ? ': ' : ''}
+        </Title>
+        <FilterValue>{resultValue}</FilterValue>
+      </Item>
+      {text && <FilterIndicatorText>{text}</FilterIndicatorText>}
+    </>
   );
 };
 
diff --git a/superset-frontend/src/dashboard/components/FiltersBadge/Styles.tsx b/superset-frontend/src/dashboard/components/FiltersBadge/Styles.tsx
index 74ffd1967789..2fa1afb944ef 100644
--- a/superset-frontend/src/dashboard/components/FiltersBadge/Styles.tsx
+++ b/superset-frontend/src/dashboard/components/FiltersBadge/Styles.tsx
@@ -35,7 +35,7 @@ export const Pill = styled.div`
 
   svg {
     position: relative;
-    top: -1px;
+    top: -2px;
     color: ${({ theme }) => theme.colors.grayscale.light5};
     width: 1em;
     height: 1em;
@@ -153,3 +153,13 @@ export const FilterValue = styled.div`
   overflow: auto;
   color: ${({ theme }) => theme.colors.grayscale.light5};
 `;
+
+export const FilterIndicatorText = styled.div`
+  ${({ theme }) => `
+  padding-top: ${theme.gridUnit * 3}px;
+  max-width: 100%;
+  flex-grow: 1;
+  overflow: auto;
+  color: ${theme.colors.grayscale.light5};
+  `}
+`;
diff --git a/superset-frontend/src/dashboard/components/FiltersBadge/index.tsx b/superset-frontend/src/dashboard/components/FiltersBadge/index.tsx
index 506dc5216fe4..b9c2b5f736f2 100644
--- a/superset-frontend/src/dashboard/components/FiltersBadge/index.tsx
+++ b/superset-frontend/src/dashboard/components/FiltersBadge/index.tsx
@@ -16,29 +16,158 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { uniqWith } from 'lodash';
 import cx from 'classnames';
-import Icon from 'src/components/Icon';
 import Icons from 'src/components/Icons';
+import { usePrevious } from 'src/common/hooks/usePrevious';
+import { DataMaskStateWithId } from 'src/dataMask/types';
 import DetailsPanelPopover from './DetailsPanel';
 import { Pill } from './Styles';
-import { Indicator } from './selectors';
+import {
+  Indicator,
+  IndicatorStatus,
+  selectIndicatorsForChart,
+  selectNativeIndicatorsForChart,
+} from './selectors';
+import { setDirectPathToChild } from '../../actions/dashboardState';
+import {
+  ChartsState,
+  DashboardInfo,
+  DashboardLayout,
+  RootState,
+} from '../../types';
+import { Filters } from '../../reducers/types';
 
 export interface FiltersBadgeProps {
-  appliedCrossFilterIndicators: Indicator[];
-  appliedIndicators: Indicator[];
-  unsetIndicators: Indicator[];
-  incompatibleIndicators: Indicator[];
-  onHighlightFilterSource: (path: string[]) => void;
+  chartId: number;
 }
 
-const FiltersBadge = ({
-  appliedCrossFilterIndicators,
-  appliedIndicators,
-  unsetIndicators,
-  incompatibleIndicators,
-  onHighlightFilterSource,
-}: FiltersBadgeProps) => {
+const sortByStatus = (indicators: Indicator[]): Indicator[] => {
+  const statuses = [
+    IndicatorStatus.Applied,
+    IndicatorStatus.Unset,
+    IndicatorStatus.Incompatible,
+  ];
+  return indicators.sort(
+    (a, b) =>
+      statuses.indexOf(a.status as IndicatorStatus) -
+      statuses.indexOf(b.status as IndicatorStatus),
+  );
+};
+
+export const FiltersBadge = ({ chartId }: FiltersBadgeProps) => {
+  const dispatch = useDispatch();
+  const datasources = useSelector<RootState, any>(state => state.datasources);
+  const dashboardFilters = useSelector<RootState, any>(
+    state => state.dashboardFilters,
+  );
+  const nativeFilters = useSelector<RootState, Filters>(
+    state => state.nativeFilters?.filters,
+  );
+  const dashboardInfo = useSelector<RootState, DashboardInfo>(
+    state => state.dashboardInfo,
+  );
+  const charts = useSelector<RootState, ChartsState>(state => state.charts);
+  const present = useSelector<RootState, DashboardLayout>(
+    state => state.dashboardLayout.present,
+  );
+  const dataMask = useSelector<RootState, DataMaskStateWithId>(
+    state => state.dataMask,
+  );
+
+  const [nativeIndicators, setNativeIndicators] = useState<Indicator[]>([]);
+  const [dashboardIndicators, setDashboardIndicators] = useState<Indicator[]>(
+    [],
+  );
+
+  const onHighlightFilterSource = useCallback(
+    (path: string[]) => {
+      dispatch(setDirectPathToChild(path));
+    },
+    [dispatch],
+  );
+
+  const chart = charts[chartId];
+  const prevChartStatus = usePrevious(chart?.chartStatus);
+
+  const showIndicators = useCallback(
+    () =>
+      chart?.chartStatus && ['rendered', 'success'].includes(chart.chartStatus),
+    [chart.chartStatus],
+  );
+  useEffect(() => {
+    if (!showIndicators) {
+      setDashboardIndicators([]);
+    }
+    if (prevChartStatus !== 'success') {
+      setDashboardIndicators(
+        selectIndicatorsForChart(chartId, dashboardFilters, datasources, chart),
+      );
+    }
+  }, [
+    chart,
+    chartId,
+    dashboardFilters,
+    datasources,
+    prevChartStatus,
+    showIndicators,
+  ]);
+
+  useEffect(() => {
+    if (!showIndicators) {
+      setNativeIndicators([]);
+    }
+    if (prevChartStatus !== 'success') {
+      setNativeIndicators(
+        selectNativeIndicatorsForChart(
+          nativeFilters,
+          dataMask,
+          chartId,
+          chart,
+          present,
+          dashboardInfo.metadata?.chart_configuration,
+        ),
+      );
+    }
+  }, [
+    chart,
+    chartId,
+    dashboardInfo.metadata?.chart_configuration,
+    dataMask,
+    nativeFilters,
+    present,
+    prevChartStatus,
+    showIndicators,
+  ]);
+
+  const indicators = useMemo(
+    () =>
+      uniqWith(
+        sortByStatus([...dashboardIndicators, ...nativeIndicators]),
+        (ind1, ind2) =>
+          ind1.column === ind2.column &&
+          ind1.name === ind2.name &&
+          (ind1.status !== IndicatorStatus.Applied ||
+            ind2.status !== IndicatorStatus.Applied),
+      ),
+    [dashboardIndicators, nativeIndicators],
+  );
+
+  const appliedCrossFilterIndicators = indicators.filter(
+    indicator => indicator.status === IndicatorStatus.CrossFilterApplied,
+  );
+  const appliedIndicators = indicators.filter(
+    indicator => indicator.status === IndicatorStatus.Applied,
+  );
+  const unsetIndicators = indicators.filter(
+    indicator => indicator.status === IndicatorStatus.Unset,
+  );
+  const incompatibleIndicators = indicators.filter(
+    indicator => indicator.status === IndicatorStatus.Incompatible,
+  );
+
   if (
     !appliedCrossFilterIndicators.length &&
     !appliedIndicators.length &&
@@ -69,7 +198,7 @@ const FiltersBadge = ({
           isInactive && 'filters-inactive',
         )}
       >
-        <Icon name="filter" />
+        <Icons.Filter iconSize="m" />
         {!isInactive && (
           <span data-test="applied-filter-count">
             {appliedIndicators.length + appliedCrossFilterIndicators.length}
@@ -89,4 +218,4 @@ const FiltersBadge = ({
   );
 };
 
-export default FiltersBadge;
+export default React.memo(FiltersBadge);
diff --git a/superset-frontend/src/dashboard/components/FiltersBadge/selectors.ts b/superset-frontend/src/dashboard/components/FiltersBadge/selectors.ts
index 9d7b84799ba5..34bdfce6d975 100644
--- a/superset-frontend/src/dashboard/components/FiltersBadge/selectors.ts
+++ b/superset-frontend/src/dashboard/components/FiltersBadge/selectors.ts
@@ -16,14 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { TIME_FILTER_MAP } from 'src/explore/constants';
+import { NO_TIME_RANGE, TIME_FILTER_MAP } from 'src/explore/constants';
 import { getChartIdsInFilterScope } from 'src/dashboard/util/activeDashboardFilters';
-import {
-  ChartConfiguration,
-  NativeFiltersState,
-} from 'src/dashboard/reducers/types';
+import { ChartConfiguration, Filters } from 'src/dashboard/reducers/types';
 import { DataMaskStateWithId, DataMaskType } from 'src/dataMask/types';
-import { FeatureFlag, isFeatureEnabled } from '@superset-ui/core';
+import {
+  ensureIsArray,
+  FeatureFlag,
+  FilterState,
+  isFeatureEnabled,
+} from '@superset-ui/core';
 import { Layout } from '../../types';
 import { getTreeCheckedItems } from '../nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils';
 
@@ -53,6 +55,16 @@ type Filter = {
   datasourceId: string;
 };
 
+const extractLabel = (filter?: FilterState): string | null => {
+  if (filter?.label) {
+    return filter.label;
+  }
+  if (filter?.value) {
+    return ensureIsArray(filter?.value).join(', ');
+  }
+  return null;
+};
+
 const selectIndicatorValue = (
   columnKey: string,
   filter: Filter,
@@ -63,7 +75,7 @@ const selectIndicatorValue = (
 
   if (
     values == null ||
-    (filter.isDateFilter && values === 'No filter') ||
+    (filter.isDateFilter && values === NO_TIME_RANGE) ||
     arrValues.length === 0
   ) {
     return [];
@@ -147,12 +159,8 @@ export const selectIndicatorsForChart = (
   chartId: number,
   filters: { [key: number]: Filter },
   datasources: { [key: string]: Datasource },
-  charts: any,
+  chart: any,
 ): Indicator[] => {
-  const chart = charts[chartId];
-  // no indicators if chart is loading
-  if (chart.chartStatus === 'loading') return [];
-
   // for now we only need to know which columns are compatible/incompatible,
   // so grab the columns from the applied/rejected filters
   const appliedColumns = getAppliedColumns(chart);
@@ -178,29 +186,27 @@ export const selectIndicatorsForChart = (
 };
 
 export const selectNativeIndicatorsForChart = (
-  nativeFilters: NativeFiltersState,
+  nativeFilters: Filters,
   dataMask: DataMaskStateWithId,
   chartId: number,
-  charts: any,
+  chart: any,
   dashboardLayout: Layout,
   chartConfiguration: ChartConfiguration = {},
 ): Indicator[] => {
-  const chart = charts[chartId];
-
   const appliedColumns = getAppliedColumns(chart);
   const rejectedColumns = getRejectedColumns(chart);
 
   const getStatus = ({
-    value,
+    label,
     column,
     type = DataMaskType.NativeFilters,
   }: {
-    value: any;
+    label: string | null;
     column?: string;
     type?: DataMaskType;
   }): IndicatorStatus => {
     // a filter is only considered unset if it's value is null
-    const hasValue = value !== null;
+    const hasValue = label !== null;
     if (type === DataMaskType.CrossFilters && hasValue) {
       return IndicatorStatus.CrossFilterApplied;
     }
@@ -218,29 +224,27 @@ export const selectNativeIndicatorsForChart = (
 
   let nativeFilterIndicators: any = [];
   if (isFeatureEnabled(FeatureFlag.DASHBOARD_NATIVE_FILTERS)) {
-    nativeFilterIndicators = Object.values(nativeFilters.filters)
-      .filter(nativeFilter =>
-        getTreeCheckedItems(nativeFilter.scope, dashboardLayout).some(
-          layoutItem => dashboardLayout[layoutItem]?.meta?.chartId === chartId,
-        ),
-      )
-      .map(nativeFilter => {
-        const column = nativeFilter.targets[0]?.column?.name;
-        let value =
-          dataMask[nativeFilter.id]?.filterState?.label ??
-          dataMask[nativeFilter.id]?.filterState?.value ??
-          null;
-        if (!Array.isArray(value) && value !== null) {
-          value = [value];
-        }
-        return {
-          column,
-          name: nativeFilter.name,
-          path: [nativeFilter.id],
-          status: getStatus({ value, column }),
-          value,
-        };
-      });
+    nativeFilterIndicators =
+      nativeFilters &&
+      Object.values(nativeFilters)
+        .filter(nativeFilter =>
+          getTreeCheckedItems(nativeFilter.scope, dashboardLayout).some(
+            layoutItem =>
+              dashboardLayout[layoutItem]?.meta?.chartId === chartId,
+          ),
+        )
+        .map(nativeFilter => {
+          const column = nativeFilter.targets[0]?.column?.name;
+          const filterState = dataMask[nativeFilter.id]?.filterState;
+          const label = extractLabel(filterState);
+          return {
+            column,
+            name: nativeFilter.name,
+            path: [nativeFilter.id],
+            status: getStatus({ label, column }),
+            value: label,
+          };
+        });
   }
 
   let crossFilterIndicators: any = [];
@@ -255,23 +259,26 @@ export const selectNativeIndicatorsForChart = (
         ),
       )
       .map(chartConfig => {
-        let value =
-          dataMask[chartConfig.id]?.filterState?.label ??
-          dataMask[chartConfig.id]?.filterState?.value ??
-          null;
-        if (!Array.isArray(value) && value !== null) {
-          value = [value];
-        }
+        const filterState = dataMask[chartConfig.id]?.filterState;
+        const label = extractLabel(filterState);
+        const filtersState = filterState?.filters;
+        const column = filtersState && Object.keys(filtersState)[0];
+
+        const dashboardLayoutItem = Object.values(dashboardLayout).find(
+          layoutItem => layoutItem?.meta?.chartId === chartConfig.id,
+        );
         return {
-          name: Object.values(dashboardLayout).find(
-            layoutItem => layoutItem?.meta?.chartId === chartConfig.id,
-          )?.meta?.sliceName as string,
-          path: [`${chartConfig.id}`],
+          column,
+          name: dashboardLayoutItem?.meta?.sliceName as string,
+          path: [
+            ...(dashboardLayoutItem?.parents ?? []),
+            dashboardLayoutItem?.id,
+          ],
           status: getStatus({
-            value,
+            label,
             type: DataMaskType.CrossFilters,
           }),
-          value,
+          value: label,
         };
       })
       .filter(filter => filter.status === IndicatorStatus.CrossFilterApplied);
diff --git a/superset-frontend/src/dashboard/components/Header/Header.test.tsx b/superset-frontend/src/dashboard/components/Header/Header.test.tsx
index d5393b227559..8a9ecdb5be46 100644
--- a/superset-frontend/src/dashboard/components/Header/Header.test.tsx
+++ b/superset-frontend/src/dashboard/components/Header/Header.test.tsx
@@ -19,7 +19,12 @@
 import React from 'react';
 import { render, screen, fireEvent } from 'spec/helpers/testing-library';
 import userEvent from '@testing-library/user-event';
+import sinon from 'sinon';
 import fetchMock from 'fetch-mock';
+import * as actions from 'src/reports/actions/reports';
+import * as featureFlags from 'src/featureFlags';
+import { ReportObject } from 'src/components/ReportModal';
+import mockState from 'spec/fixtures/mockStateWithoutUser';
 import { HeaderProps } from './types';
 import Header from '.';
 
@@ -32,12 +37,24 @@ const createProps = () => ({
     dash_edit_perm: false,
     dash_save_perm: false,
     dash_share_perm: false,
-    userId: 1,
+    userId: '1',
     metadata: {},
     common: {
       conf: {},
     },
   },
+  user: {
+    createdOn: '2021-04-27T18:12:38.952304',
+    email: 'admin@test.com',
+    firstName: 'admin',
+    isActive: true,
+    lastName: 'admin',
+    permissions: {},
+    roles: { Admin: [['menu_access', 'Manage']] },
+    userId: 1,
+    username: 'admin',
+  },
+  reports: {},
   dashboardTitle: 'Dashboard Title',
   charts: {},
   layout: {},
@@ -53,6 +70,8 @@ const createProps = () => ({
   onChange: jest.fn(),
   fetchFaveStar: jest.fn(),
   fetchCharts: jest.fn(),
+  onRefresh: jest.fn(),
+  fetchUISpecificReport: jest.fn(),
   saveFaveStar: jest.fn(),
   savePublished: jest.fn(),
   isPublished: false,
@@ -94,7 +113,10 @@ const redoProps = {
   redoLength: 1,
 };
 
+const REPORT_ENDPOINT = 'glob:*/api/v1/report*';
+
 fetchMock.get('glob:*/csstemplateasyncmodelview/api/read', {});
+fetchMock.get(REPORT_ENDPOINT, {});
 
 function setup(props: HeaderProps) {
   return (
@@ -248,6 +270,21 @@ test('should render the selected fave icon', () => {
   ).toBeInTheDocument();
 });
 
+test('should NOT render the fave icon on anonymous user', () => {
+  const mockedProps = createProps();
+  const anonymousUserProps = {
+    ...mockedProps,
+    user: undefined,
+  };
+  render(setup(anonymousUserProps));
+  expect(() =>
+    screen.getByRole('img', { name: 'favorite-unselected' }),
+  ).toThrowError('Unable to find');
+  expect(() =>
+    screen.getByRole('img', { name: 'favorite-selected' }),
+  ).toThrowError('Unable to find');
+});
+
 test('should fave', async () => {
   const mockedProps = createProps();
   render(setup(mockedProps));
@@ -284,5 +321,146 @@ test('should refresh the charts', async () => {
   render(setup(mockedProps));
   await openActionsDropdown();
   userEvent.click(screen.getByText('Refresh dashboard'));
-  expect(mockedProps.fetchCharts).toHaveBeenCalledTimes(1);
+  expect(mockedProps.onRefresh).toHaveBeenCalledTimes(1);
+});
+
+describe('Email Report Modal', () => {
+  let isFeatureEnabledMock: any;
+  let dispatch: any;
+
+  beforeEach(async () => {
+    isFeatureEnabledMock = jest
+      .spyOn(featureFlags, 'isFeatureEnabled')
+      .mockImplementation(() => true);
+    dispatch = sinon.spy();
+  });
+
+  afterAll(() => {
+    isFeatureEnabledMock.mockRestore();
+  });
+
+  it('creates a new email report', async () => {
+    // ---------- Render/value setup ----------
+    const mockedProps = createProps();
+    render(setup(mockedProps), { useRedux: true });
+
+    const reportValues = {
+      active: true,
+      creation_method: 'dashboards',
+      crontab: '0 12 * * 1',
+      dashboard: mockedProps.dashboardInfo.id,
+      name: 'Weekly Report',
+      owners: [mockedProps.user.userId],
+      recipients: [
+        {
+          recipient_config_json: {
+            target: mockedProps.user.email,
+          },
+          type: 'Email',
+        },
+      ],
+      type: 'Report',
+    };
+    // This is needed to structure the reportValues to match the fetchMock return
+    const stringyReportValues = `{"active":true,"creation_method":"dashboards","crontab":"0 12 * * 1","dashboard":${mockedProps.dashboardInfo.id},"name":"Weekly Report","owners":[${mockedProps.user.userId}],"recipients":[{"recipient_config_json":{"target":"${mockedProps.user.email}"},"type":"Email"}],"type":"Report"}`;
+    // Watch for report POST
+    fetchMock.post(REPORT_ENDPOINT, reportValues);
+
+    screen.logTestingPlaygroundURL();
+    // ---------- Begin tests ----------
+    // Click calendar icon to open email report modal
+    const emailReportModalButton = screen.getByRole('button', {
+      name: /schedule email report/i,
+    });
+    userEvent.click(emailReportModalButton);
+
+    // Click "Add" button to create a new email report
+    const addButton = screen.getByRole('button', { name: /add/i });
+    userEvent.click(addButton);
+
+    // Mock addReport from Redux
+    const makeRequest = () => {
+      const request = actions.addReport(reportValues as ReportObject);
+      return request(dispatch);
+    };
+
+    return makeRequest().then(() => {
+      // 🐞 ----- There are 2 POST calls at this point ----- 🐞
+
+      // addReport's mocked POST return should match the mocked values
+      expect(fetchMock.lastOptions()?.body).toEqual(stringyReportValues);
+      // Dispatch should be called once for addReport
+      expect(dispatch.callCount).toBe(2);
+      const reportCalls = fetchMock.calls(REPORT_ENDPOINT);
+      expect(reportCalls).toHaveLength(2);
+    });
+  });
+
+  it('edits an existing email report', async () => {
+    // TODO (lyndsiWilliams): This currently does not work, see TODOs below
+    //  The modal does appear with the edit title, but the PUT call is not registering
+
+    // ---------- Render/value setup ----------
+    const mockedProps = createProps();
+    const editedReportValues = {
+      active: true,
+      creation_method: 'dashboards',
+      crontab: '0 12 * * 1',
+      dashboard: mockedProps.dashboardInfo.id,
+      name: 'Weekly Report edit',
+      owners: [mockedProps.user.userId],
+      recipients: [
+        {
+          recipient_config_json: {
+            target: mockedProps.user.email,
+          },
+          type: 'Email',
+        },
+      ],
+      type: 'Report',
+    };
+
+    // getMockStore({ reports: reportValues });
+    render(setup(mockedProps), {
+      useRedux: true,
+      initialState: mockState,
+    });
+    // TODO (lyndsiWilliams): currently fetchMock detects this PUT
+    //  address as 'glob:*/api/v1/report/undefined', is not detected
+    //  on fetchMock.calls()
+    fetchMock.put(`glob:*/api/v1/report*`, editedReportValues);
+
+    // Mock fetchUISpecificReport from Redux
+    // const makeFetchRequest = () => {
+    //   const request = actions.fetchUISpecificReport(
+    //     mockedProps.user.userId,
+    //     'dashboard_id',
+    //     'dashboards',
+    //     mockedProps.dashboardInfo.id,
+    //   );
+    //   return request(dispatch);
+    // };
+
+    // makeFetchRequest();
+
+    dispatch(actions.setReport(editedReportValues));
+
+    // ---------- Begin tests ----------
+    // Click calendar icon to open email report modal
+    const emailReportModalButton = screen.getByRole('button', {
+      name: /schedule email report/i,
+    });
+    userEvent.click(emailReportModalButton);
+
+    const nameTextbox = screen.getByTestId('report-name-test');
+    userEvent.type(nameTextbox, ' edit');
+
+    const saveButton = screen.getByRole('button', { name: /save/i });
+    userEvent.click(saveButton);
+
+    // TODO (lyndsiWilliams): There should be a report in state at this porint,
+    // which would render the HeaderReportActionsDropDown under the calendar icon
+    // BLOCKER: I cannot get report to populate, as its data is handled through redux
+    expect.anything();
+  });
 });
diff --git a/superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/HeaderActionsDropdown.test.tsx b/superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/HeaderActionsDropdown.test.tsx
index a5f7bab11c83..1b1cb30424e8 100644
--- a/superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/HeaderActionsDropdown.test.tsx
+++ b/superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/HeaderActionsDropdown.test.tsx
@@ -32,7 +32,7 @@ const createProps = () => ({
     id: 1,
     dash_edit_perm: true,
     dash_save_perm: true,
-    userId: 1,
+    userId: '1',
     metadata: {},
     common: {
       conf: {},
@@ -112,7 +112,7 @@ test('should render the menu items', async () => {
   expect(screen.getByText('Refresh dashboard')).toBeInTheDocument();
   expect(screen.getByText('Set auto-refresh interval')).toBeInTheDocument();
   expect(screen.getByText('Download as image')).toBeInTheDocument();
-  expect(screen.getByText('Toggle fullscreen')).toBeInTheDocument();
+  expect(screen.getByText('Enter fullscreen')).toBeInTheDocument();
 });
 
 test('should render the menu items in edit mode', async () => {
diff --git a/superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx b/superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx
index 4ed5fd623d15..0e276291a0d4 100644
--- a/superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx
+++ b/superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx
@@ -22,7 +22,7 @@ import PropTypes from 'prop-types';
 import { styled, SupersetClient, t } from '@superset-ui/core';
 
 import { Menu, NoAnimationDropdown } from 'src/common/components';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import { URL_PARAMS } from 'src/constants';
 import ShareMenuItems from 'src/dashboard/components/menu/ShareMenuItems';
 import CssEditor from 'src/dashboard/components/CssEditor';
@@ -42,6 +42,7 @@ const propTypes = {
   dashboardInfo: PropTypes.object.isRequired,
   dashboardId: PropTypes.number.isRequired,
   dashboardTitle: PropTypes.string.isRequired,
+  dataMask: PropTypes.object.isRequired,
   customCss: PropTypes.string.isRequired,
   colorNamespace: PropTypes.string,
   colorScheme: PropTypes.string,
@@ -87,6 +88,9 @@ const MENU_KEYS = {
 
 const DropdownButton = styled.div`
   margin-left: ${({ theme }) => theme.gridUnit * 2.5}px;
+  span {
+    color: ${({ theme }) => theme.colors.grayscale.base};
+  }
 `;
 
 const SCREENSHOT_NODE_SELECTOR = '.dashboard';
@@ -158,18 +162,21 @@ class HeaderActionsDropdown extends React.PureComponent {
         downloadAsImage(
           SCREENSHOT_NODE_SELECTOR,
           this.props.dashboardTitle,
+          {},
+          true,
         )(domEvent).then(() => {
           menu.style.visibility = 'visible';
         });
         break;
       }
       case MENU_KEYS.TOGGLE_FULLSCREEN: {
-        const url = getDashboardUrl(
-          window.location.pathname,
-          getActiveFilters(),
-          window.location.hash,
-          !getUrlParam(URL_PARAMS.standalone),
-        );
+        const url = getDashboardUrl({
+          dataMask: this.props.dataMask,
+          pathname: window.location.pathname,
+          filters: getActiveFilters(),
+          hash: window.location.hash,
+          standalone: !getUrlParam(URL_PARAMS.standalone),
+        });
         window.location.replace(url);
         break;
       }
@@ -183,6 +190,7 @@ class HeaderActionsDropdown extends React.PureComponent {
       dashboardTitle,
       dashboardId,
       dashboardInfo,
+      dataMask,
       refreshFrequency,
       shouldPersistRefreshFrequency,
       editMode,
@@ -206,11 +214,13 @@ class HeaderActionsDropdown extends React.PureComponent {
     const emailTitle = t('Superset dashboard');
     const emailSubject = `${emailTitle} ${dashboardTitle}`;
     const emailBody = t('Check out this dashboard: ');
-    const url = getDashboardUrl(
-      window.location.pathname,
-      getActiveFilters(),
-      window.location.hash,
-    );
+
+    const url = getDashboardUrl({
+      dataMask,
+      pathname: window.location.pathname,
+      filters: getActiveFilters(),
+      hash: window.location.hash,
+    });
 
     const menu = (
       <Menu
@@ -307,7 +317,9 @@ class HeaderActionsDropdown extends React.PureComponent {
 
         {!editMode && (
           <Menu.Item key={MENU_KEYS.TOGGLE_FULLSCREEN}>
-            {t('Toggle fullscreen')}
+            {getUrlParam(URL_PARAMS.standalone)
+              ? t('Exit fullscreen')
+              : t('Enter fullscreen')}
           </Menu.Item>
         )}
       </Menu>
@@ -321,7 +333,7 @@ class HeaderActionsDropdown extends React.PureComponent {
         }
       >
         <DropdownButton id="save-dash-split-button" role="button">
-          <Icon name="more-horiz" />
+          <Icons.MoreHoriz />
         </DropdownButton>
       </NoAnimationDropdown>
     );
diff --git a/superset-frontend/src/dashboard/components/Header/index.jsx b/superset-frontend/src/dashboard/components/Header/index.jsx
index 6befcbbc789f..9198601ae685 100644
--- a/superset-frontend/src/dashboard/components/Header/index.jsx
+++ b/superset-frontend/src/dashboard/components/Header/index.jsx
@@ -28,31 +28,39 @@ import {
   LOG_ACTIONS_FORCE_REFRESH_DASHBOARD,
   LOG_ACTIONS_TOGGLE_EDIT_DASHBOARD,
 } from 'src/logger/LogUtils';
+import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags';
 
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import Button from 'src/components/Button';
 import EditableTitle from 'src/components/EditableTitle';
 import FaveStar from 'src/components/FaveStar';
 import { safeStringify } from 'src/utils/safeStringify';
 import HeaderActionsDropdown from 'src/dashboard/components/Header/HeaderActionsDropdown';
+import HeaderReportActionsDropdown from 'src/components/ReportModal/HeaderReportActionsDropdown';
 import PublishedStatus from 'src/dashboard/components/PublishedStatus';
 import UndoRedoKeyListeners from 'src/dashboard/components/UndoRedoKeyListeners';
 import PropertiesModal from 'src/dashboard/components/PropertiesModal';
+import ReportModal from 'src/components/ReportModal';
 import { chartPropShape } from 'src/dashboard/util/propShapes';
+import { UserWithPermissionsAndRoles } from 'src/types/bootstrapTypes';
 import {
   UNDO_LIMIT,
   SAVE_TYPE_OVERWRITE,
   DASHBOARD_POSITION_DATA_LIMIT,
 } from 'src/dashboard/util/constants';
-import setPeriodicRunner from 'src/dashboard/util/setPeriodicRunner';
+import setPeriodicRunner, {
+  stopPeriodicRender,
+} from 'src/dashboard/util/setPeriodicRunner';
 import { options as PeriodicRefreshOptions } from 'src/dashboard/components/RefreshIntervalModal';
 
 const propTypes = {
   addSuccessToast: PropTypes.func.isRequired,
   addDangerToast: PropTypes.func.isRequired,
   addWarningToast: PropTypes.func.isRequired,
+  user: UserWithPermissionsAndRoles,
   dashboardInfo: PropTypes.object.isRequired,
   dashboardTitle: PropTypes.string.isRequired,
+  dataMask: PropTypes.object.isRequired,
   charts: PropTypes.objectOf(chartPropShape).isRequired,
   layout: PropTypes.object.isRequired,
   expandedSlices: PropTypes.object.isRequired,
@@ -67,6 +75,7 @@ const propTypes = {
   onChange: PropTypes.func.isRequired,
   fetchFaveStar: PropTypes.func.isRequired,
   fetchCharts: PropTypes.func.isRequired,
+  fetchUISpecificReport: PropTypes.func.isRequired,
   saveFaveStar: PropTypes.func.isRequired,
   savePublished: PropTypes.func.isRequired,
   updateDashboardTitle: PropTypes.func.isRequired,
@@ -80,6 +89,7 @@ const propTypes = {
   lastModifiedTime: PropTypes.number.isRequired,
 
   // redux
+  onRefresh: PropTypes.func.isRequired,
   onUndo: PropTypes.func.isRequired,
   onRedo: PropTypes.func.isRequired,
   undoLength: PropTypes.number.isRequired,
@@ -108,6 +118,9 @@ const StyledDashboardHeader = styled.div`
   padding: 0 ${({ theme }) => theme.gridUnit * 6}px;
   border-bottom: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
 
+  .action-button > span {
+    color: ${({ theme }) => theme.colors.grayscale.base};
+  }
   button,
   .fave-unfave-icon {
     margin-left: ${({ theme }) => theme.gridUnit * 2}px;
@@ -118,13 +131,17 @@ const StyledDashboardHeader = styled.div`
     flex-wrap: nowrap;
     .action-button {
       font-size: ${({ theme }) => theme.typography.sizes.xl}px;
+      margin-left: ${({ theme }) => theme.gridUnit * 2.5}px;
     }
   }
 `;
 
 class Header extends React.PureComponent {
   static discardChanges() {
-    window.location.reload();
+    const url = new URL(window.location.href);
+
+    url.searchParams.delete('edit');
+    window.location.assign(url);
   }
 
   constructor(props) {
@@ -133,6 +150,7 @@ class Header extends React.PureComponent {
       didNotifyMaxUndoHistoryToast: false,
       emphasizeUndo: false,
       showingPropertiesModal: false,
+      showingReportModal: false,
     };
 
     this.handleChangeText = this.handleChangeText.bind(this);
@@ -144,14 +162,28 @@ class Header extends React.PureComponent {
     this.overwriteDashboard = this.overwriteDashboard.bind(this);
     this.showPropertiesModal = this.showPropertiesModal.bind(this);
     this.hidePropertiesModal = this.hidePropertiesModal.bind(this);
+    this.showReportModal = this.showReportModal.bind(this);
+    this.hideReportModal = this.hideReportModal.bind(this);
+    this.renderReportModal = this.renderReportModal.bind(this);
   }
 
   componentDidMount() {
-    const { refreshFrequency } = this.props;
+    const { refreshFrequency, user, dashboardInfo } = this.props;
     this.startPeriodicRender(refreshFrequency * 1000);
+    if (this.canAddReports()) {
+      // this is in case there is an anonymous user.
+      this.props.fetchUISpecificReport(
+        user.userId,
+        'dashboard_id',
+        'dashboards',
+        dashboardInfo.id,
+        user.email,
+      );
+    }
   }
 
   UNSAFE_componentWillReceiveProps(nextProps) {
+    const { user } = this.props;
     if (
       UNDO_LIMIT - nextProps.undoLength <= 0 &&
       !this.state.didNotifyMaxUndoHistoryToast
@@ -165,9 +197,24 @@ class Header extends React.PureComponent {
     ) {
       this.props.setMaxUndoHistoryExceeded();
     }
+    if (
+      this.canAddReports() &&
+      nextProps.dashboardInfo.id !== this.props.dashboardInfo.id
+    ) {
+      // this is in case there is an anonymous user.
+      this.props.fetchUISpecificReport(
+        user.userId,
+        'dashboard_id',
+        'dashboards',
+        nextProps.dashboardInfo.id,
+        user.email,
+      );
+    }
   }
 
   componentWillUnmount() {
+    stopPeriodicRender(this.refreshTimer);
+    this.props.setRefreshFrequency(0);
     clearTimeout(this.ctrlYTimeout);
     clearTimeout(this.ctrlZTimeout);
   }
@@ -208,8 +255,7 @@ class Header extends React.PureComponent {
         interval: 0,
         chartCount: chartList.length,
       });
-
-      return this.props.fetchCharts(
+      return this.props.onRefresh(
         chartList,
         true,
         0,
@@ -326,7 +372,7 @@ class Header extends React.PureComponent {
     if (positionJSONLength >= limit) {
       this.props.addDangerToast(
         t(
-          'Your dashboard is too large. Please reduce the size before save it.',
+          'Your dashboard is too large. Please reduce its size before saving it.',
         ),
       );
     } else {
@@ -346,6 +392,55 @@ class Header extends React.PureComponent {
     this.setState({ showingPropertiesModal: false });
   }
 
+  showReportModal() {
+    this.setState({ showingReportModal: true });
+  }
+
+  hideReportModal() {
+    this.setState({ showingReportModal: false });
+  }
+
+  renderReportModal() {
+    const attachedReportExists = !!Object.keys(this.props.reports).length;
+    return attachedReportExists ? (
+      <HeaderReportActionsDropdown
+        showReportModal={this.showReportModal}
+        toggleActive={this.props.toggleActive}
+        deleteActiveReport={this.props.deleteActiveReport}
+      />
+    ) : (
+      <>
+        <span
+          role="button"
+          title={t('Schedule email report')}
+          tabIndex={0}
+          className="action-button"
+          onClick={this.showReportModal}
+        >
+          <Icons.Calendar />
+        </span>
+      </>
+    );
+  }
+
+  canAddReports() {
+    if (!isFeatureEnabled(FeatureFlag.ALERT_REPORTS)) {
+      return false;
+    }
+    const { user } = this.props;
+    if (!user) {
+      // this is in the case that there is an anonymous user.
+      return false;
+    }
+    const roles = Object.keys(user.roles || []);
+    const permissions = roles.map(key =>
+      user.roles[key].filter(
+        perms => perms[0] === 'menu_access' && perms[1] === 'Manage',
+      ),
+    );
+    return permissions[0].length > 0;
+  }
+
   render() {
     const {
       dashboardTitle,
@@ -353,6 +448,7 @@ class Header extends React.PureComponent {
       expandedSlices,
       customCss,
       colorNamespace,
+      dataMask,
       setColorSchemeAndUnsavedChanges,
       colorScheme,
       onUndo,
@@ -364,6 +460,7 @@ class Header extends React.PureComponent {
       updateCss,
       editMode,
       isPublished,
+      user,
       dashboardInfo,
       hasUnsavedChanges,
       isLoading,
@@ -372,10 +469,10 @@ class Header extends React.PureComponent {
       setRefreshFrequency,
       lastModifiedTime,
     } = this.props;
-
     const userCanEdit = dashboardInfo.dash_edit_perm;
     const userCanShare = dashboardInfo.dash_share_perm;
     const userCanSaveAs = dashboardInfo.dash_save_perm;
+    const shouldShowReport = !editMode && this.canAddReports();
     const refreshLimit =
       dashboardInfo.common.conf.SUPERSET_DASHBOARD_PERIODICAL_REFRESH_LIMIT;
     const refreshWarning =
@@ -402,7 +499,7 @@ class Header extends React.PureComponent {
             canEdit={userCanEdit}
             canSave={userCanSaveAs}
           />
-          {dashboardInfo.userId && (
+          {user?.userId && (
             <FaveStar
               itemId={dashboardInfo.id}
               fetchFaveStar={this.props.fetchFaveStar}
@@ -487,10 +584,11 @@ class Header extends React.PureComponent {
                 className="action-button"
                 onClick={this.toggleEditMode}
               >
-                <Icon name="edit-alt" />
+                <Icons.EditAlt />
               </span>
             </>
           )}
+          {shouldShowReport && this.renderReportModal()}
 
           {this.state.showingPropertiesModal && (
             <PropertiesModal
@@ -520,12 +618,26 @@ class Header extends React.PureComponent {
             />
           )}
 
+          {this.state.showingReportModal && (
+            <ReportModal
+              show={this.state.showingReportModal}
+              onHide={this.hideReportModal}
+              props={{
+                userId: user.userId,
+                userEmail: user.email,
+                dashboardId: dashboardInfo.id,
+                creationMethod: 'dashboards',
+              }}
+            />
+          )}
+
           <HeaderActionsDropdown
             addSuccessToast={this.props.addSuccessToast}
             addDangerToast={this.props.addDangerToast}
             dashboardId={dashboardInfo.id}
             dashboardTitle={dashboardTitle}
             dashboardInfo={dashboardInfo}
+            dataMask={dataMask}
             layout={layout}
             expandedSlices={expandedSlices}
             customCss={customCss}
diff --git a/superset-frontend/src/dashboard/components/Header/types.ts b/superset-frontend/src/dashboard/components/Header/types.ts
index 5580136cb836..f03e01874005 100644
--- a/superset-frontend/src/dashboard/components/Header/types.ts
+++ b/superset-frontend/src/dashboard/components/Header/types.ts
@@ -22,7 +22,7 @@ import { ChartState } from 'src/explore/types';
 
 interface DashboardInfo {
   id: number;
-  userId: number;
+  userId: string | undefined;
   dash_edit_perm: boolean;
   dash_save_perm: boolean;
   metadata?: Record<string, any>;
@@ -65,6 +65,7 @@ export interface HeaderProps {
   charts: ChartState | {};
   colorScheme?: string;
   customCss: string;
+  user: Object | undefined;
   dashboardInfo: DashboardInfo;
   dashboardTitle: string;
   setColorSchemeAndUnsavedChanges: () => void;
@@ -86,6 +87,7 @@ export interface HeaderProps {
   lastModifiedTime: number;
   onUndo: () => void;
   onRedo: () => void;
+  onRefresh: () => void;
   undoLength: number;
   redoLength: number;
   setMaxUndoHistoryExceeded: () => void;
diff --git a/superset-frontend/src/dashboard/components/IconButton.jsx b/superset-frontend/src/dashboard/components/IconButton.jsx
deleted file mode 100644
index 1db166dcb922..000000000000
--- a/superset-frontend/src/dashboard/components/IconButton.jsx
+++ /dev/null
@@ -1,63 +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 React from 'react';
-import PropTypes from 'prop-types';
-
-const propTypes = {
-  onClick: PropTypes.func.isRequired,
-  className: PropTypes.string,
-  label: PropTypes.string,
-};
-
-const defaultProps = {
-  className: null,
-  label: null,
-};
-
-export default class IconButton extends React.PureComponent {
-  constructor(props) {
-    super(props);
-    this.handleClick = this.handleClick.bind(this);
-  }
-
-  handleClick(event) {
-    event.preventDefault();
-    const { onClick } = this.props;
-    onClick(event);
-  }
-
-  render() {
-    const { className, label } = this.props;
-    return (
-      <div
-        className="icon-button"
-        onClick={this.handleClick}
-        tabIndex="0"
-        role="button"
-        data-test="icon-button"
-      >
-        <span data-test="icon-button-span" className={className} />
-        {label && <span className="icon-button-label">{label}</span>}
-      </div>
-    );
-  }
-}
-
-IconButton.propTypes = propTypes;
-IconButton.defaultProps = defaultProps;
diff --git a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragWrapper/index.tsx b/superset-frontend/src/dashboard/components/IconButton.tsx
similarity index 53%
rename from superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragWrapper/index.tsx
rename to superset-frontend/src/dashboard/components/IconButton.tsx
index e12c7f9ed616..1a15456a1eca 100644
--- a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragWrapper/index.tsx
+++ b/superset-frontend/src/dashboard/components/IconButton.tsx
@@ -16,40 +16,40 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { ReactNode } from 'react';
-import { useDrag } from 'react-dnd';
+import React, { MouseEventHandler } from 'react';
 import { styled } from '@superset-ui/core';
-import { DatasourcePanelDndItem } from '../types';
 
-const DatasourceItemContainer = styled.div`
+interface IconButtonProps {
+  icon: JSX.Element;
+  label?: string;
+  onClick: MouseEventHandler<HTMLDivElement>;
+}
+
+const StyledDiv = styled.div`
   display: flex;
   align-items: center;
-  width: 100%;
-  height: ${({ theme }) => theme.gridUnit * 6}px;
-  cursor: pointer;
-
-  :hover {
-    background-color: ${({ theme }) => theme.colors.grayscale.light2};
+  color: ${({ theme }) => theme.colors.grayscale.base};
+  &:hover {
+    color: ${({ theme }) => theme.colors.primary.base};
   }
 `;
 
-interface DatasourcePanelDragWrapperProps extends DatasourcePanelDndItem {
-  children?: ReactNode;
-}
+const StyledSpan = styled.span`
+  margin-left: ${({ theme }) => theme.gridUnit * 2}px;
+`;
 
-export default function DatasourcePanelDragWrapper(
-  props: DatasourcePanelDragWrapperProps,
-) {
-  const [, drag] = useDrag({
-    item: {
-      value: props.value,
-      type: props.type,
-    },
-  });
+const IconButton = ({ icon, label, onClick }: IconButtonProps) => (
+  <StyledDiv
+    tabIndex={0}
+    role="button"
+    onClick={e => {
+      e.preventDefault();
+      onClick(e);
+    }}
+  >
+    {icon}
+    {label && <StyledSpan>{label}</StyledSpan>}
+  </StyledDiv>
+);
 
-  return (
-    <DatasourceItemContainer data-test="DatasourcePanelDragWrapper" ref={drag}>
-      {props.children}
-    </DatasourceItemContainer>
-  );
-}
+export default IconButton;
diff --git a/superset-frontend/src/dashboard/components/PropertiesModal/PropertiesModal.test.tsx b/superset-frontend/src/dashboard/components/PropertiesModal/PropertiesModal.test.tsx
index e377308f8d51..42b718edadd9 100644
--- a/superset-frontend/src/dashboard/components/PropertiesModal/PropertiesModal.test.tsx
+++ b/superset-frontend/src/dashboard/components/PropertiesModal/PropertiesModal.test.tsx
@@ -113,8 +113,6 @@ fetchMock.get('http://localhost/api/v1/dashboard/26', {
       published: false,
       roles: [],
       slug: null,
-      table_names:
-        '[examples].[covid_vaccines], [examples].[covid_vaccines], [examples].[covid_vaccines], [examples].[covid_vaccines], [examples].[covid_vaccines], [examples].[covid_vaccines], [examples].[covid_vaccines], [examples].[covid_vaccines]',
       thumbnail_url:
         '/api/v1/dashboard/26/thumbnail/b24805e98d90116da8c0974d24f5c533/',
       url: '/superset/dashboard/26/',
@@ -165,7 +163,8 @@ test('should render - FeatureFlag disabled', async () => {
   expect(screen.getByRole('button', { name: 'Save' })).toBeInTheDocument();
   expect(screen.getAllByRole('button')).toHaveLength(4);
 
-  expect(screen.getAllByRole('textbox')).toHaveLength(3);
+  expect(screen.getAllByRole('textbox')).toHaveLength(2);
+  expect(screen.getByRole('combobox')).toBeInTheDocument();
 
   expect(spyColorSchemeControlWrapper).toBeCalledTimes(4);
   expect(spyColorSchemeControlWrapper).toBeCalledWith(
@@ -201,7 +200,8 @@ test('should render - FeatureFlag enabled', async () => {
   expect(screen.getByRole('button', { name: 'Save' })).toBeInTheDocument();
   expect(screen.getAllByRole('button')).toHaveLength(4);
 
-  expect(screen.getAllByRole('textbox')).toHaveLength(4);
+  expect(screen.getAllByRole('textbox')).toHaveLength(2);
+  expect(screen.getAllByRole('combobox')).toHaveLength(2);
 
   expect(spyColorSchemeControlWrapper).toBeCalledTimes(4);
   expect(spyColorSchemeControlWrapper).toBeCalledWith(
@@ -220,9 +220,11 @@ test('should open advance', async () => {
     await screen.findByTestId('dashboard-edit-properties-form'),
   ).toBeInTheDocument();
 
-  expect(screen.getAllByRole('textbox')).toHaveLength(4);
+  expect(screen.getAllByRole('textbox')).toHaveLength(2);
+  expect(screen.getAllByRole('combobox')).toHaveLength(2);
   userEvent.click(screen.getByRole('button', { name: 'Advanced' }));
-  expect(screen.getAllByRole('textbox')).toHaveLength(5);
+  expect(screen.getAllByRole('textbox')).toHaveLength(3);
+  expect(screen.getAllByRole('combobox')).toHaveLength(2);
 });
 
 test('should close modal', async () => {
diff --git a/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx b/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx
index cdc1b956748f..6ca383063431 100644
--- a/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx
+++ b/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx
@@ -22,7 +22,7 @@ import { Row, Col, Input } from 'src/common/components';
 import { Form, FormItem } from 'src/components/Form';
 import jsonStringify from 'json-stringify-pretty-compact';
 import Button from 'src/components/Button';
-import { AsyncSelect } from 'src/components/Select';
+import { Select } from 'src/components';
 import rison from 'rison';
 import {
   styled,
@@ -38,7 +38,6 @@ import { JsonEditor } from 'src/components/AsyncAceEditor';
 import ColorSchemeControlWrapper from 'src/dashboard/components/ColorSchemeControlWrapper';
 import { getClientErrorObject } from 'src/utils/getClientErrorObject';
 import withToasts from 'src/messageToasts/enhancers/withToasts';
-import 'src/dashboard/stylesheets/buttons.less';
 import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags';
 
 const StyledJsonEditor = styled(JsonEditor)`
@@ -92,11 +91,13 @@ const loadAccessOptions = accessType => (input = '') => {
   return SupersetClient.get({
     endpoint: `/api/v1/dashboard/related/${accessType}?q=${query}`,
   }).then(
-    response =>
-      response.json.result.map(item => ({
+    response => ({
+      data: response.json.result.map(item => ({
         value: item.value,
         label: item.text,
       })),
+      totalCount: response.json.count,
+    }),
     badResponse => {
       handleErrorResponse(badResponse);
       return [];
@@ -104,6 +105,9 @@ const loadAccessOptions = accessType => (input = '') => {
   );
 };
 
+const loadOwners = loadAccessOptions('owners');
+const loadRoles = loadAccessOptions('roles');
+
 class PropertiesModal extends React.PureComponent {
   constructor(props) {
     super(props);
@@ -327,16 +331,15 @@ class PropertiesModal extends React.PureComponent {
         <Col xs={24} md={12}>
           <h3 style={{ marginTop: '1em' }}>{t('Access')}</h3>
           <FormItem label={t('Owners')}>
-            <AsyncSelect
+            <Select
+              allowClear
+              ariaLabel={t('Owners')}
+              disabled={!isDashboardLoaded}
               name="owners"
-              isMulti
+              mode="multiple"
               value={values.owners}
-              loadOptions={loadAccessOptions('owners')}
-              defaultOptions // load options on render
-              cacheOptions
+              options={loadOwners}
               onChange={this.onOwnersChange}
-              disabled={!isDashboardLoaded}
-              filterOption={null} // options are filtered at the api
             />
             <p className="help-block">
               {t(
@@ -369,16 +372,15 @@ class PropertiesModal extends React.PureComponent {
         <Row gutter={16}>
           <Col xs={24} md={12}>
             <FormItem label={t('Owners')}>
-              <AsyncSelect
+              <Select
+                allowClear
+                ariaLabel={t('Owners')}
+                disabled={!isDashboardLoaded}
                 name="owners"
-                isMulti
+                mode="multiple"
                 value={values.owners}
-                loadOptions={loadAccessOptions('owners')}
-                defaultOptions // load options on render
-                cacheOptions
+                options={loadOwners}
                 onChange={this.onOwnersChange}
-                disabled={!isDashboardLoaded}
-                filterOption={null} // options are filtered at the api
               />
               <p className="help-block">
                 {t(
@@ -389,16 +391,15 @@ class PropertiesModal extends React.PureComponent {
           </Col>
           <Col xs={24} md={12}>
             <FormItem label={t('Roles')}>
-              <AsyncSelect
+              <Select
+                allowClear
+                ariaLabel={t('Roles')}
+                disabled={!isDashboardLoaded}
                 name="roles"
-                isMulti
+                mode="multiple"
                 value={values.roles}
-                loadOptions={loadAccessOptions('roles')}
-                defaultOptions // load options on render
-                cacheOptions
+                options={loadRoles}
                 onChange={this.onRolesChange}
-                disabled={!isDashboardLoaded}
-                filterOption={null} // options are filtered at the api
               />
               <p className="help-block">
                 {t(
diff --git a/superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx b/superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx
index aa97ff872f7c..731572b8d751 100644
--- a/superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx
+++ b/superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React, { RefObject } from 'react';
-import Select from 'src/components/Select';
+import { Select } from 'src/components';
 import { t, styled } from '@superset-ui/core';
 import Alert from 'src/components/Alert';
 import Button from 'src/components/Button';
@@ -36,7 +36,7 @@ export const options = [
   [21600, t('6 hours')],
   [43200, t('12 hours')],
   [86400, t('24 hours')],
-].map(o => ({ value: o[0], label: o[1] }));
+].map(o => ({ value: o[0] as number, label: o[1] }));
 
 const StyledModalTrigger = styled(ModalTrigger)`
   .ant-modal-body {
@@ -95,10 +95,9 @@ class RefreshIntervalModal extends React.PureComponent<
     this.modalRef.current?.close();
   }
 
-  handleFrequencyChange(opt: Record<string, any>) {
-    const value = opt ? opt.value : options[0].value;
+  handleFrequencyChange(value: number) {
     this.setState({
-      refreshFrequency: value,
+      refreshFrequency: value || options[0].value,
     });
   }
 
@@ -117,10 +116,10 @@ class RefreshIntervalModal extends React.PureComponent<
           <div>
             <FormLabel>{t('Refresh frequency')}</FormLabel>
             <Select
+              ariaLabel={t('Refresh interval')}
               options={options}
-              value={{ value: refreshFrequency }}
+              value={refreshFrequency}
               onChange={this.handleFrequencyChange}
-              forceOverflow
             />
             {showRefreshWarning && (
               <RefreshWarningContainer>
diff --git a/superset-frontend/src/dashboard/components/SliceAdder.jsx b/superset-frontend/src/dashboard/components/SliceAdder.jsx
index 12d62c5fdbac..ef1e446e27c1 100644
--- a/superset-frontend/src/dashboard/components/SliceAdder.jsx
+++ b/superset-frontend/src/dashboard/components/SliceAdder.jsx
@@ -23,7 +23,7 @@ import { List } from 'react-virtualized';
 import { createFilter } from 'react-search-input';
 import { t, styled } from '@superset-ui/core';
 import { Input } from 'src/common/components';
-import Select from 'src/components/Select';
+import { Select } from 'src/components';
 import Loading from 'src/components/Loading';
 import {
   CHART_TYPE,
@@ -168,8 +168,7 @@ class SliceAdder extends React.Component {
     }));
   }
 
-  handleSelect(object) {
-    const sortBy = object.value;
+  handleSelect(sortBy) {
     this.setState(prevState => ({
       sortBy,
       filteredSlices: this.getFilteredSortedSlices(
diff --git a/superset-frontend/src/dashboard/components/SliceHeader/SliceHeader.test.tsx b/superset-frontend/src/dashboard/components/SliceHeader/SliceHeader.test.tsx
index e846bd57d071..6acf88844c68 100644
--- a/superset-frontend/src/dashboard/components/SliceHeader/SliceHeader.test.tsx
+++ b/superset-frontend/src/dashboard/components/SliceHeader/SliceHeader.test.tsx
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Slice } from 'src/types/Chart';
 import React from 'react';
 import { render, screen } from 'spec/helpers/testing-library';
 import userEvent from '@testing-library/user-event';
@@ -58,7 +57,7 @@ jest.mock('src/dashboard/components/SliceHeaderControls', () => ({
       <button
         type="button"
         data-test="exploreChart"
-        onClick={props.exploreChart}
+        onClick={props.logExploreChart}
       >
         exploreChart
       </button>
@@ -94,7 +93,7 @@ jest.mock('src/dashboard/components/SliceHeaderControls', () => ({
   ),
 }));
 
-jest.mock('src/dashboard/containers/FiltersBadge', () => ({
+jest.mock('src/dashboard/components/FiltersBadge', () => ({
   __esModule: true,
   default: (props: any) => (
     <div data-test="FiltersBadge" data-chart-id={props.chartId} />
@@ -114,7 +113,7 @@ const createProps = () => ({
   supersetCanExplore: true,
   supersetCanCSV: true,
   sliceCanEdit: false,
-  slice: ({
+  slice: {
     slice_id: 312,
     slice_url: '/superset/explore/?form_data=%7B%22slice_id%22%3A%20312%7D',
     slice_name: 'Vaccine Candidates per Phase',
@@ -139,12 +138,13 @@ const createProps = () => ({
     },
     viz_type: 'dist_bar',
     datasource: '58__table',
-    description: null,
+    description: '',
     description_markeddown: '',
     owners: [],
     modified: '<span class="no-wrap">20 hours ago</span>',
     changed_on: 1617143411366,
-  } as unknown) as Slice,
+    slice_description: '',
+  },
   componentId: 'CHART-aGfmWtliqA',
   dashboardId: 26,
   isFullSize: false,
@@ -155,7 +155,7 @@ const createProps = () => ({
   updateSliceName: jest.fn(),
   toggleExpandSlice: jest.fn(),
   forceRefresh: jest.fn(),
-  exploreChart: jest.fn(),
+  logExploreChart: jest.fn(),
   exportCSV: jest.fn(),
   formData: {},
 });
@@ -176,7 +176,7 @@ test('Should render - default props', () => {
   // @ts-ignore
   delete props.toggleExpandSlice;
   // @ts-ignore
-  delete props.exploreChart;
+  delete props.logExploreChart;
   // @ts-ignore
   delete props.exportCSV;
   // @ts-ignore
@@ -218,7 +218,7 @@ test('Should render default props and "call" actions', () => {
   // @ts-ignore
   delete props.toggleExpandSlice;
   // @ts-ignore
-  delete props.exploreChart;
+  delete props.logExploreChart;
   // @ts-ignore
   delete props.exportCSV;
   // @ts-ignore
@@ -378,9 +378,9 @@ test('Correct actions to "SliceHeaderControls"', () => {
   userEvent.click(screen.getByTestId('forceRefresh'));
   expect(props.forceRefresh).toBeCalledTimes(1);
 
-  expect(props.exploreChart).toBeCalledTimes(0);
+  expect(props.logExploreChart).toBeCalledTimes(0);
   userEvent.click(screen.getByTestId('exploreChart'));
-  expect(props.exploreChart).toBeCalledTimes(1);
+  expect(props.logExploreChart).toBeCalledTimes(1);
 
   expect(props.exportCSV).toBeCalledTimes(0);
   userEvent.click(screen.getByTestId('exportCSV'));
diff --git a/superset-frontend/src/dashboard/components/SliceHeader/index.tsx b/superset-frontend/src/dashboard/components/SliceHeader/index.tsx
index 27d9e8000bf4..a0cdb94be801 100644
--- a/superset-frontend/src/dashboard/components/SliceHeader/index.tsx
+++ b/superset-frontend/src/dashboard/components/SliceHeader/index.tsx
@@ -19,54 +19,37 @@
 import React, { FC } from 'react';
 import { styled, t } from '@superset-ui/core';
 import { Tooltip } from 'src/components/Tooltip';
-import { useSelector } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import EditableTitle from 'src/components/EditableTitle';
-import SliceHeaderControls from 'src/dashboard/components/SliceHeaderControls';
-import FiltersBadge from 'src/dashboard/containers/FiltersBadge';
-import Icon from 'src/components/Icon';
+import SliceHeaderControls, {
+  SliceHeaderControlsProps,
+} from 'src/dashboard/components/SliceHeaderControls';
+import FiltersBadge from 'src/dashboard/components/FiltersBadge';
+import Icons from 'src/components/Icons';
 import { RootState } from 'src/dashboard/types';
-import { Slice } from 'src/types/Chart';
 import FilterIndicator from 'src/dashboard/components/FiltersBadge/FilterIndicator';
+import { clearDataMask } from 'src/dataMask/actions';
 
-type SliceHeaderProps = {
+type SliceHeaderProps = SliceHeaderControlsProps & {
   innerRef?: string;
-  slice: Slice;
-  isExpanded?: boolean;
-  isCached?: boolean[];
-  cachedDttm?: string[];
-  updatedDttm?: number;
   updateSliceName?: (arg0: string) => void;
-  toggleExpandSlice?: Function;
-  forceRefresh?: Function;
-  exploreChart?: Function;
-  exportCSV?: Function;
   editMode?: boolean;
-  isFullSize?: boolean;
   annotationQuery?: object;
   annotationError?: object;
   sliceName?: string;
-  supersetCanExplore?: boolean;
-  supersetCanShare?: boolean;
-  supersetCanCSV?: boolean;
-  sliceCanEdit?: boolean;
-  componentId: string;
-  dashboardId: number;
   filters: object;
-  addSuccessToast: Function;
-  addDangerToast: Function;
-  handleToggleFullSize: Function;
-  chartStatus: string;
+  handleToggleFullSize: () => void;
   formData: object;
 };
 
 const annotationsLoading = t('Annotation layers are still loading.');
 const annotationsError = t('One ore more annotation layers failed loading.');
 
-const CrossFilterIcon = styled(Icon)`
-  fill: ${({ theme }) => theme.colors.grayscale.light5};
-  & circle {
-    fill: ${({ theme }) => theme.colors.primary.base};
-  }
+const CrossFilterIcon = styled(Icons.CursorTarget)`
+  cursor: pointer;
+  color: ${({ theme }) => theme.colors.primary.base};
+  height: 22px;
+  width: 22px;
 `;
 
 const SliceHeader: FC<SliceHeaderProps> = ({
@@ -74,7 +57,8 @@ const SliceHeader: FC<SliceHeaderProps> = ({
   forceRefresh = () => ({}),
   updateSliceName = () => ({}),
   toggleExpandSlice = () => ({}),
-  exploreChart = () => ({}),
+  logExploreChart = () => ({}),
+  exploreUrl = '#',
   exportCSV = () => ({}),
   editMode = false,
   annotationQuery = {},
@@ -82,12 +66,13 @@ const SliceHeader: FC<SliceHeaderProps> = ({
   cachedDttm = null,
   updatedDttm = null,
   isCached = [],
-  isExpanded = [],
+  isExpanded = false,
   sliceName = '',
   supersetCanExplore = false,
   supersetCanShare = false,
   supersetCanCSV = false,
   sliceCanEdit = false,
+  exportFullCSV,
   slice,
   componentId,
   dashboardId,
@@ -98,6 +83,7 @@ const SliceHeader: FC<SliceHeaderProps> = ({
   chartStatus,
   formData,
 }) => {
+  const dispatch = useDispatch();
   // TODO: change to indicator field after it will be implemented
   const crossFilterValue = useSelector<RootState, any>(
     state => state.dataMask[slice?.slice_id]?.filterState?.value,
@@ -157,10 +143,13 @@ const SliceHeader: FC<SliceHeaderProps> = ({
                       value: crossFilterValue,
                       name: t('Emitted values'),
                     }}
+                    text={t('Click to clear emitted filters')}
                   />
                 }
               >
-                <CrossFilterIcon name="cross-filter-badge" />
+                <CrossFilterIcon
+                  onClick={() => dispatch(clearDataMask(slice?.slice_id))}
+                />
               </Tooltip>
             )}
             <FiltersBadge chartId={slice.slice_id} />
@@ -172,8 +161,10 @@ const SliceHeader: FC<SliceHeaderProps> = ({
               updatedDttm={updatedDttm}
               toggleExpandSlice={toggleExpandSlice}
               forceRefresh={forceRefresh}
-              exploreChart={exploreChart}
+              logExploreChart={logExploreChart}
+              exploreUrl={exploreUrl}
               exportCSV={exportCSV}
+              exportFullCSV={exportFullCSV}
               supersetCanExplore={supersetCanExplore}
               supersetCanShare={supersetCanShare}
               supersetCanCSV={supersetCanCSV}
diff --git a/superset-frontend/src/dashboard/components/SliceHeaderControls/SliceHeaderControls.test.tsx b/superset-frontend/src/dashboard/components/SliceHeaderControls/SliceHeaderControls.test.tsx
index b89ce7bdd6c1..158bd99e858d 100644
--- a/superset-frontend/src/dashboard/components/SliceHeaderControls/SliceHeaderControls.test.tsx
+++ b/superset-frontend/src/dashboard/components/SliceHeaderControls/SliceHeaderControls.test.tsx
@@ -20,6 +20,7 @@
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { render, screen } from 'spec/helpers/testing-library';
+import { FeatureFlag } from 'src/featureFlags';
 import SliceHeaderControls from '.';
 
 jest.mock('src/common/components', () => {
@@ -40,6 +41,7 @@ const createProps = () => ({
   addSuccessToast: jest.fn(),
   exploreChart: jest.fn(),
   exportCSV: jest.fn(),
+  exportFullCSV: jest.fn(),
   forceRefresh: jest.fn(),
   handleToggleFullSize: jest.fn(),
   toggleExpandSlice: jest.fn(),
@@ -47,6 +49,7 @@ const createProps = () => ({
     slice_id: 371,
     slice_url: '/superset/explore/?form_data=%7B%22slice_id%22%3A%20371%7D',
     slice_name: 'Vaccine Candidates per Country & Stage',
+    slice_description: 'Table of vaccine candidates for 100 countries',
     form_data: {
       adhoc_filters: [],
       color_scheme: 'supersetColors',
@@ -76,7 +79,7 @@ const createProps = () => ({
   },
   isCached: [false],
   isExpanded: false,
-  cachedDttm: [null],
+  cachedDttm: [''],
   updatedDttm: 1617213803803,
   supersetCanExplore: true,
   supersetCanCSV: true,
@@ -85,6 +88,9 @@ const createProps = () => ({
   dashboardId: 26,
   isFullSize: false,
   chartStatus: 'rendered',
+  showControls: true,
+  supersetCanShare: true,
+  formData: {},
 });
 
 test('Should render', () => {
@@ -119,7 +125,6 @@ test('Should render default props', () => {
   delete props.sliceCanEdit;
 
   render(<SliceHeaderControls {...props} />, { useRedux: true });
-
   userEvent.click(screen.getByRole('menuitem', { name: 'Maximize chart' }));
   userEvent.click(screen.getByRole('menuitem', { name: /Force refresh/ }));
   userEvent.click(
@@ -147,16 +152,45 @@ test('Should "export to CSV"', () => {
   expect(props.exportCSV).toBeCalledWith(371);
 });
 
-test('Should "View chart in Explore"', () => {
+test('Export full CSV is under featureflag', () => {
+  // @ts-ignore
+  global.featureFlags = {
+    [FeatureFlag.ALLOW_FULL_CSV_EXPORT]: false,
+  };
+  const props = createProps();
+  props.slice.viz_type = 'table';
+  render(<SliceHeaderControls {...props} />, { useRedux: true });
+  expect(screen.queryByRole('menuitem', { name: 'Export full CSV' })).toBe(
+    null,
+  );
+});
+test('Should "export full CSV"', () => {
+  // @ts-ignore
+  global.featureFlags = {
+    [FeatureFlag.ALLOW_FULL_CSV_EXPORT]: true,
+  };
   const props = createProps();
+  props.slice.viz_type = 'table';
   render(<SliceHeaderControls {...props} />, { useRedux: true });
+  expect(screen.queryByRole('menuitem', { name: 'Export full CSV' })).not.toBe(
+    null,
+  );
+  expect(props.exportFullCSV).toBeCalledTimes(0);
+  userEvent.click(screen.getByRole('menuitem', { name: 'Export full CSV' }));
+  expect(props.exportFullCSV).toBeCalledTimes(1);
+  expect(props.exportFullCSV).toBeCalledWith(371);
+});
 
-  expect(props.exploreChart).toBeCalledTimes(0);
-  userEvent.click(
-    screen.getByRole('menuitem', { name: 'View chart in Explore' }),
+test('Should not show export full CSV if report is not table', () => {
+  // @ts-ignore
+  global.featureFlags = {
+    [FeatureFlag.ALLOW_FULL_CSV_EXPORT]: true,
+  };
+  const props = createProps();
+  render(<SliceHeaderControls {...props} />, { useRedux: true });
+  expect(screen.queryByRole('menuitem', { name: 'Export full CSV' })).toBe(
+    null,
   );
-  expect(props.exploreChart).toBeCalledTimes(1);
-  expect(props.exploreChart).toBeCalledWith(371);
 });
 
 test('Should "Toggle chart description"', () => {
diff --git a/superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx b/superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx
similarity index 72%
rename from superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx
rename to superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx
index 9c3d025864b0..ffa9b589e373 100644
--- a/superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx
+++ b/superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx
@@ -17,7 +17,6 @@
  * under the License.
  */
 import React from 'react';
-import PropTypes from 'prop-types';
 import moment from 'moment';
 import {
   Behavior,
@@ -36,48 +35,15 @@ import Icons from 'src/components/Icons';
 import ModalTrigger from 'src/components/ModalTrigger';
 import ViewQueryModal from 'src/explore/components/controls/ViewQueryModal';
 
-const propTypes = {
-  slice: PropTypes.object.isRequired,
-  componentId: PropTypes.string.isRequired,
-  dashboardId: PropTypes.number.isRequired,
-  addDangerToast: PropTypes.func.isRequired,
-  isCached: PropTypes.arrayOf(PropTypes.bool),
-  cachedDttm: PropTypes.arrayOf(PropTypes.string),
-  isExpanded: PropTypes.bool,
-  updatedDttm: PropTypes.number,
-  supersetCanExplore: PropTypes.bool,
-  supersetCanShare: PropTypes.bool,
-  supersetCanCSV: PropTypes.bool,
-  sliceCanEdit: PropTypes.bool,
-  toggleExpandSlice: PropTypes.func,
-  forceRefresh: PropTypes.func,
-  exploreChart: PropTypes.func,
-  exportCSV: PropTypes.func,
-};
-
-const defaultProps = {
-  forceRefresh: () => ({}),
-  toggleExpandSlice: () => ({}),
-  exploreChart: () => ({}),
-  exportCSV: () => ({}),
-  cachedDttm: [],
-  updatedDttm: null,
-  isCached: [],
-  isExpanded: false,
-  supersetCanExplore: false,
-  supersetCanShare: false,
-  supersetCanCSV: false,
-  sliceCanEdit: false,
-};
-
 const MENU_KEYS = {
   CROSS_FILTER_SCOPING: 'cross_filter_scoping',
-  FORCE_REFRESH: 'force_refresh',
-  TOGGLE_CHART_DESCRIPTION: 'toggle_chart_description',
+  DOWNLOAD_AS_IMAGE: 'download_as_image',
   EXPLORE_CHART: 'explore_chart',
   EXPORT_CSV: 'export_csv',
+  EXPORT_FULL_CSV: 'export_full_csv',
+  FORCE_REFRESH: 'force_refresh',
   RESIZE_LABEL: 'resize_label',
-  DOWNLOAD_AS_IMAGE: 'download_as_image',
+  TOGGLE_CHART_DESCRIPTION: 'toggle_chart_description',
   VIEW_QUERY: 'view_query',
 };
 
@@ -115,8 +81,51 @@ const VerticalDotsTrigger = () => (
   </VerticalDotsContainer>
 );
 
-class SliceHeaderControls extends React.PureComponent {
-  constructor(props) {
+export interface SliceHeaderControlsProps {
+  slice: {
+    description: string;
+    viz_type: string;
+    slice_name: string;
+    slice_id: number;
+    slice_description: string;
+  };
+
+  componentId: string;
+  dashboardId: number;
+  chartStatus: string;
+  isCached: boolean[];
+  cachedDttm: string[] | null;
+  isExpanded?: boolean;
+  updatedDttm: number | null;
+  isFullSize?: boolean;
+  formData: object;
+  exploreUrl?: string;
+
+  forceRefresh: (sliceId: number, dashboardId: number) => void;
+  logExploreChart?: (sliceId: number) => void;
+  toggleExpandSlice?: (sliceId: number) => void;
+  exportCSV?: (sliceId: number) => void;
+  exportFullCSV?: (sliceId: number) => void;
+  handleToggleFullSize: () => void;
+
+  addDangerToast: (message: string) => void;
+  addSuccessToast: (message: string) => void;
+
+  supersetCanExplore?: boolean;
+  supersetCanShare?: boolean;
+  supersetCanCSV?: boolean;
+  sliceCanEdit?: boolean;
+}
+interface State {
+  showControls: boolean;
+  showCrossFilterScopingModal: boolean;
+}
+
+class SliceHeaderControls extends React.PureComponent<
+  SliceHeaderControlsProps,
+  State
+> {
+  constructor(props: SliceHeaderControlsProps) {
     super(props);
     this.toggleControls = this.toggleControls.bind(this);
     this.refreshChart = this.refreshChart.bind(this);
@@ -143,7 +152,13 @@ class SliceHeaderControls extends React.PureComponent {
     }));
   }
 
-  handleMenuClick({ key, domEvent }) {
+  handleMenuClick({
+    key,
+    domEvent,
+  }: {
+    key: React.Key;
+    domEvent: React.MouseEvent<HTMLElement>;
+  }) {
     switch (key) {
       case MENU_KEYS.FORCE_REFRESH:
         this.refreshChart();
@@ -152,27 +167,38 @@ class SliceHeaderControls extends React.PureComponent {
         this.setState({ showCrossFilterScopingModal: true });
         break;
       case MENU_KEYS.TOGGLE_CHART_DESCRIPTION:
-        this.props.toggleExpandSlice(this.props.slice.slice_id);
+        // eslint-disable-next-line no-unused-expressions
+        this.props.toggleExpandSlice &&
+          this.props.toggleExpandSlice(this.props.slice.slice_id);
         break;
       case MENU_KEYS.EXPLORE_CHART:
-        this.props.exploreChart(this.props.slice.slice_id);
+        // eslint-disable-next-line no-unused-expressions
+        this.props.logExploreChart &&
+          this.props.logExploreChart(this.props.slice.slice_id);
         break;
       case MENU_KEYS.EXPORT_CSV:
-        this.props.exportCSV(this.props.slice.slice_id);
+        // eslint-disable-next-line no-unused-expressions
+        this.props.exportCSV && this.props.exportCSV(this.props.slice.slice_id);
         break;
       case MENU_KEYS.RESIZE_LABEL:
         this.props.handleToggleFullSize();
         break;
+      case MENU_KEYS.EXPORT_FULL_CSV:
+        // eslint-disable-next-line no-unused-expressions
+        this.props.exportFullCSV &&
+          this.props.exportFullCSV(this.props.slice.slice_id);
+        break;
       case MENU_KEYS.DOWNLOAD_AS_IMAGE: {
         // menu closes with a delay, we need to hide it manually,
         // so that we don't capture it on the screenshot
         const menu = document.querySelector(
           '.ant-dropdown:not(.ant-dropdown-hidden)',
-        );
+        ) as HTMLElement;
         menu.style.visibility = 'hidden';
         downloadAsImage(
           SCREENSHOT_NODE_SELECTOR,
           this.props.slice.slice_name,
+          // @ts-ignore
         )(domEvent).then(() => {
           menu.style.visibility = 'visible';
         });
@@ -186,16 +212,17 @@ class SliceHeaderControls extends React.PureComponent {
   render() {
     const {
       slice,
-      isCached,
-      cachedDttm,
-      updatedDttm,
-      componentId,
-      addSuccessToast,
-      addDangerToast,
       isFullSize,
-      supersetCanShare,
+      componentId,
+      cachedDttm = [],
+      updatedDttm = null,
+      addSuccessToast = () => {},
+      addDangerToast = () => {},
+      supersetCanShare = false,
+      isCached = [],
     } = this.props;
     const crossFilterItems = getChartMetadataRegistry().items;
+    const isTable = slice.viz_type === 'table';
     const isCrossFilter = Object.entries(crossFilterItems)
       // @ts-ignore
       .filter(([, { value }]) =>
@@ -203,11 +230,11 @@ class SliceHeaderControls extends React.PureComponent {
       )
       .find(([key]) => key === slice.viz_type);
 
-    const cachedWhen = cachedDttm.map(itemCachedDttm =>
+    const cachedWhen = (cachedDttm || []).map(itemCachedDttm =>
       moment.utc(itemCachedDttm).fromNow(),
     );
     const updatedWhen = updatedDttm ? moment.utc(updatedDttm).fromNow() : '';
-    const getCachedTitle = itemCached => {
+    const getCachedTitle = (itemCached: boolean) => {
       if (itemCached) {
         return t('Cached %s', cachedWhen);
       }
@@ -216,12 +243,11 @@ class SliceHeaderControls extends React.PureComponent {
       }
       return '';
     };
-    const refreshTooltipData = isCached.map(getCachedTitle) || '';
+    const refreshTooltipData = [...new Set(isCached.map(getCachedTitle) || '')];
     // If all queries have same cache time we can unit them to one
-    let refreshTooltip = [...new Set(refreshTooltipData)];
-    refreshTooltip = refreshTooltip.map((item, index) => (
+    const refreshTooltip = refreshTooltipData.map((item, index) => (
       <div key={`tooltip-${index}`}>
-        {refreshTooltip.length > 1
+        {refreshTooltipData.length > 1
           ? `${t('Query')} ${index + 1}: ${item}`
           : item}
       </div>
@@ -255,7 +281,9 @@ class SliceHeaderControls extends React.PureComponent {
 
         {this.props.supersetCanExplore && (
           <Menu.Item key={MENU_KEYS.EXPLORE_CHART}>
-            {t('View chart in Explore')}
+            <a href={this.props.exploreUrl} rel="noopener noreferrer">
+              {t('View chart in Explore')}
+            </a>
           </Menu.Item>
         )}
 
@@ -276,11 +304,11 @@ class SliceHeaderControls extends React.PureComponent {
 
         {supersetCanShare && (
           <ShareMenuItems
-            url={getDashboardUrl(
-              window.location.pathname,
-              getActiveFilters(),
-              componentId,
-            )}
+            url={getDashboardUrl({
+              pathname: window.location.pathname,
+              filters: getActiveFilters(),
+              hash: componentId,
+            })}
             copyMenuItemTitle={t('Copy chart URL')}
             emailMenuItemTitle={t('Share chart by email')}
             emailSubject={t('Superset chart')}
@@ -299,6 +327,13 @@ class SliceHeaderControls extends React.PureComponent {
         {this.props.supersetCanCSV && (
           <Menu.Item key={MENU_KEYS.EXPORT_CSV}>{t('Export CSV')}</Menu.Item>
         )}
+        {isFeatureEnabled(FeatureFlag.ALLOW_FULL_CSV_EXPORT) &&
+          this.props.supersetCanCSV &&
+          isTable && (
+            <Menu.Item key={MENU_KEYS.EXPORT_FULL_CSV}>
+              {t('Export full CSV')}
+            </Menu.Item>
+          )}
         {isFeatureEnabled(FeatureFlag.DASHBOARD_CROSS_FILTERS) &&
           isCrossFilter && (
             <Menu.Item key={MENU_KEYS.CROSS_FILTER_SCOPING}>
@@ -327,11 +362,8 @@ class SliceHeaderControls extends React.PureComponent {
           overlay={menu}
           trigger={['click']}
           placement="bottomRight"
-          dropdownAlign={{
-            offset: [-40, 4],
-          }}
           getPopupContainer={triggerNode =>
-            triggerNode.closest(SCREENSHOT_NODE_SELECTOR)
+            triggerNode.closest(SCREENSHOT_NODE_SELECTOR) as HTMLElement
           }
         >
           <span
@@ -347,7 +379,4 @@ class SliceHeaderControls extends React.PureComponent {
   }
 }
 
-SliceHeaderControls.propTypes = propTypes;
-SliceHeaderControls.defaultProps = defaultProps;
-
 export default SliceHeaderControls;
diff --git a/superset-frontend/src/dashboard/components/StickyVerticalBar.tsx b/superset-frontend/src/dashboard/components/StickyVerticalBar.tsx
deleted file mode 100644
index 80e76282e366..000000000000
--- a/superset-frontend/src/dashboard/components/StickyVerticalBar.tsx
+++ /dev/null
@@ -1,100 +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 React from 'react';
-import { StickyContainer, Sticky } from 'react-sticky';
-import { styled } from '@superset-ui/core';
-import cx from 'classnames';
-
-const Wrapper = styled.div`
-  position: relative;
-  width: ${({ theme }) => theme.gridUnit * 8}px;
-  flex: 0 0 ${({ theme }) => theme.gridUnit * 8}px;
-  /* these animations (which can be enabled with the "animated" class) look glitchy due to chart resizing */
-  /* keeping these for posterity, in case we can improve that resizing performance */
-  /* &.animated {
-    transition: width 0;
-    transition-delay: ${({ theme }) => theme.transitionTiming * 2}s;
-  } */
-  &.open {
-    width: 250px;
-    flex: 0 0 250px;
-    /* &.animated {
-      transition-delay: 0s;
-    } */
-  }
-`;
-
-const Contents = styled.div`
-  display: grid;
-  position: absolute;
-  overflow: auto;
-  height: 100%;
-`;
-
-export interface SVBProps {
-  topOffset: number;
-  width?: number;
-  filtersOpen: boolean;
-}
-
-/**
- * A vertical sidebar that uses sticky position to stay
- * fixed on the page after the sitenav is scrolled out of the viewport.
- *
- * TODO use css position: sticky when sufficiently supported
- * (should have better performance)
- */
-export const StickyVerticalBar: React.FC<SVBProps> = ({
-  topOffset,
-  children,
-  filtersOpen,
-}) => (
-  <Wrapper className={cx({ open: filtersOpen })}>
-    <StickyContainer>
-      <Sticky topOffset={-topOffset} bottomOffset={Infinity}>
-        {({
-          style,
-          isSticky,
-          distanceFromTop,
-        }: {
-          style: any;
-          isSticky: boolean;
-          distanceFromTop: number;
-        }) => (
-          <Contents
-            style={
-              isSticky
-                ? {
-                    ...style,
-                    top: topOffset,
-                    height: `calc(100vh - ${topOffset}px)`,
-                  }
-                : {
-                    height: `calc(100vh - ${distanceFromTop}px)`,
-                  }
-            }
-          >
-            {children}
-          </Contents>
-        )}
-      </Sticky>
-    </StickyContainer>
-  </Wrapper>
-);
diff --git a/superset-frontend/src/dashboard/components/dnd/DragDroppable.jsx b/superset-frontend/src/dashboard/components/dnd/DragDroppable.jsx
index 36be1833e618..a841be782717 100644
--- a/superset-frontend/src/dashboard/components/dnd/DragDroppable.jsx
+++ b/superset-frontend/src/dashboard/components/dnd/DragDroppable.jsx
@@ -37,7 +37,7 @@ const propTypes = {
   component: componentShape.isRequired,
   parentComponent: componentShape,
   depth: PropTypes.number.isRequired,
-  disableDragdrop: PropTypes.bool,
+  disableDragDrop: PropTypes.bool,
   orientation: PropTypes.oneOf(['row', 'column']),
   index: PropTypes.number.isRequired,
   style: PropTypes.object,
@@ -58,7 +58,7 @@ const defaultProps = {
   className: null,
   style: null,
   parentComponent: null,
-  disableDragdrop: false,
+  disableDragDrop: false,
   children() {},
   onDrop() {},
   orientation: 'row',
@@ -104,6 +104,7 @@ export class UnwrappedDragDroppable extends React.Component {
       className,
       orientation,
       dragSourceRef,
+      disableDragDrop,
       isDragging,
       isDraggingOver,
       style,
@@ -112,7 +113,7 @@ export class UnwrappedDragDroppable extends React.Component {
 
     const { dropIndicator } = this.state;
     const dropIndicatorProps =
-      isDraggingOver && dropIndicator
+      isDraggingOver && dropIndicator && !disableDragDrop
         ? {
             className: cx(
               'drop-indicator',
diff --git a/superset-frontend/src/dashboard/components/dnd/dragDroppableConfig.js b/superset-frontend/src/dashboard/components/dnd/dragDroppableConfig.js
index 4e13d701a545..02466d3c5e15 100644
--- a/superset-frontend/src/dashboard/components/dnd/dragDroppableConfig.js
+++ b/superset-frontend/src/dashboard/components/dnd/dragDroppableConfig.js
@@ -54,6 +54,9 @@ export const dragConfig = [
 export const dropConfig = [
   TYPE,
   {
+    canDrop(props) {
+      return !props.disableDragDrop;
+    },
     hover(props, monitor, component) {
       if (component && component.mounted) {
         handleHover(props, monitor, component);
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Chart.jsx b/superset-frontend/src/dashboard/components/gridComponents/Chart.jsx
index 36b2071a9279..ae40888fcc4d 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Chart.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Chart.jsx
@@ -20,21 +20,24 @@ import cx from 'classnames';
 import React from 'react';
 import PropTypes from 'prop-types';
 import { styled } from '@superset-ui/core';
+import { isEqual } from 'lodash';
 
-import { exploreChart, exportChart } from '../../../explore/exploreUtils';
-import SliceHeader from '../SliceHeader';
-import ChartContainer from '../../../chart/ChartContainer';
-import MissingChart from '../MissingChart';
-import { slicePropShape, chartPropShape } from '../../util/propShapes';
+import { exportChart, getExploreLongUrl } from 'src/explore/exploreUtils';
+import ChartContainer from 'src/chart/ChartContainer';
 import {
   LOG_ACTIONS_CHANGE_DASHBOARD_FILTER,
   LOG_ACTIONS_EXPLORE_DASHBOARD_CHART,
   LOG_ACTIONS_EXPORT_CSV_DASHBOARD_CHART,
   LOG_ACTIONS_FORCE_REFRESH_CHART,
-} from '../../../logger/LogUtils';
+} from 'src/logger/LogUtils';
+import { areObjectsEqual } from 'src/reduxUtils';
+
+import SliceHeader from '../SliceHeader';
+import MissingChart from '../MissingChart';
+import { slicePropShape, chartPropShape } from '../../util/propShapes';
+
 import { isFilterBox } from '../../util/activeDashboardFilters';
 import getFilterValuesByFilterId from '../../util/getFilterValuesByFilterId';
-import { areObjectsEqual } from '../../../reduxUtils';
 
 const propTypes = {
   id: PropTypes.number.isRequired,
@@ -49,10 +52,11 @@ const propTypes = {
   // from redux
   chart: chartPropShape.isRequired,
   formData: PropTypes.object.isRequired,
-  datasource: PropTypes.object.isRequired,
+  datasource: PropTypes.object,
   slice: slicePropShape.isRequired,
   sliceName: PropTypes.string.isRequired,
   timeout: PropTypes.number.isRequired,
+  maxRows: PropTypes.number.isRequired,
   // all active filter fields in dashboard
   filters: PropTypes.object.isRequired,
   refreshChart: PropTypes.func.isRequired,
@@ -107,8 +111,8 @@ export default class Chart extends React.Component {
     this.changeFilter = this.changeFilter.bind(this);
     this.handleFilterMenuOpen = this.handleFilterMenuOpen.bind(this);
     this.handleFilterMenuClose = this.handleFilterMenuClose.bind(this);
-    this.exploreChart = this.exploreChart.bind(this);
     this.exportCSV = this.exportCSV.bind(this);
+    this.exportFullCSV = this.exportFullCSV.bind(this);
     this.forceRefresh = this.forceRefresh.bind(this);
     this.resize = this.resize.bind(this);
     this.setDescriptionRef = this.setDescriptionRef.bind(this);
@@ -122,7 +126,8 @@ export default class Chart extends React.Component {
     if (
       nextState.width !== this.state.width ||
       nextState.height !== this.state.height ||
-      nextState.descriptionHeight !== this.state.descriptionHeight
+      nextState.descriptionHeight !== this.state.descriptionHeight ||
+      !isEqual(nextProps.datasource, this.props.datasource)
     ) {
       return true;
     }
@@ -217,26 +222,33 @@ export default class Chart extends React.Component {
     this.props.unsetFocusedFilterField(chartId, column);
   }
 
-  exploreChart() {
+  logExploreChart = () => {
     this.props.logEvent(LOG_ACTIONS_EXPLORE_DASHBOARD_CHART, {
       slice_id: this.props.slice.slice_id,
       is_cached: this.props.isCached,
     });
-    exploreChart(this.props.formData);
-  }
+  };
+
+  getChartUrl = () => getExploreLongUrl(this.props.formData);
 
-  exportCSV() {
+  exportCSV(isFullCSV = false) {
     this.props.logEvent(LOG_ACTIONS_EXPORT_CSV_DASHBOARD_CHART, {
       slice_id: this.props.slice.slice_id,
       is_cached: this.props.isCached,
     });
     exportChart({
-      formData: this.props.formData,
+      formData: isFullCSV
+        ? { ...this.props.formData, row_limit: this.props.maxRows }
+        : this.props.formData,
       resultType: 'results',
       resultFormat: 'csv',
     });
   }
 
+  exportFullCSV() {
+    this.exportCSV(true);
+  }
+
   forceRefresh() {
     this.props.logEvent(LOG_ACTIONS_FORCE_REFRESH_CHART, {
       slice_id: this.props.slice.slice_id,
@@ -278,7 +290,6 @@ export default class Chart extends React.Component {
     } = this.props;
 
     const { width } = this.state;
-
     // this prevents throwing in the case that a gridComponent
     // references a chart that is not associated with the dashboard
     if (!chart || !slice) {
@@ -318,8 +329,10 @@ export default class Chart extends React.Component {
           forceRefresh={this.forceRefresh}
           editMode={editMode}
           annotationQuery={chart.annotationQuery}
-          exploreChart={this.exploreChart}
+          logExploreChart={this.logExploreChart}
+          exploreUrl={this.getChartUrl()}
           exportCSV={this.exportCSV}
+          exportFullCSV={this.exportFullCSV}
           updateSliceName={updateSliceName}
           sliceName={sliceName}
           supersetCanExplore={supersetCanExplore}
diff --git a/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.jsx b/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.jsx
index 102acae84aa0..23f46f292d9d 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.jsx
@@ -20,6 +20,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { useTheme } from '@superset-ui/core';
+import { useSelector } from 'react-redux';
 
 import { getChartIdsInFilterScope } from 'src/dashboard/util/activeDashboardFilters';
 import Chart from '../../containers/Chart';
@@ -30,13 +31,13 @@ import HoverMenu from '../menu/HoverMenu';
 import ResizableContainer from '../resizable/ResizableContainer';
 import getChartAndLabelComponentIdFromPath from '../../util/getChartAndLabelComponentIdFromPath';
 import { componentShape } from '../../util/propShapes';
-import { ROW_TYPE, COLUMN_TYPE } from '../../util/componentTypes';
+import { COLUMN_TYPE, ROW_TYPE } from '../../util/componentTypes';
 
 import {
-  GRID_MIN_COLUMN_COUNT,
-  GRID_MIN_ROW_UNITS,
   GRID_BASE_UNIT,
   GRID_GUTTER_SIZE,
+  GRID_MIN_COLUMN_COUNT,
+  GRID_MIN_ROW_UNITS,
 } from '../../util/constants';
 
 const CHART_MARGIN = 32;
@@ -53,6 +54,7 @@ const propTypes = {
   directPathToChild: PropTypes.arrayOf(PropTypes.string),
   directPathLastUpdated: PropTypes.number,
   focusedFilterScope: PropTypes.object,
+  fullSizeChartId: PropTypes.oneOf([PropTypes.number, null]),
 
   // grid related
   availableColumnCount: PropTypes.number.isRequired,
@@ -65,6 +67,7 @@ const propTypes = {
   deleteComponent: PropTypes.func.isRequired,
   updateComponents: PropTypes.func.isRequired,
   handleComponentDrop: PropTypes.func.isRequired,
+  setFullSizeChartId: PropTypes.func.isRequired,
 };
 
 const defaultProps = {
@@ -72,6 +75,21 @@ const defaultProps = {
   directPathLastUpdated: 0,
 };
 
+/**
+ * Selects the chart scope of the filter input that has focus.
+ *
+ * @returns {{chartId: number, scope: { scope: string[], immune: string[] }} | null }
+ * the scope of the currently focused filter, if any
+ */
+function selectFocusedFilterScope(dashboardState, dashboardFilters) {
+  if (!dashboardState.focusedFilterField) return null;
+  const { chartId, column } = dashboardState.focusedFilterField;
+  return {
+    chartId,
+    scope: dashboardFilters[chartId].scopes[column],
+  };
+}
+
 /**
  * Renders any styles necessary to highlight the chart's relationship to the focused filter.
  *
@@ -85,8 +103,16 @@ const defaultProps = {
  * If ChartHolder were a function component, this could be implemented as a hook instead.
  */
 const FilterFocusHighlight = React.forwardRef(
-  ({ chartId, focusedFilterScope, nativeFilters, ...otherProps }, ref) => {
+  ({ chartId, ...otherProps }, ref) => {
     const theme = useTheme();
+
+    const nativeFilters = useSelector(state => state.nativeFilters);
+    const dashboardState = useSelector(state => state.dashboardState);
+    const dashboardFilters = useSelector(state => state.dashboardFilters);
+    const focusedFilterScope = selectFocusedFilterScope(
+      dashboardState,
+      dashboardFilters,
+    );
     const focusedNativeFilterId = nativeFilters.focusedFilterId;
     if (!(focusedFilterScope || focusedNativeFilterId))
       return <div ref={ref} {...otherProps} />;
@@ -100,15 +126,13 @@ const FilterFocusHighlight = React.forwardRef(
     const focusedChartStyles = {
       borderColor: theme.colors.primary.light2,
       opacity: 1,
-      boxShadow: `0px 0px ${theme.gridUnit * 2}px ${
-        theme.colors.primary.light2
-      }`,
+      boxShadow: `0px 0px ${theme.gridUnit * 2}px ${theme.colors.primary.base}`,
       pointerEvents: 'auto',
     };
 
     if (focusedNativeFilterId) {
       if (
-        nativeFilters.filters[focusedNativeFilterId].chartsInScope.includes(
+        nativeFilters.filters[focusedNativeFilterId]?.chartsInScope?.includes(
           chartId,
         )
       ) {
@@ -167,7 +191,6 @@ class ChartHolder extends React.Component {
       outlinedComponentId: null,
       outlinedColumnName: null,
       directPathLastUpdated: 0,
-      isFullSize: false,
     };
 
     this.handleChangeFocus = this.handleChangeFocus.bind(this);
@@ -222,7 +245,10 @@ class ChartHolder extends React.Component {
   }
 
   handleToggleFullSize() {
-    this.setState(prevState => ({ isFullSize: !prevState.isFullSize }));
+    const { component, fullSizeChartId, setFullSizeChartId } = this.props;
+    const { chartId } = component.meta;
+    const isFullSize = fullSizeChartId === chartId;
+    setFullSizeChartId(isFullSize ? null : chartId);
   }
 
   render() {
@@ -241,10 +267,12 @@ class ChartHolder extends React.Component {
       editMode,
       isComponentVisible,
       dashboardId,
-      focusedFilterScope,
-      nativeFilters,
+      fullSizeChartId,
     } = this.props;
 
+    const { chartId } = component.meta;
+    const isFullSize = fullSizeChartId === chartId;
+
     // inherit the size of parent columns
     const widthMultiple =
       parentComponent.type === COLUMN_TYPE
@@ -254,7 +282,7 @@ class ChartHolder extends React.Component {
     let chartWidth = 0;
     let chartHeight = 0;
 
-    if (this.state.isFullSize) {
+    if (isFullSize) {
       chartWidth = window.innerWidth - CHART_MARGIN;
       chartHeight = window.innerHeight - CHART_MARGIN;
     } else {
@@ -268,8 +296,6 @@ class ChartHolder extends React.Component {
       );
     }
 
-    const { chartId } = component.meta;
-
     return (
       <DragDroppable
         component={component}
@@ -300,15 +326,13 @@ class ChartHolder extends React.Component {
           >
             <FilterFocusHighlight
               chartId={chartId}
-              focusedFilterScope={focusedFilterScope}
-              nativeFilters={nativeFilters}
               ref={dragSourceRef}
               data-test="dashboard-component-chart-holder"
               className={cx(
                 'dashboard-component',
                 'dashboard-component-chart-holder',
                 this.state.outlinedComponentId ? 'fade-in' : 'fade-out',
-                this.state.isFullSize && 'full-size',
+                isFullSize && 'full-size',
               )}
             >
               {!editMode && (
@@ -333,7 +357,7 @@ class ChartHolder extends React.Component {
                 updateSliceName={this.handleUpdateSliceName}
                 isComponentVisible={isComponentVisible}
                 handleToggleFullSize={this.handleToggleFullSize}
-                isFullSize={this.state.isFullSize}
+                isFullSize={isFullSize}
               />
               {editMode && (
                 <HoverMenu position="top">
diff --git a/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.test.tsx b/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.test.tsx
index 201b042624f1..6f24f06fa6d9 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.test.tsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.test.tsx
@@ -18,15 +18,18 @@
  */
 
 import React from 'react';
-import userEvent from '@testing-library/user-event';
 import { waitFor } from '@testing-library/react';
-import { render, screen } from 'spec/helpers/testing-library';
-import mockState from 'spec/fixtures/mockState';
 import { sliceId as chartId } from 'spec/fixtures/mockChartQueries';
 import { nativeFiltersInfo } from 'spec/javascripts/dashboard/fixtures/mockNativeFilters';
 import newComponentFactory from 'src/dashboard/util/newComponentFactory';
-import { ChartHolder } from './index';
+import { getMockStore } from 'spec/fixtures/mockStore';
+import { initialState } from 'spec/javascripts/sqllab/fixtures';
+import { DndProvider } from 'react-dnd';
+import { HTML5Backend } from 'react-dnd-html5-backend';
+import { Provider } from 'react-redux';
+import { screen, render } from 'spec/helpers/testing-library';
 import { CHART_TYPE, ROW_TYPE } from '../../util/componentTypes';
+import { ChartHolder } from './index';
 
 describe('ChartHolder', () => {
   const defaultProps = {
@@ -62,28 +65,27 @@ describe('ChartHolder', () => {
     isComponentVisible: true,
     dashboardId: 123,
     nativeFilters: nativeFiltersInfo.filters,
+    fullSizeChartId: chartId,
+    setFullSizeChartId: () => {},
   };
+  const mockStore = getMockStore({
+    ...initialState,
+  });
+  const renderWrapper = () =>
+    render(
+      <Provider store={mockStore}>
+        <DndProvider backend={HTML5Backend}>
+          <ChartHolder {...defaultProps} />{' '}
+        </DndProvider>
+      </Provider>,
+    );
 
-  const renderWrapper = (props = defaultProps, state = mockState) =>
-    render(<ChartHolder {...props} />, {
-      useRedux: true,
-      initialState: state,
-      useDnd: true,
-    });
-
-  it('toggle full size', async () => {
+  it('should render full size', async () => {
     renderWrapper();
 
-    let chart = (screen.getByTestId('slice-container')
+    const chart = (screen.getByTestId('slice-container')
       .firstChild as HTMLElement).style;
-    expect(chart?.width).toBe('900px');
-    expect(chart?.height).toBe('26px');
-
-    userEvent.click(screen.getByRole('button'));
-    userEvent.click(screen.getByText('Maximize chart'));
 
-    chart = (screen.getByTestId('slice-container').firstChild as HTMLElement)
-      .style;
     await waitFor(() => expect(chart?.width).toBe('992px'));
     expect(chart?.height).toBe('714px');
   });
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Column.jsx b/superset-frontend/src/dashboard/components/gridComponents/Column.jsx
index 78d272b551c0..d63634978b1c 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Column.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Column.jsx
@@ -19,21 +19,19 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
-
-import DashboardComponent from '../../containers/DashboardComponent';
-import DeleteComponentButton from '../DeleteComponentButton';
-import DragDroppable from '../dnd/DragDroppable';
-import DragHandle from '../dnd/DragHandle';
-import HoverMenu from '../menu/HoverMenu';
-import IconButton from '../IconButton';
-import ResizableContainer from '../resizable/ResizableContainer';
-import BackgroundStyleDropdown from '../menu/BackgroundStyleDropdown';
-import WithPopoverMenu from '../menu/WithPopoverMenu';
-
-import backgroundStyleOptions from '../../util/backgroundStyleOptions';
-import { componentShape } from '../../util/propShapes';
-
-import { BACKGROUND_TRANSPARENT } from '../../util/constants';
+import Icons from 'src/components/Icons';
+import DashboardComponent from 'src/dashboard/containers/DashboardComponent';
+import DeleteComponentButton from 'src/dashboard/components/DeleteComponentButton';
+import DragDroppable from 'src/dashboard/components/dnd/DragDroppable';
+import DragHandle from 'src/dashboard/components/dnd/DragHandle';
+import HoverMenu from 'src/dashboard/components/menu/HoverMenu';
+import IconButton from 'src/dashboard/components/IconButton';
+import ResizableContainer from 'src/dashboard/components/resizable/ResizableContainer';
+import BackgroundStyleDropdown from 'src/dashboard/components/menu/BackgroundStyleDropdown';
+import WithPopoverMenu from 'src/dashboard/components/menu/WithPopoverMenu';
+import backgroundStyleOptions from 'src/dashboard/util/backgroundStyleOptions';
+import { componentShape } from 'src/dashboard/util/propShapes';
+import { BACKGROUND_TRANSPARENT } from 'src/dashboard/util/constants';
 
 const propTypes = {
   id: PropTypes.string.isRequired,
@@ -169,7 +167,7 @@ class Column extends React.PureComponent {
                   />
                   <IconButton
                     onClick={this.handleChangeFocus}
-                    className="fa fa-cog"
+                    icon={<Icons.Cog iconSize="xl" />}
                   />
                 </HoverMenu>
               )}
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx b/superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx
index 1170bf25f57c..1465b92db1ee 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx
@@ -326,6 +326,7 @@ class Markdown extends React.PureComponent {
                 'dashboard-markdown',
                 isEditing && 'dashboard-markdown--editing',
               )}
+              id={component.id}
             >
               <ResizableContainer
                 id={component.id}
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Row.jsx b/superset-frontend/src/dashboard/components/gridComponents/Row.jsx
index 3614d9a98f77..a6b3598cf0cb 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Row.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Row.jsx
@@ -20,18 +20,18 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 
-import DragDroppable from '../dnd/DragDroppable';
-import DragHandle from '../dnd/DragHandle';
-import DashboardComponent from '../../containers/DashboardComponent';
-import DeleteComponentButton from '../DeleteComponentButton';
-import HoverMenu from '../menu/HoverMenu';
-import IconButton from '../IconButton';
-import BackgroundStyleDropdown from '../menu/BackgroundStyleDropdown';
-import WithPopoverMenu from '../menu/WithPopoverMenu';
-
-import { componentShape } from '../../util/propShapes';
-import backgroundStyleOptions from '../../util/backgroundStyleOptions';
-import { BACKGROUND_TRANSPARENT } from '../../util/constants';
+import DragDroppable from 'src/dashboard/components/dnd/DragDroppable';
+import DragHandle from 'src/dashboard/components/dnd/DragHandle';
+import DashboardComponent from 'src/dashboard/containers/DashboardComponent';
+import DeleteComponentButton from 'src/dashboard/components/DeleteComponentButton';
+import HoverMenu from 'src/dashboard/components/menu/HoverMenu';
+import Icons from 'src/components/Icons';
+import IconButton from 'src/dashboard/components/IconButton';
+import BackgroundStyleDropdown from 'src/dashboard/components/menu/BackgroundStyleDropdown';
+import WithPopoverMenu from 'src/dashboard/components/menu/WithPopoverMenu';
+import { componentShape } from 'src/dashboard/util/propShapes';
+import backgroundStyleOptions from 'src/dashboard/util/backgroundStyleOptions';
+import { BACKGROUND_TRANSPARENT } from 'src/dashboard/util/constants';
 
 const propTypes = {
   id: PropTypes.string.isRequired,
@@ -149,7 +149,7 @@ class Row extends React.PureComponent {
                 <DeleteComponentButton onDelete={this.handleDeleteComponent} />
                 <IconButton
                   onClick={this.handleChangeFocus}
-                  className="fa fa-cog"
+                  icon={<Icons.Cog iconSize="xl" />}
                 />
               </HoverMenu>
             )}
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx b/superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx
index f103653492f0..a2a74829d067 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx
@@ -18,10 +18,11 @@
  */
 import React from 'react';
 import PropTypes from 'prop-types';
+import { styled, t } from '@superset-ui/core';
+import { connect } from 'react-redux';
 import { LineEditableTabs } from 'src/components/Tabs';
 import { LOG_ACTIONS_SELECT_DASHBOARD_TAB } from 'src/logger/LogUtils';
 import { Modal } from 'src/common/components';
-import { styled, t } from '@superset-ui/core';
 import DragDroppable from '../dnd/DragDroppable';
 import DragHandle from '../dnd/DragHandle';
 import DashboardComponent from '../../containers/DashboardComponent';
@@ -31,13 +32,9 @@ import findTabIndexByComponentId from '../../util/findTabIndexByComponentId';
 import getDirectPathToTabIndex from '../../util/getDirectPathToTabIndex';
 import getLeafComponentIdFromPath from '../../util/getLeafComponentIdFromPath';
 import { componentShape } from '../../util/propShapes';
-import {
-  NEW_TAB_ID,
-  DASHBOARD_ROOT_ID,
-  DASHBOARD_GRID_ID,
-} from '../../util/constants';
+import { NEW_TAB_ID, DASHBOARD_ROOT_ID } from '../../util/constants';
 import { RENDER_TAB, RENDER_TAB_CONTENT } from './Tab';
-import { TAB_TYPE } from '../../util/componentTypes';
+import { TABS_TYPE, TAB_TYPE } from '../../util/componentTypes';
 
 const propTypes = {
   id: PropTypes.string.isRequired,
@@ -50,9 +47,11 @@ const propTypes = {
   editMode: PropTypes.bool.isRequired,
   renderHoverMenu: PropTypes.bool,
   directPathToChild: PropTypes.arrayOf(PropTypes.string),
+  activeTabs: PropTypes.arrayOf(PropTypes.string),
 
   // actions (from DashboardComponent.jsx)
   logEvent: PropTypes.func.isRequired,
+  setActiveTabs: PropTypes.func,
 
   // grid related
   availableColumnCount: PropTypes.number,
@@ -75,6 +74,8 @@ const defaultProps = {
   availableColumnCount: 0,
   columnWidth: 0,
   directPathToChild: [],
+  activeTabs: [],
+  setActiveTabs() {},
   onResizeStart() {},
   onResize() {},
   onResizeStop() {},
@@ -107,7 +108,7 @@ const StyledTabsContainer = styled.div`
   }
 `;
 
-class Tabs extends React.PureComponent {
+export class Tabs extends React.PureComponent {
   constructor(props) {
     super(props);
     const tabIndex = Math.max(
@@ -130,6 +131,19 @@ class Tabs extends React.PureComponent {
     this.handleDropOnTab = this.handleDropOnTab.bind(this);
   }
 
+  componentDidMount() {
+    this.props.setActiveTabs([...this.props.activeTabs, this.state.activeKey]);
+  }
+
+  componentDidUpdate(prevProps, prevState) {
+    if (prevState.activeKey !== this.state.activeKey) {
+      this.props.setActiveTabs([
+        ...this.props.activeTabs.filter(tabId => tabId !== prevState.activeKey),
+        this.state.activeKey,
+      ]);
+    }
+  }
+
   UNSAFE_componentWillReceiveProps(nextProps) {
     const maxIndex = Math.max(0, nextProps.component.children.length - 1);
     const currTabsIds = this.props.component.children;
@@ -143,7 +157,11 @@ class Tabs extends React.PureComponent {
       const lastTabId = nextTabsIds[nextTabsIds.length - 1];
       // if a new tab is added focus on it immediately
       if (nextTabsIds.length > currTabsIds.length) {
-        this.setState(() => ({ activeKey: lastTabId }));
+        // a new tab's path may be empty, here also need to set tabIndex
+        this.setState(() => ({
+          activeKey: lastTabId,
+          tabIndex: maxIndex,
+        }));
       }
       // if a tab is removed focus on the first
       if (nextTabsIds.length < currTabsIds.length) {
@@ -167,7 +185,10 @@ class Tabs extends React.PureComponent {
 
         // make sure nextFocusComponent is under this tabs component
         if (nextTabIndex > -1 && nextTabIndex !== this.state.tabIndex) {
-          this.setState(() => ({ tabIndex: nextTabIndex }));
+          this.setState(() => ({
+            tabIndex: nextTabIndex,
+            activeKey: nextTabsIds[nextTabIndex],
+          }));
         }
       }
     }
@@ -187,7 +208,7 @@ class Tabs extends React.PureComponent {
       onOk: () => {
         deleteComponent(key, component.id);
         const tabIndex = component.children.indexOf(key);
-        this.handleClickTab(Math.max(0, tabIndex - 1));
+        this.handleDeleteTab(tabIndex);
       },
       okType: 'danger',
       okText: 'DELETE',
@@ -277,24 +298,13 @@ class Tabs extends React.PureComponent {
       isComponentVisible: isCurrentTabVisible,
       editMode,
       nativeFilters,
-      dashboardLayout,
-      lastFocusedTabId,
-      setLastFocusedTab,
     } = this.props;
 
     const { children: tabIds } = tabsComponent;
     const { tabIndex: selectedTabIndex, activeKey } = this.state;
 
-    // On dashboards with top level tabs, set initial focus to the active top level tab
-    const dashboardRoot = dashboardLayout[DASHBOARD_ROOT_ID];
-    const rootChildId = dashboardRoot.children[0];
-    const isTopLevelTabs = rootChildId !== DASHBOARD_GRID_ID;
-    if (isTopLevelTabs && !lastFocusedTabId) {
-      setLastFocusedTab(activeKey);
-    }
-
     let tabsToHighlight;
-    if (nativeFilters.focusedFilterId) {
+    if (nativeFilters?.focusedFilterId) {
       tabsToHighlight =
         nativeFilters.filters[nativeFilters.focusedFilterId].tabsInScope;
     }
@@ -305,7 +315,11 @@ class Tabs extends React.PureComponent {
         orientation="row"
         index={index}
         depth={depth}
-        onDrop={handleComponentDrop}
+        onDrop={dropResult => {
+          if (dropResult.dragging.type !== TABS_TYPE) {
+            handleComponentDrop(dropResult);
+          }
+        }}
         editMode={editMode}
       >
         {({
@@ -332,7 +346,6 @@ class Tabs extends React.PureComponent {
               onEdit={this.handleEdit}
               data-test="nav-list"
               type={editMode ? 'editable-card' : 'card'}
-              onTabClick={setLastFocusedTab}
             >
               {tabIds.map((tabId, tabIndex) => (
                 <LineEditableTabs.TabPane
@@ -391,4 +404,7 @@ class Tabs extends React.PureComponent {
 Tabs.propTypes = propTypes;
 Tabs.defaultProps = defaultProps;
 
-export default Tabs;
+function mapStateToProps(state) {
+  return { nativeFilters: state.nativeFilters };
+}
+export default connect(mapStateToProps)(Tabs);
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Tabs.test.tsx b/superset-frontend/src/dashboard/components/gridComponents/Tabs.test.tsx
index 49ec405f25bd..d37d7936a601 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Tabs.test.tsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Tabs.test.tsx
@@ -26,7 +26,7 @@ import DragDroppable from 'src/dashboard/components/dnd/DragDroppable';
 import DeleteComponentButton from 'src/dashboard/components/DeleteComponentButton';
 import getLeafComponentIdFromPath from 'src/dashboard/util/getLeafComponentIdFromPath';
 import emptyDashboardLayout from 'src/dashboard/fixtures/emptyDashboardLayout';
-import Tabs from './Tabs';
+import { Tabs } from './Tabs';
 
 jest.mock('src/dashboard/containers/DashboardComponent', () =>
   jest.fn(props => (
diff --git a/superset-frontend/src/dashboard/components/gridComponents/index.js b/superset-frontend/src/dashboard/components/gridComponents/index.js
index 27f419c9dd99..ce014f8d57ce 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/index.js
+++ b/superset-frontend/src/dashboard/components/gridComponents/index.js
@@ -34,7 +34,7 @@ import Divider from './Divider';
 import Header from './Header';
 import Row from './Row';
 import Tab from './Tab';
-import Tabs from './Tabs';
+import TabsConnected from './Tabs';
 
 export { default as ChartHolder } from './ChartHolder';
 export { default as Markdown } from './Markdown';
@@ -53,5 +53,5 @@ export const componentLookup = {
   [HEADER_TYPE]: Header,
   [ROW_TYPE]: Row,
   [TAB_TYPE]: Tab,
-  [TABS_TYPE]: Tabs,
+  [TABS_TYPE]: TabsConnected,
 };
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadeFilterControl/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadeFilterControl/index.tsx
index 91908823badb..75d6497fab03 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadeFilterControl/index.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadeFilterControl/index.tsx
@@ -18,7 +18,6 @@
  */
 import React from 'react';
 import { styled, DataMask } from '@superset-ui/core';
-import Icon from 'src/components/Icon';
 import FilterControl from 'src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl';
 import { CascadeFilter } from 'src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/types';
 import { Filter } from 'src/dashboard/components/nativeFilters/types';
@@ -31,19 +30,15 @@ export interface CascadeFilterControlProps {
   onFilterSelectionChange: (filter: Filter, dataMask: DataMask) => void;
 }
 
-const StyledCascadeChildrenList = styled.ul`
-  list-style-type: none;
-  & > * {
-    list-style-type: none;
-  }
-`;
-
-const StyledFilterControlBox = styled.div`
+const StyledDiv = styled.div`
   display: flex;
-`;
+  width: 100%;
+  flex-direction: column;
+  align-items: center;
 
-const StyledCaretIcon = styled(Icon)`
-  margin-top: ${({ theme }) => -theme.gridUnit}px;
+  .ant-form-item {
+    margin-bottom: ${({ theme }) => theme.gridUnit * 4}px;
+  }
 `;
 
 const CascadeFilterControl: React.FC<CascadeFilterControlProps> = ({
@@ -53,28 +48,23 @@ const CascadeFilterControl: React.FC<CascadeFilterControlProps> = ({
   onFilterSelectionChange,
 }) => (
   <>
-    <StyledFilterControlBox>
-      <StyledCaretIcon name="caret-down" />
-      <FilterControl
-        dataMaskSelected={dataMaskSelected}
-        filter={filter}
-        directPathToChild={directPathToChild}
-        onFilterSelectionChange={onFilterSelectionChange}
-      />
-    </StyledFilterControlBox>
-
-    <StyledCascadeChildrenList>
+    <FilterControl
+      dataMaskSelected={dataMaskSelected}
+      filter={filter}
+      directPathToChild={directPathToChild}
+      onFilterSelectionChange={onFilterSelectionChange}
+    />
+    <StyledDiv>
       {filter.cascadeChildren?.map(childFilter => (
-        <li key={childFilter.id}>
-          <CascadeFilterControl
-            dataMaskSelected={dataMaskSelected}
-            filter={childFilter}
-            directPathToChild={directPathToChild}
-            onFilterSelectionChange={onFilterSelectionChange}
-          />
-        </li>
+        <CascadeFilterControl
+          key={childFilter.id}
+          dataMaskSelected={dataMaskSelected}
+          filter={childFilter}
+          directPathToChild={directPathToChild}
+          onFilterSelectionChange={onFilterSelectionChange}
+        />
       ))}
-    </StyledCascadeChildrenList>
+    </StyledDiv>
   </>
 );
 
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadePopover/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadePopover/index.tsx
index 2bd5c6fa4de9..332fe8773e7c 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadePopover/index.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadePopover/index.tsx
@@ -17,9 +17,9 @@
  * under the License.
  */
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { styled, t, DataMask } from '@superset-ui/core';
+import { styled, t, DataMask, css, SupersetTheme } from '@superset-ui/core';
 import Popover from 'src/components/Popover';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import { Pill } from 'src/dashboard/components/FiltersBadge/Styles';
 import { DataMaskStateWithId } from 'src/dataMask/types';
 import FilterControl from 'src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl';
@@ -32,6 +32,7 @@ interface CascadePopoverProps {
   filter: CascadeFilter;
   visible: boolean;
   directPathToChild?: string[];
+  inView?: boolean;
   onVisibleChange: (visible: boolean) => void;
   onFilterSelectionChange: (filter: Filter, dataMask: DataMask) => void;
 }
@@ -60,10 +61,10 @@ const StyledTitle = styled.h4`
   padding: 0;
 `;
 
-const StyledIcon = styled(Icon)`
-  margin-right: ${({ theme }) => theme.gridUnit}px;
-  color: ${({ theme }) => theme.colors.grayscale.dark1};
-  width: ${({ theme }) => theme.gridUnit * 4}px;
+const IconStyles = (theme: SupersetTheme) => css`
+  margin-right: ${theme.gridUnit}px;
+  color: ${theme.colors.grayscale.dark1};
+  width: ${theme.gridUnit * 4}px;
 `;
 
 const StyledPill = styled(Pill)`
@@ -73,6 +74,11 @@ const StyledPill = styled(Pill)`
   background: ${({ theme }) => theme.colors.grayscale.light1};
 `;
 
+const ContentWrapper = styled.div`
+  max-height: 700px;
+  overflow-y: auto;
+`;
+
 const CascadePopover: React.FC<CascadePopoverProps> = ({
   dataMaskSelected,
   filter,
@@ -80,6 +86,7 @@ const CascadePopover: React.FC<CascadePopoverProps> = ({
   onVisibleChange,
   onFilterSelectionChange,
   directPathToChild,
+  inView,
 }) => {
   const [currentPathToChild, setCurrentPathToChild] = useState<string[]>();
   const dataMask = dataMaskSelected[filter.id];
@@ -148,6 +155,7 @@ const CascadePopover: React.FC<CascadePopoverProps> = ({
         filter={filter}
         directPathToChild={directPathToChild}
         onFilterSelectionChange={onFilterSelectionChange}
+        inView={inView}
       />
     );
   }
@@ -155,22 +163,31 @@ const CascadePopover: React.FC<CascadePopoverProps> = ({
   const title = (
     <StyledTitleBox>
       <StyledTitle>
-        <StyledIcon name="edit" />
+        <Icons.Edit
+          iconSize="l"
+          css={(theme: SupersetTheme) => IconStyles(theme)}
+        />
         {t('Select parent filters')} ({allFilters.length})
       </StyledTitle>
-      <StyledIcon name="close" onClick={() => onVisibleChange(false)} />
+      <Icons.Close
+        iconSize="l"
+        css={(theme: SupersetTheme) => IconStyles(theme)}
+        onClick={() => onVisibleChange(false)}
+      />
     </StyledTitleBox>
   );
 
   const content = (
-    <CascadeFilterControl
-      dataMaskSelected={dataMaskSelected}
-      data-test="cascade-filters-control"
-      key={filter.id}
-      filter={filter}
-      directPathToChild={visible ? currentPathToChild : undefined}
-      onFilterSelectionChange={onFilterSelectionChange}
-    />
+    <ContentWrapper>
+      <CascadeFilterControl
+        dataMaskSelected={dataMaskSelected}
+        data-test="cascade-filters-control"
+        key={filter.id}
+        filter={filter}
+        directPathToChild={visible ? currentPathToChild : undefined}
+        onFilterSelectionChange={onFilterSelectionChange}
+      />
+    </ContentWrapper>
   );
 
   return (
@@ -182,7 +199,7 @@ const CascadePopover: React.FC<CascadePopoverProps> = ({
       onVisibleChange={onVisibleChange}
       placement="rightTop"
       id={filter.id}
-      overlayStyle={{ minWidth: '400px', maxWidth: '600px' }}
+      overlayStyle={{ width: '400px' }}
     >
       <div>
         {activeFilters.map(activeFilter => (
@@ -192,11 +209,12 @@ const CascadePopover: React.FC<CascadePopoverProps> = ({
             filter={activeFilter}
             onFilterSelectionChange={onFilterSelectionChange}
             directPathToChild={currentPathToChild}
+            inView={inView}
             icon={
               <>
                 {filter.cascadeChildren.length !== 0 && (
                   <StyledPill onClick={() => onVisibleChange(true)}>
-                    <Icon name="filter" /> {allFilters.length}
+                    <Icons.Filter iconSize="m" /> {allFilters.length}
                   </StyledPill>
                 )}
               </>
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.test.tsx
index d666c975fa5e..d76f09f85141 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.test.tsx
@@ -19,13 +19,8 @@
 
 import React from 'react';
 import { render, screen } from 'spec/helpers/testing-library';
-import { Provider } from 'react-redux';
 import userEvent from '@testing-library/user-event';
-import {
-  getMockStore,
-  mockStore,
-  stateWithoutNativeFilters,
-} from 'spec/fixtures/mockStore';
+import { stateWithoutNativeFilters } from 'spec/fixtures/mockStore';
 import * as mockCore from '@superset-ui/core';
 import { testWithId } from 'src/utils/testUtils';
 import { FeatureFlag } from 'src/featureFlags';
@@ -34,10 +29,6 @@ import { TimeFilterPlugin, SelectFilterPlugin } from 'src/filters/components';
 import { DATE_FILTER_CONTROL_TEST_ID } from 'src/explore/components/controls/DateFilterControl/DateFilterLabel';
 import fetchMock from 'fetch-mock';
 import { waitFor } from '@testing-library/react';
-import mockDatasource, {
-  id as datasourceId,
-  datasourceId as fullDatasourceId,
-} from 'spec/fixtures/mockDatasource';
 import FilterBar, { FILTER_BAR_TEST_ID } from '.';
 import { FILTERS_CONFIG_MODAL_TEST_ID } from '../FiltersConfigModal/FiltersConfigModal';
 
@@ -57,8 +48,25 @@ class MainPreset extends Preset {
   }
 }
 
-fetchMock.get(`glob:*/api/v1/dataset/${datasourceId}`, {
-  result: [mockDatasource[fullDatasourceId]],
+fetchMock.get('glob:*/api/v1/dataset/7', {
+  description_columns: {},
+  id: 1,
+  label_columns: {
+    columns: 'Columns',
+    table_name: 'Table Name',
+  },
+  result: {
+    metrics: [],
+    columns: [
+      {
+        column_name: 'Column A',
+        id: 1,
+      },
+    ],
+    table_name: 'birth_names',
+    id: 1,
+  },
+  show_columns: ['id', 'table_name'],
 });
 
 const getTestId = testWithId<string>(FILTER_BAR_TEST_ID, true);
@@ -91,7 +99,7 @@ const addFilterSetFlow = async () => {
   expect(screen.getByText('Filters (1)')).toBeInTheDocument();
   expect(screen.getByText(FILTER_NAME)).toBeInTheDocument();
 
-  expect(screen.getAllByText('Last week').length).toBe(2);
+  expect(screen.getAllByText('No filter').length).toBe(1);
 
   // apply filters
   expect(screen.getByTestId(getTestId('new-filter-set-button'))).toBeEnabled();
@@ -109,7 +117,7 @@ const addFilterSetFlow = async () => {
 };
 
 const changeFilterValue = async () => {
-  userEvent.click(screen.getAllByText('Last week')[0]);
+  userEvent.click(screen.getAllByText('No filter')[0]);
   userEvent.click(screen.getByDisplayValue('Last day'));
   expect(await screen.findByText(/2021-04-13/)).toBeInTheDocument();
   userEvent.click(screen.getByTestId(getDateControlTestId('apply-button')));
@@ -143,8 +151,7 @@ describe('FilterBar', () => {
               "defaultDataMask":{"filterState":{"value":null}},
               "controlValues":{},
               "cascadeParentIds":[],
-              "scope":{"rootPath":["ROOT_ID"],"excluded":[]},
-              "isInstant":false
+              "scope":{"rootPath":["ROOT_ID"],"excluded":[]}
             }],
             "filter_sets_configuration":[{
               "name":"${FILTER_SET_NAME}",
@@ -155,17 +162,16 @@ describe('FilterBar', () => {
                   "name":"${FILTER_NAME}",
                   "filterType":"filter_time",
                   "targets":[{}],
-                  "defaultDataMask":{"filterState":{"value":"Last week"},"extraFormData":{"time_range":"Last week"}},
+                  "defaultDataMask":{"filterState":{},"extraFormData":{}},
                   "controlValues":{},
                   "cascadeParentIds":[],
-                  "scope":{"rootPath":["ROOT_ID"],"excluded":[]},
-                  "isInstant":false
+                  "scope":{"rootPath":["ROOT_ID"],"excluded":[]}
                 }
               },
               "dataMask":{
                 "${filterId}":{
-                  "extraFormData":{"time_range":"Last week"},
-                  "filterState":{"value":"Last week"},
+                  "extraFormData":{},
+                  "filterState":{},
                   "ownState":{},
                   "id":"${filterId}"
                 }
@@ -179,7 +185,14 @@ describe('FilterBar', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     fetchMock.get(
-      'http://localhost/api/v1/time_range/?q=%27Last%20day%27',
+      'glob:*/api/v1/time_range/?q=%27No%20filter%27',
+      {
+        result: { since: '', until: '', timeRange: 'No filter' },
+      },
+      { overwriteRoutes: true },
+    );
+    fetchMock.get(
+      'glob:*/api/v1/time_range/?q=%27Last%20day%27',
       {
         result: {
           since: '2021-04-13T00:00:00',
@@ -190,7 +203,7 @@ describe('FilterBar', () => {
       { overwriteRoutes: true },
     );
     fetchMock.get(
-      'http://localhost/api/v1/time_range/?q=%27Last%20week%27',
+      'glob:*/api/v1/time_range/?q=%27Last%20week%27',
       {
         result: {
           since: '2021-04-07T00:00:00',
@@ -206,11 +219,11 @@ describe('FilterBar', () => {
   });
 
   const renderWrapper = (props = closedBarProps, state?: object) =>
-    render(
-      <Provider store={state ? getMockStore(state) : mockStore}>
-        <FilterBar {...props} />
-      </Provider>,
-    );
+    render(<FilterBar {...props} width={280} height={400} offset={0} />, {
+      useRedux: true,
+      initialState: state,
+      useRouter: true,
+    });
 
   it('should render', () => {
     const { container } = renderWrapper();
@@ -242,13 +255,6 @@ describe('FilterBar', () => {
     expect(screen.getByRole('img', { name: 'filter' })).toBeInTheDocument();
   });
 
-  it('should render the filter control name', async () => {
-    renderWrapper();
-    expect(
-      await screen.findByText('test', {}, { timeout: 2000 }),
-    ).toBeInTheDocument();
-  });
-
   it('should toggle', () => {
     renderWrapper();
     const collapse = screen.getByRole('img', { name: 'collapse' });
@@ -305,10 +311,11 @@ describe('FilterBar', () => {
 
     await addFilterFlow();
 
-    expect(screen.getByTestId(getTestId('apply-button'))).toBeEnabled();
+    expect(screen.getByTestId(getTestId('apply-button'))).toBeDisabled();
   });
 
-  it('add and apply filter set', async () => {
+  // disable due to filter sets not detecting changes in metadata properly
+  it.skip('add and apply filter set', async () => {
     // @ts-ignore
     global.featureFlags = {
       [FeatureFlag.DASHBOARD_NATIVE_FILTERS]: true,
@@ -344,12 +351,13 @@ describe('FilterBar', () => {
     ).not.toHaveAttribute('data-selected', 'true');
     userEvent.click(screen.getByTestId(getTestId('filter-set-wrapper')));
     userEvent.click(screen.getAllByText('Filters (1)')[1]);
-    expect(await screen.findByText('Last week')).toBeInTheDocument();
+    expect(await screen.findByText('No filter')).toBeInTheDocument();
     userEvent.click(screen.getByTestId(getTestId('apply-button')));
     expect(screen.getByTestId(getTestId('apply-button'))).toBeDisabled();
   });
 
-  it('add and edit filter set', async () => {
+  // disable due to filter sets not detecting changes in metadata properly
+  it.skip('add and edit filter set', async () => {
     // @ts-ignore
     global.featureFlags = {
       [FeatureFlag.DASHBOARD_NATIVE_FILTERS_SET]: true,
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.tsx
index 14dc65b90655..c952c1f25067 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.tsx
@@ -18,11 +18,17 @@
  */
 import React from 'react';
 import { styled } from '@superset-ui/core';
+import { Form, FormItem } from 'src/components/Form';
 import FilterValue from './FilterValue';
 import { FilterProps } from './types';
+import { checkIsMissingRequiredValue } from '../utils';
+
+const StyledIcon = styled.div`
+  position: absolute;
+  right: 0;
+`;
 
 const StyledFilterControlTitle = styled.h4`
-  width: 100%;
   font-size: ${({ theme }) => theme.typography.sizes.s}px;
   color: ${({ theme }) => theme.colors.grayscale.dark1};
   margin: 0;
@@ -37,8 +43,13 @@ const StyledFilterControlTitleBox = styled.div`
   margin-bottom: ${({ theme }) => theme.gridUnit}px;
 `;
 
-const StyledFilterControlContainer = styled.div`
+const StyledFilterControlContainer = styled(Form)`
   width: 100%;
+  && .ant-form-item-label > label {
+    text-transform: none;
+    width: 100%;
+    padding-right: ${({ theme }) => theme.gridUnit * 11}px;
+  }
 `;
 
 const FilterControl: React.FC<FilterProps> = ({
@@ -47,22 +58,37 @@ const FilterControl: React.FC<FilterProps> = ({
   icon,
   onFilterSelectionChange,
   directPathToChild,
+  inView,
 }) => {
   const { name = '<undefined>' } = filter;
+
+  const isMissingRequiredValue = checkIsMissingRequiredValue(
+    filter,
+    filter.dataMask?.filterState,
+  );
+
   return (
-    <StyledFilterControlContainer>
-      <StyledFilterControlTitleBox>
-        <StyledFilterControlTitle data-test="filter-control-name">
-          {name}
-        </StyledFilterControlTitle>
-        <div data-test="filter-icon">{icon}</div>
-      </StyledFilterControlTitleBox>
-      <FilterValue
-        dataMaskSelected={dataMaskSelected}
-        filter={filter}
-        directPathToChild={directPathToChild}
-        onFilterSelectionChange={onFilterSelectionChange}
-      />
+    <StyledFilterControlContainer layout="vertical">
+      <FormItem
+        label={
+          <StyledFilterControlTitleBox>
+            <StyledFilterControlTitle data-test="filter-control-name">
+              {name}
+            </StyledFilterControlTitle>
+            <StyledIcon data-test="filter-icon">{icon}</StyledIcon>
+          </StyledFilterControlTitleBox>
+        }
+        required={filter?.controlValues?.enableEmptyFilter}
+        validateStatus={isMissingRequiredValue ? 'error' : undefined}
+      >
+        <FilterValue
+          dataMaskSelected={dataMaskSelected}
+          filter={filter}
+          directPathToChild={directPathToChild}
+          onFilterSelectionChange={onFilterSelectionChange}
+          inView={inView}
+        />
+      </FormItem>
     </StyledFilterControlContainer>
   );
 };
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx
index 21fe5c2c68d0..81cb01fa7717 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx
@@ -19,18 +19,14 @@
 import React, { FC, useMemo, useState } from 'react';
 import { DataMask, styled, t } from '@superset-ui/core';
 import { css } from '@emotion/react';
-import { useSelector } from 'react-redux';
 import * as portals from 'react-reverse-portal';
 import { DataMaskStateWithId } from 'src/dataMask/types';
 import { Collapse } from 'src/common/components';
-import { TAB_TYPE } from 'src/dashboard/util/componentTypes';
-import { RootState } from 'src/dashboard/types';
 import CascadePopover from '../CascadeFilters/CascadePopover';
 import { buildCascadeFiltersTree } from './utils';
 import { useFilters } from '../state';
 import { Filter } from '../../types';
-import { CascadeFilter } from '../CascadeFilters/types';
-import { useDashboardLayout } from '../../state';
+import { useDashboardHasTabs, useSelectFiltersInScope } from '../../state';
 
 const Wrapper = styled.div`
   padding: ${({ theme }) => theme.gridUnit * 4}px;
@@ -52,10 +48,6 @@ const FilterControls: FC<FilterControlsProps> = ({
 }) => {
   const [visiblePopoverId, setVisiblePopoverId] = useState<string | null>(null);
   const filters = useFilters();
-  const dashboardLayout = useDashboardLayout();
-  const lastFocusedTabId = useSelector<RootState, string | null>(
-    state => state.dashboardState?.lastFocusedTabId,
-  );
   const filterValues = Object.values<Filter>(filters);
   const portalNodes = React.useMemo(() => {
     const nodes = new Array(filterValues.length);
@@ -74,23 +66,11 @@ const FilterControls: FC<FilterControlsProps> = ({
   }, [filterValues, dataMaskSelected]);
   const cascadeFilterIds = new Set(cascadeFilters.map(item => item.id));
 
-  let filtersInScope: CascadeFilter[] = [];
-  const filtersOutOfScope: CascadeFilter[] = [];
-  const dashboardHasTabs = Object.values(dashboardLayout).some(
-    element => element.type === TAB_TYPE,
+  const [filtersInScope, filtersOutOfScope] = useSelectFiltersInScope(
+    cascadeFilters,
   );
+  const dashboardHasTabs = useDashboardHasTabs();
   const showCollapsePanel = dashboardHasTabs && cascadeFilters.length > 0;
-  if (!lastFocusedTabId || !dashboardHasTabs) {
-    filtersInScope = cascadeFilters;
-  } else {
-    cascadeFilters.forEach((filter, index) => {
-      if (cascadeFilters[index].tabsInScope?.includes(lastFocusedTabId)) {
-        filtersInScope.push(filter);
-      } else {
-        filtersOutOfScope.push(filter);
-      }
-    });
-  }
 
   return (
     <Wrapper>
@@ -109,12 +89,13 @@ const FilterControls: FC<FilterControlsProps> = ({
               filter={cascadeFilters[index]}
               onFilterSelectionChange={onFilterSelectionChange}
               directPathToChild={directPathToChild}
+              inView={false}
             />
           </portals.InPortal>
         ))}
       {filtersInScope.map(filter => {
         const index = filterValues.findIndex(f => f.id === filter.id);
-        return <portals.OutPortal node={portalNodes[index]} />;
+        return <portals.OutPortal node={portalNodes[index]} inView />;
       })}
       {showCollapsePanel && (
         <Collapse
@@ -152,7 +133,7 @@ const FilterControls: FC<FilterControlsProps> = ({
           >
             {filtersOutOfScope.map(filter => {
               const index = cascadeFilters.findIndex(f => f.id === filter.id);
-              return <portals.OutPortal node={portalNodes[index]} />;
+              return <portals.OutPortal node={portalNodes[index]} inView />;
             })}
           </Collapse.Panel>
         </Collapse>
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx
index bb071315c628..0ce0ad0c7245 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx
@@ -19,36 +19,37 @@
 import React, { useEffect, useRef, useState } from 'react';
 import {
   QueryFormData,
-  styled,
   SuperChart,
   DataMask,
   t,
+  styled,
   Behavior,
   ChartDataResponseResult,
   JsonObject,
   getChartMetadataRegistry,
 } from '@superset-ui/core';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { areObjectsEqual } from 'src/reduxUtils';
 import { getChartDataRequest } from 'src/chart/chartAction';
 import Loading from 'src/components/Loading';
 import BasicErrorAlert from 'src/components/ErrorMessage/BasicErrorAlert';
 import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags';
 import { waitForAsyncData } from 'src/middleware/asyncEvent';
-import {
-  setFocusedNativeFilter,
-  unsetFocusedNativeFilter,
-} from 'src/dashboard/actions/nativeFilters';
 import { ClientErrorObject } from 'src/utils/getClientErrorObject';
+import { RootState } from 'src/dashboard/types';
+import { dispatchFocusAction } from './utils';
 import { FilterProps } from './types';
 import { getFormData } from '../../utils';
 import { useCascadingFilters } from './state';
+import { checkIsMissingRequiredValue } from '../utils';
 
-const FilterItem = styled.div`
-  min-height: ${({ theme }) => theme.gridUnit * 11}px;
-  padding-bottom: ${({ theme }) => theme.gridUnit * 3}px;
-  & > div > div {
-    height: auto;
+const HEIGHT = 32;
+
+// Overrides superset-ui height with min-height
+const StyledDiv = styled.div`
+  & > div {
+    height: auto !important;
+    min-height: ${HEIGHT}px;
   }
 `;
 
@@ -57,14 +58,21 @@ const FilterValue: React.FC<FilterProps> = ({
   filter,
   directPathToChild,
   onFilterSelectionChange,
+  inView = true,
 }) => {
   const { id, targets, filterType, adhoc_filters, time_range } = filter;
   const metadata = getChartMetadataRegistry().get(filterType);
   const cascadingFilters = useCascadingFilters(id, dataMaskSelected);
+  const isDashboardRefreshing = useSelector<RootState, boolean>(
+    state => state.dashboardState.isRefreshing,
+  );
   const [state, setState] = useState<ChartDataResponseResult[]>([]);
   const [error, setError] = useState<string>('');
-  const [formData, setFormData] = useState<Partial<QueryFormData>>({});
+  const [formData, setFormData] = useState<Partial<QueryFormData>>({
+    inView: false,
+  });
   const [ownState, setOwnState] = useState<JsonObject>({});
+  const [inViewFirstTime, setInViewFirstTime] = useState(inView);
   const inputRef = useRef<HTMLInputElement>(null);
   const [target] = targets;
   const {
@@ -74,9 +82,19 @@ const FilterValue: React.FC<FilterProps> = ({
   const { name: groupby } = column;
   const hasDataSource = !!datasetId;
   const [isLoading, setIsLoading] = useState<boolean>(hasDataSource);
-  const [isRefreshing, setIsRefreshing] = useState<boolean>(true);
+  const [isRefreshing, setIsRefreshing] = useState(false);
   const dispatch = useDispatch();
+
   useEffect(() => {
+    if (!inViewFirstTime && inView) {
+      setInViewFirstTime(true);
+    }
+  }, [inView, inViewFirstTime, setInViewFirstTime]);
+
+  useEffect(() => {
+    if (!inViewFirstTime) {
+      return;
+    }
     const newFormData = getFormData({
       ...filter,
       datasetId,
@@ -88,8 +106,10 @@ const FilterValue: React.FC<FilterProps> = ({
     });
     const filterOwnState = filter.dataMask?.ownState || {};
     if (
-      !areObjectsEqual(formData, newFormData) ||
-      !areObjectsEqual(ownState, filterOwnState)
+      !isRefreshing &&
+      (!areObjectsEqual(formData, newFormData) ||
+        !areObjectsEqual(ownState, filterOwnState) ||
+        isDashboardRefreshing)
     ) {
       setFormData(newFormData);
       setOwnState(filterOwnState);
@@ -103,25 +123,36 @@ const FilterValue: React.FC<FilterProps> = ({
         requestParams: { dashboardId: 0 },
         ownState: filterOwnState,
       })
-        .then(response => {
+        .then(({ response, json }) => {
           if (isFeatureEnabled(FeatureFlag.GLOBAL_ASYNC_QUERIES)) {
             // deal with getChartDataRequest transforming the response data
-            const result = 'result' in response ? response.result[0] : response;
-            waitForAsyncData(result)
-              .then((asyncResult: ChartDataResponseResult[]) => {
-                setIsRefreshing(false);
-                setIsLoading(false);
-                setState(asyncResult);
-              })
-              .catch((error: ClientErrorObject) => {
-                setError(
-                  error.message || error.error || t('Check configuration'),
-                );
-                setIsRefreshing(false);
-                setIsLoading(false);
-              });
+            const result = 'result' in json ? json.result[0] : json;
+
+            if (response.status === 200) {
+              setIsRefreshing(false);
+              setIsLoading(false);
+              setState([result]);
+            } else if (response.status === 202) {
+              waitForAsyncData(result)
+                .then((asyncResult: ChartDataResponseResult[]) => {
+                  setIsRefreshing(false);
+                  setIsLoading(false);
+                  setState(asyncResult);
+                })
+                .catch((error: ClientErrorObject) => {
+                  setError(
+                    error.message || error.error || t('Check configuration'),
+                  );
+                  setIsRefreshing(false);
+                  setIsLoading(false);
+                });
+            } else {
+              throw new Error(
+                `Received unexpected response status (${response.status}) while fetching chart data`,
+              );
+            }
           } else {
-            setState(response.result);
+            setState(json.result);
             setError('');
             setIsRefreshing(false);
             setIsLoading(false);
@@ -134,11 +165,14 @@ const FilterValue: React.FC<FilterProps> = ({
         });
     }
   }, [
+    inViewFirstTime,
     cascadingFilters,
     datasetId,
     groupby,
     JSON.stringify(filter),
     hasDataSource,
+    isRefreshing,
+    isDashboardRefreshing,
   ]);
 
   useEffect(() => {
@@ -155,8 +189,8 @@ const FilterValue: React.FC<FilterProps> = ({
   const setDataMask = (dataMask: DataMask) =>
     onFilterSelectionChange(filter, dataMask);
 
-  const setFocusedFilter = () => dispatch(setFocusedNativeFilter(id));
-  const unsetFocusedFilter = () => dispatch(unsetFocusedNativeFilter());
+  const setFocusedFilter = () => dispatchFocusAction(dispatch, id);
+  const unsetFocusedFilter = () => dispatchFocusAction(dispatch);
 
   if (error) {
     return (
@@ -167,28 +201,36 @@ const FilterValue: React.FC<FilterProps> = ({
       />
     );
   }
+  const isMissingRequiredValue = checkIsMissingRequiredValue(
+    filter,
+    filter.dataMask?.filterState,
+  );
+  const filterState = {
+    ...filter.dataMask?.filterState,
+    validateStatus: isMissingRequiredValue && 'error',
+  };
 
   return (
-    <FilterItem data-test="form-item-value">
+    <StyledDiv data-test="form-item-value">
       {isLoading ? (
         <Loading position="inline-centered" />
       ) : (
         <SuperChart
-          height={20}
-          width={220}
+          height={HEIGHT}
+          width="100%"
           formData={formData}
           // For charts that don't have datasource we need workaround for empty placeholder
           queriesData={hasDataSource ? state : [{ data: [{}] }]}
           chartType={filterType}
           behaviors={[Behavior.NATIVE_FILTER]}
-          filterState={filter.dataMask?.filterState}
+          filterState={filterState}
           ownState={filter.dataMask?.ownState}
           enableNoResults={metadata?.enableNoResults}
           isRefreshing={isRefreshing}
           hooks={{ setDataMask, setFocusedFilter, unsetFocusedFilter }}
         />
       )}
-    </FilterItem>
+    </StyledDiv>
   );
 };
 
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/types.ts b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/types.ts
index 93bf76d8c294..f28620bb349a 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/types.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/types.ts
@@ -29,4 +29,5 @@ export interface FilterProps {
   icon?: React.ReactElement;
   directPathToChild?: string[];
   onFilterSelectionChange: (filter: Filter, dataMask: DataMask) => void;
+  inView?: boolean;
 }
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/utils.ts b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/utils.ts
index 19b50ddf664d..0b6d9a78f3ef 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/utils.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/utils.ts
@@ -16,6 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { debounce } from 'lodash';
+import { Dispatch } from 'react';
+import {
+  setFocusedNativeFilter,
+  unsetFocusedNativeFilter,
+} from 'src/dashboard/actions/nativeFilters';
 import { Filter } from '../../types';
 import { CascadeFilter } from '../CascadeFilters/types';
 import { mapParentFiltersToChildren } from '../utils';
@@ -36,3 +42,14 @@ export function buildCascadeFiltersTree(filters: Filter[]): CascadeFilter[] {
     .filter(filter => !filter.cascadeParentIds?.length)
     .map(getCascadeFilter);
 }
+
+export const dispatchFocusAction = debounce(
+  (dispatch: Dispatch<any>, id?: string) => {
+    if (id) {
+      dispatch(setFocusedNativeFilter(id));
+    } else {
+      dispatch(unsetFocusedNativeFilter());
+    }
+  },
+  300,
+);
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FiltersHeader.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FiltersHeader.tsx
index 339f1b7915c3..d63033142f8a 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FiltersHeader.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FiltersHeader.tsx
@@ -17,10 +17,10 @@
  * under the License.
  */
 import React, { FC } from 'react';
-import { styled, t } from '@superset-ui/core';
+import { styled, t, useTheme } from '@superset-ui/core';
 import { Collapse, Typography, Tooltip } from 'src/common/components';
 import { DataMaskState } from 'src/dataMask/types';
-import { CaretDownOutlined } from '@ant-design/icons';
+import Icons from 'src/components/Icons';
 import { areObjectsEqual } from 'src/reduxUtils';
 import { FilterSet } from 'src/dashboard/reducers/types';
 import { getFilterValueForDisplay } from './utils';
@@ -55,12 +55,18 @@ const StyledCollapse = styled(Collapse)`
   }
 `;
 
+const StyledFilterRow = styled.div`
+  padding-top: ${({ theme }) => theme.gridUnit}px;
+  padding-bottom: ${({ theme }) => theme.gridUnit}px;
+`;
+
 export type FiltersHeaderProps = {
   dataMask?: DataMaskState;
   filterSet?: FilterSet;
 };
 
 const FiltersHeader: FC<FiltersHeaderProps> = ({ dataMask, filterSet }) => {
+  const theme = useTheme();
   const filters = useFilters();
   const filterValues = Object.values(filters);
 
@@ -98,7 +104,7 @@ const FiltersHeader: FC<FiltersHeaderProps> = ({ dataMask, filterSet }) => {
         placement="bottomLeft"
         key={id}
       >
-        <div data-test="filter-info">
+        <StyledFilterRow data-test="filter-info">
           <Typography.Text strong delete={removedFilter} mark={changedFilter}>
             {name}:&nbsp;
           </Typography.Text>
@@ -107,19 +113,23 @@ const FiltersHeader: FC<FiltersHeaderProps> = ({ dataMask, filterSet }) => {
               <Typography.Text type="secondary">{t('None')}</Typography.Text>
             )}
           </Typography.Text>
-        </div>
+        </StyledFilterRow>
       </Tooltip>
     );
   };
 
+  const getExpandIcon = ({ isActive }: { isActive: boolean }) => {
+    const color = theme.colors.grayscale.base;
+    const Icon = isActive ? Icons.CaretUpOutlined : Icons.CaretDownOutlined;
+    return <Icon iconColor={color} />;
+  };
+
   return (
     <StyledCollapse
       ghost
       expandIconPosition="right"
       defaultActiveKey={!filterSet ? ['filters'] : undefined}
-      expandIcon={({ isActive }: { isActive: boolean }) => (
-        <CaretDownOutlined rotate={isActive ? 0 : 180} />
-      )}
+      expandIcon={getExpandIcon}
     >
       <Collapse.Panel
         {...getFilterBarTestId('collapse-filter-set-description')}
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/index.tsx
index 591aacbf47da..6f6b3d8c8a4f 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/index.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/index.tsx
@@ -36,6 +36,9 @@ const FilterSetsWrapper = styled.div`
   align-items: center;
   justify-content: center;
   grid-template-columns: 1fr;
+  padding: ${({ theme }) => theme.gridUnit * 2}px
+    ${({ theme }) => theme.gridUnit * 4}px;
+
   & button.superset-button {
     margin-left: 0;
   }
@@ -48,18 +51,17 @@ const FilterSetUnitWrapper = styled.div<{
   onClick?: HandlerFunction;
   'data-selected'?: boolean;
 }>`
-  display: grid;
-  align-items: center;
-  justify-content: center;
-  grid-template-columns: 1fr;
-  grid-gap: ${({ theme }) => theme.gridUnit}px;
-  ${({ theme }) =>
-    `padding: 0 ${theme.gridUnit * 4}px ${theme.gridUnit * 4}px`};
-  border-bottom: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
-  padding: ${({ theme }) => `${theme.gridUnit * 3}px ${theme.gridUnit * 2}px`};
-  cursor: ${({ onClick }) => (!onClick ? 'auto' : 'pointer')};
-  ${({ theme, 'data-selected': selected }) =>
-    `background: ${selected ? theme.colors.primary.light5 : 'transparent'}`};
+  ${({ theme, 'data-selected': selected, onClick }) => `
+    display: grid;
+    align-items: center;
+    justify-content: center;
+    grid-template-columns: 1fr;
+    grid-gap: ${theme.gridUnit}px;
+    border-bottom: 1px solid ${theme.colors.grayscale.light2};
+    padding: ${theme.gridUnit * 2}px 0px};
+    cursor: ${!onClick ? 'auto' : 'pointer'};
+    background: ${selected ? theme.colors.primary.light5 : 'transparent'};
+  `}
 `;
 
 export type FilterSetsProps = {
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/Header.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/Header.test.tsx
index 4b6418e21dd0..64a2dd1d43a9 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/Header.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/Header.test.tsx
@@ -24,7 +24,7 @@ import Header from './index';
 const createProps = () => ({
   toggleFiltersBar: jest.fn(),
   onApply: jest.fn(),
-  setDataMaskSelected: jest.fn(),
+  onClearAll: jest.fn(),
   dataMaskSelected: {
     DefaultsID: {
       filterState: {
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx
index 096e58b003b3..16714ac8a6ce 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx
@@ -17,12 +17,11 @@
  * under the License.
  */
 /* eslint-disable no-param-reassign */
-import { styled, t } from '@superset-ui/core';
+import { styled, t, useTheme } from '@superset-ui/core';
 import React, { FC } from 'react';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import Button from 'src/components/Button';
 import { useSelector } from 'react-redux';
-import { getInitialDataMask } from 'src/dataMask/reducer';
 import { DataMaskState, DataMaskStateWithId } from 'src/dataMask/types';
 import FilterConfigurationLink from 'src/dashboard/components/nativeFilters/FilterBar/FilterConfigurationLink';
 import { useFilters } from 'src/dashboard/components/nativeFilters/FilterBar/state';
@@ -49,8 +48,7 @@ const ActionButtons = styled.div`
   align-items: center;
   grid-gap: 10px;
   grid-template-columns: 1fr 1fr;
-  ${({ theme }) =>
-    `padding: 0 ${theme.gridUnit * 2}px ${theme.gridUnit * 2}px`};
+  ${({ theme }) => `padding: 0 ${theme.gridUnit * 2}px`};
 
   .btn {
     flex: 1;
@@ -61,10 +59,15 @@ const HeaderButton = styled(Button)`
   padding: 0;
 `;
 
+const Wrapper = styled.div`
+  padding: ${({ theme }) => theme.gridUnit}px
+    ${({ theme }) => theme.gridUnit * 2}px;
+`;
+
 type HeaderProps = {
   toggleFiltersBar: (arg0: boolean) => void;
   onApply: () => void;
-  setDataMaskSelected: (arg0: (draft: DataMaskState) => void) => void;
+  onClearAll: () => void;
   dataMaskSelected: DataMaskState;
   dataMaskApplied: DataMaskStateWithId;
   isApplyDisabled: boolean;
@@ -72,26 +75,19 @@ type HeaderProps = {
 
 const Header: FC<HeaderProps> = ({
   onApply,
+  onClearAll,
   isApplyDisabled,
   dataMaskSelected,
   dataMaskApplied,
-  setDataMaskSelected,
   toggleFiltersBar,
 }) => {
+  const theme = useTheme();
   const filters = useFilters();
   const filterValues = Object.values<Filter>(filters);
   const canEdit = useSelector<RootState, boolean>(
     ({ dashboardInfo }) => dashboardInfo.dash_edit_perm,
   );
 
-  const handleClearAll = () => {
-    filterValues.forEach(filter => {
-      setDataMaskSelected(draft => {
-        draft[filter.id] = getInitialDataMask(filter.id);
-      });
-    });
-  };
-
   const isClearAllDisabled = Object.values(dataMaskApplied).every(
     filter =>
       dataMaskSelected[filter.id]?.filterState?.value === null ||
@@ -99,12 +95,15 @@ const Header: FC<HeaderProps> = ({
   );
 
   return (
-    <>
+    <Wrapper>
       <TitleArea>
         <span>{t('Filters')}</span>
         {canEdit && (
           <FilterConfigurationLink createNewOnOpen={filterValues.length === 0}>
-            <Icon name="edit" data-test="create-filter" />
+            <Icons.Edit
+              data-test="create-filter"
+              iconColor={theme.colors.grayscale.base}
+            />
           </FilterConfigurationLink>
         )}
         <HeaderButton
@@ -113,7 +112,7 @@ const Header: FC<HeaderProps> = ({
           buttonSize="xsmall"
           onClick={() => toggleFiltersBar(false)}
         >
-          <Icon name="expand" />
+          <Icons.Expand iconColor={theme.colors.grayscale.base} />
         </HeaderButton>
       </TitleArea>
       <ActionButtons>
@@ -121,7 +120,7 @@ const Header: FC<HeaderProps> = ({
           disabled={isClearAllDisabled}
           buttonStyle="tertiary"
           buttonSize="small"
-          onClick={handleClearAll}
+          onClick={onClearAll}
           {...getFilterBarTestId('clear-button')}
         >
           {t('Clear all')}
@@ -137,7 +136,7 @@ const Header: FC<HeaderProps> = ({
           {t('Apply')}
         </Button>
       </ActionButtons>
-    </>
+    </Wrapper>
   );
 };
 
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx
index 631179b89829..9a96331dd088 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx
@@ -19,21 +19,25 @@
 
 /* eslint-disable no-param-reassign */
 import { DataMask, HandlerFunction, styled, t } from '@superset-ui/core';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useCallback } from 'react';
 import { useDispatch } from 'react-redux';
 import cx from 'classnames';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import { Tabs } from 'src/common/components';
+import { useHistory } from 'react-router-dom';
+import { usePrevious } from 'src/common/hooks/usePrevious';
+import rison from 'rison';
 import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags';
-import { updateDataMask } from 'src/dataMask/actions';
+import { updateDataMask, clearDataMask } from 'src/dataMask/actions';
 import { DataMaskStateWithId, DataMaskWithId } from 'src/dataMask/types';
 import { useImmer } from 'use-immer';
-import { areObjectsEqual } from 'src/reduxUtils';
 import { testWithId } from 'src/utils/testUtils';
 import { Filter } from 'src/dashboard/components/nativeFilters/types';
 import Loading from 'src/components/Loading';
 import { getInitialDataMask } from 'src/dataMask/reducer';
-import { getOnlyExtraFormData, TabIds } from './utils';
+import { URL_PARAMS } from 'src/constants';
+import replaceUndefinedByNull from 'src/dashboard/util/replaceUndefinedByNull';
+import { checkIsApplyDisabled, TabIds } from './utils';
 import FilterSets from './FilterSets';
 import {
   useNativeFiltersDataMask,
@@ -46,22 +50,21 @@ import EditSection from './FilterSets/EditSection';
 import Header from './Header';
 import FilterControls from './FilterControls/FilterControls';
 
-const BAR_WIDTH = `250px`;
-
 export const FILTER_BAR_TEST_ID = 'filter-bar';
 export const getFilterBarTestId = testWithId(FILTER_BAR_TEST_ID);
 
-const BarWrapper = styled.div`
+const BarWrapper = styled.div<{ width: number }>`
   width: ${({ theme }) => theme.gridUnit * 8}px;
+
   & .ant-tabs-top > .ant-tabs-nav {
     margin: 0;
   }
   &.open {
-    width: ${BAR_WIDTH}; // arbitrary...
+    width: ${({ width }) => width}px; // arbitrary...
   }
 `;
 
-const Bar = styled.div`
+const Bar = styled.div<{ width: number }>`
   & .ant-typography-edit-content {
     left: 0;
     margin-top: 0;
@@ -72,66 +75,49 @@ const Bar = styled.div`
   left: 0;
   flex-direction: column;
   flex-grow: 1;
-  width: ${BAR_WIDTH}; // arbitrary...
+  width: ${({ width }) => width}px;
   background: ${({ theme }) => theme.colors.grayscale.light5};
   border-right: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
+  border-bottom: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
   min-height: 100%;
   display: none;
-  /* &.animated {
-    display: flex;
-    transform: translateX(-100%);
-    transition: transform ${({ theme }) => theme.transitionTiming}s;
-    transition-delay: 0s;
-  }  */
 
   &.open {
     display: flex;
-    /* &.animated {
-      transform: translateX(0);
-      transition-delay: ${({ theme }) => theme.transitionTiming * 2}s;
-    } */
   }
 `;
 
-const CollapsedBar = styled.div`
+const CollapsedBar = styled.div<{ offset: number }>`
   position: absolute;
-  top: 0;
+  top: ${({ offset }) => offset}px;
   left: 0;
   height: 100%;
   width: ${({ theme }) => theme.gridUnit * 8}px;
   padding-top: ${({ theme }) => theme.gridUnit * 2}px;
   display: none;
   text-align: center;
-  /* &.animated {
-    display: block;
-    transform: translateX(-100%);
-    transition: transform ${({ theme }) => theme.transitionTiming}s;
-    transition-delay: 0s;
-  } */
 
   &.open {
     display: flex;
     flex-direction: column;
     align-items: center;
     padding: ${({ theme }) => theme.gridUnit * 2}px;
-    /* &.animated {
-      transform: translateX(0);
-      transition-delay: ${({ theme }) => theme.transitionTiming * 3}s;
-    } */
   }
 
   svg {
-    width: ${({ theme }) => theme.gridUnit * 4}px;
-    height: ${({ theme }) => theme.gridUnit * 4}px;
     cursor: pointer;
   }
 `;
 
-const StyledCollapseIcon = styled(Icon)`
+const StyledCollapseIcon = styled(Icons.Collapse)`
   color: ${({ theme }) => theme.colors.primary.base};
   margin-bottom: ${({ theme }) => theme.gridUnit * 3}px;
 `;
 
+const StyledFilterIcon = styled(Icons.Filter)`
+  color: ${({ theme }) => theme.colors.grayscale.base};
+`;
+
 const StyledTabs = styled(Tabs)`
   & .ant-tabs-nav-list {
     width: 100%;
@@ -148,30 +134,56 @@ export interface FiltersBarProps {
   filtersOpen: boolean;
   toggleFiltersBar: any;
   directPathToChild?: string[];
+  width: number;
+  height: number | string;
+  offset: number;
 }
 
 const FilterBar: React.FC<FiltersBarProps> = ({
   filtersOpen,
   toggleFiltersBar,
   directPathToChild,
+  width,
+  height,
+  offset,
 }) => {
+  const history = useHistory();
+  const dataMaskApplied: DataMaskStateWithId = useNativeFiltersDataMask();
   const [editFilterSetId, setEditFilterSetId] = useState<string | null>(null);
   const [dataMaskSelected, setDataMaskSelected] = useImmer<DataMaskStateWithId>(
-    {},
+    dataMaskApplied,
   );
   const dispatch = useDispatch();
   const filterSets = useFilterSets();
   const filterSetFilterValues = Object.values(filterSets);
   const [tab, setTab] = useState(TabIds.AllFilters);
   const filters = useFilters();
+  const previousFilters = usePrevious(filters);
   const filterValues = Object.values<Filter>(filters);
-  const dataMaskApplied: DataMaskStateWithId = useNativeFiltersDataMask();
   const [isFilterSetChanged, setIsFilterSetChanged] = useState(false);
 
   useEffect(() => {
     setDataMaskSelected(() => dataMaskApplied);
   }, [JSON.stringify(dataMaskApplied), setDataMaskSelected]);
 
+  // reset filter state if filter type changes
+  useEffect(() => {
+    setDataMaskSelected(draft => {
+      Object.values(filters).forEach(filter => {
+        if (
+          filter.filterType !== previousFilters?.[filter.id]?.filterType &&
+          previousFilters?.[filter.id]?.filterType !== undefined
+        ) {
+          draft[filter.id] = getInitialDataMask(filter.id) as DataMaskWithId;
+        }
+      });
+    });
+  }, [
+    JSON.stringify(filters),
+    JSON.stringify(previousFilters),
+    setDataMaskSelected,
+  ]);
+
   const handleFilterSelectionChange = (
     filter: Pick<Filter, 'id'> & Partial<Filter>,
     dataMask: Partial<DataMask>,
@@ -180,11 +192,10 @@ const FilterBar: React.FC<FiltersBarProps> = ({
     setDataMaskSelected(draft => {
       // force instant updating on initialization for filters with `requiredFirst` is true or instant filters
       if (
-        (dataMaskSelected[filter.id] && filter.isInstant) ||
         // filterState.value === undefined - means that value not initialized
-        (dataMask.filterState?.value !== undefined &&
-          dataMaskSelected[filter.id]?.filterState?.value === undefined &&
-          filter.requiredFirst)
+        dataMask.filterState?.value !== undefined &&
+        dataMaskSelected[filter.id]?.filterState?.value === undefined &&
+        filter.requiredFirst
       ) {
         dispatch(updateDataMask(filter.id, dataMask));
       }
@@ -196,6 +207,37 @@ const FilterBar: React.FC<FiltersBarProps> = ({
     });
   };
 
+  const publishDataMask = useCallback(
+    (dataMaskSelected: DataMaskStateWithId) => {
+      const { location } = history;
+      const { search } = location;
+      const previousParams = new URLSearchParams(search);
+      const newParams = new URLSearchParams();
+
+      previousParams.forEach((value, key) => {
+        if (key !== URL_PARAMS.nativeFilters.name) {
+          newParams.append(key, value);
+        }
+      });
+
+      newParams.set(
+        URL_PARAMS.nativeFilters.name,
+        rison.encode(replaceUndefinedByNull(dataMaskSelected)),
+      );
+
+      history.replace({
+        search: newParams.toString(),
+      });
+    },
+    [history],
+  );
+
+  const dataMaskAppliedText = JSON.stringify(dataMaskApplied);
+  useEffect(() => {
+    publishDataMask(dataMaskApplied);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [dataMaskAppliedText, publishDataMask]);
+
   const handleApply = () => {
     const filterIds = Object.keys(dataMaskSelected);
     filterIds.forEach(filterId => {
@@ -205,43 +247,54 @@ const FilterBar: React.FC<FiltersBarProps> = ({
     });
   };
 
-  useFilterUpdates(dataMaskSelected, setDataMaskSelected);
-
-  const dataSelectedValues = Object.values(dataMaskSelected);
-  const dataAppliedValues = Object.values(dataMaskApplied);
-  const isApplyDisabled =
-    areObjectsEqual(
-      getOnlyExtraFormData(dataMaskSelected),
-      getOnlyExtraFormData(dataMaskApplied),
-      { ignoreUndefined: true },
-    ) || dataSelectedValues.length !== dataAppliedValues.length;
+  const handleClearAll = () => {
+    const filterIds = Object.keys(dataMaskSelected);
+    filterIds.forEach(filterId => {
+      if (dataMaskSelected[filterId]) {
+        dispatch(clearDataMask(filterId));
+      }
+    });
+  };
 
+  useFilterUpdates(dataMaskSelected, setDataMaskSelected);
+  const isApplyDisabled = checkIsApplyDisabled(
+    dataMaskSelected,
+    dataMaskApplied,
+    filterValues,
+  );
   const isInitialized = useInitialization();
 
   return (
-    <BarWrapper {...getFilterBarTestId()} className={cx({ open: filtersOpen })}>
+    <BarWrapper
+      {...getFilterBarTestId()}
+      className={cx({ open: filtersOpen })}
+      width={width}
+    >
       <CollapsedBar
         {...getFilterBarTestId('collapsable')}
         className={cx({ open: !filtersOpen })}
         onClick={() => toggleFiltersBar(true)}
+        offset={offset}
       >
         <StyledCollapseIcon
-          name="collapse"
           {...getFilterBarTestId('expand-button')}
+          iconSize="l"
         />
-        <Icon name="filter" {...getFilterBarTestId('filter-icon')} />
+        <StyledFilterIcon {...getFilterBarTestId('filter-icon')} iconSize="l" />
       </CollapsedBar>
-      <Bar className={cx({ open: filtersOpen })}>
+      <Bar className={cx({ open: filtersOpen })} width={width}>
         <Header
           toggleFiltersBar={toggleFiltersBar}
           onApply={handleApply}
-          setDataMaskSelected={setDataMaskSelected}
+          onClearAll={handleClearAll}
           isApplyDisabled={isApplyDisabled}
           dataMaskSelected={dataMaskSelected}
           dataMaskApplied={dataMaskApplied}
         />
         {!isInitialized ? (
-          <Loading />
+          <div css={{ height }}>
+            <Loading />
+          </div>
         ) : isFeatureEnabled(FeatureFlag.DASHBOARD_NATIVE_FILTERS_SET) ? (
           <StyledTabs
             centered
@@ -252,6 +305,7 @@ const FilterBar: React.FC<FiltersBarProps> = ({
             <Tabs.TabPane
               tab={t(`All Filters (${filterValues.length})`)}
               key={TabIds.AllFilters}
+              css={{ overflow: 'auto', height }}
             >
               {editFilterSetId && (
                 <EditSection
@@ -271,6 +325,7 @@ const FilterBar: React.FC<FiltersBarProps> = ({
               disabled={!!editFilterSetId}
               tab={t(`Filter Sets (${filterSetFilterValues.length})`)}
               key={TabIds.FilterSets}
+              css={{ overflow: 'auto', height }}
             >
               <FilterSets
                 onEditFilterSet={setEditFilterSetId}
@@ -282,11 +337,13 @@ const FilterBar: React.FC<FiltersBarProps> = ({
             </Tabs.TabPane>
           </StyledTabs>
         ) : (
-          <FilterControls
-            dataMaskSelected={dataMaskSelected}
-            directPathToChild={directPathToChild}
-            onFilterSelectionChange={handleFilterSelectionChange}
-          />
+          <div css={{ overflow: 'auto', height }}>
+            <FilterControls
+              dataMaskSelected={dataMaskSelected}
+              directPathToChild={directPathToChild}
+              onFilterSelectionChange={handleFilterSelectionChange}
+            />
+          </div>
         )}
       </Bar>
     </BarWrapper>
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/state.ts b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/state.ts
index aa4894fd9ee6..12d7b6c19451 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/state.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/state.ts
@@ -30,6 +30,7 @@ import {
 import { useEffect, useState } from 'react';
 import { ChartsState, RootState } from 'src/dashboard/types';
 import { NATIVE_FILTER_PREFIX } from '../FiltersConfigModal/utils';
+import { Filter } from '../types';
 
 export const useFilterSets = () =>
   useSelector<any, FilterSetsType>(
@@ -37,7 +38,20 @@ export const useFilterSets = () =>
   );
 
 export const useFilters = () =>
-  useSelector<any, Filters>(state => state.nativeFilters.filters);
+  useSelector<any, Filters>(state => {
+    const preselectNativeFilters =
+      state.dashboardState?.preselectNativeFilters || {};
+    return Object.entries(state.nativeFilters.filters).reduce(
+      (acc, [filterId, filter]: [string, Filter]) => ({
+        ...acc,
+        [filterId]: {
+          ...filter,
+          preselect: preselectNativeFilters[filterId],
+        },
+      }),
+      {} as Filters,
+    );
+  });
 
 export const useNativeFiltersDataMask = () => {
   const dataMask = useSelector<RootState, DataMaskStateWithId>(
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/utils.ts b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/utils.ts
index 75cda7382e91..84bd6cbf369e 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/utils.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/utils.ts
@@ -18,6 +18,8 @@
  */
 
 import { DataMaskStateWithId } from 'src/dataMask/types';
+import { areObjectsEqual } from 'src/reduxUtils';
+import { FilterState } from '@superset-ui/core';
 import { Filter } from '../types';
 
 export enum TabIds {
@@ -46,3 +48,39 @@ export const getOnlyExtraFormData = (data: DataMaskStateWithId) =>
     (prev, next) => ({ ...prev, [next.id]: next.extraFormData }),
     {},
   );
+
+export const checkIsMissingRequiredValue = (
+  filter: Filter,
+  filterState?: FilterState,
+) => {
+  const value = filterState?.value;
+  // TODO: this property should be unhardcoded
+  return (
+    filter.controlValues.enableEmptyFilter &&
+    (value === null || value === undefined)
+  );
+};
+
+export const checkIsApplyDisabled = (
+  dataMaskSelected: DataMaskStateWithId,
+  dataMaskApplied: DataMaskStateWithId,
+  filters: Filter[],
+) => {
+  const dataSelectedValues = Object.values(dataMaskSelected);
+  const dataAppliedValues = Object.values(dataMaskApplied);
+
+  return (
+    areObjectsEqual(
+      getOnlyExtraFormData(dataMaskSelected),
+      getOnlyExtraFormData(dataMaskApplied),
+      { ignoreUndefined: true },
+    ) ||
+    dataSelectedValues.length !== dataAppliedValues.length ||
+    filters.some(filter =>
+      checkIsMissingRequiredValue(
+        filter,
+        dataMaskSelected?.[filter?.id]?.filterState,
+      ),
+    )
+  );
+};
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTabs.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTabs.tsx
index 3d687961eaf8..a5f1dd03fb8b 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTabs.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTabs.tsx
@@ -20,7 +20,7 @@ import { PlusOutlined } from '@ant-design/icons';
 import { styled, t } from '@superset-ui/core';
 import React, { FC } from 'react';
 import { LineEditableTabs } from 'src/components/Tabs';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import { FilterRemoval } from './types';
 import { REMOVAL_DELAY_SECS } from './utils';
 
@@ -51,7 +51,7 @@ export const StyledAddFilterBox = styled.div`
   }
 `;
 
-export const StyledTrashIcon = styled(Icon)`
+export const StyledTrashIcon = styled(Icons.Trash)`
   color: ${({ theme }) => theme.colors.grayscale.light3};
 `;
 
@@ -124,14 +124,13 @@ const FilterTabsContainer = styled(LineEditableTabs)`
       margin: 0 ${theme.gridUnit * 2}px 0 0;
       padding: ${theme.gridUnit}px
         ${theme.gridUnit * 2}px;
-
       &:hover,
       &-active {
         color: ${theme.colors.grayscale.dark1};
         border-radius: ${theme.borderRadius}px;
         background-color: ${theme.colors.secondary.light4};
 
-        .ant-tabs-tab-remove > svg {
+        .ant-tabs-tab-remove > span {
           color: ${theme.colors.grayscale.base};
           transition: all 0.3s;
         }
@@ -238,9 +237,7 @@ const FilterTabs: FC<FilterTabsProps> = ({
           </FilterTabTitle>
         }
         key={id}
-        closeIcon={
-          removedFilters[id] ? <></> : <StyledTrashIcon name="trash" />
-        }
+        closeIcon={removedFilters[id] ? <></> : <StyledTrashIcon />}
       >
         {
           // @ts-ignore
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/CollapsibleControl.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/CollapsibleControl.tsx
index 1d9ed15aa6a0..68f3ad5f2992 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/CollapsibleControl.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/CollapsibleControl.tsx
@@ -16,13 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { ReactNode, useState } from 'react';
+import React, { ReactNode, useEffect, useState } from 'react';
 import { styled } from '@superset-ui/core';
 import { Checkbox } from 'src/common/components';
+import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
 
 interface CollapsibleControlProps {
+  initialValue?: boolean;
+  disabled?: boolean;
   checked?: boolean;
   title: string;
+  tooltip?: string;
   children: ReactNode;
   onChange?: (checked: boolean) => void;
 }
@@ -45,22 +49,47 @@ const StyledContainer = styled.div<{ checked: boolean }>`
 `;
 
 const CollapsibleControl = (props: CollapsibleControlProps) => {
-  const { checked = false, title, children, onChange } = props;
-  const [isChecked, setIsChecked] = useState(checked);
+  const {
+    checked,
+    disabled,
+    title,
+    tooltip,
+    children,
+    onChange = () => {},
+    initialValue = false,
+  } = props;
+  const [isChecked, setIsChecked] = useState(initialValue);
+
+  useEffect(() => {
+    // if external `checked` changed to `undefined`, it means that we work now in uncontrolled mode with local state
+    // and we need ignore external value
+    if (checked !== undefined) {
+      setIsChecked(checked);
+    }
+  }, [checked]);
+
   return (
     <StyledContainer checked={isChecked}>
       <Checkbox
         className="checkbox"
         checked={isChecked}
+        disabled={disabled}
         onChange={e => {
           const value = e.target.checked;
-          setIsChecked(value);
-          if (onChange) {
-            onChange(value);
+          // external `checked` value has more priority then local state
+          if (checked === undefined) {
+            // uncontrolled mode
+            setIsChecked(value);
           }
+          onChange(value);
         }}
       >
-        {title}
+        <>
+          {title}&nbsp;
+          {tooltip && (
+            <InfoTooltipWithTrigger placement="top" tooltip={tooltip} />
+          )}
+        </>
       </Checkbox>
       {isChecked && children}
     </StyledContainer>
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.test.tsx
index f3a5ed8d793e..efb6b9d8e651 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.test.tsx
@@ -17,18 +17,20 @@
  * under the License.
  */
 import React from 'react';
-import { render, waitFor } from 'spec/helpers/testing-library';
+import { render, screen, waitFor } from 'spec/helpers/testing-library';
 import fetchMock from 'fetch-mock';
 import * as utils from 'src/utils/getClientErrorObject';
+import { Column, JsonObject } from '@superset-ui/core';
+import userEvent from '@testing-library/user-event';
 import { ColumnSelect } from './ColumnSelect';
 
 fetchMock.get('http://localhost/api/v1/dataset/123', {
   body: {
     result: {
       columns: [
-        { column_name: 'column_name_01' },
-        { column_name: 'column_name_02' },
-        { column_name: 'column_name_03' },
+        { column_name: 'column_name_01', is_dttm: true },
+        { column_name: 'column_name_02', is_dttm: false },
+        { column_name: 'column_name_03', is_dttm: false },
       ],
     },
   },
@@ -37,9 +39,9 @@ fetchMock.get('http://localhost/api/v1/dataset/456', {
   body: {
     result: {
       columns: [
-        { column_name: 'column_name_04' },
-        { column_name: 'column_name_05' },
-        { column_name: 'column_name_06' },
+        { column_name: 'column_name_04', is_dttm: false },
+        { column_name: 'column_name_05', is_dttm: false },
+        { column_name: 'column_name_06', is_dttm: false },
       ],
     },
   },
@@ -47,24 +49,35 @@ fetchMock.get('http://localhost/api/v1/dataset/456', {
 
 fetchMock.get('http://localhost/api/v1/dataset/789', { status: 404 });
 
-const createProps = () => ({
+const createProps = (extraProps: JsonObject = {}) => ({
   filterId: 'filterId',
   form: { getFieldValue: jest.fn(), setFields: jest.fn() },
   datasetId: 123,
   value: 'column_name_01',
   onChange: jest.fn(),
+  ...extraProps,
 });
 
 afterAll(() => {
   fetchMock.restore();
 });
 
-test('Should render', () => {
+test('Should render', async () => {
   const props = createProps();
   const { container } = render(<ColumnSelect {...(props as any)} />, {
     useRedux: true,
   });
   expect(container.children).toHaveLength(1);
+  userEvent.type(screen.getByRole('combobox'), 'column_name');
+  await waitFor(() => {
+    expect(screen.getByTitle('column_name_01')).toBeInTheDocument();
+  });
+  await waitFor(() => {
+    expect(screen.getByTitle('column_name_02')).toBeInTheDocument();
+  });
+  await waitFor(() => {
+    expect(screen.getByTitle('column_name_03')).toBeInTheDocument();
+  });
 });
 
 test('Should call "setFields" when "datasetId" changes', () => {
@@ -94,3 +107,23 @@ test('Should call "getClientErrorObject" when api returns an error', async () =>
     expect(spy).toBeCalled();
   });
 });
+
+test('Should filter results', async () => {
+  const props = createProps({
+    filterValues: (column: Column) => column.is_dttm,
+  });
+  const { container } = render(<ColumnSelect {...(props as any)} />, {
+    useRedux: true,
+  });
+  expect(container.children).toHaveLength(1);
+  userEvent.type(screen.getByRole('combobox'), 'column_name');
+  await waitFor(() => {
+    expect(screen.getByTitle('column_name_01')).toBeInTheDocument();
+  });
+  await waitFor(() => {
+    expect(screen.queryByTitle('column_name_02')).not.toBeInTheDocument();
+  });
+  await waitFor(() => {
+    expect(screen.queryByTitle('column_name_03')).not.toBeInTheDocument();
+  });
+});
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.tsx
index a45d3016d4a7..8fc4cc4b9cd6 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.tsx
@@ -16,27 +16,27 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { useCallback } from 'react';
+import React, { useCallback, useState, useMemo, useEffect } from 'react';
 import { FormInstance } from 'antd/lib/form';
-import { SupersetClient, t } from '@superset-ui/core';
+import { Column, ensureIsArray, SupersetClient, t } from '@superset-ui/core';
 import { useChangeEffect } from 'src/common/hooks/useChangeEffect';
-import { AsyncSelect } from 'src/components/Select';
+import { Select } from 'src/components';
 import { useToasts } from 'src/messageToasts/enhancers/withToasts';
 import { getClientErrorObject } from 'src/utils/getClientErrorObject';
 import { cacheWrapper } from 'src/utils/cacheWrapper';
 import { NativeFiltersForm } from '../types';
-
-type ColumnSelectValue = {
-  value: string;
-  label: string;
-};
+import { doesColumnMatchFilterType } from './utils';
 
 interface ColumnSelectProps {
+  allowClear?: boolean;
+  filterValues?: (column: Column) => boolean;
   form: FormInstance<NativeFiltersForm>;
+  formField?: string;
   filterId: string;
-  datasetId?: number | null | undefined;
-  value?: ColumnSelectValue | null;
-  onChange?: (value: ColumnSelectValue | null) => void;
+  datasetId?: number;
+  value?: string | string[];
+  onChange?: (value: string) => void;
+  mode?: 'multiple';
 }
 
 const localCache = new Map<string, any>();
@@ -50,62 +50,91 @@ const cachedSupersetGet = cacheWrapper(
 /** Special purpose AsyncSelect that selects a column from a dataset */
 // eslint-disable-next-line import/prefer-default-export
 export function ColumnSelect({
+  allowClear = false,
+  filterValues = () => true,
   form,
+  formField = 'column',
   filterId,
   datasetId,
   value,
   onChange,
+  mode,
 }: ColumnSelectProps) {
+  const [columns, setColumns] = useState<Column[]>();
   const { addDangerToast } = useToasts();
   const resetColumnField = useCallback(() => {
     form.setFields([
-      { name: ['filters', filterId, 'column'], touched: false, value: null },
+      { name: ['filters', filterId, formField], touched: false, value: null },
     ]);
-  }, [form, filterId]);
+  }, [form, filterId, formField]);
+
+  const options = useMemo(
+    () =>
+      ensureIsArray(columns)
+        .filter(filterValues)
+        .map((col: Column) => col.column_name)
+        .sort((a: string, b: string) => a.localeCompare(b))
+        .map((column: string) => ({ label: column, value: column })),
+    [columns, filterValues],
+  );
+
+  const currentFilterType = form.getFieldValue('filters')?.[filterId]
+    .filterType;
+  const currentColumn = useMemo(
+    () => columns?.find(column => column.column_name === value),
+    [columns, value],
+  );
+
+  useEffect(() => {
+    if (
+      currentColumn &&
+      !doesColumnMatchFilterType(currentFilterType, currentColumn)
+    ) {
+      resetColumnField();
+    }
+  }, [currentColumn, currentFilterType, resetColumnField]);
 
   useChangeEffect(datasetId, previous => {
     if (previous != null) {
       resetColumnField();
     }
+    if (datasetId != null) {
+      cachedSupersetGet({
+        endpoint: `/api/v1/dataset/${datasetId}`,
+      }).then(
+        ({ json: { result } }) => {
+          const lookupValue = Array.isArray(value) ? value : [value];
+          const valueExists = result.columns.some((column: Column) =>
+            lookupValue?.includes(column.column_name),
+          );
+          if (!valueExists) {
+            resetColumnField();
+          }
+          setColumns(result.columns);
+        },
+        async badResponse => {
+          const { error, message } = await getClientErrorObject(badResponse);
+          let errorText = message || error || t('An error has occurred');
+          if (message === 'Forbidden') {
+            errorText = t('You do not have permission to edit this dashboard');
+          }
+          addDangerToast(errorText);
+        },
+      );
+    }
   });
 
-  function loadOptions() {
-    if (datasetId == null) return [];
-    return cachedSupersetGet({
-      endpoint: `/api/v1/dataset/${datasetId}`,
-    }).then(
-      ({ json: { result } }) => {
-        const columns = result.columns
-          .map((col: any) => col.column_name)
-          .sort((a: string, b: string) => a.localeCompare(b));
-        if (!columns.includes(value)) {
-          resetColumnField();
-        }
-        return columns;
-      },
-      async badResponse => {
-        const { error, message } = await getClientErrorObject(badResponse);
-        let errorText = message || error || t('An error has occurred');
-        if (message === 'Forbidden') {
-          errorText = t('You do not have permission to edit this dashboard');
-        }
-        addDangerToast(errorText);
-        return [];
-      },
-    );
-  }
-
   return (
-    <AsyncSelect
-      // "key" prop makes react render a new instance of the select whenever the dataset changes
-      key={datasetId == null ? '*no dataset*' : datasetId}
-      isDisabled={datasetId == null}
-      value={value}
+    <Select
+      mode={mode}
+      value={mode === 'multiple' ? value || [] : value}
+      ariaLabel={t('Column select')}
       onChange={onChange}
-      isMulti={false}
-      loadOptions={loadOptions}
-      defaultOptions // load options on render
-      cacheOptions
+      options={options}
+      placeholder={t('Select a column')}
+      notFoundContent={t('No compatible columns found')}
+      showSearch
+      allowClear={allowClear}
     />
   );
 }
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DatasetSelect.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DatasetSelect.tsx
new file mode 100644
index 000000000000..1fdadcbd0a70
--- /dev/null
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DatasetSelect.tsx
@@ -0,0 +1,105 @@
+/**
+ * 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 React, { useCallback, useMemo } from 'react';
+import rison from 'rison';
+import { t, SupersetClient } from '@superset-ui/core';
+import { Select } from 'src/components';
+import { cacheWrapper } from 'src/utils/cacheWrapper';
+import {
+  ClientErrorObject,
+  getClientErrorObject,
+} from 'src/utils/getClientErrorObject';
+import { datasetToSelectOption } from './utils';
+
+const localCache = new Map<string, any>();
+
+const cachedSupersetGet = cacheWrapper(
+  SupersetClient.get,
+  localCache,
+  ({ endpoint }) => endpoint || '',
+);
+
+interface DatasetSelectProps {
+  onChange: (value: { label: string; value: number }) => void;
+  value?: { label: string; value: number };
+}
+
+const DatasetSelect = ({ onChange, value }: DatasetSelectProps) => {
+  const getErrorMessage = useCallback(
+    ({ error, message }: ClientErrorObject) => {
+      let errorText = message || error || t('An error has occurred');
+      if (message === 'Forbidden') {
+        errorText = t('You do not have permission to edit this dashboard');
+      }
+      return errorText;
+    },
+    [],
+  );
+
+  const loadDatasetOptions = async (
+    search: string,
+    page: number,
+    pageSize: number,
+  ) => {
+    const searchColumn = 'table_name';
+    const query = rison.encode({
+      filters: [{ col: searchColumn, opr: 'ct', value: search }],
+      page,
+      page_size: pageSize,
+      order_column: searchColumn,
+      order_direction: 'asc',
+    });
+    return cachedSupersetGet({
+      endpoint: `/api/v1/dataset/?q=${query}`,
+    })
+      .then(response => {
+        const data: {
+          label: string;
+          value: string | number;
+        }[] = response.json.result
+          .map(datasetToSelectOption)
+          .sort((a: { label: string }, b: { label: string }) =>
+            a.label.localeCompare(b.label),
+          );
+        return {
+          data,
+          totalCount: response.json.count,
+        };
+      })
+      .catch(async error => {
+        const errorMessage = getErrorMessage(await getClientErrorObject(error));
+        throw new Error(errorMessage);
+      });
+  };
+
+  return (
+    <Select
+      ariaLabel={t('Dataset')}
+      value={value}
+      options={loadDatasetOptions}
+      onChange={onChange}
+    />
+  );
+};
+
+const MemoizedSelect = (props: DatasetSelectProps) =>
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  useMemo(() => <DatasetSelect {...props} />, []);
+
+export default MemoizedSelect;
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DefaultValue.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DefaultValue.tsx
index 524ab83cd79e..e876006ee9cc 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DefaultValue.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DefaultValue.tsx
@@ -16,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { FC, useEffect, useState } from 'react';
+import React, { FC } from 'react';
 import {
   Behavior,
   SetDataMaskHook,
   SuperChart,
   AppSection,
+  t,
 } from '@superset-ui/core';
 import { FormInstance } from 'antd/lib/form';
 import Loading from 'src/components/Loading';
@@ -29,6 +30,7 @@ import { NativeFiltersForm } from '../types';
 import { getFormData } from '../../utils';
 
 type DefaultValueProps = {
+  hasDefaultValue: boolean;
   filterId: string;
   setDataMask: SetDataMaskHook;
   hasDataset: boolean;
@@ -38,6 +40,7 @@ type DefaultValueProps = {
 };
 
 const DefaultValue: FC<DefaultValueProps> = ({
+  hasDefaultValue,
   filterId,
   hasDataset,
   form,
@@ -45,24 +48,18 @@ const DefaultValue: FC<DefaultValueProps> = ({
   formData,
   enableNoResults,
 }) => {
-  const [loading, setLoading] = useState(hasDataset);
   const formFilter = (form.getFieldValue('filters') || {})[filterId];
   const queriesData = formFilter?.defaultValueQueriesData;
-
-  useEffect(() => {
-    if (!hasDataset || queriesData !== null) {
-      setLoading(false);
-    } else {
-      setLoading(true);
-    }
-  }, [hasDataset, queriesData]);
-
+  const loading = hasDataset && queriesData === null;
+  const value = formFilter.defaultDataMask?.filterState.value;
+  const isMissingRequiredValue =
+    hasDefaultValue && (value === null || value === undefined);
   return loading ? (
     <Loading position="inline-centered" />
   ) : (
     <SuperChart
-      height={25}
-      width={250}
+      height={32}
+      width={formFilter?.filterType === 'filter_time' ? 350 : 250}
       appSection={AppSection.FILTER_CONFIG_MODAL}
       behaviors={[Behavior.NATIVE_FILTER]}
       formData={formData}
@@ -73,7 +70,11 @@ const DefaultValue: FC<DefaultValueProps> = ({
       chartType={formFilter?.filterType}
       hooks={{ setDataMask }}
       enableNoResults={enableNoResults}
-      filterState={formFilter.defaultDataMask?.filterState}
+      filterState={{
+        ...formFilter.defaultDataMask?.filterState,
+        validateMessage: isMissingRequiredValue && t('Value is required'),
+        validateStatus: isMissingRequiredValue && 'error',
+      }}
     />
   );
 };
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx
index e8ffde2df1e0..5bec228941fb 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx
@@ -17,23 +17,25 @@
  * under the License.
  */
 
-import React, { FC } from 'react';
+import React, { FC, useCallback, useState } from 'react';
 import { t, styled } from '@superset-ui/core';
 import { Radio } from 'src/components/Radio';
 import { Form, Typography } from 'src/common/components';
+import { useComponentDidUpdate } from 'src/common/hooks/useComponentDidUpdate/useComponentDidUpdate';
 import { Scope } from '../../../types';
-import { Scoping } from './types';
+import { ScopingType } from './types';
 import ScopingTree from './ScopingTree';
 import { getDefaultScopeValue, isScopingAll } from './utils';
 
 type FilterScopeProps = {
   pathToFormValue?: string[];
   updateFormValues: (values: any) => void;
-  formScope?: Scope;
+  formFilterScope?: Scope;
   forceUpdate: Function;
-  scope?: Scope;
-  formScoping?: Scoping;
+  filterScope?: Scope;
+  formScopingType?: ScopingType;
   chartId?: number;
+  initiallyExcludedCharts?: number[];
 };
 
 const Wrapper = styled.div`
@@ -50,59 +52,98 @@ const CleanFormItem = styled(Form.Item)`
 
 const FilterScope: FC<FilterScopeProps> = ({
   pathToFormValue = [],
-  formScoping,
-  formScope,
+  formScopingType,
+  formFilterScope,
   forceUpdate,
-  scope,
+  filterScope,
   updateFormValues,
   chartId,
+  initiallyExcludedCharts,
 }) => {
-  const initialScope = scope || getDefaultScopeValue(chartId);
-  const initialScoping = isScopingAll(initialScope, chartId)
-    ? Scoping.all
-    : Scoping.specific;
+  const [initialFilterScope] = useState(
+    filterScope || getDefaultScopeValue(chartId, initiallyExcludedCharts),
+  );
+  const [initialScopingType] = useState(
+    isScopingAll(initialFilterScope, chartId)
+      ? ScopingType.all
+      : ScopingType.specific,
+  );
+  const [hasScopeBeenModified, setHasScopeBeenModified] = useState(
+    !!filterScope,
+  );
+
+  const onUpdateFormValues = useCallback(
+    (formValues: any) => {
+      updateFormValues(formValues);
+      setHasScopeBeenModified(true);
+    },
+    [updateFormValues],
+  );
+
+  const updateScopes = useCallback(() => {
+    if (filterScope || hasScopeBeenModified) {
+      return;
+    }
+
+    const newScope = getDefaultScopeValue(chartId, initiallyExcludedCharts);
+    updateFormValues({
+      scope: newScope,
+      scoping: isScopingAll(newScope, chartId)
+        ? ScopingType.all
+        : ScopingType.specific,
+    });
+  }, [
+    chartId,
+    filterScope,
+    hasScopeBeenModified,
+    initiallyExcludedCharts,
+    updateFormValues,
+  ]);
+  useComponentDidUpdate(updateScopes);
 
   return (
     <Wrapper>
       <CleanFormItem
         name={[...pathToFormValue, 'scoping']}
-        initialValue={initialScoping}
+        initialValue={initialScopingType}
       >
         <Radio.Group
           onChange={({ target: { value } }) => {
-            if (value === Scoping.all) {
+            if (value === ScopingType.all) {
               const scope = getDefaultScopeValue(chartId);
               updateFormValues({
                 scope,
               });
             }
+            setHasScopeBeenModified(true);
             forceUpdate();
           }}
         >
-          <Radio value={Scoping.all}>{t('Apply to all panels')}</Radio>
-          <Radio value={Scoping.specific}>
+          <Radio value={ScopingType.all}>{t('Apply to all panels')}</Radio>
+          <Radio value={ScopingType.specific}>
             {t('Apply to specific panels')}
           </Radio>
         </Radio.Group>
       </CleanFormItem>
       <Typography.Text type="secondary">
-        {(formScoping ?? initialScoping) === Scoping.specific
+        {(formScopingType ?? initialScopingType) === ScopingType.specific
           ? t('Only selected panels will be affected by this filter')
           : t('All panels with this column will be affected by this filter')}
       </Typography.Text>
-      {(formScoping ?? initialScoping) === Scoping.specific && (
+      {(formScopingType ?? initialScopingType) === ScopingType.specific && (
         <ScopingTree
-          updateFormValues={updateFormValues}
-          initialScope={initialScope}
-          formScope={formScope}
+          updateFormValues={onUpdateFormValues}
+          initialScope={initialFilterScope}
+          formScope={formFilterScope}
           forceUpdate={forceUpdate}
           chartId={chartId}
+          initiallyExcludedCharts={initiallyExcludedCharts}
         />
       )}
       <CleanFormItem
         name={[...pathToFormValue, 'scope']}
         hidden
-        initialValue={initialScope}
+        initialValue={initialFilterScope}
       />
     </Wrapper>
   );
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/ScopingTree.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/ScopingTree.tsx
index d9dcf519d552..af140f862c86 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/ScopingTree.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/ScopingTree.tsx
@@ -20,6 +20,8 @@
 import React, { FC, useMemo, useState } from 'react';
 import { Tree } from 'src/common/components';
 import { DASHBOARD_ROOT_ID } from 'src/dashboard/util/constants';
+import { Tooltip } from 'src/components/Tooltip';
+import Icons from 'src/components/Icons';
 import { useFilterScopeTree } from './state';
 import { findFilterScope, getTreeCheckedItems } from './utils';
 import { Scope } from '../../../types';
@@ -30,6 +32,26 @@ type ScopingTreeProps = {
   formScope?: Scope;
   initialScope: Scope;
   chartId?: number;
+  initiallyExcludedCharts?: number[];
+};
+
+const buildTreeLeafTitle = (
+  label: string,
+  hasTooltip: boolean,
+  tooltipTitle?: string,
+) => {
+  let title = <span>{label}</span>;
+  if (hasTooltip) {
+    title = (
+      <>
+        {title}&nbsp;
+        <Tooltip title={tooltipTitle}>
+          <Icons.Info iconSize="m" />
+        </Tooltip>
+      </>
+    );
+  }
+  return title;
 };
 
 const ScopingTree: FC<ScopingTreeProps> = ({
@@ -38,12 +60,17 @@ const ScopingTree: FC<ScopingTreeProps> = ({
   forceUpdate,
   updateFormValues,
   chartId,
+  initiallyExcludedCharts = [],
 }) => {
   const [expandedKeys, setExpandedKeys] = useState<string[]>([
     DASHBOARD_ROOT_ID,
   ]);
 
-  const { treeData, layout } = useFilterScopeTree(chartId);
+  const { treeData, layout } = useFilterScopeTree(
+    chartId,
+    initiallyExcludedCharts,
+    buildTreeLeafTitle,
+  );
   const [autoExpandParent, setAutoExpandParent] = useState<boolean>(true);
 
   const handleExpand = (expandedKeys: string[]) => {
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/state.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/state.ts
index 8926c60be02c..f9b94a39856e 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/state.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/state.ts
@@ -25,12 +25,14 @@ import {
   CHART_TYPE,
   DASHBOARD_ROOT_TYPE,
 } from 'src/dashboard/util/componentTypes';
-import { TreeItem } from './types';
+import { BuildTreeLeafTitle, TreeItem } from './types';
 import { buildTree } from './utils';
 
 // eslint-disable-next-line import/prefer-default-export
 export function useFilterScopeTree(
   currentChartId?: number,
+  initiallyExcludedCharts: number[] = [],
+  buildTreeLeafTitle: BuildTreeLeafTitle = label => label,
 ): {
   treeData: [TreeItem];
   layout: Layout;
@@ -61,8 +63,16 @@ export function useFilterScopeTree(
   );
 
   useMemo(() => {
-    buildTree(layout[DASHBOARD_ROOT_ID], tree, layout, charts, validNodes);
-  }, [charts, layout, tree]);
+    buildTree(
+      layout[DASHBOARD_ROOT_ID],
+      tree,
+      layout,
+      charts,
+      validNodes,
+      initiallyExcludedCharts,
+      buildTreeLeafTitle,
+    );
+  }, [layout, tree, charts, initiallyExcludedCharts, buildTreeLeafTitle]);
 
   return { treeData: [tree], layout };
 }
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/types.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/types.ts
index cb804bf6d60c..8c9d2a5f3cf5 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/types.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/types.ts
@@ -17,7 +17,9 @@
  * under the License.
  */
 
-export enum Scoping {
+import { ReactNode } from 'react';
+
+export enum ScopingType {
   all,
   specific,
 }
@@ -26,5 +28,11 @@ export enum Scoping {
 export type TreeItem = {
   children: TreeItem[];
   key: string;
-  title: string;
+  title: ReactNode;
 };
+
+export type BuildTreeLeafTitle = (
+  label: string,
+  hasTooltip: boolean,
+  tooltipTitle?: string,
+) => ReactNode;
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.ts
index 8c74aa7511c1..555b87ff7779 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.ts
@@ -23,7 +23,8 @@ import {
   TAB_TYPE,
 } from 'src/dashboard/util/componentTypes';
 import { DASHBOARD_ROOT_ID } from 'src/dashboard/util/constants';
-import { TreeItem } from './types';
+import { t } from '@superset-ui/core';
+import { BuildTreeLeafTitle, TreeItem } from './types';
 import { Scope } from '../../../types';
 
 export const isShowTypeInTree = ({ type, meta }: LayoutItem, charts?: Charts) =>
@@ -36,6 +37,8 @@ export const buildTree = (
   layout: Layout,
   charts: Charts,
   validNodes: string[],
+  initiallyExcludedCharts: number[],
+  buildTreeLeafTitle: BuildTreeLeafTitle,
 ) => {
   let itemToPass: TreeItem = treeItem;
   if (
@@ -43,16 +46,36 @@ export const buildTree = (
     node.type !== DASHBOARD_ROOT_TYPE &&
     validNodes.includes(node.id)
   ) {
+    const title = buildTreeLeafTitle(
+      node.meta.sliceNameOverride ||
+        node.meta.sliceName ||
+        node.meta.text ||
+        node.meta.defaultText ||
+        node.id.toString(),
+      initiallyExcludedCharts.includes(node.meta?.chartId),
+      t(
+        "This chart might be incompatible with the filter (datasets don't match)",
+      ),
+    );
+
     const currentTreeItem = {
       key: node.id,
-      title: node.meta.sliceName || node.meta.text || node.id.toString(),
+      title,
       children: [],
     };
     treeItem.children.push(currentTreeItem);
     itemToPass = currentTreeItem;
   }
   node.children.forEach(child =>
-    buildTree(layout[child], itemToPass, layout, charts, validNodes),
+    buildTree(
+      layout[child],
+      itemToPass,
+      layout,
+      charts,
+      validNodes,
+      initiallyExcludedCharts,
+      buildTreeLeafTitle,
+    ),
   );
 };
 
@@ -144,9 +167,14 @@ export const findFilterScope = (
   };
 };
 
-export const getDefaultScopeValue = (chartId?: number): Scope => ({
+export const getDefaultScopeValue = (
+  chartId?: number,
+  initiallyExcludedCharts: number[] = [],
+): Scope => ({
   rootPath: [DASHBOARD_ROOT_ID],
-  excluded: chartId ? [chartId] : [],
+  excluded: chartId
+    ? [chartId, ...initiallyExcludedCharts]
+    : initiallyExcludedCharts,
 });
 
 export const isScopingAll = (scope: Scope, chartId?: number) =>
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
index 296ee8e6ad25..e46d581a16a6 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
@@ -20,51 +20,65 @@ import {
   AdhocFilter,
   Behavior,
   ChartDataResponseResult,
+  Column,
+  GenericDataType,
   getChartMetadataRegistry,
   JsonResponse,
   styled,
   SupersetApiError,
   t,
+  SupersetClient,
 } from '@superset-ui/core';
 import {
   ColumnMeta,
-  DatasourceMeta,
+  InfoTooltipWithTrigger,
   Metric,
 } from '@superset-ui/chart-controls';
 import { FormInstance } from 'antd/lib/form';
 import React, {
+  forwardRef,
   useCallback,
   useEffect,
-  useState,
-  useMemo,
-  forwardRef,
   useImperativeHandle,
+  useMemo,
+  useState,
 } from 'react';
 import { useSelector } from 'react-redux';
+import { isEqual } from 'lodash';
 import { FormItem } from 'src/components/Form';
-import { Checkbox, Input } from 'src/common/components';
-import { Select } from 'src/components/Select';
-import SupersetResourceSelect, {
-  cachedSupersetGet,
-} from 'src/components/SupersetResourceSelect';
+import { Input } from 'src/common/components';
+import { Select } from 'src/components';
+import { cacheWrapper } from 'src/utils/cacheWrapper';
 import AdhocFilterControl from 'src/explore/components/controls/FilterControl/AdhocFilterControl';
 import DateFilterControl from 'src/explore/components/controls/DateFilterControl';
 import { addDangerToast } from 'src/messageToasts/actions';
 import { ClientErrorObject } from 'src/utils/getClientErrorObject';
-import SelectControl from 'src/explore/components/controls/SelectControl';
 import Collapse from 'src/components/Collapse';
 import { getChartDataRequest } from 'src/chart/chartAction';
 import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags';
 import { waitForAsyncData } from 'src/middleware/asyncEvent';
 import Tabs from 'src/components/Tabs';
+import Icons from 'src/components/Icons';
+import { Tooltip } from 'src/components/Tooltip';
+import { Radio } from 'src/components/Radio';
+import BasicErrorAlert from 'src/components/ErrorMessage/BasicErrorAlert';
+import {
+  Chart,
+  ChartsState,
+  DatasourcesState,
+  RootState,
+} from 'src/dashboard/types';
+import Loading from 'src/components/Loading';
 import { ColumnSelect } from './ColumnSelect';
 import { NativeFiltersForm } from '../types';
 import {
-  datasetToSelectOption,
+  FILTER_SUPPORTED_TYPES,
+  hasTemporalColumns,
   setNativeFilterFieldValues,
   useForceUpdate,
+  mostUsedDataset,
 } from './utils';
-import { useBackendFormUpdate } from './state';
+import { useBackendFormUpdate, useDefaultValue } from './state';
 import { getFormData } from '../../utils';
 import { Filter } from '../../types';
 import getControlItemsMap from './getControlItemsMap';
@@ -76,6 +90,7 @@ import {
   CASCADING_FILTERS,
   getFiltersConfigModalTestId,
 } from '../FiltersConfigModal';
+import DatasetSelect from './DatasetSelect';
 
 const { TabPane } = Tabs;
 
@@ -97,7 +112,7 @@ export const StyledFormItem = styled(FormItem)`
   margin-bottom: ${({ theme }) => theme.gridUnit * 4}px;
 
   & .ant-form-item-label {
-    padding-bottom: 0px;
+    padding-bottom: 0;
   }
 
   & .ant-form-item-control-input {
@@ -106,12 +121,12 @@ export const StyledFormItem = styled(FormItem)`
 `;
 
 export const StyledRowFormItem = styled(FormItem)`
-  margin-bottom: 0px;
-  padding-bottom: 0px;
+  margin-bottom: 0;
+  padding-bottom: 0;
   min-width: 50%;
 
   & .ant-form-item-label {
-    padding-bottom: 0px;
+    padding-bottom: 0;
   }
 
   .ant-form-item-control-input-content > div > div {
@@ -123,6 +138,30 @@ export const StyledRowFormItem = styled(FormItem)`
   }
 `;
 
+export const StyledRowSubFormItem = styled(FormItem)`
+  min-width: 50%;
+
+  & .ant-form-item-label {
+    padding-bottom: 0;
+  }
+
+  .ant-form-item {
+    margin-bottom: 0;
+  }
+
+  .ant-form-item-control-input-content > div > div {
+    height: auto;
+  }
+
+  .ant-form-item-extra {
+    display: none;
+  }
+
+  & .ant-form-item-control-input {
+    height: auto;
+  }
+`;
+
 export const StyledLabel = styled.span`
   color: ${({ theme }) => theme.colors.grayscale.base};
   font-size: ${({ theme }) => theme.typography.sizes.s}px;
@@ -133,22 +172,33 @@ const CleanFormItem = styled(FormItem)`
   margin-bottom: 0;
 `;
 
+const DefaultValueContainer = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+`;
+
+const RefreshIcon = styled(Icons.Refresh)`
+  margin-left: ${({ theme }) => theme.gridUnit * 2}px;
+  color: ${({ theme }) => theme.colors.primary.base};
+`;
+
 const StyledCollapse = styled(Collapse)`
   margin-left: ${({ theme }) => theme.gridUnit * -4 - 1}px;
   margin-right: ${({ theme }) => theme.gridUnit * -4}px;
   border-left: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
   border-top: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
-  border-radius: 0px;
+  border-radius: 0;
 
   .ant-collapse-header {
     border-bottom: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
     border-top: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
     margin-top: -1px;
-    border-radius: 0px;
+    border-radius: 0;
   }
 
   .ant-collapse-content {
-    border: 0px;
+    border: 0;
   }
 
   .ant-collapse-content-box {
@@ -156,32 +206,34 @@ const StyledCollapse = styled(Collapse)`
   }
 
   &.ant-collapse > .ant-collapse-item {
-    border: 0px;
-    border-radius: 0px;
+    border: 0;
+    border-radius: 0;
   }
 `;
 
 const StyledTabs = styled(Tabs)`
   .ant-tabs-nav {
     position: sticky;
-    top: 0px;
+    margin-left: ${({ theme }) => theme.gridUnit * -4}px;
+    margin-right: ${({ theme }) => theme.gridUnit * -4}px;
+    top: 0;
     background: white;
     z-index: 1;
   }
 
   .ant-tabs-nav-list {
-    padding: 0px;
+    padding: 0;
   }
 
   .ant-form-item-label {
-    padding-bottom: 0px;
+    padding-bottom: 0;
   }
 `;
 
 const StyledAsterisk = styled.span`
   color: ${({ theme }) => theme.colors.error.base};
-  font-family: SimSun, sans-serif;
-  margin-right: ${({ theme }) => theme.gridUnit - 1}px;
+  font-size: ${({ theme }) => theme.typography.sizes.s}px;
+  margin-left: ${({ theme }) => theme.gridUnit - 1}px;
   &:before {
     content: '*';
   }
@@ -218,13 +270,6 @@ export interface FiltersConfigFormProps {
   parentFilters: { id: string; title: string }[];
 }
 
-// TODO: Need to do with it something
-const FILTERS_WITHOUT_COLUMN = [
-  'filter_timegrain',
-  'filter_timecolumn',
-  'filter_groupby',
-];
-
 const FILTERS_WITH_ADHOC_FILTERS = ['filter_select', 'filter_range'];
 
 const BASIC_CONTROL_ITEMS = ['enableEmptyFilter', 'multiSelect'];
@@ -239,6 +284,14 @@ const FILTER_TYPE_NAME_MAPPING = {
   [t('Group By')]: t('Group by'),
 };
 
+const localCache = new Map<string, any>();
+
+const cachedSupersetGet = cacheWrapper(
+  SupersetClient.get,
+  localCache,
+  ({ endpoint }) => endpoint || '',
+);
+
 /**
  * The configuration form for a specific filter.
  * Assigns field values to `filters[filterId]` in the form.
@@ -254,6 +307,7 @@ const FiltersConfigForm = (
   }: FiltersConfigFormProps,
   ref: React.RefObject<any>,
 ) => {
+  const [error, setError] = useState<string>('');
   const [metrics, setMetrics] = useState<Metric[]>([]);
   const [activeTabKey, setActiveTabKey] = useState<string>(
     FilterTabs.configuration.key,
@@ -261,14 +315,13 @@ const FiltersConfigForm = (
   const [activeFilterPanelKey, setActiveFilterPanelKey] = useState<
     string | string[]
   >(FilterPanels.basic.key);
-  const [hasDefaultValue, setHasDefaultValue] = useState(
-    !!filterToEdit?.defaultDataMask?.filterState?.value,
-  );
+
   const forceUpdate = useForceUpdate();
   const [datasetDetails, setDatasetDetails] = useState<Record<string, any>>();
-  const defaultFormFilter = useMemo(() => {}, []);
+  const defaultFormFilter = useMemo(() => ({}), []);
   const formFilter =
     form.getFieldValue('filters')?.[filterId] || defaultFormFilter;
+
   const nativeFilterItems = getChartMetadataRegistry().items;
   const nativeFilterVizTypes = Object.entries(nativeFilterItems)
     // @ts-ignore
@@ -277,22 +330,58 @@ const FiltersConfigForm = (
     )
     .map(([key]) => key);
 
-  const loadedDatasets = useSelector<any, DatasourceMeta>(
+  const loadedDatasets = useSelector<RootState, DatasourcesState>(
     ({ datasources }) => datasources,
   );
 
+  const charts = useSelector<RootState, ChartsState>(({ charts }) => charts);
+
+  const doLoadedDatasetsHaveTemporalColumns = useMemo(
+    () =>
+      Object.values(loadedDatasets).some(dataset =>
+        hasTemporalColumns(dataset),
+      ),
+    [loadedDatasets],
+  );
+
+  const showTimeRangePicker = useMemo(() => {
+    const currentDataset = Object.values(loadedDatasets).find(
+      dataset => dataset.id === formFilter.dataset?.value,
+    );
+
+    return currentDataset ? hasTemporalColumns(currentDataset) : true;
+  }, [formFilter.dataset?.value, loadedDatasets]);
+
   // @ts-ignore
   const hasDataset = !!nativeFilterItems[formFilter?.filterType]?.value
     ?.datasourceCount;
-  const hasColumn =
-    hasDataset && !FILTERS_WITHOUT_COLUMN.includes(formFilter?.filterType);
+
+  const datasetId =
+    formFilter?.dataset?.value ??
+    filterToEdit?.targets[0]?.datasetId ??
+    mostUsedDataset(loadedDatasets, charts);
+
+  const { controlItems = {}, mainControlItems = {} } = formFilter
+    ? getControlItemsMap({
+        datasetId,
+        disabled: false,
+        forceUpdate,
+        form,
+        filterId,
+        filterType: formFilter.filterType,
+        filterToEdit,
+        formFilter,
+        removed,
+      })
+    : {};
+  const hasColumn = !!mainControlItems.groupby;
+
+  const nativeFilterItem = nativeFilterItems[formFilter?.filterType] ?? {};
   // @ts-ignore
-  const enableNoResults = !!nativeFilterItems[formFilter?.filterType]?.value
-    ?.enableNoResults;
-  const datasetId = formFilter?.dataset?.value;
+  const enableNoResults = !!nativeFilterItem.value?.enableNoResults;
 
   useEffect(() => {
-    if (datasetId && hasColumn) {
+    if (datasetId) {
       cachedSupersetGet({
         endpoint: `/api/v1/dataset/${datasetId}`,
       })
@@ -308,7 +397,7 @@ const FiltersConfigForm = (
           addDangerToast(response.message);
         });
     }
-  }, [datasetId, hasColumn]);
+  }, [datasetId]);
 
   useImperativeHandle(ref, () => ({
     changeTab(tab: 'configuration' | 'scoping') {
@@ -331,67 +420,99 @@ const FiltersConfigForm = (
 
   useBackendFormUpdate(form, filterId);
 
-  const refreshHandler = useCallback(() => {
-    if (!hasDataset || !formFilter?.dataset?.value) {
-      forceUpdate();
-      return;
-    }
-    const formData = getFormData({
-      datasetId: formFilter?.dataset?.value,
-      groupby: formFilter?.column,
-      ...formFilter,
-    });
+  const setNativeFilterFieldValuesWrapper = (values: object) => {
+    setNativeFilterFieldValues(form, filterId, values);
+    setError('');
+    forceUpdate();
+  };
+
+  const setErrorWrapper = (error: string) => {
     setNativeFilterFieldValues(form, filterId, {
       defaultValueQueriesData: null,
-      isDataDirty: false,
     });
+    setError(error);
     forceUpdate();
-    getChartDataRequest({
-      formData,
-      force: false,
-      requestParams: { dashboardId: 0 },
-    }).then(response => {
-      if (isFeatureEnabled(FeatureFlag.GLOBAL_ASYNC_QUERIES)) {
-        // deal with getChartDataRequest transforming the response data
-        const result = 'result' in response ? response.result[0] : response;
-        waitForAsyncData(result)
-          .then((asyncResult: ChartDataResponseResult[]) => {
-            setNativeFilterFieldValues(form, filterId, {
-              defaultValueQueriesData: asyncResult,
+  };
+
+  const refreshHandler = useCallback(
+    (force = false) => {
+      if (!hasDataset || !formFilter?.dataset?.value) {
+        forceUpdate();
+        return;
+      }
+      const formData = getFormData({
+        datasetId: formFilter?.dataset?.value,
+        groupby: formFilter?.column,
+        ...formFilter,
+      });
+      setNativeFilterFieldValuesWrapper({
+        defaultValueQueriesData: null,
+        isDataDirty: false,
+      });
+      getChartDataRequest({
+        formData,
+        force,
+        requestParams: { dashboardId: 0 },
+      })
+        .then(({ response, json }) => {
+          if (isFeatureEnabled(FeatureFlag.GLOBAL_ASYNC_QUERIES)) {
+            // deal with getChartDataRequest transforming the response data
+            const result = 'result' in json ? json.result[0] : json;
+
+            if (response.status === 200) {
+              setNativeFilterFieldValuesWrapper({
+                defaultValueQueriesData: [result],
+              });
+            } else if (response.status === 202) {
+              waitForAsyncData(result)
+                .then((asyncResult: ChartDataResponseResult[]) => {
+                  setNativeFilterFieldValuesWrapper({
+                    defaultValueQueriesData: asyncResult,
+                  });
+                })
+                .catch((error: ClientErrorObject) => {
+                  setError(
+                    error.message || error.error || t('Check configuration'),
+                  );
+                });
+            } else {
+              throw new Error(
+                `Received unexpected response status (${response.status}) while fetching chart data`,
+              );
+            }
+          } else {
+            setNativeFilterFieldValuesWrapper({
+              defaultValueQueriesData: json.result,
             });
-            forceUpdate();
-          })
-          .catch((error: ClientErrorObject) => {
-            // TODO: show error once this logic is moved into new NativeFilter
-            //  component
-            console.error(
-              error.message || error.error || t('Check configuration'),
+          }
+        })
+        .catch((error: Response) => {
+          error.json().then(body => {
+            setErrorWrapper(
+              body.message || error.statusText || t('Check configuration'),
             );
           });
-      } else {
-        setNativeFilterFieldValues(form, filterId, {
-          defaultValueQueriesData: response.result,
         });
-        forceUpdate();
-      }
-    });
-  }, [filterId, forceUpdate, form, formFilter, hasDataset]);
-
-  const defaultDatasetSelectOptions = Object.values(loadedDatasets).map(
-    datasetToSelectOption,
+    },
+    [filterId, forceUpdate, form, formFilter, hasDataset],
   );
-  const initialDatasetId =
-    filterToEdit?.targets[0]?.datasetId ??
-    (defaultDatasetSelectOptions.length === 1
-      ? defaultDatasetSelectOptions[0].value
-      : undefined);
-  const initColumn = filterToEdit?.targets[0]?.column?.name;
+
   const newFormData = getFormData({
     datasetId,
     groupby: hasColumn ? formFilter?.column : undefined,
     ...formFilter,
   });
 
+  const [
+    hasDefaultValue,
+    isRequired,
+    defaultValueTooltip,
+    setHasDefaultValue,
+  ] = useDefaultValue(formFilter, filterToEdit);
+
+  const showDataset =
+    !datasetId || datasetDetails || formFilter?.dataset?.label;
+
   useEffect(() => {
     if (hasDataset && hasFilledDataset && hasDefaultValue && isDataDirty) {
       refreshHandler();
@@ -403,17 +524,24 @@ const FiltersConfigForm = (
     formFilter,
     isDataDirty,
     refreshHandler,
+    showDataset,
   ]);
 
-  const onDatasetSelectError = useCallback(
-    ({ error, message }: ClientErrorObject) => {
-      let errorText = message || error || t('An error has occurred');
-      if (message === 'Forbidden') {
-        errorText = t('You do not have permission to edit this dashboard');
-      }
-      addDangerToast(errorText);
+  const formChanged = useCallback(() => {
+    form.setFields([
+      {
+        name: 'changed',
+        value: true,
+      },
+    ]);
+  }, [form]);
+
+  const updateFormValues = useCallback(
+    (values: any) => {
+      setNativeFilterFieldValues(form, filterId, values);
+      formChanged();
     },
-    [],
+    [filterId, form, formChanged],
   );
 
   const parentFilterOptions = parentFilters.map(filter => ({
@@ -433,19 +561,15 @@ const FiltersConfigForm = (
   const hasSorting =
     typeof filterToEdit?.controlValues?.sortAscending === 'boolean';
 
-  const showDefaultValue = !hasDataset || (!isDataDirty && hasFilledDataset);
+  let sort = filterToEdit?.controlValues?.sortAscending;
+  if (typeof formFilter?.controlValues?.sortAscending === 'boolean') {
+    sort = formFilter.controlValues.sortAscending;
+  }
 
-  const controlItems = formFilter
-    ? getControlItemsMap({
-        disabled: false,
-        forceUpdate,
-        form,
-        filterId,
-        filterType: formFilter.filterType,
-        filterToEdit,
-        formFilter,
-      })
-    : {};
+  const showDefaultValue =
+    !hasDataset ||
+    (!isDataDirty && hasFilledDataset) ||
+    !mainControlItems.groupby;
 
   const onSortChanged = (value: boolean | undefined) => {
     const previous = form.getFieldValue('filters')?.[filterId].controlValues;
@@ -458,6 +582,39 @@ const FiltersConfigForm = (
     forceUpdate();
   };
 
+  const validatePreFilter = () =>
+    setTimeout(
+      () =>
+        form.validateFields([
+          ['filters', filterId, 'adhoc_filters'],
+          ['filters', filterId, 'time_range'],
+        ]),
+      0,
+    );
+
+  const hasTimeRange =
+    formFilter?.time_range && formFilter.time_range !== 'No filter';
+
+  const hasAdhoc = formFilter?.adhoc_filters?.length > 0;
+
+  const defaultToFirstItem = formFilter?.controlValues?.defaultToFirstItem;
+
+  const hasAdvancedSection =
+    formFilter?.filterType === 'filter_select' ||
+    formFilter?.filterType === 'filter_range';
+
+  const initialDefaultValue =
+    formFilter.filterType === filterToEdit?.filterType
+      ? filterToEdit?.defaultDataMask
+      : null;
+
+  const preFilterValidator = () => {
+    if (hasTimeRange || hasAdhoc) {
+      return Promise.resolve();
+    }
+    return Promise.reject(new Error(t('Pre-filter is required')));
+  };
+
   let hasCheckedAdvancedControl = hasParentFilter || hasPreFilter || hasSorting;
   if (!hasCheckedAdvancedControl) {
     hasCheckedAdvancedControl = Object.keys(controlItems)
@@ -473,6 +630,44 @@ const FiltersConfigForm = (
     setActiveFilterPanelKey(activeFilterPanelKey);
   }, [hasCheckedAdvancedControl]);
 
+  const initiallyExcludedCharts = useMemo(() => {
+    const excluded: number[] = [];
+    if (formFilter?.dataset?.value === undefined) {
+      return [];
+    }
+
+    Object.values(charts).forEach((chart: Chart) => {
+      const chartDatasetUid = chart.formData?.datasource;
+      if (chartDatasetUid === undefined) {
+        return;
+      }
+      if (loadedDatasets[chartDatasetUid]?.id !== formFilter?.dataset?.value) {
+        excluded.push(chart.id);
+      }
+    });
+    return excluded;
+  }, [
+    JSON.stringify(charts),
+    formFilter?.dataset?.value,
+    JSON.stringify(loadedDatasets),
+  ]);
+
+  const ParentSelect = ({
+    value,
+    ...rest
+  }: {
+    value?: { value: string | number };
+  }) => (
+    <Select
+      ariaLabel={t('Parent filter')}
+      placeholder={t('None')}
+      options={parentFilterOptions}
+      allowClear
+      value={value?.value}
+      {...rest}
+    />
+  );
+
   if (removed) {
     return <RemovedFilter onClick={() => restoreFilter(filterId)} />;
   }
@@ -505,21 +700,38 @@ const FiltersConfigForm = (
             {...getFiltersConfigModalTestId('filter-type')}
           >
             <Select
+              ariaLabel={t('Filter type')}
               options={nativeFilterVizTypes.map(filterType => {
                 // @ts-ignore
                 const name = nativeFilterItems[filterType]?.value.name;
                 const mappedName = name
                   ? FILTER_TYPE_NAME_MAPPING[name]
                   : undefined;
+                const isDisabled =
+                  FILTER_SUPPORTED_TYPES[filterType]?.length === 1 &&
+                  FILTER_SUPPORTED_TYPES[filterType]?.includes(
+                    GenericDataType.TEMPORAL,
+                  ) &&
+                  !doLoadedDatasetsHaveTemporalColumns;
                 return {
                   value: filterType,
-                  label: mappedName || name,
+                  label: isDisabled ? (
+                    <Tooltip
+                      title={t('Datasets do not contain a temporal column')}
+                    >
+                      {mappedName || name}
+                    </Tooltip>
+                  ) : (
+                    mappedName || name
+                  ),
+                  disabled: isDisabled,
                 };
               })}
-              onChange={({ value }: { value: string }) => {
+              onChange={value => {
                 setNativeFilterFieldValues(form, filterId, {
                   filterType: value,
                   defaultDataMask: null,
+                  column: null,
                 });
                 forceUpdate();
               }}
@@ -528,63 +740,46 @@ const FiltersConfigForm = (
         </StyledContainer>
         {hasDataset && (
           <StyledRowContainer>
-            <StyledFormItem
-              name={['filters', filterId, 'dataset']}
-              initialValue={{ value: initialDatasetId }}
-              label={<StyledLabel>{t('Dataset')}</StyledLabel>}
-              rules={[
-                { required: !removed, message: t('Dataset is required') },
-              ]}
-              {...getFiltersConfigModalTestId('datasource-input')}
-            >
-              <SupersetResourceSelect
-                initialId={initialDatasetId}
-                resource="dataset"
-                searchColumn="table_name"
-                transformItem={datasetToSelectOption}
-                isMulti={false}
-                onError={onDatasetSelectError}
-                defaultOptions={Object.values(loadedDatasets).map(
-                  datasetToSelectOption,
-                )}
-                onChange={e => {
-                  // We need reset column when dataset changed
-                  if (datasetId && e?.value !== datasetId) {
-                    setNativeFilterFieldValues(form, filterId, {
-                      defaultDataMask: null,
-                      column: null,
-                    });
-                  }
-                  forceUpdate();
-                }}
-              />
-            </StyledFormItem>
-            {hasColumn && (
+            {showDataset ? (
               <StyledFormItem
-                // don't show the column select unless we have a dataset
-                // style={{ display: datasetId == null ? undefined : 'none' }}
-                name={['filters', filterId, 'column']}
-                initialValue={initColumn}
-                label={<StyledLabel>{t('Column')}</StyledLabel>}
+                name={['filters', filterId, 'dataset']}
+                label={<StyledLabel>{t('Dataset')}</StyledLabel>}
+                initialValue={
+                  datasetDetails
+                    ? {
+                        label: datasetDetails.table_name,
+                        value: datasetDetails.id,
+                      }
+                    : undefined
+                }
                 rules={[
-                  { required: !removed, message: t('Field is required') },
+                  { required: !removed, message: t('Dataset is required') },
                 ]}
-                data-test="field-input"
+                {...getFiltersConfigModalTestId('datasource-input')}
               >
-                <ColumnSelect
-                  form={form}
-                  filterId={filterId}
-                  datasetId={datasetId}
-                  onChange={() => {
-                    // We need reset default value when when column changed
-                    setNativeFilterFieldValues(form, filterId, {
-                      defaultDataMask: null,
-                    });
+                <DatasetSelect
+                  onChange={(value: { label: string; value: number }) => {
+                    // We need to reset the column when the dataset has changed
+                    if (value.value !== datasetId) {
+                      setNativeFilterFieldValues(form, filterId, {
+                        dataset: value,
+                        defaultDataMask: null,
+                        column: null,
+                      });
+                    }
                     forceUpdate();
                   }}
                 />
               </StyledFormItem>
+            ) : (
+              <StyledFormItem label={<StyledLabel>{t('Dataset')}</StyledLabel>}>
+                <Loading position="inline-centered" />
+              </StyledFormItem>
             )}
+            {hasDataset &&
+              Object.keys(mainControlItems).map(
+                key => mainControlItems[key].element,
+              )}
           </StyledRowContainer>
         )}
         <StyledCollapse
@@ -597,13 +792,6 @@ const FiltersConfigForm = (
             header={FilterPanels.basic.name}
             key={FilterPanels.basic.key}
           >
-            {hasFilledDataset && (
-              <CleanFormItem
-                name={['filters', filterId, 'defaultValueFormData']}
-                hidden
-                initialValue={newFormData}
-              />
-            )}
             <CleanFormItem
               name={['filters', filterId, 'defaultValueQueriesData']}
               hidden
@@ -611,73 +799,85 @@ const FiltersConfigForm = (
             />
             <CollapsibleControl
               title={t('Filter has default value')}
+              initialValue={hasDefaultValue}
+              disabled={isRequired || defaultToFirstItem}
+              tooltip={defaultValueTooltip}
               checked={hasDefaultValue}
-              onChange={value => setHasDefaultValue(value)}
+              onChange={value => {
+                setHasDefaultValue(value);
+                formChanged();
+              }}
             >
-              <StyledRowFormItem
-                name={['filters', filterId, 'defaultDataMask']}
-                initialValue={filterToEdit?.defaultDataMask}
-                data-test="default-input"
-                label={<StyledLabel>{t('Default Value')}</StyledLabel>}
-                required
-                rules={[
-                  {
-                    required: true,
-                  },
-                  {
-                    validator: (rule, value) => {
-                      const hasValue = !!value.filterState?.value;
-                      if (
-                        hasValue ||
-                        // TODO: do more generic
-                        formFilter.controlValues?.defaultToFirstItem
-                      ) {
-                        return Promise.resolve();
-                      }
-                      return Promise.reject(
-                        new Error(t('Default value is required')),
-                      );
+              {formFilter.filterType && (
+                <StyledRowSubFormItem
+                  name={['filters', filterId, 'defaultDataMask']}
+                  initialValue={initialDefaultValue}
+                  data-test="default-input"
+                  label={<StyledLabel>{t('Default Value')}</StyledLabel>}
+                  required={hasDefaultValue}
+                  rules={[
+                    {
+                      validator: () => {
+                        if (formFilter?.defaultDataMask?.filterState?.value) {
+                          return Promise.resolve();
+                        }
+                        return Promise.reject(
+                          new Error(t('Default value is required')),
+                        );
+                      },
                     },
-                  },
-                ]}
-              >
-                {showDefaultValue ? (
-                  <DefaultValue
-                    setDataMask={dataMask => {
-                      setNativeFilterFieldValues(form, filterId, {
-                        defaultDataMask: dataMask,
-                      });
-                      form.validateFields([
-                        ['filters', filterId, 'defaultDataMask'],
-                      ]);
-                      forceUpdate();
-                    }}
-                    filterId={filterId}
-                    hasDataset={hasDataset}
-                    form={form}
-                    formData={newFormData}
-                    enableNoResults={enableNoResults}
-                  />
-                ) : (
-                  t('Fill all required fields to enable "Default Value"')
-                )}
-              </StyledRowFormItem>
+                  ]}
+                >
+                  {error ? (
+                    <BasicErrorAlert
+                      title={t('Cannot load filter')}
+                      body={error}
+                      level="error"
+                    />
+                  ) : showDefaultValue ? (
+                    <DefaultValueContainer>
+                      <DefaultValue
+                        setDataMask={dataMask => {
+                          if (
+                            !isEqual(
+                              initialDefaultValue?.filterState?.value,
+                              dataMask?.filterState?.value,
+                            )
+                          ) {
+                            formChanged();
+                          }
+                          setNativeFilterFieldValues(form, filterId, {
+                            defaultDataMask: dataMask,
+                          });
+                          form.validateFields([
+                            ['filters', filterId, 'defaultDataMask'],
+                          ]);
+                          forceUpdate();
+                        }}
+                        hasDefaultValue={hasDefaultValue}
+                        filterId={filterId}
+                        hasDataset={hasDataset}
+                        form={form}
+                        formData={newFormData}
+                        enableNoResults={enableNoResults}
+                      />
+                      {hasDataset && datasetId && (
+                        <Tooltip title={t('Refresh the default values')}>
+                          <RefreshIcon onClick={() => refreshHandler(true)} />
+                        </Tooltip>
+                      )}
+                    </DefaultValueContainer>
+                  ) : (
+                    t('Fill all required fields to enable "Default Value"')
+                  )}
+                </StyledRowSubFormItem>
+              )}
             </CollapsibleControl>
             {Object.keys(controlItems)
               .filter(key => BASIC_CONTROL_ITEMS.includes(key))
               .map(key => controlItems[key].element)}
-            <StyledRowFormItem
-              name={['filters', filterId, 'isInstant']}
-              initialValue={filterToEdit?.isInstant || false}
-              valuePropName="checked"
-              colon={false}
-            >
-              <Checkbox data-test="apply-changes-instantly-checkbox">
-                {t('Apply changes instantly')}
-              </Checkbox>
-            </StyledRowFormItem>
           </Collapse.Panel>
-          {((hasDataset && hasAdditionalFilters) || hasMetrics) && (
+          {hasAdvancedSection && (
             <Collapse.Panel
               forceRender
               header={FilterPanels.advanced.name}
@@ -686,8 +886,9 @@ const FiltersConfigForm = (
               {isCascadingFilter && (
                 <CollapsibleControl
                   title={t('Filter is hierarchical')}
-                  checked={hasParentFilter}
+                  initialValue={hasParentFilter}
                   onChange={checked => {
+                    formChanged();
                     if (checked) {
                       // execute after render
                       setTimeout(
@@ -700,10 +901,11 @@ const FiltersConfigForm = (
                     }
                   }}
                 >
-                  <StyledRowFormItem
+                  <StyledRowSubFormItem
                     name={['filters', filterId, 'parentFilter']}
                     label={<StyledLabel>{t('Parent filter')}</StyledLabel>}
                     initialValue={parentFilter}
+                    normalize={value => (value ? { value } : undefined)}
                     data-test="parent-filter-input"
                     required
                     rules={[
@@ -713,12 +915,8 @@ const FiltersConfigForm = (
                       },
                     ]}
                   >
-                    <Select
-                      placeholder={t('None')}
-                      options={parentFilterOptions}
-                      isClearable
-                    />
-                  </StyledRowFormItem>
+                    <ParentSelect />
+                  </StyledRowSubFormItem>
                 </CollapsibleControl>
               )}
               {Object.keys(controlItems)
@@ -727,28 +925,21 @@ const FiltersConfigForm = (
               {hasDataset && hasAdditionalFilters && (
                 <CollapsibleControl
                   title={t('Pre-filter available values')}
-                  checked={hasPreFilter}
+                  initialValue={hasPreFilter}
                   onChange={checked => {
+                    formChanged();
                     if (checked) {
-                      // execute after render
-                      setTimeout(
-                        () =>
-                          form.validateFields([
-                            ['filters', filterId, 'adhoc_filters'],
-                          ]),
-                        0,
-                      );
+                      validatePreFilter();
                     }
                   }}
                 >
-                  <StyledRowFormItem
+                  <StyledRowSubFormItem
                     name={['filters', filterId, 'adhoc_filters']}
                     initialValue={filterToEdit?.adhoc_filters}
                     required
                     rules={[
                       {
-                        required: true,
-                        message: t('Pre-filter is required'),
+                        validator: preFilterValidator,
                       },
                     ]}
                   >
@@ -765,95 +956,139 @@ const FiltersConfigForm = (
                           adhoc_filters: filters,
                         });
                         forceUpdate();
+                        validatePreFilter();
                       }}
                       label={
                         <span>
-                          <StyledAsterisk />
                           <StyledLabel>{t('Pre-filter')}</StyledLabel>
+                          {!hasTimeRange && <StyledAsterisk />}
                         </span>
                       }
                     />
-                  </StyledRowFormItem>
-                  <StyledRowFormItem
-                    name={['filters', filterId, 'time_range']}
-                    label={<StyledLabel>{t('Time range')}</StyledLabel>}
-                    initialValue={filterToEdit?.time_range || 'No filter'}
-                  >
-                    <DateFilterControl
-                      name="time_range"
-                      onChange={timeRange => {
-                        setNativeFilterFieldValues(form, filterId, {
-                          time_range: timeRange,
-                        });
-                        forceUpdate();
-                      }}
-                    />
-                  </StyledRowFormItem>
+                  </StyledRowSubFormItem>
+                  {showTimeRangePicker && (
+                    <StyledRowFormItem
+                      name={['filters', filterId, 'time_range']}
+                      label={<StyledLabel>{t('Time range')}</StyledLabel>}
+                      initialValue={filterToEdit?.time_range || 'No filter'}
+                      required={!hasAdhoc}
+                      rules={[
+                        {
+                          validator: preFilterValidator,
+                        },
+                      ]}
+                    >
+                      <DateFilterControl
+                        name="time_range"
+                        onChange={timeRange => {
+                          setNativeFilterFieldValues(form, filterId, {
+                            time_range: timeRange,
+                          });
+                          forceUpdate();
+                          validatePreFilter();
+                        }}
+                      />
+                    </StyledRowFormItem>
+                  )}
+                  {hasTimeRange && (
+                    <StyledRowFormItem
+                      name={['filters', filterId, 'granularity_sqla']}
+                      label={
+                        <>
+                          <StyledLabel>{t('Time column')}</StyledLabel>&nbsp;
+                          <InfoTooltipWithTrigger
+                            placement="top"
+                            tooltip={t(
+                              'Optional time column if time range should apply to another column than the default time column',
+                            )}
+                          />
+                        </>
+                      }
+                      initialValue={filterToEdit?.granularity_sqla}
+                    >
+                      <ColumnSelect
+                        allowClear
+                        form={form}
+                        formField="granularity_sqla"
+                        filterId={filterId}
+                        filterValues={(column: Column) => !!column.is_dttm}
+                        datasetId={datasetId}
+                        onChange={column => {
+                          // We need reset default value when when column changed
+                          setNativeFilterFieldValues(form, filterId, {
+                            granularity_sqla: column,
+                          });
+                          forceUpdate();
+                        }}
+                      />
+                    </StyledRowFormItem>
+                  )}
                 </CollapsibleControl>
               )}
               {formFilter?.filterType !== 'filter_range' && (
                 <CollapsibleControl
                   title={t('Sort filter values')}
-                  onChange={checked => onSortChanged(checked || undefined)}
-                  checked={hasSorting}
+                  onChange={checked => {
+                    onSortChanged(checked || undefined);
+                    formChanged();
+                  }}
+                  initialValue={hasSorting}
                 >
-                  <StyledRowContainer>
-                    <StyledFormItem
-                      name={[
-                        'filters',
-                        filterId,
-                        'controlValues',
-                        'sortAscending',
-                      ]}
-                      initialValue={filterToEdit?.controlValues?.sortAscending}
-                      label={<StyledLabel>{t('Sort type')}</StyledLabel>}
+                  <StyledRowFormItem
+                    name={[
+                      'filters',
+                      filterId,
+                      'controlValues',
+                      'sortAscending',
+                    ]}
+                    initialValue={sort}
+                    label={<StyledLabel>{t('Sort type')}</StyledLabel>}
+                  >
+                    <Radio.Group
+                      onChange={value => {
+                        onSortChanged(value.target.value);
+                      }}
+                    >
+                      <Radio value>{t('Sort ascending')}</Radio>
+                      <Radio value={false}>{t('Sort descending')}</Radio>
+                    </Radio.Group>
+                  </StyledRowFormItem>
+                  {hasMetrics && (
+                    <StyledRowSubFormItem
+                      name={['filters', filterId, 'sortMetric']}
+                      initialValue={filterToEdit?.sortMetric}
+                      label={
+                        <>
+                          <StyledLabel>{t('Sort Metric')}</StyledLabel>&nbsp;
+                          <InfoTooltipWithTrigger
+                            placement="top"
+                            tooltip={t(
+                              'If a metric is specified, sorting will be done based on the metric value',
+                            )}
+                          />
+                        </>
+                      }
+                      data-test="field-input"
                     >
                       <Select
-                        form={form}
-                        filterId={filterId}
-                        name="sortAscending"
-                        options={[
-                          {
-                            value: true,
-                            label: t('Sort ascending'),
-                          },
-                          {
-                            value: false,
-                            label: t('Sort descending'),
-                          },
-                        ]}
-                        onChange={({ value }: { value: boolean }) =>
-                          onSortChanged(value)
-                        }
+                        allowClear
+                        ariaLabel={t('Sort metric')}
+                        name="sortMetric"
+                        options={metrics.map((metric: Metric) => ({
+                          value: metric.metric_name,
+                          label: metric.verbose_name ?? metric.metric_name,
+                        }))}
+                        onChange={value => {
+                          if (value !== undefined) {
+                            setNativeFilterFieldValues(form, filterId, {
+                              sortMetric: value,
+                            });
+                            forceUpdate();
+                          }
+                        }}
                       />
-                    </StyledFormItem>
-                    {hasMetrics && (
-                      <StyledFormItem
-                        name={['filters', filterId, 'sortMetric']}
-                        initialValue={filterToEdit?.sortMetric}
-                        label={<StyledLabel>{t('Sort Metric')}</StyledLabel>}
-                        data-test="field-input"
-                      >
-                        <SelectControl
-                          form={form}
-                          filterId={filterId}
-                          name="sortMetric"
-                          options={metrics.map((metric: Metric) => ({
-                            value: metric.metric_name,
-                            label: metric.verbose_name ?? metric.metric_name,
-                          }))}
-                          onChange={(value: string | null): void => {
-                            if (value !== undefined) {
-                              setNativeFilterFieldValues(form, filterId, {
-                                sortMetric: value,
-                              });
-                              forceUpdate();
-                            }
-                          }}
-                        />
-                      </StyledFormItem>
-                    )}
-                  </StyledRowContainer>
+                    </StyledRowSubFormItem>
+                  )}
                 </CollapsibleControl>
               )}
             </Collapse.Panel>
@@ -866,14 +1101,13 @@ const FiltersConfigForm = (
         forceRender
       >
         <FilterScope
-          updateFormValues={(values: any) =>
-            setNativeFilterFieldValues(form, filterId, values)
-          }
+          updateFormValues={updateFormValues}
           pathToFormValue={['filters', filterId]}
           forceUpdate={forceUpdate}
-          scope={filterToEdit?.scope}
-          formScope={formFilter?.scope}
-          formScoping={formFilter?.scoping}
+          filterScope={filterToEdit?.scope}
+          formFilterScope={formFilter?.scope}
+          formScopingType={formFilter?.scoping}
+          initiallyExcludedCharts={initiallyExcludedCharts}
         />
       </TabPane>
     </StyledTabs>
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.test.tsx
index fcff22da0ee7..f2f62983f360 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.test.tsx
@@ -51,7 +51,6 @@ const formMock: FormInstance = {
 const filterMock: Filter = {
   cascadeParentIds: [],
   defaultDataMask: {},
-  isInstant: false,
   id: 'mock',
   name: 'mock',
   scope: {
@@ -64,6 +63,7 @@ const filterMock: Filter = {
 };
 
 const createProps: () => ControlItemsProps = () => ({
+  datasetId: 1,
   disabled: false,
   forceUpdate: jest.fn(),
   form: formMock,
@@ -77,6 +77,7 @@ const createControlItems = () => [
   false,
   {},
   { name: 'name_1', config: { renderTrigger: true, resetConfig: true } },
+  { name: 'groupby', config: { multiple: true, required: false } },
 ];
 
 beforeEach(() => {
@@ -87,7 +88,10 @@ function renderControlItems(
   controlItemsMap: ReturnType<typeof getControlItemsMap>,
 ) {
   return render(
-    <>{Object.values(controlItemsMap).map(value => value.element)}</>,
+    // @ts-ignore
+    <>
+      {Object.values(controlItemsMap.controlItems).map(value => value.element)}
+    </>,
   );
 }
 
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.tsx
index 097d80b8d84c..65ac4fbca259 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.tsx
@@ -26,12 +26,22 @@ import { FormInstance } from 'antd/lib/form';
 import { getChartControlPanelRegistry, styled, t } from '@superset-ui/core';
 import { Tooltip } from 'src/components/Tooltip';
 import { FormItem } from 'src/components/Form';
-import { getControlItems, setNativeFilterFieldValues } from './utils';
+import {
+  doesColumnMatchFilterType,
+  getControlItems,
+  setNativeFilterFieldValues,
+} from './utils';
 import { NativeFiltersForm, NativeFiltersFormItem } from '../types';
-import { StyledRowFormItem } from './FiltersConfigForm';
+import {
+  StyledFormItem,
+  StyledLabel,
+  StyledRowFormItem,
+} from './FiltersConfigForm';
 import { Filter } from '../../types';
+import { ColumnSelect } from './ColumnSelect';
 
 export interface ControlItemsProps {
+  datasetId: number;
   disabled: boolean;
   forceUpdate: Function;
   form: FormInstance<NativeFiltersForm>;
@@ -39,6 +49,7 @@ export interface ControlItemsProps {
   filterType: string;
   filterToEdit?: Filter;
   formFilter?: NativeFiltersFormItem;
+  removed?: boolean;
 }
 
 const CleanFormItem = styled(FormItem)`
@@ -46,6 +57,7 @@ const CleanFormItem = styled(FormItem)`
 `;
 
 export default function getControlItemsMap({
+  datasetId,
   disabled,
   forceUpdate,
   form,
@@ -53,15 +65,82 @@ export default function getControlItemsMap({
   filterType,
   filterToEdit,
   formFilter,
+  removed,
 }: ControlItemsProps) {
   const controlPanelRegistry = getChartControlPanelRegistry();
   const controlItems =
     getControlItems(controlPanelRegistry.get(filterType)) ?? [];
-  const map: Record<
+  const mapControlItems: Record<
+    string,
+    { element: React.ReactNode; checked: boolean }
+  > = {};
+  const mapMainControlItems: Record<
     string,
     { element: React.ReactNode; checked: boolean }
   > = {};
 
+  controlItems
+    .filter(
+      (mainControlItem: CustomControlItem) =>
+        mainControlItem?.name === 'groupby',
+    )
+    .forEach(mainControlItem => {
+      const initialValue =
+        filterToEdit?.controlValues?.[mainControlItem.name] ??
+        mainControlItem?.config?.default;
+      const initColumn = filterToEdit?.targets[0]?.column?.name;
+
+      const element = (
+        <>
+          <CleanFormItem
+            name={['filters', filterId, 'requiredFirst', mainControlItem.name]}
+            hidden
+            initialValue={
+              mainControlItem?.config?.requiredFirst &&
+              filterToEdit?.requiredFirst
+            }
+          />
+          <StyledFormItem
+            // don't show the column select unless we have a dataset
+            name={['filters', filterId, 'column']}
+            initialValue={initColumn}
+            label={
+              <StyledLabel>
+                {t(`${mainControlItem.config?.label}`) || t('Column')}
+              </StyledLabel>
+            }
+            rules={[
+              {
+                required: mainControlItem.config?.required && !removed, // TODO: need to move ColumnSelect settings to controlPanel for all filters
+                message: t('Column is required'),
+              },
+            ]}
+            data-test="field-input"
+          >
+            <ColumnSelect
+              mode={mainControlItem.config?.multiple && 'multiple'}
+              form={form}
+              filterId={filterId}
+              datasetId={datasetId}
+              filterValues={column =>
+                doesColumnMatchFilterType(formFilter?.filterType || '', column)
+              }
+              onChange={() => {
+                // We need reset default value when when column changed
+                setNativeFilterFieldValues(form, filterId, {
+                  defaultDataMask: null,
+                });
+                forceUpdate();
+              }}
+            />
+          </StyledFormItem>
+        </>
+      );
+      mapMainControlItems[mainControlItem.name] = {
+        element,
+        checked: initialValue,
+      };
+    });
   controlItems
     .filter(
       (controlItem: CustomControlItem) =>
@@ -116,7 +195,7 @@ export default function getControlItemsMap({
                   forceUpdate();
                 }}
               >
-                {controlItem.config.label}{' '}
+                {controlItem.config.label}&nbsp;
                 {controlItem.config.description && (
                   <InfoTooltipWithTrigger
                     placement="top"
@@ -129,7 +208,10 @@ export default function getControlItemsMap({
           </Tooltip>
         </>
       );
-      map[controlItem.name] = { element, checked: initialValue };
+      mapControlItems[controlItem.name] = { element, checked: initialValue };
     });
-  return map;
+  return {
+    controlItems: mapControlItems,
+    mainControlItems: mapMainControlItems,
+  };
 }
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/state.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/state.ts
index 70749d689f74..6580ade3f984 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/state.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/state.ts
@@ -16,10 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useEffect } from 'react';
+import { useEffect, useState } from 'react';
 import { FormInstance } from 'antd/lib/form';
-import { NativeFiltersForm } from '../types';
+import { t } from '@superset-ui/core';
+import { NativeFiltersForm, NativeFiltersFormItem } from '../types';
 import { setNativeFilterFieldValues, useForceUpdate } from './utils';
+import { Filter } from '../../types';
 
 // When some fields in form changed we need re-fetch data for Filter defaultValue
 // eslint-disable-next-line import/prefer-default-export
@@ -46,3 +48,56 @@ export const useBackendFormUpdate = (
     filterId,
   ]);
 };
+
+export const useDefaultValue = (
+  formFilter?: NativeFiltersFormItem,
+  filterToEdit?: Filter,
+): [boolean, boolean, string, Function] => {
+  const enableEmptyFilter = !!formFilter?.controlValues?.enableEmptyFilter;
+  const defaultToFirstItem = !!formFilter?.controlValues?.defaultToFirstItem;
+
+  const [hasDefaultValue, setHasPartialDefaultValue] = useState(false);
+  const [isRequired, setIsRequired] = useState(enableEmptyFilter);
+  const [defaultValueTooltip, setDefaultValueTooltip] = useState('');
+
+  const setHasDefaultValue = (value = false) => {
+    const required = enableEmptyFilter && !defaultToFirstItem;
+    setIsRequired(required);
+    setHasPartialDefaultValue(required ? true : value);
+  };
+
+  useEffect(() => {
+    setHasDefaultValue(
+      defaultToFirstItem
+        ? false
+        : !!formFilter?.defaultDataMask?.filterState?.value,
+    );
+    // TODO: this logic should be unhardcoded
+  }, [defaultToFirstItem, enableEmptyFilter]);
+
+  useEffect(() => {
+    setHasDefaultValue(
+      defaultToFirstItem
+        ? false
+        : !!filterToEdit?.defaultDataMask?.filterState?.value,
+    );
+  }, []);
+
+  useEffect(() => {
+    let tooltip = '';
+    if (defaultToFirstItem) {
+      tooltip = t(
+        'Default value set automatically when "Default to first item" is checked',
+      );
+    } else if (isRequired) {
+      tooltip = t('Default value must be set when "Required" is checked');
+    } else if (hasDefaultValue) {
+      tooltip = t(
+        'Default value must be set when "Filter has default value" is checked',
+      );
+    }
+    setDefaultValueTooltip(tooltip);
+  }, [hasDefaultValue, isRequired, defaultToFirstItem]);
+
+  return [hasDefaultValue, isRequired, defaultValueTooltip, setHasDefaultValue];
+};
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.ts
index b59e96e558e2..51a4a63b5b20 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.ts
@@ -19,10 +19,25 @@
 import { flatMapDeep } from 'lodash';
 import { FormInstance } from 'antd/lib/form';
 import React from 'react';
-import { CustomControlItem } from '@superset-ui/chart-controls';
+import { CustomControlItem, DatasourceMeta } from '@superset-ui/chart-controls';
+import { Column, ensureIsArray, GenericDataType } from '@superset-ui/core';
+import { DatasourcesState, ChartsState } from 'src/dashboard/types';
 
 const FILTERS_FIELD_NAME = 'filters';
 
+export const FILTER_SUPPORTED_TYPES = {
+  filter_time: [GenericDataType.TEMPORAL],
+  filter_timegrain: [GenericDataType.TEMPORAL],
+  filter_timecolumn: [GenericDataType.TEMPORAL],
+  filter_select: [
+    GenericDataType.BOOLEAN,
+    GenericDataType.STRING,
+    GenericDataType.NUMERIC,
+    GenericDataType.TEMPORAL,
+  ],
+  filter_range: [GenericDataType.NUMERIC],
+};
+
 export const useForceUpdate = () => {
   const [, updateState] = React.useState({});
   return React.useCallback(() => updateState({}), []);
@@ -64,7 +79,50 @@ type DatasetSelectValue = {
   label: string;
 };
 
-export const datasetToSelectOption = (item: any): DatasetSelectValue => ({
+export const datasetToSelectOption = (
+  item: DatasourceMeta & { table_name: string },
+): DatasetSelectValue => ({
   value: item.id,
   label: item.table_name,
 });
+
+// TODO: add column_types field to DatasourceMeta
+// We return true if column_types is undefined or empty as a precaution against backend failing to return column_types
+export const hasTemporalColumns = (
+  dataset: DatasourceMeta & { column_types: GenericDataType[] },
+) => {
+  const columnTypes = ensureIsArray(dataset?.column_types);
+  return (
+    columnTypes.length === 0 || columnTypes.includes(GenericDataType.TEMPORAL)
+  );
+};
+
+export const doesColumnMatchFilterType = (filterType: string, column: Column) =>
+  !column.type_generic ||
+  !(filterType in FILTER_SUPPORTED_TYPES) ||
+  FILTER_SUPPORTED_TYPES[filterType]?.includes(column.type_generic);
+
+export const mostUsedDataset = (
+  datasets: DatasourcesState,
+  charts: ChartsState,
+) => {
+  const map = new Map<string, number>();
+  let mostUsedDataset = '';
+  let maxCount = 0;
+
+  Object.values(charts).forEach(chart => {
+    const { formData } = chart;
+    if (formData) {
+      const { datasource } = formData;
+      const count = (map.get(datasource) || 0) + 1;
+      map.set(datasource, count);
+
+      if (count > maxCount) {
+        maxCount = count;
+        mostUsedDataset = datasource;
+      }
+    }
+  });
+
+  return datasets[mostUsedDataset]?.id;
+};
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.test.tsx
index 9713292d9a56..a5497d00d8cb 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.test.tsx
@@ -16,199 +16,339 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import React from 'react';
 import { Preset } from '@superset-ui/core';
-import { SelectFilterPlugin, TimeFilterPlugin } from 'src/filters/components';
-import { render, cleanup, screen } from 'spec/helpers/testing-library';
-import { Provider } from 'react-redux';
-import {
-  getMockStore,
-  mockStore,
-  stateWithoutNativeFilters,
-} from 'spec/fixtures/mockStore';
 import fetchMock from 'fetch-mock';
-import React from 'react';
-import userEvent from '@testing-library/user-event';
-import { testWithId } from 'src/utils/testUtils';
-import { waitFor } from '@testing-library/react';
+import userEvent, { specialChars } from '@testing-library/user-event';
+import {
+  SelectFilterPlugin,
+  RangeFilterPlugin,
+  TimeFilterPlugin,
+  TimeColumnFilterPlugin,
+  TimeGrainFilterPlugin,
+} from 'src/filters/components';
+import { render, screen, waitFor } from 'spec/helpers/testing-library';
+import mockDatasource, { id, datasourceId } from 'spec/fixtures/mockDatasource';
+import chartQueries from 'spec/fixtures/mockChartQueries';
 import {
-  FILTERS_CONFIG_MODAL_TEST_ID,
   FiltersConfigModal,
+  FiltersConfigModalProps,
 } from './FiltersConfigModal';
 
-jest.useFakeTimers();
-
 class MainPreset extends Preset {
   constructor() {
     super({
       name: 'Legacy charts',
       plugins: [
-        new TimeFilterPlugin().configure({ key: 'filter_time' }),
         new SelectFilterPlugin().configure({ key: 'filter_select' }),
+        new RangeFilterPlugin().configure({ key: 'filter_range' }),
+        new TimeFilterPlugin().configure({ key: 'filter_time' }),
+        new TimeColumnFilterPlugin().configure({ key: 'filter_timecolumn' }),
+        new TimeGrainFilterPlugin().configure({ key: 'filter_timegrain' }),
       ],
     });
   }
 }
 
-const getTestId = testWithId<string>(FILTERS_CONFIG_MODAL_TEST_ID, true);
+const defaultState = () => ({
+  datasources: { ...mockDatasource },
+  charts: chartQueries,
+});
 
-describe('FilterConfigModal', () => {
-  new MainPreset().register();
-  const onSave = jest.fn();
-  const newFilterProps = {
-    isOpen: true,
-    initialFilterId: undefined,
-    createNewOnOpen: true,
-    onSave,
-    onCancel: jest.fn(),
-  };
-  fetchMock.get(
-    'glob:*/api/v1/dataset/?q=*',
-    {
-      count: 1,
-      ids: [11],
-      label_columns: {
-        id: 'Id',
-        table_name: 'Table Name',
-      },
-      list_columns: ['id', 'table_name'],
-      order_columns: ['table_name'],
-      result: [
-        {
-          id: 11,
-          owners: [],
-          table_name: 'birth_names',
-        },
-      ],
+const noTemporalColumnsState = () => {
+  const state = defaultState();
+  return {
+    charts: {
+      ...state.charts,
     },
-    { overwriteRoutes: true },
-  );
-  fetchMock.get(
-    'glob:*/api/v1/dataset/11',
-    {
-      description_columns: {},
-      id: 3,
-      label_columns: {
-        columns: 'Columns',
-        table_name: 'Table Name',
-      },
-      result: {
-        columns: [
-          {
-            column_name: 'name',
-            groupby: true,
-            id: 334,
-          },
-        ],
-        table_name: 'birth_names',
+    datasources: {
+      ...state.datasources,
+      [datasourceId]: {
+        ...state.datasources[datasourceId],
+        column_types: [0, 1],
       },
-      show_columns: ['id', 'table_name'],
     },
-    { overwriteRoutes: true },
-  );
-  fetchMock.post(
-    'glob:*/api/v1/chart/data',
+  };
+};
+
+const datasetResult = (id: number) => ({
+  description_columns: {},
+  id,
+  label_columns: {
+    columns: 'Columns',
+    table_name: 'Table Name',
+  },
+  result: {
+    metrics: [],
+    columns: [
+      {
+        column_name: 'Column A',
+        id: 1,
+      },
+    ],
+    table_name: 'birth_names',
+    id,
+  },
+  show_columns: ['id', 'table_name'],
+});
+
+fetchMock.get('glob:*/api/v1/dataset/1', datasetResult(1));
+fetchMock.get(`glob:*/api/v1/dataset/${id}`, datasetResult(id));
+
+fetchMock.post('glob:*/api/v1/chart/data', {
+  result: [
     {
-      result: [
-        {
-          status: 'success',
-          data: [
-            { name: 'Aaron', count: 453 },
-            { name: 'Abigail', count: 228 },
-            { name: 'Adam', count: 454 },
-          ],
-          applied_filters: [{ column: 'name' }],
-        },
+      status: 'success',
+      data: [
+        { name: 'Aaron', count: 453 },
+        { name: 'Abigail', count: 228 },
+        { name: 'Adam', count: 454 },
       ],
+      applied_filters: [{ column: 'name' }],
     },
-    { overwriteRoutes: true },
-  );
+  ],
+});
 
-  const renderWrapper = (
-    props = newFilterProps,
-    state: object = stateWithoutNativeFilters,
-  ) =>
-    render(
-      <Provider
-        store={state ? getMockStore(stateWithoutNativeFilters) : mockStore}
-      >
-        <FiltersConfigModal {...props} />
-      </Provider>,
-    );
-
-  afterEach(() => {
-    cleanup();
-    jest.clearAllMocks();
+const FILTER_TYPE_REGEX = /^filter type$/i;
+const FILTER_NAME_REGEX = /^filter name$/i;
+const DATASET_REGEX = /^dataset$/i;
+const COLUMN_REGEX = /^column$/i;
+const VALUE_REGEX = /^value$/i;
+const NUMERICAL_RANGE_REGEX = /^numerical range$/i;
+const TIME_RANGE_REGEX = /^time range$/i;
+const TIME_COLUMN_REGEX = /^time column$/i;
+const TIME_GRAIN_REGEX = /^time grain$/i;
+const ADVANCED_REGEX = /^advanced$/i;
+const DEFAULT_VALUE_REGEX = /^filter has default value$/i;
+const MULTIPLE_REGEX = /^multiple select$/i;
+const REQUIRED_REGEX = /^required$/i;
+const HIERARCHICAL_REGEX = /^filter is hierarchical$/i;
+const FIRST_ITEM_REGEX = /^default to first item$/i;
+const INVERSE_SELECTION_REGEX = /^inverse selection$/i;
+const SEARCH_ALL_REGEX = /^search all filter options$/i;
+const PRE_FILTER_REGEX = /^pre-filter available values$/i;
+const SORT_REGEX = /^sort filter values$/i;
+const SAVE_REGEX = /^save$/i;
+const NAME_REQUIRED_REGEX = /^name is required$/i;
+const COLUMN_REQUIRED_REGEX = /^column is required$/i;
+const DEFAULT_VALUE_REQUIRED_REGEX = /^default value is required$/i;
+const PARENT_REQUIRED_REGEX = /^parent filter is required$/i;
+const PRE_FILTER_REQUIRED_REGEX = /^pre-filter is required$/i;
+const FILL_REQUIRED_FIELDS_REGEX = /fill all required fields to enable/;
+const TIME_RANGE_PREFILTER_REGEX = /^time range$/i;
+
+const props: FiltersConfigModalProps = {
+  isOpen: true,
+  createNewOnOpen: true,
+  onSave: jest.fn(),
+  onCancel: jest.fn(),
+};
+
+beforeAll(() => {
+  new MainPreset().register();
+});
+
+function defaultRender(initialState = defaultState()) {
+  return render(<FiltersConfigModal {...props} />, {
+    useRedux: true,
+    initialState,
   });
+}
 
-  // TODO: fix and unskip
-  it.skip('Create Select Filter (with datasource and columns) with specific filter scope', async () => {
-    renderWrapper();
+function getCheckbox(name: RegExp) {
+  return screen.getByRole('checkbox', { name });
+}
 
-    const FILTER_NAME = 'Select Filter 1';
+function queryCheckbox(name: RegExp) {
+  return screen.queryByRole('checkbox', { name });
+}
 
-    // fill name
-    userEvent.type(screen.getByTestId(getTestId('name-input')), FILTER_NAME);
+test('renders a value filter type', () => {
+  defaultRender();
 
-    // fill dataset
-    await waitFor(() =>
-      expect(screen.queryByText('Loading...')).not.toBeInTheDocument(),
-    );
-    userEvent.click(
-      screen
-        .getByTestId(getTestId('datasource-input'))
-        .querySelector('.Select__indicators')!,
-    );
-    userEvent.click(screen.getByText('birth_names'));
+  userEvent.click(screen.getByText(ADVANCED_REGEX));
+
+  expect(screen.getByText(FILTER_TYPE_REGEX)).toBeInTheDocument();
+  expect(screen.getByText(FILTER_NAME_REGEX)).toBeInTheDocument();
+  expect(screen.getByText(DATASET_REGEX)).toBeInTheDocument();
+  expect(screen.getByText(COLUMN_REGEX)).toBeInTheDocument();
+
+  expect(getCheckbox(DEFAULT_VALUE_REGEX)).not.toBeChecked();
+  expect(getCheckbox(REQUIRED_REGEX)).not.toBeChecked();
+  expect(getCheckbox(HIERARCHICAL_REGEX)).not.toBeChecked();
+  expect(getCheckbox(FIRST_ITEM_REGEX)).not.toBeChecked();
+  expect(getCheckbox(INVERSE_SELECTION_REGEX)).not.toBeChecked();
+  expect(getCheckbox(SEARCH_ALL_REGEX)).not.toBeChecked();
+  expect(getCheckbox(PRE_FILTER_REGEX)).not.toBeChecked();
+  expect(getCheckbox(SORT_REGEX)).not.toBeChecked();
+
+  expect(getCheckbox(MULTIPLE_REGEX)).toBeChecked();
+});
+
+test('renders a numerical range filter type', async () => {
+  defaultRender();
+
+  userEvent.click(screen.getByText(VALUE_REGEX));
+
+  await waitFor(() => userEvent.click(screen.getByText(NUMERICAL_RANGE_REGEX)));
+
+  userEvent.click(screen.getByText(ADVANCED_REGEX));
+
+  expect(screen.getByText(FILTER_TYPE_REGEX)).toBeInTheDocument();
+  expect(screen.getByText(FILTER_NAME_REGEX)).toBeInTheDocument();
+  expect(screen.getByText(DATASET_REGEX)).toBeInTheDocument();
+  expect(screen.getByText(COLUMN_REGEX)).toBeInTheDocument();
+  expect(screen.getByText(REQUIRED_REGEX)).toBeInTheDocument();
 
-    // fill column
-    userEvent.click(screen.getByText('Select...'));
-    await waitFor(() =>
-      expect(screen.queryByText('Loading...')).not.toBeInTheDocument(),
-    );
-    userEvent.click(screen.getByText('name'));
-
-    // fill controls
-    expect(screen.getByText('Multiple select').parentElement!).toHaveAttribute(
-      'class',
-      'ant-checkbox-wrapper ant-checkbox-wrapper-checked',
-    );
-    userEvent.click(screen.getByText('Multiple select'));
+  expect(getCheckbox(DEFAULT_VALUE_REGEX)).not.toBeChecked();
+  expect(getCheckbox(PRE_FILTER_REGEX)).not.toBeChecked();
+
+  expect(queryCheckbox(MULTIPLE_REGEX)).not.toBeInTheDocument();
+  expect(queryCheckbox(HIERARCHICAL_REGEX)).not.toBeInTheDocument();
+  expect(queryCheckbox(FIRST_ITEM_REGEX)).not.toBeInTheDocument();
+  expect(queryCheckbox(INVERSE_SELECTION_REGEX)).not.toBeInTheDocument();
+  expect(queryCheckbox(SEARCH_ALL_REGEX)).not.toBeInTheDocument();
+  expect(queryCheckbox(SORT_REGEX)).not.toBeInTheDocument();
+});
+
+test('renders a time range filter type', async () => {
+  defaultRender();
+
+  userEvent.click(screen.getByText(VALUE_REGEX));
+
+  await waitFor(() => userEvent.click(screen.getByText(TIME_RANGE_REGEX)));
+
+  expect(screen.getByText(FILTER_TYPE_REGEX)).toBeInTheDocument();
+  expect(screen.getByText(FILTER_NAME_REGEX)).toBeInTheDocument();
+  expect(screen.queryByText(DATASET_REGEX)).not.toBeInTheDocument();
+  expect(screen.queryByText(COLUMN_REGEX)).not.toBeInTheDocument();
+
+  expect(getCheckbox(DEFAULT_VALUE_REGEX)).not.toBeChecked();
+
+  expect(screen.queryByText(ADVANCED_REGEX)).not.toBeInTheDocument();
+});
+
+test('renders a time column filter type', async () => {
+  defaultRender();
+
+  userEvent.click(screen.getByText(VALUE_REGEX));
+
+  await waitFor(() => userEvent.click(screen.getByText(TIME_COLUMN_REGEX)));
+
+  expect(screen.getByText(FILTER_TYPE_REGEX)).toBeInTheDocument();
+  expect(screen.getByText(FILTER_NAME_REGEX)).toBeInTheDocument();
+  expect(screen.getByText(DATASET_REGEX)).toBeInTheDocument();
+  expect(screen.queryByText(COLUMN_REGEX)).not.toBeInTheDocument();
+
+  expect(getCheckbox(DEFAULT_VALUE_REGEX)).not.toBeChecked();
+
+  expect(screen.queryByText(ADVANCED_REGEX)).not.toBeInTheDocument();
+});
+
+test('renders a time grain filter type', async () => {
+  defaultRender();
+
+  userEvent.click(screen.getByText(VALUE_REGEX));
+
+  await waitFor(() => userEvent.click(screen.getByText(TIME_GRAIN_REGEX)));
+
+  expect(screen.getByText(FILTER_TYPE_REGEX)).toBeInTheDocument();
+  expect(screen.getByText(FILTER_NAME_REGEX)).toBeInTheDocument();
+  expect(screen.getByText(DATASET_REGEX)).toBeInTheDocument();
+  expect(screen.queryByText(COLUMN_REGEX)).not.toBeInTheDocument();
+
+  expect(getCheckbox(DEFAULT_VALUE_REGEX)).not.toBeChecked();
+
+  expect(screen.queryByText(ADVANCED_REGEX)).not.toBeInTheDocument();
+});
+
+test('render time filter types as disabled if there are no temporal columns in the dataset', async () => {
+  defaultRender(noTemporalColumnsState());
+
+  userEvent.click(screen.getByText(VALUE_REGEX));
+
+  const timeRange = await screen.findByText(TIME_RANGE_REGEX);
+  const timeGrain = await screen.findByText(TIME_GRAIN_REGEX);
+  const timeColumn = await screen.findByText(TIME_COLUMN_REGEX);
+  const disabledClass = '.ant-select-item-option-disabled';
+
+  expect(timeRange.closest(disabledClass)).toBeInTheDocument();
+  expect(timeGrain.closest(disabledClass)).toBeInTheDocument();
+  expect(timeColumn.closest(disabledClass)).toBeInTheDocument();
+});
+
+test('validates the name', async () => {
+  defaultRender();
+  userEvent.click(screen.getByRole('button', { name: SAVE_REGEX }));
+  expect(await screen.findByText(NAME_REQUIRED_REGEX)).toBeInTheDocument();
+});
+
+test('validates the column', async () => {
+  defaultRender();
+  userEvent.click(screen.getByRole('button', { name: SAVE_REGEX }));
+  expect(await screen.findByText(COLUMN_REQUIRED_REGEX)).toBeInTheDocument();
+});
+
+// eslint-disable-next-line jest/no-disabled-tests
+test.skip('validates the default value', async () => {
+  defaultRender(noTemporalColumnsState());
+  expect(await screen.findByText('birth_names')).toBeInTheDocument();
+  userEvent.type(screen.getByRole('combobox'), `Column A${specialChars.enter}`);
+  userEvent.click(getCheckbox(DEFAULT_VALUE_REGEX));
+  await waitFor(() => {
     expect(
-      screen.getByText('Multiple select').parentElement!,
-    ).not.toHaveAttribute(
-      'class',
-      'ant-checkbox-wrapper ant-checkbox-wrapper-checked',
-    );
-
-    // choose default value
-    userEvent.click(await screen.findByText('3 options'));
-    userEvent.click(screen.getByTitle('Abigail'));
-
-    // fill scoping
-    userEvent.click(screen.getByText('Apply to specific panels'));
-    userEvent.click(screen.getByText('CHART_ID'));
-
-    // saving
-    userEvent.click(screen.getByText('Save'));
-    await waitFor(() =>
-      expect(onSave.mock.calls[0][0][0]).toEqual(
-        expect.objectContaining({
-          cascadeParentIds: [],
-          controlValues: {
-            defaultToFirstItem: false,
-            enableEmptyFilter: false,
-            inverseSelection: false,
-            multiSelect: false,
-            sortAscending: true,
-          },
-          defaultValue: ['Abigail'],
-          filterType: 'filter_select',
-          isInstant: false,
-          name: 'Select Filter 1',
-          scope: { excluded: [], rootPath: [] },
-          targets: [{ column: { name: 'name' }, datasetId: 11 }],
-        }),
-      ),
-    );
+      screen.queryByText(FILL_REQUIRED_FIELDS_REGEX),
+    ).not.toBeInTheDocument();
   });
+  expect(
+    await screen.findByText(DEFAULT_VALUE_REQUIRED_REGEX),
+  ).toBeInTheDocument();
+});
+
+test('validates the hierarchical value', async () => {
+  defaultRender();
+  userEvent.click(screen.getByText(ADVANCED_REGEX));
+  userEvent.click(getCheckbox(HIERARCHICAL_REGEX));
+  expect(await screen.findByText(PARENT_REQUIRED_REGEX)).toBeInTheDocument();
+});
+
+test('validates the pre-filter value', async () => {
+  defaultRender();
+  userEvent.click(screen.getByText(ADVANCED_REGEX));
+  userEvent.click(getCheckbox(PRE_FILTER_REGEX));
+  expect(
+    await screen.findByText(PRE_FILTER_REQUIRED_REGEX),
+  ).toBeInTheDocument();
+});
+
+test("doesn't render time range pre-filter if there are no temporal columns in datasource", async () => {
+  defaultRender(noTemporalColumnsState());
+  userEvent.click(screen.getByText(DATASET_REGEX));
+  await waitFor(() => {
+    expect(screen.queryByLabelText('Loading')).not.toBeInTheDocument();
+    userEvent.click(screen.getByText('birth_names'));
+  });
+  userEvent.click(screen.getByText(ADVANCED_REGEX));
+  userEvent.click(getCheckbox(PRE_FILTER_REGEX));
+  await waitFor(() =>
+    expect(
+      screen.queryByText(TIME_RANGE_PREFILTER_REGEX),
+    ).not.toBeInTheDocument(),
+  );
 });
+/*
+  TODO
+    adds a new value filter type with all fields filled
+    adds a new numerical range filter type with all fields filled
+    adds a new time range filter type with all fields filled
+    adds a new time column filter type with all fields filled
+    adds a new time grain filter type with all fields filled
+    collapsible controls opens by default when it is checked
+    advanced section opens by default when it has an option checked
+    deletes a filter
+    disables the default value when default to first item is checked
+    changes the default value options when the column changes
+    switches to configuration tab when validation fails
+    displays cancel message when there are pending operations
+    do not displays cancel message when there are no pending operations
+*/
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx
index c1f39c0cd931..f0343842efba 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx
@@ -167,11 +167,12 @@ export function FiltersConfigModal({
   // After this, it should be as if the modal was just opened fresh.
   // Called when the modal is closed.
   const resetForm = () => {
-    form.resetFields();
     setNewFilterIds([]);
     setCurrentFilterId(initialCurrentFilterId);
     setRemovedFilters({});
     setSaveAlertVisible(false);
+    setFormValues({ filters: {} });
+    form.setFieldsValue({ changed: false });
   };
 
   const getFilterTitle = (id: string) =>
@@ -209,10 +210,10 @@ export function FiltersConfigModal({
         filterConfigMap,
         filterIds,
         removedFilters,
-        resetForm,
         onSave,
         values,
       )();
+      resetForm();
     } else {
       configFormRef.current.changeTab('configuration');
     }
@@ -224,7 +225,8 @@ export function FiltersConfigModal({
   };
 
   const handleCancel = () => {
-    if (unsavedFiltersIds.length > 0) {
+    const changed = form.getFieldValue('changed');
+    if (unsavedFiltersIds.length > 0 || form.isFieldsTouched() || changed) {
       setSaveAlertVisible(true);
     } else {
       handleConfirmCancel();
@@ -235,7 +237,7 @@ export function FiltersConfigModal({
     <StyledModalWrapper
       visible={isOpen}
       maskClosable={false}
-      title={t('Filters configuration')}
+      title={t('Filters configuration and scoping')}
       width="50%"
       destroyOnClose
       onCancel={handleCancel}
@@ -246,10 +248,8 @@ export function FiltersConfigModal({
         <Footer
           onDismiss={() => setSaveAlertVisible(false)}
           onCancel={handleCancel}
-          getFilterTitle={getFilterTitle}
           handleSave={handleSave}
           saveAlertVisible={saveAlertVisible}
-          unsavedFiltersIds={unsavedFiltersIds}
           onConfirmCancel={handleConfirmCancel}
         />
       }
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/Footer.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/Footer.tsx
index 47f36bd0147b..a55a87c25ea4 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/Footer.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/Footer.tsx
@@ -27,8 +27,6 @@ type FooterProps = {
   onConfirmCancel: OnClickHandler;
   onDismiss: OnClickHandler;
   saveAlertVisible: boolean;
-  getFilterTitle: (id: string) => string;
-  unsavedFiltersIds: string[];
 };
 
 const Footer: FC<FooterProps> = ({
@@ -36,38 +34,17 @@ const Footer: FC<FooterProps> = ({
   handleSave,
   onDismiss,
   onConfirmCancel,
-  getFilterTitle,
-  unsavedFiltersIds,
   saveAlertVisible,
 }) => {
-  const getUnsavedFilterNames = (): string => {
-    const unsavedFiltersNames = unsavedFiltersIds.map(
-      id => `"${getFilterTitle(id)}"`,
-    );
-
-    if (unsavedFiltersNames.length === 0) {
-      return '';
-    }
-
-    if (unsavedFiltersNames.length === 1) {
-      return unsavedFiltersNames[0];
-    }
-
-    const lastFilter = unsavedFiltersNames.pop();
-
-    return `${unsavedFiltersNames.join(', ')} ${t('and')} ${lastFilter}`;
-  };
-
   if (saveAlertVisible) {
     return (
       <CancelConfirmationAlert
         key="cancel-confirm"
-        title={`${unsavedFiltersIds.length} ${t('unsaved filters')}`}
+        title={t('There are unsaved changes.')}
         onConfirm={onConfirmCancel}
         onDismiss={onDismiss}
       >
-        {t(`Are you sure you want to cancel?`)} {getUnsavedFilterNames()}{' '}
-        {t(`will not be saved.`)}
+        {t(`Are you sure you want to cancel?`)}
       </CancelConfirmationAlert>
     );
   }
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/types.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/types.ts
index 0ba091f4eebc..dd211aceed70 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/types.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/types.ts
@@ -41,13 +41,14 @@ export interface NativeFiltersFormItem {
     label: string;
   };
   sortMetric: string | null;
-  isInstant: boolean;
   adhoc_filters?: AdhocFilter[];
   time_range?: string;
+  granularity_sqla?: string;
 }
 
 export interface NativeFiltersForm {
   filters: Record<string, NativeFiltersFormItem>;
+  changed?: boolean;
 }
 
 export type FilterRemoval =
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts
index b218ad4944dc..c2307e4b4534 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts
@@ -56,18 +56,6 @@ export const validateForm = async (
         throw error;
       }
     }
-    const validateInstant = (filterId: string) => {
-      const isInstant = formValues.filters[filterId]
-        ? formValues.filters[filterId].isInstant
-        : filterConfigMap[filterId]?.isInstant;
-      if (!isInstant) {
-        addValidationError(
-          filterId,
-          'isInstant',
-          'For hierarchical filters changes must be applied instantly',
-        );
-      }
-    };
 
     const validateCycles = (filterId: string, trace: string[] = []) => {
       if (trace.includes(filterId)) {
@@ -81,7 +69,6 @@ export const validateForm = async (
         ? formValues.filters[filterId].parentFilter?.value
         : filterConfigMap[filterId]?.cascadeParentIds?.[0];
       if (parentId) {
-        validateInstant(parentId);
         validateCycles(parentId, [...trace, filterId]);
       }
     };
@@ -117,7 +104,6 @@ export const createHandleSave = (
   filterConfigMap: Record<string, Filter>,
   filterIds: string[],
   removedFilters: Record<string, FilterRemoval>,
-  resetForm: Function,
   saveForm: Function,
   values: NativeFiltersForm,
 ) => async () => {
@@ -140,6 +126,7 @@ export const createHandleSave = (
         adhoc_filters: formInputs.adhoc_filters,
         time_range: formInputs.time_range,
         controlValues: formInputs.controlValues ?? {},
+        granularity_sqla: formInputs.granularity_sqla,
         requiredFirst: Object.values(formInputs.requiredFirst ?? {}).find(
           rf => rf,
         ),
@@ -152,13 +139,11 @@ export const createHandleSave = (
           ? [formInputs.parentFilter.value]
           : [],
         scope: formInputs.scope,
-        isInstant: formInputs.isInstant,
         sortMetric: formInputs.sortMetric,
       };
     });
 
   await saveForm(newFilterConfig);
-  resetForm();
 };
 
 export const createHandleTabEdit = (
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/state.ts b/superset-frontend/src/dashboard/components/nativeFilters/state.ts
index 027bf2ac968c..280a203da7b3 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/state.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/state.ts
@@ -19,7 +19,9 @@
 import { useSelector } from 'react-redux';
 import { useMemo } from 'react';
 import { Filter, FilterConfiguration } from './types';
-import { DashboardLayout } from '../../types';
+import { ActiveTabs, DashboardLayout, RootState } from '../../types';
+import { TAB_TYPE } from '../../util/componentTypes';
+import { CascadeFilter } from './FilterBar/CascadeFilters/types';
 
 const defaultFilterConfiguration: Filter[] = [];
 
@@ -52,3 +54,73 @@ export function useDashboardLayout() {
     state => state.dashboardLayout?.present,
   );
 }
+
+export function useDashboardHasTabs() {
+  const dashboardLayout = useDashboardLayout();
+  return useMemo(
+    () =>
+      Object.values(dashboardLayout).some(element => element.type === TAB_TYPE),
+    [dashboardLayout],
+  );
+}
+
+function useActiveDashboardTabs() {
+  return useSelector<RootState, ActiveTabs>(
+    state => state.dashboardState?.activeTabs,
+  );
+}
+
+function useSelectChartTabParents() {
+  const dashboardLayout = useDashboardLayout();
+  return (chartId: number) => {
+    const chartLayoutItem = Object.values(dashboardLayout).find(
+      layoutItem => layoutItem.meta?.chartId === chartId,
+    );
+    return chartLayoutItem?.parents.filter(
+      (parent: string) => dashboardLayout[parent].type === TAB_TYPE,
+    );
+  };
+}
+
+function useIsFilterInScope() {
+  const activeTabs = useActiveDashboardTabs();
+  const selectChartTabParents = useSelectChartTabParents();
+
+  // Filter is in scope if any of it's charts is visible.
+  // Chart is visible if it's placed in an active tab tree or if it's not attached to any tab.
+  // Chart is in an active tab tree if all of it's ancestors of type TAB are active
+  return (filter: CascadeFilter) =>
+    filter.chartsInScope?.some((chartId: number) => {
+      const tabParents = selectChartTabParents(chartId);
+      return (
+        tabParents?.length === 0 ||
+        tabParents?.every(tab => activeTabs.includes(tab))
+      );
+    });
+}
+
+export function useSelectFiltersInScope(cascadeFilters: CascadeFilter[]) {
+  const dashboardHasTabs = useDashboardHasTabs();
+  const isFilterInScope = useIsFilterInScope();
+
+  return useMemo(() => {
+    let filtersInScope: CascadeFilter[] = [];
+    const filtersOutOfScope: CascadeFilter[] = [];
+
+    // we check native filters scopes only on dashboards with tabs
+    if (!dashboardHasTabs) {
+      filtersInScope = cascadeFilters;
+    } else {
+      cascadeFilters.forEach((filter: CascadeFilter) => {
+        const filterInScope = isFilterInScope(filter);
+
+        if (filterInScope) {
+          filtersInScope.push(filter);
+        } else {
+          filtersOutOfScope.push(filter);
+        }
+      });
+    }
+    return [filtersInScope, filtersOutOfScope];
+  }, [cascadeFilters, dashboardHasTabs, isFilterInScope]);
+}
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/types.ts b/superset-frontend/src/dashboard/components/nativeFilters/types.ts
index a1e206bab073..3792d3e82be1 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/types.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/types.ts
@@ -42,7 +42,6 @@ export interface Target {
 export interface Filter {
   cascadeParentIds: string[];
   defaultDataMask: DataMask;
-  isInstant: boolean;
   id: string; // randomly generated at filter creation
   name: string;
   scope: Scope;
@@ -55,6 +54,7 @@ export interface Filter {
   };
   sortMetric?: string | null;
   adhoc_filters?: AdhocFilter[];
+  granularity_sqla?: string;
   time_range?: string;
   requiredFirst?: boolean;
   tabsInScope?: string[];
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/utils.ts b/superset-frontend/src/dashboard/components/nativeFilters/utils.ts
index 24264cb4e725..5dc81fd160a3 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/utils.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/utils.ts
@@ -46,6 +46,7 @@ export const getFormData = ({
   sortMetric,
   adhoc_filters,
   time_range,
+  granularity_sqla,
 }: Partial<Filter> & {
   datasetId?: number;
   inputRef?: RefObject<HTMLInputElement>;
@@ -74,7 +75,7 @@ export const getFormData = ({
     adhoc_filters: adhoc_filters ?? [],
     extra_filters: [],
     extra_form_data: cascadingFilters,
-    granularity_sqla: 'ds',
+    granularity_sqla,
     metrics: ['count'],
     row_limit: 1000,
     showSearch: true,
@@ -82,6 +83,7 @@ export const getFormData = ({
     time_range,
     time_range_endpoints: ['inclusive', 'exclusive'],
     url_params: extractUrlParams('regular'),
+    inView: true,
     viz_type: filterType,
     inputRef,
   };
diff --git a/superset-frontend/src/dashboard/constants.ts b/superset-frontend/src/dashboard/constants.ts
new file mode 100644
index 000000000000..ab3fa29a0b77
--- /dev/null
+++ b/superset-frontend/src/dashboard/constants.ts
@@ -0,0 +1,35 @@
+/* eslint-disable import/prefer-default-export */
+import { DatasourceType } from '@superset-ui/core';
+import { Datasource } from 'src/dashboard/types';
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+export const PLACEHOLDER_DATASOURCE: Datasource = {
+  id: 0,
+  type: DatasourceType.Table,
+  uid: '_placeholder_',
+  datasource_name: '',
+  table_name: '',
+  columns: [],
+  column_types: [],
+  metrics: [],
+  column_format: {},
+  verbose_map: {},
+  main_dttm_col: '',
+  description: '',
+};
diff --git a/superset-frontend/src/dashboard/containers/Chart.jsx b/superset-frontend/src/dashboard/containers/Chart.jsx
index 6ef9e4e71b88..4fdfcfdb952c 100644
--- a/superset-frontend/src/dashboard/containers/Chart.jsx
+++ b/superset-frontend/src/dashboard/containers/Chart.jsx
@@ -35,6 +35,7 @@ import {
 } from '../util/activeDashboardFilters';
 import getFormDataWithExtraFilters from '../util/charts/getFormDataWithExtraFilters';
 import Chart from '../components/gridComponents/Chart';
+import { PLACEHOLDER_DATASOURCE } from '../constants';
 
 const EMPTY_FILTERS = {};
 
@@ -48,13 +49,15 @@ function mapStateToProps(
     datasources,
     sliceEntities,
     nativeFilters,
+    common,
   },
   ownProps,
 ) {
   const { id } = ownProps;
   const chart = chartQueries[id] || {};
   const datasource =
-    (chart && chart.form_data && datasources[chart.form_data.datasource]) || {};
+    (chart && chart.form_data && datasources[chart.form_data.datasource]) ||
+    PLACEHOLDER_DATASOURCE;
   const { colorScheme, colorNamespace } = dashboardState;
 
   // note: this method caches filters if possible to prevent render cascades
@@ -89,6 +92,7 @@ function mapStateToProps(
     sliceCanEdit: !!dashboardInfo.slice_can_edit,
     ownState: dataMask[id]?.ownState,
     filterState: dataMask[id]?.filterState,
+    maxRows: common.conf.SQL_MAX_ROW,
   };
 }
 
diff --git a/superset-frontend/src/dashboard/containers/Dashboard.ts b/superset-frontend/src/dashboard/containers/Dashboard.ts
index 398dff7f29a5..ccca038dfdf9 100644
--- a/superset-frontend/src/dashboard/containers/Dashboard.ts
+++ b/superset-frontend/src/dashboard/containers/Dashboard.ts
@@ -18,19 +18,21 @@
  */
 import { bindActionCreators, Dispatch } from 'redux';
 import { connect } from 'react-redux';
-import Dashboard from '../components/Dashboard';
+import { RootState } from 'src/dashboard/types';
+import Dashboard from 'src/dashboard/components/Dashboard';
 import {
   addSliceToDashboard,
   removeSliceFromDashboard,
-} from '../actions/dashboardState';
-import { triggerQuery } from '../../chart/chartAction';
-import { logEvent } from '../../logger/actions';
-import { getActiveFilters } from '../util/activeDashboardFilters';
+} from 'src/dashboard/actions/dashboardState';
+import { setDatasources } from 'src/dashboard/actions/datasources';
+
+import { triggerQuery } from 'src/chart/chartAction';
+import { logEvent } from 'src/logger/actions';
+import { getActiveFilters } from 'src/dashboard/util/activeDashboardFilters';
 import {
   getAllActiveFilters,
   getRelevantDataMask,
-} from '../util/activeAllDashboardFilters';
-import { RootState } from '../types';
+} from 'src/dashboard/util/activeAllDashboardFilters';
 
 function mapStateToProps(state: RootState) {
   const {
@@ -80,6 +82,7 @@ function mapDispatchToProps(dispatch: Dispatch) {
   return {
     actions: bindActionCreators(
       {
+        setDatasources,
         addSliceToDashboard,
         removeSliceFromDashboard,
         triggerQuery,
diff --git a/superset-frontend/src/dashboard/containers/DashboardComponent.jsx b/superset-frontend/src/dashboard/containers/DashboardComponent.jsx
index 387e67c92629..c7ead005701c 100644
--- a/superset-frontend/src/dashboard/containers/DashboardComponent.jsx
+++ b/superset-frontend/src/dashboard/containers/DashboardComponent.jsx
@@ -37,7 +37,8 @@ import {
 } from '../actions/dashboardLayout';
 import {
   setDirectPathToChild,
-  setLastFocusedTab,
+  setActiveTabs,
+  setFullSizeChartId,
 } from '../actions/dashboardState';
 
 const propTypes = {
@@ -67,29 +68,8 @@ const defaultProps = {
   isComponentVisible: true,
 };
 
-/**
- * Selects the chart scope of the filter input that has focus.
- *
- * @returns {{chartId: number, scope: { scope: string[], immune: string[] }} | null }
- * the scope of the currently focused filter, if any
- */
-function selectFocusedFilterScope(dashboardState, dashboardFilters) {
-  if (!dashboardState.focusedFilterField) return null;
-  const { chartId, column } = dashboardState.focusedFilterField;
-  return {
-    chartId,
-    scope: dashboardFilters[chartId].scopes[column],
-  };
-}
-
 function mapStateToProps(
-  {
-    dashboardLayout: undoableLayout,
-    dashboardState,
-    dashboardInfo,
-    dashboardFilters,
-    nativeFilters,
-  },
+  { dashboardLayout: undoableLayout, dashboardState, dashboardInfo },
   ownProps,
 ) {
   const dashboardLayout = undoableLayout.present;
@@ -104,14 +84,10 @@ function mapStateToProps(
     redoLength: undoableLayout.future.length,
     filters: getActiveFilters(),
     directPathToChild: dashboardState.directPathToChild,
-    lastFocusedTabId: dashboardState.lastFocusedTabId,
+    activeTabs: dashboardState.activeTabs,
     directPathLastUpdated: dashboardState.directPathLastUpdated,
     dashboardId: dashboardInfo.id,
-    nativeFilters,
-    focusedFilterScope: selectFocusedFilterScope(
-      dashboardState,
-      dashboardFilters,
-    ),
+    fullSizeChartId: dashboardState.fullSizeChartId,
   };
 
   // rows and columns need more data about their child dimensions
@@ -141,7 +117,8 @@ function mapDispatchToProps(dispatch) {
       updateComponents,
       handleComponentDrop,
       setDirectPathToChild,
-      setLastFocusedTab,
+      setFullSizeChartId,
+      setActiveTabs,
       logEvent,
     },
     dispatch,
diff --git a/superset-frontend/src/dashboard/containers/DashboardHeader.jsx b/superset-frontend/src/dashboard/containers/DashboardHeader.jsx
index 6351561c71fc..bcd6caf9daec 100644
--- a/superset-frontend/src/dashboard/containers/DashboardHeader.jsx
+++ b/superset-frontend/src/dashboard/containers/DashboardHeader.jsx
@@ -19,6 +19,7 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
+import { updateDataMask } from 'src/dataMask/actions';
 import DashboardHeader from '../components/Header';
 import isDashboardLoading from '../util/isDashboardLoading';
 
@@ -38,6 +39,7 @@ import {
   setMaxUndoHistoryExceeded,
   maxUndoHistoryToast,
   setRefreshFrequency,
+  onRefresh,
 } from '../actions/dashboardState';
 
 import {
@@ -55,12 +57,20 @@ import {
 
 import { logEvent } from '../../logger/actions';
 import { DASHBOARD_HEADER_ID } from '../util/constants';
+import {
+  fetchUISpecificReport,
+  toggleActive,
+  deleteActiveReport,
+} from '../../reports/actions/reports';
 
 function mapStateToProps({
   dashboardLayout: undoableLayout,
   dashboardState,
+  reports,
   dashboardInfo,
   charts,
+  dataMask,
+  user,
 }) {
   return {
     dashboardInfo,
@@ -77,7 +87,8 @@ function mapStateToProps({
     colorNamespace: dashboardState.colorNamespace,
     colorScheme: dashboardState.colorScheme,
     charts,
-    userId: dashboardInfo.userId,
+    dataMask,
+    user,
     isStarred: !!dashboardState.isStarred,
     isPublished: !!dashboardState.isPublished,
     isLoading: isDashboardLoading(charts),
@@ -90,6 +101,7 @@ function mapStateToProps({
     editMode: !!dashboardState.editMode,
     slug: dashboardInfo.slug,
     metadata: dashboardInfo.metadata,
+    reports,
   };
 }
 
@@ -116,8 +128,13 @@ function mapDispatchToProps(dispatch) {
       maxUndoHistoryToast,
       logEvent,
       setRefreshFrequency,
+      onRefresh,
       dashboardInfoChanged,
       dashboardTitleChanged,
+      updateDataMask,
+      fetchUISpecificReport,
+      toggleActive,
+      deleteActiveReport,
     },
     dispatch,
   );
diff --git a/superset-frontend/src/dashboard/containers/DashboardPage.tsx b/superset-frontend/src/dashboard/containers/DashboardPage.tsx
index e5897d18c464..d98e6ed7a1bc 100644
--- a/superset-frontend/src/dashboard/containers/DashboardPage.tsx
+++ b/superset-frontend/src/dashboard/containers/DashboardPage.tsx
@@ -16,19 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { useEffect, useState, FC } from 'react';
+import React, { useEffect, FC } from 'react';
+import { t } from '@superset-ui/core';
 import { useDispatch } from 'react-redux';
 import { useParams } from 'react-router-dom';
+import { useToasts } from 'src/messageToasts/enhancers/withToasts';
 import Loading from 'src/components/Loading';
 import {
   useDashboard,
   useDashboardCharts,
   useDashboardDatasets,
 } from 'src/common/hooks/apiResources';
-import { ResourceStatus } from 'src/common/hooks/apiResources/apiResources';
 import { hydrateDashboard } from 'src/dashboard/actions/hydrate';
+import { setDatasources } from 'src/dashboard/actions/datasources';
 import injectCustomCss from 'src/dashboard/util/injectCustomCss';
+import setupPlugins from 'src/setup/setupPlugins';
 
+setupPlugins();
 const DashboardContainer = React.lazy(
   () =>
     import(
@@ -40,48 +44,57 @@ const DashboardContainer = React.lazy(
 
 const DashboardPage: FC = () => {
   const dispatch = useDispatch();
+  const { addDangerToast } = useToasts();
   const { idOrSlug } = useParams<{ idOrSlug: string }>();
-  const [isHydrated, setHydrated] = useState(false);
-  const dashboardResource = useDashboard(idOrSlug);
-  const chartsResource = useDashboardCharts(idOrSlug);
-  const datasetsResource = useDashboardDatasets(idOrSlug);
-  const error = [dashboardResource, chartsResource, datasetsResource].find(
-    resource => resource.status === ResourceStatus.ERROR,
-  )?.error;
+  const { result: dashboard, error: dashboardApiError } = useDashboard(
+    idOrSlug,
+  );
+  const { result: charts, error: chartsApiError } = useDashboardCharts(
+    idOrSlug,
+  );
+  const { result: datasets, error: datasetsApiError } = useDashboardDatasets(
+    idOrSlug,
+  );
+
+  const error = dashboardApiError || chartsApiError;
+  const readyToRender = Boolean(dashboard && charts);
+  const { dashboard_title, css } = dashboard || {};
 
   useEffect(() => {
-    if (dashboardResource.result) {
-      document.title = dashboardResource.result.dashboard_title;
-      if (dashboardResource.result.css) {
-        // returning will clean up custom css
-        // when dashboard unmounts or changes
-        return injectCustomCss(dashboardResource.result.css);
-      }
+    if (readyToRender) {
+      dispatch(hydrateDashboard(dashboard, charts));
     }
-    return () => {};
-  }, [dashboardResource.result]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [readyToRender]);
 
-  const shouldBeHydrated =
-    dashboardResource.status === ResourceStatus.COMPLETE &&
-    chartsResource.status === ResourceStatus.COMPLETE &&
-    datasetsResource.status === ResourceStatus.COMPLETE;
+  useEffect(() => {
+    if (dashboard_title) {
+      document.title = dashboard_title;
+    }
+  }, [dashboard_title]);
 
   useEffect(() => {
-    if (shouldBeHydrated) {
-      dispatch(
-        hydrateDashboard(
-          dashboardResource.result,
-          chartsResource.result,
-          datasetsResource.result,
-        ),
+    if (css) {
+      // returning will clean up custom css
+      // when dashboard unmounts or changes
+      return injectCustomCss(css);
+    }
+    return () => {};
+  }, [css]);
+
+  useEffect(() => {
+    if (datasetsApiError) {
+      addDangerToast(
+        t('Error loading chart datasources. Filters may not work correctly.'),
       );
-      setHydrated(true);
+    } else {
+      dispatch(setDatasources(datasets));
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [shouldBeHydrated]);
+  }, [addDangerToast, datasets, datasetsApiError, dispatch]);
 
   if (error) throw error; // caught in error boundary
-  if (!isHydrated) return <Loading />;
+  if (!readyToRender) return <Loading />;
+
   return <DashboardContainer />;
 };
 
diff --git a/superset-frontend/src/dashboard/containers/FiltersBadge.tsx b/superset-frontend/src/dashboard/containers/FiltersBadge.tsx
deleted file mode 100644
index 546b96303f8a..000000000000
--- a/superset-frontend/src/dashboard/containers/FiltersBadge.tsx
+++ /dev/null
@@ -1,115 +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 { connect } from 'react-redux';
-import { bindActionCreators, Dispatch } from 'redux';
-import { uniqWith } from 'lodash';
-import { setDirectPathToChild } from 'src/dashboard/actions/dashboardState';
-import {
-  selectIndicatorsForChart,
-  Indicator,
-  IndicatorStatus,
-  selectNativeIndicatorsForChart,
-} from 'src/dashboard/components/FiltersBadge/selectors';
-import FiltersBadge from 'src/dashboard/components/FiltersBadge';
-
-export interface FiltersBadgeProps {
-  chartId: number;
-}
-
-const mapDispatchToProps = (dispatch: Dispatch) =>
-  bindActionCreators(
-    {
-      onHighlightFilterSource: setDirectPathToChild,
-    },
-    dispatch,
-  );
-
-const sortByStatus = (indicators: Indicator[]): Indicator[] => {
-  const statuses = [
-    IndicatorStatus.Applied,
-    IndicatorStatus.Unset,
-    IndicatorStatus.Incompatible,
-  ];
-  return indicators.sort(
-    (a, b) =>
-      statuses.indexOf(a.status as IndicatorStatus) -
-      statuses.indexOf(b.status as IndicatorStatus),
-  );
-};
-
-const mapStateToProps = (
-  {
-    datasources,
-    dashboardFilters,
-    nativeFilters,
-    dashboardInfo,
-    charts,
-    dataMask,
-    dashboardLayout: { present },
-  }: any,
-  { chartId }: FiltersBadgeProps,
-) => {
-  const dashboardIndicators = selectIndicatorsForChart(
-    chartId,
-    dashboardFilters,
-    datasources,
-    charts,
-  );
-
-  const nativeIndicators = selectNativeIndicatorsForChart(
-    nativeFilters,
-    dataMask,
-    chartId,
-    charts,
-    present,
-    dashboardInfo.metadata?.chart_configuration,
-  );
-
-  const indicators = uniqWith(
-    sortByStatus([...dashboardIndicators, ...nativeIndicators]),
-    (ind1, ind2) =>
-      ind1.column === ind2.column &&
-      ind1.name === ind2.name &&
-      (ind1.status !== IndicatorStatus.Applied ||
-        ind2.status !== IndicatorStatus.Applied),
-  );
-
-  const appliedCrossFilterIndicators = indicators.filter(
-    indicator => indicator.status === IndicatorStatus.CrossFilterApplied,
-  );
-  const appliedIndicators = indicators.filter(
-    indicator => indicator.status === IndicatorStatus.Applied,
-  );
-  const unsetIndicators = indicators.filter(
-    indicator => indicator.status === IndicatorStatus.Unset,
-  );
-  const incompatibleIndicators = indicators.filter(
-    indicator => indicator.status === IndicatorStatus.Incompatible,
-  );
-
-  return {
-    chartId,
-    appliedIndicators,
-    appliedCrossFilterIndicators,
-    unsetIndicators,
-    incompatibleIndicators,
-  };
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(FiltersBadge);
diff --git a/superset-frontend/src/dashboard/reducers/dashboardState.js b/superset-frontend/src/dashboard/reducers/dashboardState.js
index 842916e1cc31..3c3963abd49b 100644
--- a/superset-frontend/src/dashboard/reducers/dashboardState.js
+++ b/superset-frontend/src/dashboard/reducers/dashboardState.js
@@ -32,10 +32,13 @@ import {
   TOGGLE_PUBLISHED,
   UPDATE_CSS,
   SET_REFRESH_FREQUENCY,
+  ON_REFRESH,
+  ON_REFRESH_SUCCESS,
   SET_DIRECT_PATH,
   SET_FOCUSED_FILTER_FIELD,
   UNSET_FOCUSED_FILTER_FIELD,
-  SET_LAST_FOCUSED_TAB,
+  SET_ACTIVE_TABS,
+  SET_FULL_SIZE_CHART_ID,
 } from '../actions/dashboardState';
 import { HYDRATE_DASHBOARD } from '../actions/hydrate';
 
@@ -127,6 +130,18 @@ export default function dashboardStateReducer(state = {}, action) {
         hasUnsavedChanges: action.isPersistent,
       };
     },
+    [ON_REFRESH]() {
+      return {
+        ...state,
+        isRefreshing: true,
+      };
+    },
+    [ON_REFRESH_SUCCESS]() {
+      return {
+        ...state,
+        isRefreshing: false,
+      };
+    },
     [SET_DIRECT_PATH]() {
       return {
         ...state,
@@ -134,10 +149,10 @@ export default function dashboardStateReducer(state = {}, action) {
         directPathLastUpdated: Date.now(),
       };
     },
-    [SET_LAST_FOCUSED_TAB]() {
+    [SET_ACTIVE_TABS]() {
       return {
         ...state,
-        lastFocusedTabId: action.tabId,
+        activeTabs: action.tabIds,
       };
     },
     [SET_FOCUSED_FILTER_FIELD]() {
@@ -165,6 +180,12 @@ export default function dashboardStateReducer(state = {}, action) {
         focusedFilterField: null,
       };
     },
+    [SET_FULL_SIZE_CHART_ID]() {
+      return {
+        ...state,
+        fullSizeChartId: action.chartId,
+      };
+    },
   };
 
   if (action.type in actionHandlers) {
diff --git a/superset-frontend/src/dashboard/reducers/datasources.ts b/superset-frontend/src/dashboard/reducers/datasources.ts
new file mode 100644
index 000000000000..864641645ed7
--- /dev/null
+++ b/superset-frontend/src/dashboard/reducers/datasources.ts
@@ -0,0 +1,43 @@
+/**
+ * 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 { keyBy } from 'lodash';
+import { DatasourcesState } from 'src/dashboard/types';
+import {
+  DatasourcesActionPayload,
+  DatasourcesAction,
+} from '../actions/datasources';
+
+export default function datasourcesReducer(
+  datasources: DatasourcesState | undefined,
+  action: DatasourcesActionPayload,
+) {
+  if (action.type === DatasourcesAction.SET_DATASOURCES) {
+    return {
+      ...datasources,
+      ...keyBy(action.datasources, 'uid'),
+    };
+  }
+  if (action.type === DatasourcesAction.SET_DATASOURCE) {
+    return {
+      ...datasources,
+      [action.key]: action.datasource,
+    };
+  }
+  return datasources || {};
+}
diff --git a/superset-frontend/src/dashboard/reducers/nativeFilters.ts b/superset-frontend/src/dashboard/reducers/nativeFilters.ts
index 8587328ca64c..1ed96a64c958 100644
--- a/superset-frontend/src/dashboard/reducers/nativeFilters.ts
+++ b/superset-frontend/src/dashboard/reducers/nativeFilters.ts
@@ -20,6 +20,7 @@ import {
   AnyFilterAction,
   SAVE_FILTER_SETS,
   SET_FILTER_CONFIG_COMPLETE,
+  SET_IN_SCOPE_STATUS_OF_FILTERS,
   SET_FILTER_SETS_CONFIG_COMPLETE,
   SET_FOCUSED_NATIVE_FILTER,
   UNSET_FOCUSED_NATIVE_FILTER,
@@ -92,6 +93,7 @@ export default function nativeFilterReducer(
       };
 
     case SET_FILTER_CONFIG_COMPLETE:
+    case SET_IN_SCOPE_STATUS_OF_FILTERS:
       return getInitialState({ filterConfig: action.filterConfig, state });
 
     case SET_FILTER_SETS_CONFIG_COMPLETE:
diff --git a/superset-frontend/src/dashboard/stylesheets/index.less b/superset-frontend/src/dashboard/stylesheets/index.less
index 2f882ebe719e..6dee17e77cce 100644
--- a/superset-frontend/src/dashboard/stylesheets/index.less
+++ b/superset-frontend/src/dashboard/stylesheets/index.less
@@ -20,7 +20,6 @@
 
 @import './builder.less';
 @import './builder-sidepane.less';
-@import './buttons.less';
 @import './dashboard.less';
 @import './dnd.less';
 @import './filter-scope-selector.less';
diff --git a/superset-frontend/src/dashboard/types.ts b/superset-frontend/src/dashboard/types.ts
index 9a15b1da7ef0..ae602aa7fd62 100644
--- a/superset-frontend/src/dashboard/types.ts
+++ b/superset-frontend/src/dashboard/types.ts
@@ -16,13 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ChartProps, ExtraFormData, JsonObject } from '@superset-ui/core';
+import {
+  ChartProps,
+  ExtraFormData,
+  GenericDataType,
+  JsonObject,
+} from '@superset-ui/core';
+import { DatasourceMeta } from '@superset-ui/chart-controls';
 import { chart } from 'src/chart/chartReducer';
 import componentTypes from 'src/dashboard/util/componentTypes';
+
 import { DataMaskStateWithId } from '../dataMask/types';
 import { NativeFiltersState } from './reducers/types';
 import { ChartState } from '../explore/types';
 
+export { Dashboard } from 'src/types/Dashboard';
+
 export type ChartReducerInitialState = typeof chart;
 
 // chart query built from initialState
@@ -38,15 +47,20 @@ export interface ChartQueryPayload extends Partial<ChartReducerInitialState> {
 export type Chart = ChartState & {
   formData: {
     viz_type: string;
+    datasource: string;
   };
 };
 
+export type ActiveTabs = string[];
 export type DashboardLayout = { [key: string]: LayoutItem };
 export type DashboardLayoutState = { present: DashboardLayout };
 export type DashboardState = {
+  preselectNativeFilters?: JsonObject;
   editMode: boolean;
   directPathToChild: string[];
-  lastFocusedTabId: string | null;
+  activeTabs: ActiveTabs;
+  fullSizeChartId: number | null;
+  isRefreshing: boolean;
 };
 export type DashboardInfo = {
   common: {
@@ -55,14 +69,26 @@ export type DashboardInfo = {
   };
   userId: string;
   dash_edit_perm: boolean;
-  metadata: { show_native_filters: boolean; chart_configuration: JsonObject };
+  metadata: {
+    show_native_filters: boolean;
+    chart_configuration: JsonObject;
+  };
 };
 
 export type ChartsState = { [key: string]: Chart };
 
+export type Datasource = DatasourceMeta & {
+  uid: string;
+  column_types: GenericDataType[];
+  table_name: string;
+};
+export type DatasourcesState = {
+  [key: string]: Datasource;
+};
+
 /** Root state of redux */
 export type RootState = {
-  datasources: JsonObject;
+  datasources: DatasourcesState;
   sliceEntities: JsonObject;
   charts: ChartsState;
   dashboardLayout: DashboardLayoutState;
@@ -91,8 +117,11 @@ export type LayoutItem = {
   id: string;
   meta: {
     chartId: number;
+    defaultText?: string;
     height: number;
+    placeholder?: string;
     sliceName?: string;
+    sliceNameOverride?: string;
     text?: string;
     uuid: string;
     width: number;
diff --git a/superset-frontend/src/dashboard/util/activeAllDashboardFilters.ts b/superset-frontend/src/dashboard/util/activeAllDashboardFilters.ts
index 2243c25d566e..7b9dc10a4a0e 100644
--- a/superset-frontend/src/dashboard/util/activeAllDashboardFilters.ts
+++ b/superset-frontend/src/dashboard/util/activeAllDashboardFilters.ts
@@ -104,7 +104,7 @@ export const getAllActiveFilters = ({
       };
     // Iterate over all roots to find all affected charts
     scope.rootPath.forEach((layoutItemId: string | number) => {
-      layout[layoutItemId].children.forEach((child: string) => {
+      layout[layoutItemId]?.children?.forEach((child: string) => {
         // Need exclude from affected charts, charts that located in scope `excluded`
         findAffectedCharts({
           child,
diff --git a/superset-frontend/src/dashboard/util/activeDashboardFilters.js b/superset-frontend/src/dashboard/util/activeDashboardFilters.js
index 30bdc2540aa4..96db2c312941 100644
--- a/superset-frontend/src/dashboard/util/activeDashboardFilters.js
+++ b/superset-frontend/src/dashboard/util/activeDashboardFilters.js
@@ -33,7 +33,9 @@ let allComponents = {};
 
 // output: { [id_column]: { values, scope } }
 export function getActiveFilters() {
-  return activeFilters;
+  return {
+    ...activeFilters,
+  };
 }
 
 // currently filter_box is a chart,
diff --git a/superset-frontend/src/dashboard/util/constants.ts b/superset-frontend/src/dashboard/util/constants.ts
index 917ea36c9754..6fd6247def85 100644
--- a/superset-frontend/src/dashboard/util/constants.ts
+++ b/superset-frontend/src/dashboard/util/constants.ts
@@ -73,4 +73,5 @@ export const ALL_FILTERS_ROOT = 'ALL_FILTERS_ROOT';
 export enum DashboardStandaloneMode {
   HIDE_NAV = 1,
   HIDE_NAV_AND_TITLE = 2,
+  REPORT = 3,
 }
diff --git a/superset-frontend/src/dashboard/util/getDashboardUrl.ts b/superset-frontend/src/dashboard/util/getDashboardUrl.ts
index 7eb817a0957a..c3cc696c23f3 100644
--- a/superset-frontend/src/dashboard/util/getDashboardUrl.ts
+++ b/superset-frontend/src/dashboard/util/getDashboardUrl.ts
@@ -16,15 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import rison from 'rison';
+import { JsonObject } from '@superset-ui/core';
 import { URL_PARAMS } from 'src/constants';
+import replaceUndefinedByNull from './replaceUndefinedByNull';
 import serializeActiveFilterValues from './serializeActiveFilterValues';
+import { DataMaskState } from '../../dataMask/types';
 
-export default function getDashboardUrl(
-  pathname: string,
+export default function getDashboardUrl({
+  pathname,
   filters = {},
   hash = '',
-  standalone?: number | null,
-) {
+  standalone,
+  dataMask,
+}: {
+  pathname: string;
+  filters: JsonObject;
+  hash: string;
+  standalone?: number | null;
+  dataMask?: DataMaskState;
+}) {
   const newSearchParams = new URLSearchParams();
 
   // convert flattened { [id_column]: values } object
@@ -38,7 +49,13 @@ export default function getDashboardUrl(
     newSearchParams.set(URL_PARAMS.standalone.name, standalone.toString());
   }
 
-  const hashSection = hash ? `#${hash}` : '';
+  if (dataMask) {
+    newSearchParams.set(
+      URL_PARAMS.nativeFilters.name,
+      rison.encode(replaceUndefinedByNull(dataMask)),
+    );
+  }
 
+  const hashSection = hash ? `#${hash}` : '';
   return `${pathname}?${newSearchParams.toString()}${hashSection}`;
 }
diff --git a/superset-frontend/src/dashboard/util/injectCustomCss.ts b/superset-frontend/src/dashboard/util/injectCustomCss.ts
index b7db2b03d020..a68650372521 100644
--- a/superset-frontend/src/dashboard/util/injectCustomCss.ts
+++ b/superset-frontend/src/dashboard/util/injectCustomCss.ts
@@ -40,7 +40,7 @@ export default function injectCustomCss(css: string) {
     document.querySelector(`.${className}`) || createStyleElement(className);
 
   if ('styleSheet' in style) {
-    (style as MysteryStyleElement).styleSheet.cssText = css;
+    ((style as unknown) as MysteryStyleElement).styleSheet.cssText = css;
   } else {
     style.innerHTML = css;
   }
diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.less b/superset-frontend/src/dashboard/util/replaceUndefinedByNull.ts
similarity index 58%
rename from superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.less
rename to superset-frontend/src/dashboard/util/replaceUndefinedByNull.ts
index e9faf8bcd3d2..bcf5004b3eea 100644
--- a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.less
+++ b/superset-frontend/src/dashboard/util/replaceUndefinedByNull.ts
@@ -16,39 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-@import '../../../../../stylesheets/less/variables.less';
+import { cloneDeep } from 'lodash';
 
-.viztype-label {
-  margin-top: 10px;
-  text-align: center;
-  font-size: @font-size-m;
-}
-
-.viztype-selector-container {
-  cursor: pointer;
-  margin-top: 10px;
-  margin-bottom: 10px;
-
-  &:hover img {
-    border: 1px solid @gray-heading;
-  }
-
-  &.selected {
-    cursor: not-allowed;
-    opacity: 1;
-
-    img {
-      border: 1px solid @almost-black;
+function processObject(object: Object) {
+  const result = object;
+  Object.keys(result).forEach(key => {
+    if (result[key] === undefined) {
+      result[key] = null;
+    } else if (result[key] !== null && typeof result[key] === 'object') {
+      result[key] = processObject(result[key]);
     }
-  }
-
-  img {
-    border: 1px solid @gray-light;
-    border-radius: @border-radius-large;
-    transition: border-color @timing-normal;
-  }
+  });
+  return result;
 }
 
-.viztype-control-search-box {
-  margin-bottom: 10px;
+export default function replaceUndefinedByNull(object: Object) {
+  const copy = cloneDeep(object);
+  return processObject(copy);
 }
diff --git a/superset-frontend/src/dashboard/util/resizableConfig.ts b/superset-frontend/src/dashboard/util/resizableConfig.ts
index 50bca08f15d7..e6d24b4d0c90 100644
--- a/superset-frontend/src/dashboard/util/resizableConfig.ts
+++ b/superset-frontend/src/dashboard/util/resizableConfig.ts
@@ -19,8 +19,8 @@
 // config for a ResizableContainer
 const adjustableWidthAndHeight = {
   top: false,
-  right: false,
-  bottom: false,
+  right: true,
+  bottom: true,
   left: false,
   topRight: false,
   bottomRight: true,
@@ -30,19 +30,21 @@ const adjustableWidthAndHeight = {
 
 const adjustableWidth = {
   ...adjustableWidthAndHeight,
-  right: true,
   bottomRight: false,
+  bottom: false,
 };
 
 const adjustableHeight = {
   ...adjustableWidthAndHeight,
-  bottom: true,
   bottomRight: false,
+  right: false,
 };
 
 const notAdjustable = {
   ...adjustableWidthAndHeight,
   bottomRight: false,
+  bottom: false,
+  right: false,
 };
 
 export default {
diff --git a/superset-frontend/src/dashboard/util/setPeriodicRunner.ts b/superset-frontend/src/dashboard/util/setPeriodicRunner.ts
index e0207e860598..c5177edf7187 100644
--- a/superset-frontend/src/dashboard/util/setPeriodicRunner.ts
+++ b/superset-frontend/src/dashboard/util/setPeriodicRunner.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-const stopPeriodicRender = (refreshTimer?: number) => {
+export const stopPeriodicRender = (refreshTimer?: number) => {
   if (refreshTimer) {
     clearInterval(refreshTimer);
   }
diff --git a/superset-frontend/src/dataMask/actions.ts b/superset-frontend/src/dataMask/actions.ts
index 76a286c83348..1b7428ff7eaf 100644
--- a/superset-frontend/src/dataMask/actions.ts
+++ b/superset-frontend/src/dataMask/actions.ts
@@ -20,11 +20,12 @@ import { DataMask } from '@superset-ui/core';
 import { FilterConfiguration } from '../dashboard/components/nativeFilters/types';
 import { FeatureFlag, isFeatureEnabled } from '../featureFlags';
 import { Filters } from '../dashboard/reducers/types';
+import { getInitialDataMask } from './reducer';
 
 export const UPDATE_DATA_MASK = 'UPDATE_DATA_MASK';
 export interface UpdateDataMask {
   type: typeof UPDATE_DATA_MASK;
-  filterId: string;
+  filterId: string | number;
   dataMask: DataMask;
 }
 
@@ -55,7 +56,7 @@ export function setDataMaskForFilterConfigComplete(
   };
 }
 export function updateDataMask(
-  filterId: string,
+  filterId: string | number,
   dataMask: DataMask,
 ): UpdateDataMask {
   // Only apply data mask if one of the relevant features is enabled
@@ -69,6 +70,17 @@ export function updateDataMask(
   };
 }
 
+export function clearDataMask(filterId: string | number) {
+  return updateDataMask(
+    filterId,
+    getInitialDataMask(filterId, {
+      filterState: {
+        value: null,
+      },
+    }),
+  );
+}
+
 export type AnyDataMaskAction =
   | UpdateDataMask
   | SetDataMaskForFilterConfigFail
diff --git a/superset-frontend/src/dataMask/reducer.ts b/superset-frontend/src/dataMask/reducer.ts
index 275787e0dba1..f5fd883393a9 100644
--- a/superset-frontend/src/dataMask/reducer.ts
+++ b/superset-frontend/src/dataMask/reducer.ts
@@ -24,6 +24,8 @@ import { DataMask, FeatureFlag } from '@superset-ui/core';
 import { NATIVE_FILTER_PREFIX } from 'src/dashboard/components/nativeFilters/FiltersConfigModal/utils';
 import { HYDRATE_DASHBOARD } from 'src/dashboard/actions/hydrate';
 import { isFeatureEnabled } from 'src/featureFlags';
+import { getUrlParam } from 'src/utils/urlUtils';
+import { URL_PARAMS } from 'src/constants';
 import { DataMaskStateWithId, DataMaskWithId } from './types';
 import {
   AnyDataMaskAction,
@@ -37,8 +39,14 @@ import {
 import { areObjectsEqual } from '../reduxUtils';
 import { Filters } from '../dashboard/reducers/types';
 
-export function getInitialDataMask(id?: string): DataMask;
-export function getInitialDataMask(id: string): DataMaskWithId {
+export function getInitialDataMask(
+  id?: string | number,
+  moreProps?: DataMask,
+): DataMask;
+export function getInitialDataMask(
+  id: string | number,
+  moreProps: DataMask = {},
+): DataMaskWithId {
   let otherProps = {};
   if (id) {
     otherProps = {
@@ -52,6 +60,7 @@ export function getInitialDataMask(id: string): DataMaskWithId {
       value: undefined,
     },
     ownState: {},
+    ...moreProps,
   } as DataMaskWithId;
 }
 
@@ -61,13 +70,13 @@ function fillNativeFilters(
   draftDataMask: DataMaskStateWithId,
   currentFilters?: Filters,
 ) {
+  const dataMaskFromUrl = getUrlParam(URL_PARAMS.nativeFilters) || {};
   filterConfig.forEach((filter: Filter) => {
     mergedDataMask[filter.id] = {
       ...getInitialDataMask(filter.id), // take initial data
       ...filter.defaultDataMask, // if something new came from BE - take it
-      ...draftDataMask[filter.id], // keep local filter data
+      ...dataMaskFromUrl[filter.id],
     };
-    // if we came from filters config modal and particular filters changed take it's dataMask
     if (
       currentFilters &&
       !areObjectsEqual(
diff --git a/superset-frontend/src/datasource/ChangeDatasourceModal.tsx b/superset-frontend/src/datasource/ChangeDatasourceModal.tsx
index 78dd1c2afbe4..2980d4019c6e 100644
--- a/superset-frontend/src/datasource/ChangeDatasourceModal.tsx
+++ b/superset-frontend/src/datasource/ChangeDatasourceModal.tsx
@@ -26,15 +26,22 @@ import React, {
 import Alert from 'src/components/Alert';
 import { SupersetClient, t, styled } from '@superset-ui/core';
 import TableView, { EmptyWrapperType } from 'src/components/TableView';
+import { ServerPagination, SortByType } from 'src/components/TableView/types';
 import StyledModal from 'src/components/Modal';
 import Button from 'src/components/Button';
 import { useListViewResource } from 'src/views/CRUD/hooks';
 import Dataset from 'src/types/Dataset';
 import { useDebouncedEffect } from 'src/explore/exploreUtils';
+import { SLOW_DEBOUNCE } from 'src/constants';
 import { getClientErrorObject } from 'src/utils/getClientErrorObject';
 import Loading from 'src/components/Loading';
 import withToasts from 'src/messageToasts/enhancers/withToasts';
 import { Input, AntdInput } from 'src/common/components';
+import {
+  PAGE_SIZE as DATASET_PAGE_SIZE,
+  SORT_BY as DATASET_SORT_BY,
+} from 'src/views/CRUD/data/dataset/constants';
+import FacePile from '../components/FacePile';
 
 const CONFIRM_WARNING_MESSAGE = t(
   'Warning! Changing the dataset may break the chart if the metadata does not exist.',
@@ -60,6 +67,13 @@ interface ChangeDatasourceModalProps {
   show: boolean;
 }
 
+const Modal = styled(StyledModal)`
+  .ant-modal-body {
+    display: flex;
+    flex-direction: column;
+  }
+`;
+
 const ConfirmModalStyled = styled.div`
   .btn-container {
     display: flex;
@@ -81,21 +95,6 @@ const StyledSpan = styled.span`
   }
 `;
 
-const TABLE_COLUMNS = [
-  'name',
-  'type',
-  'schema',
-  'connection',
-  'creator',
-].map(col => ({ accessor: col, Header: col }));
-
-const emptyRequest = {
-  pageIndex: 0,
-  pageSize: 20,
-  filters: [],
-  sortBy: [{ id: 'changed_on_delta_humanized' }],
-};
-
 const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
   addDangerToast,
   addSuccessToast,
@@ -105,12 +104,14 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
   show,
 }) => {
   const [filter, setFilter] = useState<any>(undefined);
+  const [pageIndex, setPageIndex] = useState<number>(0);
+  const [sortBy, setSortBy] = useState<SortByType>(DATASET_SORT_BY);
   const [confirmChange, setConfirmChange] = useState(false);
   const [confirmedDataset, setConfirmedDataset] = useState<Datasource>();
   const searchRef = useRef<AntdInput>(null);
 
   const {
-    state: { loading, resourceCollection },
+    state: { loading, resourceCollection, resourceCount },
     fetchData,
   } = useListViewResource<Dataset>('dataset', t('dataset'), addDangerToast);
 
@@ -119,10 +120,17 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
     setConfirmedDataset(datasource);
   }, []);
 
+  const fetchDatasetPayload = {
+    pageIndex,
+    pageSize: DATASET_PAGE_SIZE,
+    filters: [],
+    sortBy,
+  };
+
   useDebouncedEffect(
     () => {
       fetchData({
-        ...emptyRequest,
+        ...fetchDatasetPayload,
         ...(filter && {
           filters: [
             {
@@ -134,8 +142,8 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
         }),
       });
     },
-    300,
-    [filter],
+    SLOW_DEBOUNCE,
+    [filter, pageIndex, sortBy],
   );
 
   useEffect(() => {
@@ -159,6 +167,7 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
   const changeSearch = (event: React.ChangeEvent<HTMLInputElement>) => {
     const searchValue = event.target.value ?? '';
     setFilter(searchValue);
+    setPageIndex(0);
   };
 
   const handleChangeConfirm = () => {
@@ -187,35 +196,63 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
     setConfirmChange(false);
   };
 
-  const renderTableView = () => {
-    const data = resourceCollection.map((ds: any) => ({
-      rawName: ds.table_name,
-      connection: ds.database.database_name,
-      schema: ds.schema,
-      name: (
+  const columns = [
+    {
+      Cell: ({ row: { original } }: any) => (
         <StyledSpan
           role="button"
           tabIndex={0}
           data-test="datasource-link"
-          onClick={() => selectDatasource({ type: 'table', ...ds })}
+          onClick={() => selectDatasource({ type: 'table', ...original })}
         >
-          {ds.table_name}
+          {original?.table_name}
         </StyledSpan>
       ),
-      type: ds.kind,
-    }));
+      Header: t('Name'),
+      accessor: 'table_name',
+    },
+    {
+      Header: t('Type'),
+      accessor: 'kind',
+      disableSortBy: true,
+    },
+    {
+      Header: t('Schema'),
+      accessor: 'schema',
+    },
+    {
+      Header: t('Connection'),
+      accessor: 'database.database_name',
+      disableSortBy: true,
+    },
+    {
+      Cell: ({
+        row: {
+          original: { owners = [] },
+        },
+      }: any) => <FacePile users={owners} />,
+      Header: t('Owners'),
+      id: 'owners',
+      disableSortBy: true,
+    },
+  ];
 
-    return data;
+  const onServerPagination = (args: ServerPagination) => {
+    setPageIndex(args.pageIndex);
+    if (args.sortBy) {
+      // ensure default sort by
+      setSortBy(args.sortBy.length > 0 ? args.sortBy : DATASET_SORT_BY);
+    }
   };
 
   return (
-    <StyledModal
+    <Modal
       show={show}
       onHide={onHide}
       responsive
       title={t('Change dataset')}
       width={confirmChange ? '432px' : ''}
-      height={confirmChange ? 'auto' : '480px'}
+      height={confirmChange ? 'auto' : '540px'}
       hideFooter={!confirmChange}
       footer={
         <>
@@ -259,11 +296,17 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
             {loading && <Loading />}
             {!loading && (
               <TableView
-                columns={TABLE_COLUMNS}
-                data={renderTableView()}
-                pageSize={20}
+                columns={columns}
+                data={resourceCollection}
+                pageSize={DATASET_PAGE_SIZE}
+                initialPageIndex={pageIndex}
+                initialSortBy={sortBy}
+                totalCount={resourceCount}
+                onServerPagination={onServerPagination}
                 className="table-condensed"
                 emptyWrapperType={EmptyWrapperType.Small}
+                serverPagination
+                isPaginationSticky
                 scrollTable
               />
             )}
@@ -271,7 +314,7 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
         )}
         {confirmChange && <>{CONFIRM_WARNING_MESSAGE}</>}
       </>
-    </StyledModal>
+    </Modal>
   );
 };
 
diff --git a/superset-frontend/src/datasource/DatasourceEditor.jsx b/superset-frontend/src/datasource/DatasourceEditor.jsx
index 3fb02364398c..d8a0a3425f24 100644
--- a/superset-frontend/src/datasource/DatasourceEditor.jsx
+++ b/superset-frontend/src/datasource/DatasourceEditor.jsx
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import rison from 'rison';
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Row, Col } from 'src/common/components';
@@ -30,7 +31,6 @@ import Tabs from 'src/components/Tabs';
 import CertifiedIcon from 'src/components/CertifiedIcon';
 import WarningIconWithTooltip from 'src/components/WarningIconWithTooltip';
 import DatabaseSelector from 'src/components/DatabaseSelector';
-import Icon from 'src/components/Icon';
 import Label from 'src/components/Label';
 import Loading from 'src/components/Loading';
 import TableSelector from 'src/components/TableSelector';
@@ -51,6 +51,7 @@ import Field from 'src/CRUD/Field';
 
 import withToasts from 'src/messageToasts/enhancers/withToasts';
 import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags';
+import Icons from 'src/components/Icons';
 
 const DatasourceContainer = styled.div`
   .change-warning {
@@ -75,7 +76,7 @@ const FlexRowContainer = styled.div`
   align-items: center;
   display: flex;
 
-  > svg {
+  svg {
     margin-right: ${({ theme }) => theme.gridUnit}px;
   }
 `;
@@ -87,6 +88,14 @@ const StyledTableTabs = styled(Tabs)`
   }
 `;
 
+const StyledBadge = styled(Badge)`
+  .ant-badge-count {
+    line-height: ${({ theme }) => theme.gridUnit * 4}px;
+    height: ${({ theme }) => theme.gridUnit * 4}px;
+    margin-left: ${({ theme }) => theme.gridUnit}px;
+  }
+`;
+
 const EditLockContainer = styled.div`
   font-size: ${supersetTheme.typography.sizes.s}px;
   display: flex;
@@ -104,7 +113,7 @@ const ColumnButtonWrapper = styled.div`
 const checkboxGenerator = (d, onChange) => (
   <CheckboxControl value={d} onChange={onChange} />
 );
-const DATA_TYPES = ['STRING', 'NUMERIC', 'DATETIME'];
+const DATA_TYPES = ['STRING', 'NUMERIC', 'DATETIME', 'BOOLEAN'];
 
 const DATASOURCE_TYPES_ARR = [
   { key: 'physical', label: t('Physical (table or view)') },
@@ -117,8 +126,12 @@ DATASOURCE_TYPES_ARR.forEach(o => {
 
 function CollectionTabTitle({ title, collection }) {
   return (
-    <div data-test={`collection-tab-${title}`}>
-      {title} <Badge count={collection ? collection.length : 0} showZero />
+    <div
+      css={{ display: 'flex', alignItems: 'center' }}
+      data-test={`collection-tab-${title}`}
+    >
+      {title}{' '}
+      <StyledBadge count={collection ? collection.length : 0} showZero />
     </div>
   );
 }
@@ -141,6 +154,7 @@ function ColumnCollectionTable({
     <CollectionTable
       collection={columns}
       tableColumns={['column_name', 'type', 'is_dttm', 'filterable', 'groupby']}
+      sortColumns={['column_name', 'type', 'is_dttm', 'filterable', 'groupby']}
       allowDeletes
       allowAddItem={allowAddItem}
       itemGenerator={itemGenerator}
@@ -307,7 +321,25 @@ class DatasourceEditor extends React.PureComponent {
   constructor(props) {
     super(props);
     this.state = {
-      datasource: props.datasource,
+      datasource: {
+        ...props.datasource,
+        metrics: props.datasource.metrics?.map(metric => {
+          const {
+            certified_by: certifiedByMetric,
+            certification_details: certificationDetails,
+          } = metric;
+          const {
+            certification: { details, certified_by: certifiedBy } = {},
+            warning_markdown: warningMarkdown,
+          } = JSON.parse(metric.extra || '{}') || {};
+          return {
+            ...metric,
+            certification_details: certificationDetails || details,
+            warning_markdown: warningMarkdown || '',
+            certified_by: certifiedBy || certifiedByMetric,
+          };
+        }),
+      },
       errors: [],
       isDruid:
         props.datasource.type === 'druid' ||
@@ -331,6 +363,9 @@ class DatasourceEditor extends React.PureComponent {
     this.onChangeEditMode = this.onChangeEditMode.bind(this);
     this.onDatasourcePropChange = this.onDatasourcePropChange.bind(this);
     this.onDatasourceChange = this.onDatasourceChange.bind(this);
+    this.tableChangeAndSyncMetadata = this.tableChangeAndSyncMetadata.bind(
+      this,
+    );
     this.syncMetadata = this.syncMetadata.bind(this);
     this.setColumns = this.setColumns.bind(this);
     this.validateAndChange = this.validateAndChange.bind(this);
@@ -360,8 +395,8 @@ class DatasourceEditor extends React.PureComponent {
     this.setState(prevState => ({ isEditMode: !prevState.isEditMode }));
   }
 
-  onDatasourceChange(datasource) {
-    this.setState({ datasource }, this.validateAndChange);
+  onDatasourceChange(datasource, callback = this.validateAndChange) {
+    this.setState({ datasource }, callback);
   }
 
   onDatasourcePropChange(attr, value) {
@@ -370,7 +405,9 @@ class DatasourceEditor extends React.PureComponent {
       prevState => ({
         datasource: { ...prevState.datasource, [attr]: value },
       }),
-      this.onDatasourceChange(datasource),
+      attr === 'table_name'
+        ? this.onDatasourceChange(datasource, this.tableChangeAndSyncMetadata)
+        : this.onDatasourceChange(datasource, this.validateAndChange),
     );
   }
 
@@ -387,6 +424,13 @@ class DatasourceEditor extends React.PureComponent {
     this.validate(this.onChange);
   }
 
+  tableChangeAndSyncMetadata() {
+    this.validate(() => {
+      this.syncMetadata();
+      this.onChange();
+    });
+  }
+
   updateColumns(cols) {
     const { databaseColumns } = this.state;
     const databaseColumnNames = cols.map(col => col.name);
@@ -446,9 +490,22 @@ class DatasourceEditor extends React.PureComponent {
 
   syncMetadata() {
     const { datasource } = this.state;
-    const endpoint = `/datasource/external_metadata/${
-      datasource.type || datasource.datasource_type
-    }/${datasource.id}/`;
+    const params = {
+      datasource_type: datasource.type || datasource.datasource_type,
+      database_name:
+        datasource.database.database_name || datasource.database.name,
+      schema_name: datasource.schema,
+      table_name: datasource.table_name,
+    };
+    Object.entries(params).forEach(([key, value]) => {
+      // rison can't encode the undefined value
+      if (value === undefined) {
+        params[key] = null;
+      }
+    });
+    const endpoint = `/datasource/external_metadata_by_name/?q=${rison.encode(
+      params,
+    )}`;
     this.setState({ metadataLoading: true });
 
     SupersetClient.get({ endpoint })
@@ -530,6 +587,10 @@ class DatasourceEditor extends React.PureComponent {
     this.setState({ activeTabKey });
   }
 
+  sortMetrics(metrics) {
+    return metrics.sort(({ id: a }, { id: b }) => b - a);
+  }
+
   renderSettingsFieldset() {
     const { datasource } = this.state;
     return (
@@ -571,7 +632,13 @@ class DatasourceEditor extends React.PureComponent {
                 'values from the table. Typically the intent would be to limit the scan ' +
                 'by applying a relative time filter on a partitioned or indexed time-related field.',
             )}
-            control={<TextControl controlId="fetch_values_predicate" />}
+            control={
+              <TextAreaControl
+                language="sql"
+                controlId="fetch_values_predicate"
+                minLines={5}
+              />
+            }
           />
         )}
         {this.state.isSqla && (
@@ -708,41 +775,47 @@ class DatasourceEditor extends React.PureComponent {
             <div>
               {this.state.isSqla && (
                 <>
-                  <Field
-                    fieldKey="databaseSelector"
-                    label={t('virtual')}
-                    control={
-                      <DatabaseSelector
-                        dbId={datasource.database.id}
-                        schema={datasource.schema}
-                        onSchemaChange={schema =>
-                          this.state.isEditMode &&
-                          this.onDatasourcePropChange('schema', schema)
-                        }
-                        onDbChange={database =>
-                          this.state.isEditMode &&
-                          this.onDatasourcePropChange('database', database)
+                  <Col xs={24} md={12}>
+                    <Field
+                      fieldKey="databaseSelector"
+                      label={t('virtual')}
+                      control={
+                        <div css={{ marginTop: 8 }}>
+                          <DatabaseSelector
+                            db={datasource?.database}
+                            schema={datasource.schema}
+                            onSchemaChange={schema =>
+                              this.state.isEditMode &&
+                              this.onDatasourcePropChange('schema', schema)
+                            }
+                            onDbChange={database =>
+                              this.state.isEditMode &&
+                              this.onDatasourcePropChange('database', database)
+                            }
+                            formMode={false}
+                            handleError={this.props.addDangerToast}
+                            readOnly={!this.state.isEditMode}
+                          />
+                        </div>
+                      }
+                    />
+                    <div css={{ width: 'calc(100% - 34px)', marginTop: -16 }}>
+                      <Field
+                        fieldKey="table_name"
+                        label={t('Dataset name')}
+                        control={
+                          <TextControl
+                            controlId="table_name"
+                            onChange={table => {
+                              this.onDatasourcePropChange('table_name', table);
+                            }}
+                            placeholder={t('Dataset name')}
+                            disabled={!this.state.isEditMode}
+                          />
                         }
-                        formMode={false}
-                        handleError={this.props.addDangerToast}
-                        readOnly={!this.state.isEditMode}
                       />
-                    }
-                  />
-                  <Field
-                    fieldKey="table_name"
-                    label={t('Dataset name')}
-                    control={
-                      <TextControl
-                        controlId="table_name"
-                        onChange={table => {
-                          this.onDatasourcePropChange('table_name', table);
-                        }}
-                        placeholder={t('Dataset name')}
-                        disabled={!this.state.isEditMode}
-                      />
-                    }
-                  />
+                    </div>
+                  </Col>
                   <Field
                     fieldKey="sql"
                     label={t('SQL')}
@@ -786,33 +859,39 @@ class DatasourceEditor extends React.PureComponent {
                   fieldKey="tableSelector"
                   label={t('Physical')}
                   control={
-                    <TableSelector
-                      clearable={false}
-                      dbId={datasource.database.id}
-                      handleError={this.props.addDangerToast}
-                      schema={datasource.schema}
-                      sqlLabMode={false}
-                      tableName={datasource.table_name}
-                      onSchemaChange={
-                        this.state.isEditMode
-                          ? schema =>
-                              this.onDatasourcePropChange('schema', schema)
-                          : undefined
-                      }
-                      onDbChange={
-                        this.state.isEditMode
-                          ? database =>
-                              this.onDatasourcePropChange('database', database)
-                          : undefined
-                      }
-                      onTableChange={
-                        this.state.isEditMode
-                          ? table =>
-                              this.onDatasourcePropChange('table_name', table)
-                          : undefined
-                      }
-                      readOnly={!this.state.isEditMode}
-                    />
+                    <div css={{ marginTop: 8 }}>
+                      <TableSelector
+                        clearable={false}
+                        database={datasource.database}
+                        dbId={datasource.database.id}
+                        handleError={this.props.addDangerToast}
+                        schema={datasource.schema}
+                        sqlLabMode={false}
+                        tableName={datasource.table_name}
+                        onSchemaChange={
+                          this.state.isEditMode
+                            ? schema =>
+                                this.onDatasourcePropChange('schema', schema)
+                            : undefined
+                        }
+                        onDbChange={
+                          this.state.isEditMode
+                            ? database =>
+                                this.onDatasourcePropChange(
+                                  'database',
+                                  database,
+                                )
+                            : undefined
+                        }
+                        onTableChange={
+                          this.state.isEditMode
+                            ? table =>
+                                this.onDatasourcePropChange('table_name', table)
+                            : undefined
+                        }
+                        readOnly={!this.state.isEditMode}
+                      />
+                    </div>
                   }
                   description={t(
                     'The pointer to a physical table (or view). Keep in mind that the chart is ' +
@@ -827,10 +906,15 @@ class DatasourceEditor extends React.PureComponent {
         {this.allowEditSource && (
           <EditLockContainer>
             <span role="button" tabIndex={0} onClick={this.onChangeEditMode}>
-              <Icon
-                color={supersetTheme.colors.grayscale.base}
-                name={this.state.isEditMode ? 'lock-unlocked' : 'lock-locked'}
-              />
+              {this.state.isEditMode ? (
+                <Icons.LockUnlocked
+                  iconColor={supersetTheme.colors.grayscale.base}
+                />
+              ) : (
+                <Icons.LockLocked
+                  iconColor={supersetTheme.colors.grayscale.base}
+                />
+              )}
             </span>
             {!this.state.isEditMode && (
               <div>{t('Click the lock to make changes.')}</div>
@@ -864,9 +948,13 @@ class DatasourceEditor extends React.PureComponent {
   }
 
   renderMetricCollection() {
+    const { datasource } = this.state;
+    const { metrics } = datasource;
+    const sortedMetrics = metrics?.length ? this.sortMetrics(metrics) : [];
     return (
       <CollectionTable
         tableColumns={['metric_name', 'verbose_name', 'expression']}
+        sortColumns={['metric_name', 'verbose_name', 'expression']}
         columnLabels={{
           metric_name: t('Metric'),
           verbose_name: t('Label'),
@@ -936,18 +1024,7 @@ class DatasourceEditor extends React.PureComponent {
             </Fieldset>
           </FormContainer>
         }
-        collection={this.state.datasource.metrics?.map(metric => {
-          const {
-            certification: { details, certified_by: certifiedBy } = {},
-            warning_markdown: warningMarkdown,
-          } = JSON.parse(metric.extra || '{}') || {};
-          return {
-            ...metric,
-            certification_details: details || '',
-            warning_markdown: warningMarkdown || '',
-            certified_by: certifiedBy,
-          };
-        })}
+        collection={sortedMetrics}
         allowAddItem
         onChange={this.onDatasourcePropChange.bind(this, 'metrics')}
         itemGenerator={() => ({
@@ -1005,6 +1082,9 @@ class DatasourceEditor extends React.PureComponent {
 
   render() {
     const { datasource, activeTabKey } = this.state;
+    const { metrics } = datasource;
+    const sortedMetrics = metrics?.length ? this.sortMetrics(metrics) : [];
+
     return (
       <DatasourceContainer>
         {this.renderErrors()}
@@ -1034,7 +1114,7 @@ class DatasourceEditor extends React.PureComponent {
           <Tabs.TabPane
             tab={
               <CollectionTabTitle
-                collection={datasource.metrics}
+                collection={sortedMetrics}
                 title={t('Metrics')}
               />
             }
@@ -1056,9 +1136,10 @@ class DatasourceEditor extends React.PureComponent {
                 <span className="m-t-10 m-r-10">
                   <Button
                     buttonSize="small"
-                    buttonStyle="primary"
+                    buttonStyle="tertiary"
                     onClick={this.syncMetadata}
                     className="sync-from-source"
+                    disabled={this.state.isEditMode}
                   >
                     <i className="fa fa-database" />{' '}
                     {t('Sync columns from source')}
diff --git a/superset-frontend/src/explore/actions/exploreActions.ts b/superset-frontend/src/explore/actions/exploreActions.ts
index 7ebfc45e4263..c4faf793b115 100644
--- a/superset-frontend/src/explore/actions/exploreActions.ts
+++ b/superset-frontend/src/explore/actions/exploreActions.ts
@@ -70,7 +70,7 @@ export const FETCH_FAVE_STAR = 'FETCH_FAVE_STAR';
 export function fetchFaveStar(sliceId: string) {
   return function (dispatch: Dispatch) {
     SupersetClient.get({
-      endpoint: `${FAVESTAR_BASE_URL}/${sliceId}/count`,
+      endpoint: `${FAVESTAR_BASE_URL}/${sliceId}/count/`,
     }).then(({ json }) => {
       if (json.count > 0) {
         dispatch(toggleFaveStar(true));
diff --git a/superset-frontend/src/explore/actions/saveModalActions.js b/superset-frontend/src/explore/actions/saveModalActions.js
index ef4c9f8cbcaf..6e87fe52b5f1 100644
--- a/superset-frontend/src/explore/actions/saveModalActions.js
+++ b/superset-frontend/src/explore/actions/saveModalActions.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { SupersetClient } from '@superset-ui/core';
-import { getExploreUrl } from '../exploreUtils';
+import { buildV1ChartDataPayload, getExploreUrl } from '../exploreUtils';
 
 export const FETCH_DASHBOARDS_SUCCEEDED = 'FETCH_DASHBOARDS_SUCCEEDED';
 export function fetchDashboardsSucceeded(choices) {
@@ -70,7 +70,19 @@ export function saveSlice(formData, requestParams) {
       requestParams,
     });
 
-    return SupersetClient.post({ url, postPayload: { form_data: formData } })
+    // Save the query context so we can re-generate the data from Python
+    // for alerts and reports
+    const queryContext = buildV1ChartDataPayload({
+      formData,
+      force: false,
+      resultFormat: 'json',
+      resultType: 'full',
+    });
+
+    return SupersetClient.post({
+      url,
+      postPayload: { form_data: formData, query_context: queryContext },
+    })
       .then(response => {
         dispatch(saveSliceSuccess(response.json));
         return response.json;
diff --git a/superset-frontend/src/explore/components/Control.tsx b/superset-frontend/src/explore/components/Control.tsx
index eb53337dce4b..04c1267974cd 100644
--- a/superset-frontend/src/explore/components/Control.tsx
+++ b/superset-frontend/src/explore/components/Control.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { ReactNode } from 'react';
+import React, { ReactNode, useCallback, useState } from 'react';
 import { ControlType } from '@superset-ui/chart-controls';
 import { JsonValue, QueryFormData } from '@superset-ui/core';
 import ErrorBoundary from 'src/components/ErrorBoundary';
@@ -43,53 +43,38 @@ export type ControlProps = {
   renderTrigger?: boolean;
 };
 
-export default class Control extends React.PureComponent<
-  ControlProps,
-  { hovered: boolean }
-> {
-  onMouseEnter: () => void;
+export default function Control(props: ControlProps) {
+  const {
+    actions: { setControlValue },
+    name,
+    type,
+    hidden,
+  } = props;
 
-  onMouseLeave: () => void;
+  const [hovered, setHovered] = useState(false);
+  const onChange = useCallback(
+    (value: any, errors: any[]) => setControlValue(name, value, errors),
+    [name, setControlValue],
+  );
 
-  constructor(props: ControlProps) {
-    super(props);
-    this.state = { hovered: false };
-    this.onChange = this.onChange.bind(this);
-    this.onMouseEnter = this.setHover.bind(this, true);
-    this.onMouseLeave = this.setHover.bind(this, false);
-  }
-
-  onChange(value: any, errors: any[]) {
-    this.props.actions.setControlValue(this.props.name, value, errors);
-  }
+  if (!type) return null;
 
-  setHover(hovered: boolean) {
-    this.setState({ hovered });
+  const ControlComponent = typeof type === 'string' ? controlMap[type] : type;
+  if (!ControlComponent) {
+    return <>Unknown controlType: {type}</>;
   }
 
-  render() {
-    const { type, hidden } = this.props;
-    if (!type) return null;
-    const ControlComponent = typeof type === 'string' ? controlMap[type] : type;
-    if (!ControlComponent) {
-      return `Unknown controlType: ${type}`;
-    }
-    return (
-      <div
-        className="Control"
-        data-test={this.props.name}
-        style={hidden ? { display: 'none' } : undefined}
-        onMouseEnter={this.onMouseEnter}
-        onMouseLeave={this.onMouseLeave}
-      >
-        <ErrorBoundary>
-          <ControlComponent
-            onChange={this.onChange}
-            hovered={this.state.hovered}
-            {...this.props}
-          />
-        </ErrorBoundary>
-      </div>
-    );
-  }
+  return (
+    <div
+      className="Control"
+      data-test={name}
+      style={hidden ? { display: 'none' } : undefined}
+      onMouseEnter={() => setHovered(true)}
+      onMouseLeave={() => setHovered(false)}
+    >
+      <ErrorBoundary>
+        <ControlComponent onChange={onChange} hovered={hovered} {...props} />
+      </ErrorBoundary>
+    </div>
+  );
 }
diff --git a/superset-frontend/src/explore/components/ControlHeader.jsx b/superset-frontend/src/explore/components/ControlHeader.jsx
index c1b073459cf0..9a45917f6cf7 100644
--- a/superset-frontend/src/explore/components/ControlHeader.jsx
+++ b/superset-frontend/src/explore/components/ControlHeader.jsx
@@ -18,10 +18,11 @@
  */
 import React from 'react';
 import PropTypes from 'prop-types';
-import { t, css } from '@superset-ui/core';
+import { t, css, withTheme } from '@superset-ui/core';
 import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
 import { Tooltip } from 'src/components/Tooltip';
 import { FormLabel } from 'src/components/Form';
+import Icons from 'src/components/Icons';
 
 const propTypes = {
   name: PropTypes.string,
@@ -45,7 +46,7 @@ const defaultProps = {
   name: undefined,
 };
 
-export default class ControlHeader extends React.Component {
+class ControlHeader extends React.Component {
   renderOptionalIcons() {
     if (this.props.hovered) {
       return (
@@ -91,6 +92,9 @@ export default class ControlHeader extends React.Component {
     }
     const labelClass =
       this.props.validationErrors.length > 0 ? 'text-danger' : '';
+
+    const { theme } = this.props;
+
     return (
       <div className="ControlHeader" data-test={`${this.props.name}-header`}>
         <div className="pull-left">
@@ -117,7 +121,10 @@ export default class ControlHeader extends React.Component {
                   placement="top"
                   title={this.props.warning}
                 >
-                  <i className="fa fa-exclamation-circle text-warning" />
+                  <Icons.AlertSolid
+                    iconColor={theme.colors.alert.base}
+                    iconSize="s"
+                  />
                 </Tooltip>{' '}
               </span>
             )}
@@ -128,7 +135,10 @@ export default class ControlHeader extends React.Component {
                   placement="top"
                   title={this.props.danger}
                 >
-                  <i className="fa fa-exclamation-circle text-danger" />
+                  <Icons.ErrorSolid
+                    iconColor={theme.colors.error.base}
+                    iconSize="s"
+                  />
                 </Tooltip>{' '}
               </span>
             )}
@@ -139,7 +149,10 @@ export default class ControlHeader extends React.Component {
                   placement="top"
                   title={this.props.validationErrors.join(' ')}
                 >
-                  <i className="fa fa-exclamation-circle text-danger" />
+                  <Icons.ErrorSolid
+                    iconColor={theme.colors.error.base}
+                    iconSize="s"
+                  />
                 </Tooltip>{' '}
               </span>
             )}
@@ -157,3 +170,5 @@ export default class ControlHeader extends React.Component {
 
 ControlHeader.propTypes = propTypes;
 ControlHeader.defaultProps = defaultProps;
+
+export default withTheme(ControlHeader);
diff --git a/superset-frontend/src/explore/components/ControlPanelsContainer.tsx b/superset-frontend/src/explore/components/ControlPanelsContainer.tsx
index 2fd44df9b8aa..ac48db4718b5 100644
--- a/superset-frontend/src/explore/components/ControlPanelsContainer.tsx
+++ b/superset-frontend/src/explore/components/ControlPanelsContainer.tsx
@@ -118,6 +118,7 @@ type ControlPanelsContainerState = {
   expandedCustomizeSections: string[];
   querySections: ControlPanelSectionConfig[];
   customizeSections: ControlPanelSectionConfig[];
+  loading: boolean;
 };
 
 const isTimeSection = (section: ControlPanelSectionConfig): boolean =>
@@ -189,6 +190,7 @@ function getState(
     expandedCustomizeSections,
     querySections,
     customizeSections,
+    loading: false,
   };
 }
 
@@ -206,24 +208,12 @@ export class ControlPanelsContainer extends React.Component<
       expandedCustomizeSections: [],
       querySections: [],
       customizeSections: [],
+      loading: false,
     };
     this.renderControl = this.renderControl.bind(this);
     this.renderControlPanelSection = this.renderControlPanelSection.bind(this);
   }
 
-  static getDerivedStateFromProps(
-    props: ControlPanelsContainerProps,
-    state: ControlPanelsContainerState,
-  ): ControlPanelsContainerState {
-    // only update the sections, not the expanded/collapsed state
-    const newState = getState(props);
-    return {
-      ...state,
-      customizeSections: newState.customizeSections,
-      querySections: newState.querySections,
-    };
-  }
-
   componentDidUpdate(prevProps: ControlPanelsContainerProps) {
     if (
       this.props.form_data.datasource !== prevProps.form_data.datasource ||
@@ -234,6 +224,17 @@ export class ControlPanelsContainer extends React.Component<
     }
   }
 
+  // required for an Antd bug that would otherwise malfunction re-rendering
+  // a collapsed panel after changing the datasource or viz type
+  UNSAFE_componentWillReceiveProps(nextProps: ControlPanelsContainerProps) {
+    if (
+      this.props.form_data.datasource !== nextProps.form_data.datasource ||
+      this.props.form_data.viz_type !== nextProps.form_data.viz_type
+    ) {
+      this.setState({ loading: true });
+    }
+  }
+
   componentDidMount() {
     this.setState(getState(this.props));
   }
@@ -382,8 +383,9 @@ export class ControlPanelsContainer extends React.Component<
   render() {
     const controlPanelRegistry = getChartControlPanelRegistry();
     if (
-      !controlPanelRegistry.has(this.props.form_data.viz_type) &&
-      this.context.loading
+      (!controlPanelRegistry.has(this.props.form_data.viz_type) &&
+        this.context.loading) ||
+      this.state.loading
     ) {
       return <Loading />;
     }
diff --git a/superset-frontend/src/explore/components/DataTableControl/index.tsx b/superset-frontend/src/explore/components/DataTableControl/index.tsx
index 43148cad1c23..16a6c64bbad9 100644
--- a/superset-frontend/src/explore/components/DataTableControl/index.tsx
+++ b/superset-frontend/src/explore/components/DataTableControl/index.tsx
@@ -122,7 +122,7 @@ export const useTableColumns = (
         ? Object.keys(data[0]).map(
             key =>
               ({
-                accessor: key,
+                accessor: row => row[key],
                 Header: key,
                 Cell: ({ value }) => {
                   if (value === true) {
diff --git a/superset-frontend/src/explore/components/DataTableControl/useTableColumns.test.ts b/superset-frontend/src/explore/components/DataTableControl/useTableColumns.test.ts
index b950dbdf60ad..952b817b9dab 100644
--- a/superset-frontend/src/explore/components/DataTableControl/useTableColumns.test.ts
+++ b/superset-frontend/src/explore/components/DataTableControl/useTableColumns.test.ts
@@ -16,38 +16,121 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 import { renderHook } from '@testing-library/react-hooks';
+import { BOOL_FALSE_DISPLAY, BOOL_TRUE_DISPLAY } from 'src/constants';
 import { useTableColumns } from '.';
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type JsonObject = { [member: string]: any };
+
+const asciiChars = [];
+for (let i = 32; i < 127; i += 1) {
+  asciiChars.push(String.fromCharCode(i));
+}
+const asciiKey = asciiChars.join('');
+const unicodeKey = '你好. 吃了吗?';
+
 const data = [
-  { col01: 'some', col02: 'data' },
-  { col01: 'any', col02: 'data' },
-  { col01: 'some', col02: 'thing' },
-  { col01: 'any', col02: 'things', col03: 'secret' },
+  { col01: true, col02: false, [asciiKey]: asciiKey, [unicodeKey]: unicodeKey },
+  { col01: true, col02: false, [asciiKey]: asciiKey, [unicodeKey]: unicodeKey },
+  { col01: true, col02: false, [asciiKey]: asciiKey, [unicodeKey]: unicodeKey },
+  {
+    col01: true,
+    col02: false,
+    col03: 'secret',
+    [asciiKey]: asciiKey,
+    [unicodeKey]: unicodeKey,
+  },
 ];
 
 test('useTableColumns with no options', () => {
   const hook = renderHook(() => useTableColumns(data));
   expect(hook.result.current).toEqual([
-    { Cell: expect.any(Function), Header: 'col01', accessor: 'col01' },
-    { Cell: expect.any(Function), Header: 'col02', accessor: 'col02' },
+    {
+      Cell: expect.any(Function),
+      Header: 'col01',
+      accessor: expect.any(Function),
+    },
+    {
+      Cell: expect.any(Function),
+      Header: 'col02',
+      accessor: expect.any(Function),
+    },
+    {
+      Cell: expect.any(Function),
+      Header: asciiKey,
+      accessor: expect.any(Function),
+    },
+    {
+      Cell: expect.any(Function),
+      Header: unicodeKey,
+      accessor: expect.any(Function),
+    },
   ]);
+  hook.result.current.forEach((col: JsonObject) => {
+    expect(col.accessor(data[0])).toBe(data[0][col.Header]);
+  });
+
+  hook.result.current.forEach((col: JsonObject) => {
+    data.forEach(row => {
+      expect(col.Cell({ value: row.col01 })).toBe(BOOL_TRUE_DISPLAY);
+      expect(col.Cell({ value: row.col02 })).toBe(BOOL_FALSE_DISPLAY);
+      expect(col.Cell({ value: row[asciiKey] })).toBe(asciiKey);
+      expect(col.Cell({ value: row[unicodeKey] })).toBe(unicodeKey);
+    });
+  });
 });
 
 test('use only the first record columns', () => {
-  const hook = renderHook(() => useTableColumns(data));
+  const newData = [data[3], data[0]];
+  const hook = renderHook(() => useTableColumns(newData));
   expect(hook.result.current).toEqual([
-    { Cell: expect.any(Function), Header: 'col01', accessor: 'col01' },
-    { Cell: expect.any(Function), Header: 'col02', accessor: 'col02' },
+    {
+      Cell: expect.any(Function),
+      Header: 'col01',
+      accessor: expect.any(Function),
+    },
+    {
+      Cell: expect.any(Function),
+      Header: 'col02',
+      accessor: expect.any(Function),
+    },
+    {
+      Cell: expect.any(Function),
+      Header: 'col03',
+      accessor: expect.any(Function),
+    },
+    {
+      Cell: expect.any(Function),
+      Header: asciiKey,
+      accessor: expect.any(Function),
+    },
+    {
+      Cell: expect.any(Function),
+      Header: unicodeKey,
+      accessor: expect.any(Function),
+    },
   ]);
 
-  const hook2 = renderHook(() => useTableColumns([data[3], data[0]]));
-  expect(hook2.result.current).toEqual([
-    { Cell: expect.any(Function), Header: 'col01', accessor: 'col01' },
-    { Cell: expect.any(Function), Header: 'col02', accessor: 'col02' },
-    { Cell: expect.any(Function), Header: 'col03', accessor: 'col03' },
-  ]);
+  hook.result.current.forEach((col: JsonObject) => {
+    expect(col.accessor(newData[0])).toBe(newData[0][col.Header]);
+  });
+
+  hook.result.current.forEach((col: JsonObject) => {
+    expect(col.Cell({ value: newData[0].col01 })).toBe(BOOL_TRUE_DISPLAY);
+    expect(col.Cell({ value: newData[0].col02 })).toBe(BOOL_FALSE_DISPLAY);
+    expect(col.Cell({ value: newData[0].col03 })).toBe('secret');
+    expect(col.Cell({ value: newData[0][asciiKey] })).toBe(asciiKey);
+    expect(col.Cell({ value: newData[0][unicodeKey] })).toBe(unicodeKey);
+  });
+
+  hook.result.current.forEach((col: JsonObject) => {
+    expect(col.Cell({ value: newData[1].col01 })).toBe(BOOL_TRUE_DISPLAY);
+    expect(col.Cell({ value: newData[1].col02 })).toBe(BOOL_FALSE_DISPLAY);
+    expect(col.Cell({ value: newData[1].col03 })).toBe('undefined');
+    expect(col.Cell({ value: newData[1][asciiKey] })).toBe(asciiKey);
+    expect(col.Cell({ value: newData[1][unicodeKey] })).toBe(unicodeKey);
+  });
 });
 
 test('useTableColumns with options', () => {
@@ -56,9 +139,35 @@ test('useTableColumns with options', () => {
     {
       Cell: expect.any(Function),
       Header: 'col01',
-      accessor: 'col01',
+      accessor: expect.any(Function),
       id: 'ID',
     },
-    { Cell: expect.any(Function), Header: 'col02', accessor: 'col02' },
+    {
+      Cell: expect.any(Function),
+      Header: 'col02',
+      accessor: expect.any(Function),
+    },
+    {
+      Cell: expect.any(Function),
+      Header: asciiKey,
+      accessor: expect.any(Function),
+    },
+    {
+      Cell: expect.any(Function),
+      Header: unicodeKey,
+      accessor: expect.any(Function),
+    },
   ]);
+  hook.result.current.forEach((col: JsonObject) => {
+    expect(col.accessor(data[0])).toBe(data[0][col.Header]);
+  });
+
+  hook.result.current.forEach((col: JsonObject) => {
+    data.forEach(row => {
+      expect(col.Cell({ value: row.col01 })).toBe(BOOL_TRUE_DISPLAY);
+      expect(col.Cell({ value: row.col02 })).toBe(BOOL_FALSE_DISPLAY);
+      expect(col.Cell({ value: row[asciiKey] })).toBe(asciiKey);
+      expect(col.Cell({ value: row[unicodeKey] })).toBe(unicodeKey);
+    });
+  });
 });
diff --git a/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.test.tsx b/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.test.tsx
index 1199deecccc0..7df51908ad7c 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.test.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.test.tsx
@@ -73,7 +73,7 @@ test('Rendering DataTablesPane correctly', () => {
   expect(screen.getByRole('img', { name: 'right' })).toBeVisible();
 });
 
-test('Shoud show tabs', async () => {
+test('Should show tabs', async () => {
   const props = createProps();
   render(<DataTablesPane {...props} />, { useRedux: true });
   expect(screen.queryByText('View results')).not.toBeInTheDocument();
@@ -83,7 +83,7 @@ test('Shoud show tabs', async () => {
   expect(screen.getByText('View samples')).toBeVisible();
 });
 
-test('Shoud show tabs: View results', async () => {
+test('Should show tabs: View results', async () => {
   const props = createProps();
   render(<DataTablesPane {...props} />, {
     useRedux: true,
@@ -93,7 +93,7 @@ test('Shoud show tabs: View results', async () => {
   expect(screen.getByText('0 rows retrieved')).toBeVisible();
 });
 
-test('Shoud show tabs: View samples', async () => {
+test('Should show tabs: View samples', async () => {
   const props = createProps();
   render(<DataTablesPane {...props} />, {
     useRedux: true,
diff --git a/superset-frontend/src/explore/components/DataTablesPane/index.tsx b/superset-frontend/src/explore/components/DataTablesPane/index.tsx
index f2b33f28e071..3d8308981198 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/index.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/index.tsx
@@ -101,6 +101,10 @@ const CollapseWrapper = styled.div`
   }
 `;
 
+const Error = styled.pre`
+  margin-top: ${({ theme }) => `${theme.gridUnit * 4}px`};
+`;
+
 export const DataTablesPane = ({
   queryFormData,
   tableSectionHeight,
@@ -149,10 +153,30 @@ export const DataTablesPane = ({
         resultType,
         ownState,
       })
-        .then(response => {
+        .then(({ json }) => {
           // Only displaying the first query is currently supported
-          const result = response.result[0];
-          setData(prevData => ({ ...prevData, [resultType]: result.data }));
+          if (json.result.length > 1) {
+            const data: any[] = [];
+            json.result.forEach((item: { data: any[] }) => {
+              item.data.forEach((row, i) => {
+                if (data[i] !== undefined) {
+                  data[i] = { ...data[i], ...row };
+                } else {
+                  data[i] = row;
+                }
+              });
+            });
+            setData(prevData => ({
+              ...prevData,
+              [resultType]: data,
+            }));
+          } else {
+            setData(prevData => ({
+              ...prevData,
+              [resultType]: json.result[0].data,
+            }));
+          }
+
           setIsLoading(prevIsLoading => ({
             ...prevIsLoading,
             [resultType]: false,
@@ -263,7 +287,7 @@ export const DataTablesPane = ({
       return <Loading />;
     }
     if (error[type]) {
-      return <pre>{error[type]}</pre>;
+      return <Error>{error[type]}</Error>;
     }
     if (data[type]) {
       if (data[type]?.length === 0) {
@@ -279,11 +303,12 @@ export const DataTablesPane = ({
           className="table-condensed"
           isPaginationSticky
           showRowCount={false}
+          small
         />
       );
     }
     if (errorMessage) {
-      return <pre>{errorMessage}</pre>;
+      return <Error>{errorMessage}</Error>;
     }
     return null;
   };
diff --git a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanel.test.tsx b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanel.test.tsx
index 0d065958339b..34484334768c 100644
--- a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanel.test.tsx
+++ b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanel.test.tsx
@@ -116,7 +116,7 @@ test('should render 0 search results', async () => {
   const searchInput = screen.getByPlaceholderText('Search Metrics & Columns');
 
   search('nothing', searchInput);
-  expect(await screen.findByText('Showing 0 of 0')).toBeInTheDocument();
+  expect(await screen.findAllByText('Showing 0 of 0')).toHaveLength(2);
 });
 
 test('should search and render matching columns', async () => {
diff --git a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragWrapper/DatasourcePanelDragWrapper.test.tsx b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragOption/DatasourcePanelDragOption.test.tsx
similarity index 75%
rename from superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragWrapper/DatasourcePanelDragWrapper.test.tsx
rename to superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragOption/DatasourcePanelDragOption.test.tsx
index 7698f7328ca3..be8f91eade6a 100644
--- a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragWrapper/DatasourcePanelDragWrapper.test.tsx
+++ b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragOption/DatasourcePanelDragOption.test.tsx
@@ -21,37 +21,33 @@ import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import { render, screen } from 'spec/helpers/testing-library';
 import { DndItemType } from 'src/explore/components/DndItemType';
-import DatasourcePanelDragWrapper from '.';
+import DatasourcePanelDragOption from '.';
 
 test('should render', () => {
   render(
     <DndProvider backend={HTML5Backend}>
-      <DatasourcePanelDragWrapper
+      <DatasourcePanelDragOption
         value={{ metric_name: 'test' }}
         type={DndItemType.Metric}
-      >
-        <div data-test="children" />
-      </DatasourcePanelDragWrapper>
+      />
     </DndProvider>,
   );
 
-  expect(screen.getByTestId('DatasourcePanelDragWrapper')).toBeInTheDocument();
-  expect(screen.getByTestId('children')).toBeInTheDocument();
+  expect(screen.getByTestId('DatasourcePanelDragOption')).toBeInTheDocument();
+  expect(screen.getByText('test')).toBeInTheDocument();
 });
 
 test('should have attribute draggable:true', () => {
   render(
     <DndProvider backend={HTML5Backend}>
-      <DatasourcePanelDragWrapper
+      <DatasourcePanelDragOption
         value={{ metric_name: 'test' }}
         type={DndItemType.Metric}
-      >
-        <div data-test="children" />
-      </DatasourcePanelDragWrapper>
+      />
     </DndProvider>,
   );
 
-  expect(screen.getByTestId('DatasourcePanelDragWrapper')).toHaveAttribute(
+  expect(screen.getByTestId('DatasourcePanelDragOption')).toHaveAttribute(
     'draggable',
     'true',
   );
diff --git a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragOption/index.tsx b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragOption/index.tsx
new file mode 100644
index 000000000000..518f7ebabc8b
--- /dev/null
+++ b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragOption/index.tsx
@@ -0,0 +1,84 @@
+/**
+ * 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 React from 'react';
+import { useDrag } from 'react-dnd';
+import { Metric, styled } from '@superset-ui/core';
+import { DndItemType } from 'src/explore/components/DndItemType';
+import {
+  StyledColumnOption,
+  StyledMetricOption,
+} from 'src/explore/components/optionRenderers';
+import { ColumnMeta } from '@superset-ui/chart-controls';
+import { DatasourcePanelDndItem } from '../types';
+
+const DatasourceItemContainer = styled.div`
+  display: flex;
+  align-items: center;
+  width: 100%;
+  height: ${({ theme }) => theme.gridUnit * 6}px;
+  cursor: pointer;
+
+  > div {
+    width: 100%;
+  }
+
+  :hover {
+    background-color: ${({ theme }) => theme.colors.grayscale.light2};
+  }
+`;
+
+interface DatasourcePanelDragOptionProps extends DatasourcePanelDndItem {
+  labelRef?: React.RefObject<any>;
+  showTooltip?: boolean;
+}
+
+type MetricOption = Omit<Metric, 'id'> & {
+  label?: string;
+};
+
+export default function DatasourcePanelDragOption(
+  props: DatasourcePanelDragOptionProps,
+) {
+  const { labelRef, showTooltip, type, value } = props;
+  const [{ isDragging }, drag] = useDrag({
+    item: {
+      value: props.value,
+      type: props.type,
+    },
+    collect: monitor => ({
+      isDragging: monitor.isDragging(),
+    }),
+  });
+
+  const optionProps = {
+    labelRef,
+    showTooltip: !isDragging && showTooltip,
+    showType: true,
+  };
+
+  return (
+    <DatasourceItemContainer data-test="DatasourcePanelDragOption" ref={drag}>
+      {type === DndItemType.Column ? (
+        <StyledColumnOption column={value as ColumnMeta} {...optionProps} />
+      ) : (
+        <StyledMetricOption metric={value as MetricOption} {...optionProps} />
+      )}
+    </DatasourceItemContainer>
+  );
+}
diff --git a/superset-frontend/src/explore/components/DatasourcePanel/index.tsx b/superset-frontend/src/explore/components/DatasourcePanel/index.tsx
index bac9babceaa9..209458335c55 100644
--- a/superset-frontend/src/explore/components/DatasourcePanel/index.tsx
+++ b/superset-frontend/src/explore/components/DatasourcePanel/index.tsx
@@ -16,17 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { useEffect, useState } from 'react';
-import { styled, t } from '@superset-ui/core';
-import Collapse from 'src/components/Collapse';
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
 import { ControlConfig, DatasourceMeta } from '@superset-ui/chart-controls';
 import { debounce } from 'lodash';
 import { matchSorter, rankings } from 'match-sorter';
+import { css, styled, t } from '@superset-ui/core';
+import Collapse from 'src/components/Collapse';
+import { Input } from 'src/common/components';
 import { FAST_DEBOUNCE } from 'src/constants';
-import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags';
+import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags';
 import { ExploreActions } from 'src/explore/actions/exploreActions';
 import Control from 'src/explore/components/Control';
-import DatasourcePanelDragWrapper from './DatasourcePanelDragWrapper';
+import DatasourcePanelDragOption from './DatasourcePanelDragOption';
 import { DndItemType } from '../DndItemType';
 import { StyledColumnOption, StyledMetricOption } from '../optionRenderers';
 
@@ -42,40 +49,55 @@ export interface Props {
   actions: Partial<ExploreActions> & Pick<ExploreActions, 'setControlValue'>;
 }
 
+const Button = styled.button`
+  background: none;
+  border: none;
+  text-decoration: underline;
+  color: ${({ theme }) => theme.colors.primary.dark1};
+`;
+
+const ButtonContainer = styled.div`
+  text-align: center;
+  padding-top: 2px;
+`;
+
 const DatasourceContainer = styled.div`
-  background-color: ${({ theme }) => theme.colors.grayscale.light4};
-  position: relative;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  max-height: 100%;
-  .ant-collapse {
-    height: auto;
-  }
-  .field-selections {
-    padding: ${({ theme }) => `0 0 ${4 * theme.gridUnit}px`};
-    overflow: auto;
-  }
-  .field-length {
-    margin-bottom: ${({ theme }) => theme.gridUnit * 2}px;
-    font-size: ${({ theme }) => theme.typography.sizes.s}px;
-    color: ${({ theme }) => theme.colors.grayscale.light1};
-  }
-  .form-control.input-md {
-    width: calc(100% - ${({ theme }) => theme.gridUnit * 4}px);
-    margin: ${({ theme }) => theme.gridUnit * 2}px auto;
-  }
-  .type-label {
-    font-weight: ${({ theme }) => theme.typography.weights.light};
-    font-size: ${({ theme }) => theme.typography.sizes.s}px;
-    color: ${({ theme }) => theme.colors.grayscale.base};
-  }
-  .Control {
-    padding-bottom: 0;
-  }
+  ${({ theme }) => css`
+    background-color: ${theme.colors.grayscale.light4};
+    position: relative;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    max-height: 100%;
+    .ant-collapse {
+      height: auto;
+    }
+    .field-selections {
+      padding: 0 0 ${4 * theme.gridUnit}px;
+      overflow: auto;
+    }
+    .field-length {
+      margin-bottom: ${theme.gridUnit * 2}px;
+      font-size: ${theme.typography.sizes.s}px;
+      color: ${theme.colors.grayscale.light1};
+    }
+    .form-control.input-md {
+      width: calc(100% - ${theme.gridUnit * 4}px);
+      height: ${theme.gridUnit * 8}px;
+      margin: ${theme.gridUnit * 2}px auto;
+    }
+    .type-label {
+      font-weight: ${theme.typography.weights.light};
+      font-size: ${theme.typography.sizes.s}px;
+      color: ${theme.colors.grayscale.base};
+    }
+    .Control {
+      padding-bottom: 0;
+    }
+  `};
 `;
 
-const LabelContainer = styled.div`
+const LabelWrapper = styled.div`
   overflow: hidden;
   text-overflow: ellipsis;
 
@@ -98,6 +120,42 @@ const LabelContainer = styled.div`
   }
 `;
 
+const LabelContainer = (props: {
+  children: React.ReactElement;
+  className: string;
+}) => {
+  const labelRef = useRef<HTMLDivElement>(null);
+  const [showTooltip, setShowTooltip] = useState(true);
+  const isLabelTruncated = () =>
+    !!(
+      labelRef &&
+      labelRef.current &&
+      labelRef.current.scrollWidth > labelRef.current.clientWidth
+    );
+  const handleShowTooltip = () => {
+    const shouldShowTooltip = isLabelTruncated();
+    if (shouldShowTooltip !== showTooltip) {
+      setShowTooltip(shouldShowTooltip);
+    }
+  };
+  const handleResetTooltip = () => {
+    setShowTooltip(true);
+  };
+  const extendedProps = {
+    labelRef,
+    showTooltip,
+  };
+  return (
+    <LabelWrapper
+      onMouseEnter={handleShowTooltip}
+      onMouseLeave={handleResetTooltip}
+      className={props.className}
+    >
+      {React.cloneElement(props.children, extendedProps)}
+    </LabelWrapper>
+  );
+};
+
 const enableExploreDnd = isFeatureEnabled(
   FeatureFlag.ENABLE_EXPLORE_DRAG_AND_DROP,
 );
@@ -107,66 +165,90 @@ export default function DataSourcePanel({
   controls: { datasource: datasourceControl },
   actions,
 }: Props) {
-  const { columns, metrics } = datasource;
+  const { columns: _columns, metrics } = datasource;
+
+  // display temporal column first
+  const columns = useMemo(
+    () =>
+      [..._columns].sort((col1, col2) => {
+        if (col1.is_dttm && !col2.is_dttm) {
+          return -1;
+        }
+        if (col2.is_dttm && !col1.is_dttm) {
+          return 1;
+        }
+        return 0;
+      }),
+    [_columns],
+  );
+
   const [inputValue, setInputValue] = useState('');
   const [lists, setList] = useState({
     columns,
     metrics,
   });
+  const [showAllMetrics, setShowAllMetrics] = useState(false);
+  const [showAllColumns, setShowAllColumns] = useState(false);
 
-  const search = debounce((value: string) => {
-    if (value === '') {
-      setList({ columns, metrics });
-      return;
-    }
-    setList({
-      columns: matchSorter(columns, value, {
-        keys: [
-          {
-            key: 'verbose_name',
-            threshold: rankings.CONTAINS,
-          },
-          {
-            key: 'column_name',
-            threshold: rankings.CONTAINS,
-          },
-          {
-            key: item =>
-              [item.description, item.expression].map(
-                x => x?.replace(/[_\n\s]+/g, ' ') || '',
-              ),
-            threshold: rankings.CONTAINS,
-            maxRanking: rankings.CONTAINS,
-          },
-        ],
-        keepDiacritics: true,
-      }),
-      metrics: matchSorter(metrics, value, {
-        keys: [
-          {
-            key: 'verbose_name',
-            threshold: rankings.CONTAINS,
-          },
-          {
-            key: 'metric_name',
-            threshold: rankings.CONTAINS,
-          },
-          {
-            key: item =>
-              [item.description, item.expression].map(
-                x => x?.replace(/[_\n\s]+/g, ' ') || '',
-              ),
-            threshold: rankings.CONTAINS,
-            maxRanking: rankings.CONTAINS,
-          },
-        ],
-        keepDiacritics: true,
-        baseSort: (a, b) =>
-          Number(b.item.is_certified) - Number(a.item.is_certified) ||
-          String(a.rankedValue).localeCompare(b.rankedValue),
-      }),
-    });
-  }, FAST_DEBOUNCE);
+  const DEFAULT_MAX_COLUMNS_LENGTH = 50;
+  const DEFAULT_MAX_METRICS_LENGTH = 50;
+
+  const search = useCallback(
+    debounce((value: string) => {
+      if (value === '') {
+        setList({ columns, metrics });
+        return;
+      }
+      setList({
+        columns: matchSorter(columns, value, {
+          keys: [
+            {
+              key: 'verbose_name',
+              threshold: rankings.CONTAINS,
+            },
+            {
+              key: 'column_name',
+              threshold: rankings.CONTAINS,
+            },
+            {
+              key: item =>
+                [item.description, item.expression].map(
+                  x => x?.replace(/[_\n\s]+/g, ' ') || '',
+                ),
+              threshold: rankings.CONTAINS,
+              maxRanking: rankings.CONTAINS,
+            },
+          ],
+          keepDiacritics: true,
+        }),
+        metrics: matchSorter(metrics, value, {
+          keys: [
+            {
+              key: 'verbose_name',
+              threshold: rankings.CONTAINS,
+            },
+            {
+              key: 'metric_name',
+              threshold: rankings.CONTAINS,
+            },
+            {
+              key: item =>
+                [item.description, item.expression].map(
+                  x => x?.replace(/[_\n\s]+/g, ' ') || '',
+                ),
+              threshold: rankings.CONTAINS,
+              maxRanking: rankings.CONTAINS,
+            },
+          ],
+          keepDiacritics: true,
+          baseSort: (a, b) =>
+            Number(b.item.is_certified) - Number(a.item.is_certified) ||
+            String(a.rankedValue).localeCompare(b.rankedValue),
+        }),
+      });
+    }, FAST_DEBOUNCE),
+    [columns, metrics],
+  );
 
   useEffect(() => {
     setList({
@@ -176,75 +258,121 @@ export default function DataSourcePanel({
     setInputValue('');
   }, [columns, datasource, metrics]);
 
-  const metricSlice = lists.metrics.slice(0, 50);
-  const columnSlice = lists.columns.slice(0, 50);
+  const metricSlice = useMemo(
+    () =>
+      showAllMetrics
+        ? lists.metrics
+        : lists.metrics.slice(0, DEFAULT_MAX_METRICS_LENGTH),
+    [lists.metrics, showAllMetrics],
+  );
+  const columnSlice = useMemo(
+    () =>
+      showAllColumns
+        ? lists.columns
+        : lists.columns.slice(0, DEFAULT_MAX_COLUMNS_LENGTH),
+    [lists.columns, showAllColumns],
+  );
 
-  const mainBody = (
-    <>
-      <input
-        type="text"
-        onChange={evt => {
-          setInputValue(evt.target.value);
-          search(evt.target.value);
-        }}
-        value={inputValue}
-        className="form-control input-md"
-        placeholder={t('Search Metrics & Columns')}
-      />
-      <div className="field-selections">
-        <Collapse
-          bordered
-          defaultActiveKey={['metrics', 'column']}
-          expandIconPosition="right"
-          ghost
-        >
-          <Collapse.Panel
-            header={<span className="header">{t('Metrics')}</span>}
-            key="metrics"
+  const mainBody = useMemo(
+    () => (
+      <>
+        <Input
+          allowClear
+          onChange={evt => {
+            setInputValue(evt.target.value);
+            search(evt.target.value);
+          }}
+          value={inputValue}
+          className="form-control input-md"
+          placeholder={t('Search Metrics & Columns')}
+        />
+        <div className="field-selections">
+          <Collapse
+            bordered
+            defaultActiveKey={['metrics', 'column']}
+            expandIconPosition="right"
+            ghost
           >
-            <div className="field-length">
-              {t(`Showing %s of %s`, metricSlice.length, lists.metrics.length)}
-            </div>
-            {metricSlice.map(m => (
-              <LabelContainer key={m.metric_name} className="column">
-                {enableExploreDnd ? (
-                  <DatasourcePanelDragWrapper
-                    value={m}
-                    type={DndItemType.Metric}
-                  >
+            <Collapse.Panel
+              header={<span className="header">{t('Metrics')}</span>}
+              key="metrics"
+            >
+              <div className="field-length">
+                {t(
+                  `Showing %s of %s`,
+                  metricSlice.length,
+                  lists.metrics.length,
+                )}
+              </div>
+              {metricSlice.map(m => (
+                <LabelContainer key={m.metric_name} className="column">
+                  {enableExploreDnd ? (
+                    <DatasourcePanelDragOption
+                      value={m}
+                      type={DndItemType.Metric}
+                    />
+                  ) : (
                     <StyledMetricOption metric={m} showType />
-                  </DatasourcePanelDragWrapper>
-                ) : (
-                  <StyledMetricOption metric={m} showType />
+                  )}
+                </LabelContainer>
+              ))}
+              {lists.metrics.length > DEFAULT_MAX_METRICS_LENGTH ? (
+                <ButtonContainer>
+                  <Button onClick={() => setShowAllMetrics(!showAllMetrics)}>
+                    {showAllMetrics ? t('Show less...') : t('Show all...')}
+                  </Button>
+                </ButtonContainer>
+              ) : (
+                <></>
+              )}
+            </Collapse.Panel>
+            <Collapse.Panel
+              header={<span className="header">{t('Columns')}</span>}
+              key="column"
+            >
+              <div className="field-length">
+                {t(
+                  `Showing %s of %s`,
+                  columnSlice.length,
+                  lists.columns.length,
                 )}
-              </LabelContainer>
-            ))}
-          </Collapse.Panel>
-          <Collapse.Panel
-            header={<span className="header">{t('Columns')}</span>}
-            key="column"
-          >
-            <div className="field-length">
-              {t(`Showing %s of %s`, columnSlice.length, lists.columns.length)}
-            </div>
-            {columnSlice.map(col => (
-              <LabelContainer key={col.column_name} className="column">
-                {enableExploreDnd ? (
-                  <DatasourcePanelDragWrapper
-                    value={col}
-                    type={DndItemType.Column}
-                  >
+              </div>
+              {columnSlice.map(col => (
+                <LabelContainer key={col.column_name} className="column">
+                  {enableExploreDnd ? (
+                    <DatasourcePanelDragOption
+                      value={col}
+                      type={DndItemType.Column}
+                    />
+                  ) : (
                     <StyledColumnOption column={col} showType />
-                  </DatasourcePanelDragWrapper>
-                ) : (
-                  <StyledColumnOption column={col} showType />
-                )}
-              </LabelContainer>
-            ))}
-          </Collapse.Panel>
-        </Collapse>
-      </div>
-    </>
+                  )}
+                </LabelContainer>
+              ))}
+              {lists.columns.length > DEFAULT_MAX_COLUMNS_LENGTH ? (
+                <ButtonContainer>
+                  <Button onClick={() => setShowAllColumns(!showAllColumns)}>
+                    {showAllColumns ? t('Show Less...') : t('Show all...')}
+                  </Button>
+                </ButtonContainer>
+              ) : (
+                <></>
+              )}
+            </Collapse.Panel>
+          </Collapse>
+        </div>
+      </>
+    ),
+    [
+      columnSlice,
+      inputValue,
+      lists.columns.length,
+      lists.metrics.length,
+      metricSlice,
+      search,
+      showAllColumns,
+      showAllMetrics,
+    ],
   );
 
   return (
diff --git a/superset-frontend/src/explore/components/ExploreChartHeader.jsx b/superset-frontend/src/explore/components/ExploreChartHeader.jsx
index fdcf7d275569..5d057cabaec7 100644
--- a/superset-frontend/src/explore/components/ExploreChartHeader.jsx
+++ b/superset-frontend/src/explore/components/ExploreChartHeader.jsx
@@ -20,8 +20,17 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import PropTypes from 'prop-types';
+import Icons from 'src/components/Icons';
 import { styled, t } from '@superset-ui/core';
 import { Tooltip } from 'src/components/Tooltip';
+import ReportModal from 'src/components/ReportModal';
+import {
+  fetchUISpecificReport,
+  toggleActive,
+  deleteActiveReport,
+} from 'src/reports/actions/reports';
+import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags';
+import HeaderReportActionsDropdown from 'src/components/ReportModal/HeaderReportActionsDropdown';
 import { chartPropShape } from '../../dashboard/util/propShapes';
 import ExploreActionButtons from './ExploreActionButtons';
 import RowCountLabel from './RowCountLabel';
@@ -80,6 +89,12 @@ const StyledHeader = styled.div`
       margin-left: ${({ theme }) => theme.gridUnit}px;
     }
   }
+
+  .action-button {
+    color: ${({ theme }) => theme.colors.grayscale.base};
+    margin: 0 ${({ theme }) => theme.gridUnit * 1.5}px 0
+      ${({ theme }) => theme.gridUnit}px;
+  }
 `;
 
 const StyledButtons = styled.span`
@@ -92,9 +107,26 @@ export class ExploreChartHeader extends React.PureComponent {
     super(props);
     this.state = {
       isPropertiesModalOpen: false,
+      showingReportModal: false,
     };
     this.openPropertiesModal = this.openPropertiesModal.bind(this);
     this.closePropertiesModal = this.closePropertiesModal.bind(this);
+    this.showReportModal = this.showReportModal.bind(this);
+    this.hideReportModal = this.hideReportModal.bind(this);
+    this.renderReportModal = this.renderReportModal.bind(this);
+  }
+
+  componentDidMount() {
+    if (this.canAddReports()) {
+      const { user, chart } = this.props;
+      // this is in the case that there is an anonymous user.
+      this.props.fetchUISpecificReport(
+        user.userId,
+        'chart_id',
+        'charts',
+        chart.id,
+      );
+    }
   }
 
   getSliceName() {
@@ -123,8 +155,58 @@ export class ExploreChartHeader extends React.PureComponent {
     });
   }
 
+  showReportModal() {
+    this.setState({ showingReportModal: true });
+  }
+
+  hideReportModal() {
+    this.setState({ showingReportModal: false });
+  }
+
+  renderReportModal() {
+    const attachedReportExists = !!Object.keys(this.props.reports).length;
+    return attachedReportExists ? (
+      <HeaderReportActionsDropdown
+        showReportModal={this.showReportModal}
+        hideReportModal={this.hideReportModal}
+        toggleActive={this.props.toggleActive}
+        deleteActiveReport={this.props.deleteActiveReport}
+      />
+    ) : (
+      <>
+        <span
+          role="button"
+          title={t('Schedule email report')}
+          tabIndex={0}
+          className="action-button"
+          onClick={this.showReportModal}
+        >
+          <Icons.Calendar />
+        </span>
+      </>
+    );
+  }
+
+  canAddReports() {
+    if (!isFeatureEnabled(FeatureFlag.ALERT_REPORTS)) {
+      return false;
+    }
+    const { user } = this.props;
+    if (!user) {
+      // this is in the case that there is an anonymous user.
+      return false;
+    }
+    const roles = Object.keys(user.roles || []);
+    const permissions = roles.map(key =>
+      user.roles[key].filter(
+        perms => perms[0] === 'menu_access' && perms[1] === 'Manage',
+      ),
+    );
+    return permissions[0].length > 0;
+  }
+
   render() {
-    const formData = this.props.form_data;
+    const { user, form_data: formData } = this.props;
     const {
       chartStatus,
       chartUpdateEndTime,
@@ -148,7 +230,7 @@ export class ExploreChartHeader extends React.PureComponent {
 
           {this.props.slice && (
             <StyledButtons>
-              {this.props.userId && (
+              {user.userId && (
                 <FaveStar
                   itemId={this.props.slice.slice_id}
                   fetchFaveStar={this.props.actions.fetchFaveStar}
@@ -205,6 +287,17 @@ export class ExploreChartHeader extends React.PureComponent {
             isRunning={chartStatus === 'loading'}
             status={CHART_STATUS_MAP[chartStatus]}
           />
+          {this.canAddReports() && this.renderReportModal()}
+          <ReportModal
+            show={this.state.showingReportModal}
+            onHide={this.hideReportModal}
+            props={{
+              userId: this.props.user.userId,
+              userEmail: this.props.user.email,
+              chart: this.props.chart,
+              creationMethod: 'charts',
+            }}
+          />
           <ExploreActionButtons
             actions={{
               ...this.props.actions,
@@ -225,7 +318,10 @@ export class ExploreChartHeader extends React.PureComponent {
 ExploreChartHeader.propTypes = propTypes;
 
 function mapDispatchToProps(dispatch) {
-  return bindActionCreators({ sliceUpdated }, dispatch);
+  return bindActionCreators(
+    { sliceUpdated, fetchUISpecificReport, toggleActive, deleteActiveReport },
+    dispatch,
+  );
 }
 
 export default connect(null, mapDispatchToProps)(ExploreChartHeader);
diff --git a/superset-frontend/src/explore/components/ExploreChartPanel.jsx b/superset-frontend/src/explore/components/ExploreChartPanel.jsx
index 3bbd1512a786..bd2213f13125 100644
--- a/superset-frontend/src/explore/components/ExploreChartPanel.jsx
+++ b/superset-frontend/src/explore/components/ExploreChartPanel.jsx
@@ -19,7 +19,7 @@
 import React, { useState, useEffect, useCallback, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import Split from 'react-split';
-import { styled, useTheme } from '@superset-ui/core';
+import { styled, SupersetClient, useTheme } from '@superset-ui/core';
 import { useResizeDetector } from 'react-resize-detector';
 import { chartPropShape } from 'src/dashboard/util/propShapes';
 import ChartContainer from 'src/chart/ChartContainer';
@@ -29,6 +29,7 @@ import {
 } from 'src/utils/localStorageHelpers';
 import ConnectedExploreChartHeader from './ExploreChartHeader';
 import { DataTablesPane } from './DataTablesPane';
+import { buildV1ChartDataPayload } from '../exploreUtils';
 
 const propTypes = {
   actions: PropTypes.object.isRequired,
@@ -128,6 +129,35 @@ const ExploreChartPanel = props => {
     getFromLocalStorage(STORAGE_KEYS.sizes, INITIAL_SIZES),
   );
 
+  const { slice } = props;
+  const updateQueryContext = useCallback(
+    async function fetchChartData() {
+      if (slice && slice.query_context === null) {
+        const queryContext = buildV1ChartDataPayload({
+          formData: slice.form_data,
+          force: false,
+          resultFormat: 'json',
+          resultType: 'full',
+          setDataMask: null,
+          ownState: null,
+        });
+
+        await SupersetClient.put({
+          endpoint: `/api/v1/chart/${slice.slice_id}`,
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({
+            query_context: JSON.stringify(queryContext),
+            query_context_generation: true,
+          }),
+        });
+      }
+    },
+    [slice],
+  );
+  useEffect(() => {
+    updateQueryContext();
+  }, [updateQueryContext]);
+
   const calcSectionHeight = useCallback(
     percent => {
       let headerHeight;
@@ -254,7 +284,8 @@ const ExploreChartPanel = props => {
       form_data={props.form_data}
       timeout={props.timeout}
       chart={props.chart}
-      userId={props.userId}
+      user={props.user}
+      reports={props.reports}
     />
   );
 
diff --git a/superset-frontend/src/explore/components/ExploreViewContainer.jsx b/superset-frontend/src/explore/components/ExploreViewContainer.jsx
index 63efc2b189ff..27a6aa25ab9d 100644
--- a/superset-frontend/src/explore/components/ExploreViewContainer.jsx
+++ b/superset-frontend/src/explore/components/ExploreViewContainer.jsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 /* eslint camelcase: 0 */
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
@@ -25,7 +25,7 @@ import { styled, t, css, useTheme } from '@superset-ui/core';
 import { debounce } from 'lodash';
 import { Resizable } from 're-resizable';
 
-import { useDynamicPluginContext } from 'src/components/DynamicPlugins';
+import { usePluginContext } from 'src/components/DynamicPlugins';
 import { Global } from '@emotion/react';
 import { Tooltip } from 'src/components/Tooltip';
 import { usePrevious } from 'src/common/hooks/usePrevious';
@@ -81,7 +81,7 @@ const Styles = styled.div`
   text-align: left;
   position: relative;
   width: 100%;
-  height: 100%;
+  max-height: 100%;
   display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
@@ -159,12 +159,17 @@ function useWindowSize({ delayMs = 250 } = {}) {
 }
 
 function ExploreViewContainer(props) {
-  const dynamicPluginContext = useDynamicPluginContext();
-  const dynamicPlugin = dynamicPluginContext.plugins[props.vizType];
-  const isDynamicPluginLoading = dynamicPlugin && dynamicPlugin.loading;
+  const dynamicPluginContext = usePluginContext();
+  const dynamicPlugin = dynamicPluginContext.dynamicPlugins[props.vizType];
+  const isDynamicPluginLoading = dynamicPlugin && dynamicPlugin.mounting;
   const wasDynamicPluginLoading = usePrevious(isDynamicPluginLoading);
 
+  /** the state of controls in the previous render */
   const previousControls = usePrevious(props.controls);
+  /** the state of controls last time a query was triggered */
+  const [lastQueriedControls, setLastQueriedControls] = useState(
+    props.controls,
+  );
   const windowSize = useWindowSize();
 
   const [showingModal, setShowingModal] = useState(false);
@@ -187,29 +192,32 @@ function ExploreViewContainer(props) {
     datasource_width: 300,
   };
 
-  function addHistory({ isReplace = false, title } = {}) {
-    const payload = { ...props.form_data };
-    const longUrl = getExploreLongUrl(
-      props.form_data,
-      props.standalone ? URL_PARAMS.standalone.name : null,
-      false,
-    );
-    try {
-      if (isReplace) {
-        window.history.replaceState(payload, title, longUrl);
-      } else {
-        window.history.pushState(payload, title, longUrl);
-      }
-    } catch (e) {
-      // eslint-disable-next-line no-console
-      console.warn(
-        'Failed at altering browser history',
-        payload,
-        title,
-        longUrl,
+  const addHistory = useCallback(
+    ({ isReplace = false, title } = {}) => {
+      const payload = { ...props.form_data };
+      const longUrl = getExploreLongUrl(
+        props.form_data,
+        props.standalone ? URL_PARAMS.standalone.name : null,
+        false,
       );
-    }
-  }
+      try {
+        if (isReplace) {
+          window.history.replaceState(payload, title, longUrl);
+        } else {
+          window.history.pushState(payload, title, longUrl);
+        }
+      } catch (e) {
+        // eslint-disable-next-line no-console
+        console.warn(
+          'Failed at altering browser history',
+          payload,
+          title,
+          longUrl,
+        );
+      }
+    },
+    [props.form_data, props.standalone],
+  );
 
   function handlePopstate() {
     const formData = window.history.state;
@@ -223,11 +231,11 @@ function ExploreViewContainer(props) {
       );
     }
   }
-
-  function onQuery() {
+  const onQuery = useCallback(() => {
     props.actions.triggerQuery(true, props.chart.id);
     addHistory();
-  }
+    setLastQueriedControls(props.controls);
+  }, [props.controls, addHistory, props.actions, props.chart.id]);
 
   function handleKeydown(event) {
     const controlOrCommand = event.ctrlKey || event.metaKey;
@@ -338,13 +346,13 @@ function ExploreViewContainer(props) {
   }, [props.controls, props.ownState]);
 
   const chartIsStale = useMemo(() => {
-    if (previousControls) {
+    if (lastQueriedControls) {
       const changedControlKeys = Object.keys(props.controls).filter(
         key =>
-          typeof previousControls[key] !== 'undefined' &&
+          typeof lastQueriedControls[key] !== 'undefined' &&
           !areObjectsEqual(
             props.controls[key].value,
-            previousControls[key].value,
+            lastQueriedControls[key].value,
           ),
       );
 
@@ -355,7 +363,7 @@ function ExploreViewContainer(props) {
       );
     }
     return false;
-  }, [previousControls, props.controls]);
+  }, [lastQueriedControls, props.controls]);
 
   useEffect(() => {
     if (props.ownState !== undefined) {
@@ -440,6 +448,7 @@ function ExploreViewContainer(props) {
             margin-bottom: 0;
           }
           body {
+            height: 100vh;
             max-height: 100vh;
             overflow: hidden;
           }
@@ -450,7 +459,7 @@ function ExploreViewContainer(props) {
           #app {
             flex-basis: 100%;
             overflow: hidden;
-            height: 100vh;
+            height: 100%;
           }
           #app-menu {
             flex-shrink: 0;
@@ -572,7 +581,7 @@ function ExploreViewContainer(props) {
 ExploreViewContainer.propTypes = propTypes;
 
 function mapStateToProps(state) {
-  const { explore, charts, impressionId, dataMask } = state;
+  const { explore, charts, impressionId, dataMask, reports } = state;
   const form_data = getFormDataFromControls(explore.controls);
   form_data.extra_form_data = mergeExtraFormData(
     { ...form_data.extra_form_data },
@@ -612,6 +621,8 @@ function mapStateToProps(state) {
     ownState: dataMask[form_data.slice_id ?? 0]?.ownState, // 0 - unsaved chart
     impressionId,
     userId: explore.user_id,
+    user: explore.user,
+    reports,
   };
 }
 
diff --git a/superset-frontend/src/explore/components/PropertiesModal/index.tsx b/superset-frontend/src/explore/components/PropertiesModal/index.tsx
index 0c46f6ba792f..ab1e075a45cb 100644
--- a/superset-frontend/src/explore/components/PropertiesModal/index.tsx
+++ b/superset-frontend/src/explore/components/PropertiesModal/index.tsx
@@ -175,7 +175,7 @@ export default function PropertiesModal({
             buttonStyle="primary"
             // @ts-ignore
             onClick={onSubmit}
-            disabled={!owners || submitting || !name}
+            disabled={submitting || !name}
             cta
           >
             {t('Save')}
diff --git a/superset-frontend/src/explore/components/controls/BoundsControl.jsx b/superset-frontend/src/explore/components/controls/BoundsControl.jsx
index ff22cebf3b18..39a0d560bc33 100644
--- a/superset-frontend/src/explore/components/controls/BoundsControl.jsx
+++ b/superset-frontend/src/explore/components/controls/BoundsControl.jsx
@@ -97,8 +97,8 @@ export default class BoundsControl extends React.Component {
 
   onChange() {
     const mm = this.state.minMax;
-    const min = parseFloat(mm[0]) || null;
-    const max = parseFloat(mm[1]) || null;
+    const min = Number.isNaN(parseFloat(mm[0])) ? null : parseFloat(mm[0]);
+    const max = Number.isNaN(parseFloat(mm[1])) ? null : parseFloat(mm[1]);
     this.props.onChange([min, max]);
   }
 
diff --git a/superset-frontend/src/explore/components/controls/CollectionControl/index.jsx b/superset-frontend/src/explore/components/controls/CollectionControl/index.jsx
index c6e712840c96..384d23ed03a5 100644
--- a/superset-frontend/src/explore/components/controls/CollectionControl/index.jsx
+++ b/superset-frontend/src/explore/components/controls/CollectionControl/index.jsx
@@ -27,7 +27,7 @@ import {
   SortableElement,
   arrayMove,
 } from 'react-sortable-hoc';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import {
   HeaderContainer,
   AddIconButton,
@@ -80,8 +80,9 @@ class CollectionControl extends React.Component {
   }
 
   onChange(i, value) {
-    Object.assign(this.props.value[i], value);
-    this.props.onChange(this.props.value);
+    const newValue = [...this.props.value];
+    newValue[i] = { ...this.props.value[i], ...value };
+    this.props.onChange(newValue);
   }
 
   onAdd() {
@@ -156,11 +157,9 @@ class CollectionControl extends React.Component {
         <HeaderContainer>
           <ControlHeader {...this.props} />
           <AddIconButton onClick={this.onAdd}>
-            <Icon
-              name="plus-large"
-              width={theme.gridUnit * 3}
-              height={theme.gridUnit * 3}
-              color={theme.colors.grayscale.light5}
+            <Icons.PlusLarge
+              iconSize="s"
+              iconColor={theme.colors.grayscale.light5}
             />
           </AddIconButton>
         </HeaderContainer>
diff --git a/superset-frontend/src/explore/components/controls/ColorSchemeControl.jsx b/superset-frontend/src/explore/components/controls/ColorSchemeControl.jsx
index d26e91fb687e..cf1d4255208a 100644
--- a/superset-frontend/src/explore/components/controls/ColorSchemeControl.jsx
+++ b/superset-frontend/src/explore/components/controls/ColorSchemeControl.jsx
@@ -19,7 +19,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { isFunction } from 'lodash';
-import { Select } from 'src/components/Select';
+import { Select } from 'src/components';
 import { Tooltip } from 'src/components/Tooltip';
 import ControlHeader from '../ControlHeader';
 
@@ -54,14 +54,13 @@ export default class ColorSchemeControl extends React.PureComponent {
     this.renderOption = this.renderOption.bind(this);
   }
 
-  onChange(option) {
-    const optionValue = option ? option.value : null;
-    this.props.onChange(optionValue);
+  onChange(value) {
+    this.props.onChange(value);
   }
 
-  renderOption(key) {
+  renderOption(value) {
     const { isLinear } = this.props;
-    const currentScheme = this.schemes[key.value];
+    const currentScheme = this.schemes[value];
 
     // For categorical scheme, display all the colors
     // For sequential scheme, show 10 or interpolate to 10.
@@ -106,34 +105,28 @@ export default class ColorSchemeControl extends React.PureComponent {
   }
 
   render() {
-    const { schemes, choices, labelMargin = 0 } = this.props;
+    const { schemes, choices } = this.props;
     // save parsed schemes for later
     this.schemes = isFunction(schemes) ? schemes() : schemes;
+
     const options = (isFunction(choices) ? choices() : choices).map(
-      ([value, label]) => ({
+      ([value]) => ({
         value,
-        // use scheme label if available
-        label: this.schemes[value]?.label || label,
+        label: this.renderOption(value),
       }),
     );
     const selectProps = {
-      multi: false,
+      allowClear: this.props.clearable,
+      defaultValue: this.props.default,
       name: `select-${this.props.name}`,
-      placeholder: `Select (${options.length})`,
-      default: this.props.default,
+      onChange: this.onChange,
       options,
+      placeholder: `Select (${options.length})`,
+      showSearch: true,
       value: this.props.value,
-      autosize: false,
-      clearable: this.props.clearable,
-      onChange: this.onChange,
-      optionRenderer: this.renderOption,
-      valueRenderer: this.renderOption,
     };
     return (
-      <div>
-        <ControlHeader {...this.props} />
-        <Select {...selectProps} css={{ marginTop: labelMargin }} />
-      </div>
+      <Select header={<ControlHeader {...this.props} />} {...selectProps} />
     );
   }
 }
diff --git a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/ConditionalFormattingControl.tsx b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/ConditionalFormattingControl.tsx
new file mode 100644
index 000000000000..401364e0dfc0
--- /dev/null
+++ b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/ConditionalFormattingControl.tsx
@@ -0,0 +1,186 @@
+/**
+ * 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 React, { useCallback, useEffect, useState } from 'react';
+import { styled, css, t, useTheme } from '@superset-ui/core';
+import Icons from 'src/components/Icons';
+import ControlHeader from 'src/explore/components/ControlHeader';
+import { useComponentDidUpdate } from 'src/common/hooks/useComponentDidUpdate';
+import { FormattingPopover } from './FormattingPopover';
+import {
+  COMPARATOR,
+  ConditionalFormattingConfig,
+  ConditionalFormattingControlProps,
+} from './types';
+import {
+  AddControlLabel,
+  CaretContainer,
+  Label,
+  OptionControlContainer,
+} from '../OptionControls';
+
+const FormattersContainer = styled.div`
+  ${({ theme }) => css`
+    padding: ${theme.gridUnit}px;
+    border: solid 1px ${theme.colors.grayscale.light2};
+    border-radius: ${theme.gridUnit}px;
+  `}
+`;
+
+export const FormatterContainer = styled(OptionControlContainer)`
+  &,
+  & > div {
+    margin-bottom: ${({ theme }) => theme.gridUnit}px;
+    :last-child {
+      margin-bottom: 0;
+    }
+  }
+`;
+
+export const CloseButton = styled.button`
+  ${({ theme }) => css`
+    color: ${theme.colors.grayscale.light1};
+    height: 100%;
+    width: ${theme.gridUnit * 6}px;
+    border: none;
+    border-right: solid 1px ${theme.colors.grayscale.dark2}0C;
+    padding: 0;
+    outline: none;
+    border-bottom-left-radius: 3px;
+    border-top-left-radius: 3px;
+  `}
+`;
+
+const ConditionalFormattingControl = ({
+  value,
+  onChange,
+  columnOptions,
+  verboseMap,
+  ...props
+}: ConditionalFormattingControlProps) => {
+  const theme = useTheme();
+  const [
+    conditionalFormattingConfigs,
+    setConditionalFormattingConfigs,
+  ] = useState<ConditionalFormattingConfig[]>(value ?? []);
+
+  useEffect(() => {
+    if (onChange) {
+      onChange(conditionalFormattingConfigs);
+    }
+  }, [conditionalFormattingConfigs, onChange]);
+
+  // remove formatter when corresponding column is removed from controls
+  const removeFormattersWhenColumnsChange = useCallback(() => {
+    const newFormattingConfigs = conditionalFormattingConfigs.filter(config =>
+      columnOptions.some(option => option?.value === config?.column),
+    );
+    if (
+      newFormattingConfigs.length !== conditionalFormattingConfigs.length &&
+      onChange
+    ) {
+      setConditionalFormattingConfigs(newFormattingConfigs);
+      onChange(newFormattingConfigs);
+    }
+  }, [JSON.stringify(columnOptions)]);
+  useComponentDidUpdate(removeFormattersWhenColumnsChange);
+
+  const onDelete = (index: number) => {
+    setConditionalFormattingConfigs(prevConfigs =>
+      prevConfigs.filter((_, i) => i !== index),
+    );
+  };
+
+  const onSave = (config: ConditionalFormattingConfig) => {
+    setConditionalFormattingConfigs(prevConfigs => [...prevConfigs, config]);
+  };
+
+  const onEdit = (newConfig: ConditionalFormattingConfig, index: number) => {
+    const newConfigs = [...conditionalFormattingConfigs];
+    newConfigs.splice(index, 1, newConfig);
+    setConditionalFormattingConfigs(newConfigs);
+  };
+
+  const createLabel = ({
+    column,
+    operator,
+    targetValue,
+    targetValueLeft,
+    targetValueRight,
+  }: ConditionalFormattingConfig) => {
+    const columnName = (column && verboseMap?.[column]) ?? column;
+    switch (operator) {
+      case COMPARATOR.NONE:
+        return `${columnName}`;
+      case COMPARATOR.BETWEEN:
+        return `${targetValueLeft} ${COMPARATOR.LESS_THAN} ${columnName} ${COMPARATOR.LESS_THAN} ${targetValueRight}`;
+      case COMPARATOR.BETWEEN_OR_EQUAL:
+        return `${targetValueLeft} ${COMPARATOR.LESS_OR_EQUAL} ${columnName} ${COMPARATOR.LESS_OR_EQUAL} ${targetValueRight}`;
+      case COMPARATOR.BETWEEN_OR_LEFT_EQUAL:
+        return `${targetValueLeft} ${COMPARATOR.LESS_OR_EQUAL} ${columnName} ${COMPARATOR.LESS_THAN} ${targetValueRight}`;
+      case COMPARATOR.BETWEEN_OR_RIGHT_EQUAL:
+        return `${targetValueLeft} ${COMPARATOR.LESS_THAN} ${columnName} ${COMPARATOR.LESS_OR_EQUAL} ${targetValueRight}`;
+      default:
+        return `${columnName} ${operator} ${targetValue}`;
+    }
+  };
+
+  return (
+    <div>
+      <ControlHeader {...props} />
+      <FormattersContainer>
+        {conditionalFormattingConfigs.map((config, index) => (
+          <FormatterContainer key={index}>
+            <CloseButton onClick={() => onDelete(index)}>
+              <Icons.XSmall iconColor={theme.colors.grayscale.light1} />
+            </CloseButton>
+            <FormattingPopover
+              title={t('Edit formatter')}
+              config={config}
+              columns={columnOptions}
+              onChange={(newConfig: ConditionalFormattingConfig) =>
+                onEdit(newConfig, index)
+              }
+              destroyTooltipOnHide
+            >
+              <OptionControlContainer withCaret>
+                <Label>{createLabel(config)}</Label>
+                <CaretContainer>
+                  <Icons.CaretRight iconColor={theme.colors.grayscale.light1} />
+                </CaretContainer>
+              </OptionControlContainer>
+            </FormattingPopover>
+          </FormatterContainer>
+        ))}
+        <FormattingPopover
+          title={t('Add new formatter')}
+          columns={columnOptions}
+          onChange={onSave}
+          destroyTooltipOnHide
+        >
+          <AddControlLabel>
+            <Icons.PlusSmall iconColor={theme.colors.grayscale.light1} />
+            {t('Add new color formatter')}
+          </AddControlLabel>
+        </FormattingPopover>
+      </FormattersContainer>
+    </div>
+  );
+};
+
+export default ConditionalFormattingControl;
diff --git a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopover.tsx b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopover.tsx
new file mode 100644
index 000000000000..c44ca7623546
--- /dev/null
+++ b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopover.tsx
@@ -0,0 +1,61 @@
+/**
+ * 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 React, { useCallback, useState } from 'react';
+import Popover from 'src/components/Popover';
+import { FormattingPopoverContent } from './FormattingPopoverContent';
+import { ConditionalFormattingConfig, FormattingPopoverProps } from './types';
+
+export const FormattingPopover = ({
+  title,
+  columns,
+  onChange,
+  config,
+  children,
+  ...props
+}: FormattingPopoverProps) => {
+  const [visible, setVisible] = useState(false);
+
+  const handleSave = useCallback(
+    (newConfig: ConditionalFormattingConfig) => {
+      setVisible(false);
+      onChange(newConfig);
+    },
+    [onChange],
+  );
+
+  return (
+    <Popover
+      title={title}
+      content={
+        <FormattingPopoverContent
+          onChange={handleSave}
+          config={config}
+          columns={columns}
+        />
+      }
+      visible={visible}
+      onVisibleChange={setVisible}
+      trigger={['click']}
+      overlayStyle={{ width: '450px' }}
+      {...props}
+    >
+      {children}
+    </Popover>
+  );
+};
diff --git a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.tsx b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.tsx
new file mode 100644
index 000000000000..85f406c08d18
--- /dev/null
+++ b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.tsx
@@ -0,0 +1,229 @@
+/**
+ * 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 React from 'react';
+import { styled, t } from '@superset-ui/core';
+import { Form, FormItem, FormProps } from 'src/components/Form';
+import { Select } from 'src/components';
+import { Col, InputNumber, Row } from 'src/common/components';
+import Button from 'src/components/Button';
+import {
+  COMPARATOR,
+  ConditionalFormattingConfig,
+  MULTIPLE_VALUE_COMPARATORS,
+} from './types';
+
+const FullWidthInputNumber = styled(InputNumber)`
+  width: 100%;
+`;
+
+const JustifyEnd = styled.div`
+  display: flex;
+  justify-content: flex-end;
+`;
+
+const colorSchemeOptions = [
+  { value: 'rgb(0,255,0)', label: t('green') },
+  { value: 'rgb(255,255,0)', label: t('yellow') },
+  { value: 'rgb(255,0,0)', label: t('red') },
+];
+
+const operatorOptions = [
+  { value: COMPARATOR.NONE, label: 'None' },
+  { value: COMPARATOR.GREATER_THAN, label: '>' },
+  { value: COMPARATOR.LESS_THAN, label: '<' },
+  { value: COMPARATOR.GREATER_OR_EQUAL, label: '≥' },
+  { value: COMPARATOR.LESS_OR_EQUAL, label: '≤' },
+  { value: COMPARATOR.EQUAL, label: '=' },
+  { value: COMPARATOR.NOT_EQUAL, label: '≠' },
+  { value: COMPARATOR.BETWEEN, label: '< x <' },
+  { value: COMPARATOR.BETWEEN_OR_EQUAL, label: '≤ x ≤' },
+  { value: COMPARATOR.BETWEEN_OR_LEFT_EQUAL, label: '≤ x <' },
+  { value: COMPARATOR.BETWEEN_OR_RIGHT_EQUAL, label: '< x ≤' },
+];
+
+const targetValueValidator = (
+  compare: (targetValue: number, compareValue: number) => boolean,
+  rejectMessage: string,
+) => (targetValue: number | string) => (
+  _: any,
+  compareValue: number | string,
+) => {
+  if (
+    !targetValue ||
+    !compareValue ||
+    compare(Number(targetValue), Number(compareValue))
+  ) {
+    return Promise.resolve();
+  }
+  return Promise.reject(new Error(rejectMessage));
+};
+
+const targetValueLeftValidator = targetValueValidator(
+  (target: number, val: number) => target > val,
+  t('This value should be smaller than the right target value'),
+);
+
+const targetValueRightValidator = targetValueValidator(
+  (target: number, val: number) => target < val,
+  t('This value should be greater than the left target value'),
+);
+
+const isOperatorMultiValue = (operator?: COMPARATOR) =>
+  operator && MULTIPLE_VALUE_COMPARATORS.includes(operator);
+
+const isOperatorNone = (operator?: COMPARATOR) =>
+  !operator || operator === COMPARATOR.NONE;
+
+const rulesRequired = [{ required: true, message: t('Required') }];
+
+type GetFieldValue = Pick<Required<FormProps>['form'], 'getFieldValue'>;
+const rulesTargetValueLeft = [
+  { required: true, message: t('Required') },
+  ({ getFieldValue }: GetFieldValue) => ({
+    validator: targetValueLeftValidator(getFieldValue('targetValueRight')),
+  }),
+];
+
+const rulesTargetValueRight = [
+  { required: true, message: t('Required') },
+  ({ getFieldValue }: GetFieldValue) => ({
+    validator: targetValueRightValidator(getFieldValue('targetValueLeft')),
+  }),
+];
+
+const targetValueLeftDeps = ['targetValueRight'];
+const targetValueRightDeps = ['targetValueLeft'];
+
+const shouldFormItemUpdate = (
+  prevValues: ConditionalFormattingConfig,
+  currentValues: ConditionalFormattingConfig,
+) =>
+  isOperatorNone(prevValues.operator) !==
+    isOperatorNone(currentValues.operator) ||
+  isOperatorMultiValue(prevValues.operator) !==
+    isOperatorMultiValue(currentValues.operator);
+
+const operatorField = (
+  <FormItem
+    name="operator"
+    label={t('Operator')}
+    rules={rulesRequired}
+    initialValue={operatorOptions[0].value}
+  >
+    <Select ariaLabel={t('Operator')} options={operatorOptions} />
+  </FormItem>
+);
+
+const renderOperatorFields = ({ getFieldValue }: GetFieldValue) =>
+  isOperatorNone(getFieldValue('operator')) ? (
+    <Row gutter={12}>
+      <Col span={6}>{operatorField}</Col>
+    </Row>
+  ) : isOperatorMultiValue(getFieldValue('operator')) ? (
+    <Row gutter={12}>
+      <Col span={9}>
+        <FormItem
+          name="targetValueLeft"
+          label={t('Left value')}
+          rules={rulesTargetValueLeft}
+          dependencies={targetValueLeftDeps}
+          validateTrigger="onBlur"
+          trigger="onBlur"
+        >
+          <FullWidthInputNumber />
+        </FormItem>
+      </Col>
+      <Col span={6}>{operatorField}</Col>
+      <Col span={9}>
+        <FormItem
+          name="targetValueRight"
+          label={t('Right value')}
+          rules={rulesTargetValueRight}
+          dependencies={targetValueRightDeps}
+          validateTrigger="onBlur"
+          trigger="onBlur"
+        >
+          <FullWidthInputNumber />
+        </FormItem>
+      </Col>
+    </Row>
+  ) : (
+    <Row gutter={12}>
+      <Col span={6}>{operatorField}</Col>
+      <Col span={18}>
+        <FormItem
+          name="targetValue"
+          label={t('Target value')}
+          rules={rulesRequired}
+        >
+          <FullWidthInputNumber />
+        </FormItem>
+      </Col>
+    </Row>
+  );
+
+export const FormattingPopoverContent = ({
+  config,
+  onChange,
+  columns = [],
+}: {
+  config?: ConditionalFormattingConfig;
+  onChange: (config: ConditionalFormattingConfig) => void;
+  columns: { label: string; value: string }[];
+}) => (
+  <Form
+    onFinish={onChange}
+    initialValues={config}
+    requiredMark="optional"
+    layout="vertical"
+  >
+    <Row gutter={12}>
+      <Col span={12}>
+        <FormItem
+          name="column"
+          label={t('Column')}
+          rules={rulesRequired}
+          initialValue={columns[0]?.value}
+        >
+          <Select ariaLabel={t('Select column')} options={columns} />
+        </FormItem>
+      </Col>
+      <Col span={12}>
+        <FormItem
+          name="colorScheme"
+          label={t('Color scheme')}
+          rules={rulesRequired}
+          initialValue={colorSchemeOptions[0].value}
+        >
+          <Select ariaLabel={t('Color scheme')} options={colorSchemeOptions} />
+        </FormItem>
+      </Col>
+    </Row>
+    <FormItem noStyle shouldUpdate={shouldFormItemUpdate}>
+      {renderOperatorFields}
+    </FormItem>
+    <FormItem>
+      <JustifyEnd>
+        <Button htmlType="submit" buttonStyle="primary">
+          {t('Apply')}
+        </Button>
+      </JustifyEnd>
+    </FormItem>
+  </Form>
+);
diff --git a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/index.ts b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/index.ts
new file mode 100644
index 000000000000..ba5d7c971287
--- /dev/null
+++ b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/index.ts
@@ -0,0 +1,22 @@
+/**
+ * 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 ConditionalFormattingControl from './ConditionalFormattingControl';
+
+export * from './types';
+export default ConditionalFormattingControl;
diff --git a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/types.ts b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/types.ts
new file mode 100644
index 000000000000..99f2da1e9584
--- /dev/null
+++ b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/types.ts
@@ -0,0 +1,69 @@
+/**
+ * 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 { ReactNode } from 'react';
+import { PopoverProps } from 'antd/lib/popover';
+import { ControlComponentProps } from '@superset-ui/chart-controls/lib/shared-controls/components/types';
+
+export enum COMPARATOR {
+  NONE = 'None',
+  GREATER_THAN = '>',
+  LESS_THAN = '<',
+  GREATER_OR_EQUAL = '≥',
+  LESS_OR_EQUAL = '≤',
+  EQUAL = '=',
+  NOT_EQUAL = '≠',
+  BETWEEN = '< x <',
+  BETWEEN_OR_EQUAL = '≤ x ≤',
+  BETWEEN_OR_LEFT_EQUAL = '≤ x <',
+  BETWEEN_OR_RIGHT_EQUAL = '< x ≤',
+}
+
+export const MULTIPLE_VALUE_COMPARATORS = [
+  COMPARATOR.BETWEEN,
+  COMPARATOR.BETWEEN_OR_EQUAL,
+  COMPARATOR.BETWEEN_OR_LEFT_EQUAL,
+  COMPARATOR.BETWEEN_OR_RIGHT_EQUAL,
+];
+
+export type ConditionalFormattingConfig = {
+  operator?: COMPARATOR;
+  targetValue?: number;
+  targetValueLeft?: number;
+  targetValueRight?: number;
+  column?: string;
+  colorScheme?: string;
+};
+
+export type ConditionalFormattingControlProps = ControlComponentProps<
+  ConditionalFormattingConfig[]
+> & {
+  columnOptions: { label: string; value: string }[];
+  verboseMap: Record<string, string>;
+  label: string;
+  description: string;
+};
+
+export type FormattingPopoverProps = PopoverProps & {
+  columns: { label: string; value: string }[];
+  onChange: (value: ConditionalFormattingConfig) => void;
+  config?: ConditionalFormattingConfig;
+  title: string;
+  children: ReactNode;
+};
diff --git a/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx b/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx
index 616cc79f7ca7..3df55323d11d 100644
--- a/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx
+++ b/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx
@@ -1,3 +1,4 @@
+/* eslint-disable camelcase */
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -22,7 +23,6 @@ import { t, styled, supersetTheme } from '@superset-ui/core';
 
 import { Dropdown, Menu } from 'src/common/components';
 import { Tooltip } from 'src/components/Tooltip';
-import Icon from 'src/components/Icon';
 import Icons from 'src/components/Icons';
 import ChangeDatasourceModal from 'src/datasource/ChangeDatasourceModal';
 import DatasourceModal from 'src/datasource/DatasourceModal';
@@ -36,6 +36,7 @@ const propTypes = {
   onChange: PropTypes.func,
   value: PropTypes.string,
   datasource: PropTypes.object.isRequired,
+  form_data: PropTypes.object.isRequired,
   isEditable: PropTypes.bool,
   onDatasourceSave: PropTypes.func,
 };
@@ -93,6 +94,12 @@ const Styles = styled.div`
     margin-right: ${({ theme }) => 2 * theme.gridUnit}px;
     flex: none;
   }
+  span[aria-label='dataset-physical'] {
+    color: ${({ theme }) => theme.colors.grayscale.base};
+  }
+  span[aria-label='more-vert'] {
+    color: ${({ theme }) => theme.colors.primary.base};
+  }
 `;
 
 const CHANGE_DATASET = 'change_dataset';
@@ -117,6 +124,19 @@ class DatasourceControl extends React.PureComponent {
 
   onDatasourceSave(datasource) {
     this.props.actions.setDatasource(datasource);
+    const timeCol = this.props.form_data?.granularity_sqla;
+    const { columns } = this.props.datasource;
+    const firstDttmCol = columns.find(column => column.is_dttm);
+    if (
+      datasource.type === 'table' &&
+      !columns.find(({ column_name }) => column_name === timeCol)?.is_dttm
+    ) {
+      // set `granularity_sqla` to first datatime column name or null
+      this.props.actions.setControlValue(
+        'granularity_sqla',
+        firstDttmCol ? firstDttmCol.column_name : null,
+      );
+    }
     if (this.props.onDatasourceSave) {
       this.props.onDatasourceSave(datasource);
     }
@@ -190,7 +210,7 @@ class DatasourceControl extends React.PureComponent {
     return (
       <Styles data-test="datasource-control" className="DatasourceControl">
         <div className="data-container">
-          <Icon name="dataset-physical" className="dataset-svg" />
+          <Icons.DatasetPhysical className="dataset-svg" />
           {/* Add a tooltip only for long dataset names */}
           {!isMissingDatasource && datasource.name.length > 25 ? (
             <Tooltip title={datasource.name}>
@@ -206,11 +226,8 @@ class DatasourceControl extends React.PureComponent {
               <Icons.AlertSolid iconColor={supersetTheme.colors.warning.base} />
             </Tooltip>
           )}
-          {extra?.warning_markdown && ( // eslint-disable-line camelcase
-            <WarningIconWithTooltip
-              warningMarkdown={extra.warning_markdown} // eslint-disable-line camelcase
-              size={30}
-            />
+          {extra?.warning_markdown && (
+            <WarningIconWithTooltip warningMarkdown={extra.warning_markdown} />
           )}
           <Dropdown
             overlay={datasourceMenu}
@@ -218,10 +235,9 @@ class DatasourceControl extends React.PureComponent {
             data-test="datasource-menu"
           >
             <Tooltip title={t('More dataset related options')}>
-              <Icon
+              <Icons.MoreVert
                 className="datasource-modal-trigger"
                 data-test="datasource-menu-trigger"
-                name="more-horiz"
               />
             </Tooltip>
           </Dropdown>
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx
index 2674eca5f1d1..71f84a8459ff 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx
@@ -21,9 +21,9 @@ import rison from 'rison';
 import {
   SupersetClient,
   styled,
-  supersetTheme,
   t,
   TimeRangeEndpoints,
+  useTheme,
 } from '@superset-ui/core';
 import {
   buildTimeRangeString,
@@ -36,17 +36,17 @@ import {
 import { getClientErrorObject } from 'src/utils/getClientErrorObject';
 import Button from 'src/components/Button';
 import ControlHeader from 'src/explore/components/ControlHeader';
-import Label from 'src/components/Label';
+import Label, { Type } from 'src/components/Label';
 import Popover from 'src/components/Popover';
 import { Divider } from 'src/common/components';
-import Icon from 'src/components/Icon';
-import { Select } from 'src/components/Select';
+import Icons from 'src/components/Icons';
+import { Select } from 'src/components';
 import { Tooltip } from 'src/components/Tooltip';
 import { DEFAULT_TIME_RANGE } from 'src/explore/constants';
 import { useDebouncedEffect } from 'src/explore/exploreUtils';
 import { SLOW_DEBOUNCE } from 'src/constants';
 import { testWithId } from 'src/utils/testUtils';
-import { SelectOptionType, FrameType } from './types';
+import { FrameType } from './types';
 
 import {
   CommonFrame,
@@ -95,6 +95,9 @@ const fetchTimeRange = async (
 };
 
 const StyledPopover = styled(Popover)``;
+const StyledRangeType = styled(Select)`
+  width: 272px;
+`;
 
 const ContentStyleWrapper = styled.div`
   .ant-row {
@@ -105,10 +108,6 @@ const ContentStyleWrapper = styled.div`
     width: 100%;
   }
 
-  .frame-dropdown {
-    width: 272px;
-  }
-
   .ant-picker {
     padding: 4px 17px 4px;
     border-radius: 4px;
@@ -156,7 +155,7 @@ const ContentStyleWrapper = styled.div`
 `;
 
 const IconWrapper = styled.span`
-  svg {
+  span {
     margin-right: ${({ theme }) => 2 * theme.gridUnit}px;
     vertical-align: middle;
   }
@@ -173,6 +172,7 @@ interface DateFilterControlProps {
   onChange: (timeRange: string) => void;
   value?: string;
   endpoints?: TimeRangeEndpoints;
+  type?: Type;
 }
 
 export const DATE_FILTER_CONTROL_TEST_ID = 'date-filter-control';
@@ -181,12 +181,13 @@ export const getDateFilterControlTestId = testWithId(
 );
 
 export default function DateFilterLabel(props: DateFilterControlProps) {
-  const { value = DEFAULT_TIME_RANGE, endpoints, onChange } = props;
+  const { value = DEFAULT_TIME_RANGE, endpoints, onChange, type } = props;
   const [actualTimeRange, setActualTimeRange] = useState<string>(value);
 
   const [show, setShow] = useState<boolean>(false);
   const guessedFrame = useMemo(() => guessFrame(value), [value]);
   const [frame, setFrame] = useState<FrameType>(guessedFrame);
+  const [lastFetchedTimeRange, setLastFetchedTimeRange] = useState(value);
   const [timeRangeValue, setTimeRangeValue] = useState(value);
   const [validTimeRange, setValidTimeRange] = useState<boolean>(false);
   const [evalResponse, setEvalResponse] = useState<string>(value);
@@ -216,27 +217,37 @@ export default function DateFilterLabel(props: DateFilterControlProps) {
           guessedFrame === 'No filter'
         ) {
           setActualTimeRange(value);
-          setTooltipTitle(actualRange || '');
+          setTooltipTitle(
+            type === ('error' as Type)
+              ? t('Default value is required')
+              : actualRange || '',
+          );
         } else {
           setActualTimeRange(actualRange || '');
           setTooltipTitle(value || '');
         }
         setValidTimeRange(true);
       }
+      setLastFetchedTimeRange(value);
     });
   }, [value]);
 
   useDebouncedEffect(
     () => {
-      fetchTimeRange(timeRangeValue, endpoints).then(({ value, error }) => {
-        if (error) {
-          setEvalResponse(error || '');
-          setValidTimeRange(false);
-        } else {
-          setEvalResponse(value || '');
-          setValidTimeRange(true);
-        }
-      });
+      if (lastFetchedTimeRange !== timeRangeValue) {
+        fetchTimeRange(timeRangeValue, endpoints).then(
+          ({ value: actualRange, error }) => {
+            if (error) {
+              setEvalResponse(error || '');
+              setValidTimeRange(false);
+            } else {
+              setEvalResponse(actualRange || '');
+              setValidTimeRange(true);
+            }
+            setLastFetchedTimeRange(timeRangeValue);
+          },
+        );
+      }
     },
     SLOW_DEBOUNCE,
     [timeRangeValue],
@@ -267,21 +278,23 @@ export default function DateFilterLabel(props: DateFilterControlProps) {
     }
   };
 
-  function onChangeFrame(option: SelectOptionType) {
-    if (option.value === 'No filter') {
+  function onChangeFrame(value: string) {
+    if (value === 'No filter') {
       setTimeRangeValue('No filter');
     }
-    setFrame(option.value as FrameType);
+    setFrame(value as FrameType);
   }
 
-  const overlayConetent = (
+  const theme = useTheme();
+
+  const overlayContent = (
     <ContentStyleWrapper>
       <div className="control-label">{t('RANGE TYPE')}</div>
-      <Select
+      <StyledRangeType
+        ariaLabel={t('RANGE TYPE')}
         options={FRAME_OPTIONS}
-        value={FRAME_OPTIONS.filter(({ value }) => value === frame)}
+        value={frame}
         onChange={onChangeFrame}
-        className="frame-dropdown"
       />
       {frame !== 'No filter' && <Divider />}
       {frame === 'Common' && (
@@ -303,10 +316,7 @@ export default function DateFilterLabel(props: DateFilterControlProps) {
         {validTimeRange && <div>{evalResponse}</div>}
         {!validTimeRange && (
           <IconWrapper className="warning">
-            <Icon
-              name="error-solid-small"
-              color={supersetTheme.colors.error.base}
-            />
+            <Icons.ErrorSolidSmall iconColor={theme.colors.error.base} />
             <span className="text error">{evalResponse}</span>
           </IconWrapper>
         )}
@@ -338,7 +348,7 @@ export default function DateFilterLabel(props: DateFilterControlProps) {
 
   const title = (
     <IconWrapper>
-      <Icon name="edit-alt" />
+      <Icons.EditAlt iconColor={theme.colors.grayscale.base} />
       <span className="text">{t('Edit time range')}</span>
     </IconWrapper>
   );
@@ -353,7 +363,7 @@ export default function DateFilterLabel(props: DateFilterControlProps) {
       <StyledPopover
         placement="right"
         trigger="click"
-        content={overlayConetent}
+        content={overlayContent}
         title={title}
         defaultVisible={show}
         visible={show}
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/components/CalendarFrame.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/components/CalendarFrame.tsx
index ad6a37cbe2d1..1137dcca1703 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/components/CalendarFrame.tsx
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/components/CalendarFrame.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React from 'react';
+import React, { useEffect } from 'react';
 import { t } from '@superset-ui/core';
 import { Radio } from 'src/components/Radio';
 import {
@@ -29,12 +29,15 @@ import {
   FrameComponentProps,
 } from '../types';
 
-export function CalendarFrame(props: FrameComponentProps) {
-  let calendarRange = PreviousCalendarWeek;
-  if (CALENDAR_RANGE_SET.has(props.value as CalendarRangeType)) {
-    calendarRange = props.value;
-  } else {
-    props.onChange(calendarRange);
+export function CalendarFrame({ onChange, value }: FrameComponentProps) {
+  useEffect(() => {
+    if (!CALENDAR_RANGE_SET.has(value as CalendarRangeType)) {
+      onChange(PreviousCalendarWeek);
+    }
+  }, [onChange, value]);
+
+  if (!CALENDAR_RANGE_SET.has(value as CalendarRangeType)) {
+    return null;
   }
 
   return (
@@ -43,8 +46,8 @@ export function CalendarFrame(props: FrameComponentProps) {
         {t('Configure Time Range: Previous...')}
       </div>
       <Radio.Group
-        value={calendarRange}
-        onChange={(e: any) => props.onChange(e.target.value)}
+        value={value}
+        onChange={(e: any) => onChange(e.target.value)}
       >
         {CALENDAR_RANGE_OPTIONS.map(({ value, label }) => (
           <Radio key={value} value={value} className="vertical-radio">
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.test.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.test.tsx
index 94efa8df5dea..6cb5c4f56cd0 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.test.tsx
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.test.tsx
@@ -96,10 +96,10 @@ test('triggers onChange when the value changes', () => {
 test('triggers onChange when the mode changes', () => {
   const onChange = jest.fn();
   render(<CustomFrame onChange={onChange} value={todayNowValue} />);
-  userEvent.click(screen.getByText('Midnight'));
-  userEvent.click(screen.getByText('Relative Date/Time'));
-  userEvent.click(screen.getByText('Now'));
-  userEvent.click(screen.getByText('Specific Date/Time'));
+  userEvent.click(screen.getByTitle('Midnight'));
+  userEvent.click(screen.getByTitle('Relative Date/Time'));
+  userEvent.click(screen.getAllByTitle('Now')[1]);
+  userEvent.click(screen.getAllByTitle('Specific Date/Time')[1]);
   expect(onChange).toHaveBeenCalledTimes(2);
 });
 
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx
index b9269a440487..8125f0e9a6a7 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx
@@ -23,7 +23,7 @@ import { isInteger } from 'lodash';
 import { Col, InputNumber, Row } from 'src/common/components';
 import { DatePicker } from 'src/components/DatePicker';
 import { Radio } from 'src/components/Radio';
-import { Select } from 'src/components/Select';
+import { Select } from 'src/components';
 import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
 import {
   SINCE_GRAIN_OPTIONS,
@@ -38,7 +38,6 @@ import {
 } from 'src/explore/components/controls/DateFilterControl/utils';
 import {
   CustomRangeKey,
-  SelectOptionType,
   FrameComponentProps,
 } from 'src/explore/components/controls/DateFilterControl/types';
 
@@ -118,13 +117,10 @@ export function CustomFrame(props: FrameComponentProps) {
             />
           </div>
           <Select
+            ariaLabel={t('START (INCLUSIVE)')}
             options={SINCE_MODE_OPTIONS}
-            value={SINCE_MODE_OPTIONS.filter(
-              option => option.value === sinceMode,
-            )}
-            onChange={(option: SelectOptionType) =>
-              onChange('sinceMode', option.value)
-            }
+            value={sinceMode}
+            onChange={(value: string) => onChange('sinceMode', value)}
           />
           {sinceMode === 'specific' && (
             <Row>
@@ -155,13 +151,10 @@ export function CustomFrame(props: FrameComponentProps) {
               </Col>
               <Col span={13}>
                 <Select
+                  ariaLabel={t('Relative period')}
                   options={SINCE_GRAIN_OPTIONS}
-                  value={SINCE_GRAIN_OPTIONS.filter(
-                    option => option.value === sinceGrain,
-                  )}
-                  onChange={(option: SelectOptionType) =>
-                    onChange('sinceGrain', option.value)
-                  }
+                  value={sinceGrain}
+                  onChange={(value: string) => onChange('sinceGrain', value)}
                 />
               </Col>
             </Row>
@@ -176,13 +169,10 @@ export function CustomFrame(props: FrameComponentProps) {
             />
           </div>
           <Select
+            ariaLabel={t('END (EXCLUSIVE)')}
             options={UNTIL_MODE_OPTIONS}
-            value={UNTIL_MODE_OPTIONS.filter(
-              option => option.value === untilMode,
-            )}
-            onChange={(option: SelectOptionType) =>
-              onChange('untilMode', option.value)
-            }
+            value={untilMode}
+            onChange={(value: string) => onChange('untilMode', value)}
           />
           {untilMode === 'specific' && (
             <Row>
@@ -212,13 +202,10 @@ export function CustomFrame(props: FrameComponentProps) {
               </Col>
               <Col span={13}>
                 <Select
+                  ariaLabel={t('Relative period')}
                   options={UNTIL_GRAIN_OPTIONS}
-                  value={UNTIL_GRAIN_OPTIONS.filter(
-                    option => option.value === untilGrain,
-                  )}
-                  onChange={(option: SelectOptionType) =>
-                    onChange('untilGrain', option.value)
-                  }
+                  value={untilGrain}
+                  onChange={(value: string) => onChange('untilGrain', value)}
                 />
               </Col>
             </Row>
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
new file mode 100644
index 000000000000..c58b3d382e6d
--- /dev/null
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
@@ -0,0 +1,223 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/* eslint-disable camelcase */
+import React, { useCallback, useMemo, useState } from 'react';
+import Tabs from 'src/components/Tabs';
+import Button from 'src/components/Button';
+import { NativeSelect as Select } from 'src/components/Select';
+import { t, styled } from '@superset-ui/core';
+
+import { Form, FormItem } from 'src/components/Form';
+import { StyledColumnOption } from 'src/explore/components/optionRenderers';
+import { ColumnMeta } from '@superset-ui/chart-controls';
+
+const StyledSelect = styled(Select)`
+  .metric-option {
+    & > svg {
+      min-width: ${({ theme }) => `${theme.gridUnit * 4}px`};
+    }
+    & > .option-label {
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  }
+`;
+
+interface ColumnSelectPopoverProps {
+  columns: ColumnMeta[];
+  editedColumn?: ColumnMeta;
+  onChange: (column: ColumnMeta) => void;
+  onClose: () => void;
+}
+
+const ColumnSelectPopover = ({
+  columns,
+  editedColumn,
+  onChange,
+  onClose,
+}: ColumnSelectPopoverProps) => {
+  const [
+    initialCalculatedColumn,
+    initialSimpleColumn,
+  ] = editedColumn?.expression
+    ? [editedColumn, undefined]
+    : [undefined, editedColumn];
+  const [selectedCalculatedColumn, setSelectedCalculatedColumn] = useState(
+    initialCalculatedColumn,
+  );
+  const [selectedSimpleColumn, setSelectedSimpleColumn] = useState(
+    initialSimpleColumn,
+  );
+
+  const [calculatedColumns, simpleColumns] = useMemo(
+    () =>
+      columns?.reduce(
+        (acc: [ColumnMeta[], ColumnMeta[]], column: ColumnMeta) => {
+          if (column.expression) {
+            acc[0].push(column);
+          } else {
+            acc[1].push(column);
+          }
+          return acc;
+        },
+        [[], []],
+      ),
+    [columns],
+  );
+
+  const onCalculatedColumnChange = useCallback(
+    selectedColumnName => {
+      const selectedColumn = calculatedColumns.find(
+        col => col.column_name === selectedColumnName,
+      );
+      setSelectedCalculatedColumn(selectedColumn);
+      setSelectedSimpleColumn(undefined);
+    },
+    [calculatedColumns],
+  );
+
+  const onSimpleColumnChange = useCallback(
+    selectedColumnName => {
+      const selectedColumn = simpleColumns.find(
+        col => col.column_name === selectedColumnName,
+      );
+      setSelectedCalculatedColumn(undefined);
+      setSelectedSimpleColumn(selectedColumn);
+    },
+    [simpleColumns],
+  );
+
+  const defaultActiveTabKey =
+    initialSimpleColumn || calculatedColumns.length === 0 ? 'simple' : 'saved';
+
+  const onSave = useCallback(() => {
+    const selectedColumn = selectedCalculatedColumn || selectedSimpleColumn;
+    if (!selectedColumn) {
+      return;
+    }
+    onChange(selectedColumn);
+    onClose();
+  }, [onChange, onClose, selectedCalculatedColumn, selectedSimpleColumn]);
+
+  const onResetStateAndClose = useCallback(() => {
+    setSelectedCalculatedColumn(initialCalculatedColumn);
+    setSelectedSimpleColumn(initialSimpleColumn);
+    onClose();
+  }, [initialCalculatedColumn, initialSimpleColumn, onClose]);
+
+  const stateIsValid = selectedCalculatedColumn || selectedSimpleColumn;
+  const hasUnsavedChanges =
+    selectedCalculatedColumn?.column_name !==
+      initialCalculatedColumn?.column_name ||
+    selectedSimpleColumn?.column_name !== initialSimpleColumn?.column_name;
+
+  const filterOption = useCallback(
+    (input, option) =>
+      option?.filterBy.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+    [],
+  );
+
+  const getPopupContainer = useCallback(
+    (triggerNode: any) => triggerNode.parentNode,
+    [],
+  );
+
+  return (
+    <Form layout="vertical" id="metrics-edit-popover">
+      <Tabs
+        id="adhoc-metric-edit-tabs"
+        defaultActiveKey={defaultActiveTabKey}
+        className="adhoc-metric-edit-tabs"
+        allowOverflow
+      >
+        <Tabs.TabPane key="saved" tab={t('Saved')}>
+          <FormItem label={t('Saved expressions')}>
+            <StyledSelect
+              value={selectedCalculatedColumn?.column_name}
+              getPopupContainer={getPopupContainer}
+              onChange={onCalculatedColumnChange}
+              allowClear
+              showSearch
+              autoFocus={!selectedCalculatedColumn}
+              filterOption={filterOption}
+              placeholder={t('%s column(s)', calculatedColumns.length)}
+            >
+              {calculatedColumns.map(calculatedColumn => (
+                <Select.Option
+                  value={calculatedColumn.column_name}
+                  filterBy={
+                    calculatedColumn.verbose_name ||
+                    calculatedColumn.column_name
+                  }
+                  key={calculatedColumn.column_name}
+                >
+                  <StyledColumnOption column={calculatedColumn} showType />
+                </Select.Option>
+              ))}
+            </StyledSelect>
+          </FormItem>
+        </Tabs.TabPane>
+        <Tabs.TabPane key="simple" tab={t('Simple')}>
+          <FormItem label={t('Column')}>
+            <Select
+              value={selectedSimpleColumn?.column_name}
+              getPopupContainer={getPopupContainer}
+              onChange={onSimpleColumnChange}
+              allowClear
+              showSearch
+              autoFocus={!selectedSimpleColumn}
+              filterOption={filterOption}
+              placeholder={t('%s column(s)', simpleColumns.length)}
+            >
+              {simpleColumns.map(simpleColumn => (
+                <Select.Option
+                  value={simpleColumn.column_name}
+                  filterBy={
+                    simpleColumn.verbose_name || simpleColumn.column_name
+                  }
+                  key={simpleColumn.column_name}
+                >
+                  <StyledColumnOption column={simpleColumn} showType />
+                </Select.Option>
+              ))}
+            </Select>
+          </FormItem>
+        </Tabs.TabPane>
+      </Tabs>
+      <div>
+        <Button buttonSize="small" onClick={onResetStateAndClose} cta>
+          {t('Close')}
+        </Button>
+        <Button
+          disabled={!stateIsValid}
+          buttonStyle={
+            hasUnsavedChanges && stateIsValid ? 'primary' : 'default'
+          }
+          buttonSize="small"
+          onClick={onSave}
+          cta
+        >
+          {t('Save')}
+        </Button>
+      </div>
+    </Form>
+  );
+};
+
+export default ColumnSelectPopover;
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopoverTrigger.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopoverTrigger.tsx
new file mode 100644
index 000000000000..4caf086d4642
--- /dev/null
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopoverTrigger.tsx
@@ -0,0 +1,99 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React, { useCallback, useMemo, useState } from 'react';
+import { ColumnMeta } from '@superset-ui/chart-controls';
+import Popover from 'src/components/Popover';
+import { ExplorePopoverContent } from 'src/explore/components/ExploreContentPopover';
+import ColumnSelectPopover from './ColumnSelectPopover';
+
+interface ColumnSelectPopoverTriggerProps {
+  columns: ColumnMeta[];
+  editedColumn?: ColumnMeta;
+  onColumnEdit: (editedColumn: ColumnMeta) => void;
+  isControlledComponent?: boolean;
+  visible?: boolean;
+  togglePopover?: (visible: boolean) => void;
+  closePopover?: () => void;
+  children: React.ReactNode;
+}
+
+const ColumnSelectPopoverTrigger = ({
+  columns,
+  editedColumn,
+  onColumnEdit,
+  isControlledComponent,
+  children,
+  ...props
+}: ColumnSelectPopoverTriggerProps) => {
+  const [popoverVisible, setPopoverVisible] = useState(false);
+
+  const togglePopover = useCallback((visible: boolean) => {
+    setPopoverVisible(visible);
+  }, []);
+
+  const closePopover = useCallback(() => {
+    setPopoverVisible(false);
+  }, []);
+
+  const {
+    visible,
+    handleTogglePopover,
+    handleClosePopover,
+  } = isControlledComponent
+    ? {
+        visible: props.visible,
+        handleTogglePopover: props.togglePopover!,
+        handleClosePopover: props.closePopover!,
+      }
+    : {
+        visible: popoverVisible,
+        handleTogglePopover: togglePopover,
+        handleClosePopover: closePopover,
+      };
+
+  const overlayContent = useMemo(
+    () => (
+      <ExplorePopoverContent>
+        <ColumnSelectPopover
+          editedColumn={editedColumn}
+          columns={columns}
+          onClose={handleClosePopover}
+          onChange={onColumnEdit}
+        />
+      </ExplorePopoverContent>
+    ),
+    [columns, editedColumn, handleClosePopover, onColumnEdit],
+  );
+
+  return (
+    <Popover
+      placement="right"
+      trigger="click"
+      content={overlayContent}
+      defaultVisible={visible}
+      visible={visible}
+      onVisibleChange={handleTogglePopover}
+      destroyTooltipOnHide
+    >
+      {children}
+    </Popover>
+  );
+};
+
+export default ColumnSelectPopoverTrigger;
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.test.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.test.tsx
index 3a1325875cf7..93d00a70592d 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.test.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.test.tsx
@@ -29,7 +29,7 @@ const defaultProps: LabelProps = {
 
 test('renders with default props', () => {
   render(<DndColumnSelect {...defaultProps} />, { useDnd: true });
-  expect(screen.getByText('Drop columns')).toBeInTheDocument();
+  expect(screen.getByText('Drop columns here')).toBeInTheDocument();
 });
 
 test('renders with value', () => {
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.tsx
index 10c8bd60d27e..69cc6442e26a 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.tsx
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { useState } from 'react';
-import { tn } from '@superset-ui/core';
+import React, { useCallback, useMemo, useState } from 'react';
+import { FeatureFlag, isFeatureEnabled, tn } from '@superset-ui/core';
 import { ColumnMeta } from '@superset-ui/chart-controls';
 import { isEmpty } from 'lodash';
 import { LabelProps } from 'src/explore/components/controls/DndColumnSelectControl/types';
@@ -26,62 +26,207 @@ import OptionWrapper from 'src/explore/components/controls/DndColumnSelectContro
 import { OptionSelector } from 'src/explore/components/controls/DndColumnSelectControl/utils';
 import { DatasourcePanelDndItem } from 'src/explore/components/DatasourcePanel/types';
 import { DndItemType } from 'src/explore/components/DndItemType';
-import { StyledColumnOption } from 'src/explore/components/optionRenderers';
+import { useComponentDidUpdate } from 'src/common/hooks/useComponentDidUpdate';
+import ColumnSelectPopoverTrigger from './ColumnSelectPopoverTrigger';
 
 export const DndColumnSelect = (props: LabelProps) => {
-  const { value, options, multi = true } = props;
-  const optionSelector = new OptionSelector(options, value);
-  const [values, setValues] = useState<ColumnMeta[]>(optionSelector.values);
-
-  const onDrop = (item: DatasourcePanelDndItem) => {
-    const column = item.value as ColumnMeta;
-    if (!optionSelector.isArray && !isEmpty(optionSelector.values)) {
-      optionSelector.replace(0, column.column_name);
-    } else {
-      optionSelector.add(column.column_name);
+  const {
+    value,
+    options,
+    multi = true,
+    onChange,
+    canDelete = true,
+    ghostButtonText,
+    name,
+    label,
+  } = props;
+  const [newColumnPopoverVisible, setNewColumnPopoverVisible] = useState(false);
+
+  const optionSelector = useMemo(
+    () => new OptionSelector(options, multi, value),
+    [multi, options, value],
+  );
+
+  // synchronize values in case of dataset changes
+  const handleOptionsChange = useCallback(() => {
+    const optionSelectorValues = optionSelector.getValues();
+    if (typeof value !== typeof optionSelectorValues) {
+      onChange(optionSelectorValues);
     }
-    setValues(optionSelector.values);
-    props.onChange(optionSelector.getValues());
-  };
-
-  const canDrop = (item: DatasourcePanelDndItem) =>
-    (multi || optionSelector.values.length === 0) &&
-    !optionSelector.has((item.value as ColumnMeta).column_name);
-
-  const onClickClose = (index: number) => {
-    optionSelector.del(index);
-    setValues(optionSelector.values);
-    props.onChange(optionSelector.getValues());
-  };
-
-  const onShiftOptions = (dragIndex: number, hoverIndex: number) => {
-    optionSelector.swap(dragIndex, hoverIndex);
-    setValues(optionSelector.values);
-    props.onChange(optionSelector.getValues());
-  };
-
-  const valuesRenderer = () =>
-    values.map((column, idx) => (
-      <OptionWrapper
-        key={idx}
-        index={idx}
-        clickClose={onClickClose}
-        onShiftOptions={onShiftOptions}
-        type={DndItemType.ColumnOption}
-      >
-        <StyledColumnOption column={column} showType />
-      </OptionWrapper>
-    ));
+    if (
+      typeof value === 'string' &&
+      typeof optionSelectorValues === 'string' &&
+      value !== optionSelectorValues
+    ) {
+      onChange(optionSelectorValues);
+    }
+    if (
+      Array.isArray(optionSelectorValues) &&
+      Array.isArray(value) &&
+      (optionSelectorValues.length !== value.length ||
+        optionSelectorValues.every((val, index) => val === value[index]))
+    ) {
+      onChange(optionSelectorValues);
+    }
+  }, [JSON.stringify(value), JSON.stringify(optionSelector.getValues())]);
+
+  // useComponentDidUpdate to avoid running this for the first render, to avoid
+  // calling onChange when the initial value is not valid for the dataset
+  useComponentDidUpdate(handleOptionsChange);
+
+  const onDrop = useCallback(
+    (item: DatasourcePanelDndItem) => {
+      const column = item.value as ColumnMeta;
+      if (!optionSelector.multi && !isEmpty(optionSelector.values)) {
+        optionSelector.replace(0, column.column_name);
+      } else {
+        optionSelector.add(column.column_name);
+      }
+      onChange(optionSelector.getValues());
+    },
+    [onChange, optionSelector],
+  );
+
+  const canDrop = useCallback(
+    (item: DatasourcePanelDndItem) => {
+      const columnName = (item.value as ColumnMeta).column_name;
+      return (
+        columnName in optionSelector.options && !optionSelector.has(columnName)
+      );
+    },
+    [optionSelector],
+  );
+
+  const onClickClose = useCallback(
+    (index: number) => {
+      optionSelector.del(index);
+      onChange(optionSelector.getValues());
+    },
+    [onChange, optionSelector],
+  );
+
+  const onShiftOptions = useCallback(
+    (dragIndex: number, hoverIndex: number) => {
+      optionSelector.swap(dragIndex, hoverIndex);
+      onChange(optionSelector.getValues());
+    },
+    [onChange, optionSelector],
+  );
+
+  const popoverOptions = useMemo(
+    () =>
+      Object.values(options).filter(
+        col =>
+          !optionSelector.values
+            .map(val => val.column_name)
+            .includes(col.column_name),
+      ),
+    [optionSelector.values, options],
+  );
+
+  const valuesRenderer = useCallback(
+    () =>
+      optionSelector.values.map((column, idx) =>
+        isFeatureEnabled(FeatureFlag.ENABLE_DND_WITH_CLICK_UX) ? (
+          <ColumnSelectPopoverTrigger
+            columns={popoverOptions}
+            onColumnEdit={newColumn => {
+              optionSelector.replace(idx, newColumn.column_name);
+              onChange(optionSelector.getValues());
+            }}
+            editedColumn={column}
+          >
+            <OptionWrapper
+              key={idx}
+              index={idx}
+              clickClose={onClickClose}
+              onShiftOptions={onShiftOptions}
+              type={`${DndItemType.ColumnOption}_${name}_${label}`}
+              canDelete={canDelete}
+              column={column}
+              withCaret
+            />
+          </ColumnSelectPopoverTrigger>
+        ) : (
+          <OptionWrapper
+            key={idx}
+            index={idx}
+            clickClose={onClickClose}
+            onShiftOptions={onShiftOptions}
+            type={`${DndItemType.ColumnOption}_${name}_${label}`}
+            canDelete={canDelete}
+            column={column}
+          />
+        ),
+      ),
+    [
+      canDelete,
+      label,
+      name,
+      onChange,
+      onClickClose,
+      onShiftOptions,
+      optionSelector,
+      popoverOptions,
+    ],
+  );
+
+  const addNewColumnWithPopover = useCallback(
+    (newColumn: ColumnMeta) => {
+      optionSelector.add(newColumn.column_name);
+      onChange(optionSelector.getValues());
+    },
+    [onChange, optionSelector],
+  );
+
+  const togglePopover = useCallback((visible: boolean) => {
+    setNewColumnPopoverVisible(visible);
+  }, []);
+
+  const closePopover = useCallback(() => {
+    togglePopover(false);
+  }, [togglePopover]);
+
+  const openPopover = useCallback(() => {
+    togglePopover(true);
+  }, [togglePopover]);
+
+  const defaultGhostButtonText = isFeatureEnabled(
+    FeatureFlag.ENABLE_DND_WITH_CLICK_UX,
+  )
+    ? tn(
+        'Drop a column here or click',
+        'Drop columns here or click',
+        multi ? 2 : 1,
+      )
+    : tn('Drop column here', 'Drop columns here', multi ? 2 : 1);
 
   return (
-    <DndSelectLabel<string | string[], ColumnMeta[]>
-      onDrop={onDrop}
-      canDrop={canDrop}
-      valuesRenderer={valuesRenderer}
-      accept={DndItemType.Column}
-      displayGhostButton={multi || optionSelector.values.length === 0}
-      ghostButtonText={tn('Drop column', 'Drop columns', multi ? 2 : 1)}
-      {...props}
-    />
+    <div>
+      <DndSelectLabel<string | string[], ColumnMeta[]>
+        onDrop={onDrop}
+        canDrop={canDrop}
+        valuesRenderer={valuesRenderer}
+        accept={DndItemType.Column}
+        displayGhostButton={multi || optionSelector.values.length === 0}
+        ghostButtonText={ghostButtonText || defaultGhostButtonText}
+        onClickGhostButton={
+          isFeatureEnabled(FeatureFlag.ENABLE_DND_WITH_CLICK_UX)
+            ? openPopover
+            : undefined
+        }
+        {...props}
+      />
+      <ColumnSelectPopoverTrigger
+        columns={popoverOptions}
+        onColumnEdit={addNewColumnWithPopover}
+        isControlledComponent
+        togglePopover={togglePopover}
+        closePopover={closePopover}
+        visible={newColumnPopoverVisible}
+      >
+        <div />
+      </ColumnSelectPopoverTrigger>
+    </div>
   );
 };
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.test.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.test.tsx
index bf7d135b7884..bddb80a9aa21 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.test.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.test.tsx
@@ -38,7 +38,7 @@ const defaultProps = {
 
 test('renders with default props', () => {
   render(<DndFilterSelect {...defaultProps} />, { useDnd: true });
-  expect(screen.getByText('Drop columns or metrics')).toBeInTheDocument();
+  expect(screen.getByText('Drop columns or metrics here')).toBeInTheDocument();
 });
 
 test('renders with value', () => {
@@ -56,7 +56,7 @@ test('renders options with saved metric', () => {
   render(<DndFilterSelect {...defaultProps} formData={['saved_metric']} />, {
     useDnd: true,
   });
-  expect(screen.getByText('Drop columns or metrics')).toBeInTheDocument();
+  expect(screen.getByText('Drop columns or metrics here')).toBeInTheDocument();
 });
 
 test('renders options with column', () => {
@@ -76,7 +76,7 @@ test('renders options with column', () => {
       useDnd: true,
     },
   );
-  expect(screen.getByText('Drop columns or metrics')).toBeInTheDocument();
+  expect(screen.getByText('Drop columns or metrics here')).toBeInTheDocument();
 });
 
 test('renders options with adhoc metric', () => {
@@ -87,5 +87,5 @@ test('renders options with adhoc metric', () => {
   render(<DndFilterSelect {...defaultProps} formData={[adhocMetric]} />, {
     useDnd: true,
   });
-  expect(screen.getByText('Drop columns or metrics')).toBeInTheDocument();
+  expect(screen.getByText('Drop columns or metrics here')).toBeInTheDocument();
 });
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx
index 0ba8dd31ba06..a9e327bfd6bf 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx
@@ -16,11 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { useEffect, useMemo, useState } from 'react';
-import { logging, SupersetClient, t, Metric } from '@superset-ui/core';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import {
+  FeatureFlag,
+  isFeatureEnabled,
+  logging,
+  Metric,
+  SupersetClient,
+  t,
+} from '@superset-ui/core';
 import { ColumnMeta } from '@superset-ui/chart-controls';
-import { Tooltip } from 'src/components/Tooltip';
-import { OPERATORS } from 'src/explore/constants';
+import {
+  OPERATOR_ENUM_TO_OPERATOR_TYPE,
+  Operators,
+} from 'src/explore/constants';
 import { OptionSortType } from 'src/explore/types';
 import {
   DndFilterSelectProps,
@@ -40,10 +49,19 @@ import {
 } from 'src/explore/components/DatasourcePanel/types';
 import { DndItemType } from 'src/explore/components/DndItemType';
 
+const DND_ACCEPTED_TYPES = [
+  DndItemType.Column,
+  DndItemType.Metric,
+  DndItemType.MetricOption,
+  DndItemType.AdhocMetricOption,
+];
+
 const isDictionaryForAdhocFilter = (value: OptionValueType) =>
   !(value instanceof AdhocFilter) && value?.expressionType;
 
 export const DndFilterSelect = (props: DndFilterSelectProps) => {
+  const { datasource, onChange } = props;
+
   const propsValues = Array.from(props.value ?? []);
   const [values, setValues] = useState(
     propsValues.map((filter: OptionValueType) =>
@@ -107,7 +125,6 @@ export const DndFilterSelect = (props: DndFilterSelectProps) => {
   );
 
   useEffect(() => {
-    const { datasource } = props;
     if (datasource && datasource.type === 'table') {
       const dbId = datasource.database?.id;
       const {
@@ -139,7 +156,7 @@ export const DndFilterSelect = (props: DndFilterSelectProps) => {
           });
       }
     }
-  }, []);
+  }, [datasource]);
 
   useEffect(() => {
     setOptions(optionsForSelect(props.columns, props.formData));
@@ -153,132 +170,173 @@ export const DndFilterSelect = (props: DndFilterSelectProps) => {
     );
   }, [props.value]);
 
-  const onClickClose = (index: number) => {
-    const valuesCopy = [...values];
-    valuesCopy.splice(index, 1);
-    setValues(valuesCopy);
-    props.onChange(valuesCopy);
-  };
+  const onClickClose = useCallback(
+    (index: number) => {
+      const valuesCopy = [...values];
+      valuesCopy.splice(index, 1);
+      setValues(valuesCopy);
+      onChange(valuesCopy);
+    },
+    [onChange, values],
+  );
 
-  const onShiftOptions = (dragIndex: number, hoverIndex: number) => {
-    const newValues = [...values];
-    [newValues[hoverIndex], newValues[dragIndex]] = [
-      newValues[dragIndex],
-      newValues[hoverIndex],
-    ];
-    setValues(newValues);
-  };
+  const onShiftOptions = useCallback(
+    (dragIndex: number, hoverIndex: number) => {
+      const newValues = [...values];
+      [newValues[hoverIndex], newValues[dragIndex]] = [
+        newValues[dragIndex],
+        newValues[hoverIndex],
+      ];
+      setValues(newValues);
+    },
+    [values],
+  );
 
-  const getMetricExpression = (savedMetricName: string) =>
-    props.savedMetrics.find(
-      (savedMetric: Metric) => savedMetric.metric_name === savedMetricName,
-    )?.expression;
+  const getMetricExpression = useCallback(
+    (savedMetricName: string) =>
+      props.savedMetrics.find(
+        (savedMetric: Metric) => savedMetric.metric_name === savedMetricName,
+      )?.expression,
+    [props.savedMetrics],
+  );
 
-  const mapOption = (option: OptionValueType) => {
-    // already a AdhocFilter, skip
-    if (option instanceof AdhocFilter) {
-      return option;
-    }
-    const filterOptions = option as Record<string, any>;
-    // via datasource saved metric
-    if (filterOptions.saved_metric_name) {
-      return new AdhocFilter({
-        expressionType:
-          props.datasource.type === 'druid'
-            ? EXPRESSION_TYPES.SIMPLE
-            : EXPRESSION_TYPES.SQL,
-        subject:
-          props.datasource.type === 'druid'
-            ? filterOptions.saved_metric_name
-            : getMetricExpression(filterOptions.saved_metric_name),
-        operator: OPERATORS['>'],
-        comparator: 0,
-        clause: CLAUSES.HAVING,
-      });
-    }
-    // has a custom label, meaning it's custom column
-    if (filterOptions.label) {
-      return new AdhocFilter({
-        expressionType:
-          props.datasource.type === 'druid'
-            ? EXPRESSION_TYPES.SIMPLE
-            : EXPRESSION_TYPES.SQL,
-        subject:
-          props.datasource.type === 'druid'
-            ? filterOptions.label
-            : new AdhocMetric(option).translateToSql(),
-        operator: OPERATORS['>'],
-        comparator: 0,
-        clause: CLAUSES.HAVING,
-      });
-    }
-    // add a new filter item
-    if (filterOptions.column_name) {
-      return new AdhocFilter({
-        expressionType: EXPRESSION_TYPES.SIMPLE,
-        subject: filterOptions.column_name,
-        operator: OPERATORS['=='],
-        comparator: '',
-        clause: CLAUSES.WHERE,
-        isNew: true,
-      });
-    }
-    return null;
-  };
+  const mapOption = useCallback(
+    (option: OptionValueType) => {
+      // already a AdhocFilter, skip
+      if (option instanceof AdhocFilter) {
+        return option;
+      }
+      const filterOptions = option as Record<string, any>;
+      // via datasource saved metric
+      if (filterOptions.saved_metric_name) {
+        return new AdhocFilter({
+          expressionType:
+            datasource.type === 'druid'
+              ? EXPRESSION_TYPES.SIMPLE
+              : EXPRESSION_TYPES.SQL,
+          subject:
+            datasource.type === 'druid'
+              ? filterOptions.saved_metric_name
+              : getMetricExpression(filterOptions.saved_metric_name),
+          operator:
+            OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.GREATER_THAN].operation,
+          operatorId: Operators.GREATER_THAN,
+          comparator: 0,
+          clause: CLAUSES.HAVING,
+        });
+      }
+      // has a custom label, meaning it's custom column
+      if (filterOptions.label) {
+        return new AdhocFilter({
+          expressionType:
+            datasource.type === 'druid'
+              ? EXPRESSION_TYPES.SIMPLE
+              : EXPRESSION_TYPES.SQL,
+          subject:
+            datasource.type === 'druid'
+              ? filterOptions.label
+              : new AdhocMetric(option).translateToSql(),
+          operator:
+            OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.GREATER_THAN].operation,
+          operatorId: Operators.GREATER_THAN,
+          comparator: 0,
+          clause: CLAUSES.HAVING,
+        });
+      }
+      // add a new filter item
+      if (filterOptions.column_name) {
+        return new AdhocFilter({
+          expressionType: EXPRESSION_TYPES.SIMPLE,
+          subject: filterOptions.column_name,
+          operator: OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.EQUALS].operation,
+          operatorId: Operators.EQUALS,
+          comparator: '',
+          clause: CLAUSES.WHERE,
+          isNew: true,
+        });
+      }
+      return null;
+    },
+    [datasource.type, getMetricExpression],
+  );
 
-  const onFilterEdit = (changedFilter: AdhocFilter) => {
-    props.onChange(
-      values.map((value: AdhocFilter) => {
-        if (value.filterOptionName === changedFilter.filterOptionName) {
-          return changedFilter;
-        }
-        return value;
-      }),
-    );
-  };
+  const onFilterEdit = useCallback(
+    (changedFilter: AdhocFilter) => {
+      onChange(
+        values.map((value: AdhocFilter) => {
+          if (value.filterOptionName === changedFilter.filterOptionName) {
+            return changedFilter;
+          }
+          return value;
+        }),
+      );
+    },
+    [onChange, values],
+  );
 
-  const onNewFilter = (newFilter: AdhocFilter) => {
-    const mappedOption = mapOption(newFilter);
-    if (mappedOption) {
-      const newValues = [...values, mappedOption];
-      setValues(newValues);
-      props.onChange(newValues);
-    }
-  };
+  const onNewFilter = useCallback(
+    (newFilter: AdhocFilter) => {
+      const mappedOption = mapOption(newFilter);
+      if (mappedOption) {
+        const newValues = [...values, mappedOption];
+        setValues(newValues);
+        onChange(newValues);
+      }
+    },
+    [mapOption, onChange, values],
+  );
 
-  const togglePopover = (visible: boolean) => {
+  const togglePopover = useCallback((visible: boolean) => {
     setNewFilterPopoverVisible(visible);
-  };
+  }, []);
 
-  const closePopover = () => {
+  const closePopover = useCallback(() => {
     togglePopover(false);
-  };
+  }, [togglePopover]);
 
-  const valuesRenderer = () =>
-    values.map((adhocFilter: AdhocFilter, index: number) => {
-      const label = adhocFilter.getDefaultLabel();
-      return (
-        <AdhocFilterPopoverTrigger
-          key={index}
-          adhocFilter={adhocFilter}
-          options={options}
-          datasource={props.datasource}
-          onFilterEdit={onFilterEdit}
-          partitionColumn={partitionColumn}
-        >
-          <OptionWrapper
+  const valuesRenderer = useCallback(
+    () =>
+      values.map((adhocFilter: AdhocFilter, index: number) => {
+        const label = adhocFilter.getDefaultLabel();
+        const tooltipTitle = adhocFilter.getTooltipTitle();
+        return (
+          <AdhocFilterPopoverTrigger
             key={index}
-            index={index}
-            clickClose={onClickClose}
-            onShiftOptions={onShiftOptions}
-            type={DndItemType.FilterOption}
-            withCaret
+            adhocFilter={adhocFilter}
+            options={options}
+            datasource={datasource}
+            onFilterEdit={onFilterEdit}
+            partitionColumn={partitionColumn}
           >
-            <Tooltip title={label}>{label}</Tooltip>
-          </OptionWrapper>
-        </AdhocFilterPopoverTrigger>
-      );
-    });
+            <OptionWrapper
+              key={index}
+              index={index}
+              label={label}
+              tooltipTitle={tooltipTitle}
+              clickClose={onClickClose}
+              onShiftOptions={onShiftOptions}
+              type={DndItemType.FilterOption}
+              withCaret
+              isExtra={adhocFilter.isExtra}
+            />
+          </AdhocFilterPopoverTrigger>
+        );
+      }),
+    [
+      onClickClose,
+      onFilterEdit,
+      onShiftOptions,
+      options,
+      partitionColumn,
+      datasource,
+      values,
+    ],
+  );
+
+  const handleClickGhostButton = useCallback(() => {
+    setDroppedItem(null);
+    togglePopover(true);
+  }, [togglePopover]);
 
   const adhocFilter = useMemo(() => {
     if (droppedItem?.metric_name) {
@@ -295,40 +353,54 @@ export const DndFilterSelect = (props: DndFilterSelectProps) => {
         sqlExpression: (droppedItem as AdhocMetric)?.translateToSql(),
       });
     }
-    return new AdhocFilter({
+    const config: Partial<AdhocFilter> = {
       subject: (droppedItem as ColumnMeta)?.column_name,
-    });
+    };
+    if (config.subject && isFeatureEnabled(FeatureFlag.UX_BETA)) {
+      config.operator = OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.IN].operation;
+      config.operatorId = Operators.IN;
+    }
+    return new AdhocFilter(config);
   }, [droppedItem]);
 
+  const canDrop = useCallback(() => true, []);
+  const handleDrop = useCallback(
+    (item: DatasourcePanelDndItem) => {
+      setDroppedItem(item.value);
+      togglePopover(true);
+    },
+    [togglePopover],
+  );
+
+  const ghostButtonText = isFeatureEnabled(FeatureFlag.ENABLE_DND_WITH_CLICK_UX)
+    ? t('Drop columns/metrics here or click')
+    : t('Drop columns or metrics here');
+
   return (
     <>
       <DndSelectLabel<OptionValueType, OptionValueType[]>
-        onDrop={(item: DatasourcePanelDndItem) => {
-          setDroppedItem(item.value);
-          togglePopover(true);
-        }}
-        canDrop={() => true}
+        onDrop={handleDrop}
+        canDrop={canDrop}
         valuesRenderer={valuesRenderer}
-        accept={[
-          DndItemType.Column,
-          DndItemType.Metric,
-          DndItemType.MetricOption,
-          DndItemType.AdhocMetricOption,
-        ]}
-        ghostButtonText={t('Drop columns or metrics')}
+        accept={DND_ACCEPTED_TYPES}
+        ghostButtonText={ghostButtonText}
+        onClickGhostButton={
+          isFeatureEnabled(FeatureFlag.ENABLE_DND_WITH_CLICK_UX)
+            ? handleClickGhostButton
+            : undefined
+        }
         {...props}
       />
       <AdhocFilterPopoverTrigger
         adhocFilter={adhocFilter}
         options={options}
-        datasource={props.datasource}
+        datasource={datasource}
         onFilterEdit={onNewFilter}
         partitionColumn={partitionColumn}
         isControlledComponent
         visible={newFilterPopoverVisible}
         togglePopover={togglePopover}
         closePopover={closePopover}
-        createNew
       >
         <div />
       </AdhocFilterPopoverTrigger>
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.test.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.test.tsx
index 51fb9aac3ba2..71cf4bf5480b 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.test.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.test.tsx
@@ -31,10 +31,10 @@ const defaultProps = {
 
 test('renders with default props', () => {
   render(<DndMetricSelect {...defaultProps} />, { useDnd: true });
-  expect(screen.getByText('Drop column or metric')).toBeInTheDocument();
+  expect(screen.getByText('Drop column or metric here')).toBeInTheDocument();
 });
 
 test('renders with default props and multi = true', () => {
   render(<DndMetricSelect {...defaultProps} multi />, { useDnd: true });
-  expect(screen.getByText('Drop columns or metrics')).toBeInTheDocument();
+  expect(screen.getByText('Drop columns or metrics here')).toBeInTheDocument();
 });
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.tsx
index a3daeaf70211..8f3850525ff0 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.tsx
@@ -18,7 +18,14 @@
  */
 
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { ensureIsArray, Metric, tn } from '@superset-ui/core';
+import {
+  ensureIsArray,
+  FeatureFlag,
+  GenericDataType,
+  isFeatureEnabled,
+  Metric,
+  tn,
+} from '@superset-ui/core';
 import { ColumnMeta } from '@superset-ui/chart-controls';
 import { isEqual } from 'lodash';
 import { usePrevious } from 'src/common/hooks/usePrevious';
@@ -30,6 +37,10 @@ import { DatasourcePanelDndItem } from 'src/explore/components/DatasourcePanel/t
 import { DndItemType } from 'src/explore/components/DndItemType';
 import DndSelectLabel from 'src/explore/components/controls/DndColumnSelectControl/DndSelectLabel';
 import { savedMetricType } from 'src/explore/components/controls/MetricControl/types';
+import { AGGREGATES } from 'src/explore/constants';
+
+const EMPTY_OBJECT = {};
+const DND_ACCEPTED_TYPES = [DndItemType.Column, DndItemType.Metric];
 
 const isDictionaryForAdhocMetric = (value: any) =>
   value && !(value instanceof AdhocMetric) && value.expressionType;
@@ -154,112 +165,191 @@ export const DndMetricSelect = (props: any) => {
     onChange,
   ]);
 
-  const canDrop = (item: DatasourcePanelDndItem) => {
-    const isMetricAlreadyInValues =
-      item.type === 'metric' ? value.includes(item.value.metric_name) : false;
-    return (props.multi || value.length === 0) && !isMetricAlreadyInValues;
-  };
+  const canDrop = useCallback(
+    (item: DatasourcePanelDndItem) => {
+      const isMetricAlreadyInValues =
+        item.type === 'metric' ? value.includes(item.value.metric_name) : false;
+      return !isMetricAlreadyInValues;
+    },
+    [value],
+  );
 
-  const onNewMetric = (newMetric: Metric) => {
-    const newValue = [...value, newMetric];
-    setValue(newValue);
-    handleChange(newValue);
-  };
+  const onNewMetric = useCallback(
+    (newMetric: Metric) => {
+      const newValue = props.multi ? [...value, newMetric] : [newMetric];
+      setValue(newValue);
+      handleChange(newValue);
+    },
+    [handleChange, props.multi, value],
+  );
 
-  const onMetricEdit = (
-    changedMetric: Metric | AdhocMetric,
-    oldMetric: Metric | AdhocMetric,
-  ) => {
-    const newValue = value.map(value => {
-      if (
-        // compare saved metrics
-        value === (oldMetric as Metric).metric_name ||
-        // compare adhoc metrics
-        typeof (value as AdhocMetric).optionName !== 'undefined'
-          ? (value as AdhocMetric).optionName ===
-            (oldMetric as AdhocMetric).optionName
-          : false
-      ) {
-        return changedMetric;
+  const onMetricEdit = useCallback(
+    (changedMetric: Metric | AdhocMetric, oldMetric: Metric | AdhocMetric) => {
+      if (oldMetric instanceof AdhocMetric && oldMetric.equals(changedMetric)) {
+        return;
       }
-      return value;
-    });
-    setValue(newValue);
-    handleChange(newValue);
-  };
+      const newValue = value.map(value => {
+        if (
+          // compare saved metrics
+          value === (oldMetric as Metric).metric_name ||
+          // compare adhoc metrics
+          typeof (value as AdhocMetric).optionName !== 'undefined'
+            ? (value as AdhocMetric).optionName ===
+              (oldMetric as AdhocMetric).optionName
+            : false
+        ) {
+          return changedMetric;
+        }
+        return value;
+      });
+      setValue(newValue);
+      handleChange(newValue);
+    },
+    [handleChange, value],
+  );
 
-  const onRemoveMetric = (index: number) => {
-    if (!Array.isArray(value)) {
-      return;
-    }
-    const valuesCopy = [...value];
-    valuesCopy.splice(index, 1);
-    setValue(valuesCopy);
-    onChange(valuesCopy);
-  };
+  const onRemoveMetric = useCallback(
+    (index: number) => {
+      if (!Array.isArray(value)) {
+        return;
+      }
+      const valuesCopy = [...value];
+      valuesCopy.splice(index, 1);
+      setValue(valuesCopy);
+      onChange(valuesCopy);
+    },
+    [onChange, value],
+  );
 
-  const moveLabel = (dragIndex: number, hoverIndex: number) => {
-    const newValues = [...value];
-    [newValues[hoverIndex], newValues[dragIndex]] = [
-      newValues[dragIndex],
-      newValues[hoverIndex],
-    ];
-    setValue(newValues);
-  };
+  const moveLabel = useCallback(
+    (dragIndex: number, hoverIndex: number) => {
+      const newValues = [...value];
+      [newValues[hoverIndex], newValues[dragIndex]] = [
+        newValues[dragIndex],
+        newValues[hoverIndex],
+      ];
+      setValue(newValues);
+    },
+    [value],
+  );
+
+  const newSavedMetricOptions = useMemo(
+    () => getOptionsForSavedMetrics(props.savedMetrics, props.value),
+    [props.savedMetrics, props.value],
+  );
 
-  const valueRenderer = (
-    option: Metric | AdhocMetric | string,
-    index: number,
-  ) => (
-    <MetricDefinitionValue
-      key={index}
-      index={index}
-      option={option}
-      onMetricEdit={onMetricEdit}
-      onRemoveMetric={() => onRemoveMetric(index)}
-      columns={props.columns}
-      savedMetrics={props.savedMetrics}
-      savedMetricsOptions={getOptionsForSavedMetrics(
+  const getSavedMetricOptionsForMetric = useCallback(
+    index =>
+      getOptionsForSavedMetrics(
         props.savedMetrics,
         props.value,
         props.value?.[index],
-      )}
-      datasourceType={props.datasourceType}
-      onMoveLabel={moveLabel}
-      onDropLabel={() => onChange(value)}
-    />
+      ),
+    [props.savedMetrics, props.value],
   );
 
-  const valuesRenderer = () =>
-    value.map((value, index) => valueRenderer(value, index));
+  const handleDropLabel = useCallback(
+    () => onChange(multi ? value : value[0]),
+    [multi, onChange, value],
+  );
+
+  const valueRenderer = useCallback(
+    (option: Metric | AdhocMetric | string, index: number) => (
+      <MetricDefinitionValue
+        key={index}
+        index={index}
+        option={option}
+        onMetricEdit={onMetricEdit}
+        onRemoveMetric={onRemoveMetric}
+        columns={props.columns}
+        savedMetrics={props.savedMetrics}
+        savedMetricsOptions={getSavedMetricOptionsForMetric(index)}
+        datasourceType={props.datasourceType}
+        onMoveLabel={moveLabel}
+        onDropLabel={handleDropLabel}
+        type={`${DndItemType.AdhocMetricOption}_${props.name}_${props.label}`}
+        multi={multi}
+      />
+    ),
+    [
+      getSavedMetricOptionsForMetric,
+      handleDropLabel,
+      moveLabel,
+      multi,
+      onMetricEdit,
+      onRemoveMetric,
+      props.columns,
+      props.datasourceType,
+      props.label,
+      props.name,
+      props.savedMetrics,
+    ],
+  );
+
+  const valuesRenderer = useCallback(
+    () => value.map((value, index) => valueRenderer(value, index)),
+    [value, valueRenderer],
+  );
 
-  const togglePopover = (visible: boolean) => {
+  const togglePopover = useCallback((visible: boolean) => {
     setNewMetricPopoverVisible(visible);
-  };
+  }, []);
 
-  const closePopover = () => {
+  const closePopover = useCallback(() => {
     togglePopover(false);
-  };
+  }, [togglePopover]);
 
-  const handleDrop = (item: DatasourcePanelDndItem) => {
-    if (item.type === DndItemType.Metric) {
-      onNewMetric(item.value as Metric);
-    }
-    if (item.type === DndItemType.Column) {
-      setDroppedItem(item);
-      togglePopover(true);
-    }
-  };
+  const handleDrop = useCallback(
+    (item: DatasourcePanelDndItem) => {
+      if (item.type === DndItemType.Metric) {
+        onNewMetric(item.value as Metric);
+      }
+      if (item.type === DndItemType.Column) {
+        setDroppedItem(item);
+        togglePopover(true);
+      }
+    },
+    [onNewMetric, togglePopover],
+  );
+
+  const handleClickGhostButton = useCallback(() => {
+    setDroppedItem(null);
+    togglePopover(true);
+  }, [togglePopover]);
 
   const adhocMetric = useMemo(() => {
     if (droppedItem?.type === DndItemType.Column) {
       const itemValue = droppedItem?.value as ColumnMeta;
-      return new AdhocMetric({
+      const config: Partial<AdhocMetric> = {
         column: { column_name: itemValue?.column_name },
-      });
+      };
+      if (isFeatureEnabled(FeatureFlag.UX_BETA)) {
+        if (itemValue.type_generic === GenericDataType.NUMERIC) {
+          config.aggregate = AGGREGATES.SUM;
+        } else if (
+          itemValue.type_generic === GenericDataType.STRING ||
+          itemValue.type_generic === GenericDataType.BOOLEAN ||
+          itemValue.type_generic === GenericDataType.TEMPORAL
+        ) {
+          config.aggregate = AGGREGATES.COUNT_DISTINCT;
+        }
+      }
+      return new AdhocMetric(config);
     }
     return new AdhocMetric({ isNew: true });
-  }, [droppedItem?.type, droppedItem?.value]);
+  }, [droppedItem]);
+
+  const ghostButtonText = isFeatureEnabled(FeatureFlag.ENABLE_DND_WITH_CLICK_UX)
+    ? tn(
+        'Drop a column/metric here or click',
+        'Drop columns/metrics here or click',
+        multi ? 2 : 1,
+      )
+    : tn(
+        'Drop column or metric here',
+        'Drop columns or metrics here',
+        multi ? 2 : 1,
+      );
 
   return (
     <div className="metrics-select">
@@ -267,30 +357,27 @@ export const DndMetricSelect = (props: any) => {
         onDrop={handleDrop}
         canDrop={canDrop}
         valuesRenderer={valuesRenderer}
-        accept={[DndItemType.Column, DndItemType.Metric]}
-        ghostButtonText={tn(
-          'Drop column or metric',
-          'Drop columns or metrics',
-          multi ? 2 : 1,
-        )}
+        accept={DND_ACCEPTED_TYPES}
+        ghostButtonText={ghostButtonText}
         displayGhostButton={multi || value.length === 0}
+        onClickGhostButton={
+          isFeatureEnabled(FeatureFlag.ENABLE_DND_WITH_CLICK_UX)
+            ? handleClickGhostButton
+            : undefined
+        }
         {...props}
       />
       <AdhocMetricPopoverTrigger
         adhocMetric={adhocMetric}
         onMetricEdit={onNewMetric}
         columns={props.columns}
-        savedMetricsOptions={getOptionsForSavedMetrics(
-          props.savedMetrics,
-          props.value,
-        )}
-        savedMetric={{} as savedMetricType}
+        savedMetricsOptions={newSavedMetricOptions}
+        savedMetric={EMPTY_OBJECT as savedMetricType}
         datasourceType={props.datasourceType}
         isControlledComponent
         visible={newMetricPopoverVisible}
         togglePopover={togglePopover}
         closePopover={closePopover}
-        createNew
       >
         <div />
       </AdhocMetricPopoverTrigger>
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.test.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.test.tsx
index d6090e2a269d..d9689d7e8d23 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.test.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.test.tsx
@@ -33,7 +33,7 @@ const defaultProps = {
 
 test('renders with default props', async () => {
   render(<DndSelectLabel {...defaultProps} />, { useDnd: true });
-  expect(await screen.findByText('Drop columns')).toBeInTheDocument();
+  expect(await screen.findByText('Drop columns here')).toBeInTheDocument();
 });
 
 test('renders ghost button when empty', async () => {
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.tsx
index daaeb9185285..d3bf95d09002 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.tsx
@@ -40,9 +40,11 @@ export default function DndSelectLabel<T, O>({
 
     drop: (item: DatasourcePanelDndItem) => {
       props.onDrop(item);
+      props.onDropValue?.(item.value);
     },
 
-    canDrop: (item: DatasourcePanelDndItem) => props.canDrop(item),
+    canDrop: (item: DatasourcePanelDndItem) =>
+      props.canDrop(item) && (props.canDropValue?.(item.value) ?? true),
 
     collect: monitor => ({
       isOver: monitor.isOver(),
@@ -53,9 +55,12 @@ export default function DndSelectLabel<T, O>({
 
   function renderGhostButton() {
     return (
-      <AddControlLabel cancelHover>
+      <AddControlLabel
+        cancelHover={!props.onClickGhostButton}
+        onClick={props.onClickGhostButton}
+      >
         <Icons.PlusSmall iconColor={theme.colors.grayscale.light1} />
-        {t(props.ghostButtonText || 'Drop columns')}
+        {t(props.ghostButtonText || 'Drop columns here')}
       </AddControlLabel>
     );
   }
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/Option.test.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/Option.test.tsx
index 7a85997dbfe1..744fe03a0955 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/Option.test.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/Option.test.tsx
@@ -44,6 +44,17 @@ test('renders with caret', () => {
   expect(screen.getByRole('img', { name: 'caret-right' })).toBeInTheDocument();
 });
 
+test('renders with extra triangle', () => {
+  render(
+    <Option index={1} clickClose={jest.fn()} isExtra>
+      Option
+    </Option>,
+  );
+  expect(
+    screen.getByRole('button', { name: 'Show info tooltip' }),
+  ).toBeInTheDocument();
+});
+
 test('triggers onClose', () => {
   const clickClose = jest.fn();
   render(
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/Option.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/Option.tsx
index 5b589f0972c3..3c7ee3c7c14b 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/Option.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/Option.tsx
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React from 'react';
-import { useTheme } from '@superset-ui/core';
+import React, { useCallback } from 'react';
+import { styled, t, useTheme } from '@superset-ui/core';
 import Icons from 'src/components/Icons';
 import {
   CaretContainer,
@@ -26,23 +26,52 @@ import {
   Label,
 } from 'src/explore/components/controls/OptionControls';
 import { OptionProps } from 'src/explore/components/controls/DndColumnSelectControl/types';
+import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
 
-export default function Option(props: OptionProps) {
+const StyledInfoTooltipWithTrigger = styled(InfoTooltipWithTrigger)`
+  margin: 0 ${({ theme }) => theme.gridUnit}px;
+`;
+
+export default function Option({
+  children,
+  index,
+  clickClose,
+  withCaret,
+  isExtra,
+  canDelete = true,
+}: OptionProps) {
   const theme = useTheme();
+  const onClickClose = useCallback(
+    e => {
+      e.stopPropagation();
+      clickClose(index);
+    },
+    [clickClose, index],
+  );
   return (
-    <OptionControlContainer
-      data-test="option-label"
-      withCaret={props.withCaret}
-    >
-      <CloseContainer
-        role="button"
-        data-test="remove-control-button"
-        onClick={() => props.clickClose(props.index)}
-      >
-        <Icons.XSmall iconColor={theme.colors.grayscale.light1} />
-      </CloseContainer>
-      <Label data-test="control-label">{props.children}</Label>
-      {props.withCaret && (
+    <OptionControlContainer data-test="option-label" withCaret={withCaret}>
+      {canDelete && (
+        <CloseContainer
+          role="button"
+          data-test="remove-control-button"
+          onClick={onClickClose}
+        >
+          <Icons.XSmall iconColor={theme.colors.grayscale.light1} />
+        </CloseContainer>
+      )}
+      <Label data-test="control-label">{children}</Label>
+      {isExtra && (
+        <StyledInfoTooltipWithTrigger
+          icon="exclamation-triangle"
+          placement="top"
+          bsStyle="warning"
+          tooltip={t(`
+                This filter was inherited from the dashboard's context.
+                It won't be saved when saving the chart.
+              `)}
+        />
+      )}
+      {withCaret && (
         <CaretContainer>
           <Icons.CaretRight iconColor={theme.colors.grayscale.light1} />
         </CaretContainer>
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.test.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.test.tsx
index c46f49be0107..e237cea989a5 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.test.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.test.tsx
@@ -28,9 +28,8 @@ test('renders with default props', () => {
       clickClose={jest.fn()}
       type={'Column' as DndItemType}
       onShiftOptions={jest.fn()}
-    >
-      Option
-    </OptionWrapper>,
+      label="Option"
+    />,
     { useDnd: true },
   );
   expect(container).toBeInTheDocument();
@@ -46,17 +45,15 @@ test('triggers onShiftOptions on drop', () => {
         clickClose={jest.fn()}
         type={'Column' as DndItemType}
         onShiftOptions={onShiftOptions}
-      >
-        Option 1
-      </OptionWrapper>
+        label="Option 1"
+      />
       <OptionWrapper
         index={2}
         clickClose={jest.fn()}
         type={'Column' as DndItemType}
         onShiftOptions={onShiftOptions}
-      >
-        Option 2
-      </OptionWrapper>
+        label="Option 2"
+      />
     </>,
     { useDnd: true },
   );
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.tsx
index cf947074d17c..fc2399e81a81 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.tsx
@@ -24,36 +24,50 @@ import {
   DragSourceMonitor,
 } from 'react-dnd';
 import { DragContainer } from 'src/explore/components/controls/OptionControls';
-import { DndItemType } from 'src/explore/components/DndItemType';
 import {
   OptionProps,
   OptionItemInterface,
 } from 'src/explore/components/controls/DndColumnSelectControl/types';
+import { Tooltip } from 'src/components/Tooltip';
+import { StyledColumnOption } from 'src/explore/components/optionRenderers';
+import { styled } from '@superset-ui/core';
+import { ColumnMeta } from '@superset-ui/chart-controls';
 import Option from './Option';
 
+export const OptionLabel = styled.div`
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+`;
+
 export default function OptionWrapper(
   props: OptionProps & {
-    type: DndItemType;
+    type: string;
     onShiftOptions: (dragIndex: number, hoverIndex: number) => void;
   },
 ) {
   const {
     index,
+    label,
+    tooltipTitle,
+    column,
     type,
     onShiftOptions,
     clickClose,
     withCaret,
-    children,
+    isExtra,
+    canDelete = true,
     ...rest
   } = props;
   const ref = useRef<HTMLDivElement>(null);
+  const labelRef = useRef<HTMLDivElement>(null);
 
-  const item: OptionItemInterface = {
-    dragIndex: index,
-    type,
-  };
-  const [, drag] = useDrag({
-    item,
+  const [{ isDragging }, drag] = useDrag({
+    item: {
+      type,
+      dragIndex: index,
+    },
     collect: (monitor: DragSourceMonitor) => ({
       isDragging: monitor.isDragging(),
     }),
@@ -81,8 +95,8 @@ export default function OptionWrapper(
       // Determine mouse position
       const clientOffset = monitor.getClientOffset();
       // Get pixels to the top
-      const hoverClientY = clientOffset?.y
-        ? clientOffset?.y - hoverBoundingRect.top
+      const hoverClientY = clientOffset
+        ? clientOffset.y - hoverBoundingRect.top
         : 0;
       // Only perform the move when the mouse has crossed half of the items height
       // When dragging downwards, only move when the cursor is below 50%
@@ -103,12 +117,63 @@ export default function OptionWrapper(
     },
   });
 
+  const shouldShowTooltip =
+    (!isDragging && tooltipTitle && label && tooltipTitle !== label) ||
+    (!isDragging &&
+      labelRef &&
+      labelRef.current &&
+      labelRef.current.scrollWidth > labelRef.current.clientWidth);
+
+  const LabelContent = () => {
+    if (!shouldShowTooltip) {
+      return <span>{label}</span>;
+    }
+    return (
+      <Tooltip title={tooltipTitle || label}>
+        <span>{label}</span>
+      </Tooltip>
+    );
+  };
+
+  const ColumnOption = () => (
+    <StyledColumnOption
+      column={column as ColumnMeta}
+      labelRef={labelRef}
+      showTooltip={!!shouldShowTooltip}
+      showType
+    />
+  );
+
+  const Label = () => {
+    if (label) {
+      return (
+        <OptionLabel ref={labelRef}>
+          <LabelContent />
+        </OptionLabel>
+      );
+    }
+    if (column) {
+      return (
+        <OptionLabel>
+          <ColumnOption />
+        </OptionLabel>
+      );
+    }
+    return null;
+  };
+
   drag(drop(ref));
 
   return (
     <DragContainer ref={ref} {...rest}>
-      <Option index={index} clickClose={clickClose} withCaret={withCaret}>
-        {children}
+      <Option
+        index={index}
+        clickClose={clickClose}
+        withCaret={withCaret}
+        isExtra={isExtra}
+        canDelete={canDelete}
+      >
+        <Label />
       </Option>
     </DragContainer>
   );
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/types.ts b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/types.ts
index 5ba1e06abb45..b77e9d263341 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/types.ts
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/types.ts
@@ -19,14 +19,22 @@
 import { ReactNode } from 'react';
 import { Metric } from '@superset-ui/core';
 import { ColumnMeta } from '@superset-ui/chart-controls';
-import { DatasourcePanelDndItem } from '../../DatasourcePanel/types';
+import {
+  DatasourcePanelDndItem,
+  DndItemValue,
+} from '../../DatasourcePanel/types';
 import { DndItemType } from '../../DndItemType';
 
 export interface OptionProps {
-  children: ReactNode;
+  children?: ReactNode;
   index: number;
+  label?: string;
+  tooltipTitle?: string;
+  column?: ColumnMeta;
   clickClose: (index: number) => void;
   withCaret?: boolean;
+  isExtra?: boolean;
+  canDelete?: boolean;
 }
 
 export interface OptionItemInterface {
@@ -40,6 +48,9 @@ export interface LabelProps<T = string[] | string> {
   onChange: (value?: T) => void;
   options: { string: ColumnMeta };
   multi?: boolean;
+  canDelete?: boolean;
+  ghostButtonText?: string;
+  label?: string;
 }
 
 export interface DndColumnSelectProps<
@@ -48,10 +59,13 @@ export interface DndColumnSelectProps<
 > extends LabelProps<T> {
   onDrop: (item: DatasourcePanelDndItem) => void;
   canDrop: (item: DatasourcePanelDndItem) => boolean;
+  canDropValue?: (value: DndItemValue) => boolean;
+  onDropValue?: (value: DndItemValue) => void;
   valuesRenderer: () => ReactNode;
   accept: DndItemType | DndItemType[];
   ghostButtonText?: string;
   displayGhostButton?: boolean;
+  onClickGhostButton?: () => void;
 }
 
 export type OptionValueType = Record<string, any>;
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/utils/optionSelector.ts b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/utils/optionSelector.ts
index 37833d943ce6..532aa33fc632 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/utils/optionSelector.ts
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/utils/optionSelector.ts
@@ -17,28 +17,23 @@
  * under the License.
  */
 import { ColumnMeta } from '@superset-ui/chart-controls';
+import { ensureIsArray } from '@superset-ui/core';
 
 export class OptionSelector {
   values: ColumnMeta[];
 
   options: { string: ColumnMeta };
 
-  isArray: boolean;
+  multi: boolean;
 
   constructor(
     options: { string: ColumnMeta },
+    multi: boolean,
     initialValues?: string[] | string,
   ) {
     this.options = options;
-    let values: string[];
-    if (Array.isArray(initialValues)) {
-      values = initialValues;
-      this.isArray = true;
-    } else {
-      values = initialValues ? [initialValues] : [];
-      this.isArray = false;
-    }
-    this.values = values
+    this.multi = multi;
+    this.values = ensureIsArray(initialValues)
       .map(value => {
         if (value in options) {
           return options[value];
@@ -68,12 +63,12 @@ export class OptionSelector {
     [this.values[a], this.values[b]] = [this.values[b], this.values[a]];
   }
 
-  has(groupBy: string): boolean {
-    return !!this.getValues()?.includes(groupBy);
+  has(value: string): boolean {
+    return !!this.getValues()?.includes(value);
   }
 
   getValues(): string[] | string | undefined {
-    if (!this.isArray) {
+    if (!this.multi) {
       return this.values.length > 0 ? this.values[0].column_name : undefined;
     }
     return this.values.map(option => option.column_name);
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilter/AdhocFilter.test.js b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilter/AdhocFilter.test.js
index 90dcdf0fbbe6..2aa5fd160418 100644
--- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilter/AdhocFilter.test.js
+++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilter/AdhocFilter.test.js
@@ -20,6 +20,7 @@ import AdhocFilter, {
   EXPRESSION_TYPES,
   CLAUSES,
 } from 'src/explore/components/controls/FilterControl/AdhocFilter';
+import { Operators } from 'src/explore/constants';
 
 describe('AdhocFilter', () => {
   it('sets filterOptionName in constructor', () => {
@@ -188,6 +189,22 @@ describe('AdhocFilter', () => {
     });
     // eslint-disable-next-line no-unused-expressions
     expect(adhocFilter8.isValid()).toBe(false);
+
+    const adhocFilter9 = new AdhocFilter({
+      expressionType: EXPRESSION_TYPES.SIMPLE,
+      subject: 'value',
+      operator: 'IS NULL',
+      clause: CLAUSES.WHERE,
+    });
+    expect(adhocFilter9.isValid()).toBe(true);
+    const adhocFilter10 = new AdhocFilter({
+      expressionType: EXPRESSION_TYPES.SIMPLE,
+      subject: 'value',
+      operator: 'IS NOT NULL',
+      clause: CLAUSES.WHERE,
+    });
+    // eslint-disable-next-line no-unused-expressions
+    expect(adhocFilter10.isValid()).toBe(true);
   });
 
   it('can translate from simple expressions to sql expressions', () => {
@@ -209,4 +226,26 @@ describe('AdhocFilter', () => {
     });
     expect(adhocFilter2.translateToSql()).toBe('SUM(value) <> 5');
   });
+  it('sets comparator to null when operator is IS_NULL', () => {
+    const adhocFilter2 = new AdhocFilter({
+      expressionType: EXPRESSION_TYPES.SIMPLE,
+      subject: 'SUM(value)',
+      operator: 'IS NULL',
+      operatorId: Operators.IS_NULL,
+      comparator: '5',
+      clause: CLAUSES.HAVING,
+    });
+    expect(adhocFilter2.comparator).toBe(null);
+  });
+  it('sets comparator to null when operator is IS_NOT_NULL', () => {
+    const adhocFilter2 = new AdhocFilter({
+      expressionType: EXPRESSION_TYPES.SIMPLE,
+      subject: 'SUM(value)',
+      operator: 'IS NOT NULL',
+      operatorId: Operators.IS_NOT_NULL,
+      comparator: '5',
+      clause: CLAUSES.HAVING,
+    });
+    expect(adhocFilter2.comparator).toBe(null);
+  });
 });
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilter/index.js b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilter/index.js
index c9c661b5b8a5..f6f00271ace6 100644
--- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilter/index.js
+++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilter/index.js
@@ -16,7 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { CUSTOM_OPERATORS, OPERATORS } from 'src/explore/constants';
+import {
+  CUSTOM_OPERATORS,
+  Operators,
+  OPERATOR_ENUM_TO_OPERATOR_TYPE,
+} from 'src/explore/constants';
 import { getSimpleSQLExpression } from 'src/explore/exploreUtils';
 
 export const EXPRESSION_TYPES = {
@@ -49,11 +53,16 @@ const OPERATORS_TO_SQL = {
     `= '{{ presto.latest_partition('${datasource.schema}.${datasource.datasource_name}') }}'`,
 };
 
+const CUSTOM_OPERATIONS = [...CUSTOM_OPERATORS].map(
+  op => OPERATOR_ENUM_TO_OPERATOR_TYPE[op].operation,
+);
+
 function translateToSql(adhocMetric, { useSimple } = {}) {
   if (adhocMetric.expressionType === EXPRESSION_TYPES.SIMPLE || useSimple) {
     const { subject, comparator } = adhocMetric;
     const operator =
-      adhocMetric.operator && CUSTOM_OPERATORS.has(adhocMetric.operator)
+      adhocMetric.operator &&
+      CUSTOM_OPERATIONS.indexOf(adhocMetric.operator) >= 0
         ? OPERATORS_TO_SQL[adhocMetric.operator](adhocMetric)
         : OPERATORS_TO_SQL[adhocMetric.operator];
     return getSimpleSQLExpression(subject, operator, comparator);
@@ -70,7 +79,22 @@ export default class AdhocFilter {
     if (this.expressionType === EXPRESSION_TYPES.SIMPLE) {
       this.subject = adhocFilter.subject;
       this.operator = adhocFilter.operator?.toUpperCase();
+      this.operatorId = adhocFilter.operatorId;
       this.comparator = adhocFilter.comparator;
+      if (
+        [Operators.IS_TRUE, Operators.IS_FALSE].indexOf(
+          adhocFilter.operatorId,
+        ) >= 0
+      ) {
+        this.comparator = adhocFilter.operatorId === Operators.IS_TRUE;
+      }
+      if (
+        [Operators.IS_NULL, Operators.IS_NOT_NULL].indexOf(
+          adhocFilter.operatorId,
+        ) >= 0
+      ) {
+        this.comparator = null;
+      }
       this.clause = adhocFilter.clause || CLAUSES.WHERE;
       this.sqlExpression = null;
     } else if (this.expressionType === EXPRESSION_TYPES.SQL) {
@@ -79,9 +103,13 @@ export default class AdhocFilter {
           ? adhocFilter.sqlExpression
           : translateToSql(adhocFilter, { useSimple: true });
       this.clause = adhocFilter.clause;
-      if (adhocFilter.operator && CUSTOM_OPERATORS.has(adhocFilter.operator)) {
+      if (
+        adhocFilter.operator &&
+        CUSTOM_OPERATIONS.indexOf(adhocFilter.operator) >= 0
+      ) {
         this.subject = adhocFilter.subject;
         this.operator = adhocFilter.operator;
+        this.operatorId = adhocFilter.operatorId;
       } else {
         this.subject = null;
         this.operator = null;
@@ -112,24 +140,26 @@ export default class AdhocFilter {
       adhocFilter.expressionType === this.expressionType &&
       adhocFilter.sqlExpression === this.sqlExpression &&
       adhocFilter.operator === this.operator &&
+      adhocFilter.operatorId === this.operatorId &&
       adhocFilter.comparator === this.comparator &&
       adhocFilter.subject === this.subject
     );
   }
 
   isValid() {
+    const nullCheckOperators = [Operators.IS_NOT_NULL, Operators.IS_NULL].map(
+      op => OPERATOR_ENUM_TO_OPERATOR_TYPE[op].operation,
+    );
+    const truthCheckOperators = [Operators.IS_TRUE, Operators.IS_FALSE].map(
+      op => OPERATOR_ENUM_TO_OPERATOR_TYPE[op].operation,
+    );
     if (this.expressionType === EXPRESSION_TYPES.SIMPLE) {
-      if (
-        [
-          OPERATORS['IS TRUE'],
-          OPERATORS['IS FALSE'],
-          OPERATORS['IS NULL'],
-          OPERATORS['IS NOT NULL'],
-        ].indexOf(this.operator) >= 0
-      ) {
+      if (nullCheckOperators.indexOf(this.operator) >= 0) {
         return !!(this.operator && this.subject);
       }
-
+      if (truthCheckOperators.indexOf(this.operator) >= 0) {
+        return !!(this.subject && this.comparator !== null);
+      }
       if (this.operator && this.subject && this.clause) {
         if (Array.isArray(this.comparator)) {
           if (this.comparator.length > 0) {
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/AdhocFilterControl.test.jsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/AdhocFilterControl.test.jsx
index eb3f5e8496c6..c7b13d55fa95 100644
--- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/AdhocFilterControl.test.jsx
+++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/AdhocFilterControl.test.jsx
@@ -27,14 +27,18 @@ import AdhocFilter, {
   CLAUSES,
 } from 'src/explore/components/controls/FilterControl/AdhocFilter';
 import { LabelsContainer } from 'src/explore/components/controls/OptionControls';
-import { AGGREGATES, OPERATORS } from 'src/explore/constants';
+import {
+  AGGREGATES,
+  Operators,
+  OPERATOR_ENUM_TO_OPERATOR_TYPE,
+} from 'src/explore/constants';
 import AdhocMetric from 'src/explore/components/controls/MetricControl/AdhocMetric';
 import AdhocFilterControl from '.';
 
 const simpleAdhocFilter = new AdhocFilter({
   expressionType: EXPRESSION_TYPES.SIMPLE,
   subject: 'value',
-  operator: '>',
+  operator: OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.GREATER_THAN].operation,
   comparator: '10',
   clause: CLAUSES.WHERE,
 });
@@ -92,7 +96,8 @@ describe('AdhocFilterControl', () => {
         new AdhocFilter({
           expressionType: EXPRESSION_TYPES.SQL,
           subject: savedMetric.expression,
-          operator: OPERATORS['>'],
+          operator:
+            OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.GREATER_THAN].operation,
           comparator: 0,
           clause: CLAUSES.HAVING,
         }),
@@ -111,7 +116,8 @@ describe('AdhocFilterControl', () => {
         new AdhocFilter({
           expressionType: EXPRESSION_TYPES.SQL,
           subject: sumValueAdhocMetric.label,
-          operator: OPERATORS['>'],
+          operator:
+            OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.GREATER_THAN].operation,
           comparator: 0,
           clause: CLAUSES.HAVING,
         }),
@@ -134,7 +140,7 @@ describe('AdhocFilterControl', () => {
         new AdhocFilter({
           expressionType: EXPRESSION_TYPES.SIMPLE,
           subject: columns[0].column_name,
-          operator: OPERATORS['=='],
+          operator: OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.EQUALS].operation,
           comparator: '',
           clause: CLAUSES.WHERE,
         }),
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.jsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.jsx
index 55e926c1800c..414745467e57 100644
--- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.jsx
+++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.jsx
@@ -30,7 +30,10 @@ import ControlHeader from 'src/explore/components/ControlHeader';
 import adhocMetricType from 'src/explore/components/controls/MetricControl/adhocMetricType';
 import savedMetricType from 'src/explore/components/controls/MetricControl/savedMetricType';
 import AdhocMetric from 'src/explore/components/controls/MetricControl/AdhocMetric';
-import { OPERATORS } from 'src/explore/constants';
+import {
+  Operators,
+  OPERATOR_ENUM_TO_OPERATOR_TYPE,
+} from 'src/explore/constants';
 import FilterDefinitionOption from 'src/explore/components/controls/MetricControl/FilterDefinitionOption';
 import {
   AddControlLabel,
@@ -242,7 +245,8 @@ class AdhocFilterControl extends React.Component {
           this.props.datasource.type === 'druid'
             ? option.saved_metric_name
             : this.getMetricExpression(option.saved_metric_name),
-        operator: OPERATORS['>'],
+        operator:
+          OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.GREATER_THAN].operation,
         comparator: 0,
         clause: CLAUSES.HAVING,
       });
@@ -258,7 +262,8 @@ class AdhocFilterControl extends React.Component {
           this.props.datasource.type === 'druid'
             ? option.label
             : new AdhocMetric(option).translateToSql(),
-        operator: OPERATORS['>'],
+        operator:
+          OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.GREATER_THAN].operation,
         comparator: 0,
         clause: CLAUSES.HAVING,
       });
@@ -268,7 +273,7 @@ class AdhocFilterControl extends React.Component {
       return new AdhocFilter({
         expressionType: EXPRESSION_TYPES.SIMPLE,
         subject: option.column_name,
-        operator: OPERATORS['=='],
+        operator: OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.EQUALS].operation,
         comparator: '',
         clause: CLAUSES.WHERE,
         isNew: true,
@@ -324,7 +329,6 @@ class AdhocFilterControl extends React.Component {
         options={this.state.options}
         onFilterEdit={this.onNewFilter}
         partitionColumn={this.state.partitionColumn}
-        createNew
       >
         {trigger}
       </AdhocFilterPopoverTrigger>
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/AdhocFilterEditPopoverSimpleTabContent.test.jsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/AdhocFilterEditPopoverSimpleTabContent.test.jsx
deleted file mode 100644
index 51678db676b9..000000000000
--- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/AdhocFilterEditPopoverSimpleTabContent.test.jsx
+++ /dev/null
@@ -1,277 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/* eslint-disable no-unused-expressions */
-import React from 'react';
-import sinon from 'sinon';
-import { shallow } from 'enzyme';
-
-import AdhocFilter, {
-  EXPRESSION_TYPES,
-  CLAUSES,
-} from 'src/explore/components/controls/FilterControl/AdhocFilter';
-import { AGGREGATES } from 'src/explore/constants';
-import AdhocMetric from 'src/explore/components/controls/MetricControl/AdhocMetric';
-import AdhocFilterEditPopoverSimpleTabContent from '.';
-
-const simpleAdhocFilter = new AdhocFilter({
-  expressionType: EXPRESSION_TYPES.SIMPLE,
-  subject: 'value',
-  operator: '>',
-  comparator: '10',
-  clause: CLAUSES.WHERE,
-});
-
-const simpleMultiAdhocFilter = new AdhocFilter({
-  expressionType: EXPRESSION_TYPES.SIMPLE,
-  subject: 'value',
-  operator: 'IN',
-  comparator: ['10'],
-  clause: CLAUSES.WHERE,
-});
-
-const sumValueAdhocMetric = new AdhocMetric({
-  expressionType: EXPRESSION_TYPES.SIMPLE,
-  column: { type: 'VARCHAR(255)', column_name: 'source' },
-  aggregate: AGGREGATES.SUM,
-});
-
-const simpleCustomFilter = new AdhocFilter({
-  expressionType: EXPRESSION_TYPES.SIMPLE,
-  subject: 'ds',
-  operator: 'LATEST PARTITION',
-});
-
-const options = [
-  { type: 'VARCHAR(255)', column_name: 'source', id: 1 },
-  { type: 'VARCHAR(255)', column_name: 'target', id: 2 },
-  { type: 'DOUBLE', column_name: 'value', id: 3 },
-  { saved_metric_name: 'my_custom_metric', id: 4 },
-  sumValueAdhocMetric,
-];
-
-function setup(overrides) {
-  const onChange = sinon.spy();
-  const onHeightChange = sinon.spy();
-  const props = {
-    adhocFilter: simpleAdhocFilter,
-    onChange,
-    onHeightChange,
-    options,
-    datasource: {},
-    ...overrides,
-  };
-  const wrapper = shallow(
-    <AdhocFilterEditPopoverSimpleTabContent {...props} />,
-  );
-  return { wrapper, onChange, onHeightChange };
-}
-
-describe('AdhocFilterEditPopoverSimpleTabContent', () => {
-  it('renders the simple tab form', () => {
-    const { wrapper } = setup();
-    expect(wrapper).toExist();
-  });
-
-  it('passes the new adhocFilter to onChange after onSubjectChange', () => {
-    const { wrapper, onChange } = setup();
-    wrapper.instance().onSubjectChange(1);
-    expect(onChange.calledOnce).toBe(true);
-    expect(onChange.lastCall.args[0]).toEqual(
-      simpleAdhocFilter.duplicateWith({ subject: 'source' }),
-    );
-  });
-
-  it('may alter the clause in onSubjectChange if the old clause is not appropriate', () => {
-    const { wrapper, onChange } = setup();
-    wrapper.instance().onSubjectChange(sumValueAdhocMetric.optionName);
-    expect(onChange.calledOnce).toBe(true);
-    expect(onChange.lastCall.args[0]).toEqual(
-      simpleAdhocFilter.duplicateWith({
-        subject: sumValueAdhocMetric.label,
-        clause: CLAUSES.HAVING,
-      }),
-    );
-  });
-
-  it('will convert from individual comparator to array if the operator changes to multi', () => {
-    const { wrapper, onChange } = setup();
-    wrapper.instance().onOperatorChange('IN');
-    expect(onChange.calledOnce).toBe(true);
-    expect(onChange.lastCall.args[0]).toEqual(
-      simpleAdhocFilter.duplicateWith({ operator: 'IN', comparator: ['10'] }),
-    );
-  });
-
-  it('will convert from array to individual comparators if the operator changes from multi', () => {
-    const { wrapper, onChange } = setup({
-      adhocFilter: simpleMultiAdhocFilter,
-    });
-    wrapper.instance().onOperatorChange('<');
-    expect(onChange.calledOnce).toBe(true);
-    expect(onChange.lastCall.args[0]).toEqual(
-      simpleMultiAdhocFilter.duplicateWith({ operator: '<', comparator: '10' }),
-    );
-  });
-
-  it('passes the new adhocFilter to onChange after onComparatorChange', () => {
-    const { wrapper, onChange } = setup();
-    wrapper.instance().onComparatorChange('20');
-    expect(onChange.calledOnce).toBe(true);
-    expect(onChange.lastCall.args[0]).toEqual(
-      simpleAdhocFilter.duplicateWith({ comparator: '20' }),
-    );
-  });
-
-  it('will filter operators for table datasources', () => {
-    const { wrapper } = setup({ datasource: { type: 'table' } });
-    expect(wrapper.instance().isOperatorRelevant('REGEX')).toBe(false);
-    expect(wrapper.instance().isOperatorRelevant('LIKE')).toBe(true);
-  });
-
-  it('will filter operators for druid datasources', () => {
-    const { wrapper } = setup({ datasource: { type: 'druid' } });
-    expect(wrapper.instance().isOperatorRelevant('REGEX')).toBe(true);
-    expect(wrapper.instance().isOperatorRelevant('LIKE')).toBe(false);
-  });
-
-  it('will show LATEST PARTITION operator', () => {
-    const { wrapper } = setup({
-      datasource: {
-        type: 'table',
-        datasource_name: 'table1',
-        schema: 'schema',
-      },
-      adhocFilter: simpleCustomFilter,
-      partitionColumn: 'ds',
-    });
-
-    expect(
-      wrapper.instance().isOperatorRelevant('LATEST PARTITION', 'ds'),
-    ).toBe(true);
-    expect(
-      wrapper.instance().isOperatorRelevant('LATEST PARTITION', 'value'),
-    ).toBe(false);
-  });
-
-  it('will generate custom sqlExpression for LATEST PARTITION operator', () => {
-    const testAdhocFilter = new AdhocFilter({
-      expressionType: EXPRESSION_TYPES.SIMPLE,
-      subject: 'ds',
-    });
-    const { wrapper, onChange } = setup({
-      datasource: {
-        type: 'table',
-        datasource_name: 'table1',
-        schema: 'schema',
-      },
-      adhocFilter: testAdhocFilter,
-      partitionColumn: 'ds',
-    });
-
-    wrapper.instance().onOperatorChange('LATEST PARTITION');
-    expect(onChange.lastCall.args[0]).toEqual(
-      testAdhocFilter.duplicateWith({
-        subject: 'ds',
-        operator: 'LATEST PARTITION',
-        comparator: null,
-        clause: 'WHERE',
-        expressionType: 'SQL',
-        sqlExpression: "ds = '{{ presto.latest_partition('schema.table1') }}'",
-      }),
-    );
-  });
-  it('will display boolean operators only when column type is boolean', () => {
-    const { wrapper } = setup({
-      datasource: {
-        type: 'table',
-        datasource_name: 'table1',
-        schema: 'schema',
-        columns: [{ column_name: 'value', type: 'BOOL' }],
-      },
-      adhocFilter: simpleAdhocFilter,
-    });
-    const booleanOnlyOperators = [
-      'IS TRUE',
-      'IS FALSE',
-      'IS NULL',
-      'IS NOT NULL',
-    ];
-    booleanOnlyOperators.forEach(operator => {
-      expect(wrapper.instance().isOperatorRelevant(operator, 'value')).toBe(
-        true,
-      );
-    });
-  });
-  it('will display boolean operators when column type is number', () => {
-    const { wrapper } = setup({
-      datasource: {
-        type: 'table',
-        datasource_name: 'table1',
-        schema: 'schema',
-        columns: [{ column_name: 'value', type: 'INT' }],
-      },
-      adhocFilter: simpleAdhocFilter,
-    });
-    const booleanOnlyOperators = ['IS TRUE', 'IS FALSE'];
-    booleanOnlyOperators.forEach(operator => {
-      expect(wrapper.instance().isOperatorRelevant(operator, 'value')).toBe(
-        true,
-      );
-    });
-  });
-  it('will not display boolean operators when column type is string', () => {
-    const { wrapper } = setup({
-      datasource: {
-        type: 'table',
-        datasource_name: 'table1',
-        schema: 'schema',
-        columns: [{ column_name: 'value', type: 'STRING' }],
-      },
-      adhocFilter: simpleAdhocFilter,
-    });
-    const booleanOnlyOperators = ['IS TRUE', 'IS FALSE'];
-    booleanOnlyOperators.forEach(operator => {
-      expect(wrapper.instance().isOperatorRelevant(operator, 'value')).toBe(
-        false,
-      );
-    });
-  });
-  it('will display boolean operators when column is an expression', () => {
-    const { wrapper } = setup({
-      datasource: {
-        type: 'table',
-        datasource_name: 'table1',
-        schema: 'schema',
-        columns: [
-          {
-            column_name: 'value',
-            expression: 'case when value is 0 then "NO"',
-          },
-        ],
-      },
-      adhocFilter: simpleAdhocFilter,
-    });
-    const booleanOnlyOperators = ['IS TRUE', 'IS FALSE'];
-    booleanOnlyOperators.forEach(operator => {
-      expect(wrapper.instance().isOperatorRelevant(operator, 'value')).toBe(
-        true,
-      );
-    });
-  });
-});
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/AdhocFilterEditPopoverSimpleTabContent.test.tsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/AdhocFilterEditPopoverSimpleTabContent.test.tsx
new file mode 100644
index 000000000000..947614c6c11c
--- /dev/null
+++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/AdhocFilterEditPopoverSimpleTabContent.test.tsx
@@ -0,0 +1,322 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/* eslint-disable no-unused-expressions */
+import React from 'react';
+import sinon from 'sinon';
+import { shallow } from 'enzyme';
+
+import AdhocFilter, {
+  EXPRESSION_TYPES,
+  CLAUSES,
+} from 'src/explore/components/controls/FilterControl/AdhocFilter';
+import {
+  AGGREGATES,
+  Operators,
+  OPERATOR_ENUM_TO_OPERATOR_TYPE,
+} from 'src/explore/constants';
+import AdhocMetric from 'src/explore/components/controls/MetricControl/AdhocMetric';
+import AdhocFilterEditPopoverSimpleTabContent, {
+  useSimpleTabFilterProps,
+} from '.';
+
+const simpleAdhocFilter = new AdhocFilter({
+  expressionType: EXPRESSION_TYPES.SIMPLE,
+  subject: 'value',
+  operatorId: Operators.GREATER_THAN,
+  operator: OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.GREATER_THAN].operation,
+  comparator: '10',
+  clause: CLAUSES.WHERE,
+});
+
+const simpleMultiAdhocFilter = new AdhocFilter({
+  expressionType: EXPRESSION_TYPES.SIMPLE,
+  subject: 'value',
+  operatorId: Operators.IN,
+  operator: OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.IN].operation,
+  comparator: ['10'],
+  clause: CLAUSES.WHERE,
+});
+
+const sumValueAdhocMetric = new AdhocMetric({
+  expressionType: EXPRESSION_TYPES.SIMPLE,
+  column: { type: 'VARCHAR(255)', column_name: 'source' },
+  aggregate: AGGREGATES.SUM,
+});
+
+const simpleCustomFilter = new AdhocFilter({
+  expressionType: EXPRESSION_TYPES.SIMPLE,
+  subject: 'ds',
+  operator: 'LATEST PARTITION',
+  operatorId: Operators.LATEST_PARTITION,
+});
+
+const options = [
+  { type: 'VARCHAR(255)', column_name: 'source', id: 1 },
+  { type: 'VARCHAR(255)', column_name: 'target', id: 2 },
+  { type: 'DOUBLE', column_name: 'value', id: 3 },
+  { saved_metric_name: 'my_custom_metric', id: 4 },
+  sumValueAdhocMetric,
+];
+
+function setup(overrides?: Record<string, any>) {
+  const onChange = sinon.spy();
+  const props = {
+    adhocFilter: simpleAdhocFilter,
+    onChange,
+    options,
+    datasource: {
+      id: 'test-id',
+      columns: [],
+      type: 'postgres',
+      filter_select: false,
+    },
+    partitionColumn: 'test',
+    ...overrides,
+  };
+  const wrapper = shallow(
+    <AdhocFilterEditPopoverSimpleTabContent {...props} />,
+  );
+  return { wrapper, props };
+}
+
+describe('AdhocFilterEditPopoverSimpleTabContent', () => {
+  it('renders the simple tab form', () => {
+    const { wrapper } = setup();
+    expect(wrapper).toExist();
+  });
+
+  it('shows boolean only operators when subject is boolean', () => {
+    const { props } = setup({
+      adhocFilter: new AdhocFilter({
+        expressionType: EXPRESSION_TYPES.SIMPLE,
+        subject: 'value',
+        operatorId: null,
+        operator: null,
+        comparator: null,
+        clause: null,
+      }),
+      datasource: {
+        columns: [
+          {
+            id: 3,
+            column_name: 'value',
+            type: 'BOOL',
+          },
+        ],
+      },
+    });
+    const { isOperatorRelevant } = useSimpleTabFilterProps(props);
+    [
+      Operators.IS_TRUE,
+      Operators.IS_FALSE,
+      Operators.IS_NULL,
+      Operators.IS_FALSE,
+    ].map(operator => expect(isOperatorRelevant(operator, 'value')).toBe(true));
+  });
+  it('shows boolean only operators when subject is number', () => {
+    const { props } = setup({
+      adhocFilter: new AdhocFilter({
+        expressionType: EXPRESSION_TYPES.SIMPLE,
+        subject: 'value',
+        operatorId: null,
+        operator: null,
+        comparator: null,
+        clause: null,
+      }),
+      datasource: {
+        columns: [
+          {
+            id: 3,
+            column_name: 'value',
+            type: 'INT',
+          },
+        ],
+      },
+    });
+    const { isOperatorRelevant } = useSimpleTabFilterProps(props);
+    [
+      Operators.IS_TRUE,
+      Operators.IS_FALSE,
+      Operators.IS_NULL,
+      Operators.IS_NOT_NULL,
+    ].map(operator => expect(isOperatorRelevant(operator, 'value')).toBe(true));
+  });
+
+  it('will convert from individual comparator to array if the operator changes to multi', () => {
+    const { props } = setup();
+    const { onOperatorChange } = useSimpleTabFilterProps(props);
+    onOperatorChange(Operators.IN);
+    expect(props.onChange.calledOnce).toBe(true);
+    expect(props.onChange.lastCall.args[0].comparator).toEqual(['10']);
+    expect(props.onChange.lastCall.args[0].operatorId).toEqual(Operators.IN);
+  });
+
+  it('will convert from array to individual comparators if the operator changes from multi', () => {
+    const { props } = setup({
+      adhocFilter: simpleMultiAdhocFilter,
+    });
+    const { onOperatorChange } = useSimpleTabFilterProps(props);
+    onOperatorChange(Operators.LESS_THAN);
+    expect(props.onChange.calledOnce).toBe(true);
+    expect(props.onChange.lastCall.args[0]).toEqual(
+      simpleMultiAdhocFilter.duplicateWith({
+        operatorId: Operators.LESS_THAN,
+        operator: '<',
+        comparator: '10',
+      }),
+    );
+  });
+
+  it('passes the new adhocFilter to onChange after onComparatorChange', () => {
+    const { props } = setup();
+    const { onComparatorChange } = useSimpleTabFilterProps(props);
+    onComparatorChange('20');
+    expect(props.onChange.calledOnce).toBe(true);
+    expect(props.onChange.lastCall.args[0]).toEqual(
+      simpleAdhocFilter.duplicateWith({ comparator: '20' }),
+    );
+  });
+
+  it('will filter operators for table datasources', () => {
+    const { props } = setup({ datasource: { type: 'table' } });
+    const { isOperatorRelevant } = useSimpleTabFilterProps(props);
+    expect(isOperatorRelevant(Operators.REGEX, 'value')).toBe(false);
+    expect(isOperatorRelevant(Operators.LIKE, 'value')).toBe(true);
+  });
+
+  it('will filter operators for druid datasources', () => {
+    const { props } = setup({ datasource: { type: 'druid' } });
+    const { isOperatorRelevant } = useSimpleTabFilterProps(props);
+    expect(isOperatorRelevant(Operators.REGEX, 'value')).toBe(true);
+    expect(isOperatorRelevant(Operators.LIKE, 'value')).toBe(false);
+  });
+
+  it('will show LATEST PARTITION operator', () => {
+    const { props } = setup({
+      datasource: {
+        type: 'table',
+        datasource_name: 'table1',
+        schema: 'schema',
+      },
+      adhocFilter: simpleCustomFilter,
+      partitionColumn: 'ds',
+    });
+    const { isOperatorRelevant } = useSimpleTabFilterProps(props);
+    expect(isOperatorRelevant(Operators.LATEST_PARTITION, 'ds')).toBe(true);
+    expect(isOperatorRelevant(Operators.LATEST_PARTITION, 'value')).toBe(false);
+  });
+
+  it('will generate custom sqlExpression for LATEST PARTITION operator', () => {
+    const testAdhocFilter = new AdhocFilter({
+      expressionType: EXPRESSION_TYPES.SIMPLE,
+      subject: 'ds',
+    });
+    const { props } = setup({
+      datasource: {
+        type: 'table',
+        datasource_name: 'table1',
+        schema: 'schema',
+      },
+      adhocFilter: testAdhocFilter,
+      partitionColumn: 'ds',
+    });
+    const { onOperatorChange } = useSimpleTabFilterProps(props);
+    onOperatorChange(Operators.LATEST_PARTITION);
+    expect(props.onChange.calledOnce).toBe(true);
+    expect(props.onChange.lastCall.args[0]).toEqual(
+      testAdhocFilter.duplicateWith({
+        subject: 'ds',
+        operator: 'LATEST PARTITION',
+        operatorId: Operators.LATEST_PARTITION,
+        comparator: null,
+        clause: 'WHERE',
+        expressionType: 'SQL',
+        sqlExpression: "ds = '{{ presto.latest_partition('schema.table1') }}'",
+      }),
+    );
+  });
+  it('will not display boolean operators when column type is string', () => {
+    const { props } = setup({
+      datasource: {
+        type: 'table',
+        datasource_name: 'table1',
+        schema: 'schema',
+        columns: [{ column_name: 'value', type: 'STRING' }],
+      },
+      adhocFilter: simpleAdhocFilter,
+    });
+    const { isOperatorRelevant } = useSimpleTabFilterProps(props);
+    const booleanOnlyOperators = [Operators.IS_TRUE, Operators.IS_FALSE];
+    booleanOnlyOperators.forEach(operator => {
+      expect(isOperatorRelevant(operator, 'value')).toBe(false);
+    });
+  });
+  it('will display boolean operators when column is an expression', () => {
+    const { props } = setup({
+      datasource: {
+        type: 'table',
+        datasource_name: 'table1',
+        schema: 'schema',
+        columns: [
+          {
+            column_name: 'value',
+            expression: 'case when value is 0 then "NO"',
+          },
+        ],
+      },
+      adhocFilter: simpleAdhocFilter,
+    });
+    const { isOperatorRelevant } = useSimpleTabFilterProps(props);
+    const booleanOnlyOperators = [Operators.IS_TRUE, Operators.IS_FALSE];
+    booleanOnlyOperators.forEach(operator => {
+      expect(isOperatorRelevant(operator, 'value')).toBe(true);
+    });
+  });
+  it('sets comparator to true when operator is IS_TRUE', () => {
+    const { props } = setup();
+    const { onOperatorChange } = useSimpleTabFilterProps(props);
+    onOperatorChange(Operators.IS_TRUE);
+    expect(props.onChange.calledOnce).toBe(true);
+    expect(props.onChange.lastCall.args[0].operatorId).toBe(Operators.IS_TRUE);
+    expect(props.onChange.lastCall.args[0].operator).toBe('==');
+    expect(props.onChange.lastCall.args[0].comparator).toBe(true);
+  });
+  it('sets comparator to false when operator is IS_FALSE', () => {
+    const { props } = setup();
+    const { onOperatorChange } = useSimpleTabFilterProps(props);
+    onOperatorChange(Operators.IS_FALSE);
+    expect(props.onChange.calledOnce).toBe(true);
+    expect(props.onChange.lastCall.args[0].operatorId).toBe(Operators.IS_FALSE);
+    expect(props.onChange.lastCall.args[0].operator).toBe('==');
+    expect(props.onChange.lastCall.args[0].comparator).toBe(false);
+  });
+  it('sets comparator to null when operator is IS_NULL or IS_NOT_NULL', () => {
+    const { props } = setup();
+    const { onOperatorChange } = useSimpleTabFilterProps(props);
+    [Operators.IS_NULL, Operators.IS_NOT_NULL].forEach(op => {
+      onOperatorChange(op);
+      expect(props.onChange.called).toBe(true);
+      expect(props.onChange.lastCall.args[0].operatorId).toBe(op);
+      expect(props.onChange.lastCall.args[0].operator).toBe(
+        OPERATOR_ENUM_TO_OPERATOR_TYPE[op].operation,
+      );
+      expect(props.onChange.lastCall.args[0].comparator).toBe(null);
+    });
+  });
+});
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx
deleted file mode 100644
index 23f6cf9e02ca..000000000000
--- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx
+++ /dev/null
@@ -1,457 +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 React from 'react';
-import PropTypes from 'prop-types';
-import { NativeSelect as Select } from 'src/components/Select';
-import { Input } from 'src/common/components';
-import { t, SupersetClient, styled } from '@superset-ui/core';
-
-import adhocMetricType from 'src/explore/components/controls/MetricControl/adhocMetricType';
-import {
-  OPERATORS,
-  OPERATORS_OPTIONS,
-  TABLE_ONLY_OPERATORS,
-  DRUID_ONLY_OPERATORS,
-  HAVING_OPERATORS,
-  MULTI_OPERATORS,
-  CUSTOM_OPERATORS,
-  DISABLE_INPUT_OPERATORS,
-} from 'src/explore/constants';
-import FilterDefinitionOption from 'src/explore/components/controls/MetricControl/FilterDefinitionOption';
-import AdhocFilter, {
-  EXPRESSION_TYPES,
-  CLAUSES,
-} from 'src/explore/components/controls/FilterControl/AdhocFilter';
-import columnType from 'src/explore/components/controls/FilterControl/columnType';
-import Icons from 'src/components/Icons';
-
-const SelectWithLabel = styled(Select)`
-  .ant-select-selector {
-    margin-bottom: ${({ theme }) => theme.gridUnit * 4}px;
-  }
-
-  .ant-select-selector::after {
-    content: '${({ labelText }) => labelText || '\\A0'}';
-    display: inline-block;
-    white-space: nowrap;
-    color: ${({ theme }) => theme.colors.grayscale.light1};
-    width: max-content;
-  }
-`;
-
-const propTypes = {
-  adhocFilter: PropTypes.instanceOf(AdhocFilter).isRequired,
-  onChange: PropTypes.func.isRequired,
-  options: PropTypes.arrayOf(
-    PropTypes.oneOfType([
-      columnType,
-      PropTypes.shape({ saved_metric_name: PropTypes.string.isRequired }),
-      adhocMetricType,
-    ]),
-  ).isRequired,
-  onHeightChange: PropTypes.func.isRequired,
-  datasource: PropTypes.object,
-  partitionColumn: PropTypes.string,
-  popoverRef: PropTypes.object,
-};
-
-const defaultProps = {
-  datasource: {},
-};
-
-function translateOperator(operator) {
-  if (operator === OPERATORS['==']) {
-    return 'equals';
-  }
-  if (operator === OPERATORS['!=']) {
-    return 'not equal to';
-  }
-  if (operator === OPERATORS.LIKE) {
-    return 'LIKE';
-  }
-  if (operator === OPERATORS.ILIKE) {
-    return 'LIKE (case insensitive)';
-  }
-  if (operator === OPERATORS['LATEST PARTITION']) {
-    return 'use latest_partition template';
-  }
-  return operator;
-}
-
-export default class AdhocFilterEditPopoverSimpleTabContent extends React.Component {
-  constructor(props) {
-    super(props);
-    this.onSubjectChange = this.onSubjectChange.bind(this);
-    this.onOperatorChange = this.onOperatorChange.bind(this);
-    this.onComparatorChange = this.onComparatorChange.bind(this);
-    this.onInputComparatorChange = this.onInputComparatorChange.bind(this);
-    this.isOperatorRelevant = this.isOperatorRelevant.bind(this);
-    this.refreshComparatorSuggestions = this.refreshComparatorSuggestions.bind(
-      this,
-    );
-    this.clearSuggestionSearch = this.clearSuggestionSearch.bind(this);
-
-    this.state = {
-      suggestions: [],
-      abortActiveRequest: null,
-      currentSuggestionSearch: '',
-    };
-
-    this.selectProps = {
-      name: 'select-column',
-      showSearch: true,
-    };
-  }
-
-  UNSAFE_componentWillMount() {
-    this.refreshComparatorSuggestions();
-  }
-
-  componentDidUpdate(prevProps) {
-    if (prevProps.adhocFilter.subject !== this.props.adhocFilter.subject) {
-      this.refreshComparatorSuggestions();
-    }
-  }
-
-  onSubjectChange(id) {
-    const option = this.props.options.find(
-      option => option.id === id || option.optionName === id,
-    );
-
-    let subject;
-    let clause;
-    // infer the new clause based on what subject was selected.
-    if (option && option.column_name) {
-      subject = option.column_name;
-      clause = CLAUSES.WHERE;
-    } else if (option && (option.saved_metric_name || option.label)) {
-      subject = option.saved_metric_name || option.label;
-      clause = CLAUSES.HAVING;
-    }
-    const { operator } = this.props.adhocFilter;
-    this.props.onChange(
-      this.props.adhocFilter.duplicateWith({
-        subject,
-        clause,
-        operator:
-          operator && this.isOperatorRelevant(operator, subject)
-            ? operator
-            : null,
-        expressionType: EXPRESSION_TYPES.SIMPLE,
-      }),
-    );
-  }
-
-  onOperatorChange(operator) {
-    const currentComparator = this.props.adhocFilter.comparator;
-    let newComparator;
-    // convert between list of comparators and individual comparators
-    // (e.g. `in ('North America', 'Africa')` to `== 'North America'`)
-    if (MULTI_OPERATORS.has(operator)) {
-      newComparator = Array.isArray(currentComparator)
-        ? currentComparator
-        : [currentComparator].filter(element => element);
-    } else {
-      newComparator = Array.isArray(currentComparator)
-        ? currentComparator[0]
-        : currentComparator;
-    }
-
-    if (operator && CUSTOM_OPERATORS.has(operator)) {
-      this.props.onChange(
-        this.props.adhocFilter.duplicateWith({
-          subject: this.props.adhocFilter.subject,
-          clause: CLAUSES.WHERE,
-          operator,
-          expressionType: EXPRESSION_TYPES.SQL,
-          datasource: this.props.datasource,
-        }),
-      );
-    } else {
-      this.props.onChange(
-        this.props.adhocFilter.duplicateWith({
-          operator,
-          comparator: newComparator,
-          expressionType: EXPRESSION_TYPES.SIMPLE,
-        }),
-      );
-    }
-  }
-
-  onInputComparatorChange(event) {
-    this.onComparatorChange(event.target.value);
-  }
-
-  onComparatorChange(comparator) {
-    this.props.onChange(
-      this.props.adhocFilter.duplicateWith({
-        comparator,
-        expressionType: EXPRESSION_TYPES.SIMPLE,
-      }),
-    );
-  }
-
-  refreshComparatorSuggestions() {
-    const { datasource } = this.props;
-    const col = this.props.adhocFilter.subject;
-    const having = this.props.adhocFilter.clause === CLAUSES.HAVING;
-
-    if (col && datasource && datasource.filter_select && !having) {
-      if (this.state.abortActiveRequest) {
-        this.state.abortActiveRequest();
-      }
-
-      const controller = new AbortController();
-      const { signal } = controller;
-      this.setState({ abortActiveRequest: controller.abort, loading: true });
-
-      SupersetClient.get({
-        signal,
-        endpoint: `/superset/filter/${datasource.type}/${datasource.id}/${col}/`,
-      })
-        .then(({ json }) => {
-          this.setState(() => ({
-            suggestions: json,
-            abortActiveRequest: null,
-            loading: false,
-          }));
-        })
-        .catch(() => {
-          this.setState(() => ({
-            suggestions: [],
-            abortActiveRequest: null,
-            loading: false,
-          }));
-        });
-    }
-  }
-
-  isOperatorRelevant(operator, subject) {
-    const column = this.props.datasource.columns?.find(
-      col => col.column_name === subject,
-    );
-    const isColumnBoolean =
-      !!column && (column.type === 'BOOL' || column.type === 'BOOLEAN');
-    const isColumnNumber = !!column && column.type === 'INT';
-    const isColumnFunction = !!column && !!column.expression;
-
-    if (operator && CUSTOM_OPERATORS.has(operator)) {
-      const { partitionColumn } = this.props;
-      return partitionColumn && subject && subject === partitionColumn;
-    }
-    if (
-      operator === OPERATORS['IS TRUE'] ||
-      operator === OPERATORS['IS FALSE']
-    ) {
-      return isColumnBoolean || isColumnNumber || isColumnFunction;
-    }
-    if (isColumnBoolean) {
-      return (
-        operator === OPERATORS['IS NULL'] ||
-        operator === OPERATORS['IS NOT NULL']
-      );
-    }
-    return !(
-      (this.props.datasource.type === 'druid' &&
-        TABLE_ONLY_OPERATORS.indexOf(operator) >= 0) ||
-      (this.props.datasource.type === 'table' &&
-        DRUID_ONLY_OPERATORS.indexOf(operator) >= 0) ||
-      (this.props.adhocFilter.clause === CLAUSES.HAVING &&
-        HAVING_OPERATORS.indexOf(operator) === -1)
-    );
-  }
-
-  focusComparator(ref, shouldFocus) {
-    if (ref && shouldFocus) {
-      ref.focus();
-    }
-  }
-
-  optionsRemaining() {
-    const { suggestions } = this.state;
-    const { comparator } = this.props.adhocFilter;
-    // if select is multi/value is array, we show the options not selected
-    const valuesFromSuggestionsLength = Array.isArray(comparator)
-      ? comparator.filter(v => suggestions.includes(v)).length
-      : 0;
-    return suggestions?.length - valuesFromSuggestionsLength ?? 0;
-  }
-
-  createSuggestionsPlaceholder() {
-    const optionsRemaining = this.optionsRemaining();
-    const placeholder = t('%s option(s)', optionsRemaining);
-    return optionsRemaining ? placeholder : '';
-  }
-
-  renderSubjectOptionLabel(option) {
-    return <FilterDefinitionOption option={option} />;
-  }
-
-  clearSuggestionSearch() {
-    this.setState({ currentSuggestionSearch: '' });
-  }
-
-  render() {
-    const { adhocFilter, options, datasource } = this.props;
-    const { currentSuggestionSearch } = this.state;
-    let columns = options;
-    const { subject, operator, comparator } = adhocFilter;
-    const subjectSelectProps = {
-      value: subject ?? undefined,
-      onChange: this.onSubjectChange,
-      notFoundContent: t(
-        'No such column found. To filter on a metric, try the Custom SQL tab.',
-      ),
-      filterOption: (input, option) =>
-        option.filterBy.toLowerCase().indexOf(input.toLowerCase()) >= 0,
-      autoFocus: !subject,
-    };
-
-    if (datasource.type === 'druid') {
-      subjectSelectProps.placeholder = t(
-        '%s column(s) and metric(s)',
-        columns.length,
-      );
-    } else {
-      // we cannot support simple ad-hoc filters for metrics because we don't know what type
-      // the value should be cast to (without knowing the output type of the aggregate, which
-      // becomes a rather complicated problem)
-      subjectSelectProps.placeholder =
-        adhocFilter.clause === CLAUSES.WHERE
-          ? t('%s column(s)', columns.length)
-          : t('To filter on a metric, use Custom SQL tab.');
-      columns = options.filter(option => option.column_name);
-    }
-
-    const operatorSelectProps = {
-      placeholder: t(
-        '%s operator(s)',
-        OPERATORS_OPTIONS.filter(op => this.isOperatorRelevant(op, subject))
-          .length,
-      ),
-      // like AGGREGATES_OPTIONS, operator options are string
-      value: operator,
-      onChange: this.onOperatorChange,
-      filterOption: (input, option) =>
-        option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0,
-      autoFocus: !!subjectSelectProps.value && !operator,
-    };
-
-    const focusComparator =
-      !!subjectSelectProps.value && !!operatorSelectProps.value;
-    const comparatorSelectProps = {
-      allowClear: true,
-      showSearch: true,
-      mode: MULTI_OPERATORS.has(operator) && 'tags',
-      tokenSeparators: [',', '\n', '\t', ';'],
-      loading: this.state.loading,
-      value: comparator,
-      onChange: this.onComparatorChange,
-      notFoundContent: t('Type a value here'),
-      disabled: DISABLE_INPUT_OPERATORS.includes(operator),
-      placeholder: this.createSuggestionsPlaceholder(),
-      labelText: comparator?.length > 0 && this.createSuggestionsPlaceholder(),
-      autoFocus: focusComparator,
-    };
-    const Icon =
-      operator === 'NOT IN' ? Icons.StopOutlined : Icons.CheckOutlined;
-
-    return (
-      <>
-        <Select
-          css={theme => ({
-            marginTop: theme.gridUnit * 4,
-            marginBottom: theme.gridUnit * 4,
-          })}
-          {...this.selectProps}
-          {...subjectSelectProps}
-          name="filter-column"
-          getPopupContainer={triggerNode => triggerNode.parentNode}
-        >
-          {columns.map(column => (
-            <Select.Option
-              value={column.id || column.optionName}
-              filterBy={
-                column.saved_metric_name || column.column_name || column.label
-              }
-              key={column.id || column.optionName}
-            >
-              {this.renderSubjectOptionLabel(column)}
-            </Select.Option>
-          ))}
-        </Select>
-        <Select
-          css={theme => ({ marginBottom: theme.gridUnit * 4 })}
-          {...this.selectProps}
-          {...operatorSelectProps}
-          getPopupContainer={triggerNode => triggerNode.parentNode}
-          name="filter-operator"
-        >
-          {OPERATORS_OPTIONS.filter(op =>
-            this.isOperatorRelevant(op, subject),
-          ).map(option => (
-            <Select.Option value={option} key={option}>
-              {translateOperator(option)}
-            </Select.Option>
-          ))}
-        </Select>
-        {MULTI_OPERATORS.has(operator) || this.state.suggestions.length > 0 ? (
-          <SelectWithLabel
-            data-test="adhoc-filter-simple-value"
-            name="filter-value"
-            {...comparatorSelectProps}
-            getPopupContainer={triggerNode => triggerNode.parentNode}
-            onSearch={val => this.setState({ currentSuggestionSearch: val })}
-            onSelect={this.clearSuggestionSearch}
-            onBlur={this.clearSuggestionSearch}
-            menuItemSelectedIcon={<Icon iconSize="m" />}
-          >
-            {this.state.suggestions.map(suggestion => (
-              <Select.Option value={suggestion} key={suggestion}>
-                {suggestion}
-              </Select.Option>
-            ))}
-
-            {/* enable selecting an option not included in suggestions */}
-            {currentSuggestionSearch &&
-              !this.state.suggestions.some(
-                suggestion => suggestion === currentSuggestionSearch,
-              ) && (
-                <Select.Option value={currentSuggestionSearch}>
-                  {`${t('Create "%s"', currentSuggestionSearch)}`}
-                </Select.Option>
-              )}
-          </SelectWithLabel>
-        ) : (
-          <Input
-            data-test="adhoc-filter-simple-value"
-            name="filter-value"
-            ref={ref => this.focusComparator(ref, focusComparator)}
-            onChange={this.onInputComparatorChange}
-            value={comparator}
-            placeholder={t('Filter value (case sensitive)')}
-            disabled={DISABLE_INPUT_OPERATORS.includes(operator)}
-          />
-        )}
-      </>
-    );
-  }
-}
-AdhocFilterEditPopoverSimpleTabContent.propTypes = propTypes;
-AdhocFilterEditPopoverSimpleTabContent.defaultProps = defaultProps;
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.tsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.tsx
new file mode 100644
index 000000000000..f6ef44b5a10c
--- /dev/null
+++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.tsx
@@ -0,0 +1,463 @@
+/**
+ * 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 React, { useEffect, useState } from 'react';
+import { NativeSelect as Select } from 'src/components/Select';
+import { t, SupersetClient, styled } from '@superset-ui/core';
+import {
+  Operators,
+  OPERATORS_OPTIONS,
+  TABLE_ONLY_OPERATORS,
+  DRUID_ONLY_OPERATORS,
+  HAVING_OPERATORS,
+  MULTI_OPERATORS,
+  CUSTOM_OPERATORS,
+  DISABLE_INPUT_OPERATORS,
+  AGGREGATES,
+  OPERATOR_ENUM_TO_OPERATOR_TYPE,
+} from 'src/explore/constants';
+import FilterDefinitionOption from 'src/explore/components/controls/MetricControl/FilterDefinitionOption';
+import AdhocFilter, {
+  EXPRESSION_TYPES,
+  CLAUSES,
+} from 'src/explore/components/controls/FilterControl/AdhocFilter';
+import { Input, SelectProps } from 'src/common/components';
+
+const SelectWithLabel = styled(Select)`
+  .ant-select-selector {
+    margin-bottom: ${({ theme }) => theme.gridUnit * 4}px;
+  }
+
+  .ant-select-selector::after {
+    content: '${(
+      pr: SelectProps<any> & {
+        labelText: string | boolean;
+      },
+    ) => pr.labelText || '\\A0'}';
+    display: inline-block;
+    white-space: nowrap;
+    color: ${({ theme }) => theme.colors.grayscale.light1};
+    width: max-content;
+  }
+`;
+
+export interface SimpleColumnType {
+  id: number;
+  column_name: string;
+  expression?: string;
+  type: string;
+  optionName?: string;
+  filterBy?: string;
+  value?: string;
+}
+
+export interface SimpleExpressionType {
+  expressionType: keyof typeof EXPRESSION_TYPES;
+  column: SimpleColumnType;
+  aggregate: keyof typeof AGGREGATES;
+  label: string;
+}
+export interface SQLExpressionType {
+  expressionType: keyof typeof EXPRESSION_TYPES;
+  sqlExpression: string;
+  label: string;
+}
+
+export interface MetricColumnType {
+  saved_metric_name: string;
+}
+
+export type ColumnType =
+  | SimpleColumnType
+  | SimpleExpressionType
+  | SQLExpressionType
+  | MetricColumnType;
+
+export interface Props {
+  adhocFilter: AdhocFilter;
+  onChange: (filter: AdhocFilter) => void;
+  options: ColumnType[];
+  datasource: {
+    id: string;
+    columns: SimpleColumnType[];
+    type: string;
+    filter_select: boolean;
+  };
+  partitionColumn: string;
+}
+export const useSimpleTabFilterProps = (props: Props) => {
+  const isOperatorRelevant = (operator: Operators, subject: string) => {
+    const column = props.datasource.columns?.find(
+      col => col.column_name === subject,
+    );
+    const isColumnBoolean =
+      !!column && (column.type === 'BOOL' || column.type === 'BOOLEAN');
+    const isColumnNumber =
+      !!column && (column.type === 'INT' || column.type === 'INTEGER');
+    const isColumnFunction = !!column && !!column.expression;
+
+    if (operator && CUSTOM_OPERATORS.has(operator)) {
+      const { partitionColumn } = props;
+      return partitionColumn && subject && subject === partitionColumn;
+    }
+    if (operator === Operators.IS_TRUE || operator === Operators.IS_FALSE) {
+      return isColumnBoolean || isColumnNumber || isColumnFunction;
+    }
+    if (isColumnBoolean) {
+      return (
+        operator === Operators.IS_NULL || operator === Operators.IS_NOT_NULL
+      );
+    }
+    return !(
+      (props.datasource.type === 'druid' &&
+        TABLE_ONLY_OPERATORS.indexOf(operator) >= 0) ||
+      (props.datasource.type === 'table' &&
+        DRUID_ONLY_OPERATORS.indexOf(operator) >= 0) ||
+      (props.adhocFilter.clause === CLAUSES.HAVING &&
+        HAVING_OPERATORS.indexOf(operator) === -1)
+    );
+  };
+  const onSubjectChange = (id: string | number) => {
+    const option = props.options.find(
+      option =>
+        ('id' in option && option.id === id) ||
+        ('optionName' in option && option.optionName === id),
+    );
+
+    let subject = '';
+    let clause;
+    // infer the new clause based on what subject was selected.
+    if (option && 'column_name' in option) {
+      subject = option.column_name;
+      clause = CLAUSES.WHERE;
+    } else if (option && 'saved_metric_name' in option) {
+      subject = option.saved_metric_name;
+      clause = CLAUSES.HAVING;
+    } else if (option && option.label) {
+      subject = option.label;
+      clause = CLAUSES.HAVING;
+    }
+    const { operator, operatorId } = props.adhocFilter;
+    props.onChange(
+      props.adhocFilter.duplicateWith({
+        subject,
+        clause,
+        operator:
+          operator && isOperatorRelevant(operatorId, subject)
+            ? OPERATOR_ENUM_TO_OPERATOR_TYPE[operatorId].operation
+            : null,
+        expressionType: EXPRESSION_TYPES.SIMPLE,
+        operatorId,
+      }),
+    );
+  };
+  const onOperatorChange = (operatorId: Operators) => {
+    const currentComparator = props.adhocFilter.comparator;
+    let newComparator;
+    // convert between list of comparators and individual comparators
+    // (e.g. `in ('North America', 'Africa')` to `== 'North America'`)
+    if (MULTI_OPERATORS.has(operatorId)) {
+      newComparator = Array.isArray(currentComparator)
+        ? currentComparator
+        : [currentComparator].filter(element => element);
+    } else {
+      newComparator = Array.isArray(currentComparator)
+        ? currentComparator[0]
+        : currentComparator;
+    }
+    if (operatorId === Operators.IS_TRUE || operatorId === Operators.IS_FALSE) {
+      newComparator = Operators.IS_TRUE === operatorId;
+    }
+    if (operatorId && CUSTOM_OPERATORS.has(operatorId)) {
+      props.onChange(
+        props.adhocFilter.duplicateWith({
+          subject: props.adhocFilter.subject,
+          clause: CLAUSES.WHERE,
+          operatorId,
+          operator: OPERATOR_ENUM_TO_OPERATOR_TYPE[operatorId].operation,
+          expressionType: EXPRESSION_TYPES.SQL,
+          datasource: props.datasource,
+        }),
+      );
+    } else {
+      props.onChange(
+        props.adhocFilter.duplicateWith({
+          operatorId,
+          operator: OPERATOR_ENUM_TO_OPERATOR_TYPE[operatorId].operation,
+          comparator: newComparator,
+          expressionType: EXPRESSION_TYPES.SIMPLE,
+        }),
+      );
+    }
+  };
+  const onComparatorChange = (comparator: string) => {
+    props.onChange(
+      props.adhocFilter.duplicateWith({
+        comparator,
+        expressionType: EXPRESSION_TYPES.SIMPLE,
+      }),
+    );
+  };
+  return {
+    onSubjectChange,
+    onOperatorChange,
+    onComparatorChange,
+    isOperatorRelevant,
+  };
+};
+
+const AdhocFilterEditPopoverSimpleTabContent: React.FC<Props> = props => {
+  const selectProps = {
+    name: 'select-column',
+    showSearch: true,
+  };
+  const {
+    onSubjectChange,
+    onOperatorChange,
+    isOperatorRelevant,
+    onComparatorChange,
+  } = useSimpleTabFilterProps(props);
+  const [suggestions, setSuggestions] = useState<Record<string, any>>([]);
+  const [currentSuggestionSearch, setCurrentSuggestionSearch] = useState('');
+  const [
+    loadingComparatorSuggestions,
+    setLoadingComparatorSuggestions,
+  ] = useState(false);
+
+  useEffect(() => {
+    const refreshComparatorSuggestions = () => {
+      const { datasource } = props;
+      const col = props.adhocFilter.subject;
+      const having = props.adhocFilter.clause === CLAUSES.HAVING;
+
+      if (col && datasource && datasource.filter_select && !having) {
+        const controller = new AbortController();
+        const { signal } = controller;
+        if (loadingComparatorSuggestions) {
+          controller.abort();
+        }
+        setLoadingComparatorSuggestions(true);
+        SupersetClient.get({
+          signal,
+          endpoint: `/superset/filter/${datasource.type}/${datasource.id}/${col}/`,
+        })
+          .then(({ json }) => {
+            setSuggestions(json);
+            setLoadingComparatorSuggestions(false);
+          })
+          .catch(() => {
+            setSuggestions([]);
+            setLoadingComparatorSuggestions(false);
+          });
+      }
+    };
+    refreshComparatorSuggestions();
+  }, [props.adhocFilter.subject]);
+
+  const onInputComparatorChange = (
+    event: React.ChangeEvent<HTMLInputElement>,
+  ) => {
+    onComparatorChange(event.target.value);
+  };
+
+  const renderSubjectOptionLabel = (option: ColumnType) => (
+    <FilterDefinitionOption option={option} />
+  );
+
+  const clearSuggestionSearch = () => {
+    setCurrentSuggestionSearch('');
+  };
+
+  const getOptionsRemaining = () => {
+    const { comparator } = props.adhocFilter;
+    // if select is multi/value is array, we show the options not selected
+    const valuesFromSuggestionsLength = Array.isArray(comparator)
+      ? comparator.filter(v => suggestions.includes(v)).length
+      : 0;
+    return suggestions?.length - valuesFromSuggestionsLength ?? 0;
+  };
+  const createSuggestionsPlaceholder = () => {
+    const optionsRemaining = getOptionsRemaining();
+    const placeholder = t('%s option(s)', optionsRemaining);
+    return optionsRemaining ? placeholder : '';
+  };
+
+  let columns = props.options;
+  const { subject, operator, comparator, operatorId } = props.adhocFilter;
+  const subjectSelectProps = {
+    value: subject ?? undefined,
+    onChange: onSubjectChange,
+    notFoundContent: t(
+      'No such column found. To filter on a metric, try the Custom SQL tab.',
+    ),
+    autoFocus: !subject,
+    placeholder: '',
+  };
+
+  if (props.datasource.type === 'druid') {
+    subjectSelectProps.placeholder = t(
+      '%s column(s) and metric(s)',
+      columns.length,
+    );
+  } else {
+    // we cannot support simple ad-hoc filters for metrics because we don't know what type
+    // the value should be cast to (without knowing the output type of the aggregate, which
+    // becomes a rather complicated problem)
+    subjectSelectProps.placeholder =
+      props.adhocFilter.clause === CLAUSES.WHERE
+        ? t('%s column(s)', columns.length)
+        : t('To filter on a metric, use Custom SQL tab.');
+    columns = props.options.filter(
+      option => 'column_name' in option && option.column_name,
+    );
+  }
+
+  const operatorSelectProps = {
+    placeholder: t(
+      '%s operator(s)',
+      OPERATORS_OPTIONS.filter(op => isOperatorRelevant(op, subject)).length,
+    ),
+    value: OPERATOR_ENUM_TO_OPERATOR_TYPE[operatorId]?.display,
+    onChange: onOperatorChange,
+    autoFocus: !!subjectSelectProps.value && !operator,
+    name: 'select-operator',
+  };
+
+  const shouldFocusComparator =
+    !!subjectSelectProps.value && !!operatorSelectProps.value;
+
+  const comparatorSelectProps: SelectProps<any> & {
+    labelText: string | boolean;
+  } = {
+    allowClear: true,
+    showSearch: true,
+    mode: MULTI_OPERATORS.has(operatorId) ? 'tags' : undefined,
+    tokenSeparators: [',', '\n', '\t', ';'],
+    loading: loadingComparatorSuggestions,
+    value: comparator,
+    onChange: onComparatorChange,
+    notFoundContent: t('Type a value here'),
+    disabled: DISABLE_INPUT_OPERATORS.includes(operatorId),
+    placeholder: createSuggestionsPlaceholder(),
+    labelText:
+      comparator && comparator.length > 0 && createSuggestionsPlaceholder(),
+    autoFocus: shouldFocusComparator,
+  };
+
+  return (
+    <>
+      <Select
+        css={theme => ({
+          marginTop: theme.gridUnit * 4,
+          marginBottom: theme.gridUnit * 4,
+        })}
+        {...selectProps}
+        {...subjectSelectProps}
+        filterOption={(input, option) =>
+          option && option.filterBy
+            ? option.filterBy.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            : false
+        }
+        getPopupContainer={triggerNode => triggerNode.parentNode}
+      >
+        {columns.map(column => (
+          <Select.Option
+            value={
+              ('id' in column && column.id) ||
+              ('optionName' in column && column.optionName) ||
+              ''
+            }
+            filterBy={
+              ('saved_metric_name' in column && column.saved_metric_name) ||
+              ('column_name' in column && column.column_name) ||
+              ('label' in column && column.label)
+            }
+            key={
+              ('id' in column && column.id) ||
+              ('optionName' in column && column.optionName) ||
+              undefined
+            }
+          >
+            {renderSubjectOptionLabel(column)}
+          </Select.Option>
+        ))}
+      </Select>
+      <Select
+        css={theme => ({ marginBottom: theme.gridUnit * 4 })}
+        {...selectProps}
+        {...operatorSelectProps}
+        filterOption={(input, option) =>
+          option && option.children
+            ? option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            : false
+        }
+        getPopupContainer={triggerNode => triggerNode.parentNode}
+      >
+        {OPERATORS_OPTIONS.filter(op => isOperatorRelevant(op, subject)).map(
+          option => (
+            <Select.Option value={option} key={option}>
+              {OPERATOR_ENUM_TO_OPERATOR_TYPE[option].display}
+            </Select.Option>
+          ),
+        )}
+      </Select>
+      {MULTI_OPERATORS.has(operatorId) || suggestions.length > 0 ? (
+        <SelectWithLabel
+          data-test="adhoc-filter-simple-value"
+          {...comparatorSelectProps}
+          getPopupContainer={triggerNode => triggerNode.parentNode}
+          onSearch={val => setCurrentSuggestionSearch(val)}
+          onSelect={clearSuggestionSearch}
+          onBlur={clearSuggestionSearch}
+        >
+          {suggestions.map((suggestion: string) => (
+            <Select.Option value={suggestion} key={suggestion}>
+              {String(suggestion)}
+            </Select.Option>
+          ))}
+
+          {/* enable selecting an option not included in suggestions */}
+          {currentSuggestionSearch &&
+            !suggestions.some(
+              (suggestion: string) => suggestion === currentSuggestionSearch,
+            ) && (
+              <Select.Option value={currentSuggestionSearch}>
+                {currentSuggestionSearch}
+              </Select.Option>
+            )}
+        </SelectWithLabel>
+      ) : (
+        <Input
+          data-test="adhoc-filter-simple-value"
+          name="filter-value"
+          ref={ref => {
+            if (ref && shouldFocusComparator) {
+              ref.focus();
+            }
+          }}
+          onChange={onInputComparatorChange}
+          value={comparator}
+          placeholder={t('Filter value (case sensitive)')}
+          disabled={DISABLE_INPUT_OPERATORS.includes(operatorId)}
+        />
+      )}
+    </>
+  );
+};
+
+export default AdhocFilterEditPopoverSimpleTabContent;
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterPopoverTrigger/index.tsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterPopoverTrigger/index.tsx
index 530c1bb4fff6..e6477863173c 100644
--- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterPopoverTrigger/index.tsx
+++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterPopoverTrigger/index.tsx
@@ -29,7 +29,6 @@ interface AdhocFilterPopoverTriggerProps {
   datasource: Record<string, any>;
   onFilterEdit: (editedFilter: AdhocFilter) => void;
   partitionColumn?: string;
-  createNew?: boolean;
   isControlledComponent?: boolean;
   visible?: boolean;
   togglePopover?: (visible: boolean) => void;
@@ -104,7 +103,7 @@ class AdhocFilterPopoverTrigger extends React.PureComponent<
         defaultVisible={visible}
         visible={visible}
         onVisibleChange={togglePopover}
-        destroyTooltipOnHide={this.props.createNew}
+        destroyTooltipOnHide
       >
         {this.props.children}
       </Popover>
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/adhocFilterType.js b/superset-frontend/src/explore/components/controls/FilterControl/adhocFilterType.js
index f036fc0fca7a..c9eef05926fc 100644
--- a/superset-frontend/src/explore/components/controls/FilterControl/adhocFilterType.js
+++ b/superset-frontend/src/explore/components/controls/FilterControl/adhocFilterType.js
@@ -17,8 +17,6 @@
  * under the License.
  */
 import PropTypes from 'prop-types';
-
-import { OPERATORS } from 'src/explore/constants';
 import { EXPRESSION_TYPES, CLAUSES } from './AdhocFilter';
 
 export default PropTypes.oneOfType([
@@ -26,7 +24,6 @@ export default PropTypes.oneOfType([
     expressionType: PropTypes.oneOf([EXPRESSION_TYPES.SIMPLE]).isRequired,
     clause: PropTypes.oneOf([CLAUSES.HAVING, CLAUSES.WHERE]).isRequired,
     subject: PropTypes.string.isRequired,
-    operator: PropTypes.oneOf(Object.keys(OPERATORS)).isRequired,
     comparator: PropTypes.oneOfType([
       PropTypes.string,
       PropTypes.arrayOf(PropTypes.string),
diff --git a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricOption.jsx b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricOption.jsx
index 9a9fd2002a93..bbe544dd8fed 100644
--- a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricOption.jsx
+++ b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricOption.jsx
@@ -36,6 +36,8 @@ const propTypes = {
   onMoveLabel: PropTypes.func,
   onDropLabel: PropTypes.func,
   index: PropTypes.number,
+  type: PropTypes.string,
+  multi: PropTypes.bool,
 };
 
 class AdhocMetricOption extends React.PureComponent {
@@ -46,7 +48,7 @@ class AdhocMetricOption extends React.PureComponent {
 
   onRemoveMetric(e) {
     e.stopPropagation();
-    this.props.onRemoveMetric();
+    this.props.onRemoveMetric(this.props.index);
   }
 
   render() {
@@ -60,6 +62,8 @@ class AdhocMetricOption extends React.PureComponent {
       onMoveLabel,
       onDropLabel,
       index,
+      type,
+      multi,
     } = this.props;
 
     return (
@@ -79,9 +83,10 @@ class AdhocMetricOption extends React.PureComponent {
           onMoveLabel={onMoveLabel}
           onDropLabel={onDropLabel}
           index={index}
-          type={DndItemType.AdhocMetricOption}
+          type={type ?? DndItemType.AdhocMetricOption}
           withCaret
           isFunction
+          multi={multi}
         />
       </AdhocMetricPopoverTrigger>
     );
diff --git a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricPopoverTrigger.tsx b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricPopoverTrigger.tsx
index 3a5e2fb5cda1..2b3b557793fa 100644
--- a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricPopoverTrigger.tsx
+++ b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricPopoverTrigger.tsx
@@ -35,7 +35,6 @@ export type AdhocMetricPopoverTriggerProps = {
   savedMetric: savedMetricType;
   datasourceType: string;
   children: ReactNode;
-  createNew?: boolean;
   isControlledComponent?: boolean;
   visible?: boolean;
   togglePopover?: (visible: boolean) => void;
@@ -43,6 +42,7 @@ export type AdhocMetricPopoverTriggerProps = {
 };
 
 export type AdhocMetricPopoverTriggerState = {
+  adhocMetric: AdhocMetric;
   popoverVisible: boolean;
   title: { label: string; hasCustomLabel: boolean };
   currentLabel: string;
@@ -65,6 +65,7 @@ class AdhocMetricPopoverTrigger extends React.PureComponent<
     this.onChange = this.onChange.bind(this);
 
     this.state = {
+      adhocMetric: props.adhocMetric,
       popoverVisible: false,
       title: {
         label: props.adhocMetric.label,
@@ -76,6 +77,26 @@ class AdhocMetricPopoverTrigger extends React.PureComponent<
     };
   }
 
+  static getDerivedStateFromProps(
+    nextProps: AdhocMetricPopoverTriggerProps,
+    prevState: AdhocMetricPopoverTriggerState,
+  ) {
+    if (prevState.adhocMetric.optionName !== nextProps.adhocMetric.optionName) {
+      return {
+        adhocMetric: nextProps.adhocMetric,
+        title: {
+          label: nextProps.adhocMetric.label,
+          hasCustomLabel: nextProps.adhocMetric.hasCustomLabel,
+        },
+        currentLabel: '',
+        labelModified: false,
+      };
+    }
+    return {
+      adhocMetric: nextProps.adhocMetric,
+    };
+  }
+
   onLabelChange(e: any) {
     const { verbose_name, metric_name } = this.props.savedMetric;
     const defaultMetricLabel = this.props.adhocMetric?.getDefaultLabel();
@@ -180,7 +201,6 @@ class AdhocMetricPopoverTrigger extends React.PureComponent<
       <ExplorePopoverContent>
         <AdhocMetricEditPopover
           adhocMetric={adhocMetric}
-          title={title}
           columns={columns}
           savedMetricsOptions={savedMetricsOptions}
           savedMetric={savedMetric}
@@ -211,7 +231,7 @@ class AdhocMetricPopoverTrigger extends React.PureComponent<
         visible={visible}
         onVisibleChange={togglePopover}
         title={popoverTitle}
-        destroyTooltipOnHide={this.props.createNew}
+        destroyTooltipOnHide
       >
         {this.props.children}
       </Popover>
diff --git a/superset-frontend/src/explore/components/controls/MetricControl/FilterDefinitionOption.jsx b/superset-frontend/src/explore/components/controls/MetricControl/FilterDefinitionOption.jsx
index 0491090ed90a..7063c4c69452 100644
--- a/superset-frontend/src/explore/components/controls/MetricControl/FilterDefinitionOption.jsx
+++ b/superset-frontend/src/explore/components/controls/MetricControl/FilterDefinitionOption.jsx
@@ -51,5 +51,6 @@ export default function FilterDefinitionOption({ option }) {
       />
     );
   }
+  return null;
 }
 FilterDefinitionOption.propTypes = propTypes;
diff --git a/superset-frontend/src/explore/components/controls/MetricControl/MetricDefinitionValue.jsx b/superset-frontend/src/explore/components/controls/MetricControl/MetricDefinitionValue.jsx
index 44a6527548ee..7115f529437c 100644
--- a/superset-frontend/src/explore/components/controls/MetricControl/MetricDefinitionValue.jsx
+++ b/superset-frontend/src/explore/components/controls/MetricControl/MetricDefinitionValue.jsx
@@ -48,6 +48,8 @@ export default function MetricDefinitionValue({
   onMoveLabel,
   onDropLabel,
   index,
+  type,
+  multi,
 }) {
   const getSavedMetricByName = metricName =>
     savedMetrics.find(metric => metric.metric_name === metricName);
@@ -74,6 +76,8 @@ export default function MetricDefinitionValue({
       onDropLabel,
       index,
       savedMetric: savedMetric ?? {},
+      type,
+      multi,
     };
 
     return <AdhocMetricOption {...metricOptionProps} />;
diff --git a/superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.jsx b/superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.jsx
index c8b7205c5237..4e4925b9cd20 100644
--- a/superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.jsx
+++ b/superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.jsx
@@ -16,16 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import PropTypes from 'prop-types';
-import { t, withTheme } from '@superset-ui/core';
-import { isEqual } from 'lodash';
+import { ensureIsArray, t, useTheme } from '@superset-ui/core';
 import ControlHeader from 'src/explore/components/ControlHeader';
-import {
-  AGGREGATES_OPTIONS,
-  sqlaAutoGeneratedMetricNameRegex,
-  druidAutoGeneratedMetricRegex,
-} from 'src/explore/constants';
 import Icons from 'src/components/Icons';
 import {
   AddIconButton,
@@ -34,7 +28,6 @@ import {
   LabelsContainer,
 } from 'src/explore/components/controls/OptionControls';
 import columnType from './columnType';
-import MetricDefinitionOption from './MetricDefinitionOption';
 import MetricDefinitionValue from './MetricDefinitionValue';
 import AdhocMetric from './AdhocMetric';
 import savedMetricType from './savedMetricType';
@@ -82,9 +75,9 @@ function isDictionaryForAdhocMetric(value) {
   return value && !(value instanceof AdhocMetric) && value.expressionType;
 }
 
-function columnsContainAllMetrics(value, nextProps) {
+function columnsContainAllMetrics(value, columns, savedMetrics) {
   const columnNames = new Set(
-    [...(nextProps.columns || []), ...(nextProps.savedMetrics || [])]
+    [...(columns || []), ...(savedMetrics || [])]
       // eslint-disable-next-line camelcase
       .map(({ column_name, metric_name }) => column_name || metric_name),
   );
@@ -123,294 +116,227 @@ function coerceAdhocMetrics(value) {
   });
 }
 
-class MetricsControl extends React.PureComponent {
-  constructor(props) {
-    super(props);
-    this.onChange = this.onChange.bind(this);
-    this.onMetricEdit = this.onMetricEdit.bind(this);
-    this.onNewMetric = this.onNewMetric.bind(this);
-    this.onRemoveMetric = this.onRemoveMetric.bind(this);
-    this.moveLabel = this.moveLabel.bind(this);
-    this.checkIfAggregateInInput = this.checkIfAggregateInInput.bind(this);
-    this.optionsForSelect = this.optionsForSelect.bind(this);
-    this.selectFilterOption = this.selectFilterOption.bind(this);
-    this.isAutoGeneratedMetric = this.isAutoGeneratedMetric.bind(this);
-    this.optionRenderer = option => <MetricDefinitionOption option={option} />;
-    this.valueRenderer = (option, index) => (
-      <MetricDefinitionValue
-        key={index}
-        index={index}
-        option={option}
-        onMetricEdit={this.onMetricEdit}
-        onRemoveMetric={() => this.onRemoveMetric(index)}
-        columns={this.props.columns}
-        datasource={this.props.datasource}
-        savedMetrics={this.props.savedMetrics}
-        savedMetricsOptions={getOptionsForSavedMetrics(
-          this.props.savedMetrics,
-          this.props.value,
-          this.props.value?.[index],
-        )}
-        datasourceType={this.props.datasourceType}
-        onMoveLabel={this.moveLabel}
-        onDropLabel={() => this.props.onChange(this.state.value)}
-      />
-    );
-    this.select = null;
-    this.selectRef = ref => {
-      if (ref) {
-        this.select = ref.select;
-      } else {
-        this.select = null;
-      }
-    };
-    this.state = {
-      aggregateInInput: null,
-      options: this.optionsForSelect(this.props),
-      value: coerceAdhocMetrics(this.props.value),
-    };
-  }
+const emptySavedMetric = { metric_name: '', expression: '' };
 
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    const { value } = this.props;
-    if (
-      !isEqual(this.props.columns, nextProps.columns) ||
-      !isEqual(this.props.savedMetrics, nextProps.savedMetrics)
-    ) {
-      this.setState({ options: this.optionsForSelect(nextProps) });
+const MetricsControl = ({
+  onChange,
+  multi,
+  value: propsValue,
+  columns,
+  savedMetrics,
+  datasource,
+  datasourceType,
+  ...props
+}) => {
+  const [value, setValue] = useState(coerceAdhocMetrics(propsValue));
+  const theme = useTheme();
 
-      // Remove all metrics if selected value no longer a valid column
-      // in the dataset. Must use `nextProps` here because Redux reducers may
-      // have already updated the value for this control.
-      if (!columnsContainAllMetrics(nextProps.value, nextProps)) {
-        this.props.onChange([]);
+  const handleChange = useCallback(
+    opts => {
+      // if clear out options
+      if (opts === null) {
+        onChange(null);
+        return;
       }
-    }
-    if (value !== nextProps.value) {
-      this.setState({ value: coerceAdhocMetrics(nextProps.value) });
-    }
-  }
-
-  onNewMetric(newMetric) {
-    this.setState(
-      prevState => ({
-        ...prevState,
-        value: [...prevState.value, newMetric],
-      }),
-      () => {
-        this.onChange(this.state.value);
-      },
-    );
-  }
 
-  onMetricEdit(changedMetric, oldMetric) {
-    this.setState(
-      prevState => ({
-        value: prevState.value.map(value => {
-          if (
-            // compare saved metrics
-            value === oldMetric.metric_name ||
-            // compare adhoc metrics
-            typeof value.optionName !== 'undefined'
-              ? value.optionName === oldMetric.optionName
-              : false
-          ) {
-            return changedMetric;
+      const transformedOpts = ensureIsArray(opts);
+      const optionValues = transformedOpts
+        .map(option => {
+          // pre-defined metric
+          if (option.metric_name) {
+            return option.metric_name;
           }
-          return value;
-        }),
-      }),
-      () => {
-        this.onChange(this.state.value);
-      },
-    );
-  }
-
-  onRemoveMetric(index) {
-    if (!Array.isArray(this.state.value)) {
-      return;
-    }
-    const valuesCopy = [...this.state.value];
-    valuesCopy.splice(index, 1);
-    this.setState(prevState => ({
-      ...prevState,
-      value: valuesCopy,
-    }));
-    this.props.onChange(valuesCopy);
-  }
+          return option;
+        })
+        .filter(option => option);
+      onChange(multi ? optionValues : optionValues[0]);
+    },
+    [multi, onChange],
+  );
 
-  onChange(opts) {
-    // if clear out options
-    if (opts === null) {
-      this.props.onChange(null);
-      return;
-    }
+  const onNewMetric = useCallback(
+    newMetric => {
+      const newValue = [...value, newMetric];
+      setValue(newValue);
+      handleChange(newValue);
+    },
+    [handleChange, value],
+  );
 
-    let transformedOpts;
-    if (Array.isArray(opts)) {
-      transformedOpts = opts;
-    } else {
-      transformedOpts = opts ? [opts] : [];
-    }
-    const optionValues = transformedOpts
-      .map(option => {
-        // pre-defined metric
-        if (option.metric_name) {
-          return option.metric_name;
+  const onMetricEdit = useCallback(
+    (changedMetric, oldMetric) => {
+      const newValue = value.map(val => {
+        if (
+          // compare saved metrics
+          val === oldMetric.metric_name ||
+          // compare adhoc metrics
+          typeof val.optionName !== 'undefined'
+            ? val.optionName === oldMetric.optionName
+            : false
+        ) {
+          return changedMetric;
         }
-        return option;
-      })
-      .filter(option => option);
-    this.props.onChange(this.props.multi ? optionValues : optionValues[0]);
-  }
-
-  moveLabel(dragIndex, hoverIndex) {
-    const { value } = this.state;
-
-    const newValues = [...value];
-    [newValues[hoverIndex], newValues[dragIndex]] = [
-      newValues[dragIndex],
-      newValues[hoverIndex],
-    ];
-    this.setState({ value: newValues });
-  }
-
-  isAddNewMetricDisabled() {
-    return !this.props.multi && this.state.value.length > 0;
-  }
-
-  addNewMetricPopoverTrigger(trigger) {
-    if (this.isAddNewMetricDisabled()) {
-      return trigger;
-    }
-    return (
-      <AdhocMetricPopoverTrigger
-        adhocMetric={new AdhocMetric({ isNew: true })}
-        onMetricEdit={this.onNewMetric}
-        columns={this.props.columns}
-        savedMetricsOptions={getOptionsForSavedMetrics(
-          this.props.savedMetrics,
-          this.props.value,
-          null,
-        )}
-        datasource={this.props.datasource}
-        savedMetric={{ metric_name: '', expression: '' }}
-        datasourceType={this.props.datasourceType}
-        createNew
-      >
-        {trigger}
-      </AdhocMetricPopoverTrigger>
-    );
-  }
+        return val;
+      });
+      setValue(newValue);
+      handleChange(newValue);
+    },
+    [handleChange, value],
+  );
 
-  checkIfAggregateInInput(input) {
-    const lowercaseInput = input.toLowerCase();
-    const aggregateInInput =
-      AGGREGATES_OPTIONS.find(x =>
-        lowercaseInput.startsWith(`${x.toLowerCase()}(`),
-      ) || null;
-    this.clearedAggregateInInput = this.state.aggregateInInput;
-    this.setState({ aggregateInInput });
-  }
+  const onRemoveMetric = useCallback(
+    index => {
+      if (!Array.isArray(value)) {
+        return;
+      }
+      const valuesCopy = [...value];
+      valuesCopy.splice(index, 1);
+      setValue(valuesCopy);
+      handleChange(valuesCopy);
+    },
+    [handleChange, value],
+  );
 
-  optionsForSelect(props) {
-    const { columns, savedMetrics } = props;
-    const aggregates =
-      columns && columns.length
-        ? AGGREGATES_OPTIONS.map(aggregate => ({
-            aggregate_name: aggregate,
-          }))
-        : [];
-    const options = [
-      ...(columns || []),
-      ...aggregates,
-      ...(savedMetrics || []),
-    ];
+  const moveLabel = useCallback(
+    (dragIndex, hoverIndex) => {
+      const newValues = [...value];
+      [newValues[hoverIndex], newValues[dragIndex]] = [
+        newValues[dragIndex],
+        newValues[hoverIndex],
+      ];
+      setValue(newValues);
+    },
+    [value],
+  );
 
-    return options.reduce((results, option) => {
-      if (option.metric_name) {
-        results.push({ ...option, optionName: option.metric_name });
-      } else if (option.column_name) {
-        results.push({ ...option, optionName: `_col_${option.column_name}` });
-      } else if (option.aggregate_name) {
-        results.push({
-          ...option,
-          optionName: `_aggregate_${option.aggregate_name}`,
-        });
-      }
-      return results;
-    }, []);
-  }
+  const isAddNewMetricDisabled = useCallback(() => !multi && value.length > 0, [
+    multi,
+    value.length,
+  ]);
 
-  isAutoGeneratedMetric(savedMetric) {
-    if (this.props.datasourceType === 'druid') {
-      return druidAutoGeneratedMetricRegex.test(savedMetric.verbose_name);
-    }
-    return sqlaAutoGeneratedMetricNameRegex.test(savedMetric.metric_name);
-  }
+  const savedMetricOptions = useMemo(
+    () => getOptionsForSavedMetrics(savedMetrics, propsValue, null),
+    [propsValue, savedMetrics],
+  );
 
-  selectFilterOption({ data: option }, filterValue) {
-    if (this.state.aggregateInInput) {
-      let endIndex = filterValue.length;
-      if (filterValue.endsWith(')')) {
-        endIndex = filterValue.length - 1;
+  const newAdhocMetric = useMemo(() => new AdhocMetric({ isNew: true }), [
+    value,
+  ]);
+  const addNewMetricPopoverTrigger = useCallback(
+    trigger => {
+      if (isAddNewMetricDisabled()) {
+        return trigger;
       }
-      const valueAfterAggregate = filterValue.substring(
-        filterValue.indexOf('(') + 1,
-        endIndex,
-      );
       return (
-        option.column_name &&
-        option.column_name.toLowerCase().indexOf(valueAfterAggregate) >= 0
+        <AdhocMetricPopoverTrigger
+          adhocMetric={newAdhocMetric}
+          onMetricEdit={onNewMetric}
+          columns={columns}
+          savedMetricsOptions={savedMetricOptions}
+          datasource={datasource}
+          savedMetric={emptySavedMetric}
+          datasourceType={datasourceType}
+        >
+          {trigger}
+        </AdhocMetricPopoverTrigger>
       );
+    },
+    [
+      columns,
+      datasource,
+      datasourceType,
+      isAddNewMetricDisabled,
+      newAdhocMetric,
+      onNewMetric,
+      savedMetricOptions,
+    ],
+  );
+
+  useEffect(() => {
+    // Remove all metrics if selected value no longer a valid column
+    // in the dataset. Must use `nextProps` here because Redux reducers may
+    // have already updated the value for this control.
+    if (!columnsContainAllMetrics(propsValue, columns, savedMetrics)) {
+      handleChange([]);
     }
-    return (
-      option.optionName &&
-      (!option.metric_name ||
-        !this.isAutoGeneratedMetric(option) ||
-        option.verbose_name) &&
-      (option.optionName.toLowerCase().indexOf(filterValue) >= 0 ||
-        (option.verbose_name &&
-          option.verbose_name.toLowerCase().indexOf(filterValue) >= 0))
-    );
-  }
+  }, [columns, savedMetrics]);
 
-  render() {
-    const { theme } = this.props;
-    return (
-      <div className="metrics-select">
-        <HeaderContainer>
-          <ControlHeader {...this.props} />
-          {this.addNewMetricPopoverTrigger(
-            <AddIconButton
-              disabled={this.isAddNewMetricDisabled()}
-              data-test="add-metric-button"
-            >
-              <Icons.PlusLarge
-                iconSize="s"
-                iconColor={theme.colors.grayscale.light5}
-              />
-            </AddIconButton>,
-          )}
-        </HeaderContainer>
-        <LabelsContainer>
-          {this.state.value.length > 0
-            ? this.state.value.map((value, index) =>
-                this.valueRenderer(value, index),
-              )
-            : this.addNewMetricPopoverTrigger(
-                <AddControlLabel>
-                  <Icons.PlusSmall iconColor={theme.colors.grayscale.light1} />
-                  {t('Add metric')}
-                </AddControlLabel>,
-              )}
-        </LabelsContainer>
-      </div>
-    );
-  }
-}
+  useEffect(() => {
+    setValue(coerceAdhocMetrics(propsValue));
+  }, [propsValue]);
+
+  const onDropLabel = useCallback(() => handleChange(value), [
+    handleChange,
+    value,
+  ]);
+
+  const valueRenderer = useCallback(
+    (option, index) => (
+      <MetricDefinitionValue
+        key={index}
+        index={index}
+        option={option}
+        onMetricEdit={onMetricEdit}
+        onRemoveMetric={onRemoveMetric}
+        columns={columns}
+        datasource={datasource}
+        savedMetrics={savedMetrics}
+        savedMetricsOptions={getOptionsForSavedMetrics(
+          savedMetrics,
+          value,
+          value?.[index],
+        )}
+        datasourceType={datasourceType}
+        onMoveLabel={moveLabel}
+        onDropLabel={onDropLabel}
+        multi={multi}
+      />
+    ),
+    [
+      columns,
+      datasource,
+      datasourceType,
+      moveLabel,
+      multi,
+      onDropLabel,
+      onMetricEdit,
+      onRemoveMetric,
+      savedMetrics,
+      value,
+    ],
+  );
+
+  return (
+    <div className="metrics-select">
+      <HeaderContainer>
+        <ControlHeader {...props} />
+        {addNewMetricPopoverTrigger(
+          <AddIconButton
+            disabled={isAddNewMetricDisabled()}
+            data-test="add-metric-button"
+          >
+            <Icons.PlusLarge
+              iconSize="s"
+              iconColor={theme.colors.grayscale.light5}
+            />
+          </AddIconButton>,
+        )}
+      </HeaderContainer>
+      <LabelsContainer>
+        {value.length > 0
+          ? value.map((value, index) => valueRenderer(value, index))
+          : addNewMetricPopoverTrigger(
+              <AddControlLabel>
+                <Icons.PlusSmall iconColor={theme.colors.grayscale.light1} />
+                {t('Add metric')}
+              </AddControlLabel>,
+            )}
+      </LabelsContainer>
+    </div>
+  );
+};
 
 MetricsControl.propTypes = propTypes;
 MetricsControl.defaultProps = defaultProps;
 
-export default withTheme(MetricsControl);
+export default MetricsControl;
diff --git a/superset-frontend/src/explore/components/controls/OptionControls/index.tsx b/superset-frontend/src/explore/components/controls/OptionControls/index.tsx
index 0469b4b916a7..716e10a908b7 100644
--- a/superset-frontend/src/explore/components/controls/OptionControls/index.tsx
+++ b/superset-frontend/src/explore/components/controls/OptionControls/index.tsx
@@ -45,11 +45,10 @@ export const OptionControlContainer = styled.div<{
   border-radius: 3px;
   cursor: ${({ withCaret }) => (withCaret ? 'pointer' : 'default')};
 `;
-
 export const Label = styled.div`
   ${({ theme }) => `
     display: flex;
-    max-width: 100%;
+    width: 100%;
     overflow: hidden;
     text-overflow: ellipsis;
     align-items: center;
@@ -71,6 +70,11 @@ export const Label = styled.div`
   `}
 `;
 
+const LabelText = styled.span`
+  overflow: hidden;
+  text-overflow: ellipsis;
+`;
+
 export const CaretContainer = styled.div`
   height: 100%;
   border-left: solid 1px ${({ theme }) => theme.colors.grayscale.dark2}0C;
@@ -177,6 +181,7 @@ export const OptionControlLabel = ({
   index,
   isExtra,
   tooltipTitle,
+  multi = true,
   ...props
 }: {
   label: string | React.ReactNode;
@@ -192,15 +197,24 @@ export const OptionControlLabel = ({
   index: number;
   isExtra?: boolean;
   tooltipTitle: string;
+  multi?: boolean;
 }) => {
   const theme = useTheme();
   const ref = useRef<HTMLDivElement>(null);
+  const labelRef = useRef<HTMLDivElement>(null);
+  const hasMetricName = savedMetric?.metric_name;
   const [, drop] = useDrop({
     accept: type,
     drop() {
+      if (!multi) {
+        return;
+      }
       onDropLabel?.();
     },
     hover(item: DragItem, monitor: DropTargetMonitor) {
+      if (!multi) {
+        return;
+      }
       if (!ref.current) {
         return;
       }
@@ -242,7 +256,7 @@ export const OptionControlLabel = ({
       item.index = hoverIndex;
     },
   });
-  const [, drag] = useDrag({
+  const [{ isDragging }, drag] = useDrag({
     item: {
       type,
       index,
@@ -254,10 +268,34 @@ export const OptionControlLabel = ({
   });
 
   const getLabelContent = () => {
-    if (savedMetric?.metric_name) {
-      return <StyledMetricOption metric={savedMetric} />;
+    const shouldShowTooltip =
+      (!isDragging &&
+        typeof label === 'string' &&
+        tooltipTitle &&
+        label &&
+        tooltipTitle !== label) ||
+      (!isDragging &&
+        labelRef &&
+        labelRef.current &&
+        labelRef.current.scrollWidth > labelRef.current.clientWidth);
+
+    if (savedMetric && hasMetricName) {
+      return (
+        <StyledMetricOption
+          metric={savedMetric}
+          labelRef={labelRef}
+          showTooltip={!!shouldShowTooltip}
+        />
+      );
+    }
+    if (!shouldShowTooltip) {
+      return <LabelText ref={labelRef}>{label}</LabelText>;
     }
-    return <Tooltip title={tooltipTitle}>{label}</Tooltip>;
+    return (
+      <Tooltip title={tooltipTitle || label}>
+        <LabelText ref={labelRef}>{label}</LabelText>
+      </Tooltip>
+    );
   };
 
   const getOptionControlContent = () => (
diff --git a/superset-frontend/src/explore/components/controls/TextAreaControl.jsx b/superset-frontend/src/explore/components/controls/TextAreaControl.jsx
index cfbda997a3ab..4e21b080d984 100644
--- a/superset-frontend/src/explore/components/controls/TextAreaControl.jsx
+++ b/superset-frontend/src/explore/components/controls/TextAreaControl.jsx
@@ -62,21 +62,27 @@ const defaultProps = {
 export default class TextAreaControl extends React.Component {
   constructor() {
     super();
+    this.state = {
+      value: '',
+    };
     this.onAceChangeDebounce = debounce(value => {
       this.onAceChange(value);
     }, FAST_DEBOUNCE);
   }
 
   onControlChange(event) {
-    this.props.onChange(event.target.value);
+    const { value } = event.target;
+    this.setState({ value });
+    this.props.onChange(value);
   }
 
   onAceChange(value) {
+    this.setState({ value });
     this.props.onChange(value);
   }
 
   renderEditor(inModal = false) {
-    const value = this.props.value || '';
+    const value = this.state.value || this.props.value;
     const minLines = inModal ? 40 : this.props.minLines || 12;
     if (this.props.language) {
       const style = { border: '1px solid #CCC' };
diff --git a/superset-frontend/src/explore/components/controls/ViewQueryModal.tsx b/superset-frontend/src/explore/components/controls/ViewQueryModal.tsx
index 1234613b5052..88391bf995c0 100644
--- a/superset-frontend/src/explore/components/controls/ViewQueryModal.tsx
+++ b/superset-frontend/src/explore/components/controls/ViewQueryModal.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React, { useEffect, useState } from 'react';
-import { styled, t } from '@superset-ui/core';
+import { ensureIsArray, styled, t } from '@superset-ui/core';
 import SyntaxHighlighter from 'react-syntax-highlighter/dist/cjs/light';
 import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';
 import CopyToClipboard from 'src/components/CopyToClipboard';
@@ -45,9 +45,13 @@ interface Props {
   latestQueryFormData: object;
 }
 
+type Result = {
+  query: string;
+  language: string;
+};
+
 const ViewQueryModal: React.FC<Props> = props => {
-  const [language, setLanguage] = useState(null);
-  const [query, setQuery] = useState(null);
+  const [result, setResult] = useState<Result[]>([]);
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
@@ -58,11 +62,8 @@ const ViewQueryModal: React.FC<Props> = props => {
       resultFormat: 'json',
       resultType,
     })
-      .then(response => {
-        // Only displaying the first query is currently supported
-        const result = response.result[0];
-        setLanguage(result.language);
-        setQuery(result.query);
+      .then(({ json }) => {
+        setResult(ensureIsArray(json.result));
         setIsLoading(false);
         setError(null);
       })
@@ -80,7 +81,7 @@ const ViewQueryModal: React.FC<Props> = props => {
   };
   useEffect(() => {
     loadChartData('query');
-  }, [props.latestQueryFormData]);
+  }, [JSON.stringify(props.latestQueryFormData)]);
 
   if (isLoading) {
     return <Loading />;
@@ -88,25 +89,31 @@ const ViewQueryModal: React.FC<Props> = props => {
   if (error) {
     return <pre>{error}</pre>;
   }
-  if (query) {
-    return (
-      <div>
-        <CopyToClipboard
-          text={query}
-          shouldShowText={false}
-          copyNode={
-            <CopyButtonViewQuery buttonSize="xsmall">
-              <i className="fa fa-clipboard" />
-            </CopyButtonViewQuery>
-          }
-        />
-        <SyntaxHighlighter language={language || undefined} style={github}>
-          {query}
-        </SyntaxHighlighter>
-      </div>
-    );
-  }
-  return null;
+  return (
+    <>
+      {result.map(item =>
+        item.query ? (
+          <div>
+            <CopyToClipboard
+              text={item.query}
+              shouldShowText={false}
+              copyNode={
+                <CopyButtonViewQuery buttonSize="xsmall">
+                  <i className="fa fa-clipboard" />
+                </CopyButtonViewQuery>
+              }
+            />
+            <SyntaxHighlighter
+              language={item.language || undefined}
+              style={github}
+            >
+              {item.query}
+            </SyntaxHighlighter>
+          </div>
+        ) : null,
+      )}
+    </>
+  );
 };
 
 export default ViewQueryModal;
diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx
index 35dd245bb659..b13075cd0f49 100644
--- a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx
+++ b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { Preset } from '@superset-ui/core';
-import { render, cleanup, screen } from 'spec/helpers/testing-library';
+import { render, cleanup, screen, act } from 'spec/helpers/testing-library';
 import { Provider } from 'react-redux';
 import {
   getMockStore,
@@ -26,6 +26,7 @@ import {
 } from 'spec/fixtures/mockStore';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
+import { DynamicPluginProvider } from 'src/components/DynamicPlugins';
 import { testWithId } from 'src/utils/testUtils';
 import {
   EchartsMixedTimeseriesChartPlugin,
@@ -57,6 +58,15 @@ class MainPreset extends Preset {
 
 const getTestId = testWithId<string>(VIZ_TYPE_CONTROL_TEST_ID, true);
 
+/**
+ * AntD and/or the Icon component seems to be doing some kind of async changes,
+ * so even though the test passes, there is a warning an update to Icon was not
+ * wrapped in act(). This sufficiently act-ifies whatever side effects are going
+ * on and prevents those warnings.
+ */
+const waitForEffects = () =>
+  act(() => new Promise(resolve => setTimeout(resolve, 0)));
+
 describe('VizTypeControl', () => {
   new MainPreset().register();
   const newVizTypeControlProps = {
@@ -64,21 +74,26 @@ describe('VizTypeControl', () => {
     label: '',
     name: '',
     value: '',
-    labelType: '',
+    labelType: 'primary',
     onChange: jest.fn(),
-  };
+    isModalOpenInit: true,
+  } as const;
 
-  const renderWrapper = (
+  const renderWrapper = async (
     props = newVizTypeControlProps,
     state: object = stateWithoutNativeFilters,
-  ) =>
+  ) => {
     render(
       <Provider
         store={state ? getMockStore(stateWithoutNativeFilters) : mockStore}
       >
-        <VizTypeControl {...props} />
+        <DynamicPluginProvider>
+          <VizTypeControl {...props} />
+        </DynamicPluginProvider>
       </Provider>,
     );
+    await waitForEffects();
+  };
 
   afterEach(() => {
     cleanup();
@@ -86,14 +101,13 @@ describe('VizTypeControl', () => {
   });
 
   it('Search visualization type', async () => {
-    renderWrapper();
+    await renderWrapper();
 
     const visualizations = screen.getByTestId(getTestId('viz-row'));
 
+    userEvent.click(screen.getByRole('button', { name: 'ballot All charts' }));
+
     expect(visualizations).toHaveTextContent(/Time-series Table/);
-    expect(visualizations).toHaveTextContent(/Time-series Chart/);
-    expect(visualizations).toHaveTextContent(/Mixed timeseries chart/);
-    expect(visualizations).toHaveTextContent(/Line Chart/);
 
     const searchInputText = 'time series';
 
@@ -102,10 +116,11 @@ describe('VizTypeControl', () => {
       screen.getByTestId(getTestId('search-input')),
       searchInputText,
     );
+    await waitForEffects();
 
     expect(visualizations).toHaveTextContent(/Time-series Table/);
     expect(visualizations).toHaveTextContent(/Time-series Chart/);
-    expect(visualizations).toHaveTextContent(/Mixed timeseries chart/);
+    expect(visualizations).toHaveTextContent(/Mixed Time-Series/);
     expect(visualizations).not.toHaveTextContent(/Line Chart/);
   });
 });
diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx
new file mode 100644
index 000000000000..7f2933428bf2
--- /dev/null
+++ b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx
@@ -0,0 +1,784 @@
+/**
+ * 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 React, {
+  ChangeEventHandler,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
+import Fuse from 'fuse.js';
+import cx from 'classnames';
+import {
+  t,
+  styled,
+  css,
+  ChartMetadata,
+  SupersetTheme,
+  useTheme,
+} from '@superset-ui/core';
+import { Collapse, Input } from 'src/common/components';
+import Label from 'src/components/Label';
+import { usePluginContext } from 'src/components/DynamicPlugins';
+import Icons from 'src/components/Icons';
+import { nativeFilterGate } from 'src/dashboard/components/nativeFilters/utils';
+import scrollIntoView from 'scroll-into-view-if-needed';
+
+interface VizTypeGalleryProps {
+  onChange: (vizType: string | null) => void;
+  selectedViz: string | null;
+  className?: string;
+}
+
+type VizEntry = {
+  key: string;
+  value: ChartMetadata;
+};
+
+enum SECTIONS {
+  ALL_CHARTS = 'ALL_CHARTS',
+  CATEGORY = 'CATEGORY',
+  TAGS = 'TAGS',
+  RECOMMENDED_TAGS = 'RECOMMENDED_TAGS',
+}
+
+const DEFAULT_ORDER = [
+  'line',
+  'big_number',
+  'big_number_total',
+  'table',
+  'pivot_table_v2',
+  'echarts_timeseries_line',
+  'echarts_area',
+  'echarts_timeseries_bar',
+  'echarts_timeseries_scatter',
+  'pie',
+  'mixed_timeseries',
+  'filter_box',
+  'dist_bar',
+  'area',
+  'bar',
+  'deck_polygon',
+  'time_table',
+  'histogram',
+  'deck_scatter',
+  'deck_hex',
+  'time_pivot',
+  'deck_arc',
+  'heatmap',
+  'deck_grid',
+  'dual_line',
+  'deck_screengrid',
+  'line_multi',
+  'treemap',
+  'box_plot',
+  'sunburst',
+  'sankey',
+  'word_cloud',
+  'mapbox',
+  'kepler',
+  'cal_heatmap',
+  'rose',
+  'bubble',
+  'deck_geojson',
+  'horizon',
+  'deck_multi',
+  'compare',
+  'partition',
+  'event_flow',
+  'deck_path',
+  'graph_chart',
+  'world_map',
+  'paired_ttest',
+  'para',
+  'country_map',
+];
+
+const typesWithDefaultOrder = new Set(DEFAULT_ORDER);
+
+const THUMBNAIL_GRID_UNITS = 24;
+
+export const MAX_ADVISABLE_VIZ_GALLERY_WIDTH = 1090;
+
+const OTHER_CATEGORY = t('Other');
+
+const ALL_CHARTS = t('All charts');
+
+const RECOMMENDED_TAGS = [t('Popular'), t('ECharts'), t('Advanced-Analytics')];
+
+export const VIZ_TYPE_CONTROL_TEST_ID = 'viz-type-control';
+
+const VizPickerLayout = styled.div`
+  display: grid;
+  grid-template-rows: auto minmax(100px, 1fr) minmax(200px, 35%);
+  // em is used here because the sidebar should be sized to fit the longest standard tag
+  grid-template-columns: minmax(14em, auto) 5fr;
+  grid-template-areas:
+    'sidebar search'
+    'sidebar main'
+    'details details';
+  height: 70vh;
+  overflow: auto;
+`;
+
+const SectionTitle = styled.h3`
+  margin-top: 0;
+  margin-bottom: ${({ theme }) => theme.gridUnit * 2}px;
+  font-size: ${({ theme }) => theme.typography.sizes.l}px;
+  font-weight: ${({ theme }) => theme.typography.weights.bold};
+  line-height: ${({ theme }) => theme.gridUnit * 6}px;
+`;
+
+const LeftPane = styled.div`
+  grid-area: sidebar;
+  display: flex;
+  flex-direction: column;
+  border-right: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
+  overflow: auto;
+
+  .ant-collapse .ant-collapse-item {
+    .ant-collapse-header {
+      font-size: ${({ theme }) => theme.typography.sizes.s}px;
+      color: ${({ theme }) => theme.colors.grayscale.base};
+      padding-left: ${({ theme }) => theme.gridUnit * 2}px;
+      padding-bottom: ${({ theme }) => theme.gridUnit}px;
+    }
+    .ant-collapse-content .ant-collapse-content-box {
+      display: flex;
+      flex-direction: column;
+      padding: 0 ${({ theme }) => theme.gridUnit * 2}px;
+    }
+  }
+`;
+
+const RightPane = styled.div`
+  grid-area: main;
+  overflow-y: auto;
+`;
+
+const SearchWrapper = styled.div`
+  ${({ theme }) => `
+    grid-area: search;
+    margin-top: ${theme.gridUnit * 3}px;
+    margin-bottom: ${theme.gridUnit}px;
+    margin-left: ${theme.gridUnit * 3}px;
+    margin-right: ${theme.gridUnit * 3}px;
+    .ant-input-affix-wrapper {
+      padding-left: ${theme.gridUnit * 2}px;
+    }
+  `}
+`;
+
+/** Styles to line up prefix/suffix icons in the search input */
+const InputIconAlignment = styled.div`
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: ${({ theme }) => theme.colors.grayscale.base};
+`;
+
+const SelectorLabel = styled.button`
+  ${({ theme }) => `
+    all: unset; // remove default button styles
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    cursor: pointer;
+    margin: ${theme.gridUnit}px 0;
+    padding: 0 ${theme.gridUnit}px;
+    border-radius: ${theme.borderRadius}px;
+    line-height: 2em;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    position: relative;
+
+    &:focus {
+      outline: initial;
+    }
+
+    &.selected {
+      background-color: ${theme.colors.primary.dark1};
+      color: ${theme.colors.primary.light5};
+
+      svg {
+        color: ${theme.colors.primary.light5};
+      }
+
+      &:hover {
+        .cancel {
+          visibility: visible;
+        }
+      }
+    }
+
+    & span:first-of-type svg {
+      margin-top: ${theme.gridUnit * 1.5}px;
+    }
+
+    .cancel {
+      visibility: hidden;
+    }
+  `}
+`;
+
+const IconsPane = styled.div`
+  overflow: auto;
+  display: grid;
+  grid-template-columns: repeat(
+    auto-fill,
+    ${({ theme }) => theme.gridUnit * THUMBNAIL_GRID_UNITS}px
+  );
+  grid-auto-rows: max-content;
+  justify-content: space-evenly;
+  grid-gap: ${({ theme }) => theme.gridUnit * 2}px;
+  justify-items: center;
+  // for some reason this padding doesn't seem to apply at the bottom of the container. Why is a mystery.
+  padding: ${({ theme }) => theme.gridUnit * 2}px;
+`;
+
+const DetailsPane = (theme: SupersetTheme) => css`
+  grid-area: details;
+  border-top: 1px solid ${theme.colors.grayscale.light2};
+`;
+
+const DetailsPopulated = (theme: SupersetTheme) => css`
+  padding: ${theme.gridUnit * 4}px;
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  grid-template-rows: auto auto 1fr;
+  grid-template-areas:
+    'viz-name examples-header'
+    'viz-tags examples'
+    'description examples';
+`;
+
+const DetailsEmpty = (theme: SupersetTheme) => css`
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  text-align: center;
+  font-style: italic;
+  color: ${theme.colors.grayscale.light1};
+`;
+
+// overflow hidden on the details pane and overflow auto on the description
+// (plus grid layout) enables the description to scroll while the header stays in place.
+const TagsWrapper = styled.div`
+  grid-area: viz-tags;
+  width: ${({ theme }) => theme.gridUnit * 120}px;
+  padding-right: ${({ theme }) => theme.gridUnit * 14}px;
+  padding-bottom: ${({ theme }) => theme.gridUnit * 2}px;
+`;
+
+const Description = styled.p`
+  grid-area: description;
+  overflow: auto;
+  padding-right: ${({ theme }) => theme.gridUnit * 14}px;
+  margin: 0;
+`;
+
+const Examples = styled.div`
+  grid-area: examples;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  overflow: auto;
+  gap: ${({ theme }) => theme.gridUnit * 4}px;
+
+  img {
+    height: 100%;
+    border-radius: ${({ theme }) => theme.gridUnit}px;
+    border: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
+  }
+`;
+
+const thumbnailContainerCss = (theme: SupersetTheme) => css`
+  cursor: pointer;
+  width: ${theme.gridUnit * THUMBNAIL_GRID_UNITS}px;
+
+  img {
+    min-width: ${theme.gridUnit * THUMBNAIL_GRID_UNITS}px;
+    min-height: ${theme.gridUnit * THUMBNAIL_GRID_UNITS}px;
+    border: 1px solid ${theme.colors.grayscale.light2};
+    border-radius: ${theme.gridUnit}px;
+    transition: border-color ${theme.transitionTiming};
+  }
+
+  &.selected img {
+    border: 2px solid ${theme.colors.primary.light2};
+  }
+
+  &:hover:not(.selected) img {
+    border: 1px solid ${theme.colors.grayscale.light1};
+  }
+
+  .viztype-label {
+    margin-top: ${theme.gridUnit * 2}px;
+    text-align: center;
+  }
+`;
+
+function vizSortFactor(entry: VizEntry) {
+  if (typesWithDefaultOrder.has(entry.key)) {
+    return DEFAULT_ORDER.indexOf(entry.key);
+  }
+  return DEFAULT_ORDER.length;
+}
+
+interface ThumbnailProps {
+  entry: VizEntry;
+  selectedViz: string | null;
+  setSelectedViz: (viz: string) => void;
+}
+
+const Thumbnail: React.FC<ThumbnailProps> = ({
+  entry,
+  selectedViz,
+  setSelectedViz,
+}) => {
+  const theme = useTheme();
+  const { key, value: type } = entry;
+  const isSelected = selectedViz === entry.key;
+
+  return (
+    <div
+      role="button"
+      // using css instead of a styled component to preserve
+      // the data-test attribute
+      css={thumbnailContainerCss(theme)}
+      tabIndex={0}
+      className={isSelected ? 'selected' : ''}
+      onClick={() => setSelectedViz(key)}
+      data-test="viztype-selector-container"
+    >
+      <img
+        alt={type.name}
+        width="100%"
+        className={`viztype-selector ${isSelected ? 'selected' : ''}`}
+        src={type.thumbnail}
+      />
+      <div
+        className="viztype-label"
+        data-test={`${VIZ_TYPE_CONTROL_TEST_ID}__viztype-label`}
+      >
+        {type.name}
+      </div>
+    </div>
+  );
+};
+
+interface ThumbnailGalleryProps {
+  vizEntries: VizEntry[];
+  selectedViz: string | null;
+  setSelectedViz: (viz: string) => void;
+}
+
+/** A list of viz thumbnails, used within the viz picker modal */
+const ThumbnailGallery: React.FC<ThumbnailGalleryProps> = ({
+  vizEntries,
+  ...props
+}) => (
+  <IconsPane data-test={`${VIZ_TYPE_CONTROL_TEST_ID}__viz-row`}>
+    {vizEntries.map(entry => (
+      <Thumbnail key={entry.key} {...props} entry={entry} />
+    ))}
+  </IconsPane>
+);
+
+const Selector: React.FC<{
+  selector: string;
+  sectionId: string;
+  icon: JSX.Element;
+  isSelected: boolean;
+  onClick: (selector: string, sectionId: string) => void;
+  className?: string;
+}> = ({ selector, sectionId, icon, isSelected, onClick, className }) => {
+  const btnRef = useRef<HTMLButtonElement>(null);
+
+  // see Element.scrollIntoViewIfNeeded()
+  // see: https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollIntoViewIfNeeded
+  useEffect(() => {
+    if (isSelected) {
+      // We need to wait for the modal to open and then scroll, so we put it in the microtask queue
+      queueMicrotask(() =>
+        scrollIntoView(btnRef.current as HTMLButtonElement, {
+          behavior: 'smooth',
+          scrollMode: 'if-needed',
+        }),
+      );
+    }
+  }, []);
+
+  return (
+    <SelectorLabel
+      ref={btnRef}
+      key={selector}
+      name={selector}
+      className={cx(className, isSelected && 'selected')}
+      onClick={() => onClick(selector, sectionId)}
+    >
+      {icon}
+      {selector}
+    </SelectorLabel>
+  );
+};
+
+const doesVizMatchSelector = (viz: ChartMetadata, selector: string) =>
+  selector === viz.category ||
+  (selector === OTHER_CATEGORY && viz.category == null) ||
+  (viz.tags || []).indexOf(selector) > -1;
+
+export default function VizTypeGallery(props: VizTypeGalleryProps) {
+  const { selectedViz, onChange, className } = props;
+  const { mountedPluginMetadata } = usePluginContext();
+  const searchInputRef = useRef<HTMLInputElement>();
+  const [searchInputValue, setSearchInputValue] = useState('');
+  const [isSearchFocused, setIsSearchFocused] = useState(true);
+  const isActivelySearching = isSearchFocused && !!searchInputValue;
+
+  const selectedVizMetadata: ChartMetadata | null = selectedViz
+    ? mountedPluginMetadata[selectedViz]
+    : null;
+
+  const chartMetadata: VizEntry[] = useMemo(() => {
+    const result = Object.entries(mountedPluginMetadata)
+      .map(([key, value]) => ({ key, value }))
+      .filter(
+        ({ value }) =>
+          nativeFilterGate(value.behaviors || []) && !value.deprecated,
+      );
+    result.sort((a, b) => vizSortFactor(a) - vizSortFactor(b));
+    return result;
+  }, [mountedPluginMetadata]);
+
+  const chartsByCategory = useMemo(() => {
+    const result: Record<string, VizEntry[]> = {};
+    chartMetadata.forEach(entry => {
+      const category = entry.value.category || OTHER_CATEGORY;
+      if (!result[category]) {
+        result[category] = [];
+      }
+      result[category].push(entry);
+    });
+    return result;
+  }, [chartMetadata]);
+
+  const categories = useMemo(
+    () =>
+      Object.keys(chartsByCategory).sort((a, b) => {
+        // make sure Other goes at the end
+        if (a === OTHER_CATEGORY) return 1;
+        if (b === OTHER_CATEGORY) return -1;
+        // sort alphabetically
+        return a.localeCompare(b);
+      }),
+    [chartsByCategory],
+  );
+
+  const chartsByTags = useMemo(() => {
+    const result: Record<string, VizEntry[]> = {};
+    chartMetadata.forEach(entry => {
+      const tags = entry.value.tags || [];
+      tags.forEach(tag => {
+        if (!result[tag]) {
+          result[tag] = [];
+        }
+        result[tag].push(entry);
+      });
+    });
+    return result;
+  }, [chartMetadata]);
+
+  const tags = useMemo(
+    () =>
+      Object.keys(chartsByTags)
+        .sort((a, b) =>
+          // sort alphabetically
+          a.localeCompare(b),
+        )
+        .filter(tag => RECOMMENDED_TAGS.indexOf(tag) === -1),
+    [chartsByTags],
+  );
+
+  const sortedMetadata = useMemo(
+    () => chartMetadata.sort((a, b) => a.key.localeCompare(b.key)),
+    [chartMetadata],
+  );
+
+  const [activeSelector, setActiveSelector] = useState<string>(
+    () => selectedVizMetadata?.category || RECOMMENDED_TAGS[0],
+  );
+
+  const [activeSection, setActiveSection] = useState<string>(() =>
+    selectedVizMetadata?.category
+      ? SECTIONS.CATEGORY
+      : SECTIONS.RECOMMENDED_TAGS,
+  );
+
+  // get a fuse instance for fuzzy search
+  const fuse = useMemo(
+    () =>
+      new Fuse(chartMetadata, {
+        ignoreLocation: true,
+        threshold: 0.3,
+        keys: ['value.name', 'value.tags', 'value.description'],
+      }),
+    [chartMetadata],
+  );
+
+  const searchResults = useMemo(() => {
+    if (searchInputValue.trim() === '') {
+      return [];
+    }
+    return fuse.search(searchInputValue).map(result => result.item);
+  }, [searchInputValue, fuse]);
+
+  const focusSearch = useCallback(() => {
+    // "start searching" is actually a two-stage process.
+    // When you first click on the search bar, the input is focused and nothing else happens.
+    // Once you begin typing, the selected category is cleared and the displayed viz entries change.
+    setIsSearchFocused(true);
+  }, []);
+
+  const changeSearch: ChangeEventHandler<HTMLInputElement> = useCallback(
+    event => setSearchInputValue(event.target.value),
+    [],
+  );
+
+  const stopSearching = useCallback(() => {
+    // stopping a search takes you back to the category you were looking at before.
+    // Unlike focusSearch, this is a simple one-step process.
+    setIsSearchFocused(false);
+    setSearchInputValue('');
+    searchInputRef.current!.blur();
+  }, []);
+
+  const clickSelector = useCallback(
+    (selector: string, sectionId: string) => {
+      if (isSearchFocused) {
+        stopSearching();
+      }
+      setActiveSelector(selector);
+      setActiveSection(sectionId);
+      // clear the selected viz if it is not present in the new category or tags
+      const isSelectedVizCompatible =
+        selectedVizMetadata &&
+        doesVizMatchSelector(selectedVizMetadata, selector);
+      if (selector !== activeSelector && !isSelectedVizCompatible) {
+        onChange(null);
+      }
+    },
+    [
+      stopSearching,
+      isSearchFocused,
+      activeSelector,
+      selectedVizMetadata,
+      onChange,
+    ],
+  );
+
+  const sectionMap = useMemo(
+    () => ({
+      [SECTIONS.RECOMMENDED_TAGS]: {
+        title: t('Recommended tags'),
+        icon: <Icons.Tags />,
+        selectors: RECOMMENDED_TAGS,
+      },
+      [SECTIONS.CATEGORY]: {
+        title: t('Category'),
+        icon: <Icons.Category />,
+        selectors: categories,
+      },
+      [SECTIONS.TAGS]: {
+        title: t('Tags'),
+        icon: <Icons.Tags />,
+        selectors: tags,
+      },
+    }),
+    [categories, tags],
+  );
+
+  const getVizEntriesToDisplay = () => {
+    if (isActivelySearching) {
+      return searchResults;
+    }
+    if (
+      activeSelector === ALL_CHARTS &&
+      activeSection === SECTIONS.ALL_CHARTS
+    ) {
+      return sortedMetadata;
+    }
+    if (
+      activeSection === SECTIONS.CATEGORY &&
+      chartsByCategory[activeSelector]
+    ) {
+      return chartsByCategory[activeSelector];
+    }
+    if (
+      (activeSection === SECTIONS.TAGS ||
+        activeSection === SECTIONS.RECOMMENDED_TAGS) &&
+      chartsByTags[activeSelector]
+    ) {
+      return chartsByTags[activeSelector];
+    }
+    return [];
+  };
+
+  return (
+    <VizPickerLayout className={className}>
+      <LeftPane>
+        <Selector
+          css={({ gridUnit }) =>
+            // adjust style for not being inside a collapse
+            css`
+              margin: ${gridUnit * 2}px;
+              margin-bottom: 0;
+            `
+          }
+          sectionId={SECTIONS.ALL_CHARTS}
+          selector={ALL_CHARTS}
+          icon={<Icons.Ballot />}
+          isSelected={
+            !isActivelySearching &&
+            ALL_CHARTS === activeSelector &&
+            SECTIONS.ALL_CHARTS === activeSection
+          }
+          onClick={clickSelector}
+        />
+        <Collapse
+          expandIconPosition="right"
+          ghost
+          defaultActiveKey={Object.keys(sectionMap)}
+        >
+          {Object.keys(sectionMap).map(sectionId => {
+            const section = sectionMap[sectionId];
+
+            return (
+              <Collapse.Panel
+                header={<span className="header">{section.title}</span>}
+                key={sectionId}
+              >
+                {section.selectors.map((selector: string) => (
+                  <Selector
+                    key={selector}
+                    selector={selector}
+                    sectionId={sectionId}
+                    icon={section.icon}
+                    isSelected={
+                      !isActivelySearching &&
+                      selector === activeSelector &&
+                      sectionId === activeSection
+                    }
+                    onClick={clickSelector}
+                  />
+                ))}
+              </Collapse.Panel>
+            );
+          })}
+        </Collapse>
+      </LeftPane>
+
+      <SearchWrapper>
+        <Input
+          type="text"
+          ref={searchInputRef as any /* cast required because emotion */}
+          value={searchInputValue}
+          placeholder={t('Search all charts')}
+          onChange={changeSearch}
+          onFocus={focusSearch}
+          data-test={`${VIZ_TYPE_CONTROL_TEST_ID}__search-input`}
+          prefix={
+            <InputIconAlignment>
+              <Icons.Search iconSize="m" />
+            </InputIconAlignment>
+          }
+          suffix={
+            <InputIconAlignment>
+              {searchInputValue && (
+                <Icons.XLarge iconSize="m" onClick={stopSearching} />
+              )}
+            </InputIconAlignment>
+          }
+        />
+      </SearchWrapper>
+
+      <RightPane>
+        <ThumbnailGallery
+          vizEntries={getVizEntriesToDisplay()}
+          selectedViz={selectedViz}
+          setSelectedViz={onChange}
+        />
+      </RightPane>
+
+      {selectedVizMetadata ? (
+        <div
+          css={(theme: SupersetTheme) => [
+            DetailsPane(theme),
+            DetailsPopulated(theme),
+          ]}
+        >
+          <>
+            <SectionTitle
+              css={css`
+                grid-area: viz-name;
+              `}
+            >
+              {selectedVizMetadata?.name}
+            </SectionTitle>
+            <TagsWrapper>
+              {selectedVizMetadata?.tags.map(tag => (
+                <Label key={tag}>{tag}</Label>
+              ))}
+            </TagsWrapper>
+            <Description>
+              {selectedVizMetadata?.description ||
+                t('No description available.')}
+            </Description>
+            <SectionTitle
+              css={css`
+                grid-area: examples-header;
+              `}
+            >
+              {!!selectedVizMetadata?.exampleGallery?.length && t('Examples')}
+            </SectionTitle>
+            <Examples>
+              {(selectedVizMetadata?.exampleGallery || []).map(example => (
+                <img
+                  src={example.url}
+                  alt={example.caption}
+                  title={example.caption}
+                />
+              ))}
+            </Examples>
+          </>
+        </div>
+      ) : (
+        <div
+          css={(theme: SupersetTheme) => [
+            DetailsPane(theme),
+            DetailsEmpty(theme),
+          ]}
+        >
+          {t('Select a visualization type')}
+        </div>
+      )}
+    </VizPickerLayout>
+  );
+}
diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl/index.jsx b/superset-frontend/src/explore/components/controls/VizTypeControl/index.jsx
deleted file mode 100644
index b7efbd8bc709..000000000000
--- a/superset-frontend/src/explore/components/controls/VizTypeControl/index.jsx
+++ /dev/null
@@ -1,244 +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 React, { useEffect, useRef, useState } from 'react';
-import PropTypes from 'prop-types';
-import { Input, Row, Col } from 'src/common/components';
-import { t, getChartMetadataRegistry } from '@superset-ui/core';
-import { useDynamicPluginContext } from 'src/components/DynamicPlugins';
-import Modal from 'src/components/Modal';
-import { Tooltip } from 'src/components/Tooltip';
-import Label from 'src/components/Label';
-import ControlHeader from 'src/explore/components/ControlHeader';
-import { nativeFilterGate } from 'src/dashboard/components/nativeFilters/utils';
-import './VizTypeControl.less';
-
-const propTypes = {
-  description: PropTypes.string,
-  label: PropTypes.string,
-  name: PropTypes.string.isRequired,
-  onChange: PropTypes.func,
-  value: PropTypes.string.isRequired,
-  labelType: PropTypes.string,
-};
-
-const defaultProps = {
-  onChange: () => {},
-  labelType: 'default',
-};
-
-const registry = getChartMetadataRegistry();
-
-const DEFAULT_ORDER = [
-  'line',
-  'big_number',
-  'table',
-  'filter_box',
-  'dist_bar',
-  'area',
-  'bar',
-  'deck_polygon',
-  'pie',
-  'time_table',
-  'pivot_table',
-  'histogram',
-  'big_number_total',
-  'deck_scatter',
-  'deck_hex',
-  'time_pivot',
-  'deck_arc',
-  'heatmap',
-  'deck_grid',
-  'dual_line',
-  'deck_screengrid',
-  'line_multi',
-  'treemap',
-  'box_plot',
-  'sunburst',
-  'sankey',
-  'word_cloud',
-  'mapbox',
-  'kepler',
-  'cal_heatmap',
-  'rose',
-  'bubble',
-  'deck_geojson',
-  'horizon',
-  'deck_multi',
-  'compare',
-  'partition',
-  'event_flow',
-  'deck_path',
-  'graph_chart',
-  'world_map',
-  'paired_ttest',
-  'para',
-  'country_map',
-];
-
-const typesWithDefaultOrder = new Set(DEFAULT_ORDER);
-
-export const VIZ_TYPE_CONTROL_TEST_ID = 'viz-type-control';
-
-function VizSupportValidation({ vizType }) {
-  const state = useDynamicPluginContext();
-  if (state.loading || registry.has(vizType)) {
-    return null;
-  }
-  return (
-    <div className="text-danger">
-      <i className="fa fa-exclamation-circle text-danger" />{' '}
-      <small>{t('This visualization type is not supported.')}</small>
-    </div>
-  );
-}
-
-const VizTypeControl = props => {
-  const [showModal, setShowModal] = useState(false);
-  const [filter, setFilter] = useState('');
-  const searchRef = useRef(null);
-
-  useEffect(() => {
-    if (showModal) {
-      setTimeout(() => searchRef?.current?.focus(), 200);
-    }
-  }, [showModal]);
-
-  const onChange = vizType => {
-    props.onChange(vizType);
-    setShowModal(false);
-  };
-
-  const toggleModal = () => {
-    setShowModal(prevState => !prevState);
-  };
-
-  const changeSearch = event => {
-    setFilter(event.target.value);
-  };
-
-  const renderItem = entry => {
-    const { value } = props;
-    const { key, value: type } = entry;
-    const isSelected = key === value;
-
-    return (
-      <div
-        role="button"
-        tabIndex={0}
-        className={`viztype-selector-container ${isSelected ? 'selected' : ''}`}
-        onClick={() => onChange(key)}
-      >
-        <img
-          alt={type.name}
-          width="100%"
-          className={`viztype-selector ${isSelected ? 'selected' : ''}`}
-          src={type.thumbnail}
-        />
-        <div
-          className="viztype-label"
-          data-test={`${VIZ_TYPE_CONTROL_TEST_ID}__viztype-label`}
-        >
-          {type.name}
-        </div>
-      </div>
-    );
-  };
-
-  const { value, labelType } = props;
-  const filterString = filter.toLowerCase();
-  const filterStringParts = filterString.split(' ');
-
-  const a = DEFAULT_ORDER.filter(type => registry.has(type));
-  const filteredTypes = a
-    .filter(type => {
-      const behaviors = registry.get(type)?.behaviors || [];
-      return nativeFilterGate(behaviors);
-    })
-    .map(type => ({
-      key: type,
-      value: registry.get(type),
-    }))
-    .concat(
-      registry
-        .entries()
-        .filter(entry => {
-          const behaviors = entry.value?.behaviors || [];
-          return nativeFilterGate(behaviors);
-        })
-        .filter(({ key }) => !typesWithDefaultOrder.has(key)),
-    )
-    .filter(entry =>
-      filterStringParts.every(
-        part => entry.value.name.toLowerCase().indexOf(part) !== -1,
-      ),
-    );
-
-  return (
-    <div>
-      <ControlHeader {...props} />
-      <Tooltip
-        id="error-tooltip"
-        placement="right"
-        title={t('Click to change visualization type')}
-      >
-        <>
-          <Label
-            onClick={toggleModal}
-            type={labelType}
-            data-test="visualization-type"
-          >
-            {registry.has(value) ? registry.get(value).name : `${value}`}
-          </Label>
-          <VizSupportValidation vizType={value} />
-        </>
-      </Tooltip>
-      <Modal
-        show={showModal}
-        onHide={toggleModal}
-        title={t('Select a visualization type')}
-        responsive
-        hideFooter
-        forceRender
-      >
-        <div className="viztype-control-search-box">
-          <Input
-            ref={searchRef}
-            type="text"
-            value={filter}
-            placeholder={t('Search')}
-            onChange={changeSearch}
-            data-test={`${VIZ_TYPE_CONTROL_TEST_ID}__search-input`}
-          />
-        </div>
-        <Row data-test={`${VIZ_TYPE_CONTROL_TEST_ID}__viz-row`} gutter={16}>
-          {filteredTypes.map(entry => (
-            <Col xs={12} sm={8} md={6} lg={4} key={`grid-col-${entry.key}`}>
-              {renderItem(entry)}
-            </Col>
-          ))}
-        </Row>
-      </Modal>
-    </div>
-  );
-};
-
-VizTypeControl.propTypes = propTypes;
-VizTypeControl.defaultProps = defaultProps;
-
-export default VizTypeControl;
diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl/index.tsx b/superset-frontend/src/explore/components/controls/VizTypeControl/index.tsx
new file mode 100644
index 000000000000..7837eb04ae9f
--- /dev/null
+++ b/superset-frontend/src/explore/components/controls/VizTypeControl/index.tsx
@@ -0,0 +1,152 @@
+/**
+ * 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 React, { useCallback, useState } from 'react';
+import PropTypes from 'prop-types';
+import { t, getChartMetadataRegistry, styled } from '@superset-ui/core';
+import { usePluginContext } from 'src/components/DynamicPlugins';
+import Modal from 'src/components/Modal';
+import { Tooltip } from 'src/components/Tooltip';
+import Label, { Type } from 'src/components/Label';
+import ControlHeader from 'src/explore/components/ControlHeader';
+import VizTypeGallery, {
+  MAX_ADVISABLE_VIZ_GALLERY_WIDTH,
+} from './VizTypeGallery';
+
+const propTypes = {
+  description: PropTypes.string,
+  label: PropTypes.string,
+  name: PropTypes.string.isRequired,
+  onChange: PropTypes.func,
+  value: PropTypes.string.isRequired,
+  labelType: PropTypes.string,
+};
+
+interface VizTypeControlProps {
+  description?: string;
+  label?: string;
+  name: string;
+  onChange: (vizType: string | null) => void;
+  value: string | null;
+  labelType?: Type;
+  isModalOpenInit?: boolean;
+}
+
+const defaultProps = {
+  onChange: () => {},
+  labelType: 'default',
+};
+
+const metadataRegistry = getChartMetadataRegistry();
+
+export const VIZ_TYPE_CONTROL_TEST_ID = 'viz-type-control';
+
+function VizSupportValidation({ vizType }: { vizType: string }) {
+  const state = usePluginContext();
+  if (state.loading || metadataRegistry.has(vizType)) {
+    return null;
+  }
+  return (
+    <div className="text-danger">
+      <i className="fa fa-exclamation-circle text-danger" />{' '}
+      <small>{t('This visualization type is not supported.')}</small>
+    </div>
+  );
+}
+
+const UnpaddedModal = styled(Modal)`
+  .ant-modal-body {
+    padding: 0;
+  }
+`;
+
+/** Manages the viz type and the viz picker modal */
+const VizTypeControl = (props: VizTypeControlProps) => {
+  const { value: initialValue, onChange, isModalOpenInit, labelType } = props;
+  const { mountedPluginMetadata } = usePluginContext();
+  const [showModal, setShowModal] = useState(!!isModalOpenInit);
+  // a trick to force re-initialization of the gallery each time the modal opens,
+  // ensuring that the modal always opens to the correct category.
+  const [modalKey, setModalKey] = useState(0);
+  const [selectedViz, setSelectedViz] = useState<string | null>(initialValue);
+
+  const openModal = useCallback(() => {
+    setShowModal(true);
+  }, []);
+
+  const onSubmit = useCallback(() => {
+    onChange(selectedViz);
+    setShowModal(false);
+  }, [selectedViz, onChange]);
+
+  const onCancel = useCallback(() => {
+    setShowModal(false);
+    setModalKey(key => key + 1);
+    // make sure the modal re-opens to the last submitted viz
+    setSelectedViz(initialValue);
+  }, [initialValue]);
+
+  const labelContent = initialValue
+    ? mountedPluginMetadata[initialValue]?.name || `${initialValue}`
+    : t('Select Viz Type');
+
+  return (
+    <div>
+      <ControlHeader {...props} />
+      <Tooltip
+        id="error-tooltip"
+        placement="right"
+        title={t('Click to change visualization type')}
+      >
+        <>
+          <Label
+            onClick={openModal}
+            type={labelType}
+            data-test="visualization-type"
+          >
+            {labelContent}
+          </Label>
+          {initialValue && <VizSupportValidation vizType={initialValue} />}
+        </>
+      </Tooltip>
+
+      <UnpaddedModal
+        show={showModal}
+        onHide={onCancel}
+        title={t('Select a visualization type')}
+        primaryButtonName={t('Select')}
+        disablePrimaryButton={!selectedViz}
+        onHandledPrimaryAction={onSubmit}
+        maxWidth={`${MAX_ADVISABLE_VIZ_GALLERY_WIDTH}px`}
+        responsive
+      >
+        {/* When the key increments, it forces react to re-init the gallery component */}
+        <VizTypeGallery
+          key={modalKey}
+          selectedViz={selectedViz}
+          onChange={setSelectedViz}
+        />
+      </UnpaddedModal>
+    </div>
+  );
+};
+
+VizTypeControl.propTypes = propTypes;
+VizTypeControl.defaultProps = defaultProps;
+
+export default VizTypeControl;
diff --git a/superset-frontend/src/explore/components/controls/index.js b/superset-frontend/src/explore/components/controls/index.js
index e3ae9fa26611..a00a88f53dfc 100644
--- a/superset-frontend/src/explore/components/controls/index.js
+++ b/superset-frontend/src/explore/components/controls/index.js
@@ -40,6 +40,7 @@ import VizTypeControl from './VizTypeControl';
 import MetricsControl from './MetricControl/MetricsControl';
 import AdhocFilterControl from './FilterControl/AdhocFilterControl';
 import FilterBoxItemControl from './FilterBoxItemControl';
+import ConditionalFormattingControl from './ConditionalFormattingControl';
 import DndColumnSelectControl, {
   DndColumnSelect,
   DndFilterSelect,
@@ -74,6 +75,7 @@ const controlMap = {
   MetricsControl,
   AdhocFilterControl,
   FilterBoxItemControl,
+  ConditionalFormattingControl,
   ...sharedControlComponents,
 };
 export default controlMap;
diff --git a/superset-frontend/src/explore/components/optionRenderers.tsx b/superset-frontend/src/explore/components/optionRenderers.tsx
index 74d2891df910..fbd641db3742 100644
--- a/superset-frontend/src/explore/components/optionRenderers.tsx
+++ b/superset-frontend/src/explore/components/optionRenderers.tsx
@@ -27,6 +27,7 @@ import {
 } from '@superset-ui/chart-controls';
 
 const OptionContainer = styled.div`
+  width: 100%;
   > span {
     display: flex;
     align-items: center;
diff --git a/superset-frontend/src/explore/constants.ts b/superset-frontend/src/explore/constants.ts
index b3af092eb9fe..c3b31f1de568 100644
--- a/superset-frontend/src/explore/constants.ts
+++ b/superset-frontend/src/explore/constants.ts
@@ -28,49 +28,78 @@ export const AGGREGATES = {
 };
 export const AGGREGATES_OPTIONS = Object.values(AGGREGATES);
 
-export const OPERATORS = {
-  '==': '==',
-  '!=': '!=',
-  '>': '>',
-  '<': '<',
-  '>=': '>=',
-  '<=': '<=',
-  IN: 'IN',
-  'NOT IN': 'NOT IN',
-  ILIKE: 'ILIKE',
-  LIKE: 'LIKE',
-  REGEX: 'REGEX',
-  'IS NOT NULL': 'IS NOT NULL',
-  'IS NULL': 'IS NULL',
-  'LATEST PARTITION': 'LATEST PARTITION',
-  'IS TRUE': 'IS TRUE',
-  'IS FALSE': 'IS FALSE',
+export enum Operators {
+  EQUALS = 'EQUALS',
+  NOT_EQUALS = 'NOT_EQUALS',
+  LESS_THAN = 'LESS_THAN',
+  GREATER_THAN = 'GREATER_THAN',
+  LESS_THAN_OR_EQUAL = 'LESS_THAN_OR_EQUAL',
+  GREATER_THAN_OR_EQUAL = 'GREATER_THAN_OR_EQUAL',
+  IN = 'IN',
+  NOT_IN = 'NOT_IN',
+  ILIKE = 'ILIKE',
+  LIKE = 'LIKE',
+  REGEX = 'REGEX',
+  IS_NOT_NULL = 'IS_NOT_NULL',
+  IS_NULL = 'IS_NULL',
+  LATEST_PARTITION = 'LATEST_PARTITION',
+  IS_TRUE = 'IS_TRUE',
+  IS_FALSE = 'IS_FALSE',
+}
+
+export interface OperatorType {
+  display: string;
+  operation: string;
+}
+
+export const OPERATOR_ENUM_TO_OPERATOR_TYPE: {
+  [key in Operators]: OperatorType;
+} = {
+  [Operators.EQUALS]: { display: 'equals', operation: '==' },
+  [Operators.NOT_EQUALS]: { display: 'not equals', operation: '!=' },
+  [Operators.GREATER_THAN]: { display: '>', operation: '>' },
+  [Operators.LESS_THAN]: { display: '<', operation: '<' },
+  [Operators.GREATER_THAN_OR_EQUAL]: { display: '>=', operation: '>=' },
+  [Operators.LESS_THAN_OR_EQUAL]: { display: '<=', operation: '<=' },
+  [Operators.IN]: { display: 'IN', operation: 'IN' },
+  [Operators.NOT_IN]: { display: 'NOT IN', operation: 'NOT IN' },
+  [Operators.LIKE]: { display: 'LIKE', operation: 'LIKE' },
+  [Operators.ILIKE]: { display: 'LIKE (case insensitive)', operation: 'ILIKE' },
+  [Operators.REGEX]: { display: 'REGEX', operation: 'REGEX' },
+  [Operators.IS_NOT_NULL]: { display: 'IS NOT NULL', operation: 'IS NOT NULL' },
+  [Operators.IS_NULL]: { display: 'IS NULL', operation: 'IS NULL' },
+  [Operators.LATEST_PARTITION]: {
+    display: 'use latest_partition template',
+    operation: 'LATEST PARTITION',
+  },
+  [Operators.IS_TRUE]: { display: 'IS TRUE', operation: '==' },
+  [Operators.IS_FALSE]: { display: 'IS FALSE', operation: '==' },
 };
 
-export const OPERATORS_OPTIONS = Object.values(OPERATORS);
+export const OPERATORS_OPTIONS = Object.values(Operators) as Operators[];
 
-export const TABLE_ONLY_OPERATORS = [OPERATORS.LIKE, OPERATORS.ILIKE];
-export const DRUID_ONLY_OPERATORS = [OPERATORS.REGEX];
+export const TABLE_ONLY_OPERATORS = [Operators.LIKE, Operators.ILIKE];
+export const DRUID_ONLY_OPERATORS = [Operators.REGEX];
 export const HAVING_OPERATORS = [
-  OPERATORS['=='],
-  OPERATORS['!='],
-  OPERATORS['>'],
-  OPERATORS['<'],
-  OPERATORS['>='],
-  OPERATORS['<='],
+  Operators.EQUALS,
+  Operators.NOT_EQUALS,
+  Operators.GREATER_THAN,
+  Operators.LESS_THAN,
+  Operators.GREATER_THAN_OR_EQUAL,
+  Operators.LESS_THAN_OR_EQUAL,
 ];
-export const MULTI_OPERATORS = new Set([OPERATORS.IN, OPERATORS['NOT IN']]);
+export const MULTI_OPERATORS = new Set([Operators.IN, Operators.NOT_IN]);
 // CUSTOM_OPERATORS will show operator in simple mode,
 // but will generate customized sqlExpression
-export const CUSTOM_OPERATORS = new Set([OPERATORS['LATEST PARTITION']]);
+export const CUSTOM_OPERATORS = new Set([Operators.LATEST_PARTITION]);
 // DISABLE_INPUT_OPERATORS will disable filter value input
 // in adhocFilter control
 export const DISABLE_INPUT_OPERATORS = [
-  OPERATORS['IS NOT NULL'],
-  OPERATORS['IS NULL'],
-  OPERATORS['LATEST PARTITION'],
-  OPERATORS['IS TRUE'],
-  OPERATORS['IS FALSE'],
+  Operators.IS_NOT_NULL,
+  Operators.IS_NULL,
+  Operators.LATEST_PARTITION,
+  Operators.IS_TRUE,
+  Operators.IS_FALSE,
 ];
 
 export const sqlaAutoGeneratedMetricNameRegex = /^(sum|min|max|avg|count|count_distinct)__.*$/i;
@@ -107,3 +136,4 @@ export const TIME_FILTER_MAP = {
 
 // TODO: make this configurable per Superset installation
 export const DEFAULT_TIME_RANGE = 'No filter';
+export const NO_TIME_RANGE = 'No filter';
diff --git a/superset-frontend/src/explore/exploreUtils/index.js b/superset-frontend/src/explore/exploreUtils/index.js
index c936590db095..ddcd95b82a43 100644
--- a/superset-frontend/src/explore/exploreUtils/index.js
+++ b/superset-frontend/src/explore/exploreUtils/index.js
@@ -29,7 +29,10 @@ import {
 import { availableDomains } from 'src/utils/hostNamesConfig';
 import { safeStringify } from 'src/utils/safeStringify';
 import { URL_PARAMS } from 'src/constants';
-import { MULTI_OPERATORS } from 'src/explore/constants';
+import {
+  MULTI_OPERATORS,
+  OPERATOR_ENUM_TO_OPERATOR_TYPE,
+} from 'src/explore/constants';
 import { DashboardStandaloneMode } from 'src/dashboard/util/constants';
 
 const MAX_URL_LENGTH = 8000;
@@ -86,6 +89,10 @@ export function getURIDirectory(endpointType = 'base') {
   return '/superset/explore/';
 }
 
+/**
+ * This gets the url of the explore page, with all the form data included explicitly.
+ * This includes any form data overrides from the dashboard.
+ */
 export function getExploreLongUrl(
   formData,
   endpointType,
@@ -135,6 +142,11 @@ export function getChartDataUri({ path, qs, allowDomainSharding = false }) {
   return uri;
 }
 
+/**
+ * This gets the minimal url for the given form data.
+ * If there are dashboard overrides present in the form data,
+ * they will not be included in the url.
+ */
 export function getExploreUrl({
   formData,
   endpointType = 'base',
@@ -319,7 +331,10 @@ export const useDebouncedEffect = (effect, delay, deps) => {
 };
 
 export const getSimpleSQLExpression = (subject, operator, comparator) => {
-  const isMulti = MULTI_OPERATORS.has(operator);
+  const isMulti =
+    [...MULTI_OPERATORS]
+      .map(op => OPERATOR_ENUM_TO_OPERATOR_TYPE[op].operation)
+      .indexOf(operator) >= 0;
   let expression = subject ?? '';
   if (subject && operator) {
     expression += ` ${operator}`;
diff --git a/superset-frontend/src/explore/reducers/index.js b/superset-frontend/src/explore/reducers/index.js
index 2a92b07d716e..e387c49c18a4 100644
--- a/superset-frontend/src/explore/reducers/index.js
+++ b/superset-frontend/src/explore/reducers/index.js
@@ -18,6 +18,7 @@
  */
 import { combineReducers } from 'redux';
 
+import reports from 'src/reports/reducers/reports';
 import charts from '../../chart/chartReducer';
 import saveModal from './saveModalReducer';
 import explore from './exploreReducer';
@@ -33,4 +34,5 @@ export default combineReducers({
   explore,
   impressionId,
   messageToasts,
+  reports,
 });
diff --git a/superset-frontend/src/filters/components/GroupBy/GroupByFilterPlugin.tsx b/superset-frontend/src/filters/components/GroupBy/GroupByFilterPlugin.tsx
index ce67cdc72791..b8452cac4425 100644
--- a/superset-frontend/src/filters/components/GroupBy/GroupByFilterPlugin.tsx
+++ b/superset-frontend/src/filters/components/GroupBy/GroupByFilterPlugin.tsx
@@ -18,12 +18,11 @@
  */
 import { ensureIsArray, ExtraFormData, t, tn } from '@superset-ui/core';
 import React, { useEffect, useState } from 'react';
-import { Select } from 'src/common/components';
-import { Styles, StyledSelect } from '../common';
+import { FormItemProps } from 'antd/lib/form';
+import { Select } from 'src/components';
+import { FilterPluginStyle, StyledFormItem, StatusMessage } from '../common';
 import { PluginFilterGroupByProps } from './types';
 
-const { Option } = Select;
-
 export default function PluginFilterGroupBy(props: PluginFilterGroupByProps) {
   const {
     data,
@@ -63,35 +62,60 @@ export default function PluginFilterGroupBy(props: PluginFilterGroupByProps) {
     // so we can process it like this `JSON.stringify` or start to use `Immer`
   }, [JSON.stringify(defaultValue), multiSelect]);
 
-  const columns = data || [];
+  const groupby = formData?.groupby?.[0]?.length
+    ? formData?.groupby?.[0]
+    : null;
+
+  const withData = groupby
+    ? data.filter(dataItem =>
+        // @ts-ignore
+        groupby.includes(dataItem.column_name),
+      )
+    : data;
+
+  const columns = data ? withData : [];
+
   const placeholderText =
     columns.length === 0
       ? t('No columns')
       : tn('%s option', '%s options', columns.length, columns.length);
+
+  const formItemData: FormItemProps = {};
+  if (filterState.validateMessage) {
+    formItemData.extra = (
+      <StatusMessage status={filterState.validateStatus}>
+        {filterState.validateMessage}
+      </StatusMessage>
+    );
+  }
+  const options = columns.map(
+    (row: { column_name: string; verbose_name: string | null }) => {
+      const { column_name: columnName, verbose_name: verboseName } = row;
+      return {
+        label: verboseName ?? columnName,
+        value: columnName,
+      };
+    },
+  );
   return (
-    <Styles height={height} width={width}>
-      <StyledSelect
-        allowClear
-        value={value}
-        placeholder={placeholderText}
-        mode={multiSelect ? 'multiple' : undefined}
-        // @ts-ignore
-        onChange={handleChange}
-        onBlur={unsetFocusedFilter}
-        onFocus={setFocusedFilter}
-        ref={inputRef}
+    <FilterPluginStyle height={height} width={width}>
+      <StyledFormItem
+        validateStatus={filterState.validateStatus}
+        {...formItemData}
       >
-        {columns.map(
-          (row: { column_name: string; verbose_name: string | null }) => {
-            const { column_name: columnName, verbose_name: verboseName } = row;
-            return (
-              <Option key={columnName} value={columnName}>
-                {verboseName ?? columnName}
-              </Option>
-            );
-          },
-        )}
-      </StyledSelect>
-    </Styles>
+        <Select
+          allowClear
+          value={value}
+          placeholder={placeholderText}
+          mode={multiSelect ? 'multiple' : undefined}
+          // @ts-ignore
+          onChange={handleChange}
+          onBlur={unsetFocusedFilter}
+          onFocus={setFocusedFilter}
+          ref={inputRef}
+          options={options}
+        />
+      </StyledFormItem>
+    </FilterPluginStyle>
   );
 }
diff --git a/superset-frontend/src/filters/components/GroupBy/controlPanel.ts b/superset-frontend/src/filters/components/GroupBy/controlPanel.ts
index 5b9b898e6487..e6a6adddc922 100644
--- a/superset-frontend/src/filters/components/GroupBy/controlPanel.ts
+++ b/superset-frontend/src/filters/components/GroupBy/controlPanel.ts
@@ -18,6 +18,7 @@
  */
 import { ControlPanelConfig, sections } from '@superset-ui/chart-controls';
 import { t } from '@superset-ui/core';
+import { sharedControls } from '@superset-ui/chart-controls/lib';
 import { DEFAULT_FORM_DATA } from './types';
 
 const { multiSelect } = DEFAULT_FORM_DATA;
@@ -26,6 +27,23 @@ const config: ControlPanelConfig = {
   controlPanelSections: [
     // @ts-ignore
     sections.legacyRegularTime,
+    {
+      label: t('Query'),
+      expanded: true,
+      controlSetRows: [
+        [
+          {
+            name: 'groupby',
+            config: {
+              ...sharedControls.groupby,
+              label: 'Columns to show',
+              multiple: true,
+              required: false,
+            },
+          },
+        ],
+      ],
+    },
     {
       label: t('UI Configuration'),
       expanded: true,
@@ -44,6 +62,18 @@ const config: ControlPanelConfig = {
             },
           },
         ],
+        [
+          {
+            name: 'enableEmptyFilter',
+            config: {
+              type: 'CheckboxControl',
+              label: t('Required'),
+              default: false,
+              renderTrigger: true,
+              description: t('User must select a value for this filter.'),
+            },
+          },
+        ],
       ],
     },
   ],
diff --git a/superset-frontend/src/filters/components/Range/RangeFilterPlugin.tsx b/superset-frontend/src/filters/components/Range/RangeFilterPlugin.tsx
index 8d88e516bc70..2cd8129edcf1 100644
--- a/superset-frontend/src/filters/components/Range/RangeFilterPlugin.tsx
+++ b/superset-frontend/src/filters/components/Range/RangeFilterPlugin.tsx
@@ -16,13 +16,64 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { getNumberFormatter, NumberFormats, t } from '@superset-ui/core';
+import {
+  getNumberFormatter,
+  NumberFormats,
+  styled,
+  t,
+} from '@superset-ui/core';
 import React, { useEffect, useState } from 'react';
 import { Slider } from 'src/common/components';
+import { rgba } from 'emotion-rgba';
+import { FormItemProps } from 'antd/lib/form';
 import { PluginFilterRangeProps } from './types';
-import { Styles } from '../common';
+import { StatusMessage, StyledFormItem, FilterPluginStyle } from '../common';
 import { getRangeExtraFormData } from '../../utils';
 
+const Wrapper = styled.div<{ validateStatus?: 'error' | 'warning' | 'info' }>`
+  ${({ theme, validateStatus }) => `
+    border: 1px solid transparent;
+    &:focus {
+      border: 1px solid
+        ${theme.colors[validateStatus || 'primary']?.base};
+      outline: 0;
+      box-shadow: 0 0 0 3px
+        ${rgba(theme.colors[validateStatus || 'primary']?.base, 0.2)};
+    }
+    & .ant-slider {
+      margin-top: ${theme.gridUnit}px;
+      margin-bottom: ${theme.gridUnit * 5}px;
+
+      & .ant-slider-track {
+        background-color: ${
+          validateStatus && theme.colors[validateStatus]?.light1
+        };
+      }
+      & .ant-slider-handle {
+        border: ${
+          validateStatus && `2px solid ${theme.colors[validateStatus]?.light1}`
+        };
+        &:focus {
+          box-shadow: 0 0 0 3px
+            ${rgba(theme.colors[validateStatus || 'primary']?.base, 0.2)};
+        }
+      }
+      &:hover {
+        & .ant-slider-track {
+          background-color: ${
+            validateStatus && theme.colors[validateStatus]?.base
+          };
+        }
+        & .ant-slider-handle {
+          border: ${
+            validateStatus && `2px solid ${theme.colors[validateStatus]?.base}`
+          };
+        }
+      }
+    }
+  `}
+`;
+
 export default function RangeFilterPlugin(props: PluginFilterRangeProps) {
   const {
     data,
@@ -32,7 +83,6 @@ export default function RangeFilterPlugin(props: PluginFilterRangeProps) {
     setDataMask,
     setFocusedFilter,
     unsetFocusedFilter,
-    inputRef,
     filterState,
   } = props;
   const numberFormatter = getNumberFormatter(NumberFormats.SMART_NUMBER);
@@ -40,7 +90,7 @@ export default function RangeFilterPlugin(props: PluginFilterRangeProps) {
   const [row] = data;
   // @ts-ignore
   const { min, max }: { min: number; max: number } = row;
-  const { groupby, defaultValue } = formData;
+  const { groupby, defaultValue, inputRef } = formData;
   const [col = ''] = groupby || [];
   const [value, setValue] = useState<[number, number]>(
     defaultValue ?? [min, max],
@@ -103,28 +153,49 @@ export default function RangeFilterPlugin(props: PluginFilterRangeProps) {
   };
 
   useEffect(() => {
+    // when switch filter type and queriesData still not updated we need ignore this case (in FilterBar)
+    if (row?.min === undefined && row?.max === undefined) {
+      return;
+    }
     handleAfterChange(filterState.value ?? [min, max]);
-  }, [JSON.stringify(filterState.value)]);
+  }, [JSON.stringify(filterState.value), JSON.stringify(data)]);
 
+  const formItemData: FormItemProps = {};
+  if (filterState.validateMessage) {
+    formItemData.extra = (
+      <StatusMessage status={filterState.validateStatus}>
+        {filterState.validateMessage}
+      </StatusMessage>
+    );
+  }
   return (
-    <Styles height={height} width={width}>
+    <FilterPluginStyle height={height} width={width}>
       {Number.isNaN(Number(min)) || Number.isNaN(Number(max)) ? (
         <h4>{t('Chosen non-numeric column')}</h4>
       ) : (
-        <div onMouseEnter={setFocusedFilter} onMouseLeave={unsetFocusedFilter}>
-          <Slider
-            range
-            min={min}
-            max={max}
-            value={value ?? [min, max]}
-            onAfterChange={handleAfterChange}
-            onChange={handleChange}
-            tipFormatter={value => numberFormatter(value)}
+        <StyledFormItem {...formItemData}>
+          <Wrapper
+            tabIndex={-1}
             ref={inputRef}
-            marks={marks}
-          />
-        </div>
+            validateStatus={filterState.validateStatus}
+            onFocus={setFocusedFilter}
+            onBlur={unsetFocusedFilter}
+            onMouseEnter={setFocusedFilter}
+            onMouseLeave={unsetFocusedFilter}
+          >
+            <Slider
+              range
+              min={min}
+              max={max}
+              value={value ?? [min, max]}
+              onAfterChange={handleAfterChange}
+              onChange={handleChange}
+              tipFormatter={value => numberFormatter(value)}
+              marks={marks}
+            />
+          </Wrapper>
+        </StyledFormItem>
       )}
-    </Styles>
+    </FilterPluginStyle>
   );
 }
diff --git a/superset-frontend/src/filters/components/Range/controlPanel.ts b/superset-frontend/src/filters/components/Range/controlPanel.ts
index 8f9501d7a507..555b019210e8 100644
--- a/superset-frontend/src/filters/components/Range/controlPanel.ts
+++ b/superset-frontend/src/filters/components/Range/controlPanel.ts
@@ -36,8 +36,25 @@ const config: ControlPanelConfig = {
             config: {
               ...sharedControls.groupby,
               label: 'Column',
-              description:
-                'The numeric column based on which to calculate the range',
+              required: true,
+            },
+          },
+        ],
+      ],
+    },
+    {
+      label: t('UI Configuration'),
+      expanded: true,
+      controlSetRows: [
+        [
+          {
+            name: 'enableEmptyFilter',
+            config: {
+              type: 'CheckboxControl',
+              label: t('Required'),
+              default: false,
+              renderTrigger: true,
+              description: t('User must select a value for this filter.'),
             },
           },
         ],
diff --git a/superset-frontend/src/filters/components/Select/SelectFilterPlugin.test.tsx b/superset-frontend/src/filters/components/Select/SelectFilterPlugin.test.tsx
index e2ed21c90bc9..549217619b78 100644
--- a/superset-frontend/src/filters/components/Select/SelectFilterPlugin.test.tsx
+++ b/superset-frontend/src/filters/components/Select/SelectFilterPlugin.test.tsx
@@ -150,7 +150,7 @@ describe('SelectFilterPlugin', () => {
         ],
       },
       filterState: {
-        label: '',
+        label: undefined,
         value: null,
       },
     });
@@ -165,7 +165,7 @@ describe('SelectFilterPlugin', () => {
       },
       extraFormData: {},
       filterState: {
-        label: '',
+        label: undefined,
         value: null,
       },
     });
diff --git a/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx b/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx
index 305667c2947b..4865501e1a8e 100644
--- a/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx
+++ b/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx
@@ -20,7 +20,6 @@
 import {
   AppSection,
   DataMask,
-  DataRecord,
   ensureIsArray,
   ExtraFormData,
   GenericDataType,
@@ -29,18 +28,16 @@ import {
   t,
   tn,
 } from '@superset-ui/core';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { Select } from 'src/common/components';
+import React, { useCallback, useEffect, useState, useMemo } from 'react';
+import { Select } from 'src/components';
 import debounce from 'lodash/debounce';
 import { SLOW_DEBOUNCE } from 'src/constants';
 import { useImmerReducer } from 'use-immer';
-import Icons from 'src/components/Icons';
+import { FormItemProps } from 'antd/lib/form';
 import { PluginFilterSelectProps, SelectValue } from './types';
-import { StyledSelect, Styles } from '../common';
+import { StyledFormItem, FilterPluginStyle, StatusMessage } from '../common';
 import { getDataRecordFormatter, getSelectExtraFormData } from '../../utils';
 
-const { Option } = Select;
-
 type DataMaskAction =
   | { type: 'ownState'; ownState: JsonObject }
   | {
@@ -98,24 +95,6 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
   const groupby = ensureIsArray<string>(formData.groupby);
   const [col] = groupby;
   const [initialColtypeMap] = useState(coltypeMap);
-  const [selectedValues, setSelectedValues] = useState<SelectValue>(
-    filterState.value,
-  );
-  const sortedData = useMemo(() => {
-    const firstData: DataRecord[] = [];
-    const restData: DataRecord[] = [];
-    data.forEach(row => {
-      // @ts-ignore
-      if (selectedValues?.includes(row[col])) {
-        firstData.push(row);
-      } else {
-        restData.push(row);
-      }
-    });
-    return [...firstData, ...restData];
-  }, [col, selectedValues, data]);
-  const [isDropdownVisible, setIsDropdownVisible] = useState(false);
-  const [currentSuggestionSearch, setCurrentSuggestionSearch] = useState('');
   const [dataMask, dispatchDataMask] = useImmerReducer(reducer, {
     extraFormData: {},
     filterState,
@@ -138,7 +117,10 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
           inverseSelection,
         ),
         filterState: {
-          label: `${(values || []).join(', ')}${suffix}`,
+          ...filterState,
+          label: values?.length
+            ? `${(values || []).join(', ')}${suffix}`
+            : undefined,
           value:
             appSection === AppSection.FILTER_CONFIG_MODAL && defaultToFirstItem
               ? undefined
@@ -158,9 +140,6 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
   );
 
   useEffect(() => {
-    if (!isDropdownVisible) {
-      setSelectedValues(filterState.value);
-    }
     updateDataMask(filterState.value);
   }, [JSON.stringify(filterState.value)]);
 
@@ -184,11 +163,9 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
     if (searchAllOptions) {
       debouncedOwnStateFunc(val);
     }
-    setCurrentSuggestionSearch(val);
   };
 
   const clearSuggestionSearch = () => {
-    setCurrentSuggestionSearch('');
     if (searchAllOptions) {
       dispatchDataMask({
         type: 'ownState',
@@ -203,13 +180,16 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
   const handleBlur = () => {
     clearSuggestionSearch();
     unsetFocusedFilter();
-    setSelectedValues(filterState.value);
   };
 
   const datatype: GenericDataType = coltypeMap[col];
-  const labelFormatter = getDataRecordFormatter({
-    timeFormatter: smartDateDetailedFormatter,
-  });
+  const labelFormatter = useMemo(
+    () =>
+      getDataRecordFormatter({
+        timeFormatter: smartDateDetailedFormatter,
+      }),
+    [],
+  );
 
   const handleChange = (value?: SelectValue | number | string) => {
     const values = ensureIsArray(value);
@@ -258,48 +238,57 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
     data.length === 0
       ? t('No data')
       : tn('%s option', '%s options', data.length, data.length);
-  const Icon = inverseSelection ? Icons.StopOutlined : Icons.CheckOutlined;
+
+  const formItemData: FormItemProps = {};
+  if (filterState.validateMessage) {
+    formItemData.extra = (
+      <StatusMessage status={filterState.validateStatus}>
+        {filterState.validateMessage}
+      </StatusMessage>
+    );
+  }
+
+  const options = useMemo(() => {
+    const options: { label: string; value: string | number }[] = [];
+    data.forEach(row => {
+      const [value] = groupby.map(col => row[col]);
+      options.push({
+        label: labelFormatter(value, datatype),
+        value: typeof value === 'number' ? value : String(value),
+      });
+    });
+    return options;
+  }, [data, datatype, groupby, labelFormatter]);
 
   return (
-    <Styles height={height} width={width}>
-      <StyledSelect
-        allowClear={!enableEmptyFilter}
-        // @ts-ignore
-        value={filterState.value || []}
-        disabled={isDisabled}
-        showSearch={showSearch}
-        mode={multiSelect ? 'multiple' : undefined}
-        placeholder={placeholderText}
-        onSearch={searchWrapper}
-        onSelect={clearSuggestionSearch}
-        onBlur={handleBlur}
-        onDropdownVisibleChange={setIsDropdownVisible}
-        onFocus={setFocusedFilter}
-        // @ts-ignore
-        onChange={handleChange}
-        ref={inputRef}
-        loading={isRefreshing}
-        maxTagCount={5}
-        menuItemSelectedIcon={<Icon iconSize="m" />}
+    <FilterPluginStyle height={height} width={width}>
+      <StyledFormItem
+        validateStatus={filterState.validateStatus}
+        {...formItemData}
       >
-        {sortedData.map(row => {
-          const [value] = groupby.map(col => row[col]);
-          return (
-            // @ts-ignore
-            <Option key={`${value}`} value={value}>
-              {labelFormatter(value, datatype)}
-            </Option>
-          );
-        })}
-        {currentSuggestionSearch &&
-          !ensureIsArray(filterState.value).some(
-            suggestion => suggestion === currentSuggestionSearch,
-          ) && (
-            <Option value={currentSuggestionSearch}>
-              {`${t('Create "%s"', currentSuggestionSearch)}`}
-            </Option>
-          )}
-      </StyledSelect>
-    </Styles>
+        <Select
+          allowClear
+          allowNewOptions
+          // @ts-ignore
+          value={filterState.value || []}
+          disabled={isDisabled}
+          showSearch={showSearch}
+          mode={multiSelect ? 'multiple' : 'single'}
+          placeholder={placeholderText}
+          onSearch={searchWrapper}
+          onSelect={clearSuggestionSearch}
+          onBlur={handleBlur}
+          onMouseEnter={setFocusedFilter}
+          onMouseLeave={unsetFocusedFilter}
+          // @ts-ignore
+          onChange={handleChange}
+          ref={inputRef}
+          loading={isRefreshing}
+          maxTagCount={5}
+          invertSelection={inverseSelection}
+          options={options}
+        />
+      </StyledFormItem>
+    </FilterPluginStyle>
   );
 }
diff --git a/superset-frontend/src/filters/components/Select/buildQuery.test.ts b/superset-frontend/src/filters/components/Select/buildQuery.test.ts
index 2ad31b158248..08b7037f9cef 100644
--- a/superset-frontend/src/filters/components/Select/buildQuery.test.ts
+++ b/superset-frontend/src/filters/components/Select/buildQuery.test.ts
@@ -25,7 +25,7 @@ describe('Select buildQuery', () => {
     datasource: '5__table',
     groupby: ['my_col'],
     viz_type: 'filter_select',
-    sortAscending: false,
+    sortAscending: undefined,
     sortMetric: undefined,
     filters: undefined,
     enableEmptyFilter: false,
@@ -42,12 +42,12 @@ describe('Select buildQuery', () => {
     expect(queryContext.queries.length).toEqual(1);
     const [query] = queryContext.queries;
     expect(query.groupby).toEqual(['my_col']);
-    expect(query.filters).toEqual([{ col: 'my_col', op: 'IS NOT NULL' }]);
+    expect(query.filters).toEqual([]);
     expect(query.metrics).toEqual([]);
     expect(query.orderby).toEqual([]);
   });
 
-  it('should handle sort metric correctly', () => {
+  it('should sort descending by metric', () => {
     const queryContext = buildQuery({
       ...formData,
       sortMetric: 'my_metric',
@@ -60,6 +60,43 @@ describe('Select buildQuery', () => {
     expect(query.orderby).toEqual([['my_metric', false]]);
   });
 
+  it('should sort ascending by metric', () => {
+    const queryContext = buildQuery({
+      ...formData,
+      sortMetric: 'my_metric',
+      sortAscending: true,
+    });
+    expect(queryContext.queries.length).toEqual(1);
+    const [query] = queryContext.queries;
+    expect(query.groupby).toEqual(['my_col']);
+    expect(query.metrics).toEqual(['my_metric']);
+    expect(query.orderby).toEqual([['my_metric', true]]);
+  });
+
+  it('should sort ascending by column', () => {
+    const queryContext = buildQuery({
+      ...formData,
+      sortAscending: true,
+    });
+    expect(queryContext.queries.length).toEqual(1);
+    const [query] = queryContext.queries;
+    expect(query.groupby).toEqual(['my_col']);
+    expect(query.metrics).toEqual([]);
+    expect(query.orderby).toEqual([['my_col', true]]);
+  });
+
+  it('should sort descending by column', () => {
+    const queryContext = buildQuery({
+      ...formData,
+      sortAscending: false,
+    });
+    expect(queryContext.queries.length).toEqual(1);
+    const [query] = queryContext.queries;
+    expect(query.groupby).toEqual(['my_col']);
+    expect(query.metrics).toEqual([]);
+    expect(query.orderby).toEqual([['my_col', false]]);
+  });
+
   it('should add text search parameter to query filter', () => {
     const queryContext = buildQuery(formData, {
       ownState: {
diff --git a/superset-frontend/src/filters/components/Select/buildQuery.ts b/superset-frontend/src/filters/components/Select/buildQuery.ts
index e442fcd6b09a..a66a855011f3 100644
--- a/superset-frontend/src/filters/components/Select/buildQuery.ts
+++ b/superset-frontend/src/filters/components/Select/buildQuery.ts
@@ -33,29 +33,28 @@ const buildQuery: BuildQuery<PluginFilterSelectQueryFormData> = (
   const { sortAscending, sortMetric } = { ...DEFAULT_FORM_DATA, ...formData };
   return buildQueryContext(formData, baseQueryObject => {
     const { columns = [], filters = [] } = baseQueryObject;
-    const extra_filters: QueryObjectFilterClause[] = columns.map(column => {
-      if (search && coltypeMap[column] === GenericDataType.STRING) {
-        return {
-          col: column,
-          op: 'ILIKE',
-          val: `%${search}%`,
-        };
-      }
-      if (
-        search &&
-        coltypeMap[column] === GenericDataType.NUMERIC &&
-        !Number.isNaN(Number(search))
-      ) {
-        // for numeric columns we apply a >= where clause
-        return {
-          col: column,
-          op: '>=',
-          val: Number(search),
-        };
-      }
-      // if no search is defined, make sure the col value is not null
-      return { col: column, op: 'IS NOT NULL' };
-    });
+    const extraFilters: QueryObjectFilterClause[] = [];
+    if (search) {
+      columns.forEach(column => {
+        if (coltypeMap[column] === GenericDataType.STRING) {
+          extraFilters.push({
+            col: column,
+            op: 'ILIKE',
+            val: `%${search}%`,
+          });
+        } else if (
+          coltypeMap[column] === GenericDataType.NUMERIC &&
+          !Number.isNaN(Number(search))
+        ) {
+          // for numeric columns we apply a >= where clause
+          extraFilters.push({
+            col: column,
+            op: '>=',
+            val: Number(search),
+          });
+        }
+      });
+    }
 
     const sortColumns = sortMetric ? [sortMetric] : columns;
     const query: QueryObject[] = [
@@ -63,10 +62,10 @@ const buildQuery: BuildQuery<PluginFilterSelectQueryFormData> = (
         ...baseQueryObject,
         groupby: columns,
         metrics: sortMetric ? [sortMetric] : [],
-        filters: filters.concat(extra_filters),
+        filters: filters.concat(extraFilters),
         orderby:
-          sortMetric || sortAscending
-            ? sortColumns.map(column => [column, sortAscending])
+          sortMetric || sortAscending !== undefined
+            ? sortColumns.map(column => [column, !!sortAscending])
             : [],
       },
     ];
diff --git a/superset-frontend/src/filters/components/Select/controlPanel.ts b/superset-frontend/src/filters/components/Select/controlPanel.ts
index 74891b0ed946..c06d73c2dab1 100644
--- a/superset-frontend/src/filters/components/Select/controlPanel.ts
+++ b/superset-frontend/src/filters/components/Select/controlPanel.ts
@@ -18,6 +18,7 @@
  */
 import { t, validateNonEmpty } from '@superset-ui/core';
 import { ControlPanelConfig, sections } from '@superset-ui/chart-controls';
+import { sharedControls } from '@superset-ui/chart-controls/lib';
 import { DEFAULT_FORM_DATA } from './types';
 
 const {
@@ -36,7 +37,18 @@ const config: ControlPanelConfig = {
     {
       label: t('Query'),
       expanded: true,
-      controlSetRows: [['groupby']],
+      controlSetRows: [
+        [
+          {
+            name: 'groupby',
+            config: {
+              ...sharedControls.groupby,
+              label: 'Column',
+              required: true,
+            },
+          },
+        ],
+      ],
     },
     {
       label: t('UI Configuration'),
@@ -77,8 +89,7 @@ const config: ControlPanelConfig = {
               default: enableEmptyFilter,
               renderTrigger: true,
               description: t(
-                'User must select a value for this filter when filter is in single select mode. ' +
-                  'If selection is empty, an always false filter is emitted.',
+                'User must select a value before applying the filter',
               ),
             },
           },
diff --git a/superset-frontend/src/filters/components/Select/types.ts b/superset-frontend/src/filters/components/Select/types.ts
index 36052e8696a9..11e1d1d66fa0 100644
--- a/superset-frontend/src/filters/components/Select/types.ts
+++ b/superset-frontend/src/filters/components/Select/types.ts
@@ -39,7 +39,7 @@ interface PluginFilterSelectCustomizeProps {
   defaultToFirstItem: boolean;
   inputRef?: RefObject<HTMLInputElement>;
   searchAllOptions: boolean;
-  sortAscending: boolean;
+  sortAscending?: boolean;
   sortMetric?: string;
 }
 
diff --git a/superset-frontend/src/filters/components/Time/TimeFilterPlugin.tsx b/superset-frontend/src/filters/components/Time/TimeFilterPlugin.tsx
index 9f6f42df1ee9..2ec290c21ca1 100644
--- a/superset-frontend/src/filters/components/Time/TimeFilterPlugin.tsx
+++ b/superset-frontend/src/filters/components/Time/TimeFilterPlugin.tsx
@@ -17,66 +17,92 @@
  * under the License.
  */
 import { styled } from '@superset-ui/core';
-import React, { useState, useEffect } from 'react';
+import React, { useEffect } from 'react';
 import DateFilterControl from 'src/explore/components/controls/DateFilterControl';
+import { NO_TIME_RANGE } from 'src/explore/constants';
 import { PluginFilterTimeProps } from './types';
-import { Styles } from '../common';
+import { FilterPluginStyle } from '../common';
 
-const DEFAULT_VALUE = 'Last week';
-
-const TimeFilterStyles = styled(Styles)`
-  overflow-x: scroll;
+const TimeFilterStyles = styled(FilterPluginStyle)`
+  overflow-x: auto;
 `;
 
-const ControlContainer = styled.div`
-  display: inline-block;
+const ControlContainer = styled.div<{
+  validateStatus?: 'error' | 'warning' | 'info';
+}>`
+  padding: 2px;
+  & > span,
+  & > span:hover {
+    border: 2px solid transparent;
+    display: inline-block;
+    border: ${({ theme, validateStatus }) =>
+      validateStatus && `2px solid ${theme.colors[validateStatus]?.base}`};
+  }
+  &:focus {
+    & > span {
+      border: 2px solid
+        ${({ theme, validateStatus }) =>
+          validateStatus
+            ? theme.colors[validateStatus]?.base
+            : theme.colors.primary.base};
+      outline: 0;
+      box-shadow: 0 0 0 2px
+        ${({ validateStatus }) =>
+          validateStatus
+            ? 'rgba(224, 67, 85, 12%)'
+            : 'rgba(32, 167, 201, 0.2)'};
+    }
+  }
 `;
 
 export default function TimeFilterPlugin(props: PluginFilterTimeProps) {
   const {
-    formData,
     setDataMask,
     setFocusedFilter,
     unsetFocusedFilter,
     width,
+    height,
     filterState,
+    formData: { inputRef },
   } = props;
-  const { defaultValue } = formData;
-
-  const [value, setValue] = useState<string>(defaultValue ?? DEFAULT_VALUE);
-
-  const handleTimeRangeChange = (timeRange: string): void => {
-    setValue(timeRange);
 
+  const handleTimeRangeChange = (timeRange?: string): void => {
+    const isSet = timeRange && timeRange !== NO_TIME_RANGE;
     setDataMask({
-      extraFormData: {
-        time_range: timeRange,
+      extraFormData: isSet
+        ? {
+            time_range: timeRange,
+          }
+        : {},
+      filterState: {
+        value: isSet ? timeRange : undefined,
       },
-      filterState: { value: timeRange },
     });
   };
 
   useEffect(() => {
-    handleTimeRangeChange(filterState.value ?? DEFAULT_VALUE);
+    handleTimeRangeChange(filterState.value);
   }, [filterState.value]);
 
-  useEffect(() => {
-    handleTimeRangeChange(defaultValue ?? DEFAULT_VALUE);
-  }, [defaultValue]);
-
-  return (
+  return props.formData?.inView ? (
     // @ts-ignore
-    <TimeFilterStyles width={width}>
+    <TimeFilterStyles width={width} height={height}>
       <ControlContainer
+        tabIndex={-1}
+        ref={inputRef}
+        validateStatus={filterState.validateStatus}
+        onFocus={setFocusedFilter}
+        onBlur={unsetFocusedFilter}
         onMouseEnter={setFocusedFilter}
         onMouseLeave={unsetFocusedFilter}
       >
         <DateFilterControl
-          value={value}
+          value={filterState.value || NO_TIME_RANGE}
           name="time_range"
           onChange={handleTimeRangeChange}
+          type={filterState.validateStatus}
         />
       </ControlContainer>
     </TimeFilterStyles>
-  );
+  ) : null;
 }
diff --git a/superset-frontend/src/filters/components/Time/controlPanel.ts b/superset-frontend/src/filters/components/Time/controlPanel.ts
index 1b5f12b9a78c..9fcbe067f878 100644
--- a/superset-frontend/src/filters/components/Time/controlPanel.ts
+++ b/superset-frontend/src/filters/components/Time/controlPanel.ts
@@ -17,10 +17,47 @@
  * under the License.
  */
 import { ControlPanelConfig } from '@superset-ui/chart-controls';
+import { t } from '@superset-ui/core';
+import { sharedControls } from '@superset-ui/chart-controls/lib';
 
 const config: ControlPanelConfig = {
   // For control input types, see: superset-frontend/src/explore/components/controls/index.js
-  controlPanelSections: [],
+  controlPanelSections: [
+    {
+      label: t('Query'),
+      expanded: true,
+      controlSetRows: [
+        [
+          {
+            name: 'groupby',
+            config: {
+              ...sharedControls.groupby,
+              label: 'Column',
+              required: true,
+            },
+          },
+        ],
+      ],
+    },
+    {
+      label: t('UI Configuration'),
+      expanded: true,
+      controlSetRows: [
+        [
+          {
+            name: 'enableEmptyFilter',
+            config: {
+              type: 'CheckboxControl',
+              label: t('Required'),
+              default: false,
+              renderTrigger: true,
+              description: t('User must select a value for this filter.'),
+            },
+          },
+        ],
+      ],
+    },
+  ],
 };
 
 export default config;
diff --git a/superset-frontend/src/filters/components/TimeColumn/TimeColumnFilterPlugin.tsx b/superset-frontend/src/filters/components/TimeColumn/TimeColumnFilterPlugin.tsx
index 08456baa85d3..0f616a6a709b 100644
--- a/superset-frontend/src/filters/components/TimeColumn/TimeColumnFilterPlugin.tsx
+++ b/superset-frontend/src/filters/components/TimeColumn/TimeColumnFilterPlugin.tsx
@@ -24,12 +24,11 @@ import {
   tn,
 } from '@superset-ui/core';
 import React, { useEffect, useState } from 'react';
-import { Select } from 'src/common/components';
-import { Styles, StyledSelect } from '../common';
+import { Select } from 'src/components';
+import { FormItemProps } from 'antd/lib/form';
+import { FilterPluginStyle, StyledFormItem, StatusMessage } from '../common';
 import { PluginFilterTimeColumnProps } from './types';
 
-const { Option } = Select;
-
 export default function PluginFilterTimeColumn(
   props: PluginFilterTimeColumnProps,
 ) {
@@ -63,16 +62,16 @@ export default function PluginFilterTimeColumn(
     });
   };
 
-  useEffect(() => {
-    handleChange(filterState.value ?? null);
-  }, [JSON.stringify(filterState.value)]);
-
   useEffect(() => {
     handleChange(defaultValue ?? null);
     // I think after Config Modal update some filter it re-creates default value for all other filters
     // so we can process it like this `JSON.stringify` or start to use `Immer`
   }, [JSON.stringify(defaultValue)]);
 
+  useEffect(() => {
+    handleChange(filterState.value ?? null);
+  }, [JSON.stringify(filterState.value)]);
+
   const timeColumns = (data || []).filter(
     row => row.dtype === GenericDataType.TEMPORAL,
   );
@@ -81,29 +80,44 @@ export default function PluginFilterTimeColumn(
     timeColumns.length === 0
       ? t('No time columns')
       : tn('%s option', '%s options', timeColumns.length, timeColumns.length);
+
+  const formItemData: FormItemProps = {};
+  if (filterState.validateMessage) {
+    formItemData.extra = (
+      <StatusMessage status={filterState.validateStatus}>
+        {filterState.validateMessage}
+      </StatusMessage>
+    );
+  }
+
+  const options = timeColumns.map(
+    (row: { column_name: string; verbose_name: string | null }) => {
+      const { column_name: columnName, verbose_name: verboseName } = row;
+      return {
+        label: verboseName ?? columnName,
+        value: columnName,
+      };
+    },
+  );
+
   return (
-    <Styles height={height} width={width}>
-      <StyledSelect
-        allowClear
-        value={value}
-        placeholder={placeholderText}
-        // @ts-ignore
-        onChange={handleChange}
-        onBlur={unsetFocusedFilter}
-        onFocus={setFocusedFilter}
-        ref={inputRef}
+    <FilterPluginStyle height={height} width={width}>
+      <StyledFormItem
+        validateStatus={filterState.validateStatus}
+        {...formItemData}
       >
-        {timeColumns.map(
-          (row: { column_name: string; verbose_name: string | null }) => {
-            const { column_name: columnName, verbose_name: verboseName } = row;
-            return (
-              <Option key={columnName} value={columnName}>
-                {verboseName ?? columnName}
-              </Option>
-            );
-          },
-        )}
-      </StyledSelect>
-    </Styles>
+        <Select
+          allowClear
+          value={value}
+          placeholder={placeholderText}
+          // @ts-ignore
+          onChange={handleChange}
+          onMouseEnter={setFocusedFilter}
+          onMouseLeave={unsetFocusedFilter}
+          ref={inputRef}
+          options={options}
+        />
+      </StyledFormItem>
+    </FilterPluginStyle>
   );
 }
diff --git a/superset-frontend/src/filters/components/TimeColumn/controlPanel.ts b/superset-frontend/src/filters/components/TimeColumn/controlPanel.ts
index 5b7bc3dc3bb3..448c0cea69ac 100644
--- a/superset-frontend/src/filters/components/TimeColumn/controlPanel.ts
+++ b/superset-frontend/src/filters/components/TimeColumn/controlPanel.ts
@@ -17,9 +17,29 @@
  * under the License.
  */
 import { ControlPanelConfig } from '@superset-ui/chart-controls';
+import { t } from '@superset-ui/core';
 
 const config: ControlPanelConfig = {
-  controlPanelSections: [],
+  controlPanelSections: [
+    {
+      label: t('UI Configuration'),
+      expanded: true,
+      controlSetRows: [
+        [
+          {
+            name: 'enableEmptyFilter',
+            config: {
+              type: 'CheckboxControl',
+              label: t('Required'),
+              default: false,
+              renderTrigger: true,
+              description: t('User must select a value for this filter.'),
+            },
+          },
+        ],
+      ],
+    },
+  ],
 };
 
 export default config;
diff --git a/superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.tsx b/superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.tsx
index aabc86786fda..4bac5c47f71b 100644
--- a/superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.tsx
+++ b/superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.tsx
@@ -23,13 +23,12 @@ import {
   TimeGranularity,
   tn,
 } from '@superset-ui/core';
-import React, { useEffect, useState } from 'react';
-import { Select } from 'src/common/components';
-import { Styles, StyledSelect } from '../common';
+import React, { useEffect, useMemo, useState } from 'react';
+import { Select } from 'src/components';
+import { FormItemProps } from 'antd/lib/form';
+import { FilterPluginStyle, StyledFormItem, StatusMessage } from '../common';
 import { PluginFilterTimeGrainProps } from './types';
 
-const { Option } = Select;
-
 export default function PluginFilterTimegrain(
   props: PluginFilterTimeGrainProps,
 ) {
@@ -46,10 +45,22 @@ export default function PluginFilterTimegrain(
   const { defaultValue, inputRef } = formData;
 
   const [value, setValue] = useState<string[]>(defaultValue ?? []);
+  const durationMap = useMemo(
+    () =>
+      data.reduce(
+        (agg, { duration, name }: { duration: string; name: string }) => ({
+          ...agg,
+          [duration]: name,
+        }),
+        {} as { [key in string]: string },
+      ),
+    [JSON.stringify(data)],
+  );
 
   const handleChange = (values: string[] | string | undefined | null) => {
     const resultValue: string[] = ensureIsArray<string>(values);
     const [timeGrain] = resultValue;
+    const label = timeGrain ? durationMap[timeGrain] : undefined;
 
     const extraFormData: ExtraFormData = {};
     if (timeGrain) {
@@ -59,46 +70,64 @@ export default function PluginFilterTimegrain(
     setDataMask({
       extraFormData,
       filterState: {
+        label,
         value: resultValue.length ? resultValue : null,
       },
     });
   };
 
-  useEffect(() => {
-    handleChange(filterState.value ?? []);
-  }, [JSON.stringify(filterState.value)]);
-
   useEffect(() => {
     handleChange(defaultValue ?? []);
     // I think after Config Modal update some filter it re-creates default value for all other filters
     // so we can process it like this `JSON.stringify` or start to use `Immer`
   }, [JSON.stringify(defaultValue)]);
 
+  useEffect(() => {
+    handleChange(filterState.value ?? []);
+  }, [JSON.stringify(filterState.value)]);
+
   const placeholderText =
     (data || []).length === 0
       ? t('No data')
       : tn('%s option', '%s options', data.length, data.length);
+
+  const formItemData: FormItemProps = {};
+  if (filterState.validateMessage) {
+    formItemData.extra = (
+      <StatusMessage status={filterState.validateStatus}>
+        {filterState.validateMessage}
+      </StatusMessage>
+    );
+  }
+
+  const options = (data || []).map(
+    (row: { name: string; duration: string }) => {
+      const { name, duration } = row;
+      return {
+        label: name,
+        value: duration,
+      };
+    },
+  );
+
   return (
-    <Styles height={height} width={width}>
-      <StyledSelect
-        allowClear
-        value={value}
-        placeholder={placeholderText}
-        // @ts-ignore
-        onChange={handleChange}
-        onBlur={unsetFocusedFilter}
-        onFocus={setFocusedFilter}
-        ref={inputRef}
+    <FilterPluginStyle height={height} width={width}>
+      <StyledFormItem
+        validateStatus={filterState.validateStatus}
+        {...formItemData}
       >
-        {(data || []).map((row: { name: string; duration: string }) => {
-          const { name, duration } = row;
-          return (
-            <Option key={duration} value={duration}>
-              {name}
-            </Option>
-          );
-        })}
-      </StyledSelect>
-    </Styles>
+        <Select
+          allowClear
+          value={value}
+          placeholder={placeholderText}
+          // @ts-ignore
+          onChange={handleChange}
+          onMouseEnter={setFocusedFilter}
+          onMouseLeave={unsetFocusedFilter}
+          ref={inputRef}
+          options={options}
+        />
+      </StyledFormItem>
+    </FilterPluginStyle>
   );
 }
diff --git a/superset-frontend/src/filters/components/TimeGrain/controlPanel.ts b/superset-frontend/src/filters/components/TimeGrain/controlPanel.ts
index 5b7bc3dc3bb3..448c0cea69ac 100644
--- a/superset-frontend/src/filters/components/TimeGrain/controlPanel.ts
+++ b/superset-frontend/src/filters/components/TimeGrain/controlPanel.ts
@@ -17,9 +17,29 @@
  * under the License.
  */
 import { ControlPanelConfig } from '@superset-ui/chart-controls';
+import { t } from '@superset-ui/core';
 
 const config: ControlPanelConfig = {
-  controlPanelSections: [],
+  controlPanelSections: [
+    {
+      label: t('UI Configuration'),
+      expanded: true,
+      controlSetRows: [
+        [
+          {
+            name: 'enableEmptyFilter',
+            config: {
+              type: 'CheckboxControl',
+              label: t('Required'),
+              default: false,
+              renderTrigger: true,
+              description: t('User must select a value for this filter.'),
+            },
+          },
+        ],
+      ],
+    },
+  ],
 };
 
 export default config;
diff --git a/superset-frontend/src/filters/components/common.ts b/superset-frontend/src/filters/components/common.ts
index 1a57f2ae341b..af1fe9c79176 100644
--- a/superset-frontend/src/filters/components/common.ts
+++ b/superset-frontend/src/filters/components/common.ts
@@ -17,14 +17,22 @@
  * under the License.
  */
 import { styled } from '@superset-ui/core';
-import { Select } from 'src/common/components';
 import { PluginFilterStylesProps } from './types';
+import FormItem from '../../components/Form/FormItem';
 
-export const Styles = styled.div<PluginFilterStylesProps>`
-  height: ${({ height }) => height}px;
+export const FilterPluginStyle = styled.div<PluginFilterStylesProps>`
+  min-height: ${({ height }) => height}px;
   width: ${({ width }) => width}px;
 `;
 
-export const StyledSelect = styled(Select)`
-  width: 100%;
+export const StyledFormItem = styled(FormItem)`
+  &.ant-row.ant-form-item {
+    margin: 0;
+  }
+`;
+
+export const StatusMessage = styled.div<{
+  status?: 'error' | 'warning' | 'info';
+}>`
+  color: ${({ theme, status = 'error' }) => theme.colors[status]?.base};
 `;
diff --git a/superset-frontend/src/messageToasts/components/Toast.tsx b/superset-frontend/src/messageToasts/components/Toast.tsx
index 9018ed6ae2c6..5f7416aa4dd1 100644
--- a/superset-frontend/src/messageToasts/components/Toast.tsx
+++ b/superset-frontend/src/messageToasts/components/Toast.tsx
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { styled } from '@superset-ui/core';
+import { styled, css, SupersetTheme } from '@superset-ui/core';
 import cx from 'classnames';
 import Interweave from 'interweave';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
-import Icon, { IconName } from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import { ToastType } from 'src/messageToasts/constants';
 import { ToastMeta } from '../types';
 
@@ -34,8 +34,9 @@ const ToastContainer = styled.div`
   }
 `;
 
-const StyledIcon = styled(Icon)`
-  min-width: ${({ theme }) => theme.gridUnit * 5}px;
+const StyledIcon = (theme: SupersetTheme) => css`
+  min-width: ${theme.gridUnit * 5}px;
+  color: ${theme.colors.grayscale.base};
 `;
 
 interface ToastPresenterProps {
@@ -76,16 +77,17 @@ export default function Toast({ toast, onCloseToast }: ToastPresenterProps) {
     };
   }, [handleClosePress, toast.duration]);
 
-  let iconName: IconName = 'circle-check-solid';
   let className = 'toast--success';
+  let icon = <Icons.CircleCheckSolid css={theme => StyledIcon(theme)} />;
+
   if (toast.toastType === ToastType.WARNING) {
-    iconName = 'warning-solid';
+    icon = <Icons.WarningSolid css={StyledIcon} />;
     className = 'toast--warning';
   } else if (toast.toastType === ToastType.DANGER) {
-    iconName = 'error-solid';
+    icon = <Icons.ErrorSolid css={StyledIcon} />;
     className = 'toast--danger';
   } else if (toast.toastType === ToastType.INFO) {
-    iconName = 'info-solid';
+    icon = <Icons.InfoSolid css={StyledIcon} />;
     className = 'toast--info';
   }
 
@@ -95,7 +97,7 @@ export default function Toast({ toast, onCloseToast }: ToastPresenterProps) {
       data-test="toast-container"
       role="alert"
     >
-      <StyledIcon name={iconName} />
+      {icon}
       <Interweave content={toast.text} />
       <i
         className="fa fa-close pull-right pointer"
diff --git a/superset-frontend/src/reports/actions/reports.js b/superset-frontend/src/reports/actions/reports.js
new file mode 100644
index 000000000000..7b3bc814ca0e
--- /dev/null
+++ b/superset-frontend/src/reports/actions/reports.js
@@ -0,0 +1,176 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/* eslint camelcase: 0 */
+import { t, SupersetClient } from '@superset-ui/core';
+import rison from 'rison';
+import { getClientErrorObject } from 'src/utils/getClientErrorObject';
+import { addDangerToast, addSuccessToast } from '../../messageToasts/actions';
+
+export const SET_REPORT = 'SET_REPORT';
+export function setReport(report) {
+  return { type: SET_REPORT, report };
+}
+
+export function fetchUISpecificReport(
+  userId,
+  filter_field,
+  creation_method,
+  dashboardId,
+) {
+  const queryParams = rison.encode({
+    filters: [
+      {
+        col: filter_field,
+        opr: 'eq',
+        value: dashboardId,
+      },
+      {
+        col: 'creation_method',
+        opr: 'eq',
+        value: creation_method,
+      },
+      {
+        col: 'created_by',
+        opr: 'rel_o_m',
+        value: userId,
+      },
+    ],
+  });
+  return function fetchUISpecificReportThunk(dispatch) {
+    return SupersetClient.get({
+      endpoint: `/api/v1/report/?q=${queryParams}`,
+    })
+      .then(({ json }) => {
+        dispatch(setReport(json));
+      })
+      .catch(() =>
+        dispatch(
+          addDangerToast(
+            t(
+              'There was an issue fetching reports attached to this dashboard.',
+            ),
+          ),
+        ),
+      );
+  };
+}
+
+const structureFetchAction = (dispatch, getState) => {
+  const state = getState();
+  const { user, dashboardInfo, charts, explore } = state;
+  if (dashboardInfo) {
+    dispatch(
+      fetchUISpecificReport(
+        user.userId,
+        'dashboard_id',
+        'dashboards',
+        dashboardInfo.id,
+      ),
+    );
+  } else {
+    const [chartArr] = Object.keys(charts);
+    dispatch(
+      fetchUISpecificReport(
+        explore.user.userId,
+        'chart_id',
+        'charts',
+        charts[chartArr].id,
+      ),
+    );
+  }
+};
+
+export const ADD_REPORT = 'ADD_REPORT';
+
+export const addReport = report => dispatch =>
+  SupersetClient.post({
+    endpoint: `/api/v1/report/`,
+    jsonPayload: report,
+  })
+    .then(({ json }) => {
+      dispatch({ type: ADD_REPORT, json });
+      dispatch(addSuccessToast(t('The report has been created')));
+    })
+    .catch(async e => {
+      const parsedError = await getClientErrorObject(e);
+      const errorMessage = parsedError.message;
+      const errorArr = Object.keys(errorMessage);
+      const error = errorMessage[errorArr[0]];
+      dispatch(
+        addDangerToast(
+          t('An error occurred while editing this report: %s', error),
+        ),
+      );
+    });
+
+export const EDIT_REPORT = 'EDIT_REPORT';
+
+export function editReport(id, report) {
+  return function (dispatch) {
+    SupersetClient.put({
+      endpoint: `/api/v1/report/${id}`,
+      jsonPayload: report,
+    })
+      .then(({ json }) => {
+        dispatch({ type: EDIT_REPORT, json });
+      })
+      .catch(() =>
+        dispatch(
+          addDangerToast(t('An error occurred while editing this report.')),
+        ),
+      );
+  };
+}
+
+export function toggleActive(report, isActive) {
+  return function toggleActiveThunk(dispatch) {
+    return SupersetClient.put({
+      endpoint: encodeURI(`/api/v1/report/${report.id}`),
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        active: isActive,
+      }),
+    })
+      .catch(() => {
+        dispatch(
+          addDangerToast(
+            t('We were unable to active or deactivate this report.'),
+          ),
+        );
+      })
+      .finally(() => {
+        dispatch(structureFetchAction);
+      });
+  };
+}
+
+export function deleteActiveReport(report) {
+  return function deleteActiveReportThunk(dispatch) {
+    return SupersetClient.delete({
+      endpoint: encodeURI(`/api/v1/report/${report.id}`),
+    })
+      .catch(() => {
+        dispatch(addDangerToast(t('Your report could not be deleted')));
+      })
+      .finally(() => {
+        dispatch(structureFetchAction);
+        dispatch(addSuccessToast(t('Deleted: %s', report.name)));
+      });
+  };
+}
diff --git a/superset-frontend/src/dashboard/reducers/datasources.js b/superset-frontend/src/reports/reducers/reports.js
similarity index 59%
rename from superset-frontend/src/dashboard/reducers/datasources.js
rename to superset-frontend/src/reports/reducers/reports.js
index 616c3c134ffd..8b582d0d0cc1 100644
--- a/superset-frontend/src/dashboard/reducers/datasources.js
+++ b/superset-frontend/src/reports/reducers/reports.js
@@ -16,30 +16,39 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SET_DATASOURCE } from '../actions/datasources';
-import { HYDRATE_DASHBOARD } from '../actions/hydrate';
+/* eslint-disable camelcase */
+import { SET_REPORT, ADD_REPORT, EDIT_REPORT } from '../actions/reports';
 
-export default function datasourceReducer(datasources = {}, action) {
+export default function reportsReducer(state = {}, action) {
   const actionHandlers = {
-    [HYDRATE_DASHBOARD]() {
-      return action.data.datasources;
+    [SET_REPORT]() {
+      return {
+        ...action.report.result.reduce(
+          (obj, report) => ({ ...obj, [report.id]: report }),
+          {},
+        ),
+      };
     },
-    [SET_DATASOURCE]() {
-      return action.datasource;
+    [ADD_REPORT]() {
+      const report = action.json.result;
+      report.id = action.json.id;
+      return {
+        ...state,
+        [action.json.id]: report,
+      };
+    },
+    [EDIT_REPORT]() {
+      const report = action.json.result;
+      report.id = action.json.id;
+      return {
+        ...state,
+        [action.json.id]: report,
+      };
     },
   };
 
   if (action.type in actionHandlers) {
-    if (action.key) {
-      return {
-        ...datasources,
-        [action.key]: actionHandlers[action.type](
-          datasources[action.key],
-          action,
-        ),
-      };
-    }
     return actionHandlers[action.type]();
   }
-  return datasources;
+  return state;
 }
diff --git a/superset-frontend/src/setup/setupColors.ts b/superset-frontend/src/setup/setupColors.ts
index 77b1b69454cb..4068dd0de0d0 100644
--- a/superset-frontend/src/setup/setupColors.ts
+++ b/superset-frontend/src/setup/setupColors.ts
@@ -58,7 +58,10 @@ export default function setupColors(
 
   if (extraSequentialColorSchemes?.length > 0) {
     extraSequentialColorSchemes.forEach(scheme => {
-      categoricalSchemeRegistry.registerValue(scheme.id, scheme);
+      sequentialSchemeRegistry.registerValue(
+        scheme.id,
+        new SequentialScheme(scheme),
+      );
     });
   }
 
diff --git a/superset-frontend/src/setup/setupErrorMessages.ts b/superset-frontend/src/setup/setupErrorMessages.ts
index ed244614d066..a0626c171ce0 100644
--- a/superset-frontend/src/setup/setupErrorMessages.ts
+++ b/superset-frontend/src/setup/setupErrorMessages.ts
@@ -35,10 +35,18 @@ export default function setupErrorMessages() {
     ErrorTypeEnum.BACKEND_TIMEOUT_ERROR,
     TimeoutErrorMessage,
   );
+  errorMessageComponentRegistry.registerValue(
+    ErrorTypeEnum.DATABASE_NOT_FOUND_ERROR,
+    DatabaseErrorMessage,
+  );
   errorMessageComponentRegistry.registerValue(
     ErrorTypeEnum.GENERIC_DB_ENGINE_ERROR,
     DatabaseErrorMessage,
   );
+  errorMessageComponentRegistry.registerValue(
+    ErrorTypeEnum.GENERIC_BACKEND_ERROR,
+    DatabaseErrorMessage,
+  );
   errorMessageComponentRegistry.registerValue(
     ErrorTypeEnum.COLUMN_DOES_NOT_EXIST_ERROR,
     DatabaseErrorMessage,
@@ -51,10 +59,46 @@ export default function setupErrorMessages() {
     ErrorTypeEnum.MISSING_TEMPLATE_PARAMS_ERROR,
     ParameterErrorMessage,
   );
+  errorMessageComponentRegistry.registerValue(
+    ErrorTypeEnum.INVALID_TEMPLATE_PARAMS_ERROR,
+    ParameterErrorMessage,
+  );
+  errorMessageComponentRegistry.registerValue(
+    ErrorTypeEnum.RESULTS_BACKEND_NOT_CONFIGURED_ERROR,
+    DatabaseErrorMessage,
+  );
+  errorMessageComponentRegistry.registerValue(
+    ErrorTypeEnum.DML_NOT_ALLOWED_ERROR,
+    DatabaseErrorMessage,
+  );
+  errorMessageComponentRegistry.registerValue(
+    ErrorTypeEnum.INVALID_CTAS_QUERY_ERROR,
+    DatabaseErrorMessage,
+  );
+  errorMessageComponentRegistry.registerValue(
+    ErrorTypeEnum.INVALID_CVAS_QUERY_ERROR,
+    DatabaseErrorMessage,
+  );
+  errorMessageComponentRegistry.registerValue(
+    ErrorTypeEnum.QUERY_SECURITY_ACCESS_ERROR,
+    DatabaseErrorMessage,
+  );
   errorMessageComponentRegistry.registerValue(
     ErrorTypeEnum.CONNECTION_INVALID_HOSTNAME_ERROR,
     DatabaseErrorMessage,
   );
+  errorMessageComponentRegistry.registerValue(
+    ErrorTypeEnum.RESULTS_BACKEND_ERROR,
+    DatabaseErrorMessage,
+  );
+  errorMessageComponentRegistry.registerValue(
+    ErrorTypeEnum.ASYNC_WORKERS_ERROR,
+    DatabaseErrorMessage,
+  );
+  errorMessageComponentRegistry.registerValue(
+    ErrorTypeEnum.SQLLAB_TIMEOUT_ERROR,
+    DatabaseErrorMessage,
+  );
   errorMessageComponentRegistry.registerValue(
     ErrorTypeEnum.CONNECTION_PORT_CLOSED_ERROR,
     DatabaseErrorMessage,
@@ -83,6 +127,14 @@ export default function setupErrorMessages() {
     ErrorTypeEnum.SCHEMA_DOES_NOT_EXIST_ERROR,
     DatabaseErrorMessage,
   );
+  errorMessageComponentRegistry.registerValue(
+    ErrorTypeEnum.OBJECT_DOES_NOT_EXIST_ERROR,
+    DatabaseErrorMessage,
+  );
+  errorMessageComponentRegistry.registerValue(
+    ErrorTypeEnum.SYNTAX_ERROR,
+    DatabaseErrorMessage,
+  );
   errorMessageComponentRegistry.registerValue(
     ErrorTypeEnum.CONNECTION_DATABASE_PERMISSIONS_ERROR,
     DatabaseErrorMessage,
diff --git a/superset-frontend/src/types/Chart.ts b/superset-frontend/src/types/Chart.ts
index 02b9025c8387..4c670482b43b 100644
--- a/superset-frontend/src/types/Chart.ts
+++ b/superset-frontend/src/types/Chart.ts
@@ -47,6 +47,7 @@ export type Slice = {
   description: string | null;
   cache_timeout: number | null;
   form_data?: QueryFormData;
+  query_context?: object;
 };
 
 export default Chart;
diff --git a/superset-frontend/src/types/Dashboard.ts b/superset-frontend/src/types/Dashboard.ts
index 14de6d110c40..96a92d567f12 100644
--- a/superset-frontend/src/types/Dashboard.ts
+++ b/superset-frontend/src/types/Dashboard.ts
@@ -19,7 +19,7 @@
 import Owner from './Owner';
 import Role from './Role';
 
-type Dashboard = {
+export interface Dashboard {
   id: number;
   slug?: string | null;
   url: string;
@@ -35,6 +35,6 @@ type Dashboard = {
   charts: string[]; // just chart names, unfortunately...
   owners: Owner[];
   roles: Role[];
-};
+}
 
 export default Dashboard;
diff --git a/superset-frontend/src/types/react-lines-ellipsis.d.ts b/superset-frontend/src/types/react-lines-ellipsis.d.ts
new file mode 100644
index 000000000000..a0772baccfe7
--- /dev/null
+++ b/superset-frontend/src/types/react-lines-ellipsis.d.ts
@@ -0,0 +1,47 @@
+/**
+ * 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.
+ */
+
+declare module 'react-lines-ellipsis' {
+  interface ReactLinesEllipsisProps {
+    basedOn?: 'letters' | 'words';
+    className?: string;
+    component?: string;
+    ellipsis?: string;
+    isClamped?: () => boolean;
+    maxLine?: number | string;
+    onReflow?: ({ clamped, text }: { clamped: boolean; text: string }) => any;
+    style?: React.CSSProperties;
+    text?: string;
+    trimRight?: boolean;
+    winWidth?: number;
+  }
+
+  // eslint-disable-next-line react/prefer-stateless-function
+  class LinesEllipsis extends React.Component<ReactLinesEllipsisProps> {
+    static defaultProps?: ReactLinesEllipsisProps;
+  }
+
+  export default LinesEllipsis;
+}
+
+declare module 'react-lines-ellipsis/lib/responsiveHOC' {
+  export default function responsiveHOC(): <P extends object>(
+    WrappedComponent: React.ComponentType<P>,
+  ) => React.ComponentClass<P>;
+}
diff --git a/superset-frontend/src/utils/downloadAsImage.ts b/superset-frontend/src/utils/downloadAsImage.ts
index ad23d366e5bf..8ec472f4081f 100644
--- a/superset-frontend/src/utils/downloadAsImage.ts
+++ b/superset-frontend/src/utils/downloadAsImage.ts
@@ -64,15 +64,23 @@ export default function downloadAsImage(
       );
     }
 
+    // Mapbox controls are loaded from different origin, causing CORS error
+    // See https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/toDataURL#exceptions
+    const filter = (node: Element) => {
+      if (typeof node.className === 'string') {
+        return (
+          node.className !== 'mapboxgl-control-container' &&
+          !node.className.includes('ant-dropdown')
+        );
+      }
+      return true;
+    };
+
     return domToImage
       .toJpeg(elementToPrint, {
         quality: 0.95,
         bgcolor: GRAY_BACKGROUND_COLOR,
-        // Mapbox controls are loaded from different origin, causing CORS error
-        // See https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/toDataURL#exceptions
-        filter: (node: Element) =>
-          node.className !== 'mapboxgl-control-container',
-        ...domToImageOptions,
+        filter,
       })
       .then(dataUrl => {
         const link = document.createElement('a');
diff --git a/superset-frontend/src/utils/export.ts b/superset-frontend/src/utils/export.ts
new file mode 100644
index 000000000000..4f3ea75d7675
--- /dev/null
+++ b/superset-frontend/src/utils/export.ts
@@ -0,0 +1,48 @@
+/**
+ * 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 parseCookie from 'src/utils/parseCookie';
+import rison from 'rison';
+import shortid from 'shortid';
+
+export default function handleResourceExport(
+  resource: string,
+  ids: number[],
+  done: () => void,
+  interval = 200,
+): void {
+  const token = shortid.generate();
+  const url = `/api/v1/${resource}/export/?q=${rison.encode(
+    ids,
+  )}&token=${token}`;
+
+  // create new iframe for export
+  const iframe = document.createElement('iframe');
+  iframe.style.display = 'none';
+  iframe.src = url;
+  document.body.appendChild(iframe);
+
+  const timer = window.setInterval(() => {
+    const cookie: { [cookieId: string]: string } = parseCookie();
+    if (cookie[token] === 'done') {
+      window.clearInterval(timer);
+      document.body.removeChild(iframe);
+      done();
+    }
+  }, interval);
+}
diff --git a/superset-frontend/src/utils/urlUtils.ts b/superset-frontend/src/utils/urlUtils.ts
index ebb3a1df8343..f0d9fa8e6ba6 100644
--- a/superset-frontend/src/utils/urlUtils.ts
+++ b/superset-frontend/src/utils/urlUtils.ts
@@ -17,15 +17,17 @@
  * under the License.
  */
 import { SupersetClient } from '@superset-ui/core';
+import rison from 'rison';
 import { getClientErrorObject } from './getClientErrorObject';
 import { URL_PARAMS } from '../constants';
 
-export type UrlParamType = 'string' | 'number' | 'boolean' | 'object';
+export type UrlParamType = 'string' | 'number' | 'boolean' | 'object' | 'rison';
 export type UrlParam = typeof URL_PARAMS[keyof typeof URL_PARAMS];
 export function getUrlParam(param: UrlParam & { type: 'string' }): string;
 export function getUrlParam(param: UrlParam & { type: 'number' }): number;
 export function getUrlParam(param: UrlParam & { type: 'boolean' }): boolean;
 export function getUrlParam(param: UrlParam & { type: 'object' }): object;
+export function getUrlParam(param: UrlParam & { type: 'rison' }): object;
 export function getUrlParam({ name, type }: UrlParam): unknown {
   const urlParam = new URLSearchParams(window.location.search).get(name);
   switch (type) {
@@ -53,6 +55,15 @@ export function getUrlParam({ name, type }: UrlParam): unknown {
         return null;
       }
       return urlParam !== 'false' && urlParam !== '0';
+    case 'rison':
+      if (!urlParam) {
+        return null;
+      }
+      try {
+        return rison.decode(urlParam);
+      } catch {
+        return null;
+      }
     default:
       return urlParam;
   }
diff --git a/superset-frontend/src/views/App.tsx b/superset-frontend/src/views/App.tsx
index e36dd8039833..445a87527f8c 100644
--- a/superset-frontend/src/views/App.tsx
+++ b/superset-frontend/src/views/App.tsx
@@ -32,13 +32,11 @@ import Menu from 'src/components/Menu/Menu';
 import FlashProvider from 'src/components/FlashProvider';
 import { theme } from 'src/preamble';
 import ToastPresenter from 'src/messageToasts/containers/ToastPresenter';
-import setupPlugins from 'src/setup/setupPlugins';
 import setupApp from 'src/setup/setupApp';
 import { routes, isFrontendRoute } from 'src/views/routes';
 import { store } from './store';
 
 setupApp();
-setupPlugins();
 
 const container = document.getElementById('app');
 const bootstrap = JSON.parse(container?.getAttribute('data-bootstrap') ?? '{}');
diff --git a/superset-frontend/src/views/CRUD/alert/AlertReportModal.test.jsx b/superset-frontend/src/views/CRUD/alert/AlertReportModal.test.jsx
index 25cdd290506b..8575a526a375 100644
--- a/superset-frontend/src/views/CRUD/alert/AlertReportModal.test.jsx
+++ b/superset-frontend/src/views/CRUD/alert/AlertReportModal.test.jsx
@@ -36,7 +36,7 @@ const mockData = {
   id: 1,
   name: 'test report',
   description: 'test report description',
-  chart: { id: 1, slice_name: 'test chart' },
+  chart: { id: 1, slice_name: 'test chart', viz_type: 'table' },
   database: { id: 1, database_name: 'test database' },
   sql: 'SELECT NaN',
 };
@@ -76,7 +76,7 @@ fetchMock.get(dashboardEndpoint, {
 });
 
 fetchMock.get(chartEndpoint, {
-  result: [],
+  result: [{ text: 'table chart', value: 1 }],
 });
 
 async function mountAndWait(props = mockedProps) {
@@ -226,12 +226,12 @@ describe('AlertReportModal', () => {
     expect(input.props().value).toEqual('SELECT NaN');
   });
 
-  it('renders one select element when in report mode', () => {
+  it('renders two select element when in report mode', () => {
     expect(wrapper.find(Select)).toExist();
-    expect(wrapper.find(Select)).toHaveLength(1);
+    expect(wrapper.find(Select)).toHaveLength(2);
   });
 
-  it('renders two select elements when in alert mode', async () => {
+  it('renders three select elements when in alert mode', async () => {
     const props = {
       ...mockedProps,
       isReport: false,
@@ -240,7 +240,7 @@ describe('AlertReportModal', () => {
     const addWrapper = await mountAndWait(props);
 
     expect(addWrapper.find(Select)).toExist();
-    expect(addWrapper.find(Select)).toHaveLength(2);
+    expect(addWrapper.find(Select)).toHaveLength(3);
   });
 
   it('renders value input element when in alert mode', async () => {
@@ -260,6 +260,22 @@ describe('AlertReportModal', () => {
     expect(wrapper.find(Radio)).toHaveLength(2);
   });
 
+  it('renders text option for text-based charts', async () => {
+    const props = {
+      ...mockedProps,
+      alert: mockData,
+    };
+    const textWrapper = await mountAndWait(props);
+
+    const chartOption = textWrapper.find('input[value="chart"]');
+    act(() => {
+      chartOption.props().onChange({ target: { value: 'chart' } });
+    });
+    await waitForComponentToPaint(textWrapper);
+
+    expect(textWrapper.find('input[value="TEXT"]')).toExist();
+  });
+
   it('renders input element for working timeout', () => {
     expect(wrapper.find('input[name="working_timeout"]')).toExist();
   });
diff --git a/superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx b/superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx
index 9ab653da5c04..c39783ebbeaa 100644
--- a/superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx
+++ b/superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx
@@ -17,13 +17,20 @@
  * under the License.
  */
 import React, { FunctionComponent, useState, useEffect } from 'react';
-import { styled, t, SupersetClient } from '@superset-ui/core';
+import {
+  styled,
+  t,
+  SupersetClient,
+  css,
+  SupersetTheme,
+} from '@superset-ui/core';
 import rison from 'rison';
 import { useSingleViewResource } from 'src/views/CRUD/hooks';
 
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import { Switch } from 'src/components/Switch';
 import Modal from 'src/components/Modal';
+import TimezoneSelector from 'src/components/TimezoneSelector';
 import { Radio } from 'src/components/Radio';
 import { AsyncSelect, NativeGraySelect as Select } from 'src/components/Select';
 import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags';
@@ -45,6 +52,12 @@ import {
 
 const SELECT_PAGE_SIZE = 2000; // temporary fix for paginated query
 const TIMEOUT_MIN = 1;
+const TEXT_BASED_VISUALIZATION_TYPES = [
+  'pivot_table',
+  'pivot_table_v2',
+  'table',
+  'paired_ttest',
+];
 
 type SelectValue = {
   value: string;
@@ -117,6 +130,7 @@ const DEFAULT_WORKING_TIMEOUT = 3600;
 const DEFAULT_CRON_VALUE = '0 * * * *'; // every hour
 const DEFAULT_ALERT = {
   active: true,
+  creation_method: 'alerts_reports',
   crontab: DEFAULT_CRON_VALUE,
   log_retention: DEFAULT_RETENTION,
   working_timeout: DEFAULT_WORKING_TIMEOUT,
@@ -135,8 +149,9 @@ const StyledModal = styled(Modal)`
   }
 `;
 
-const StyledIcon = styled(Icon)`
-  margin: auto ${({ theme }) => theme.gridUnit * 2}px auto 0;
+const StyledIcon = (theme: SupersetTheme) => css`
+  margin: auto ${theme.gridUnit * 2}px auto 0;
+  color: ${theme.colors.grayscale.base};
 `;
 
 const StyledSectionContainer = styled.div`
@@ -344,6 +359,10 @@ const StyledNotificationAddButton = styled.div`
   }
 `;
 
+const timezoneHeaderStyle = (theme: SupersetTheme) => css`
+  margin: ${theme.gridUnit * 3}px 0;
+`;
+
 type NotificationAddStatus = 'active' | 'disabled' | 'hidden';
 
 interface NotificationMethodAddProps {
@@ -408,6 +427,9 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
   const [dashboardOptions, setDashboardOptions] = useState<MetaObject[]>([]);
   const [chartOptions, setChartOptions] = useState<MetaObject[]>([]);
 
+  // Chart metadata
+  const [chartVizType, setChartVizType] = useState<string>('');
+
   const isEditMode = alert !== null;
   const formatOptionEnabled =
     contentType === 'chart' &&
@@ -710,6 +732,11 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
     return result;
   };
 
+  const getChartVisualizationType = (chart: SelectValue) =>
+    SupersetClient.get({
+      endpoint: `/api/v1/chart/${chart.value}`,
+    }).then(response => setChartVizType(response.json.result.viz_type));
+
   // Updating alert/report state
   const updateAlertState = (name: string, value: any) => {
     setCurrentAlert(currentAlertData => ({
@@ -762,6 +789,7 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
   };
 
   const onChartChange = (chart: SelectValue) => {
+    getChartVisualizationType(chart);
     updateAlertState('chart', chart || undefined);
     updateAlertState('dashboard', null);
   };
@@ -798,6 +826,10 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
     updateAlertState('log_retention', retention);
   };
 
+  const onTimezoneChange = (timezone: string) => {
+    updateAlertState('timezone', timezone);
+  };
+
   const onContentTypeChange = (event: any) => {
     const { target } = event;
 
@@ -860,10 +892,7 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
   useEffect(() => {
     if (
       isEditMode &&
-      (!currentAlert ||
-        !currentAlert.id ||
-        (alert && alert.id !== currentAlert.id) ||
-        (isHidden && show))
+      (!currentAlert?.id || alert?.id !== currentAlert.id || (isHidden && show))
     ) {
       if (alert && alert.id !== null && !loading && !fetchError) {
         const id = alert.id || 0;
@@ -912,6 +941,10 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
 
       setConditionNotNull(resource.validator_type === 'not null');
 
+      if (resource.chart) {
+        setChartVizType((resource.chart as ChartObject).viz_type);
+      }
+
       setCurrentAlert({
         ...resource,
         chart: resource.chart
@@ -998,9 +1031,9 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
       title={
         <h4 data-test="alert-report-modal-title">
           {isEditMode ? (
-            <StyledIcon name="edit-alt" />
+            <Icons.EditAlt css={StyledIcon} />
           ) : (
-            <StyledIcon name="plus-large" />
+            <Icons.PlusLarge css={StyledIcon} />
           )}
           {isEditMode
             ? t(`Edit ${isReport ? 'Report' : 'Alert'}`)
@@ -1077,7 +1110,7 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
                   <AsyncSelect
                     name="source"
                     value={
-                      currentAlert && currentAlert.database
+                      currentAlert?.database
                         ? {
                             value: currentAlert.database.value,
                             label: currentAlert.database.label,
@@ -1168,11 +1201,19 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
               <span className="required">*</span>
             </StyledSectionTitle>
             <AlertReportCronScheduler
-              value={
-                (currentAlert && currentAlert.crontab) || DEFAULT_CRON_VALUE
-              }
+              value={currentAlert?.crontab || DEFAULT_CRON_VALUE}
               onChange={newVal => updateAlertState('crontab', newVal)}
             />
+            <div className="control-label">{t('Timezone')}</div>
+            <div
+              className="input-container"
+              css={(theme: SupersetTheme) => timezoneHeaderStyle(theme)}
+            >
+              <TimezoneSelector
+                onTimezoneChange={onTimezoneChange}
+                timezone={currentAlert?.timezone}
+              />
+            </div>
             <StyledSectionTitle>
               <h4>{t('Schedule settings')}</h4>
             </StyledSectionTitle>
@@ -1243,17 +1284,6 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
               <StyledRadio value="dashboard">{t('Dashboard')}</StyledRadio>
               <StyledRadio value="chart">{t('Chart')}</StyledRadio>
             </Radio.Group>
-            {formatOptionEnabled && (
-              <div className="inline-container">
-                <StyledRadioGroup
-                  onChange={onFormatChange}
-                  value={reportFormat}
-                >
-                  <StyledRadio value="PNG">{t('Send as PNG')}</StyledRadio>
-                  <StyledRadio value="CSV">{t('Send as CSV')}</StyledRadio>
-                </StyledRadioGroup>
-              </div>
-            )}
             <AsyncSelect
               className={
                 contentType === 'chart'
@@ -1294,6 +1324,20 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
               cacheOptions
               onChange={onDashboardChange}
             />
+            {formatOptionEnabled && (
+              <div className="inline-container">
+                <StyledRadioGroup
+                  onChange={onFormatChange}
+                  value={reportFormat}
+                >
+                  <StyledRadio value="PNG">{t('Send as PNG')}</StyledRadio>
+                  <StyledRadio value="CSV">{t('Send as CSV')}</StyledRadio>
+                  {TEXT_BASED_VISUALIZATION_TYPES.includes(chartVizType) && (
+                    <StyledRadio value="TEXT">{t('Send as text')}</StyledRadio>
+                  )}
+                </StyledRadioGroup>
+              </div>
+            )}
             <StyledSectionTitle>
               <h4>{t('Notification method')}</h4>
               <span className="required">*</span>
diff --git a/superset-frontend/src/views/CRUD/alert/components/NotificationMethod.tsx b/superset-frontend/src/views/CRUD/alert/components/NotificationMethod.tsx
index 7a43d2d590b3..0e4b1b7e09be 100644
--- a/superset-frontend/src/views/CRUD/alert/components/NotificationMethod.tsx
+++ b/superset-frontend/src/views/CRUD/alert/components/NotificationMethod.tsx
@@ -17,9 +17,9 @@
  * under the License.
  */
 import React, { FunctionComponent, useState } from 'react';
-import { styled, t } from '@superset-ui/core';
+import { styled, t, useTheme } from '@superset-ui/core';
 import { NativeGraySelect as Select } from 'src/components/Select';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import { StyledInputContainer } from '../AlertReportModal';
 
 const StyledNotificationMethod = styled.div`
@@ -74,6 +74,7 @@ export const NotificationMethod: FunctionComponent<NotificationMethodProps> = ({
   const [recipientValue, setRecipientValue] = useState<string>(
     recipients || '',
   );
+  const theme = useTheme();
 
   if (!setting) {
     return null;
@@ -144,7 +145,7 @@ export const NotificationMethod: FunctionComponent<NotificationMethodProps> = ({
             className="delete-button"
             onClick={() => onRemove(index)}
           >
-            <Icon name="trash" />
+            <Icons.Trash iconColor={theme.colors.grayscale.base} />
           </span>
         ) : null}
       </div>
diff --git a/superset-frontend/src/views/CRUD/alert/components/RecipientIcon.tsx b/superset-frontend/src/views/CRUD/alert/components/RecipientIcon.tsx
index 3a8fff81d109..b2e8652c537e 100644
--- a/superset-frontend/src/views/CRUD/alert/components/RecipientIcon.tsx
+++ b/superset-frontend/src/views/CRUD/alert/components/RecipientIcon.tsx
@@ -16,38 +16,38 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { styled, t } from '@superset-ui/core';
-import React from 'react';
+import { t, SupersetTheme, css } from '@superset-ui/core';
+import React, { ReactElement } from 'react';
 import { Tooltip } from 'src/components/Tooltip';
-import Icon, { IconName } from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import { RecipientIconName } from '../types';
 
-const StyledIcon = styled(Icon)`
-  color: ${({ theme }) => theme.colors.grayscale.light1};
-  margin-right: ${({ theme }) => theme.gridUnit * 2}px;
+const StyledIcon = (theme: SupersetTheme) => css`
+  color: ${theme.colors.grayscale.light1};
+  margin-right: ${theme.gridUnit * 2}px;
 `;
 
 export default function RecipientIcon({ type }: { type: string }) {
-  const recipientIconConfig = {
-    name: '',
+  const recipientIconConfig: { icon: null | ReactElement; label: string } = {
+    icon: null,
     label: '',
   };
   switch (type) {
     case RecipientIconName.email:
-      recipientIconConfig.name = 'email';
+      recipientIconConfig.icon = <Icons.Email css={StyledIcon} />;
       recipientIconConfig.label = t(`${RecipientIconName.email}`);
       break;
     case RecipientIconName.slack:
-      recipientIconConfig.name = 'slack';
+      recipientIconConfig.icon = <Icons.Slack css={StyledIcon} />;
       recipientIconConfig.label = t(`${RecipientIconName.slack}`);
       break;
     default:
-      recipientIconConfig.name = '';
+      recipientIconConfig.icon = null;
       recipientIconConfig.label = '';
   }
-  return recipientIconConfig.name.length ? (
+  return recipientIconConfig.icon ? (
     <Tooltip title={recipientIconConfig.label} placement="bottom">
-      <StyledIcon name={recipientIconConfig.name as IconName} />
+      {recipientIconConfig.icon}
     </Tooltip>
   ) : null;
 }
diff --git a/superset-frontend/src/views/CRUD/alert/types.ts b/superset-frontend/src/views/CRUD/alert/types.ts
index 6df1501222e1..f67a6042dfe8 100644
--- a/superset-frontend/src/views/CRUD/alert/types.ts
+++ b/superset-frontend/src/views/CRUD/alert/types.ts
@@ -27,6 +27,7 @@ type user = {
 export type ChartObject = {
   id: number;
   slice_name: string;
+  viz_type: string;
 };
 
 export type DashboardObject = {
@@ -73,8 +74,9 @@ export type AlertObject = {
   name?: string;
   owners?: Array<Owner | MetaObject>;
   sql?: string;
+  timezone?: string;
   recipients?: Array<Recipient>;
-  report_format?: 'PNG' | 'CSV';
+  report_format?: 'PNG' | 'CSV' | 'TEXT';
   type?: string;
   validator_config_json?: {
     op?: Operator;
diff --git a/superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx b/superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx
index a824b59cb3f1..e207da03d5fd 100644
--- a/superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx
+++ b/superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx
@@ -279,6 +279,7 @@ function AnnotationList({
       />
       <AnnotationModal
         addDangerToast={addDangerToast}
+        addSuccessToast={addSuccessToast}
         annotation={currentAnnotation}
         show={annotationModalOpen}
         onAnnotationAdd={() => refreshData()}
diff --git a/superset-frontend/src/views/CRUD/annotation/AnnotationModal.test.jsx b/superset-frontend/src/views/CRUD/annotation/AnnotationModal.test.jsx
index e6686d174195..0b2f4cb9a697 100644
--- a/superset-frontend/src/views/CRUD/annotation/AnnotationModal.test.jsx
+++ b/superset-frontend/src/views/CRUD/annotation/AnnotationModal.test.jsx
@@ -45,6 +45,7 @@ const store = mockStore({});
 
 const mockedProps = {
   addDangerToast: () => {},
+  addSuccessToast: () => {},
   annotation: mockData,
   onAnnotationAdd: jest.fn(() => []),
   onHide: () => {},
diff --git a/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx b/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx
index f7794968605f..cf0c2411f3ed 100644
--- a/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx
+++ b/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx
@@ -21,15 +21,17 @@ import { styled, t } from '@superset-ui/core';
 import { useSingleViewResource } from 'src/views/CRUD/hooks';
 import { RangePicker } from 'src/components/DatePicker';
 import moment from 'moment';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import Modal from 'src/components/Modal';
 import withToasts from 'src/messageToasts/enhancers/withToasts';
+import { StyledIcon } from 'src/views/CRUD/utils';
 import { JsonEditor } from 'src/components/AsyncAceEditor';
 
 import { AnnotationObject } from './types';
 
 interface AnnotationModalProps {
   addDangerToast: (msg: string) => void;
+  addSuccessToast: (msg: string) => void;
   annnotationLayerId: number;
   annotation?: AnnotationObject | null;
   onAnnotationAdd?: (annotation?: AnnotationObject) => void;
@@ -47,10 +49,6 @@ const StyledJsonEditor = styled(JsonEditor)`
   border: 1px solid ${({ theme }) => theme.colors.secondary.light2};
 `;
 
-const StyledIcon = styled(Icon)`
-  margin: auto ${({ theme }) => theme.gridUnit * 2}px auto 0;
-`;
-
 const AnnotationContainer = styled.div`
   margin-bottom: ${({ theme }) => theme.gridUnit * 5}px;
 
@@ -85,6 +83,7 @@ const AnnotationContainer = styled.div`
 
 const AnnotationModal: FunctionComponent<AnnotationModalProps> = ({
   addDangerToast,
+  addSuccessToast,
   annnotationLayerId,
   annotation = null,
   onAnnotationAdd,
@@ -96,7 +95,6 @@ const AnnotationModal: FunctionComponent<AnnotationModalProps> = ({
     currentAnnotation,
     setCurrentAnnotation,
   ] = useState<AnnotationObject | null>(null);
-  const [isHidden, setIsHidden] = useState<boolean>(true);
   const isEditMode = annotation !== null;
 
   // annotation fetch logic
@@ -122,13 +120,12 @@ const AnnotationModal: FunctionComponent<AnnotationModalProps> = ({
     });
   };
 
-  // Functions
   const hide = () => {
-    setIsHidden(true);
-
-    // Reset annotation
-    resetAnnotation();
-
+    if (isEditMode) {
+      setCurrentAnnotation(resource);
+    } else {
+      resetAnnotation();
+    }
     onHide();
   };
 
@@ -153,6 +150,8 @@ const AnnotationModal: FunctionComponent<AnnotationModalProps> = ({
           }
 
           hide();
+
+          addSuccessToast(t('The annotation has been updated'));
         });
       }
     } else if (currentAnnotation) {
@@ -167,6 +166,8 @@ const AnnotationModal: FunctionComponent<AnnotationModalProps> = ({
         }
 
         hide();
+
+        addSuccessToast(t('The annotation has been saved'));
       });
     }
   };
@@ -236,7 +237,7 @@ const AnnotationModal: FunctionComponent<AnnotationModalProps> = ({
       (!currentAnnotation ||
         !currentAnnotation.id ||
         (annotation && annotation.id !== currentAnnotation.id) ||
-        (isHidden && show))
+        show)
     ) {
       if (annotation && annotation.id !== null && !loading) {
         const id = annotation.id || 0;
@@ -245,7 +246,7 @@ const AnnotationModal: FunctionComponent<AnnotationModalProps> = ({
       }
     } else if (
       !isEditMode &&
-      (!currentAnnotation || currentAnnotation.id || (isHidden && show))
+      (!currentAnnotation || currentAnnotation.id || show)
     ) {
       resetAnnotation();
     }
@@ -266,11 +267,6 @@ const AnnotationModal: FunctionComponent<AnnotationModalProps> = ({
     currentAnnotation ? currentAnnotation.end_dttm : '',
   ]);
 
-  // Show/hide
-  if (isHidden && show) {
-    setIsHidden(false);
-  }
-
   return (
     <Modal
       disablePrimaryButton={disableSave}
@@ -282,9 +278,9 @@ const AnnotationModal: FunctionComponent<AnnotationModalProps> = ({
       title={
         <h4 data-test="annotaion-modal-title">
           {isEditMode ? (
-            <StyledIcon name="edit-alt" />
+            <Icons.EditAlt css={StyledIcon} />
           ) : (
-            <StyledIcon name="plus-large" />
+            <Icons.PlusLarge css={StyledIcon} />
           )}
           {isEditMode ? t('Edit annotation') : t('Add annotation')}
         </h4>
diff --git a/superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx b/superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx
index 675e81b868f0..118f9117a05c 100644
--- a/superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx
+++ b/superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx
@@ -20,7 +20,8 @@ import React, { FunctionComponent, useState, useEffect } from 'react';
 import { styled, t } from '@superset-ui/core';
 import { useSingleViewResource } from 'src/views/CRUD/hooks';
 
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
+import { StyledIcon } from 'src/views/CRUD/utils';
 import Modal from 'src/components/Modal';
 import withToasts from 'src/messageToasts/enhancers/withToasts';
 
@@ -39,10 +40,6 @@ const StyledAnnotationLayerTitle = styled.div`
     ${({ theme }) => theme.gridUnit * 4}px auto;
 `;
 
-const StyledIcon = styled(Icon)`
-  margin: auto ${({ theme }) => theme.gridUnit * 2}px auto 0;
-`;
-
 const LayerContainer = styled.div`
   margin-bottom: ${({ theme }) => theme.gridUnit * 10}px;
 
@@ -234,9 +231,9 @@ const AnnotationLayerModal: FunctionComponent<AnnotationLayerModalProps> = ({
       title={
         <h4 data-test="annotation-layer-modal-title">
           {isEditMode ? (
-            <StyledIcon name="edit-alt" />
+            <Icons.EditAlt css={StyledIcon} />
           ) : (
-            <StyledIcon name="plus-large" />
+            <Icons.PlusLarge css={StyledIcon} />
           )}
           {isEditMode
             ? t('Edit annotation layer properties')
diff --git a/superset-frontend/src/views/CRUD/chart/ChartCard.tsx b/superset-frontend/src/views/CRUD/chart/ChartCard.tsx
index cc4f066f95d1..96a384e5e7f7 100644
--- a/superset-frontend/src/views/CRUD/chart/ChartCard.tsx
+++ b/superset-frontend/src/views/CRUD/chart/ChartCard.tsx
@@ -17,10 +17,9 @@
  * under the License.
  */
 import React from 'react';
-import { t } from '@superset-ui/core';
+import { t, useTheme } from '@superset-ui/core';
 import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags';
 import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
-import Icon from 'src/components/Icon';
 import Icons from 'src/components/Icons';
 import Chart from 'src/types/Chart';
 
@@ -29,7 +28,7 @@ import Label from 'src/components/Label';
 import { Dropdown, Menu } from 'src/common/components';
 import FaveStar from 'src/components/FaveStar';
 import FacePile from 'src/components/FacePile';
-import { handleChartDelete, handleBulkChartExport, CardStyles } from '../utils';
+import { handleChartDelete, CardStyles } from '../utils';
 
 interface ChartCardProps {
   chart: Chart;
@@ -45,6 +44,7 @@ interface ChartCardProps {
   chartFilter?: string;
   userId?: number;
   showThumbnails?: boolean;
+  handleBulkChartExport: (chartsToExport: Chart[]) => void;
 }
 
 export default function ChartCard({
@@ -61,11 +61,13 @@ export default function ChartCard({
   favoriteStatus,
   chartFilter,
   userId,
+  handleBulkChartExport,
 }: ChartCardProps) {
   const canEdit = hasPerm('can_write');
   const canDelete = hasPerm('can_write');
   const canExport =
     hasPerm('can_read') && isFeatureEnabled(FeatureFlag.VERSIONED_EXPORT);
+  const theme = useTheme();
 
   const menu = (
     <Menu>
@@ -132,7 +134,7 @@ export default function ChartCard({
   return (
     <CardStyles
       onClick={() => {
-        if (!bulkSelectEnabled) {
+        if (!bulkSelectEnabled && chart.url) {
           window.location.href = chart.url;
         }
       }}
@@ -148,7 +150,7 @@ export default function ChartCard({
         url={bulkSelectEnabled ? undefined : chart.url}
         imgURL={chart.thumbnail_url || ''}
         imgFallbackURL="/static/assets/images/chart-card-fallback.svg"
-        description={t('Last modified %s', chart.changed_on_delta_humanized)}
+        description={t('Modified %s', chart.changed_on_delta_humanized)}
         coverLeft={<FacePile users={chart.owners || []} />}
         coverRight={
           <Label type="secondary">{chart.datasource_name_text}</Label>
@@ -166,7 +168,7 @@ export default function ChartCard({
               isStarred={favoriteStatus}
             />
             <Dropdown overlay={menu}>
-              <Icon name="more-horiz" />
+              <Icons.MoreVert iconColor={theme.colors.grayscale.base} />
             </Dropdown>
           </ListViewCard.Actions>
         }
diff --git a/superset-frontend/src/views/CRUD/chart/ChartList.test.jsx b/superset-frontend/src/views/CRUD/chart/ChartList.test.jsx
index 00d74033c688..894aa4ec6147 100644
--- a/superset-frontend/src/views/CRUD/chart/ChartList.test.jsx
+++ b/superset-frontend/src/views/CRUD/chart/ChartList.test.jsx
@@ -142,7 +142,7 @@ describe('ChartList', () => {
   });
 
   it('renders a table view', async () => {
-    wrapper.find('[data-test="list-view"]').first().simulate('click');
+    wrapper.find('[aria-label="list-view"]').first().simulate('click');
     await waitForComponentToPaint(wrapper);
     expect(wrapper.find('table')).toExist();
   });
diff --git a/superset-frontend/src/views/CRUD/chart/ChartList.tsx b/superset-frontend/src/views/CRUD/chart/ChartList.tsx
index 4f2211ebe728..e4aff8192cca 100644
--- a/superset-frontend/src/views/CRUD/chart/ChartList.tsx
+++ b/superset-frontend/src/views/CRUD/chart/ChartList.tsx
@@ -25,11 +25,11 @@ import {
 import React, { useMemo, useState } from 'react';
 import rison from 'rison';
 import { uniqBy } from 'lodash';
+import moment from 'moment';
 import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags';
 import {
   createErrorHandler,
   createFetchRelated,
-  handleBulkChartExport,
   handleChartDelete,
 } from 'src/views/CRUD/utils';
 import {
@@ -37,6 +37,7 @@ import {
   useFavoriteStatus,
   useListViewResource,
 } from 'src/views/CRUD/hooks';
+import handleResourceExport from 'src/utils/export';
 import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
 import SubMenu, { SubMenuProps } from 'src/components/Menu/SubMenu';
 import FaveStar from 'src/components/FaveStar';
@@ -47,6 +48,7 @@ import ListView, {
   ListViewProps,
   SelectOption,
 } from 'src/components/ListView';
+import Loading from 'src/components/Loading';
 import { getFromLocalStorage } from 'src/utils/localStorageHelpers';
 import withToasts from 'src/messageToasts/enhancers/withToasts';
 import PropertiesModal from 'src/explore/components/PropertiesModal';
@@ -156,6 +158,10 @@ function ChartList(props: ChartListProps) {
 
   const [importingChart, showImportModal] = useState<boolean>(false);
   const [passwordFields, setPasswordFields] = useState<string[]>([]);
+  const [preparingExport, setPreparingExport] = useState<boolean>(false);
+
+  const { userId } = props.user;
+  const userKey = getFromLocalStorage(userId.toString(), null);
 
   const openChartImportModal = () => {
     showImportModal(true);
@@ -177,6 +183,14 @@ function ChartList(props: ChartListProps) {
     hasPerm('can_read') && isFeatureEnabled(FeatureFlag.VERSIONED_EXPORT);
   const initialSort = [{ id: 'changed_on_delta_humanized', desc: true }];
 
+  const handleBulkChartExport = (chartsToExport: Chart[]) => {
+    const ids = chartsToExport.map(({ id }) => id);
+    handleResourceExport('chart', ids, () => {
+      setPreparingExport(false);
+    });
+    setPreparingExport(true);
+  };
+
   function handleBulkChartDelete(chartsToDelete: Chart[]) {
     SupersetClient.delete({
       endpoint: `/api/v1/chart/?q=${rison.encode(
@@ -259,23 +273,33 @@ function ChartList(props: ChartListProps) {
         Cell: ({
           row: {
             original: {
-              changed_by_name: changedByName,
+              last_saved_by: lastSavedBy,
               changed_by_url: changedByUrl,
             },
           },
-        }: any) => <a href={changedByUrl}>{changedByName}</a>,
+        }: any) => (
+          <a href={changedByUrl}>
+            {lastSavedBy?.first_name
+              ? `${lastSavedBy?.first_name} ${lastSavedBy?.last_name}`
+              : null}
+          </a>
+        ),
         Header: t('Modified by'),
-        accessor: 'changed_by.first_name',
+        accessor: 'last_saved_by.first_name',
         size: 'xl',
       },
       {
         Cell: ({
           row: {
-            original: { changed_on_delta_humanized: changedOn },
+            original: { last_saved_at: lastSavedAt },
           },
-        }: any) => <span className="no-wrap">{changedOn}</span>,
+        }: any) => (
+          <span className="no-wrap">
+            {lastSavedAt ? moment.utc(lastSavedAt).fromNow() : null}
+          </span>
+        ),
         Header: t('Last modified'),
-        accessor: 'changed_on_delta_humanized',
+        accessor: 'last_saved_at',
         size: 'xl',
       },
       {
@@ -488,7 +512,7 @@ function ChartList(props: ChartListProps) {
           ),
         ),
       ),
-      paginate: false,
+      paginate: true,
     },
     ...(props.user.userId ? [favoritesFilter] : []),
     {
@@ -521,8 +545,6 @@ function ChartList(props: ChartListProps) {
   ];
 
   function renderCard(chart: Chart) {
-    const { userId } = props.user;
-    const userKey = getFromLocalStorage(userId.toString(), null);
     return (
       <ChartCard
         chart={chart}
@@ -540,6 +562,7 @@ function ChartList(props: ChartListProps) {
         loading={loading}
         favoriteStatus={favoriteStatus[chart.id]}
         saveFavoriteStatus={saveFavoriteStatus}
+        handleBulkChartExport={handleBulkChartExport}
       />
     );
   }
@@ -630,6 +653,11 @@ function ChartList(props: ChartListProps) {
               loading={loading}
               pageSize={PAGE_SIZE}
               renderCard={renderCard}
+              showThumbnails={
+                userKey
+                  ? userKey.thumbnails
+                  : isFeatureEnabled(FeatureFlag.THUMBNAILS)
+              }
               defaultViewMode={
                 isFeatureEnabled(FeatureFlag.LISTVIEWS_DEFAULT_CARD_VIEW)
                   ? 'card'
@@ -653,6 +681,7 @@ function ChartList(props: ChartListProps) {
         passwordFields={passwordFields}
         setPasswordFields={setPasswordFields}
       />
+      {preparingExport && <Loading />}
     </>
   );
 }
diff --git a/superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx b/superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx
index 0f80b6703776..4b4baa61f3b8 100644
--- a/superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx
+++ b/superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx
@@ -20,7 +20,8 @@ import React, { FunctionComponent, useState, useEffect } from 'react';
 import { styled, t } from '@superset-ui/core';
 import { useSingleViewResource } from 'src/views/CRUD/hooks';
 
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
+import { StyledIcon } from 'src/views/CRUD/utils';
 import Modal from 'src/components/Modal';
 import withToasts from 'src/messageToasts/enhancers/withToasts';
 import { CssEditor } from 'src/components/AsyncAceEditor';
@@ -45,10 +46,6 @@ const StyledCssEditor = styled(CssEditor)`
   border: 1px solid ${({ theme }) => theme.colors.secondary.light2};
 `;
 
-const StyledIcon = styled(Icon)`
-  margin: auto ${({ theme }) => theme.gridUnit * 2}px auto 0;
-`;
-
 const TemplateContainer = styled.div`
   margin-bottom: ${({ theme }) => theme.gridUnit * 10}px;
 
@@ -228,9 +225,9 @@ const CssTemplateModal: FunctionComponent<CssTemplateModalProps> = ({
       title={
         <h4 data-test="css-template-modal-title">
           {isEditMode ? (
-            <StyledIcon name="edit-alt" />
+            <Icons.EditAlt css={StyledIcon} />
           ) : (
-            <StyledIcon name="plus-large" />
+            <Icons.PlusLarge css={StyledIcon} />
           )}
           {isEditMode
             ? t('Edit CSS template properties')
diff --git a/superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx b/superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx
index 93de8ead611d..5f84e41a41d2 100644
--- a/superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx
+++ b/superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx
@@ -18,12 +18,8 @@
  */
 import React from 'react';
 import { Link, useHistory } from 'react-router-dom';
-import { t } from '@superset-ui/core';
-import {
-  handleDashboardDelete,
-  handleBulkDashboardExport,
-  CardStyles,
-} from 'src/views/CRUD/utils';
+import { t, useTheme } from '@superset-ui/core';
+import { handleDashboardDelete, CardStyles } from 'src/views/CRUD/utils';
 import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags';
 import { Dropdown, Menu } from 'src/common/components';
 import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
@@ -49,6 +45,7 @@ interface DashboardCardProps {
   dashboardFilter?: string;
   userId?: number;
   showThumbnails?: boolean;
+  handleBulkDashboardExport: (dashboardsToExport: Dashboard[]) => void;
 }
 
 function DashboardCard({
@@ -64,12 +61,14 @@ function DashboardCard({
   favoriteStatus,
   saveFavoriteStatus,
   showThumbnails,
+  handleBulkDashboardExport,
 }: DashboardCardProps) {
   const history = useHistory();
   const canEdit = hasPerm('can_write');
   const canDelete = hasPerm('can_write');
   const canExport = hasPerm('can_read');
 
+  const theme = useTheme();
   const menu = (
     <Menu>
       {canEdit && openDashboardEditModal && (
@@ -160,10 +159,7 @@ function DashboardCard({
         linkComponent={Link}
         imgURL={dashboard.thumbnail_url}
         imgFallbackURL="/static/assets/images/dashboard-card-fallback.svg"
-        description={t(
-          'Last modified %s',
-          dashboard.changed_on_delta_humanized,
-        )}
+        description={t('Modified %s', dashboard.changed_on_delta_humanized)}
         coverLeft={<FacePile users={dashboard.owners || []} />}
         actions={
           <ListViewCard.Actions
@@ -178,7 +174,7 @@ function DashboardCard({
               isStarred={favoriteStatus}
             />
             <Dropdown overlay={menu}>
-              <Icons.MoreHoriz />
+              <Icons.MoreVert iconColor={theme.colors.grayscale.base} />
             </Dropdown>
           </ListViewCard.Actions>
         }
diff --git a/superset-frontend/src/views/CRUD/dashboard/DashboardList.test.jsx b/superset-frontend/src/views/CRUD/dashboard/DashboardList.test.jsx
index 230ccc5e48e8..4bb2043bc7db 100644
--- a/superset-frontend/src/views/CRUD/dashboard/DashboardList.test.jsx
+++ b/superset-frontend/src/views/CRUD/dashboard/DashboardList.test.jsx
@@ -143,7 +143,7 @@ describe('DashboardList', () => {
   });
 
   it('renders a table view', async () => {
-    wrapper.find('[data-test="list-view"]').first().simulate('click');
+    wrapper.find('[aria-label="list-view"]').first().simulate('click');
     await waitForComponentToPaint(wrapper);
     expect(wrapper.find('table')).toExist();
   });
diff --git a/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx b/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx
index 9831c2640590..9c2bd841c093 100644
--- a/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx
+++ b/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx
@@ -25,10 +25,11 @@ import {
   createFetchRelated,
   createErrorHandler,
   handleDashboardDelete,
-  handleBulkDashboardExport,
 } from 'src/views/CRUD/utils';
 import { useListViewResource, useFavoriteStatus } from 'src/views/CRUD/hooks';
 import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
+import handleResourceExport from 'src/utils/export';
+import Loading from 'src/components/Loading';
 import SubMenu, { SubMenuProps } from 'src/components/Menu/SubMenu';
 import ListView, {
   ListViewProps,
@@ -123,6 +124,7 @@ function DashboardList(props: DashboardListProps) {
 
   const [importingDashboard, showImportModal] = useState<boolean>(false);
   const [passwordFields, setPasswordFields] = useState<string[]>([]);
+  const [preparingExport, setPreparingExport] = useState<boolean>(false);
 
   const openDashboardImportModal = () => {
     showImportModal(true);
@@ -137,6 +139,9 @@ function DashboardList(props: DashboardListProps) {
     refreshData();
   };
 
+  const { userId } = props.user;
+  const userKey = getFromLocalStorage(userId.toString(), null);
+
   const canCreate = hasPerm('can_write');
   const canEdit = hasPerm('can_write');
   const canDelete = hasPerm('can_write');
@@ -155,8 +160,28 @@ function DashboardList(props: DashboardListProps) {
       ({ json = {} }) => {
         setDashboards(
           dashboards.map(dashboard => {
-            if (dashboard.id === json.id) {
-              return json.result;
+            if (dashboard.id === json?.result?.id) {
+              const {
+                changed_by_name,
+                changed_by_url,
+                changed_by,
+                dashboard_title = '',
+                slug = '',
+                json_metadata = '',
+                changed_on_delta_humanized,
+                url = '',
+              } = json.result;
+              return {
+                ...dashboard,
+                changed_by_name,
+                changed_by_url,
+                changed_by,
+                dashboard_title,
+                slug,
+                json_metadata,
+                changed_on_delta_humanized,
+                url,
+              };
             }
             return dashboard;
           }),
@@ -170,6 +195,14 @@ function DashboardList(props: DashboardListProps) {
     );
   }
 
+  const handleBulkDashboardExport = (dashboardsToExport: Dashboard[]) => {
+    const ids = dashboardsToExport.map(({ id }) => id);
+    handleResourceExport('dashboard', ids, () => {
+      setPreparingExport(false);
+    });
+    setPreparingExport(true);
+  };
+
   function handleBulkDashboardDelete(dashboardsToDelete: Dashboard[]) {
     return SupersetClient.delete({
       endpoint: `/api/v1/dashboard/?q=${rison.encode(
@@ -468,8 +501,6 @@ function DashboardList(props: DashboardListProps) {
   ];
 
   function renderCard(dashboard: Dashboard) {
-    const { userId } = props.user;
-    const userKey = getFromLocalStorage(userId.toString(), null);
     return (
       <DashboardCard
         dashboard={dashboard}
@@ -487,6 +518,7 @@ function DashboardList(props: DashboardListProps) {
         openDashboardEditModal={openDashboardEditModal}
         saveFavoriteStatus={saveFavoriteStatus}
         favoriteStatus={favoriteStatus[dashboard.id]}
+        handleBulkDashboardExport={handleBulkDashboardExport}
       />
     );
   }
@@ -580,6 +612,11 @@ function DashboardList(props: DashboardListProps) {
                 initialSort={initialSort}
                 loading={loading}
                 pageSize={PAGE_SIZE}
+                showThumbnails={
+                  userKey
+                    ? userKey.thumbnails
+                    : isFeatureEnabled(FeatureFlag.THUMBNAILS)
+                }
                 renderCard={renderCard}
                 defaultViewMode={
                   isFeatureEnabled(FeatureFlag.LISTVIEWS_DEFAULT_CARD_VIEW)
@@ -605,6 +642,7 @@ function DashboardList(props: DashboardListProps) {
         passwordFields={passwordFields}
         setPasswordFields={setPasswordFields}
       />
+      {preparingExport && <Loading />}
     </>
   );
 }
diff --git a/superset-frontend/src/views/CRUD/data/components/SyntaxHighlighterCopy/index.tsx b/superset-frontend/src/views/CRUD/data/components/SyntaxHighlighterCopy/index.tsx
index f4eec7f0cabd..e8d693d679c8 100644
--- a/superset-frontend/src/views/CRUD/data/components/SyntaxHighlighterCopy/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/components/SyntaxHighlighterCopy/index.tsx
@@ -26,7 +26,7 @@ import jsonSyntax from 'react-syntax-highlighter/dist/cjs/languages/hljs/json';
 import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';
 import SyntaxHighlighter from 'react-syntax-highlighter/dist/cjs/light';
 import { ToastProps } from 'src/messageToasts/enhancers/withToasts';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import copyTextToClipboard from 'src/utils/copy';
 
 SyntaxHighlighter.registerLanguage('sql', sqlSyntax);
@@ -49,6 +49,7 @@ const SyntaxHighlighterWrapper = styled.div`
     left: 512px;
     visibility: hidden;
     margin: -4px;
+    color: ${({ theme }) => theme.colors.grayscale.base};
   }
 `;
 
@@ -78,9 +79,8 @@ export default function SyntaxHighlighterCopy({
   }
   return (
     <SyntaxHighlighterWrapper>
-      <Icon
+      <Icons.Copy
         tabIndex={0}
-        name="copy"
         role="button"
         onClick={e => {
           e.preventDefault();
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx
index fda65baa2703..560ab1f5cd68 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx
@@ -18,7 +18,7 @@
  */
 import { SupersetClient, t, styled } from '@superset-ui/core';
 import React, { useState, useMemo } from 'react';
-import rison from 'rison';
+import Loading from 'src/components/Loading';
 import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags';
 import { useListViewResource } from 'src/views/CRUD/hooks';
 import { createErrorHandler } from 'src/views/CRUD/utils';
@@ -30,6 +30,7 @@ import Icons from 'src/components/Icons';
 import ListView, { FilterOperator, Filters } from 'src/components/ListView';
 import { commonMenuData } from 'src/views/CRUD/data/common';
 import ImportModelsModal from 'src/components/ImportModal/index';
+import handleResourceExport from 'src/utils/export';
 import DatabaseModal from './DatabaseModal';
 
 import { DatabaseObject } from './types';
@@ -97,6 +98,7 @@ function DatabaseList({ addDangerToast, addSuccessToast }: DatabaseListProps) {
   );
   const [importingDatabase, showImportModal] = useState<boolean>(false);
   const [passwordFields, setPasswordFields] = useState<string[]>([]);
+  const [preparingExport, setPreparingExport] = useState<boolean>(false);
 
   const openDatabaseImportModal = () => {
     showImportModal(true);
@@ -203,9 +205,14 @@ function DatabaseList({ addDangerToast, addSuccessToast }: DatabaseListProps) {
   }
 
   function handleDatabaseExport(database: DatabaseObject) {
-    return window.location.assign(
-      `/api/v1/database/export/?q=${rison.encode([database.id])}`,
-    );
+    if (database.id === undefined) {
+      return;
+    }
+
+    handleResourceExport('database', [database.id], () => {
+      setPreparingExport(false);
+    });
+    setPreparingExport(true);
   }
 
   const initialSort = [{ id: 'changed_on_delta_humanized', desc: true }];
@@ -236,7 +243,9 @@ function DatabaseList({ addDangerToast, addSuccessToast }: DatabaseListProps) {
           row: {
             original: { allow_run_async: allowRunAsync },
           },
-        }: any) => <BooleanDisplay value={allowRunAsync} />,
+        }: {
+          row: { original: { allow_run_async: boolean } };
+        }) => <BooleanDisplay value={allowRunAsync} />,
         size: 'sm',
       },
       {
@@ -469,6 +478,7 @@ function DatabaseList({ addDangerToast, addSuccessToast }: DatabaseListProps) {
         passwordFields={passwordFields}
         setPasswordFields={setPasswordFields}
       />
+      {preparingExport && <Loading />}
     </>
   );
 }
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
index 5c7c729da589..e2a3f0338daa 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
@@ -16,16 +16,29 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { FormEvent } from 'react';
-import { SupersetTheme, JsonObject } from '@superset-ui/core';
+import React, { FormEvent, useState } from 'react';
+import { SupersetTheme, JsonObject, t } from '@superset-ui/core';
 import { InputProps } from 'antd/lib/input';
+import { Switch, Select, Button } from 'src/common/components';
+import InfoTooltip from 'src/components/InfoTooltip';
 import ValidatedInput from 'src/components/Form/LabeledErrorBoundInput';
+import FormLabel from 'src/components/Form/FormLabel';
+import { DeleteFilled, CloseOutlined } from '@ant-design/icons';
 import {
-  StyledFormHeader,
   formScrollableStyles,
   validatedFormStyles,
+  CredentialInfoForm,
+  toggleStyle,
+  infoTooltip,
+  StyledFooterButton,
+  StyledCatalogTable,
 } from './styles';
-import { DatabaseForm } from '../types';
+import { CatalogObject, DatabaseForm, DatabaseObject } from '../types';
+
+enum CredentialInfoOptions {
+  jsonUpload,
+  copyPaste,
+}
 
 export const FormFieldOrder = [
   'host',
@@ -34,27 +47,255 @@ export const FormFieldOrder = [
   'username',
   'password',
   'database_name',
+  'credentials_info',
+  'catalog',
+  'query',
+  'encryption',
 ];
 
 interface FieldPropTypes {
   required: boolean;
+  hasTooltip?: boolean;
+  tooltipText?: (valuse: any) => string;
+  onParametersChange: (value: any) => string;
+  onParametersUploadFileChange: (value: any) => string;
   changeMethods: { onParametersChange: (value: any) => string } & {
     onChange: (value: any) => string;
+  } & {
+    onQueryChange: (value: any) => string;
+  } & { onParametersUploadFileChange: (value: any) => string } & {
+    onAddTableCatalog: () => void;
+    onRemoveTableCatalog: (idx: number) => void;
   };
   validationErrors: JsonObject | null;
   getValidation: () => void;
+  db?: DatabaseObject;
+  isEditMode?: boolean;
+  sslForced?: boolean;
+  defaultDBName?: string;
+  editNewDb?: boolean;
 }
 
+const CredentialsInfo = ({
+  changeMethods,
+  isEditMode,
+  db,
+  editNewDb,
+}: FieldPropTypes) => {
+  const [uploadOption, setUploadOption] = useState<number>(
+    CredentialInfoOptions.jsonUpload.valueOf(),
+  );
+  const [fileToUpload, setFileToUpload] = useState<string | null | undefined>(
+    null,
+  );
+  return (
+    <CredentialInfoForm>
+      {!isEditMode && (
+        <>
+          <FormLabel required>
+            {t('How do you want to enter service account credentials?')}
+          </FormLabel>
+          <Select
+            defaultValue={uploadOption}
+            style={{ width: '100%' }}
+            onChange={option => setUploadOption(option)}
+          >
+            <Select.Option value={CredentialInfoOptions.jsonUpload}>
+              {t('Upload JSON file')}
+            </Select.Option>
+
+            <Select.Option value={CredentialInfoOptions.copyPaste}>
+              {t('Copy and Paste JSON credentials')}
+            </Select.Option>
+          </Select>
+        </>
+      )}
+      {uploadOption === CredentialInfoOptions.copyPaste ||
+      isEditMode ||
+      editNewDb ? (
+        <div className="input-container">
+          <FormLabel required>{t('Service Account')}</FormLabel>
+          <textarea
+            className="input-form"
+            name="credentials_info"
+            value={db?.parameters?.credentials_info}
+            onChange={changeMethods.onParametersChange}
+            placeholder="Paste content of service credentials JSON file here"
+          />
+          <span className="label-paste">
+            {t('Copy and paste the entire service account .json file here')}
+          </span>
+        </div>
+      ) : (
+        <div
+          className="input-container"
+          css={(theme: SupersetTheme) => infoTooltip(theme)}
+        >
+          <div css={{ display: 'flex', alignItems: 'center' }}>
+            <FormLabel required>{t('Upload Credentials')}</FormLabel>
+            <InfoTooltip
+              tooltip={t(
+                'Use the JSON file you automatically downloaded when creating your service account in Google BigQuery.',
+              )}
+              viewBox="0 0 24 24"
+            />
+          </div>
+
+          {!fileToUpload && (
+            <Button
+              className="input-upload-btn"
+              onClick={() => document?.getElementById('selectedFile')?.click()}
+            >
+              {t('Choose File')}
+            </Button>
+          )}
+          {fileToUpload && (
+            <div className="input-upload-current">
+              {fileToUpload}
+              <DeleteFilled
+                onClick={() => {
+                  setFileToUpload(null);
+                  changeMethods.onParametersChange({
+                    target: {
+                      name: 'credentials_info',
+                      value: '',
+                    },
+                  });
+                }}
+              />
+            </div>
+          )}
+
+          <input
+            id="selectedFile"
+            className="input-upload"
+            type="file"
+            onChange={async event => {
+              let file;
+              if (event.target.files) {
+                file = event.target.files[0];
+              }
+              setFileToUpload(file?.name);
+              changeMethods.onParametersChange({
+                target: {
+                  type: null,
+                  name: 'credentials_info',
+                  value: await file?.text(),
+                  checked: false,
+                },
+              });
+              (document.getElementById(
+                'selectedFile',
+              ) as HTMLInputElement).value = null as any;
+            }}
+          />
+        </div>
+      )}
+    </CredentialInfoForm>
+  );
+};
+
+const TableCatalog = ({
+  required,
+  changeMethods,
+  getValidation,
+  validationErrors,
+  db,
+}: FieldPropTypes) => {
+  const tableCatalog = db?.catalog || [];
+  const catalogError = validationErrors || {};
+  return (
+    <StyledCatalogTable>
+      <div className="catalog-type-select">
+        <FormLabel required>{t('Type of Google Sheets Allowed')}</FormLabel>
+        <Select style={{ width: '100%' }} defaultValue="true" disabled>
+          <Select.Option value="true" key={1}>
+            {t('Publicly shared sheets only')}
+          </Select.Option>
+        </Select>
+      </div>
+      <h4 className="gsheet-title">
+        {t('Connect Google Sheets as tables to this database')}
+      </h4>
+      <div>
+        {tableCatalog?.map((sheet: CatalogObject, idx: number) => (
+          <>
+            <FormLabel className="catalog-label" required>
+              {t('Google Sheet Name and URL')}
+            </FormLabel>
+            <div className="catalog-name">
+              <ValidatedInput
+                className="catalog-name-input"
+                required={required}
+                validationMethods={{ onBlur: getValidation }}
+                errorMessage={catalogError[idx]?.name}
+                placeholder={t('Enter a name for this sheet')}
+                onChange={(e: { target: { value: any } }) => {
+                  changeMethods.onParametersChange({
+                    target: {
+                      type: `catalog-${idx}`,
+                      name: 'name',
+                      value: e.target.value,
+                    },
+                  });
+                }}
+                value={sheet.name}
+              />
+              {tableCatalog?.length > 1 && (
+                <CloseOutlined
+                  className="catalog-delete"
+                  onClick={() => changeMethods.onRemoveTableCatalog(idx)}
+                />
+              )}
+            </div>
+            <ValidatedInput
+              className="catalog-name-url"
+              required={required}
+              validationMethods={{ onBlur: getValidation }}
+              errorMessage={catalogError[idx]?.url}
+              placeholder={t('Paste the shareable Google Sheet URL here')}
+              onChange={(e: { target: { value: any } }) =>
+                changeMethods.onParametersChange({
+                  target: {
+                    type: `catalog-${idx}`,
+                    name: 'value',
+                    value: e.target.value,
+                  },
+                })
+              }
+              value={sheet.value}
+            />
+          </>
+        ))}
+        <StyledFooterButton
+          className="catalog-add-btn"
+          onClick={() => {
+            changeMethods.onAddTableCatalog();
+          }}
+        >
+          + {t('Add sheet')}
+        </StyledFooterButton>
+      </div>
+    </StyledCatalogTable>
+  );
+};
+
 const hostField = ({
   required,
   changeMethods,
   getValidation,
   validationErrors,
+  db,
 }: FieldPropTypes) => (
   <ValidatedInput
     id="host"
     name="host"
+    value={db?.parameters?.host}
     required={required}
+    hasTooltip
+    tooltipText={t(
+      'This can be either an IP address (e.g. 127.0.0.1) or a domain name (e.g. mydatabase.com).',
+    )}
     validationMethods={{ onBlur: getValidation }}
     errorMessage={validationErrors?.host}
     placeholder="e.g. 127.0.0.1"
@@ -68,35 +309,42 @@ const portField = ({
   changeMethods,
   getValidation,
   validationErrors,
+  db,
 }: FieldPropTypes) => (
-  <ValidatedInput
-    id="port"
-    name="port"
-    required={required}
-    validationMethods={{ onBlur: getValidation }}
-    errorMessage={validationErrors?.port}
-    placeholder="e.g. 5432"
-    className="form-group-w-50"
-    label="Port"
-    onChange={changeMethods.onParametersChange}
-  />
+  <>
+    <ValidatedInput
+      id="port"
+      name="port"
+      type="number"
+      required={required}
+      value={db?.parameters?.port as number}
+      validationMethods={{ onBlur: getValidation }}
+      errorMessage={validationErrors?.port}
+      placeholder="e.g. 5432"
+      className="form-group-w-50"
+      label="Port"
+      onChange={changeMethods.onParametersChange}
+    />
+  </>
 );
 const databaseField = ({
   required,
   changeMethods,
   getValidation,
   validationErrors,
+  db,
 }: FieldPropTypes) => (
   <ValidatedInput
     id="database"
     name="database"
     required={required}
+    value={db?.parameters?.database}
     validationMethods={{ onBlur: getValidation }}
     errorMessage={validationErrors?.database}
     placeholder="e.g. world_population"
     label="Database name"
     onChange={changeMethods.onParametersChange}
-    helpText="Copy the name of the PostgreSQL database you are trying to connect to."
+    helpText={t('Copy the name of the  database you are trying to connect to.')}
   />
 );
 const usernameField = ({
@@ -104,11 +352,13 @@ const usernameField = ({
   changeMethods,
   getValidation,
   validationErrors,
+  db,
 }: FieldPropTypes) => (
   <ValidatedInput
     id="username"
     name="username"
     required={required}
+    value={db?.parameters?.username}
     validationMethods={{ onBlur: getValidation }}
     errorMessage={validationErrors?.username}
     placeholder="e.g. Analytics"
@@ -121,11 +371,15 @@ const passwordField = ({
   changeMethods,
   getValidation,
   validationErrors,
+  db,
+  isEditMode,
 }: FieldPropTypes) => (
   <ValidatedInput
     id="password"
     name="password"
     required={required}
+    type={isEditMode && 'password'}
+    value={db?.parameters?.password}
     validationMethods={{ onBlur: getValidation }}
     errorMessage={validationErrors?.password}
     placeholder="e.g. ********"
@@ -134,24 +388,80 @@ const passwordField = ({
   />
 );
 const displayField = ({
+  changeMethods,
+  getValidation,
+  validationErrors,
+  db,
+}: FieldPropTypes) => (
+  <>
+    <ValidatedInput
+      id="database_name"
+      name="database_name"
+      required
+      value={db?.database_name}
+      validationMethods={{ onBlur: getValidation }}
+      errorMessage={validationErrors?.database_name}
+      placeholder=""
+      label={t('Display Name')}
+      onChange={changeMethods.onChange}
+      helpText={t(
+        'Pick a nickname for this database to display as in Superset.',
+      )}
+    />
+  </>
+);
+
+const queryField = ({
   required,
   changeMethods,
   getValidation,
   validationErrors,
+  db,
 }: FieldPropTypes) => (
   <ValidatedInput
-    id="database_name"
-    name="database_name"
+    id="query_input"
+    name="query_input"
     required={required}
+    value={db?.query_input || ''}
     validationMethods={{ onBlur: getValidation }}
-    errorMessage={validationErrors?.database_name}
-    placeholder=""
-    label="Display Name"
-    onChange={changeMethods.onChange}
-    helpText="Pick a nickname for this database to display as in Superset."
+    errorMessage={validationErrors?.query}
+    placeholder="e.g. param1=value1&param2=value2"
+    label="Additional Parameters"
+    onChange={changeMethods.onQueryChange}
+    helpText={t('Add additional custom parameters')}
   />
 );
 
+const forceSSLField = ({
+  isEditMode,
+  changeMethods,
+  db,
+  sslForced,
+}: FieldPropTypes) => (
+  <div css={(theme: SupersetTheme) => infoTooltip(theme)}>
+    <Switch
+      disabled={sslForced && !isEditMode}
+      checked={db?.parameters?.encryption || sslForced}
+      onChange={changed => {
+        changeMethods.onParametersChange({
+          target: {
+            type: 'toggle',
+            name: 'encryption',
+            checked: true,
+            value: changed,
+          },
+        });
+      }}
+    />
+    <span css={toggleStyle}>SSL</span>
+    <InfoTooltip
+      tooltip={t('SSL Mode "require" will be used.')}
+      placement="right"
+      viewBox="0 -5 24 24"
+    />
+  </div>
+);
+
 const FORM_FIELD_MAP = {
   host: hostField,
   port: portField,
@@ -159,32 +469,50 @@ const FORM_FIELD_MAP = {
   username: usernameField,
   password: passwordField,
   database_name: displayField,
+  query: queryField,
+  encryption: forceSSLField,
+  credentials_info: CredentialsInfo,
+  catalog: TableCatalog,
 };
 
 const DatabaseConnectionForm = ({
-  dbModel: { name, parameters },
+  dbModel: { parameters },
   onParametersChange,
   onChange,
+  onQueryChange,
+  onParametersUploadFileChange,
+  onAddTableCatalog,
+  onRemoveTableCatalog,
   validationErrors,
   getValidation,
+  db,
+  isEditMode = false,
+  sslForced,
+  editNewDb,
 }: {
+  isEditMode?: boolean;
+  sslForced: boolean;
+  editNewDb?: boolean;
   dbModel: DatabaseForm;
+  db: Partial<DatabaseObject> | null;
   onParametersChange: (
     event: FormEvent<InputProps> | { target: HTMLInputElement },
   ) => void;
   onChange: (
     event: FormEvent<InputProps> | { target: HTMLInputElement },
   ) => void;
+  onQueryChange: (
+    event: FormEvent<InputProps> | { target: HTMLInputElement },
+  ) => void;
+  onParametersUploadFileChange?: (
+    event: FormEvent<InputProps> | { target: HTMLInputElement },
+  ) => void;
+  onAddTableCatalog: () => void;
+  onRemoveTableCatalog: (idx: number) => void;
   validationErrors: JsonObject | null;
   getValidation: () => void;
 }) => (
   <>
-    <StyledFormHeader>
-      <h4>Enter the required {name} credentials</h4>
-      <p className="helper">
-        Need help? Learn more about connecting to {name}.
-      </p>
-    </StyledFormHeader>
     <div
       // @ts-ignore
       css={(theme: SupersetTheme) => [
@@ -199,11 +527,22 @@ const DatabaseConnectionForm = ({
             key === 'database_name',
         ).map(field =>
           FORM_FIELD_MAP[field]({
-            required: parameters.required.includes(field),
-            changeMethods: { onParametersChange, onChange },
+            required: parameters.required?.includes(field),
+            changeMethods: {
+              onParametersChange,
+              onChange,
+              onQueryChange,
+              onParametersUploadFileChange,
+              onAddTableCatalog,
+              onRemoveTableCatalog,
+            },
             validationErrors,
             getValidation,
+            db,
             key: field,
+            isEditMode,
+            sslForced,
+            editNewDb,
           }),
         )}
     </div>
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx
index c046c2501111..03c82f4ce2b3 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx
@@ -27,23 +27,24 @@ import {
   StyledJsonEditor,
   StyledExpandableForm,
   antdCollapseStyles,
+  no_margin_bottom,
 } from './styles';
 import { DatabaseObject } from '../types';
 
-const defaultExtra =
-  '{\n  "metadata_params": {},\n  "engine_params": {},' +
-  '\n  "metadata_cache_timeout": {},\n  "schemas_allowed_for_csv_upload": [] \n}';
-
 const ExtraOptions = ({
   db,
   onInputChange,
   onTextChange,
   onEditorChange,
+  onExtraInputChange,
+  onExtraEditorChange,
 }: {
   db: DatabaseObject | null;
   onInputChange: EventHandler<ChangeEvent<HTMLInputElement>>;
   onTextChange: EventHandler<ChangeEvent<HTMLTextAreaElement>>;
   onEditorChange: Function;
+  onExtraInputChange: EventHandler<ChangeEvent<HTMLInputElement>>;
+  onExtraEditorChange: Function;
 }) => {
   const expandableModalIsOpen = !!db?.expose_in_sqllab;
   const createAsOpen = !!(db?.allow_ctas || db?.allow_cvas);
@@ -59,20 +60,20 @@ const ExtraOptions = ({
           <div>
             <h4>SQL Lab</h4>
             <p className="helper">
-              Configure how this database will function in SQL Lab.
+              Adjust how this database will interact with SQL Lab.
             </p>
           </div>
         }
         key="1"
       >
-        <StyledInputContainer className="mb-0">
+        <StyledInputContainer css={no_margin_bottom}>
           <div className="input-container">
             <IndeterminateCheckbox
               id="expose_in_sqllab"
               indeterminate={false}
               checked={!!db?.expose_in_sqllab}
               onChange={onInputChange}
-              labelText={t('Expose in SQL Lab')}
+              labelText={t('Expose database in SQL Lab')}
             />
             <InfoTooltip
               tooltip={t('Allow this database to be queried in SQL Lab')}
@@ -84,7 +85,7 @@ const ExtraOptions = ({
               'ctas-open': createAsOpen,
             })}
           >
-            <StyledInputContainer className="mb-0">
+            <StyledInputContainer css={no_margin_bottom}>
               <div className="input-container">
                 <IndeterminateCheckbox
                   id="allow_ctas"
@@ -98,7 +99,7 @@ const ExtraOptions = ({
                 />
               </div>
             </StyledInputContainer>
-            <StyledInputContainer className="mb-0">
+            <StyledInputContainer css={no_margin_bottom}>
               <div className="input-container">
                 <IndeterminateCheckbox
                   id="allow_cvas"
@@ -120,19 +121,18 @@ const ExtraOptions = ({
                     type="text"
                     name="force_ctas_schema"
                     value={db?.force_ctas_schema || ''}
-                    placeholder={t('Search or select schema')}
+                    placeholder={t('Create or select schema...')}
                     onChange={onInputChange}
                   />
                 </div>
                 <div className="helper">
                   {t(
-                    'When allowing CREATE TABLE AS option in SQL Lab, this option ' +
-                      'forces the table to be created in this schema.',
+                    'Force all tables and views to be created in this schema when clicking CTAS or CVAS in SQL Lab.',
                   )}
                 </div>
               </StyledInputContainer>
             </StyledInputContainer>
-            <StyledInputContainer className="mb-0">
+            <StyledInputContainer css={no_margin_bottom}>
               <div className="input-container">
                 <IndeterminateCheckbox
                   id="allow_dml"
@@ -148,14 +148,14 @@ const ExtraOptions = ({
                 />
               </div>
             </StyledInputContainer>
-            <StyledInputContainer>
+            <StyledInputContainer css={no_margin_bottom}>
               <div className="input-container">
                 <IndeterminateCheckbox
                   id="allow_multi_schema_metadata_fetch"
                   indeterminate={false}
                   checked={!!db?.allow_multi_schema_metadata_fetch}
                   onChange={onInputChange}
-                  labelText={t('Allow multi schema metadata fetch')}
+                  labelText={t('Allow Multi Schema Metadata Fetch')}
                 />
                 <InfoTooltip
                   tooltip={t(
@@ -166,6 +166,38 @@ const ExtraOptions = ({
                 />
               </div>
             </StyledInputContainer>
+            <StyledInputContainer css={no_margin_bottom}>
+              <div className="input-container">
+                <IndeterminateCheckbox
+                  id="cost_estimate_enabled"
+                  indeterminate={false}
+                  checked={!!db?.extra_json?.cost_estimate_enabled}
+                  onChange={onExtraInputChange}
+                  labelText={t('Enable query cost estimation')}
+                />
+                <InfoTooltip
+                  tooltip={t(
+                    'For Presto and Postgres, shows a button to compute cost before running a query.',
+                  )}
+                />
+              </div>
+            </StyledInputContainer>
+            <StyledInputContainer>
+              <div className="input-container">
+                <IndeterminateCheckbox
+                  id="allows_virtual_table_explore"
+                  indeterminate={false}
+                  checked={!!db?.extra_json?.allows_virtual_table_explore}
+                  onChange={onExtraInputChange}
+                  labelText={t('Allow this database to be explored')}
+                />
+                <InfoTooltip
+                  tooltip={t(
+                    'When enabled, users are able to visualize SQL Lab results in Explore.',
+                  )}
+                />
+              </div>
+            </StyledInputContainer>
           </StyledExpandableForm>
         </StyledInputContainer>
       </Collapse.Panel>
@@ -174,7 +206,7 @@ const ExtraOptions = ({
           <div>
             <h4>Performance</h4>
             <p className="helper">
-              Adjust settings that will impact the performance of this database.
+              Adjust performance settings of this database.
             </p>
           </div>
         }
@@ -187,7 +219,7 @@ const ExtraOptions = ({
               type="number"
               name="cache_timeout"
               value={db?.cache_timeout || ''}
-              placeholder={t('Chart cache timeout')}
+              placeholder={t('Enter duration in seconds')}
               onChange={onInputChange}
             />
           </div>
@@ -199,7 +231,51 @@ const ExtraOptions = ({
             )}
           </div>
         </StyledInputContainer>
-        <StyledInputContainer className="mb-0">
+        <StyledInputContainer>
+          <div className="control-label">{t('Schema cache timeout')}</div>
+          <div className="input-container">
+            <input
+              type="number"
+              name="schema_cache_timeout"
+              value={
+                db?.extra_json?.metadata_cache_timeout?.schema_cache_timeout ||
+                ''
+              }
+              placeholder={t('Enter duration in seconds')}
+              onChange={onExtraInputChange}
+              data-test="schema-cache-timeout-test"
+            />
+          </div>
+          <div className="helper">
+            {t(
+              'Duration (in seconds) of the metadata caching timeout for schemas of ' +
+                'this database. If left unset, the cache never expires.',
+            )}
+          </div>
+        </StyledInputContainer>
+        <StyledInputContainer>
+          <div className="control-label">{t('Table cache timeout')}</div>
+          <div className="input-container">
+            <input
+              type="number"
+              name="table_cache_timeout"
+              value={
+                db?.extra_json?.metadata_cache_timeout?.table_cache_timeout ||
+                ''
+              }
+              placeholder={t('Enter duration in seconds')}
+              onChange={onExtraInputChange}
+              data-test="table-cache-timeout-test"
+            />
+          </div>
+          <div className="helper">
+            {t(
+              'Duration (in seconds) of the metadata caching timeout for tables of ' +
+                'this database. If left unset, the cache never expires. ',
+            )}
+          </div>
+        </StyledInputContainer>
+        <StyledInputContainer css={{ no_margin_bottom }}>
           <div className="input-container">
             <IndeterminateCheckbox
               id="allow_run_async"
@@ -218,14 +294,30 @@ const ExtraOptions = ({
             />
           </div>
         </StyledInputContainer>
+        <StyledInputContainer css={{ no_margin_bottom }}>
+          <div className="input-container">
+            <IndeterminateCheckbox
+              id="cancel_query_on_windows_unload"
+              indeterminate={false}
+              checked={!!db?.extra_json?.cancel_query_on_windows_unload}
+              onChange={onExtraInputChange}
+              labelText={t('Cancel query on window unload event')}
+            />
+            <InfoTooltip
+              tooltip={t(
+                'Terminate running queries when browser window closed or navigated ' +
+                  'to another page. Available for Presto, Hive, MySQL, Postgres and ' +
+                  'Snowflake databases.',
+              )}
+            />
+          </div>
+        </StyledInputContainer>
       </Collapse.Panel>
       <Collapse.Panel
         header={
           <div>
             <h4>Security</h4>
-            <p className="helper">
-              Add connection information for other systems.
-            </p>
+            <p className="helper">Add extra connection information.</p>
           </div>
         }
         key="3"
@@ -245,14 +337,12 @@ const ExtraOptions = ({
             />
           </div>
           <div className="helper">
-            <div>
-              {t('JSON string containing additional connection configuration.')}
-            </div>
             <div>
               {t(
-                'This is used to provide connection information for systems like Hive, ' +
-                  'Presto, and BigQuery, which do not conform to the username:password syntax ' +
-                  'normally used by SQLAlchemy.',
+                'JSON string containing additional connection configuration. ' +
+                  'This is used to provide connection information for systems ' +
+                  'like Hive, Presto and BigQuery which do not conform to the ' +
+                  'username:password syntax normally used by SQLAlchemy.',
               )}
             </div>
           </div>
@@ -263,41 +353,50 @@ const ExtraOptions = ({
             <textarea
               name="server_cert"
               value={db?.server_cert || ''}
-              placeholder={t('Root certificate')}
+              placeholder={t('Enter CA_BUNDLE')}
               onChange={onTextChange}
             />
           </div>
           <div className="helper">
             {t(
-              'Optional CA_BUNDLE contents to validate HTTPS requests. Only available on ' +
-                'certain database engines.',
+              'Optional CA_BUNDLE contents to validate HTTPS requests. Only ' +
+                'available on certain database engines.',
             )}
           </div>
         </StyledInputContainer>
-      </Collapse.Panel>
-      <Collapse.Panel
-        header={
-          <div>
-            <h4>Other</h4>
-            <p className="helper">Additional settings.</p>
+        <StyledInputContainer>
+          <div className="control-label">
+            {t('Schemas allowed for CSV upload')}
           </div>
-        }
-        key="4"
-      >
-        <StyledInputContainer className="mb-0">
+          <div className="input-container">
+            <input
+              type="text"
+              name="schemas_allowed_for_csv_upload"
+              value={(
+                db?.extra_json?.schemas_allowed_for_csv_upload || []
+              ).join(',')}
+              placeholder="schema1,schema2"
+              onChange={onExtraInputChange}
+            />
+          </div>
+          <div className="helper">
+            {t(
+              'A comma-separated list of schemas that CSVs are allowed to upload to.',
+            )}
+          </div>
+        </StyledInputContainer>
+        <StyledInputContainer css={{ no_margin_bottom }}>
           <div className="input-container">
             <IndeterminateCheckbox
               id="impersonate_user"
               indeterminate={false}
               checked={!!db?.impersonate_user}
               onChange={onInputChange}
-              labelText={t(
-                'Impersonate Logged In User (Presto, Trino, Hive, and GSheets)',
-              )}
+              labelText={t('Impersonate logged in user (Presto & Hive)')}
             />
             <InfoTooltip
               tooltip={t(
-                'If Presto or Trino, all the queries in SQL Lab are going to be executed as the ' +
+                'If Presto, all the queries in SQL Lab are going to be executed as the ' +
                   'currently logged on user who must have permission to run them. If Hive ' +
                   'and hive.server2.enable.doAs is enabled, will run the queries as ' +
                   'service account, but impersonate the currently logged on user via ' +
@@ -306,7 +405,7 @@ const ExtraOptions = ({
             />
           </div>
         </StyledInputContainer>
-        <StyledInputContainer className="mb-0">
+        <StyledInputContainer css={{ ...no_margin_bottom }}>
           <div className="input-container">
             <IndeterminateCheckbox
               id="allow_csv_upload"
@@ -322,63 +421,80 @@ const ExtraOptions = ({
             />
           </div>
         </StyledInputContainer>
-        <StyledInputContainer className="extra-container">
-          <div className="control-label">{t('Extra')}</div>
+      </Collapse.Panel>
+      <Collapse.Panel
+        header={
+          <div>
+            <h4>Other</h4>
+            <p className="helper">Additional settings.</p>
+          </div>
+        }
+        key="4"
+      >
+        <StyledInputContainer>
+          <div className="control-label">{t('Metadata Parameters')}</div>
           <div className="input-container">
             <StyledJsonEditor
-              name="extra"
-              value={db?.extra ?? defaultExtra}
-              placeholder={t('Secure extra')}
+              name="metadata_params"
+              value={db?.extra_json?.metadata_params || ''}
+              placeholder={t('Metadata Parameters')}
               onChange={(json: string) =>
-                onEditorChange({ json, name: 'extra' })
+                onExtraEditorChange({ json, name: 'metadata_params' })
               }
               width="100%"
               height="160px"
             />
           </div>
           <div className="helper">
-            <div>
-              {t('JSON string containing extra configuration elements.')}
-            </div>
             <div>
               {t(
-                '1. The engine_params object gets unpacked into the sqlalchemy.create_engine ' +
-                  'call, while the metadata_params gets unpacked into the sqlalchemy.MetaData ' +
-                  'call.',
-              )}
-            </div>
-            <div>
-              {t(
-                '2. The metadata_cache_timeout is a cache timeout setting in seconds for ' +
-                  'metadata fetch of this database. Specify it as "metadata_cache_timeout": ' +
-                  '{"schema_cache_timeout": 600, "table_cache_timeout": 600}. If unset, cache ' +
-                  'will not be enabled for the functionality. A timeout of 0 indicates that ' +
-                  'the cache never expires.',
-              )}
-            </div>
-            <div>
-              {t(
-                '3. The schemas_allowed_for_csv_upload is a comma separated list of schemas ' +
-                  'that CSVs are allowed to upload to. Specify it as ' +
-                  '"schemas_allowed_for_csv_upload": ["public", "csv_upload"]. If database ' +
-                  'flavor does not support schema or any schema is allowed to be accessed, ' +
-                  'just leave the list empty.',
-              )}
-            </div>
-            <div>
-              {t(
-                "4. The version field is a string specifying this db's version. This " +
-                  'should be used with Presto DBs so that the syntax is correct.',
+                'The metadata_params object gets unpacked into the sqlalchemy.MetaData call.',
               )}
             </div>
+          </div>
+        </StyledInputContainer>
+        <StyledInputContainer>
+          <div className="control-label">{t('Engine Parameters')}</div>
+          <div className="input-container">
+            <StyledJsonEditor
+              name="engine_params"
+              value={db?.extra_json?.engine_params || ''}
+              placeholder={t('Engine Parameters')}
+              onChange={(json: string) =>
+                onExtraEditorChange({ json, name: 'engine_params' })
+              }
+              width="100%"
+              height="160px"
+            />
+          </div>
+          <div className="helper">
             <div>
               {t(
-                '5. The allows_virtual_table_explore field is a boolean specifying whether ' +
-                  'or not the Explore button in SQL Lab results is shown.',
+                'The engine_params object gets unpacked into the sqlalchemy.create_engine call.',
               )}
             </div>
           </div>
         </StyledInputContainer>
+        <StyledInputContainer>
+          <div className="control-label" data-test="version-label-test">
+            {t('Version')}
+          </div>
+          <div className="input-container" data-test="version-spinbutton-test">
+            <input
+              type="number"
+              name="version"
+              value={db?.extra_json?.version || ''}
+              placeholder={t('Version number')}
+              onChange={onExtraInputChange}
+            />
+          </div>
+          <div className="helper">
+            {t(
+              'Specify this database’s version. This should be used with ' +
+                'Presto databases so that the syntax is correct.',
+            )}
+          </div>
+        </StyledInputContainer>
       </Collapse.Panel>
     </Collapse>
   );
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/ModalHeader.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/ModalHeader.tsx
new file mode 100644
index 000000000000..992aa76e3606
--- /dev/null
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/ModalHeader.tsx
@@ -0,0 +1,161 @@
+/**
+ * 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 React from 'react';
+import { getDatabaseDocumentationLinks } from 'src/views/CRUD/hooks';
+import {
+  EditHeaderTitle,
+  EditHeaderSubtitle,
+  StyledFormHeader,
+  StyledStickyHeader,
+} from './styles';
+import { DatabaseForm, DatabaseObject } from '../types';
+
+const supersetTextDocs = getDatabaseDocumentationLinks();
+
+export const DOCUMENTATION_LINK = supersetTextDocs
+  ? supersetTextDocs.support
+  : 'https://superset.apache.org/docs/databases/installing-database-drivers';
+
+const irregularDocumentationLinks = {
+  postgresql: 'https://superset.apache.org/docs/databases/postgres',
+  mssql: 'https://superset.apache.org/docs/databases/sql-server',
+  gsheets: 'https://superset.apache.org/docs/databases/google-sheets',
+};
+
+const documentationLink = (engine: string | undefined) => {
+  if (!engine) return null;
+
+  if (supersetTextDocs) {
+    // override doc link for superset_txt yml
+    return supersetTextDocs[engine] || supersetTextDocs.default;
+  }
+
+  if (!irregularDocumentationLinks[engine]) {
+    return `https://superset.apache.org/docs/databases/${engine}`;
+  }
+  return irregularDocumentationLinks[engine];
+};
+const ModalHeader = ({
+  isLoading,
+  isEditMode,
+  useSqlAlchemyForm,
+  hasConnectedDb,
+  db,
+  dbName,
+  dbModel,
+  editNewDb,
+}: {
+  isLoading: boolean;
+  isEditMode: boolean;
+  useSqlAlchemyForm: boolean;
+  hasConnectedDb: boolean;
+  db: Partial<DatabaseObject> | null;
+  dbName: string;
+  dbModel: DatabaseForm;
+  editNewDb?: boolean;
+}) => {
+  const isEditHeader = (
+    <StyledFormHeader>
+      <EditHeaderTitle>{db?.backend}</EditHeaderTitle>
+      <EditHeaderSubtitle>{dbName}</EditHeaderSubtitle>
+    </StyledFormHeader>
+  );
+  const useSqlAlchemyFormHeader = (
+    <StyledFormHeader>
+      <p className="helper-top"> STEP 2 OF 2 </p>
+      <h4>Enter Primary Credentials</h4>
+      <p className="helper-bottom">
+        Need help? Learn how to connect your database{' '}
+        <a
+          href={supersetTextDocs?.default || DOCUMENTATION_LINK}
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          here
+        </a>
+        .
+      </p>
+    </StyledFormHeader>
+  );
+  const hasConnectedDbHeader = (
+    <StyledStickyHeader>
+      <StyledFormHeader>
+        <p className="helper-top"> STEP 3 OF 3 </p>
+        <h4 className="step-3-text">
+          Your database was successfully connected! Here are some optional
+          settings for your database
+        </h4>
+        <p className="helper-bottom">
+          Need help? Learn more about{' '}
+          <a
+            href={documentationLink(db?.engine)}
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            connecting to {dbModel.name}.
+          </a>
+        </p>
+      </StyledFormHeader>
+    </StyledStickyHeader>
+  );
+  const hasDbHeader = (
+    <StyledStickyHeader>
+      <StyledFormHeader>
+        <p className="helper-top"> STEP 2 OF 3 </p>
+        <h4>Enter the required {dbModel.name} credentials</h4>
+        <p className="helper-bottom">
+          Need help? Learn more about{' '}
+          <a
+            href={documentationLink(db?.engine)}
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            connecting to {dbModel.name}.
+          </a>
+        </p>
+      </StyledFormHeader>
+    </StyledStickyHeader>
+  );
+  const noDbHeader = (
+    <StyledFormHeader>
+      <div className="select-db">
+        <p className="helper-top"> STEP 1 OF 3 </p>
+        <h4>Select a database to connect</h4>
+      </div>
+    </StyledFormHeader>
+  );
+
+  if (isLoading) return <></>;
+  if (isEditMode) {
+    return isEditHeader;
+  }
+  if (useSqlAlchemyForm) {
+    return useSqlAlchemyFormHeader;
+  }
+  if (hasConnectedDb && !editNewDb) {
+    return hasConnectedDbHeader;
+  }
+  if (db || editNewDb) {
+    return hasDbHeader;
+  }
+  return noDbHeader;
+};
+
+export default ModalHeader;
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/SqlAlchemyForm.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/SqlAlchemyForm.tsx
index 57105ebe89fa..d9221499295c 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/SqlAlchemyForm.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/SqlAlchemyForm.tsx
@@ -28,11 +28,13 @@ const SqlAlchemyTab = ({
   onInputChange,
   testConnection,
   conf,
+  isEditMode = false,
 }: {
   db: DatabaseObject | null;
   onInputChange: EventHandler<ChangeEvent<HTMLInputElement>>;
   testConnection: EventHandler<MouseEvent<HTMLElement>>;
   conf: { SQLALCHEMY_DOCS_URL: string; SQLALCHEMY_DISPLAY_TEXT: string };
+  isEditMode?: boolean;
 }) => (
   <>
     <StyledInputContainer>
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.test.jsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.test.jsx
index 1fc51e45a584..6214e997bff6 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.test.jsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.test.jsx
@@ -19,18 +19,28 @@
 import React from 'react';
 import fetchMock from 'fetch-mock';
 import userEvent from '@testing-library/user-event';
-import { render, screen, waitFor } from 'spec/helpers/testing-library';
+import {
+  render,
+  screen,
+  within,
+  cleanup,
+  act,
+} from 'spec/helpers/testing-library';
+/* -- These imports are used for the mock functions that currently don't work
+import {
+  testDatabaseConnection,
+  useSingleViewResource,
+} from 'src/views/CRUD/hooks'; */
 import DatabaseModal from './index';
 
 const dbProps = {
   show: true,
-  databaseId: 10,
   database_name: 'my database',
   sqlalchemy_uri: 'postgres://superset:superset@something:1234/superset',
 };
 
 const DATABASE_FETCH_ENDPOINT = 'glob:*/api/v1/database/10';
-const DATABASE_POST_ENDPOINT = 'glob:*/api/v1/database/';
+// const DATABASE_POST_ENDPOINT = 'glob:*/api/v1/database/';
 const AVAILABLE_DB_ENDPOINT = 'glob:*/api/v1/database/available*';
 fetchMock.config.overwriteRoutes = true;
 fetchMock.get(DATABASE_FETCH_ENDPOINT, {
@@ -46,278 +56,959 @@ fetchMock.get(DATABASE_FETCH_ENDPOINT, {
 fetchMock.mock(AVAILABLE_DB_ENDPOINT, {
   databases: [
     {
+      available_drivers: ['psycopg2'],
+      default_driver: 'psycopg2',
+      engine: 'postgresql',
+      name: 'PostgreSQL',
+      parameters: {
+        properties: {
+          database: {
+            description: 'Database name',
+            type: 'string',
+          },
+          encryption: {
+            description: 'Use an encrypted connection to the database',
+            type: 'boolean',
+          },
+          host: {
+            description: 'Hostname or IP address',
+            type: 'string',
+          },
+          password: {
+            description: 'Password',
+            nullable: true,
+            type: 'string',
+          },
+          port: {
+            description: 'Database port',
+            format: 'int32',
+            maximum: 65536,
+            minimum: 0,
+            type: 'integer',
+          },
+          query: {
+            additionalProperties: {},
+            description: 'Additional parameters',
+            type: 'object',
+          },
+          username: {
+            description: 'Username',
+            nullable: true,
+            type: 'string',
+          },
+        },
+        required: ['database', 'host', 'port', 'username'],
+        type: 'object',
+      },
+      preferred: true,
+      sqlalchemy_uri_placeholder:
+        'postgresql://user:password@host:port/dbname[?key=value&key=value...]',
+    },
+    {
+      available_drivers: ['rest'],
+      engine: 'presto',
+      name: 'Presto',
+      preferred: true,
+    },
+    {
+      available_drivers: ['mysqldb'],
+      default_driver: 'mysqldb',
       engine: 'mysql',
       name: 'MySQL',
+      parameters: {
+        properties: {
+          database: {
+            description: 'Database name',
+            type: 'string',
+          },
+          encryption: {
+            description: 'Use an encrypted connection to the database',
+            type: 'boolean',
+          },
+          host: {
+            description: 'Hostname or IP address',
+            type: 'string',
+          },
+          password: {
+            description: 'Password',
+            nullable: true,
+            type: 'string',
+          },
+          port: {
+            description: 'Database port',
+            format: 'int32',
+            maximum: 65536,
+            minimum: 0,
+            type: 'integer',
+          },
+          query: {
+            additionalProperties: {},
+            description: 'Additional parameters',
+            type: 'object',
+          },
+          username: {
+            description: 'Username',
+            nullable: true,
+            type: 'string',
+          },
+        },
+        required: ['database', 'host', 'port', 'username'],
+        type: 'object',
+      },
+      preferred: true,
+      sqlalchemy_uri_placeholder:
+        'mysql://user:password@host:port/dbname[?key=value&key=value...]',
+    },
+    {
+      available_drivers: ['pysqlite'],
+      engine: 'sqlite',
+      name: 'SQLite',
+      preferred: true,
+    },
+    {
+      available_drivers: ['rest'],
+      engine: 'druid',
+      name: 'Apache Druid',
       preferred: false,
     },
+    {
+      available_drivers: ['bigquery'],
+      default_driver: 'bigquery',
+      engine: 'bigquery',
+      name: 'Google BigQuery',
+      parameters: {
+        properties: {
+          credentials_info: {
+            description: 'Contents of BigQuery JSON credentials.',
+            type: 'string',
+            'x-encrypted-extra': true,
+          },
+          query: {
+            type: 'object',
+          },
+        },
+        type: 'object',
+      },
+      preferred: false,
+      sqlalchemy_uri_placeholder: 'bigquery://{project_id}',
+    },
   ],
 });
 
 describe('DatabaseModal', () => {
-  afterEach(fetchMock.restore);
-  describe('initial load', () => {
-    it('hides the forms from the db when not selected', () => {
-      render(<DatabaseModal show databaseId={1} />, { useRedux: true });
-      // Select Advanced tab
-      const advancedTab = screen.getByRole('tab', {
-        name: /advanced/i,
-      });
-      userEvent.click(advancedTab);
-      // Select SQL Lab tab
-      const sqlLabSettingsTab = screen.getByRole('tab', {
-        name: /sql lab/i,
+  const renderAndWait = async () => {
+    const mounted = act(async () => {
+      render(<DatabaseModal {...dbProps} />, {
+        useRedux: true,
       });
-      userEvent.click(sqlLabSettingsTab);
-
-      const exposeInSqlLab = screen.getByText('Expose in SQL Lab');
-      const exposeChoicesForm = exposeInSqlLab.parentElement.nextSibling;
-      const schemaField = screen.getByText('CTAS & CVAS SCHEMA').parentElement;
-      expect(exposeChoicesForm).not.toHaveClass('open');
-      expect(schemaField).not.toHaveClass('open');
     });
+
+    return mounted;
+  };
+
+  beforeEach(async () => {
+    await renderAndWait();
   });
-  it('renders all settings when "Expose in SQL Lab" is checked', () => {
-    render(<DatabaseModal {...dbProps} />, { useRedux: true });
 
-    // Select Advanced tab
-    const advancedTab = screen.getByRole('tab', {
-      name: /advanced/i,
+  afterEach(cleanup);
+
+  describe('Visual: New database connection', () => {
+    it('renders the initial load of Step 1 correctly', async () => {
+      // ---------- Components ----------
+      // <TabHeader> - AntD header
+      const closeButton = screen.getByLabelText('Close');
+      const step1Header = screen.getByRole('heading', {
+        name: /connect a database/i,
+      });
+      // <ModalHeader> - Connection header
+      const step1Helper = screen.getByText(/step 1 of 3/i);
+      const selectDbHeader = screen.getByRole('heading', {
+        name: /select a database to connect/i,
+      });
+      // <IconButton> - Preferred database buttons
+      const preferredDbButtonPostgreSQL = screen.getByRole('button', {
+        name: /postgresql/i,
+      });
+      const preferredDbTextPostgreSQL = within(
+        preferredDbButtonPostgreSQL,
+      ).getByText(/postgresql/i);
+      const preferredDbButtonPresto = screen.getByRole('button', {
+        name: /presto/i,
+      });
+      const preferredDbTextPresto = within(preferredDbButtonPresto).getByText(
+        /presto/i,
+      );
+      const preferredDbButtonMySQL = screen.getByRole('button', {
+        name: /mysql/i,
+      });
+      const preferredDbTextMySQL = within(preferredDbButtonMySQL).getByText(
+        /mysql/i,
+      );
+      const preferredDbButtonSQLite = screen.getByRole('button', {
+        name: /sqlite/i,
+      });
+      const preferredDbTextSQLite = within(preferredDbButtonSQLite).getByText(
+        /sqlite/i,
+      );
+      // All dbs render with this icon in this testing environment,
+      // The Icon count should equal the count of databases rendered
+      const preferredDbIcon = screen.getAllByRole('img', {
+        name: /default-icon/i,
+      });
+      // renderAvailableSelector() => <Select> - Supported databases selector
+      const supportedDbsHeader = screen.getByRole('heading', {
+        name: /or choose from a list of other databases we support:/i,
+      });
+      const selectorLabel = screen.getByText(/supported databases/i);
+      const selectorPlaceholder = screen.getByText(/choose a database\.\.\./i);
+      const selectorArrow = screen.getByRole('img', {
+        name: /down/i,
+        hidden: true,
+      });
+
+      // ---------- TODO (lyndsiWilliams): Selector options, can't seem to get these to render properly.
+
+      // renderAvailableSelector() => <Alert> - Supported databases alert
+      const alertIcon = screen.getByRole('img', { name: /info icon/i });
+      const alertMessage = screen.getByText(/want to add a new database\?/i);
+      const alertDescription = screen.getByText(
+        /any databases that allow connections via sql alchemy uris can be added\. learn about how to connect a database driver \./i,
+      );
+      const alertLink = screen.getByRole('link', { name: /here/i });
+
+      // ---------- Assertions ----------
+      const visibleComponents = [
+        closeButton,
+        step1Header,
+        step1Helper,
+        selectDbHeader,
+        supportedDbsHeader,
+        selectorLabel,
+        selectorPlaceholder,
+        selectorArrow,
+        alertIcon,
+        alertMessage,
+        alertDescription,
+        alertLink,
+        preferredDbButtonPostgreSQL,
+        preferredDbButtonPresto,
+        preferredDbButtonMySQL,
+        preferredDbButtonSQLite,
+        preferredDbIcon[0],
+        preferredDbIcon[1],
+        preferredDbIcon[2],
+        preferredDbIcon[3],
+        preferredDbTextPostgreSQL,
+        preferredDbTextPresto,
+        preferredDbTextMySQL,
+        preferredDbTextSQLite,
+      ];
+
+      visibleComponents.forEach(component => {
+        expect(component).toBeVisible();
+      });
+      // This is how many preferred databases are rendered
+      expect(preferredDbIcon).toHaveLength(4);
     });
-    userEvent.click(advancedTab);
 
-    // Select SQL Lab tab
-    const sqlLabSettingsTab = screen.getByRole('tab', {
-      name: /sql lab/i,
+    it('renders the "Basic" tab of SQL Alchemy form (step 2 of 2) correctly', async () => {
+      // On step 1, click dbButton to access SQL Alchemy form
+      userEvent.click(
+        screen.getByRole('button', {
+          name: /sqlite/i,
+        }),
+      );
+
+      // ---------- Components ----------
+      // <TabHeader> - AntD header
+      const closeButton = screen.getByRole('button', { name: /close/i });
+      const basicHeader = screen.getByRole('heading', {
+        name: /connect a database/i,
+      });
+      // <ModalHeader> - Connection header
+      const basicHelper = screen.getByText(/step 2 of 2/i);
+      const basicHeaderTitle = screen.getByText(/enter primary credentials/i);
+      const basicHeaderSubtitle = screen.getByText(
+        /need help\? learn how to connect your database \./i,
+      );
+      const basicHeaderLink = within(basicHeaderSubtitle).getByRole('link', {
+        name: /here/i,
+      });
+      // <Tabs> - Basic/Advanced tabs
+      const basicTab = screen.getByRole('tab', { name: /basic/i });
+      const advancedTab = screen.getByRole('tab', { name: /advanced/i });
+      // <StyledBasicTab> - Basic tab's content
+      const displayNameLabel = screen.getByText(/display name*/i);
+      const displayNameInput = screen.getByTestId('database-name-input');
+      const displayNameHelper = screen.getByText(
+        /pick a name to help you identify this database\./i,
+      );
+      const SQLURILabel = screen.getByText(/sqlalchemy uri*/i);
+      const SQLURIInput = screen.getByTestId('sqlalchemy-uri-input');
+      const SQLURIHelper = screen.getByText(
+        /refer to the for more information on how to structure your uri\./i,
+      );
+      const testConnectionButton = screen.getByRole('button', {
+        name: /test connection/i,
+      });
+      // <Alert> - Basic tab's alert
+      const alertIcon = screen.getByRole('img', { name: /info icon/i });
+      const alertMessage = screen.getByText(
+        /additional fields may be required/i,
+      );
+      const alertDescription = screen.getByText(
+        /select databases require additional fields to be completed in the advanced tab to successfully connect the database\. learn what requirements your databases has \./i,
+      );
+      const alertLink = within(alertDescription).getByRole('link', {
+        name: /here/i,
+      });
+      // renderModalFooter() - Basic tab's footer
+      const backButton = screen.getByRole('button', { name: /back/i });
+      const connectButton = screen.getByRole('button', { name: 'Connect' });
+
+      // ---------- Assertions ----------
+      const visibleComponents = [
+        closeButton,
+        basicHeader,
+        basicHelper,
+        basicHeaderTitle,
+        basicHeaderSubtitle,
+        basicHeaderLink,
+        basicTab,
+        advancedTab,
+        displayNameLabel,
+        displayNameInput,
+        displayNameHelper,
+        SQLURILabel,
+        SQLURIInput,
+        SQLURIHelper,
+        testConnectionButton,
+        alertIcon,
+        alertMessage,
+        alertDescription,
+        alertLink,
+        backButton,
+        connectButton,
+      ];
+
+      visibleComponents.forEach(component => {
+        expect(component).toBeVisible();
+      });
     });
 
-    userEvent.click(sqlLabSettingsTab);
+    it('renders the unexpanded "Advanced" tab correctly', async () => {
+      // On step 1, click dbButton to access step 2
+      userEvent.click(
+        screen.getByRole('button', {
+          name: /sqlite/i,
+        }),
+      );
+      // Click the "Advanced" tab
+      userEvent.click(screen.getByRole('tab', { name: /advanced/i }));
+
+      // ---------- Components ----------
+      // <TabHeader> - AntD header
+      const closeButton = screen.getByRole('button', { name: /close/i });
+      const advancedHeader = screen.getByRole('heading', {
+        name: /connect a database/i,
+      });
+      // <ModalHeader> - Connection header
+      const basicHelper = screen.getByText(/step 2 of 2/i);
+      const basicHeaderTitle = screen.getByText(/enter primary credentials/i);
+      const basicHeaderSubtitle = screen.getByText(
+        /need help\? learn how to connect your database \./i,
+      );
+      const basicHeaderLink = within(basicHeaderSubtitle).getByRole('link', {
+        name: /here/i,
+      });
+      // <Tabs> - Basic/Advanced tabs
+      const basicTab = screen.getByRole('tab', { name: /basic/i });
+      const advancedTab = screen.getByRole('tab', { name: /advanced/i });
+      // <ExtraOptions> - Advanced tabs
+      const sqlLabTab = screen.getByRole('tab', {
+        name: /right sql lab adjust how this database will interact with sql lab\./i,
+      });
+      const sqlLabTabArrow = within(sqlLabTab).getByRole('img', {
+        name: /right/i,
+      });
+      const sqlLabTabHeading = screen.getByRole('heading', {
+        name: /sql lab/i,
+      });
+      const performanceTab = screen.getByRole('tab', {
+        name: /right performance adjust performance settings of this database\./i,
+      });
+      const performanceTabArrow = within(performanceTab).getByRole('img', {
+        name: /right/i,
+      });
+      const performanceTabHeading = screen.getByRole('heading', {
+        name: /performance/i,
+      });
+      const securityTab = screen.getByRole('tab', {
+        name: /right security add extra connection information\./i,
+      });
+      const securityTabArrow = within(securityTab).getByRole('img', {
+        name: /right/i,
+      });
+      const securityTabHeading = screen.getByRole('heading', {
+        name: /security/i,
+      });
+      const otherTab = screen.getByRole('tab', {
+        name: /right other additional settings\./i,
+      });
+      const otherTabArrow = within(otherTab).getByRole('img', {
+        name: /right/i,
+      });
+      const otherTabHeading = screen.getByRole('heading', { name: /other/i });
+      // renderModalFooter() - Advanced tab's footer
+      const backButton = screen.getByRole('button', { name: /back/i });
+      const connectButton = screen.getByRole('button', { name: 'Connect' });
+
+      // ---------- Assertions ----------
+      const visibleComponents = [
+        closeButton,
+        advancedHeader,
+        basicHelper,
+        basicHeaderTitle,
+        basicHeaderSubtitle,
+        basicHeaderLink,
+        basicTab,
+        advancedTab,
+        sqlLabTab,
+        sqlLabTabArrow,
+        sqlLabTabHeading,
+        performanceTab,
+        performanceTabArrow,
+        performanceTabHeading,
+        securityTab,
+        securityTabArrow,
+        securityTabHeading,
+        otherTab,
+        otherTabArrow,
+        otherTabHeading,
+        backButton,
+        connectButton,
+      ];
+
+      visibleComponents.forEach(component => {
+        expect(component).toBeVisible();
+      });
+    });
 
-    // Grab all SQL Lab settings by their labels
-    // const exposeInSqlLab = screen.getByText('Expose in SQL Lab');
-    const exposeInSqlLab = screen.getByRole('checkbox', {
-      name: /expose in sql lab/i,
+    it('renders the "Advanced" - SQL LAB tab correctly (unexpanded)', async () => {
+      // ---------- Components ----------
+      // On step 1, click dbButton to access step 2
+      userEvent.click(
+        screen.getByRole('button', {
+          name: /sqlite/i,
+        }),
+      );
+      // Click the "Advanced" tab
+      userEvent.click(screen.getByRole('tab', { name: /advanced/i }));
+      // Click the "SQL Lab" tab
+      userEvent.click(
+        screen.getByRole('tab', {
+          name: /right sql lab adjust how this database will interact with sql lab\./i,
+        }),
+      );
+
+      // ----- BEGIN STEP 2 (ADVANCED - SQL LAB)
+      // <TabHeader> - AntD header
+      const closeButton = screen.getByRole('button', { name: /close/i });
+      const advancedHeader = screen.getByRole('heading', {
+        name: /connect a database/i,
+      });
+      // <ModalHeader> - Connection header
+      const basicHelper = screen.getByText(/step 2 of 2/i);
+      const basicHeaderTitle = screen.getByText(/enter primary credentials/i);
+      const basicHeaderSubtitle = screen.getByText(
+        /need help\? learn how to connect your database \./i,
+      );
+      const basicHeaderLink = within(basicHeaderSubtitle).getByRole('link', {
+        name: /here/i,
+      });
+      // <Tabs> - Basic/Advanced tabs
+      const basicTab = screen.getByRole('tab', { name: /basic/i });
+      const advancedTab = screen.getByRole('tab', { name: /advanced/i });
+      // <ExtraOptions> - Advanced tabs
+      const sqlLabTab = screen.getByRole('tab', {
+        name: /right sql lab adjust how this database will interact with sql lab\./i,
+      });
+      // These are the checkbox SVGs that cover the actual checkboxes
+      const checkboxOffSVGs = screen.getAllByRole('img', {
+        name: /checkbox-off/i,
+      });
+      const tooltipIcons = screen.getAllByRole('img', {
+        name: /info-solid_small/i,
+      });
+      const exposeInSQLLabCheckbox = screen.getByRole('checkbox', {
+        name: /expose database in sql lab/i,
+      });
+      // This is both the checkbox and it's respective SVG
+      // const exposeInSQLLabCheckboxSVG = checkboxOffSVGs[0].parentElement;
+      const exposeInSQLLabText = screen.getByText(
+        /expose database in sql lab/i,
+      );
+      const allowCTASCheckbox = screen.getByRole('checkbox', {
+        name: /allow create table as/i,
+      });
+      const allowCTASText = screen.getByText(/allow create table as/i);
+      const allowCVASCheckbox = screen.getByRole('checkbox', {
+        name: /allow create table as/i,
+      });
+      const allowCVASText = screen.getByText(/allow create table as/i);
+      const CTASCVASLabelText = screen.getByText(/ctas & cvas schema/i);
+      // This grabs the whole input by placeholder text
+      const CTASCVASInput = screen.getByPlaceholderText(
+        /create or select schema\.\.\./i,
+      );
+      const CTASCVASHelperText = screen.getByText(
+        /force all tables and views to be created in this schema when clicking ctas or cvas in sql lab\./i,
+      );
+      const allowDMLCheckbox = screen.getByRole('checkbox', {
+        name: /allow dml/i,
+      });
+      const allowDMLText = screen.getByText(/allow dml/i);
+      const allowMultiSchemaMDFetchCheckbox = screen.getByRole('checkbox', {
+        name: /allow multi schema metadata fetch/i,
+      });
+      const allowMultiSchemaMDFetchText = screen.getByText(
+        /allow multi schema metadata fetch/i,
+      );
+      const enableQueryCostEstimationCheckbox = screen.getByRole('checkbox', {
+        name: /enable query cost estimation/i,
+      });
+      const enableQueryCostEstimationText = screen.getByText(
+        /enable query cost estimation/i,
+      );
+      const allowDbExplorationCheckbox = screen.getByRole('checkbox', {
+        name: /allow this database to be explored/i,
+      });
+      const allowDbExplorationText = screen.getByText(
+        /allow this database to be explored/i,
+      );
+
+      // ---------- Assertions ----------
+      const visibleComponents = [
+        closeButton,
+        advancedHeader,
+        basicHelper,
+        basicHeaderTitle,
+        basicHeaderSubtitle,
+        basicHeaderLink,
+        basicTab,
+        advancedTab,
+        sqlLabTab,
+        checkboxOffSVGs[0],
+        checkboxOffSVGs[1],
+        checkboxOffSVGs[2],
+        checkboxOffSVGs[3],
+        checkboxOffSVGs[4],
+        checkboxOffSVGs[5],
+        checkboxOffSVGs[6],
+        tooltipIcons[0],
+        tooltipIcons[1],
+        tooltipIcons[2],
+        tooltipIcons[3],
+        tooltipIcons[4],
+        tooltipIcons[5],
+        tooltipIcons[6],
+        exposeInSQLLabText,
+        allowCTASText,
+        allowCVASText,
+        CTASCVASLabelText,
+        CTASCVASInput,
+        CTASCVASHelperText,
+        allowDMLText,
+        allowMultiSchemaMDFetchText,
+        enableQueryCostEstimationText,
+        allowDbExplorationText,
+      ];
+      // These components exist in the DOM but are not visible
+      const invisibleComponents = [
+        exposeInSQLLabCheckbox,
+        allowCTASCheckbox,
+        allowCVASCheckbox,
+        allowDMLCheckbox,
+        allowMultiSchemaMDFetchCheckbox,
+        enableQueryCostEstimationCheckbox,
+        allowDbExplorationCheckbox,
+      ];
+
+      visibleComponents.forEach(component => {
+        expect(component).toBeVisible();
+      });
+      invisibleComponents.forEach(component => {
+        expect(component).not.toBeVisible();
+      });
+      expect(checkboxOffSVGs).toHaveLength(7);
+      expect(tooltipIcons).toHaveLength(7);
     });
 
-    expect(exposeInSqlLab).not.toBeChecked();
-    userEvent.click(exposeInSqlLab);
+    it('renders the "Advanced" - PERFORMANCE tab correctly', async () => {
+      // ---------- Components ----------
+      // On step 1, click dbButton to access step 2
+      userEvent.click(
+        screen.getByRole('button', {
+          name: /sqlite/i,
+        }),
+      );
+      // Click the "Advanced" tab
+      userEvent.click(screen.getByRole('tab', { name: /advanced/i }));
+      // Click the "Performance" tab
+      userEvent.click(
+        screen.getByRole('tab', {
+          name: /right performance adjust performance settings of this database\./i,
+        }),
+      );
+
+      // ----- BEGIN STEP 2 (ADVANCED - PERFORMANCE)
+      // <TabHeader> - AntD header
+      const closeButton = screen.getByRole('button', { name: /close/i });
+      const advancedHeader = screen.getByRole('heading', {
+        name: /connect a database/i,
+      });
+      // <ModalHeader> - Connection header
+      const basicHelper = screen.getByText(/step 2 of 2/i);
+      const basicHeaderTitle = screen.getByText(/enter primary credentials/i);
+      const basicHeaderSubtitle = screen.getByText(
+        /need help\? learn how to connect your database \./i,
+      );
+      const basicHeaderLink = within(basicHeaderSubtitle).getByRole('link', {
+        name: /here/i,
+      });
+      // <Tabs> - Basic/Advanced tabs
+      const basicTab = screen.getByRole('tab', { name: /basic/i });
+      const advancedTab = screen.getByRole('tab', { name: /advanced/i });
+      // <ExtraOptions> - Advanced tabs
+      const sqlLabTab = screen.getByRole('tab', {
+        name: /right sql lab adjust how this database will interact with sql lab\./i,
+      });
+      const performanceTab = screen.getByRole('tab', {
+        name: /right performance adjust performance settings of this database\./i,
+      });
+
+      // ---------- Assertions ----------
+      const visibleComponents = [
+        closeButton,
+        advancedHeader,
+        basicHelper,
+        basicHeaderTitle,
+        basicHeaderSubtitle,
+        basicHeaderLink,
+        basicTab,
+        advancedTab,
+        sqlLabTab,
+        performanceTab,
+      ];
+
+      visibleComponents.forEach(component => {
+        expect(component).toBeVisible();
+      });
+    });
 
-    // While checked make sure all checkboxes are showing
-    expect(exposeInSqlLab).toBeChecked();
-    const checkboxes = screen
-      .getAllByRole('checkbox')
-      .filter(checkbox => !checkbox.checked);
+    it('renders the "Advanced" - SECURITY tab correctly', async () => {
+      // ---------- Components ----------
+      // On step 1, click dbButton to access step 2
+      userEvent.click(
+        screen.getByRole('button', {
+          name: /sqlite/i,
+        }),
+      );
+      // Click the "Advanced" tab
+      userEvent.click(screen.getByRole('tab', { name: /advanced/i }));
+      // Click the "Security" tab
+      userEvent.click(
+        screen.getByRole('tab', {
+          name: /right security add extra connection information\./i,
+        }),
+      );
+
+      // ----- BEGIN STEP 2 (ADVANCED - SECURITY)
+      // <TabHeader> - AntD header
+      const closeButton = screen.getByRole('button', { name: /close/i });
+      const advancedHeader = screen.getByRole('heading', {
+        name: /connect a database/i,
+      });
+      // <ModalHeader> - Connection header
+      const basicHelper = screen.getByText(/step 2 of 2/i);
+      const basicHeaderTitle = screen.getByText(/enter primary credentials/i);
+      const basicHeaderSubtitle = screen.getByText(
+        /need help\? learn how to connect your database \./i,
+      );
+      const basicHeaderLink = within(basicHeaderSubtitle).getByRole('link', {
+        name: /here/i,
+      });
+      // <Tabs> - Basic/Advanced tabs
+      const basicTab = screen.getByRole('tab', { name: /basic/i });
+      const advancedTab = screen.getByRole('tab', { name: /advanced/i });
+      // <ExtraOptions> - Advanced tabs
+      const sqlLabTab = screen.getByRole('tab', {
+        name: /right sql lab adjust how this database will interact with sql lab\./i,
+      });
+      const performanceTab = screen.getByRole('tab', {
+        name: /right performance adjust performance settings of this database\./i,
+      });
+      const securityTab = screen.getByRole('tab', {
+        name: /right security add extra connection information\./i,
+      });
 
-    expect(checkboxes.length).toEqual(4);
-  });
+      // ---------- Assertions ----------
+      const visibleComponents = [
+        closeButton,
+        advancedHeader,
+        basicHelper,
+        basicHeaderTitle,
+        basicHeaderSubtitle,
+        basicHeaderLink,
+        basicTab,
+        advancedTab,
+        sqlLabTab,
+        performanceTab,
+        securityTab,
+      ];
+
+      visibleComponents.forEach(component => {
+        expect(component).toBeVisible();
+      });
+    });
 
-  it('renders the schema field when allowCTAS is checked', () => {
-    render(<DatabaseModal {...dbProps} />, { useRedux: true });
+    it('renders the "Advanced" - OTHER tab correctly', async () => {
+      // ---------- Components ----------
+      // On step 1, click dbButton to access step 2
+      userEvent.click(
+        screen.getByRole('button', {
+          name: /sqlite/i,
+        }),
+      );
+      // Click the "Advanced" tab
+      userEvent.click(screen.getByRole('tab', { name: /advanced/i }));
+      // Click the "Other" tab
+      userEvent.click(
+        screen.getByRole('tab', {
+          name: /right other additional settings\./i,
+        }),
+      );
+
+      // ----- BEGIN STEP 2 (ADVANCED - OTHER)
+      // <TabHeader> - AntD header
+      const closeButton = screen.getByRole('button', { name: /close/i });
+      const advancedHeader = screen.getByRole('heading', {
+        name: /connect a database/i,
+      });
+      // <ModalHeader> - Connection header
+      const basicHelper = screen.getByText(/step 2 of 2/i);
+      const basicHeaderTitle = screen.getByText(/enter primary credentials/i);
+      const basicHeaderSubtitle = screen.getByText(
+        /need help\? learn how to connect your database \./i,
+      );
+      const basicHeaderLink = within(basicHeaderSubtitle).getByRole('link', {
+        name: /here/i,
+      });
+      // <Tabs> - Basic/Advanced tabs
+      const basicTab = screen.getByRole('tab', { name: /basic/i });
+      const advancedTab = screen.getByRole('tab', { name: /advanced/i });
+      // <ExtraOptions> - Advanced tabs
+      const sqlLabTab = screen.getByRole('tab', {
+        name: /right sql lab adjust how this database will interact with sql lab\./i,
+      });
+      const performanceTab = screen.getByRole('tab', {
+        name: /right performance adjust performance settings of this database\./i,
+      });
+      const securityTab = screen.getByRole('tab', {
+        name: /right security add extra connection information\./i,
+      });
+      const otherTab = screen.getByRole('tab', {
+        name: /right other additional settings\./i,
+      });
 
-    // Select Advanced tab
-    const advancedTab = screen.getByRole('tab', {
-      name: /advanced/i,
+      // ---------- Assertions ----------
+      const visibleComponents = [
+        closeButton,
+        advancedHeader,
+        basicHelper,
+        basicHeaderTitle,
+        basicHeaderSubtitle,
+        basicHeaderLink,
+        basicTab,
+        advancedTab,
+        sqlLabTab,
+        performanceTab,
+        securityTab,
+        otherTab,
+      ];
+
+      visibleComponents.forEach(component => {
+        expect(component).toBeVisible();
+      });
     });
-    userEvent.click(advancedTab);
 
-    // Select SQL Lab tab
-    const sqlLabSettingsTab = screen.getByRole('tab', {
-      name: /sql lab/i,
+    it('Dynamic form', async () => {
+      // ---------- Components ----------
+      // On step 1, click dbButton to access step 2
+      userEvent.click(
+        screen.getByRole('button', {
+          name: /postgresql/i,
+        }),
+      );
+
+      expect.anything();
     });
-    userEvent.click(sqlLabSettingsTab);
-    // Grab CTAS & schema field by their labels
-    const allowCTAS = screen.getByLabelText('Allow CREATE TABLE AS');
-    const schemaField = screen.getByText('CTAS & CVAS SCHEMA').parentElement;
+  });
 
-    // While CTAS & CVAS are unchecked, schema field is not visible
-    expect(schemaField).not.toHaveClass('open');
+  describe('Functional: Create new database', () => {
+    it('directs databases to the appropriate form (dynamic vs. SQL Alchemy)', () => {
+      // ---------- Dynamic example (3-step form)
+      // Click the PostgreSQL button to enter the dynamic form
+      const postgreSQLButton = screen.getByRole('button', {
+        name: /postgresql/i,
+      });
+      userEvent.click(postgreSQLButton);
 
-    // Check "Allow CTAS" to reveal schema field
-    userEvent.click(allowCTAS);
-    expect(schemaField).toHaveClass('open');
+      // Dynamic form has 3 steps, seeing this text means the dynamic form is present
+      const dynamicFormStepText = screen.getByText(/step 2 of 3/i);
 
-    // Uncheck "Allow CTAS" to hide schema field again
-    userEvent.click(allowCTAS);
-    expect(schemaField).not.toHaveClass('open');
-  });
+      expect(dynamicFormStepText).toBeVisible();
 
-  it('renders the schema field when allowCVAS is checked', () => {
-    render(<DatabaseModal {...dbProps} />, { useRedux: true });
+      // ---------- SQL Alchemy example (2-step form)
+      // Click the back button to go back to step 1,
+      // then click the SQLite button to enter the SQL Alchemy form
+      const backButton = screen.getByRole('button', { name: /back/i });
+      userEvent.click(backButton);
 
-    // Select Advanced tab
-    const advancedTab = screen.getByRole('tab', {
-      name: /advanced/i,
-    });
-    userEvent.click(advancedTab);
+      const sqliteButton = screen.getByRole('button', {
+        name: /sqlite/i,
+      });
+      userEvent.click(sqliteButton);
 
-    // Select SQL Lab tab
-    const sqlLabSettingsTab = screen.getByRole('tab', {
-      name: /sql lab/i,
+      // SQL Alchemy form has 2 steps, seeing this text means the SQL Alchemy form is present
+      const sqlAlchemyFormStepText = screen.getByText(/step 2 of 2/i);
+
+      expect(sqlAlchemyFormStepText).toBeVisible();
     });
-    userEvent.click(sqlLabSettingsTab);
-    // Grab CVAS by it's label & schema field
-    const allowCVAS = screen.getByText('Allow CREATE VIEW AS');
-    const schemaField = screen.getByText('CTAS & CVAS SCHEMA').parentElement;
 
-    // While CTAS & CVAS are unchecked, schema field is not visible
-    expect(schemaField).not.toHaveClass('open');
+    describe('SQL Alchemy form flow', () => {
+      beforeEach(() => {
+        userEvent.click(
+          screen.getByRole('button', {
+            name: /sqlite/i,
+          }),
+        );
+      });
 
-    // Check "Allow CVAS" to reveal schema field
-    userEvent.click(allowCVAS);
-    expect(schemaField).toHaveClass('open');
+      it('enters step 2 of 2 when proper database is selected', () => {
+        const step2text = screen.getByText(/step 2 of 2/i);
+        expect(step2text).toBeVisible();
+      });
 
-    // Uncheck "Allow CVAS" to hide schema field again
-    userEvent.click(allowCVAS);
-    expect(schemaField).not.toHaveClass('open');
-  });
+      it('runs fetchResource when "Connect" is clicked', () => {
+        /* ---------- 🐞 TODO (lyndsiWilliams): function mock is not currently working 🐞 ----------
 
-  it('renders the schema field when both allowCTAS and allowCVAS are checked', () => {
-    render(<DatabaseModal {...dbProps} />, { useRedux: true });
+        // Mock useSingleViewResource
+        const mockUseSingleViewResource = jest.fn();
+        mockUseSingleViewResource.mockImplementation(useSingleViewResource);
 
-    // Select Advanced tab
-    const advancedTab = screen.getByRole('tab', {
-      name: /advanced/i,
-    });
-    userEvent.click(advancedTab);
+        const { fetchResource } = mockUseSingleViewResource('database');
 
-    // Select SQL Lab tab
-    const sqlLabSettingsTab = screen.getByRole('tab', {
-      name: /sql lab/i,
-    });
-    userEvent.click(sqlLabSettingsTab);
-    // Grab CTAS and CVAS by their labels, & schema field
-    const allowCTAS = screen.getByText('Allow CREATE TABLE AS');
-    const allowCVAS = screen.getByText('Allow CREATE VIEW AS');
-    const schemaField = screen.getByText('CTAS & CVAS SCHEMA').parentElement;
-
-    // While CTAS & CVAS are unchecked, schema field is not visible
-    expect(schemaField).not.toHaveClass('open');
-
-    // Check both "Allow CTAS" and "Allow CVAS" to reveal schema field
-    userEvent.click(allowCTAS);
-    userEvent.click(allowCVAS);
-    expect(schemaField).toHaveClass('open');
-    // Uncheck both "Allow CTAS" and "Allow CVAS" to hide schema field again
-    userEvent.click(allowCTAS);
-    userEvent.click(allowCVAS);
-
-    // Both checkboxes go unchecked, so the field should no longer render
-    expect(schemaField).not.toHaveClass('open');
-  });
+        // Invalid hook call?
+        userEvent.click(screen.getByRole('button', { name: 'Connect' }));
+        expect(fetchResource).toHaveBeenCalled();
 
-  describe('create database', () => {
-    beforeEach(() => {
-      fetchMock.post(DATABASE_POST_ENDPOINT, {
-        id: 10,
-      });
-      fetchMock.mock(AVAILABLE_DB_ENDPOINT, {
-        databases: [
-          {
-            engine: 'mysql',
-            name: 'MySQL',
-            preferred: false,
-          },
-        ],
-      });
-    });
-    const props = {
-      ...dbProps,
-      databaseId: null,
-      database_name: null,
-      sqlalchemy_uri: null,
-    };
-    it('should show a form when dynamic_form is selected', async () => {
-      render(<DatabaseModal {...props} />, { useRedux: true });
-      // it should have the correct header text
-      const headerText = screen.getByText(/connect a database/i);
-      expect(headerText).toBeVisible();
-
-      await screen.findByText(/display name/i);
-
-      // it does not fetch any databases if no id is passed in
-      expect(fetchMock.calls(DATABASE_FETCH_ENDPOINT).length).toEqual(0);
-
-      // todo we haven't hooked this up to load dynamically yet so
-      // we can't currently test it
-    });
-    it('should close the modal on save if using the sqlalchemy form', async () => {
-      const onHideMock = jest.fn();
-      render(<DatabaseModal {...props} onHide={onHideMock} />, {
-        useRedux: true,
+        The line below makes the linter happy */
+        expect.anything();
       });
-      // button should be disabled by default
-      const submitButton = screen.getByTestId('modal-confirm-button');
-      expect(submitButton).toBeDisabled();
 
-      const displayName = screen.getByTestId('database-name-input');
-      userEvent.type(displayName, 'MyTestDB');
-      expect(displayName.value).toBe('MyTestDB');
-      const sqlalchemyInput = screen.getByTestId('sqlalchemy-uri-input');
-      userEvent.type(sqlalchemyInput, 'some_url');
-      expect(sqlalchemyInput.value).toBe('some_url');
+      describe('step 2 component interaction', () => {
+        it('properly interacts with textboxes', () => {
+          const dbNametextBox = screen.getByTestId('database-name-input');
+          expect(dbNametextBox).toHaveValue('SQLite');
 
-      // button should not be disabled now
-      expect(submitButton).toBeEnabled();
+          userEvent.type(dbNametextBox, 'Different text');
+          expect(dbNametextBox).toHaveValue('SQLiteDifferent text');
 
-      await waitFor(() => {
-        userEvent.click(submitButton);
-      });
-      expect(fetchMock.calls(DATABASE_POST_ENDPOINT)).toHaveLength(1);
-      expect(onHideMock).toHaveBeenCalled();
-    });
-  });
+          const sqlAlchemyURItextBox = screen.getByTestId(
+            'sqlalchemy-uri-input',
+          );
+          expect(sqlAlchemyURItextBox).toHaveValue('');
 
-  describe('edit database', () => {
-    beforeEach(() => {
-      fetchMock.mock(AVAILABLE_DB_ENDPOINT, {
-        databases: [
-          {
-            engine: 'mysql',
-            name: 'MySQL',
-            preferred: false,
-          },
-        ],
-      });
-    });
-    it('renders the sqlalchemy form when the sqlalchemy_form configuration method is set', async () => {
-      render(<DatabaseModal {...dbProps} />, { useRedux: true });
+          userEvent.type(sqlAlchemyURItextBox, 'Different text');
+          expect(sqlAlchemyURItextBox).toHaveValue('Different text');
+        });
 
-      // it should have tabs
-      const tabs = screen.getAllByRole('tab');
-      expect(tabs.length).toEqual(2);
-      expect(tabs[0]).toHaveTextContent('Basic');
-      expect(tabs[1]).toHaveTextContent('Advanced');
+        it('runs testDatabaseConnection when "TEST CONNECTION" is clicked', () => {
+          /* ---------- 🐞 TODO (lyndsiWilliams): function mock is not currently working 🐞 ----------
 
-      // it should have the correct header text
-      const headerText = screen.getByText(/edit database/i);
-      expect(headerText).toBeVisible();
+          // Mock testDatabaseConnection
+          const mockTestDatabaseConnection = jest.fn();
+          mockTestDatabaseConnection.mockImplementation(testDatabaseConnection);
 
-      // todo add more when this form is built out
-    });
-    it('renders the dynamic form when the dynamic_form configuration method is set', async () => {
-      fetchMock.get(DATABASE_FETCH_ENDPOINT, {
-        result: {
-          id: 10,
-          database_name: 'my database',
-          expose_in_sqllab: false,
-          allow_ctas: false,
-          allow_cvas: false,
-          configuration_method: 'dynamic_form',
-          parameters: {
-            database: 'mydatabase',
-          },
-        },
+          userEvent.click(
+            screen.getByRole('button', {
+              name: /test connection/i,
+            }),
+          );
+
+          expect(mockTestDatabaseConnection).toHaveBeenCalled();
+
+          The line below makes the linter happy */
+          expect.anything();
+        });
       });
-      render(<DatabaseModal {...dbProps} />, { useRedux: true });
+    });
 
-      await screen.findByText(/todo/i);
+    describe('Dynamic form flow', () => {
+      beforeEach(() => {
+        userEvent.click(
+          screen.getByRole('button', {
+            name: /postgresql/i,
+          }),
+        );
+      });
 
-      // // it should have tabs
-      const tabs = screen.getAllByRole('tab');
-      expect(tabs.length).toEqual(2);
+      it('enters step 2 of 3 when proper database is selected', () => {
+        const step2of3text = screen.getByText(/step 2 of 3/i);
+        expect(step2of3text).toBeVisible();
+      });
 
-      // it should show a TODO for now
-      const todoText = screen.getAllByText(/todo/i);
-      expect(todoText[0]).toBeVisible();
+      it('enters form credentials and runs fetchResource when "Connect" is clicked', () => {
+        const textboxes = screen.getAllByRole('textbox');
+        const hostField = textboxes[0];
+        const portField = screen.getByRole('spinbutton');
+        const databaseNameField = textboxes[1];
+        const usernameField = textboxes[2];
+        const passwordField = textboxes[3];
+
+        expect(hostField).toHaveValue('');
+        expect(portField).toHaveValue(null);
+        expect(databaseNameField).toHaveValue('');
+        expect(usernameField).toHaveValue('');
+        expect(passwordField).toHaveValue('');
+
+        userEvent.type(hostField, 'localhost');
+        userEvent.type(portField, '5432');
+        userEvent.type(databaseNameField, 'postgres');
+        userEvent.type(usernameField, 'testdb');
+        userEvent.type(passwordField, 'demoPassword');
+
+        expect(hostField).toHaveValue('localhost');
+        expect(portField).toHaveValue(5432);
+        expect(databaseNameField).toHaveValue('postgres');
+        expect(usernameField).toHaveValue('testdb');
+        expect(passwordField).toHaveValue('demoPassword');
+
+        /* ---------- 🐞 TODO (lyndsiWilliams): function mock is not currently working 🐞 ----------
+
+        // Mock useSingleViewResource
+        const mockUseSingleViewResource = jest.fn();
+        mockUseSingleViewResource.mockImplementation(useSingleViewResource);
+
+        const { fetchResource } = mockUseSingleViewResource('database');
+
+        // Invalid hook call?
+        userEvent.click(screen.getByRole('button', { name: 'Connect' }));
+        expect(fetchResource).toHaveBeenCalled();
+
+        */
+      });
     });
   });
 });
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
index 265a8561923c..55bceb736957 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -16,7 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { t, SupersetTheme } from '@superset-ui/core';
+import {
+  t,
+  SupersetTheme,
+  FeatureFlag,
+  isFeatureEnabled,
+} from '@superset-ui/core';
 import React, {
   FunctionComponent,
   useEffect,
@@ -25,45 +30,100 @@ import React, {
   Reducer,
 } from 'react';
 import Tabs from 'src/components/Tabs';
-import { Alert } from 'src/common/components';
+import { Select } from 'src/common/components';
+import Alert from 'src/components/Alert';
 import Modal from 'src/components/Modal';
 import Button from 'src/components/Button';
+import IconButton from 'src/components/IconButton';
+import InfoTooltip from 'src/components/InfoTooltip';
 import withToasts from 'src/messageToasts/enhancers/withToasts';
 import {
   testDatabaseConnection,
   useSingleViewResource,
   useAvailableDatabases,
   useDatabaseValidation,
+  getDatabaseImages,
+  getConnectionAlert,
 } from 'src/views/CRUD/hooks';
 import { useCommonConf } from 'src/views/CRUD/data/database/state';
 import {
   DatabaseObject,
   DatabaseForm,
   CONFIGURATION_METHOD,
+  CatalogObject,
 } from 'src/views/CRUD/data/database/types';
+import Loading from 'src/components/Loading';
 import ExtraOptions from './ExtraOptions';
 import SqlAlchemyForm from './SqlAlchemyForm';
-
 import DatabaseConnectionForm from './DatabaseConnectionForm';
 import {
+  antDErrorAlertStyles,
   antDAlertStyles,
+  StyledAlertMargin,
   antDModalNoPaddingStyles,
   antDModalStyles,
   antDTabsStyles,
   buttonLinkStyles,
+  alchemyButtonLinkStyles,
   TabHeader,
-  CreateHeaderSubtitle,
-  CreateHeaderTitle,
-  EditHeaderSubtitle,
-  EditHeaderTitle,
   formHelperStyles,
   formStyles,
-  StyledBasicTab,
+  StyledAlignment,
+  SelectDatabaseStyles,
+  infoTooltip,
+  StyledFooterButton,
+  StyledStickyHeader,
 } from './styles';
+import ModalHeader, { DOCUMENTATION_LINK } from './ModalHeader';
 
-const DOCUMENTATION_LINK =
-  'https://superset.apache.org/docs/databases/installing-database-drivers';
+const engineSpecificAlertMapping = {
+  gsheets: {
+    message: 'Why do I need to create a database?',
+    description:
+      'To begin using your Google Sheets, you need to create a database first. ' +
+      'Databases are used as a way to identify ' +
+      'your data so that it can be queried and visualized. This ' +
+      'database will hold all of your individual Google Sheets ' +
+      'you choose to connect here.',
+  },
+};
 
+const errorAlertMapping = {
+  CONNECTION_MISSING_PARAMETERS_ERROR: {
+    message: 'Missing Required Fields',
+    description: 'Please complete all required fields.',
+  },
+  CONNECTION_INVALID_HOSTNAME_ERROR: {
+    message: 'Could not verify the host',
+    description:
+      'The host is invalid. Please verify that this field is entered correctly.',
+  },
+  CONNECTION_PORT_CLOSED_ERROR: {
+    message: 'Port is closed',
+    description: 'Please verify that port is open to connect.',
+  },
+  CONNECTION_INVALID_PORT_ERROR: {
+    message: 'Invalid Port Number',
+    description: 'The port must be a whole number less than or equal to 65535.',
+  },
+  CONNECTION_ACCESS_DENIED_ERROR: {
+    message: 'Invalid account information',
+    description: 'Either the username or password is incorrect.',
+  },
+  CONNECTION_INVALID_PASSWORD_ERROR: {
+    message: 'Invalid account information',
+    description: 'Either the username or password is incorrect.',
+  },
+  INVALID_PAYLOAD_SCHEMA_ERROR: {
+    message: 'Incorrect Fields',
+    description: 'Please make sure all fields are filled out correctly',
+  },
+  TABLE_DOES_NOT_EXIST_ERROR: {
+    message: 'URL could not be identified',
+    description:
+      'The URL could not be identified. Please check for typos and make sure that "Type of google sheet allowed" selection matches the input',
+  },
+};
 interface DatabaseModalProps {
   addDangerToast: (msg: string) => void;
   addSuccessToast: (msg: string) => void;
@@ -82,6 +142,11 @@ enum ActionType {
   parametersChange,
   reset,
   textChange,
+  extraInputChange,
+  extraEditorChange,
+  addTableCatalogSheet,
+  removeTableCatalogSheet,
+  queryChange,
 }
 
 interface DBReducerPayloadType {
@@ -96,7 +161,10 @@ interface DBReducerPayloadType {
 type DBReducerActionType =
   | {
       type:
+        | ActionType.extraEditorChange
+        | ActionType.extraInputChange
         | ActionType.textChange
+        | ActionType.queryChange
         | ActionType.inputChange
         | ActionType.editorChange
         | ActionType.parametersChange;
@@ -109,16 +177,27 @@ type DBReducerActionType =
   | {
       type: ActionType.dbSelected;
       payload: {
+        database_name?: string;
         engine?: string;
         configuration_method: CONFIGURATION_METHOD;
       };
     }
   | {
-      type: ActionType.reset;
+      type: ActionType.reset | ActionType.addTableCatalogSheet;
+    }
+  | {
+      type: ActionType.removeTableCatalogSheet;
+      payload: {
+        indexToDelete: number;
+      };
     }
   | {
       type: ActionType.configMethodChange;
-      payload: { configuration_method: CONFIGURATION_METHOD };
+      payload: {
+        database_name?: string;
+        engine?: string;
+        configuration_method: CONFIGURATION_METHOD;
+      };
     };
 
 function dbReducer(
@@ -128,8 +207,57 @@ function dbReducer(
   const trimmedState = {
     ...(state || {}),
   };
+  let query = {};
+  let query_input = '';
+  let deserializeExtraJSON = {};
+  let extra_json: DatabaseObject['extra_json'];
 
   switch (action.type) {
+    case ActionType.extraEditorChange:
+      return {
+        ...trimmedState,
+        extra_json: {
+          ...trimmedState.extra_json,
+          [action.payload.name]: action.payload.json,
+        },
+      };
+    case ActionType.extraInputChange:
+      if (
+        action.payload.name === 'schema_cache_timeout' ||
+        action.payload.name === 'table_cache_timeout'
+      ) {
+        return {
+          ...trimmedState,
+          extra_json: {
+            ...trimmedState.extra_json,
+            metadata_cache_timeout: {
+              ...trimmedState.extra_json?.metadata_cache_timeout,
+              [action.payload.name]: action.payload.value,
+            },
+          },
+        };
+      }
+      if (action.payload.name === 'schemas_allowed_for_csv_upload') {
+        return {
+          ...trimmedState,
+          extra_json: {
+            ...trimmedState.extra_json,
+            schemas_allowed_for_csv_upload: (action.payload.value || '').split(
+              ',',
+            ),
+          },
+        };
+      }
+      return {
+        ...trimmedState,
+        extra_json: {
+          ...trimmedState.extra_json,
+          [action.payload.name]:
+            action.payload.type === 'checkbox'
+              ? action.payload.checked
+              : action.payload.value,
+        },
+      };
     case ActionType.inputChange:
       if (action.payload.type === 'checkbox') {
         return {
@@ -142,6 +270,29 @@ function dbReducer(
         [action.payload.name]: action.payload.value,
       };
     case ActionType.parametersChange:
+      if (
+        trimmedState.catalog !== undefined &&
+        action.payload.type?.startsWith('catalog')
+      ) {
+        // Formatting wrapping google sheets table catalog
+        const idx = action.payload.type?.split('-')[1];
+        const catalogToUpdate = trimmedState?.catalog[idx] || {};
+        catalogToUpdate[action.payload.name] = action.payload.value;
+
+        const paramatersCatalog = {};
+        // eslint-disable-next-line array-callback-return
+        trimmedState.catalog?.map((item: CatalogObject) => {
+          paramatersCatalog[item.name] = item.value;
+        });
+
+        return {
+          ...trimmedState,
+          parameters: {
+            ...trimmedState.parameters,
+            catalog: paramatersCatalog,
+          },
+        };
+      }
       return {
         ...trimmedState,
         parameters: {
@@ -149,35 +300,142 @@ function dbReducer(
           [action.payload.name]: action.payload.value,
         },
       };
+    case ActionType.addTableCatalogSheet:
+      if (trimmedState.catalog !== undefined) {
+        return {
+          ...trimmedState,
+          catalog: [...trimmedState.catalog, { name: '', value: '' }],
+        };
+      }
+      return {
+        ...trimmedState,
+        catalog: [{ name: '', value: '' }],
+      };
+    case ActionType.removeTableCatalogSheet:
+      trimmedState.catalog?.splice(action.payload.indexToDelete, 1);
+      return {
+        ...trimmedState,
+      };
     case ActionType.editorChange:
       return {
         ...trimmedState,
         [action.payload.name]: action.payload.json,
       };
+    case ActionType.queryChange:
+      return {
+        ...trimmedState,
+        parameters: {
+          ...trimmedState.parameters,
+          query: Object.fromEntries(new URLSearchParams(action.payload.value)),
+        },
+        query_input: action.payload.value,
+      };
     case ActionType.textChange:
       return {
         ...trimmedState,
         [action.payload.name]: action.payload.value,
       };
     case ActionType.fetched:
+      // convert all the keys in this payload into strings
+      if (action.payload.extra) {
+        extra_json = {
+          ...JSON.parse(action.payload.extra || ''),
+        } as DatabaseObject['extra_json'];
+
+        deserializeExtraJSON = {
+          ...JSON.parse(action.payload.extra || ''),
+          metadata_params: JSON.stringify(extra_json?.metadata_params),
+          engine_params: JSON.stringify(extra_json?.engine_params),
+          schemas_allowed_for_csv_upload:
+            extra_json?.schemas_allowed_for_csv_upload,
+        };
+      }
+
+      // convert query to a string and store in query_input
+      query = action.payload?.parameters?.query || {};
+      query_input = Object.entries(query)
+        .map(([key, value]) => `${key}=${value}`)
+        .join('&');
+
+      if (
+        action.payload.backend === 'bigquery' &&
+        action.payload.configuration_method ===
+          CONFIGURATION_METHOD.DYNAMIC_FORM
+      ) {
+        return {
+          ...action.payload,
+          engine: action.payload.backend,
+          configuration_method: action.payload.configuration_method,
+          extra_json: deserializeExtraJSON,
+          parameters: {
+            credentials_info: JSON.stringify(
+              action.payload?.parameters?.credentials_info || '',
+            ),
+            query,
+          },
+          query_input,
+        };
+      }
+
+      if (
+        action.payload.backend === 'gsheets' &&
+        action.payload.configuration_method ===
+          CONFIGURATION_METHOD.DYNAMIC_FORM &&
+        extra_json?.engine_params?.catalog !== undefined
+      ) {
+        // pull catalog from engine params
+        const engineParamsCatalog = extra_json?.engine_params?.catalog;
+
+        return {
+          ...action.payload,
+          engine: action.payload.backend,
+          configuration_method: action.payload.configuration_method,
+          extra_json: deserializeExtraJSON,
+          catalog: Object.keys(engineParamsCatalog).map(e => ({
+            name: e,
+            value: engineParamsCatalog[e],
+          })),
+          query_input,
+        } as DatabaseObject;
+      }
+
       return {
-        engine: trimmedState.engine,
-        configuration_method: trimmedState.configuration_method,
         ...action.payload,
+        encrypted_extra: action.payload.encrypted_extra || '',
+        engine: action.payload.backend || trimmedState.engine,
+        configuration_method: action.payload.configuration_method,
+        extra_json: deserializeExtraJSON,
+        parameters: action.payload.parameters,
+        query_input,
       };
+
     case ActionType.dbSelected:
+      return {
+        ...action.payload,
+      };
     case ActionType.configMethodChange:
       return {
         ...action.payload,
       };
     case ActionType.reset:
     default:
-      return {};
+      return null;
   }
 }
 
 const DEFAULT_TAB_KEY = '1';
-const FALSY_FORM_VALUES = [undefined, null, ''];
+
+const serializeExtra = (extraJson: DatabaseObject['extra_json']) =>
+  JSON.stringify({
+    ...extraJson,
+    metadata_params: JSON.parse((extraJson?.metadata_params as string) || '{}'),
+    engine_params: JSON.parse(
+      ((extraJson?.engine_params as unknown) as string) || '{}',
+    ),
+    schemas_allowed_for_csv_upload: (
+      extraJson?.schemas_allowed_for_csv_upload || []
+    ).filter(schema => schema !== ''),
+  });
 
 const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
   addDangerToast,
@@ -192,27 +450,53 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
   >(dbReducer, null);
   const [tabKey, setTabKey] = useState<string>(DEFAULT_TAB_KEY);
   const [availableDbs, getAvailableDbs] = useAvailableDatabases();
-  const [validationErrors, getValidation] = useDatabaseValidation();
+  const [
+    validationErrors,
+    getValidation,
+    setValidationErrors,
+  ] = useDatabaseValidation();
   const [hasConnectedDb, setHasConnectedDb] = useState<boolean>(false);
   const [dbName, setDbName] = useState('');
+  const [editNewDb, setEditNewDb] = useState<boolean>(false);
+  const [isLoading, setLoading] = useState<boolean>(false);
   const conf = useCommonConf();
-
+  const dbImages = getDatabaseImages();
+  const connectionAlert = getConnectionAlert();
   const isEditMode = !!databaseId;
+  const sslForced = isFeatureEnabled(
+    FeatureFlag.FORCE_DATABASE_CONNECTIONS_SSL,
+  );
+  const hasAlert =
+    connectionAlert || !!(db?.engine && engineSpecificAlertMapping[db.engine]);
   const useSqlAlchemyForm =
     db?.configuration_method === CONFIGURATION_METHOD.SQLALCHEMY_URI;
   const useTabLayout = isEditMode || useSqlAlchemyForm;
-
   // Database fetch logic
   const {
-    state: { loading: dbLoading, resource: dbFetched },
+    state: { loading: dbLoading, resource: dbFetched, error: dbErrors },
     fetchResource,
     createResource,
     updateResource,
+    clearError,
   } = useSingleViewResource<DatabaseObject>(
     'database',
     t('database'),
     addDangerToast,
   );
+  const isDynamic = (engine: string | undefined) =>
+    availableDbs?.databases?.find(
+      (DB: DatabaseObject) => DB.backend === engine || DB.engine === engine,
+    )?.parameters !== undefined;
+  const showDBError = validationErrors || dbErrors;
+  const isEmpty = (data?: Object | null) =>
+    data && Object.keys(data).length === 0;
+
+  const dbModel: DatabaseForm =
+    availableDbs?.databases?.find(
+      (available: { engine: string | undefined }) =>
+        // TODO: we need a centralized engine in one place
+        available.engine === (isEditMode ? db?.backend : db?.engine),
+    ) || {};
 
   // Test Connection logic
   const testConnection = () => {
@@ -225,8 +509,8 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
       sqlalchemy_uri: db?.sqlalchemy_uri || '',
       database_name: db?.database_name?.trim() || undefined,
       impersonate_user: db?.impersonate_user || undefined,
-      extra: db?.extra || undefined,
-      encrypted_extra: db?.encrypted_extra || undefined,
+      extra: serializeExtra(db?.extra_json) || undefined,
+      encrypted_extra: db?.encrypted_extra || '',
       server_cert: db?.server_cert || undefined,
     };
 
@@ -236,30 +520,89 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
   const onClose = () => {
     setDB({ type: ActionType.reset });
     setHasConnectedDb(false);
+    setValidationErrors(null); // reset validation errors on close
+    clearError();
+    setEditNewDb(false);
     onHide();
   };
 
   const onSave = async () => {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { id, ...update } = db || {};
-    if (db?.id) {
-      if (db.sqlalchemy_uri) {
-        // don't pass parameters if using the sqlalchemy uri
-        delete update.parameters;
+
+    // Clone DB object
+    const dbToUpdate = JSON.parse(JSON.stringify(update));
+
+    if (dbToUpdate.configuration_method === CONFIGURATION_METHOD.DYNAMIC_FORM) {
+      // Validate DB before saving
+      await getValidation(dbToUpdate, true);
+      if (validationErrors && !isEmpty(validationErrors)) {
+        return;
       }
+
+      const engine = dbToUpdate.backend || dbToUpdate.engine;
+      if (engine === 'bigquery' && dbToUpdate.parameters?.credentials_info) {
+        // wrap encrypted_extra in credentials_info only for BigQuery
+        if (
+          dbToUpdate.parameters?.credentials_info &&
+          typeof dbToUpdate.parameters?.credentials_info === 'object' &&
+          dbToUpdate.parameters?.credentials_info.constructor === Object
+        ) {
+          // Don't cast if object
+          dbToUpdate.encrypted_extra = JSON.stringify({
+            credentials_info: dbToUpdate.parameters?.credentials_info,
+          });
+
+          // Convert credentials info string before updating
+          dbToUpdate.parameters.credentials_info = JSON.stringify(
+            dbToUpdate.parameters.credentials_info,
+          );
+        } else {
+          dbToUpdate.encrypted_extra = JSON.stringify({
+            credentials_info: JSON.parse(
+              dbToUpdate.parameters?.credentials_info,
+            ),
+          });
+        }
+      }
+    }
+
+    if (dbToUpdate?.parameters?.catalog) {
+      // need to stringify gsheets catalog to allow it to be seralized
+      dbToUpdate.extra_json = {
+        engine_params: JSON.stringify({
+          catalog: dbToUpdate.parameters.catalog,
+        }),
+      };
+    }
+
+    if (dbToUpdate?.extra_json) {
+      // convert extra_json to back to string
+      dbToUpdate.extra = serializeExtra(dbToUpdate?.extra_json);
+    }
+
+    if (db?.id) {
+      setLoading(true);
       const result = await updateResource(
         db.id as number,
-        update as DatabaseObject,
+        dbToUpdate as DatabaseObject,
+        dbToUpdate.configuration_method === CONFIGURATION_METHOD.DYNAMIC_FORM, // onShow toast on SQLA Forms
       );
       if (result) {
         if (onDatabaseAdd) {
           onDatabaseAdd();
         }
-        onClose();
+        if (!editNewDb) {
+          onClose();
+        }
       }
     } else if (db) {
       // Create
-      const dbId = await createResource(update as DatabaseObject);
+      setLoading(true);
+      const dbId = await createResource(
+        dbToUpdate as DatabaseObject,
+        dbToUpdate.configuration_method === CONFIGURATION_METHOD.DYNAMIC_FORM, // onShow toast on SQLA Forms
+      );
       if (dbId) {
         setHasConnectedDb(true);
         if (onDatabaseAdd) {
@@ -272,6 +615,8 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
         }
       }
     }
+    setEditNewDb(false);
+    setLoading(false);
   };
 
   const onChange = (type: any, payload: any) => {
@@ -294,16 +639,188 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
     }
   };
 
-  useEffect(() => {
-    if (show) {
-      setTabKey(DEFAULT_TAB_KEY);
-      getAvailableDbs();
+  const setDatabaseModel = (database_name: string) => {
+    if (database_name === 'Other') {
+      // Allow users to connect to DB via legacy SQLA form
       setDB({
         type: ActionType.dbSelected,
         payload: {
+          database_name,
           configuration_method: CONFIGURATION_METHOD.SQLALCHEMY_URI,
-        }, // todo hook this up to step 1
+          engine: undefined,
+        },
       });
+    } else {
+      const selectedDbModel = availableDbs?.databases.filter(
+        (db: DatabaseObject) => db.name === database_name,
+      )[0];
+      const { engine, parameters } = selectedDbModel;
+      const isDynamic = parameters !== undefined;
+      setDB({
+        type: ActionType.dbSelected,
+        payload: {
+          database_name,
+          configuration_method: isDynamic
+            ? CONFIGURATION_METHOD.DYNAMIC_FORM
+            : CONFIGURATION_METHOD.SQLALCHEMY_URI,
+          engine,
+        },
+      });
+    }
+
+    setDB({ type: ActionType.addTableCatalogSheet });
+  };
+
+  const renderAvailableSelector = () => (
+    <div className="available">
+      <h4 className="available-label">
+        Or choose from a list of other databases we support:
+      </h4>
+      <div className="control-label">Supported databases</div>
+      <Select
+        className="available-select"
+        onChange={setDatabaseModel}
+        placeholder="Choose a database..."
+      >
+        {[...(availableDbs?.databases || [])]
+          ?.sort((a: DatabaseForm, b: DatabaseForm) =>
+            a.name.localeCompare(b.name),
+          )
+          .map((database: DatabaseForm) => (
+            <Select.Option value={database.name} key={database.name}>
+              {database.name}
+            </Select.Option>
+          ))}
+        {/* Allow users to connect to DB via legacy SQLA form */}
+        <Select.Option value="Other" key="Other">
+          Other
+        </Select.Option>
+      </Select>
+      <Alert
+        showIcon
+        closable={false}
+        css={(theme: SupersetTheme) => antDAlertStyles(theme)}
+        type="info"
+        message={
+          connectionAlert?.ADD_DATABASE?.message ||
+          t('Want to add a new database?')
+        }
+        description={
+          connectionAlert?.ADD_DATABASE ? (
+            <>
+              Any databases that allow connections via SQL Alchemy URIs can be
+              added.{' '}
+              <a
+                href={connectionAlert?.ADD_DATABASE.contact_link}
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                {connectionAlert?.ADD_DATABASE.contact_description_link}
+              </a>{' '}
+              {connectionAlert?.ADD_DATABASE.description}
+            </>
+          ) : (
+            <>
+              Any databases that allow connections via SQL Alchemy URIs can be
+              added. Learn about how to connect a database driver{' '}
+              <a
+                href={DOCUMENTATION_LINK}
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                here
+              </a>
+              .
+            </>
+          )
+        }
+      />
+    </div>
+  );
+
+  const renderPreferredSelector = () => (
+    <div className="preferred">
+      {availableDbs?.databases
+        ?.filter((db: DatabaseForm) => db.preferred)
+        .map((database: DatabaseForm) => (
+          <IconButton
+            className="preferred-item"
+            onClick={() => setDatabaseModel(database.name)}
+            buttonText={database.name}
+            icon={dbImages?.[database.engine]}
+          />
+        ))}
+    </div>
+  );
+
+  const handleBackButtonOnFinish = () => {
+    if (dbFetched) {
+      fetchResource(dbFetched.id as number);
+    }
+    setEditNewDb(true);
+  };
+
+  const handleBackButtonOnConnect = () => {
+    if (editNewDb) {
+      setHasConnectedDb(false);
+    }
+    setDB({ type: ActionType.reset });
+  };
+
+  const renderModalFooter = () => {
+    if (db) {
+      // if db show back + connenct
+      if (!hasConnectedDb || editNewDb) {
+        return (
+          <>
+            <StyledFooterButton key="back" onClick={handleBackButtonOnConnect}>
+              Back
+            </StyledFooterButton>
+            <StyledFooterButton
+              key="submit"
+              buttonStyle="primary"
+              onClick={onSave}
+            >
+              Connect
+            </StyledFooterButton>
+          </>
+        );
+      }
+
+      return (
+        <>
+          <StyledFooterButton key="back" onClick={handleBackButtonOnFinish}>
+            Back
+          </StyledFooterButton>
+          <StyledFooterButton
+            key="submit"
+            buttonStyle="primary"
+            onClick={onSave}
+            data-test="modal-confirm-button"
+          >
+            Finish
+          </StyledFooterButton>
+        </>
+      );
+    }
+    return [];
+  };
+
+  const renderEditModalFooter = () => (
+    <>
+      <StyledFooterButton key="close" onClick={onClose}>
+        Close
+      </StyledFooterButton>
+      <StyledFooterButton key="submit" buttonStyle="primary" onClick={onSave}>
+        Finish
+      </StyledFooterButton>
+    </>
+  );
+  useEffect(() => {
+    if (show) {
+      setTabKey(DEFAULT_TAB_KEY);
+      getAvailableDbs();
+      setLoading(true);
     }
     if (databaseId && show) {
       fetchDB();
@@ -322,118 +839,317 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
     }
   }, [dbFetched]);
 
+  useEffect(() => {
+    if (isLoading) {
+      setLoading(false);
+    }
+  }, [availableDbs]);
+
   const tabChange = (key: string) => {
     setTabKey(key);
   };
 
-  const dbModel: DatabaseForm =
-    availableDbs?.databases?.find(
-      (available: { engine: string | undefined }) =>
-        available.engine === db?.engine,
-    ) || {};
+  const renderStepTwoAlert = () => {
+    const { hostname } = window.location;
+    let ipAlert = connectionAlert?.REGIONAL_IPS?.default || '';
+    const regionalIPs = connectionAlert?.REGIONAL_IPS || {};
+    Object.entries(regionalIPs).forEach(([ipRegion, ipRange]) => {
+      const regex = new RegExp(ipRegion);
+      if (hostname.match(regex)) {
+        ipAlert = ipRange;
+      }
+    });
+    return (
+      db?.engine && (
+        <StyledAlertMargin>
+          <Alert
+            closable={false}
+            css={(theme: SupersetTheme) => antDAlertStyles(theme)}
+            type="info"
+            showIcon
+            message={
+              engineSpecificAlertMapping[db.engine]?.message ||
+              connectionAlert?.DEFAULT?.message
+            }
+            description={
+              engineSpecificAlertMapping[db.engine]?.description ||
+              connectionAlert?.DEFAULT?.description + ipAlert
+            }
+          />
+        </StyledAlertMargin>
+      )
+    );
+  };
+
+  const errorAlert = () => {
+    if (
+      isEmpty(dbErrors) ||
+      (isEmpty(validationErrors) &&
+        !(validationErrors?.error_type in errorAlertMapping))
+    ) {
+      return <></>;
+    }
+
+    if (validationErrors) {
+      return (
+        <Alert
+          type="error"
+          css={(theme: SupersetTheme) => antDErrorAlertStyles(theme)}
+          message={
+            errorAlertMapping[validationErrors?.error_type]?.message ||
+            validationErrors?.error_type
+          }
+          description={
+            errorAlertMapping[validationErrors?.error_type]?.description ||
+            JSON.stringify(validationErrors)
+          }
+          showIcon
+          closable={false}
+        />
+      );
+    }
 
-  const disableSave =
-    !hasConnectedDb &&
-    (useSqlAlchemyForm
-      ? !(db?.database_name?.trim() && db?.sqlalchemy_uri)
-      : // disable the button if there is no dbModel.parameters or if
-        // any required fields are falsy
-        !dbModel?.parameters ||
-        !!dbModel.parameters.required.filter(field =>
-          FALSY_FORM_VALUES.includes(db?.parameters?.[field]),
-        ).length);
+    const message: Array<string> = Object.values(dbErrors);
+    return (
+      <Alert
+        type="error"
+        css={(theme: SupersetTheme) => antDErrorAlertStyles(theme)}
+        message="Database Creation Error"
+        description={message[0]}
+      />
+    );
+  };
+
+  const renderFinishState = () => {
+    if (!editNewDb) {
+      return (
+        <ExtraOptions
+          db={db as DatabaseObject}
+          onInputChange={({ target }: { target: HTMLInputElement }) =>
+            onChange(ActionType.inputChange, {
+              type: target.type,
+              name: target.name,
+              checked: target.checked,
+              value: target.value,
+            })
+          }
+          onTextChange={({ target }: { target: HTMLTextAreaElement }) =>
+            onChange(ActionType.textChange, {
+              name: target.name,
+              value: target.value,
+            })
+          }
+          onEditorChange={(payload: { name: string; json: any }) =>
+            onChange(ActionType.editorChange, payload)
+          }
+          onExtraInputChange={({ target }: { target: HTMLInputElement }) => {
+            onChange(ActionType.extraInputChange, {
+              type: target.type,
+              name: target.name,
+              checked: target.checked,
+              value: target.value,
+            });
+          }}
+          onExtraEditorChange={(payload: { name: string; json: any }) =>
+            onChange(ActionType.extraEditorChange, payload)
+          }
+        />
+      );
+    }
+    return (
+      <DatabaseConnectionForm
+        isEditMode
+        sslForced={sslForced}
+        dbModel={dbModel}
+        db={db as DatabaseObject}
+        onParametersChange={({ target }: { target: HTMLInputElement }) =>
+          onChange(ActionType.parametersChange, {
+            type: target.type,
+            name: target.name,
+            checked: target.checked,
+            value: target.value,
+          })
+        }
+        onChange={({ target }: { target: HTMLInputElement }) =>
+          onChange(ActionType.textChange, {
+            name: target.name,
+            value: target.value,
+          })
+        }
+        onQueryChange={({ target }: { target: HTMLInputElement }) =>
+          onChange(ActionType.queryChange, {
+            name: target.name,
+            value: target.value,
+          })
+        }
+        onAddTableCatalog={() =>
+          setDB({ type: ActionType.addTableCatalogSheet })
+        }
+        onRemoveTableCatalog={(idx: number) =>
+          setDB({
+            type: ActionType.removeTableCatalogSheet,
+            payload: { indexToDelete: idx },
+          })
+        }
+        getValidation={() => getValidation(db)}
+        validationErrors={validationErrors}
+      />
+    );
+  };
 
   return useTabLayout ? (
     <Modal
       css={(theme: SupersetTheme) => [
         antDTabsStyles,
-        antDModalStyles(theme),
         antDModalNoPaddingStyles,
+        antDModalStyles(theme),
         formHelperStyles(theme),
+        formStyles(theme),
       ]}
       name="database"
-      disablePrimaryButton={disableSave}
       data-test="database-modal"
-      height="600px"
       onHandledPrimaryAction={onSave}
       onHide={onClose}
       primaryButtonName={isEditMode ? t('Save') : t('Connect')}
       width="500px"
+      centered
       show={show}
       title={
         <h4>{isEditMode ? t('Edit database') : t('Connect a database')}</h4>
       }
+      footer={isEditMode ? renderEditModalFooter() : renderModalFooter()}
     >
-      {isEditMode ? (
-        <TabHeader>
-          <EditHeaderTitle>{db?.backend}</EditHeaderTitle>
-          <EditHeaderSubtitle>{dbName}</EditHeaderSubtitle>
-        </TabHeader>
-      ) : (
+      <StyledStickyHeader>
         <TabHeader>
-          <CreateHeaderTitle>Enter Primary Credentials</CreateHeaderTitle>
-          <CreateHeaderSubtitle>
-            Need help? Learn how to connect your database{' '}
-            <a
-              href={DOCUMENTATION_LINK}
-              target="_blank"
-              rel="noopener noreferrer"
-            >
-              here
-            </a>
-            .
-          </CreateHeaderSubtitle>
+          <ModalHeader
+            isLoading={isLoading}
+            isEditMode={isEditMode}
+            useSqlAlchemyForm={useSqlAlchemyForm}
+            hasConnectedDb={hasConnectedDb}
+            db={db}
+            dbName={dbName}
+            dbModel={dbModel}
+          />
         </TabHeader>
-      )}
-      <hr />
+      </StyledStickyHeader>
       <Tabs
         defaultActiveKey={DEFAULT_TAB_KEY}
         activeKey={tabKey}
         onTabClick={tabChange}
         animated={{ inkBar: true, tabPane: true }}
       >
-        <StyledBasicTab tab={<span>{t('Basic')}</span>} key="1">
+        <Tabs.TabPane tab={<span>{t('Basic')}</span>} key="1">
           {useSqlAlchemyForm ? (
-            <SqlAlchemyForm
+            <StyledAlignment>
+              <SqlAlchemyForm
+                db={db as DatabaseObject}
+                onInputChange={({ target }: { target: HTMLInputElement }) =>
+                  onChange(ActionType.inputChange, {
+                    type: target.type,
+                    name: target.name,
+                    checked: target.checked,
+                    value: target.value,
+                  })
+                }
+                conf={conf}
+                testConnection={testConnection}
+                isEditMode={isEditMode}
+              />
+              {isDynamic(db?.backend || db?.engine) && !isEditMode && (
+                <div css={(theme: SupersetTheme) => infoTooltip(theme)}>
+                  <Button
+                    buttonStyle="link"
+                    onClick={() =>
+                      setDB({
+                        type: ActionType.configMethodChange,
+                        payload: {
+                          database_name: db?.database_name,
+                          configuration_method:
+                            CONFIGURATION_METHOD.DYNAMIC_FORM,
+                          engine: db?.engine,
+                        },
+                      })
+                    }
+                    css={theme => alchemyButtonLinkStyles(theme)}
+                  >
+                    Connect this database using the dynamic form instead
+                  </Button>
+                  <InfoTooltip
+                    tooltip={t(
+                      'Click this link to switch to an alternate form that exposes only the required fields needed to connect this database.',
+                    )}
+                    viewBox="0 -6 24 24"
+                  />
+                </div>
+              )}
+            </StyledAlignment>
+          ) : (
+            <DatabaseConnectionForm
+              isEditMode
+              sslForced={sslForced}
+              dbModel={dbModel}
               db={db as DatabaseObject}
-              onInputChange={({ target }: { target: HTMLInputElement }) =>
-                onChange(ActionType.inputChange, {
+              onParametersChange={({ target }: { target: HTMLInputElement }) =>
+                onChange(ActionType.parametersChange, {
                   type: target.type,
                   name: target.name,
                   checked: target.checked,
                   value: target.value,
                 })
               }
-              conf={conf}
-              testConnection={testConnection}
+              onChange={({ target }: { target: HTMLInputElement }) =>
+                onChange(ActionType.textChange, {
+                  name: target.name,
+                  value: target.value,
+                })
+              }
+              onQueryChange={({ target }: { target: HTMLInputElement }) =>
+                onChange(ActionType.queryChange, {
+                  name: target.name,
+                  value: target.value,
+                })
+              }
+              onAddTableCatalog={() =>
+                setDB({ type: ActionType.addTableCatalogSheet })
+              }
+              onRemoveTableCatalog={(idx: number) =>
+                setDB({
+                  type: ActionType.removeTableCatalogSheet,
+                  payload: { indexToDelete: idx },
+                })
+              }
+              getValidation={() => getValidation(db)}
+              validationErrors={validationErrors}
             />
-          ) : (
-            <div>
-              <p>TODO: form</p>
-            </div>
           )}
-          <Alert
-            css={(theme: SupersetTheme) => antDAlertStyles(theme)}
-            message="Additional fields may be required"
-            description={
-              <>
-                Select databases require additional fields to be completed in
-                the Advanced tab to successfully connect the database. Learn
-                what requirements your databases has{' '}
-                <a
-                  href={DOCUMENTATION_LINK}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  here
-                </a>
-                .
-              </>
-            }
-            type="info"
-            showIcon
-          />
-        </StyledBasicTab>
+          {!isEditMode && (
+            <StyledAlertMargin>
+              <Alert
+                closable={false}
+                css={(theme: SupersetTheme) => antDAlertStyles(theme)}
+                message="Additional fields may be required"
+                showIcon
+                description={
+                  <>
+                    Select databases require additional fields to be completed
+                    in the Advanced tab to successfully connect the database.
+                    Learn what requirements your databases has{' '}
+                    <a
+                      href={DOCUMENTATION_LINK}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      className="additional-fields-alert-description"
+                    >
+                      here
+                    </a>
+                    .
+                  </>
+                }
+                type="info"
+              />
+            </StyledAlertMargin>
+          )}
+        </Tabs.TabPane>
         <Tabs.TabPane tab={<span>{t('Advanced')}</span>} key="2">
           <ExtraOptions
             db={db as DatabaseObject}
@@ -454,7 +1170,19 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
             onEditorChange={(payload: { name: string; json: any }) =>
               onChange(ActionType.editorChange, payload)
             }
+            onExtraInputChange={({ target }: { target: HTMLInputElement }) => {
+              onChange(ActionType.extraInputChange, {
+                type: target.type,
+                name: target.name,
+                checked: target.checked,
+                value: target.value,
+              });
+            }}
+            onExtraEditorChange={(payload: { name: string; json: any }) => {
+              onChange(ActionType.extraEditorChange, payload);
+            }}
           />
+          {showDBError && errorAlert()}
         </Tabs.TabPane>
       </Tabs>
     </Modal>
@@ -467,73 +1195,132 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
         formStyles(theme),
       ]}
       name="database"
-      disablePrimaryButton={disableSave}
-      height="600px"
       onHandledPrimaryAction={onSave}
       onHide={onClose}
       primaryButtonName={hasConnectedDb ? t('Finish') : t('Connect')}
       width="500px"
+      centered
       show={show}
       title={<h4>{t('Connect a database')}</h4>}
+      footer={renderModalFooter()}
     >
       {hasConnectedDb ? (
-        <ExtraOptions
-          db={db as DatabaseObject}
-          onInputChange={({ target }: { target: HTMLInputElement }) =>
-            onChange(ActionType.inputChange, {
-              type: target.type,
-              name: target.name,
-              checked: target.checked,
-              value: target.value,
-            })
-          }
-          onTextChange={({ target }: { target: HTMLTextAreaElement }) =>
-            onChange(ActionType.textChange, {
-              name: target.name,
-              value: target.value,
-            })
-          }
-          onEditorChange={(payload: { name: string; json: any }) =>
-            onChange(ActionType.editorChange, payload)
-          }
-        />
-      ) : (
         <>
-          <DatabaseConnectionForm
+          <ModalHeader
+            isLoading={isLoading}
+            isEditMode={isEditMode}
+            useSqlAlchemyForm={useSqlAlchemyForm}
+            hasConnectedDb={hasConnectedDb}
+            db={db}
+            dbName={dbName}
             dbModel={dbModel}
-            onParametersChange={({ target }: { target: HTMLInputElement }) =>
-              onChange(ActionType.parametersChange, {
-                type: target.type,
-                name: target.name,
-                checked: target.checked,
-                value: target.value,
-              })
-            }
-            onChange={({ target }: { target: HTMLInputElement }) =>
-              onChange(ActionType.textChange, {
-                name: target.name,
-                value: target.value,
-              })
-            }
-            getValidation={() => getValidation(db)}
-            validationErrors={validationErrors}
+            editNewDb={editNewDb}
           />
-          <Button
-            buttonStyle="link"
-            onClick={() =>
-              setDB({
-                type: ActionType.configMethodChange,
-                payload: {
-                  configuration_method: CONFIGURATION_METHOD.SQLALCHEMY_URI,
-                },
-              })
-            }
-            css={buttonLinkStyles}
-          >
-            Connect this database with a SQLAlchemy URI string instead
-          </Button>
+          {renderFinishState()}
+        </>
+      ) : (
+        <>
+          {/* Dyanmic Form Step 1 */}
+          {!isLoading &&
+            (!db ? (
+              <SelectDatabaseStyles>
+                <ModalHeader
+                  isLoading={isLoading}
+                  isEditMode={isEditMode}
+                  useSqlAlchemyForm={useSqlAlchemyForm}
+                  hasConnectedDb={hasConnectedDb}
+                  db={db}
+                  dbName={dbName}
+                  dbModel={dbModel}
+                />
+                {renderPreferredSelector()}
+                {renderAvailableSelector()}
+              </SelectDatabaseStyles>
+            ) : (
+              <>
+                <ModalHeader
+                  isLoading={isLoading}
+                  isEditMode={isEditMode}
+                  useSqlAlchemyForm={useSqlAlchemyForm}
+                  hasConnectedDb={hasConnectedDb}
+                  db={db}
+                  dbName={dbName}
+                  dbModel={dbModel}
+                />
+                {hasAlert && renderStepTwoAlert()}
+                <DatabaseConnectionForm
+                  db={db}
+                  sslForced={sslForced}
+                  dbModel={dbModel}
+                  onAddTableCatalog={() => {
+                    setDB({ type: ActionType.addTableCatalogSheet });
+                  }}
+                  onQueryChange={({ target }: { target: HTMLInputElement }) =>
+                    onChange(ActionType.queryChange, {
+                      name: target.name,
+                      value: target.value,
+                    })
+                  }
+                  onRemoveTableCatalog={(idx: number) => {
+                    setDB({
+                      type: ActionType.removeTableCatalogSheet,
+                      payload: { indexToDelete: idx },
+                    });
+                  }}
+                  onParametersChange={({
+                    target,
+                  }: {
+                    target: HTMLInputElement;
+                  }) =>
+                    onChange(ActionType.parametersChange, {
+                      type: target.type,
+                      name: target.name,
+                      checked: target.checked,
+                      value: target.value,
+                    })
+                  }
+                  onChange={({ target }: { target: HTMLInputElement }) =>
+                    onChange(ActionType.textChange, {
+                      name: target.name,
+                      value: target.value,
+                    })
+                  }
+                  getValidation={() => getValidation(db)}
+                  validationErrors={validationErrors}
+                />
+                <div css={(theme: SupersetTheme) => infoTooltip(theme)}>
+                  <Button
+                    data-test="sqla-connect-btn"
+                    buttonStyle="link"
+                    onClick={() =>
+                      setDB({
+                        type: ActionType.configMethodChange,
+                        payload: {
+                          engine: db.engine,
+                          configuration_method:
+                            CONFIGURATION_METHOD.SQLALCHEMY_URI,
+                          database_name: db.database_name,
+                        },
+                      })
+                    }
+                    css={buttonLinkStyles}
+                  >
+                    Connect this database with a SQLAlchemy URI string instead
+                  </Button>
+                  <InfoTooltip
+                    tooltip={t(
+                      'Click this link to switch to an alternate form that allows you to input the SQLAlchemy URL for this database manually.',
+                    )}
+                    viewBox="0 -6 24 24"
+                  />
+                </div>
+                {/* Step 2 */}
+                {showDBError && errorAlert()}
+              </>
+            ))}
         </>
       )}
+      {isLoading && <Loading />}
     </Modal>
   );
 };
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/styles.ts b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/styles.ts
index 4dac050138a3..364ee971e12d 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/styles.ts
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/styles.ts
@@ -19,28 +19,61 @@
 
 import { styled, css, SupersetTheme } from '@superset-ui/core';
 import { JsonEditor } from 'src/components/AsyncAceEditor';
-import Tabs from 'src/components/Tabs';
+import Button from 'src/components/Button';
 
 const CTAS_CVAS_SCHEMA_FORM_HEIGHT = 102;
-const EXPOSE_IN_SQLLAB_FORM_HEIGHT = CTAS_CVAS_SCHEMA_FORM_HEIGHT + 52;
+const EXPOSE_IN_SQLLAB_FORM_HEIGHT = CTAS_CVAS_SCHEMA_FORM_HEIGHT + 153;
 const EXPOSE_ALL_FORM_HEIGHT = EXPOSE_IN_SQLLAB_FORM_HEIGHT + 102;
 
 const anticonHeight = 12;
 
+export const no_margin_bottom = css`
+  margin-bottom: 0;
+`;
+
+export const marginBottom = (theme: SupersetTheme) => css`
+  margin-bottom: ${theme.gridUnit * 4}px;
+`;
+
 export const StyledFormHeader = styled.header`
   border-bottom: ${({ theme }) => `${theme.gridUnit * 0.25}px solid
     ${theme.colors.grayscale.light2};`}
-  padding-left: ${({ theme }) => theme.gridUnit * 4}px;
-  padding-right: ${({ theme }) => theme.gridUnit * 4}px;
-  margin-bottom: ${({ theme }) => theme.gridUnit * 4}px;
-  .helper {
+  padding: ${({ theme }) => theme.gridUnit * 2}px
+    ${({ theme }) => theme.gridUnit * 4}px;
+  line-height: ${({ theme }) => theme.gridUnit * 6}px;
+
+  .helper-top {
+    padding-bottom: 0;
     color: ${({ theme }) => theme.colors.grayscale.base};
     font-size: ${({ theme }) => theme.typography.sizes.s - 1}px;
+    margin: 0;
   }
+
+  .helper-bottom {
+    padding-top: 0;
+    color: ${({ theme }) => theme.colors.grayscale.base};
+    font-size: ${({ theme }) => theme.typography.sizes.s - 1}px;
+    margin: 0;
+  }
+
   h4 {
     color: ${({ theme }) => theme.colors.grayscale.dark2};
     font-weight: bold;
     font-size: ${({ theme }) => theme.typography.sizes.l}px;
+    margin: 0;
+    padding: 0;
+    line-height: ${({ theme }) => theme.gridUnit * 8}px;
+  }
+
+  .select-db {
+    padding-bottom: ${({ theme }) => theme.gridUnit * 2}px;
+    .helper {
+      margin: 0;
+    }
+
+    h4 {
+      margin: 0 0 ${({ theme }) => theme.gridUnit * 4}px;
+    }
   }
 `;
 
@@ -69,6 +102,9 @@ export const antdCollapseStyles = (theme: SupersetTheme) => css`
 `;
 
 export const antDTabsStyles = css`
+  .ant-tabs-top {
+    margin-top: 0;
+  }
   .ant-tabs-top > .ant-tabs-nav {
     margin-bottom: 0;
   }
@@ -81,16 +117,30 @@ export const antDModalNoPaddingStyles = css`
   .ant-modal-body {
     padding-left: 0;
     padding-right: 0;
+    padding-top: 0;
+  }
+`;
+
+export const infoTooltip = (theme: SupersetTheme) => css`
+  margin-bottom: ${theme.gridUnit * 5}px;
+  svg {
+    margin-bottom: ${theme.gridUnit * 0.25}px;
   }
 `;
 
+export const toggleStyle = (theme: SupersetTheme) => css`
+  padding-left: ${theme.gridUnit * 2}px;
+`;
+
 export const formScrollableStyles = (theme: SupersetTheme) => css`
-  overflow-y: scroll;
-  padding-left: ${theme.gridUnit * 4}px;
-  padding-right: ${theme.gridUnit * 4}px;
+  padding: ${theme.gridUnit * 4}px ${theme.gridUnit * 4}px 0;
 `;
 
 export const antDModalStyles = (theme: SupersetTheme) => css`
+  .ant-select-dropdown {
+    height: ${theme.gridUnit * 40}px;
+  }
+
   .ant-modal-header {
     padding: ${theme.gridUnit * 4.5}px ${theme.gridUnit * 4}px
       ${theme.gridUnit * 4}px;
@@ -100,24 +150,65 @@ export const antDModalStyles = (theme: SupersetTheme) => css`
     color: ${theme.colors.grayscale.dark1};
     opacity: 1;
   }
+
   .ant-modal-title > h4 {
     font-weight: bold;
   }
+
+  .ant-modal-body {
+    height: ${theme.gridUnit * 180.5}px;
+  }
+
+  .ant-modal-footer {
+    height: ${theme.gridUnit * 16.25}px;
+  }
 `;
 
 export const antDAlertStyles = (theme: SupersetTheme) => css`
   border: 1px solid ${theme.colors.info.base};
   padding: ${theme.gridUnit * 4}px;
-  margin: ${theme.gridUnit * 8}px 0 0;
+  margin: ${theme.gridUnit * 4}px 0;
+
   .ant-alert-message {
     color: ${theme.colors.info.dark2};
     font-size: ${theme.typography.sizes.s + 1}px;
     font-weight: bold;
   }
+
   .ant-alert-description {
     color: ${theme.colors.info.dark2};
     font-size: ${theme.typography.sizes.s + 1}px;
     line-height: ${theme.gridUnit * 4}px;
+
+    a {
+      text-decoration: underline;
+    }
+
+    .ant-alert-icon {
+      margin-right: ${theme.gridUnit * 2.5}px;
+      font-size: ${theme.typography.sizes.l + 1}px;
+      position: relative;
+      top: ${theme.gridUnit / 4}px;
+    }
+  }
+`;
+
+export const StyledAlertMargin = styled.div`
+  margin: 0 ${({ theme }) => theme.gridUnit * 4}px -${({ theme }) => theme.gridUnit * 4}px;
+`;
+
+export const antDErrorAlertStyles = (theme: SupersetTheme) => css`
+  border: ${theme.colors.error.base} 1px solid;
+  padding: ${theme.gridUnit * 4}px;
+  margin: ${theme.gridUnit * 8}px ${theme.gridUnit * 4}px;
+  color: ${theme.colors.error.dark2};
+  .ant-alert-message {
+    font-size: ${theme.typography.sizes.s + 1}px;
+    font-weight: bold;
+  }
+  .ant-alert-description {
+    font-size: ${theme.typography.sizes.s + 1}px;
+    line-height: ${theme.gridUnit * 4}px;
     .ant-alert-icon {
       margin-right: ${theme.gridUnit * 2.5}px;
       font-size: ${theme.typography.sizes.l + 1}px;
@@ -161,6 +252,7 @@ export const formStyles = (theme: SupersetTheme) => css`
       width: ${`calc(50% - ${theme.gridUnit * 4}px)`};
       & + .form-group-w-50 {
         margin-left: ${theme.gridUnit * 8}px;
+        margin-bottom: ${theme.gridUnit * 10}px;
       }
     }
   }
@@ -295,15 +387,22 @@ export const StyledExpandableForm = styled.div`
   }
 `;
 
-export const StyledBasicTab = styled(Tabs.TabPane)`
-  padding-left: ${({ theme }) => theme.gridUnit * 4}px;
-  padding-right: ${({ theme }) => theme.gridUnit * 4}px;
+export const StyledAlignment = styled.div`
+  padding: 0 ${({ theme }) => theme.gridUnit * 4}px;
   margin-top: ${({ theme }) => theme.gridUnit * 6}px;
 `;
 
-export const buttonLinkStyles = css`
+export const buttonLinkStyles = (theme: SupersetTheme) => css`
+  font-weight: 400;
+  text-transform: initial;
+  padding-right: ${theme.gridUnit * 2}px;
+`;
+
+export const alchemyButtonLinkStyles = (theme: SupersetTheme) => css`
   font-weight: 400;
   text-transform: initial;
+  padding: ${theme.gridUnit * 8}px 0 0;
+  margin-left: 0px;
 `;
 
 export const TabHeader = styled.div`
@@ -311,15 +410,18 @@ export const TabHeader = styled.div`
   flex-direction: column;
   justify-content: center;
   padding: 0px;
-  margin: 0 ${({ theme }) => theme.gridUnit * 4}px
-    ${({ theme }) => theme.gridUnit * 8}px;
+
+  .helper {
+    color: ${({ theme }) => theme.colors.grayscale.base};
+    font-size: ${({ theme }) => theme.typography.sizes.s - 1}px;
+    margin: 0px;
+  }
 `;
 
 export const CreateHeaderTitle = styled.div`
   color: ${({ theme }) => theme.colors.grayscale.dark2};
   font-weight: bold;
   font-size: ${({ theme }) => theme.typography.sizes.m}px;
-  padding: ${({ theme }) => theme.gridUnit * 1}px 0;
 `;
 
 export const CreateHeaderSubtitle = styled.div`
@@ -338,3 +440,141 @@ export const EditHeaderSubtitle = styled.div`
   font-size: ${({ theme }) => theme.typography.sizes.l}px;
   font-weight: bold;
 `;
+
+export const CredentialInfoForm = styled.div`
+  .label-select {
+    text-transform: uppercase;
+    color: ${({ theme }) => theme.colors.grayscale.dark1};
+    font-size: 11px;
+    margin: 0 5px ${({ theme }) => theme.gridUnit * 2}px;
+  }
+
+  .label-paste {
+    color: ${({ theme }) => theme.colors.grayscale.light1};
+    font-size: 11px;
+    line-height: 16px;
+  }
+
+  .input-container {
+    margin: ${({ theme }) => theme.gridUnit * 7}px 0;
+    display: flex;
+    flex-direction: column;
+}
+  }
+  .input-form {
+    height: 100px;
+    width: 100%;
+    border: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
+    border-radius: ${({ theme }) => theme.gridUnit}px;
+    resize: vertical;
+    padding: ${({ theme }) => theme.gridUnit * 1.5}px
+      ${({ theme }) => theme.gridUnit * 2}px;
+    &::placeholder {
+      color: ${({ theme }) => theme.colors.grayscale.light1};
+    }
+  }
+
+  .input-container {
+    .input-upload {
+      display: none;
+    }
+    .input-upload-current {
+      display: flex;
+      justify-content: space-between;
+    }
+    .input-upload-btn {
+      width: ${({ theme }) => theme.gridUnit * 32}px
+    }
+  }`;
+
+export const SelectDatabaseStyles = styled.div`
+  .preferred {
+    .superset-button {
+      margin-left: 0;
+    }
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    margin: ${({ theme }) => theme.gridUnit * 4}px;
+  }
+
+  .preferred-item {
+    width: 32%;
+    margin-bottom: ${({ theme }) => theme.gridUnit * 2.5}px;
+  }
+
+  .available {
+    margin: ${({ theme }) => theme.gridUnit * 4}px;
+    .available-label {
+      font-size: ${({ theme }) => theme.typography.sizes.l * 1.1}px;
+      font-weight: bold;
+      margin: ${({ theme }) => theme.gridUnit * 6}px 0;
+    }
+    .available-select {
+      width: 100%;
+    }
+  }
+
+  .label-available-select {
+    text-transform: uppercase;
+    font-size: ${({ theme }) => theme.typography.sizes.s - 1}px;
+  }
+
+  .control-label {
+    color: ${({ theme }) => theme.colors.grayscale.dark1};
+    font-size: ${({ theme }) => theme.typography.sizes.s - 1}px;
+    margin-bottom: ${({ theme }) => theme.gridUnit * 2}px;
+  }
+`;
+
+export const StyledFooterButton = styled(Button)`
+  width: ${({ theme }) => theme.gridUnit * 40}px;
+`;
+
+export const StyledStickyHeader = styled.div`
+  position: sticky;
+  top: 0;
+  z-index: ${({ theme }) => theme.zIndex.max};
+  background: ${({ theme }) => theme.colors.grayscale.light5};
+`;
+
+export const StyledCatalogTable = styled.div`
+  margin-bottom: 16px;
+
+  .catalog-type-select {
+    margin: 0 0 40px;
+  }
+
+  .gsheet-title {
+    font-size: ${({ theme }) => theme.typography.sizes.l * 1.1}px;
+    font-weight: bold;
+    margin: ${({ theme }) => theme.gridUnit * 6}px 0 16px;
+  }
+
+  .catalog-label {
+    margin: 0 0 7px;
+  }
+
+  .catalog-name {
+    display: flex;
+    .catalog-name-input {
+      width: 95%;
+      margin-bottom: 0px;
+    }
+  }
+
+  .catalog-name-url {
+    margin: 4px 0;
+    width: 95%;
+  }
+
+  .catalog-delete {
+    align-self: center;
+    background: ${({ theme }) => theme.colors.grayscale.light4};
+    margin: 5px 5px 8px 5px;
+  }
+
+  .catalog-add-btn {
+    width: 95%;
+  }
+`;
diff --git a/superset-frontend/src/views/CRUD/data/database/types.ts b/superset-frontend/src/views/CRUD/data/database/types.ts
index 1baac06f9855..d473ba50aac7 100644
--- a/superset-frontend/src/views/CRUD/data/database/types.ts
+++ b/superset-frontend/src/views/CRUD/data/database/types.ts
@@ -21,16 +21,33 @@ type DatabaseUser = {
   last_name: string;
 };
 
+export type CatalogObject = {
+  name: string;
+  value: string;
+};
+
 export type DatabaseObject = {
   // Connection + general
   id?: number;
   database_name: string;
+  name: string; // synonym to database_name
   sqlalchemy_uri?: string;
   backend?: string;
   created_by?: null | DatabaseUser;
   changed_on_delta_humanized?: string;
   changed_on?: string;
-  parameters?: { database_name?: string };
+  parameters?: {
+    database_name?: string;
+    host?: string;
+    port?: number;
+    database?: string;
+    username?: string;
+    password?: string;
+    encryption?: boolean;
+    credentials_info?: string;
+    query?: Record<string, string>;
+    catalog?: Record<string, string>;
+  };
   configuration_method: CONFIGURATION_METHOD;
   engine?: string;
 
@@ -49,10 +66,30 @@ export type DatabaseObject = {
   // Security
   encrypted_extra?: string;
   server_cert?: string;
+  allow_csv_upload?: boolean;
+  impersonate_user?: boolean;
 
   // Extra
-  impersonate_user?: boolean;
-  allow_csv_upload?: boolean;
+  extra_json?: {
+    engine_params?: {
+      catalog: Record<any, any> | string;
+    };
+    metadata_params?: {} | string;
+    metadata_cache_timeout?: {
+      schema_cache_timeout?: number; // in Performance
+      table_cache_timeout?: number; // in Performance
+    }; // No field, holds schema and table timeout
+    allows_virtual_table_explore?: boolean; // in SQL Lab
+    schemas_allowed_for_csv_upload?: string[]; // in Security
+    cancel_query_on_windows_unload?: boolean; // in Performance
+
+    version?: string;
+    cost_estimate_enabled?: boolean; // in SQL Lab
+  };
+
+  // Temporary storage
+  catalog?: Array<CatalogObject>;
+  query_input?: string;
   extra?: string;
 };
 
@@ -89,6 +126,11 @@ export type DatabaseForm = {
         nullable: boolean;
         type: string;
       };
+      credentials_info: {
+        description: string;
+        nullable: boolean;
+        type: string;
+      };
     };
     required: string[];
     type: string;
diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx
index ea184acce4ea..ec6eaa2317a3 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx
@@ -108,7 +108,7 @@ const DatasetModal: FunctionComponent<DatasetModalProps> = ({
           dbId={datasourceId}
           formMode
           handleError={addDangerToast}
-          onChange={onChange}
+          onUpdate={onChange}
           schema={currentSchema}
           tableName={currentTableName}
         />
diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx
index 7b1da3621472..f50473cb155e 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx
@@ -33,11 +33,13 @@ import { useListViewResource } from 'src/views/CRUD/hooks';
 import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
 import DatasourceModal from 'src/datasource/DatasourceModal';
 import DeleteModal from 'src/components/DeleteModal';
+import handleResourceExport from 'src/utils/export';
 import ListView, {
   ListViewProps,
   Filters,
   FilterOperator,
 } from 'src/components/ListView';
+import Loading from 'src/components/Loading';
 import SubMenu, {
   SubMenuProps,
   ButtonProps,
@@ -49,30 +51,23 @@ import { Tooltip } from 'src/components/Tooltip';
 import Icons from 'src/components/Icons';
 import FacePile from 'src/components/FacePile';
 import CertifiedIcon from 'src/components/CertifiedIcon';
+import InfoTooltip from 'src/components/InfoTooltip';
 import ImportModelsModal from 'src/components/ImportModal/index';
 import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags';
 import WarningIconWithTooltip from 'src/components/WarningIconWithTooltip';
 import AddDatasetModal from './AddDatasetModal';
-
-const PAGE_SIZE = 25;
-const PASSWORDS_NEEDED_MESSAGE = t(
-  'The passwords for the databases below are needed in order to ' +
-    'import them together with the datasets. Please note that the ' +
-    '"Secure Extra" and "Certificate" sections of ' +
-    'the database configuration are not present in export files, and ' +
-    'should be added manually after the import if they are needed.',
-);
-const CONFIRM_OVERWRITE_MESSAGE = t(
-  'You are importing one or more datasets that already exist. ' +
-    'Overwriting might cause you to lose some of your work. Are you ' +
-    'sure you want to overwrite?',
-);
+import {
+  PAGE_SIZE,
+  SORT_BY,
+  PASSWORDS_NEEDED_MESSAGE,
+  CONFIRM_OVERWRITE_MESSAGE,
+} from './constants';
 
 const FlexRowContainer = styled.div`
   align-items: center;
   display: flex;
 
-  > svg {
+  svg {
     margin-right: ${({ theme }) => theme.gridUnit}px;
   }
 `;
@@ -139,6 +134,7 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
 
   const [importingDataset, showImportModal] = useState<boolean>(false);
   const [passwordFields, setPasswordFields] = useState<string[]>([]);
+  const [preparingExport, setPreparingExport] = useState<boolean>(false);
 
   const openDatasetImportModal = () => {
     showImportModal(true);
@@ -158,7 +154,7 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
   const canCreate = hasPerm('can_write');
   const canExport = hasPerm('can_read');
 
-  const initialSort = [{ id: 'changed_on_delta_humanized', desc: true }];
+  const initialSort = SORT_BY;
 
   const openDatasetEditModal = useCallback(
     ({ id }: Dataset) => {
@@ -233,6 +229,7 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
             original: {
               extra,
               table_name: datasetTitle,
+              description,
               explore_url: exploreURL,
             },
           },
@@ -246,14 +243,19 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
                   <CertifiedIcon
                     certifiedBy={parsedExtra.certification.certified_by}
                     details={parsedExtra.certification.details}
+                    size="l"
                   />
                 )}
                 {parsedExtra?.warning_markdown && (
                   <WarningIconWithTooltip
                     warningMarkdown={parsedExtra.warning_markdown}
+                    size="l"
                   />
                 )}
                 {titleLink}
+                {description && (
+                  <InfoTooltip tooltip={description} viewBox="0 -1 24 24" />
+                )}
               </FlexRowContainer>
             );
           } catch {
@@ -555,12 +557,13 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
     );
   };
 
-  const handleBulkDatasetExport = (datasetsToExport: Dataset[]) =>
-    window.location.assign(
-      `/api/v1/dataset/export/?q=${rison.encode(
-        datasetsToExport.map(({ id }) => id),
-      )}`,
-    );
+  const handleBulkDatasetExport = (datasetsToExport: Dataset[]) => {
+    const ids = datasetsToExport.map(({ id }) => id);
+    handleResourceExport('dataset', ids, () => {
+      setPreparingExport(false);
+    });
+    setPreparingExport(true);
+  };
 
   return (
     <>
@@ -690,6 +693,7 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
         passwordFields={passwordFields}
         setPasswordFields={setPasswordFields}
       />
+      {preparingExport && <Loading />}
     </>
   );
 };
diff --git a/superset-frontend/src/views/CRUD/data/dataset/constants.ts b/superset-frontend/src/views/CRUD/data/dataset/constants.ts
new file mode 100644
index 000000000000..cb0b5d3c0adb
--- /dev/null
+++ b/superset-frontend/src/views/CRUD/data/dataset/constants.ts
@@ -0,0 +1,34 @@
+/**
+ * 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 { t } from '@superset-ui/core';
+
+export const PAGE_SIZE = 25;
+export const SORT_BY = [{ id: 'changed_on_delta_humanized', desc: true }];
+export const PASSWORDS_NEEDED_MESSAGE = t(
+  'The passwords for the databases below are needed in order to ' +
+    'import them together with the datasets. Please note that the ' +
+    '"Secure Extra" and "Certificate" sections of ' +
+    'the database configuration are not present in export files, and ' +
+    'should be added manually after the import if they are needed.',
+);
+export const CONFIRM_OVERWRITE_MESSAGE = t(
+  'You are importing one or more datasets that already exist. ' +
+    'Overwriting might cause you to lose some of your work. Are you ' +
+    'sure you want to overwrite?',
+);
diff --git a/superset-frontend/src/views/CRUD/data/query/QueryList.tsx b/superset-frontend/src/views/CRUD/data/query/QueryList.tsx
index 69640be7a333..1cfe5c2349c8 100644
--- a/superset-frontend/src/views/CRUD/data/query/QueryList.tsx
+++ b/superset-frontend/src/views/CRUD/data/query/QueryList.tsx
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { useMemo, useState, useCallback } from 'react';
-import { SupersetClient, t, styled } from '@superset-ui/core';
+import React, { useMemo, useState, useCallback, ReactElement } from 'react';
+import { SupersetClient, t, styled, useTheme } from '@superset-ui/core';
 import moment from 'moment';
 import {
   createFetchRelated,
@@ -35,7 +35,6 @@ import ListView, {
   FilterOperator,
   ListViewProps,
 } from 'src/components/ListView';
-import Icon, { IconName } from 'src/components/Icon';
 import { Tooltip } from 'src/components/Tooltip';
 import SyntaxHighlighter from 'react-syntax-highlighter/dist/cjs/light';
 import sql from 'react-syntax-highlighter/dist/cjs/languages/hljs/sql';
@@ -43,6 +42,7 @@ import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';
 import { DATETIME_WITH_TIME_ZONE, TIME_WITH_MS } from 'src/constants';
 import { QueryObject, QueryObjectColumns } from 'src/views/CRUD/types';
 
+import Icons from 'src/components/Icons';
 import QueryPreviewModal from './QueryPreviewModal';
 
 const PAGE_SIZE = 25;
@@ -80,19 +80,6 @@ const StyledPopoverItem = styled.div`
   color: ${({ theme }) => theme.colors.grayscale.dark2};
 `;
 
-const StatusIcon = styled(Icon, {
-  shouldForwardProp: prop => prop !== 'status',
-})<{ status: string }>`
-  color: ${({ status, theme }) => {
-    if (status === 'success') return theme.colors.success.base;
-    if (status === 'failed') return theme.colors.error.base;
-    if (status === 'running') return theme.colors.primary.base;
-    if (status === 'offline') return theme.colors.grayscale.light1;
-
-    return theme.colors.grayscale.base;
-  }};
-`;
-
 function QueryList({ addDangerToast, addSuccessToast }: QueryListProps) {
   const {
     state: { loading, resourceCount: queryCount, resourceCollection: queries },
@@ -109,6 +96,8 @@ function QueryList({ addDangerToast, addSuccessToast }: QueryListProps) {
     setQueryCurrentlyPreviewing,
   ] = useState<QueryObject>();
 
+  const theme = useTheme();
+
   const handleQueryPreview = useCallback(
     (id: number) => {
       SupersetClient.get({
@@ -141,44 +130,48 @@ function QueryList({ addDangerToast, addSuccessToast }: QueryListProps) {
             original: { status },
           },
         }: any) => {
-          const statusConfig = {
-            name: '',
+          const statusConfig: {
+            name: ReactElement | null;
+            label: string;
+          } = {
+            name: null,
             label: '',
-            status: '',
           };
           if (status === 'success') {
-            statusConfig.name = 'check';
+            statusConfig.name = (
+              <Icons.Check iconColor={theme.colors.success.base} />
+            );
             statusConfig.label = t('Success');
-            statusConfig.status = 'success';
-          }
-          if (status === 'failed' || status === 'stopped') {
-            statusConfig.name = 'x-small';
+          } else if (status === 'failed' || status === 'stopped') {
+            statusConfig.name = (
+              <Icons.XSmall
+                iconColor={
+                  status === 'failed'
+                    ? theme.colors.error.base
+                    : theme.colors.grayscale.base
+                }
+              />
+            );
             statusConfig.label = t('Failed');
-            statusConfig.status = 'failed';
-          }
-          if (status === 'running') {
-            statusConfig.name = 'running';
+          } else if (status === 'running') {
+            statusConfig.name = (
+              <Icons.Running iconColor={theme.colors.primary.base} />
+            );
             statusConfig.label = t('Running');
-            statusConfig.status = 'running';
-          }
-          if (status === 'timed_out') {
-            statusConfig.name = 'offline';
+          } else if (status === 'timed_out') {
+            statusConfig.name = (
+              <Icons.Offline iconColor={theme.colors.grayscale.light1} />
+            );
             statusConfig.label = t('Offline');
-            statusConfig.status = 'offline';
-          }
-          if (status === 'scheduled' || status === 'pending') {
-            statusConfig.name = 'queued';
+          } else if (status === 'scheduled' || status === 'pending') {
+            statusConfig.name = (
+              <Icons.Queued iconColor={theme.colors.grayscale.base} />
+            );
             statusConfig.label = t('Scheduled');
-            statusConfig.status = 'queued';
           }
           return (
             <Tooltip title={statusConfig.label} placement="bottom">
-              <span>
-                <StatusIcon
-                  name={statusConfig.name as IconName}
-                  status={statusConfig.status}
-                />
-              </span>
+              <span>{statusConfig.name}</span>
             </Tooltip>
           );
         },
@@ -325,7 +318,7 @@ function QueryList({ addDangerToast, addSuccessToast }: QueryListProps) {
         }: any) => (
           <Tooltip title={t('Open query in SQL Lab')} placement="bottom">
             <a href={`/superset/sqllab?queryId=${id}`}>
-              <Icon name="full" />
+              <Icons.Full iconColor={theme.colors.grayscale.base} />
             </a>
           </Tooltip>
         ),
diff --git a/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.test.jsx b/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.test.jsx
index ac6f8c293e59..2e3a1045bcfa 100644
--- a/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.test.jsx
+++ b/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.test.jsx
@@ -26,7 +26,6 @@ import { render, screen, cleanup, waitFor } from 'spec/helpers/testing-library';
 import userEvent from '@testing-library/user-event';
 import { QueryParamProvider } from 'use-query-params';
 import { act } from 'react-dom/test-utils';
-import { handleBulkSavedQueryExport } from 'src/views/CRUD/utils';
 import * as featureFlags from 'src/featureFlags';
 import SavedQueryList from 'src/views/CRUD/data/savedquery/SavedQueryList';
 import SubMenu from 'src/components/Menu/SubMenu';
@@ -285,14 +284,6 @@ describe('RTL', () => {
     expect(exportTooltip).toBeInTheDocument();
   });
 
-  it('runs handleBulkSavedQueryExport when export is clicked', () => {
-    // Grab Export action button and mock mouse clicking it
-    const exportActionButton = screen.getAllByRole('button')[18];
-    userEvent.click(exportActionButton);
-
-    expect(handleBulkSavedQueryExport).toHaveBeenCalled();
-  });
-
   it('renders an import button in the submenu', () => {
     // Grab and assert that import saved query button is visible
     const importButton = screen.getByTestId('import-button');
@@ -330,7 +321,7 @@ describe('RTL', () => {
     userEvent.click(importButton);
 
     // Grab "Choose File" input from import modal
-    const chooseFileInput = screen.getByLabelText(/file\*/i);
+    const chooseFileInput = screen.getByTestId('model-file-input');
     // Upload mocked import file
     userEvent.upload(chooseFileInput, mockImportFile);
 
diff --git a/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx b/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx
index 04a418b39dc5..9c18e9df19f3 100644
--- a/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx
+++ b/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx
@@ -25,12 +25,12 @@ import {
   createFetchRelated,
   createFetchDistinct,
   createErrorHandler,
-  handleBulkSavedQueryExport,
 } from 'src/views/CRUD/utils';
 import Popover from 'src/components/Popover';
 import withToasts from 'src/messageToasts/enhancers/withToasts';
 import { useListViewResource } from 'src/views/CRUD/hooks';
 import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
+import handleResourceExport from 'src/utils/export';
 import SubMenu, {
   SubMenuProps,
   ButtonProps,
@@ -40,6 +40,7 @@ import ListView, {
   Filters,
   FilterOperator,
 } from 'src/components/ListView';
+import Loading from 'src/components/Loading';
 import DeleteModal from 'src/components/DeleteModal';
 import ActionsBar, { ActionProps } from 'src/components/ListView/ActionsBar';
 import { Tooltip } from 'src/components/Tooltip';
@@ -117,6 +118,7 @@ function SavedQueryList({
   ] = useState<SavedQueryObject | null>(null);
   const [importingSavedQuery, showImportModal] = useState<boolean>(false);
   const [passwordFields, setPasswordFields] = useState<string[]>([]);
+  const [preparingExport, setPreparingExport] = useState<boolean>(false);
 
   const openSavedQueryImportModal = () => {
     showImportModal(true);
@@ -238,6 +240,16 @@ function SavedQueryList({
     );
   };
 
+  const handleBulkSavedQueryExport = (
+    savedQueriesToExport: SavedQueryObject[],
+  ) => {
+    const ids = savedQueriesToExport.map(({ id }) => id);
+    handleResourceExport('saved_query', ids, () => {
+      setPreparingExport(false);
+    });
+    setPreparingExport(true);
+  };
+
   const handleBulkQueryDelete = (queriesToDelete: SavedQueryObject[]) => {
     SupersetClient.delete({
       endpoint: `/api/v1/saved_query/?q=${rison.encode(
@@ -542,6 +554,7 @@ function SavedQueryList({
         passwordFields={passwordFields}
         setPasswordFields={setPasswordFields}
       />
+      {preparingExport && <Loading />}
     </>
   );
 }
diff --git a/superset-frontend/src/views/CRUD/hooks.ts b/superset-frontend/src/views/CRUD/hooks.ts
index aaa3599a6360..808d124247f1 100644
--- a/superset-frontend/src/views/CRUD/hooks.ts
+++ b/superset-frontend/src/views/CRUD/hooks.ts
@@ -20,12 +20,18 @@ import rison from 'rison';
 import { useState, useEffect, useCallback } from 'react';
 import { makeApi, SupersetClient, t, JsonObject } from '@superset-ui/core';
 
-import { createErrorHandler } from 'src/views/CRUD/utils';
+import {
+  createErrorHandler,
+  getAlreadyExists,
+  getPasswordsNeeded,
+  hasTerminalValidation,
+} from 'src/views/CRUD/utils';
 import { FetchDataConfig } from 'src/components/ListView';
 import { FilterValue } from 'src/components/ListView/types';
 import Chart, { Slice } from 'src/types/Chart';
 import copyTextToClipboard from 'src/utils/copy';
 import { getClientErrorObject } from 'src/utils/getClientErrorObject';
+import SupersetText from 'src/utils/textUtils';
 import { FavoriteStatus, ImportResourceName, DatabaseObject } from './types';
 
 interface ListViewResourceState<D extends object = any> {
@@ -205,7 +211,7 @@ export function useListViewResource<D extends object = any>(
 interface SingleViewResourceState<D extends object = any> {
   loading: boolean;
   resource: D | null;
-  error: string | Record<string, string[] | string> | null;
+  error: any | null;
 }
 
 export function useSingleViewResource<D extends object = any>(
@@ -263,7 +269,7 @@ export function useSingleViewResource<D extends object = any>(
   );
 
   const createResource = useCallback(
-    (resource: D) => {
+    (resource: D, hideToast = false) => {
       // Set loading state
       updateState({
         loading: true,
@@ -283,13 +289,16 @@ export function useSingleViewResource<D extends object = any>(
             return json.id;
           },
           createErrorHandler((errMsg: Record<string, string[] | string>) => {
-            handleErrorMsg(
-              t(
-                'An error occurred while creating %ss: %s',
-                resourceLabel,
-                parsedErrorMessage(errMsg),
-              ),
-            );
+            // we did not want toasts for db-connection-ui but did not want to disable it everywhere
+            if (!hideToast) {
+              handleErrorMsg(
+                t(
+                  'An error occurred while creating %ss: %s',
+                  resourceLabel,
+                  parsedErrorMessage(errMsg),
+                ),
+              );
+            }
 
             updateState({
               error: errMsg,
@@ -304,7 +313,7 @@ export function useSingleViewResource<D extends object = any>(
   );
 
   const updateResource = useCallback(
-    (resourceID: number, resource: D) => {
+    (resourceID: number, resource: D, hideToast = false) => {
       // Set loading state
       updateState({
         loading: true,
@@ -324,13 +333,15 @@ export function useSingleViewResource<D extends object = any>(
             return json.result;
           },
           createErrorHandler(errMsg => {
-            handleErrorMsg(
-              t(
-                'An error occurred while fetching %ss: %s',
-                resourceLabel,
-                JSON.stringify(errMsg),
-              ),
-            );
+            if (!hideToast) {
+              handleErrorMsg(
+                t(
+                  'An error occurred while fetching %ss: %s',
+                  resourceLabel,
+                  JSON.stringify(errMsg),
+                ),
+              );
+            }
 
             updateState({
               error: errMsg,
@@ -384,40 +395,6 @@ export function useImportResource(
     setState(currentState => ({ ...currentState, ...update }));
   }
 
-  /* eslint-disable no-underscore-dangle */
-  const isNeedsPassword = (payload: any) =>
-    typeof payload === 'object' &&
-    Array.isArray(payload._schema) &&
-    payload._schema.length === 1 &&
-    payload._schema[0] === 'Must provide a password for the database';
-
-  const isAlreadyExists = (payload: any) =>
-    typeof payload === 'string' &&
-    payload.includes('already exists and `overwrite=true` was not passed');
-
-  const getPasswordsNeeded = (
-    errMsg: Record<string, Record<string, string[] | string>>,
-  ) =>
-    Object.entries(errMsg)
-      .filter(([, validationErrors]) => isNeedsPassword(validationErrors))
-      .map(([fileName]) => fileName);
-
-  const getAlreadyExists = (
-    errMsg: Record<string, Record<string, string[] | string>>,
-  ) =>
-    Object.entries(errMsg)
-      .filter(([, validationErrors]) => isAlreadyExists(validationErrors))
-      .map(([fileName]) => fileName);
-
-  const hasTerminalValidation = (
-    errMsg: Record<string, Record<string, string[] | string>>,
-  ) =>
-    Object.values(errMsg).some(
-      validationErrors =>
-        !isNeedsPassword(validationErrors) &&
-        !isAlreadyExists(validationErrors),
-    );
-
   const importResource = useCallback(
     (
       bundle: File,
@@ -452,29 +429,28 @@ export function useImportResource(
         .then(() => true)
         .catch(response =>
           getClientErrorObject(response).then(error => {
-            const errMsg = error.message || error.error;
-            if (typeof errMsg === 'string') {
+            if (!error.errors) {
               handleErrorMsg(
                 t(
                   'An error occurred while importing %s: %s',
                   resourceLabel,
-                  parsedErrorMessage(errMsg),
+                  error.message || error.error,
                 ),
               );
               return false;
             }
-            if (hasTerminalValidation(errMsg)) {
+            if (hasTerminalValidation(error.errors)) {
               handleErrorMsg(
                 t(
                   'An error occurred while importing %s: %s',
                   resourceLabel,
-                  parsedErrorMessage(errMsg),
+                  error.errors.map(payload => payload.message).join('\n'),
                 ),
               );
             } else {
               updateState({
-                passwordsNeeded: getPasswordsNeeded(errMsg),
-                alreadyExists: getAlreadyExists(errMsg),
+                passwordsNeeded: getPasswordsNeeded(error.errors),
+                alreadyExists: getAlreadyExists(error.errors),
               });
             }
             return false;
@@ -625,6 +601,12 @@ export const copyQueryLink = (
     });
 };
 
+export const getDatabaseImages = () => SupersetText.DB_IMAGES;
+
+export const getConnectionAlert = () => SupersetText.DB_CONNECTION_ALERTS;
+export const getDatabaseDocumentationLinks = () =>
+  SupersetText.DB_CONNECTION_DOC_LINKS;
+
 export const testDatabaseConnection = (
   connection: DatabaseObject,
   handleErrorMsg: (errorMsg: string) => void,
@@ -649,7 +631,7 @@ export function useAvailableDatabases() {
 
   const getAvailable = useCallback(() => {
     SupersetClient.get({
-      endpoint: `/api/v1/database/available`,
+      endpoint: `/api/v1/database/available/`,
     }).then(({ json }) => {
       setAvailableDbs(json);
     });
@@ -663,7 +645,7 @@ export function useDatabaseValidation() {
     null,
   );
   const getValidation = useCallback(
-    (database: Partial<DatabaseObject> | null) => {
+    (database: Partial<DatabaseObject> | null, onCreate = false) => {
       SupersetClient.post({
         endpoint: '/api/v1/database/validate_parameters',
         body: JSON.stringify(database),
@@ -676,26 +658,85 @@ export function useDatabaseValidation() {
           if (typeof e.json === 'function') {
             e.json().then(({ errors = [] }: JsonObject) => {
               const parsedErrors = errors
-                .filter(
-                  (error: { error_type: string }) =>
-                    error.error_type !== 'CONNECTION_MISSING_PARAMETERS_ERROR',
-                )
+                .filter((error: { error_type: string }) => {
+                  const skipValidationError = ![
+                    'CONNECTION_MISSING_PARAMETERS_ERROR',
+                    'CONNECTION_ACCESS_DENIED_ERROR',
+                  ].includes(error.error_type);
+                  return skipValidationError || onCreate;
+                })
                 .reduce(
                   (
                     obj: {},
                     {
+                      error_type,
                       extra,
                       message,
                     }: {
-                      extra: { invalid?: string[] };
+                      error_type: string;
+                      extra: {
+                        invalid?: string[];
+                        missing?: string[];
+                        name: string;
+                        catalog: {
+                          name: string;
+                          url: string;
+                          idx: number;
+                        };
+                      };
                       message: string;
                     },
                   ) => {
+                    if (extra.catalog) {
+                      if (extra.catalog.name) {
+                        return {
+                          ...obj,
+                          error_type,
+                          [extra.catalog.idx]: {
+                            name: message,
+                          },
+                        };
+                      }
+                      if (extra.catalog.url) {
+                        return {
+                          ...obj,
+                          error_type,
+                          [extra.catalog.idx]: {
+                            url: message,
+                          },
+                        };
+                      }
+
+                      return {
+                        ...obj,
+                        error_type,
+                        [extra.catalog.idx]: {
+                          name: message,
+                          url: message,
+                        },
+                      };
+                    }
                     // if extra.invalid doesn't exist then the
                     // error can't be mapped to a parameter
                     // so leave it alone
                     if (extra.invalid) {
-                      return { ...obj, [extra.invalid[0]]: message };
+                      return {
+                        ...obj,
+                        [extra.invalid[0]]: message,
+                        error_type,
+                      };
+                    }
+                    if (extra.missing) {
+                      return {
+                        ...obj,
+                        error_type,
+                        ...Object.assign(
+                          {},
+                          ...extra.missing.map(field => ({
+                            [field]: 'This is a required field',
+                          })),
+                        ),
+                      };
                     }
                     return obj;
                   },
@@ -712,5 +753,5 @@ export function useDatabaseValidation() {
     [setValidationErrors],
   );
 
-  return [validationErrors, getValidation] as const;
+  return [validationErrors, getValidation, setValidationErrors] as const;
 }
diff --git a/superset-frontend/src/views/CRUD/storageKeys.ts b/superset-frontend/src/views/CRUD/storageKeys.ts
new file mode 100644
index 000000000000..5002420aa777
--- /dev/null
+++ b/superset-frontend/src/views/CRUD/storageKeys.ts
@@ -0,0 +1,24 @@
+/**
+ * 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.
+ */
+
+// storage keys for welcome page sticky tabs and tables
+export const HOMEPAGE_CHART_FILTER = 'homepage_chart_filter';
+export const HOMEPAGE_ACTIVITY_FILTER = 'homepage_activity_filter';
+export const HOMEPAGE_DASHBOARD_FILTER = 'homepage_dashboard_filter';
+export const HOMEPAGE_COLLAPSE_STATE = 'homepage_collapse_state';
diff --git a/superset-frontend/src/views/CRUD/types.ts b/superset-frontend/src/views/CRUD/types.ts
index a312c4000458..d08ca46a692e 100644
--- a/superset-frontend/src/views/CRUD/types.ts
+++ b/superset-frontend/src/views/CRUD/types.ts
@@ -23,10 +23,16 @@ export type FavoriteStatus = {
   [id: number]: boolean;
 };
 
+export enum TableTabTypes {
+  FAVORITE = 'Favorite',
+  MINE = 'Mine',
+  EXAMPLES = 'Examples',
+}
+
 export type Filters = {
   col: string;
   opr: string;
-  value: string;
+  value: string | number;
 };
 
 export interface DashboardTableProps {
@@ -37,6 +43,7 @@ export interface DashboardTableProps {
   mine: Array<Dashboard>;
   showThumbnails?: boolean;
   featureFlag?: boolean;
+  examples: Array<Dashboard>;
 }
 
 export interface Dashboard {
diff --git a/superset-frontend/src/views/CRUD/utils.test.tsx b/superset-frontend/src/views/CRUD/utils.test.tsx
new file mode 100644
index 000000000000..24cb0ce97fc2
--- /dev/null
+++ b/superset-frontend/src/views/CRUD/utils.test.tsx
@@ -0,0 +1,145 @@
+/**
+ * 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 {
+  isNeedsPassword,
+  isAlreadyExists,
+  getPasswordsNeeded,
+  getAlreadyExists,
+  hasTerminalValidation,
+} from 'src/views/CRUD/utils';
+
+const terminalErrors = {
+  errors: [
+    {
+      message: 'Error importing database',
+      error_type: 'GENERIC_COMMAND_ERROR',
+      level: 'warning',
+      extra: {
+        'metadata.yaml': { type: ['Must be equal to Database.'] },
+        issue_codes: [
+          {
+            code: 1010,
+            message:
+              'Issue 1010 - Superset encountered an error while running a command.',
+          },
+        ],
+      },
+    },
+  ],
+};
+
+const overwriteNeededErrors = {
+  errors: [
+    {
+      message: 'Error importing database',
+      error_type: 'GENERIC_COMMAND_ERROR',
+      level: 'warning',
+      extra: {
+        'databases/imported_database.yaml':
+          'Database already exists and `overwrite=true` was not passed',
+        issue_codes: [
+          {
+            code: 1010,
+            message:
+              'Issue 1010 - Superset encountered an error while running a command.',
+          },
+        ],
+      },
+    },
+  ],
+};
+
+const passwordNeededErrors = {
+  errors: [
+    {
+      message: 'Error importing database',
+      error_type: 'GENERIC_COMMAND_ERROR',
+      level: 'warning',
+      extra: {
+        'databases/imported_database.yaml': {
+          _schema: ['Must provide a password for the database'],
+        },
+        issue_codes: [
+          {
+            code: 1010,
+            message:
+              'Issue 1010 - Superset encountered an error while running a command.',
+          },
+        ],
+      },
+    },
+  ],
+};
+
+test('identifies error payloads indicating that password is needed', () => {
+  let needsPassword;
+
+  needsPassword = isNeedsPassword({
+    _schema: ['Must provide a password for the database'],
+  });
+  expect(needsPassword).toBe(true);
+
+  needsPassword = isNeedsPassword(
+    'Database already exists and `overwrite=true` was not passed',
+  );
+  expect(needsPassword).toBe(false);
+
+  needsPassword = isNeedsPassword({ type: ['Must be equal to Database.'] });
+  expect(needsPassword).toBe(false);
+});
+
+test('identifies error payloads indicating that overwrite confirmation is needed', () => {
+  let alreadyExists;
+
+  alreadyExists = isAlreadyExists(
+    'Database already exists and `overwrite=true` was not passed',
+  );
+  expect(alreadyExists).toBe(true);
+
+  alreadyExists = isAlreadyExists({
+    _schema: ['Must provide a password for the database'],
+  });
+  expect(alreadyExists).toBe(false);
+
+  alreadyExists = isAlreadyExists({ type: ['Must be equal to Database.'] });
+  expect(alreadyExists).toBe(false);
+});
+
+test('extracts DB configuration files that need passwords', () => {
+  const passwordsNeeded = getPasswordsNeeded(passwordNeededErrors.errors);
+  expect(passwordsNeeded).toEqual(['databases/imported_database.yaml']);
+});
+
+test('extracts files that need overwrite confirmation', () => {
+  const alreadyExists = getAlreadyExists(overwriteNeededErrors.errors);
+  expect(alreadyExists).toEqual(['databases/imported_database.yaml']);
+});
+
+test('detects if the error message is terminal or if it requires uses intervention', () => {
+  let isTerminal;
+
+  isTerminal = hasTerminalValidation(terminalErrors.errors);
+  expect(isTerminal).toBe(true);
+
+  isTerminal = hasTerminalValidation(overwriteNeededErrors.errors);
+  expect(isTerminal).toBe(false);
+
+  isTerminal = hasTerminalValidation(passwordNeededErrors.errors);
+  expect(isTerminal).toBe(false);
+});
diff --git a/superset-frontend/src/views/CRUD/utils.tsx b/superset-frontend/src/views/CRUD/utils.tsx
index 716282f7806a..08535e1b91b1 100644
--- a/superset-frontend/src/views/CRUD/utils.tsx
+++ b/superset-frontend/src/views/CRUD/utils.tsx
@@ -23,13 +23,15 @@ import {
   SupersetClientResponse,
   logging,
   styled,
+  SupersetTheme,
+  css,
 } from '@superset-ui/core';
 import Chart from 'src/types/Chart';
 import rison from 'rison';
 import { getClientErrorObject } from 'src/utils/getClientErrorObject';
 import { FetchDataConfig } from 'src/components/ListView';
 import SupersetText from 'src/utils/textUtils';
-import { Dashboard, Filters, SavedQueryObject } from './types';
+import { Dashboard, Filters } from './types';
 
 const createFetchResourceMethod = (method: string) => (
   resource: string,
@@ -63,12 +65,13 @@ const createFetchResourceMethod = (method: string) => (
   return [];
 };
 
+export const PAGE_SIZE = 5;
 const getParams = (filters?: Array<Filters>) => {
   const params = {
     order_column: 'changed_on_delta_humanized',
     order_direction: 'desc',
     page: 0,
-    page_size: 3,
+    page_size: PAGE_SIZE,
     filters,
   };
   if (!filters) delete params.filters;
@@ -129,27 +132,33 @@ export const getRecentAcitivtyObjs = (
 ) =>
   SupersetClient.get({ endpoint: recent }).then(recentsRes => {
     const res: any = {};
-    if (recentsRes.json.length === 0) {
-      const newBatch = [
-        SupersetClient.get({ endpoint: `/api/v1/chart/?q=${getParams()}` }),
-        SupersetClient.get({
-          endpoint: `/api/v1/dashboard/?q=${getParams()}`,
-        }),
-      ];
-      return Promise.all(newBatch)
-        .then(([chartRes, dashboardRes]) => {
-          res.examples = [...chartRes.json.result, ...dashboardRes.json.result];
-          return res;
-        })
-        .catch(errMsg =>
-          addDangerToast(
-            t('There was an error fetching your recent activity:'),
-            errMsg,
-          ),
-        );
-    }
-    res.viewed = recentsRes.json;
-    return res;
+    const filters = [
+      {
+        col: 'created_by',
+        opr: 'rel_o_m',
+        value: 0,
+      },
+    ];
+    const newBatch = [
+      SupersetClient.get({
+        endpoint: `/api/v1/chart/?q=${getParams(filters)}`,
+      }),
+      SupersetClient.get({
+        endpoint: `/api/v1/dashboard/?q=${getParams(filters)}`,
+      }),
+    ];
+    return Promise.all(newBatch)
+      .then(([chartRes, dashboardRes]) => {
+        res.examples = [...chartRes.json.result, ...dashboardRes.json.result];
+        res.viewed = recentsRes.json;
+        return res;
+      })
+      .catch(errMsg =>
+        addDangerToast(
+          t('There was an error fetching your recent activity:'),
+          errMsg,
+        ),
+      );
   });
 
 export const createFetchRelated = createFetchResourceMethod('related');
@@ -190,7 +199,7 @@ export function handleChartDelete(
 ) {
   const filters = {
     pageIndex: 0,
-    pageSize: 3,
+    pageSize: PAGE_SIZE,
     sortBy: [
       {
         id: 'changed_on_delta_humanized',
@@ -219,32 +228,6 @@ export function handleChartDelete(
   );
 }
 
-export function handleBulkChartExport(chartsToExport: Chart[]) {
-  return window.location.assign(
-    `/api/v1/chart/export/?q=${rison.encode(
-      chartsToExport.map(({ id }) => id),
-    )}`,
-  );
-}
-
-export function handleBulkDashboardExport(dashboardsToExport: Dashboard[]) {
-  return window.location.assign(
-    `/api/v1/dashboard/export/?q=${rison.encode(
-      dashboardsToExport.map(({ id }) => id),
-    )}`,
-  );
-}
-
-export function handleBulkSavedQueryExport(
-  savedQueriesToExport: SavedQueryObject[],
-) {
-  return window.location.assign(
-    `/api/v1/saved_query/export/?q=${rison.encode(
-      savedQueriesToExport.map(({ id }) => id),
-    )}`,
-  );
-}
-
 export function handleDashboardDelete(
   { id, dashboard_title: dashboardTitle }: Dashboard,
   refreshData: (config?: FetchDataConfig | null) => void,
@@ -259,7 +242,7 @@ export function handleDashboardDelete(
     () => {
       const filters = {
         pageIndex: 0,
-        pageSize: 3,
+        pageSize: PAGE_SIZE,
         sortBy: [
           {
             id: 'changed_on_delta_humanized',
@@ -295,25 +278,28 @@ export function shortenSQL(sql: string, maxLines: number) {
   return lines.join('\n');
 }
 
+// loading card count for homepage
+export const loadingCardCount = 5;
+
 const breakpoints = [576, 768, 992, 1200];
 export const mq = breakpoints.map(bp => `@media (max-width: ${bp}px)`);
 
-export const CardContainer = styled.div`
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(31%, 31%));
-  ${mq[3]} {
-    grid-template-columns: repeat(auto-fit, minmax(31%, 31%));
-  }
-  ${mq[2]} {
-    grid-template-columns: repeat(auto-fit, minmax(48%, 48%));
-  }
-  ${mq[1]} {
-    grid-template-columns: repeat(auto-fit, minmax(50%, 80%));
-  }
-  grid-gap: ${({ theme }) => theme.gridUnit * 8}px;
-  justify-content: left;
-  padding: ${({ theme }) => theme.gridUnit * 6}px;
-  padding-top: ${({ theme }) => theme.gridUnit * 2}px;
+export const CardContainer = styled.div<{
+  showThumbnails?: boolean | undefined;
+}>`
+  ${({ showThumbnails, theme }) => `
+    overflow: hidden;
+    display: grid;
+    grid-gap: ${theme.gridUnit * 12}px ${theme.gridUnit * 4}px;
+    grid-template-columns: repeat(auto-fit, 300px);
+    max-height: ${showThumbnails ? '314' : '148'}px;
+    margin-top: ${theme.gridUnit * -6}px;
+    padding: ${
+      showThumbnails
+        ? `${theme.gridUnit * 8 + 3}px ${theme.gridUnit * 9}px`
+        : `${theme.gridUnit * 8 + 1}px ${theme.gridUnit * 9}px`
+    };
+  `}
 `;
 
 export const CardStyles = styled.div`
@@ -321,4 +307,50 @@ export const CardStyles = styled.div`
   a {
     text-decoration: none;
   }
+  .ant-card-cover > div {
+    /* Height is calculated based on 300px width, to keep the same aspect ratio as the 800*450 thumbnails */
+    height: 168px;
+  }
+`;
+
+export const StyledIcon = (theme: SupersetTheme) => css`
+  margin: auto ${theme.gridUnit * 2}px auto 0;
+  color: ${theme.colors.grayscale.base};
 `;
+
+export /* eslint-disable no-underscore-dangle */
+const isNeedsPassword = (payload: any) =>
+  typeof payload === 'object' &&
+  Array.isArray(payload._schema) &&
+  payload._schema.length === 1 &&
+  payload._schema[0] === 'Must provide a password for the database';
+
+export const isAlreadyExists = (payload: any) =>
+  typeof payload === 'string' &&
+  payload.includes('already exists and `overwrite=true` was not passed');
+
+export const getPasswordsNeeded = (errors: Record<string, any>[]) =>
+  errors
+    .map(error =>
+      Object.entries(error.extra)
+        .filter(([, payload]) => isNeedsPassword(payload))
+        .map(([fileName]) => fileName),
+    )
+    .flat();
+
+export const getAlreadyExists = (errors: Record<string, any>[]) =>
+  errors
+    .map(error =>
+      Object.entries(error.extra)
+        .filter(([, payload]) => isAlreadyExists(payload))
+        .map(([fileName]) => fileName),
+    )
+    .flat();
+
+export const hasTerminalValidation = (errors: Record<string, any>[]) =>
+  errors.some(
+    error =>
+      !Object.values(error.extra).some(
+        payload => isNeedsPassword(payload) || isAlreadyExists(payload),
+      ),
+  );
diff --git a/superset-frontend/src/views/CRUD/welcome/ActivityTable.test.tsx b/superset-frontend/src/views/CRUD/welcome/ActivityTable.test.tsx
index 9e08dbcddc48..2fd7feb977ed 100644
--- a/superset-frontend/src/views/CRUD/welcome/ActivityTable.test.tsx
+++ b/superset-frontend/src/views/CRUD/welcome/ActivityTable.test.tsx
@@ -23,7 +23,6 @@ import { ReactWrapper } from 'enzyme';
 import { Provider } from 'react-redux';
 import fetchMock from 'fetch-mock';
 import thunk from 'redux-thunk';
-import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint';
 import configureStore from 'redux-mock-store';
 import ActivityTable from 'src/views/CRUD/welcome/ActivityTable';
 
@@ -82,7 +81,7 @@ describe('ActivityTable', () => {
     activityData: mockData,
     setActiveChild: jest.fn(),
     user: { userId: '1' },
-    loading: false,
+    loadedCount: 3,
   };
 
   let wrapper: ReactWrapper;
@@ -113,11 +112,13 @@ describe('ActivityTable', () => {
         handler({} as any);
       }
     });
-    await waitForComponentToPaint(wrapper);
     const dashboardCall = fetchMock.calls(/dashboard\/\?q/);
     const chartCall = fetchMock.calls(/chart\/\?q/);
-    expect(chartCall).toHaveLength(1);
-    expect(dashboardCall).toHaveLength(1);
+    // waitforcomponenttopaint does not work here in this instance...
+    setTimeout(() => {
+      expect(chartCall).toHaveLength(1);
+      expect(dashboardCall).toHaveLength(1);
+    });
   });
   it('show empty state if there is no data', () => {
     const activityProps = {
@@ -125,7 +126,7 @@ describe('ActivityTable', () => {
       activityData: {},
       setActiveChild: jest.fn(),
       user: { userId: '1' },
-      loading: false,
+      loadedCount: 3,
     };
     const wrapper = mount(
       <Provider store={store}>
diff --git a/superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx b/superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx
index b613463c5636..930cfca8220f 100644
--- a/superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx
+++ b/superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx
@@ -21,14 +21,20 @@ import moment from 'moment';
 import { styled, t } from '@superset-ui/core';
 import { setInLocalStorage } from 'src/utils/localStorageHelpers';
 
-import Loading from 'src/components/Loading';
 import ListViewCard from 'src/components/ListViewCard';
 import SubMenu from 'src/components/Menu/SubMenu';
+import { LoadingCards, ActivityData } from 'src/views/CRUD/welcome/Welcome';
+import {
+  CardStyles,
+  getEditedObjects,
+  CardContainer,
+} from 'src/views/CRUD/utils';
+import { HOMEPAGE_ACTIVITY_FILTER } from 'src/views/CRUD/storageKeys';
 import { Chart } from 'src/types/Chart';
 import { Dashboard, SavedQueryObject } from 'src/views/CRUD/types';
-import { mq, CardStyles, getEditedObjects } from 'src/views/CRUD/utils';
 
-import { ActivityData } from './Welcome';
+import Icons from 'src/components/Icons';
+
 import EmptyState from './EmptyState';
 
 /**
@@ -51,6 +57,12 @@ interface RecentDashboard extends RecentActivity {
   item_type: 'dashboard';
 }
 
+enum SetTabType {
+  EDITED = 'Edited',
+  CREATED = 'Created',
+  VIEWED = 'Viewed',
+  EXAMPLE = 'Examples',
+}
 /**
  * Recent activity objects fetched by `getRecentAcitivtyObjs`.
  */
@@ -68,33 +80,13 @@ interface ActivityProps {
   activeChild: string;
   setActiveChild: (arg0: string) => void;
   activityData: ActivityData;
+  loadedCount: number;
 }
 
-const ActivityContainer = styled.div`
-  margin-left: ${({ theme }) => theme.gridUnit * 2}px;
-  margin-top: ${({ theme }) => theme.gridUnit * -4}px;
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(31%, max-content));
-
-  grid-gap: ${({ theme }) => theme.gridUnit * 8}px;
-  justify-content: left;
-  padding: ${({ theme }) => theme.gridUnit * 6}px;
-  padding-top: ${({ theme }) => theme.gridUnit * 2}px;
-  .ant-card-meta-avatar {
-    margin-top: ${({ theme }) => theme.gridUnit * 3}px;
-    margin-left: ${({ theme }) => theme.gridUnit * 2}px;
-  }
-  .ant-card-meta-title {
-    font-weight: ${({ theme }) => theme.typography.weights.bold};
-  }
-  ${mq[3]} {
-    grid-template-columns: repeat(auto-fit, minmax(31%, max-content));
-  }
-  ${mq[2]} {
-    grid-template-columns: repeat(auto-fit, minmax(42%, max-content));
-  }
-  ${mq[1]} {
-    grid-template-columns: repeat(auto-fit, minmax(80%, max-content));
+const Styles = styled.div`
+  .recentCards {
+    max-height: none;
+    grid-gap: ${({ theme }) => `${theme.gridUnit * 4}px`};
   }
 `;
 
@@ -108,16 +100,16 @@ const getEntityTitle = (entity: ActivityObject) => {
   return entity.item_title || UNTITLED;
 };
 
-const getEntityIconName = (entity: ActivityObject) => {
-  if ('sql' in entity) return 'sql';
+const getEntityIcon = (entity: ActivityObject) => {
+  if ('sql' in entity) return <Icons.Sql />;
   const url = 'item_url' in entity ? entity.item_url : entity.url;
   if (url?.includes('dashboard')) {
-    return 'nav-dashboard';
+    return <Icons.NavDashboard />;
   }
   if (url?.includes('explore')) {
-    return 'nav-charts';
+    return <Icons.NavCharts />;
   }
-  return '';
+  return null;
 };
 
 const getEntityUrl = (entity: ActivityObject) => {
@@ -128,8 +120,8 @@ const getEntityUrl = (entity: ActivityObject) => {
 
 const getEntityLastActionOn = (entity: ActivityObject) => {
   // translation keys for last action on
-  const LAST_VIEWED = `Last viewed %s`;
-  const LAST_MODIFIED = `Last modified %s`;
+  const LAST_VIEWED = `Viewed %s`;
+  const LAST_MODIFIED = `Modified %s`;
 
   // for Recent viewed items
   if ('time_delta_humanized' in entity) {
@@ -161,20 +153,11 @@ export default function ActivityTable({
   setActiveChild,
   activityData,
   user,
+  loadedCount,
 }: ActivityProps) {
   const [editedObjs, setEditedObjs] = useState<Array<ActivityData>>();
   const [loadingState, setLoadingState] = useState(false);
 
-  useEffect(() => {
-    if (activeChild === 'Edited') {
-      setLoadingState(true);
-      getEditedObjects(user.userId).then(r => {
-        setEditedObjs([...r.editedChart, ...r.editedDash]);
-        setLoadingState(false);
-      });
-    }
-  }, []);
-
   const getEditedCards = () => {
     setLoadingState(true);
     getEditedObjects(user.userId).then(r => {
@@ -182,14 +165,21 @@ export default function ActivityTable({
       setLoadingState(false);
     });
   };
+
+  useEffect(() => {
+    if (activeChild === 'Edited') {
+      setLoadingState(true);
+      getEditedCards();
+    }
+  }, [activeChild]);
+
   const tabs = [
     {
       name: 'Edited',
       label: t('Edited'),
       onClick: () => {
         setActiveChild('Edited');
-        setInLocalStorage('activity', { activity: 'Edited' });
-        getEditedCards();
+        setInLocalStorage(HOMEPAGE_ACTIVITY_FILTER, SetTabType.EDITED);
       },
     },
     {
@@ -197,7 +187,7 @@ export default function ActivityTable({
       label: t('Created'),
       onClick: () => {
         setActiveChild('Created');
-        setInLocalStorage('activity', { activity: 'Created' });
+        setInLocalStorage(HOMEPAGE_ACTIVITY_FILTER, SetTabType.CREATED);
       },
     },
   ];
@@ -208,20 +198,10 @@ export default function ActivityTable({
       label: t('Viewed'),
       onClick: () => {
         setActiveChild('Viewed');
-        setInLocalStorage('activity', { activity: 'Viewed' });
-      },
-    });
-  } else {
-    tabs.unshift({
-      name: 'Examples',
-      label: t('Examples'),
-      onClick: () => {
-        setActiveChild('Examples');
-        setInLocalStorage('activity', { activity: 'Examples' });
+        setInLocalStorage(HOMEPAGE_ACTIVITY_FILTER, SetTabType.VIEWED);
       },
     });
   }
-
   const renderActivity = () =>
     (activeChild !== 'Edited' ? activityData[activeChild] : editedObjs).map(
       (entity: ActivityObject) => {
@@ -239,29 +219,30 @@ export default function ActivityTable({
               url={url}
               title={getEntityTitle(entity)}
               description={lastActionOn}
-              avatar={getEntityIconName(entity)}
+              avatar={getEntityIcon(entity)}
               actions={null}
             />
           </CardStyles>
         );
       },
     );
-  if (loadingState && !editedObjs) {
-    return <Loading position="inline" />;
+
+  const doneFetching = loadedCount < 3;
+
+  if ((loadingState && !editedObjs) || doneFetching) {
+    return <LoadingCards />;
   }
   return (
-    <>
-      <SubMenu
-        activeChild={activeChild}
-        // eslint-disable-next-line react/no-children-prop
-        tabs={tabs}
-      />
+    <Styles>
+      <SubMenu activeChild={activeChild} tabs={tabs} />
       {activityData[activeChild]?.length > 0 ||
       (activeChild === 'Edited' && editedObjs && editedObjs.length > 0) ? (
-        <ActivityContainer>{renderActivity()}</ActivityContainer>
+        <CardContainer className="recentCards">
+          {renderActivity()}
+        </CardContainer>
       ) : (
         <EmptyState tableName="RECENTS" tab={activeChild} />
       )}
-    </>
+    </Styles>
   );
 }
diff --git a/superset-frontend/src/views/CRUD/welcome/ChartTable.test.tsx b/superset-frontend/src/views/CRUD/welcome/ChartTable.test.tsx
index 3af468a601df..c61cb1b33e1b 100644
--- a/superset-frontend/src/views/CRUD/welcome/ChartTable.test.tsx
+++ b/superset-frontend/src/views/CRUD/welcome/ChartTable.test.tsx
@@ -90,6 +90,16 @@ describe('ChartTable', () => {
   });
 
   it('display EmptyState if there is no data', async () => {
+    await act(async () => {
+      wrapper = mount(
+        <ChartTable
+          chartFilter="Mine"
+          user={{ userId: '2' }}
+          mine={[]}
+          store={store}
+        />,
+      );
+    });
     expect(wrapper.find('EmptyState')).toExist();
   });
 });
diff --git a/superset-frontend/src/views/CRUD/welcome/ChartTable.tsx b/superset-frontend/src/views/CRUD/welcome/ChartTable.tsx
index 0fefac675227..d487e8a246c8 100644
--- a/superset-frontend/src/views/CRUD/welcome/ChartTable.tsx
+++ b/superset-frontend/src/views/CRUD/welcome/ChartTable.tsx
@@ -18,6 +18,7 @@
  */
 import React, { useState, useMemo, useEffect } from 'react';
 import { t } from '@superset-ui/core';
+import { filter } from 'lodash';
 import {
   useListViewResource,
   useChartEditModal,
@@ -29,17 +30,19 @@ import {
 } from 'src/utils/localStorageHelpers';
 import withToasts from 'src/messageToasts/enhancers/withToasts';
 import { useHistory } from 'react-router-dom';
+import { TableTabTypes } from 'src/views/CRUD/types';
 import PropertiesModal from 'src/explore/components/PropertiesModal';
 import { User } from 'src/types/bootstrapTypes';
+import { CardContainer, PAGE_SIZE } from 'src/views/CRUD/utils';
+import { HOMEPAGE_CHART_FILTER } from 'src/views/CRUD/storageKeys';
+import { LoadingCards } from 'src/views/CRUD/welcome/Welcome';
 import ChartCard from 'src/views/CRUD/chart/ChartCard';
 import Chart from 'src/types/Chart';
+import handleResourceExport from 'src/utils/export';
 import Loading from 'src/components/Loading';
 import ErrorBoundary from 'src/components/ErrorBoundary';
 import SubMenu from 'src/components/Menu/SubMenu';
 import EmptyState from './EmptyState';
-import { CardContainer } from '../utils';
-
-const PAGE_SIZE = 3;
 
 interface ChartTableProps {
   addDangerToast: (message: string) => void;
@@ -49,6 +52,7 @@ interface ChartTableProps {
   user?: User;
   mine: Array<any>;
   showThumbnails: boolean;
+  examples?: Array<object>;
 }
 
 function ChartTable({
@@ -57,8 +61,14 @@ function ChartTable({
   addSuccessToast,
   mine,
   showThumbnails,
+  examples,
 }: ChartTableProps) {
   const history = useHistory();
+  const filterStore = getFromLocalStorage(HOMEPAGE_CHART_FILTER, null);
+  const initialFilter = filterStore || TableTabTypes.EXAMPLES;
+
+  const filteredExamples = filter(examples, obj => 'viz_type' in obj);
+
   const {
     state: { loading, resourceCollection: charts, bulkSelectEnabled },
     setResourceCollection: setCharts,
@@ -70,12 +80,11 @@ function ChartTable({
     t('chart'),
     addDangerToast,
     true,
-    mine,
+    initialFilter === 'Mine' ? mine : filteredExamples,
     [],
     false,
   );
 
-  useEffect(() => {});
   const chartIds = useMemo(() => charts.map(c => c.id), [charts]);
   const [saveFavoriteStatus, favoriteStatus] = useFavoriteStatus(
     'chart',
@@ -89,14 +98,24 @@ function ChartTable({
     closeChartEditModal,
   } = useChartEditModal(setCharts, charts);
 
-  const [chartFilter, setChartFilter] = useState('Mine');
+  const [chartFilter, setChartFilter] = useState(initialFilter);
+  const [preparingExport, setPreparingExport] = useState<boolean>(false);
+  const [loaded, setLoaded] = useState<boolean>(false);
 
   useEffect(() => {
-    const filter = getFromLocalStorage('chart', null);
-    if (!filter) {
-      setChartFilter('Mine');
-    } else setChartFilter(filter.tab);
-  }, []);
+    if (loaded || chartFilter === 'Favorite') {
+      getData(chartFilter);
+    }
+    setLoaded(true);
+  }, [chartFilter]);
+
+  const handleBulkChartExport = (chartsToExport: Chart[]) => {
+    const ids = chartsToExport.map(({ id }) => id);
+    handleResourceExport('chart', ids, () => {
+      setPreparingExport(false);
+    });
+    setPreparingExport(true);
+  };
 
   const getFilters = (filterName: string) => {
     const filters = [];
@@ -107,12 +126,18 @@ function ChartTable({
         operator: 'rel_o_m',
         value: `${user?.userId}`,
       });
-    } else {
+    } else if (filterName === 'Favorite') {
       filters.push({
         id: 'id',
         operator: 'chart_is_favorite',
         value: true,
       });
+    } else if (filterName === 'Examples') {
+      filters.push({
+        id: 'created_by',
+        operator: 'rel_o_m',
+        value: 0,
+      });
     }
     return filters;
   };
@@ -130,7 +155,36 @@ function ChartTable({
       filters: getFilters(filter),
     });
 
-  if (loading) return <Loading position="inline" />;
+  const menuTabs = [
+    {
+      name: 'Favorite',
+      label: t('Favorite'),
+      onClick: () => {
+        setChartFilter(TableTabTypes.FAVORITE);
+        setInLocalStorage(HOMEPAGE_CHART_FILTER, TableTabTypes.FAVORITE);
+      },
+    },
+    {
+      name: 'Mine',
+      label: t('Mine'),
+      onClick: () => {
+        setChartFilter(TableTabTypes.MINE);
+        setInLocalStorage(HOMEPAGE_CHART_FILTER, TableTabTypes.MINE);
+      },
+    },
+  ];
+  if (examples) {
+    menuTabs.push({
+      name: 'Examples',
+      label: t('Examples'),
+      onClick: () => {
+        setChartFilter(TableTabTypes.EXAMPLES);
+        setInLocalStorage(HOMEPAGE_CHART_FILTER, TableTabTypes.EXAMPLES);
+      },
+    });
+  }
+
+  if (loading) return <LoadingCards cover={showThumbnails} />;
   return (
     <ErrorBoundary>
       {sliceCurrentlyEditing && (
@@ -144,27 +198,7 @@ function ChartTable({
 
       <SubMenu
         activeChild={chartFilter}
-        // eslint-disable-next-line react/no-children-prop
-        tabs={[
-          {
-            name: 'Favorite',
-            label: t('Favorite'),
-            onClick: () =>
-              getData('Favorite').then(() => {
-                setChartFilter('Favorite');
-                setInLocalStorage('chart', { tab: 'Favorite' });
-              }),
-          },
-          {
-            name: 'Mine',
-            label: t('Mine'),
-            onClick: () =>
-              getData('Mine').then(() => {
-                setChartFilter('Mine');
-                setInLocalStorage('chart', { tab: 'Mine' });
-              }),
-          },
-        ]}
+        tabs={menuTabs}
         buttons={[
           {
             name: (
@@ -192,7 +226,7 @@ function ChartTable({
         ]}
       />
       {charts?.length ? (
-        <CardContainer>
+        <CardContainer showThumbnails={showThumbnails}>
           {charts.map(e => (
             <ChartCard
               key={`${e.id}`}
@@ -208,12 +242,14 @@ function ChartTable({
               addSuccessToast={addSuccessToast}
               favoriteStatus={favoriteStatus[e.id]}
               saveFavoriteStatus={saveFavoriteStatus}
+              handleBulkChartExport={handleBulkChartExport}
             />
           ))}
         </CardContainer>
       ) : (
         <EmptyState tableName="CHARTS" tab={chartFilter} />
       )}
+      {preparingExport && <Loading />}
     </ErrorBoundary>
   );
 }
diff --git a/superset-frontend/src/views/CRUD/welcome/DashboardTable.test.tsx b/superset-frontend/src/views/CRUD/welcome/DashboardTable.test.tsx
index 078b14d0e213..26fd3a13d32d 100644
--- a/superset-frontend/src/views/CRUD/welcome/DashboardTable.test.tsx
+++ b/superset-frontend/src/views/CRUD/welcome/DashboardTable.test.tsx
@@ -72,9 +72,9 @@ describe('DashboardTable', () => {
   it('render a submenu with clickable tabs and buttons', async () => {
     expect(wrapper.find('SubMenu')).toExist();
     expect(wrapper.find('li.no-router')).toHaveLength(2);
-    expect(wrapper.find('Button')).toHaveLength(4);
+    expect(wrapper.find('Button')).toHaveLength(6);
     act(() => {
-      const handler = wrapper.find('li.no-router a').at(1).prop('onClick');
+      const handler = wrapper.find('li.no-router a').at(0).prop('onClick');
       if (handler) {
         handler({} as any);
       }
diff --git a/superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx b/superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx
index 4a84148a6029..a6c470aae9a4 100644
--- a/superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx
+++ b/superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx
@@ -18,22 +18,33 @@
  */
 import React, { useState, useMemo, useEffect } from 'react';
 import { SupersetClient, t } from '@superset-ui/core';
+import { filter } from 'lodash';
 import { useListViewResource, useFavoriteStatus } from 'src/views/CRUD/hooks';
-import { Dashboard, DashboardTableProps } from 'src/views/CRUD/types';
+import {
+  Dashboard,
+  DashboardTableProps,
+  TableTabTypes,
+} from 'src/views/CRUD/types';
+import handleResourceExport from 'src/utils/export';
 import { useHistory } from 'react-router-dom';
 import {
   setInLocalStorage,
   getFromLocalStorage,
 } from 'src/utils/localStorageHelpers';
+import { LoadingCards } from 'src/views/CRUD/welcome/Welcome';
+import {
+  createErrorHandler,
+  CardContainer,
+  PAGE_SIZE,
+} from 'src/views/CRUD/utils';
+import { HOMEPAGE_DASHBOARD_FILTER } from 'src/views/CRUD/storageKeys';
+
 import withToasts from 'src/messageToasts/enhancers/withToasts';
 import Loading from 'src/components/Loading';
 import PropertiesModal from 'src/dashboard/components/PropertiesModal';
 import DashboardCard from 'src/views/CRUD/dashboard/DashboardCard';
 import SubMenu from 'src/components/Menu/SubMenu';
 import EmptyState from './EmptyState';
-import { createErrorHandler, CardContainer } from '../utils';
-
-const PAGE_SIZE = 3;
 
 export interface FilterValue {
   col: string;
@@ -47,8 +58,14 @@ function DashboardTable({
   addSuccessToast,
   mine,
   showThumbnails,
+  examples,
 }: DashboardTableProps) {
   const history = useHistory();
+  const filterStore = getFromLocalStorage(HOMEPAGE_DASHBOARD_FILTER, null);
+  const defaultFilter = filterStore || TableTabTypes.EXAMPLES;
+
+  const filteredExamples = filter(examples, obj => !('viz_type' in obj));
+
   const {
     state: { loading, resourceCollection: dashboards },
     setResourceCollection: setDashboards,
@@ -60,7 +77,7 @@ function DashboardTable({
     t('dashboard'),
     addDangerToast,
     true,
-    mine,
+    defaultFilter === 'Mine' ? mine : filteredExamples,
     [],
     false,
   );
@@ -70,15 +87,26 @@ function DashboardTable({
     dashboardIds,
     addDangerToast,
   );
+
   const [editModal, setEditModal] = useState<Dashboard>();
-  const [dashboardFilter, setDashboardFilter] = useState('Mine');
+  const [dashboardFilter, setDashboardFilter] = useState(defaultFilter);
+  const [preparingExport, setPreparingExport] = useState<boolean>(false);
+  const [loaded, setLoaded] = useState<boolean>(false);
 
   useEffect(() => {
-    const filter = getFromLocalStorage('dashboard', null);
-    if (!filter) {
-      setDashboardFilter('Mine');
-    } else setDashboardFilter(filter.tab);
-  }, []);
+    if (loaded || dashboardFilter === 'Favorite') {
+      getData(dashboardFilter);
+    }
+    setLoaded(true);
+  }, [dashboardFilter]);
+
+  const handleBulkDashboardExport = (dashboardsToExport: Dashboard[]) => {
+    const ids = dashboardsToExport.map(({ id }) => id);
+    handleResourceExport('dashboard', ids, () => {
+      setPreparingExport(false);
+    });
+    setPreparingExport(true);
+  };
 
   const handleDashboardEdit = (edits: Dashboard) =>
     SupersetClient.get({
@@ -105,25 +133,53 @@ function DashboardTable({
     const filters = [];
     if (filterName === 'Mine') {
       filters.push({
-        id: 'owners',
-        operator: 'rel_m_m',
+        id: 'created_by',
+        operator: 'rel_o_m',
         value: `${user?.userId}`,
       });
-    } else {
+    } else if (filterName === 'Favorite') {
       filters.push({
         id: 'id',
         operator: 'dashboard_is_favorite',
         value: true,
       });
+    } else if (filterName === 'Examples') {
+      filters.push({
+        id: 'created_by',
+        operator: 'rel_o_m',
+        value: 0,
+      });
     }
     return filters;
   };
-  const subMenus = [];
-  if (dashboards.length > 0 && dashboardFilter === 'favorite') {
-    subMenus.push({
+
+  const menuTabs = [
+    {
       name: 'Favorite',
       label: t('Favorite'),
-      onClick: () => setDashboardFilter('Favorite'),
+      onClick: () => {
+        setDashboardFilter(TableTabTypes.FAVORITE);
+        setInLocalStorage(HOMEPAGE_DASHBOARD_FILTER, TableTabTypes.FAVORITE);
+      },
+    },
+    {
+      name: 'Mine',
+      label: t('Mine'),
+      onClick: () => {
+        setDashboardFilter(TableTabTypes.MINE);
+        setInLocalStorage(HOMEPAGE_DASHBOARD_FILTER, TableTabTypes.MINE);
+      },
+    },
+  ];
+
+  if (examples) {
+    menuTabs.push({
+      name: 'Examples',
+      label: t('Examples'),
+      onClick: () => {
+        setDashboardFilter(TableTabTypes.EXAMPLES);
+        setInLocalStorage(HOMEPAGE_DASHBOARD_FILTER, TableTabTypes.EXAMPLES);
+      },
     });
   }
 
@@ -140,33 +196,12 @@ function DashboardTable({
       filters: getFilters(filter),
     });
 
-  if (loading) return <Loading position="inline" />;
+  if (loading) return <LoadingCards cover={showThumbnails} />;
   return (
     <>
       <SubMenu
         activeChild={dashboardFilter}
-        tabs={[
-          {
-            name: 'Favorite',
-            label: t('Favorite'),
-            onClick: () => {
-              getData('Favorite').then(() => {
-                setDashboardFilter('Favorite');
-                setInLocalStorage('dashboard', { tab: 'Favorite' });
-              });
-            },
-          },
-          {
-            name: 'Mine',
-            label: t('Mine'),
-            onClick: () => {
-              getData('Mine').then(() => {
-                setDashboardFilter('Mine');
-                setInLocalStorage('dashboard', { tab: 'Mine' });
-              });
-            },
-          },
-        ]}
+        tabs={menuTabs}
         buttons={[
           {
             name: (
@@ -202,7 +237,7 @@ function DashboardTable({
         />
       )}
       {dashboards.length > 0 && (
-        <CardContainer>
+        <CardContainer showThumbnails={showThumbnails}>
           {dashboards.map(e => (
             <DashboardCard
               key={e.id}
@@ -221,6 +256,7 @@ function DashboardTable({
               }
               saveFavoriteStatus={saveFavoriteStatus}
               favoriteStatus={favoriteStatus[e.id]}
+              handleBulkDashboardExport={handleBulkDashboardExport}
             />
           ))}
         </CardContainer>
@@ -228,6 +264,7 @@ function DashboardTable({
       {dashboards.length === 0 && (
         <EmptyState tableName="DASHBOARDS" tab={dashboardFilter} />
       )}
+      {preparingExport && <Loading />}
     </>
   );
 }
diff --git a/superset-frontend/src/views/CRUD/welcome/EmptyState.tsx b/superset-frontend/src/views/CRUD/welcome/EmptyState.tsx
index de58a799cdd8..b55ac8a4a1f1 100644
--- a/superset-frontend/src/views/CRUD/welcome/EmptyState.tsx
+++ b/superset-frontend/src/views/CRUD/welcome/EmptyState.tsx
@@ -43,7 +43,7 @@ export default function EmptyState({ tableName, tab }: EmptyStateProps) {
   const mineRedirects = {
     DASHBOARDS: '/dashboard/new',
     CHARTS: '/chart/add',
-    SAVED_QUERIES: '/superset/sqllab',
+    SAVED_QUERIES: '/superset/sqllab?new=true',
   };
   const favRedirects = {
     DASHBOARDS: '/dashboard/list/',
@@ -77,9 +77,7 @@ export default function EmptyState({ tableName, tab }: EmptyStateProps) {
           );
         }
         if (tab === 'Examples') {
-          return t(
-            `Recent example charts, dashboards, and saved queries will appear here`,
-          );
+          return t(`Example ${tableName.toLowerCase()} will appear here`);
         }
         if (tab === 'Edited') {
           return t(
@@ -91,12 +89,14 @@ export default function EmptyState({ tableName, tab }: EmptyStateProps) {
     </span>
   );
   // Mine and Recent Activity(all tabs) tab empty state
-  if (tab === 'Mine' || tableName === 'RECENTS') {
+  if (tab === 'Mine' || tableName === 'RECENTS' || tab === 'Examples') {
     return (
       <EmptyContainer>
         <Empty
           image={`/static/assets/images/${tableIcon[tableName]}`}
-          description={tableName === 'RECENTS' ? recent : mine}
+          description={
+            tableName === 'RECENTS' || tab === 'Examples' ? recent : mine
+          }
         >
           {tableName !== 'RECENTS' && (
             <ButtonContainer>
diff --git a/superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx b/superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx
index e8ec84acd873..4a20b389f532 100644
--- a/superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx
+++ b/superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx
@@ -17,25 +17,28 @@
  * under the License.
  */
 import React, { useState } from 'react';
-import { t, SupersetClient, styled } from '@superset-ui/core';
+import { t, SupersetClient, styled, useTheme } from '@superset-ui/core';
 import SyntaxHighlighter from 'react-syntax-highlighter/dist/cjs/light';
 import sql from 'react-syntax-highlighter/dist/cjs/languages/hljs/sql';
 import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';
 import withToasts from 'src/messageToasts/enhancers/withToasts';
-import Loading from 'src/components/Loading';
+import { LoadingCards } from 'src/views/CRUD/welcome/Welcome';
 import { Dropdown, Menu } from 'src/common/components';
 import { useListViewResource, copyQueryLink } from 'src/views/CRUD/hooks';
 import ListViewCard from 'src/components/ListViewCard';
 import DeleteModal from 'src/components/DeleteModal';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 import SubMenu from 'src/components/Menu/SubMenu';
 import EmptyState from './EmptyState';
-import { CardContainer, createErrorHandler, shortenSQL } from '../utils';
+import {
+  CardContainer,
+  createErrorHandler,
+  shortenSQL,
+  PAGE_SIZE,
+} from '../utils';
 
 SyntaxHighlighter.registerLanguage('sql', sql);
 
-const PAGE_SIZE = 3;
-
 interface Query {
   id?: number;
   sql_tables?: Array<any>;
@@ -136,6 +139,8 @@ const SavedQueries = ({
   const canEdit = hasPerm('can_edit');
   const canDelete = hasPerm('can_delete');
 
+  const theme = useTheme();
+
   const handleQueryDelete = ({ id, label }: Query) => {
     SupersetClient.delete({
       endpoint: `/api/v1/saved_query/${id}`,
@@ -235,7 +240,7 @@ const SavedQueries = ({
     </Menu>
   );
 
-  if (loading) return <Loading position="inline" />;
+  if (loading) return <LoadingCards cover={showThumbnails} />;
   return (
     <>
       {queryDeleteModal && (
@@ -283,7 +288,7 @@ const SavedQueries = ({
             ),
             buttonStyle: 'tertiary',
             onClick: () => {
-              window.location.href = '/superset/sqllab';
+              window.location.href = '/superset/sqllab?new=true';
             },
           },
           {
@@ -296,7 +301,7 @@ const SavedQueries = ({
         ]}
       />
       {queries.length > 0 ? (
-        <CardContainer>
+        <CardContainer showThumbnails={showThumbnails}>
           {queries.map(q => (
             <CardStyles
               onClick={() => {
@@ -309,7 +314,7 @@ const SavedQueries = ({
                 url={`/superset/sqllab?savedQueryId=${q.id}`}
                 title={q.label}
                 imgFallbackURL="/static/assets/images/empty-query.svg"
-                description={t('Last run %s', q.changed_on_delta_humanized)}
+                description={t('Ran %s', q.changed_on_delta_humanized)}
                 cover={
                   q?.sql?.length && showThumbnails && featureFlag ? (
                     <QueryContainer>
@@ -347,7 +352,9 @@ const SavedQueries = ({
                       }}
                     >
                       <Dropdown overlay={renderMenu(q)}>
-                        <Icon name="more-horiz" />
+                        <Icons.MoreVert
+                          iconColor={theme.colors.grayscale.base}
+                        />
                       </Dropdown>
                     </ListViewCard.Actions>
                   </QueryData>
diff --git a/superset-frontend/src/views/CRUD/welcome/Welcome.test.tsx b/superset-frontend/src/views/CRUD/welcome/Welcome.test.tsx
index d71864e6393b..85c953017ba1 100644
--- a/superset-frontend/src/views/CRUD/welcome/Welcome.test.tsx
+++ b/superset-frontend/src/views/CRUD/welcome/Welcome.test.tsx
@@ -132,10 +132,10 @@ describe('Welcome', () => {
     const savedQueryCall = fetchMock.calls(/saved_query\/\?q/);
     const recentCall = fetchMock.calls(/superset\/recent_activity\/*/);
     const dashboardCall = fetchMock.calls(/dashboard\/\?q/);
-    expect(chartCall).toHaveLength(1);
+    expect(chartCall).toHaveLength(2);
     expect(recentCall).toHaveLength(1);
     expect(savedQueryCall).toHaveLength(1);
-    expect(dashboardCall).toHaveLength(1);
+    expect(dashboardCall).toHaveLength(2);
   });
 });
 
diff --git a/superset-frontend/src/views/CRUD/welcome/Welcome.tsx b/superset-frontend/src/views/CRUD/welcome/Welcome.tsx
index 860ac96ccb32..63d7776178b3 100644
--- a/superset-frontend/src/views/CRUD/welcome/Welcome.tsx
+++ b/superset-frontend/src/views/CRUD/welcome/Welcome.tsx
@@ -25,14 +25,20 @@ import {
   getFromLocalStorage,
   setInLocalStorage,
 } from 'src/utils/localStorageHelpers';
+import ListViewCard from 'src/components/ListViewCard';
 import withToasts from 'src/messageToasts/enhancers/withToasts';
-import Loading from 'src/components/Loading';
 import {
   createErrorHandler,
   getRecentAcitivtyObjs,
   mq,
+  CardContainer,
   getUserOwnedObjects,
+  loadingCardCount,
 } from 'src/views/CRUD/utils';
+import {
+  HOMEPAGE_ACTIVITY_FILTER,
+  HOMEPAGE_COLLAPSE_STATE,
+} from 'src/views/CRUD/storageKeys';
 import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags';
 import { Switch } from 'src/common/components';
 
@@ -53,6 +59,12 @@ export interface ActivityData {
   Examples?: Array<object>;
 }
 
+interface LoadingProps {
+  cover?: boolean;
+}
+
+const DEFAULT_TAB_ARR = ['2', '3'];
+
 const WelcomeContainer = styled.div`
   background-color: ${({ theme }) => theme.colors.grayscale.light4};
   .ant-row.menu {
@@ -65,21 +77,40 @@ const WelcomeContainer = styled.div`
       margin: 0px ${({ theme }) => theme.gridUnit * 6}px;
       position: relative;
       width: 100%;
-      ${[mq[1]]} {
+      ${mq[1]} {
         margin-top: 5px;
         margin: 0px 2px;
       }
     }
     .ant-menu.ant-menu-light.ant-menu-root.ant-menu-horizontal {
-      padding-left: ${({ theme }) => theme.gridUnit * 10}px;
+      padding-left: ${({ theme }) => theme.gridUnit * 8}px;
     }
     button {
       padding: 3px 21px;
     }
   }
+  .ant-card-meta-description {
+    margin-top: ${({ theme }) => theme.gridUnit}px;
+  }
   .ant-card.ant-card-bordered {
     border: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
   }
+  .ant-collapse-item .ant-collapse-content {
+    margin-bottom: ${({ theme }) => theme.gridUnit * -6}px;
+  }
+  div.ant-collapse-item:last-child.ant-collapse-item-active
+    .ant-collapse-header {
+    padding-bottom: ${({ theme }) => theme.gridUnit * 3}px;
+  }
+  div.ant-collapse-item:last-child .ant-collapse-header {
+    padding-bottom: ${({ theme }) => theme.gridUnit * 9}px;
+  }
+  .loading-cards {
+    margin-top: ${({ theme }) => theme.gridUnit * 8}px;
+    .ant-card-cover > div {
+      height: 168px;
+    }
+  }
 `;
 
 const WelcomeNav = styled.div`
@@ -102,37 +133,59 @@ const WelcomeNav = styled.div`
   }
 `;
 
+export const LoadingCards = ({ cover }: LoadingProps) => (
+  <CardContainer showThumbnails={cover} className="loading-cards">
+    {[...new Array(loadingCardCount)].map(() => (
+      <ListViewCard cover={cover ? false : <></>} description="" loading />
+    ))}
+  </CardContainer>
+);
+
 function Welcome({ user, addDangerToast }: WelcomeProps) {
+  const userid = user.userId;
+  const id = userid.toString();
   const recent = `/superset/recent_activity/${user.userId}/?limit=6`;
-  const [activeChild, setActiveChild] = useState('Viewed');
-  const [checked, setChecked] = useState(true);
+  const [activeChild, setActiveChild] = useState('Loading');
+  const userKey = getFromLocalStorage(id, null);
+  let defaultChecked = false;
+  if (isFeatureEnabled(FeatureFlag.THUMBNAILS)) {
+    defaultChecked =
+      userKey?.thumbnails === undefined ? true : userKey?.thumbnails;
+  }
+  const [checked, setChecked] = useState(defaultChecked);
   const [activityData, setActivityData] = useState<ActivityData | null>(null);
   const [chartData, setChartData] = useState<Array<object> | null>(null);
   const [queryData, setQueryData] = useState<Array<object> | null>(null);
   const [dashboardData, setDashboardData] = useState<Array<object> | null>(
     null,
   );
+  const [loadedCount, setLoadedCount] = useState(0);
 
-  const userid = user.userId;
-  const id = userid.toString();
+  const collapseState = getFromLocalStorage(HOMEPAGE_COLLAPSE_STATE, null);
+  const [activeState, setActiveState] = useState<Array<string>>(collapseState);
+
+  const handleCollapse = (state: Array<string>) => {
+    setActiveState(state);
+    setInLocalStorage(HOMEPAGE_COLLAPSE_STATE, state);
+  };
 
   useEffect(() => {
-    const userKey = getFromLocalStorage(id, null);
-    if (userKey && !userKey.thumbnails) setChecked(false);
+    const activeTab = getFromLocalStorage(HOMEPAGE_ACTIVITY_FILTER, null);
+    setActiveState(collapseState || DEFAULT_TAB_ARR);
     getRecentAcitivtyObjs(user.userId, recent, addDangerToast)
       .then(res => {
         const data: ActivityData | null = {};
+        data.Examples = res.examples;
         if (res.viewed) {
           const filtered = reject(res.viewed, ['item_url', null]).map(r => r);
           data.Viewed = filtered;
-          const savedActivity = getFromLocalStorage('activity', null);
-          if (!savedActivity) {
+          if (!activeTab && data.Viewed) {
             setActiveChild('Viewed');
-          } else setActiveChild(savedActivity.activity);
-        } else {
-          data.Examples = res.examples;
-          setActiveChild('Examples');
-        }
+          } else if (!activeTab && !data.Viewed) {
+            setActiveChild('Created');
+          } else setActiveChild(activeTab);
+        } else if (!activeTab) setActiveChild('Created');
+        else setActiveChild(activeTab);
         setActivityData(activityData => ({ ...activityData, ...data }));
       })
       .catch(
@@ -145,12 +198,15 @@ function Welcome({ user, addDangerToast }: WelcomeProps) {
       );
 
     // Sets other activity data in parallel with recents api call
+
     getUserOwnedObjects(id, 'dashboard')
       .then(r => {
         setDashboardData(r);
+        setLoadedCount(loadedCount => loadedCount + 1);
       })
       .catch((err: unknown) => {
         setDashboardData([]);
+        setLoadedCount(loadedCount => loadedCount + 1);
         addDangerToast(
           t('There was an issues fetching your dashboards: %s', err),
         );
@@ -158,17 +214,21 @@ function Welcome({ user, addDangerToast }: WelcomeProps) {
     getUserOwnedObjects(id, 'chart')
       .then(r => {
         setChartData(r);
+        setLoadedCount(loadedCount => loadedCount + 1);
       })
       .catch((err: unknown) => {
         setChartData([]);
+        setLoadedCount(loadedCount => loadedCount + 1);
         addDangerToast(t('There was an issues fetching your chart: %s', err));
       });
     getUserOwnedObjects(id, 'saved_query')
       .then(r => {
         setQueryData(r);
+        setLoadedCount(loadedCount => loadedCount + 1);
       })
       .catch((err: unknown) => {
         setQueryData([]);
+        setLoadedCount(loadedCount => loadedCount + 1);
         addDangerToast(
           t('There was an issues fetching your saved queries: %s', err),
         );
@@ -181,16 +241,27 @@ function Welcome({ user, addDangerToast }: WelcomeProps) {
   };
 
   useEffect(() => {
+    if (!collapseState && queryData?.length) {
+      setActiveState(activeState => [...activeState, '4']);
+    }
     setActivityData(activityData => ({
       ...activityData,
       Created: [
-        ...(chartData || []),
-        ...(dashboardData || []),
-        ...(queryData || []),
+        ...(chartData?.slice(0, 3) || []),
+        ...(dashboardData?.slice(0, 3) || []),
+        ...(queryData?.slice(0, 3) || []),
       ],
     }));
   }, [chartData, queryData, dashboardData]);
 
+  useEffect(() => {
+    if (!collapseState && activityData?.Viewed?.length) {
+      setActiveState(activeState => ['1', ...activeState]);
+    }
+  }, [activityData]);
+
+  const isRecentActivityLoading =
+    !activityData?.Examples && !activityData?.Viewed;
   return (
     <WelcomeContainer>
       <WelcomeNav>
@@ -202,33 +273,51 @@ function Welcome({ user, addDangerToast }: WelcomeProps) {
           </div>
         ) : null}
       </WelcomeNav>
-      <Collapse defaultActiveKey={['1', '2', '3', '4']} ghost bigger>
+      <Collapse activeKey={activeState} onChange={handleCollapse} ghost bigger>
         <Collapse.Panel header={t('Recents')} key="1">
-          {activityData && (activityData.Viewed || activityData.Examples) ? (
+          {activityData &&
+          (activityData.Viewed ||
+            activityData.Examples ||
+            activityData.Created) &&
+          activeChild !== 'Loading' ? (
             <ActivityTable
               user={user}
               activeChild={activeChild}
               setActiveChild={setActiveChild}
               activityData={activityData}
+              loadedCount={loadedCount}
             />
           ) : (
-            <Loading position="inline" />
+            <LoadingCards />
           )}
         </Collapse.Panel>
         <Collapse.Panel header={t('Dashboards')} key="2">
-          {!dashboardData ? (
-            <Loading position="inline" />
+          {!dashboardData || isRecentActivityLoading ? (
+            <LoadingCards cover={checked} />
           ) : (
             <DashboardTable
               user={user}
               mine={dashboardData}
               showThumbnails={checked}
+              examples={activityData?.Examples}
+            />
+          )}
+        </Collapse.Panel>
+        <Collapse.Panel header={t('Charts')} key="3">
+          {!chartData || isRecentActivityLoading ? (
+            <LoadingCards cover={checked} />
+          ) : (
+            <ChartTable
+              showThumbnails={checked}
+              user={user}
+              mine={chartData}
+              examples={activityData?.Examples}
             />
           )}
         </Collapse.Panel>
-        <Collapse.Panel header={t('Saved queries')} key="3">
+        <Collapse.Panel header={t('Saved queries')} key="4">
           {!queryData ? (
-            <Loading position="inline" />
+            <LoadingCards cover={checked} />
           ) : (
             <SavedQueries
               showThumbnails={checked}
@@ -238,13 +327,6 @@ function Welcome({ user, addDangerToast }: WelcomeProps) {
             />
           )}
         </Collapse.Panel>
-        <Collapse.Panel header={t('Charts')} key="4">
-          {!chartData ? (
-            <Loading position="inline" />
-          ) : (
-            <ChartTable showThumbnails={checked} user={user} mine={chartData} />
-          )}
-        </Collapse.Panel>
       </Collapse>
     </WelcomeContainer>
   );
diff --git a/superset-frontend/src/views/store.ts b/superset-frontend/src/views/store.ts
index ac66d3cceda5..4704da8d0394 100644
--- a/superset-frontend/src/views/store.ts
+++ b/superset-frontend/src/views/store.ts
@@ -22,6 +22,7 @@ import messageToastReducer from 'src/messageToasts/reducers';
 import { initEnhancer } from 'src/reduxUtils';
 import charts from 'src/chart/chartReducer';
 import dataMask from 'src/dataMask/reducer';
+import reports from 'src/reports/reducers/reports';
 import dashboardInfo from 'src/dashboard/reducers/dashboardInfo';
 import dashboardState from 'src/dashboard/reducers/dashboardState';
 import dashboardFilters from 'src/dashboard/reducers/dashboardFilters';
@@ -52,6 +53,7 @@ const dashboardReducers = {
   dashboardState,
   dashboardLayout,
   sliceEntities,
+  reports,
 };
 
 // exported for tests
diff --git a/superset-frontend/src/visualizations/FilterBox/FilterBoxChartPlugin.js b/superset-frontend/src/visualizations/FilterBox/FilterBoxChartPlugin.js
index cdabe1cd49be..c038d36ad1ca 100644
--- a/superset-frontend/src/visualizations/FilterBox/FilterBoxChartPlugin.js
+++ b/superset-frontend/src/visualizations/FilterBox/FilterBoxChartPlugin.js
@@ -22,9 +22,11 @@ import thumbnail from './images/thumbnail.png';
 import controlPanel from './controlPanel';
 
 const metadata = new ChartMetadata({
+  category: t('Tools'),
   name: t('Filter box'),
-  description:
-    'A multi filter, multi-choice filter box to make dashboards interactive',
+  description: t(`Chart component that lets you add a custom filter UI in your dashboard. When added to dashboard, a filter box lets users specify specific values or ranges to filter charts by. The charts that each filter box is applied to can be fine tuned as well in the dashboard view.
+
+    Note that this plugin is being replaced with the new Filters feature that lives in the dashboard view itself. It's easier to use and has more capabilities!`),
   thumbnail,
   useLegacyApi: true,
 });
diff --git a/superset-frontend/src/visualizations/FilterBox/transformProps.js b/superset-frontend/src/visualizations/FilterBox/transformProps.ts
similarity index 91%
rename from superset-frontend/src/visualizations/FilterBox/transformProps.js
rename to superset-frontend/src/visualizations/FilterBox/transformProps.ts
index dda5558c6c09..19a962ddd1dc 100644
--- a/superset-frontend/src/visualizations/FilterBox/transformProps.js
+++ b/superset-frontend/src/visualizations/FilterBox/transformProps.ts
@@ -16,16 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { FilterBoxChartProps } from './types';
+
 const NOOP = () => {};
 
-export default function transformProps(chartProps) {
+export default function transformProps(chartProps: FilterBoxChartProps) {
   const {
     datasource,
     formData,
     hooks,
     initialValues,
     queriesData,
-    rawDatasource,
+    rawDatasource = {},
     rawFormData,
     width,
     height,
@@ -44,7 +46,7 @@ export default function transformProps(chartProps) {
     showSqlaTimeColumn,
     showSqlaTimeGranularity,
   } = formData;
-  const { verboseMap } = datasource;
+  const { verboseMap = {} } = datasource;
   const filterConfigs = formData.filterConfigs || [];
 
   const filtersFields = filterConfigs.map(flt => ({
diff --git a/superset-frontend/src/visualizations/FilterBox/types.ts b/superset-frontend/src/visualizations/FilterBox/types.ts
new file mode 100644
index 000000000000..316a29f9bbef
--- /dev/null
+++ b/superset-frontend/src/visualizations/FilterBox/types.ts
@@ -0,0 +1,29 @@
+/**
+ * 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 { ChartProps, Datasource } from '@superset-ui/core';
+
+export interface FilterConfig {
+  column: string;
+  label: string;
+}
+
+export type FilterBoxChartProps = ChartProps & {
+  datasource?: Datasource;
+  formData: ChartProps['formData'] & { filterConfigs: FilterConfig[] };
+};
diff --git a/superset-frontend/src/visualizations/TimeTable/TimeTableChartPlugin.js b/superset-frontend/src/visualizations/TimeTable/TimeTableChartPlugin.js
index c8e49a88812d..9604439f14d6 100644
--- a/superset-frontend/src/visualizations/TimeTable/TimeTableChartPlugin.js
+++ b/superset-frontend/src/visualizations/TimeTable/TimeTableChartPlugin.js
@@ -21,8 +21,20 @@ import transformProps from './transformProps';
 import thumbnail from './images/thumbnail.png';
 
 const metadata = new ChartMetadata({
+  category: t('Table'),
   name: t('Time-series Table'),
-  description: '',
+  description: t(
+    'Compare multiple time series charts (as sparklines) and related metrics quickly.',
+  ),
+  tags: [
+    t('Multi-Variables'),
+    t('Comparison'),
+    t('Legacy'),
+    t('Percentages'),
+    t('Tabular'),
+    t('Text'),
+    t('Trend'),
+  ],
   thumbnail,
   useLegacyApi: true,
 });
diff --git a/superset-frontend/src/visualizations/presets/MainPreset.js b/superset-frontend/src/visualizations/presets/MainPreset.js
index ee4d806a4979..97c14a99d57d 100644
--- a/superset-frontend/src/visualizations/presets/MainPreset.js
+++ b/superset-frontend/src/visualizations/presets/MainPreset.js
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { isFeatureEnabled, Preset } from '@superset-ui/core';
+import { isFeatureEnabled, Preset, FeatureFlag } from '@superset-ui/core';
 import {
   BigNumberChartPlugin,
   BigNumberTotalChartPlugin,
@@ -56,7 +56,13 @@ import { DeckGLChartPreset } from '@superset-ui/legacy-preset-chart-deckgl';
 import {
   EchartsPieChartPlugin,
   EchartsBoxPlotChartPlugin,
+  EchartsAreaChartPlugin,
   EchartsTimeseriesChartPlugin,
+  EchartsTimeseriesBarChartPlugin,
+  EchartsTimeseriesLineChartPlugin,
+  EchartsTimeseriesScatterChartPlugin,
+  EchartsTimeseriesSmoothLineChartPlugin,
+  EchartsTimeseriesStepChartPlugin,
   EchartsGraphChartPlugin,
   EchartsGaugeChartPlugin,
   EchartsRadarChartPlugin,
@@ -76,7 +82,6 @@ import {
 import { PivotTableChartPlugin as PivotTableChartPluginV2 } from '@superset-ui/plugin-chart-pivot-table';
 import FilterBoxChartPlugin from '../FilterBox/FilterBoxChartPlugin';
 import TimeTableChartPlugin from '../TimeTable/TimeTableChartPlugin';
-import { FeatureFlag } from '../../featureFlags';
 
 export default class MainPreset extends Preset {
   constructor() {
@@ -134,9 +139,27 @@ export default class MainPreset extends Preset {
         new TreemapChartPlugin().configure({ key: 'treemap' }),
         new WordCloudChartPlugin().configure({ key: 'word_cloud' }),
         new WorldMapChartPlugin().configure({ key: 'world_map' }),
+        new EchartsAreaChartPlugin().configure({
+          key: 'echarts_area',
+        }),
         new EchartsTimeseriesChartPlugin().configure({
           key: 'echarts_timeseries',
         }),
+        new EchartsTimeseriesBarChartPlugin().configure({
+          key: 'echarts_timeseries_bar',
+        }),
+        new EchartsTimeseriesLineChartPlugin().configure({
+          key: 'echarts_timeseries_line',
+        }),
+        new EchartsTimeseriesSmoothLineChartPlugin().configure({
+          key: 'echarts_timeseries_smooth',
+        }),
+        new EchartsTimeseriesScatterChartPlugin().configure({
+          key: 'echarts_timeseries_scatter',
+        }),
+        new EchartsTimeseriesStepChartPlugin().configure({
+          key: 'echarts_timeseries_step',
+        }),
         new SelectFilterPlugin().configure({ key: 'filter_select' }),
         new RangeFilterPlugin().configure({ key: 'filter_range' }),
         new TimeFilterPlugin().configure({ key: 'filter_time' }),
diff --git a/superset-frontend/tsconfig.json b/superset-frontend/tsconfig.json
index cc79cf31ef33..ed0ce5349874 100644
--- a/superset-frontend/tsconfig.json
+++ b/superset-frontend/tsconfig.json
@@ -7,7 +7,7 @@
     "forceConsistentCasingInFileNames": true,
     "importHelpers": false,
     "jsx": "preserve",
-    "lib": ["dom", "esnext"],
+    "lib": ["dom",  "dom.iterable", "esnext"],
     "module": "esnext",
     "moduleResolution": "node",
     "noImplicitAny": true,
diff --git a/superset-frontend/webpack.config.js b/superset-frontend/webpack.config.js
index b5460f5a9f5b..327f6ac6277a 100644
--- a/superset-frontend/webpack.config.js
+++ b/superset-frontend/webpack.config.js
@@ -27,7 +27,6 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
-const TerserPlugin = require('terser-webpack-plugin');
 const ManifestPlugin = require('webpack-manifest-plugin');
 const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
 const parsedArgs = require('yargs').argv;
@@ -50,10 +49,11 @@ const {
 } = parsedArgs;
 const isDevMode = mode !== 'production';
 const isDevServer = process.argv[1].includes('webpack-dev-server');
+const ASSET_BASE_URL = process.env.ASSET_BASE_URL || '';
 
 const output = {
   path: BUILD_DIR,
-  publicPath: '/static/assets/', // necessary for lazy-loaded chunks
+  publicPath: `${ASSET_BASE_URL}/static/assets/`,
 };
 if (isDevMode) {
   output.filename = '[name].[hash:8].entry.js';
@@ -145,6 +145,7 @@ if (!process.env.CI) {
 if (!isDevServer) {
   plugins.push(
     new CleanWebpackPlugin({
+      dry: false,
       // required because the build directory is outside the frontend directory:
       dangerouslyAllowCleanPatternsOutsideProject: true,
     }),
@@ -277,7 +278,7 @@ const config = {
         // viz thumbnails are used in `addSlice` and `explore` page
         thumbnail: {
           name: 'thumbnail',
-          test: /thumbnail(Large)?\.png/i,
+          test: /thumbnail(Large)?\.(png|jpg)/i,
           priority: 20,
           enforce: true,
         },
@@ -346,6 +347,7 @@ const config = {
           new RegExp(`${APP_DIR}/src`),
           /superset-ui.*\/src/,
           new RegExp(`${APP_DIR}/.storybook`),
+          /@encodable/,
         ],
         use: [babelLoader],
       },
@@ -505,14 +507,6 @@ if (isDevMode) {
   if (hasSymlink) {
     console.log(''); // pure cosmetic new line
   }
-} else {
-  config.optimization.minimizer = [
-    new TerserPlugin({
-      cache: '.terser-plugin-cache/',
-      parallel: true,
-      extractComments: true,
-    }),
-  ];
 }
 
 // Bundle analyzer is disabled by default
diff --git a/superset-websocket/package-lock.json b/superset-websocket/package-lock.json
index 4256ec910f78..8bbb142da239 100644
--- a/superset-websocket/package-lock.json
+++ b/superset-websocket/package-lock.json
@@ -1619,22 +1619,26 @@
       "dev": true
     },
     "node_modules/browserslist": {
-      "version": "4.16.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
-      "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==",
+      "version": "4.16.6",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
+      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
       "dev": true,
       "dependencies": {
-        "caniuse-lite": "^1.0.30001181",
-        "colorette": "^1.2.1",
-        "electron-to-chromium": "^1.3.649",
+        "caniuse-lite": "^1.0.30001219",
+        "colorette": "^1.2.2",
+        "electron-to-chromium": "^1.3.723",
         "escalade": "^3.1.1",
-        "node-releases": "^1.1.70"
+        "node-releases": "^1.1.71"
       },
       "bin": {
         "browserslist": "cli.js"
       },
       "engines": {
         "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/browserslist"
       }
     },
     "node_modules/bs-logger": {
@@ -1708,10 +1712,14 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001196",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001196.tgz",
-      "integrity": "sha512-CPvObjD3ovWrNBaXlAIGWmg2gQQuJ5YhuciUOjPRox6hIQttu8O+b51dx6VIpIY9ESd2d0Vac1RKpICdG4rGUg==",
-      "dev": true
+      "version": "1.0.30001243",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001243.tgz",
+      "integrity": "sha512-vNxw9mkTBtkmLFnJRv/2rhs1yufpDfCkBZexG3Y0xdOH2Z/eE/85E4Dl5j1YUN34nZVsSp6vVRFQRrez9wJMRA==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/browserslist"
+      }
     },
     "node_modules/capture-exit": {
       "version": "2.0.0",
@@ -2248,9 +2256,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.3.681",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.681.tgz",
-      "integrity": "sha512-W6uYvSUTHuyX2DZklIESAqx57jfmGjUkd7Z3RWqLdj9Mmt39ylhBuvFXlskQnvBHj0MYXIeQI+mjiwVddZLSvA==",
+      "version": "1.3.770",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.770.tgz",
+      "integrity": "sha512-Kyh8DGK1KfEZuYKIHvuOmrKotsKZQ+qBkDIWHciE3QoFkxXB1KzPP+tfLilSHAfxTON0yYMnFCWkQtUOR7g6KQ==",
       "dev": true
     },
     "node_modules/emittery": {
@@ -3369,9 +3377,9 @@
       }
     },
     "node_modules/hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
       "dev": true
     },
     "node_modules/hot-shots": {
@@ -7377,11 +7385,23 @@
       }
     },
     "node_modules/ws": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz",
-      "integrity": "sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.2.tgz",
+      "integrity": "sha512-lkF7AWRicoB9mAgjeKbGqVUekLnSNO4VjKVnuPHpQeOxZOErX6BPXwJk70nFslRCEEA8EVW7ZjKwXaP9N+1sKQ==",
       "engines": {
         "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
     "node_modules/xml-name-validator": {
@@ -8847,16 +8867,16 @@
       "dev": true
     },
     "browserslist": {
-      "version": "4.16.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
-      "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==",
+      "version": "4.16.6",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
+      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001181",
-        "colorette": "^1.2.1",
-        "electron-to-chromium": "^1.3.649",
+        "caniuse-lite": "^1.0.30001219",
+        "colorette": "^1.2.2",
+        "electron-to-chromium": "^1.3.723",
         "escalade": "^3.1.1",
-        "node-releases": "^1.1.70"
+        "node-releases": "^1.1.71"
       }
     },
     "bs-logger": {
@@ -8918,9 +8938,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001196",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001196.tgz",
-      "integrity": "sha512-CPvObjD3ovWrNBaXlAIGWmg2gQQuJ5YhuciUOjPRox6hIQttu8O+b51dx6VIpIY9ESd2d0Vac1RKpICdG4rGUg==",
+      "version": "1.0.30001243",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001243.tgz",
+      "integrity": "sha512-vNxw9mkTBtkmLFnJRv/2rhs1yufpDfCkBZexG3Y0xdOH2Z/eE/85E4Dl5j1YUN34nZVsSp6vVRFQRrez9wJMRA==",
       "dev": true
     },
     "capture-exit": {
@@ -9365,9 +9385,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.3.681",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.681.tgz",
-      "integrity": "sha512-W6uYvSUTHuyX2DZklIESAqx57jfmGjUkd7Z3RWqLdj9Mmt39ylhBuvFXlskQnvBHj0MYXIeQI+mjiwVddZLSvA==",
+      "version": "1.3.770",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.770.tgz",
+      "integrity": "sha512-Kyh8DGK1KfEZuYKIHvuOmrKotsKZQ+qBkDIWHciE3QoFkxXB1KzPP+tfLilSHAfxTON0yYMnFCWkQtUOR7g6KQ==",
       "dev": true
     },
     "emittery": {
@@ -10260,9 +10280,9 @@
       }
     },
     "hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
       "dev": true
     },
     "hot-shots": {
@@ -13517,9 +13537,10 @@
       }
     },
     "ws": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz",
-      "integrity": "sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA=="
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.2.tgz",
+      "integrity": "sha512-lkF7AWRicoB9mAgjeKbGqVUekLnSNO4VjKVnuPHpQeOxZOErX6BPXwJk70nFslRCEEA8EVW7ZjKwXaP9N+1sKQ==",
+      "requires": {}
     },
     "xml-name-validator": {
       "version": "3.0.0",
diff --git a/superset/annotation_layers/annotations/api.py b/superset/annotation_layers/annotations/api.py
index 17c4ee5f6448..2e2f81fe2756 100644
--- a/superset/annotation_layers/annotations/api.py
+++ b/superset/annotation_layers/annotations/api.py
@@ -137,7 +137,7 @@ def _apply_layered_relation_to_rison(  # pylint: disable=invalid-name
     @permission_name("get")
     @rison(get_list_schema)
     def get_list(  # pylint: disable=arguments-differ
-        self, pk: int, **kwargs: Dict[str, Any]
+        self, pk: int, **kwargs: Any
     ) -> Response:
         """Get a list of annotations
         ---
@@ -198,7 +198,7 @@ def get_list(  # pylint: disable=arguments-differ
     @permission_name("get")
     @rison(get_item_schema)
     def get(  # pylint: disable=arguments-differ
-        self, pk: int, annotation_id: int, **kwargs: Dict[str, Any]
+        self, pk: int, annotation_id: int, **kwargs: Any
     ) -> Response:
         """Get item from Model
         ---
diff --git a/superset/annotation_layers/annotations/commands/bulk_delete.py b/superset/annotation_layers/annotations/commands/bulk_delete.py
index 9d9df6fab85f..6a164c877da8 100644
--- a/superset/annotation_layers/annotations/commands/bulk_delete.py
+++ b/superset/annotation_layers/annotations/commands/bulk_delete.py
@@ -44,7 +44,7 @@ def run(self) -> None:
             return None
         except DAODeleteFailedError as ex:
             logger.exception(ex.exception)
-            raise AnnotationBulkDeleteFailedError()
+            raise AnnotationBulkDeleteFailedError() from ex
 
     def validate(self) -> None:
         # Validate/populate model exists
diff --git a/superset/annotation_layers/annotations/commands/create.py b/superset/annotation_layers/annotations/commands/create.py
index 398e1b4c5442..cbcb09a4c5ce 100644
--- a/superset/annotation_layers/annotations/commands/create.py
+++ b/superset/annotation_layers/annotations/commands/create.py
@@ -48,7 +48,7 @@ def run(self) -> Model:
             annotation = AnnotationDAO.create(self._properties)
         except DAOCreateFailedError as ex:
             logger.exception(ex.exception)
-            raise AnnotationCreateFailedError()
+            raise AnnotationCreateFailedError() from ex
         return annotation
 
     def validate(self) -> None:
diff --git a/superset/annotation_layers/annotations/commands/delete.py b/superset/annotation_layers/annotations/commands/delete.py
index bd5c998a594e..3d874818dc6c 100644
--- a/superset/annotation_layers/annotations/commands/delete.py
+++ b/superset/annotation_layers/annotations/commands/delete.py
@@ -44,7 +44,7 @@ def run(self) -> Model:
             annotation = AnnotationDAO.delete(self._model)
         except DAODeleteFailedError as ex:
             logger.exception(ex.exception)
-            raise AnnotationDeleteFailedError()
+            raise AnnotationDeleteFailedError() from ex
         return annotation
 
     def validate(self) -> None:
diff --git a/superset/annotation_layers/annotations/commands/update.py b/superset/annotation_layers/annotations/commands/update.py
index 1942bffa7f71..eb544344f1ea 100644
--- a/superset/annotation_layers/annotations/commands/update.py
+++ b/superset/annotation_layers/annotations/commands/update.py
@@ -52,7 +52,7 @@ def run(self) -> Model:
             annotation = AnnotationDAO.update(self._model, self._properties)
         except DAOUpdateFailedError as ex:
             logger.exception(ex.exception)
-            raise AnnotationUpdateFailedError()
+            raise AnnotationUpdateFailedError() from ex
         return annotation
 
     def validate(self) -> None:
diff --git a/superset/annotation_layers/annotations/dao.py b/superset/annotation_layers/annotations/dao.py
index 50e4bcb29aee..3b6e5e72e709 100644
--- a/superset/annotation_layers/annotations/dao.py
+++ b/superset/annotation_layers/annotations/dao.py
@@ -39,10 +39,10 @@ def bulk_delete(models: Optional[List[Annotation]], commit: bool = True) -> None
             )
             if commit:
                 db.session.commit()
-        except SQLAlchemyError:
+        except SQLAlchemyError as ex:
             if commit:
                 db.session.rollback()
-            raise DAODeleteFailedError()
+            raise DAODeleteFailedError() from ex
 
     @staticmethod
     def validate_update_uniqueness(
diff --git a/superset/annotation_layers/annotations/schemas.py b/superset/annotation_layers/annotations/schemas.py
index 42af48d61b62..72edcc10d00f 100644
--- a/superset/annotation_layers/annotations/schemas.py
+++ b/superset/annotation_layers/annotations/schemas.py
@@ -51,8 +51,8 @@
 def validate_json(value: Union[bytes, bytearray, str]) -> None:
     try:
         utils.validate_json(value)
-    except SupersetException:
-        raise ValidationError("JSON not valid")
+    except SupersetException as ex:
+        raise ValidationError("JSON not valid") from ex
 
 
 class AnnotationPostSchema(Schema):
diff --git a/superset/annotation_layers/commands/bulk_delete.py b/superset/annotation_layers/commands/bulk_delete.py
index 148bdd0bd2d6..a828047fdda0 100644
--- a/superset/annotation_layers/commands/bulk_delete.py
+++ b/superset/annotation_layers/commands/bulk_delete.py
@@ -45,7 +45,7 @@ def run(self) -> None:
             return None
         except DAODeleteFailedError as ex:
             logger.exception(ex.exception)
-            raise AnnotationLayerBulkDeleteFailedError()
+            raise AnnotationLayerBulkDeleteFailedError() from ex
 
     def validate(self) -> None:
         # Validate/populate model exists
diff --git a/superset/annotation_layers/commands/create.py b/superset/annotation_layers/commands/create.py
index c62592194938..5e26bc49d4ae 100644
--- a/superset/annotation_layers/commands/create.py
+++ b/superset/annotation_layers/commands/create.py
@@ -44,7 +44,7 @@ def run(self) -> Model:
             annotation_layer = AnnotationLayerDAO.create(self._properties)
         except DAOCreateFailedError as ex:
             logger.exception(ex.exception)
-            raise AnnotationLayerCreateFailedError()
+            raise AnnotationLayerCreateFailedError() from ex
         return annotation_layer
 
     def validate(self) -> None:
diff --git a/superset/annotation_layers/commands/delete.py b/superset/annotation_layers/commands/delete.py
index dd9b2c476e3c..c439542b24d9 100644
--- a/superset/annotation_layers/commands/delete.py
+++ b/superset/annotation_layers/commands/delete.py
@@ -45,7 +45,7 @@ def run(self) -> Model:
             annotation_layer = AnnotationLayerDAO.delete(self._model)
         except DAODeleteFailedError as ex:
             logger.exception(ex.exception)
-            raise AnnotationLayerDeleteFailedError()
+            raise AnnotationLayerDeleteFailedError() from ex
         return annotation_layer
 
     def validate(self) -> None:
diff --git a/superset/annotation_layers/commands/update.py b/superset/annotation_layers/commands/update.py
index d5625ccb4da2..7e8f6d5bd7bb 100644
--- a/superset/annotation_layers/commands/update.py
+++ b/superset/annotation_layers/commands/update.py
@@ -48,7 +48,7 @@ def run(self) -> Model:
             annotation_layer = AnnotationLayerDAO.update(self._model, self._properties)
         except DAOUpdateFailedError as ex:
             logger.exception(ex.exception)
-            raise AnnotationLayerUpdateFailedError()
+            raise AnnotationLayerUpdateFailedError() from ex
         return annotation_layer
 
     def validate(self) -> None:
diff --git a/superset/annotation_layers/dao.py b/superset/annotation_layers/dao.py
index 9c848e59a46d..0ca19e270091 100644
--- a/superset/annotation_layers/dao.py
+++ b/superset/annotation_layers/dao.py
@@ -41,10 +41,10 @@ def bulk_delete(
             ).delete(synchronize_session="fetch")
             if commit:
                 db.session.commit()
-        except SQLAlchemyError:
+        except SQLAlchemyError as ex:
             if commit:
                 db.session.rollback()
-            raise DAODeleteFailedError()
+            raise DAODeleteFailedError() from ex
 
     @staticmethod
     def has_annotations(model_id: Union[int, List[int]]) -> bool:
diff --git a/superset/app.py b/superset/app.py
index a9862001f3f9..48883a92648b 100644
--- a/superset/app.py
+++ b/superset/app.py
@@ -17,42 +17,16 @@
 
 import logging
 import os
-from typing import Any, Callable, Dict
 
-import wtforms_json
-from flask import Flask, redirect
-from flask_appbuilder import expose, IndexView
-from flask_babel import gettext as __, lazy_gettext as _
-from flask_compress import Compress
+from flask import Flask
 
-from superset.connectors.connector_registry import ConnectorRegistry
-from superset.extensions import (
-    _event_logger,
-    APP_DIR,
-    appbuilder,
-    async_query_manager,
-    cache_manager,
-    celery_app,
-    csrf,
-    db,
-    encrypted_field_factory,
-    feature_flag_manager,
-    machine_auth_provider_factory,
-    manifest_processor,
-    migrate,
-    results_backend_manager,
-    talisman,
-)
-from superset.security import SupersetSecurityManager
-from superset.typing import FlaskResponse
-from superset.utils.core import pessimistic_connection_handling
-from superset.utils.log import DBEventLogger, get_event_logger_from_cfg_value
+from superset.initialization import SupersetAppInitializer
 
 logger = logging.getLogger(__name__)
 
 
 def create_app() -> Flask:
-    app = Flask(__name__)
+    app = SupersetApp(__name__)
 
     try:
         # Allow user to override our config completely
@@ -70,663 +44,5 @@ def create_app() -> Flask:
         raise ex
 
 
-class SupersetIndexView(IndexView):
-    @expose("/")
-    def index(self) -> FlaskResponse:
-        return redirect("/superset/welcome/")
-
-
-# pylint: disable=R0904
-class SupersetAppInitializer:
-    def __init__(self, app: Flask) -> None:
-        super().__init__()
-
-        self.flask_app = app
-        self.config = app.config
-        self.manifest: Dict[Any, Any] = {}
-
-    def pre_init(self) -> None:
-        """
-        Called before all other init tasks are complete
-        """
-        wtforms_json.init()
-
-        if not os.path.exists(self.config["DATA_DIR"]):
-            os.makedirs(self.config["DATA_DIR"])
-
-    def post_init(self) -> None:
-        """
-        Called after any other init tasks
-        """
-
-    def configure_celery(self) -> None:
-        celery_app.config_from_object(self.config["CELERY_CONFIG"])
-        celery_app.set_default()
-        flask_app = self.flask_app
-
-        # Here, we want to ensure that every call into Celery task has an app context
-        # setup properly
-        task_base = celery_app.Task
-
-        class AppContextTask(task_base):  # type: ignore
-            # pylint: disable=too-few-public-methods
-            abstract = True
-
-            # Grab each call into the task and set up an app context
-            def __call__(self, *args: Any, **kwargs: Any) -> Any:
-                with flask_app.app_context():  # type: ignore
-                    return task_base.__call__(self, *args, **kwargs)
-
-        celery_app.Task = AppContextTask
-
-    def init_views(self) -> None:
-        #
-        # We're doing local imports, as several of them import
-        # models which in turn try to import
-        # the global Flask app
-        #
-        # pylint: disable=too-many-locals
-        # pylint: disable=too-many-statements
-        # pylint: disable=too-many-branches
-        from superset.annotation_layers.api import AnnotationLayerRestApi
-        from superset.annotation_layers.annotations.api import AnnotationRestApi
-        from superset.async_events.api import AsyncEventsRestApi
-        from superset.cachekeys.api import CacheRestApi
-        from superset.charts.api import ChartRestApi
-        from superset.connectors.druid.views import (
-            Druid,
-            DruidClusterModelView,
-            DruidColumnInlineView,
-            DruidDatasourceModelView,
-            DruidMetricInlineView,
-        )
-        from superset.connectors.sqla.views import (
-            RowLevelSecurityFiltersModelView,
-            SqlMetricInlineView,
-            TableColumnInlineView,
-            TableModelView,
-        )
-        from superset.css_templates.api import CssTemplateRestApi
-        from superset.dashboards.api import DashboardRestApi
-        from superset.databases.api import DatabaseRestApi
-        from superset.datasets.api import DatasetRestApi
-        from superset.datasets.columns.api import DatasetColumnsRestApi
-        from superset.datasets.metrics.api import DatasetMetricRestApi
-        from superset.queries.api import QueryRestApi
-        from superset.security.api import SecurityRestApi
-        from superset.queries.saved_queries.api import SavedQueryRestApi
-        from superset.reports.api import ReportScheduleRestApi
-        from superset.reports.logs.api import ReportExecutionLogRestApi
-        from superset.views.access_requests import AccessRequestsModelView
-        from superset.dashboards.filter_sets.api import FilterSetRestApi
-        from superset.views.alerts import (
-            AlertLogModelView,
-            AlertModelView,
-            AlertObservationModelView,
-            AlertView,
-            ReportView,
-        )
-        from superset.views.annotations import (
-            AnnotationLayerModelView,
-            AnnotationModelView,
-        )
-        from superset.views.api import Api
-        from superset.views.chart.views import SliceAsync, SliceModelView
-        from superset.views.core import Superset
-        from superset.views.css_templates import (
-            CssTemplateAsyncModelView,
-            CssTemplateModelView,
-        )
-        from superset.views.dashboard.views import (
-            Dashboard,
-            DashboardModelView,
-            DashboardModelViewAsync,
-        )
-        from superset.views.database.views import (
-            CsvToDatabaseView,
-            DatabaseView,
-            ExcelToDatabaseView,
-        )
-        from superset.views.datasource import Datasource
-        from superset.views.dynamic_plugins import DynamicPluginsView
-        from superset.views.key_value import KV
-        from superset.views.log.api import LogRestApi
-        from superset.views.log.views import LogModelView
-        from superset.views.redirects import R
-        from superset.views.schedules import (
-            DashboardEmailScheduleView,
-            SliceEmailScheduleView,
-        )
-        from superset.views.sql_lab import (
-            SavedQueryView,
-            SavedQueryViewApi,
-            SqlLab,
-            TableSchemaView,
-            TabStateView,
-        )
-        from superset.views.tags import TagView
-
-        #
-        # Setup API views
-        #
-        appbuilder.add_api(AnnotationRestApi)
-        appbuilder.add_api(AnnotationLayerRestApi)
-        appbuilder.add_api(AsyncEventsRestApi)
-        appbuilder.add_api(CacheRestApi)
-        appbuilder.add_api(ChartRestApi)
-        appbuilder.add_api(CssTemplateRestApi)
-        appbuilder.add_api(FilterSetRestApi)
-        appbuilder.add_api(DashboardRestApi)
-        appbuilder.add_api(DatabaseRestApi)
-        appbuilder.add_api(DatasetRestApi)
-        appbuilder.add_api(DatasetColumnsRestApi)
-        appbuilder.add_api(DatasetMetricRestApi)
-        appbuilder.add_api(QueryRestApi)
-        appbuilder.add_api(SavedQueryRestApi)
-        appbuilder.add_api(ReportScheduleRestApi)
-        appbuilder.add_api(ReportExecutionLogRestApi)
-        #
-        # Setup regular views
-        #
-        appbuilder.add_link(
-            "Home",
-            label=__("Home"),
-            href="/superset/welcome/",
-            cond=lambda: bool(appbuilder.app.config["LOGO_TARGET_PATH"]),
-        )
-        appbuilder.add_view(
-            AnnotationLayerModelView,
-            "Annotation Layers",
-            label=__("Annotation Layers"),
-            icon="fa-comment",
-            category="Manage",
-            category_label=__("Manage"),
-            category_icon="",
-        )
-        appbuilder.add_view(
-            DatabaseView,
-            "Databases",
-            label=__("Databases"),
-            icon="fa-database",
-            category="Data",
-            category_label=__("Data"),
-            category_icon="fa-database",
-        )
-        appbuilder.add_link(
-            "Datasets",
-            label=__("Datasets"),
-            href="/tablemodelview/list/",
-            icon="fa-table",
-            category="Data",
-            category_label=__("Data"),
-            category_icon="fa-table",
-        )
-        appbuilder.add_separator("Data")
-        appbuilder.add_view(
-            SliceModelView,
-            "Charts",
-            label=__("Charts"),
-            icon="fa-bar-chart",
-            category="",
-            category_icon="",
-        )
-        appbuilder.add_view(
-            DashboardModelView,
-            "Dashboards",
-            label=__("Dashboards"),
-            icon="fa-dashboard",
-            category="",
-            category_icon="",
-        )
-        appbuilder.add_view(
-            DynamicPluginsView,
-            "Plugins",
-            label=__("Plugins"),
-            category="Manage",
-            category_label=__("Manage"),
-            icon="fa-puzzle-piece",
-            menu_cond=lambda: feature_flag_manager.is_feature_enabled(
-                "DYNAMIC_PLUGINS"
-            ),
-        )
-        appbuilder.add_view(
-            CssTemplateModelView,
-            "CSS Templates",
-            label=__("CSS Templates"),
-            icon="fa-css3",
-            category="Manage",
-            category_label=__("Manage"),
-            category_icon="",
-        )
-        appbuilder.add_view(
-            RowLevelSecurityFiltersModelView,
-            "Row Level Security",
-            label=__("Row level security"),
-            category="Security",
-            category_label=__("Security"),
-            icon="fa-lock",
-            menu_cond=lambda: feature_flag_manager.is_feature_enabled(
-                "ROW_LEVEL_SECURITY"
-            ),
-        )
-
-        #
-        # Setup views with no menu
-        #
-        appbuilder.add_view_no_menu(Api)
-        appbuilder.add_view_no_menu(CssTemplateAsyncModelView)
-        appbuilder.add_view_no_menu(CsvToDatabaseView)
-        appbuilder.add_view_no_menu(ExcelToDatabaseView)
-        appbuilder.add_view_no_menu(Dashboard)
-        appbuilder.add_view_no_menu(DashboardModelViewAsync)
-        appbuilder.add_view_no_menu(Datasource)
-        appbuilder.add_view_no_menu(KV)
-        appbuilder.add_view_no_menu(R)
-        appbuilder.add_view_no_menu(SavedQueryView)
-        appbuilder.add_view_no_menu(SavedQueryViewApi)
-        appbuilder.add_view_no_menu(SliceAsync)
-        appbuilder.add_view_no_menu(SqlLab)
-        appbuilder.add_view_no_menu(SqlMetricInlineView)
-        appbuilder.add_view_no_menu(AnnotationModelView)
-        appbuilder.add_view_no_menu(Superset)
-        appbuilder.add_view_no_menu(TableColumnInlineView)
-        appbuilder.add_view_no_menu(TableModelView)
-        appbuilder.add_view_no_menu(TableSchemaView)
-        appbuilder.add_view_no_menu(TabStateView)
-        appbuilder.add_view_no_menu(TagView)
-
-        #
-        # Add links
-        #
-        appbuilder.add_link(
-            "Import Dashboards",
-            label=__("Import Dashboards"),
-            href="/superset/import_dashboards/",
-            icon="fa-cloud-upload",
-            category="Manage",
-            category_label=__("Manage"),
-            category_icon="fa-wrench",
-            cond=lambda: not feature_flag_manager.is_feature_enabled(
-                "VERSIONED_EXPORT"
-            ),
-        )
-        appbuilder.add_link(
-            "SQL Editor",
-            label=_("SQL Editor"),
-            href="/superset/sqllab/",
-            category_icon="fa-flask",
-            icon="fa-flask",
-            category="SQL Lab",
-            category_label=__("SQL Lab"),
-        )
-        appbuilder.add_link(
-            __("Saved Queries"),
-            href="/savedqueryview/list/",
-            icon="fa-save",
-            category="SQL Lab",
-        )
-        appbuilder.add_link(
-            "Query Search",
-            label=_("Query History"),
-            href="/superset/sqllab/history/",
-            icon="fa-search",
-            category_icon="fa-flask",
-            category="SQL Lab",
-            category_label=__("SQL Lab"),
-        )
-        appbuilder.add_link(
-            "Upload a CSV",
-            label=__("Upload a CSV"),
-            href="/csvtodatabaseview/form",
-            icon="fa-upload",
-            category="Data",
-            category_label=__("Data"),
-            category_icon="fa-wrench",
-            cond=lambda: bool(
-                self.config["CSV_EXTENSIONS"].intersection(
-                    self.config["ALLOWED_EXTENSIONS"]
-                )
-            ),
-        )
-
-        try:
-            import xlrd  # pylint: disable=unused-import
-
-            appbuilder.add_link(
-                "Upload Excel",
-                label=__("Upload Excel"),
-                href="/exceltodatabaseview/form",
-                icon="fa-upload",
-                category="Data",
-                category_label=__("Data"),
-                category_icon="fa-wrench",
-                cond=lambda: bool(
-                    self.config["EXCEL_EXTENSIONS"].intersection(
-                        self.config["ALLOWED_EXTENSIONS"]
-                    )
-                ),
-            )
-        except ImportError:
-            pass
-
-        appbuilder.add_api(LogRestApi)
-        appbuilder.add_view(
-            LogModelView,
-            "Action Log",
-            label=__("Action Log"),
-            category="Security",
-            category_label=__("Security"),
-            icon="fa-list-ol",
-            menu_cond=lambda: (
-                self.config["FAB_ADD_SECURITY_VIEWS"]
-                and self.config["SUPERSET_LOG_VIEW"]
-            ),
-        )
-        appbuilder.add_api(SecurityRestApi)
-        #
-        # Conditionally setup email views
-        #
-        if self.config["ENABLE_SCHEDULED_EMAIL_REPORTS"]:
-            logging.warning(
-                "ENABLE_SCHEDULED_EMAIL_REPORTS "
-                "is deprecated and will be removed in version 2.0.0"
-            )
-
-        appbuilder.add_separator(
-            "Manage", cond=lambda: self.config["ENABLE_SCHEDULED_EMAIL_REPORTS"]
-        )
-        appbuilder.add_view(
-            DashboardEmailScheduleView,
-            "Dashboard Email Schedules",
-            label=__("Dashboard Emails"),
-            category="Manage",
-            category_label=__("Manage"),
-            icon="fa-search",
-            menu_cond=lambda: self.config["ENABLE_SCHEDULED_EMAIL_REPORTS"],
-        )
-        appbuilder.add_view(
-            SliceEmailScheduleView,
-            "Chart Emails",
-            label=__("Chart Email Schedules"),
-            category="Manage",
-            category_label=__("Manage"),
-            icon="fa-search",
-            menu_cond=lambda: self.config["ENABLE_SCHEDULED_EMAIL_REPORTS"],
-        )
-
-        if self.config["ENABLE_ALERTS"]:
-            logging.warning(
-                "ENABLE_ALERTS is deprecated and will be removed in version 2.0.0"
-            )
-
-        appbuilder.add_view(
-            AlertModelView,
-            "Alerts",
-            label=__("Alerts"),
-            category="Manage",
-            category_label=__("Manage"),
-            icon="fa-exclamation-triangle",
-            menu_cond=lambda: bool(self.config["ENABLE_ALERTS"]),
-        )
-        appbuilder.add_view_no_menu(AlertLogModelView)
-        appbuilder.add_view_no_menu(AlertObservationModelView)
-
-        appbuilder.add_view(
-            AlertView,
-            "Alerts & Report",
-            label=__("Alerts & Reports"),
-            category="Manage",
-            category_label=__("Manage"),
-            icon="fa-exclamation-triangle",
-            menu_cond=lambda: feature_flag_manager.is_feature_enabled("ALERT_REPORTS"),
-        )
-        appbuilder.add_view_no_menu(ReportView)
-
-        appbuilder.add_view(
-            AccessRequestsModelView,
-            "Access requests",
-            label=__("Access requests"),
-            category="Security",
-            category_label=__("Security"),
-            icon="fa-table",
-            menu_cond=lambda: bool(self.config["ENABLE_ACCESS_REQUEST"]),
-        )
-
-        #
-        # Druid Views
-        #
-        appbuilder.add_separator(
-            "Data", cond=lambda: bool(self.config["DRUID_IS_ACTIVE"])
-        )
-        appbuilder.add_view(
-            DruidDatasourceModelView,
-            "Druid Datasources",
-            label=__("Druid Datasources"),
-            category="Data",
-            category_label=__("Data"),
-            icon="fa-cube",
-            menu_cond=lambda: bool(self.config["DRUID_IS_ACTIVE"]),
-        )
-        appbuilder.add_view(
-            DruidClusterModelView,
-            name="Druid Clusters",
-            label=__("Druid Clusters"),
-            icon="fa-cubes",
-            category="Data",
-            category_label=__("Data"),
-            category_icon="fa-database",
-            menu_cond=lambda: bool(self.config["DRUID_IS_ACTIVE"]),
-        )
-        appbuilder.add_view_no_menu(DruidMetricInlineView)
-        appbuilder.add_view_no_menu(DruidColumnInlineView)
-        appbuilder.add_view_no_menu(Druid)
-
-        appbuilder.add_link(
-            "Scan New Datasources",
-            label=__("Scan New Datasources"),
-            href="/druid/scan_new_datasources/",
-            category="Data",
-            category_label=__("Data"),
-            category_icon="fa-database",
-            icon="fa-refresh",
-            cond=lambda: bool(
-                self.config["DRUID_IS_ACTIVE"]
-                and self.config["DRUID_METADATA_LINKS_ENABLED"]
-            ),
-        )
-        appbuilder.add_link(
-            "Refresh Druid Metadata",
-            label=__("Refresh Druid Metadata"),
-            href="/druid/refresh_datasources/",
-            category="Data",
-            category_label=__("Data"),
-            category_icon="fa-database",
-            icon="fa-cog",
-            cond=lambda: bool(
-                self.config["DRUID_IS_ACTIVE"]
-                and self.config["DRUID_METADATA_LINKS_ENABLED"]
-            ),
-        )
-        appbuilder.add_separator(
-            "Data", cond=lambda: bool(self.config["DRUID_IS_ACTIVE"])
-        )
-
-    def init_app_in_ctx(self) -> None:
-        """
-        Runs init logic in the context of the app
-        """
-        self.configure_feature_flags()
-        self.configure_fab()
-        self.configure_url_map_converters()
-        self.configure_data_sources()
-        self.configure_auth_provider()
-        self.configure_async_queries()
-
-        # Hook that provides administrators a handle on the Flask APP
-        # after initialization
-        flask_app_mutator = self.config["FLASK_APP_MUTATOR"]
-        if flask_app_mutator:
-            flask_app_mutator(self.flask_app)
-
-        self.init_views()
-
-    def init_app(self) -> None:
-        """
-        Main entry point which will delegate to other methods in
-        order to fully init the app
-        """
-        self.pre_init()
-        # Configuration of logging must be done first to apply the formatter properly
-        self.configure_logging()
-        self.configure_db_encrypt()
-        self.setup_db()
-        self.configure_celery()
-        self.setup_event_logger()
-        self.setup_bundle_manifest()
-        self.register_blueprints()
-        self.configure_wtf()
-        self.configure_middlewares()
-        self.configure_cache()
-
-        with self.flask_app.app_context():  # type: ignore
-            self.init_app_in_ctx()
-
-        self.post_init()
-
-    def configure_auth_provider(self) -> None:
-        machine_auth_provider_factory.init_app(self.flask_app)
-
-    def setup_event_logger(self) -> None:
-        _event_logger["event_logger"] = get_event_logger_from_cfg_value(
-            self.flask_app.config.get("EVENT_LOGGER", DBEventLogger())
-        )
-
-    def configure_data_sources(self) -> None:
-        # Registering sources
-        module_datasource_map = self.config["DEFAULT_MODULE_DS_MAP"]
-        module_datasource_map.update(self.config["ADDITIONAL_MODULE_DS_MAP"])
-        ConnectorRegistry.register_sources(module_datasource_map)
-
-    def configure_cache(self) -> None:
-        cache_manager.init_app(self.flask_app)
-        results_backend_manager.init_app(self.flask_app)
-
-    def configure_feature_flags(self) -> None:
-        feature_flag_manager.init_app(self.flask_app)
-
-    def configure_fab(self) -> None:
-        if self.config["SILENCE_FAB"]:
-            logging.getLogger("flask_appbuilder").setLevel(logging.ERROR)
-
-        custom_sm = self.config["CUSTOM_SECURITY_MANAGER"] or SupersetSecurityManager
-        if not issubclass(custom_sm, SupersetSecurityManager):
-            raise Exception(
-                """Your CUSTOM_SECURITY_MANAGER must now extend SupersetSecurityManager,
-                 not FAB's security manager.
-                 See [4565] in UPDATING.md"""
-            )
-
-        appbuilder.indexview = SupersetIndexView
-        appbuilder.base_template = "superset/base.html"
-        appbuilder.security_manager_class = custom_sm
-        appbuilder.init_app(self.flask_app, db.session)
-
-    def configure_url_map_converters(self) -> None:
-        #
-        # Doing local imports here as model importing causes a reference to
-        # app.config to be invoked and we need the current_app to have been setup
-        #
-        from superset.utils.url_map_converters import (
-            ObjectTypeConverter,
-            RegexConverter,
-        )
-
-        self.flask_app.url_map.converters["regex"] = RegexConverter
-        self.flask_app.url_map.converters["object_type"] = ObjectTypeConverter
-
-    def configure_middlewares(self) -> None:
-        if self.config["ENABLE_CORS"]:
-            from flask_cors import CORS
-
-            CORS(self.flask_app, **self.config["CORS_OPTIONS"])
-
-        if self.config["ENABLE_PROXY_FIX"]:
-            from werkzeug.middleware.proxy_fix import ProxyFix
-
-            self.flask_app.wsgi_app = ProxyFix(  # type: ignore
-                self.flask_app.wsgi_app, **self.config["PROXY_FIX_CONFIG"]
-            )
-
-        if self.config["ENABLE_CHUNK_ENCODING"]:
-
-            class ChunkedEncodingFix:  # pylint: disable=too-few-public-methods
-                def __init__(self, app: Flask) -> None:
-                    self.app = app
-
-                def __call__(
-                    self, environ: Dict[str, Any], start_response: Callable[..., Any]
-                ) -> Any:
-                    # Setting wsgi.input_terminated tells werkzeug.wsgi to ignore
-                    # content-length and read the stream till the end.
-                    if environ.get("HTTP_TRANSFER_ENCODING", "").lower() == "chunked":
-                        environ["wsgi.input_terminated"] = True
-                    return self.app(environ, start_response)
-
-            self.flask_app.wsgi_app = ChunkedEncodingFix(  # type: ignore
-                self.flask_app.wsgi_app  # type: ignore
-            )
-
-        if self.config["UPLOAD_FOLDER"]:
-            try:
-                os.makedirs(self.config["UPLOAD_FOLDER"])
-            except OSError:
-                pass
-
-        for middleware in self.config["ADDITIONAL_MIDDLEWARE"]:
-            self.flask_app.wsgi_app = middleware(  # type: ignore
-                self.flask_app.wsgi_app
-            )
-
-        # Flask-Compress
-        Compress(self.flask_app)
-
-        if self.config["TALISMAN_ENABLED"]:
-            talisman.init_app(self.flask_app, **self.config["TALISMAN_CONFIG"])
-
-    def configure_logging(self) -> None:
-        self.config["LOGGING_CONFIGURATOR"].configure_logging(
-            self.config, self.flask_app.debug
-        )
-
-    def configure_db_encrypt(self) -> None:
-        encrypted_field_factory.init_app(self.flask_app)
-
-    def setup_db(self) -> None:
-        db.init_app(self.flask_app)
-
-        with self.flask_app.app_context():  # type: ignore
-            pessimistic_connection_handling(db.engine)
-
-        migrate.init_app(self.flask_app, db=db, directory=APP_DIR + "/migrations")
-
-    def configure_wtf(self) -> None:
-        if self.config["WTF_CSRF_ENABLED"]:
-            csrf.init_app(self.flask_app)
-            csrf_exempt_list = self.config["WTF_CSRF_EXEMPT_LIST"]
-            for ex in csrf_exempt_list:
-                csrf.exempt(ex)
-
-    def configure_async_queries(self) -> None:
-        if feature_flag_manager.is_feature_enabled("GLOBAL_ASYNC_QUERIES"):
-            async_query_manager.init_app(self.flask_app)
-
-    def register_blueprints(self) -> None:
-        for bp in self.config["BLUEPRINTS"]:
-            try:
-                logger.info("Registering blueprint: %s", bp.name)
-                self.flask_app.register_blueprint(bp)
-            except Exception:  # pylint: disable=broad-except
-                logger.exception("blueprint registration failed")
-
-    def setup_bundle_manifest(self) -> None:
-        manifest_processor.init_app(self.flask_app)
+class SupersetApp(Flask):
+    pass
diff --git a/superset/charts/api.py b/superset/charts/api.py
index bb92b3da20ef..7a21fe2676d0 100644
--- a/superset/charts/api.py
+++ b/superset/charts/api.py
@@ -52,6 +52,7 @@
 from superset.charts.commands.update import UpdateChartCommand
 from superset.charts.dao import ChartDAO
 from superset.charts.filters import ChartAllTextFilter, ChartFavoriteFilter, ChartFilter
+from superset.charts.post_processing import apply_post_process
 from superset.charts.schemas import (
     CHART_SCHEMAS,
     ChartPostSchema,
@@ -107,6 +108,7 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]:
         RouteMethod.RELATED,
         "bulk_delete",  # not using RouteMethod since locally defined
         "data",
+        "get_data",
         "data_from_cache",
         "viz_types",
         "favorite_status",
@@ -128,6 +130,7 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]:
         "params",
         "slice_name",
         "viz_type",
+        "query_context",
     ]
     show_select_columns = show_columns + ["table.id"]
     list_columns = [
@@ -149,6 +152,10 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]:
         "description_markeddown",
         "edit_url",
         "id",
+        "last_saved_at",
+        "last_saved_by.id",
+        "last_saved_by.first_name",
+        "last_saved_by.last_name",
         "owners.first_name",
         "owners.id",
         "owners.last_name",
@@ -167,12 +174,20 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]:
         "changed_on_delta_humanized",
         "datasource_id",
         "datasource_name",
+        "last_saved_at",
+        "last_saved_by.id",
+        "last_saved_by.first_name",
+        "last_saved_by.last_name",
         "slice_name",
         "viz_type",
     ]
     search_columns = [
         "created_by",
         "changed_by",
+        "last_saved_at",
+        "last_saved_by.id",
+        "last_saved_by.first_name",
+        "last_saved_by.last_name",
         "datasource_id",
         "datasource_name",
         "datasource_type",
@@ -336,7 +351,6 @@ def put(self, pk: int) -> Response:
             500:
               $ref: '#/components/responses/500'
         """
-
         if not request.is_json:
             return self.response_400(message="Request is not JSON")
         try:
@@ -344,7 +358,6 @@ def put(self, pk: int) -> Response:
         # This validates custom Schema with custom validations
         except ValidationError as error:
             return self.response_400(message=error.messages)
-
         try:
             changed_model = UpdateChartCommand(g.user, pk, item).run()
             response = self.response(200, id=changed_model.id, result=item)
@@ -480,17 +493,18 @@ def bulk_delete(self, **kwargs: Any) -> Response:
         except ChartBulkDeleteFailedError as ex:
             return self.response_422(message=str(ex))
 
-    def get_data_response(
-        self, command: ChartDataCommand, force_cached: bool = False
+    def send_chart_response(
+        self, result: Dict[Any, Any], form_data: Optional[Dict[str, Any]] = None,
     ) -> Response:
-        try:
-            result = command.run(force_cached=force_cached)
-        except ChartDataCacheLoadError as exc:
-            return self.response_422(message=exc.message)
-        except ChartDataQueryFailedError as exc:
-            return self.response_400(message=exc.message)
-
+        result_type = result["query_context"].result_type
         result_format = result["query_context"].result_format
+
+        # Post-process the data so it matches the data presented in the chart.
+        # This is needed for sending reports based on text charts that do the
+        # post-processing of data, eg, the pivot table.
+        if result_type == ChartDataResultType.POST_PROCESSED:
+            result = apply_post_process(result, form_data)
+
         if result_format == ChartDataResultFormat.CSV:
             # Verify user has permission to export CSV file
             if not security_manager.can_access("can_csv", "Superset"):
@@ -512,6 +526,123 @@ def get_data_response(
 
         return self.response_400(message=f"Unsupported result_format: {result_format}")
 
+    def get_data_response(
+        self,
+        command: ChartDataCommand,
+        force_cached: bool = False,
+        form_data: Optional[Dict[str, Any]] = None,
+    ) -> Response:
+        try:
+            result = command.run(force_cached=force_cached)
+        except ChartDataCacheLoadError as exc:
+            return self.response_422(message=exc.message)
+        except ChartDataQueryFailedError as exc:
+            return self.response_400(message=exc.message)
+
+        return self.send_chart_response(result, form_data)
+
+    @expose("/<int:pk>/data/", methods=["GET"])
+    @protect()
+    @statsd_metrics
+    @event_logger.log_this_with_context(
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.data",
+        log_to_statsd=False,
+    )
+    def get_data(self, pk: int) -> Response:
+        """
+        Takes a chart ID and uses the query context stored when the chart was saved
+        to return payload data response.
+        ---
+        get:
+          description: >-
+            Takes a chart ID and uses the query context stored when the chart was saved
+            to return payload data response.
+          parameters:
+          - in: path
+            schema:
+              type: integer
+            name: pk
+            description: The chart ID
+          - in: query
+            name: format
+            description: The format in which the data should be returned
+            schema:
+              type: string
+          - in: query
+            name: type
+            description: The type in which the data should be returned
+            schema:
+              type: string
+          responses:
+            200:
+              description: Query result
+              content:
+                application/json:
+                  schema:
+                    $ref: "#/components/schemas/ChartDataResponseSchema"
+            202:
+              description: Async job details
+              content:
+                application/json:
+                  schema:
+                    $ref: "#/components/schemas/ChartDataAsyncResponseSchema"
+            400:
+              $ref: '#/components/responses/400'
+            401:
+              $ref: '#/components/responses/401'
+            500:
+              $ref: '#/components/responses/500'
+        """
+        chart = self.datamodel.get(pk, self._base_filters)
+        if not chart:
+            return self.response_404()
+
+        try:
+            json_body = json.loads(chart.query_context)
+        except (TypeError, json.decoder.JSONDecodeError):
+            json_body = None
+
+        if json_body is None:
+            return self.response_400(
+                message=_(
+                    "Chart has no query context saved. Please save the chart again."
+                )
+            )
+
+        # override saved query context
+        json_body["result_format"] = request.args.get(
+            "format", ChartDataResultFormat.JSON
+        )
+        json_body["result_type"] = request.args.get("type", ChartDataResultType.FULL)
+
+        try:
+            command = ChartDataCommand()
+            query_context = command.set_query_context(json_body)
+            command.validate()
+        except QueryObjectValidationError as error:
+            return self.response_400(message=error.message)
+        except ValidationError as error:
+            return self.response_400(
+                message=_(
+                    "Request is incorrect: %(error)s", error=error.normalized_messages()
+                )
+            )
+
+        # TODO: support CSV, SQL query and other non-JSON types
+        if (
+            is_feature_enabled("GLOBAL_ASYNC_QUERIES")
+            and query_context.result_format == ChartDataResultFormat.JSON
+            and query_context.result_type == ChartDataResultType.FULL
+        ):
+            return self._run_async(command)
+
+        try:
+            form_data = json.loads(chart.params)
+        except (TypeError, json.decoder.JSONDecodeError):
+            form_data = {}
+
+        return self.get_data_response(command, form_data=form_data)
+
     @expose("/data", methods=["POST"])
     @protect()
     @statsd_metrics
@@ -589,16 +720,37 @@ def data(self) -> Response:
             and query_context.result_format == ChartDataResultFormat.JSON
             and query_context.result_type == ChartDataResultType.FULL
         ):
+            return self._run_async(command)
 
-            try:
-                command.validate_async_request(request)
-            except AsyncQueryTokenException:
-                return self.response_401()
+        return self.get_data_response(command)
+
+    def _run_async(self, command: ChartDataCommand) -> Response:
+        """
+        Execute command as an async query.
+        """
+        # First, look for the chart query results in the cache.
+        try:
+            result = command.run(force_cached=True)
+        except ChartDataCacheLoadError:
+            result = None  # type: ignore
 
-            result = command.run_async(g.user.get_id())
-            return self.response(202, **result)
+        already_cached_result = result is not None
 
-        return self.get_data_response(command)
+        # If the chart query has already been cached, return it immediately.
+        if already_cached_result:
+            return self.send_chart_response(result)
+
+        # Otherwise, kick off a background job to run the chart query.
+        # Clients will either poll or be notified of query completion,
+        # at which point they will call the /data/<cache_key> endpoint
+        # to retrieve the results.
+        try:
+            command.validate_async_request(request)
+        except AsyncQueryTokenException:
+            return self.response_401()
+
+        result = command.run_async(g.user.get_id())
+        return self.response(202, **result)
 
     @expose("/data/<cache_key>", methods=["GET"])
     @protect()
@@ -664,7 +816,7 @@ def data_from_cache(self, cache_key: str) -> Response:
         f".cache_screenshot",
         log_to_statsd=False,
     )
-    def cache_screenshot(self, pk: int, **kwargs: Dict[str, bool]) -> WerkzeugResponse:
+    def cache_screenshot(self, pk: int, **kwargs: Any) -> WerkzeugResponse:
         """
         ---
         get:
@@ -796,9 +948,7 @@ def screenshot(self, pk: int, digest: str) -> WerkzeugResponse:
         action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.thumbnail",
         log_to_statsd=False,
     )
-    def thumbnail(
-        self, pk: int, digest: str, **kwargs: Dict[str, bool]
-    ) -> WerkzeugResponse:
+    def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
         """Get Chart thumbnail
         ---
         get:
@@ -848,6 +998,7 @@ def thumbnail(
         )
         # If not screenshot then send request to compute thumb to celery
         if not screenshot:
+            self.incr_stats("async", self.thumbnail.__name__)
             logger.info(
                 "Triggering thumbnail compute (chart id: %s) ASYNC", str(chart.id)
             )
@@ -855,11 +1006,13 @@ def thumbnail(
             return self.response(202, message="OK Async")
         # If digests
         if chart.digest != digest:
+            self.incr_stats("redirect", self.thumbnail.__name__)
             return redirect(
                 url_for(
                     f"{self.__class__.__name__}.thumbnail", pk=pk, digest=chart.digest
                 )
             )
+        self.incr_stats("from_cache", self.thumbnail.__name__)
         return Response(
             FileWrapper(screenshot), mimetype="image/png", direct_passthrough=True
         )
@@ -903,6 +1056,7 @@ def export(self, **kwargs: Any) -> Response:
             500:
               $ref: '#/components/responses/500'
         """
+        token = request.args.get("token")
         requested_ids = kwargs["rison"]
         timestamp = datetime.now().strftime("%Y%m%dT%H%M%S")
         root = f"chart_export_{timestamp}"
@@ -918,12 +1072,15 @@ def export(self, **kwargs: Any) -> Response:
                 return self.response_404()
         buf.seek(0)
 
-        return send_file(
+        response = send_file(
             buf,
             mimetype="application/zip",
             as_attachment=True,
             attachment_filename=filename,
         )
+        if token:
+            response.set_cookie(token, "done", max_age=600)
+        return response
 
     @expose("/favorite_status/", methods=["GET"])
     @protect()
diff --git a/superset/charts/commands/bulk_delete.py b/superset/charts/commands/bulk_delete.py
index 463f17bc07fc..26a3fce9e41c 100644
--- a/superset/charts/commands/bulk_delete.py
+++ b/superset/charts/commands/bulk_delete.py
@@ -49,7 +49,7 @@ def run(self) -> None:
             ChartDAO.bulk_delete(self._models)
         except DeleteFailedError as ex:
             logger.exception(ex.exception)
-            raise ChartBulkDeleteFailedError()
+            raise ChartBulkDeleteFailedError() from ex
 
     def validate(self) -> None:
         # Validate/populate model exists
@@ -67,5 +67,5 @@ def validate(self) -> None:
         for model in self._models:
             try:
                 check_ownership(model)
-            except SupersetSecurityException:
-                raise ChartForbiddenError()
+            except SupersetSecurityException as ex:
+                raise ChartForbiddenError() from ex
diff --git a/superset/charts/commands/create.py b/superset/charts/commands/create.py
index 1425396e0e91..36dca581a784 100644
--- a/superset/charts/commands/create.py
+++ b/superset/charts/commands/create.py
@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import logging
+from datetime import datetime
 from typing import Any, Dict, List, Optional
 
 from flask_appbuilder.models.sqla import Model
@@ -27,15 +28,15 @@
     DashboardsNotFoundValidationError,
 )
 from superset.charts.dao import ChartDAO
-from superset.commands.base import BaseCommand
-from superset.commands.utils import get_datasource_by_id, populate_owners
+from superset.commands.base import BaseCommand, CreateMixin
+from superset.commands.utils import get_datasource_by_id
 from superset.dao.exceptions import DAOCreateFailedError
 from superset.dashboards.dao import DashboardDAO
 
 logger = logging.getLogger(__name__)
 
 
-class CreateChartCommand(BaseCommand):
+class CreateChartCommand(CreateMixin, BaseCommand):
     def __init__(self, user: User, data: Dict[str, Any]):
         self._actor = user
         self._properties = data.copy()
@@ -43,10 +44,12 @@ def __init__(self, user: User, data: Dict[str, Any]):
     def run(self) -> Model:
         self.validate()
         try:
+            self._properties["last_saved_at"] = datetime.now()
+            self._properties["last_saved_by"] = self._actor
             chart = ChartDAO.create(self._properties)
         except DAOCreateFailedError as ex:
             logger.exception(ex.exception)
-            raise ChartCreateFailedError()
+            raise ChartCreateFailedError() from ex
         return chart
 
     def validate(self) -> None:
@@ -70,7 +73,7 @@ def validate(self) -> None:
         self._properties["dashboards"] = dashboards
 
         try:
-            owners = populate_owners(self._actor, owner_ids)
+            owners = self.populate_owners(self._actor, owner_ids)
             self._properties["owners"] = owners
         except ValidationError as ex:
             exceptions.append(ex)
diff --git a/superset/charts/commands/data.py b/superset/charts/commands/data.py
index 1a383827cc1d..619244c239ad 100644
--- a/superset/charts/commands/data.py
+++ b/superset/charts/commands/data.py
@@ -50,8 +50,8 @@ def run(self, **kwargs: Any) -> Dict[str, Any]:
             payload = self._query_context.get_payload(
                 cache_query_context=cache_query_context, force_cached=force_cached
             )
-        except CacheLoadError as exc:
-            raise ChartDataCacheLoadError(exc.message)
+        except CacheLoadError as ex:
+            raise ChartDataCacheLoadError(ex.message) from ex
 
         # TODO: QueryContext should support SIP-40 style errors
         for query in payload["queries"]:
@@ -77,8 +77,8 @@ def set_query_context(self, form_data: Dict[str, Any]) -> QueryContext:
         self._form_data = form_data
         try:
             self._query_context = ChartDataQueryContextSchema().load(self._form_data)
-        except KeyError:
-            raise ValidationError("Request is incorrect")
+        except KeyError as ex:
+            raise ValidationError("Request is incorrect") from ex
         except ValidationError as error:
             raise error
 
diff --git a/superset/charts/commands/delete.py b/superset/charts/commands/delete.py
index 5b33a5041d41..faf72c5ef7b9 100644
--- a/superset/charts/commands/delete.py
+++ b/superset/charts/commands/delete.py
@@ -52,7 +52,7 @@ def run(self) -> Model:
             chart = ChartDAO.delete(self._model)
         except DAODeleteFailedError as ex:
             logger.exception(ex.exception)
-            raise ChartDeleteFailedError()
+            raise ChartDeleteFailedError() from ex
         return chart
 
     def validate(self) -> None:
@@ -70,5 +70,5 @@ def validate(self) -> None:
         # Check ownership
         try:
             check_ownership(self._model)
-        except SupersetSecurityException:
-            raise ChartForbiddenError()
+        except SupersetSecurityException as ex:
+            raise ChartForbiddenError() from ex
diff --git a/superset/charts/commands/exceptions.py b/superset/charts/commands/exceptions.py
index ee369a544cf8..60a62e19879d 100644
--- a/superset/charts/commands/exceptions.py
+++ b/superset/charts/commands/exceptions.py
@@ -28,15 +28,15 @@
 )
 
 
-class TimeRangeUnclearError(ValidationError):
+class TimeRangeAmbiguousError(ValidationError):
     """
-    Time range is in valid error.
+    Time range is ambiguous error.
     """
 
     def __init__(self, human_readable: str) -> None:
         super().__init__(
             _(
-                "Time string is unclear."
+                "Time string is ambiguous."
                 " Please specify [%(human_readable)s ago]"
                 " or [%(human_readable)s later].",
                 human_readable=human_readable,
@@ -56,6 +56,23 @@ def __init__(self, human_readable: str) -> None:
         )
 
 
+class TimeDeltaAmbiguousError(ValidationError):
+    """
+    Time delta is ambiguous error.
+    """
+
+    def __init__(self, human_readable: str) -> None:
+        super().__init__(
+            _(
+                "Time delta is ambiguous."
+                " Please specify [%(human_readable)s ago]"
+                " or [%(human_readable)s later].",
+                human_readable=human_readable,
+            ),
+            field_name="time_range",
+        )
+
+
 class DatabaseNotFoundValidationError(ValidationError):
     """
     Marshmallow validation error for database does not exist
diff --git a/superset/charts/commands/export.py b/superset/charts/commands/export.py
index 7fc778fef0b2..b0dbc9f0d503 100644
--- a/superset/charts/commands/export.py
+++ b/superset/charts/commands/export.py
@@ -54,7 +54,7 @@ def _export(model: Slice) -> Iterator[Tuple[str, str]]:
             export_uuids=True,
         )
         # TODO (betodealmeida): move this logic to export_to_dict once this
-        # becomes the default export endpoint
+        #  becomes the default export endpoint
         for key in REMOVE_KEYS:
             del payload[key]
         if payload.get("params"):
diff --git a/superset/charts/commands/importers/dispatcher.py b/superset/charts/commands/importers/dispatcher.py
index ff348898ea49..afeb9c2820c8 100644
--- a/superset/charts/commands/importers/dispatcher.py
+++ b/superset/charts/commands/importers/dispatcher.py
@@ -40,7 +40,6 @@ class ImportChartsCommand(BaseCommand):
     until it finds one that matches.
     """
 
-    # pylint: disable=unused-argument
     def __init__(self, contents: Dict[str, str], *args: Any, **kwargs: Any):
         self.contents = contents
         self.args = args
diff --git a/superset/charts/commands/importers/v1/__init__.py b/superset/charts/commands/importers/v1/__init__.py
index 0e2b5b3a8adf..5c2b535a7b34 100644
--- a/superset/charts/commands/importers/v1/__init__.py
+++ b/superset/charts/commands/importers/v1/__init__.py
@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
+import json
 from typing import Any, Dict, Set
 
 from marshmallow import Schema
@@ -95,4 +96,10 @@ def _import(
                     }
                 )
                 config["params"].update({"datasource": dataset.uid})
+                if config["query_context"]:
+                    # TODO (betodealmeida): export query_context as object, not string
+                    query_context = json.loads(config["query_context"])
+                    query_context["datasource"] = {"id": dataset.id, "type": "table"}
+                    config["query_context"] = json.dumps(query_context)
+
                 import_chart(session, config, overwrite=overwrite)
diff --git a/superset/charts/commands/update.py b/superset/charts/commands/update.py
index dcbf8c3b61db..b09845512c0c 100644
--- a/superset/charts/commands/update.py
+++ b/superset/charts/commands/update.py
@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import logging
+from datetime import datetime
 from typing import Any, Dict, List, Optional
 
 from flask_appbuilder.models.sqla import Model
@@ -30,8 +31,8 @@
     DatasourceTypeUpdateRequiredValidationError,
 )
 from superset.charts.dao import ChartDAO
-from superset.commands.base import BaseCommand
-from superset.commands.utils import get_datasource_by_id, populate_owners
+from superset.commands.base import BaseCommand, UpdateMixin
+from superset.commands.utils import get_datasource_by_id
 from superset.dao.exceptions import DAOUpdateFailedError
 from superset.dashboards.dao import DashboardDAO
 from superset.exceptions import SupersetSecurityException
@@ -41,7 +42,13 @@
 logger = logging.getLogger(__name__)
 
 
-class UpdateChartCommand(BaseCommand):
+def is_query_context_update(properties: Dict[str, Any]) -> bool:
+    return set(properties) == {"query_context", "query_context_generation"} and bool(
+        properties.get("query_context_generation")
+    )
+
+
+class UpdateChartCommand(UpdateMixin, BaseCommand):
     def __init__(self, user: User, model_id: int, data: Dict[str, Any]):
         self._actor = user
         self._model_id = model_id
@@ -51,10 +58,13 @@ def __init__(self, user: User, model_id: int, data: Dict[str, Any]):
     def run(self) -> Model:
         self.validate()
         try:
+            if self._properties.get("query_context_generation") is None:
+                self._properties["last_saved_at"] = datetime.now()
+                self._properties["last_saved_by"] = self._actor
             chart = ChartDAO.update(self._model, self._properties)
         except DAOUpdateFailedError as ex:
             logger.exception(ex.exception)
-            raise ChartUpdateFailedError()
+            raise ChartUpdateFailedError() from ex
         return chart
 
     def validate(self) -> None:
@@ -73,11 +83,14 @@ def validate(self) -> None:
         self._model = ChartDAO.find_by_id(self._model_id)
         if not self._model:
             raise ChartNotFoundError()
-        # Check ownership
-        try:
-            check_ownership(self._model)
-        except SupersetSecurityException:
-            raise ChartForbiddenError()
+
+        # Check ownership; when only updating query context we ignore
+        # ownership so the update can be performed by report workers
+        if not is_query_context_update(self._properties):
+            try:
+                check_ownership(self._model)
+            except SupersetSecurityException as ex:
+                raise ChartForbiddenError() from ex
 
         # Validate/Populate datasource
         if datasource_id is not None:
@@ -96,7 +109,7 @@ def validate(self) -> None:
 
         # Validate/Populate owner
         try:
-            owners = populate_owners(self._actor, owner_ids)
+            owners = self.populate_owners(self._actor, owner_ids)
             self._properties["owners"] = owners
         except ValidationError as ex:
             exceptions.append(ex)
diff --git a/superset/charts/post_processing.py b/superset/charts/post_processing.py
new file mode 100644
index 000000000000..cb65c499aff3
--- /dev/null
+++ b/superset/charts/post_processing.py
@@ -0,0 +1,321 @@
+# 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.
+"""
+Functions to reproduce the post-processing of data on text charts.
+
+Some text-based charts (pivot tables and t-test table) perform
+post-processing of the data in Javascript. When sending the data
+to users in reports we want to show the same data they would see
+on Explore.
+
+In order to do that, we reproduce the post-processing in Python
+for these chart types.
+"""
+
+from io import StringIO
+from typing import Any, Dict, List, Optional, Tuple
+
+import pandas as pd
+
+from superset.utils.core import (
+    ChartDataResultFormat,
+    DTTM_ALIAS,
+    extract_dataframe_dtypes,
+    get_metric_name,
+)
+
+
+def get_column_key(label: Tuple[str, ...], metrics: List[str]) -> Tuple[Any, ...]:
+    """
+    Sort columns when combining metrics.
+
+    MultiIndex labels have the metric name as the last element in the
+    tuple. We want to sort these according to the list of passed metrics.
+    """
+    parts: List[Any] = list(label)
+    metric = parts[-1]
+    parts[-1] = metrics.index(metric)
+    return tuple(parts)
+
+
+def pivot_df(  # pylint: disable=too-many-locals, too-many-arguments, too-many-statements, too-many-branches
+    df: pd.DataFrame,
+    rows: List[str],
+    columns: List[str],
+    metrics: List[str],
+    aggfunc: str = "Sum",
+    transpose_pivot: bool = False,
+    combine_metrics: bool = False,
+    show_rows_total: bool = False,
+    show_columns_total: bool = False,
+    apply_metrics_on_rows: bool = False,
+) -> pd.DataFrame:
+    metric_name = f"Total ({aggfunc})"
+
+    if transpose_pivot:
+        rows, columns = columns, rows
+
+    # to apply the metrics on the rows we pivot the dataframe, apply the
+    # metrics to the columns, and pivot the dataframe back before
+    # returning it
+    if apply_metrics_on_rows:
+        rows, columns = columns, rows
+        axis = {"columns": 0, "rows": 1}
+    else:
+        axis = {"columns": 1, "rows": 0}
+
+    # pivot data; we'll compute totals and subtotals later
+    if rows or columns:
+        df = df.pivot_table(
+            index=rows,
+            columns=columns,
+            values=metrics,
+            aggfunc=pivot_v2_aggfunc_map[aggfunc],
+            margins=False,
+        )
+    else:
+        # if there's no rows nor columns we have a single value; update
+        # the index with the metric name so it shows up in the table
+        df.index = pd.Index([*df.index[:-1], metric_name], name="metric")
+
+    # if no rows were passed the metrics will be in the rows, so we
+    # need to move them back to columns
+    if columns and not rows:
+        df = df.stack().to_frame().T
+        df = df[metrics]
+        df.index = pd.Index([*df.index[:-1], metric_name], name="metric")
+
+    # combining metrics changes the column hierarchy, moving the metric
+    # from the top to the bottom, eg:
+    #
+    # ('SUM(col)', 'age', 'name') => ('age', 'name', 'SUM(col)')
+    if combine_metrics and isinstance(df.columns, pd.MultiIndex):
+        # move metrics to the lowest level
+        new_order = [*range(1, df.columns.nlevels), 0]
+        df = df.reorder_levels(new_order, axis=1)
+
+        # sort columns, combining metrics for each group
+        decorated_columns = [(col, i) for i, col in enumerate(df.columns)]
+        grouped_columns = sorted(
+            decorated_columns, key=lambda t: get_column_key(t[0], metrics)
+        )
+        indexes = [i for col, i in grouped_columns]
+        df = df[df.columns[indexes]]
+    elif rows:
+        # if metrics were not combined we sort the dataframe by the list
+        # of metrics defined by the user
+        df = df[metrics]
+
+    # compute fractions, if needed
+    if aggfunc.endswith(" as Fraction of Total"):
+        total = df.sum().sum()
+        df = df.astype(total.dtypes) / total
+    elif aggfunc.endswith(" as Fraction of Columns"):
+        total = df.sum(axis=axis["rows"])
+        df = df.astype(total.dtypes).div(total, axis=axis["columns"])
+    elif aggfunc.endswith(" as Fraction of Rows"):
+        total = df.sum(axis=axis["columns"])
+        df = df.astype(total.dtypes).div(total, axis=axis["rows"])
+
+    # convert to a MultiIndex to simplify logic
+    if not isinstance(df.index, pd.MultiIndex):
+        df.index = pd.MultiIndex.from_tuples([(str(i),) for i in df.index])
+    if not isinstance(df.columns, pd.MultiIndex):
+        df.columns = pd.MultiIndex.from_tuples([(str(i),) for i in df.columns])
+
+    if show_rows_total:
+        # add subtotal for each group and overall total; we start from the
+        # overall group, and iterate deeper into subgroups
+        groups = df.columns
+        for level in range(df.columns.nlevels):
+            subgroups = {group[:level] for group in groups}
+            for subgroup in subgroups:
+                slice_ = df.columns.get_loc(subgroup)
+                subtotal = pivot_v2_aggfunc_map[aggfunc](df.iloc[:, slice_], axis=1)
+                depth = df.columns.nlevels - len(subgroup) - 1
+                total = metric_name if level == 0 else "Subtotal"
+                subtotal_name = tuple([*subgroup, total, *([""] * depth)])
+                # insert column after subgroup
+                df.insert(int(slice_.stop), subtotal_name, subtotal)
+
+    if rows and show_columns_total:
+        # add subtotal for each group and overall total; we start from the
+        # overall group, and iterate deeper into subgroups
+        groups = df.index
+        for level in range(df.index.nlevels):
+            subgroups = {group[:level] for group in groups}
+            for subgroup in subgroups:
+                slice_ = df.index.get_loc(subgroup)
+                subtotal = pivot_v2_aggfunc_map[aggfunc](
+                    df.iloc[slice_, :].apply(pd.to_numeric), axis=0
+                )
+                depth = df.index.nlevels - len(subgroup) - 1
+                total = metric_name if level == 0 else "Subtotal"
+                subtotal.name = tuple([*subgroup, total, *([""] * depth)])
+                # insert row after subgroup
+                df = pd.concat(
+                    [df[: slice_.stop], subtotal.to_frame().T, df[slice_.stop :]]
+                )
+
+    # if we want to apply the metrics on the rows we need to pivot the
+    # dataframe back
+    if apply_metrics_on_rows:
+        df = df.T
+
+    return df
+
+
+def list_unique_values(series: pd.Series) -> str:
+    """
+    List unique values in a series.
+    """
+    return ", ".join(set(str(v) for v in pd.Series.unique(series)))
+
+
+pivot_v2_aggfunc_map = {
+    "Count": pd.Series.count,
+    "Count Unique Values": pd.Series.nunique,
+    "List Unique Values": list_unique_values,
+    "Sum": pd.Series.sum,
+    "Average": pd.Series.mean,
+    "Median": pd.Series.median,
+    "Sample Variance": lambda series: pd.series.var(series) if len(series) > 1 else 0,
+    "Sample Standard Deviation": (
+        lambda series: pd.series.std(series) if len(series) > 1 else 0,
+    ),
+    "Minimum": pd.Series.min,
+    "Maximum": pd.Series.max,
+    "First": lambda series: series[:1],
+    "Last": lambda series: series[-1:],
+    "Sum as Fraction of Total": pd.Series.sum,
+    "Sum as Fraction of Rows": pd.Series.sum,
+    "Sum as Fraction of Columns": pd.Series.sum,
+    "Count as Fraction of Total": pd.Series.count,
+    "Count as Fraction of Rows": pd.Series.count,
+    "Count as Fraction of Columns": pd.Series.count,
+}
+
+
+def pivot_table_v2(df: pd.DataFrame, form_data: Dict[str, Any]) -> pd.DataFrame:
+    """
+    Pivot table v2.
+    """
+    if form_data.get("granularity_sqla") == "all" and DTTM_ALIAS in df:
+        del df[DTTM_ALIAS]
+
+    return pivot_df(
+        df,
+        rows=form_data.get("groupbyRows") or [],
+        columns=form_data.get("groupbyColumns") or [],
+        metrics=[get_metric_name(m) for m in form_data["metrics"]],
+        aggfunc=form_data.get("aggregateFunction", "Sum"),
+        transpose_pivot=bool(form_data.get("transposePivot")),
+        combine_metrics=bool(form_data.get("combineMetric")),
+        show_rows_total=bool(form_data.get("rowTotals")),
+        show_columns_total=bool(form_data.get("colTotals")),
+        apply_metrics_on_rows=form_data.get("metricsLayout") == "ROWS",
+    )
+
+
+def pivot_table(df: pd.DataFrame, form_data: Dict[str, Any]) -> pd.DataFrame:
+    """
+    Pivot table (v1).
+    """
+    if form_data.get("granularity") == "all" and DTTM_ALIAS in df:
+        del df[DTTM_ALIAS]
+
+    # v1 func names => v2 func names
+    func_map = {
+        "sum": "Sum",
+        "mean": "Average",
+        "min": "Minimum",
+        "max": "Maximum",
+        "std": "Sample Standard Deviation",
+        "var": "Sample Variance",
+    }
+
+    return pivot_df(
+        df,
+        rows=form_data.get("groupby") or [],
+        columns=form_data.get("columns") or [],
+        metrics=[get_metric_name(m) for m in form_data["metrics"]],
+        aggfunc=func_map.get(form_data.get("pandas_aggfunc", "sum"), "Sum"),
+        transpose_pivot=bool(form_data.get("transpose_pivot")),
+        combine_metrics=bool(form_data.get("combine_metric")),
+        show_rows_total=bool(form_data.get("pivot_margins")),
+        show_columns_total=bool(form_data.get("pivot_margins")),
+        apply_metrics_on_rows=False,
+    )
+
+
+post_processors = {
+    "pivot_table": pivot_table,
+    "pivot_table_v2": pivot_table_v2,
+}
+
+
+def apply_post_process(
+    result: Dict[Any, Any], form_data: Optional[Dict[str, Any]] = None,
+) -> Dict[Any, Any]:
+    form_data = form_data or {}
+
+    viz_type = form_data.get("viz_type")
+    if viz_type not in post_processors:
+        return result
+
+    post_processor = post_processors[viz_type]
+
+    for query in result["queries"]:
+        if query["result_format"] == ChartDataResultFormat.JSON:
+            df = pd.DataFrame.from_dict(query["data"])
+        elif query["result_format"] == ChartDataResultFormat.CSV:
+            df = pd.read_csv(StringIO(query["data"]))
+        else:
+            raise Exception(f"Result format {query['result_format']} not supported")
+
+        processed_df = post_processor(df, form_data)
+
+        query["colnames"] = list(processed_df.columns)
+        query["indexnames"] = list(processed_df.index)
+        query["coltypes"] = extract_dataframe_dtypes(processed_df)
+        query["rowcount"] = len(processed_df.index)
+
+        # Flatten hierarchical columns/index since they are represented as
+        # `Tuple[str]`. Otherwise encoding to JSON later will fail because
+        # maps cannot have tuples as their keys in JSON.
+        processed_df.columns = [
+            " ".join(str(name) for name in column).strip()
+            if isinstance(column, tuple)
+            else column
+            for column in processed_df.columns
+        ]
+        processed_df.index = [
+            " ".join(str(name) for name in index).strip()
+            if isinstance(index, tuple)
+            else index
+            for index in processed_df.index
+        ]
+
+        if query["result_format"] == ChartDataResultFormat.JSON:
+            query["data"] = processed_df.to_dict()
+        elif query["result_format"] == ChartDataResultFormat.CSV:
+            buf = StringIO()
+            processed_df.to_csv(buf)
+            buf.seek(0)
+            query["data"] = buf.getvalue()
+
+    return result
diff --git a/superset/charts/schemas.py b/superset/charts/schemas.py
index ef11d8412e2b..9916c0b221ec 100644
--- a/superset/charts/schemas.py
+++ b/superset/charts/schemas.py
@@ -77,6 +77,16 @@
     "or overwrite button in the explore view. "
     "This JSON object for power users who may want to alter specific parameters."
 )
+query_context_description = (
+    "The query context represents the queries that need to run "
+    "in order to generate the data the visualization, and in what "
+    "format the data should be returned."
+)
+query_context_generation_description = (
+    "The query context generation represents whether the query_context"
+    "is user generated or not so that it does not update user modfied"
+    "state."
+)
 cache_timeout_description = (
     "Duration (in seconds) of the caching timeout "
     "for this chart. Note this defaults to the datasource/table"
@@ -140,7 +150,6 @@ class ChartEntityResponseSchema(Schema):
     cache_timeout = fields.Integer(description=cache_timeout_description)
     changed_on = fields.String(description=changed_on_description)
     modified = fields.String()
-    datasource = fields.String(description=datasource_name_description)
     description = fields.String(description=description_description)
     description_markeddown = fields.String(
         description=description_markeddown_description
@@ -167,6 +176,14 @@ class ChartPostSchema(Schema):
     params = fields.String(
         description=params_description, allow_none=True, validate=utils.validate_json
     )
+    query_context = fields.String(
+        description=query_context_description,
+        allow_none=True,
+        validate=utils.validate_json,
+    )
+    query_context_generation = fields.Boolean(
+        description=query_context_generation_description, allow_none=True
+    )
     cache_timeout = fields.Integer(
         description=cache_timeout_description, allow_none=True
     )
@@ -199,6 +216,12 @@ class ChartPutSchema(Schema):
     )
     owners = fields.List(fields.Integer(description=owners_description))
     params = fields.String(description=params_description, allow_none=True)
+    query_context = fields.String(
+        description=query_context_description, allow_none=True
+    )
+    query_context_generation = fields.Boolean(
+        description=query_context_generation_description, allow_none=True
+    )
     cache_timeout = fields.Integer(
         description=cache_timeout_description, allow_none=True
     )
@@ -281,6 +304,13 @@ class ChartDataAdhocMetricSchema(Schema):
         "will be generated.",
         example="metric_aec60732-fac0-4b17-b736-93f1a5c93e30",
     )
+    timeGrain = fields.String(
+        description="Optional time grain for temporal filters", example="PT1M",
+    )
+    isExtra = fields.Boolean(
+        description="Indicates if the filter has been added by a filter component as "
+        "opposed to being a part of the original query."
+    )
 
 
 class ChartDataAggregateConfigField(fields.Dict):
@@ -717,6 +747,8 @@ class ChartDataPostProcessingOperationSchema(Schema):
                 "rolling",
                 "select",
                 "sort",
+                "diff",
+                "compare",
             )
         ),
         example="aggregate",
@@ -757,6 +789,13 @@ class ChartDataFilterSchema(Schema):
         "integer, decimal or list, depending on the operator.",
         example=["China", "France", "Japan"],
     )
+    grain = fields.String(
+        description="Optional time grain for temporal filters", example="PT1M",
+    )
+    isExtra = fields.Boolean(
+        description="Indicates if the filter has been added by a filter component as "
+        "opposed to being a part of the original query."
+    )
 
 
 class ChartDataExtrasSchema(Schema):
@@ -1007,11 +1046,21 @@ class Meta:  # pylint: disable=too-few-public-methods
         allow_none=True,
     )
     orderby = fields.List(
-        fields.List(fields.Raw()),
+        fields.Tuple(
+            (
+                fields.Raw(
+                    validate=[
+                        Length(min=1, error=_("orderby column must be populated"))
+                    ],
+                    allow_none=False,
+                ),
+                fields.Boolean(),
+            )
+        ),
         description="Expects a list of lists where the first element is the column "
         "name which to sort by, and the second element is a boolean.",
         allow_none=True,
-        example=[["my_col_1", False], ["my_col_2", True]],
+        example=[("my_col_1", False), ("my_col_2", True)],
     )
     where = fields.String(
         description="WHERE clause to be added to queries using AND operator."
@@ -1051,6 +1100,7 @@ class Meta:  # pylint: disable=too-few-public-methods
         description="Should the rowcount of the actual query be returned",
         allow_none=True,
     )
+    time_offsets = fields.List(fields.String(), allow_none=True,)
 
 
 class ChartDataQueryContextSchema(Schema):
@@ -1179,6 +1229,7 @@ class ImportV1ChartSchema(Schema):
     slice_name = fields.String(required=True)
     viz_type = fields.String(required=True)
     params = fields.Dict()
+    query_context = fields.String(allow_none=True, validate=utils.validate_json)
     cache_timeout = fields.Integer(allow_none=True)
     uuid = fields.UUID(required=True)
     version = fields.String(required=True)
diff --git a/superset/cli.py b/superset/cli.py
index 15a8ce9e14cf..b6bb80dd5a09 100755
--- a/superset/cli.py
+++ b/superset/cli.py
@@ -17,20 +17,24 @@
 # under the License.
 import json
 import logging
+import os
 import sys
 from datetime import datetime, timedelta
+from pathlib import Path
 from subprocess import Popen
 from typing import Any, Dict, List, Optional, Type, Union
 from zipfile import is_zipfile, ZipFile
 
 import click
 import yaml
+from apispec import APISpec
+from apispec.ext.marshmallow import MarshmallowPlugin
 from celery.utils.abstract import CallableTask
 from colorama import Fore, Style
 from flask import current_app, g
 from flask.cli import FlaskGroup, with_appcontext
 from flask_appbuilder import Model
-from pathlib2 import Path
+from flask_appbuilder.api import BaseApi
 
 from superset import app, appbuilder, config, security_manager
 from superset.app import create_app
@@ -78,7 +82,7 @@ def superset() -> None:
     """This is a management script for the Superset application."""
 
     @app.shell_context_processor
-    def make_shell_context() -> Dict[str, Any]:  # pylint: disable=unused-variable
+    def make_shell_context() -> Dict[str, Any]:
         return dict(app=app, db=db)
 
 
@@ -120,12 +124,14 @@ def load_examples_run(
         examples_db = utils.get_example_database()
         print(f"Loading examples metadata and related data into {examples_db}")
 
+    # pylint: disable=import-outside-toplevel
     from superset import examples
 
     examples.load_css_templates()
 
-    print("Loading energy related dataset")
-    examples.load_energy(only_metadata, force)
+    if load_test_data:
+        print("Loading energy related dataset")
+        examples.load_energy(only_metadata, force)
 
     print("Loading [World Bank's Health Nutrition and Population Stats]")
     examples.load_world_bank_health_n_pop(only_metadata, force)
@@ -133,25 +139,17 @@ def load_examples_run(
     print("Loading [Birth names]")
     examples.load_birth_names(only_metadata, force)
 
-    print("Loading [Tabbed dashboard]")
-    examples.load_tabbed_dashboard(only_metadata)
+    if load_test_data:
+        print("Loading [Tabbed dashboard]")
+        examples.load_tabbed_dashboard(only_metadata)
 
     if not load_test_data:
-        print("Loading [Random time series data]")
-        examples.load_random_time_series_data(only_metadata, force)
-
         print("Loading [Random long/lat data]")
         examples.load_long_lat_data(only_metadata, force)
 
         print("Loading [Country Map data]")
         examples.load_country_map_data(only_metadata, force)
 
-        print("Loading [Multiformat time series]")
-        examples.load_multiformat_time_series(only_metadata, force)
-
-        print("Loading [Paris GeoJson]")
-        examples.load_paris_iris_geojson(only_metadata, force)
-
         print("Loading [San Francisco population polygons]")
         examples.load_sf_population_polygons(only_metadata, force)
 
@@ -175,7 +173,7 @@ def load_examples_run(
         examples.load_big_data()
 
     # load examples that are stored as YAML config files
-    examples.load_from_configs(force, load_test_data)
+    examples.load_examples_from_configs(force, load_test_data)
 
 
 @with_appcontext
@@ -194,10 +192,29 @@ def load_examples(
     only_metadata: bool = False,
     force: bool = False,
 ) -> None:
-    """Loads a set of Slices and Dashboards and a supporting dataset """
+    """Loads a set of Slices and Dashboards and a supporting dataset"""
     load_examples_run(load_test_data, load_big_data, only_metadata, force)
 
 
+@with_appcontext
+@superset.command()
+@click.argument("directory")
+@click.option(
+    "--overwrite", "-o", is_flag=True, help="Overwriting existing metadata definitions"
+)
+@click.option(
+    "--force", "-f", is_flag=True, help="Force load data even if table already exists"
+)
+def import_directory(directory: str, overwrite: bool, force: bool) -> None:
+    """Imports configs from a given directory"""
+    # pylint: disable=import-outside-toplevel
+    from superset.examples.utils import load_configs_from_directory
+
+    load_configs_from_directory(
+        root=Path(directory), overwrite=overwrite, force_data=force,
+    )
+
+
 @with_appcontext
 @superset.command()
 @click.option("--database_name", "-d", help="Database name to change")
@@ -210,7 +227,7 @@ def load_examples(
     help="Create the DB if it doesn't exist",
 )
 def set_database_uri(database_name: str, uri: str, skip_create: bool) -> None:
-    """Updates a database connection URI """
+    """Updates a database connection URI"""
     utils.get_or_create_db(database_name, uri, not skip_create)
 
 
@@ -231,9 +248,11 @@ def set_database_uri(database_name: str, uri: str, skip_create: bool) -> None:
 )
 def refresh_druid(datasource: str, merge: bool) -> None:
     """Refresh druid datasources"""
-    session = db.session()
+    # pylint: disable=import-outside-toplevel
     from superset.connectors.druid.models import DruidCluster
 
+    session = db.session()
+
     for cluster in session.query(DruidCluster).all():
         try:
             cluster.refresh_datasources(datasource_name=datasource, merge_flag=merge)
@@ -254,6 +273,7 @@ def refresh_druid(datasource: str, merge: bool) -> None:
     )
     def export_dashboards(dashboard_file: Optional[str] = None) -> None:
         """Export dashboards to ZIP file"""
+        # pylint: disable=import-outside-toplevel
         from superset.dashboards.commands.export import ExportDashboardsCommand
         from superset.models.dashboard import Dashboard
 
@@ -277,7 +297,6 @@ def export_dashboards(dashboard_file: Optional[str] = None) -> None:
                 "the exception traceback in the log"
             )
 
-    # pylint: disable=too-many-locals
     @superset.command()
     @with_appcontext
     @click.option(
@@ -285,6 +304,7 @@ def export_dashboards(dashboard_file: Optional[str] = None) -> None:
     )
     def export_datasources(datasource_file: Optional[str] = None) -> None:
         """Export datasources to ZIP file"""
+        # pylint: disable=import-outside-toplevel
         from superset.connectors.sqla.models import SqlaTable
         from superset.datasets.commands.export import ExportDatasetsCommand
 
@@ -319,6 +339,7 @@ def export_datasources(datasource_file: Optional[str] = None) -> None:
     )
     def import_dashboards(path: str, username: Optional[str]) -> None:
         """Import dashboards from ZIP file"""
+        # pylint: disable=import-outside-toplevel
         from superset.commands.importers.v1.utils import get_contents_from_bundle
         from superset.dashboards.commands.importers.dispatcher import (
             ImportDashboardsCommand,
@@ -330,7 +351,8 @@ def import_dashboards(path: str, username: Optional[str]) -> None:
             with ZipFile(path) as bundle:
                 contents = get_contents_from_bundle(bundle)
         else:
-            contents = {path: open(path).read()}
+            with open(path) as file:
+                contents = {path: file.read()}
         try:
             ImportDashboardsCommand(contents, overwrite=True).run()
         except Exception:  # pylint: disable=broad-except
@@ -346,6 +368,7 @@ def import_dashboards(path: str, username: Optional[str]) -> None:
     )
     def import_datasources(path: str) -> None:
         """Import datasources from ZIP file"""
+        # pylint: disable=import-outside-toplevel
         from superset.commands.importers.v1.utils import get_contents_from_bundle
         from superset.datasets.commands.importers.dispatcher import (
             ImportDatasetsCommand,
@@ -355,7 +378,8 @@ def import_datasources(path: str) -> None:
             with ZipFile(path) as bundle:
                 contents = get_contents_from_bundle(bundle)
         else:
-            contents = {path: open(path).read()}
+            with open(path) as file:
+                contents = {path: file.read()}
         try:
             ImportDatasetsCommand(contents, overwrite=True).run()
         except Exception:  # pylint: disable=broad-except
@@ -383,6 +407,7 @@ def export_dashboards(
         dashboard_file: Optional[str], print_stdout: bool = False
     ) -> None:
         """Export dashboards to JSON"""
+        # pylint: disable=import-outside-toplevel
         from superset.utils import dashboard_import_export
 
         data = dashboard_import_export.export_dashboards(db.session)
@@ -393,7 +418,6 @@ def export_dashboards(
             with open(dashboard_file, "w") as data_stream:
                 data_stream.write(data)
 
-    # pylint: disable=too-many-locals
     @superset.command()
     @with_appcontext
     @click.option(
@@ -430,6 +454,7 @@ def export_datasources(
         include_defaults: bool = False,
     ) -> None:
         """Export datasources to YAML"""
+        # pylint: disable=import-outside-toplevel
         from superset.utils import dict_import_export
 
         data = dict_import_export.export_to_dict(
@@ -468,6 +493,7 @@ def export_datasources(
     )
     def import_dashboards(path: str, recursive: bool, username: str) -> None:
         """Import dashboards from JSON file"""
+        # pylint: disable=import-outside-toplevel
         from superset.dashboards.commands.importers.v0 import ImportDashboardsCommand
 
         path_object = Path(path)
@@ -480,7 +506,10 @@ def import_dashboards(path: str, recursive: bool, username: str) -> None:
             files.extend(path_object.rglob("*.json"))
         if username is not None:
             g.user = security_manager.find_user(username=username)
-        contents = {path.name: open(path).read() for path in files}
+        contents = {}
+        for path_ in files:
+            with open(path_) as file:
+                contents[path_.name] = file.read()
         try:
             ImportDashboardsCommand(contents).run()
         except Exception:  # pylint: disable=broad-except
@@ -512,6 +541,7 @@ def import_dashboards(path: str, recursive: bool, username: str) -> None:
     )
     def import_datasources(path: str, sync: str, recursive: bool) -> None:
         """Import datasources from YAML"""
+        # pylint: disable=import-outside-toplevel
         from superset.datasets.commands.importers.v0 import ImportDatasetsCommand
 
         sync_array = sync.split(",")
@@ -528,7 +558,10 @@ def import_datasources(path: str, sync: str, recursive: bool) -> None:
         elif path_object.exists() and recursive:
             files.extend(path_object.rglob("*.yaml"))
             files.extend(path_object.rglob("*.yml"))
-        contents = {path.name: open(path).read() for path in files}
+        contents = {}
+        for path_ in files:
+            with open(path_) as file:
+                contents[path_.name] = file.read()
         try:
             ImportDatasetsCommand(contents, sync_columns, sync_metrics).run()
         except Exception:  # pylint: disable=broad-except
@@ -545,6 +578,7 @@ def import_datasources(path: str, sync: str, recursive: bool) -> None:
     )
     def export_datasource_schema(back_references: bool) -> None:
         """Export datasource YAML schema to stdout"""
+        # pylint: disable=import-outside-toplevel
         from superset.utils import dict_import_export
 
         data = dict_import_export.export_schema_to_dict(back_references=back_references)
@@ -555,6 +589,7 @@ def export_datasource_schema(back_references: bool) -> None:
 @with_appcontext
 def update_datasources_cache() -> None:
     """Refresh sqllab datasources cache"""
+    # pylint: disable=import-outside-toplevel
     from superset.models.core import Database
 
     for database in db.session.query(Database).all():
@@ -621,7 +656,7 @@ def flower(port: int, address: str) -> None:
     print(Fore.BLUE + "-=" * 40)
     print(Fore.YELLOW + cmd)
     print(Fore.BLUE + "-=" * 40)
-    Popen(cmd, shell=True).wait()
+    Popen(cmd, shell=True).wait()  # pylint: disable=consider-using-with
 
 
 @superset.command()
@@ -659,6 +694,7 @@ def compute_thumbnails(
     model_id: int,
 ) -> None:
     """Compute thumbnails"""
+    # pylint: disable=import-outside-toplevel
     from superset.models.dashboard import Dashboard
     from superset.models.slice import Slice
     from superset.tasks.thumbnails import (
@@ -771,6 +807,7 @@ def sync_tags() -> None:
     # pylint: disable=no-member
     metadata = Model.metadata
 
+    # pylint: disable=import-outside-toplevel
     from superset.common.tags import add_favorites, add_owners, add_types
 
     add_types(db.engine, metadata)
@@ -783,6 +820,7 @@ def sync_tags() -> None:
 def alert() -> None:
     """Run the alert scheduler loop"""
     # this command is just for testing purposes
+    # pylint: disable=import-outside-toplevel
     from superset.models.schedules import ScheduleType
     from superset.tasks.schedules import schedule_window
 
@@ -801,13 +839,8 @@ def alert() -> None:
 @with_appcontext
 def update_api_docs() -> None:
     """Regenerate the openapi.json file in docs"""
-    from apispec import APISpec
-    from apispec.ext.marshmallow import MarshmallowPlugin
-    from flask_appbuilder.api import BaseApi
-    from os import path
-
-    superset_dir = path.abspath(path.dirname(__file__))
-    openapi_json = path.join(
+    superset_dir = os.path.abspath(os.path.dirname(__file__))
+    openapi_json = os.path.join(
         superset_dir, "..", "docs", "src", "resources", "openapi.json"
     )
     api_version = "v1"
diff --git a/superset/commands/base.py b/superset/commands/base.py
index 0bcf3a7bee0d..2592a03fa77e 100644
--- a/superset/commands/base.py
+++ b/superset/commands/base.py
@@ -15,7 +15,11 @@
 # specific language governing permissions and limitations
 # under the License.
 from abc import ABC, abstractmethod
-from typing import Any
+from typing import Any, List, Optional
+
+from flask_appbuilder.security.sqla.models import User
+
+from superset.commands.utils import populate_owners
 
 
 class BaseCommand(ABC):
@@ -37,3 +41,38 @@ def validate(self) -> None:
         Will raise exception if validation fails
         :raises: CommandException
         """
+
+
+class CreateMixin:  # pylint: disable=too-few-public-methods
+    @staticmethod
+    def populate_owners(
+        user: User, owner_ids: Optional[List[int]] = None
+    ) -> List[User]:
+        """
+        Populate list of owners, defaulting to the current user if `owner_ids` is
+        undefined or empty. If current user is missing in `owner_ids`, current user
+        is added unless belonging to the Admin role.
+
+        :param user: current user
+        :param owner_ids: list of owners by id's
+        :raises OwnersNotFoundValidationError: if at least one owner can't be resolved
+        :returns: Final list of owners
+        """
+        return populate_owners(user, owner_ids, default_to_user=True)
+
+
+class UpdateMixin:  # pylint: disable=too-few-public-methods
+    @staticmethod
+    def populate_owners(
+        user: User, owner_ids: Optional[List[int]] = None
+    ) -> List[User]:
+        """
+        Populate list of owners. If current user is missing in `owner_ids`, current user
+        is added unless belonging to the Admin role.
+
+        :param user: current user
+        :param owner_ids: list of owners by id's
+        :raises OwnersNotFoundValidationError: if at least one owner can't be resolved
+        :returns: Final list of owners
+        """
+        return populate_owners(user, owner_ids, default_to_user=False)
diff --git a/superset/commands/importers/v1/__init__.py b/superset/commands/importers/v1/__init__.py
index b9ea24414785..5440470a1633 100644
--- a/superset/commands/importers/v1/__init__.py
+++ b/superset/commands/importers/v1/__init__.py
@@ -66,11 +66,10 @@ def run(self) -> None:
         try:
             self._import(db.session, self._configs, self.overwrite)
             db.session.commit()
-        except Exception:
+        except Exception as ex:
             db.session.rollback()
-            raise self.import_error()
+            raise self.import_error() from ex
 
-    # pylint: disable=too-many-branches
     def validate(self) -> None:
         exceptions: List[ValidationError] = []
 
diff --git a/superset/commands/importers/v1/examples.py b/superset/commands/importers/v1/examples.py
index 2b56ee080df8..66563f856b62 100644
--- a/superset/commands/importers/v1/examples.py
+++ b/superset/commands/importers/v1/examples.py
@@ -14,27 +14,33 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+# pylint: disable=protected-access
 
-from typing import Any, Dict, List, Tuple
+from typing import Any, Dict, List, Set, Tuple
 
 from marshmallow import Schema
 from sqlalchemy.orm import Session
+from sqlalchemy.orm.exc import MultipleResultsFound
 from sqlalchemy.sql import select
 
 from superset import db
+from superset.charts.commands.importers.v1 import ImportChartsCommand
 from superset.charts.commands.importers.v1.utils import import_chart
 from superset.charts.schemas import ImportV1ChartSchema
 from superset.commands.exceptions import CommandException
 from superset.commands.importers.v1 import ImportModelsCommand
 from superset.dao.base import BaseDAO
+from superset.dashboards.commands.importers.v1 import ImportDashboardsCommand
 from superset.dashboards.commands.importers.v1.utils import (
     find_chart_uuids,
     import_dashboard,
     update_id_refs,
 )
 from superset.dashboards.schemas import ImportV1DashboardSchema
+from superset.databases.commands.importers.v1 import ImportDatabasesCommand
 from superset.databases.commands.importers.v1.utils import import_database
 from superset.databases.schemas import ImportV1DatabaseSchema
+from superset.datasets.commands.importers.v1 import ImportDatasetsCommand
 from superset.datasets.commands.importers.v1.utils import import_dataset
 from superset.datasets.schemas import ImportV1DatasetSchema
 from superset.models.core import Database
@@ -66,9 +72,18 @@ def run(self) -> None:
         try:
             self._import(db.session, self._configs, self.overwrite, self.force_data)
             db.session.commit()
-        except Exception:
+        except Exception as ex:
             db.session.rollback()
-            raise self.import_error()
+            raise self.import_error() from ex
+
+    @classmethod
+    def _get_uuids(cls) -> Set[str]:
+        return (
+            ImportDatabasesCommand._get_uuids()
+            | ImportDatasetsCommand._get_uuids()
+            | ImportChartsCommand._get_uuids()
+            | ImportDashboardsCommand._get_uuids()
+        )
 
     # pylint: disable=too-many-locals, arguments-differ
     @staticmethod
@@ -86,19 +101,40 @@ def _import(
                 database_ids[str(database.uuid)] = database.id
 
         # import datasets
-        # TODO (betodealmeida): once we have all examples being imported we can
-        # have a stable UUID for the database stored in the dataset YAML; for
-        # now we need to fetch the current ID.
-        examples_id = (
-            db.session.query(Database).filter_by(database_name="examples").one().id
+        # If database_uuid is not in the list of UUIDs it means that the examples
+        # database was created before its UUID was frozen, so it has a random UUID.
+        # We need to determine its ID so we can point the dataset to it.
+        examples_db = (
+            db.session.query(Database).filter_by(database_name="examples").first()
         )
         dataset_info: Dict[str, Dict[str, Any]] = {}
         for file_name, config in configs.items():
             if file_name.startswith("datasets/"):
-                config["database_id"] = examples_id
+                # find the ID of the corresponding database
+                if config["database_uuid"] not in database_ids:
+                    if examples_db is None:
+                        raise Exception("Cannot find examples database")
+                    config["database_id"] = examples_db.id
+                else:
+                    config["database_id"] = database_ids[config["database_uuid"]]
+
                 dataset = import_dataset(
                     session, config, overwrite=overwrite, force_data=force_data
                 )
+
+                try:
+                    dataset = import_dataset(
+                        session, config, overwrite=overwrite, force_data=force_data
+                    )
+                except MultipleResultsFound:
+                    # Multiple result can be found for datasets. There was a bug in
+                    # load-examples that resulted in datasets being loaded with a NULL
+                    # schema. Users could then add a new dataset with the same name in
+                    # the correct schema, resulting in duplicates, since the uniqueness
+                    # constraint was not enforced correctly in the application logic.
+                    # See https://github.com/apache/superset/issues/16051.
+                    continue
+
                 dataset_info[str(dataset.uuid)] = {
                     "datasource_id": dataset.id,
                     "datasource_type": "view" if dataset.is_sqllab_view else "table",
@@ -108,7 +144,10 @@ def _import(
         # import charts
         chart_ids: Dict[str, int] = {}
         for file_name, config in configs.items():
-            if file_name.startswith("charts/"):
+            if (
+                file_name.startswith("charts/")
+                and config["dataset_uuid"] in dataset_info
+            ):
                 # update datasource id, type, and name
                 config.update(dataset_info[config["dataset_uuid"]])
                 chart = import_chart(session, config, overwrite=overwrite)
@@ -123,8 +162,14 @@ def _import(
         dashboard_chart_ids: List[Tuple[int, int]] = []
         for file_name, config in configs.items():
             if file_name.startswith("dashboards/"):
-                config = update_id_refs(config, chart_ids)
+                try:
+                    config = update_id_refs(config, chart_ids, dataset_info)
+                except KeyError:
+                    continue
+
                 dashboard = import_dashboard(session, config, overwrite=overwrite)
+                dashboard.published = True
+
                 for uuid in find_chart_uuids(config["position"]):
                     chart_id = chart_ids[uuid]
                     if (dashboard.id, chart_id) not in existing_relationships:
@@ -135,5 +180,5 @@ def _import(
             {"dashboard_id": dashboard_id, "slice_id": chart_id}
             for (dashboard_id, chart_id) in dashboard_chart_ids
         ]
-        # pylint: disable=no-value-for-parameter (sqlalchemy/issues/4656)
+        # pylint: disable=no-value-for-parameter # sqlalchemy/issues/4656
         session.execute(dashboard_slices.insert(), values)
diff --git a/superset/commands/importers/v1/utils.py b/superset/commands/importers/v1/utils.py
index b071678a078d..15bec8278ca7 100644
--- a/superset/commands/importers/v1/utils.py
+++ b/superset/commands/importers/v1/utils.py
@@ -47,9 +47,9 @@ def load_yaml(file_name: str, content: str) -> Dict[str, Any]:
     """Try to load a YAML file"""
     try:
         return yaml.safe_load(content)
-    except yaml.parser.ParserError:
+    except yaml.parser.ParserError as ex:
         logger.exception("Invalid YAML in %s", file_name)
-        raise ValidationError({file_name: "Not a valid YAML file"})
+        raise ValidationError({file_name: "Not a valid YAML file"}) from ex
 
 
 def load_metadata(contents: Dict[str, str]) -> Dict[str, str]:
@@ -63,15 +63,15 @@ def load_metadata(contents: Dict[str, str]) -> Dict[str, str]:
     metadata = load_yaml(METADATA_FILE_NAME, contents[METADATA_FILE_NAME])
     try:
         MetadataSchema().load(metadata)
-    except ValidationError as exc:
+    except ValidationError as ex:
         # if the version doesn't match raise an exception so that the
         # dispatcher can try a different command version
-        if "version" in exc.messages:
-            raise IncorrectVersionError(exc.messages["version"][0])
+        if "version" in ex.messages:
+            raise IncorrectVersionError(ex.messages["version"][0]) from ex
 
         # otherwise we raise the validation error
-        exc.messages = {METADATA_FILE_NAME: exc.messages}
-        raise exc
+        ex.messages = {METADATA_FILE_NAME: ex.messages}
+        raise ex
 
     return metadata
 
diff --git a/superset/commands/utils.py b/superset/commands/utils.py
index b39cf6434f06..c656ce304036 100644
--- a/superset/commands/utils.py
+++ b/superset/commands/utils.py
@@ -29,17 +29,25 @@
 from superset.extensions import db, security_manager
 
 
-def populate_owners(user: User, owner_ids: Optional[List[int]] = None) -> List[User]:
+def populate_owners(
+    user: User, owner_ids: Optional[List[int]], default_to_user: bool,
+) -> List[User]:
     """
     Helper function for commands, will fetch all users from owners id's
-    Can raise ValidationError
-    :param user: The current user
-    :param owner_ids: A List of owners by id's
+    :param user: current user
+    :param owner_ids: list of owners by id's
+    :param default_to_user: make user the owner if `owner_ids` is None or empty
+    :raises OwnersNotFoundValidationError: if at least one owner id can't be resolved
+    :returns: Final list of owners
     """
+    owner_ids = owner_ids or []
     owners = list()
-    if not owner_ids:
+    if not owner_ids and default_to_user:
         return [user]
-    if user.id not in owner_ids:
+    if user.id not in owner_ids and "admin" not in [
+        role.name.lower() for role in user.roles
+    ]:
+        # make sure non-admins can't remove themselves as owner by mistake
         owners.append(user)
     for owner_id in owner_ids:
         owner = security_manager.get_user_by_id(owner_id)
@@ -68,5 +76,5 @@ def get_datasource_by_id(datasource_id: int, datasource_type: str) -> BaseDataso
         return ConnectorRegistry.get_datasource(
             datasource_type, datasource_id, db.session
         )
-    except DatasetNotFoundError:
-        raise DatasourceNotFoundValidationError()
+    except DatasetNotFoundError as ex:
+        raise DatasourceNotFoundValidationError() from ex
diff --git a/superset/common/query_actions.py b/superset/common/query_actions.py
index dbd73c065abf..349d62d38227 100644
--- a/superset/common/query_actions.py
+++ b/superset/common/query_actions.py
@@ -27,6 +27,7 @@
     ChartDataResultType,
     extract_column_dtype,
     extract_dataframe_dtypes,
+    ExtraFiltersReasonType,
     get_time_filter_status,
     QueryStatus,
 )
@@ -100,8 +101,10 @@ def _get_full(
     status = payload["status"]
     if status != QueryStatus.FAILED:
         payload["colnames"] = list(df.columns)
+        payload["indexnames"] = list(df.index)
         payload["coltypes"] = extract_dataframe_dtypes(df)
         payload["data"] = query_context.get_data(df)
+        payload["result_format"] = query_context.result_format
     del payload["df"]
 
     filters = query_obj.filter
@@ -114,7 +117,7 @@ def _get_full(
         {"column": col} for col in filter_columns if col in columns
     ] + applied_time_columns
     payload["rejected_filters"] = [
-        {"reason": "not_in_datasource", "column": col}
+        {"reason": ExtraFiltersReasonType.COL_NOT_IN_DATASOURCE, "column": col}
         for col in filter_columns
         if col not in columns
     ] + rejected_time_columns
@@ -157,6 +160,10 @@ def _get_results(
     ChartDataResultType.SAMPLES: _get_samples,
     ChartDataResultType.FULL: _get_full,
     ChartDataResultType.RESULTS: _get_results,
+    # for requests for post-processed data we return the full results,
+    # and post-process it later where we have the chart context, since
+    # post-processing is unique to each visualization type
+    ChartDataResultType.POST_PROCESSED: _get_full,
 }
 
 
@@ -180,5 +187,5 @@ def get_query_results(
     if result_func:
         return result_func(query_context, query_obj, force_cached)
     raise QueryObjectValidationError(
-        _("Invalid result type: %(result_type)", result_type=result_type)
+        _("Invalid result type: %(result_type)s", result_type=result_type)
     )
diff --git a/superset/common/query_context.py b/superset/common/query_context.py
index 98e02f4e825e..566b01c8613b 100644
--- a/superset/common/query_context.py
+++ b/superset/common/query_context.py
@@ -14,27 +14,30 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from __future__ import annotations
+
+import copy
 import logging
-from typing import Any, ClassVar, Dict, List, Optional, Union
+from typing import Any, ClassVar, Dict, List, Optional, TYPE_CHECKING, Union
 
 import numpy as np
 import pandas as pd
 from flask_babel import _
+from pandas import DateOffset
+from typing_extensions import TypedDict
 
 from superset import app, db, is_feature_enabled
 from superset.annotation_layers.dao import AnnotationLayerDAO
 from superset.charts.dao import ChartDAO
 from superset.common.query_actions import get_query_results
 from superset.common.query_object import QueryObject
+from superset.common.utils import QueryCacheManager
 from superset.connectors.base.models import BaseDatasource
 from superset.connectors.connector_registry import ConnectorRegistry
-from superset.exceptions import (
-    CacheLoadError,
-    QueryObjectValidationError,
-    SupersetException,
-)
+from superset.constants import CacheRegion
+from superset.exceptions import QueryObjectValidationError, SupersetException
 from superset.extensions import cache_manager, security_manager
-from superset.stats_logger import BaseStatsLogger
+from superset.models.helpers import QueryResult
 from superset.utils import csv
 from superset.utils.cache import generate_cache_key, set_and_log_cache
 from superset.utils.core import (
@@ -44,17 +47,28 @@
     DTTM_ALIAS,
     error_msg_from_exception,
     get_column_names_from_metrics,
-    get_stacktrace,
+    get_metric_names,
     normalize_dttm_col,
     QueryStatus,
+    TIME_COMPARISION,
 )
+from superset.utils.date_parser import get_past_or_future, normalize_time_delta
 from superset.views.utils import get_viz
 
+if TYPE_CHECKING:
+    from superset.stats_logger import BaseStatsLogger
+
 config = app.config
 stats_logger: BaseStatsLogger = config["STATS_LOGGER"]
 logger = logging.getLogger(__name__)
 
 
+class CachedTimeOffset(TypedDict):
+    df: pd.DataFrame
+    queries: List[str]
+    cache_keys: List[Optional[str]]
+
+
 class QueryContext:
     """
     The query context contains the query object and additional fields necessary
@@ -73,7 +87,8 @@ class QueryContext:
 
     # TODO: Type datasource and query_object dictionary with TypedDict when it becomes
     #  a vanilla python type https://github.com/python/mypy/issues/5288
-    def __init__(  # pylint: disable=too-many-arguments
+    # pylint: disable=too-many-arguments
+    def __init__(
         self,
         datasource: DatasourceDict,
         queries: List[Dict[str, Any]],
@@ -97,21 +112,143 @@ def __init__(  # pylint: disable=too-many-arguments
             "result_format": self.result_format,
         }
 
-    def get_query_result(self, query_object: QueryObject) -> Dict[str, Any]:
-        """Returns a pandas dataframe based on the query object"""
+    @staticmethod
+    def left_join_on_dttm(
+        left_df: pd.DataFrame, right_df: pd.DataFrame
+    ) -> pd.DataFrame:
+        df = left_df.set_index(DTTM_ALIAS).join(right_df.set_index(DTTM_ALIAS))
+        df.reset_index(level=0, inplace=True)
+        return df
+
+    def processing_time_offsets(  # pylint: disable=too-many-locals
+        self, df: pd.DataFrame, query_object: QueryObject,
+    ) -> CachedTimeOffset:
+        # ensure query_object is immutable
+        query_object_clone = copy.copy(query_object)
+        queries = []
+        cache_keys = []
+
+        time_offsets = query_object.time_offsets
+        outer_from_dttm = query_object.from_dttm
+        outer_to_dttm = query_object.to_dttm
+        for offset in time_offsets:
+            try:
+                query_object_clone.from_dttm = get_past_or_future(
+                    offset, outer_from_dttm,
+                )
+                query_object_clone.to_dttm = get_past_or_future(offset, outer_to_dttm)
+            except ValueError as ex:
+                raise QueryObjectValidationError(str(ex)) from ex
+            # make sure subquery use main query where clause
+            query_object_clone.inner_from_dttm = outer_from_dttm
+            query_object_clone.inner_to_dttm = outer_to_dttm
+            query_object_clone.time_offsets = []
+            query_object_clone.post_processing = []
+
+            if not query_object.from_dttm or not query_object.to_dttm:
+                raise QueryObjectValidationError(
+                    _(
+                        "An enclosed time range (both start and end) must be specified "
+                        "when using a Time Comparison."
+                    )
+                )
+            # `offset` is added to the hash function
+            cache_key = self.query_cache_key(query_object_clone, time_offset=offset)
+            cache = QueryCacheManager.get(cache_key, CacheRegion.DATA, self.force)
+            # whether hit in the cache
+            if cache.is_loaded:
+                df = self.left_join_on_dttm(df, cache.df)
+                queries.append(cache.query)
+                cache_keys.append(cache_key)
+                continue
+
+            query_object_clone_dct = query_object_clone.to_dict()
+            result = self.datasource.query(query_object_clone_dct)
+            queries.append(result.query)
+            cache_keys.append(None)
+
+            # rename metrics: SUM(value) => SUM(value) 1 year ago
+            columns_name_mapping = {
+                metric: TIME_COMPARISION.join([metric, offset])
+                for metric in get_metric_names(
+                    query_object_clone_dct.get("metrics", [])
+                )
+            }
+            columns_name_mapping[DTTM_ALIAS] = DTTM_ALIAS
 
-        # Here, we assume that all the queries will use the same datasource, which is
-        # a valid assumption for current setting. In the long term, we may
-        # support multiple queries from different data sources.
+            offset_metrics_df = result.df
+            if offset_metrics_df.empty:
+                offset_metrics_df = pd.DataFrame(
+                    {col: [np.NaN] for col in columns_name_mapping.values()}
+                )
+            else:
+                # 1. normalize df, set dttm column
+                offset_metrics_df = self.normalize_df(
+                    offset_metrics_df, query_object_clone
+                )
+
+                # 2. extract `metrics` columns and `dttm` column from extra query
+                offset_metrics_df = offset_metrics_df[columns_name_mapping.keys()]
 
+                # 3. rename extra query columns
+                offset_metrics_df = offset_metrics_df.rename(
+                    columns=columns_name_mapping
+                )
+
+                # 4. set offset for dttm column
+                offset_metrics_df[DTTM_ALIAS] = offset_metrics_df[
+                    DTTM_ALIAS
+                ] - DateOffset(**normalize_time_delta(offset))
+
+            # df left join `offset_metrics_df` on `DTTM`
+            df = self.left_join_on_dttm(df, offset_metrics_df)
+
+            # set offset df to cache.
+            value = {
+                "df": offset_metrics_df,
+                "query": result.query,
+            }
+            cache.set(
+                key=cache_key,
+                value=value,
+                timeout=self.cache_timeout,
+                datasource_uid=self.datasource.uid,
+                region=CacheRegion.DATA,
+            )
+
+        return CachedTimeOffset(df=df, queries=queries, cache_keys=cache_keys)
+
+    def normalize_df(self, df: pd.DataFrame, query_object: QueryObject) -> pd.DataFrame:
         timestamp_format = None
         if self.datasource.type == "table":
             dttm_col = self.datasource.get_column(query_object.granularity)
             if dttm_col:
                 timestamp_format = dttm_col.python_date_format
 
+        normalize_dttm_col(
+            df=df,
+            timestamp_format=timestamp_format,
+            offset=self.datasource.offset,
+            time_shift=query_object.time_shift,
+        )
+
+        if self.enforce_numerical_metrics:
+            self.df_metrics_to_num(df, query_object)
+
+        df.replace([np.inf, -np.inf], np.nan, inplace=True)
+
+        return df
+
+    def get_query_result(self, query_object: QueryObject) -> QueryResult:
+        """Returns a pandas dataframe based on the query object"""
+
+        # Here, we assume that all the queries will use the same datasource, which is
+        # a valid assumption for current setting. In the long term, we may
+        # support multiple queries from different data sources.
+
         # The datasource here can be different backend but the interface is common
         result = self.datasource.query(query_object.to_dict())
+        query = result.query + ";\n\n"
 
         df = result.df
         # Transform the timestamp we received from database to pandas supported
@@ -120,25 +257,21 @@ def get_query_result(self, query_object: QueryObject) -> Dict[str, Any]:
         # If the datetime format is unix, the parse will use the corresponding
         # parsing logic
         if not df.empty:
-            normalize_dttm_col(
-                df=df,
-                timestamp_format=timestamp_format,
-                offset=self.datasource.offset,
-                time_shift=query_object.time_shift,
-            )
+            df = self.normalize_df(df, query_object)
+
+            if query_object.time_offsets:
+                time_offsets = self.processing_time_offsets(df, query_object)
+                df = time_offsets["df"]
+                queries = time_offsets["queries"]
 
-            if self.enforce_numerical_metrics:
-                self.df_metrics_to_num(df, query_object)
+                query += ";\n\n".join(queries)
+                query += ";\n\n"
 
-            df.replace([np.inf, -np.inf], np.nan, inplace=True)
             df = query_object.exec_post_processing(df)
 
-        return {
-            "query": result.query,
-            "status": result.status,
-            "error_message": result.error_message,
-            "df": df,
-        }
+        result.df = df
+        result.query = query
+        return result
 
     @staticmethod
     def df_metrics_to_num(df: pd.DataFrame, query_object: QueryObject) -> None:
@@ -284,7 +417,7 @@ def get_viz_annotation_data(
             payload = viz_obj.get_payload()
             return payload["data"]
         except SupersetException as ex:
-            raise QueryObjectValidationError(error_msg_from_exception(ex))
+            raise QueryObjectValidationError(error_msg_from_exception(ex)) from ex
 
     def get_annotation_data(self, query_obj: QueryObject) -> Dict[str, Any]:
         """
@@ -304,47 +437,16 @@ def get_annotation_data(self, query_obj: QueryObject) -> Dict[str, Any]:
             )
         return annotation_data
 
-    def get_df_payload(  # pylint: disable=too-many-statements,too-many-locals
+    def get_df_payload(
         self, query_obj: QueryObject, force_cached: Optional[bool] = False,
     ) -> Dict[str, Any]:
         """Handles caching around the df payload retrieval"""
         cache_key = self.query_cache_key(query_obj)
-        logger.info("Cache key: %s", cache_key)
-        is_loaded = False
-        stacktrace = None
-        df = pd.DataFrame()
-        cache_value = None
-        status = None
-        query = ""
-        annotation_data = {}
-        error_message = None
-        if cache_key and cache_manager.data_cache and not self.force:
-            cache_value = cache_manager.data_cache.get(cache_key)
-            if cache_value:
-                stats_logger.incr("loading_from_cache")
-                try:
-                    df = cache_value["df"]
-                    query = cache_value["query"]
-                    annotation_data = cache_value.get("annotation_data", {})
-                    status = QueryStatus.SUCCESS
-                    is_loaded = True
-                    stats_logger.incr("loaded_from_cache")
-                except KeyError as ex:
-                    logger.exception(ex)
-                    logger.error(
-                        "Error reading cache: %s",
-                        error_msg_from_exception(ex),
-                        exc_info=True,
-                    )
-                logger.info("Serving from cache")
-
-        if force_cached and not is_loaded:
-            logger.warning(
-                "force_cached (QueryContext): value not found for key %s", cache_key
-            )
-            raise CacheLoadError("Error loading data from cache")
+        cache = QueryCacheManager.get(
+            cache_key, CacheRegion.DATA, self.force, force_cached,
+        )
 
-        if query_obj and not is_loaded:
+        if query_obj and cache_key and not cache.is_loaded:
             try:
                 invalid_columns = [
                     col
@@ -361,47 +463,32 @@ def get_df_payload(  # pylint: disable=too-many-statements,too-many-locals
                         )
                     )
                 query_result = self.get_query_result(query_obj)
-                status = query_result["status"]
-                query = query_result["query"]
-                error_message = query_result["error_message"]
-                df = query_result["df"]
                 annotation_data = self.get_annotation_data(query_obj)
-
-                if status != QueryStatus.FAILED:
-                    stats_logger.incr("loaded_from_source")
-                    if not self.force:
-                        stats_logger.incr("loaded_from_source_without_force")
-                    is_loaded = True
-            except QueryObjectValidationError as ex:
-                error_message = str(ex)
-                status = QueryStatus.FAILED
-            except Exception as ex:  # pylint: disable=broad-except
-                logger.exception(ex)
-                if not error_message:
-                    error_message = str(ex)
-                status = QueryStatus.FAILED
-                stacktrace = get_stacktrace()
-
-            if is_loaded and cache_key and status != QueryStatus.FAILED:
-                set_and_log_cache(
-                    cache_manager.data_cache,
-                    cache_key,
-                    {"df": df, "query": query, "annotation_data": annotation_data},
-                    self.cache_timeout,
-                    self.datasource.uid,
+                cache.set_query_result(
+                    key=cache_key,
+                    query_result=query_result,
+                    annotation_data=annotation_data,
+                    force_query=self.force,
+                    timeout=self.cache_timeout,
+                    datasource_uid=self.datasource.uid,
+                    region=CacheRegion.DATA,
                 )
+            except QueryObjectValidationError as ex:
+                cache.error_message = str(ex)
+                cache.status = QueryStatus.FAILED
+
         return {
             "cache_key": cache_key,
-            "cached_dttm": cache_value["dttm"] if cache_value is not None else None,
+            "cached_dttm": cache.cache_dttm,
             "cache_timeout": self.cache_timeout,
-            "df": df,
-            "annotation_data": annotation_data,
-            "error": error_message,
-            "is_cached": cache_value is not None,
-            "query": query,
-            "status": status,
-            "stacktrace": stacktrace,
-            "rowcount": len(df.index),
+            "df": cache.df,
+            "annotation_data": cache.annotation_data,
+            "error": cache.error_message,
+            "is_cached": cache.is_cached,
+            "query": cache.query,
+            "status": cache.status,
+            "stacktrace": cache.stacktrace,
+            "rowcount": len(cache.df.index),
         }
 
     def raise_for_access(self) -> None:
diff --git a/superset/common/query_object.py b/superset/common/query_object.py
index 8fd281cf308c..bdf5f89e964d 100644
--- a/superset/common/query_object.py
+++ b/superset/common/query_object.py
@@ -14,10 +14,9 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# pylint: disable=R
 import logging
 from datetime import datetime, timedelta
-from typing import Any, Dict, List, NamedTuple, Optional, Union
+from typing import Any, Dict, List, NamedTuple, Optional
 
 from flask_babel import gettext as _
 from pandas import DataFrame
@@ -36,6 +35,7 @@
     get_metric_names,
     is_adhoc_metric,
     json_int_dttm_ser,
+    QueryObjectFilterClause,
 )
 from superset.utils.date_parser import get_since_until, parse_human_timedelta
 from superset.utils.hashing import md5_sha_from_dict
@@ -65,7 +65,7 @@ class DeprecatedField(NamedTuple):
 )
 
 
-class QueryObject:
+class QueryObject:  # pylint: disable=too-many-instance-attributes
     """
     The query object's schema matches the interfaces of DB connectors like sqla
     and druid. The query objects are constructed on the client.
@@ -77,13 +77,15 @@ class QueryObject:
     granularity: Optional[str]
     from_dttm: Optional[datetime]
     to_dttm: Optional[datetime]
+    inner_from_dttm: Optional[datetime]
+    inner_to_dttm: Optional[datetime]
     is_timeseries: bool
     time_shift: Optional[timedelta]
     groupby: List[str]
     metrics: Optional[List[Metric]]
     row_limit: int
     row_offset: int
-    filter: List[Dict[str, Any]]
+    filter: List[QueryObjectFilterClause]
     timeseries_limit: int
     timeseries_limit_metric: Optional[Metric]
     order_desc: bool
@@ -94,8 +96,9 @@ class QueryObject:
     datasource: Optional[BaseDatasource]
     result_type: Optional[ChartDataResultType]
     is_rowcount: bool
+    time_offsets: List[str]
 
-    def __init__(
+    def __init__(  # pylint: disable=too-many-arguments,too-many-locals
         self,
         datasource: Optional[DatasourceDict] = None,
         result_type: Optional[ChartDataResultType] = None,
@@ -103,9 +106,9 @@ def __init__(
         applied_time_extras: Optional[Dict[str, str]] = None,
         apply_fetch_values_predicate: bool = False,
         granularity: Optional[str] = None,
-        metrics: Optional[List[Union[Dict[str, Any], str]]] = None,
+        metrics: Optional[List[Metric]] = None,
         groupby: Optional[List[str]] = None,
-        filters: Optional[List[Dict[str, Any]]] = None,
+        filters: Optional[List[QueryObjectFilterClause]] = None,
         time_range: Optional[str] = None,
         time_shift: Optional[str] = None,
         is_timeseries: Optional[bool] = None,
@@ -125,6 +128,9 @@ def __init__(
         groupby = groupby or []
         extras = extras or {}
         annotation_layers = annotation_layers or []
+        self.time_offsets = kwargs.get("time_offsets", [])
+        self.inner_from_dttm = kwargs.get("inner_from_dttm")
+        self.inner_to_dttm = kwargs.get("inner_to_dttm")
 
         self.is_rowcount = is_rowcount
         self.datasource = None
@@ -170,9 +176,7 @@ def __init__(
         #   2. { label: 'label_name' }  - legacy format for a predefined metric
         #   3. { expressionType: 'SIMPLE' | 'SQL', ... } - adhoc metric
         self.metrics = metrics and [
-            x
-            if isinstance(x, str) or is_adhoc_metric(x)
-            else x["label"]  # type: ignore
+            x if isinstance(x, str) or is_adhoc_metric(x) else x["label"]  # type: ignore
             for x in metrics
         ]
 
@@ -270,6 +274,8 @@ def to_dict(self) -> Dict[str, Any]:
             "groupby": self.groupby,
             "from_dttm": self.from_dttm,
             "to_dttm": self.to_dttm,
+            "inner_from_dttm": self.inner_from_dttm,
+            "inner_to_dttm": self.inner_to_dttm,
             "is_rowcount": self.is_rowcount,
             "is_timeseries": self.is_timeseries,
             "metrics": self.metrics,
@@ -309,6 +315,8 @@ def cache_key(self, **extra: Any) -> str:
             cache_dict["time_range"] = self.time_range
         if self.post_processing:
             cache_dict["post_processing"] = self.post_processing
+        if self.time_offsets:
+            cache_dict["time_offsets"] = self.time_offsets
 
         for k in ["from_dttm", "to_dttm"]:
             del cache_dict[k]
diff --git a/superset/common/utils.py b/superset/common/utils.py
new file mode 100644
index 000000000000..ab83b84922c1
--- /dev/null
+++ b/superset/common/utils.py
@@ -0,0 +1,179 @@
+# 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 logging
+from typing import Any, Dict, Optional
+
+from flask_caching import Cache
+from pandas import DataFrame
+
+from superset import app
+from superset.constants import CacheRegion
+from superset.exceptions import CacheLoadError
+from superset.extensions import cache_manager
+from superset.models.helpers import QueryResult
+from superset.stats_logger import BaseStatsLogger
+from superset.utils.cache import set_and_log_cache
+from superset.utils.core import error_msg_from_exception, get_stacktrace, QueryStatus
+
+config = app.config
+stats_logger: BaseStatsLogger = config["STATS_LOGGER"]
+logger = logging.getLogger(__name__)
+
+_cache: Dict[CacheRegion, Cache] = {
+    CacheRegion.DEFAULT: cache_manager.cache,
+    CacheRegion.DATA: cache_manager.data_cache,
+}
+
+
+class QueryCacheManager:
+    """
+    Class for manage query-cache getting and setting
+    """
+
+    # pylint: disable=too-many-instance-attributes,too-many-arguments
+    def __init__(
+        self,
+        df: DataFrame = DataFrame(),
+        query: str = "",
+        annotation_data: Optional[Dict[str, Any]] = None,
+        status: Optional[str] = None,
+        error_message: Optional[str] = None,
+        is_loaded: bool = False,
+        stacktrace: Optional[str] = None,
+        is_cached: Optional[bool] = None,
+        cache_dttm: Optional[str] = None,
+        cache_value: Optional[Dict[str, Any]] = None,
+    ) -> None:
+        self.df = df
+        self.query = query
+        self.annotation_data = {} if annotation_data is None else annotation_data
+        self.status = status
+        self.error_message = error_message
+
+        self.is_loaded = is_loaded
+        self.stacktrace = stacktrace
+        self.is_cached = is_cached
+        self.cache_dttm = cache_dttm
+        self.cache_value = cache_value
+
+    # pylint: disable=too-many-arguments
+    def set_query_result(
+        self,
+        key: str,
+        query_result: QueryResult,
+        annotation_data: Optional[Dict[str, Any]] = None,
+        force_query: Optional[bool] = False,
+        timeout: Optional[int] = None,
+        datasource_uid: Optional[str] = None,
+        region: CacheRegion = CacheRegion.DEFAULT,
+    ) -> None:
+        """
+        Set dataframe of query-result to specific cache region
+        """
+        try:
+            self.status = query_result.status
+            self.query = query_result.query
+            self.error_message = query_result.error_message
+            self.df = query_result.df
+            self.annotation_data = {} if annotation_data is None else annotation_data
+
+            if self.status != QueryStatus.FAILED:
+                stats_logger.incr("loaded_from_source")
+                if not force_query:
+                    stats_logger.incr("loaded_from_source_without_force")
+                self.is_loaded = True
+
+            value = {
+                "df": self.df,
+                "query": self.query,
+                "annotation_data": self.annotation_data,
+            }
+            if self.is_loaded and key and self.status != QueryStatus.FAILED:
+                self.set(
+                    key=key,
+                    value=value,
+                    timeout=timeout,
+                    datasource_uid=datasource_uid,
+                    region=region,
+                )
+        except Exception as ex:  # pylint: disable=broad-except
+            logger.exception(ex)
+            if not self.error_message:
+                self.error_message = str(ex)
+            self.status = QueryStatus.FAILED
+            self.stacktrace = get_stacktrace()
+
+    @classmethod
+    def get(
+        cls,
+        key: Optional[str],
+        region: CacheRegion = CacheRegion.DEFAULT,
+        force_query: Optional[bool] = False,
+        force_cached: Optional[bool] = False,
+    ) -> "QueryCacheManager":
+        """
+        Initialize QueryCacheManager by query-cache key
+        """
+        query_cache = cls()
+        if not key or not _cache[region] or force_query:
+            return query_cache
+
+        cache_value = _cache[region].get(key)
+        if cache_value:
+            logger.info("Cache key: %s", key)
+            stats_logger.incr("loading_from_cache")
+            try:
+                query_cache.df = cache_value["df"]
+                query_cache.query = cache_value["query"]
+                query_cache.annotation_data = cache_value.get("annotation_data", {})
+                query_cache.status = QueryStatus.SUCCESS
+                query_cache.is_loaded = True
+                query_cache.is_cached = cache_value is not None
+                query_cache.cache_dttm = (
+                    cache_value["dttm"] if cache_value is not None else None
+                )
+                query_cache.cache_value = cache_value
+                stats_logger.incr("loaded_from_cache")
+            except KeyError as ex:
+                logger.exception(ex)
+                logger.error(
+                    "Error reading cache: %s",
+                    error_msg_from_exception(ex),
+                    exc_info=True,
+                )
+            logger.info("Serving from cache")
+
+        if force_cached and not query_cache.is_loaded:
+            logger.warning(
+                "force_cached (QueryContext): value not found for key %s", key
+            )
+            raise CacheLoadError("Error loading data from cache")
+        return query_cache
+
+    @staticmethod
+    def set(
+        key: Optional[str],
+        value: Dict[str, Any],
+        timeout: Optional[int] = None,
+        datasource_uid: Optional[str] = None,
+        region: CacheRegion = CacheRegion.DEFAULT,
+    ) -> None:
+        """
+        set value to specify cache region, proxy for `set_and_log_cache`
+        """
+        if key:
+            set_and_log_cache(_cache[region], key, value, timeout, datasource_uid)
diff --git a/superset/config.py b/superset/config.py
index a6427b528d77..c0946740c57f 100644
--- a/superset/config.py
+++ b/superset/config.py
@@ -20,7 +20,7 @@
 in your PYTHONPATH as there is a ``from superset_config import *``
 at the end of this file.
 """
-import imp
+import imp  # pylint: disable=deprecated-module
 import importlib.util
 import json
 import logging
@@ -28,7 +28,7 @@
 import re
 import sys
 from collections import OrderedDict
-from datetime import date
+from datetime import date, timedelta
 from typing import Any, Callable, Dict, List, Optional, Type, TYPE_CHECKING, Union
 
 from cachelib.base import BaseCache
@@ -38,9 +38,7 @@
 from flask_appbuilder.security.manager import AUTH_DB
 from pandas.io.parsers import STR_NA_VALUES
 
-from superset.jinja_context import (  # pylint: disable=unused-import
-    BaseTemplateProcessor,
-)
+from superset.jinja_context import BaseTemplateProcessor
 from superset.stats_logger import DummyStatsLogger
 from superset.typing import CacheConfig
 from superset.utils.core import is_test, parse_boolean_string
@@ -51,12 +49,9 @@
 logger = logging.getLogger(__name__)
 
 if TYPE_CHECKING:
-    from flask_appbuilder.security.sqla import models  # pylint: disable=unused-import
-
-    from superset.connectors.sqla.models import (  # pylint: disable=unused-import
-        SqlaTable,
-    )
-    from superset.models.core import Database  # pylint: disable=unused-import
+    from flask_appbuilder.security.sqla import models
+    from superset.connectors.sqla.models import SqlaTable
+    from superset.models.core import Database
 
 # Realtime stats logger, a StatsD implementation exists
 STATS_LOGGER = DummyStatsLogger()
@@ -96,9 +91,7 @@ def _try_json_readversion(filepath: str) -> Optional[str]:
         return None
 
 
-def _try_json_readsha(  # pylint: disable=unused-argument
-    filepath: str, length: int
-) -> Optional[str]:
+def _try_json_readsha(filepath: str, length: int) -> Optional[str]:
     try:
         with open(filepath, "r") as f:
             return json.load(f).get("GIT_SHA")[:length]
@@ -139,7 +132,7 @@ def _try_json_readsha(  # pylint: disable=unused-argument
 # [load balancer / proxy / envoy / kong / ...] timeout settings.
 # You should also make sure to configure your WSGI server
 # (gunicorn, nginx, apache, ...) timeout setting to be <= to this setting
-SUPERSET_WEBSERVER_TIMEOUT = 60
+SUPERSET_WEBSERVER_TIMEOUT = int(timedelta(minutes=1).total_seconds())
 
 # this 2 settings are used by dashboard period force refresh feature
 # When user choose auto force refresh frequency
@@ -196,6 +189,10 @@ def _try_json_readsha(  # pylint: disable=unused-argument
 DEBUG = os.environ.get("FLASK_ENV") == "development"
 FLASK_USE_RELOAD = True
 
+# Enable profiling of Python calls. Turn this on and append ``?_instrument=1``
+# to the page to see the call stack.
+PROFILING = False
+
 # Superset allows server-side python stacktraces to be surfaced to the
 # user when this feature is on. This may has security implications
 # and it's more secure to turn it off in production settings.
@@ -212,14 +209,20 @@ def _try_json_readsha(  # pylint: disable=unused-argument
 # Uncomment to setup Your App name
 APP_NAME = "Superset"
 
-# Uncomment to setup an App icon
+# Specify the App icon
 APP_ICON = "/static/assets/images/superset-logo-horiz.png"
 APP_ICON_WIDTH = 126
 
-# Uncomment to specify where clicking the logo would take the user
+# Specify where clicking the logo would take the user
 # e.g. setting it to '/' would take the user to '/superset/welcome/'
 LOGO_TARGET_PATH = None
 
+# Specify tooltip that should appear when hovering over the App Icon/Logo
+LOGO_TOOLTIP = ""
+
+# Specify any text that should appear to the right of the logo
+LOGO_RIGHT_TEXT: Union[Callable[[], str], str] = ""
+
 # Enables SWAGGER UI for superset openapi spec
 # ex: http://localhost:8080/swagger/v1
 FAB_API_SWAGGER_UI = True
@@ -303,6 +306,7 @@ def _try_json_readsha(  # pylint: disable=unused-argument
     "pt_BR": {"flag": "br", "name": "Brazilian Portuguese"},
     "ru": {"flag": "ru", "name": "Russian"},
     "ko": {"flag": "kr", "name": "Korean"},
+    "sl": {"flag": "si", "name": "Slovenian"},
 }
 # Turning off i18n by default as translation in most languages are
 # incomplete and not well maintained.
@@ -360,6 +364,7 @@ def _try_json_readsha(  # pylint: disable=unused-argument
     "DASHBOARD_NATIVE_FILTERS": False,
     "DASHBOARD_CROSS_FILTERS": False,
     "DASHBOARD_NATIVE_FILTERS_SET": False,
+    "DASHBOARD_FILTERS_EXPERIMENTAL": False,
     "GLOBAL_ASYNC_QUERIES": False,
     "VERSIONED_EXPORT": False,
     # Note that: RowLevelSecurityFilter is only given by default to the Admin role
@@ -376,6 +381,7 @@ def _try_json_readsha(  # pylint: disable=unused-argument
     "OMNIBAR": False,
     "DASHBOARD_RBAC": False,
     "ENABLE_EXPLORE_DRAG_AND_DROP": False,
+    "ENABLE_DND_WITH_CLICK_UX": False,
     # Enabling ALERTS_ATTACH_REPORTS, the system sends email and slack message
     # with screenshot and link
     # Disables ALERTS_ATTACH_REPORTS, the system DOES NOT generate screenshot
@@ -383,9 +389,15 @@ def _try_json_readsha(  # pylint: disable=unused-argument
     # for report with type 'report' still send with email and slack message with
     # screenshot and link
     "ALERTS_ATTACH_REPORTS": True,
-    # Enabling FORCE_DATABASE_CONNECTIONS_SSL forces all database connections to be
-    # encrypted before being saved into superset metastore.
+    # FORCE_DATABASE_CONNECTIONS_SSL is depreciated.
     "FORCE_DATABASE_CONNECTIONS_SSL": False,
+    # Enabling ENFORCE_DB_ENCRYPTION_UI forces all database connections to be
+    # encrypted before being saved into superset metastore.
+    "ENFORCE_DB_ENCRYPTION_UI": False,
+    # Allow users to export full CSV of table viz type.
+    # This could cause the server to run out of memory or compute.
+    "ALLOW_FULL_CSV_EXPORT": False,
+    "UX_BETA": False,
 }
 
 # Feature flags may also be set via 'SUPERSET_FEATURE_' prefixed environment vars.
@@ -416,6 +428,20 @@ def _try_json_readsha(  # pylint: disable=unused-argument
 #     return feature_flags_dict
 GET_FEATURE_FLAGS_FUNC: Optional[Callable[[Dict[str, bool]], Dict[str, bool]]] = None
 
+# A function that expands/overrides the frontend `bootstrap_data.common` object.
+# Can be used to implement custom frontend functionality,
+# or dynamically change certain configs.
+#
+# Values in `bootstrap_data.common` should have these characteristics:
+# - They are not specific to a page the user is visiting
+# - They do not contain secrets
+#
+# Takes as a parameter the common bootstrap payload before transformations.
+# Returns a dict containing data that should be added or overridden to the payload.
+COMMON_BOOTSTRAP_OVERRIDES_FUNC: Callable[
+    [Dict[str, Any]], Dict[str, Any]
+] = lambda data: {}  # default: empty dict
+
 # EXTRA_CATEGORICAL_COLOR_SCHEMES is used for adding custom categorical color schemes
 # example code for "My custom warm to hot" color scheme
 # EXTRA_CATEGORICAL_COLOR_SCHEMES = [
@@ -475,11 +501,18 @@ def _try_json_readsha(  # pylint: disable=unused-argument
     "CACHE_NO_NULL_WARNING": True,
 }
 
-# Used for thumbnails and other api: Time in seconds before selenium
-# times out after trying to locate an element on the page and wait
-# for that element to load for an alert screenshot.
-SCREENSHOT_LOCATE_WAIT = 10
-SCREENSHOT_LOAD_WAIT = 60
+# Time before selenium times out after trying to locate an element on the page and wait
+# for that element to load for a screenshot.
+SCREENSHOT_LOCATE_WAIT = int(timedelta(seconds=10).total_seconds())
+# Time before selenium times out after waiting for all DOM class elements named
+# "loading" are gone.
+SCREENSHOT_LOAD_WAIT = int(timedelta(minutes=1).total_seconds())
+# Selenium destroy retries
+SCREENSHOT_SELENIUM_RETRIES = 5
+# Give selenium an headstart, in seconds
+SCREENSHOT_SELENIUM_HEADSTART = 3
+# Wait for the chart animation, in seconds
+SCREENSHOT_SELENIUM_ANIMATION_WAIT = 5
 
 # ---------------------------------------------------
 # Image and file configuration
@@ -496,9 +529,9 @@ def _try_json_readsha(  # pylint: disable=unused-argument
 # Setup image size default is (300, 200, True)
 # IMG_SIZE = (300, 200, True)
 
-# Default cache timeout (in seconds), applies to all cache backends unless
-# specifically overridden in each cache config.
-CACHE_DEFAULT_TIMEOUT = 60 * 60 * 24  # 1 day
+# Default cache timeout, applies to all cache backends unless specifically overridden in
+# each cache config.
+CACHE_DEFAULT_TIMEOUT = int(timedelta(days=1).total_seconds())
 
 # Default cache for Superset objects
 CACHE_CONFIG: CacheConfig = {"CACHE_TYPE": "null"}
@@ -634,7 +667,7 @@ def _try_json_readsha(  # pylint: disable=unused-argument
 
 # Default row limit for SQL Lab queries. Is overridden by setting a new limit in
 # the SQL Lab UI
-DEFAULT_SQLLAB_LIMIT = 10000
+DEFAULT_SQLLAB_LIMIT = 1000
 
 # Maximum number of tables/views displayed in the dropdown window in SQL Lab.
 MAX_TABLE_NAMES = 3000
@@ -660,8 +693,8 @@ class CeleryConfig:  # pylint: disable=too-few-public-methods
         "sql_lab.get_sql_results": {"rate_limit": "100/s"},
         "email_reports.send": {
             "rate_limit": "1/s",
-            "time_limit": 120,
-            "soft_time_limit": 150,
+            "time_limit": int(timedelta(seconds=120).total_seconds()),
+            "soft_time_limit": int(timedelta(seconds=150).total_seconds()),
             "ignore_result": True,
         },
     }
@@ -701,22 +734,21 @@ class CeleryConfig:  # pylint: disable=too-few-public-methods
 DEFAULT_DB_ID = None
 
 # Timeout duration for SQL Lab synchronous queries
-SQLLAB_TIMEOUT = 30
+SQLLAB_TIMEOUT = int(timedelta(seconds=30).total_seconds())
 
 # Timeout duration for SQL Lab query validation
-SQLLAB_VALIDATION_TIMEOUT = 10
+SQLLAB_VALIDATION_TIMEOUT = int(timedelta(seconds=10).total_seconds())
 
 # SQLLAB_DEFAULT_DBID
 SQLLAB_DEFAULT_DBID = None
 
-# The MAX duration (in seconds) a query can run for before being killed
-# by celery.
-SQLLAB_ASYNC_TIME_LIMIT_SEC = 60 * 60 * 6
+# The MAX duration a query can run for before being killed by celery.
+SQLLAB_ASYNC_TIME_LIMIT_SEC = int(timedelta(hours=6).total_seconds())
 
 # Some databases support running EXPLAIN queries that allow users to estimate
 # query costs before they run. These EXPLAIN queries should have a small
 # timeout.
-SQLLAB_QUERY_COST_ESTIMATE_TIMEOUT = 10  # seconds
+SQLLAB_QUERY_COST_ESTIMATE_TIMEOUT = int(timedelta(seconds=10).total_seconds())
 # The feature is off by default, and currently only supported in Presto and Postgres.
 # It also need to be enabled on a per-database basis, by adding the key/value pair
 # `cost_estimate_enabled: true` to the database `extra` attribute.
@@ -884,7 +916,7 @@ def CSV_TO_HIVE_UPLOAD_DIRECTORY_FUNC(
 TROUBLESHOOTING_LINK = ""
 
 # CSRF token timeout, set to None for a token that never expires
-WTF_CSRF_TIME_LIMIT = 60 * 60 * 24 * 7
+WTF_CSRF_TIME_LIMIT = int(timedelta(weeks=1).total_seconds())
 
 # This link should lead to a page with instructions on how to gain access to a
 # Datasource. It will be placed at the bottom of permissions errors.
@@ -900,11 +932,11 @@ def CSV_TO_HIVE_UPLOAD_DIRECTORY_FUNC(
 TRACKING_URL_TRANSFORMER = lambda x: x
 
 # Interval between consecutive polls when using Hive Engine
-HIVE_POLL_INTERVAL = 5
+HIVE_POLL_INTERVAL = int(timedelta(seconds=5).total_seconds())
 
 # Interval between consecutive polls when using Presto Engine
-# See here: https://github.com/dropbox/PyHive/blob/8eb0aeab8ca300f3024655419b93dad926c1a351/pyhive/presto.py#L93  # pylint: disable=line-too-long
-PRESTO_POLL_INTERVAL = 1
+# See here: https://github.com/dropbox/PyHive/blob/8eb0aeab8ca300f3024655419b93dad926c1a351/pyhive/presto.py#L93  # pylint: disable=line-too-long,useless-suppression
+PRESTO_POLL_INTERVAL = int(timedelta(seconds=1).total_seconds())
 
 # Allow for javascript controls components
 # this enables programmers to customize certain charts (like the
@@ -962,10 +994,10 @@ def CSV_TO_HIVE_UPLOAD_DIRECTORY_FUNC(
 ALERT_REPORTS_WORKING_TIME_OUT_KILL = True
 # if ALERT_REPORTS_WORKING_TIME_OUT_KILL is True, set a celery hard timeout
 # Equal to working timeout + ALERT_REPORTS_WORKING_TIME_OUT_LAG
-ALERT_REPORTS_WORKING_TIME_OUT_LAG = 10
+ALERT_REPORTS_WORKING_TIME_OUT_LAG = int(timedelta(seconds=10).total_seconds())
 # if ALERT_REPORTS_WORKING_TIME_OUT_KILL is True, set a celery hard timeout
 # Equal to working timeout + ALERT_REPORTS_WORKING_SOFT_TIME_OUT_LAG
-ALERT_REPORTS_WORKING_SOFT_TIME_OUT_LAG = 1
+ALERT_REPORTS_WORKING_SOFT_TIME_OUT_LAG = int(timedelta(seconds=1).total_seconds())
 # If set to true no notification is sent, the worker will just log a message.
 # Useful for debugging
 ALERT_REPORTS_NOTIFICATION_DRY_RUN = False
@@ -998,7 +1030,7 @@ def CSV_TO_HIVE_UPLOAD_DIRECTORY_FUNC(
 # by celery.
 #
 # Warning: This config key is deprecated and will be removed in version 2.0.0"
-EMAIL_ASYNC_TIME_LIMIT_SEC = 300
+EMAIL_ASYNC_TIME_LIMIT_SEC = int(timedelta(minutes=5).total_seconds())
 
 # Send bcc of all reports to this address. Set to None to disable.
 # This is useful for maintaining an audit trail of all email deliveries.
@@ -1042,9 +1074,8 @@ def CSV_TO_HIVE_UPLOAD_DIRECTORY_FUNC(
 WEBDRIVER_BASEURL = "http://0.0.0.0:8080/"
 # The base URL for the email report hyperlinks.
 WEBDRIVER_BASEURL_USER_FRIENDLY = WEBDRIVER_BASEURL
-# Time in seconds, selenium will wait for the page to load
-# and render for the email report.
-EMAIL_PAGE_RENDER_WAIT = 30
+# Time selenium will wait for the page to load and render for the email report.
+EMAIL_PAGE_RENDER_WAIT = int(timedelta(seconds=30).total_seconds())
 
 # Send user to a link where they can report bugs
 BUG_REPORT_URL = None
@@ -1075,10 +1106,10 @@ def CSV_TO_HIVE_UPLOAD_DIRECTORY_FUNC(
 # use the "engine_name" attribute of the corresponding DB engine spec
 # in `superset/db_engine_specs/`.
 PREFERRED_DATABASES: List[str] = [
-    # "PostgreSQL",
-    # "Presto",
-    # "MySQL",
-    # "SQLite",
+    "PostgreSQL",
+    "Presto",
+    "MySQL",
+    "SQLite",
     # etc.
 ]
 
@@ -1112,8 +1143,8 @@ def CSV_TO_HIVE_UPLOAD_DIRECTORY_FUNC(
 SESSION_COOKIE_SECURE = False  # Prevent cookie from being transmitted over non-tls?
 SESSION_COOKIE_SAMESITE = "Lax"  # One of [None, 'None', 'Lax', 'Strict']
 
-# Flask configuration variables
-SEND_FILE_MAX_AGE_DEFAULT = 60 * 60 * 24 * 365  # Cache static resources
+# Cache static resources.
+SEND_FILE_MAX_AGE_DEFAULT = int(timedelta(days=365).total_seconds())
 
 # URI to database storing the example data, points to
 # SQLALCHEMY_DATABASE_URI by default if set to `None`
@@ -1174,7 +1205,9 @@ def CSV_TO_HIVE_UPLOAD_DIRECTORY_FUNC(
 GLOBAL_ASYNC_QUERIES_JWT_COOKIE_DOMAIN = None
 GLOBAL_ASYNC_QUERIES_JWT_SECRET = "test-secret-change-me"
 GLOBAL_ASYNC_QUERIES_TRANSPORT = "polling"
-GLOBAL_ASYNC_QUERIES_POLLING_DELAY = 500
+GLOBAL_ASYNC_QUERIES_POLLING_DELAY = int(
+    timedelta(milliseconds=500).total_seconds() * 1000
+)
 GLOBAL_ASYNC_QUERIES_WEBSOCKET_URL = "ws://127.0.0.1:8080/"
 
 # A SQL dataset health check. Note if enabled it is strongly advised that the callable
@@ -1208,6 +1241,9 @@ def CSV_TO_HIVE_UPLOAD_DIRECTORY_FUNC(
 #
 DATASET_HEALTH_CHECK: Optional[Callable[["SqlaTable"], str]] = None
 
+# Do not show user info or profile in the menu
+MENU_HIDE_USER_INFO = False
+
 # SQLalchemy link doc reference
 SQLALCHEMY_DOCS_URL = "https://docs.sqlalchemy.org/en/13/core/engines.html"
 SQLALCHEMY_DISPLAY_TEXT = "SQLAlchemy docs"
@@ -1237,7 +1273,7 @@ def CSV_TO_HIVE_UPLOAD_DIRECTORY_FUNC(
 elif importlib.util.find_spec("superset_config") and not is_test():
     try:
         import superset_config  # pylint: disable=import-error
-        from superset_config import *  # type: ignore # pylint: disable=import-error,wildcard-import,unused-wildcard-import
+        from superset_config import *  # type: ignore # pylint: disable=import-error,wildcard-import
 
         print(f"Loaded your LOCAL configuration at [{superset_config.__file__}]")
     except Exception:
diff --git a/superset/connectors/base/models.py b/superset/connectors/base/models.py
index 8cacab91697f..844dc48bb89a 100644
--- a/superset/connectors/base/models.py
+++ b/superset/connectors/base/models.py
@@ -17,24 +17,26 @@
 import json
 from datetime import datetime
 from enum import Enum
-from typing import Any, Dict, Hashable, List, Optional, Type, Union
+from typing import Any, Dict, Hashable, List, Optional, Set, Type, Union
 
 from flask_appbuilder.security.sqla.models import User
 from sqlalchemy import and_, Boolean, Column, Integer, String, Text
 from sqlalchemy.ext.declarative import declared_attr
-from sqlalchemy.orm import foreign, Query, relationship, RelationshipProperty
+from sqlalchemy.orm import foreign, Query, relationship, RelationshipProperty, Session
 
-from superset import security_manager
+from superset import is_feature_enabled, security_manager
 from superset.constants import NULL_STRING
 from superset.models.helpers import AuditMixinNullable, ImportExportMixin, QueryResult
 from superset.models.slice import Slice
 from superset.typing import FilterValue, FilterValues, QueryObjectDict
 from superset.utils import core as utils
+from superset.utils.core import GenericDataType
 
 METRIC_FORM_DATA_PARAMS = [
     "metric",
-    "metrics",
     "metric_2",
+    "metrics",
+    "metrics_b",
     "percent_metrics",
     "secondary_metric",
     "size",
@@ -101,7 +103,7 @@ def name(self) -> str:
     description = Column(Text)
     default_endpoint = Column(Text)
     is_featured = Column(Boolean, default=False)  # TODO deprecating
-    filter_select_enabled = Column(Boolean, default=False)
+    filter_select_enabled = Column(Boolean, default=is_feature_enabled("UX_BETA"))
     offset = Column(Integer, default=0)
     cache_timeout = Column(Integer)
     params = Column(String(1000))
@@ -280,25 +282,34 @@ def data_for_slices(self, slices: List[Slice]) -> Dict[str, Any]:
         column_names = set()
         for slc in slices:
             form_data = slc.form_data
-
             # pull out all required metrics from the form_data
-            for param in METRIC_FORM_DATA_PARAMS:
-                for metric in utils.get_iterable(form_data.get(param) or []):
+            for metric_param in METRIC_FORM_DATA_PARAMS:
+                for metric in utils.get_iterable(form_data.get(metric_param) or []):
                     metric_names.add(utils.get_metric_name(metric))
-
                     if utils.is_adhoc_metric(metric):
                         column_names.add(
                             (metric.get("column") or {}).get("column_name")
                         )
 
-            # pull out all required columns from the form_data
-            for filter_ in form_data.get("adhoc_filters") or []:
-                if filter_["clause"] == "WHERE" and filter_.get("subject"):
-                    column_names.add(filter_.get("subject"))
+            # Columns used in query filters
+            column_names.update(
+                filter_["subject"]
+                for filter_ in form_data.get("adhoc_filters") or []
+                if filter_.get("clause") == "WHERE" and filter_.get("subject")
+            )
 
-            for param in COLUMN_FORM_DATA_PARAMS:
-                for column in utils.get_iterable(form_data.get(param) or []):
-                    column_names.add(column)
+            # columns used by Filter Box
+            column_names.update(
+                filter_config["column"]
+                for filter_config in form_data.get("filter_configs") or []
+                if "column" in filter_config
+            )
+
+            column_names.update(
+                column
+                for column_param in COLUMN_FORM_DATA_PARAMS
+                for column in utils.get_iterable(form_data.get(column_param) or [])
+            )
 
         filtered_metrics = [
             metric
@@ -306,12 +317,16 @@ def data_for_slices(self, slices: List[Slice]) -> Dict[str, Any]:
             if metric["metric_name"] in metric_names
         ]
 
-        filtered_columns = [
-            column
-            for column in data["columns"]
-            if column["column_name"] in column_names
-        ]
+        filtered_columns: List[Column] = []
+        column_types: Set[GenericDataType] = set()
+        for column in data["columns"]:
+            generic_type = column.get("type_generic")
+            if generic_type is not None:
+                column_types.add(generic_type)
+            if column["column_name"] in column_names:
+                filtered_columns.append(column)
 
+        data["column_types"] = list(column_types)
         del data["description"]
         data.update({"metrics": filtered_metrics})
         data.update({"columns": filtered_columns})
@@ -359,6 +374,8 @@ def handle_single_value(value: Optional[FilterValue]) -> Optional[FilterValue]:
                     return None
                 if value == "<empty string>":
                     return ""
+            if target_column_type == utils.GenericDataType.BOOLEAN:
+                return utils.cast_to_boolean(value)
             return value
 
         if isinstance(values, (list, tuple)):
@@ -511,6 +528,12 @@ def raise_for_access(self) -> None:
 
         security_manager.raise_for_access(datasource=self)
 
+    @classmethod
+    def get_datasource_by_name(
+        cls, session: Session, datasource_name: str, schema: str, database_name: str
+    ) -> Optional["BaseDatasource"]:
+        raise NotImplementedError()
+
 
 class BaseColumn(AuditMixinNullable, ImportExportMixin):
     """Interface for column"""
diff --git a/superset/connectors/connector_registry.py b/superset/connectors/connector_registry.py
index 0931fd9e5567..06816fa53049 100644
--- a/superset/connectors/connector_registry.py
+++ b/superset/connectors/connector_registry.py
@@ -16,8 +16,10 @@
 # under the License.
 from typing import Dict, List, Optional, Set, Type, TYPE_CHECKING
 
+from flask_babel import _
 from sqlalchemy import or_
 from sqlalchemy.orm import Session, subqueryload
+from sqlalchemy.orm.exc import NoResultFound
 
 from superset.datasets.commands.exceptions import DatasetNotFoundError
 
@@ -29,7 +31,7 @@
 
 
 class ConnectorRegistry:
-    """ Central Registry for all available datasource engines"""
+    """Central Registry for all available datasource engines"""
 
     sources: Dict[str, Type["BaseDatasource"]] = {}
 
@@ -66,13 +68,36 @@ def get_datasource(
     @classmethod
     def get_all_datasources(cls, session: Session) -> List["BaseDatasource"]:
         datasources: List["BaseDatasource"] = []
-        for source_type in ConnectorRegistry.sources:
-            source_class = ConnectorRegistry.sources[source_type]
+        for source_class in ConnectorRegistry.sources.values():
             qry = session.query(source_class)
             qry = source_class.default_query(qry)
             datasources.extend(qry.all())
         return datasources
 
+    @classmethod
+    def get_datasource_by_id(
+        cls, session: Session, datasource_id: int
+    ) -> "BaseDatasource":
+        """
+        Find a datasource instance based on the unique id.
+
+        :param session: Session to use
+        :param datasource_id: unique id of datasource
+        :return: Datasource corresponding to the id
+        :raises NoResultFound: if no datasource is found corresponding to the id
+        """
+        for datasource_class in ConnectorRegistry.sources.values():
+            try:
+                return (
+                    session.query(datasource_class)
+                    .filter(datasource_class.id == datasource_id)
+                    .one()
+                )
+            except NoResultFound:
+                # proceed to next datasource type
+                pass
+        raise NoResultFound(_("Datasource id not found: %(id)s", id=datasource_id))
+
     @classmethod
     def get_datasource_by_name(  # pylint: disable=too-many-arguments
         cls,
diff --git a/superset/connectors/druid/models.py b/superset/connectors/druid/models.py
index 1839f763e70e..32edb695279c 100644
--- a/superset/connectors/druid/models.py
+++ b/superset/connectors/druid/models.py
@@ -43,9 +43,12 @@
     Table,
     Text,
     UniqueConstraint,
+    update,
 )
+from sqlalchemy.engine.base import Connection
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import backref, relationship, Session
+from sqlalchemy.orm.mapper import Mapper
 from sqlalchemy.sql import expression
 
 from superset import conf, db, security_manager
@@ -55,9 +58,17 @@
 from superset.extensions import encrypted_field_factory
 from superset.models.core import Database
 from superset.models.helpers import AuditMixinNullable, ImportExportMixin, QueryResult
-from superset.typing import FilterValues, Granularity, Metric, QueryObjectDict
+from superset.typing import (
+    AdhocMetric,
+    AdhocMetricColumn,
+    FilterValues,
+    Granularity,
+    Metric,
+    QueryObjectDict,
+)
 from superset.utils import core as utils
 from superset.utils.date_parser import parse_human_datetime, parse_human_timedelta
+from superset.utils.memoized import memoized
 
 try:
     import requests
@@ -83,7 +94,13 @@
     pass
 
 try:
-    from superset.utils.core import DimSelector, DTTM_ALIAS, FilterOperator, flasher
+    from superset.utils.core import (
+        DimSelector,
+        DTTM_ALIAS,
+        FilterOperator,
+        flasher,
+        get_metric_name,
+    )
 except ImportError:
     pass
 
@@ -192,7 +209,7 @@ def get_druid_version(self) -> str:
         return json.loads(requests.get(endpoint, auth=auth).text)["version"]
 
     @property  # type: ignore
-    @utils.memoized
+    @memoized
     def druid_version(self) -> str:
         return self.get_druid_version()
 
@@ -1010,8 +1027,8 @@ def _add_filter_from_pre_query_data(
         return ret
 
     @staticmethod
-    def druid_type_from_adhoc_metric(adhoc_metric: Dict[str, Any]) -> str:
-        column_type = adhoc_metric["column"]["type"].lower()
+    def druid_type_from_adhoc_metric(adhoc_metric: AdhocMetric) -> str:
+        column_type = adhoc_metric["column"]["type"].lower()  # type: ignore
         aggregate = adhoc_metric["aggregate"].lower()
 
         if aggregate == "count":
@@ -1025,7 +1042,7 @@ def druid_type_from_adhoc_metric(adhoc_metric: Dict[str, Any]) -> str:
     def get_aggregations(
         metrics_dict: Dict[str, Any],
         saved_metrics: Set[str],
-        adhoc_metrics: Optional[List[Dict[str, Any]]] = None,
+        adhoc_metrics: Optional[List[AdhocMetric]] = None,
     ) -> "OrderedDict[str, Any]":
         """
         Returns a dictionary of aggregation metric names to aggregation json objects
@@ -1053,11 +1070,13 @@ def get_aggregations(
                 _("Metric(s) {} must be aggregations.").format(invalid_metric_names)
             )
         for adhoc_metric in adhoc_metrics:
-            aggregations[adhoc_metric["label"]] = {
-                "fieldName": adhoc_metric["column"]["column_name"],
-                "fieldNames": [adhoc_metric["column"]["column_name"]],
+            label = get_metric_name(adhoc_metric)
+            column = cast(AdhocMetricColumn, adhoc_metric["column"])
+            aggregations[label] = {
+                "fieldName": column["column_name"],
+                "fieldNames": [column["column_name"]],
                 "type": DruidDatasource.druid_type_from_adhoc_metric(adhoc_metric),
-                "name": adhoc_metric["label"],
+                "name": label,
             }
         return aggregations
 
@@ -1680,6 +1699,25 @@ def external_metadata(self) -> List[Dict[str, Any]]:
         latest_metadata = self.latest_metadata() or {}
         return [{"name": k, "type": v.get("type")} for k, v in latest_metadata.items()]
 
+    @staticmethod
+    def update_datasource(
+        _mapper: Mapper, _connection: Connection, obj: Union[DruidColumn, DruidMetric]
+    ) -> None:
+        """
+        Forces an update to the datasource's changed_on value when a metric or column on
+        the datasource is updated. This busts the cache key for all charts that use the
+        datasource.
+
+        :param _mapper: Unused.
+        :param _connection: Unused.
+        :param obj: The metric or column that was updated.
+        """
+        db.session.execute(
+            update(DruidDatasource).where(DruidDatasource.id == obj.datasource.id)
+        )
+
 
 sa.event.listen(DruidDatasource, "after_insert", security_manager.set_perm)
 sa.event.listen(DruidDatasource, "after_update", security_manager.set_perm)
+sa.event.listen(DruidMetric, "after_update", DruidDatasource.update_datasource)
+sa.event.listen(DruidColumn, "after_update", DruidDatasource.update_datasource)
diff --git a/superset/connectors/druid/views.py b/superset/connectors/druid/views.py
index 5454a41d34dc..eca14d481cf4 100644
--- a/superset/connectors/druid/views.py
+++ b/superset/connectors/druid/views.py
@@ -127,7 +127,7 @@ def pre_update(self, item: "DruidColumnInlineView") -> None:
             try:
                 dimension_spec = json.loads(item.dimension_spec_json)
             except ValueError as ex:
-                raise ValueError("Invalid Dimension Spec JSON: " + str(ex))
+                raise ValueError("Invalid Dimension Spec JSON: " + str(ex)) from ex
             if not isinstance(dimension_spec, dict):
                 raise ValueError("Dimension Spec must be a JSON object")
             if "outputName" not in dimension_spec:
diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
index 2f7b6d1498d1..c5c46628382e 100644
--- a/superset/connectors/sqla/models.py
+++ b/superset/connectors/sqla/models.py
@@ -19,10 +19,20 @@
 import logging
 import re
 from collections import defaultdict, OrderedDict
-from contextlib import closing
-from dataclasses import dataclass, field  # pylint: disable=wrong-import-order
+from dataclasses import dataclass, field
 from datetime import datetime, timedelta
-from typing import Any, Dict, Hashable, List, NamedTuple, Optional, Tuple, Type, Union
+from typing import (
+    Any,
+    cast,
+    Dict,
+    Hashable,
+    List,
+    NamedTuple,
+    Optional,
+    Tuple,
+    Type,
+    Union,
+)
 
 import pandas as pd
 import sqlalchemy as sa
@@ -46,24 +56,25 @@
     String,
     Table,
     Text,
+    update,
 )
+from sqlalchemy.engine.base import Connection
 from sqlalchemy.orm import backref, Query, relationship, RelationshipProperty, Session
+from sqlalchemy.orm.mapper import Mapper
 from sqlalchemy.schema import UniqueConstraint
 from sqlalchemy.sql import column, ColumnElement, literal_column, table, text
 from sqlalchemy.sql.elements import ColumnClause
 from sqlalchemy.sql.expression import Label, Select, TextAsFrom, TextClause
 from sqlalchemy.sql.selectable import Alias, TableClause
-from sqlalchemy.types import TypeEngine
 
 from superset import app, db, is_feature_enabled, security_manager
 from superset.connectors.base.models import BaseColumn, BaseDatasource, BaseMetric
-from superset.db_engine_specs.base import BaseEngineSpec, TimestampExpression
-from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
-from superset.exceptions import (
-    QueryObjectValidationError,
-    SupersetGenericDBErrorException,
-    SupersetSecurityException,
+from superset.connectors.sqla.utils import (
+    get_physical_table_metadata,
+    get_virtual_table_metadata,
 )
+from superset.db_engine_specs.base import BaseEngineSpec, TimestampExpression
+from superset.exceptions import QueryObjectValidationError
 from superset.jinja_context import (
     BaseTemplateProcessor,
     ExtraCache,
@@ -72,11 +83,14 @@
 from superset.models.annotations import Annotation
 from superset.models.core import Database
 from superset.models.helpers import AuditMixinNullable, QueryResult
-from superset.result_set import SupersetResultSet
 from superset.sql_parse import ParsedQuery
 from superset.typing import AdhocMetric, Metric, OrderBy, QueryObjectDict
 from superset.utils import core as utils
-from superset.utils.core import GenericDataType, remove_duplicates
+from superset.utils.core import (
+    GenericDataType,
+    QueryObjectFilterClause,
+    remove_duplicates,
+)
 
 config = app.config
 metadata = Model.metadata  # pylint: disable=no-member
@@ -241,7 +255,9 @@ def get_sqla_col(self, label: Optional[str] = None) -> Column:
         column_spec = db_engine_spec.get_column_spec(self.type)
         type_ = column_spec.sqla_type if column_spec else None
         if self.expression:
-            col = literal_column(self.expression, type_=type_)
+            tp = self.table.get_template_processor()
+            expression = tp.process_template(self.expression)
+            col = literal_column(expression, type_=type_)
         else:
             col = column(self.column_name, type_=type_)
         col = self.table.make_sqla_column_compatible(col, label)
@@ -291,13 +307,15 @@ def get_timestamp_expression(
 
         pdf = self.python_date_format
         is_epoch = pdf in ("epoch_s", "epoch_ms")
+        column_spec = self.db_engine_spec.get_column_spec(self.type)
+        type_ = column_spec.sqla_type if column_spec else DateTime
         if not self.expression and not time_grain and not is_epoch:
-            sqla_col = column(self.column_name, type_=DateTime)
+            sqla_col = column(self.column_name, type_=type_)
             return self.table.make_sqla_column_compatible(sqla_col, label)
         if self.expression:
-            col = literal_column(self.expression)
+            col = literal_column(self.expression, type_=type_)
         else:
-            col = column(self.column_name)
+            col = column(self.column_name, type_=type_)
         time_expr = self.db_engine_spec.get_timestamp_expr(
             col, pdf, time_grain, self.type
         )
@@ -386,14 +404,13 @@ class SqlMetric(Model, BaseMetric):
         "extra",
         "warning_text",
     ]
-    update_from_object_fields = list(
-        [s for s in export_fields if s not in ("table_id",)]
-    )
+    update_from_object_fields = list(s for s in export_fields if s != "table_id")
     export_parent = "table"
 
     def get_sqla_col(self, label: Optional[str] = None) -> Column:
         label = label or self.metric_name
-        sqla_col: ColumnClause = literal_column(self.expression)
+        tp = self.table.get_template_processor()
+        sqla_col: ColumnClause = literal_column(tp.process_template(self.expression))
         return self.table.make_sqla_column_compatible(sqla_col, label)
 
     @property
@@ -454,10 +471,9 @@ def data(self) -> Dict[str, Any]:
 )
 
 
-class SqlaTable(  # pylint: disable=too-many-public-methods,too-many-instance-attributes
+class SqlaTable(  # pylint: disable=too-many-instance-attributes,too-many-public-methods
     Model, BaseDatasource
 ):
-
     """An ORM object for SqlAlchemy table references"""
 
     type = "table"
@@ -470,12 +486,20 @@ class SqlaTable(  # pylint: disable=too-many-public-methods,too-many-instance-at
     owner_class = security_manager.user_model
 
     __tablename__ = "tables"
-    __table_args__ = (UniqueConstraint("database_id", "table_name"),)
+
+    # Note this uniqueness constraint is not part of the physical schema, i.e., it does
+    # not exist in the migrations, but is required by `import_from_dict` to ensure the
+    # correct filters are applied in order to identify uniqueness.
+    #
+    # The reason it does not physically exist is MySQL, PostgreSQL, etc. have a
+    # different interpretation of uniqueness when it comes to NULL which is problematic
+    # given the schema is optional.
+    __table_args__ = (UniqueConstraint("database_id", "schema", "table_name"),)
 
     table_name = Column(String(250), nullable=False)
     main_dttm_col = Column(String(250))
     database_id = Column(Integer, ForeignKey("dbs.id"), nullable=False)
-    fetch_values_predicate = Column(String(1000))
+    fetch_values_predicate = Column(Text)
     owners = relationship(owner_class, secondary=sqlatable_user, backref="tables")
     database: Database = relationship(
         "Database",
@@ -635,72 +659,11 @@ def sql_url(self) -> str:
         return self.database.sql_url + "?table_name=" + str(self.table_name)
 
     def external_metadata(self) -> List[Dict[str, str]]:
-        db_engine_spec = self.db_engine_spec
         if self.sql:
-            engine = self.database.get_sqla_engine(schema=self.schema)
-            sql = self.get_template_processor().process_template(
-                self.sql, **self.template_params_dict
-            )
-            parsed_query = ParsedQuery(sql)
-            if not db_engine_spec.is_readonly_query(parsed_query):
-                raise SupersetSecurityException(
-                    SupersetError(
-                        error_type=SupersetErrorType.DATASOURCE_SECURITY_ACCESS_ERROR,
-                        message=_("Only `SELECT` statements are allowed"),
-                        level=ErrorLevel.ERROR,
-                    )
-                )
-            statements = parsed_query.get_statements()
-            if len(statements) > 1:
-                raise SupersetSecurityException(
-                    SupersetError(
-                        error_type=SupersetErrorType.DATASOURCE_SECURITY_ACCESS_ERROR,
-                        message=_("Only single queries supported"),
-                        level=ErrorLevel.ERROR,
-                    )
-                )
-            # TODO(villebro): refactor to use same code that's used by
-            #  sql_lab.py:execute_sql_statements
-            try:
-                with closing(engine.raw_connection()) as conn:
-                    cursor = conn.cursor()
-                    query = self.database.apply_limit_to_sql(statements[0])
-                    db_engine_spec.execute(cursor, query)
-                    result = db_engine_spec.fetch_data(cursor, limit=1)
-                    result_set = SupersetResultSet(
-                        result, cursor.description, db_engine_spec
-                    )
-                    cols = result_set.columns
-            except Exception as exc:
-                raise SupersetGenericDBErrorException(message=str(exc))
-        else:
-            db_dialect = self.database.get_dialect()
-            cols = self.database.get_columns(
-                self.table_name, schema=self.schema or None
-            )
-            for col in cols:
-                try:
-                    if isinstance(col["type"], TypeEngine):
-                        db_type = db_engine_spec.column_datatype_to_string(
-                            col["type"], db_dialect
-                        )
-                        type_spec = db_engine_spec.get_column_spec(db_type)
-                        col.update(
-                            {
-                                "type": db_type,
-                                "type_generic": type_spec.generic_type
-                                if type_spec
-                                else None,
-                                "is_dttm": type_spec.is_dttm if type_spec else None,
-                            }
-                        )
-                # Broad exception catch, because there are multiple possible exceptions
-                # from different drivers that fall outside CompileError
-                except Exception:  # pylint: disable=broad-except
-                    col.update(
-                        {"type": "UNKNOWN", "generic_type": None, "is_dttm": None,}
-                    )
-        return cols
+            return get_virtual_table_metadata(dataset=self)
+        return get_physical_table_metadata(
+            database=self.database, table_name=self.table_name, schema_name=self.schema,
+        )
 
     @property
     def time_column_grains(self) -> Dict[str, Any]:
@@ -717,7 +680,7 @@ def select_star(self) -> Optional[str]:
             self.table_name, schema=self.schema, show_cols=False, latest_partition=False
         )
 
-    @property  # type: ignore
+    @property
     def health_check_message(self) -> Optional[str]:
         check = config["DATASET_HEALTH_CHECK"]
         return check(self) if check else None
@@ -755,7 +718,7 @@ def get_fetch_values_predicate(self) -> TextClause:
                     "Error in jinja expression in fetch values predicate: %(msg)s",
                     msg=ex.message,
                 )
-            )
+            ) from ex
 
     def values_for_column(self, column_name: str, limit: int = 10000) -> List[Any]:
         """Runs query against sqla to retrieve some
@@ -854,7 +817,7 @@ def get_rendered_sql(
                         "Error while rendering virtual dataset query: %(msg)s",
                         msg=ex.message,
                     )
-                )
+                ) from ex
         sql = sqlparse.format(sql.strip("\t\r\n; "), strip_comments=True)
         if not sql:
             raise QueryObjectValidationError(_("Virtual dataset query cannot be empty"))
@@ -866,7 +829,7 @@ def get_rendered_sql(
 
     def adhoc_metric_to_sqla(
         self, metric: AdhocMetric, columns_by_name: Dict[str, TableColumn]
-    ) -> Column:
+    ) -> ColumnElement:
         """
         Turn an adhoc metric into a sqlalchemy column.
 
@@ -879,7 +842,8 @@ def adhoc_metric_to_sqla(
         label = utils.get_metric_name(metric)
 
         if expression_type == utils.AdhocMetricExpressionType.SIMPLE:
-            column_name = metric["column"].get("column_name")
+            metric_column = metric.get("column") or {}
+            column_name = cast(str, metric_column.get("column_name"))
             table_column: Optional[TableColumn] = columns_by_name.get(column_name)
             if table_column:
                 sqla_column = table_column.get_sqla_col()
@@ -887,15 +851,17 @@ def adhoc_metric_to_sqla(
                 sqla_column = column(column_name)
             sqla_metric = self.sqla_aggregations[metric["aggregate"]](sqla_column)
         elif expression_type == utils.AdhocMetricExpressionType.SQL:
-            sqla_metric = literal_column(metric.get("sqlExpression"))
+            tp = self.get_template_processor()
+            expression = tp.process_template(cast(str, metric["sqlExpression"]))
+            sqla_metric = literal_column(expression)
         else:
             raise QueryObjectValidationError("Adhoc metric expressionType is invalid")
 
         return self.make_sqla_column_compatible(sqla_metric, label)
 
     def make_sqla_column_compatible(
-        self, sqla_col: Column, label: Optional[str] = None
-    ) -> Column:
+        self, sqla_col: ColumnElement, label: Optional[str] = None
+    ) -> ColumnElement:
         """Takes a sqlalchemy column object and adds label info if supported by engine.
         :param sqla_col: sqlalchemy column instance
         :param label: alias/label that column is expected to have
@@ -962,7 +928,7 @@ def _get_sqla_row_level_filters(
         except TemplateError as ex:
             raise QueryObjectValidationError(
                 _("Error in jinja expression in RLS filters: %(msg)s", msg=ex.message,)
-            )
+            ) from ex
 
     def get_sqla_query(  # pylint: disable=too-many-arguments,too-many-locals,too-many-branches,too-many-statements
         self,
@@ -973,7 +939,7 @@ def get_sqla_query(  # pylint: disable=too-many-arguments,too-many-locals,too-ma
         columns: Optional[List[str]] = None,
         groupby: Optional[List[str]] = None,
         filter: Optional[  # pylint: disable=redefined-builtin
-            List[Dict[str, Any]]
+            List[QueryObjectFilterClause]
         ] = None,
         is_timeseries: bool = True,
         timeseries_limit: int = 15,
@@ -1013,7 +979,7 @@ def get_sqla_query(  # pylint: disable=too-many-arguments,too-many-locals,too-ma
         metrics = metrics or []
 
         # For backward compatibility
-        if granularity not in self.dttm_cols:
+        if granularity not in self.dttm_cols and granularity is not None:
             granularity = self.main_dttm_col
 
         # Database spec supports join-free timeslot grouping
@@ -1054,14 +1020,16 @@ def get_sqla_query(  # pylint: disable=too-many-arguments,too-many-locals,too-ma
 
         # To ensure correct handling of the ORDER BY labeling we need to reference the
         # metric instance if defined in the SELECT clause.
-        metrics_exprs_by_label = {m.name: m for m in metrics_exprs}
+        # use the key of the ColumnClause for the expected label
+        metrics_exprs_by_label = {m.key: m for m in metrics_exprs}
         metrics_exprs_by_expr = {str(m): m for m in metrics_exprs}
 
         # Since orderby may use adhoc metrics, too; we need to process them first
         orderby_exprs: List[ColumnElement] = []
         for orig_col, ascending in orderby:
-            col: Union[Metric, ColumnElement] = orig_col
+            col: Union[AdhocMetric, ColumnElement] = orig_col
             if isinstance(col, dict):
+                col = cast(AdhocMetric, col)
                 if utils.is_adhoc_metric(col):
                     # add adhoc sort by column to columns_by_name if not exists
                     col = self.adhoc_metric_to_sqla(col, columns_by_name)
@@ -1092,19 +1060,20 @@ def get_sqla_query(  # pylint: disable=too-many-arguments,too-many-locals,too-ma
         # filter out the pseudo column  __timestamp from columns
         columns = columns or []
         columns = [col for col in columns if col != utils.DTTM_ALIAS]
+        time_grain = extras.get("time_grain_sqla")
+        dttm_col = columns_by_name.get(granularity) if granularity else None
 
         if need_groupby:
             # dedup columns while preserving order
             columns = groupby or columns
             for selected in columns:
                 # if groupby field/expr equals granularity field/expr
-                if selected == granularity:
-                    time_grain = extras.get("time_grain_sqla")
-                    sqla_col = columns_by_name[selected]
-                    outer = sqla_col.get_timestamp_expression(time_grain, selected)
+                table_col = columns_by_name.get(selected)
+                if table_col and table_col.type_generic == GenericDataType.TEMPORAL:
+                    outer = table_col.get_timestamp_expression(time_grain, selected)
                 # if groupby field equals a selected column
-                elif selected in columns_by_name:
-                    outer = columns_by_name[selected].get_sqla_col()
+                elif table_col:
+                    outer = table_col.get_sqla_col()
                 else:
                     outer = literal_column(f"({selected})")
                     outer = self.make_sqla_column_compatible(outer, selected)
@@ -1123,15 +1092,13 @@ def get_sqla_query(  # pylint: disable=too-many-arguments,too-many-locals,too-ma
         groupby_exprs_with_timestamp = OrderedDict(groupby_exprs_sans_timestamp.items())
 
         if granularity:
-            if granularity not in columns_by_name:
+            if granularity not in columns_by_name or not dttm_col:
                 raise QueryObjectValidationError(
                     _(
                         'Time column "%(col)s" does not exist in dataset',
                         col=granularity,
                     )
                 )
-            dttm_col = columns_by_name[granularity]
-            time_grain = extras.get("time_grain_sqla")
             time_filters = []
 
             if is_timeseries:
@@ -1181,12 +1148,17 @@ def get_sqla_query(  # pylint: disable=too-many-arguments,too-many-locals,too-ma
         having_clause_and = []
 
         for flt in filter:  # type: ignore
-            if not all([flt.get(s) for s in ["col", "op"]]):
+            if not all(flt.get(s) for s in ["col", "op"]):
                 continue
             col = flt["col"]
             val = flt.get("val")
             op = flt["op"].upper()
-            col_obj = columns_by_name.get(col)
+            col_obj = (
+                dttm_col
+                if col == utils.DTTM_ALIAS and is_timeseries and dttm_col
+                else columns_by_name.get(col)
+            )
+            filter_grain = flt.get("grain")
 
             if is_feature_enabled("ENABLE_TEMPLATE_REMOVE_FILTERS"):
                 if col in removed_filters:
@@ -1194,6 +1166,10 @@ def get_sqla_query(  # pylint: disable=too-many-arguments,too-many-locals,too-ma
                     continue
 
             if col_obj:
+                if filter_grain:
+                    sqla_col = col_obj.get_timestamp_expression(filter_grain)
+                else:
+                    sqla_col = col_obj.get_sqla_col()
                 col_spec = db_engine_spec.get_column_spec(col_obj.type)
                 is_list_target = op in (
                     utils.FilterOperator.IN.value,
@@ -1216,24 +1192,24 @@ def get_sqla_query(  # pylint: disable=too-many-arguments,too-many-locals,too-ma
                         )
                     if None in eq:
                         eq = [x for x in eq if x is not None]
-                        is_null_cond = col_obj.get_sqla_col().is_(None)
+                        is_null_cond = sqla_col.is_(None)
                         if eq:
-                            cond = or_(is_null_cond, col_obj.get_sqla_col().in_(eq))
+                            cond = or_(is_null_cond, sqla_col.in_(eq))
                         else:
                             cond = is_null_cond
                     else:
-                        cond = col_obj.get_sqla_col().in_(eq)
+                        cond = sqla_col.in_(eq)
                     if op == utils.FilterOperator.NOT_IN.value:
                         cond = ~cond
                     where_clause_and.append(cond)
                 elif op == utils.FilterOperator.IS_NULL.value:
-                    where_clause_and.append(col_obj.get_sqla_col().is_(None))
+                    where_clause_and.append(sqla_col.is_(None))
                 elif op == utils.FilterOperator.IS_NOT_NULL.value:
-                    where_clause_and.append(col_obj.get_sqla_col().isnot(None))
+                    where_clause_and.append(sqla_col.isnot(None))
                 elif op == utils.FilterOperator.IS_TRUE.value:
-                    where_clause_and.append(col_obj.get_sqla_col().is_(True))
+                    where_clause_and.append(sqla_col.is_(True))
                 elif op == utils.FilterOperator.IS_FALSE.value:
-                    where_clause_and.append(col_obj.get_sqla_col().is_(False))
+                    where_clause_and.append(sqla_col.is_(False))
                 else:
                     if eq is None:
                         raise QueryObjectValidationError(
@@ -1243,21 +1219,21 @@ def get_sqla_query(  # pylint: disable=too-many-arguments,too-many-locals,too-ma
                             )
                         )
                     if op == utils.FilterOperator.EQUALS.value:
-                        where_clause_and.append(col_obj.get_sqla_col() == eq)
+                        where_clause_and.append(sqla_col == eq)
                     elif op == utils.FilterOperator.NOT_EQUALS.value:
-                        where_clause_and.append(col_obj.get_sqla_col() != eq)
+                        where_clause_and.append(sqla_col != eq)
                     elif op == utils.FilterOperator.GREATER_THAN.value:
-                        where_clause_and.append(col_obj.get_sqla_col() > eq)
+                        where_clause_and.append(sqla_col > eq)
                     elif op == utils.FilterOperator.LESS_THAN.value:
-                        where_clause_and.append(col_obj.get_sqla_col() < eq)
+                        where_clause_and.append(sqla_col < eq)
                     elif op == utils.FilterOperator.GREATER_THAN_OR_EQUALS.value:
-                        where_clause_and.append(col_obj.get_sqla_col() >= eq)
+                        where_clause_and.append(sqla_col >= eq)
                     elif op == utils.FilterOperator.LESS_THAN_OR_EQUALS.value:
-                        where_clause_and.append(col_obj.get_sqla_col() <= eq)
+                        where_clause_and.append(sqla_col <= eq)
                     elif op == utils.FilterOperator.LIKE.value:
-                        where_clause_and.append(col_obj.get_sqla_col().like(eq))
+                        where_clause_and.append(sqla_col.like(eq))
                     elif op == utils.FilterOperator.ILIKE.value:
-                        where_clause_and.append(col_obj.get_sqla_col().ilike(eq))
+                        where_clause_and.append(sqla_col.ilike(eq))
                     else:
                         raise QueryObjectValidationError(
                             _("Invalid filter operation type: %(op)s", op=op)
@@ -1275,7 +1251,7 @@ def get_sqla_query(  # pylint: disable=too-many-arguments,too-many-locals,too-ma
                             "Error in jinja expression in WHERE clause: %(msg)s",
                             msg=ex.message,
                         )
-                    )
+                    ) from ex
                 where_clause_and += [sa.text("({})".format(where))]
             having = extras.get("having")
             if having:
@@ -1287,7 +1263,7 @@ def get_sqla_query(  # pylint: disable=too-many-arguments,too-many-locals,too-ma
                             "Error in jinja expression in HAVING clause: %(msg)s",
                             msg=ex.message,
                         )
-                    )
+                    ) from ex
                 having_clause_and += [sa.text("({})".format(having))]
         if apply_fetch_values_predicate and self.fetch_values_predicate:
             qry = qry.where(self.get_fetch_values_predicate())
@@ -1313,10 +1289,11 @@ def get_sqla_query(  # pylint: disable=too-many-arguments,too-many-locals,too-ma
             qry = qry.offset(row_offset)
 
         if (
-            is_timeseries  # pylint: disable=too-many-boolean-expressions
+            is_timeseries
             and timeseries_limit
             and not time_groupby_inline
             and groupby_exprs_sans_timestamp
+            and dttm_col
         ):
             if db_engine_spec.allows_joins:
                 # some sql dialects require for order by expressions
@@ -1648,10 +1625,68 @@ class and any keys added via `ExtraCache`.
             extra_cache_keys += sqla_query.extra_cache_keys
         return extra_cache_keys
 
+    @staticmethod
+    def before_update(
+        mapper: Mapper,  # pylint: disable=unused-argument
+        connection: Connection,  # pylint: disable=unused-argument
+        target: "SqlaTable",
+    ) -> None:
+        """
+        Check whether before update if the target table already exists.
+
+        Note this listener is called when any fields are being updated and thus it is
+        necessary to first check whether the reference table is being updated.
+
+        Note this logic is temporary, given uniqueness is handled via the dataset DAO,
+        but is necessary until both the legacy datasource editor and datasource/save
+        endpoints are deprecated.
+
+        :param mapper: The table mapper
+        :param connection: The DB-API connection
+        :param target: The mapped instance being persisted
+        :raises Exception: If the target table is not unique
+        """
+
+        # pylint: disable=import-outside-toplevel
+        from superset.datasets.commands.exceptions import get_dataset_exist_error_msg
+        from superset.datasets.dao import DatasetDAO
+
+        # Check whether the relevant attributes have changed.
+        state = db.inspect(target)  # pylint: disable=no-member
+
+        for attr in ["database_id", "schema", "table_name"]:
+            history = state.get_history(attr, True)
+
+            if history.has_changes():
+                break
+        else:
+            return None
+
+        if not DatasetDAO.validate_uniqueness(
+            target.database_id, target.schema, target.table_name
+        ):
+            raise Exception(get_dataset_exist_error_msg(target.full_name))
+
+    @staticmethod
+    def update_table(
+        _mapper: Mapper, _connection: Connection, obj: Union[SqlMetric, TableColumn]
+    ) -> None:
+        """
+        Forces an update to the table's changed_on value when a metric or column on the
+        table is updated. This busts the cache key for all charts that use the table.
+
+        :param _mapper: Unused.
+        :param _connection: Unused.
+        :param obj: The metric or column that was updated.
+        """
+        db.session.execute(update(SqlaTable).where(SqlaTable.id == obj.table.id))
+
 
 sa.event.listen(SqlaTable, "after_insert", security_manager.set_perm)
 sa.event.listen(SqlaTable, "after_update", security_manager.set_perm)
-
+sa.event.listen(SqlaTable, "before_update", SqlaTable.before_update)
+sa.event.listen(SqlMetric, "after_update", SqlaTable.update_table)
+sa.event.listen(TableColumn, "after_update", SqlaTable.update_table)
 
 RLSFilterRoles = Table(
     "rls_filter_roles",
diff --git a/superset/connectors/sqla/utils.py b/superset/connectors/sqla/utils.py
new file mode 100644
index 000000000000..a9b62030086a
--- /dev/null
+++ b/superset/connectors/sqla/utils.py
@@ -0,0 +1,115 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from contextlib import closing
+from typing import Dict, List, Optional, TYPE_CHECKING
+
+from flask_babel import lazy_gettext as _
+from sqlalchemy.exc import NoSuchTableError
+from sqlalchemy.sql.type_api import TypeEngine
+
+from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
+from superset.exceptions import (
+    SupersetGenericDBErrorException,
+    SupersetSecurityException,
+)
+from superset.models.core import Database
+from superset.result_set import SupersetResultSet
+from superset.sql_parse import ParsedQuery
+
+if TYPE_CHECKING:
+    from superset.connectors.sqla.models import SqlaTable
+
+
+def get_physical_table_metadata(
+    database: Database, table_name: str, schema_name: Optional[str] = None,
+) -> List[Dict[str, str]]:
+    """Use SQLAlchemy inspector to get table metadata"""
+    db_engine_spec = database.db_engine_spec
+    db_dialect = database.get_dialect()
+    # ensure empty schema
+    _schema_name = schema_name if schema_name else None
+    # Table does not exist or is not visible to a connection.
+    if not database.has_table_by_name(table_name, schema=_schema_name):
+        raise NoSuchTableError
+
+    cols = database.get_columns(table_name, schema=_schema_name)
+    for col in cols:
+        try:
+            if isinstance(col["type"], TypeEngine):
+                db_type = db_engine_spec.column_datatype_to_string(
+                    col["type"], db_dialect
+                )
+                type_spec = db_engine_spec.get_column_spec(db_type)
+                col.update(
+                    {
+                        "type": db_type,
+                        "type_generic": type_spec.generic_type if type_spec else None,
+                        "is_dttm": type_spec.is_dttm if type_spec else None,
+                    }
+                )
+        # Broad exception catch, because there are multiple possible exceptions
+        # from different drivers that fall outside CompileError
+        except Exception:  # pylint: disable=broad-except
+            col.update(
+                {"type": "UNKNOWN", "generic_type": None, "is_dttm": None,}
+            )
+    return cols
+
+
+def get_virtual_table_metadata(dataset: "SqlaTable") -> List[Dict[str, str]]:
+    """Use SQLparser to get virtual dataset metadata"""
+    if not dataset.sql:
+        raise SupersetGenericDBErrorException(
+            message=_("Virtual dataset query cannot be empty"),
+        )
+
+    db_engine_spec = dataset.database.db_engine_spec
+    engine = dataset.database.get_sqla_engine(schema=dataset.schema)
+    sql = dataset.get_template_processor().process_template(
+        dataset.sql, **dataset.template_params_dict
+    )
+    parsed_query = ParsedQuery(sql)
+    if not db_engine_spec.is_readonly_query(parsed_query):
+        raise SupersetSecurityException(
+            SupersetError(
+                error_type=SupersetErrorType.DATASOURCE_SECURITY_ACCESS_ERROR,
+                message=_("Only `SELECT` statements are allowed"),
+                level=ErrorLevel.ERROR,
+            )
+        )
+    statements = parsed_query.get_statements()
+    if len(statements) > 1:
+        raise SupersetSecurityException(
+            SupersetError(
+                error_type=SupersetErrorType.DATASOURCE_SECURITY_ACCESS_ERROR,
+                message=_("Only single queries supported"),
+                level=ErrorLevel.ERROR,
+            )
+        )
+    # TODO(villebro): refactor to use same code that's used by
+    #  sql_lab.py:execute_sql_statements
+    try:
+        with closing(engine.raw_connection()) as conn:
+            cursor = conn.cursor()
+            query = dataset.database.apply_limit_to_sql(statements[0])
+            db_engine_spec.execute(cursor, query)
+            result = db_engine_spec.fetch_data(cursor, limit=1)
+            result_set = SupersetResultSet(result, cursor.description, db_engine_spec)
+            cols = result_set.columns
+    except Exception as ex:
+        raise SupersetGenericDBErrorException(message=str(ex)) from ex
+    return cols
diff --git a/superset/connectors/sqla/views.py b/superset/connectors/sqla/views.py
index f7f6742ab53b..08abf54a25a9 100644
--- a/superset/connectors/sqla/views.py
+++ b/superset/connectors/sqla/views.py
@@ -53,9 +53,7 @@
 logger = logging.getLogger(__name__)
 
 
-class TableColumnInlineView(  # pylint: disable=too-many-ancestors
-    CompactCRUDMixin, SupersetModelView
-):
+class TableColumnInlineView(CompactCRUDMixin, SupersetModelView):
     datamodel = SQLAInterface(models.TableColumn)
     # TODO TODO, review need for this on related_views
     class_permission_name = "Dataset"
@@ -196,9 +194,7 @@ def pre_delete(self, item: "models.SqlMetric") -> None:
             check_ownership(item.table)
 
 
-class SqlMetricInlineView(  # pylint: disable=too-many-ancestors
-    CompactCRUDMixin, SupersetModelView
-):
+class SqlMetricInlineView(CompactCRUDMixin, SupersetModelView):
     datamodel = SQLAInterface(models.SqlMetric)
     class_permission_name = "Dataset"
     method_permission_name = MODEL_VIEW_RW_METHOD_PERMISSION_MAP
@@ -301,9 +297,7 @@ def __init__(self, **kwargs: Any):
         super().__init__(**kwargs)
 
 
-class RowLevelSecurityFiltersModelView(  # pylint: disable=too-many-ancestors
-    SupersetModelView, DeleteMixin
-):
+class RowLevelSecurityFiltersModelView(SupersetModelView, DeleteMixin):
     datamodel = SQLAInterface(models.RowLevelSecurityFilter)
 
     list_widget = cast(SupersetListWidget, RowLevelSecurityListWidget)
@@ -561,7 +555,7 @@ def edit(self, pk: str) -> FlaskResponse:
     @action(
         "refresh", __("Refresh Metadata"), __("Refresh column metadata"), "fa-refresh"
     )
-    def refresh(  # pylint: disable=no-self-use, too-many-branches
+    def refresh(  # pylint: disable=no-self-use,
         self, tables: Union["TableModelView", List["TableModelView"]]
     ) -> FlaskResponse:
         logger.warning(
diff --git a/superset/constants.py b/superset/constants.py
index a4f0ad133b39..b1e7bf46b90f 100644
--- a/superset/constants.py
+++ b/superset/constants.py
@@ -18,9 +18,15 @@
 # ATTENTION: If you change any constants, make sure to also change utils/common.js
 
 # string to use when None values *need* to be converted to/from strings
+from enum import Enum
+
 NULL_STRING = "<NULL>"
 
 
+# UUID for the examples database
+EXAMPLES_DB_UUID = "a2dc77af-e654-49bb-b321-40f6b559a1ee"
+
+
 class RouteMethod:  # pylint: disable=too-few-public-methods
     """
     Route methods are a FAB concept around ModelView and RestModelView
@@ -119,6 +125,7 @@ class RouteMethod:  # pylint: disable=too-few-public-methods
     "get_datasets": "read",
     "function_names": "read",
     "available": "read",
+    "get_data": "read",
 }
 
 EXTRA_FORM_DATA_APPEND_KEYS = {
@@ -150,3 +157,20 @@ class RouteMethod:  # pylint: disable=too-few-public-methods
     set(EXTRA_FORM_DATA_OVERRIDE_REGULAR_MAPPINGS.values())
     | EXTRA_FORM_DATA_OVERRIDE_EXTRA_KEYS
 )
+
+
+class PandasAxis(int, Enum):
+    ROW = 0
+    COLUMN = 1
+
+
+class PandasPostprocessingCompare(str, Enum):
+    ABS = "absolute"
+    PCT = "percentage"
+    RAT = "ratio"
+
+
+class CacheRegion(str, Enum):
+    DEFAULT = "default"
+    DATA = "data"
+    THUMBNAIL = "thumbnail"
diff --git a/superset/css_templates/commands/bulk_delete.py b/superset/css_templates/commands/bulk_delete.py
index 40b2e800cdc8..839dbd26aee5 100644
--- a/superset/css_templates/commands/bulk_delete.py
+++ b/superset/css_templates/commands/bulk_delete.py
@@ -44,7 +44,7 @@ def run(self) -> None:
             return None
         except DAODeleteFailedError as ex:
             logger.exception(ex.exception)
-            raise CssTemplateBulkDeleteFailedError()
+            raise CssTemplateBulkDeleteFailedError() from ex
 
     def validate(self) -> None:
         # Validate/populate model exists
diff --git a/superset/css_templates/dao.py b/superset/css_templates/dao.py
index 8f9d36be3df7..1862fb7aafd9 100644
--- a/superset/css_templates/dao.py
+++ b/superset/css_templates/dao.py
@@ -39,7 +39,7 @@ def bulk_delete(models: Optional[List[CssTemplate]], commit: bool = True) -> Non
             )
             if commit:
                 db.session.commit()
-        except SQLAlchemyError:
+        except SQLAlchemyError as ex:
             if commit:
                 db.session.rollback()
-            raise DAODeleteFailedError()
+            raise DAODeleteFailedError() from ex
diff --git a/superset/dao/base.py b/superset/dao/base.py
index 0cd0facf7e37..79ece40c9337 100644
--- a/superset/dao/base.py
+++ b/superset/dao/base.py
@@ -106,7 +106,7 @@ def create(cls, properties: Dict[str, Any], commit: bool = True) -> Model:
                 db.session.commit()
         except SQLAlchemyError as ex:  # pragma: no cover
             db.session.rollback()
-            raise DAOCreateFailedError(exception=ex)
+            raise DAOCreateFailedError(exception=ex) from ex
         return model
 
     @classmethod
@@ -125,7 +125,7 @@ def update(
                 db.session.commit()
         except SQLAlchemyError as ex:  # pragma: no cover
             db.session.rollback()
-            raise DAOUpdateFailedError(exception=ex)
+            raise DAOUpdateFailedError(exception=ex) from ex
         return model
 
     @classmethod
@@ -140,5 +140,5 @@ def delete(cls, model: Model, commit: bool = True) -> Model:
                 db.session.commit()
         except SQLAlchemyError as ex:  # pragma: no cover
             db.session.rollback()
-            raise DAODeleteFailedError(exception=ex)
+            raise DAODeleteFailedError(exception=ex) from ex
         return model
diff --git a/superset/dashboards/api.py b/superset/dashboards/api.py
index 632f7f2c6464..d248afd514f8 100644
--- a/superset/dashboards/api.py
+++ b/superset/dashboards/api.py
@@ -18,7 +18,7 @@
 import logging
 from datetime import datetime
 from io import BytesIO
-from typing import Any, Dict, Optional
+from typing import Any, Optional
 from zipfile import is_zipfile, ZipFile
 
 from flask import g, make_response, redirect, request, Response, send_file, url_for
@@ -222,7 +222,7 @@ def __repr__(self) -> str:
         )
 
     @etag_cache(
-        get_last_modified=lambda _self, id_or_slug: DashboardDAO.get_dashboard_changed_on(  # pylint: disable=line-too-long
+        get_last_modified=lambda _self, id_or_slug: DashboardDAO.get_dashboard_changed_on(  # pylint: disable=line-too-long,useless-suppression
             id_or_slug
         ),
         max_age=0,
@@ -237,7 +237,7 @@ def __repr__(self) -> str:
     @statsd_metrics
     @event_logger.log_this_with_context(
         action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.get",
-        log_to_statsd=False,
+        log_to_statsd=False,  # pylint: disable=arguments-renamed
     )
     def get(self, id_or_slug: str) -> Response:
         """Gets a dashboard
@@ -279,7 +279,7 @@ def get(self, id_or_slug: str) -> Response:
             return self.response_404()
 
     @etag_cache(
-        get_last_modified=lambda _self, id_or_slug: DashboardDAO.get_dashboard_and_datasets_changed_on(  # pylint: disable=line-too-long
+        get_last_modified=lambda _self, id_or_slug: DashboardDAO.get_dashboard_and_datasets_changed_on(  # pylint: disable=line-too-long,useless-suppression
             id_or_slug
         ),
         max_age=0,
@@ -340,7 +340,7 @@ def get_datasets(self, id_or_slug: str) -> Response:
             return self.response_404()
 
     @etag_cache(
-        get_last_modified=lambda _self, id_or_slug: DashboardDAO.get_dashboard_and_slices_changed_on(  # pylint: disable=line-too-long
+        get_last_modified=lambda _self, id_or_slug: DashboardDAO.get_dashboard_and_slices_changed_on(  # pylint: disable=line-too-long,useless-suppression
             id_or_slug
         ),
         max_age=0,
@@ -671,7 +671,7 @@ def bulk_delete(self, **kwargs: Any) -> Response:
     @event_logger.log_this_with_context(
         action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.export",
         log_to_statsd=False,
-    )
+    )  # pylint: disable=too-many-locals
     def export(self, **kwargs: Any) -> Response:
         """Export dashboards
         ---
@@ -706,6 +706,7 @@ def export(self, **kwargs: Any) -> Response:
         requested_ids = kwargs["rison"]
 
         if is_feature_enabled("VERSIONED_EXPORT"):
+            token = request.args.get("token")
             timestamp = datetime.now().strftime("%Y%m%dT%H%M%S")
             root = f"dashboard_export_{timestamp}"
             filename = f"{root}.zip"
@@ -722,12 +723,15 @@ def export(self, **kwargs: Any) -> Response:
                     return self.response_404()
             buf.seek(0)
 
-            return send_file(
+            response = send_file(
                 buf,
                 mimetype="application/zip",
                 as_attachment=True,
                 attachment_filename=filename,
             )
+            if token:
+                response.set_cookie(token, "done", max_age=600)
+            return response
 
         query = self.datamodel.session.query(Dashboard).filter(
             Dashboard.id.in_(requested_ids)
@@ -751,9 +755,7 @@ def export(self, **kwargs: Any) -> Response:
         action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.thumbnail",
         log_to_statsd=False,
     )
-    def thumbnail(
-        self, pk: int, digest: str, **kwargs: Dict[str, bool]
-    ) -> WerkzeugResponse:
+    def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
         """Get Dashboard thumbnail
         ---
         get:
@@ -818,10 +820,12 @@ def thumbnail(
         ).get_from_cache(cache=thumbnail_cache)
         # If the screenshot does not exist, request one from the workers
         if not screenshot:
+            self.incr_stats("async", self.thumbnail.__name__)
             cache_dashboard_thumbnail.delay(dashboard_url, dashboard.digest, force=True)
             return self.response(202, message="OK Async")
         # If digests
         if dashboard.digest != digest:
+            self.incr_stats("redirect", self.thumbnail.__name__)
             return redirect(
                 url_for(
                     f"{self.__class__.__name__}.thumbnail",
@@ -829,6 +833,7 @@ def thumbnail(
                     digest=dashboard.digest,
                 )
             )
+        self.incr_stats("from_cache", self.thumbnail.__name__)
         return Response(
             FileWrapper(screenshot), mimetype="image/png", direct_passthrough=True
         )
diff --git a/superset/dashboards/commands/bulk_delete.py b/superset/dashboards/commands/bulk_delete.py
index 27787cc61bf1..958dea27d391 100644
--- a/superset/dashboards/commands/bulk_delete.py
+++ b/superset/dashboards/commands/bulk_delete.py
@@ -50,7 +50,7 @@ def run(self) -> None:
             return None
         except DeleteFailedError as ex:
             logger.exception(ex.exception)
-            raise DashboardBulkDeleteFailedError()
+            raise DashboardBulkDeleteFailedError() from ex
 
     def validate(self) -> None:
         # Validate/populate model exists
@@ -68,5 +68,5 @@ def validate(self) -> None:
         for model in self._models:
             try:
                 check_ownership(model)
-            except SupersetSecurityException:
-                raise DashboardForbiddenError()
+            except SupersetSecurityException as ex:
+                raise DashboardForbiddenError() from ex
diff --git a/superset/dashboards/commands/create.py b/superset/dashboards/commands/create.py
index e351d675af4a..91f7e90bac56 100644
--- a/superset/dashboards/commands/create.py
+++ b/superset/dashboards/commands/create.py
@@ -21,8 +21,8 @@
 from flask_appbuilder.security.sqla.models import User
 from marshmallow import ValidationError
 
-from superset.commands.base import BaseCommand
-from superset.commands.utils import populate_owners, populate_roles
+from superset.commands.base import BaseCommand, CreateMixin
+from superset.commands.utils import populate_roles
 from superset.dao.exceptions import DAOCreateFailedError
 from superset.dashboards.commands.exceptions import (
     DashboardCreateFailedError,
@@ -34,7 +34,7 @@
 logger = logging.getLogger(__name__)
 
 
-class CreateDashboardCommand(BaseCommand):
+class CreateDashboardCommand(CreateMixin, BaseCommand):
     def __init__(self, user: User, data: Dict[str, Any]):
         self._actor = user
         self._properties = data.copy()
@@ -46,7 +46,7 @@ def run(self) -> Model:
             dashboard = DashboardDAO.update_charts_owners(dashboard, commit=True)
         except DAOCreateFailedError as ex:
             logger.exception(ex.exception)
-            raise DashboardCreateFailedError()
+            raise DashboardCreateFailedError() from ex
         return dashboard
 
     def validate(self) -> None:
@@ -60,7 +60,7 @@ def validate(self) -> None:
             exceptions.append(DashboardSlugExistsValidationError())
 
         try:
-            owners = populate_owners(self._actor, owner_ids)
+            owners = self.populate_owners(self._actor, owner_ids)
             self._properties["owners"] = owners
         except ValidationError as ex:
             exceptions.append(ex)
diff --git a/superset/dashboards/commands/delete.py b/superset/dashboards/commands/delete.py
index 795288a84376..67f683a1c154 100644
--- a/superset/dashboards/commands/delete.py
+++ b/superset/dashboards/commands/delete.py
@@ -50,7 +50,7 @@ def run(self) -> Model:
             dashboard = DashboardDAO.delete(self._model)
         except DAODeleteFailedError as ex:
             logger.exception(ex.exception)
-            raise DashboardDeleteFailedError()
+            raise DashboardDeleteFailedError() from ex
         return dashboard
 
     def validate(self) -> None:
@@ -68,5 +68,5 @@ def validate(self) -> None:
         # Check ownership
         try:
             check_ownership(self._model)
-        except SupersetSecurityException:
-            raise DashboardForbiddenError()
+        except SupersetSecurityException as ex:
+            raise DashboardForbiddenError() from ex
diff --git a/superset/dashboards/commands/export.py b/superset/dashboards/commands/export.py
index 09ddb758c5d3..a0467972d5fe 100644
--- a/superset/dashboards/commands/export.py
+++ b/superset/dashboards/commands/export.py
@@ -30,6 +30,8 @@
 from superset.dashboards.commands.importers.v1.utils import find_chart_uuids
 from superset.dashboards.dao import DashboardDAO
 from superset.commands.export import ExportModelsCommand
+from superset.datasets.commands.export import ExportDatasetsCommand
+from superset.datasets.dao import DatasetDAO
 from superset.models.dashboard import Dashboard
 from superset.models.slice import Slice
 from superset.utils.dict_import_export import EXPORT_VERSION
@@ -116,7 +118,7 @@ def _export(model: Dashboard) -> Iterator[Tuple[str, str]]:
             export_uuids=True,
         )
         # TODO (betodealmeida): move this logic to export_to_dict once this
-        # becomes the default export endpoint
+        #  becomes the default export endpoint
         for key, new_name in JSON_KEYS.items():
             value: Optional[str] = payload.pop(key, None)
             if value:
@@ -126,6 +128,18 @@ def _export(model: Dashboard) -> Iterator[Tuple[str, str]]:
                     logger.info("Unable to decode `%s` field: %s", key, value)
                     payload[new_name] = {}
 
+        # Extract all native filter datasets and replace native
+        # filter dataset references with uuid
+        for native_filter in payload.get("metadata", {}).get(
+            "native_filter_configuration", []
+        ):
+            for target in native_filter.get("targets", []):
+                dataset_id = target.pop("datasetId", None)
+                if dataset_id is not None:
+                    dataset = DatasetDAO.find_by_id(dataset_id)
+                    target["datasetUuid"] = str(dataset.uuid)
+                    yield from ExportDatasetsCommand([dataset_id]).run()
+
         # the mapping between dashboard -> charts is inferred from the position
         # attribute, so if it's not present we need to add a default config
         if not payload.get("position"):
diff --git a/superset/dashboards/commands/importers/dispatcher.py b/superset/dashboards/commands/importers/dispatcher.py
index 59ab20488350..dd0121f3e350 100644
--- a/superset/dashboards/commands/importers/dispatcher.py
+++ b/superset/dashboards/commands/importers/dispatcher.py
@@ -43,7 +43,6 @@ class ImportDashboardsCommand(BaseCommand):
     until it finds one that matches.
     """
 
-    # pylint: disable=unused-argument
     def __init__(self, contents: Dict[str, str], *args: Any, **kwargs: Any):
         self.contents = contents
         self.args = args
diff --git a/superset/dashboards/commands/importers/v0.py b/superset/dashboards/commands/importers/v0.py
index 3b164fe41ab2..f317d51086c9 100644
--- a/superset/dashboards/commands/importers/v0.py
+++ b/superset/dashboards/commands/importers/v0.py
@@ -82,8 +82,9 @@ def import_chart(
 
 
 def import_dashboard(
-    # pylint: disable=too-many-locals,too-many-branches,too-many-statements
+    # pylint: disable=too-many-locals,too-many-statements
     dashboard_to_import: Dashboard,
+    dataset_id_mapping: Optional[Dict[int, int]] = None,
     import_time: Optional[int] = None,
 ) -> int:
     """Imports the dashboard from the object to the database.
@@ -140,6 +141,20 @@ def alter_positions(
                     value["meta"]["chartId"] = old_to_new_slc_id_dict[old_slice_id]
         dashboard.position_json = json.dumps(position_data)
 
+    def alter_native_filters(dashboard: Dashboard) -> None:
+        json_metadata = json.loads(dashboard.json_metadata)
+        native_filter_configuration = json_metadata.get("native_filter_configuration")
+        if not native_filter_configuration:
+            return
+        for native_filter in native_filter_configuration:
+            for target in native_filter.get("targets", []):
+                old_dataset_id = target.get("datasetId")
+                if dataset_id_mapping and old_dataset_id is not None:
+                    target["datasetId"] = dataset_id_mapping.get(
+                        old_dataset_id, old_dataset_id,
+                    )
+        dashboard.json_metadata = json.dumps(json_metadata)
+
     logger.info("Started import of the dashboard: %s", dashboard_to_import.to_json())
     session = db.session
     logger.info("Dashboard has %d slices", len(dashboard_to_import.slices))
@@ -235,6 +250,8 @@ def alter_positions(
             timed_refresh_immune_slices=new_timed_refresh_immune_slices
         )
 
+    alter_native_filters(dashboard_to_import)
+
     new_slices = (
         session.query(Slice).filter(Slice.id.in_(old_to_new_slc_id_dict.values())).all()
     )
@@ -258,6 +275,7 @@ def decode_dashboards(  # pylint: disable=too-many-return-statements
     Function to be passed into json.loads obj_hook parameter
     Recreates the dashboard object from a json representation.
     """
+    # pylint: disable=import-outside-toplevel
     from superset.connectors.druid.models import (
         DruidCluster,
         DruidColumn,
@@ -301,11 +319,15 @@ def import_dashboards(
     data = json.loads(content, object_hook=decode_dashboards)
     if not data:
         raise DashboardImportException(_("No data in file"))
+    dataset_id_mapping: Dict[int, int] = {}
     for table in data["datasources"]:
-        import_dataset(table, database_id, import_time=import_time)
+        new_dataset_id = import_dataset(table, database_id, import_time=import_time)
+        params = json.loads(table.params)
+        dataset_id_mapping[params["remote_id"]] = new_dataset_id
+
     session.commit()
     for dashboard in data["dashboards"]:
-        import_dashboard(dashboard, import_time=import_time)
+        import_dashboard(dashboard, dataset_id_mapping, import_time=import_time)
     session.commit()
 
 
diff --git a/superset/dashboards/commands/importers/v1/__init__.py b/superset/dashboards/commands/importers/v1/__init__.py
index c698e89af66e..1720e01ab8bc 100644
--- a/superset/dashboards/commands/importers/v1/__init__.py
+++ b/superset/dashboards/commands/importers/v1/__init__.py
@@ -27,6 +27,7 @@
 from superset.dashboards.commands.exceptions import DashboardImportError
 from superset.dashboards.commands.importers.v1.utils import (
     find_chart_uuids,
+    find_native_filter_datasets,
     import_dashboard,
     update_id_refs,
 )
@@ -60,14 +61,17 @@ class ImportDashboardsCommand(ImportModelsCommand):
     def _import(
         session: Session, configs: Dict[str, Any], overwrite: bool = False
     ) -> None:
-        # discover charts associated with dashboards
+        # discover charts and datasets associated with dashboards
         chart_uuids: Set[str] = set()
+        dataset_uuids: Set[str] = set()
         for file_name, config in configs.items():
             if file_name.startswith("dashboards/"):
                 chart_uuids.update(find_chart_uuids(config["position"]))
+                dataset_uuids.update(
+                    find_native_filter_datasets(config.get("metadata", {}))
+                )
 
         # discover datasets associated with charts
-        dataset_uuids: Set[str] = set()
         for file_name, config in configs.items():
             if file_name.startswith("charts/") and config["uuid"] in chart_uuids:
                 dataset_uuids.add(config["dataset_uuid"])
@@ -96,7 +100,7 @@ def _import(
                 dataset = import_dataset(session, config, overwrite=False)
                 dataset_info[str(dataset.uuid)] = {
                     "datasource_id": dataset.id,
-                    "datasource_type": "view" if dataset.is_sqllab_view else "table",
+                    "datasource_type": dataset.datasource_type,
                     "datasource_name": dataset.table_name,
                 }
 
@@ -121,7 +125,7 @@ def _import(
         dashboard_chart_ids: List[Tuple[int, int]] = []
         for file_name, config in configs.items():
             if file_name.startswith("dashboards/"):
-                config = update_id_refs(config, chart_ids)
+                config = update_id_refs(config, chart_ids, dataset_info)
                 dashboard = import_dashboard(session, config, overwrite=overwrite)
                 for uuid in find_chart_uuids(config["position"]):
                     if uuid not in chart_ids:
@@ -135,5 +139,5 @@ def _import(
             {"dashboard_id": dashboard_id, "slice_id": chart_id}
             for (dashboard_id, chart_id) in dashboard_chart_ids
         ]
-        # pylint: disable=no-value-for-parameter (sqlalchemy/issues/4656)
+        # pylint: disable=no-value-for-parameter # sqlalchemy/issues/4656
         session.execute(dashboard_slices.insert(), values)
diff --git a/superset/dashboards/commands/importers/v1/utils.py b/superset/dashboards/commands/importers/v1/utils.py
index 7b2ad91fbf32..9a0a6b23eb96 100644
--- a/superset/dashboards/commands/importers/v1/utils.py
+++ b/superset/dashboards/commands/importers/v1/utils.py
@@ -33,6 +33,17 @@ def find_chart_uuids(position: Dict[str, Any]) -> Set[str]:
     return set(build_uuid_to_id_map(position))
 
 
+def find_native_filter_datasets(metadata: Dict[str, Any]) -> Set[str]:
+    uuids: Set[str] = set()
+    for native_filter in metadata.get("native_filter_configuration", []):
+        targets = native_filter.get("targets", [])
+        for target in targets:
+            dataset_uuid = target.get("datasetUuid")
+            if dataset_uuid:
+                uuids.add(dataset_uuid)
+    return uuids
+
+
 def build_uuid_to_id_map(position: Dict[str, Any]) -> Dict[str, int]:
     return {
         child["meta"]["uuid"]: child["meta"]["chartId"]
@@ -45,7 +56,11 @@ def build_uuid_to_id_map(position: Dict[str, Any]) -> Dict[str, int]:
     }
 
 
-def update_id_refs(config: Dict[str, Any], chart_ids: Dict[str, int]) -> Dict[str, Any]:
+def update_id_refs(  # pylint: disable=too-many-locals
+    config: Dict[str, Any],
+    chart_ids: Dict[str, int],
+    dataset_info: Dict[str, Dict[str, Any]],
+) -> Dict[str, Any]:
     """Update dashboard metadata to use new IDs"""
     fixed = config.copy()
 
@@ -103,6 +118,17 @@ def update_id_refs(config: Dict[str, Any], chart_ids: Dict[str, int]) -> Dict[st
         ):
             child["meta"]["chartId"] = chart_ids[child["meta"]["uuid"]]
 
+    # fix native filter references
+    native_filter_configuration = fixed.get("metadata", {}).get(
+        "native_filter_configuration", []
+    )
+    for native_filter in native_filter_configuration:
+        targets = native_filter.get("targets", [])
+        for target in targets:
+            dataset_uuid = target.pop("datasetUuid", None)
+            if dataset_uuid:
+                target["datasetId"] = dataset_info[dataset_uuid]["datasource_id"]
+
     return fixed
 
 
diff --git a/superset/dashboards/commands/update.py b/superset/dashboards/commands/update.py
index 9c885c635abb..c22f4a35fbd2 100644
--- a/superset/dashboards/commands/update.py
+++ b/superset/dashboards/commands/update.py
@@ -21,8 +21,8 @@
 from flask_appbuilder.security.sqla.models import User
 from marshmallow import ValidationError
 
-from superset.commands.base import BaseCommand
-from superset.commands.utils import populate_owners, populate_roles
+from superset.commands.base import BaseCommand, UpdateMixin
+from superset.commands.utils import populate_roles
 from superset.dao.exceptions import DAOUpdateFailedError
 from superset.dashboards.commands.exceptions import (
     DashboardForbiddenError,
@@ -39,7 +39,7 @@
 logger = logging.getLogger(__name__)
 
 
-class UpdateDashboardCommand(BaseCommand):
+class UpdateDashboardCommand(UpdateMixin, BaseCommand):
     def __init__(self, user: User, model_id: int, data: Dict[str, Any]):
         self._actor = user
         self._model_id = model_id
@@ -53,7 +53,7 @@ def run(self) -> Model:
             dashboard = DashboardDAO.update_charts_owners(dashboard, commit=True)
         except DAOUpdateFailedError as ex:
             logger.exception(ex.exception)
-            raise DashboardUpdateFailedError()
+            raise DashboardUpdateFailedError() from ex
         return dashboard
 
     def validate(self) -> None:
@@ -69,8 +69,8 @@ def validate(self) -> None:
         # Check ownership
         try:
             check_ownership(self._model)
-        except SupersetSecurityException:
-            raise DashboardForbiddenError()
+        except SupersetSecurityException as ex:
+            raise DashboardForbiddenError() from ex
 
         # Validate slug uniqueness
         if not DashboardDAO.validate_update_slug_uniqueness(self._model_id, slug):
@@ -80,7 +80,7 @@ def validate(self) -> None:
         if owners_ids is None:
             owners_ids = [owner.id for owner in self._model.owners]
         try:
-            owners = populate_owners(self._actor, owners_ids)
+            owners = self.populate_owners(self._actor, owners_ids)
             self._properties["owners"] = owners
         except ValidationError as ex:
             exceptions.append(ex)
diff --git a/superset/dashboards/schemas.py b/superset/dashboards/schemas.py
index 629337322e59..9c48d472557e 100644
--- a/superset/dashboards/schemas.py
+++ b/superset/dashboards/schemas.py
@@ -89,8 +89,8 @@
 def validate_json(value: Union[bytes, bytearray, str]) -> None:
     try:
         utils.validate_json(value)
-    except SupersetException:
-        raise ValidationError("JSON not valid")
+    except SupersetException as ex:
+        raise ValidationError("JSON not valid") from ex
 
 
 def validate_json_metadata(value: Union[bytes, bytearray, str]) -> None:
@@ -98,8 +98,8 @@ def validate_json_metadata(value: Union[bytes, bytearray, str]) -> None:
         return
     try:
         value_obj = json.loads(value)
-    except json.decoder.JSONDecodeError:
-        raise ValidationError("JSON not valid")
+    except json.decoder.JSONDecodeError as ex:
+        raise ValidationError("JSON not valid") from ex
     errors = DashboardJSONMetadataSchema().validate(value_obj, partial=False)
     if errors:
         raise ValidationError(errors)
@@ -158,7 +158,7 @@ class DashboardGetResponseSchema(Schema):
     charts = fields.List(fields.String(description=charts_description))
     owners = fields.List(fields.Nested(UserSchema))
     roles = fields.List(fields.Nested(RolesSchema))
-    table_names = fields.String()  # legacy nonsense
+    changed_on_humanized = fields.String(data_key="changed_on_delta_humanized")
 
 
 class DatabaseSchema(Schema):
@@ -199,6 +199,7 @@ class DashboardDatasetSchema(Schema):
     template_params = fields.Str()
     owners = fields.List(fields.Int())
     columns = fields.List(fields.Dict())
+    column_types = fields.List(fields.Int())
     metrics = fields.List(fields.Dict())
     order_by_choices = fields.List(fields.List(fields.Str()))
     verbose_map = fields.Dict(fields.Str(), fields.Str())
@@ -216,8 +217,6 @@ def post_load(self, data: Dict[str, Any], **kwargs: Any) -> Dict[str, Any]:
             data["slug"] = re.sub(r"[^\w\-]+", "", data["slug"])
         return data
 
-    # pylint: disable=no-self-use,unused-argument
-
 
 class DashboardPostSchema(BaseDashboardSchema):
     dashboard_title = fields.String(
diff --git a/superset/databases/api.py b/superset/databases/api.py
index d64238baf4a3..712540c2e29f 100644
--- a/superset/databases/api.py
+++ b/superset/databases/api.py
@@ -41,6 +41,7 @@
     DatabaseInvalidError,
     DatabaseNotFoundError,
     DatabaseUpdateFailedError,
+    InvalidParametersError,
 )
 from superset.databases.commands.export import ExportDatabasesCommand
 from superset.databases.commands.importers.dispatcher import ImportDatabasesCommand
@@ -65,7 +66,8 @@
 )
 from superset.databases.utils import get_table_metadata
 from superset.db_engine_specs import get_available_engine_specs
-from superset.exceptions import InvalidPayloadFormatError, InvalidPayloadSchemaError
+from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
+from superset.exceptions import InvalidPayloadFormatError
 from superset.extensions import security_manager
 from superset.models.core import Database
 from superset.typing import FlaskResponse
@@ -134,6 +136,7 @@ class DatabaseRestApi(BaseSupersetModelRestApi):
         "database_name",
         "explore_database_id",
         "expose_in_sqllab",
+        "extra",
         "force_ctas_schema",
         "id",
     ]
@@ -244,6 +247,12 @@ def post(self) -> Response:
             new_model = CreateDatabaseCommand(g.user, item).run()
             # Return censored version for sqlalchemy URI
             item["sqlalchemy_uri"] = new_model.sqlalchemy_uri
+            item["expose_in_sqllab"] = new_model.expose_in_sqllab
+
+            # If parameters are available return them in the payload
+            if new_model.parameters:
+                item["parameters"] = new_model.parameters
+
             return self.response(201, id=new_model.id, result=item)
         except DatabaseInvalidError as ex:
             return self.response_422(message=ex.normalized_messages())
@@ -266,9 +275,7 @@ def post(self) -> Response:
         action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.put",
         log_to_statsd=False,
     )
-    def put(  # pylint: disable=too-many-return-statements, arguments-differ
-        self, pk: int
-    ) -> Response:
+    def put(self, pk: int) -> Response:
         """Changes a Database
         ---
         put:
@@ -346,7 +353,7 @@ def put(  # pylint: disable=too-many-return-statements, arguments-differ
         action=lambda self, *args, **kwargs: f"{self.__class__.__name__}" f".delete",
         log_to_statsd=False,
     )
-    def delete(self, pk: int) -> Response:  # pylint: disable=arguments-differ
+    def delete(self, pk: int) -> Response:
         """Deletes a Database
         ---
         delete:
@@ -582,9 +589,7 @@ def select_star(
         f".test_connection",
         log_to_statsd=False,
     )
-    def test_connection(  # pylint: disable=too-many-return-statements
-        self,
-    ) -> FlaskResponse:
+    def test_connection(self) -> FlaskResponse:
         """Tests a database connection
         ---
         post:
@@ -722,6 +727,7 @@ def export(self, **kwargs: Any) -> Response:
             500:
               $ref: '#/components/responses/500'
         """
+        token = request.args.get("token")
         requested_ids = kwargs["rison"]
         timestamp = datetime.now().strftime("%Y%m%dT%H%M%S")
         root = f"database_export_{timestamp}"
@@ -739,12 +745,15 @@ def export(self, **kwargs: Any) -> Response:
                 return self.response_404()
         buf.seek(0)
 
-        return send_file(
+        response = send_file(
             buf,
             mimetype="application/zip",
             as_attachment=True,
             attachment_filename=filename,
         )
+        if token:
+            response.set_cookie(token, "done", max_age=600)
+        return response
 
     @expose("/import/", methods=["POST"])
     @protect()
@@ -908,6 +917,9 @@ def available(self) -> Response:
         preferred_databases: List[str] = app.config.get("PREFERRED_DATABASES", [])
         available_databases = []
         for engine_spec, drivers in get_available_engine_specs().items():
+            if not drivers:
+                continue
+
             payload: Dict[str, Any] = {
                 "name": engine_spec.engine_name,
                 "engine": engine_spec.engine,
@@ -961,9 +973,7 @@ def available(self) -> Response:
         f".validate_parameters",
         log_to_statsd=False,
     )
-    def validate_parameters(  # pylint: disable=too-many-return-statements
-        self,
-    ) -> FlaskResponse:
+    def validate_parameters(self) -> FlaskResponse:
         """validates database connection parameters
         ---
         post:
@@ -998,8 +1008,17 @@ def validate_parameters(  # pylint: disable=too-many-return-statements
 
         try:
             payload = DatabaseValidateParametersSchema().load(request.json)
-        except ValidationError as error:
-            raise InvalidPayloadSchemaError(error)
+        except ValidationError as ex:
+            errors = [
+                SupersetError(
+                    message="\n".join(messages),
+                    error_type=SupersetErrorType.INVALID_PAYLOAD_SCHEMA_ERROR,
+                    level=ErrorLevel.ERROR,
+                    extra={"invalid": [attribute]},
+                )
+                for attribute, messages in ex.messages.items()
+            ]
+            raise InvalidParametersError(errors) from ex
 
         command = ValidateDatabaseParametersCommand(g.user, payload)
         command.run()
diff --git a/superset/databases/commands/create.py b/superset/databases/commands/create.py
index ec3d3458b9c5..6024b64469ae 100644
--- a/superset/databases/commands/create.py
+++ b/superset/databases/commands/create.py
@@ -44,20 +44,21 @@ def __init__(self, user: User, data: Dict[str, Any]):
 
     def run(self) -> Model:
         self.validate()
+
+        try:
+            # Test connection before starting create transaction
+            TestConnectionDatabaseCommand(self._actor, self._properties).run()
+        except Exception as ex:
+            event_logger.log_with_context(
+                action=f"db_creation_failed.{ex.__class__.__name__}",
+                engine=self._properties.get("sqlalchemy_uri", "").split(":")[0],
+            )
+            raise DatabaseConnectionFailedError() from ex
+
         try:
             database = DatabaseDAO.create(self._properties, commit=False)
             database.set_sqlalchemy_uri(database.sqlalchemy_uri)
 
-            try:
-                TestConnectionDatabaseCommand(self._actor, self._properties).run()
-            except Exception as ex:  # pylint: disable=broad-except
-                db.session.rollback()
-                event_logger.log_with_context(
-                    action=f"db_creation_failed.{ex.__class__.__name__}",
-                    engine=database.db_engine_spec.__name__,
-                )
-                raise DatabaseConnectionFailedError()
-
             # adding a new database we always want to force refresh schema list
             schemas = database.get_all_schema_names(cache=False)
             for schema in schemas:
@@ -67,11 +68,12 @@ def run(self) -> Model:
             security_manager.add_permission_view_menu("database_access", database.perm)
             db.session.commit()
         except DAOCreateFailedError as ex:
+            db.session.rollback()
             event_logger.log_with_context(
                 action=f"db_creation_failed.{ex.__class__.__name__}",
                 engine=database.db_engine_spec.__name__,
             )
-            raise DatabaseCreateFailedError()
+            raise DatabaseCreateFailedError() from ex
         return database
 
     def validate(self) -> None:
diff --git a/superset/databases/commands/delete.py b/superset/databases/commands/delete.py
index 5f002dbfb36d..61bd7ad0a575 100644
--- a/superset/databases/commands/delete.py
+++ b/superset/databases/commands/delete.py
@@ -48,7 +48,7 @@ def run(self) -> Model:
             database = DatabaseDAO.delete(self._model)
         except DAODeleteFailedError as ex:
             logger.exception(ex.exception)
-            raise DatabaseDeleteFailedError()
+            raise DatabaseDeleteFailedError() from ex
         return database
 
     def validate(self) -> None:
diff --git a/superset/databases/commands/exceptions.py b/superset/databases/commands/exceptions.py
index c7df6bc3f1b9..9cd8b3306f62 100644
--- a/superset/databases/commands/exceptions.py
+++ b/superset/databases/commands/exceptions.py
@@ -39,7 +39,7 @@ class DatabaseExistsValidationError(ValidationError):
 
     def __init__(self) -> None:
         super().__init__(
-            _("A database with the same name already exists"),
+            _("A database with the same name already exists."),
             field_name="database_name",
         )
 
@@ -106,7 +106,7 @@ class DatabaseConnectionFailedError(  # pylint: disable=too-many-ancestors
 
 
 class DatabaseDeleteDatasetsExistFailedError(DeleteFailedError):
-    message = _("Cannot delete a database that has tables attached")
+    message = _("Cannot delete a database that has datasets attached")
 
 
 class DatabaseDeleteFailedError(DeleteFailedError):
diff --git a/superset/databases/commands/export.py b/superset/databases/commands/export.py
index f373ce101a4d..786eb56a0ca1 100644
--- a/superset/databases/commands/export.py
+++ b/superset/databases/commands/export.py
@@ -18,7 +18,7 @@
 
 import json
 import logging
-from typing import Iterator, Tuple
+from typing import Any, Dict, Iterator, Tuple
 
 import yaml
 from werkzeug.utils import secure_filename
@@ -32,6 +32,23 @@
 logger = logging.getLogger(__name__)
 
 
+def parse_extra(extra_payload: str) -> Dict[str, Any]:
+    try:
+        extra = json.loads(extra_payload)
+    except json.decoder.JSONDecodeError:
+        logger.info("Unable to decode `extra` field: %s", extra_payload)
+        return {}
+
+    # Fix for DBs saved with an invalid ``schemas_allowed_for_csv_upload``
+    schemas_allowed_for_csv_upload = extra.get("schemas_allowed_for_csv_upload")
+    if isinstance(schemas_allowed_for_csv_upload, str):
+        extra["schemas_allowed_for_csv_upload"] = json.loads(
+            schemas_allowed_for_csv_upload
+        )
+
+    return extra
+
+
 class ExportDatabasesCommand(ExportModelsCommand):
 
     dao = DatabaseDAO
@@ -51,10 +68,7 @@ def _export(model: Database) -> Iterator[Tuple[str, str]]:
         # TODO (betodealmeida): move this logic to export_to_dict once this
         # becomes the default export endpoint
         if payload.get("extra"):
-            try:
-                payload["extra"] = json.loads(payload["extra"])
-            except json.decoder.JSONDecodeError:
-                logger.info("Unable to decode `extra` field: %s", payload["extra"])
+            payload["extra"] = parse_extra(payload["extra"])
 
         payload["version"] = EXPORT_VERSION
 
diff --git a/superset/databases/commands/importers/dispatcher.py b/superset/databases/commands/importers/dispatcher.py
index 0f9cd1ac5880..88d38bf13b85 100644
--- a/superset/databases/commands/importers/dispatcher.py
+++ b/superset/databases/commands/importers/dispatcher.py
@@ -38,7 +38,6 @@ class ImportDatabasesCommand(BaseCommand):
     until it finds one that matches.
     """
 
-    # pylint: disable=unused-argument
     def __init__(self, contents: Dict[str, str], *args: Any, **kwargs: Any):
         self.contents = contents
         self.args = args
diff --git a/superset/databases/commands/test_connection.py b/superset/databases/commands/test_connection.py
index 3b3a8e41f670..7b2f4da687c6 100644
--- a/superset/databases/commands/test_connection.py
+++ b/superset/databases/commands/test_connection.py
@@ -95,7 +95,7 @@ def run(self) -> None:
                 message=_("Could not load database driver: {}").format(
                     database.db_engine_spec.__name__
                 ),
-            )
+            ) from ex
         except DBAPIError as ex:
             event_logger.log_with_context(
                 action=f"test_connection_error.{ex.__class__.__name__}",
@@ -103,20 +103,20 @@ def run(self) -> None:
             )
             # check for custom errors (wrong username, wrong password, etc)
             errors = database.db_engine_spec.extract_errors(ex, context)
-            raise DatabaseTestConnectionFailedError(errors)
+            raise DatabaseTestConnectionFailedError(errors) from ex
         except SupersetSecurityException as ex:
             event_logger.log_with_context(
                 action=f"test_connection_error.{ex.__class__.__name__}",
                 engine=database.db_engine_spec.__name__,
             )
-            raise DatabaseSecurityUnsafeError(message=str(ex))
-        except Exception as ex:  # pylint: disable=broad-except
+            raise DatabaseSecurityUnsafeError(message=str(ex)) from ex
+        except Exception as ex:
             event_logger.log_with_context(
                 action=f"test_connection_error.{ex.__class__.__name__}",
                 engine=database.db_engine_spec.__name__,
             )
             errors = database.db_engine_spec.extract_errors(ex, context)
-            raise DatabaseTestConnectionUnexpectedError(errors)
+            raise DatabaseTestConnectionUnexpectedError(errors) from ex
 
     def validate(self) -> None:
         database_name = self._properties.get("database_name")
diff --git a/superset/databases/commands/update.py b/superset/databases/commands/update.py
index 7c48e743aedb..db1741c32bb5 100644
--- a/superset/databases/commands/update.py
+++ b/superset/databases/commands/update.py
@@ -56,7 +56,7 @@ def run(self) -> Model:
                 schemas = database.get_all_schema_names()
             except Exception as ex:
                 db.session.rollback()
-                raise DatabaseConnectionFailedError()
+                raise DatabaseConnectionFailedError() from ex
             for schema in schemas:
                 security_manager.add_permission_view_menu(
                     "schema_access", security_manager.get_schema_perm(database, schema)
@@ -65,7 +65,7 @@ def run(self) -> Model:
 
         except DAOUpdateFailedError as ex:
             logger.exception(ex.exception)
-            raise DatabaseUpdateFailedError()
+            raise DatabaseUpdateFailedError() from ex
         return database
 
     def validate(self) -> None:
diff --git a/superset/databases/commands/validate.py b/superset/databases/commands/validate.py
index 2f084f632408..27633d2c15c5 100644
--- a/superset/databases/commands/validate.py
+++ b/superset/databases/commands/validate.py
@@ -35,6 +35,8 @@
 from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
 from superset.models.core import Database
 
+BYPASS_VALIDATION_ENGINES = {"bigquery"}
+
 
 class ValidateDatabaseParametersCommand(BaseCommand):
     def __init__(self, user: User, parameters: Dict[str, Any]):
@@ -45,6 +47,11 @@ def __init__(self, user: User, parameters: Dict[str, Any]):
     def run(self) -> None:
         engine = self._properties["engine"]
         engine_specs = get_engine_specs()
+
+        if engine in BYPASS_VALIDATION_ENGINES:
+            # Skip engines that are only validated onCreate
+            return
+
         if engine not in engine_specs:
             raise InvalidEngineError(
                 SupersetError(
@@ -57,7 +64,7 @@ def run(self) -> None:
                 ),
             )
         engine_spec = engine_specs[engine]
-        if not issubclass(engine_spec, BasicParametersMixin):
+        if not hasattr(engine_spec, "parameters_schema"):
             raise InvalidEngineError(
                 SupersetError(
                     message=__(
@@ -78,8 +85,8 @@ def run(self) -> None:
             )
 
         # perform initial validation
-        errors = engine_spec.validate_parameters(
-            self._properties.get("parameters", None)
+        errors = engine_spec.validate_parameters(  # type: ignore
+            self._properties.get("parameters", {})
         )
         if errors:
             raise InvalidParametersError(errors)
@@ -91,9 +98,8 @@ def run(self) -> None:
             encrypted_extra = {}
 
         # try to connect
-        sqlalchemy_uri = engine_spec.build_sqlalchemy_uri(
-            self._properties.get("parameters", None),  # type: ignore
-            encrypted_extra,
+        sqlalchemy_uri = engine_spec.build_sqlalchemy_uri(  # type: ignore
+            self._properties.get("parameters"), encrypted_extra,
         )
         if self._model and sqlalchemy_uri == self._model.safe_sqlalchemy_uri():
             sqlalchemy_uri = self._model.sqlalchemy_uri_decrypted
@@ -110,7 +116,7 @@ def run(self) -> None:
         try:
             with closing(engine.raw_connection()) as conn:
                 alive = engine.dialect.do_ping(conn)
-        except Exception as ex:  # pylint: disable=broad-except
+        except Exception as ex:
             url = make_url(sqlalchemy_uri)
             context = {
                 "hostname": url.host,
@@ -120,7 +126,7 @@ def run(self) -> None:
                 "database": url.database,
             }
             errors = database.db_engine_spec.extract_errors(ex, context)
-            raise DatabaseTestConnectionFailedError(errors)
+            raise DatabaseTestConnectionFailedError(errors) from ex
 
         if not alive:
             raise DatabaseOfflineError(
diff --git a/superset/databases/schemas.py b/superset/databases/schemas.py
index 1df799c5fda0..43ef975d4209 100644
--- a/superset/databases/schemas.py
+++ b/superset/databases/schemas.py
@@ -16,7 +16,7 @@
 # under the License.
 import inspect
 import json
-from typing import Any, Dict
+from typing import Any, Dict, Optional, Type
 
 from flask import current_app
 from flask_babel import lazy_gettext as _
@@ -27,7 +27,7 @@
 from sqlalchemy.engine.url import make_url
 from sqlalchemy.exc import ArgumentError
 
-from superset.db_engine_specs import get_engine_specs
+from superset.db_engine_specs import BaseEngineSpec, get_engine_specs
 from superset.exceptions import CertificateException, SupersetSecurityException
 from superset.models.core import ConfigurationMethod, PASSWORD_MASK
 from superset.security.analytics_db_safety import check_sqlalchemy_uri
@@ -142,7 +142,7 @@ def sqlalchemy_uri_validator(value: str) -> str:
     """
     try:
         uri = make_url(value.strip())
-    except (ArgumentError, AttributeError, ValueError):
+    except (ArgumentError, AttributeError, ValueError) as ex:
         raise ValidationError(
             [
                 _(
@@ -150,12 +150,12 @@ def sqlalchemy_uri_validator(value: str) -> str:
                     "driver://user:password@database-host/database-name"
                 )
             ]
-        )
+        ) from ex
     if current_app.config.get("PREVENT_UNSAFE_DB_CONNECTIONS", True):
         try:
             check_sqlalchemy_uri(uri)
         except SupersetSecurityException as ex:
-            raise ValidationError([str(ex)])
+            raise ValidationError([str(ex)]) from ex
     return value
 
 
@@ -166,8 +166,8 @@ def server_cert_validator(value: str) -> str:
     if value:
         try:
             parse_ssl_cert(value)
-        except CertificateException:
-            raise ValidationError([_("Invalid certificate")])
+        except CertificateException as ex:
+            raise ValidationError([_("Invalid certificate")]) from ex
     return value
 
 
@@ -181,7 +181,7 @@ def encrypted_extra_validator(value: str) -> str:
         except json.JSONDecodeError as ex:
             raise ValidationError(
                 [_("Field cannot be decoded by JSON. %(msg)s", msg=str(ex))]
-            )
+            ) from ex
     return value
 
 
@@ -196,7 +196,7 @@ def extra_validator(value: str) -> str:
         except json.JSONDecodeError as ex:
             raise ValidationError(
                 [_("Field cannot be decoded by JSON. %(msg)s", msg=str(ex))]
-            )
+            ) from ex
         else:
             metadata_signature = inspect.signature(MetaData)
             for key in extra_.get("metadata_params", {}):
@@ -214,7 +214,7 @@ def extra_validator(value: str) -> str:
     return value
 
 
-class DatabaseParametersSchemaMixin:
+class DatabaseParametersSchemaMixin:  # pylint: disable=too-few-public-methods
     """
     Allow SQLAlchemy URI to be passed as separate parameters.
 
@@ -253,28 +253,16 @@ def build_sqlalchemy_uri(
         the constructed SQLAlchemy URI to be passed.
         """
         parameters = data.pop("parameters", {})
-
-        # TODO (betodealmeida): remove second expression after making sure
-        # frontend is not passing engine inside parameters
-        engine = data.pop("engine", None) or parameters.pop("engine", None)
+        # TODO(AAfghahi) standardize engine.
+        engine = (
+            data.pop("engine", None)
+            or parameters.pop("engine", None)
+            or data.pop("backend", None)
+        )
 
         configuration_method = data.get("configuration_method")
         if configuration_method == ConfigurationMethod.DYNAMIC_FORM:
-            if not engine:
-                raise ValidationError(
-                    [
-                        _(
-                            "An engine must be specified when passing "
-                            "individual parameters to a database."
-                        )
-                    ]
-                )
-            engine_specs = get_engine_specs()
-            if engine not in engine_specs:
-                raise ValidationError(
-                    [_('Engine "%(engine)s" is not a valid engine.', engine=engine,)]
-                )
-            engine_spec = engine_specs[engine]
+            engine_spec = get_engine_spec(engine)
 
             if not hasattr(engine_spec, "build_sqlalchemy_uri") or not hasattr(
                 engine_spec, "parameters_schema"
@@ -291,7 +279,7 @@ def build_sqlalchemy_uri(
             # validate parameters
             parameters = engine_spec.parameters_schema.load(parameters)  # type: ignore
 
-            serialized_encrypted_extra = data.get("encrypted_extra", "{}")
+            serialized_encrypted_extra = data.get("encrypted_extra") or "{}"
             try:
                 encrypted_extra = json.loads(serialized_encrypted_extra)
             except json.decoder.JSONDecodeError:
@@ -304,7 +292,28 @@ def build_sqlalchemy_uri(
         return data
 
 
+def get_engine_spec(engine: Optional[str]) -> Type[BaseEngineSpec]:
+    if not engine:
+        raise ValidationError(
+            [
+                _(
+                    "An engine must be specified when passing "
+                    "individual parameters to a database."
+                )
+            ]
+        )
+    engine_specs = get_engine_specs()
+    if engine not in engine_specs:
+        raise ValidationError(
+            [_('Engine "%(engine)s" is not a valid engine.', engine=engine,)]
+        )
+    return engine_specs[engine]
+
+
 class DatabaseValidateParametersSchema(Schema):
+    class Meta:  # pylint: disable=too-few-public-methods
+        unknown = EXCLUDE
+
     engine = fields.String(required=True, description="SQLAlchemy engine to use")
     parameters = fields.Dict(
         keys=fields.String(),
@@ -329,7 +338,7 @@ class DatabaseValidateParametersSchema(Schema):
     configuration_method = EnumField(
         ConfigurationMethod,
         by_value=True,
-        allow_none=True,
+        required=True,
         description=configuration_method_description,
     )
 
@@ -543,6 +552,25 @@ class DatabaseFunctionNamesResponse(Schema):
 
 
 class ImportV1DatabaseExtraSchema(Schema):
+    # pylint: disable=no-self-use, unused-argument
+    @pre_load
+    def fix_schemas_allowed_for_csv_upload(
+        self, data: Dict[str, Any], **kwargs: Any
+    ) -> Dict[str, Any]:
+        """
+        Fix ``schemas_allowed_for_csv_upload`` being a string.
+
+        Due to a bug in the database modal, some databases might have been
+        saved and exported with a string for ``schemas_allowed_for_csv_upload``.
+        """
+        schemas_allowed_for_csv_upload = data.get("schemas_allowed_for_csv_upload")
+        if isinstance(schemas_allowed_for_csv_upload, str):
+            data["schemas_allowed_for_csv_upload"] = json.loads(
+                schemas_allowed_for_csv_upload
+            )
+
+        return data
+
     metadata_params = fields.Dict(keys=fields.Str(), values=fields.Raw())
     engine_params = fields.Dict(keys=fields.Str(), values=fields.Raw())
     metadata_cache_timeout = fields.Dict(keys=fields.Str(), values=fields.Integer())
diff --git a/superset/datasets/api.py b/superset/datasets/api.py
index 312369c609e3..261a7d749e40 100644
--- a/superset/datasets/api.py
+++ b/superset/datasets/api.py
@@ -100,6 +100,8 @@ class DatasetRestApi(BaseSupersetModelRestApi):
         "changed_on_utc",
         "changed_on_delta_humanized",
         "default_endpoint",
+        "description",
+        "datasource_type",
         "explore_url",
         "extra",
         "kind",
@@ -119,7 +121,7 @@ class DatasetRestApi(BaseSupersetModelRestApi):
         "changed_on_delta_humanized",
         "database.database_name",
     ]
-    show_columns = [
+    show_select_columns = [
         "id",
         "database.database_name",
         "database.id",
@@ -139,12 +141,26 @@ class DatasetRestApi(BaseSupersetModelRestApi):
         "owners.username",
         "owners.first_name",
         "owners.last_name",
-        "columns",
+        "columns.changed_on",
+        "columns.column_name",
+        "columns.created_on",
+        "columns.description",
+        "columns.expression",
+        "columns.filterable",
+        "columns.groupby",
+        "columns.id",
+        "columns.is_active",
+        "columns.is_dttm",
+        "columns.python_date_format",
+        "columns.type",
+        "columns.uuid",
+        "columns.verbose_name",
         "metrics",
         "datasource_type",
         "url",
         "extra",
     ]
+    show_columns = show_select_columns + ["columns.type_generic", "database.backend"]
     add_model_schema = DatasetPostSchema()
     edit_model_schema = DatasetPutSchema()
     add_columns = ["database", "schema", "table_name", "owners"]
@@ -399,7 +415,7 @@ def delete(self, pk: int) -> Response:
     @event_logger.log_this_with_context(
         action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.export",
         log_to_statsd=False,
-    )
+    )  # pylint: disable=too-many-locals
     def export(self, **kwargs: Any) -> Response:
         """Export datasets
         ---
@@ -432,6 +448,7 @@ def export(self, **kwargs: Any) -> Response:
         requested_ids = kwargs["rison"]
 
         if is_feature_enabled("VERSIONED_EXPORT"):
+            token = request.args.get("token")
             timestamp = datetime.now().strftime("%Y%m%dT%H%M%S")
             root = f"dataset_export_{timestamp}"
             filename = f"{root}.zip"
@@ -448,12 +465,15 @@ def export(self, **kwargs: Any) -> Response:
                     return self.response_404()
             buf.seek(0)
 
-            return send_file(
+            response = send_file(
                 buf,
                 mimetype="application/zip",
                 as_attachment=True,
                 attachment_filename=filename,
             )
+            if token:
+                response.set_cookie(token, "done", max_age=600)
+            return response
 
         query = self.datamodel.session.query(SqlaTable).filter(
             SqlaTable.id.in_(requested_ids)
diff --git a/superset/datasets/columns/commands/delete.py b/superset/datasets/columns/commands/delete.py
index 1076c0090940..f5914af5277f 100644
--- a/superset/datasets/columns/commands/delete.py
+++ b/superset/datasets/columns/commands/delete.py
@@ -51,7 +51,7 @@ def run(self) -> Model:
             return column
         except DAODeleteFailedError as ex:
             logger.exception(ex.exception)
-            raise DatasetColumnDeleteFailedError()
+            raise DatasetColumnDeleteFailedError() from ex
 
     def validate(self) -> None:
         # Validate/populate model exists
@@ -61,5 +61,5 @@ def validate(self) -> None:
         # Check ownership
         try:
             check_ownership(self._model)
-        except SupersetSecurityException:
-            raise DatasetColumnForbiddenError()
+        except SupersetSecurityException as ex:
+            raise DatasetColumnForbiddenError() from ex
diff --git a/superset/datasets/commands/bulk_delete.py b/superset/datasets/commands/bulk_delete.py
index 0ba6b4e767f1..13608eda810c 100644
--- a/superset/datasets/commands/bulk_delete.py
+++ b/superset/datasets/commands/bulk_delete.py
@@ -74,7 +74,7 @@ def run(self) -> None:
             return None
         except DeleteFailedError as ex:
             logger.exception(ex.exception)
-            raise DatasetBulkDeleteFailedError()
+            raise DatasetBulkDeleteFailedError() from ex
 
     def validate(self) -> None:
         # Validate/populate model exists
@@ -85,5 +85,5 @@ def validate(self) -> None:
         for model in self._models:
             try:
                 check_ownership(model)
-            except SupersetSecurityException:
-                raise DatasetForbiddenError()
+            except SupersetSecurityException as ex:
+                raise DatasetForbiddenError() from ex
diff --git a/superset/datasets/commands/create.py b/superset/datasets/commands/create.py
index d2169ca7ae66..0bf403ebfbcd 100644
--- a/superset/datasets/commands/create.py
+++ b/superset/datasets/commands/create.py
@@ -22,8 +22,7 @@
 from marshmallow import ValidationError
 from sqlalchemy.exc import SQLAlchemyError
 
-from superset.commands.base import BaseCommand
-from superset.commands.utils import populate_owners
+from superset.commands.base import BaseCommand, CreateMixin
 from superset.dao.exceptions import DAOCreateFailedError
 from superset.datasets.commands.exceptions import (
     DatabaseNotFoundValidationError,
@@ -38,7 +37,7 @@
 logger = logging.getLogger(__name__)
 
 
-class CreateDatasetCommand(BaseCommand):
+class CreateDatasetCommand(CreateMixin, BaseCommand):
     def __init__(self, user: User, data: Dict[str, Any]):
         self._actor = user
         self._properties = data.copy()
@@ -63,7 +62,7 @@ def run(self) -> Model:
         except (SQLAlchemyError, DAOCreateFailedError) as ex:
             logger.warning(ex, exc_info=True)
             db.session.rollback()
-            raise DatasetCreateFailedError()
+            raise DatasetCreateFailedError() from ex
         return dataset
 
     def validate(self) -> None:
@@ -90,7 +89,7 @@ def validate(self) -> None:
             exceptions.append(TableNotFoundValidationError(table_name))
 
         try:
-            owners = populate_owners(self._actor, owner_ids)
+            owners = self.populate_owners(self._actor, owner_ids)
             self._properties["owners"] = owners
         except ValidationError as ex:
             exceptions.append(ex)
diff --git a/superset/datasets/commands/delete.py b/superset/datasets/commands/delete.py
index 028df423e44a..a9e5a0ab5aba 100644
--- a/superset/datasets/commands/delete.py
+++ b/superset/datasets/commands/delete.py
@@ -75,7 +75,7 @@ def run(self) -> Model:
         except (SQLAlchemyError, DAODeleteFailedError) as ex:
             logger.exception(ex)
             db.session.rollback()
-            raise DatasetDeleteFailedError()
+            raise DatasetDeleteFailedError() from ex
         return dataset
 
     def validate(self) -> None:
@@ -86,5 +86,5 @@ def validate(self) -> None:
         # Check ownership
         try:
             check_ownership(self._model)
-        except SupersetSecurityException:
-            raise DatasetForbiddenError()
+        except SupersetSecurityException as ex:
+            raise DatasetForbiddenError() from ex
diff --git a/superset/datasets/commands/importers/dispatcher.py b/superset/datasets/commands/importers/dispatcher.py
index f999b18dacd6..74f1129d23bb 100644
--- a/superset/datasets/commands/importers/dispatcher.py
+++ b/superset/datasets/commands/importers/dispatcher.py
@@ -43,7 +43,6 @@ class ImportDatasetsCommand(BaseCommand):
     until it finds one that matches.
     """
 
-    # pylint: disable=unused-argument
     def __init__(self, contents: Dict[str, str], *args: Any, **kwargs: Any):
         self.contents = contents
         self.args = args
diff --git a/superset/datasets/commands/importers/v0.py b/superset/datasets/commands/importers/v0.py
index a19e9ae05bf5..1508298a23e8 100644
--- a/superset/datasets/commands/importers/v0.py
+++ b/superset/datasets/commands/importers/v0.py
@@ -322,9 +322,11 @@ def validate(self) -> None:
         for file_name, content in self.contents.items():
             try:
                 config = yaml.safe_load(content)
-            except yaml.parser.ParserError:
+            except yaml.parser.ParserError as ex:
                 logger.exception("Invalid YAML file")
-                raise IncorrectVersionError(f"{file_name} is not a valid YAML file")
+                raise IncorrectVersionError(
+                    f"{file_name} is not a valid YAML file"
+                ) from ex
 
             # CLI export
             if isinstance(config, dict):
diff --git a/superset/datasets/commands/importers/v1/utils.py b/superset/datasets/commands/importers/v1/utils.py
index c21c66ff1807..43df8b6ae5ec 100644
--- a/superset/datasets/commands/importers/v1/utils.py
+++ b/superset/datasets/commands/importers/v1/utils.py
@@ -14,8 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# pylint: disable=too-many-branches
-
 import gzip
 import json
 import logging
@@ -98,11 +96,12 @@ def import_dataset(
             except TypeError:
                 logger.info("Unable to encode `%s` field: %s", key, config[key])
     for metric in config.get("metrics", []):
-        if metric.get("extra"):
+        if metric.get("extra") is not None:
             try:
                 metric["extra"] = json.dumps(metric["extra"])
             except TypeError:
                 logger.info("Unable to encode `extra` field: %s", metric["extra"])
+                metric["extra"] = None
 
     # should we delete columns and metrics not present in the current import?
     sync = ["columns", "metrics"] if overwrite else []
@@ -118,10 +117,12 @@ def import_dataset(
     example_database = get_example_database()
     try:
         table_exists = example_database.has_table_by_name(dataset.table_name)
-    except Exception as ex:
+    except Exception:  # pylint: disable=broad-except
         # MySQL doesn't play nice with GSheets table names
-        logger.warning("Couldn't check if table %s exists, stopping import")
-        raise ex
+        logger.warning(
+            "Couldn't check if table %s exists, assuming it does", dataset.table_name
+        )
+        table_exists = True
 
     if data_uri and (not table_exists or force_data):
         load_data(data_uri, dataset, example_database, session)
@@ -132,8 +133,7 @@ def import_dataset(
 def load_data(
     data_uri: str, dataset: SqlaTable, example_database: Database, session: Session
 ) -> None:
-
-    data = request.urlopen(data_uri)
+    data = request.urlopen(data_uri)  # pylint: disable=consider-using-with
     if data_uri.endswith(".gz"):
         data = gzip.open(data)
     df = pd.read_csv(data, encoding="utf-8")
diff --git a/superset/datasets/commands/refresh.py b/superset/datasets/commands/refresh.py
index 22869570bd9f..962ffb410902 100644
--- a/superset/datasets/commands/refresh.py
+++ b/superset/datasets/commands/refresh.py
@@ -48,7 +48,7 @@ def run(self) -> Model:
                 return self._model
             except Exception as ex:
                 logger.exception(ex)
-                raise DatasetRefreshFailedError()
+                raise DatasetRefreshFailedError() from ex
         raise DatasetRefreshFailedError()
 
     def validate(self) -> None:
@@ -59,5 +59,5 @@ def validate(self) -> None:
         # Check ownership
         try:
             check_ownership(self._model)
-        except SupersetSecurityException:
-            raise DatasetForbiddenError()
+        except SupersetSecurityException as ex:
+            raise DatasetForbiddenError() from ex
diff --git a/superset/datasets/commands/update.py b/superset/datasets/commands/update.py
index 5be57ffccdcf..c9bf8500c929 100644
--- a/superset/datasets/commands/update.py
+++ b/superset/datasets/commands/update.py
@@ -22,8 +22,7 @@
 from flask_appbuilder.security.sqla.models import User
 from marshmallow import ValidationError
 
-from superset.commands.base import BaseCommand
-from superset.commands.utils import populate_owners
+from superset.commands.base import BaseCommand, UpdateMixin
 from superset.connectors.sqla.models import SqlaTable
 from superset.dao.exceptions import DAOUpdateFailedError
 from superset.datasets.commands.exceptions import (
@@ -47,7 +46,7 @@
 logger = logging.getLogger(__name__)
 
 
-class UpdateDatasetCommand(BaseCommand):
+class UpdateDatasetCommand(UpdateMixin, BaseCommand):
     def __init__(
         self,
         user: User,
@@ -73,7 +72,7 @@ def run(self) -> Model:
                 return dataset
             except DAOUpdateFailedError as ex:
                 logger.exception(ex.exception)
-                raise DatasetUpdateFailedError()
+                raise DatasetUpdateFailedError() from ex
         raise DatasetUpdateFailedError()
 
     def validate(self) -> None:
@@ -86,8 +85,8 @@ def validate(self) -> None:
         # Check ownership
         try:
             check_ownership(self._model)
-        except SupersetSecurityException:
-            raise DatasetForbiddenError()
+        except SupersetSecurityException as ex:
+            raise DatasetForbiddenError() from ex
 
         database_id = self._properties.get("database", None)
         table_name = self._properties.get("table_name", None)
@@ -101,7 +100,7 @@ def validate(self) -> None:
             exceptions.append(DatabaseChangeValidationError())
         # Validate/Populate owner
         try:
-            owners = populate_owners(self._actor, owner_ids)
+            owners = self.populate_owners(self._actor, owner_ids)
             self._properties["owners"] = owners
         except ValidationError as ex:
             exceptions.append(ex)
diff --git a/superset/datasets/dao.py b/superset/datasets/dao.py
index 68315be3b1cd..db7bbe04f5de 100644
--- a/superset/datasets/dao.py
+++ b/superset/datasets/dao.py
@@ -143,7 +143,7 @@ def validate_metrics_uniqueness(dataset_id: int, metrics_names: List[str]) -> bo
         return len(dataset_query) == 0
 
     @classmethod
-    def update(  # pylint: disable=W:279
+    def update(  # pylint: disable=arguments-differ
         cls,
         model: SqlaTable,
         properties: Dict[str, Any],
diff --git a/superset/datasets/metrics/commands/delete.py b/superset/datasets/metrics/commands/delete.py
index e6f68dc98121..cb3f1e0bea1e 100644
--- a/superset/datasets/metrics/commands/delete.py
+++ b/superset/datasets/metrics/commands/delete.py
@@ -51,7 +51,7 @@ def run(self) -> Model:
             return column
         except DAODeleteFailedError as ex:
             logger.exception(ex.exception)
-            raise DatasetMetricDeleteFailedError()
+            raise DatasetMetricDeleteFailedError() from ex
 
     def validate(self) -> None:
         # Validate/populate model exists
@@ -61,5 +61,5 @@ def validate(self) -> None:
         # Check ownership
         try:
             check_ownership(self._model)
-        except SupersetSecurityException:
-            raise DatasetMetricForbiddenError()
+        except SupersetSecurityException as ex:
+            raise DatasetMetricForbiddenError() from ex
diff --git a/superset/db_engine_specs/__init__.py b/superset/db_engine_specs/__init__.py
index f4ced6f32312..2c543cf1d766 100644
--- a/superset/db_engine_specs/__init__.py
+++ b/superset/db_engine_specs/__init__.py
@@ -53,7 +53,7 @@ def is_engine_spec(attr: Any) -> bool:
     )
 
 
-def get_engine_specs() -> Dict[str, Type[BaseEngineSpec]]:
+def load_engine_specs() -> List[Type[BaseEngineSpec]]:
     engine_specs: List[Type[BaseEngineSpec]] = []
 
     # load standard engines
@@ -75,6 +75,12 @@ def get_engine_specs() -> Dict[str, Type[BaseEngineSpec]]:
             continue
         engine_specs.append(engine_spec)
 
+    return engine_specs
+
+
+def get_engine_specs() -> Dict[str, Type[BaseEngineSpec]]:
+    engine_specs = load_engine_specs()
+
     # build map from name/alias -> spec
     engine_specs_map: Dict[str, Type[BaseEngineSpec]] = {}
     for engine_spec in engine_specs:
@@ -121,11 +127,16 @@ def get_available_engine_specs() -> Dict[Type[BaseEngineSpec], Set[str]]:
         except Exception:  # pylint: disable=broad-except
             logger.warning("Unable to load SQLAlchemy dialect: %s", dialect)
         else:
-            drivers[dialect.name].add(dialect.driver)
-
-    engine_specs = get_engine_specs()
-    return {
-        engine_specs[backend]: drivers
-        for backend, drivers in drivers.items()
-        if backend in engine_specs
-    }
+            backend = dialect.name
+            if isinstance(backend, bytes):
+                backend = backend.decode()
+            driver = getattr(dialect, "driver", dialect.name)
+            if isinstance(driver, bytes):
+                driver = driver.decode()
+            drivers[backend].add(driver)
+
+    available_engines = {}
+    for engine_spec in load_engine_specs():
+        available_engines[engine_spec] = drivers[engine_spec.engine]
+
+    return available_engines
diff --git a/superset/db_engine_specs/ascend.py b/superset/db_engine_specs/ascend.py
new file mode 100644
index 000000000000..ee7bab9facd1
--- /dev/null
+++ b/superset/db_engine_specs/ascend.py
@@ -0,0 +1,40 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from sqlalchemy.dialects import registry
+
+from superset.db_engine_specs.impala import ImpalaEngineSpec
+
+
+class AscendEngineSpec(ImpalaEngineSpec):
+    """Engine spec for Ascend.io (Hive2+TLS) using Cloudera's Impala"""
+
+    engine = "ascend"
+    registry.register("ascend", "impala.sqlalchemy", "ImpalaDialect")
+
+    engine_name = "Ascend"
+
+    _time_grain_expressions = {
+        None: "{col}",
+        "PT1S": "DATE_TRUNC('second', {col})",
+        "PT1M": "DATE_TRUNC('minute', {col})",
+        "PT1H": "DATE_TRUNC('hour', {col})",
+        "P1D": "DATE_TRUNC('day', {col})",
+        "P1W": "DATE_TRUNC('week', {col})",
+        "P1M": "DATE_TRUNC('month', {col})",
+        "P0.25Y": "DATE_TRUNC('quarter', {col})",
+        "P1Y": "DATE_TRUNC('year', {col})",
+    }
diff --git a/superset/db_engine_specs/athena.py b/superset/db_engine_specs/athena.py
index d82591756a00..2952d8267772 100644
--- a/superset/db_engine_specs/athena.py
+++ b/superset/db_engine_specs/athena.py
@@ -14,12 +14,20 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+import re
 from datetime import datetime
-from typing import Optional
+from typing import Any, Dict, Optional, Pattern, Tuple
+
+from flask_babel import gettext as __
 
 from superset.db_engine_specs.base import BaseEngineSpec
+from superset.errors import SupersetErrorType
 from superset.utils import core as utils
 
+SYNTAX_ERROR_REGEX = re.compile(
+    ": mismatched input '(?P<syntax_error>.*?)'. Expecting: "
+)
+
 
 class AthenaEngineSpec(BaseEngineSpec):
     engine = "awsathena"
@@ -41,6 +49,17 @@ class AthenaEngineSpec(BaseEngineSpec):
                                     date_add('day', 1, CAST({col} AS TIMESTAMP))))",
     }
 
+    custom_errors: Dict[Pattern[str], Tuple[str, SupersetErrorType, Dict[str, Any]]] = {
+        SYNTAX_ERROR_REGEX: (
+            __(
+                "Please check your query for syntax errors at or "
+                'near "%(syntax_error)s". Then, try running your query again.'
+            ),
+            SupersetErrorType.SYNTAX_ERROR,
+            {},
+        ),
+    }
+
     @classmethod
     def convert_dttm(cls, target_type: str, dttm: datetime) -> Optional[str]:
         tt = target_type.upper()
diff --git a/superset/db_engine_specs/base.py b/superset/db_engine_specs/base.py
index 3f123c1e394f..a249408cd05f 100644
--- a/superset/db_engine_specs/base.py
+++ b/superset/db_engine_specs/base.py
@@ -43,7 +43,8 @@
 from flask import current_app, g
 from flask_babel import gettext as __, lazy_gettext as _
 from marshmallow import fields, Schema
-from sqlalchemy import column, DateTime, select, types
+from marshmallow.validate import Range
+from sqlalchemy import column, select, types
 from sqlalchemy.engine.base import Engine
 from sqlalchemy.engine.interfaces import Compiled, Dialect
 from sqlalchemy.engine.reflection import Inspector
@@ -63,6 +64,7 @@
 from superset.utils import core as utils
 from superset.utils.core import ColumnSpec, GenericDataType
 from superset.utils.hashing import md5_sha_from_str
+from superset.utils.memoized import memoized
 from superset.utils.network import is_hostname_valid, is_port_open
 
 if TYPE_CHECKING:
@@ -73,7 +75,7 @@
 logger = logging.getLogger()
 
 
-class TimeGrain(NamedTuple):  # pylint: disable=too-few-public-methods
+class TimeGrain(NamedTuple):
     name: str  # TODO: redundant field, remove
     label: str
     function: str
@@ -85,27 +87,28 @@ class TimeGrain(NamedTuple):  # pylint: disable=too-few-public-methods
 builtin_time_grains: Dict[Optional[str], str] = {
     None: __("Original value"),
     "PT1S": __("Second"),
+    "PT5S": __("5 second"),
+    "PT30S": __("30 second"),
     "PT1M": __("Minute"),
     "PT5M": __("5 minute"),
     "PT10M": __("10 minute"),
     "PT15M": __("15 minute"),
     "PT0.5H": __("Half hour"),
     "PT1H": __("Hour"),
+    "PT6H": __("6 hour"),
     "P1D": __("Day"),
     "P1W": __("Week"),
     "P1M": __("Month"),
     "P0.25Y": __("Quarter"),
     "P1Y": __("Year"),
-    "1969-12-28T00:00:00Z/P1W": __("Week starting sunday"),
-    "1969-12-29T00:00:00Z/P1W": __("Week starting monday"),
-    "P1W/1970-01-03T00:00:00Z": __("Week ending saturday"),
-    "P1W/1970-01-04T00:00:00Z": __("Week_ending sunday"),
+    "1969-12-28T00:00:00Z/P1W": __("Week starting Sunday"),
+    "1969-12-29T00:00:00Z/P1W": __("Week starting Monday"),
+    "P1W/1970-01-03T00:00:00Z": __("Week ending Saturday"),
+    "P1W/1970-01-04T00:00:00Z": __("Week_ending Sunday"),
 }
 
 
-class TimestampExpression(
-    ColumnClause
-):  # pylint: disable=abstract-method,too-many-ancestors,too-few-public-methods
+class TimestampExpression(ColumnClause):  # pylint: disable=abstract-method
     def __init__(self, expr: str, col: ColumnClause, **kwargs: Any) -> None:
         """Sqlalchemy class that can be can be used to render native column elements
         respeting engine-specific quoting rules as part of a string-based expression.
@@ -376,7 +379,7 @@ def get_timestamp_expr(
         elif pdf == "epoch_ms":
             time_expr = time_expr.replace("{col}", cls.epoch_ms_to_dttm())
 
-        return TimestampExpression(time_expr, col, type_=DateTime)
+        return TimestampExpression(time_expr, col, type_=col.type)
 
     @classmethod
     def get_time_grains(cls) -> Tuple[TimeGrain, ...]:
@@ -1263,7 +1266,7 @@ def is_select_query(cls, parsed_query: ParsedQuery) -> bool:
         return parsed_query.is_select()
 
     @classmethod
-    @utils.memoized
+    @memoized
     def get_column_spec(
         cls,
         native_type: Optional[str],
@@ -1300,6 +1303,46 @@ def get_column_spec(
             )
         return None
 
+    @classmethod
+    def has_implicit_cancel(cls) -> bool:
+        """
+        Return True if the live cursor handles the implicit cancelation of the query,
+        False otherise.
+
+        :return: Whether the live cursor implicitly cancels the query
+        :see: handle_cursor
+        """
+
+        return False
+
+    @classmethod
+    def get_cancel_query_id(cls, cursor: Any, query: Query) -> Optional[str]:
+        """
+        Select identifiers from the database engine that uniquely identifies the
+        queries to cancel. The identifier is typically a session id, process id
+        or similar.
+
+        :param cursor: Cursor instance in which the query will be executed
+        :param query: Query instance
+        :return: Query identifier
+        """
+
+        return None
+
+    @classmethod
+    def cancel_query(cls, cursor: Any, query: Query, cancel_query_id: str) -> bool:
+        """
+        Cancel query in the underlying database.
+
+        :param cursor: New cursor instance to the db of the query
+        :param query: Query instance
+        :param cancel_query_id: Value returned by get_cancel_query_payload or set in
+        other life-cycle methods of the query
+        :return: True if query cancelled successfully, False otherwise
+        """
+
+        return False
+
 
 # schema for adding a database by providing parameters instead of the
 # full SQLAlchemy URI
@@ -1307,7 +1350,11 @@ class BasicParametersSchema(Schema):
     username = fields.String(required=True, allow_none=True, description=__("Username"))
     password = fields.String(allow_none=True, description=__("Password"))
     host = fields.String(required=True, description=__("Hostname or IP address"))
-    port = fields.Integer(required=True, description=__("Database port"))
+    port = fields.Integer(
+        required=True,
+        description=__("Database port"),
+        validate=Range(min=0, max=2 ** 16, max_inclusive=False),
+    )
     database = fields.String(required=True, description=__("Database name"))
     query = fields.Dict(
         keys=fields.Str(), values=fields.Raw(), description=__("Additional parameters")
@@ -1361,7 +1408,8 @@ def build_sqlalchemy_uri(
         parameters: BasicParametersType,
         encryted_extra: Optional[Dict[str, str]] = None,
     ) -> str:
-        query = parameters.get("query", {})
+        # make a copy so that we don't update the original
+        query = parameters.get("query", {}).copy()
         if parameters.get("encryption"):
             if not cls.encryption_parameters:
                 raise Exception("Unable to build a URL with encryption enabled")
@@ -1384,6 +1432,11 @@ def get_parameters_from_uri(
         cls, uri: str, encrypted_extra: Optional[Dict[str, Any]] = None
     ) -> BasicParametersType:
         url = make_url(uri)
+        query = {
+            key: value
+            for (key, value) in url.query.items()
+            if (key, value) not in cls.encryption_parameters.items()
+        }
         encryption = all(
             item in url.query.items() for item in cls.encryption_parameters.items()
         )
@@ -1393,7 +1446,7 @@ def get_parameters_from_uri(
             "host": url.host,
             "port": url.port,
             "database": url.database,
-            "query": url.query,
+            "query": query,
             "encryption": encryption,
         }
 
@@ -1410,7 +1463,7 @@ def validate_parameters(
         errors: List[SupersetError] = []
 
         required = {"host", "port", "username", "database"}
-        present = {key for key in parameters if parameters.get(key, ())}  # type: ignore
+        present = {key for key in parameters if parameters.get(key, ())}
         missing = sorted(required - present)
 
         if missing:
@@ -1440,7 +1493,30 @@ def validate_parameters(
         port = parameters.get("port", None)
         if not port:
             return errors
-        if not is_port_open(host, port):
+        try:
+            port = int(port)
+        except (ValueError, TypeError):
+            errors.append(
+                SupersetError(
+                    message="Port must be a valid integer.",
+                    error_type=SupersetErrorType.CONNECTION_INVALID_PORT_ERROR,
+                    level=ErrorLevel.ERROR,
+                    extra={"invalid": ["port"]},
+                ),
+            )
+        if not (isinstance(port, int) and 0 <= port < 2 ** 16):
+            errors.append(
+                SupersetError(
+                    message=(
+                        "The port must be an integer between 0 and 65535 "
+                        "(inclusive)."
+                    ),
+                    error_type=SupersetErrorType.CONNECTION_INVALID_PORT_ERROR,
+                    level=ErrorLevel.ERROR,
+                    extra={"invalid": ["port"]},
+                ),
+            )
+        elif not is_port_open(host, port):
             errors.append(
                 SupersetError(
                     message="The port is closed.",
diff --git a/superset/db_engine_specs/bigquery.py b/superset/db_engine_specs/bigquery.py
index 7320eab6db9d..734984499fce 100644
--- a/superset/db_engine_specs/bigquery.py
+++ b/superset/db_engine_specs/bigquery.py
@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import re
+import urllib
 from datetime import datetime
 from typing import Any, Dict, List, Optional, Pattern, Tuple, TYPE_CHECKING
 
@@ -22,15 +23,16 @@
 from apispec import APISpec
 from apispec.ext.marshmallow import MarshmallowPlugin
 from flask_babel import gettext as __
-from marshmallow import Schema
+from marshmallow import fields, Schema
+from marshmallow.exceptions import ValidationError
 from sqlalchemy import literal_column
+from sqlalchemy.engine.url import make_url
 from sqlalchemy.sql.expression import ColumnClause
 from typing_extensions import TypedDict
 
 from superset.databases.schemas import encrypted_field_properties, EncryptedField
 from superset.db_engine_specs.base import BaseEngineSpec
-from superset.errors import SupersetErrorType
-from superset.exceptions import SupersetGenericDBErrorException
+from superset.errors import SupersetError, SupersetErrorType
 from superset.sql_parse import Table
 from superset.utils import core as utils
 from superset.utils.hashing import md5_sha_from_str
@@ -44,17 +46,37 @@
     + "permission in project (?P<project>.+?)"
 )
 
+TABLE_DOES_NOT_EXIST_REGEX = re.compile(
+    'Table name "(?P<table>.*?)" missing dataset while no default '
+    "dataset is set in the request"
+)
+
+COLUMN_DOES_NOT_EXIST_REGEX = re.compile(
+    r"Unrecognized name: (?P<column>.*?) at \[(?P<location>.+?)\]"
+)
+
+SCHEMA_DOES_NOT_EXIST_REGEX = re.compile(
+    r"bigquery error: 404 Not found: Dataset (?P<dataset>.*?):"
+    r"(?P<schema>.*?) was not found in location"
+)
+
+SYNTAX_ERROR_REGEX = re.compile(
+    'Syntax error: Expected end of input but got identifier "(?P<syntax_error>.+?)"'
+)
+
 ma_plugin = MarshmallowPlugin()
 
 
 class BigQueryParametersSchema(Schema):
     credentials_info = EncryptedField(
-        required=True, description="Contents of BigQuery JSON credentials.",
+        required=False, description="Contents of BigQuery JSON credentials.",
     )
+    query = fields.Dict(required=False)
 
 
 class BigQueryParametersType(TypedDict):
     credentials_info: Dict[str, Any]
+    query: Dict[str, Any]
 
 
 class BigQueryEngineSpec(BaseEngineSpec):
@@ -127,6 +149,35 @@ class BigQueryEngineSpec(BaseEngineSpec):
             SupersetErrorType.CONNECTION_DATABASE_PERMISSIONS_ERROR,
             {},
         ),
+        TABLE_DOES_NOT_EXIST_REGEX: (
+            __(
+                'The table "%(table)s" does not exist. '
+                "A valid table must be used to run this query.",
+            ),
+            SupersetErrorType.TABLE_DOES_NOT_EXIST_ERROR,
+            {},
+        ),
+        COLUMN_DOES_NOT_EXIST_REGEX: (
+            __('We can\'t seem to resolve column "%(column)s" at line %(location)s.'),
+            SupersetErrorType.COLUMN_DOES_NOT_EXIST_ERROR,
+            {},
+        ),
+        SCHEMA_DOES_NOT_EXIST_REGEX: (
+            __(
+                'The schema "%(schema)s" does not exist. '
+                "A valid schema must be used to run this query."
+            ),
+            SupersetErrorType.SCHEMA_DOES_NOT_EXIST_ERROR,
+            {},
+        ),
+        SYNTAX_ERROR_REGEX: (
+            __(
+                "Please check your query for syntax errors at or near "
+                '"%(syntax_error)s". Then, try running your query again.'
+            ),
+            SupersetErrorType.SYNTAX_ERROR,
+            {},
+        ),
     }
 
     @classmethod
@@ -273,14 +324,15 @@ def df_to_sql(
         """
 
         try:
+            # pylint: disable=import-outside-toplevel
             import pandas_gbq
             from google.oauth2 import service_account
-        except ImportError:
+        except ImportError as ex:
             raise Exception(
                 "Could not import libraries `pandas_gbq` or `google.oauth2`, which are "
                 "required to be installed in your environment in order "
                 "to upload data to BigQuery"
-            )
+            ) from ex
 
         if not table.schema:
             raise Exception("The table schema must be defined")
@@ -307,29 +359,40 @@ def df_to_sql(
 
     @classmethod
     def build_sqlalchemy_uri(
-        cls, _: BigQueryParametersType, encrypted_extra: Optional[Dict[str, Any]] = None
+        cls,
+        parameters: BigQueryParametersType,
+        encrypted_extra: Optional[Dict[str, Any]] = None,
     ) -> str:
-        if encrypted_extra:
-            project_id = encrypted_extra.get("credentials_info", {}).get("project_id")
+        query = parameters.get("query", {})
+        query_params = urllib.parse.urlencode(query)
+
+        if not encrypted_extra:
+            raise ValidationError("Missing service credentials")
+
+        project_id = encrypted_extra.get("credentials_info", {}).get("project_id")
 
         if project_id:
-            return f"{cls.engine}+{cls.default_driver}://{project_id}"
+            return f"{cls.default_driver}://{project_id}/?{query_params}"
 
-        raise SupersetGenericDBErrorException(
-            message="Big Query encrypted_extra is not available.",
-        )
+        raise ValidationError("Invalid service credentials")
 
     @classmethod
     def get_parameters_from_uri(
-        cls, _: str, encrypted_extra: Optional[Dict[str, str]] = None
+        cls, uri: str, encrypted_extra: Optional[Dict[str, str]] = None
     ) -> Any:
-        # BigQuery doesn't have parameters
+        value = make_url(uri)
+
+        # Building parameters from encrypted_extra and uri
         if encrypted_extra:
-            return encrypted_extra
+            return {**encrypted_extra, "query": value.query}
 
-        raise SupersetGenericDBErrorException(
-            message="Big Query encrypted_extra is not available.",
-        )
+        raise ValidationError("Invalid service credentials")
+
+    @classmethod
+    def validate_parameters(
+        cls, parameters: BigQueryParametersType  # pylint: disable=unused-argument
+    ) -> List[SupersetError]:
+        return []
 
     @classmethod
     def parameters_json_schema(cls) -> Any:
diff --git a/superset/db_engine_specs/clickhouse.py b/superset/db_engine_specs/clickhouse.py
index 4db568411904..a425a719ba36 100644
--- a/superset/db_engine_specs/clickhouse.py
+++ b/superset/db_engine_specs/clickhouse.py
@@ -17,6 +17,8 @@
 from datetime import datetime
 from typing import Dict, Optional, Type
 
+from urllib3.exceptions import NewConnectionError
+
 from superset.db_engine_specs.base import BaseEngineSpec
 from superset.db_engine_specs.exceptions import SupersetDBAPIDatabaseError
 from superset.utils import core as utils
@@ -48,8 +50,6 @@ class ClickHouseEngineSpec(BaseEngineSpec):  # pylint: disable=abstract-method
 
     @classmethod
     def get_dbapi_exception_mapping(cls) -> Dict[Type[Exception], Type[Exception]]:
-        from urllib3.exceptions import NewConnectionError
-
         return {NewConnectionError: SupersetDBAPIDatabaseError}
 
     @classmethod
diff --git a/superset/db_engine_specs/databricks.py b/superset/db_engine_specs/databricks.py
index deb9a35439e3..1c11c4017b73 100644
--- a/superset/db_engine_specs/databricks.py
+++ b/superset/db_engine_specs/databricks.py
@@ -20,6 +20,6 @@
 
 class DatabricksHiveEngineSpec(HiveEngineSpec):
     engine = "databricks"
-    engine_name = "Databricks Hive"
+    engine_name = "Databricks"
     driver = "pyhive"
     _show_functions_column = "function"
diff --git a/superset/db_engine_specs/drill.py b/superset/db_engine_specs/drill.py
index fc3d833cfffb..6578965778b6 100644
--- a/superset/db_engine_specs/drill.py
+++ b/superset/db_engine_specs/drill.py
@@ -29,6 +29,7 @@ class DrillEngineSpec(BaseEngineSpec):
 
     engine = "drill"
     engine_name = "Apache Drill"
+    default_driver = "sadrill"
 
     _time_grain_expressions = {
         None: "{col}",
diff --git a/superset/db_engine_specs/druid.py b/superset/db_engine_specs/druid.py
index 3ab2dedb4c0d..faccb002060f 100644
--- a/superset/db_engine_specs/druid.py
+++ b/superset/db_engine_specs/druid.py
@@ -41,17 +41,26 @@ class DruidEngineSpec(BaseEngineSpec):  # pylint: disable=abstract-method
     _time_grain_expressions = {
         None: "{col}",
         "PT1S": "FLOOR({col} TO SECOND)",
+        "PT5S": "TIME_FLOOR({col}, 'PT5S')",
+        "PT30S": "TIME_FLOOR({col}, 'PT30S')",
         "PT1M": "FLOOR({col} TO MINUTE)",
         "PT5M": "TIME_FLOOR({col}, 'PT5M')",
         "PT10M": "TIME_FLOOR({col}, 'PT10M')",
         "PT15M": "TIME_FLOOR({col}, 'PT15M')",
         "PT0.5H": "TIME_FLOOR({col}, 'PT30M')",
         "PT1H": "FLOOR({col} TO HOUR)",
+        "PT6H": "TIME_FLOOR({col}, 'PT6H')",
         "P1D": "FLOOR({col} TO DAY)",
         "P1W": "FLOOR({col} TO WEEK)",
         "P1M": "FLOOR({col} TO MONTH)",
         "P0.25Y": "FLOOR({col} TO QUARTER)",
         "P1Y": "FLOOR({col} TO YEAR)",
+        "P1W/1970-01-03T00:00:00Z": (
+            "TIMESTAMPADD(DAY, 5, FLOOR(TIMESTAMPADD(DAY, 1, {col}) TO WEEK))"
+        ),
+        "1969-12-28T00:00:00Z/P1W": (
+            "TIMESTAMPADD(DAY, -1, FLOOR(TIMESTAMPADD(DAY, 1, {col}) TO WEEK))"
+        ),
     }
 
     @classmethod
@@ -70,8 +79,8 @@ def get_extra_params(database: "Database") -> Dict[str, Any]:
         """
         try:
             extra = json.loads(database.extra or "{}")
-        except json.JSONDecodeError:
-            raise SupersetException("Unable to parse database extras")
+        except json.JSONDecodeError as ex:
+            raise SupersetException("Unable to parse database extras") from ex
 
         if database.server_cert:
             engine_params = extra.get("engine_params", {})
diff --git a/superset/db_engine_specs/elasticsearch.py b/superset/db_engine_specs/elasticsearch.py
index 31c15a40e6ab..65042ed05c48 100644
--- a/superset/db_engine_specs/elasticsearch.py
+++ b/superset/db_engine_specs/elasticsearch.py
@@ -28,7 +28,7 @@
 
 class ElasticSearchEngineSpec(BaseEngineSpec):  # pylint: disable=abstract-method
     engine = "elasticsearch"
-    engine_name = "ElasticSearch"
+    engine_name = "ElasticSearch (SQL API)"
     time_groupby_inline = True
     time_secondary_columns = True
     allows_joins = False
@@ -49,7 +49,8 @@ class ElasticSearchEngineSpec(BaseEngineSpec):  # pylint: disable=abstract-metho
 
     @classmethod
     def get_dbapi_exception_mapping(cls) -> Dict[Type[Exception], Type[Exception]]:
-        import es.exceptions as es_exceptions  # pylint: disable=import-error
+        # pylint: disable=import-error,import-outside-toplevel
+        import es.exceptions as es_exceptions
 
         return {
             es_exceptions.DatabaseError: SupersetDBAPIDatabaseError,
@@ -83,7 +84,7 @@ class OpenDistroEngineSpec(BaseEngineSpec):  # pylint: disable=abstract-method
     }
 
     engine = "odelasticsearch"
-    engine_name = "ElasticSearch"
+    engine_name = "ElasticSearch (OpenDistro SQL)"
 
     @classmethod
     def convert_dttm(cls, target_type: str, dttm: datetime) -> Optional[str]:
diff --git a/superset/db_engine_specs/gsheets.py b/superset/db_engine_specs/gsheets.py
index f715cd43b332..7c5cd1cc0523 100644
--- a/superset/db_engine_specs/gsheets.py
+++ b/superset/db_engine_specs/gsheets.py
@@ -14,12 +14,42 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from typing import Optional
+import json
+import re
+from contextlib import closing
+from typing import Any, Dict, List, Optional, Pattern, Tuple, TYPE_CHECKING
 
+from apispec import APISpec
+from apispec.ext.marshmallow import MarshmallowPlugin
+from flask import g
+from flask_babel import gettext as __
+from marshmallow import fields, Schema
+from marshmallow.exceptions import ValidationError
+from sqlalchemy.engine import create_engine
 from sqlalchemy.engine.url import URL
+from typing_extensions import TypedDict
 
 from superset import security_manager
+from superset.databases.schemas import encrypted_field_properties
 from superset.db_engine_specs.sqlite import SqliteEngineSpec
+from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
+
+if TYPE_CHECKING:
+    from superset.models.core import Database
+
+
+SYNTAX_ERROR_REGEX = re.compile('SQLError: near "(?P<server_error>.*?)": syntax error')
+
+ma_plugin = MarshmallowPlugin()
+
+
+class GSheetsParametersSchema(Schema):
+    catalog = fields.Dict()
+
+
+class GSheetsParametersType(TypedDict):
+    credentials_info: Dict[str, Any]
+    catalog: Dict[str, str]
 
 
 class GSheetsEngineSpec(SqliteEngineSpec):
@@ -27,14 +57,148 @@ class GSheetsEngineSpec(SqliteEngineSpec):
 
     engine = "gsheets"
     engine_name = "Google Sheets"
-    allows_joins = False
+    allows_joins = True
     allows_subqueries = True
 
+    parameters_schema = GSheetsParametersSchema()
+    default_driver = "apsw"
+    sqlalchemy_uri_placeholder = "gsheets://"
+
+    custom_errors: Dict[Pattern[str], Tuple[str, SupersetErrorType, Dict[str, Any]]] = {
+        SYNTAX_ERROR_REGEX: (
+            __(
+                'Please check your query for syntax errors near "%(server_error)s". '
+                "Then, try running your query again.",
+            ),
+            SupersetErrorType.SYNTAX_ERROR,
+            {},
+        ),
+    }
+
     @classmethod
     def modify_url_for_impersonation(
-        cls, url: URL, impersonate_user: bool, username: Optional[str]
+        cls, url: URL, impersonate_user: bool, username: Optional[str],
     ) -> None:
         if impersonate_user and username is not None:
             user = security_manager.find_user(username=username)
             if user and user.email:
                 url.query["subject"] = user.email
+
+    @classmethod
+    def extra_table_metadata(
+        cls, database: "Database", table_name: str, schema_name: str,
+    ) -> Dict[str, Any]:
+        engine = cls.get_engine(database, schema=schema_name)
+        with closing(engine.raw_connection()) as conn:
+            cursor = conn.cursor()
+            cursor.execute(f'SELECT GET_METADATA("{table_name}")')
+            results = cursor.fetchone()[0]
+
+        try:
+            metadata = json.loads(results)
+        except Exception:  # pylint: disable=broad-except
+            metadata = {}
+
+        return {"metadata": metadata["extra"]}
+
+    @classmethod
+    def build_sqlalchemy_uri(
+        cls,
+        _: GSheetsParametersType,
+        encrypted_extra: Optional[  # pylint: disable=unused-argument
+            Dict[str, Any]
+        ] = None,
+    ) -> str:
+        return "gsheets://"
+
+    @classmethod
+    def get_parameters_from_uri(
+        cls, encrypted_extra: Optional[Dict[str, str]] = None,
+    ) -> Any:
+        # Building parameters from encrypted_extra and uri
+        if encrypted_extra:
+            return {**encrypted_extra}
+
+        raise ValidationError("Invalid service credentials")
+
+    @classmethod
+    def parameters_json_schema(cls) -> Any:
+        """
+        Return configuration parameters as OpenAPI.
+        """
+        if not cls.parameters_schema:
+            return None
+
+        spec = APISpec(
+            title="Database Parameters",
+            version="1.0.0",
+            openapi_version="3.0.0",
+            plugins=[ma_plugin],
+        )
+
+        ma_plugin.init_spec(spec)
+        ma_plugin.converter.add_attribute_function(encrypted_field_properties)
+        spec.components.schema(cls.__name__, schema=cls.parameters_schema)
+        return spec.to_dict()["components"]["schemas"][cls.__name__]
+
+    @classmethod
+    def validate_parameters(
+        cls, parameters: GSheetsParametersType,
+    ) -> List[SupersetError]:
+        errors: List[SupersetError] = []
+        credentials_info = parameters.get("credentials_info")
+        table_catalog = parameters.get("catalog", {})
+
+        if not table_catalog:
+            # Allowing users to submit empty catalogs
+            return errors
+
+        # We need a subject in case domain wide delegation is set, otherwise the
+        # check will fail. This means that the admin will be able to add sheets
+        # that only they have access, even if later users are not able to access
+        # them.
+        subject = g.user.email if g.user else None
+
+        engine = create_engine(
+            "gsheets://", service_account_info=credentials_info, subject=subject,
+        )
+        conn = engine.connect()
+        idx = 0
+        for name, url in table_catalog.items():
+
+            if not name:
+                errors.append(
+                    SupersetError(
+                        message="Sheet name is required",
+                        error_type=SupersetErrorType.CONNECTION_MISSING_PARAMETERS_ERROR,
+                        level=ErrorLevel.WARNING,
+                        extra={"catalog": {"idx": idx, "name": True}},
+                    ),
+                )
+                return errors
+
+            if not url:
+                errors.append(
+                    SupersetError(
+                        message="URL is required",
+                        error_type=SupersetErrorType.CONNECTION_MISSING_PARAMETERS_ERROR,
+                        level=ErrorLevel.WARNING,
+                        extra={"catalog": {"idx": idx, "url": True}},
+                    ),
+                )
+                return errors
+
+            try:
+                results = conn.execute(f'SELECT * FROM "{url}" LIMIT 1')
+                results.fetchall()
+            except Exception:  # pylint: disable=broad-except
+                errors.append(
+                    SupersetError(
+                        message="URL could not be identified",
+                        error_type=SupersetErrorType.TABLE_DOES_NOT_EXIST_ERROR,
+                        level=ErrorLevel.WARNING,
+                        extra={"catalog": {"idx": idx, "url": True}},
+                    ),
+                )
+            idx += 1
+        return errors
diff --git a/superset/db_engine_specs/hive.py b/superset/db_engine_specs/hive.py
index 7fec8d3d0557..e33012e71281 100644
--- a/superset/db_engine_specs/hive.py
+++ b/superset/db_engine_specs/hive.py
@@ -62,8 +62,8 @@ def upload_to_s3(filename: str, upload_prefix: str, table: Table) -> str:
     :returns: The S3 location of the table
     """
 
-    # Optional dependency
-    import boto3  # pylint: disable=import-error
+    # pylint: disable=import-outside-toplevel
+    import boto3
 
     bucket_path = current_app.config["CSV_TO_HIVE_UPLOAD_S3_BUCKET"]
 
@@ -128,6 +128,7 @@ class HiveEngineSpec(PrestoEngineSpec):
 
     @classmethod
     def patch(cls) -> None:
+        # pylint: disable=import-outside-toplevel
         from pyhive import hive
         from TCLIService import (
             constants as patched_constants,
@@ -152,6 +153,7 @@ def get_all_datasource_names(
     def fetch_data(
         cls, cursor: Any, limit: Optional[int] = None
     ) -> List[Tuple[Any, ...]]:
+        # pylint: disable=import-outside-toplevel
         import pyhive
         from TCLIService import ttypes
 
@@ -314,6 +316,7 @@ def handle_cursor(  # pylint: disable=too-many-locals
         cls, cursor: Any, query: Query, session: Session
     ) -> None:
         """Updates progress information"""
+        # pylint: disable=import-outside-toplevel
         from pyhive import hive
 
         unfinished_states = (
@@ -331,7 +334,12 @@ def handle_cursor(  # pylint: disable=too-many-locals
                 cursor.cancel()
                 break
 
-            log = cursor.fetch_logs() or ""
+            try:
+                log = cursor.fetch_logs() or ""
+            except Exception:  # pylint: disable=broad-except
+                logger.warning("Call to GetLog() failed")
+                log = ""
+
             if log:
                 log_lines = log.splitlines()
                 progress = cls.progress(log_lines)
@@ -540,3 +548,20 @@ def is_readonly_query(cls, parsed_query: ParsedQuery) -> bool:
             or parsed_query.is_set()
             or parsed_query.is_show()
         )
+
+    @classmethod
+    def has_implicit_cancel(cls) -> bool:
+        """
+        Return True if the live cursor handles the implicit cancelation of the query,
+        False otherise.
+
+        :return: Whether the live cursor implicitly cancels the query
+        :see: handle_cursor
+        """
+
+        return True
+
+
+class SparkEngineSpec(HiveEngineSpec):
+
+    engine_name = "Apache Spark SQL"
diff --git a/superset/db_engine_specs/mssql.py b/superset/db_engine_specs/mssql.py
index c24d40d23b51..ff6b5326d393 100644
--- a/superset/db_engine_specs/mssql.py
+++ b/superset/db_engine_specs/mssql.py
@@ -44,7 +44,7 @@
 
 class MssqlEngineSpec(BaseEngineSpec):
     engine = "mssql"
-    engine_name = "Microsoft SQL"
+    engine_name = "Microsoft SQL Server"
     limit_method = LimitMethod.WRAP_SQL
     max_column_name_length = 128
 
@@ -126,3 +126,9 @@ def extract_error_message(cls, ex: Exception) -> str:
                 "have an alias on MSSQL. For example: SELECT COUNT(*) AS C1 FROM TABLE1"
             )
         return f"{cls.engine} error: {cls._extract_error_message(ex)}"
+
+
+class AzureSynapseSpec(MssqlEngineSpec):
+    engine = "mssql"
+    engine_name = "Azure Synapse"
+    default_driver = "pyodbc"
diff --git a/superset/db_engine_specs/mysql.py b/superset/db_engine_specs/mysql.py
index 4bb5979706b5..2fb1e9737bb6 100644
--- a/superset/db_engine_specs/mysql.py
+++ b/superset/db_engine_specs/mysql.py
@@ -37,6 +37,7 @@
 
 from superset.db_engine_specs.base import BaseEngineSpec, BasicParametersMixin
 from superset.errors import SupersetErrorType
+from superset.models.sql_lab import Query
 from superset.utils import core as utils
 from superset.utils.core import ColumnSpec, GenericDataType
 
@@ -52,6 +53,11 @@
 )
 CONNECTION_UNKNOWN_DATABASE_REGEX = re.compile("Unknown database '(?P<database>.*?)'")
 
+SYNTAX_ERROR_REGEX = re.compile(
+    "check the manual that corresponds to your MySQL server "
+    "version for the right syntax to use near '(?P<server_error>.*)"
+)
+
 
 class MySQLEngineSpec(BaseEngineSpec, BasicParametersMixin):
     engine = "mysql"
@@ -134,6 +140,14 @@ class MySQLEngineSpec(BaseEngineSpec, BasicParametersMixin):
             SupersetErrorType.CONNECTION_UNKNOWN_DATABASE_ERROR,
             {"invalid": ["database"]},
         ),
+        SYNTAX_ERROR_REGEX: (
+            __(
+                'Please check your query for syntax errors near "%(server_error)s". '
+                "Then, try running your query again."
+            ),
+            SupersetErrorType.SYNTAX_ERROR,
+            {},
+        ),
     }
 
     @classmethod
@@ -157,6 +171,7 @@ def adjust_database_uri(
     def get_datatype(cls, type_code: Any) -> Optional[str]:
         if not cls.type_code_map:
             # only import and store if needed at least once
+            # pylint: disable=import-outside-toplevel
             import MySQLdb
 
             ft = MySQLdb.constants.FIELD_TYPE
@@ -186,7 +201,7 @@ def _extract_error_message(cls, ex: Exception) -> str:
         return message
 
     @classmethod
-    def get_column_spec(  # type: ignore
+    def get_column_spec(
         cls,
         native_type: Optional[str],
         source: utils.ColumnTypeSource = utils.ColumnTypeSource.GET_TABLE,
@@ -207,3 +222,34 @@ def get_column_spec(  # type: ignore
         return super().get_column_spec(
             native_type, column_type_mappings=column_type_mappings
         )
+
+    @classmethod
+    def get_cancel_query_id(cls, cursor: Any, query: Query) -> Optional[str]:
+        """
+        Get MySQL connection ID that will be used to cancel all other running
+        queries in the same connection.
+
+        :param cursor: Cursor instance in which the query will be executed
+        :param query: Query instance
+        :return: MySQL Connection ID
+        """
+        cursor.execute("SELECT CONNECTION_ID()")
+        row = cursor.fetchone()
+        return row[0]
+
+    @classmethod
+    def cancel_query(cls, cursor: Any, query: Query, cancel_query_id: str) -> bool:
+        """
+        Cancel query in the underlying database.
+
+        :param cursor: New cursor instance to the db of the query
+        :param query: Query instance
+        :param cancel_query_id: MySQL Connection ID
+        :return: True if query cancelled successfully, False otherwise
+        """
+        try:
+            cursor.execute(f"KILL CONNECTION {cancel_query_id}")
+        except Exception:  # pylint: disable=broad-except
+            return False
+
+        return True
diff --git a/superset/db_engine_specs/netezza.py b/superset/db_engine_specs/netezza.py
new file mode 100644
index 000000000000..469ac4fa1984
--- /dev/null
+++ b/superset/db_engine_specs/netezza.py
@@ -0,0 +1,40 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from superset.db_engine_specs.postgres import PostgresBaseEngineSpec
+
+
+class NetezzaEngineSpec(PostgresBaseEngineSpec):
+
+    engine = "netezza"
+    default_driver = "nzpy"
+    engine_name = "IBM Netezza Performance Server"
+
+    _time_grain_expressions = {
+        None: "{col}",
+        "PT1S": "DATE_TRUNC('second', {col})",
+        "PT1M": "DATE_TRUNC('minute', {col})",
+        "PT1H": "DATE_TRUNC('hour', {col})",
+        "P1D": "DATE_TRUNC('day', {col})",
+        "P1W": "DATE_TRUNC('week', {col})",
+        "P1M": "DATE_TRUNC('month', {col})",
+        "P0.25Y": "DATE_TRUNC('quarter', {col})",
+        "P1Y": "DATE_TRUNC('year', {col})",
+    }
+
+    @classmethod
+    def epoch_to_dttm(cls) -> str:
+        return "(timestamp 'epoch' + {col} * interval '1 second')"
diff --git a/superset/db_engine_specs/postgres.py b/superset/db_engine_specs/postgres.py
index 513e01eb0cd7..4d1936310d4d 100644
--- a/superset/db_engine_specs/postgres.py
+++ b/superset/db_engine_specs/postgres.py
@@ -40,6 +40,7 @@
 from superset.db_engine_specs.base import BaseEngineSpec, BasicParametersMixin
 from superset.errors import SupersetErrorType
 from superset.exceptions import SupersetException
+from superset.models.sql_lab import Query
 from superset.utils import core as utils
 from superset.utils.core import ColumnSpec, GenericDataType
 
@@ -80,6 +81,12 @@ class FixedOffsetTimezone(_FixedOffset):
 CONNECTION_UNKNOWN_DATABASE_REGEX = re.compile(
     'database "(?P<database>.*?)" does not exist'
 )
+COLUMN_DOES_NOT_EXIST_REGEX = re.compile(
+    r'postgresql error: column "(?P<column_name>.+?)" '
+    r"does not exist\s+LINE (?P<location>\d+?)"
+)
+
+SYNTAX_ERROR_REGEX = re.compile('syntax error at or near "(?P<syntax_error>.*?)"')
 
 
 class PostgresBaseEngineSpec(BaseEngineSpec):
@@ -100,7 +107,7 @@ class PostgresBaseEngineSpec(BaseEngineSpec):
         "P1Y": "DATE_TRUNC('year', {col})",
     }
 
-    custom_errors = {
+    custom_errors: Dict[Pattern[str], Tuple[str, SupersetErrorType, Dict[str, Any]]] = {
         CONNECTION_INVALID_USERNAME_REGEX: (
             __('The username "%(username)s" does not exist.'),
             SupersetErrorType.CONNECTION_INVALID_USERNAME_ERROR,
@@ -139,6 +146,22 @@ class PostgresBaseEngineSpec(BaseEngineSpec):
             SupersetErrorType.CONNECTION_UNKNOWN_DATABASE_ERROR,
             {"invalid": ["database"]},
         ),
+        COLUMN_DOES_NOT_EXIST_REGEX: (
+            __(
+                'We can\'t seem to resolve the column "%(column_name)s" at '
+                "line %(location)s.",
+            ),
+            SupersetErrorType.COLUMN_DOES_NOT_EXIST_ERROR,
+            {},
+        ),
+        SYNTAX_ERROR_REGEX: (
+            __(
+                "Please check your query for syntax errors at or "
+                'near "%(syntax_error)s". Then, try running your query again.'
+            ),
+            SupersetErrorType.SYNTAX_ERROR,
+            {},
+        ),
     }
 
     @classmethod
@@ -164,7 +187,7 @@ class PostgresEngineSpec(PostgresBaseEngineSpec, BasicParametersMixin):
         "postgresql://user:password@host:port/dbname[?key=value&key=value...]"
     )
     # https://www.postgresql.org/docs/9.1/libpq-ssl.html#LIBQ-SSL-CERTIFICATES
-    encryption_parameters = {"sslmode": "verify-ca"}
+    encryption_parameters = {"sslmode": "require"}
 
     max_column_name_length = 63
     try_remove_schema_from_table_name = False
@@ -239,8 +262,8 @@ def get_extra_params(database: "Database") -> Dict[str, Any]:
         """
         try:
             extra = json.loads(database.extra or "{}")
-        except json.JSONDecodeError:
-            raise SupersetException("Unable to parse database extras")
+        except json.JSONDecodeError as ex:
+            raise SupersetException("Unable to parse database extras") from ex
 
         if database.server_cert:
             engine_params = extra.get("engine_params", {})
@@ -253,7 +276,7 @@ def get_extra_params(database: "Database") -> Dict[str, Any]:
         return extra
 
     @classmethod
-    def get_column_spec(  # type: ignore
+    def get_column_spec(
         cls,
         native_type: Optional[str],
         source: utils.ColumnTypeSource = utils.ColumnTypeSource.GET_TABLE,
@@ -274,3 +297,38 @@ def get_column_spec(  # type: ignore
         return super().get_column_spec(
             native_type, column_type_mappings=column_type_mappings
         )
+
+    @classmethod
+    def get_cancel_query_id(cls, cursor: Any, query: Query) -> Optional[str]:
+        """
+        Get Postgres PID that will be used to cancel all other running
+        queries in the same session.
+
+        :param cursor: Cursor instance in which the query will be executed
+        :param query: Query instance
+        :return: Postgres PID
+        """
+        cursor.execute("SELECT pg_backend_pid()")
+        row = cursor.fetchone()
+        return row[0]
+
+    @classmethod
+    def cancel_query(cls, cursor: Any, query: Query, cancel_query_id: str) -> bool:
+        """
+        Cancel query in the underlying database.
+
+        :param cursor: New cursor instance to the db of the query
+        :param query: Query instance
+        :param cancel_query_id: Postgres PID
+        :return: True if query cancelled successfully, False otherwise
+        """
+        try:
+            cursor.execute(
+                "SELECT pg_terminate_backend(pid) "
+                "FROM pg_stat_activity "
+                f"WHERE pid='{cancel_query_id}'"
+            )
+        except Exception:  # pylint: disable=broad-except
+            return False
+
+        return True
diff --git a/superset/db_engine_specs/presto.py b/superset/db_engine_specs/presto.py
index 3ffe45942205..51d7951359de 100644
--- a/superset/db_engine_specs/presto.py
+++ b/superset/db_engine_specs/presto.py
@@ -341,7 +341,7 @@ def _split_data_type(cls, data_type: str, delimiter: str) -> List[str]:
         )
 
     @classmethod
-    def _parse_structural_column(  # pylint: disable=too-many-locals,too-many-branches
+    def _parse_structural_column(  # pylint: disable=too-many-locals
         cls,
         parent_column_name: str,
         parent_data_type: str,
@@ -655,9 +655,7 @@ def select_star(  # pylint: disable=too-many-arguments
         )
 
     @classmethod
-    def estimate_statement_cost(  # pylint: disable=too-many-locals
-        cls, statement: str, cursor: Any
-    ) -> Dict[str, Any]:
+    def estimate_statement_cost(cls, statement: str, cursor: Any) -> Dict[str, Any]:
         """
         Run a SQL query that estimates the cost of a given statement.
 
@@ -749,7 +747,7 @@ def convert_dttm(cls, target_type: str, dttm: datetime) -> Optional[str]:
         if tt == utils.TemporalType.DATE:
             return f"""from_iso8601_date('{dttm.date().isoformat()}')"""
         if tt == utils.TemporalType.TIMESTAMP:
-            return f"""from_iso8601_timestamp('{dttm.isoformat(timespec="microseconds")}')"""  # pylint: disable=line-too-long
+            return f"""from_iso8601_timestamp('{dttm.isoformat(timespec="microseconds")}')"""  # pylint: disable=line-too-long,useless-suppression
         return None
 
     @classmethod
@@ -777,7 +775,7 @@ def get_all_datasource_names(
         return datasource_names
 
     @classmethod
-    def expand_data(  # pylint: disable=too-many-locals,too-many-branches
+    def expand_data(  # pylint: disable=too-many-locals
         cls, columns: List[Dict[Any, Any]], data: List[Dict[Any, Any]]
     ) -> Tuple[List[Dict[Any, Any]], List[Dict[Any, Any]], List[Dict[Any, Any]]]:
         """
@@ -925,6 +923,7 @@ def get_create_view(
         :param schema: Schema name
         :param table: Table (view) name
         """
+        # pylint: disable=import-outside-toplevel
         from pyhive.exc import DatabaseError
 
         engine = cls.get_engine(database, schema)
@@ -1212,7 +1211,7 @@ def is_readonly_query(cls, parsed_query: ParsedQuery) -> bool:
         return super().is_readonly_query(parsed_query) or parsed_query.is_show()
 
     @classmethod
-    def get_column_spec(  # type: ignore
+    def get_column_spec(
         cls,
         native_type: Optional[str],
         source: utils.ColumnTypeSource = utils.ColumnTypeSource.GET_TABLE,
@@ -1234,3 +1233,15 @@ def get_column_spec(  # type: ignore
             return column_spec
 
         return super().get_column_spec(native_type)
+
+    @classmethod
+    def has_implicit_cancel(cls) -> bool:
+        """
+        Return True if the live cursor handles the implicit cancelation of the query,
+        False otherise.
+
+        :return: Whether the live cursor implicitly cancels the query
+        :see: handle_cursor
+        """
+
+        return True
diff --git a/superset/db_engine_specs/rockset.py b/superset/db_engine_specs/rockset.py
new file mode 100644
index 000000000000..27e626776d26
--- /dev/null
+++ b/superset/db_engine_specs/rockset.py
@@ -0,0 +1,69 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from datetime import datetime
+from typing import Optional, TYPE_CHECKING
+
+from superset.db_engine_specs.base import BaseEngineSpec
+from superset.utils import core as utils
+
+if TYPE_CHECKING:
+    from superset.connectors.sqla.models import TableColumn
+
+
+class RocksetEngineSpec(BaseEngineSpec):
+
+    engine = "rockset"
+    engine_name = "Rockset"
+
+    _time_grain_expressions = {
+        None: "{col}",
+        "PT1S": "DATE_TRUNC('second', {col})",
+        "PT1M": "DATE_TRUNC('minute', {col})",
+        "PT1H": "DATE_TRUNC('hour', {col})",
+        "P1D": "DATE_TRUNC('day', {col})",
+        "P1W": "DATE_TRUNC('week', {col})",
+        "P1M": "DATE_TRUNC('month', {col})",
+        "P0.25Y": "DATE_TRUNC('quarter', {col})",
+        "P1Y": "DATE_TRUNC('year', {col})",
+    }
+
+    @classmethod
+    def epoch_to_dttm(cls) -> str:
+        return "{col} * 1000"
+
+    @classmethod
+    def epoch_ms_to_dttm(cls) -> str:
+        return "{col}"
+
+    @classmethod
+    def convert_dttm(cls, target_type: str, dttm: datetime) -> Optional[str]:
+        print(cls)
+        tt = target_type.upper()
+        if tt == utils.TemporalType.DATE:
+            return f"DATE '{dttm.date().isoformat()}'"
+        if tt == utils.TemporalType.DATETIME:
+            dttm_formatted = dttm.isoformat(sep=" ", timespec="microseconds")
+            return f"""DATETIME '{dttm_formatted}'"""
+        if tt == utils.TemporalType.TIMESTAMP:
+            dttm_formatted = dttm.isoformat(timespec="microseconds")
+            return f"""TIMESTAMP '{dttm_formatted}'"""
+        return None
+
+    @classmethod
+    def alter_new_orm_column(cls, orm_col: "TableColumn") -> None:
+        if orm_col.type == "TIMESTAMP":
+            orm_col.python_date_format = "epoch_ms"
diff --git a/superset/db_engine_specs/snowflake.py b/superset/db_engine_specs/snowflake.py
index 7cce0581e9fa..6dd85706562b 100644
--- a/superset/db_engine_specs/snowflake.py
+++ b/superset/db_engine_specs/snowflake.py
@@ -15,18 +15,32 @@
 # specific language governing permissions and limitations
 # under the License.
 import json
+import re
 from datetime import datetime
-from typing import Optional, TYPE_CHECKING
+from typing import Any, Dict, Optional, Pattern, Tuple, TYPE_CHECKING
 from urllib import parse
 
+from flask_babel import gettext as __
 from sqlalchemy.engine.url import URL
 
 from superset.db_engine_specs.postgres import PostgresBaseEngineSpec
+from superset.errors import SupersetErrorType
+from superset.models.sql_lab import Query
 from superset.utils import core as utils
 
 if TYPE_CHECKING:
     from superset.models.core import Database
 
+# Regular expressions to catch custom errors
+OBJECT_DOES_NOT_EXIST_REGEX = re.compile(
+    r"Object (?P<object>.*?) does not exist or not authorized."
+)
+
+SYNTAX_ERROR_REGEX = re.compile(
+    "syntax error line (?P<line>.+?) at position (?P<position>.+?) "
+    "unexpected '(?P<syntax_error>.+?)'."
+)
+
 
 class SnowflakeEngineSpec(PostgresBaseEngineSpec):
     engine = "snowflake"
@@ -54,6 +68,22 @@ class SnowflakeEngineSpec(PostgresBaseEngineSpec):
         "P1Y": "DATE_TRUNC('YEAR', {col})",
     }
 
+    custom_errors: Dict[Pattern[str], Tuple[str, SupersetErrorType, Dict[str, Any]]] = {
+        OBJECT_DOES_NOT_EXIST_REGEX: (
+            __("%(object)s does not exist in this database."),
+            SupersetErrorType.OBJECT_DOES_NOT_EXIST_ERROR,
+            {},
+        ),
+        SYNTAX_ERROR_REGEX: (
+            __(
+                "Please check your query for syntax errors at or "
+                'near "%(syntax_error)s". Then, try running your query again.'
+            ),
+            SupersetErrorType.SYNTAX_ERROR,
+            {},
+        ),
+    }
+
     @classmethod
     def adjust_database_uri(
         cls, uri: URL, selected_schema: Optional[str] = None
@@ -99,3 +129,34 @@ def mutate_db_for_connection_test(database: "Database") -> None:
         engine_params["connect_args"] = connect_args
         extra["engine_params"] = engine_params
         database.extra = json.dumps(extra)
+
+    @classmethod
+    def get_cancel_query_id(cls, cursor: Any, query: Query) -> Optional[str]:
+        """
+        Get Snowflake session ID that will be used to cancel all other running
+        queries in the same session.
+
+        :param cursor: Cursor instance in which the query will be executed
+        :param query: Query instance
+        :return: Snowflake Session ID
+        """
+        cursor.execute("SELECT CURRENT_SESSION()")
+        row = cursor.fetchone()
+        return row[0]
+
+    @classmethod
+    def cancel_query(cls, cursor: Any, query: Query, cancel_query_id: str) -> bool:
+        """
+        Cancel query in the underlying database.
+
+        :param cursor: New cursor instance to the db of the query
+        :param query: Query instance
+        :param cancel_query_id: Snowflake Session ID
+        :return: True if query cancelled successfully, False otherwise
+        """
+        try:
+            cursor.execute(f"SELECT SYSTEM$CANCEL_ALL_QUERIES({cancel_query_id})")
+        except Exception:  # pylint: disable=broad-except
+            return False
+
+        return True
diff --git a/superset/db_engine_specs/sqlite.py b/superset/db_engine_specs/sqlite.py
index 07706d2d8ea8..d2b87a488950 100644
--- a/superset/db_engine_specs/sqlite.py
+++ b/superset/db_engine_specs/sqlite.py
@@ -14,12 +14,15 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+import re
 from datetime import datetime
-from typing import List, Optional, TYPE_CHECKING
+from typing import Any, Dict, List, Optional, Pattern, Tuple, TYPE_CHECKING
 
+from flask_babel import gettext as __
 from sqlalchemy.engine.reflection import Inspector
 
 from superset.db_engine_specs.base import BaseEngineSpec
+from superset.errors import SupersetErrorType
 from superset.utils import core as utils
 
 if TYPE_CHECKING:
@@ -27,18 +30,20 @@
     from superset.models.core import Database
 
 
+COLUMN_DOES_NOT_EXIST_REGEX = re.compile("no such column: (?P<column_name>.+)")
+
+
 class SqliteEngineSpec(BaseEngineSpec):
     engine = "sqlite"
     engine_name = "SQLite"
 
-    # pylint: disable=line-too-long
     _time_grain_expressions = {
         None: "{col}",
         "PT1S": "DATETIME(STRFTIME('%Y-%m-%dT%H:%M:%S', {col}))",
         "PT1M": "DATETIME(STRFTIME('%Y-%m-%dT%H:%M:00', {col}))",
         "PT1H": "DATETIME(STRFTIME('%Y-%m-%dT%H:00:00', {col}))",
         "P1D": "DATE({col})",
-        "P1W": "DATE({col}, -strftime('%W', {col}) || ' days')",
+        "P1W": "DATE({col}, -strftime('%w', {col}) || ' days')",
         "P1M": "DATE({col}, -strftime('%d', {col}) || ' days', '+1 day')",
         "P0.25Y": (
             "DATETIME(STRFTIME('%Y-', {col}) || "  # year
@@ -53,6 +58,14 @@ class SqliteEngineSpec(BaseEngineSpec):
         "1969-12-28T00:00:00Z/P1W": "DATE({col}, 'weekday 0', '-7 days')",
     }
 
+    custom_errors: Dict[Pattern[str], Tuple[str, SupersetErrorType, Dict[str, Any]]] = {
+        COLUMN_DOES_NOT_EXIST_REGEX: (
+            __('We can\'t seem to resolve the column "%(column_name)s"'),
+            SupersetErrorType.COLUMN_DOES_NOT_EXIST_ERROR,
+            {},
+        ),
+    }
+
     @classmethod
     def epoch_to_dttm(cls) -> str:
         return "datetime({col}, 'unixepoch')"
diff --git a/superset/db_engine_specs/trino.py b/superset/db_engine_specs/trino.py
index 7c60e622855b..7d28cfbaa604 100644
--- a/superset/db_engine_specs/trino.py
+++ b/superset/db_engine_specs/trino.py
@@ -15,9 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 from datetime import datetime
-from typing import Any, Dict, Optional
+from typing import Any, Dict, List, Optional
 from urllib import parse
 
+import simplejson as json
 from sqlalchemy.engine.url import make_url, URL
 
 from superset.db_engine_specs.base import BaseEngineSpec
@@ -28,7 +29,6 @@ class TrinoEngineSpec(BaseEngineSpec):
     engine = "trino"
     engine_name = "Trino"
 
-    # pylint: disable=line-too-long
     _time_grain_expressions = {
         None: "{col}",
         "PT1S": "date_trunc('second', CAST({col} AS TIMESTAMP))",
@@ -103,3 +103,81 @@ def modify_url_for_impersonation(
         :param username: Effective username
         """
         # Do nothing and let update_impersonation_config take care of impersonation
+
+    @classmethod
+    def get_allow_cost_estimate(cls, extra: Dict[str, Any]) -> bool:
+        return True
+
+    @classmethod
+    def estimate_statement_cost(cls, statement: str, cursor: Any) -> Dict[str, Any]:
+        """
+        Run a SQL query that estimates the cost of a given statement.
+
+        :param statement: A single SQL statement
+        :param database: Database instance
+        :param cursor: Cursor instance
+        :param username: Effective username
+        :return: JSON response from Trino
+        """
+        sql = f"EXPLAIN (TYPE IO, FORMAT JSON) {statement}"
+        cursor.execute(sql)
+
+        # the output from Trino is a single column and a single row containing
+        # JSON:
+        #
+        #   {
+        #     ...
+        #     "estimate" : {
+        #       "outputRowCount" : 8.73265878E8,
+        #       "outputSizeInBytes" : 3.41425774958E11,
+        #       "cpuCost" : 3.41425774958E11,
+        #       "maxMemory" : 0.0,
+        #       "networkCost" : 3.41425774958E11
+        #     }
+        #   }
+        result = json.loads(cursor.fetchone()[0])
+        return result
+
+    @classmethod
+    def query_cost_formatter(
+        cls, raw_cost: List[Dict[str, Any]]
+    ) -> List[Dict[str, str]]:
+        """
+        Format cost estimate.
+
+        :param raw_cost: JSON estimate from Trino
+        :return: Human readable cost estimate
+        """
+
+        def humanize(value: Any, suffix: str) -> str:
+            try:
+                value = int(value)
+            except ValueError:
+                return str(value)
+
+            prefixes = ["K", "M", "G", "T", "P", "E", "Z", "Y"]
+            prefix = ""
+            to_next_prefix = 1000
+            while value > to_next_prefix and prefixes:
+                prefix = prefixes.pop(0)
+                value //= to_next_prefix
+
+            return f"{value} {prefix}{suffix}"
+
+        cost = []
+        columns = [
+            ("outputRowCount", "Output count", " rows"),
+            ("outputSizeInBytes", "Output size", "B"),
+            ("cpuCost", "CPU cost", ""),
+            ("maxMemory", "Max memory", "B"),
+            ("networkCost", "Network cost", ""),
+        ]
+        for row in raw_cost:
+            estimate: Dict[str, float] = row.get("estimate", {})
+            statement_cost = {}
+            for key, label, suffix in columns:
+                if key in estimate:
+                    statement_cost[label] = humanize(estimate[key], suffix).strip()
+            cost.append(statement_cost)
+
+        return cost
diff --git a/superset/db_engines/hive.py b/superset/db_engines/hive.py
index 467a8df2c706..37fe50f5e21e 100644
--- a/superset/db_engines/hive.py
+++ b/superset/db_engines/hive.py
@@ -35,6 +35,7 @@ def fetch_logs(
     .. note::
         This is not a part of DB-API.
     """
+    # pylint: disable=import-outside-toplevel
     from pyhive import hive
     from TCLIService import ttypes
     from thrift import Thrift
@@ -45,9 +46,9 @@ def fetch_logs(
         logs = self._connection.client.GetLog(req).log
         return logs
     # raised if Hive is used
-    except (ttypes.TApplicationException, Thrift.TApplicationException):
+    except (ttypes.TApplicationException, Thrift.TApplicationException) as ex:
         if self._state == self._STATE_NONE:
-            raise hive.ProgrammingError("No query yet")
+            raise hive.ProgrammingError("No query yet") from ex
         logs = []
         while True:
             req = ttypes.TFetchResultsReq(
diff --git a/superset/errors.py b/superset/errors.py
index 961cca444c98..abfa65352fde 100644
--- a/superset/errors.py
+++ b/superset/errors.py
@@ -14,8 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# pylint: disable=too-few-public-methods,invalid-name
-from dataclasses import dataclass  # pylint: disable=wrong-import-order
+from dataclasses import dataclass
 from enum import Enum
 from typing import Any, Dict, Optional
 
@@ -44,11 +43,14 @@ class SupersetErrorType(str, Enum):
     CONNECTION_INVALID_PASSWORD_ERROR = "CONNECTION_INVALID_PASSWORD_ERROR"
     CONNECTION_INVALID_HOSTNAME_ERROR = "CONNECTION_INVALID_HOSTNAME_ERROR"
     CONNECTION_PORT_CLOSED_ERROR = "CONNECTION_PORT_CLOSED_ERROR"
+    CONNECTION_INVALID_PORT_ERROR = "CONNECTION_INVALID_PORT_ERROR"
     CONNECTION_HOST_DOWN_ERROR = "CONNECTION_HOST_DOWN_ERROR"
     CONNECTION_ACCESS_DENIED_ERROR = "CONNECTION_ACCESS_DENIED_ERROR"
     CONNECTION_UNKNOWN_DATABASE_ERROR = "CONNECTION_UNKNOWN_DATABASE_ERROR"
     CONNECTION_DATABASE_PERMISSIONS_ERROR = "CONNECTION_DATABASE_PERMISSIONS_ERROR"
     CONNECTION_MISSING_PARAMETERS_ERROR = "CONNECTION_MISSING_PARAMETERS_ERROR"
+    OBJECT_DOES_NOT_EXIST_ERROR = "OBJECT_DOES_NOT_EXIST_ERROR"
+    SYNTAX_ERROR = "SYNTAX_ERROR"
 
     # Viz errors
     VIZ_GET_DF_ERROR = "VIZ_GET_DF_ERROR"
@@ -59,13 +61,23 @@ class SupersetErrorType(str, Enum):
     TABLE_SECURITY_ACCESS_ERROR = "TABLE_SECURITY_ACCESS_ERROR"
     DATASOURCE_SECURITY_ACCESS_ERROR = "DATASOURCE_SECURITY_ACCESS_ERROR"
     DATABASE_SECURITY_ACCESS_ERROR = "DATABASE_SECURITY_ACCESS_ERROR"
+    QUERY_SECURITY_ACCESS_ERROR = "QUERY_SECURITY_ACCESS_ERROR"
     MISSING_OWNERSHIP_ERROR = "MISSING_OWNERSHIP_ERROR"
 
     # Other errors
     BACKEND_TIMEOUT_ERROR = "BACKEND_TIMEOUT_ERROR"
+    DATABASE_NOT_FOUND_ERROR = "DATABASE_NOT_FOUND_ERROR"
 
     # Sql Lab errors
     MISSING_TEMPLATE_PARAMS_ERROR = "MISSING_TEMPLATE_PARAMS_ERROR"
+    INVALID_TEMPLATE_PARAMS_ERROR = "INVALID_TEMPLATE_PARAMS_ERROR"
+    RESULTS_BACKEND_NOT_CONFIGURED_ERROR = "RESULTS_BACKEND_NOT_CONFIGURED_ERROR"
+    DML_NOT_ALLOWED_ERROR = "DML_NOT_ALLOWED_ERROR"
+    INVALID_CTAS_QUERY_ERROR = "INVALID_CTAS_QUERY_ERROR"
+    INVALID_CVAS_QUERY_ERROR = "INVALID_CVAS_QUERY_ERROR"
+    SQLLAB_TIMEOUT_ERROR = "SQLLAB_TIMEOUT_ERROR"
+    RESULTS_BACKEND_ERROR = "RESULTS_BACKEND_ERROR"
+    ASYNC_WORKERS_ERROR = "ASYNC_WORKERS_ERROR"
 
     # Generic errors
     GENERIC_COMMAND_ERROR = "GENERIC_COMMAND_ERROR"
@@ -76,180 +88,89 @@ class SupersetErrorType(str, Enum):
     INVALID_PAYLOAD_SCHEMA_ERROR = "INVALID_PAYLOAD_SCHEMA_ERROR"
 
 
+ISSUE_CODES = {
+    1000: _("The datasource is too large to query."),
+    1001: _("The database is under an unusual load."),
+    1002: _("The database returned an unexpected error."),
+    1003: _(
+        "There is a syntax error in the SQL query. "
+        "Perhaps there was a misspelling or a typo."
+    ),
+    1004: _("The column was deleted or renamed in the database."),
+    1005: _("The table was deleted or renamed in the database."),
+    1006: _("One or more parameters specified in the query are missing."),
+    1007: _("The hostname provided can't be resolved."),
+    1008: _("The port is closed."),
+    1009: _("The host might be down, and can't be reached on the provided port."),
+    1010: _("Superset encountered an error while running a command."),
+    1011: _("Superset encountered an unexpected error."),
+    1012: _("The username provided when connecting to a database is not valid."),
+    1013: _("The password provided when connecting to a database is not valid."),
+    1014: _("Either the username or the password is wrong."),
+    1015: _("Either the database is spelled incorrectly or does not exist."),
+    1016: _("The schema was deleted or renamed in the database."),
+    1017: _("User doesn't have the proper permissions."),
+    1018: _("One or more parameters needed to configure a database are missing."),
+    1019: _("The submitted payload has the incorrect format."),
+    1020: _("The submitted payload has the incorrect schema."),
+    1021: _("Results backend needed for asynchronous queries is not configured."),
+    1022: _("Database does not allow data manipulation."),
+    1023: _(
+        "The CTAS (create table as select) doesn't have a "
+        "SELECT statement at the end. Please make sure your query has a "
+        "SELECT as its last statement. Then, try running your query again."
+    ),
+    1024: _("CVAS (create view as select) query has more than one statement."),
+    1025: _("CVAS (create view as select) query is not a SELECT statement."),
+    1026: _("Query is too complex and takes too long to run."),
+    1027: _("The database is currently running too many queries."),
+    1028: _("One or more parameters specified in the query are malformatted."),
+    1029: _("The object does not exist in the given database."),
+    1030: _("The query has a syntax error."),
+    1031: _("The results backend no longer has the data from the query."),
+    1032: _("The query associated with the results was deleted."),
+    1033: _(
+        "The results stored in the backend were stored in a "
+        "different format, and no longer can be deserialized."
+    ),
+    1034: _("The port number is invalid."),
+    1035: _("Failed to start remote query on a worker."),
+    1036: _("The database was deleted."),
+}
+
+
 ERROR_TYPES_TO_ISSUE_CODES_MAPPING = {
-    SupersetErrorType.BACKEND_TIMEOUT_ERROR: [
-        {
-            "code": 1000,
-            "message": _("Issue 1000 - The datasource is too large to query."),
-        },
-        {
-            "code": 1001,
-            "message": _("Issue 1001 - The database is under an unusual load."),
-        },
-    ],
-    SupersetErrorType.GENERIC_DB_ENGINE_ERROR: [
-        {
-            "code": 1002,
-            "message": _("Issue 1002 - The database returned an unexpected error."),
-        }
-    ],
-    SupersetErrorType.COLUMN_DOES_NOT_EXIST_ERROR: [
-        {
-            "code": 1003,
-            "message": _(
-                "Issue 1003 - There is a syntax error in the SQL query. "
-                "Perhaps there was a misspelling or a typo."
-            ),
-        },
-        {
-            "code": 1004,
-            "message": _(
-                "Issue 1004 - The column was deleted or renamed in the database."
-            ),
-        },
-    ],
-    SupersetErrorType.TABLE_DOES_NOT_EXIST_ERROR: [
-        {
-            "code": 1003,
-            "message": _(
-                "Issue 1003 - There is a syntax error in the SQL query. "
-                "Perhaps there was a misspelling or a typo."
-            ),
-        },
-        {
-            "code": 1005,
-            "message": _(
-                "Issue 1005 - The table was deleted or renamed in the database."
-            ),
-        },
-    ],
-    SupersetErrorType.SCHEMA_DOES_NOT_EXIST_ERROR: [
-        {
-            "code": 1003,
-            "message": _(
-                "Issue 1003 - There is a syntax error in the SQL query. "
-                "Perhaps there was a misspelling or a typo."
-            ),
-        },
-        {
-            "code": 1016,
-            "message": _(
-                "Issue 1005 - The schema was deleted or renamed in the database."
-            ),
-        },
-    ],
-    SupersetErrorType.MISSING_TEMPLATE_PARAMS_ERROR: [
-        {
-            "code": 1006,
-            "message": _(
-                "Issue 1006 - One or more parameters specified in the query are "
-                "missing."
-            ),
-        },
-    ],
-    SupersetErrorType.CONNECTION_INVALID_HOSTNAME_ERROR: [
-        {
-            "code": 1007,
-            "message": _("Issue 1007 - The hostname provided can't be resolved."),
-        },
-    ],
-    SupersetErrorType.CONNECTION_PORT_CLOSED_ERROR: [
-        {"code": 1008, "message": _("Issue 1008 - The port is closed.")},
-    ],
-    SupersetErrorType.CONNECTION_HOST_DOWN_ERROR: [
-        {
-            "code": 1009,
-            "message": _(
-                "Issue 1009 - The host might be down, and can't be reached on the "
-                "provided port."
-            ),
-        },
-    ],
-    SupersetErrorType.GENERIC_COMMAND_ERROR: [
-        {
-            "code": 1010,
-            "message": _(
-                "Issue 1010 - Superset encountered an error while running a command."
-            ),
-        },
-    ],
-    SupersetErrorType.GENERIC_BACKEND_ERROR: [
-        {
-            "code": 1011,
-            "message": _("Issue 1011 - Superset encountered an unexpected error."),
-        },
-    ],
-    SupersetErrorType.CONNECTION_INVALID_USERNAME_ERROR: [
-        {
-            "code": 1012,
-            "message": _(
-                "Issue 1012 - The username provided when "
-                "connecting to a database is not valid."
-            ),
-        },
-    ],
-    SupersetErrorType.CONNECTION_INVALID_PASSWORD_ERROR: [
-        {
-            "code": 1013,
-            "message": _(
-                "Issue 1013 - The password provided when "
-                "connecting to a database is not valid."
-            ),
-        },
-    ],
-    SupersetErrorType.CONNECTION_ACCESS_DENIED_ERROR: [
-        {
-            "code": 1014,
-            "message": _("Issue 1014 - Either the username or the password is wrong."),
-        },
-        {
-            "code": 1015,
-            "message": _(
-                "Issue 1015 - Either the database is "
-                "spelled incorrectly or does not exist."
-            ),
-        },
-    ],
-    SupersetErrorType.CONNECTION_UNKNOWN_DATABASE_ERROR: [
-        {
-            "code": 1015,
-            "message": _(
-                "Issue 1015 - Either the database is "
-                "spelled incorrectly or does not exist."
-            ),
-        }
-    ],
-    SupersetErrorType.CONNECTION_DATABASE_PERMISSIONS_ERROR: [
-        {
-            "code": 1017,
-            "message": _("Issue 1017 - User doesn't have the proper permissions."),
-        },
-    ],
-    SupersetErrorType.CONNECTION_MISSING_PARAMETERS_ERROR: [
-        {
-            "code": 1018,
-            "message": _(
-                "Issue 1018 - One or more parameters needed to configure a "
-                "database are missing."
-            ),
-        },
-    ],
-    SupersetErrorType.INVALID_PAYLOAD_FORMAT_ERROR: [
-        {
-            "code": 1019,
-            "message": _(
-                "Issue 1019 - The submitted payload has the incorrect format."
-            ),
-        }
-    ],
-    SupersetErrorType.INVALID_PAYLOAD_SCHEMA_ERROR: [
-        {
-            "code": 1020,
-            "message": _(
-                "Issue 1020 - The submitted payload has the incorrect schema."
-            ),
-        }
-    ],
+    SupersetErrorType.BACKEND_TIMEOUT_ERROR: [1000, 1001],
+    SupersetErrorType.GENERIC_DB_ENGINE_ERROR: [1002],
+    SupersetErrorType.COLUMN_DOES_NOT_EXIST_ERROR: [1003, 1004],
+    SupersetErrorType.TABLE_DOES_NOT_EXIST_ERROR: [1003, 1005],
+    SupersetErrorType.SCHEMA_DOES_NOT_EXIST_ERROR: [1003, 1016],
+    SupersetErrorType.MISSING_TEMPLATE_PARAMS_ERROR: [1006],
+    SupersetErrorType.INVALID_TEMPLATE_PARAMS_ERROR: [1028],
+    SupersetErrorType.RESULTS_BACKEND_NOT_CONFIGURED_ERROR: [1021],
+    SupersetErrorType.DML_NOT_ALLOWED_ERROR: [1022],
+    SupersetErrorType.CONNECTION_INVALID_HOSTNAME_ERROR: [1007],
+    SupersetErrorType.CONNECTION_PORT_CLOSED_ERROR: [1008],
+    SupersetErrorType.CONNECTION_HOST_DOWN_ERROR: [1009],
+    SupersetErrorType.GENERIC_COMMAND_ERROR: [1010],
+    SupersetErrorType.GENERIC_BACKEND_ERROR: [1011],
+    SupersetErrorType.CONNECTION_INVALID_USERNAME_ERROR: [1012],
+    SupersetErrorType.CONNECTION_INVALID_PASSWORD_ERROR: [1013],
+    SupersetErrorType.CONNECTION_ACCESS_DENIED_ERROR: [1014, 1015],
+    SupersetErrorType.CONNECTION_UNKNOWN_DATABASE_ERROR: [1015],
+    SupersetErrorType.CONNECTION_DATABASE_PERMISSIONS_ERROR: [1017],
+    SupersetErrorType.CONNECTION_MISSING_PARAMETERS_ERROR: [1018],
+    SupersetErrorType.INVALID_PAYLOAD_FORMAT_ERROR: [1019],
+    SupersetErrorType.INVALID_PAYLOAD_SCHEMA_ERROR: [1020],
+    SupersetErrorType.INVALID_CTAS_QUERY_ERROR: [1023],
+    SupersetErrorType.INVALID_CVAS_QUERY_ERROR: [1024, 1025],
+    SupersetErrorType.SQLLAB_TIMEOUT_ERROR: [1026, 1027],
+    SupersetErrorType.OBJECT_DOES_NOT_EXIST_ERROR: [1029],
+    SupersetErrorType.SYNTAX_ERROR: [1030],
+    SupersetErrorType.RESULTS_BACKEND_ERROR: [1031, 1032, 1033],
+    SupersetErrorType.CONNECTION_INVALID_PORT_ERROR: [1034],
+    SupersetErrorType.ASYNC_WORKERS_ERROR: [1035],
+    SupersetErrorType.DATABASE_NOT_FOUND_ERROR: [1011, 1036],
 }
 
 
@@ -284,4 +205,16 @@ def __post_init__(self) -> None:
         issue_codes = ERROR_TYPES_TO_ISSUE_CODES_MAPPING.get(self.error_type)
         if issue_codes:
             self.extra = self.extra or {}
-            self.extra.update({"issue_codes": issue_codes})
+            self.extra.update(
+                {
+                    "issue_codes": [
+                        {
+                            "code": issue_code,
+                            "message": (
+                                f"Issue {issue_code} - {ISSUE_CODES[issue_code]}"
+                            ),
+                        }
+                        for issue_code in issue_codes
+                    ]
+                }
+            )
diff --git a/superset/examples/__init__.py b/superset/examples/__init__.py
index 161a52f4b4d1..a7742b0ef7df 100644
--- a/superset/examples/__init__.py
+++ b/superset/examples/__init__.py
@@ -30,5 +30,5 @@
 from .random_time_series import load_random_time_series_data
 from .sf_population_polygons import load_sf_population_polygons
 from .tabbed_dashboard import load_tabbed_dashboard
-from .utils import load_from_configs
+from .utils import load_examples_from_configs
 from .world_bank import load_world_bank_health_n_pop
diff --git a/superset/examples/bart_lines.py b/superset/examples/bart_lines.py
index 60b84b5e9043..8cdb8a3bdee8 100644
--- a/superset/examples/bart_lines.py
+++ b/superset/examples/bart_lines.py
@@ -23,7 +23,7 @@
 from superset import db
 from superset.utils.core import get_example_database
 
-from .helpers import get_example_data, TBL
+from .helpers import get_example_data, get_table_connector_registry
 
 
 def load_bart_lines(only_metadata: bool = False, force: bool = False) -> None:
@@ -53,11 +53,13 @@ def load_bart_lines(only_metadata: bool = False, force: bool = False) -> None:
         )
 
     print("Creating table {} reference".format(tbl_name))
-    tbl = db.session.query(TBL).filter_by(table_name=tbl_name).first()
+    table = get_table_connector_registry()
+    tbl = db.session.query(table).filter_by(table_name=tbl_name).first()
     if not tbl:
-        tbl = TBL(table_name=tbl_name)
+        tbl = table(table_name=tbl_name)
     tbl.description = "BART lines"
     tbl.database = database
+    tbl.filter_select_enabled = True
     db.session.merge(tbl)
     db.session.commit()
     tbl.fetch_metadata()
diff --git a/superset/examples/birth_names.py b/superset/examples/birth_names.py
index 583a0991f365..2fc1fae8c037 100644
--- a/superset/examples/birth_names.py
+++ b/superset/examples/birth_names.py
@@ -19,10 +19,11 @@
 from typing import Dict, List, Tuple, Union
 
 import pandas as pd
+from flask_appbuilder.security.sqla.models import User
 from sqlalchemy import DateTime, String
 from sqlalchemy.sql import column
 
-from superset import db, security_manager
+from superset import app, db, security_manager
 from superset.connectors.base.models import BaseDatasource
 from superset.connectors.sqla.models import SqlMetric, TableColumn
 from superset.exceptions import NoDataException
@@ -32,22 +33,24 @@
 from superset.utils.core import get_example_database
 
 from .helpers import (
-    config,
     get_example_data,
     get_slice_json,
+    get_table_connector_registry,
     merge_slice,
     misc_dash_slices,
-    TBL,
     update_slice_ids,
 )
 
-admin = security_manager.find_user("admin")
-if admin is None:
-    raise NoDataException(
-        "Admin user does not exist. "
-        "Please, check if test users are properly loaded "
-        "(`superset load_test_users`)."
-    )
+
+def get_admin_user() -> User:
+    admin = security_manager.find_user("admin")
+    if admin is None:
+        raise NoDataException(
+            "Admin user does not exist. "
+            "Please, check if test users are properly loaded "
+            "(`superset load_test_users`)."
+        )
+    return admin
 
 
 def gen_filter(
@@ -95,7 +98,6 @@ def load_birth_names(
     only_metadata: bool = False, force: bool = False, sample: bool = False
 ) -> None:
     """Loading birth name dataset from a zip file in the repo"""
-    # pylint: disable=too-many-locals
     tbl_name = "birth_names"
     database = get_example_database()
     table_exists = database.has_table_by_name(tbl_name)
@@ -103,10 +105,11 @@ def load_birth_names(
     if not only_metadata and (not table_exists or force):
         load_data(tbl_name, database, sample=sample)
 
-    obj = db.session.query(TBL).filter_by(table_name=tbl_name).first()
+    table = get_table_connector_registry()
+    obj = db.session.query(table).filter_by(table_name=tbl_name).first()
     if not obj:
         print(f"Creating table [{tbl_name}] reference")
-        obj = TBL(table_name=tbl_name)
+        obj = table(table_name=tbl_name)
         db.session.add(obj)
 
     _set_table_metadata(obj, database)
@@ -170,13 +173,14 @@ def create_slices(
         "time_range_endpoints": ["inclusive", "exclusive"],
         "granularity_sqla": "ds",
         "groupby": [],
-        "row_limit": config["ROW_LIMIT"],
+        "row_limit": app.config["ROW_LIMIT"],
         "since": "100 years ago",
         "until": "now",
         "viz_type": "table",
         "markup_type": "markdown",
     }
 
+    admin = get_admin_user()
     if admin_owner:
         slice_props = dict(
             datasource_id=tbl.id,
@@ -503,7 +507,7 @@ def create_slices(
 
 def create_dashboard(slices: List[Slice]) -> Dashboard:
     print("Creating a dashboard")
-
+    admin = get_admin_user()
     dash = db.session.query(Dashboard).filter_by(slug="births").first()
     if not dash:
         dash = Dashboard()
@@ -523,9 +527,9 @@ def create_dashboard(slices: List[Slice]) -> Dashboard:
         }
     }"""
     )
+    # pylint: disable=line-too-long
     pos = json.loads(
         textwrap.dedent(
-            # pylint: disable=line-too-long
             """\
         {
           "CHART-6GdlekVise": {
@@ -795,9 +799,10 @@ def create_dashboard(slices: List[Slice]) -> Dashboard:
             "type": "ROW"
           }
         }
-        """  # pylint: enable=line-too-long
+        """
         )
     )
+    # pylint: enable=line-too-long
     # dashboard v2 doesn't allow add markup slice
     dash.slices = [slc for slc in slices if slc.viz_type != "markup"]
     update_slice_ids(pos, dash.slices)
diff --git a/superset/examples/configs/dashboards/COVID_Vaccine_Dashboard.yaml b/superset/examples/configs/dashboards/COVID_Vaccine_Dashboard.yaml
index 28bfe4cdaaa7..89194405f2a1 100644
--- a/superset/examples/configs/dashboards/COVID_Vaccine_Dashboard.yaml
+++ b/superset/examples/configs/dashboards/COVID_Vaccine_Dashboard.yaml
@@ -16,7 +16,7 @@
 # under the License.
 dashboard_title: COVID Vaccine Dashboard
 description: null
-css: ''
+css: ""
 slug: null
 uuid: f4065089-110a-41fa-8dd7-9ce98a65e250
 position:
@@ -25,134 +25,118 @@ position:
     id: CHART-63bEuxjDMJ
     meta:
       chartId: 3961
-      height: 76
+      height: 72
       sliceName: Vaccine Candidates per Country
       sliceNameOverride: Map of Vaccine Candidates
       uuid: ddc91df6-fb40-4826-bdca-16b85af1c024
-      width: 7
+      width: 12
     parents:
-    - ROOT_ID
-    - TABS-wUKya7eQ0Z
-    - TAB-BCIJF4NvgQ
-    - ROW-zvw7luvEL
+      - ROOT_ID
+      - TABS-wUKya7eQ0Z
+      - TAB-BCIJF4NvgQ
+      - ROW-zvw7luvEL
     type: CHART
   CHART-F-fkth0Dnv:
     children: []
     id: CHART-F-fkth0Dnv
     meta:
       chartId: 3960
-      height: 76
+      height: 60
       sliceName: Vaccine Candidates per Country
       sliceNameOverride: Treemap of Vaccine Candidates per Country
       uuid: e2f5a8a7-feb0-4f79-bc6b-01fe55b98b3c
-      width: 5
+      width: 8
     parents:
-    - ROOT_ID
-    - TABS-wUKya7eQ0Z
-    - TAB-BCIJF4NvgQ
-    - ROW-zvw7luvEL
+      - ROOT_ID
+      - TABS-wUKya7eQ0Z
+      - TAB-BCIJF4NvgQ
+      - ROW-xSeNAspgw
     type: CHART
   CHART-RjD_ygqtwH:
     children: []
     id: CHART-RjD_ygqtwH
     meta:
       chartId: 3957
-      height: 59
+      height: 72
       sliceName: Vaccine Candidates per Phase
       sliceNameOverride: Vaccine Candidates per Phase
       uuid: 30b73c65-85e7-455f-bb24-801bb0cdc670
-      width: 2
+      width: 3
     parents:
-    - ROOT_ID
-    - TABS-wUKya7eQ0Z
-    - TAB-BCIJF4NvgQ
-    - ROW-xSeNAspgw
+      - ROOT_ID
+      - TABS-wUKya7eQ0Z
+      - TAB-BCIJF4NvgQ
+      - ROW-zvw7luvEL
     type: CHART
   CHART-aGfmWtliqA:
     children: []
     id: CHART-aGfmWtliqA
     meta:
       chartId: 3956
-      height: 59
+      height: 72
       sliceName: Vaccine Candidates per Phase
       uuid: 392f293e-0892-4316-bd41-c927b65606a4
+      width: 5
+    parents:
+      - ROOT_ID
+      - TABS-wUKya7eQ0Z
+      - TAB-BCIJF4NvgQ
+      - ROW-zvw7luvEL
+    type: CHART
+  CHART-j4hUvP5dDD:
+    children: []
+    id: CHART-j4hUvP5dDD
+    meta:
+      chartId: 3962
+      height: 82
+      sliceName: Vaccine Candidates per Approach & Stage
+      sliceNameOverride: Heatmap of Aproaches & Clinical Stages
+      uuid: 0c953c84-0c9a-418d-be9f-2894d2a2cee0
       width: 4
     parents:
-    - ROOT_ID
-    - TABS-wUKya7eQ0Z
-    - TAB-BCIJF4NvgQ
-    - ROW-xSeNAspgw
+      - ROOT_ID
+      - TABS-wUKya7eQ0Z
+      - TAB-BCIJF4NvgQ
+      - ROW-dieUdkeUw
     type: CHART
   CHART-dCUpAcPsji:
     children: []
     id: CHART-dCUpAcPsji
     meta:
       chartId: 3963
-      height: 82
+      height: 72
       sliceName: Vaccine Candidates per Country & Stage
       sliceNameOverride: Heatmap of Countries & Clinical Stages
       uuid: cd111331-d286-4258-9020-c7949a109ed2
       width: 4
     parents:
-    - ROOT_ID
-    - TABS-wUKya7eQ0Z
-    - TAB-BCIJF4NvgQ
-    - ROW-zhOlQLQnB
+      - ROOT_ID
+      - TABS-wUKya7eQ0Z
+      - TAB-BCIJF4NvgQ
+      - ROW-dieUdkeUw
     type: CHART
   CHART-eirDduqb1A:
     children: []
     id: CHART-eirDduqb1A
     meta:
       chartId: 3965
-      height: 59
+      height: 60
       sliceName: Filtering Vaccines
       sliceNameOverride: Filter Box of Vaccines
       uuid: c29381ce-0e99-4cf3-bf0f-5f55d6b94176
-      width: 3
-    parents:
-    - ROOT_ID
-    - TABS-wUKya7eQ0Z
-    - TAB-BCIJF4NvgQ
-    - ROW-xSeNAspgw
-    type: CHART
-  CHART-fYo7IyvKZQ:
-    children: []
-    id: CHART-fYo7IyvKZQ
-    meta:
-      chartId: 3964
-      height: 82
-      sliceName: Vaccine Candidates per Country & Stage
-      sliceNameOverride: Sunburst of Country & Clinical Stages
-      uuid: f69c556f-15fe-4a82-a8bb-69d5b6954123
-      width: 5
-    parents:
-    - ROOT_ID
-    - TABS-wUKya7eQ0Z
-    - TAB-BCIJF4NvgQ
-    - ROW-zhOlQLQnB
-    type: CHART
-  CHART-j4hUvP5dDD:
-    children: []
-    id: CHART-j4hUvP5dDD
-    meta:
-      chartId: 3962
-      height: 82
-      sliceName: Vaccine Candidates per Approach & Stage
-      sliceNameOverride: Heatmap of Aproaches & Clinical Stages
-      uuid: 0c953c84-0c9a-418d-be9f-2894d2a2cee0
-      width: 3
+      width: 4
     parents:
-    - ROOT_ID
-    - TABS-wUKya7eQ0Z
-    - TAB-BCIJF4NvgQ
-    - ROW-zhOlQLQnB
+      - ROOT_ID
+      - TABS-wUKya7eQ0Z
+      - TAB-BCIJF4NvgQ
+      - ROW-xSeNAspgw
     type: CHART
   DASHBOARD_VERSION_KEY: v2
   GRID_ID:
     children: []
     id: GRID_ID
     parents:
-    - ROOT_ID
+      - ROOT_ID
     type: GRID
   HEADER_ID:
     id: HEADER_ID
@@ -163,7 +147,7 @@ position:
     children: []
     id: MARKDOWN-VjQQ5SFj5v
     meta:
-      code: '# COVID-19 Vaccine Dashboard
+      code: "# COVID-19 Vaccine Dashboard
 
 
         Everywhere you look, you see negative news about COVID-19. This is to be expected;
@@ -193,129 +177,157 @@ position:
         country responsible for each vaccine effort.
 
 
-        _Note that this dataset was last updated on 12/23/2020_.
+        _Note that this dataset was last updated on 07/2021_.
 
 
-        '
-      height: 59
-      width: 3
+        "
+      height: 72
+      width: 4
     parents:
-    - ROOT_ID
-    - TABS-wUKya7eQ0Z
-    - TAB-BCIJF4NvgQ
-    - ROW-xSeNAspgw
+      - ROOT_ID
+      - TABS-wUKya7eQ0Z
+      - TAB-BCIJF4NvgQ
+      - ROW-zhOlQLQnB
     type: MARKDOWN
+  CHART-fYo7IyvKZQ:
+    children: []
+    id: CHART-fYo7IyvKZQ
+    meta:
+      chartId: 3964
+      height: 72
+      sliceName: Vaccine Candidates per Country & Stage
+      sliceNameOverride: Sunburst of Country & Clinical Stages
+      uuid: f69c556f-15fe-4a82-a8bb-69d5b6954123
+      width: 4
+    parents:
+      - ROOT_ID
+      - TABS-wUKya7eQ0Z
+      - TAB-BCIJF4NvgQ
+      - ROW-dieUdkeUw
+    type: CHART
   ROOT_ID:
     children:
-    - TABS-wUKya7eQ0Z
+      - TABS-wUKya7eQ0Z
     id: ROOT_ID
     type: ROOT
+  ROW-zhOlQLQnB:
+    children:
+      - MARKDOWN-VjQQ5SFj5v
+      - CHART-RjD_ygqtwH
+      - CHART-aGfmWtliqA
+    id: ROW-zhOlQLQnB
+    meta:
+      "0": ROOT_ID
+      background: BACKGROUND_TRANSPARENT
+    parents:
+      - ROOT_ID
+      - TABS-wUKya7eQ0Z
+      - TAB-BCIJF4NvgQ
+    type: ROW
   ROW-xSeNAspgw:
     children:
-    - MARKDOWN-VjQQ5SFj5v
-    - CHART-aGfmWtliqA
-    - CHART-RjD_ygqtwH
-    - CHART-eirDduqb1A
+      - CHART-eirDduqb1A
+      - CHART-F-fkth0Dnv
     id: ROW-xSeNAspgw
     meta:
-      '0': ROOT_ID
+      "0": ROOT_ID
       background: BACKGROUND_TRANSPARENT
     parents:
-    - ROOT_ID
-    - TABS-wUKya7eQ0Z
-    - TAB-BCIJF4NvgQ
+      - ROOT_ID
+      - TABS-wUKya7eQ0Z
+      - TAB-BCIJF4NvgQ
     type: ROW
-  ROW-zhOlQLQnB:
+  ROW-dieUdkeUw:
     children:
-    - CHART-j4hUvP5dDD
-    - CHART-dCUpAcPsji
-    - CHART-fYo7IyvKZQ
-    id: ROW-zhOlQLQnB
+      - CHART-dCUpAcPsji
+      - CHART-fYo7IyvKZQ
+      - CHART-j4hUvP5dDD
+    id: ROW-xSeNAspgw
     meta:
-      '0': ROOT_ID
+      "0": ROOT_ID
       background: BACKGROUND_TRANSPARENT
     parents:
-    - ROOT_ID
-    - TABS-wUKya7eQ0Z
-    - TAB-BCIJF4NvgQ
+      - ROOT_ID
+      - TABS-wUKya7eQ0Z
+      - TAB-BCIJF4NvgQ
     type: ROW
   ROW-zvw7luvEL:
     children:
-    - CHART-63bEuxjDMJ
-    - CHART-F-fkth0Dnv
+      - CHART-63bEuxjDMJ
     id: ROW-zvw7luvEL
     meta:
-      '0': ROOT_ID
+      "0": ROOT_ID
       background: BACKGROUND_TRANSPARENT
     parents:
-    - ROOT_ID
-    - TABS-wUKya7eQ0Z
-    - TAB-BCIJF4NvgQ
+      - ROOT_ID
+      - TABS-wUKya7eQ0Z
+      - TAB-BCIJF4NvgQ
     type: ROW
   TAB-BCIJF4NvgQ:
     children:
-    - ROW-xSeNAspgw
-    - ROW-zvw7luvEL
-    - ROW-zhOlQLQnB
+      - ROW-zhOlQLQnB
+      - ROW-xSeNAspgw
+      - ROW-zvw7luvEL
+      - ROW-dieUdkeUw
     id: TAB-BCIJF4NvgQ
     meta:
       text: Overview
     parents:
-    - ROOT_ID
-    - TABS-wUKya7eQ0Z
+      - ROOT_ID
+      - TABS-wUKya7eQ0Z
     type: TAB
   TABS-wUKya7eQ0Z:
     children:
-    - TAB-BCIJF4NvgQ
+      - TAB-BCIJF4NvgQ
     id: TABS-wUKya7eQ0Z
     meta: {}
     parents:
-    - ROOT_ID
+      - ROOT_ID
     type: TABS
 metadata:
   timed_refresh_immune_slices: []
   expanded_slices: {}
   refresh_frequency: 0
-  default_filters: '{}'
+  default_filters: "{}"
   color_scheme: supersetColors
   label_colors:
-    '0': '#D3B3DA'
-    '1': '#9EE5E5'
-    0. Pre-clinical: '#1FA8C9'
-    2. Phase II or Combined I/II: '#454E7C'
-    1. Phase I: '#5AC189'
-    3. Phase III: '#FF7F44'
-    4. Authorized: '#666666'
-    root: '#1FA8C9'
-    Protein subunit: '#454E7C'
-    Phase II: '#5AC189'
-    Pre-clinical: '#FF7F44'
-    Phase III: '#666666'
-    Phase I: '#E04355'
-    Phase I/II: '#FCC700'
-    Inactivated virus: '#A868B7'
-    Virus-like particle: '#3CCCCB'
-    Replicating bacterial vector: '#A38F79'
-    DNA-based: '#8FD3E4'
-    RNA-based vaccine: '#A1A6BD'
-    Authorized: '#ACE1C4'
-    Non-replicating viral vector: '#FEC0A1'
-    Replicating viral vector: '#B2B2B2'
-    Unknown: '#EFA1AA'
-    Live attenuated virus: '#FDE380'
-    COUNT(*): '#D1C6BC'
+    "0": "#D3B3DA"
+    "1": "#9EE5E5"
+    0. Pre-clinical: "#1FA8C9"
+    2. Phase II or Combined I/II: "#454E7C"
+    1. Phase I: "#5AC189"
+    3. Phase III: "#FF7F44"
+    4. Authorized: "#666666"
+    root: "#1FA8C9"
+    Protein subunit: "#454E7C"
+    Phase II: "#5AC189"
+    Pre-clinical: "#FF7F44"
+    Phase III: "#666666"
+    Phase I: "#E04355"
+    Phase I/II: "#FCC700"
+    Inactivated virus: "#A868B7"
+    Virus-like particle: "#3CCCCB"
+    Replicating bacterial vector: "#A38F79"
+    DNA-based: "#8FD3E4"
+    RNA-based vaccine: "#A1A6BD"
+    Authorized: "#ACE1C4"
+    Non-replicating viral vector: "#FEC0A1"
+    Replicating viral vector: "#B2B2B2"
+    Unknown: "#EFA1AA"
+    Live attenuated virus: "#FDE380"
+    COUNT(*): "#D1C6BC"
   filter_scopes:
-    '3965':
+    "3965":
       Country_Name:
         scope:
-        - ROOT_ID
+          - ROOT_ID
         immune: []
       Product_Category:
         scope:
-        - ROOT_ID
+          - ROOT_ID
         immune: []
       Clinical Stage:
         scope:
-        - ROOT_ID
+          - ROOT_ID
         immune: []
 version: 1.0.0
diff --git a/superset/examples/configs/datasets/examples/FCC_2018_Survey.yaml b/superset/examples/configs/datasets/examples/FCC_2018_Survey.yaml
index c7caea36b3f7..26890b5ebbbc 100644
--- a/superset/examples/configs/datasets/examples/FCC_2018_Survey.yaml
+++ b/superset/examples/configs/datasets/examples/FCC_2018_Survey.yaml
@@ -24,7 +24,7 @@ schema: null
 sql: ''
 params: null
 template_params: null
-filter_select_enabled: false
+filter_select_enabled: true
 fetch_values_predicate: null
 extra: null
 uuid: d95a2865-53ce-1f82-a53d-8e3c89331469
diff --git a/superset/examples/configs/datasets/examples/channel_members.yaml b/superset/examples/configs/datasets/examples/channel_members.yaml
index da7e60b598f7..7bdf0836c456 100644
--- a/superset/examples/configs/datasets/examples/channel_members.yaml
+++ b/superset/examples/configs/datasets/examples/channel_members.yaml
@@ -24,7 +24,7 @@ schema: null
 sql: null
 params: null
 template_params: null
-filter_select_enabled: false
+filter_select_enabled: true
 fetch_values_predicate: null
 extra: null
 uuid: 3e8130eb-0831-d568-b531-c3ce6d68d3d8
diff --git a/superset/examples/configs/datasets/examples/channels.yaml b/superset/examples/configs/datasets/examples/channels.yaml
index 3707e03e9bad..92ce51d210fc 100644
--- a/superset/examples/configs/datasets/examples/channels.yaml
+++ b/superset/examples/configs/datasets/examples/channels.yaml
@@ -24,7 +24,7 @@ schema: null
 sql: null
 params: null
 template_params: null
-filter_select_enabled: false
+filter_select_enabled: true
 fetch_values_predicate: null
 extra: null
 uuid: f7db6d45-7056-f395-d24a-6c805fb4c97d
diff --git a/superset/examples/configs/datasets/examples/cleaned_sales_data.yaml b/superset/examples/configs/datasets/examples/cleaned_sales_data.yaml
index 4af19bc90b1e..8832cc529d0f 100644
--- a/superset/examples/configs/datasets/examples/cleaned_sales_data.yaml
+++ b/superset/examples/configs/datasets/examples/cleaned_sales_data.yaml
@@ -24,7 +24,7 @@ schema: null
 sql: null
 params: null
 template_params: null
-filter_select_enabled: false
+filter_select_enabled: true
 fetch_values_predicate: null
 extra: null
 uuid: e8623bb9-5e00-f531-506a-19607f5f8005
diff --git a/superset/examples/configs/datasets/examples/covid_vaccines.yaml b/superset/examples/configs/datasets/examples/covid_vaccines.yaml
index 992d4d962e6c..9d1431c2db73 100644
--- a/superset/examples/configs/datasets/examples/covid_vaccines.yaml
+++ b/superset/examples/configs/datasets/examples/covid_vaccines.yaml
@@ -24,7 +24,7 @@ schema: null
 sql: ''
 params: null
 template_params: null
-filter_select_enabled: false
+filter_select_enabled: true
 fetch_values_predicate: null
 extra: null
 uuid: 974b7a1c-22ea-49cb-9214-97b7dbd511e0
diff --git a/superset/examples/configs/datasets/examples/exported_stats.yaml b/superset/examples/configs/datasets/examples/exported_stats.yaml
index d69e404dfc0c..28cd18ba73bf 100644
--- a/superset/examples/configs/datasets/examples/exported_stats.yaml
+++ b/superset/examples/configs/datasets/examples/exported_stats.yaml
@@ -24,7 +24,7 @@ schema: null
 sql: ''
 params: null
 template_params: null
-filter_select_enabled: false
+filter_select_enabled: true
 fetch_values_predicate: null
 extra: null
 uuid: 0bd5d01c-b7d8-471b-b3a5-366ce6c920d4
diff --git a/superset/examples/configs/datasets/examples/members_channels_2.yaml b/superset/examples/configs/datasets/examples/members_channels_2.yaml
index b6967002f807..a8ce28350c8d 100644
--- a/superset/examples/configs/datasets/examples/members_channels_2.yaml
+++ b/superset/examples/configs/datasets/examples/members_channels_2.yaml
@@ -25,7 +25,7 @@ sql: SELECT c.name AS channel_name, u.name AS member_name FROM channel_members c
   JOIN channels c ON cm.channel_id = c.id JOIN users u ON cm.user_id = u.id
 params: null
 template_params: null
-filter_select_enabled: false
+filter_select_enabled: true
 fetch_values_predicate: null
 extra: null
 uuid: 3d9c0054-b31b-4102-92de-b1ef9f9e5e77
diff --git a/superset/examples/configs/datasets/examples/messages.yaml b/superset/examples/configs/datasets/examples/messages.yaml
index 2b8c3ebc7902..27ca367009b8 100644
--- a/superset/examples/configs/datasets/examples/messages.yaml
+++ b/superset/examples/configs/datasets/examples/messages.yaml
@@ -24,7 +24,7 @@ schema: null
 sql: null
 params: null
 template_params: null
-filter_select_enabled: false
+filter_select_enabled: true
 fetch_values_predicate: null
 extra: null
 uuid: e032c69e-716e-d700-eff7-07800d0f9989
diff --git a/superset/examples/configs/datasets/examples/messages_channels.yaml b/superset/examples/configs/datasets/examples/messages_channels.yaml
index 87e850767291..e93a3efeebaa 100644
--- a/superset/examples/configs/datasets/examples/messages_channels.yaml
+++ b/superset/examples/configs/datasets/examples/messages_channels.yaml
@@ -25,7 +25,7 @@ sql: SELECT m.ts, c.name, m.text FROM messages m JOIN channels c ON m.channel_id
   c.id
 params: null
 template_params: null
-filter_select_enabled: false
+filter_select_enabled: true
 fetch_values_predicate: null
 extra: null
 uuid: 6e533506-fce6-4f6a-b116-d139df6dbdea
diff --git a/superset/examples/configs/datasets/examples/new_members_daily.yaml b/superset/examples/configs/datasets/examples/new_members_daily.yaml
index 4ab93d09bc3c..3a7996dd46a1 100644
--- a/superset/examples/configs/datasets/examples/new_members_daily.yaml
+++ b/superset/examples/configs/datasets/examples/new_members_daily.yaml
@@ -25,7 +25,7 @@ sql: SELECT date, total_membership - lag(total_membership) OVER (ORDER BY date)
   new_members FROM exported_stats
 params: null
 template_params: null
-filter_select_enabled: false
+filter_select_enabled: true
 fetch_values_predicate: null
 extra: null
 uuid: 9dd99cda-ff6b-4575-9a74-684d06e871ab
diff --git a/superset/examples/configs/datasets/examples/threads.yaml b/superset/examples/configs/datasets/examples/threads.yaml
index 9e030074f443..0d6a2ab8a5ef 100644
--- a/superset/examples/configs/datasets/examples/threads.yaml
+++ b/superset/examples/configs/datasets/examples/threads.yaml
@@ -24,7 +24,7 @@ schema: null
 sql: null
 params: null
 template_params: null
-filter_select_enabled: false
+filter_select_enabled: true
 fetch_values_predicate: null
 extra: null
 uuid: d7438be6-6078-17dd-cf9a-56f0ef546c80
diff --git a/superset/examples/configs/datasets/examples/unicode_test.test.yaml b/superset/examples/configs/datasets/examples/unicode_test.test.yaml
index 907eab5df32a..f95cf456be93 100644
--- a/superset/examples/configs/datasets/examples/unicode_test.test.yaml
+++ b/superset/examples/configs/datasets/examples/unicode_test.test.yaml
@@ -24,7 +24,7 @@ schema: null
 sql: null
 params: null
 template_params: null
-filter_select_enabled: false
+filter_select_enabled: true
 fetch_values_predicate: null
 extra: null
 uuid: a6771c73-96fc-44c6-8b6e-9d303955ea48
diff --git a/superset/examples/configs/datasets/examples/users.yaml b/superset/examples/configs/datasets/examples/users.yaml
index 1ea9b8a8ea40..c26b96b935c4 100644
--- a/superset/examples/configs/datasets/examples/users.yaml
+++ b/superset/examples/configs/datasets/examples/users.yaml
@@ -24,200 +24,200 @@ schema: null
 sql: null
 params: null
 template_params: null
-filter_select_enabled: false
+filter_select_enabled: true
 fetch_values_predicate: null
 extra: null
 uuid: 7195db6b-2d17-7619-b7c7-26b15378df8c
 metrics:
-- metric_name: count
-  verbose_name: COUNT(*)
-  metric_type: count
-  expression: COUNT(*)
-  description: null
-  d3format: null
-  extra: null
-  warning_text: null
+  - metric_name: count
+    verbose_name: COUNT(*)
+    metric_type: count
+    expression: COUNT(*)
+    description: null
+    d3format: null
+    extra: null
+    warning_text: null
 columns:
-- column_name: updated
-  verbose_name: null
-  is_dttm: true
-  is_active: true
-  type: TIMESTAMP WITHOUT TIME ZONE
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: has_2fa
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: BOOLEAN
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: real_name
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: VARCHAR
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: tz_label
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: VARCHAR
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: team_id
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: VARCHAR
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: name
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: VARCHAR
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: color
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: VARCHAR
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: id
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: VARCHAR
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: tz
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: VARCHAR
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: is_ultra_restricted
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: BOOLEAN
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: is_primary_owner
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: BOOLEAN
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: is_app_user
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: BOOLEAN
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: is_admin
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: BOOLEAN
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: is_bot
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: BOOLEAN
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: is_restricted
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: BOOLEAN
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: is_owner
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: BOOLEAN
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: deleted
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: BOOLEAN
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: tz_offset
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: BIGINT
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
+  - column_name: updated
+    verbose_name: null
+    is_dttm: true
+    is_active: true
+    type: TIMESTAMP WITHOUT TIME ZONE
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: has_2fa
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: BOOLEAN
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: real_name
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: VARCHAR
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: tz_label
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: VARCHAR
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: team_id
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: VARCHAR
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: name
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: VARCHAR
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: color
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: VARCHAR
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: id
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: VARCHAR
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: tz
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: VARCHAR
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: is_ultra_restricted
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: BOOLEAN
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: is_primary_owner
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: BOOLEAN
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: is_app_user
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: BOOLEAN
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: is_admin
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: BOOLEAN
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: is_bot
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: BOOLEAN
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: is_restricted
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: BOOLEAN
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: is_owner
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: BOOLEAN
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: deleted
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: BOOLEAN
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: tz_offset
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: BIGINT
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
 version: 1.0.0
 database_uuid: a2dc77af-e654-49bb-b321-40f6b559a1ee
 data: https://raw.githubusercontent.com/apache-superset/examples-data/master/datasets/examples/slack/users.csv
diff --git a/superset/examples/configs/datasets/examples/users_channels-uzooNNtSRO.yaml b/superset/examples/configs/datasets/examples/users_channels-uzooNNtSRO.yaml
index f54d061def33..5ba899be6914 100644
--- a/superset/examples/configs/datasets/examples/users_channels-uzooNNtSRO.yaml
+++ b/superset/examples/configs/datasets/examples/users_channels-uzooNNtSRO.yaml
@@ -21,56 +21,57 @@ default_endpoint: null
 offset: 0
 cache_timeout: null
 schema: null
-sql: 'SELECT uc1.name as channel_1, uc2.name as channel_2, count(*) AS cnt
+sql: >
+  SELECT uc1.name as channel_1, uc2.name as channel_2, count(*) AS cnt
   FROM users_channels uc1
   JOIN users_channels uc2 ON uc1.user_id = uc2.user_id
   GROUP BY uc1.name, uc2.name
-  HAVING uc1.name <> uc2.name'
+  HAVING uc1.name <> uc2.name
 params: null
 template_params: null
-filter_select_enabled: false
+filter_select_enabled: true
 fetch_values_predicate: null
 extra: null
 uuid: 473d6113-b44a-48d8-a6ae-e0ef7e2aebb0
 metrics:
-- metric_name: count
-  verbose_name: null
-  metric_type: null
-  expression: count(*)
-  description: null
-  d3format: null
-  extra: null
-  warning_text: null
+  - metric_name: count
+    verbose_name: null
+    metric_type: null
+    expression: count(*)
+    description: null
+    d3format: null
+    extra: null
+    warning_text: null
 columns:
-- column_name: channel_1
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: STRING
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: channel_2
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: STRING
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: cnt
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: INT
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
+  - column_name: channel_1
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: STRING
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: channel_2
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: STRING
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: cnt
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: INT
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
 version: 1.0.0
-database_uuid: 566ca280-3da8-967e-4aa4-4b349218736a
+database_uuid: a2dc77af-e654-49bb-b321-40f6b559a1ee
diff --git a/superset/examples/configs/datasets/examples/users_channels.yaml b/superset/examples/configs/datasets/examples/users_channels.yaml
index 8b3a7ac2eb5a..a69db421d938 100644
--- a/superset/examples/configs/datasets/examples/users_channels.yaml
+++ b/superset/examples/configs/datasets/examples/users_channels.yaml
@@ -24,40 +24,40 @@ schema: null
 sql: null
 params: null
 template_params: null
-filter_select_enabled: false
+filter_select_enabled: true
 fetch_values_predicate: null
 extra: null
 uuid: 29b18573-c9d6-40bc-b8cb-f70c9a1b6244
 metrics:
-- metric_name: count
-  verbose_name: null
-  metric_type: null
-  expression: count(*)
-  description: null
-  d3format: null
-  extra: null
-  warning_text: null
+  - metric_name: count
+    verbose_name: null
+    metric_type: null
+    expression: count(*)
+    description: null
+    d3format: null
+    extra: null
+    warning_text: null
 columns:
-- column_name: user_id
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: STRING
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: name
-  verbose_name: null
-  is_dttm: false
-  is_active: true
-  type: STRING
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
+  - column_name: user_id
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: STRING
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: name
+    verbose_name: null
+    is_dttm: false
+    is_active: true
+    type: STRING
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
 version: 1.0.0
 database_uuid: a2dc77af-e654-49bb-b321-40f6b559a1ee
 data: https://raw.githubusercontent.com/apache-superset/examples-data/master/datasets/examples/slack/users_channels.csv
diff --git a/superset/examples/configs/datasets/examples/video_game_sales.yaml b/superset/examples/configs/datasets/examples/video_game_sales.yaml
index cf6f05898679..7748f6af8c10 100644
--- a/superset/examples/configs/datasets/examples/video_game_sales.yaml
+++ b/superset/examples/configs/datasets/examples/video_game_sales.yaml
@@ -21,136 +21,136 @@ default_endpoint: null
 offset: 0
 cache_timeout: null
 schema: null
-sql: ''
+sql: ""
 params:
   remote_id: 64
   database_name: examples
   import_time: 1606677834
 template_params: null
-filter_select_enabled: false
+filter_select_enabled: true
 fetch_values_predicate: null
 extra: null
 uuid: 53d47c0c-c03d-47f0-b9ac-81225f808283
 metrics:
-- metric_name: count
-  verbose_name: COUNT(*)
-  metric_type: null
-  expression: COUNT(*)
-  description: null
-  d3format: null
-  extra: null
-  warning_text: null
+  - metric_name: count
+    verbose_name: COUNT(*)
+    metric_type: null
+    expression: COUNT(*)
+    description: null
+    d3format: null
+    extra: null
+    warning_text: null
 columns:
-- column_name: year
-  verbose_name: null
-  is_dttm: true
-  is_active: null
-  type: BIGINT
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: '%Y'
-- column_name: na_sales
-  verbose_name: null
-  is_dttm: false
-  is_active: null
-  type: FLOAT64
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: eu_sales
-  verbose_name: null
-  is_dttm: false
-  is_active: null
-  type: FLOAT64
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: global_sales
-  verbose_name: null
-  is_dttm: false
-  is_active: null
-  type: FLOAT64
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: jp_sales
-  verbose_name: null
-  is_dttm: false
-  is_active: null
-  type: FLOAT64
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: other_sales
-  verbose_name: null
-  is_dttm: false
-  is_active: null
-  type: FLOAT64
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: rank
-  verbose_name: null
-  is_dttm: false
-  is_active: null
-  type: BIGINT
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: genre
-  verbose_name: null
-  is_dttm: false
-  is_active: null
-  type: STRING
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: name
-  verbose_name: null
-  is_dttm: false
-  is_active: null
-  type: STRING
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: platform
-  verbose_name: null
-  is_dttm: false
-  is_active: null
-  type: STRING
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
-- column_name: publisher
-  verbose_name: null
-  is_dttm: false
-  is_active: null
-  type: STRING
-  groupby: true
-  filterable: true
-  expression: null
-  description: null
-  python_date_format: null
+  - column_name: year
+    verbose_name: null
+    is_dttm: true
+    is_active: null
+    type: BIGINT
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: "%Y"
+  - column_name: na_sales
+    verbose_name: null
+    is_dttm: false
+    is_active: null
+    type: FLOAT64
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: eu_sales
+    verbose_name: null
+    is_dttm: false
+    is_active: null
+    type: FLOAT64
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: global_sales
+    verbose_name: null
+    is_dttm: false
+    is_active: null
+    type: FLOAT64
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: jp_sales
+    verbose_name: null
+    is_dttm: false
+    is_active: null
+    type: FLOAT64
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: other_sales
+    verbose_name: null
+    is_dttm: false
+    is_active: null
+    type: FLOAT64
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: rank
+    verbose_name: null
+    is_dttm: false
+    is_active: null
+    type: BIGINT
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: genre
+    verbose_name: null
+    is_dttm: false
+    is_active: null
+    type: STRING
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: name
+    verbose_name: null
+    is_dttm: false
+    is_active: null
+    type: STRING
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: platform
+    verbose_name: null
+    is_dttm: false
+    is_active: null
+    type: STRING
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
+  - column_name: publisher
+    verbose_name: null
+    is_dttm: false
+    is_active: null
+    type: STRING
+    groupby: true
+    filterable: true
+    expression: null
+    description: null
+    python_date_format: null
 version: 1.0.0
 database_uuid: a2dc77af-e654-49bb-b321-40f6b559a1ee
 data: https://github.com/apache-superset/examples-data/raw/lowercase_columns_examples/datasets/examples/video_game_sales.csv
diff --git a/superset/examples/country_map.py b/superset/examples/country_map.py
index 2ed7c96a8eaa..4ed5235e6d91 100644
--- a/superset/examples/country_map.py
+++ b/superset/examples/country_map.py
@@ -28,9 +28,9 @@
 from .helpers import (
     get_example_data,
     get_slice_json,
+    get_table_connector_registry,
     merge_slice,
     misc_dash_slices,
-    TBL,
 )
 
 
@@ -46,7 +46,7 @@ def load_country_map_data(only_metadata: bool = False, force: bool = False) -> N
         )
         data = pd.read_csv(csv_bytes, encoding="utf-8")
         data["dttm"] = datetime.datetime.now().date()
-        data.to_sql(  # pylint: disable=no-member
+        data.to_sql(
             tbl_name,
             database.get_sqla_engine(),
             if_exists="replace",
@@ -73,11 +73,13 @@ def load_country_map_data(only_metadata: bool = False, force: bool = False) -> N
         print("-" * 80)
 
     print("Creating table reference")
-    obj = db.session.query(TBL).filter_by(table_name=tbl_name).first()
+    table = get_table_connector_registry()
+    obj = db.session.query(table).filter_by(table_name=tbl_name).first()
     if not obj:
-        obj = TBL(table_name=tbl_name)
+        obj = table(table_name=tbl_name)
     obj.main_dttm_col = "dttm"
     obj.database = database
+    obj.filter_select_enabled = True
     if not any(col.metric_name == "avg__2004" for col in obj.metrics):
         col = str(column("2004").compile(db.engine))
         obj.metrics.append(SqlMetric(metric_name="avg__2004", expression=f"AVG({col})"))
diff --git a/superset/examples/deck.py b/superset/examples/deck.py
index c2cecde96e23..a3d137bb06d7 100644
--- a/superset/examples/deck.py
+++ b/superset/examples/deck.py
@@ -21,7 +21,12 @@
 from superset.models.dashboard import Dashboard
 from superset.models.slice import Slice
 
-from .helpers import get_slice_json, merge_slice, TBL, update_slice_ids
+from .helpers import (
+    get_slice_json,
+    get_table_connector_registry,
+    merge_slice,
+    update_slice_ids,
+)
 
 COLOR_RED = {"r": 205, "g": 0, "b": 3, "a": 0.82}
 POSITION_JSON = """\
@@ -170,7 +175,8 @@
 def load_deck_dash() -> None:
     print("Loading deck.gl dashboard")
     slices = []
-    tbl = db.session.query(TBL).filter_by(table_name="long_lat").first()
+    table = get_table_connector_registry()
+    tbl = db.session.query(table).filter_by(table_name="long_lat").first()
     slice_data = {
         "spatial": {"type": "latlong", "lonCol": "LON", "latCol": "LAT"},
         "color_picker": COLOR_RED,
@@ -281,6 +287,7 @@ def load_deck_dash() -> None:
     slices.append(slc)
 
     slice_data = {
+        "autozoom": False,
         "spatial": {"type": "latlong", "lonCol": "LON", "latCol": "LAT"},
         "row_limit": 5000,
         "mapbox_style": "mapbox://styles/mapbox/satellite-streets-v9",
@@ -317,7 +324,7 @@ def load_deck_dash() -> None:
     slices.append(slc)
 
     polygon_tbl = (
-        db.session.query(TBL).filter_by(table_name="sf_population_polygons").first()
+        db.session.query(table).filter_by(table_name="sf_population_polygons").first()
     )
     slice_data = {
         "datasource": "11__table",
@@ -449,7 +456,10 @@ def load_deck_dash() -> None:
         slice_name="Arcs",
         viz_type="deck_arc",
         datasource_type="table",
-        datasource_id=db.session.query(TBL).filter_by(table_name="flights").first().id,
+        datasource_id=db.session.query(table)
+        .filter_by(table_name="flights")
+        .first()
+        .id,
         params=get_slice_json(slice_data),
     )
     merge_slice(slc)
@@ -498,7 +508,7 @@ def load_deck_dash() -> None:
         slice_name="Path",
         viz_type="deck_path",
         datasource_type="table",
-        datasource_id=db.session.query(TBL)
+        datasource_id=db.session.query(table)
         .filter_by(table_name="bart_lines")
         .first()
         .id,
@@ -524,7 +534,3 @@ def load_deck_dash() -> None:
     dash.slices = slices
     db.session.merge(dash)
     db.session.commit()
-
-
-if __name__ == "__main__":
-    load_deck_dash()
diff --git a/superset/examples/energy.py b/superset/examples/energy.py
index b101905af9e5..4ad56b020da0 100644
--- a/superset/examples/energy.py
+++ b/superset/examples/energy.py
@@ -26,7 +26,12 @@
 from superset.models.slice import Slice
 from superset.utils import core as utils
 
-from .helpers import get_example_data, merge_slice, misc_dash_slices, TBL
+from .helpers import (
+    get_example_data,
+    get_table_connector_registry,
+    merge_slice,
+    misc_dash_slices,
+)
 
 
 def load_energy(
@@ -52,11 +57,13 @@ def load_energy(
         )
 
     print("Creating table [wb_health_population] reference")
-    tbl = db.session.query(TBL).filter_by(table_name=tbl_name).first()
+    table = get_table_connector_registry()
+    tbl = db.session.query(table).filter_by(table_name=tbl_name).first()
     if not tbl:
-        tbl = TBL(table_name=tbl_name)
+        tbl = table(table_name=tbl_name)
     tbl.description = "Energy consumption"
     tbl.database = database
+    tbl.filter_select_enabled = True
 
     if not any(col.metric_name == "sum__value" for col in tbl.metrics):
         col = str(column("value").compile(db.engine))
diff --git a/superset/examples/flights.py b/superset/examples/flights.py
index 16f88491dd34..cb72940f6052 100644
--- a/superset/examples/flights.py
+++ b/superset/examples/flights.py
@@ -20,7 +20,7 @@
 from superset import db
 from superset.utils import core as utils
 
-from .helpers import get_example_data, TBL
+from .helpers import get_example_data, get_table_connector_registry
 
 
 def load_flights(only_metadata: bool = False, force: bool = False) -> None:
@@ -38,14 +38,11 @@ def load_flights(only_metadata: bool = False, force: bool = False) -> None:
         airports = pd.read_csv(airports_bytes, encoding="latin-1")
         airports = airports.set_index("IATA_CODE")
 
-        pdf["ds"] = (
-            pdf.YEAR.map(str) + "-0" + pdf.MONTH.map(str) + "-0" + pdf.DAY.map(str)
-        )
+        pdf[  # pylint: disable=unsupported-assignment-operation,useless-suppression
+            "ds"
+        ] = (pdf.YEAR.map(str) + "-0" + pdf.MONTH.map(str) + "-0" + pdf.DAY.map(str))
         pdf.ds = pd.to_datetime(pdf.ds)
-        del pdf["YEAR"]
-        del pdf["MONTH"]
-        del pdf["DAY"]
-
+        pdf.drop(columns=["DAY", "MONTH", "YEAR"])
         pdf = pdf.join(airports, on="ORIGIN_AIRPORT", rsuffix="_ORIG")
         pdf = pdf.join(airports, on="DESTINATION_AIRPORT", rsuffix="_DEST")
         pdf.to_sql(
@@ -57,11 +54,13 @@ def load_flights(only_metadata: bool = False, force: bool = False) -> None:
             index=False,
         )
 
-    tbl = db.session.query(TBL).filter_by(table_name=tbl_name).first()
+    table = get_table_connector_registry()
+    tbl = db.session.query(table).filter_by(table_name=tbl_name).first()
     if not tbl:
-        tbl = TBL(table_name=tbl_name)
+        tbl = table(table_name=tbl_name)
     tbl.description = "Random set of flights in the US"
     tbl.database = database
+    tbl.filter_select_enabled = True
     db.session.merge(tbl)
     db.session.commit()
     tbl.fetch_metadata()
diff --git a/superset/examples/helpers.py b/superset/examples/helpers.py
index 2b872a1512bc..d8b2c59fb777 100644
--- a/superset/examples/helpers.py
+++ b/superset/examples/helpers.py
@@ -24,21 +24,19 @@
 
 from superset import app, db
 from superset.connectors.connector_registry import ConnectorRegistry
-from superset.models import core as models
 from superset.models.slice import Slice
 
 BASE_URL = "https://github.com/apache-superset/examples-data/blob/master/"
 
-# Shortcuts
-DB = models.Database
+misc_dash_slices: Set[str] = set()  # slices assembled in a 'Misc Chart' dashboard
 
-TBL = ConnectorRegistry.sources["table"]
 
-config = app.config
+def get_table_connector_registry() -> Any:
+    return ConnectorRegistry.sources["table"]
 
-EXAMPLES_FOLDER = os.path.join(config["BASE_DIR"], "examples")
 
-misc_dash_slices: Set[str] = set()  # slices assembled in a 'Misc Chart' dashboard
+def get_examples_folder() -> str:
+    return os.path.join(app.config["BASE_DIR"], "examples")
 
 
 def update_slice_ids(layout_dict: Dict[Any, Any], slices: List[Slice]) -> None:
@@ -71,7 +69,9 @@ def get_slice_json(defaults: Dict[Any, Any], **kwargs: Any) -> str:
 def get_example_data(
     filepath: str, is_gzip: bool = True, make_bytes: bool = False
 ) -> BytesIO:
-    content = request.urlopen(f"{BASE_URL}{filepath}?raw=true").read()
+    content = request.urlopen(  # pylint: disable=consider-using-with
+        f"{BASE_URL}{filepath}?raw=true"
+    ).read()
     if is_gzip:
         content = zlib.decompress(content, zlib.MAX_WBITS | 16)
     if make_bytes:
diff --git a/superset/examples/long_lat.py b/superset/examples/long_lat.py
index 55fce5b1eb22..7e2f2f9bdc20 100644
--- a/superset/examples/long_lat.py
+++ b/superset/examples/long_lat.py
@@ -28,9 +28,9 @@
 from .helpers import (
     get_example_data,
     get_slice_json,
+    get_table_connector_registry,
     merge_slice,
     misc_dash_slices,
-    TBL,
 )
 
 
@@ -54,7 +54,7 @@ def load_long_lat_data(only_metadata: bool = False, force: bool = False) -> None
         pdf["radius_miles"] = [random.uniform(1, 3) for _ in range(len(pdf))]
         pdf["geohash"] = pdf[["LAT", "LON"]].apply(lambda x: geohash.encode(*x), axis=1)
         pdf["delimited"] = pdf["LAT"].map(str).str.cat(pdf["LON"].map(str), sep=",")
-        pdf.to_sql(  # pylint: disable=no-member
+        pdf.to_sql(
             tbl_name,
             database.get_sqla_engine(),
             if_exists="replace",
@@ -82,11 +82,13 @@ def load_long_lat_data(only_metadata: bool = False, force: bool = False) -> None
         print("-" * 80)
 
     print("Creating table reference")
-    obj = db.session.query(TBL).filter_by(table_name=tbl_name).first()
+    table = get_table_connector_registry()
+    obj = db.session.query(table).filter_by(table_name=tbl_name).first()
     if not obj:
-        obj = TBL(table_name=tbl_name)
+        obj = table(table_name=tbl_name)
     obj.main_dttm_col = "datetime"
     obj.database = database
+    obj.filter_select_enabled = True
     db.session.merge(obj)
     db.session.commit()
     obj.fetch_metadata()
diff --git a/superset/examples/multiformat_time_series.py b/superset/examples/multiformat_time_series.py
index f7789fa2fe4e..e473ec8c3843 100644
--- a/superset/examples/multiformat_time_series.py
+++ b/superset/examples/multiformat_time_series.py
@@ -19,21 +19,20 @@
 import pandas as pd
 from sqlalchemy import BigInteger, Date, DateTime, String
 
-from superset import db
+from superset import app, db
 from superset.models.slice import Slice
 from superset.utils.core import get_example_database
 
 from .helpers import (
-    config,
     get_example_data,
     get_slice_json,
+    get_table_connector_registry,
     merge_slice,
     misc_dash_slices,
-    TBL,
 )
 
 
-def load_multiformat_time_series(
+def load_multiformat_time_series(  # pylint: disable=too-many-locals
     only_metadata: bool = False, force: bool = False
 ) -> None:
     """Loading time series data from a zip file in the repo"""
@@ -75,11 +74,13 @@ def load_multiformat_time_series(
         print("-" * 80)
 
     print(f"Creating table [{tbl_name}] reference")
-    obj = db.session.query(TBL).filter_by(table_name=tbl_name).first()
+    table = get_table_connector_registry()
+    obj = db.session.query(table).filter_by(table_name=tbl_name).first()
     if not obj:
-        obj = TBL(table_name=tbl_name)
+        obj = table(table_name=tbl_name)
     obj.main_dttm_col = "ds"
     obj.database = database
+    obj.filter_select_enabled = True
     dttm_and_expr_dict: Dict[str, Tuple[Optional[str], None]] = {
         "ds": (None, None),
         "ds2": (None, None),
@@ -105,7 +106,7 @@ def load_multiformat_time_series(
         slice_data = {
             "metrics": ["count"],
             "granularity_sqla": col.column_name,
-            "row_limit": config["ROW_LIMIT"],
+            "row_limit": app.config["ROW_LIMIT"],
             "since": "2015",
             "until": "2016",
             "viz_type": "cal_heatmap",
diff --git a/superset/examples/paris.py b/superset/examples/paris.py
index a9ea87184615..2c16bcee485d 100644
--- a/superset/examples/paris.py
+++ b/superset/examples/paris.py
@@ -22,7 +22,7 @@
 from superset import db
 from superset.utils import core as utils
 
-from .helpers import get_example_data, TBL
+from .helpers import get_example_data, get_table_connector_registry
 
 
 def load_paris_iris_geojson(only_metadata: bool = False, force: bool = False) -> None:
@@ -50,11 +50,13 @@ def load_paris_iris_geojson(only_metadata: bool = False, force: bool = False) ->
         )
 
     print("Creating table {} reference".format(tbl_name))
-    tbl = db.session.query(TBL).filter_by(table_name=tbl_name).first()
+    table = get_table_connector_registry()
+    tbl = db.session.query(table).filter_by(table_name=tbl_name).first()
     if not tbl:
-        tbl = TBL(table_name=tbl_name)
+        tbl = table(table_name=tbl_name)
     tbl.description = "Map of Paris"
     tbl.database = database
+    tbl.filter_select_enabled = True
     db.session.merge(tbl)
     db.session.commit()
     tbl.fetch_metadata()
diff --git a/superset/examples/random_time_series.py b/superset/examples/random_time_series.py
index 29c9db34585a..394e895a886a 100644
--- a/superset/examples/random_time_series.py
+++ b/superset/examples/random_time_series.py
@@ -18,11 +18,16 @@
 import pandas as pd
 from sqlalchemy import DateTime, String
 
-from superset import db
+from superset import app, db
 from superset.models.slice import Slice
 from superset.utils import core as utils
 
-from .helpers import config, get_example_data, get_slice_json, merge_slice, TBL
+from .helpers import (
+    get_example_data,
+    get_slice_json,
+    get_table_connector_registry,
+    merge_slice,
+)
 
 
 def load_random_time_series_data(
@@ -54,22 +59,24 @@ def load_random_time_series_data(
         print("-" * 80)
 
     print(f"Creating table [{tbl_name}] reference")
-    obj = db.session.query(TBL).filter_by(table_name=tbl_name).first()
+    table = get_table_connector_registry()
+    obj = db.session.query(table).filter_by(table_name=tbl_name).first()
     if not obj:
-        obj = TBL(table_name=tbl_name)
+        obj = table(table_name=tbl_name)
     obj.main_dttm_col = "ds"
     obj.database = database
+    obj.filter_select_enabled = True
     db.session.merge(obj)
     db.session.commit()
     obj.fetch_metadata()
     tbl = obj
 
     slice_data = {
-        "granularity_sqla": "day",
-        "row_limit": config["ROW_LIMIT"],
+        "granularity_sqla": "ds",
+        "row_limit": app.config["ROW_LIMIT"],
         "since": "2019-01-01",
         "until": "2019-02-01",
-        "metric": "count",
+        "metrics": ["count"],
         "viz_type": "cal_heatmap",
         "domain_granularity": "month",
         "subdomain_granularity": "day",
diff --git a/superset/examples/sf_population_polygons.py b/superset/examples/sf_population_polygons.py
index 952bdccc5399..426822c72f60 100644
--- a/superset/examples/sf_population_polygons.py
+++ b/superset/examples/sf_population_polygons.py
@@ -22,7 +22,7 @@
 from superset import db
 from superset.utils import core as utils
 
-from .helpers import get_example_data, TBL
+from .helpers import get_example_data, get_table_connector_registry
 
 
 def load_sf_population_polygons(
@@ -52,11 +52,13 @@ def load_sf_population_polygons(
         )
 
     print("Creating table {} reference".format(tbl_name))
-    tbl = db.session.query(TBL).filter_by(table_name=tbl_name).first()
+    table = get_table_connector_registry()
+    tbl = db.session.query(table).filter_by(table_name=tbl_name).first()
     if not tbl:
-        tbl = TBL(table_name=tbl_name)
+        tbl = table(table_name=tbl_name)
     tbl.description = "Population density of San Francisco"
     tbl.database = database
+    tbl.filter_select_enabled = True
     db.session.merge(tbl)
     db.session.commit()
     tbl.fetch_metadata()
diff --git a/superset/examples/utils.py b/superset/examples/utils.py
index 66ca811df2d3..fc5b78a2304a 100644
--- a/superset/examples/utils.py
+++ b/superset/examples/utils.py
@@ -14,18 +14,29 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+import logging
 import re
 from pathlib import Path
 from typing import Any, Dict
 
+import yaml
 from pkg_resources import resource_isdir, resource_listdir, resource_stream
 
+from superset.commands.exceptions import CommandInvalidError
 from superset.commands.importers.v1.examples import ImportExamplesCommand
+from superset.commands.importers.v1.utils import METADATA_FILE_NAME
+
+_logger = logging.getLogger(__name__)
 
 YAML_EXTENSIONS = {".yaml", ".yml"}
 
 
-def load_from_configs(force_data: bool = False, load_test_data: bool = False) -> None:
+def load_examples_from_configs(
+    force_data: bool = False, load_test_data: bool = False
+) -> None:
+    """
+    Load all the examples inside superset/examples/configs/.
+    """
     contents = load_contents(load_test_data)
     command = ImportExamplesCommand(contents, overwrite=True, force_data=force_data)
     command.run()
@@ -55,3 +66,35 @@ def load_contents(load_test_data: bool = False) -> Dict[str, Any]:
             )
 
     return {str(path.relative_to(root)): content for path, content in contents.items()}
+
+
+def load_configs_from_directory(
+    root: Path, overwrite: bool = True, force_data: bool = False
+) -> None:
+    """
+    Load all the examples from a given directory.
+    """
+    contents: Dict[str, str] = {}
+    queue = [root]
+    while queue:
+        path_name = queue.pop()
+        if path_name.is_dir():
+            queue.extend(path_name.glob("*"))
+        elif path_name.suffix.lower() in YAML_EXTENSIONS:
+            with open(path_name) as fp:
+                contents[str(path_name.relative_to(root))] = fp.read()
+
+    # removing "type" from the metadata allows us to import any exported model
+    # from the unzipped directory directly
+    metadata = yaml.load(contents.get(METADATA_FILE_NAME, "{}"))
+    if "type" in metadata:
+        del metadata["type"]
+    contents[METADATA_FILE_NAME] = yaml.dump(metadata)
+
+    command = ImportExamplesCommand(
+        contents, overwrite=overwrite, force_data=force_data
+    )
+    try:
+        command.run()
+    except CommandInvalidError as ex:
+        _logger.error("An error occurred: %s", ex.normalized_messages())
diff --git a/superset/examples/world_bank.py b/superset/examples/world_bank.py
index f9c3aeb88e69..83d710a2be71 100644
--- a/superset/examples/world_bank.py
+++ b/superset/examples/world_bank.py
@@ -23,7 +23,7 @@
 from sqlalchemy import DateTime, String
 from sqlalchemy.sql import column
 
-from superset import db
+from superset import app, db
 from superset.connectors.sqla.models import SqlMetric
 from superset.models.dashboard import Dashboard
 from superset.models.slice import Slice
@@ -31,18 +31,17 @@
 
 from ..connectors.base.models import BaseDatasource
 from .helpers import (
-    config,
-    EXAMPLES_FOLDER,
     get_example_data,
+    get_examples_folder,
     get_slice_json,
+    get_table_connector_registry,
     merge_slice,
     misc_dash_slices,
-    TBL,
     update_slice_ids,
 )
 
 
-def load_world_bank_health_n_pop(  # pylint: disable=too-many-locals, too-many-statements
+def load_world_bank_health_n_pop(  # pylint: disable=too-many-locals
     only_metadata: bool = False, force: bool = False, sample: bool = False,
 ) -> None:
     """Loads the world bank health dataset, slices and a dashboard"""
@@ -78,10 +77,13 @@ def load_world_bank_health_n_pop(  # pylint: disable=too-many-locals, too-many-s
         )
 
     print("Creating table [wb_health_population] reference")
-    tbl = db.session.query(TBL).filter_by(table_name=tbl_name).first()
+    table = get_table_connector_registry()
+    tbl = db.session.query(table).filter_by(table_name=tbl_name).first()
     if not tbl:
-        tbl = TBL(table_name=tbl_name)
-    tbl.description = utils.readfile(os.path.join(EXAMPLES_FOLDER, "countries.md"))
+        tbl = table(table_name=tbl_name)
+    tbl.description = utils.readfile(
+        os.path.join(get_examples_folder(), "countries.md")
+    )
     tbl.main_dttm_col = "year"
     tbl.database = database
     tbl.filter_select_enabled = True
@@ -151,7 +153,7 @@ def create_slices(tbl: BaseDatasource) -> List[Slice]:
         "limit": "25",
         "granularity_sqla": "year",
         "groupby": [],
-        "row_limit": config["ROW_LIMIT"],
+        "row_limit": app.config["ROW_LIMIT"],
         "since": "2014-01-01",
         "until": "2014-01-02",
         "time_range": "2014-01-01 : 2014-01-02",
diff --git a/superset/exceptions.py b/superset/exceptions.py
index cde7c3f44aaf..f14506c24de8 100644
--- a/superset/exceptions.py
+++ b/superset/exceptions.py
@@ -43,9 +43,26 @@ def exception(self) -> Optional[Exception]:
 class SupersetErrorException(SupersetException):
     """Exceptions with a single SupersetErrorType associated with them"""
 
-    def __init__(self, error: SupersetError) -> None:
+    def __init__(self, error: SupersetError, status: Optional[int] = None) -> None:
         super().__init__(error.message)
         self.error = error
+        if status is not None:
+            self.status = status
+
+
+class SupersetGenericErrorException(SupersetErrorException):
+    """Exceptions that are too generic to have their own type"""
+
+    def __init__(self, message: str, status: Optional[int] = None) -> None:
+        super().__init__(
+            SupersetError(
+                message=message,
+                error_type=SupersetErrorType.GENERIC_BACKEND_ERROR,
+                level=ErrorLevel.ERROR,
+            )
+        )
+        if status is not None:
+            self.status = status
 
 
 class SupersetErrorFromParamsException(SupersetErrorException):
@@ -68,9 +85,13 @@ def __init__(
 class SupersetErrorsException(SupersetException):
     """Exceptions with multiple SupersetErrorType associated with them"""
 
-    def __init__(self, errors: List[SupersetError]) -> None:
+    def __init__(
+        self, errors: List[SupersetError], status: Optional[int] = None
+    ) -> None:
         super().__init__(str(errors))
         self.errors = errors
+        if status is not None:
+            self.status = status
 
 
 class SupersetTimeoutException(SupersetErrorFromParamsException):
@@ -97,11 +118,12 @@ class SupersetTemplateParamsErrorException(SupersetErrorFromParamsException):
     def __init__(
         self,
         message: str,
+        error: SupersetErrorType,
         level: ErrorLevel = ErrorLevel.ERROR,
         extra: Optional[Dict[str, Any]] = None,
     ) -> None:
         super().__init__(
-            SupersetErrorType.MISSING_TEMPLATE_PARAMS_ERROR, message, level, extra,
+            error, message, level, extra,
         )
 
 
@@ -167,7 +189,6 @@ def __init__(self, message: str = "Request payload has incorrect format"):
             message=message,
             error_type=SupersetErrorType.INVALID_PAYLOAD_FORMAT_ERROR,
             level=ErrorLevel.ERROR,
-            extra={},
         )
         super().__init__(error)
 
@@ -188,3 +209,7 @@ def __init__(self, error: ValidationError):
             extra={"messages": error.messages},
         )
         super().__init__(error)
+
+
+class SupersetCancelQueryException(SupersetException):
+    pass
diff --git a/superset/extensions.py b/superset/extensions.py
index d46894447d40..33dc1706a6b7 100644
--- a/superset/extensions.py
+++ b/superset/extensions.py
@@ -32,6 +32,7 @@
 from superset.utils.encrypt import EncryptedFieldFactory
 from superset.utils.feature_flag_manager import FeatureFlagManager
 from superset.utils.machine_auth import MachineAuthProviderFactory
+from superset.utils.profiler import SupersetProfiler
 
 
 class ResultsBackendManager:
@@ -64,9 +65,7 @@ def init_app(self, app: Flask) -> None:
         self.parse_manifest_json()
 
         @app.context_processor
-        def get_manifest() -> Dict[  # pylint: disable=unused-variable
-            str, Callable[[str], List[str]]
-        ]:
+        def get_manifest() -> Dict[str, Callable[[str], List[str]]]:
             loaded_chunks = set()
 
             def get_files(bundle: str, asset_type: str = "js") -> List[str]:
@@ -97,6 +96,14 @@ def get_manifest_files(self, bundle: str, asset_type: str) -> List[str]:
         return self.manifest.get(bundle, {}).get(asset_type, [])
 
 
+class ProfilingExtension:  # pylint: disable=too-few-public-methods
+    def __init__(self, interval: float = 1e-4) -> None:
+        self.interval = interval
+
+    def init_app(self, app: Flask) -> None:
+        app.wsgi_app = SupersetProfiler(app.wsgi_app, self.interval)  # type: ignore
+
+
 APP_DIR = os.path.dirname(__file__)
 appbuilder = AppBuilder(update_perms=False)
 async_query_manager = AsyncQueryManager()
@@ -111,6 +118,7 @@ def get_manifest_files(self, bundle: str, asset_type: str) -> List[str]:
 machine_auth_provider_factory = MachineAuthProviderFactory()
 manifest_processor = UIManifestProcessor(APP_DIR)
 migrate = Migrate()
+profiling = ProfilingExtension()
 results_backend_manager = ResultsBackendManager()
 security_manager = LocalProxy(lambda: appbuilder.sm)
 talisman = Talisman()
diff --git a/superset/initialization/__init__.py b/superset/initialization/__init__.py
new file mode 100644
index 000000000000..79c466069e76
--- /dev/null
+++ b/superset/initialization/__init__.py
@@ -0,0 +1,728 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from __future__ import annotations
+
+import logging
+import os
+from typing import Any, Callable, Dict, TYPE_CHECKING
+
+import wtforms_json
+from deprecation import deprecated
+from flask import Flask, redirect
+from flask_appbuilder import expose, IndexView
+from flask_babel import gettext as __, lazy_gettext as _
+from flask_compress import Compress
+from werkzeug.middleware.proxy_fix import ProxyFix
+
+from superset.connectors.connector_registry import ConnectorRegistry
+from superset.extensions import (
+    _event_logger,
+    APP_DIR,
+    appbuilder,
+    async_query_manager,
+    cache_manager,
+    celery_app,
+    csrf,
+    db,
+    encrypted_field_factory,
+    feature_flag_manager,
+    machine_auth_provider_factory,
+    manifest_processor,
+    migrate,
+    profiling,
+    results_backend_manager,
+    talisman,
+)
+from superset.security import SupersetSecurityManager
+from superset.typing import FlaskResponse
+from superset.utils.core import pessimistic_connection_handling
+from superset.utils.log import DBEventLogger, get_event_logger_from_cfg_value
+
+if TYPE_CHECKING:
+    from superset.app import SupersetApp
+
+logger = logging.getLogger(__name__)
+
+
+# pylint: disable=R0904
+class SupersetAppInitializer:
+    def __init__(self, app: SupersetApp) -> None:
+        super().__init__()
+
+        self.superset_app = app
+        self.config = app.config
+        self.manifest: Dict[Any, Any] = {}
+
+    @deprecated(details="use self.superset_app instead of self.flask_app")  # type: ignore   # pylint: disable=line-too-long,useless-suppression
+    @property
+    def flask_app(self) -> SupersetApp:
+        return self.superset_app
+
+    def pre_init(self) -> None:
+        """
+        Called before all other init tasks are complete
+        """
+        wtforms_json.init()
+
+        if not os.path.exists(self.config["DATA_DIR"]):
+            os.makedirs(self.config["DATA_DIR"])
+
+    def post_init(self) -> None:
+        """
+        Called after any other init tasks
+        """
+
+    def configure_celery(self) -> None:
+        celery_app.config_from_object(self.config["CELERY_CONFIG"])
+        celery_app.set_default()
+        superset_app = self.superset_app
+
+        # Here, we want to ensure that every call into Celery task has an app context
+        # setup properly
+        task_base = celery_app.Task
+
+        class AppContextTask(task_base):  # type: ignore
+            # pylint: disable=too-few-public-methods
+            abstract = True
+
+            # Grab each call into the task and set up an app context
+            def __call__(self, *args: Any, **kwargs: Any) -> Any:
+                with superset_app.app_context():
+                    return task_base.__call__(self, *args, **kwargs)
+
+        celery_app.Task = AppContextTask
+
+    def init_views(self) -> None:
+        #
+        # We're doing local imports, as several of them import
+        # models which in turn try to import
+        # the global Flask app
+        #
+        # pylint: disable=import-outside-toplevel,too-many-locals,too-many-statements
+        from superset.annotation_layers.api import AnnotationLayerRestApi
+        from superset.annotation_layers.annotations.api import AnnotationRestApi
+        from superset.async_events.api import AsyncEventsRestApi
+        from superset.cachekeys.api import CacheRestApi
+        from superset.charts.api import ChartRestApi
+        from superset.connectors.druid.views import (
+            Druid,
+            DruidClusterModelView,
+            DruidColumnInlineView,
+            DruidDatasourceModelView,
+            DruidMetricInlineView,
+        )
+        from superset.connectors.sqla.views import (
+            RowLevelSecurityFiltersModelView,
+            SqlMetricInlineView,
+            TableColumnInlineView,
+            TableModelView,
+        )
+        from superset.css_templates.api import CssTemplateRestApi
+        from superset.dashboards.api import DashboardRestApi
+        from superset.databases.api import DatabaseRestApi
+        from superset.datasets.api import DatasetRestApi
+        from superset.datasets.columns.api import DatasetColumnsRestApi
+        from superset.datasets.metrics.api import DatasetMetricRestApi
+        from superset.queries.api import QueryRestApi
+        from superset.security.api import SecurityRestApi
+        from superset.queries.saved_queries.api import SavedQueryRestApi
+        from superset.reports.api import ReportScheduleRestApi
+        from superset.reports.logs.api import ReportExecutionLogRestApi
+        from superset.views.access_requests import AccessRequestsModelView
+        from superset.views.alerts import (
+            AlertLogModelView,
+            AlertModelView,
+            AlertObservationModelView,
+            AlertView,
+            ReportView,
+        )
+        from superset.views.annotations import (
+            AnnotationLayerModelView,
+            AnnotationModelView,
+        )
+        from superset.views.api import Api
+        from superset.views.chart.views import SliceAsync, SliceModelView
+        from superset.views.core import Superset
+        from superset.views.css_templates import (
+            CssTemplateAsyncModelView,
+            CssTemplateModelView,
+        )
+        from superset.views.dashboard.views import (
+            Dashboard,
+            DashboardModelView,
+            DashboardModelViewAsync,
+        )
+        from superset.views.database.views import (
+            CsvToDatabaseView,
+            DatabaseView,
+            ExcelToDatabaseView,
+        )
+        from superset.views.datasource.views import Datasource
+        from superset.views.dynamic_plugins import DynamicPluginsView
+        from superset.views.key_value import KV
+        from superset.views.log.api import LogRestApi
+        from superset.views.log.views import LogModelView
+        from superset.views.redirects import R
+        from superset.views.schedules import (
+            DashboardEmailScheduleView,
+            SliceEmailScheduleView,
+        )
+        from superset.views.sql_lab import (
+            SavedQueryView,
+            SavedQueryViewApi,
+            SqlLab,
+            TableSchemaView,
+            TabStateView,
+        )
+        from superset.views.tags import TagView
+
+        #
+        # Setup API views
+        #
+        appbuilder.add_api(AnnotationRestApi)
+        appbuilder.add_api(AnnotationLayerRestApi)
+        appbuilder.add_api(AsyncEventsRestApi)
+        appbuilder.add_api(CacheRestApi)
+        appbuilder.add_api(ChartRestApi)
+        appbuilder.add_api(CssTemplateRestApi)
+        appbuilder.add_api(DashboardRestApi)
+        appbuilder.add_api(DatabaseRestApi)
+        appbuilder.add_api(DatasetRestApi)
+        appbuilder.add_api(DatasetColumnsRestApi)
+        appbuilder.add_api(DatasetMetricRestApi)
+        appbuilder.add_api(QueryRestApi)
+        appbuilder.add_api(SavedQueryRestApi)
+        appbuilder.add_api(ReportScheduleRestApi)
+        appbuilder.add_api(ReportExecutionLogRestApi)
+        #
+        # Setup regular views
+        #
+        appbuilder.add_link(
+            "Home",
+            label=__("Home"),
+            href="/superset/welcome/",
+            cond=lambda: bool(appbuilder.app.config["LOGO_TARGET_PATH"]),
+        )
+        appbuilder.add_view(
+            AnnotationLayerModelView,
+            "Annotation Layers",
+            label=__("Annotation Layers"),
+            icon="fa-comment",
+            category="Manage",
+            category_label=__("Manage"),
+            category_icon="",
+        )
+        appbuilder.add_view(
+            DashboardModelView,
+            "Dashboards",
+            label=__("Dashboards"),
+            icon="fa-dashboard",
+            category="",
+            category_icon="",
+        )
+        appbuilder.add_view(
+            SliceModelView,
+            "Charts",
+            label=__("Charts"),
+            icon="fa-bar-chart",
+            category="",
+            category_icon="",
+        )
+        appbuilder.add_view(
+            DynamicPluginsView,
+            "Plugins",
+            label=__("Plugins"),
+            category="Manage",
+            category_label=__("Manage"),
+            icon="fa-puzzle-piece",
+            menu_cond=lambda: feature_flag_manager.is_feature_enabled(
+                "DYNAMIC_PLUGINS"
+            ),
+        )
+        appbuilder.add_view(
+            CssTemplateModelView,
+            "CSS Templates",
+            label=__("CSS Templates"),
+            icon="fa-css3",
+            category="Manage",
+            category_label=__("Manage"),
+            category_icon="",
+        )
+        appbuilder.add_view(
+            RowLevelSecurityFiltersModelView,
+            "Row Level Security",
+            label=__("Row level security"),
+            category="Security",
+            category_label=__("Security"),
+            icon="fa-lock",
+            menu_cond=lambda: feature_flag_manager.is_feature_enabled(
+                "ROW_LEVEL_SECURITY"
+            ),
+        )
+
+        #
+        # Setup views with no menu
+        #
+        appbuilder.add_view_no_menu(Api)
+        appbuilder.add_view_no_menu(CssTemplateAsyncModelView)
+        appbuilder.add_view_no_menu(CsvToDatabaseView)
+        appbuilder.add_view_no_menu(ExcelToDatabaseView)
+        appbuilder.add_view_no_menu(Dashboard)
+        appbuilder.add_view_no_menu(DashboardModelViewAsync)
+        appbuilder.add_view_no_menu(Datasource)
+        appbuilder.add_view_no_menu(KV)
+        appbuilder.add_view_no_menu(R)
+        appbuilder.add_view_no_menu(SavedQueryView)
+        appbuilder.add_view_no_menu(SavedQueryViewApi)
+        appbuilder.add_view_no_menu(SliceAsync)
+        appbuilder.add_view_no_menu(SqlLab)
+        appbuilder.add_view_no_menu(SqlMetricInlineView)
+        appbuilder.add_view_no_menu(AnnotationModelView)
+        appbuilder.add_view_no_menu(Superset)
+        appbuilder.add_view_no_menu(TableColumnInlineView)
+        appbuilder.add_view_no_menu(TableModelView)
+        appbuilder.add_view_no_menu(TableSchemaView)
+        appbuilder.add_view_no_menu(TabStateView)
+        appbuilder.add_view_no_menu(TagView)
+
+        #
+        # Add links
+        #
+        appbuilder.add_link(
+            "Import Dashboards",
+            label=__("Import Dashboards"),
+            href="/superset/import_dashboards/",
+            icon="fa-cloud-upload",
+            category="Manage",
+            category_label=__("Manage"),
+            category_icon="fa-wrench",
+            cond=lambda: not feature_flag_manager.is_feature_enabled(
+                "VERSIONED_EXPORT"
+            ),
+        )
+        appbuilder.add_link(
+            "SQL Editor",
+            label=_("SQL Editor"),
+            href="/superset/sqllab/",
+            category_icon="fa-flask",
+            icon="fa-flask",
+            category="SQL Lab",
+            category_label=__("SQL Lab"),
+        )
+        appbuilder.add_link(
+            __("Saved Queries"),
+            href="/savedqueryview/list/",
+            icon="fa-save",
+            category="SQL Lab",
+        )
+        appbuilder.add_link(
+            "Query Search",
+            label=_("Query History"),
+            href="/superset/sqllab/history/",
+            icon="fa-search",
+            category_icon="fa-flask",
+            category="SQL Lab",
+            category_label=__("SQL Lab"),
+        )
+        appbuilder.add_view(
+            DatabaseView,
+            "Databases",
+            label=__("Databases"),
+            icon="fa-database",
+            category="Data",
+            category_label=__("Data"),
+            category_icon="fa-database",
+        )
+        appbuilder.add_link(
+            "Datasets",
+            label=__("Datasets"),
+            href="/tablemodelview/list/",
+            icon="fa-table",
+            category="Data",
+            category_label=__("Data"),
+            category_icon="fa-table",
+        )
+        appbuilder.add_separator("Data")
+        appbuilder.add_link(
+            "Upload a CSV",
+            label=__("Upload a CSV"),
+            href="/csvtodatabaseview/form",
+            icon="fa-upload",
+            category="Data",
+            category_label=__("Data"),
+            category_icon="fa-wrench",
+            cond=lambda: bool(
+                self.config["CSV_EXTENSIONS"].intersection(
+                    self.config["ALLOWED_EXTENSIONS"]
+                )
+            ),
+        )
+
+        try:
+            import xlrd  # pylint: disable=unused-import
+
+            appbuilder.add_link(
+                "Upload Excel",
+                label=__("Upload Excel"),
+                href="/exceltodatabaseview/form",
+                icon="fa-upload",
+                category="Data",
+                category_label=__("Data"),
+                category_icon="fa-wrench",
+                cond=lambda: bool(
+                    self.config["EXCEL_EXTENSIONS"].intersection(
+                        self.config["ALLOWED_EXTENSIONS"]
+                    )
+                ),
+            )
+        except ImportError:
+            pass
+
+        appbuilder.add_api(LogRestApi)
+        appbuilder.add_view(
+            LogModelView,
+            "Action Log",
+            label=__("Action Log"),
+            category="Security",
+            category_label=__("Security"),
+            icon="fa-list-ol",
+            menu_cond=lambda: (
+                self.config["FAB_ADD_SECURITY_VIEWS"]
+                and self.config["SUPERSET_LOG_VIEW"]
+            ),
+        )
+        appbuilder.add_api(SecurityRestApi)
+        #
+        # Conditionally setup email views
+        #
+        if self.config["ENABLE_SCHEDULED_EMAIL_REPORTS"]:
+            logging.warning(
+                "ENABLE_SCHEDULED_EMAIL_REPORTS "
+                "is deprecated and will be removed in version 2.0.0"
+            )
+
+        appbuilder.add_separator(
+            "Manage", cond=lambda: self.config["ENABLE_SCHEDULED_EMAIL_REPORTS"]
+        )
+        appbuilder.add_view(
+            DashboardEmailScheduleView,
+            "Dashboard Email Schedules",
+            label=__("Dashboard Emails"),
+            category="Manage",
+            category_label=__("Manage"),
+            icon="fa-search",
+            menu_cond=lambda: self.config["ENABLE_SCHEDULED_EMAIL_REPORTS"],
+        )
+        appbuilder.add_view(
+            SliceEmailScheduleView,
+            "Chart Emails",
+            label=__("Chart Email Schedules"),
+            category="Manage",
+            category_label=__("Manage"),
+            icon="fa-search",
+            menu_cond=lambda: self.config["ENABLE_SCHEDULED_EMAIL_REPORTS"],
+        )
+
+        if self.config["ENABLE_ALERTS"]:
+            logging.warning(
+                "ENABLE_ALERTS is deprecated and will be removed in version 2.0.0"
+            )
+
+        appbuilder.add_view(
+            AlertModelView,
+            "Alerts",
+            label=__("Alerts"),
+            category="Manage",
+            category_label=__("Manage"),
+            icon="fa-exclamation-triangle",
+            menu_cond=lambda: bool(self.config["ENABLE_ALERTS"]),
+        )
+        appbuilder.add_view_no_menu(AlertLogModelView)
+        appbuilder.add_view_no_menu(AlertObservationModelView)
+
+        appbuilder.add_view(
+            AlertView,
+            "Alerts & Report",
+            label=__("Alerts & Reports"),
+            category="Manage",
+            category_label=__("Manage"),
+            icon="fa-exclamation-triangle",
+            menu_cond=lambda: feature_flag_manager.is_feature_enabled("ALERT_REPORTS"),
+        )
+        appbuilder.add_view_no_menu(ReportView)
+
+        appbuilder.add_view(
+            AccessRequestsModelView,
+            "Access requests",
+            label=__("Access requests"),
+            category="Security",
+            category_label=__("Security"),
+            icon="fa-table",
+            menu_cond=lambda: bool(self.config["ENABLE_ACCESS_REQUEST"]),
+        )
+
+        #
+        # Druid Views
+        #
+        appbuilder.add_separator(
+            "Data", cond=lambda: bool(self.config["DRUID_IS_ACTIVE"])
+        )
+        appbuilder.add_view(
+            DruidDatasourceModelView,
+            "Druid Datasources",
+            label=__("Druid Datasources"),
+            category="Data",
+            category_label=__("Data"),
+            icon="fa-cube",
+            menu_cond=lambda: bool(self.config["DRUID_IS_ACTIVE"]),
+        )
+        appbuilder.add_view(
+            DruidClusterModelView,
+            name="Druid Clusters",
+            label=__("Druid Clusters"),
+            icon="fa-cubes",
+            category="Data",
+            category_label=__("Data"),
+            category_icon="fa-database",
+            menu_cond=lambda: bool(self.config["DRUID_IS_ACTIVE"]),
+        )
+        appbuilder.add_view_no_menu(DruidMetricInlineView)
+        appbuilder.add_view_no_menu(DruidColumnInlineView)
+        appbuilder.add_view_no_menu(Druid)
+
+        appbuilder.add_link(
+            "Scan New Datasources",
+            label=__("Scan New Datasources"),
+            href="/druid/scan_new_datasources/",
+            category="Data",
+            category_label=__("Data"),
+            category_icon="fa-database",
+            icon="fa-refresh",
+            cond=lambda: bool(
+                self.config["DRUID_IS_ACTIVE"]
+                and self.config["DRUID_METADATA_LINKS_ENABLED"]
+            ),
+        )
+        appbuilder.add_link(
+            "Refresh Druid Metadata",
+            label=__("Refresh Druid Metadata"),
+            href="/druid/refresh_datasources/",
+            category="Data",
+            category_label=__("Data"),
+            category_icon="fa-database",
+            icon="fa-cog",
+            cond=lambda: bool(
+                self.config["DRUID_IS_ACTIVE"]
+                and self.config["DRUID_METADATA_LINKS_ENABLED"]
+            ),
+        )
+        appbuilder.add_separator(
+            "Data", cond=lambda: bool(self.config["DRUID_IS_ACTIVE"])
+        )
+
+    def init_app_in_ctx(self) -> None:
+        """
+        Runs init logic in the context of the app
+        """
+        self.configure_fab()
+        self.configure_url_map_converters()
+        self.configure_data_sources()
+        self.configure_auth_provider()
+        self.configure_async_queries()
+
+        # Hook that provides administrators a handle on the Flask APP
+        # after initialization
+        flask_app_mutator = self.config["FLASK_APP_MUTATOR"]
+        if flask_app_mutator:
+            flask_app_mutator(self.superset_app)
+
+        self.init_views()
+
+    def init_app(self) -> None:
+        """
+        Main entry point which will delegate to other methods in
+        order to fully init the app
+        """
+        self.pre_init()
+        # Configuration of logging must be done first to apply the formatter properly
+        self.configure_logging()
+        # Configuration of feature_flags must be done first to allow init features
+        # conditionally
+        self.configure_feature_flags()
+        self.configure_db_encrypt()
+        self.setup_db()
+        self.configure_celery()
+        self.enable_profiling()
+        self.setup_event_logger()
+        self.setup_bundle_manifest()
+        self.register_blueprints()
+        self.configure_wtf()
+        self.configure_middlewares()
+        self.configure_cache()
+
+        with self.superset_app.app_context():
+            self.init_app_in_ctx()
+
+        self.post_init()
+
+    def configure_auth_provider(self) -> None:
+        machine_auth_provider_factory.init_app(self.superset_app)
+
+    def setup_event_logger(self) -> None:
+        _event_logger["event_logger"] = get_event_logger_from_cfg_value(
+            self.superset_app.config.get("EVENT_LOGGER", DBEventLogger())
+        )
+
+    def configure_data_sources(self) -> None:
+        # Registering sources
+        module_datasource_map = self.config["DEFAULT_MODULE_DS_MAP"]
+        module_datasource_map.update(self.config["ADDITIONAL_MODULE_DS_MAP"])
+        ConnectorRegistry.register_sources(module_datasource_map)
+
+    def configure_cache(self) -> None:
+        cache_manager.init_app(self.superset_app)
+        results_backend_manager.init_app(self.superset_app)
+
+    def configure_feature_flags(self) -> None:
+        feature_flag_manager.init_app(self.superset_app)
+
+    def configure_fab(self) -> None:
+        if self.config["SILENCE_FAB"]:
+            logging.getLogger("flask_appbuilder").setLevel(logging.ERROR)
+
+        custom_sm = self.config["CUSTOM_SECURITY_MANAGER"] or SupersetSecurityManager
+        if not issubclass(custom_sm, SupersetSecurityManager):
+            raise Exception(
+                """Your CUSTOM_SECURITY_MANAGER must now extend SupersetSecurityManager,
+                 not FAB's security manager.
+                 See [4565] in UPDATING.md"""
+            )
+
+        appbuilder.indexview = SupersetIndexView
+        appbuilder.base_template = "superset/base.html"
+        appbuilder.security_manager_class = custom_sm
+        appbuilder.init_app(self.superset_app, db.session)
+
+    def configure_url_map_converters(self) -> None:
+        #
+        # Doing local imports here as model importing causes a reference to
+        # app.config to be invoked and we need the current_app to have been setup
+        #
+        # pylint: disable=import-outside-toplevel
+        from superset.utils.url_map_converters import (
+            ObjectTypeConverter,
+            RegexConverter,
+        )
+
+        self.superset_app.url_map.converters["regex"] = RegexConverter
+        self.superset_app.url_map.converters["object_type"] = ObjectTypeConverter
+
+    def configure_middlewares(self) -> None:
+        if self.config["ENABLE_CORS"]:
+            # pylint: disable=import-outside-toplevel
+            from flask_cors import CORS
+
+            CORS(self.superset_app, **self.config["CORS_OPTIONS"])
+
+        if self.config["ENABLE_PROXY_FIX"]:
+            self.superset_app.wsgi_app = ProxyFix(  # type: ignore
+                self.superset_app.wsgi_app, **self.config["PROXY_FIX_CONFIG"]
+            )
+
+        if self.config["ENABLE_CHUNK_ENCODING"]:
+
+            class ChunkedEncodingFix:  # pylint: disable=too-few-public-methods
+                def __init__(self, app: Flask) -> None:
+                    self.app = app
+
+                def __call__(
+                    self, environ: Dict[str, Any], start_response: Callable[..., Any]
+                ) -> Any:
+                    # Setting wsgi.input_terminated tells werkzeug.wsgi to ignore
+                    # content-length and read the stream till the end.
+                    if environ.get("HTTP_TRANSFER_ENCODING", "").lower() == "chunked":
+                        environ["wsgi.input_terminated"] = True
+                    return self.app(environ, start_response)
+
+            self.superset_app.wsgi_app = ChunkedEncodingFix(  # type: ignore
+                self.superset_app.wsgi_app  # type: ignore
+            )
+
+        if self.config["UPLOAD_FOLDER"]:
+            try:
+                os.makedirs(self.config["UPLOAD_FOLDER"])
+            except OSError:
+                pass
+
+        for middleware in self.config["ADDITIONAL_MIDDLEWARE"]:
+            self.superset_app.wsgi_app = middleware(  # type: ignore
+                self.superset_app.wsgi_app
+            )
+
+        # Flask-Compress
+        Compress(self.superset_app)
+
+        if self.config["TALISMAN_ENABLED"]:
+            talisman.init_app(self.superset_app, **self.config["TALISMAN_CONFIG"])
+
+    def configure_logging(self) -> None:
+        self.config["LOGGING_CONFIGURATOR"].configure_logging(
+            self.config, self.superset_app.debug
+        )
+
+    def configure_db_encrypt(self) -> None:
+        encrypted_field_factory.init_app(self.superset_app)
+
+    def setup_db(self) -> None:
+        db.init_app(self.superset_app)
+
+        with self.superset_app.app_context():
+            pessimistic_connection_handling(db.engine)
+
+        migrate.init_app(self.superset_app, db=db, directory=APP_DIR + "/migrations")
+
+    def configure_wtf(self) -> None:
+        if self.config["WTF_CSRF_ENABLED"]:
+            csrf.init_app(self.superset_app)
+            csrf_exempt_list = self.config["WTF_CSRF_EXEMPT_LIST"]
+            for ex in csrf_exempt_list:
+                csrf.exempt(ex)
+
+    def configure_async_queries(self) -> None:
+        if feature_flag_manager.is_feature_enabled("GLOBAL_ASYNC_QUERIES"):
+            async_query_manager.init_app(self.superset_app)
+
+    def register_blueprints(self) -> None:
+        for bp in self.config["BLUEPRINTS"]:
+            try:
+                logger.info("Registering blueprint: %s", bp.name)
+                self.superset_app.register_blueprint(bp)
+            except Exception:  # pylint: disable=broad-except
+                logger.exception("blueprint registration failed")
+
+    def setup_bundle_manifest(self) -> None:
+        manifest_processor.init_app(self.superset_app)
+
+    def enable_profiling(self) -> None:
+        if self.config["PROFILING"]:
+            profiling.init_app(self.superset_app)
+
+
+class SupersetIndexView(IndexView):
+    @expose("/")
+    def index(self) -> FlaskResponse:
+        return redirect("/superset/welcome/")
diff --git a/superset/jinja_context.py b/superset/jinja_context.py
index 43e64e4be72e..59f7d933bdb5 100644
--- a/superset/jinja_context.py
+++ b/superset/jinja_context.py
@@ -38,11 +38,8 @@
 
 from superset.exceptions import SupersetTemplateException
 from superset.extensions import feature_flag_manager
-from superset.utils.core import (
-    convert_legacy_filters_into_adhoc,
-    memoized,
-    merge_extra_filters,
-)
+from superset.utils.core import convert_legacy_filters_into_adhoc, merge_extra_filters
+from superset.utils.memoized import memoized
 
 if TYPE_CHECKING:
     from superset.connectors.sqla.models import SqlaTable
@@ -172,6 +169,7 @@ def url_param(
         :returns: The URL parameters
         """
 
+        # pylint: disable=import-outside-toplevel
         from superset.views.utils import get_form_data
 
         if request.args.get(param):
@@ -287,6 +285,7 @@ def get_filters(self, column: str, remove_filter: bool = False) -> List[Filter]:
             only apply to the inner query
         :return: returns a list of filters
         """
+        # pylint: disable=import-outside-toplevel
         from superset.utils.core import FilterOperator
         from superset.views.utils import get_form_data
 
@@ -334,10 +333,10 @@ def safe_proxy(func: Callable[..., Any], *args: Any, **kwargs: Any) -> Any:
     if value_type in COLLECTION_TYPES:
         try:
             return_value = json.loads(json.dumps(return_value))
-        except TypeError:
+        except TypeError as ex:
             raise SupersetTemplateException(
                 _("Unsupported return value for method %(name)s", name=func.__name__,)
-            )
+            ) from ex
 
     return return_value
 
@@ -358,10 +357,10 @@ def validate_context_types(context: Dict[str, Any]) -> Dict[str, Any]:
         if arg_type in COLLECTION_TYPES:
             try:
                 context[key] = json.loads(json.dumps(context[key]))
-            except TypeError:
+            except TypeError as ex:
                 raise SupersetTemplateException(
                     _("Unsupported template value for key %(key)s", key=key)
-                )
+                ) from ex
 
     return context
 
@@ -379,7 +378,7 @@ def validate_template_context(
     return validate_context_types(context)
 
 
-class BaseTemplateProcessor:  # pylint: disable=too-few-public-methods
+class BaseTemplateProcessor:
     """
     Base class for database-specific jinja context
     """
@@ -443,9 +442,7 @@ def set_context(self, **kwargs: Any) -> None:
         )
 
 
-class NoOpTemplateProcessor(
-    BaseTemplateProcessor
-):  # pylint: disable=too-few-public-methods
+class NoOpTemplateProcessor(BaseTemplateProcessor):
     def process_template(self, sql: str, **kwargs: Any) -> str:
         """
         Makes processing a template a noop
@@ -499,6 +496,7 @@ def latest_partitions(self, table_name: str) -> Optional[List[str]]:
         :return: the latest partition array
         """
 
+        # pylint: disable=import-outside-toplevel
         from superset.db_engine_specs.presto import PrestoEngineSpec
 
         table_name, schema = self._schema_table(table_name, self._schema)
@@ -509,6 +507,7 @@ def latest_partitions(self, table_name: str) -> Optional[List[str]]:
     def latest_sub_partition(self, table_name: str, **kwargs: Any) -> Any:
         table_name, schema = self._schema_table(table_name, self._schema)
 
+        # pylint: disable=import-outside-toplevel
         from superset.db_engine_specs.presto import PrestoEngineSpec
 
         return cast(
@@ -530,10 +529,10 @@ class HiveTemplateProcessor(PrestoTemplateProcessor):
 @memoized
 def get_template_processors() -> Dict[str, Any]:
     processors = current_app.config.get("CUSTOM_TEMPLATE_PROCESSORS", {})
-    for engine in DEFAULT_PROCESSORS:
+    for engine, processor in DEFAULT_PROCESSORS.items():
         # do not overwrite engine-specific CUSTOM_TEMPLATE_PROCESSORS
         if not engine in processors:
-            processors[engine] = DEFAULT_PROCESSORS[engine]
+            processors[engine] = processor
 
     return processors
 
diff --git a/superset/migrations/versions/030c840e3a1c_add_query_context_to_slices.py b/superset/migrations/versions/030c840e3a1c_add_query_context_to_slices.py
new file mode 100644
index 000000000000..5fa1dc2a5196
--- /dev/null
+++ b/superset/migrations/versions/030c840e3a1c_add_query_context_to_slices.py
@@ -0,0 +1,41 @@
+# 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.
+"""Add query context to slices
+
+Revision ID: 030c840e3a1c
+Revises: 3317e9248280
+Create Date: 2021-07-21 12:09:37.048337
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = "030c840e3a1c"
+down_revision = "3317e9248280"
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import mysql
+
+
+def upgrade():
+    with op.batch_alter_table("slices") as batch_op:
+        batch_op.add_column(sa.Column("query_context", sa.Text(), nullable=True))
+
+
+def downgrade():
+    with op.batch_alter_table("slices") as batch_op:
+        batch_op.drop_column("query_context")
diff --git a/superset/migrations/versions/07071313dd52_change_fetch_values_predicate_to_text.py b/superset/migrations/versions/07071313dd52_change_fetch_values_predicate_to_text.py
new file mode 100644
index 000000000000..320fb55a3524
--- /dev/null
+++ b/superset/migrations/versions/07071313dd52_change_fetch_values_predicate_to_text.py
@@ -0,0 +1,84 @@
+# 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_fetch_values_predicate_to_text
+
+Revision ID: 07071313dd52
+Revises: 6d20ba9ecb33
+Create Date: 2021-08-09 17:32:56.204184
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = "07071313dd52"
+down_revision = "6d20ba9ecb33"
+
+import logging
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy import and_, func, or_
+from sqlalchemy.dialects import postgresql
+from sqlalchemy.sql.schema import Table
+
+from superset import db
+from superset.connectors.sqla.models import SqlaTable
+
+
+def upgrade():
+    with op.batch_alter_table("tables") as batch_op:
+        batch_op.alter_column(
+            "fetch_values_predicate",
+            existing_type=sa.String(length=1000),
+            type_=sa.Text(),
+            existing_nullable=True,
+        )
+
+
+def remove_value_if_too_long():
+    bind = op.get_bind()
+    session = db.Session(bind=bind)
+
+    # it will be easier for users to notice that their field has been deleted rather than truncated
+    # so just remove it if it won't fit back into the 1000 string length column
+    try:
+        rows = (
+            session.query(SqlaTable)
+            .filter(func.length(SqlaTable.fetch_values_predicate) > 1000)
+            .all()
+        )
+
+        for row in rows:
+            row.fetch_values_predicate = None
+
+        logging.info("%d values deleted", len(rows))
+
+        session.commit()
+        session.close()
+    except Exception as ex:
+        logging.warning(ex)
+
+
+def downgrade():
+    remove_value_if_too_long()
+
+    with op.batch_alter_table("tables") as batch_op:
+        batch_op.alter_column(
+            "fetch_values_predicate",
+            existing_type=sa.Text(),
+            type_=sa.String(length=1000),
+            existing_nullable=True,
+        )
diff --git a/superset/migrations/versions/143b6f2815da_migrate_pivot_table_v2_heatmaps_to_new_.py b/superset/migrations/versions/143b6f2815da_migrate_pivot_table_v2_heatmaps_to_new_.py
new file mode 100644
index 000000000000..888925a888c7
--- /dev/null
+++ b/superset/migrations/versions/143b6f2815da_migrate_pivot_table_v2_heatmaps_to_new_.py
@@ -0,0 +1,108 @@
+# 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.
+"""migrate pivot table v2 heatmaps to new format
+
+Revision ID: 143b6f2815da
+Revises: e323605f370a
+Create Date: 2021-08-03 15:36:35.925420
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = "143b6f2815da"
+down_revision = "e323605f370a"
+
+import json
+from typing import Any, Dict, List, Tuple
+
+from alembic import op
+from sqlalchemy import and_, Column, Integer, String, Text
+from sqlalchemy.ext.declarative import declarative_base
+
+from superset import db
+
+Base = declarative_base()
+
+
+class Slice(Base):
+    __tablename__ = "slices"
+    id = Column(Integer, primary_key=True)
+    viz_type = Column(String(250))
+    params = Column(Text)
+
+
+VALID_RENDERERS = (
+    "Table With Subtotal",
+    "Table With Subtotal Heatmap",
+    "Table With Subtotal Col Heatmap",
+    "Table With Subtotal Row Heatmap",
+    "Table With Subtotal Barchart",
+    "Table With Subtotal Col Barchart",
+    "Table With Subtotal Row Barchart",
+)
+
+
+def upgrade():
+    bind = op.get_bind()
+    session = db.Session(bind=bind)
+
+    slices = (
+        session.query(Slice)
+        .filter(
+            and_(
+                Slice.viz_type == "pivot_table_v2",
+                Slice.params.like('%"tableRenderer%'),
+            )
+        )
+        .all()
+    )
+    changed_slices = 0
+    for slice in slices:
+        try:
+            params = json.loads(slice.params)
+            table_renderer = params.pop("tableRenderer", None)
+            conditional_formatting = params.get("conditional_formatting")
+
+            # don't update unless table_renderer is valid and
+            # conditional_formatting is undefined
+            if table_renderer in VALID_RENDERERS and conditional_formatting is None:
+                metric_labels = [
+                    metric if isinstance(metric, str) else metric["label"]
+                    for metric in params.get("metrics")
+                ]
+                params["conditional_formatting"] = [
+                    {
+                        "colorScheme": "rgb(255,0,0)",
+                        "column": metric_label,
+                        "operator": "None",
+                    }
+                    for metric_label in metric_labels
+                ]
+                changed_slices += 1
+                slice.params = json.dumps(params, sort_keys=True)
+        except Exception as e:
+            print(f"Parsing json_metadata for slice {slice.id} failed.")
+            raise e
+
+    session.commit()
+    session.close()
+    print(f"Upgraded {changed_slices} slices.")
+
+
+def downgrade():
+    # slices can't be downgraded
+    pass
diff --git a/superset/migrations/versions/27ae655e4247_make_creator_owners.py b/superset/migrations/versions/27ae655e4247_make_creator_owners.py
index 561a8ca9a544..c373c0f7e909 100644
--- a/superset/migrations/versions/27ae655e4247_make_creator_owners.py
+++ b/superset/migrations/versions/27ae655e4247_make_creator_owners.py
@@ -27,10 +27,10 @@
 down_revision = "d8bc074f7aad"
 
 from alembic import op
+from flask import g
 from flask_appbuilder import Model
-from flask_appbuilder.models.mixins import AuditMixin
 from sqlalchemy import Column, ForeignKey, Integer, Table
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.ext.declarative import declarative_base, declared_attr
 from sqlalchemy.orm import relationship
 
 from superset import db
@@ -62,6 +62,29 @@ class User(Base):
 )
 
 
+class AuditMixin:
+    @classmethod
+    def get_user_id(cls):
+        try:
+            return g.user.id
+        except Exception:
+            return None
+
+    @declared_attr
+    def created_by_fk(cls):
+        return Column(
+            Integer, ForeignKey("ab_user.id"), default=cls.get_user_id, nullable=False
+        )
+
+    @declared_attr
+    def created_by(cls):
+        return relationship(
+            "User",
+            primaryjoin="%s.created_by_fk == User.id" % cls.__name__,
+            enable_typechecks=False,
+        )
+
+
 class Slice(Base, AuditMixin):
     """Declarative class to do query in upgrade"""
 
diff --git a/superset/migrations/versions/301362411006_add_execution_id_to_report_execution_.py b/superset/migrations/versions/301362411006_add_execution_id_to_report_execution_.py
index c7af8f6c0ce1..3edc52f28cce 100644
--- a/superset/migrations/versions/301362411006_add_execution_id_to_report_execution_.py
+++ b/superset/migrations/versions/301362411006_add_execution_id_to_report_execution_.py
@@ -32,8 +32,10 @@
 
 
 def upgrade():
-    op.add_column("report_execution_log", sa.Column("uuid", UUIDType(binary=True)))
+    with op.batch_alter_table("report_execution_log") as batch_op:
+        batch_op.add_column(sa.Column("uuid", UUIDType(binary=True)))
 
 
 def downgrade():
-    op.drop_column("report_execution_log", "execution_id")
+    with op.batch_alter_table("report_execution_log") as batch_op:
+        batch_op.drop_column("uuid")
diff --git a/superset/migrations/versions/31b2a1039d4a_drop_tables_constraint.py b/superset/migrations/versions/31b2a1039d4a_drop_tables_constraint.py
new file mode 100644
index 000000000000..02123d73ef5d
--- /dev/null
+++ b/superset/migrations/versions/31b2a1039d4a_drop_tables_constraint.py
@@ -0,0 +1,54 @@
+# 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.
+"""drop tables constraint
+
+Revision ID: 31b2a1039d4a
+Revises: ae1ed299413b
+Create Date: 2021-07-27 08:25:20.755453
+
+"""
+
+from alembic import op
+from sqlalchemy import engine
+from sqlalchemy.exc import OperationalError, ProgrammingError
+
+from superset.utils.core import generic_find_uq_constraint_name
+
+# revision identifiers, used by Alembic.
+revision = "31b2a1039d4a"
+down_revision = "ae1ed299413b"
+
+conv = {"uq": "uq_%(table_name)s_%(column_0_name)s"}
+
+
+def upgrade():
+    bind = op.get_bind()
+    insp = engine.reflection.Inspector.from_engine(bind)
+
+    # Drop the uniqueness constraint if it exists.
+    constraint = generic_find_uq_constraint_name("tables", {"table_name"}, insp)
+
+    if constraint:
+        with op.batch_alter_table("tables", naming_convention=conv) as batch_op:
+            batch_op.drop_constraint(constraint, type_="unique")
+
+
+def downgrade():
+
+    # One cannot simply re-add the uniqueness constraint as it may not have previously
+    # existed.
+    pass
diff --git a/superset/migrations/versions/3317e9248280_add_creation_method_to_reports_model.py b/superset/migrations/versions/3317e9248280_add_creation_method_to_reports_model.py
new file mode 100644
index 000000000000..68b4383ca9da
--- /dev/null
+++ b/superset/migrations/versions/3317e9248280_add_creation_method_to_reports_model.py
@@ -0,0 +1,48 @@
+# 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.
+"""add_creation_method_to_reports_model
+
+Revision ID: 3317e9248280
+Revises: 453530256cea
+Create Date: 2021-07-14 10:31:38.610095
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = "3317e9248280"
+down_revision = "453530256cea"
+
+import sqlalchemy as sa
+from alembic import op
+
+
+def upgrade():
+    with op.batch_alter_table("report_schedule") as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "creation_method", sa.VARCHAR(255), server_default="alerts_reports",
+            )
+        )
+        batch_op.create_index(
+            op.f("ix_creation_method"), ["creation_method"], unique=False
+        )
+
+
+def downgrade():
+    with op.batch_alter_table("report_schedule") as batch_op:
+        batch_op.drop_index("ix_creation_method")
+        batch_op.drop_column("creation_method")
diff --git a/superset/migrations/versions/49b5a32daba5_add_report_schedules.py b/superset/migrations/versions/49b5a32daba5_add_report_schedules.py
index f20745471ebc..edf65728b577 100644
--- a/superset/migrations/versions/49b5a32daba5_add_report_schedules.py
+++ b/superset/migrations/versions/49b5a32daba5_add_report_schedules.py
@@ -28,6 +28,7 @@
 
 import sqlalchemy as sa
 from alembic import op
+from sqlalchemy.engine.reflection import Inspector
 from sqlalchemy.exc import OperationalError
 
 
@@ -119,13 +120,17 @@ def upgrade():
     )
 
 
+def has_unique_constraint(constraint_name: str, table_name: str) -> bool:
+    bind = op.get_bind()
+    inspector = Inspector.from_engine(bind)
+    unique_constraints = inspector.get_unique_constraints(table_name)
+    return constraint_name in {constraint["name"] for constraint in unique_constraints}
+
+
 def downgrade():
     op.drop_index(op.f("ix_report_schedule_active"), table_name="report_schedule")
-    try:
+    if has_unique_constraint("uq_report_schedule_name", "report_schedule"):
         op.drop_constraint("uq_report_schedule_name", "report_schedule", type_="unique")
-    except Exception:
-        # Expected to fail on SQLite
-        pass
 
     op.drop_table("report_execution_log")
     op.drop_table("report_recipient")
diff --git a/superset/migrations/versions/620241d1153f_update_time_grain_sqla.py b/superset/migrations/versions/620241d1153f_update_time_grain_sqla.py
index c5c779bc7306..560b6106f492 100644
--- a/superset/migrations/versions/620241d1153f_update_time_grain_sqla.py
+++ b/superset/migrations/versions/620241d1153f_update_time_grain_sqla.py
@@ -34,7 +34,7 @@
 from sqlalchemy.ext.declarative import declarative_base
 
 from superset import db, db_engine_specs
-from superset.utils import core as utils
+from superset.utils.memoized import memoized
 
 Base = declarative_base()
 
@@ -70,7 +70,7 @@ class Slice(Base):
     datasource_id = Column(Integer)
 
 
-@utils.memoized
+@memoized
 def duration_by_name(database: Database):
     return {grain.name: grain.duration for grain in database.grains()}
 
diff --git a/superset/migrations/versions/6d20ba9ecb33_add_last_saved_at_to_slice_model.py b/superset/migrations/versions/6d20ba9ecb33_add_last_saved_at_to_slice_model.py
new file mode 100644
index 000000000000..408da5311841
--- /dev/null
+++ b/superset/migrations/versions/6d20ba9ecb33_add_last_saved_at_to_slice_model.py
@@ -0,0 +1,66 @@
+# 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.
+"""add_last_saved_at_to_slice_model
+
+Revision ID: 6d20ba9ecb33
+Revises: 'f6196627326f'
+Create Date: 2021-08-02 21:14:58.200438
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = "6d20ba9ecb33"
+down_revision = "f6196627326f"
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+
+def upgrade():
+    with op.batch_alter_table("slices") as batch_op:
+        batch_op.add_column(sa.Column("last_saved_at", sa.DateTime(), nullable=True))
+        batch_op.add_column(sa.Column("last_saved_by_fk", sa.Integer(), nullable=True))
+        batch_op.create_foreign_key(
+            "slices_last_saved_by_fk", "ab_user", ["last_saved_by_fk"], ["id"]
+        )
+
+    # now do data migration, copy values from changed_on and changed_by
+    slices_table = sa.Table(
+        "slices",
+        sa.MetaData(),
+        sa.Column("changed_on", sa.DateTime(), nullable=True),
+        sa.Column("changed_by_fk", sa.Integer(), nullable=True),
+        sa.Column("last_saved_at", sa.DateTime(), nullable=True),
+        sa.Column("last_saved_by_fk", sa.Integer(), nullable=True),
+    )
+    conn = op.get_bind()
+    conn.execute(
+        slices_table.update().values(
+            last_saved_at=slices_table.c.changed_on,
+            last_saved_by_fk=slices_table.c.changed_by_fk,
+        )
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    with op.batch_alter_table("slices") as batch_op:
+        batch_op.drop_constraint("slices_last_saved_by_fk", type_="foreignkey")
+        batch_op.drop_column("last_saved_by_fk")
+        batch_op.drop_column("last_saved_at")
+    # ### end Alembic commands ###
diff --git a/superset/migrations/versions/ae1ed299413b_add_timezone_to_report_schedule.py b/superset/migrations/versions/ae1ed299413b_add_timezone_to_report_schedule.py
new file mode 100644
index 000000000000..000d581da76c
--- /dev/null
+++ b/superset/migrations/versions/ae1ed299413b_add_timezone_to_report_schedule.py
@@ -0,0 +1,44 @@
+# 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.
+"""add_timezone_to_report_schedule
+
+Revision ID: ae1ed299413b
+Revises: 030c840e3a1c
+Create Date: 2021-07-09 12:18:52.057815
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = "ae1ed299413b"
+down_revision = "030c840e3a1c"
+
+import sqlalchemy as sa
+from alembic import op
+
+
+def upgrade():
+    with op.batch_alter_table("report_schedule") as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "timezone", sa.String(length=100), nullable=False, server_default="UTC"
+            )
+        )
+
+
+def downgrade():
+    with op.batch_alter_table("report_schedule") as batch_op:
+        batch_op.drop_column("timezone")
diff --git a/superset/migrations/versions/c82ee8a39623_add_implicit_tags.py b/superset/migrations/versions/c82ee8a39623_add_implicit_tags.py
index 42fdb7e4668c..3bab3f6ec3af 100644
--- a/superset/migrations/versions/c82ee8a39623_add_implicit_tags.py
+++ b/superset/migrations/versions/c82ee8a39623_add_implicit_tags.py
@@ -26,16 +26,46 @@
 revision = "c82ee8a39623"
 down_revision = "c617da68de7d"
 
+from datetime import datetime
+
 from alembic import op
-from sqlalchemy import Column, Enum, ForeignKey, Integer, String
-from sqlalchemy.ext.declarative import declarative_base
+from flask_appbuilder.models.mixins import AuditMixin
+from sqlalchemy import Column, DateTime, Enum, ForeignKey, Integer, String
+from sqlalchemy.ext.declarative import declarative_base, declared_attr
 
-from superset.models.helpers import AuditMixinNullable
 from superset.models.tags import ObjectTypes, TagTypes
 
 Base = declarative_base()
 
 
+class AuditMixinNullable(AuditMixin):
+    """Altering the AuditMixin to use nullable fields
+
+    Allows creating objects programmatically outside of CRUD
+    """
+
+    created_on = Column(DateTime, default=datetime.now, nullable=True)
+    changed_on = Column(
+        DateTime, default=datetime.now, onupdate=datetime.now, nullable=True
+    )
+
+    @declared_attr
+    def created_by_fk(self) -> Column:
+        return Column(
+            Integer, ForeignKey("ab_user.id"), default=self.get_user_id, nullable=True,
+        )
+
+    @declared_attr
+    def changed_by_fk(self) -> Column:
+        return Column(
+            Integer,
+            ForeignKey("ab_user.id"),
+            default=self.get_user_id,
+            onupdate=self.get_user_id,
+            nullable=True,
+        )
+
+
 class Tag(Base, AuditMixinNullable):
     """A tag attached to an object (query, chart or dashboard)."""
 
diff --git a/superset/migrations/versions/e323605f370a_fix_schemas_allowed_for_csv_upload.py b/superset/migrations/versions/e323605f370a_fix_schemas_allowed_for_csv_upload.py
new file mode 100644
index 000000000000..eb5d1b424293
--- /dev/null
+++ b/superset/migrations/versions/e323605f370a_fix_schemas_allowed_for_csv_upload.py
@@ -0,0 +1,82 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""fix schemas_allowed_for_csv_upload
+
+Revision ID: e323605f370a
+Revises: 31b2a1039d4a
+Create Date: 2021-08-02 16:39:45.329151
+
+"""
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import Column, Integer, Text
+from sqlalchemy.ext.declarative import declarative_base
+
+from superset import db
+
+# revision identifiers, used by Alembic.
+revision = "e323605f370a"
+down_revision = "31b2a1039d4a"
+
+
+Base = declarative_base()
+
+
+class Database(Base):
+
+    __tablename__ = "dbs"
+    id = Column(Integer, primary_key=True)
+    extra = Column(Text)
+
+
+def upgrade():
+    """
+    Fix databases with ``schemas_allowed_for_csv_upload`` stored as string.
+    """
+    bind = op.get_bind()
+    session = db.Session(bind=bind)
+
+    for database in session.query(Database).all():
+        try:
+            extra = json.loads(database.extra)
+        except json.decoder.JSONDecodeError as ex:
+            logging.warning(str(ex))
+            continue
+
+        schemas_allowed_for_csv_upload = extra.get("schemas_allowed_for_csv_upload")
+        if not isinstance(schemas_allowed_for_csv_upload, str):
+            continue
+
+        if schemas_allowed_for_csv_upload == "[]":
+            extra["schemas_allowed_for_csv_upload"] = []
+        else:
+            extra["schemas_allowed_for_csv_upload"] = [
+                schema.strip()
+                for schema in schemas_allowed_for_csv_upload.split(",")
+                if schema.strip()
+            ]
+
+        database.extra = json.dumps(extra)
+
+    session.commit()
+    session.close()
+
+
+def downgrade():
+    pass
diff --git a/superset/migrations/versions/f6196627326f_update_chart_permissions.py b/superset/migrations/versions/f6196627326f_update_chart_permissions.py
new file mode 100644
index 000000000000..9a24138cef8b
--- /dev/null
+++ b/superset/migrations/versions/f6196627326f_update_chart_permissions.py
@@ -0,0 +1,73 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""update chart permissions
+
+Revision ID: f6196627326f
+Revises: 143b6f2815da
+Create Date: 2021-08-04 17:16:47.714866
+
+"""
+
+from alembic import op
+from sqlalchemy.exc import SQLAlchemyError
+from sqlalchemy.orm import Session
+
+from superset.migrations.shared.security_converge import (
+    add_pvms,
+    get_reversed_new_pvms,
+    get_reversed_pvm_map,
+    migrate_roles,
+    Pvm,
+)
+
+# revision identifiers, used by Alembic.
+revision = "f6196627326f"
+down_revision = "143b6f2815da"
+
+NEW_PVMS = {"Chart": ("can_read",)}
+PVM_MAP = {
+    Pvm("Chart", "can_get_data"): (Pvm("Chart", "can_read"),),
+    Pvm("Chart", "can_post_data"): (Pvm("Chart", "can_read"),),
+}
+
+
+def upgrade():
+    bind = op.get_bind()
+    session = Session(bind=bind)
+
+    # Add the new permissions on the migration itself
+    add_pvms(session, NEW_PVMS)
+    migrate_roles(session, PVM_MAP)
+    try:
+        session.commit()
+    except SQLAlchemyError as ex:
+        print(f"An error occurred while upgrading permissions: {ex}")
+        session.rollback()
+
+
+def downgrade():
+    bind = op.get_bind()
+    session = Session(bind=bind)
+
+    # Add the old permissions on the migration itself
+    add_pvms(session, get_reversed_new_pvms(PVM_MAP))
+    migrate_roles(session, get_reversed_pvm_map(PVM_MAP))
+    try:
+        session.commit()
+    except SQLAlchemyError as ex:
+        print(f"An error occurred while downgrading permissions: {ex}")
+        session.rollback()
diff --git a/superset/models/core.py b/superset/models/core.py
index ee8e822477a8..129923b05ccf 100755
--- a/superset/models/core.py
+++ b/superset/models/core.py
@@ -14,12 +14,13 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# pylint: disable=line-too-long,unused-argument,ungrouped-imports
+# pylint: disable=line-too-long,unused-argument
 """A collection of ORM sqlalchemy models for Superset"""
 import enum
 import json
 import logging
 import textwrap
+from ast import literal_eval
 from contextlib import closing
 from copy import deepcopy
 from datetime import datetime
@@ -60,6 +61,7 @@
 from superset.models.tags import FavStarUpdater
 from superset.result_set import SupersetResultSet
 from superset.utils import cache as cache_util, core as utils
+from superset.utils.memoized import memoized
 
 config = app.config
 custom_password_store = config["SQLALCHEMY_CUSTOM_PASSWORD_STORE"]
@@ -239,15 +241,12 @@ def backend(self) -> str:
 
     @property
     def parameters(self) -> Dict[str, Any]:
-        # Build parameters if db_engine_spec is a subclass of BasicParametersMixin
-        parameters = {"engine": self.backend}
-
-        if hasattr(self.db_engine_spec, "parameters_schema") and hasattr(
-            self.db_engine_spec, "get_parameters_from_uri"
-        ):
-            uri = make_url(self.sqlalchemy_uri_decrypted)
-            encrypted_extra = self.get_encrypted_extra()
-            return {**parameters, **self.db_engine_spec.get_parameters_from_uri(uri, encrypted_extra=encrypted_extra)}  # type: ignore
+        uri = make_url(self.sqlalchemy_uri_decrypted)
+        encrypted_extra = self.get_encrypted_extra()
+        try:
+            parameters = self.db_engine_spec.get_parameters_from_uri(uri, encrypted_extra=encrypted_extra)  # type: ignore
+        except Exception:  # pylint: disable=broad-except
+            parameters = {}
 
         return parameters
 
@@ -323,7 +322,7 @@ def get_effective_user(
                 effective_username = g.user.username
         return effective_username
 
-    @utils.memoized(watch=("impersonate_user", "sqlalchemy_uri_decrypted", "extra"))
+    @memoized(watch=("impersonate_user", "sqlalchemy_uri_decrypted", "extra"))
     def get_sqla_engine(
         self,
         schema: Optional[str] = None,
@@ -507,7 +506,7 @@ def get_all_view_names_in_database(
         return self.db_engine_spec.get_all_datasource_names(self, "view")
 
     @cache_util.memoized_func(
-        key=lambda self, schema, *args, **kwargs: f"db:{self.id}:schema:{schema}:table_list",  # type: ignore
+        key=lambda self, schema, *args, **kwargs: f"db:{self.id}:schema:{schema}:table_list",
         cache=cache_manager.data_cache,
     )
     def get_all_table_names_in_schema(
@@ -537,9 +536,10 @@ def get_all_table_names_in_schema(
             ]
         except Exception as ex:  # pylint: disable=broad-except
             logger.warning(ex)
+            return []
 
     @cache_util.memoized_func(
-        key=lambda self, schema, *args, **kwargs: f"db:{self.id}:schema:{schema}:view_list",  # type: ignore
+        key=lambda self, schema, *args, **kwargs: f"db:{self.id}:schema:{schema}:view_list",
         cache=cache_manager.data_cache,
     )
     def get_all_view_names_in_schema(
@@ -567,6 +567,7 @@ def get_all_view_names_in_schema(
             return [utils.DatasourceName(table=view, schema=schema) for view in views]
         except Exception as ex:  # pylint: disable=broad-except
             logger.warning(ex)
+            return []
 
     @cache_util.memoized_func(
         key=lambda self, *args, **kwargs: f"db:{self.id}:schema_list",
@@ -595,7 +596,7 @@ def db_engine_spec(self) -> Type[db_engine_specs.BaseEngineSpec]:
         return self.get_db_engine_spec_for_backend(self.backend)
 
     @classmethod
-    @utils.memoized
+    @memoized
     def get_db_engine_spec_for_backend(
         cls, backend: str
     ) -> Type[db_engine_specs.BaseEngineSpec]:
@@ -670,6 +671,10 @@ def get_schema_access_for_csv_upload(  # pylint: disable=invalid-name
         self,
     ) -> List[str]:
         allowed_databases = self.get_extra().get("schemas_allowed_for_csv_upload", [])
+
+        if isinstance(allowed_databases, str):
+            allowed_databases = literal_eval(allowed_databases)
+
         if hasattr(g, "user"):
             extra_allowed_databases = config["ALLOWED_USER_CSV_SCHEMA_FUNC"](
                 self, g.user
@@ -716,10 +721,10 @@ def has_table_by_name(self, table_name: str, schema: Optional[str] = None) -> bo
         engine = self.get_sqla_engine()
         return engine.has_table(table_name, schema)
 
-    @utils.memoized
+    @memoized
     def get_dialect(self) -> Dialect:
         sqla_url = url.make_url(self.sqlalchemy_uri_decrypted)
-        return sqla_url.get_dialect()()  # pylint: disable=no-member
+        return sqla_url.get_dialect()()
 
 
 sqla.event.listen(Database, "after_insert", security_manager.set_perm)
diff --git a/superset/models/dashboard.py b/superset/models/dashboard.py
index a67df9e5bd53..8f0fd87204ef 100644
--- a/superset/models/dashboard.py
+++ b/superset/models/dashboard.py
@@ -18,8 +18,9 @@
 
 import json
 import logging
+from collections import defaultdict
 from functools import partial
-from typing import Any, Callable, Dict, List, Set, Union
+from typing import Any, Callable, Dict, List, Set, Tuple, Type, Union
 
 import sqlalchemy as sqla
 from flask import g
@@ -62,8 +63,6 @@
 from superset.utils.hashing import md5_sha_from_str
 from superset.utils.urls import get_url_path
 
-# pylint: disable=too-many-public-methods
-
 metadata = Model.metadata  # pylint: disable=no-member
 config = app.config
 logger = logging.getLogger(__name__)
@@ -136,7 +135,6 @@ def copy_dashboard(
 class Dashboard(  # pylint: disable=too-many-instance-attributes
     Model, AuditMixinNullable, ImportExportMixin
 ):
-
     """The dashboard object!"""
 
     __tablename__ = "dashboards"
@@ -166,6 +164,28 @@ class Dashboard(  # pylint: disable=too-many-instance-attributes
     def __repr__(self) -> str:
         return f"Dashboard<{self.id or self.slug}>"
 
+    @property
+    def url(self) -> str:
+        return f"/superset/dashboard/{self.slug or self.id}/"
+
+    @property
+    def datasources(self) -> Set[BaseDatasource]:
+        # Verbose but efficient database enumeration of dashboard datasources.
+        datasources_by_cls_model: Dict[Type["BaseDatasource"], Set[int]] = defaultdict(
+            set
+        )
+
+        for slc in self.slices:
+            datasources_by_cls_model[slc.cls_model].add(slc.datasource_id)
+
+        return {
+            datasource
+            for cls_model, datasource_ids in datasources_by_cls_model.items()
+            for datasource in db.session.query(cls_model)
+            .filter(cls_model.id.in_(datasource_ids))
+            .all()
+        }
+
     @property
     def filter_sets(self) -> Dict[int, FilterSet]:
         return {fs.id: fs for fs in self._filter_sets}
@@ -189,20 +209,6 @@ def filter_sets_lst(self) -> Dict[int, FilterSet]:
             for fs in user_filter_sets + filter_sets_by_owner_type["Dashboard"]
         }
 
-    @property
-    def table_names(self) -> str:
-        # pylint: disable=no-member
-        return ", ".join(str(s.datasource.full_name) for s in self.slices)
-
-    @property
-    def url(self) -> str:
-        return f"/superset/dashboard/{self.slug or self.id}/"
-
-    @property
-    def datasources(self) -> Set[BaseDatasource]:
-        # pylint: disable=using-constant-test
-        return {slc.datasource for slc in self.slices if slc.datasource}
-
     @property
     def charts(self) -> List[BaseDatasource]:
         return [slc.chart for slc in self.slices]
@@ -275,13 +281,26 @@ def data(self) -> Dict[str, Any]:
         unless=lambda: not is_feature_enabled("DASHBOARD_CACHE"),
     )
     def datasets_trimmed_for_slices(self) -> List[Dict[str, Any]]:
-        datasource_slices = utils.indexed(self.slices, "datasource")
-        return [
-            # Filter out unneeded fields from the datasource payload
-            datasource.data_for_slices(slices)
-            for datasource, slices in datasource_slices.items()
-            if datasource
-        ]
+        # Verbose but efficient database enumeration of dashboard datasources.
+        slices_by_datasource: Dict[
+            Tuple[Type["BaseDatasource"], int], Set[Slice]
+        ] = defaultdict(set)
+
+        for slc in self.slices:
+            slices_by_datasource[(slc.cls_model, slc.datasource_id)].add(slc)
+
+        result: List[Dict[str, Any]] = []
+
+        for (cls_model, datasource_id), slices in slices_by_datasource.items():
+            datasource = (
+                db.session.query(cls_model).filter_by(id=datasource_id).one_or_none()
+            )
+
+            if datasource:
+                # Filter out unneeded fields from the datasource payload
+                result.append(datasource.data_for_slices(slices))
+
+        return result
 
     @property  # type: ignore
     def params(self) -> str:  # type: ignore
@@ -363,6 +382,20 @@ def export_dashboards(  # pylint: disable=too-many-locals
                 # set slices without creating ORM relations
                 slices = copied_dashboard.__dict__.setdefault("slices", [])
                 slices.append(copied_slc)
+
+            json_metadata = json.loads(dashboard.json_metadata)
+            native_filter_configuration: List[Dict[str, Any]] = json_metadata.get(
+                "native_filter_configuration", []
+            )
+            for native_filter in native_filter_configuration:
+                session = db.session()
+                for target in native_filter.get("targets", []):
+                    id_ = target.get("datasetId")
+                    if id_ is None:
+                        continue
+                    datasource = ConnectorRegistry.get_datasource_by_id(session, id_)
+                    datasource_ids.add((datasource.id, datasource.type))
+
             copied_dashboard.alter_params(remote_id=dashboard_id)
             copied_dashboards.append(copied_dashboard)
 
diff --git a/superset/models/datasource_access_request.py b/superset/models/datasource_access_request.py
index 98362ec316f8..fa3b9d67113d 100644
--- a/superset/models/datasource_access_request.py
+++ b/superset/models/datasource_access_request.py
@@ -23,7 +23,7 @@
 from superset import app, db, security_manager
 from superset.connectors.connector_registry import ConnectorRegistry
 from superset.models.helpers import AuditMixinNullable
-from superset.utils import core as utils
+from superset.utils.memoized import memoized
 
 if TYPE_CHECKING:
     from superset.connectors.base.models import BaseDatasource
@@ -55,7 +55,7 @@ def datasource(self) -> "BaseDatasource":
         return self.get_datasource
 
     @datasource.getter  # type: ignore
-    @utils.memoized
+    @memoized
     def get_datasource(self) -> "BaseDatasource":
         ds = db.session.query(self.cls_model).filter_by(id=self.datasource_id).first()
         return ds
diff --git a/superset/models/reports.py b/superset/models/reports.py
index 73c74ebc5022..6ed769dd4940 100644
--- a/superset/models/reports.py
+++ b/superset/models/reports.py
@@ -50,7 +50,7 @@ class ReportScheduleType(str, enum.Enum):
 
 
 class ReportScheduleValidatorType(str, enum.Enum):
-    """ Validator types for alerts """
+    """Validator types for alerts"""
 
     NOT_NULL = "not null"
     OPERATOR = "operator"
@@ -72,6 +72,13 @@ class ReportState(str, enum.Enum):
 class ReportDataFormat(str, enum.Enum):
     VISUALIZATION = "PNG"
     DATA = "CSV"
+    TEXT = "TEXT"
+
+
+class ReportCreationMethodType(str, enum.Enum):
+    CHARTS = "charts"
+    DASHBOARDS = "dashboards"
+    ALERTS_REPORTS = "alerts_reports"
 
 
 report_schedule_user = Table(
@@ -102,6 +109,10 @@ class ReportSchedule(Model, AuditMixinNullable):
     context_markdown = Column(Text)
     active = Column(Boolean, default=True, index=True)
     crontab = Column(String(1000), nullable=False)
+    creation_method = Column(
+        String(255), server_default=ReportCreationMethodType.ALERTS_REPORTS
+    )
+    timezone = Column(String(100), default="UTC", nullable=False)
     report_format = Column(String(50), default=ReportDataFormat.VISUALIZATION)
     sql = Column(Text())
     # (Alerts/Reports) M-O to chart
@@ -142,10 +153,7 @@ def crontab_humanized(self) -> str:
         return get_description(self.crontab)
 
 
-class ReportRecipients(
-    Model, AuditMixinNullable
-):  # pylint: disable=too-few-public-methods
-
+class ReportRecipients(Model, AuditMixinNullable):
     """
     Report Recipients, meant to support multiple notification types, eg: Slack, email
     """
diff --git a/superset/models/schedules.py b/superset/models/schedules.py
index fdc90f00aea3..f60890bfc3b5 100644
--- a/superset/models/schedules.py
+++ b/superset/models/schedules.py
@@ -31,17 +31,20 @@
 
 
 class ScheduleType(str, enum.Enum):
+    # pylint: disable=invalid-name
     slice = "slice"
     dashboard = "dashboard"
     alert = "alert"
 
 
 class EmailDeliveryType(str, enum.Enum):
+    # pylint: disable=invalid-name
     attachment = "Attachment"
     inline = "Inline"
 
 
 class SliceEmailReportFormat(str, enum.Enum):
+    # pylint: disable=invalid-name
     visualization = "Visualization"
     data = "Raw data"
 
diff --git a/superset/models/slice.py b/superset/models/slice.py
index c80e1fba78ca..28473d53d14e 100644
--- a/superset/models/slice.py
+++ b/superset/models/slice.py
@@ -23,7 +23,7 @@
 from flask_appbuilder import Model
 from flask_appbuilder.models.decorators import renders
 from markupsafe import escape, Markup
-from sqlalchemy import Column, ForeignKey, Integer, String, Table, Text
+from sqlalchemy import Column, DateTime, ForeignKey, Integer, String, Table, Text
 from sqlalchemy.engine.base import Connection
 from sqlalchemy.orm import relationship
 from sqlalchemy.orm.mapper import Mapper
@@ -35,8 +35,9 @@
 from superset.tasks.thumbnails import cache_chart_thumbnail
 from superset.utils import core as utils
 from superset.utils.hashing import md5_sha_from_str
+from superset.utils.memoized import memoized
 from superset.utils.urls import get_url_path
-from superset.viz import BaseViz, viz_types  # type: ignore
+from superset.viz import BaseViz, viz_types
 
 if TYPE_CHECKING:
     from superset.connectors.base.models import BaseDatasource
@@ -52,10 +53,9 @@
 logger = logging.getLogger(__name__)
 
 
-class Slice(
+class Slice(  # pylint: disable=too-many-public-methods
     Model, AuditMixinNullable, ImportExportMixin
-):  # pylint: disable=too-many-public-methods
-
+):
     """A slice is essentially a report or a view on data"""
 
     __tablename__ = "slices"
@@ -66,10 +66,18 @@ class Slice(
     datasource_name = Column(String(2000))
     viz_type = Column(String(250))
     params = Column(Text)
+    query_context = Column(Text)
     description = Column(Text)
     cache_timeout = Column(Integer)
     perm = Column(String(1000))
     schema_perm = Column(String(1000))
+    # the last time a user has saved the chart, changed_on is referencing
+    # when the database row was last written
+    last_saved_at = Column(DateTime, nullable=True)
+    last_saved_by_fk = Column(Integer, ForeignKey("ab_user.id"), nullable=True,)
+    last_saved_by = relationship(
+        security_manager.user_model, foreign_keys=[last_saved_by_fk]
+    )
     owners = relationship(security_manager.user_model, secondary=slice_user)
     table = relationship(
         "SqlaTable",
@@ -88,6 +96,7 @@ class Slice(
         "datasource_name",
         "viz_type",
         "params",
+        "query_context",
         "cache_timeout",
     ]
     export_parent = "table"
@@ -117,7 +126,7 @@ def clone(self) -> "Slice":
 
     # pylint: disable=using-constant-test
     @datasource.getter  # type: ignore
-    @utils.memoized
+    @memoized
     def get_datasource(self) -> Optional["BaseDatasource"]:
         return db.session.query(self.cls_model).filter_by(id=self.datasource_id).first()
 
@@ -156,7 +165,7 @@ def datasource_edit_url(self) -> Optional[str]:
     # pylint: enable=using-constant-test
 
     @property  # type: ignore
-    @utils.memoized
+    @memoized
     def viz(self) -> Optional[BaseViz]:
         form_data = json.loads(self.params)
         viz_class = viz_types.get(self.viz_type)
@@ -190,6 +199,7 @@ def data(self) -> Dict[str, Any]:
             "description_markeddown": self.description_markeddown,
             "edit_url": self.edit_url,
             "form_data": self.form_data,
+            "query_context": self.query_context,
             "modified": self.modified(),
             "owners": [
                 f"{owner.first_name} {owner.last_name}" for owner in self.owners
diff --git a/superset/models/tags.py b/superset/models/tags.py
index 722c5b099e1e..528206e672f6 100644
--- a/superset/models/tags.py
+++ b/superset/models/tags.py
@@ -46,6 +46,7 @@ class TagTypes(enum.Enum):
     can find all their objects by querying for the tag `owner:alice`.
     """
 
+    # pylint: disable=invalid-name
     # explicit tags, added manually by the owner
     custom = 1
 
@@ -59,6 +60,7 @@ class ObjectTypes(enum.Enum):
 
     """Object types."""
 
+    # pylint: disable=invalid-name
     query = 1
     chart = 2
     dashboard = 3
@@ -104,8 +106,8 @@ def get_object_type(class_name: str) -> ObjectTypes:
     }
     try:
         return mapping[class_name.lower()]
-    except KeyError:
-        raise Exception("No mapping found for {0}".format(class_name))
+    except KeyError as ex:
+        raise Exception("No mapping found for {0}".format(class_name)) from ex
 
 
 class ObjectUpdater:
diff --git a/superset/queries/saved_queries/api.py b/superset/queries/saved_queries/api.py
index 97b123e34442..eb484cc94ccd 100644
--- a/superset/queries/saved_queries/api.py
+++ b/superset/queries/saved_queries/api.py
@@ -237,6 +237,7 @@ def export(self, **kwargs: Any) -> Response:
             500:
               $ref: '#/components/responses/500'
         """
+        token = request.args.get("token")
         requested_ids = kwargs["rison"]
         timestamp = datetime.now().strftime("%Y%m%dT%H%M%S")
         root = f"saved_query_export_{timestamp}"
@@ -254,12 +255,15 @@ def export(self, **kwargs: Any) -> Response:
                 return self.response_404()
         buf.seek(0)
 
-        return send_file(
+        response = send_file(
             buf,
             mimetype="application/zip",
             as_attachment=True,
             attachment_filename=filename,
         )
+        if token:
+            response.set_cookie(token, "done", max_age=600)
+        return response
 
     @expose("/import/", methods=["POST"])
     @protect()
diff --git a/superset/queries/saved_queries/commands/bulk_delete.py b/superset/queries/saved_queries/commands/bulk_delete.py
index cf021442fbfc..0d199378c758 100644
--- a/superset/queries/saved_queries/commands/bulk_delete.py
+++ b/superset/queries/saved_queries/commands/bulk_delete.py
@@ -44,7 +44,7 @@ def run(self) -> None:
             return None
         except DAODeleteFailedError as ex:
             logger.exception(ex.exception)
-            raise SavedQueryBulkDeleteFailedError()
+            raise SavedQueryBulkDeleteFailedError() from ex
 
     def validate(self) -> None:
         # Validate/populate model exists
diff --git a/superset/queries/saved_queries/commands/importers/dispatcher.py b/superset/queries/saved_queries/commands/importers/dispatcher.py
index a53a765e790b..828320222567 100644
--- a/superset/queries/saved_queries/commands/importers/dispatcher.py
+++ b/superset/queries/saved_queries/commands/importers/dispatcher.py
@@ -40,7 +40,6 @@ class ImportSavedQueriesCommand(BaseCommand):
     until it finds one that matches.
     """
 
-    # pylint: disable=unused-argument
     def __init__(self, contents: Dict[str, str], *args: Any, **kwargs: Any):
         self.contents = contents
         self.args = args
diff --git a/superset/queries/saved_queries/dao.py b/superset/queries/saved_queries/dao.py
index cd20fe60de58..48dc67d069db 100644
--- a/superset/queries/saved_queries/dao.py
+++ b/superset/queries/saved_queries/dao.py
@@ -41,7 +41,7 @@ def bulk_delete(models: Optional[List[SavedQuery]], commit: bool = True) -> None
             )
             if commit:
                 db.session.commit()
-        except SQLAlchemyError:
+        except SQLAlchemyError as ex:
             if commit:
                 db.session.rollback()
-            raise DAODeleteFailedError()
+            raise DAODeleteFailedError() from ex
diff --git a/superset/reports/api.py b/superset/reports/api.py
index c9efae1293b3..3a049c024594 100644
--- a/superset/reports/api.py
+++ b/superset/reports/api.py
@@ -83,7 +83,9 @@ def ensure_alert_reports_enabled(self) -> Optional[Response]:
         "active",
         "chart.id",
         "chart.slice_name",
+        "chart.viz_type",
         "context_markdown",
+        "creation_method",
         "crontab",
         "dashboard.dashboard_title",
         "dashboard.id",
@@ -105,6 +107,7 @@ def ensure_alert_reports_enabled(self) -> Optional[Response]:
         "recipients.type",
         "report_format",
         "sql",
+        "timezone",
         "type",
         "validator_config_json",
         "validator_type",
@@ -123,8 +126,10 @@ def ensure_alert_reports_enabled(self) -> Optional[Response]:
         "created_by.first_name",
         "created_by.last_name",
         "created_on",
+        "creation_method",
         "crontab",
         "crontab_humanized",
+        "description",
         "id",
         "last_eval_dttm",
         "last_state",
@@ -134,12 +139,14 @@ def ensure_alert_reports_enabled(self) -> Optional[Response]:
         "owners.last_name",
         "recipients.id",
         "recipients.type",
+        "timezone",
         "type",
     ]
     add_columns = [
         "active",
         "chart",
         "context_markdown",
+        "creation_method",
         "crontab",
         "dashboard",
         "database",
@@ -151,6 +158,7 @@ def ensure_alert_reports_enabled(self) -> Optional[Response]:
         "recipients",
         "report_format",
         "sql",
+        "timezone",
         "type",
         "validator_config_json",
         "validator_type",
@@ -162,6 +170,7 @@ def ensure_alert_reports_enabled(self) -> Optional[Response]:
 
     order_columns = [
         "active",
+        "description",
         "created_by.first_name",
         "changed_by.first_name",
         "changed_on",
@@ -173,7 +182,16 @@ def ensure_alert_reports_enabled(self) -> Optional[Response]:
         "type",
         "crontab_humanized",
     ]
-    search_columns = ["name", "active", "created_by", "type", "last_state"]
+    search_columns = [
+        "name",
+        "active",
+        "created_by",
+        "type",
+        "last_state",
+        "creation_method",
+        "dashboard_id",
+        "chart_id",
+    ]
     search_filters = {"name": [ReportScheduleAllTextFilter]}
     allowed_rel_fields = {"owners", "chart", "dashboard", "database", "created_by"}
     filter_rel_fields = {
@@ -318,7 +336,7 @@ def post(self) -> Response:
     @safe
     @statsd_metrics
     @permission_name("put")
-    def put(self, pk: int) -> Response:  # pylint: disable=too-many-return-statements
+    def put(self, pk: int) -> Response:
         """Updates an Report Schedule
         ---
         put:
diff --git a/superset/reports/commands/alert.py b/superset/reports/commands/alert.py
index 5dd9797055c1..a13916f59ceb 100644
--- a/superset/reports/commands/alert.py
+++ b/superset/reports/commands/alert.py
@@ -79,8 +79,8 @@ def run(self) -> bool:
             ]
 
             return OPERATOR_FUNCTIONS[operator](self._result, threshold)
-        except (KeyError, json.JSONDecodeError):
-            raise AlertValidatorConfigError()
+        except (KeyError, json.JSONDecodeError) as ex:
+            raise AlertValidatorConfigError() from ex
 
     def _validate_not_null(self, rows: np.recarray) -> None:
         self._validate_result(rows)
@@ -115,8 +115,8 @@ def _validate_operator(self, rows: np.recarray) -> None:
             # Check if it's float or if we can convert it
             self._result = float(rows[0][1])
             return
-        except (AssertionError, TypeError, ValueError):
-            raise AlertQueryInvalidTypeError()
+        except (AssertionError, TypeError, ValueError) as ex:
+            raise AlertQueryInvalidTypeError() from ex
 
     @property
     def _is_validator_not_null(self) -> bool:
@@ -157,9 +157,9 @@ def _execute_query(self) -> pd.DataFrame:
             return df
         except SoftTimeLimitExceeded as ex:
             logger.warning("A timeout occurred while executing the alert query: %s", ex)
-            raise AlertQueryTimeout()
+            raise AlertQueryTimeout() from ex
         except Exception as ex:
-            raise AlertQueryError(message=str(ex))
+            raise AlertQueryError(message=str(ex)) from ex
 
     def validate(self) -> None:
         """
diff --git a/superset/reports/commands/base.py b/superset/reports/commands/base.py
index bb4064d22cde..3582767ef65f 100644
--- a/superset/reports/commands/base.py
+++ b/superset/reports/commands/base.py
@@ -22,9 +22,12 @@
 from superset.charts.dao import ChartDAO
 from superset.commands.base import BaseCommand
 from superset.dashboards.dao import DashboardDAO
+from superset.models.reports import ReportCreationMethodType
 from superset.reports.commands.exceptions import (
     ChartNotFoundValidationError,
+    ChartNotSavedValidationError,
     DashboardNotFoundValidationError,
+    DashboardNotSavedValidationError,
     ReportScheduleChartOrDashboardValidationError,
 )
 
@@ -47,6 +50,17 @@ def validate_chart_dashboard(
         """ Validate chart or dashboard relation """
         chart_id = self._properties.get("chart")
         dashboard_id = self._properties.get("dashboard")
+        creation_method = self._properties.get("creation_method")
+
+        if creation_method == ReportCreationMethodType.CHARTS and not chart_id:
+            # User has not saved chart yet in Explore view
+            exceptions.append(ChartNotSavedValidationError())
+            return
+
+        if creation_method == ReportCreationMethodType.DASHBOARDS and not dashboard_id:
+            exceptions.append(DashboardNotSavedValidationError())
+            return
+
         if chart_id and dashboard_id:
             exceptions.append(ReportScheduleChartOrDashboardValidationError())
         if chart_id:
diff --git a/superset/reports/commands/bulk_delete.py b/superset/reports/commands/bulk_delete.py
index aa4898e9e55d..4bff600d29df 100644
--- a/superset/reports/commands/bulk_delete.py
+++ b/superset/reports/commands/bulk_delete.py
@@ -47,7 +47,7 @@ def run(self) -> None:
             return None
         except DAODeleteFailedError as ex:
             logger.exception(ex.exception)
-            raise ReportScheduleBulkDeleteFailedError()
+            raise ReportScheduleBulkDeleteFailedError() from ex
 
     def validate(self) -> None:
         # Validate/populate model exists
@@ -59,5 +59,5 @@ def validate(self) -> None:
         for model in self._models:
             try:
                 check_ownership(model)
-            except SupersetSecurityException:
-                raise ReportScheduleForbiddenError()
+            except SupersetSecurityException as ex:
+                raise ReportScheduleForbiddenError() from ex
diff --git a/superset/reports/commands/create.py b/superset/reports/commands/create.py
index 79949dfcbd62..23ed27e89c44 100644
--- a/superset/reports/commands/create.py
+++ b/superset/reports/commands/create.py
@@ -22,7 +22,7 @@
 from flask_appbuilder.security.sqla.models import User
 from marshmallow import ValidationError
 
-from superset.commands.utils import populate_owners
+from superset.commands.base import CreateMixin
 from superset.dao.exceptions import DAOCreateFailedError
 from superset.databases.dao import DatabaseDAO
 from superset.models.reports import ReportScheduleType
@@ -40,7 +40,7 @@
 logger = logging.getLogger(__name__)
 
 
-class CreateReportScheduleCommand(BaseReportScheduleCommand):
+class CreateReportScheduleCommand(CreateMixin, BaseReportScheduleCommand):
     def __init__(self, user: User, data: Dict[str, Any]):
         self._actor = user
         self._properties = data.copy()
@@ -51,7 +51,7 @@ def run(self) -> Model:
             report_schedule = ReportScheduleDAO.create(self._properties)
         except DAOCreateFailedError as ex:
             logger.exception(ex.exception)
-            raise ReportScheduleCreateFailedError()
+            raise ReportScheduleCreateFailedError() from ex
         return report_schedule
 
     def validate(self) -> None:
@@ -90,7 +90,7 @@ def validate(self) -> None:
             )
 
         try:
-            owners = populate_owners(self._actor, owner_ids)
+            owners = self.populate_owners(self._actor, owner_ids)
             self._properties["owners"] = owners
         except ValidationError as ex:
             exceptions.append(ex)
diff --git a/superset/reports/commands/delete.py b/superset/reports/commands/delete.py
index 8375f52c30e3..eef7a56aff79 100644
--- a/superset/reports/commands/delete.py
+++ b/superset/reports/commands/delete.py
@@ -47,7 +47,7 @@ def run(self) -> Model:
             report_schedule = ReportScheduleDAO.delete(self._model)
         except DAODeleteFailedError as ex:
             logger.exception(ex.exception)
-            raise ReportScheduleDeleteFailedError()
+            raise ReportScheduleDeleteFailedError() from ex
         return report_schedule
 
     def validate(self) -> None:
@@ -59,5 +59,5 @@ def validate(self) -> None:
         # Check ownership
         try:
             check_ownership(self._model)
-        except SupersetSecurityException:
-            raise ReportScheduleForbiddenError()
+        except SupersetSecurityException as ex:
+            raise ReportScheduleForbiddenError() from ex
diff --git a/superset/reports/commands/exceptions.py b/superset/reports/commands/exceptions.py
index dfe2402da044..41b2e5605ca6 100644
--- a/superset/reports/commands/exceptions.py
+++ b/superset/reports/commands/exceptions.py
@@ -80,6 +80,32 @@ def __init__(self) -> None:
         super().__init__(_("Choose a chart or dashboard not both"), field_name="chart")
 
 
+class ChartNotSavedValidationError(ValidationError):
+    """
+    Marshmallow validation error for charts that haven't been saved yet
+    """
+
+    def __init__(self) -> None:
+        super().__init__(
+            _("Please save your chart first, then try creating a new email report."),
+            field_name="chart",
+        )
+
+
+class DashboardNotSavedValidationError(ValidationError):
+    """
+    Marshmallow validation error for dashboards that haven't been saved yet
+    """
+
+    def __init__(self) -> None:
+        super().__init__(
+            _(
+                "Please save your dashboard first, then try creating a new email report."
+            ),
+            field_name="dashboard",
+        )
+
+
 class ReportScheduleInvalidError(CommandInvalidError):
     message = _("Report Schedule parameters are invalid.")
 
@@ -116,6 +142,10 @@ class ReportScheduleCsvFailedError(CommandException):
     message = _("Report Schedule execution failed when generating a csv.")
 
 
+class ReportScheduleDataFrameFailedError(CommandException):
+    message = _("Report Schedule execution failed when generating a dataframe.")
+
+
 class ReportScheduleExecuteUnexpectedError(CommandException):
     message = _("Report Schedule execution got an unexpected error.")
 
@@ -171,6 +201,10 @@ class ReportScheduleCsvTimeout(CommandException):
     message = _("A timeout occurred while generating a csv.")
 
 
+class ReportScheduleDataFrameTimeout(CommandException):
+    message = _("A timeout occurred while generating a dataframe.")
+
+
 class ReportScheduleAlertGracePeriodError(CommandException):
     message = _("Alert fired during grace period.")
 
diff --git a/superset/reports/commands/execute.py b/superset/reports/commands/execute.py
index cc7222e30290..d30a61fd409b 100644
--- a/superset/reports/commands/execute.py
+++ b/superset/reports/commands/execute.py
@@ -20,6 +20,7 @@
 from typing import Any, List, Optional
 from uuid import UUID
 
+import pandas as pd
 from celery.exceptions import SoftTimeLimitExceeded
 from flask_appbuilder.security.sqla.models import User
 from sqlalchemy.orm import Session
@@ -43,6 +44,8 @@
     ReportScheduleAlertGracePeriodError,
     ReportScheduleCsvFailedError,
     ReportScheduleCsvTimeout,
+    ReportScheduleDataFrameFailedError,
+    ReportScheduleDataFrameTimeout,
     ReportScheduleExecuteUnexpectedError,
     ReportScheduleNotFoundError,
     ReportScheduleNotificationError,
@@ -62,7 +65,8 @@
 from superset.reports.notifications.base import NotificationContent
 from superset.reports.notifications.exceptions import NotificationError
 from superset.utils.celery import session_scope
-from superset.utils.csv import get_chart_csv_data
+from superset.utils.core import ChartDataResultFormat, ChartDataResultType
+from superset.utils.csv import get_chart_csv_data, get_chart_dataframe
 from superset.utils.screenshots import (
     BaseScreenshot,
     ChartScreenshot,
@@ -113,8 +117,8 @@ def set_state(self, state: ReportState, dttm: datetime) -> None:
         self._session.merge(self._report_schedule)
         self._session.commit()
 
-    def create_log(  # pylint: disable=too-many-arguments
-        self, state: ReportState, error_message: Optional[str] = None,
+    def create_log(
+        self, state: ReportState, error_message: Optional[str] = None
     ) -> None:
         """
         Creates a Report execution log, uses the current computed last_value for Alerts
@@ -134,17 +138,24 @@ def create_log(  # pylint: disable=too-many-arguments
         self._session.commit()
 
     def _get_url(
-        self, user_friendly: bool = False, csv: bool = False, **kwargs: Any
+        self,
+        user_friendly: bool = False,
+        result_format: Optional[ChartDataResultFormat] = None,
+        **kwargs: Any,
     ) -> str:
         """
         Get the url for this report schedule: chart or dashboard
         """
         if self._report_schedule.chart:
-            if csv:
+            if result_format in {
+                ChartDataResultFormat.CSV,
+                ChartDataResultFormat.JSON,
+            }:
                 return get_url_path(
-                    "Superset.explore_json",
-                    csv="true",
-                    form_data=json.dumps({"slice_id": self._report_schedule.chart_id}),
+                    "ChartRestApi.get_data",
+                    pk=self._report_schedule.chart_id,
+                    format=result_format.value,
+                    type=ChartDataResultType.POST_PROCESSED.value,
                 )
             return get_url_path(
                 "Superset.slice",
@@ -178,6 +189,7 @@ def _get_screenshot(self) -> bytes:
         screenshot: Optional[BaseScreenshot] = None
         if self._report_schedule.chart:
             url = self._get_url(standalone="true")
+            logger.info("Screenshotting chart at %s", url)
             screenshot = ChartScreenshot(
                 url,
                 self._report_schedule.chart.digest,
@@ -186,6 +198,7 @@ def _get_screenshot(self) -> bytes:
             )
         else:
             url = self._get_url()
+            logger.info("Screenshotting dashboard at %s", url)
             screenshot = DashboardScreenshot(
                 url,
                 self._report_schedule.dashboard.digest,
@@ -195,33 +208,87 @@ def _get_screenshot(self) -> bytes:
         user = self._get_user()
         try:
             image_data = screenshot.get_screenshot(user=user)
-        except SoftTimeLimitExceeded:
+        except SoftTimeLimitExceeded as ex:
             logger.warning("A timeout occurred while taking a screenshot.")
-            raise ReportScheduleScreenshotTimeout()
+            raise ReportScheduleScreenshotTimeout() from ex
         except Exception as ex:
             raise ReportScheduleScreenshotFailedError(
                 f"Failed taking a screenshot {str(ex)}"
-            )
+            ) from ex
         if not image_data:
             raise ReportScheduleScreenshotFailedError()
         return image_data
 
     def _get_csv_data(self) -> bytes:
-        if self._report_schedule.chart:
-            url = self._get_url(csv=True)
-            auth_cookies = machine_auth_provider_factory.instance.get_auth_cookies(
-                self._get_user()
-            )
+        url = self._get_url(result_format=ChartDataResultFormat.CSV)
+        auth_cookies = machine_auth_provider_factory.instance.get_auth_cookies(
+            self._get_user()
+        )
+
+        if self._report_schedule.chart.query_context is None:
+            logger.warning("No query context found, taking a screenshot to generate it")
+            self._update_query_context()
+
         try:
+            logger.info("Getting chart from %s", url)
             csv_data = get_chart_csv_data(url, auth_cookies)
-        except SoftTimeLimitExceeded:
-            raise ReportScheduleCsvTimeout()
+        except SoftTimeLimitExceeded as ex:
+            raise ReportScheduleCsvTimeout() from ex
         except Exception as ex:
-            raise ReportScheduleCsvFailedError(f"Failed generating csv {str(ex)}")
+            raise ReportScheduleCsvFailedError(
+                f"Failed generating csv {str(ex)}"
+            ) from ex
         if not csv_data:
             raise ReportScheduleCsvFailedError()
         return csv_data
 
+    def _get_embedded_data(self) -> pd.DataFrame:
+        """
+        Return data as a Pandas dataframe, to embed in notifications as a table.
+        """
+        url = self._get_url(result_format=ChartDataResultFormat.JSON)
+        auth_cookies = machine_auth_provider_factory.instance.get_auth_cookies(
+            self._get_user()
+        )
+
+        if self._report_schedule.chart.query_context is None:
+            logger.warning("No query context found, taking a screenshot to generate it")
+            self._update_query_context()
+
+        try:
+            logger.info("Getting chart from %s", url)
+            dataframe = get_chart_dataframe(url, auth_cookies)
+        except SoftTimeLimitExceeded as ex:
+            raise ReportScheduleDataFrameTimeout() from ex
+        except Exception as ex:
+            raise ReportScheduleDataFrameFailedError(
+                f"Failed generating dataframe {str(ex)}"
+            ) from ex
+        if dataframe is None:
+            raise ReportScheduleCsvFailedError()
+        return dataframe
+
+    def _update_query_context(self) -> None:
+        """
+        Update chart query context.
+
+        To load CSV data from the endpoint the chart must have been saved
+        with its query context. For charts without saved query context we
+        get a screenshot to force the chart to produce and save the query
+        context.
+        """
+        try:
+            self._get_screenshot()
+        except (
+            ReportScheduleScreenshotFailedError,
+            ReportScheduleScreenshotTimeout,
+        ) as ex:
+            raise ReportScheduleCsvFailedError(
+                "Unable to fetch data because the chart has no query context "
+                "saved, and an error occurred when fetching it via a screenshot. "
+                "Please try loading the chart and saving it again."
+            ) from ex
+
     def _get_notification_content(self) -> NotificationContent:
         """
         Gets a notification content, this is composed by a title and a screenshot
@@ -229,6 +296,7 @@ def _get_notification_content(self) -> NotificationContent:
         :raises: ReportScheduleScreenshotFailedError
         """
         csv_data = None
+        embedded_data = None
         error_text = None
         screenshot_data = None
         url = self._get_url(user_friendly=True)
@@ -252,6 +320,12 @@ def _get_notification_content(self) -> NotificationContent:
                     name=self._report_schedule.name, text=error_text
                 )
 
+        if (
+            self._report_schedule.chart
+            and self._report_schedule.report_format == ReportDataFormat.TEXT
+        ):
+            embedded_data = self._get_embedded_data()
+
         if self._report_schedule.chart:
             name = (
                 f"{self._report_schedule.name}: "
@@ -268,6 +342,7 @@ def _get_notification_content(self) -> NotificationContent:
             screenshot=screenshot_data,
             description=self._report_schedule.description,
             csv=csv_data,
+            embedded_data=embedded_data,
         )
 
     def _send(
@@ -540,7 +615,7 @@ def run(self) -> None:
             except CommandException as ex:
                 raise ex
             except Exception as ex:
-                raise ReportScheduleUnexpectedError(str(ex))
+                raise ReportScheduleUnexpectedError(str(ex)) from ex
 
     def validate(  # pylint: disable=arguments-differ
         self, session: Session = None
diff --git a/superset/reports/commands/update.py b/superset/reports/commands/update.py
index fcb3dd0f57b4..c1dd4167908f 100644
--- a/superset/reports/commands/update.py
+++ b/superset/reports/commands/update.py
@@ -22,7 +22,7 @@
 from flask_appbuilder.security.sqla.models import User
 from marshmallow import ValidationError
 
-from superset.commands.utils import populate_owners
+from superset.commands.base import UpdateMixin
 from superset.dao.exceptions import DAOUpdateFailedError
 from superset.databases.dao import DatabaseDAO
 from superset.exceptions import SupersetSecurityException
@@ -42,7 +42,7 @@
 logger = logging.getLogger(__name__)
 
 
-class UpdateReportScheduleCommand(BaseReportScheduleCommand):
+class UpdateReportScheduleCommand(UpdateMixin, BaseReportScheduleCommand):
     def __init__(self, user: User, model_id: int, data: Dict[str, Any]):
         self._actor = user
         self._model_id = model_id
@@ -55,7 +55,7 @@ def run(self) -> Model:
             report_schedule = ReportScheduleDAO.update(self._model, self._properties)
         except DAOUpdateFailedError as ex:
             logger.exception(ex.exception)
-            raise ReportScheduleUpdateFailedError()
+            raise ReportScheduleUpdateFailedError() from ex
         return report_schedule
 
     def validate(self) -> None:
@@ -110,14 +110,14 @@ def validate(self) -> None:
         # Check ownership
         try:
             check_ownership(self._model)
-        except SupersetSecurityException:
-            raise ReportScheduleForbiddenError()
+        except SupersetSecurityException as ex:
+            raise ReportScheduleForbiddenError() from ex
 
         # Validate/Populate owner
         if owner_ids is None:
             owner_ids = [owner.id for owner in self._model.owners]
         try:
-            owners = populate_owners(self._actor, owner_ids)
+            owners = self.populate_owners(self._actor, owner_ids)
             self._properties["owners"] = owners
         except ValidationError as ex:
             exceptions.append(ex)
diff --git a/superset/reports/dao.py b/superset/reports/dao.py
index 0f729c3d022d..ce69ba004c47 100644
--- a/superset/reports/dao.py
+++ b/superset/reports/dao.py
@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+import json
 import logging
 from datetime import datetime
 from typing import Any, Dict, List, Optional
@@ -110,7 +111,7 @@ def bulk_delete(
         except SQLAlchemyError as ex:
             if commit:
                 db.session.rollback()
-            raise DAODeleteFailedError(str(ex))
+            raise DAODeleteFailedError(str(ex)) from ex
 
     @staticmethod
     def validate_update_uniqueness(
@@ -138,7 +139,6 @@ def create(cls, properties: Dict[str, Any], commit: bool = True) -> Model:
         create a report schedule and nested recipients
         :raises: DAOCreateFailedError
         """
-        import json
 
         try:
             model = ReportSchedule()
@@ -161,7 +161,7 @@ def create(cls, properties: Dict[str, Any], commit: bool = True) -> Model:
             return model
         except SQLAlchemyError as ex:
             db.session.rollback()
-            raise DAOCreateFailedError(str(ex))
+            raise DAOCreateFailedError(str(ex)) from ex
 
     @classmethod
     def update(
@@ -171,7 +171,6 @@ def update(
         create a report schedule and nested recipients
         :raises: DAOCreateFailedError
         """
-        import json
 
         try:
             for key, value in properties.items():
@@ -195,7 +194,7 @@ def update(
             return model
         except SQLAlchemyError as ex:
             db.session.rollback()
-            raise DAOCreateFailedError(str(ex))
+            raise DAOCreateFailedError(str(ex)) from ex
 
     @staticmethod
     def find_active(session: Optional[Session] = None) -> List[ReportSchedule]:
@@ -303,4 +302,4 @@ def bulk_delete_logs(
         except SQLAlchemyError as ex:
             if commit:
                 session.rollback()
-            raise DAODeleteFailedError(str(ex))
+            raise DAODeleteFailedError(str(ex)) from ex
diff --git a/superset/reports/logs/api.py b/superset/reports/logs/api.py
index e71376f14b85..6b11da556f67 100644
--- a/superset/reports/logs/api.py
+++ b/superset/reports/logs/api.py
@@ -97,7 +97,7 @@ def _apply_layered_relation_to_rison(  # pylint: disable=invalid-name
     @permission_name("get")
     @rison(get_list_schema)
     def get_list(  # pylint: disable=arguments-differ
-        self, pk: int, **kwargs: Dict[str, Any]
+        self, pk: int, **kwargs: Any
     ) -> Response:
         """Get a list of report schedule logs
         ---
@@ -158,7 +158,7 @@ def get_list(  # pylint: disable=arguments-differ
     @permission_name("get")
     @rison(get_item_schema)
     def get(  # pylint: disable=arguments-differ
-        self, pk: int, log_id: int, **kwargs: Dict[str, Any]
+        self, pk: int, log_id: int, **kwargs: Any
     ) -> Response:
         """Get a report schedule log
         ---
diff --git a/superset/reports/notifications/base.py b/superset/reports/notifications/base.py
index d8b377261c86..40439ef3813c 100644
--- a/superset/reports/notifications/base.py
+++ b/superset/reports/notifications/base.py
@@ -18,6 +18,8 @@
 from dataclasses import dataclass
 from typing import Any, List, Optional, Type
 
+import pandas as pd
+
 from superset.models.reports import ReportRecipients, ReportRecipientType
 
 
@@ -29,6 +31,7 @@ class NotificationContent:
     text: Optional[str] = None
     description: Optional[str] = ""
     url: Optional[str] = None  # url to chart/dashboard for this screenshot
+    embedded_data: Optional[pd.DataFrame] = None
 
 
 class BaseNotification:  # pylint: disable=too-few-public-methods
diff --git a/superset/reports/notifications/email.py b/superset/reports/notifications/email.py
index d8663774ac10..c1fce9939b3f 100644
--- a/superset/reports/notifications/email.py
+++ b/superset/reports/notifications/email.py
@@ -17,10 +17,12 @@
 # under the License.
 import json
 import logging
+import textwrap
 from dataclasses import dataclass
 from email.utils import make_msgid, parseaddr
 from typing import Any, Dict, Optional
 
+import bleach
 from flask_babel import gettext as __
 
 from superset import app
@@ -31,6 +33,9 @@
 
 logger = logging.getLogger(__name__)
 
+TABLE_TAGS = ["table", "th", "tr", "td", "thead", "tbody", "tfoot"]
+TABLE_ATTRIBUTES = ["colspan", "rowspan", "halign", "border", "class"]
+
 
 @dataclass
 class EmailContent:
@@ -68,17 +73,48 @@ def _get_content(self) -> EmailContent:
         csv_data = None
         domain = self._get_smtp_domain()
         msgid = make_msgid(domain)[1:-1]
-        body = __(
-            """
-            <p>%(description)s</p>
-            <b><a href="%(url)s">Explore in Superset</a></b><p></p>
-            %(img_tag)s
-            """,
-            description=self._content.description or "",
-            url=self._content.url,
-            img_tag='<img width="1000px" src="cid:{}">'.format(msgid)
+
+        # Strip any malicious HTML from the description
+        description = bleach.clean(self._content.description or "")
+
+        # Strip malicious HTML from embedded data, allowing only table elements
+        if self._content.embedded_data is not None:
+            df = self._content.embedded_data
+            html_table = bleach.clean(
+                df.to_html(na_rep="", index=True),
+                tags=TABLE_TAGS,
+                attributes=TABLE_ATTRIBUTES,
+            )
+        else:
+            html_table = ""
+
+        call_to_action = __("Explore in Superset")
+        img_tag = (
+            f'<img width="1000px" src="cid:{msgid}">'
             if self._content.screenshot
-            else "",
+            else ""
+        )
+        body = textwrap.dedent(
+            f"""
+            <html>
+              <head>
+                <style type="text/css">
+                  table, th, td {{
+                    border-collapse: collapse;
+                    border-color: rgb(200, 212, 227);
+                    color: rgb(42, 63, 95);
+                    padding: 4px 8px;
+                  }}
+                </style>
+              </head>
+              <body>
+                <p>{description}</p>
+                <b><a href="{self._content.url}">{call_to_action}</a></b><p></p>
+                {html_table}
+                {img_tag}
+              </body>
+            </html>
+            """
         )
         if self._content.screenshot:
             image = {msgid: self._content.screenshot}
@@ -115,4 +151,4 @@ def send(self) -> None:
             )
             logger.info("Report sent to email")
         except Exception as ex:
-            raise NotificationError(ex)
+            raise NotificationError(ex) from ex
diff --git a/superset/reports/notifications/slack.py b/superset/reports/notifications/slack.py
index 4fd9fb35fa94..b5666a66f70d 100644
--- a/superset/reports/notifications/slack.py
+++ b/superset/reports/notifications/slack.py
@@ -20,8 +20,8 @@
 from io import IOBase
 from typing import Optional, Union
 
+import backoff
 from flask_babel import gettext as __
-from retry.api import retry
 from slack import WebClient
 from slack.errors import SlackApiError, SlackClientError
 
@@ -32,6 +32,9 @@
 
 logger = logging.getLogger(__name__)
 
+# Slack only allows Markdown messages up to 4k chars
+MAXIMUM_MESSAGE_SIZE = 4000
+
 
 class SlackNotification(BaseNotification):  # pylint: disable=too-few-public-methods
     """
@@ -43,14 +46,31 @@ class SlackNotification(BaseNotification):  # pylint: disable=too-few-public-met
     def _get_channel(self) -> str:
         return json.loads(self._recipient.recipient_config_json)["target"]
 
+    def _message_template(self, table: str = "") -> str:
+        return __(
+            """*%(name)s*
+
+%(description)s
+
+<%(url)s|Explore in Superset>
+
+%(table)s
+""",
+            name=self._content.name,
+            description=self._content.description or "",
+            url=self._content.url,
+            table=table,
+        )
+
     @staticmethod
     def _error_template(name: str, description: str, text: str) -> str:
         return __(
-            """
-            *%(name)s*\n
-            %(description)s\n
-            Error: %(text)s
-            """,
+            """*%(name)s*
+
+%(description)s
+
+Error: %(text)s
+""",
             name=name,
             description=description,
             text=text,
@@ -61,16 +81,57 @@ def _get_body(self) -> str:
             return self._error_template(
                 self._content.name, self._content.description or "", self._content.text
             )
-        return __(
-            """
-            *%(name)s*\n
-            %(description)s\n
-            <%(url)s|Explore in Superset>
-            """,
-            name=self._content.name,
-            description=self._content.description or "",
-            url=self._content.url,
-        )
+
+        if self._content.embedded_data is None:
+            return self._message_template()
+
+        # Embed data in the message
+        df = self._content.embedded_data
+
+        # Flatten columns/index so they show up nicely in the table
+        df.columns = [
+            " ".join(str(name) for name in column).strip()
+            if isinstance(column, tuple)
+            else column
+            for column in df.columns
+        ]
+        df.index = [
+            " ".join(str(name) for name in index).strip()
+            if isinstance(index, tuple)
+            else index
+            for index in df.index
+        ]
+
+        # Slack Markdown only works on messages shorter than 4k chars, so we might
+        # need to truncate the data
+        for i in range(len(df) - 1):
+            truncated_df = df[: i + 1].fillna("")
+            truncated_df = truncated_df.append(
+                {k: "..." for k in df.columns}, ignore_index=True
+            )
+            tabulated = df.to_markdown()
+            table = f"```\n{tabulated}\n```\n\n(table was truncated)"
+            message = self._message_template(table)
+            if len(message) > MAXIMUM_MESSAGE_SIZE:
+                # Decrement i and build a message that is under the limit
+                truncated_df = df[:i].fillna("")
+                truncated_df = truncated_df.append(
+                    {k: "..." for k in df.columns}, ignore_index=True
+                )
+                tabulated = df.to_markdown()
+                table = (
+                    f"```\n{tabulated}\n```\n\n(table was truncated)"
+                    if len(truncated_df) > 0
+                    else ""
+                )
+                break
+
+        # Send full data
+        else:
+            tabulated = df.to_markdown()
+            table = f"```\n{tabulated}\n```"
+
+        return self._message_template(table)
 
     def _get_inline_file(self) -> Optional[Union[str, IOBase, bytes]]:
         if self._content.csv:
@@ -79,7 +140,7 @@ def _get_inline_file(self) -> Optional[Union[str, IOBase, bytes]]:
             return self._content.screenshot
         return None
 
-    @retry(SlackApiError, delay=10, backoff=2, tries=5)
+    @backoff.on_exception(backoff.expo, SlackApiError, factor=10, base=2, max_tries=5)
     def send(self) -> None:
         file = self._get_inline_file()
         title = self._content.name
@@ -104,4 +165,4 @@ def send(self) -> None:
                 client.chat_postMessage(channel=channel, text=body)
             logger.info("Report sent to slack")
         except SlackClientError as ex:
-            raise NotificationError(ex)
+            raise NotificationError(ex) from ex
diff --git a/superset/reports/schemas.py b/superset/reports/schemas.py
index 1ea711f4cd0c..2180e4d22ac8 100644
--- a/superset/reports/schemas.py
+++ b/superset/reports/schemas.py
@@ -20,8 +20,10 @@
 from flask_babel import gettext as _
 from marshmallow import fields, Schema, validate, validates_schema
 from marshmallow.validate import Length, Range, ValidationError
+from marshmallow_enum import EnumField
 
 from superset.models.reports import (
+    ReportCreationMethodType,
     ReportDataFormat,
     ReportRecipientType,
     ReportScheduleType,
@@ -55,6 +57,7 @@
     "[Crontab Guru](https://crontab.guru/) is "
     "a helpful resource that can help you craft a CRON expression."
 )
+timezone_description = "A timezone string that represents the location of the timezone."
 sql_description = (
     "A SQL statement that defines whether the alert should get triggered or "
     "not. The query is expected to return either NULL or a number value."
@@ -83,6 +86,10 @@
     "If an alert is staled at a working state, how long until it's state is reseted to"
     " error"
 )
+creation_method_description = (
+    "Creation method is used to inform the frontend whether the report/alert was "
+    "created in the dashboard, chart, or alerts and reports UI."
+)
 
 
 def validate_crontab(value: Union[bytes, bytearray, str]) -> None:
@@ -146,10 +153,17 @@ class ReportSchedulePostSchema(Schema):
         allow_none=False,
         required=True,
     )
+    timezone = fields.String(description=timezone_description, default="UTC")
     sql = fields.String(
         description=sql_description, example="SELECT value FROM time_series_table"
     )
     chart = fields.Integer(required=False, allow_none=True)
+    creation_method = EnumField(
+        ReportCreationMethodType,
+        by_value=True,
+        required=False,
+        description=creation_method_description,
+    )
     dashboard = fields.Integer(required=False, allow_none=True)
     database = fields.Integer(required=False)
     owners = fields.List(fields.Integer(description=owners_description))
@@ -219,6 +233,7 @@ class ReportSchedulePutSchema(Schema):
         validate=[validate_crontab, Length(1, 1000)],
         required=False,
     )
+    timezone = fields.String(description=timezone_description, default="UTC")
     sql = fields.String(
         description=sql_description,
         example="SELECT value FROM time_series_table",
@@ -226,6 +241,12 @@ class ReportSchedulePutSchema(Schema):
         allow_none=True,
     )
     chart = fields.Integer(required=False, allow_none=True)
+    creation_method = EnumField(
+        ReportCreationMethodType,
+        by_value=True,
+        allow_none=True,
+        description=creation_method_description,
+    )
     dashboard = fields.Integer(required=False, allow_none=True)
     database = fields.Integer(required=False)
     owners = fields.List(fields.Integer(description=owners_description), required=False)
diff --git a/superset/result_set.py b/superset/result_set.py
index 34d5dc909d63..1f925138d29a 100644
--- a/superset/result_set.py
+++ b/superset/result_set.py
@@ -72,7 +72,7 @@ def destringify(obj: str) -> Any:
 
 
 class SupersetResultSet:
-    def __init__(  # pylint: disable=too-many-locals,too-many-branches
+    def __init__(  # pylint: disable=too-many-locals
         self,
         data: DbapiResult,
         cursor_description: DbapiDescription,
diff --git a/superset/security/manager.py b/superset/security/manager.py
index a7a84648fb97..75a83973aa33 100644
--- a/superset/security/manager.py
+++ b/superset/security/manager.py
@@ -18,7 +18,19 @@
 """A set of constants and methods to manage permissions and security"""
 import logging
 import re
-from typing import Any, Callable, cast, List, Optional, Set, Tuple, TYPE_CHECKING, Union
+from collections import defaultdict
+from typing import (
+    Any,
+    Callable,
+    cast,
+    Dict,
+    List,
+    Optional,
+    Set,
+    Tuple,
+    TYPE_CHECKING,
+    Union,
+)
 
 from flask import current_app, g
 from flask_appbuilder import Model
@@ -167,6 +179,7 @@ class SupersetSecurityManager(  # pylint: disable=too-many-public-methods
         "can_list",
         "can_get",
         "can_external_metadata",
+        "can_external_metadata_by_name",
         "can_read",
     }
 
@@ -351,9 +364,7 @@ def get_datasource_access_link(  # pylint: disable=unused-argument
         :returns: The access URL
         """
 
-        from superset import conf
-
-        return conf.get("PERMISSION_INSTRUCTIONS_LINK")
+        return current_app.config.get("PERMISSION_INSTRUCTIONS_LINK")
 
     def get_datasource_access_error_object(  # pylint: disable=invalid-name
         self, datasource: "BaseDatasource"
@@ -415,9 +426,44 @@ def get_table_access_link(  # pylint: disable=unused-argument,no-self-use
         :returns: The access URL
         """
 
-        from superset import conf
+        return current_app.config.get("PERMISSION_INSTRUCTIONS_LINK")
+
+    def get_user_datasources(self) -> List["BaseDatasource"]:
+        """
+        Collect datasources which the user has explicit permissions to.
 
-        return conf.get("PERMISSION_INSTRUCTIONS_LINK")
+        :returns: The list of datasources
+        """
+
+        user_perms = self.user_view_menu_names("datasource_access")
+        schema_perms = self.user_view_menu_names("schema_access")
+        user_datasources = set()
+        for datasource_class in ConnectorRegistry.sources.values():
+            user_datasources.update(
+                self.get_session.query(datasource_class)
+                .filter(
+                    or_(
+                        datasource_class.perm.in_(user_perms),
+                        datasource_class.schema_perm.in_(schema_perms),
+                    )
+                )
+                .all()
+            )
+
+        # group all datasources by database
+        all_datasources = ConnectorRegistry.get_all_datasources(self.get_session)
+        datasources_by_database: Dict["Database", Set["BaseDatasource"]] = defaultdict(
+            set
+        )
+        for datasource in all_datasources:
+            datasources_by_database[datasource.database].add(datasource)
+
+        # add datasources with implicit permission (eg, database access)
+        for database, datasources in datasources_by_database.items():
+            if self.can_access_database(database):
+                user_datasources.update(datasources)
+
+        return list(user_datasources)
 
     def can_access_table(self, database: "Database", table: "Table") -> bool:
         """
@@ -478,6 +524,7 @@ def get_schemas_accessible_by_user(
         :returns: The list of accessible SQL schemas
         """
 
+        # pylint: disable=import-outside-toplevel
         from superset.connectors.sqla.models import SqlaTable
 
         if hierarchical and self.can_access_database(database):
@@ -579,6 +626,7 @@ def create_missing_perms(self) -> None:
         Creates missing FAB permissions for datasources, schemas and metrics.
         """
 
+        # pylint: disable=import-outside-toplevel
         from superset.models import core as models
 
         logger.info("Fetching a set of all perms to lookup which ones are missing")
@@ -628,8 +676,6 @@ def sync_role_definitions(self) -> None:
         Initialize the Superset application with security roles and such.
         """
 
-        from superset import conf
-
         logger.info("Syncing role definition")
 
         self.create_custom_permissions()
@@ -642,9 +688,13 @@ def sync_role_definitions(self) -> None:
         self.set_role("sql_lab", self._is_sql_lab_pvm)
 
         # Configure public role
-        if conf["PUBLIC_ROLE_LIKE"]:
-            self.copy_role(conf["PUBLIC_ROLE_LIKE"], self.auth_role_public, merge=True)
-        if conf.get("PUBLIC_ROLE_LIKE_GAMMA", False):
+        if current_app.config["PUBLIC_ROLE_LIKE"]:
+            self.copy_role(
+                current_app.config["PUBLIC_ROLE_LIKE"],
+                self.auth_role_public,
+                merge=True,
+            )
+        if current_app.config.get("PUBLIC_ROLE_LIKE_GAMMA", False):
             logger.warning(
                 "The config `PUBLIC_ROLE_LIKE_GAMMA` is deprecated and will be removed "
                 "in Superset 1.0. Please use `PUBLIC_ROLE_LIKE` instead."
@@ -850,7 +900,7 @@ def _is_granter_pvm(  # pylint: disable=no-self-use
 
         return pvm.permission.name in {"can_override_role_permissions", "can_approve"}
 
-    def set_perm(  # pylint: disable=no-self-use,unused-argument
+    def set_perm(  # pylint: disable=unused-argument
         self, mapper: Mapper, connection: Connection, target: "BaseDatasource"
     ) -> None:
         """
@@ -860,7 +910,7 @@ def set_perm(  # pylint: disable=no-self-use,unused-argument
         :param connection: The DB-API connection
         :param target: The mapped instance being persisted
         """
-        link_table = target.__table__  # pylint: disable=no-member
+        link_table = target.__table__
         if target.perm != target.get_perm():
             connection.execute(
                 link_table.update()
@@ -924,8 +974,7 @@ def set_perm(  # pylint: disable=no-self-use,unused-argument
                 )
 
     def raise_for_access(
-        # pylint: disable=too-many-arguments,too-many-branches,
-        # pylint: disable=too-many-locals
+        # pylint: disable=too-many-arguments,too-many-locals
         self,
         database: Optional["Database"] = None,
         datasource: Optional["BaseDatasource"] = None,
@@ -946,7 +995,9 @@ def raise_for_access(
         :raises SupersetSecurityException: If the user cannot access the resource
         """
 
+        # pylint: disable=import-outside-toplevel
         from superset.connectors.sqla.models import SqlaTable
+        from superset.extensions import feature_flag_manager
         from superset.sql_parse import Table
 
         if database and table or query:
@@ -996,8 +1047,6 @@ def raise_for_access(
 
             assert datasource
 
-            from superset.extensions import feature_flag_manager
-
             if not (
                 self.can_access_schema(datasource)
                 or self.can_access("datasource_access", datasource.perm or "")
@@ -1037,6 +1086,7 @@ def get_rls_filters(self, table: "BaseDatasource") -> List[SqlaQuery]:
         :returns: A list of filters
         """
         if hasattr(g, "user") and hasattr(g.user, "id"):
+            # pylint: disable=import-outside-toplevel
             from superset.connectors.sqla.models import (
                 RLSFilterRoles,
                 RLSFilterTables,
@@ -1118,6 +1168,7 @@ def raise_for_dashboard_access(dashboard: "Dashboard") -> None:
         :param dashboard: Dashboard the user wants access to
         :raises DashboardAccessDeniedError: If the user cannot access the resource
         """
+        # pylint: disable=import-outside-toplevel
         from superset.dashboards.commands.exceptions import DashboardAccessDeniedError
         from superset.views.base import get_user_roles, is_user_admin
         from superset.views.utils import is_owner
@@ -1139,6 +1190,7 @@ def raise_for_dashboard_access(dashboard: "Dashboard") -> None:
 
     @staticmethod
     def can_access_based_on_dashboard(datasource: "BaseDatasource") -> bool:
+        # pylint: disable=import-outside-toplevel
         from superset import db
         from superset.dashboards.filters import DashboardAccessFilter
         from superset.models.slice import Slice
diff --git a/superset/sql_lab.py b/superset/sql_lab.py
index 30cec61c929b..d392e6c25d4c 100644
--- a/superset/sql_lab.py
+++ b/superset/sql_lab.py
@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+import dataclasses
 import logging
 import uuid
 from contextlib import closing
@@ -25,15 +26,17 @@
 import msgpack
 import pyarrow as pa
 import simplejson as json
+from celery import Task
 from celery.exceptions import SoftTimeLimitExceeded
-from celery.task.base import Task
-from flask_babel import lazy_gettext as _
+from flask_babel import gettext as __
 from sqlalchemy.orm import Session
 from werkzeug.local import LocalProxy
 
 from superset import app, results_backend, results_backend_use_msgpack, security_manager
 from superset.dataframe import df_to_records
 from superset.db_engine_specs import BaseEngineSpec
+from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
+from superset.exceptions import SupersetErrorException, SupersetErrorsException
 from superset.extensions import celery_app
 from superset.models.core import Database
 from superset.models.sql_lab import LimitingFactor, Query
@@ -70,6 +73,7 @@ def dummy_sql_query_mutator(
 SQL_QUERY_MUTATOR = config.get("SQL_QUERY_MUTATOR") or dummy_sql_query_mutator
 log_query = config["QUERY_LOGGER"]
 logger = logging.getLogger(__name__)
+cancel_query_key = "cancel_query"
 
 
 class SqlLabException(Exception):
@@ -80,21 +84,39 @@ class SqlLabSecurityException(SqlLabException):
     pass
 
 
-class SqlLabTimeoutException(SqlLabException):
+class SqlLabQueryStoppedException(SqlLabException):
     pass
 
 
 def handle_query_error(
-    msg: str, query: Query, session: Session, payload: Optional[Dict[str, Any]] = None
+    ex: Exception,
+    query: Query,
+    session: Session,
+    payload: Optional[Dict[str, Any]] = None,
+    prefix_message: str = "",
 ) -> Dict[str, Any]:
     """Local method handling error while processing the SQL"""
     payload = payload or {}
+    msg = f"{prefix_message} {str(ex)}".strip()
     troubleshooting_link = config["TROUBLESHOOTING_LINK"]
     query.error_message = msg
     query.status = QueryStatus.FAILED
     query.tmp_table_name = None
+
+    # extract DB-specific errors (invalid column, eg)
+    if isinstance(ex, SupersetErrorException):
+        errors = [ex.error]
+    elif isinstance(ex, SupersetErrorsException):
+        errors = ex.errors
+    else:
+        errors = query.database.db_engine_spec.extract_errors(str(ex))
+
+    errors_payload = [dataclasses.asdict(error) for error in errors]
+    if errors:
+        query.set_extra_json_key("errors", errors_payload)
+
     session.commit()
-    payload.update({"status": query.status, "error": msg})
+    payload.update({"status": query.status, "error": msg, "errors": errors_payload})
     if troubleshooting_link:
         payload["link"] = troubleshooting_link
     return payload
@@ -127,8 +149,8 @@ def get_query(query_id: int, session: Session) -> Query:
     """attempts to get the query and retry if it cannot"""
     try:
         return session.query(Query).filter_by(id=query_id).one()
-    except Exception:
-        raise SqlLabException("Failed at getting query")
+    except Exception as ex:
+        raise SqlLabException("Failed at getting query") from ex
 
 
 @celery_app.task(
@@ -163,23 +185,14 @@ def get_sql_results(  # pylint: disable=too-many-arguments
                 expand_data=expand_data,
                 log_params=log_params,
             )
-        except SoftTimeLimitExceeded as ex:
-            logger.warning("Query %d: Time limit exceeded", query_id)
-            logger.debug("Query %d: %s", query_id, ex)
-            raise SqlLabTimeoutException(
-                _(
-                    "SQL Lab timeout. This environment's policy is to kill queries "
-                    "after {} seconds.".format(SQLLAB_TIMEOUT)
-                )
-            )
         except Exception as ex:  # pylint: disable=broad-except
             logger.debug("Query %d: %s", query_id, ex)
             stats_logger.incr("error_sqllab_unhandled")
             query = get_query(query_id, session)
-            return handle_query_error(str(ex), query, session)
+            return handle_query_error(ex, query, session)
 
 
-# pylint: disable=too-many-arguments, too-many-locals
+# pylint: disable=too-many-arguments, too-many-locals, too-many-statements
 def execute_sql_statement(
     sql_statement: str,
     query: Query,
@@ -200,8 +213,12 @@ def execute_sql_statement(
     increased_limit = None if query.limit is None else query.limit + 1
 
     if not db_engine_spec.is_readonly_query(parsed_query) and not database.allow_dml:
-        raise SqlLabSecurityException(
-            _("Only `SELECT` statements are allowed against this database")
+        raise SupersetErrorException(
+            SupersetError(
+                message=__("Only SELECT statements are allowed against this database."),
+                error_type=SupersetErrorType.DML_NOT_ALLOWED_ERROR,
+                level=ErrorLevel.ERROR,
+            )
         )
     if apply_ctas:
         if not query.tmp_table_name:
@@ -262,10 +279,29 @@ def execute_sql_statement(
             else:
                 # return 1 row less than increased_query
                 data = data[:-1]
+    except SoftTimeLimitExceeded as ex:
+        logger.warning("Query %d: Time limit exceeded", query.id)
+        logger.debug("Query %d: %s", query.id, ex)
+        raise SupersetErrorException(
+            SupersetError(
+                message=__(
+                    f"The query was killed after {SQLLAB_TIMEOUT} seconds. It might "
+                    "be too complex, or the database might be under heavy load."
+                ),
+                error_type=SupersetErrorType.SQLLAB_TIMEOUT_ERROR,
+                level=ErrorLevel.ERROR,
+            )
+        ) from ex
     except Exception as ex:
+        # query is stopped in another thread/worker
+        # stopping raises expected exceptions which we should skip
+        session.refresh(query)
+        if query.status == QueryStatus.STOPPED:
+            raise SqlLabQueryStoppedException() from ex
+
         logger.error("Query %d: %s", query.id, type(ex), exc_info=True)
         logger.debug("Query %d: %s", query.id, ex)
-        raise SqlLabException(db_engine_spec.extract_error_message(ex))
+        raise SqlLabException(db_engine_spec.extract_error_message(ex)) from ex
 
     logger.debug("Query %d: Fetching cursor description", query.id)
     cursor_description = cursor.description
@@ -343,7 +379,13 @@ def execute_sql_statements(  # pylint: disable=too-many-arguments, too-many-loca
     db_engine_spec.patch()
 
     if database.allow_run_async and not results_backend:
-        raise SqlLabException("Results backend isn't configured.")
+        raise SupersetErrorException(
+            SupersetError(
+                message=__("Results backend is not configured."),
+                error_type=SupersetErrorType.RESULTS_BACKEND_NOT_CONFIGURED_ERROR,
+                level=ErrorLevel.ERROR,
+            )
+        )
 
     # Breaking down into multiple statements
     parsed_query = ParsedQuery(rendered_query, strip_comments=True)
@@ -367,11 +409,16 @@ def execute_sql_statements(  # pylint: disable=too-many-arguments, too-many-loca
         and query.ctas_method == CtasMethod.TABLE
         and not parsed_query.is_valid_ctas()
     ):
-        raise SqlLabException(
-            _(
-                "CTAS (create table as select) can only be run with a query where "
-                "the last statement is a SELECT. Please make sure your query has "
-                "a SELECT as its last statement. Then, try running your query again."
+        raise SupersetErrorException(
+            SupersetError(
+                message=__(
+                    "CTAS (create table as select) can only be run with a query where "
+                    "the last statement is a SELECT. Please make sure your query has "
+                    "a SELECT as its last statement. Then, try running your query "
+                    "again."
+                ),
+                error_type=SupersetErrorType.INVALID_CTAS_QUERY_ERROR,
+                level=ErrorLevel.ERROR,
             )
         )
     if (
@@ -379,11 +426,15 @@ def execute_sql_statements(  # pylint: disable=too-many-arguments, too-many-loca
         and query.ctas_method == CtasMethod.VIEW
         and not parsed_query.is_valid_cvas()
     ):
-        raise SqlLabException(
-            _(
-                "CVAS (create view as select) can only be run with a query with "
-                "a single SELECT statement. Please make sure your query has only "
-                "a SELECT statement. Then, try running your query again."
+        raise SupersetErrorException(
+            SupersetError(
+                message=__(
+                    "CVAS (create view as select) can only be run with a query with "
+                    "a single SELECT statement. Please make sure your query has only "
+                    "a SELECT statement. Then, try running your query again."
+                ),
+                error_type=SupersetErrorType.INVALID_CVAS_QUERY_ERROR,
+                level=ErrorLevel.ERROR,
             )
         )
 
@@ -398,12 +449,17 @@ def execute_sql_statements(  # pylint: disable=too-many-arguments, too-many-loca
     with closing(engine.raw_connection()) as conn:
         # closing the connection closes the cursor as well
         cursor = conn.cursor()
+        cancel_query_id = db_engine_spec.get_cancel_query_id(cursor, query)
+        if cancel_query_id is not None:
+            query.set_extra_json_key(cancel_query_key, cancel_query_id)
+            session.commit()
         statement_count = len(statements)
         for i, statement in enumerate(statements):
             # Check if stopped
-            query = get_query(query_id, session)
+            session.refresh(query)
             if query.status == QueryStatus.STOPPED:
-                return None
+                payload.update({"status": query.status})
+                return payload
 
             # For CTAS we create the table only on the last statement
             apply_ctas = query.select_as_cta and (
@@ -426,11 +482,19 @@ def execute_sql_statements(  # pylint: disable=too-many-arguments, too-many-loca
                     log_params,
                     apply_ctas,
                 )
+            except SqlLabQueryStoppedException:
+                payload.update({"status": QueryStatus.STOPPED})
+                return payload
             except Exception as ex:  # pylint: disable=broad-except
                 msg = str(ex)
-                if statement_count > 1:
-                    msg = f"[Statement {i+1} out of {statement_count}] " + msg
-                payload = handle_query_error(msg, query, session, payload)
+                prefix_message = (
+                    f"[Statement {i+1} out of {statement_count}]"
+                    if statement_count > 1
+                    else ""
+                )
+                payload = handle_query_error(
+                    ex, query, session, payload, prefix_message
+                )
                 return payload
 
         # Commit the connection so CTA queries will create the table.
@@ -517,3 +581,36 @@ def execute_sql_statements(  # pylint: disable=too-many-arguments, too-many-loca
         return payload
 
     return None
+
+
+def cancel_query(query: Query, user_name: Optional[str] = None) -> bool:
+    """
+    Cancel a running query.
+
+    Note some engines implicitly handle the cancelation of a query and thus no expliicit
+    action is required.
+
+    :param query: Query to cancel
+    :param user_name: Default username
+    :return: True if query cancelled successfully, False otherwise
+    """
+
+    if query.database.db_engine_spec.has_implicit_cancel():
+        return True
+
+    cancel_query_id = query.extra.get(cancel_query_key)
+    if cancel_query_id is None:
+        return False
+
+    engine = query.database.get_sqla_engine(
+        schema=query.schema,
+        nullpool=True,
+        user_name=user_name,
+        source=QuerySource.SQL_LAB,
+    )
+
+    with closing(engine.raw_connection()) as conn:
+        with closing(conn.cursor()) as cursor:
+            return query.database.db_engine_spec.cancel_query(
+                cursor, query, cancel_query_id
+            )
diff --git a/superset/sql_parse.py b/superset/sql_parse.py
index fdcb39099846..a5394c15c32e 100644
--- a/superset/sql_parse.py
+++ b/superset/sql_parse.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import logging
-from dataclasses import dataclass  # pylint: disable=wrong-import-order
+from dataclasses import dataclass
 from enum import Enum
 from typing import List, Optional, Set
 from urllib import parse
@@ -79,7 +79,7 @@ def strip_comments_from_sql(statement: str) -> str:
 
 
 @dataclass(eq=True, frozen=True)
-class Table:  # pylint: disable=too-few-public-methods
+class Table:
     """
     A fully qualified SQL table conforming to [[catalog.]schema.]table.
     """
@@ -265,9 +265,7 @@ def as_create_table(
         exec_sql += f"CREATE {method} {full_table_name} AS \n{sql}"
         return exec_sql
 
-    def _extract_from_token(  # pylint: disable=too-many-branches
-        self, token: Token
-    ) -> None:
+    def _extract_from_token(self, token: Token) -> None:
         """
         <Identifier> store a list of subtokens and <IdentifierList> store lists of
         subtoken list.
diff --git a/superset/sql_validators/presto_db.py b/superset/sql_validators/presto_db.py
index 7f468c96fb39..bf77f474a000 100644
--- a/superset/sql_validators/presto_db.py
+++ b/superset/sql_validators/presto_db.py
@@ -65,6 +65,7 @@ def validate_statement(
         # engine spec's handle_cursor implementation since we don't record
         # these EXPLAIN queries done in validation as proper Query objects
         # in the superset ORM.
+        # pylint: disable=import-outside-toplevel
         from pyhive.exc import DatabaseError
 
         try:
diff --git a/superset/tasks/alerts/validator.py b/superset/tasks/alerts/validator.py
index 36cfa2a4393d..38b579134159 100644
--- a/superset/tasks/alerts/validator.py
+++ b/superset/tasks/alerts/validator.py
@@ -28,8 +28,8 @@
 
 
 class AlertValidatorType(str, enum.Enum):
-    not_null = "not null"
-    operator = "operator"
+    NOT_NULL = "not null"
+    OPERATOR = "operator"
 
     @classmethod
     def valid_type(cls, validator_type: str) -> bool:
@@ -44,7 +44,7 @@ def check_validator(validator_type: str, config: str) -> None:
 
     config_dict = json.loads(config)
 
-    if validator_type == AlertValidatorType.operator.value:
+    if validator_type == AlertValidatorType.OPERATOR.value:
 
         if not (config_dict.get("op") and config_dict.get("threshold") is not None):
             raise SupersetException(
@@ -102,8 +102,8 @@ def get_validator_function(
     """Returns a validation function based on validator_type"""
 
     alert_validators = {
-        AlertValidatorType.not_null.value: not_null_validator,
-        AlertValidatorType.operator.value: operator_validator,
+        AlertValidatorType.NOT_NULL.value: not_null_validator,
+        AlertValidatorType.OPERATOR.value: operator_validator,
     }
     if alert_validators.get(validator_type.lower()):
         return alert_validators[validator_type.lower()]
diff --git a/superset/tasks/async_queries.py b/superset/tasks/async_queries.py
index 5fbe39e1511f..d2df6dd61753 100644
--- a/superset/tasks/async_queries.py
+++ b/superset/tasks/async_queries.py
@@ -22,7 +22,6 @@
 from celery.exceptions import SoftTimeLimitExceeded
 from flask import current_app, g
 
-from superset import app
 from superset.exceptions import SupersetVizException
 from superset.extensions import (
     async_query_manager,
@@ -51,34 +50,30 @@ def ensure_user_is_set(user_id: Optional[int]) -> None:
 def load_chart_data_into_cache(
     job_metadata: Dict[str, Any], form_data: Dict[str, Any],
 ) -> None:
+    # pylint: disable=import-outside-toplevel
     from superset.charts.commands.data import ChartDataCommand
 
-    with app.app_context():  # type: ignore
-        try:
-            ensure_user_is_set(job_metadata.get("user_id"))
-            command = ChartDataCommand()
-            command.set_query_context(form_data)
-            result = command.run(cache=True)
-            cache_key = result["cache_key"]
-            result_url = f"/api/v1/chart/data/{cache_key}"
-            async_query_manager.update_job(
-                job_metadata, async_query_manager.STATUS_DONE, result_url=result_url,
-            )
-        except SoftTimeLimitExceeded as exc:
-            logger.warning(
-                "A timeout occurred while loading chart data, error: %s", exc
-            )
-            raise exc
-        except Exception as exc:
-            # TODO: QueryContext should support SIP-40 style errors
-            error = exc.message if hasattr(exc, "message") else str(exc)  # type: ignore # pylint: disable=no-member
-            errors = [{"message": error}]
-            async_query_manager.update_job(
-                job_metadata, async_query_manager.STATUS_ERROR, errors=errors
-            )
-            raise exc
-
-        return None
+    try:
+        ensure_user_is_set(job_metadata.get("user_id"))
+        command = ChartDataCommand()
+        command.set_query_context(form_data)
+        result = command.run(cache=True)
+        cache_key = result["cache_key"]
+        result_url = f"/api/v1/chart/data/{cache_key}"
+        async_query_manager.update_job(
+            job_metadata, async_query_manager.STATUS_DONE, result_url=result_url,
+        )
+    except SoftTimeLimitExceeded as exc:
+        logger.warning("A timeout occurred while loading chart data, error: %s", exc)
+        raise exc
+    except Exception as exc:
+        # TODO: QueryContext should support SIP-40 style errors
+        error = exc.message if hasattr(exc, "message") else str(exc)  # type: ignore # pylint: disable=no-member
+        errors = [{"message": error}]
+        async_query_manager.update_job(
+            job_metadata, async_query_manager.STATUS_ERROR, errors=errors
+        )
+        raise exc
 
 
 @celery_app.task(name="load_explore_json_into_cache", soft_time_limit=query_timeout)
@@ -88,58 +83,53 @@ def load_explore_json_into_cache(  # pylint: disable=too-many-locals
     response_type: Optional[str] = None,
     force: bool = False,
 ) -> None:
-    with app.app_context():  # type: ignore
-        cache_key_prefix = "ejr-"  # ejr: explore_json request
-        try:
-            ensure_user_is_set(job_metadata.get("user_id"))
-            datasource_id, datasource_type = get_datasource_info(None, None, form_data)
-
-            # Perform a deep copy here so that below we can cache the original
-            # value of the form_data object. This is necessary since the viz
-            # objects modify the form_data object. If the modified version were
-            # to be cached here, it will lead to a cache miss when clients
-            # attempt to retrieve the value of the completed async query.
-            original_form_data = copy.deepcopy(form_data)
-
-            viz_obj = get_viz(
-                datasource_type=cast(str, datasource_type),
-                datasource_id=datasource_id,
-                form_data=form_data,
-                force=force,
-            )
-            # run query & cache results
-            payload = viz_obj.get_payload()
-            if viz_obj.has_error(payload):
-                raise SupersetVizException(errors=payload["errors"])
-
-            # Cache the original form_data value for async retrieval
-            cache_value = {
-                "form_data": original_form_data,
-                "response_type": response_type,
-            }
-            cache_key = generate_cache_key(cache_value, cache_key_prefix)
-            set_and_log_cache(cache_manager.cache, cache_key, cache_value)
-            result_url = f"/superset/explore_json/data/{cache_key}"
-            async_query_manager.update_job(
-                job_metadata, async_query_manager.STATUS_DONE, result_url=result_url,
-            )
-        except SoftTimeLimitExceeded as ex:
-            logger.warning(
-                "A timeout occurred while loading explore json, error: %s", ex
-            )
-            raise ex
-        except Exception as exc:
-            if isinstance(exc, SupersetVizException):
-                errors = exc.errors  # pylint: disable=no-member
-            else:
-                error = (
-                    exc.message if hasattr(exc, "message") else str(exc)  # type: ignore # pylint: disable=no-member
-                )
-                errors = [error]
-
-            async_query_manager.update_job(
-                job_metadata, async_query_manager.STATUS_ERROR, errors=errors
+    cache_key_prefix = "ejr-"  # ejr: explore_json request
+    try:
+        ensure_user_is_set(job_metadata.get("user_id"))
+        datasource_id, datasource_type = get_datasource_info(None, None, form_data)
+
+        # Perform a deep copy here so that below we can cache the original
+        # value of the form_data object. This is necessary since the viz
+        # objects modify the form_data object. If the modified version were
+        # to be cached here, it will lead to a cache miss when clients
+        # attempt to retrieve the value of the completed async query.
+        original_form_data = copy.deepcopy(form_data)
+
+        viz_obj = get_viz(
+            datasource_type=cast(str, datasource_type),
+            datasource_id=datasource_id,
+            form_data=form_data,
+            force=force,
+        )
+        # run query & cache results
+        payload = viz_obj.get_payload()
+        if viz_obj.has_error(payload):
+            raise SupersetVizException(errors=payload["errors"])
+
+        # Cache the original form_data value for async retrieval
+        cache_value = {
+            "form_data": original_form_data,
+            "response_type": response_type,
+        }
+        cache_key = generate_cache_key(cache_value, cache_key_prefix)
+        set_and_log_cache(cache_manager.cache, cache_key, cache_value)
+        result_url = f"/superset/explore_json/data/{cache_key}"
+        async_query_manager.update_job(
+            job_metadata, async_query_manager.STATUS_DONE, result_url=result_url,
+        )
+    except SoftTimeLimitExceeded as ex:
+        logger.warning("A timeout occurred while loading explore json, error: %s", ex)
+        raise ex
+    except Exception as exc:
+        if isinstance(exc, SupersetVizException):
+            errors = exc.errors  # pylint: disable=no-member
+        else:
+            error = (
+                exc.message if hasattr(exc, "message") else str(exc)  # type: ignore # pylint: disable=no-member
             )
-            raise exc
+            errors = [error]
 
-        return None
+        async_query_manager.update_job(
+            job_metadata, async_query_manager.STATUS_ERROR, errors=errors
+        )
+        raise exc
diff --git a/superset/tasks/cache.py b/superset/tasks/cache.py
index 546eaebdb056..32b421a47055 100644
--- a/superset/tasks/cache.py
+++ b/superset/tasks/cache.py
@@ -161,7 +161,7 @@ class TopNDashboardsStrategy(Strategy):
     name = "top_n_dashboards"
 
     def __init__(self, top_n: int = 5, since: str = "7 days ago") -> None:
-        super(TopNDashboardsStrategy, self).__init__()
+        super().__init__()
         self.top_n = top_n
         self.since = parse_human_datetime(since) if since else None
 
@@ -206,7 +206,7 @@ class DashboardTagsStrategy(Strategy):
     name = "dashboard_tags"
 
     def __init__(self, tags: Optional[List[str]] = None) -> None:
-        super(DashboardTagsStrategy, self).__init__()
+        super().__init__()
         self.tags = tags or []
 
     def get_urls(self) -> List[str]:
@@ -288,7 +288,7 @@ def cache_warmup(
     for url in strategy.get_urls():
         try:
             logger.info("Fetching %s", url)
-            request.urlopen(url)
+            request.urlopen(url)  # pylint: disable=consider-using-with
             results["success"].append(url)
         except URLError:
             logger.exception("Error warming up cache!")
diff --git a/superset/tasks/cron_util.py b/superset/tasks/cron_util.py
new file mode 100644
index 000000000000..38243823f9f8
--- /dev/null
+++ b/superset/tasks/cron_util.py
@@ -0,0 +1,42 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from datetime import datetime, timedelta, timezone as dt_timezone
+from typing import Iterator
+
+import pytz
+from croniter import croniter
+
+from superset import app
+
+
+def cron_schedule_window(cron: str, timezone: str) -> Iterator[datetime]:
+    window_size = app.config["ALERT_REPORTS_CRON_WINDOW_SIZE"]
+    # create a time-aware datetime in utc
+    time_now = datetime.now(tz=dt_timezone.utc)
+    tz = pytz.timezone(timezone)
+    utc = pytz.timezone("UTC")
+    # convert the current time to the user's local time for comparison
+    time_now = time_now.astimezone(tz)
+    start_at = time_now - timedelta(seconds=1)
+    stop_at = time_now + timedelta(seconds=window_size)
+    crons = croniter(cron, start_at)
+    for schedule in crons.all_next(datetime):
+        if schedule >= stop_at:
+            break
+        # convert schedule back to utc
+        yield schedule.astimezone(utc).replace(tzinfo=None)
diff --git a/superset/tasks/scheduler.py b/superset/tasks/scheduler.py
index 67e8379d790b..eacc2ec49b1e 100644
--- a/superset/tasks/scheduler.py
+++ b/superset/tasks/scheduler.py
@@ -15,10 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import logging
-from datetime import datetime, timedelta
-from typing import Iterator
 
-import croniter
 from celery.exceptions import SoftTimeLimitExceeded
 from dateutil import parser
 
@@ -29,23 +26,12 @@
 from superset.reports.commands.execute import AsyncExecuteReportScheduleCommand
 from superset.reports.commands.log_prune import AsyncPruneReportScheduleLogCommand
 from superset.reports.dao import ReportScheduleDAO
+from superset.tasks.cron_util import cron_schedule_window
 from superset.utils.celery import session_scope
 
 logger = logging.getLogger(__name__)
 
 
-def cron_schedule_window(cron: str) -> Iterator[datetime]:
-    window_size = app.config["ALERT_REPORTS_CRON_WINDOW_SIZE"]
-    utc_now = datetime.utcnow()
-    start_at = utc_now - timedelta(seconds=1)
-    stop_at = utc_now + timedelta(seconds=window_size)
-    crons = croniter.croniter(cron, start_at)
-    for schedule in crons.all_next(datetime):
-        if schedule >= stop_at:
-            break
-        yield schedule
-
-
 @celery_app.task(name="reports.scheduler")
 def scheduler() -> None:
     """
@@ -54,7 +40,9 @@ def scheduler() -> None:
     with session_scope(nullpool=True) as session:
         active_schedules = ReportScheduleDAO.find_active(session)
         for active_schedule in active_schedules:
-            for schedule in cron_schedule_window(active_schedule.crontab):
+            for schedule in cron_schedule_window(
+                active_schedule.crontab, active_schedule.timezone
+            ):
                 logger.info(
                     "Scheduling alert %s eta: %s", active_schedule.name, schedule
                 )
diff --git a/superset/tasks/schedules.py b/superset/tasks/schedules.py
index c6e8e96df7e0..be5be222481e 100644
--- a/superset/tasks/schedules.py
+++ b/superset/tasks/schedules.py
@@ -45,7 +45,6 @@
 from dateutil.tz import tzlocal
 from flask import current_app, render_template, url_for
 from flask_babel import gettext as __
-from retry.api import retry_call
 from selenium.common.exceptions import WebDriverException
 from selenium.webdriver import chrome, firefox
 from selenium.webdriver.remote.webdriver import WebDriver
@@ -69,6 +68,7 @@
 from superset.tasks.slack_util import deliver_slack_msg
 from superset.utils.celery import session_scope
 from superset.utils.core import get_email_address_list, send_email_smtp
+from superset.utils.retries import retry_call
 from superset.utils.screenshots import ChartScreenshot, WebDriverProxy
 from superset.utils.urls import get_url_path
 
@@ -89,7 +89,7 @@
 WEBDRIVER_BASEURL_USER_FRIENDLY = config["WEBDRIVER_BASEURL_USER_FRIENDLY"]
 
 ReportContent = namedtuple(
-    "EmailContent",
+    "ReportContent",
     [
         "body",  # email body
         "data",  # attachments
@@ -230,7 +230,7 @@ def destroy_webdriver(
     # This is some very flaky code in selenium. Hence the retries
     # and catch-all exceptions
     try:
-        retry_call(driver.close, tries=2)
+        retry_call(driver.close, max_tries=2)
     except Exception:  # pylint: disable=broad-except
         pass
     try:
@@ -271,7 +271,10 @@ def deliver_dashboard(  # pylint: disable=too-many-locals
         # This is buggy in certain selenium versions with firefox driver
         get_element = getattr(driver, "find_element_by_class_name")
         element = retry_call(
-            get_element, fargs=["grid-container"], tries=2, delay=EMAIL_PAGE_RENDER_WAIT
+            get_element,
+            fargs=["grid-container"],
+            max_tries=2,
+            interval=EMAIL_PAGE_RENDER_WAIT,
         )
 
         try:
@@ -279,7 +282,7 @@ def deliver_dashboard(  # pylint: disable=too-many-locals
         except WebDriverException:
             # Some webdrivers do not support screenshots for elements.
             # In such cases, take a screenshot of the entire page.
-            screenshot = driver.screenshot()  # pylint: disable=no-member
+            screenshot = driver.screenshot()
         finally:
             destroy_webdriver(driver)
 
@@ -349,7 +352,7 @@ def _get_slice_data(
 
         # Parse the csv file and generate HTML
         columns = rows.pop(0)
-        with app.app_context():  # type: ignore
+        with app.app_context():
             body = render_template(
                 "superset/reports/slice_data.html",
                 columns=columns,
@@ -420,8 +423,8 @@ def _get_slice_visualization(
     element = retry_call(
         driver.find_element_by_class_name,
         fargs=["chart-container"],
-        tries=2,
-        delay=EMAIL_PAGE_RENDER_WAIT,
+        max_tries=2,
+        interval=EMAIL_PAGE_RENDER_WAIT,
     )
 
     try:
@@ -429,7 +432,7 @@ def _get_slice_visualization(
     except WebDriverException:
         # Some webdrivers do not support screenshots for elements.
         # In such cases, take a screenshot of the entire page.
-        screenshot = driver.screenshot()  # pylint: disable=no-member
+        screenshot = driver.screenshot()
     finally:
         destroy_webdriver(driver)
 
@@ -824,7 +827,7 @@ def get_scheduler_action(report_type: str) -> Optional[Callable[..., Any]]:
 
 @celery_app.task(name="email_reports.schedule_hourly")
 def schedule_hourly() -> None:
-    """ Celery beat job meant to be invoked hourly """
+    """Celery beat job meant to be invoked hourly"""
     if not config["ENABLE_SCHEDULED_EMAIL_REPORTS"]:
         logger.info("Scheduled email reports not enabled in config")
         return
@@ -842,7 +845,7 @@ def schedule_hourly() -> None:
 
 @celery_app.task(name="alerts.schedule_check")
 def schedule_alerts() -> None:
-    """ Celery beat job meant to be invoked every minute to check alerts """
+    """Celery beat job meant to be invoked every minute to check alerts"""
     resolution = 0
     now = datetime.utcnow()
     start_at = now - timedelta(
diff --git a/superset/tasks/slack_util.py b/superset/tasks/slack_util.py
index 5440698e777e..769f7da8a0ff 100644
--- a/superset/tasks/slack_util.py
+++ b/superset/tasks/slack_util.py
@@ -21,8 +21,8 @@
 from io import IOBase
 from typing import cast, Optional, Union
 
+import backoff
 from flask import current_app
-from retry.api import retry
 from slack import WebClient
 from slack.errors import SlackApiError
 from slack.web.slack_response import SlackResponse
@@ -31,7 +31,7 @@
 logger = logging.getLogger("tasks.slack_util")
 
 
-@retry(SlackApiError, delay=10, backoff=2, tries=5)
+@backoff.on_exception(backoff.expo, SlackApiError, factor=10, base=2, max_tries=5)
 def deliver_slack_msg(
     slack_channel: str,
     subject: str,
diff --git a/superset/tasks/thumbnails.py b/superset/tasks/thumbnails.py
index 4ca4f2770e75..5e4b8dfb755d 100644
--- a/superset/tasks/thumbnails.py
+++ b/superset/tasks/thumbnails.py
@@ -22,7 +22,7 @@
 
 from flask import current_app
 
-from superset import app, security_manager, thumbnail_cache
+from superset import security_manager, thumbnail_cache
 from superset.extensions import celery_app
 from superset.utils.celery import session_scope
 from superset.utils.screenshots import ChartScreenshot, DashboardScreenshot
@@ -39,40 +39,38 @@ def cache_chart_thumbnail(
     window_size: Optional[WindowSize] = None,
     thumb_size: Optional[WindowSize] = None,
 ) -> None:
-    with app.app_context():  # type: ignore
-        if not thumbnail_cache:
-            logger.warning("No cache set, refusing to compute")
-            return None
-        logger.info("Caching chart: %s", url)
-        screenshot = ChartScreenshot(url, digest)
-        with session_scope(nullpool=True) as session:
-            user = security_manager.get_user_by_username(
-                current_app.config["THUMBNAIL_SELENIUM_USER"], session=session
-            )
-            screenshot.compute_and_cache(
-                user=user,
-                cache=thumbnail_cache,
-                force=force,
-                window_size=window_size,
-                thumb_size=thumb_size,
-            )
+    if not thumbnail_cache:
+        logger.warning("No cache set, refusing to compute")
         return None
+    logger.info("Caching chart: %s", url)
+    screenshot = ChartScreenshot(url, digest)
+    with session_scope(nullpool=True) as session:
+        user = security_manager.get_user_by_username(
+            current_app.config["THUMBNAIL_SELENIUM_USER"], session=session
+        )
+        screenshot.compute_and_cache(
+            user=user,
+            cache=thumbnail_cache,
+            force=force,
+            window_size=window_size,
+            thumb_size=thumb_size,
+        )
+    return None
 
 
 @celery_app.task(name="cache_dashboard_thumbnail", soft_time_limit=300)
 def cache_dashboard_thumbnail(
     url: str, digest: str, force: bool = False, thumb_size: Optional[WindowSize] = None
 ) -> None:
-    with app.app_context():  # type: ignore
-        if not thumbnail_cache:
-            logging.warning("No cache set, refusing to compute")
-            return
-        logger.info("Caching dashboard: %s", url)
-        screenshot = DashboardScreenshot(url, digest)
-        with session_scope(nullpool=True) as session:
-            user = security_manager.get_user_by_username(
-                current_app.config["THUMBNAIL_SELENIUM_USER"], session=session
-            )
-            screenshot.compute_and_cache(
-                user=user, cache=thumbnail_cache, force=force, thumb_size=thumb_size,
-            )
+    if not thumbnail_cache:
+        logging.warning("No cache set, refusing to compute")
+        return
+    logger.info("Caching dashboard: %s", url)
+    screenshot = DashboardScreenshot(url, digest)
+    with session_scope(nullpool=True) as session:
+        user = security_manager.get_user_by_username(
+            current_app.config["THUMBNAIL_SELENIUM_USER"], session=session
+        )
+        screenshot.compute_and_cache(
+            user=user, cache=thumbnail_cache, force=force, thumb_size=thumb_size,
+        )
diff --git a/superset/templates/superset/partials/asset_bundle.html b/superset/templates/superset/partials/asset_bundle.html
index 281ac74c7df0..066c9f64e6d0 100644
--- a/superset/templates/superset/partials/asset_bundle.html
+++ b/superset/templates/superset/partials/asset_bundle.html
@@ -21,7 +21,7 @@
      with development version #}
   <!-- Bundle js {{ filename }} START -->
   {% for entry in js_manifest(filename) %}
-    <script src="{{ entry }}"></script>
+    <script src="{{ entry }}" async></script>
   {% endfor %}
   <!-- Bundle js {{ filename }} END -->
 {% endmacro %}
diff --git a/superset/translations/ja/LC_MESSAGES/messages.json b/superset/translations/ja/LC_MESSAGES/messages.json
index 4e5a2e42efc0..9275f6b5a43b 100644
--- a/superset/translations/ja/LC_MESSAGES/messages.json
+++ b/superset/translations/ja/LC_MESSAGES/messages.json
@@ -591,10 +591,10 @@
       "Month": ["月"],
       "Quarter": ["四半期"],
       "Year": ["年"],
-      "Week starting sunday": [""],
-      "Week starting monday": [""],
-      "Week ending saturday": [""],
-      "Week_ending sunday": [""],
+      "Week starting Sunday": [""],
+      "Week starting Monday": [""],
+      "Week ending Saturday": [""],
+      "Week_ending Sunday": [""],
       "Username": ["ユーザー名"],
       "Password": ["パスワード"],
       "Hostname or IP address": ["ホスト名またはIPアドレス"],
diff --git a/superset/translations/ja/LC_MESSAGES/messages.po b/superset/translations/ja/LC_MESSAGES/messages.po
index c355eec5cd8f..6a594ce5915f 100644
--- a/superset/translations/ja/LC_MESSAGES/messages.po
+++ b/superset/translations/ja/LC_MESSAGES/messages.po
@@ -1890,19 +1890,19 @@ msgid "Year"
 msgstr "年"
 
 #: superset/db_engine_specs/base.py:99
-msgid "Week starting sunday"
+msgid "Week starting Sunday"
 msgstr ""
 
 #: superset/db_engine_specs/base.py:100
-msgid "Week starting monday"
+msgid "Week starting Monday"
 msgstr ""
 
 #: superset/db_engine_specs/base.py:101
-msgid "Week ending saturday"
+msgid "Week ending Saturday"
 msgstr ""
 
 #: superset/db_engine_specs/base.py:102
-msgid "Week_ending sunday"
+msgid "Week_ending Sunday"
 msgstr ""
 
 #: superset/db_engine_specs/base.py:1276
diff --git a/superset/translations/ko/LC_MESSAGES/messages.json b/superset/translations/ko/LC_MESSAGES/messages.json
index ecde58250fe3..2ae5e9e8ab4b 100644
--- a/superset/translations/ko/LC_MESSAGES/messages.json
+++ b/superset/translations/ko/LC_MESSAGES/messages.json
@@ -526,10 +526,10 @@
       "Month": ["달"],
       "Quarter": ["분기"],
       "Year": ["년"],
-      "Week starting sunday": [""],
-      "Week starting monday": [""],
-      "Week ending saturday": [""],
-      "Week_ending sunday": [""],
+      "Week starting Sunday": [""],
+      "Week starting Monday": [""],
+      "Week ending Saturday": [""],
+      "Week_ending Sunday": [""],
       "Unknown Presto Error": [""],
       "We can't seem to resolve the column \"%(column_name)s\" at line %(location)s.": [
         ""
diff --git a/superset/translations/ko/LC_MESSAGES/messages.po b/superset/translations/ko/LC_MESSAGES/messages.po
index 29a49da4222b..3c0a054f89c3 100644
--- a/superset/translations/ko/LC_MESSAGES/messages.po
+++ b/superset/translations/ko/LC_MESSAGES/messages.po
@@ -1845,19 +1845,19 @@ msgid "Year"
 msgstr "년"
 
 #: superset/db_engine_specs/base.py:95
-msgid "Week starting sunday"
+msgid "Week starting Sunday"
 msgstr ""
 
 #: superset/db_engine_specs/base.py:96
-msgid "Week starting monday"
+msgid "Week starting Monday"
 msgstr ""
 
 #: superset/db_engine_specs/base.py:97
-msgid "Week ending saturday"
+msgid "Week ending Saturday"
 msgstr ""
 
 #: superset/db_engine_specs/base.py:98
-msgid "Week_ending sunday"
+msgid "Week ending Sunday"
 msgstr ""
 
 #: superset/db_engine_specs/presto.py:930
diff --git a/superset/translations/messages.pot b/superset/translations/messages.pot
index c14487bd8451..9365d5058b7f 100644
--- a/superset/translations/messages.pot
+++ b/superset/translations/messages.pot
@@ -1894,19 +1894,19 @@ msgid "Year"
 msgstr ""
 
 #: superset/db_engine_specs/base.py:99
-msgid "Week starting sunday"
+msgid "Week starting Sunday"
 msgstr ""
 
 #: superset/db_engine_specs/base.py:100
-msgid "Week starting monday"
+msgid "Week starting Monday"
 msgstr ""
 
 #: superset/db_engine_specs/base.py:101
-msgid "Week ending saturday"
+msgid "Week ending Saturday"
 msgstr ""
 
 #: superset/db_engine_specs/base.py:102
-msgid "Week_ending sunday"
+msgid "Week ending Sunday"
 msgstr ""
 
 #: superset/db_engine_specs/base.py:1276
diff --git a/superset/translations/sl/LC_MESSAGES/messages.json b/superset/translations/sl/LC_MESSAGES/messages.json
new file mode 100644
index 000000000000..78d9805dba87
--- /dev/null
+++ b/superset/translations/sl/LC_MESSAGES/messages.json
@@ -0,0 +1,4501 @@
+{
+  "domain": "superset",
+  "locale_data": {
+    "superset": {
+      "": {
+        "domain": "superset",
+        "plural_forms": "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100>=3 && n%100<=4 ? 2 : 3);",
+        "lang": "sl_SI"
+      },
+      "Home": ["Domov"],
+      "Annotation Layers": ["Sloji z oznakami"],
+      "Manage": ["Upravljaj"],
+      "Databases": ["Podatkovne baze"],
+      "Data": ["Podatki"],
+      "Datasets": ["Podatkovni seti"],
+      "Charts": ["Grafikoni"],
+      "Dashboards": ["Nadzorne plošče"],
+      "Plugins": ["Vtičniki"],
+      "CSS Templates": ["CSS predloge"],
+      "Row level security": ["Varnost na nivoju vrstic"],
+      "Security": ["Varnost"],
+      "Import Dashboards": ["Uvozi nadzorne plošče"],
+      "SQL Editor": ["SQL urejevalnik"],
+      "SQL Lab": ["SQL laboratorij"],
+      "Saved Queries": ["Shranjene poizvedbe"],
+      "Query History": ["Zgodovina poizvedb"],
+      "Upload a CSV": ["Naloži CSV"],
+      "Upload Excel": ["Naloži Excel"],
+      "Action Log": ["Dnevnik aktivnosti"],
+      "Dashboard Emails": ["E-pošta za nadzorno ploščo"],
+      "Chart Email Schedules": ["Urniki za e-pošto grafikonov"],
+      "Alerts": ["Opozorila"],
+      "Alerts & Reports": ["Opozorila in poročila"],
+      "Access requests": ["Zahteve za dostop"],
+      "Druid Datasources": ["Druid podatkovni viri"],
+      "Druid Clusters": ["Druid gruče"],
+      "Scan New Datasources": ["Preišči nove podatkovne vire"],
+      "Refresh Druid Metadata": ["Osveži metapodatke za Druid"],
+      "Issue 1000 - The datasource is too large to query.": [
+        "Težava 1000 - podatkovni vir je prevelik za poizvedbo."
+      ],
+      "Issue 1001 - The database is under an unusual load.": [
+        "Težava 1001 - podatkovni vir je neobičajno obremenjen."
+      ],
+      "Issue 1002 - The database returned an unexpected error.": [
+        "Težava 1002 - podatkovna baza je vrnila nepričakovano napako."
+      ],
+      "Issue 1003 - There is a syntax error in the SQL query. Perhaps there was a misspelling or a typo.": [
+        "Težava 1003 - v SQL-poizvedbi je sintaktična napaka. Mogoče ste se zatipkali."
+      ],
+      "Issue 1004 - The column was deleted or renamed in the database.": [
+        "Težava 1004 - stolpec je bil izbrisan ali preimenovan v podatkovni bazi."
+      ],
+      "Issue 1005 - The table was deleted or renamed in the database.": [
+        "Težava 1005 - tabela je bila izbrisana ali preimenovana v podatkovni bazi."
+      ],
+      "Issue 1005 - The schema was deleted or renamed in the database.": [
+        "Težava 1005 - shema je bila izbrisana ali preimenovana v podatkovni bazi."
+      ],
+      "Issue 1006 - One or more parameters specified in the query are missing.": [
+        "Težava 1006 - en ali več parametrov v SQL-poizvedbi manjka."
+      ],
+      "Issue 1007 - The hostname provided can't be resolved.": [
+        "Težava 1007 - imena gostitelja ni mogoče razrešiti."
+      ],
+      "Issue 1008 - The port is closed.": ["Težava 1008 - Vrata so zaprta."],
+      "Issue 1009 - The host might be down, and can't be reached on the provided port.": [
+        "Težava 1009 - Gostitelj mogoče ne deluje in ga ni mogoče doseči preko podanih vrat."
+      ],
+      "Issue 1010 - Superset encountered an error while running a command.": [
+        "Težava 1010 - Superset je naletel na napako pri izvajanju ukaza."
+      ],
+      "Issue 1011 - Superset encountered an unexpected error.": [
+        "Težava 1011 - Superset je naletel na nepričakovano napako."
+      ],
+      "Issue 1012 - The username provided when connecting to a database is not valid.": [
+        "Težava 1012 - Uporabniško ime za povezavo s podatkovno bazo je neveljavno."
+      ],
+      "Issue 1013 - The password provided when connecting to a database is not valid.": [
+        "Težava 1013 - Geslo za povezavo s podatkovno bazo je neveljavno."
+      ],
+      "Issue 1014 - Either the username or the password is wrong.": [
+        "Težava 1014 - Uporabniško ime ali/in geslo sta napačna."
+      ],
+      "Issue 1015 - Either the database is spelled incorrectly or does not exist.": [
+        "Težava 1015 - Ime podatkovne baze je zapisano napačno ali pa ne obstaja."
+      ],
+      "Issue 1017 - User doesn't have the proper permissions.": [
+        "Težava 1017 - Uporabnik nima ustreznih dovoljenj."
+      ],
+      "Issue 1018 - One or more parameters needed to configure a database are missing.": [
+        "Težava 1018 - Eden ali več parametrov, potrebnih za nastavitev podatkovne baze, manjka."
+      ],
+      "Issue 1019 - The submitted payload has the incorrect format.": [
+        "Težava 1019 - Podani podatki so v neustrezni obliki."
+      ],
+      "Issue 1020 - The submitted payload has the incorrect schema.": [
+        "Težava 1020 - Podani podatki imajo neustrezno shemo."
+      ],
+      "Invalid certificate": ["Neveljaven certifikat"],
+      "Unsafe return type for function %(func)s: %(value_type)s": [
+        "Nevaren tip rezultata, ki ga vrne funkcija %(func)s: %(value_type)s"
+      ],
+      "Unsupported return value for method %(name)s": [
+        "Nepodprt rezultat vračanja za metodo %(name)s"
+      ],
+      "Unsafe template value for key %(key)s: %(value_type)s": [
+        "Nevaren vzorec za ključ %(key)s: %(value_type)s"
+      ],
+      "Unsupported template value for key %(key)s": [
+        "Nepodprta vrednost vzorca za ključ %(key)s"
+      ],
+      "SQL Lab timeout. This environment's policy is to kill queries after {} seconds.": [
+        "Iztek časa SQL laboratorija. Nastavitev okolja določa prekinitev poizvedb po izteku {} sekund."
+      ],
+      "Only `SELECT` statements are allowed against this database": [
+        "Za to podatkovno bazo so dovoljeni le `SELECT` stavki"
+      ],
+      "CTAS (create table as select) can only be run with a query where the last statement is a SELECT. Please make sure your query has a SELECT as its last statement. Then, try running your query again.": [
+        "CTAS (create table as select) lahko izvajate le v poizvedbah, kjer je zadnji stavek SELECT. Poskrbite, da bo zadnji stavek v vaši poizvedbi SELECT in poskusite ponovno zagnati poizvedbo."
+      ],
+      "CVAS (create view as select) can only be run with a query with a single SELECT statement. Please make sure your query has only a SELECT statement. Then, try running your query again.": [
+        "CVAS (create view as select) lahko izvajate le v poizvedbah z enim SELECT stavkom. Poskrbite, da bo v vaši poizvedbi le en SELECT stavek in poskusite ponovno zagnati poizvedbo."
+      ],
+      "Viz is missing a datasource": ["Vizualizaciji manjka podatkovni vir"],
+      "Applied rolling window did not return any data. Please make sure the source query satisfies the minimum periods defined in the rolling window.": [
+        "Izbrano drseče okno ni vrnilo podatkov. Poskrbite, da izvorna poizvedba ustreza minimalni periodi drsečega okna."
+      ],
+      "From date cannot be larger than to date": [
+        "Začetni datum ne sme biti večji od končnega datuma"
+      ],
+      "Cached value not found": ["Predpomnjena vrednost ni najdena"],
+      "Columns missing in datasource: %(invalid_columns)s": [
+        "V podatkovnem viru manjkajo stolpci: %(invalid_columns)s"
+      ],
+      "Table View": ["Tabelarični pogled"],
+      "You cannot use [Columns] in combination with [Group By]/[Metrics]/[Percentage Metrics]. Please choose one or the other.": [
+        "Ne smete uporabiti [Stolpci] v kombinaciji z [Združevanje]/[Mere]/[Procentualne mere]. Izberite eno ali drugo."
+      ],
+      "Pick a granularity in the Time section or uncheck 'Include Time'": [
+        "Izberite granulacijo v razdelku 'Čas' ali odstranite 'Vključi čas'"
+      ],
+      "Time Table View": ["Pogled urnika"],
+      "Pick at least one metric": ["Izberite vsaj eno mero"],
+      "When using 'Group By' you are limited to use a single metric": [
+        "Ko uporabljate 'Group By', ste omejeni na uporabo ene mere"
+      ],
+      "Pivot Table": ["Vrtilna tabela"],
+      "Please choose at least one 'Group by' field ": [
+        "Izberite vsaj eno 'Group by' polje "
+      ],
+      "Please choose at least one metric": ["Izberite vsaj eno mero"],
+      "Group By' and 'Columns' can't overlap": [
+        "'Združevanje' in 'Stolpci' se ne smeta prekrivati"
+      ],
+      "Treemap": ["Drevesni grafikon s pravokotniki"],
+      "Calendar Heatmap": ["Koledarska barvna lestvica"],
+      "Bubble Chart": ["Mehurčkasti grafikon"],
+      "Please use 3 different metric labels": [
+        "Uporabite 3 različne oznake mer"
+      ],
+      "Pick a metric for x, y and size": ["Izberite mere za x, y in velikost"],
+      "Bullet Chart": ["'Bullet' grafikon"],
+      "Pick a metric to display": ["Izberite mero za prikaz"],
+      "Big Number with Trendline": ["Velika številka s trendno krivuljo"],
+      "Pick a metric!": ["Izberite mero!"],
+      "Big Number": ["Velika številka"],
+      "Time Series - Line Chart": ["Časovna vrsta - Črtni grafikon"],
+      "Pick a time granularity for your time series": [
+        "Izberite granulacijo časa za časovno vrsto"
+      ],
+      "An enclosed time range (both start and end) must be specified when using a Time Comparison.": [
+        "Pri časovni primerjavi mora biti določeno zaprto časovno obdobje (s časom začetka in konca)."
+      ],
+      "Time Series - Multiple Line Charts": [
+        "Časovna vrsta - Veččrtni grafikon"
+      ],
+      "Time Series - Dual Axis Line Chart": [
+        "Časovna vrsta - Črtni grafikon z dvojno osjo"
+      ],
+      "Pick a metric for left axis!": ["Izberite mero za levo os!"],
+      "Pick a metric for right axis!": ["Izberite mero za desno os!"],
+      "Please choose different metrics on left and right axis": [
+        "Izberite različni meri za levo in desno os"
+      ],
+      "Time Series - Bar Chart": ["Časovna vrsta - Stolpčni grafikon"],
+      "Time Series - Period Pivot": ["Časovna vrsta - Vrtenje period"],
+      "Time Series - Percent Change": [
+        "Časovna vrsta - Procentualna sprememba"
+      ],
+      "Time Series - Stacked": ["Časovna vrsta - Naložen graf"],
+      "Histogram": ["Histogram"],
+      "Must have at least one numeric column specified": [
+        "Definiran mora biti vsaj en numerični stolpec"
+      ],
+      "Distribution - Bar Chart": ["Porazdelitev - Stolpčni grafikon"],
+      "Can't have overlap between Series and Breakdowns": [
+        "Ne sme imeti prekrivanja med podatkovnimi serijami in členitvami"
+      ],
+      "Pick at least one field for [Series]": [
+        "Izberite vsaj eno polje za [Serije]"
+      ],
+      "Sunburst": ["Sunburst"],
+      "Sankey": ["Sankey"],
+      "Pick exactly 2 columns as [Source / Target]": [
+        "Izberite natanko dva stolpca za [Izvor / Cilj]"
+      ],
+      "There's a loop in your Sankey, please provide a tree. Here's a faulty link: {}": [
+        "V 'Sankey' je zanka, določite drevo. To je okvarjena povezava: {}"
+      ],
+      "Directed Force Layout": ["Izgled usmerjene sile"],
+      "Country Map": ["Zemljevid držav"],
+      "World Map": ["Zemljevid sveta"],
+      "Filters": ["Filtri"],
+      "Invalid filter configuration, please select a column": [
+        "Neveljavna nastavitev filtrov, izberite stolpec"
+      ],
+      "Parallel Coordinates": ["Vzporedne koordinate"],
+      "Heatmap": ["Toplotni prikaz"],
+      "Horizon Charts": ["Horizontni grafikon"],
+      "Mapbox": ["Mapbox"],
+      "[Longitude] and [Latitude] must be set": [
+        "[Zemljepisna dolžina] in [Zemljepisna širina] morata biti nastavljeni"
+      ],
+      "Must have a [Group By] column to have 'count' as the [Label]": [
+        "Mora imeti stolpec [Združevanje], da ima število (count) kot [Oznaka]"
+      ],
+      "Choice of [Label] must be present in [Group By]": [
+        "Izbira [Oznaka] mora biti prisotna v [Združevanje]"
+      ],
+      "Choice of [Point Radius] must be present in [Group By]": [
+        "Izbran [Point Radius] mora biti prisoten v [Združevanje]"
+      ],
+      "[Longitude] and [Latitude] columns must be present in [Group By]": [
+        "Stolpca [Zemljepisna dolžina] in [Zemljepisna širina] morata biti prisotna v [Združevanje]"
+      ],
+      "Deck.gl - Multiple Layers": ["Deck.gl - Večplastni"],
+      "Bad spatial key": ["Neutrezen prostorski ključ"],
+      "Invalid spatial point encountered: %s": [
+        "Neustrezna prostorska točka: %s"
+      ],
+      "Encountered invalid NULL spatial entry,                                        please consider filtering those out": [
+        "Prišlo je do neveljavnega NULL prostorskega vnosa,                                        poskusite ga izločiti s filtrom"
+      ],
+      "Deck.gl - Scatter plot": ["Deck.gl - Raztreseni graf"],
+      "Deck.gl - Screen Grid": ["Deck.gl - Mreža"],
+      "Deck.gl - 3D Grid": ["Deck.gl - 3D mreža"],
+      "Deck.gl - Paths": ["Deck.gl - Poti"],
+      "Deck.gl - Polygon": ["Deck.gl - Poligon"],
+      "Deck.gl - 3D HEX": ["Deck.gl - 3D HEX"],
+      "Deck.gl - GeoJSON": ["Deck.gl - GeoJSON"],
+      "Deck.gl - Arc": ["Deck.gl - Arc"],
+      "Event flow": ["Potek dogodkov"],
+      "Time Series - Paired t-test": [
+        "Časovna vrsta - t-test za odvisne vzorce"
+      ],
+      "Time Series - Nightingale Rose Chart": [
+        "Časovna vrsta - Nightingale Rose grafikon"
+      ],
+      "Partition Diagram": ["Grafikon s pravokotniki"],
+      "Deleted %(num)d annotation layer": [
+        "Izbrisan je %(num)d sloj z oznakami",
+        "Izbrisana sta %(num)d sloja z oznakami",
+        "Izbrisanih so %(num)d sloji z oznakami",
+        "Izbrisanih je %(num)d slojev z oznakami"
+      ],
+      "All Text": ["Celotno besedilo"],
+      "Deleted %(num)d annotation": [
+        "Izbrisana je %(num)d oznaka",
+        "Izbrisani sta %(num)d oznaki",
+        "Izbrisane so %(num)d oznake",
+        "Izbrisanih je %(num)d oznak"
+      ],
+      "End date must be after start date": [
+        "Končni datum mora biti za začetnim"
+      ],
+      "Short description must be unique for this layer": [
+        "Kratek opis mora biti za ta sloj unikaten"
+      ],
+      "Annotations could not be deleted.": ["Oznak ni mogoče izbrisati."],
+      "Annotation not found.": ["Oznaka ni najdena."],
+      "Annotation parameters are invalid.": ["Parametri oznak so neveljavni."],
+      "Annotation could not be created.": ["Oznake ni mogoče ustvariti."],
+      "Annotation could not be updated.": ["Oznake ni mogoče posodobiti."],
+      "Annotation delete failed.": ["Izbris oznake ni uspel."],
+      "Annotation layer parameters are invalid.": [
+        "Parametri sloja z oznakami so neveljavni."
+      ],
+      "Annotation layer could not be deleted.": [
+        "Sloja z oznakami ni mogoče izbrisati."
+      ],
+      "Annotation layer could not be created.": [
+        "Sloja z oznakami ni mogoče ustvariti."
+      ],
+      "Annotation layer could not be updated.": [
+        "Sloja z oznakami ni mogoče posodobiti."
+      ],
+      "Annotation layer not found.": ["Sloja z oznakami ni mogoče najti."],
+      "Annotation layer delete failed.": ["Izbris sloja z oznakami ni uspel."],
+      "Annotation layer has associated annotations.": [
+        "Sloj z oznakami ima povezane oznake."
+      ],
+      "Name must be unique": ["Ime mora biti unikatno"],
+      "Deleted %(num)d chart": [
+        "Izbrisan je %(num)d grafikon",
+        "Izbrisana sta %(num)d grafikona",
+        "Izbrisani so %(num)d grafikoni",
+        "Izbrisanih je %(num)d grafikonov"
+      ],
+      "Request is not JSON": ["Zahtevek ni JSON"],
+      "Request is incorrect: %(error)s": ["Zahtevek je napačen: %(error)s"],
+      "`confidence_interval` must be between 0 and 1 (exclusive)": [
+        "`confidence_interval` mora biti med 0 in 1 (odprt)"
+      ],
+      "lower percentile must be greater than 0 and less than 100. Must be lower than upper percentile.": [
+        "spodnji percentil mora biti večji od 0 in manjši od 100 ter mora biti manjši od zgornjega percentila."
+      ],
+      "upper percentile must be greater than 0 and less than 100. Must be higher than lower percentile.": [
+        "zgornji percentil mora biti večji od 0 in manjši od 100 ter mora biti večji od spodnjega percentila."
+      ],
+      "`width` must be greater or equal to 0": [
+        "`width` mora biti večja ali enaka 0"
+      ],
+      "`row_limit` must be greater than or equal to 0": [
+        "`row_limit` mora biti večja ali enaka 0"
+      ],
+      "`row_offset` must be greater than or equal to 0": [
+        "`row_offset` mora biti večja ali enaka 1"
+      ],
+      "There are associated alerts or reports: %s,": [
+        "Prisotna so opozorila in poročila: %s,"
+      ],
+      "Time string is unclear. Please specify [%(human_readable)s ago] or [%(human_readable)s later].": [
+        "Časovni izraz je nejasen. Podajte [%(human_readable)s ago] ali [%(human_readable)s later]."
+      ],
+      "Cannot parse time string [%(human_readable)s]": [
+        "Ni mogoče razčleniti časovnega izraza [%(human_readable)s]"
+      ],
+      "Database does not exist": ["Podatkovna baza ne obstaja"],
+      "Dashboards do not exist": ["Nadzorna plošča ne obstaja"],
+      "Datasource type is required when datasource_id is given": [
+        "Ko se podaja datasource_id, je potreben tip podatkovnega vira"
+      ],
+      "Chart parameters are invalid.": ["Parametri grafikona so neveljavni."],
+      "Chart could not be created.": ["Grafikona ni mogoče ustvariti."],
+      "Chart could not be updated.": ["Grafikona ni mogoče posodobiti."],
+      "Chart could not be deleted.": ["Grafikona ni mogoče izbrisati."],
+      "There are associated alerts or reports": [
+        "Prisotna so povezana opozorila in poročila"
+      ],
+      "Changing this chart is forbidden": [
+        "Spreminjanje tega grafikona ni dovoljeno"
+      ],
+      "Charts could not be deleted.": ["Grafikonov ni mogoče izbrisati."],
+      "Import chart failed for an unknown reason": [
+        "Uvoz grafikona ni uspel zaradi neznanega razloga"
+      ],
+      "Owners are invalid": ["Lastniki niso veljavni"],
+      "Some roles do not exist": ["Nekatere vloge ne obstajajo"],
+      "Dataset does not exist": ["Podatkovni set ne obstaja"],
+      "Invalid result type: %(result_type)": [
+        "Neveljaven tip rezultata: %(result_type)"
+      ],
+      "The chart does not exist": ["Grafikon ne obstaja"],
+      "Duplicate column/metric labels: %(labels)s. Please make sure all columns and metrics have a unique label.": [
+        "Podvojene oznake stolpcev/mer: %(labels)s. Poskrbite, da bodo imeli stolpci in mere unikatne oznake."
+      ],
+      "`operation` property of post processing object undefined": [
+        "Lastnost  `operation` poprocesirnega objekta ni definirana"
+      ],
+      "Unsupported post processing operation: %(operation)s": [
+        "Nepodprta poprocesirna operacija: %(operation)s"
+      ],
+      "Adding new datasource [{}]": ["Dodajanje novega podatkovnega vira [{}]"],
+      "Refreshing datasource [{}]": ["Osveževanje podatkovnega vira [{}]"],
+      "Metric(s) {} must be aggregations.": ["Mere {} morajo biti agregacije."],
+      "Unsupported extraction function: ": [
+        "Nepodprta ekstrakcijska funkcija: "
+      ],
+      "Columns": ["Stolpci"],
+      "Show Druid Column": ["Pokaži Druid stolpec"],
+      "Add Druid Column": ["Dodaj Druid stolpec"],
+      "Edit Druid Column": ["Uredi Druid stolpec"],
+      "Column": ["Stolpec"],
+      "Type": ["Tip"],
+      "Datasource": ["Podatkovni vir"],
+      "Groupable": ["Združevanje"],
+      "Filterable": ["Filtriranje"],
+      "Whether this column is exposed in the `Filters` section of the explore view.": [
+        "Če želite, da je ta stolpec na voljo v sekciji `Filtri` v raziskovalnem pogledu."
+      ],
+      "Metrics": ["Mere"],
+      "Show Druid Metric": ["Prikaži Druid mere"],
+      "Add Druid Metric": ["Dodaj Druid mere"],
+      "Edit Druid Metric": ["Uredi Druid mere"],
+      "Metric": ["Mera"],
+      "Description": ["Opis"],
+      "Verbose Name": ["Podrobno ime"],
+      "JSON": ["JSON"],
+      "Druid Datasource": ["Podatkovni vir Druid"],
+      "Warning Message": ["Opozorilo"],
+      "Show Druid Cluster": ["Pokaži Druid gručo"],
+      "Add Druid Cluster": ["Dodaj Druid gručo"],
+      "Edit Druid Cluster": ["Uredi Druid gručo"],
+      "Cluster Name": ["Ime gruče"],
+      "Broker Host": ["Gostitelj posrednika"],
+      "Broker Port": ["Vrata posrednika"],
+      "Broker Username": ["Uporabniško ime posrednika"],
+      "Broker Password": ["Geslo posrednika"],
+      "Broker Endpoint": ["Končna točka posrednika"],
+      "Cache Timeout": ["Trajanje predpomnilnika"],
+      "Metadata Last Refreshed": ["Meta-podatki nazadnje osveženi"],
+      "Duration (in seconds) of the caching timeout for this cluster. A timeout of 0 indicates that the cache never expires. Note this defaults to the global timeout if undefined.": [
+        "Trajanje (v sekundah) predpomnjenja za to gručo. Vrednost 0 označuje, da predpomnilnik nikoli ne poteče. V primeru, da ni definirano, ima globalno nastavitev trajanja."
+      ],
+      "Druid supports basic authentication. See [auth](http://druid.io/docs/latest/design/auth.html) and druid-basic-security extension": [
+        "Druid podpira osnovno avtentikacijo. Glejte [auth](http://druid.io/docs/latest/design/auth.html) in razširitev druid-basic-security"
+      ],
+      "Show Druid Datasource": ["Prikaži podatkovni vir za Druid"],
+      "Add Druid Datasource": ["Dodaj podatkovni vir za Druid"],
+      "Edit Druid Datasource": ["Uredi podatkovni vir za Druid"],
+      "The list of charts associated with this table. By altering this datasource, you may change how these associated charts behave. Also note that charts need to point to a datasource, so this form will fail at saving if removing charts from a datasource. If you want to change the datasource for a chart, overwrite the chart from the 'explore view'": [
+        "Seznam grafikonov, povezanih s to tabelo. S spreminjanjem podatkovnega vira lahko spremenite, kako se povezani grafikoni obnašajo. Poleg tega morajo biti grafikoni povezani s podatkovnim virom. Če odstranite grafikon s podatkovnega vira ne bo mogoče shraniti tega vnosa. Če želite spremeniti podatkovni vir grafikona, prepišite grafikon v raziskovalnem pogledu."
+      ],
+      "Timezone offset (in hours) for this datasource": [
+        "Razlika časovnega pasu (v urah) za ta podatkovni vir"
+      ],
+      "Time expression to use as a predicate when retrieving distinct values to populate the filter component. Only applies when `Enable Filter Select` is on. If you enter `7 days ago`, the distinct list of values in the filter will be populated based on the distinct value over the past week": [
+        "Prednastavljeni časovni izraz za pridobitev različnih vrednosti filtrirne komponente. Upošteva se le v primeru, da je vključeno `Omogoči izbiro filtra`. Če vnesete `7 days ago`, bo seznam vrednosti filtra napolnjen na podlagi različnih vrednosti v prejšnjem tednu"
+      ],
+      "Whether to populate the filter's dropdown in the explore view's filter section with a list of distinct values fetched from the backend on the fly": [
+        "Če želite napolniti spustni seznam filtra v raziskovalnem pogledu filtrske sekcije z različnimi vrednostmi, pridobljenimi sproti v ozadju"
+      ],
+      "Redirects to this endpoint when clicking on the datasource from the datasource list": [
+        "Preusmeri v to končno točko, ko kliknete na podatkovni vir v seznamu podatkovnih virov"
+      ],
+      "Duration (in seconds) of the caching timeout for this datasource. A timeout of 0 indicates that the cache never expires. Note this defaults to the cluster timeout if undefined.": [
+        "Trajanje (v sekundah) predpomnjenja za ta podatkovni vir. Vrednost 0 označuje, da predpomnilnik nikoli ne poteče. V primeru, da ni definirano, ima nastavitev trajanja za gručo."
+      ],
+      "Associated Charts": ["Povezani grafikoni"],
+      "Data Source": ["Podatkovni vir"],
+      "Cluster": ["Gruča"],
+      "Owners": ["Lastniki"],
+      "Is Hidden": ["Skrito"],
+      "Enable Filter Select": ["Omogoči izbiro filtra"],
+      "Default Endpoint": ["Privzeta končna točka"],
+      "Time Offset": ["Časovni zamik"],
+      "Datasource Name": ["Ime podatkovnega vira"],
+      "Fetch Values From": ["Pridobi vrednosti iz"],
+      "Changed By": ["Spremenil/a"],
+      "Modified": ["Sprememba"],
+      "Refreshed metadata from cluster [{}]": [
+        "Osveženi meta-podatki iz gruče [{}]"
+      ],
+      "Only `SELECT` statements are allowed": [
+        "Dovoljeni so le `SELECT` stavki"
+      ],
+      "Only single queries supported": ["Podprte so le enojne poizvedbe"],
+      "Error in jinja expression in fetch values predicate: %(msg)s": [
+        "Napaka v jinja izrazu za pridobivanje vrednosti predikatov: %(msg)s"
+      ],
+      "Virtual dataset query must be read-only": [
+        "Poizvedba na virtualnem podatkovnem setu mora biti samo za branje"
+      ],
+      "Error while rendering virtual dataset query: %(msg)s": [
+        "Napaka pri izvajanju poizvedbe virtualnega podatkovnega seta: %(msg)s"
+      ],
+      "Virtual dataset query cannot be empty": [
+        "Poizvedba na virtualnem podatkovnem setu ne sme biti prazna"
+      ],
+      "Virtual dataset query cannot consist of multiple statements": [
+        "Poizvedba na virtualnem podatkovnem setu ne sme biti sestavljena iz več stavkov"
+      ],
+      "Error in jinja expression in RLS filters: %(msg)s": [
+        "Napaka v jinja izrazu RLS filtrov: %(msg)s"
+      ],
+      "Datetime column not provided as part table configuration and is required by this type of chart": [
+        "Stolpec datum-čas ni podan kot del tabele, čeprav mora biti za ta tip grafikona"
+      ],
+      "Empty query?": ["Prazna poizvedba?"],
+      "Metric '%(metric)s' does not exist": ["Mera '%(metric)s' ne obstaja"],
+      "Unknown column used in orderby: %(col)s": [
+        "Za razvrščanje je uporabljen neznan stolpec: %(col)s"
+      ],
+      "Time column \"%(col)s\" does not exist in dataset": [
+        "Časovni stolpec \"%(col)s\" ne obstaja v podatkovnem setu"
+      ],
+      "Filter value list cannot be empty": [
+        "Seznam vrednosti filtra ne sme biti prazen"
+      ],
+      "Must specify a value for filters with comparison operators": [
+        "Potrebno je podati vrednost za filter s primerjalnim operandom"
+      ],
+      "Invalid filter operation type: %(op)s": [
+        "Neveljaven tip operacije filtra: %(op)s"
+      ],
+      "Error in jinja expression in WHERE clause: %(msg)s": [
+        "Napaka v jinja izrazu WHERE stavka: %(msg)s"
+      ],
+      "Error in jinja expression in HAVING clause: %(msg)s": [
+        "Napaka v jinja izrazu HAVING stavka: %(msg)s"
+      ],
+      "Database does not support subqueries": [
+        "Podatkovna baza ne podpira podpoizvedb"
+      ],
+      "Db engine did not return all queried columns": [
+        "Sitem podatkovne baze ni vrnil vse stolpcev poizvedbe"
+      ],
+      "Show Column": ["Pokaži stolpec"],
+      "Add Column": ["Dodaj stolpec"],
+      "Edit Column": ["Uredi stolpec"],
+      "Whether to make this column available as a [Time Granularity] option, column has to be DATETIME or DATETIME-like": [
+        "Če želite, da bo ta stolpec na razpolago kot možnost [Granulacija časa]. Stolpec mora biti tipa DATETIME ali DATETIME-like"
+      ],
+      "The data type that was inferred by the database. It may be necessary to input a type manually for expression-defined columns in some cases. In most case users should not need to alter this.": [
+        "Podatkovni tip, ki izvira iz podatkovne baze. V nekaterih primerih je potrebno ročno vnesti tip za stolpce, ki temeljijo na izrazih. V večini primerov uporabniku tega ni potrebno spreminjati."
+      ],
+      "Table": ["Tabela"],
+      "Expression": ["Izraz"],
+      "Is temporal": ["Časoven"],
+      "Datetime Format": ["Oblika zapisa datuma,časa"],
+      "Invalid date/timestamp format": ["Neveljaven zapis datuma/časa"],
+      "Show Metric": ["Pokaži mero"],
+      "Add Metric": ["Dodaj mero"],
+      "Edit Metric": ["Uredi mero"],
+      "SQL Expression": ["SQL izraz"],
+      "D3 Format": ["D3 zapis"],
+      "Extra": ["Dodatno"],
+      "Row level security filter": ["Filter za varnost na nivoju vrstic"],
+      "Show Row level security filter": [
+        "Prikaži filter za varnost na nivoju vrstic"
+      ],
+      "Add Row level security filter": [
+        "Dodaj filter za varnost na nivoju vrstic"
+      ],
+      "Edit Row level security filter": [
+        "Uredi filter za varnost na nivoju vrstic"
+      ],
+      "Regular filters add where clauses to queries if a user belongs to a role referenced in the filter. Base filters apply filters to all queries except the roles defined in the filter, and can be used to define what users can see if no RLS filters within a filter group apply to them.": [
+        "Navadni filtri dodajo WHERE stavek v poizvedbe, če ima uporabnik vlogo podano v filtru. Osnovni filtri filtrirajo vse poizvedbe, razen vlog, definiranih v filtru, in jih je mogoče uporabiti za nastavitev tega kaj uporabnik vidi, če v skupini filtrov ni RLS-filtrov, ki bi se nanašali nanje."
+      ],
+      "These are the tables this filter will be applied to.": [
+        "To so tabele, na katere se nanaša ta filter."
+      ],
+      "For regular filters, these are the roles this filter will be applied to. For base filters, these are the roles that the filter DOES NOT apply to, e.g. Admin if admin should see all data.": [
+        "Za regularne filtre so te vloge tiste, ki bodo filtrirane. Za osnovne filtre, so te vloge tiste, ki NE bodo filtrirane, npr. Admin, če naj administrator vidi vse podatke."
+      ],
+      "Filters with the same group key will be ORed together within the group, while different filter groups will be ANDed together. Undefined group keys are treated as unique groups, i.e. are not grouped together. For example, if a table has three filters, of which two are for departments Finance and Marketing (group key = 'department'), and one refers to the region Europe (group key = 'region'), the filter clause would apply the filter (department = 'Finance' OR department = 'Marketing') AND (region = 'Europe').": [
+        "Filtri z enakim skupinskim ključem bodo znotraj skupine združeni z OR funkcijo, medtem ko bodo različne skupine združene z AND funkcijo. Nedefinirani skupinski ključi so obravnavani kot unikatne skupine in niso združeni v svojo skupino. Npr., če ima tabela tri filtre, pri čemer sta dva za oddelka marketinga in financ (skupinski ključ = 'oddelek') tretji pa se nanaša na regijo Evropa (skupinski ključ = 'regija'), bo filtrski izraz (oddelek = 'Finance' OR oddelek = 'Marketing') AND (regija = 'Evropa')."
+      ],
+      "This is the condition that will be added to the WHERE clause. For example, to only return rows for a particular client, you might define a regular filter with the clause `client_id = 9`. To display no rows unless a user belongs to a RLS filter role, a base filter can be created with the clause `1 = 0` (always false).": [
+        "To je pogoj, ki bo dodan WHERE stavku. Npr., če želite dobiti vrstice za določeno stranko, lahko definirate regularni filter z izrazom 'id_stranke = 9'. Če ne želimo prikazati vrstic, razen če uporabnik pripada RLS vlogi, lahko filter ustvarimo z izrazom `1 = 0` (vedno neresnično)."
+      ],
+      "Tables": ["Tabele"],
+      "Roles": ["Vloge"],
+      "Clause": ["Stavek"],
+      "Creator": ["Avtor"],
+      "Show Table": ["Prikaži tabelo"],
+      "Import a table definition": ["Uvozi definicijo tabele"],
+      "Edit Table": ["Uredi tabelo"],
+      "Name of the table that exists in the source database": [
+        "Ime tabele, ki obstaja v izvorni podatkovni bazi"
+      ],
+      "Schema, as used only in some databases like Postgres, Redshift and DB2": [
+        "Shema, ki se uporablja pri nekaterih podatkovnih bazah, kot so Postgres, Redshift in DB2"
+      ],
+      "This fields acts a Superset view, meaning that Superset will run a query against this string as a subquery.": [
+        "To polje se obnaša kot Supersetov pogled, kar pomeni, da bo Superset izvedel poizvedbo za ta niz kot podpoizvedbo."
+      ],
+      "Predicate applied when fetching distinct value to populate the filter control component. Supports jinja template syntax. Applies only when `Enable Filter Select` is on.": [
+        "Privzeta vrednost za pridobivanje različnih vrednost pri oblikovanju filtrov. Podpira sintakso za jinja predloge. Potrebno le, ko je vključeno `Omogoči izbiro filtra`."
+      ],
+      "Redirects to this endpoint when clicking on the table from the table list": [
+        "Preusmeri v to končno točko, ko kliknete na tabelo v seznamu tabel"
+      ],
+      "Whether the table was generated by the 'Visualize' flow in SQL Lab": [
+        "Če želite, da je tabela ustvarjena s postopkom 'Vizualizacija' v SQL laboratoriju"
+      ],
+      "A set of parameters that become available in the query using Jinja templating syntax": [
+        "Nabor parametrov, ki postanejo razpoložljivi za poizvedbo z uporabo sintakse za Jinja predloge"
+      ],
+      "Duration (in seconds) of the caching timeout for this table. A timeout of 0 indicates that the cache never expires. Note this defaults to the database timeout if undefined.": [
+        "Trajanje (v sekundah) predpomnjenja za to tabelo. Vrednost 0 označuje, da predpomnilnik nikoli ne poteče. V primeru, da ni definirano, ima nastavitev trajanja za podatkovno bazo."
+      ],
+      "Database": ["Podatkovna baza"],
+      "Last Changed": ["Zadnja sprememba"],
+      "Schema": ["Shema"],
+      "Offset": ["Odmik"],
+      "Table Name": ["Ime tabele"],
+      "Fetch Values Predicate": ["Pridobi vrednosti predikatov"],
+      "Main Datetime Column": ["Glavni stolpec Datum-Čas"],
+      "SQL Lab View": ["Pogled SQL laboratorija"],
+      "Template parameters": ["Parametri predlog"],
+      "The table was created. As part of this two-phase configuration process, you should now click the edit button by the new table to configure it.": [
+        "Tabela je ustvarjena. Sedaj morate v tem dvodelnem postopku klikniti gumb za urejanje nove tabele."
+      ],
+      "Refresh Metadata": ["Osveži metapodatke"],
+      "Refresh column metadata": ["Osveži metapodatke stolpca"],
+      "Metadata refreshed for the following table(s): %(tables)s": [
+        "Metapodatki osveženi za naslednje tabele: %(tables)s"
+      ],
+      "The following tables added new columns: %(tables)s": [
+        "Nove stolpce so dodale naslednje tabele: %(tables)s"
+      ],
+      "The following tables removed columns: %(tables)s": [
+        "Stolpce so odstranile naslednje tabele: %(tables)s"
+      ],
+      "The following tables update column metadata: %(tables)s": [
+        "Metapodatke stolpcev so posodobile naslednje tabele: %(tables)s"
+      ],
+      "Unable to refresh metadata for the following table(s): %(tables)s": [
+        "Ni mogoče osvežiti metapodatkov za naslednje tabele: %(tables)s"
+      ],
+      "Deleted %(num)d css template": [
+        "Izbrisana %(num)d css predloga",
+        "Izbrisani %(num)d css predlogi",
+        "Izbrisane %(num)d css predloge",
+        "Izbrisanih %(num)d css predlog"
+      ],
+      "CSS template could not be deleted.": [
+        "CSS predloge ni mogoče izbrisati."
+      ],
+      "CSS template not found.": ["CSS predloga ni najdena."],
+      "Deleted %(num)d dashboard": [
+        "Izbrisana je %(num)d nadzorna plošča",
+        "Izbrisani sta %(num)d nadzorni plošči",
+        "Izbrisane so %(num)d nadzorne plošče",
+        "Izbrisanih je %(num)d nadzornih plošč"
+      ],
+      "Title or Slug": ["Naslov ali `Slug`"],
+      "Role": ["Vloga"],
+      "Must be unique": ["Mora biti unikaten"],
+      "Dashboard parameters are invalid.": [
+        "Parametri nadzorne plošče so neveljavni."
+      ],
+      "Dashboard not found.": ["Nadzorna plošča ni najdena."],
+      "Dashboard could not be created.": [
+        "Nadzorne plošče ni mogoče ustvariti."
+      ],
+      "Dashboards could not be deleted.": [
+        "Nadzornih plošč ni mogoče izbrisati."
+      ],
+      "Dashboard could not be updated.": [
+        "Nadzorne plošče ni mogoče posodobiti."
+      ],
+      "Dashboard could not be deleted.": [
+        "Nadzorne plošče ni mogoče izbrisati."
+      ],
+      "Changing this Dashboard is forbidden": [
+        "Spreminjanje te nadzorne plošče ni dovoljeno"
+      ],
+      "Import dashboard failed for an unknown reason": [
+        "Uvoz nadzorne plošče ni uspel zaradi neznanega razloga"
+      ],
+      "You don't have access to this dashboard.": [
+        "Nimate dostopa do te nadzorne plošče."
+      ],
+      "No data in file": ["V datoteki ni podatkov"],
+      "Table name undefined": ["Ime tabele ni definirano"],
+      "Invalid connection string, a valid string usually follows: driver://user:password@database-host/database-name": [
+        "Neveljaven niz povezave - veljaven niz običajno sledi: driver://user:password@database-host/database-name"
+      ],
+      "Field cannot be decoded by JSON. %(msg)s": [
+        "Polja ni mogoče dekodirati z JSON. %(msg)s"
+      ],
+      "The metadata_params in Extra field is not configured correctly. The key %(key)s is invalid.": [
+        "Metadata_params v polju Dodatno niso pravilno nastavljeni. Ključ %(key)s je neveljaven."
+      ],
+      "An engine must be specified when passing individual parameters to a database.": [
+        "Pri podajanju posameznih parametrov podatkovne baze mora biti podan njen tip."
+      ],
+      "Engine \"%(engine)s\" is not a valid engine.": [
+        "\"%(engine)s\" ni veljaven tip podatkovne baze."
+      ],
+      "Engine spec \"InvalidEngine\" does not support being configured via individual parameters.": [
+        "Specifikacija baze \"InvalidEngine\" ne podpira konfiguracije s posameznimi parametri."
+      ],
+      "Database parameters are invalid.": [
+        "Parametri podatkovne baze so neveljavni."
+      ],
+      "A database with the same name already exists": [
+        "Podatkovna baza z enakim imenom že obstaja"
+      ],
+      "Field is required": ["Polje je obvezno"],
+      "Field cannot be decoded by JSON.  %{json_error}s": [
+        "Polja ni mogoče dekodirati z JSON.  %{json_error}s"
+      ],
+      "The metadata_params in Extra field is not configured correctly. The key %{key}s is invalid.": [
+        "Metadata_params v polju Dodatno niso pravilno nastavljeni. Ključ %{key}s je neveljaven."
+      ],
+      "Database not found.": ["Podatkovna baza ni najdena."],
+      "Database could not be created.": [
+        "Podatkovne baze ni mogoče ustvariti."
+      ],
+      "Database could not be updated.": [
+        "Podatkovne baze ni mogoče posodobiti."
+      ],
+      "Connection failed, please check your connection settings": [
+        "Povezava neuspešna. Preverite nastavitve povezave"
+      ],
+      "Cannot delete a database that has tables attached": [
+        "Podatkovne baze s povezanimi tabelami ni mogoče izbrisati"
+      ],
+      "Database could not be deleted.": [
+        "Podatkovne baze ni mogoče izbrisati."
+      ],
+      "Stopped an unsafe database connection": [
+        "Nevarna povezava s podatkovno bazo je bila ustavljena"
+      ],
+      "Could not load database driver": [
+        "Ni mogoče naložiti gonilnika podatkovne baze"
+      ],
+      "Unexpected error occurred, please check your logs for details": [
+        "Zgodila se je nepričakovana napaka. Podrobnosti preverite v dnevnikih"
+      ],
+      "Import database failed for an unknown reason": [
+        "Uvoz podatkovne baze ni uspel zaradi neznanega razloga"
+      ],
+      "Could not load database driver: {}": [
+        "Ni mogoče naložiti gonilnika podatkovne baze: {}"
+      ],
+      "Engine \"%(engine)s\" cannot be configured through parameters.": [
+        "Podatkovne baze tipa \"%(engine)s\" ni mogoče konfigurirati s parametri."
+      ],
+      "Database is offline.": ["Podatkovna baza ni povezana."],
+      "Deleted %(num)d dataset": [
+        "Izbrisan %(num)d podatkovni set",
+        "Izbrisana %(num)d podatkovna niza",
+        "Izbrisani %(num)d podatkovni nizi",
+        "Izbrisanih %(num)d podatkovnih nizov"
+      ],
+      "Null or Empty": ["Nič (NULL) ali prazen"],
+      "Dataset column not found.": ["Stolpec podatkovnega seta ni najden."],
+      "Dataset column delete failed.": [
+        "Brisanje stolpca podatkovnega seta neuspešno."
+      ],
+      "Changing this dataset is forbidden.": [
+        "Spreminjanje tega podatkovnega seta ni dovoljeno."
+      ],
+      "Dataset %(name)s already exists": ["Podatkovni set %(name)s že obstaja"],
+      "Database not allowed to change": [
+        "Podatkovne baze ni dovoljeno spreminjati"
+      ],
+      "One or more columns do not exist": ["En ali več stolpcev ne obstaja"],
+      "One or more columns are duplicated": [
+        "En ali več stolpcev je podvojenih"
+      ],
+      "One or more columns already exist": ["En ali več stolpcev že obstaja"],
+      "One or more metrics do not exist": ["Ena ali več mer ne obstaja"],
+      "One or more metrics are duplicated": ["Ena ali več mer je podvojenih"],
+      "One or more metrics already exist": ["Ena ali več mer že obstaja"],
+      "Table [%(table_name)s] could not be found, please double check your database connection, schema, and table name": [
+        "Tabele [%(table_name)s] ni mogoče najti. Preverite povezavo, shemo in ime podatkovne baze"
+      ],
+      "Dataset parameters are invalid.": [
+        "Parametri podatkovnega seta so neveljavni."
+      ],
+      "Dataset could not be created.": [
+        "Podatkovnega niza ni mogoče ustvariti."
+      ],
+      "Dataset could not be updated.": [
+        "Podatkovnega niza ni mogoče posodobiti."
+      ],
+      "Dataset could not be deleted.": [
+        "Podatkovnega niza ni mogoče izbrisati."
+      ],
+      "Dataset(s) could not be bulk deleted.": [
+        "Podatkovnih nizov ni mogoče množično izbrisati."
+      ],
+      "Changing this dataset is forbidden": [
+        "Spreminjanje tega podatkovnega seta ni dovoljeno"
+      ],
+      "Import dataset failed for an unknown reason": [
+        "Uvoz podatkovnega seta ni uspel zaradi neznanega razloga"
+      ],
+      "Dataset metric not found.": ["Mer podatkovnega seta ni najdena."],
+      "Dataset metric delete failed.": [
+        "Brisanje mere podatkovnega seta ni uspelo."
+      ],
+      "Original value": ["Izvorna vrednost"],
+      "Second": ["Sekunda"],
+      "Minute": ["Minuta"],
+      "5 minute": ["5 minut"],
+      "10 minute": ["10 minut"],
+      "15 minute": ["15 minut"],
+      "Half hour": ["Pol ure"],
+      "Hour": ["Ura"],
+      "Day": ["Dan"],
+      "Week": ["Teden"],
+      "Month": ["Mesec"],
+      "Quarter": ["Četrtletje"],
+      "Year": ["Leto"],
+      "Week starting sunday": ["Teden z začetkom v nedeljo"],
+      "Week starting monday": ["Teden z začetkom v ponedeljek"],
+      "Week ending saturday": ["Teden s koncem v soboto"],
+      "Week_ending sunday": ["Teden s koncem v nedeljo"],
+      "Username": ["Uporabniško ime"],
+      "Password": ["Geslo"],
+      "Hostname or IP address": ["Ime gostitelja ali IP naslov"],
+      "Database port": ["Vrata podatkovne baze"],
+      "Database name": ["Ime podatkovne baze"],
+      "Additional parameters": ["Dodatni parametri"],
+      "Use an encrypted connection to the database": [
+        "Uporabite šifrirano povezavo s podatkovno bazo"
+      ],
+      "We were unable to connect to your database. Please confirm that your service account has the Viewer and Job User roles on the project.": [
+        "Povezava s podatkovno bazo ni uspela. Preverite, da ima vaš dostop dodeljeni vlogi Viewer in Job User."
+      ],
+      "Either the username \"%(username)s\", password, or database name \"%(database)s\" is incorrect.": [
+        "Uporabniško ime \"%(username)s\", geslo ali ime podatkovne baze \"%(database)s\" so napačni."
+      ],
+      "The hostname \"%(hostname)s\" cannot be resolved.": [
+        "Imena gostitelja \"%(hostname)s\" ni mogoče razrešiti."
+      ],
+      "Port %(port)s on hostname \"%(hostname)s\" refused the connection.": [
+        "Vrata %(port)s na gostitelju \"%(hostname)s\" niso sprejela povezave."
+      ],
+      "The host \"%(hostname)s\" might be down, and can't be reached on port %(port)s.": [
+        "Gostitelj \"%(hostname)s\" mogoče ne deluje in ga ni mogoče doseči na vratih %(port)s."
+      ],
+      "Either the username \"%(username)s\" or the password is incorrect.": [
+        "Uporabniško ime \"%(username)s\" ali geslo sta napačna."
+      ],
+      "Unknown MySQL server host \"%(hostname)s\".": [
+        "Neznan MySQL strežnik \"%(hostname)s\"."
+      ],
+      "The host \"%(hostname)s\" might be down and can't be reached.": [
+        "Gostitelj \"%(hostname)s\" mogoče ne deluje in ga ni mogoče doseči."
+      ],
+      "Unable to connect to database \"%(database)s\".": [
+        "Povezava s podatkovno bazo \"%(database)s\" ni uspela."
+      ],
+      "The username \"%(username)s\" does not exist.": [
+        "Uporabniško ime \"%(username)s\" ne obstaja."
+      ],
+      "The password provided for username \"%(username)s\" is incorrect.": [
+        "Geslo za uporabniško ime \"%(username)s\" je napačno."
+      ],
+      "Please re-enter the password.": ["Ponovno vpišite geslo."],
+      "We can't seem to resolve the column \"%(column_name)s\" at line %(location)s.": [
+        "Zdi se, da ni mogoče razrešiti stolpca \"%(column_name)s\" v vrstici %(location)s."
+      ],
+      "The table \"%(table_name)s\" does not exist. A valid table must be used to run this query.": [
+        "Tabela \"%(table_name)s\" ne obstaja. V poizvedbi mora biti uporabljena veljavna tabela."
+      ],
+      "The schema \"%(schema_name)s\" does not exist. A valid schema must be used to run this query.": [
+        "Shema \"%(schema_name)s\" ne obstaja. Za poizvedbo mora biti uporabljena veljavna shema."
+      ],
+      "Unable to connect to catalog named \"%(catalog_name)s\".": [
+        "Povezava na katalog \"%(catalog_name)s\" ni uspela."
+      ],
+      "Unknown Presto Error": ["Neznana Presto napaka"],
+      "We were unable to connect to your database named \"%(database)s\". Please verify your database name and try again.": [
+        "Povezava s podatkovno bazo \"%(database)s\" ni uspela. Preverite ime podatkovne baze in poskusite ponovno."
+      ],
+      "Temporal expression not supported for type: %(col_type)s": [
+        "Časovni izraz ni podprt za podatkovne tipe: %(col_type)s"
+      ],
+      "Deleted %(num)d saved query": [
+        "Izbrisana %(num)d shranjena poizvedba",
+        "Izbrisani %(num)d shranjeni poizvedbi",
+        "Izbrisane %(num)d shranjene poizvedbe",
+        "Izbrisanih %(num)d shranjenih poizvedb"
+      ],
+      "Saved queries could not be deleted.": [
+        "Shranjenih poizvedb ni mogoče izbrisati."
+      ],
+      "Saved query not found.": ["Shranjena poizvedba ni najdena."],
+      "Import saved query failed for an unknown reason.": [
+        "Uvoz shranjene poizvedbe ni uspel zaradi neznanega razloga."
+      ],
+      "Saved query parameters are invalid.": [
+        "Parametri shranjene poizvedbe so neveljavni."
+      ],
+      "Deleted %(num)d report schedule": [
+        "Izbrisan %(num)d urnik poročanja",
+        "Izbrisana %(num)d urnika poročanja",
+        "Izbrisani %(num)d urniki poročanja",
+        "Izbrisanih %(num)d urnikov poročanja"
+      ],
+      "Value must be greater than 0": ["Vrednost mora biti večja od 0"],
+      "Alert query returned more then one row. %s rows returned": [
+        "Opozorilna poizvedba je vrnila več kot eno vrstico. Število vrnjenih vrstic: %s"
+      ],
+      "Alert query returned more then one column. %s columns returned": [
+        "Opozorilna poizvedba je vrnila več kot en stolpec. Število vrnjenih stolpcev: %s"
+      ],
+      "Dashboard does not exist": ["Nadzorna plošča ne obstaja"],
+      "Chart does not exist": ["Grafikon ne obstaja"],
+      "Database is required for alerts": [
+        "Podatkovna baza je obvezna za opozorila"
+      ],
+      "Type is required": ["Tip je obvezen"],
+      "Choose a chart or dashboard not both": [
+        "Izberite grafikon ali nadzorno ploščo, ne obojega"
+      ],
+      "Report Schedule parameters are invalid.": [
+        "Parametri urnika poročanja so neveljavni."
+      ],
+      "Report Schedule could not be deleted.": [
+        "Urnika poročanja ni mogoče izbrisati."
+      ],
+      "Report Schedule could not be created.": [
+        "Urnika poročanja ni mogoče ustvariti."
+      ],
+      "Report Schedule could not be updated.": [
+        "Urnika poročanja ni mogoče posodobiti."
+      ],
+      "Report Schedule not found.": ["Urnika poročanja ni najden."],
+      "Report Schedule delete failed.": ["Izbris urnika poročanja ni uspel."],
+      "Report Schedule log prune failed.": [
+        "Krajšanje dnevnika urnika poročanja ni uspelo."
+      ],
+      "Report Schedule execution failed when generating a screenshot.": [
+        "Izvajanje urnika poročanja je bilo neuspešno pri ustvarjanju zaslonske slike."
+      ],
+      "Report Schedule execution failed when generating a csv.": [
+        "Izvajanje urnika poročanja je bilo neuspešno pri ustvarjanju csv."
+      ],
+      "Report Schedule execution got an unexpected error.": [
+        "Pri izvajanju urnika poročanja je prišlo do nepričakovane napake."
+      ],
+      "Report Schedule is still working, refusing to re-compute.": [
+        "Urnik poročanja se še vedno izvaja, ponovni izračun je zavrnjen."
+      ],
+      "Report Schedule reached a working timeout.": [
+        "Urnik poročanja je dosegel mejo časa izvedbe."
+      ],
+      "Alert query returned more then one row.": [
+        "Opozorilna poizvedba je vrnila več kot eno vrstico."
+      ],
+      "Alert validator config error.": [
+        "Napaka nastavitev potrjevalnika opozoril."
+      ],
+      "Alert query returned more then one column.": [
+        "Opozorilna poizvedba je vrnila več kot en stolpec."
+      ],
+      "Alert query returned a non-number value.": [
+        "Opozorilna poizvedba je vrnila neštevilsko vrednost."
+      ],
+      "Alert found an error while executing a query.": [
+        "Opozorilo je našlo napako pri izvajanju poizvedbe."
+      ],
+      "A timeout occurred while executing the query.": [
+        "Pri izvajanju poizvedbe je potekel čas."
+      ],
+      "A timeout occurred while taking a screenshot.": [
+        "Pri ustvarjanju zaslonske slike je potekel čas."
+      ],
+      "A timeout occurred while generating a csv.": [
+        "Pri ustvarjanju csv je potekel čas."
+      ],
+      "Alert fired during grace period.": [
+        "Opozorilo sproženo med obdobjem mirovanja."
+      ],
+      "Alert ended grace period.": ["Opozorilo je končalo obdobje mirovanja."],
+      "Alert on grace period": ["Opozorilo v obdobju mirovanja"],
+      "Report Schedule sellenium user not found": [
+        "Selenium uporabnik za urnik poročanja ni najden"
+      ],
+      "Report Schedule state not found": ["Stanje urnika poročanj ni najdeno"],
+      "Report schedule unexpected error": [
+        "Nepričakovana napaka urnika poročanja"
+      ],
+      "Changing this report is forbidden": [
+        "Spreminjanje tega poročila ni dovoljeno"
+      ],
+      "An error occurred while pruning logs ": [
+        "Pri krajšanju dnevnikov je prišlo do napake "
+      ],
+      "\n            Error: %(text)s\n            ": [
+        "\n            Napaka: %(text)s\n            "
+      ],
+      "\n            <p>%(description)s</p>\n            <b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>\n            %(img_tag)s\n            ": [
+        "\n            <p>%(description)s</p>\n            <b><a href=\"%(url)s\">Razišči v Supersetu</a></b><p></p>\n            %(img_tag)s\n            "
+      ],
+      "%(name)s.csv": ["%(name)s.csv"],
+      "%(prefix)s %(title)s": ["%(prefix)s %(title)s"],
+      "\n            *%(name)s*\n\n            %(description)s\n\n            Error: %(text)s\n            ": [
+        "\n            *%(name)s*\n\n            %(description)s\n\n            Napaka: %(text)s\n            "
+      ],
+      "\n            *%(name)s*\n\n            %(description)s\n\n            <%(url)s|Explore in Superset>\n            ": [
+        "\n            *%(name)s*\n\n            %(description)s\n\n            <%(url)s|Razišči v Supersetu>\n            "
+      ],
+      "%(dialect)s cannot be used as a data source for security reasons.": [
+        "%(dialect)s ni mogoče uporabiti kot podatkovni vir zaradi varnostnih razlogov."
+      ],
+      "\n        *%(name)s*\n\n        <%(url)s|Explore in Superset>\n        ": [
+        "\n        *%(name)s*\n\n        <%(url)s|Razišči v Supersetu>\n        "
+      ],
+      "<b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>": [
+        "<b><a href=\"%(url)s\">Razišči v Supersetu</a></b><p></p>"
+      ],
+      "\n            <b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>\n            <img src=\"cid:%(msgid)s\">\n            ": [
+        "\n            <b><a href=\"%(url)s\">Razišči v Supersetu</a></b><p></p>\n            <img src=\"cid:%(msgid)s\">\n            "
+      ],
+      "\n        *%(slice_name)s*\n\n        <%(slice_url_user_friendly)s|Explore in Superset>\n        ": [
+        "\n        *%(slice_name)s*\n\n        <%(slice_url_user_friendly)s|Razišči v Supersetu>\n        "
+      ],
+      "[Alert] %(label)s": ["[Alert] %(label)s"],
+      "New": ["Nov"],
+      "SQL Query": ["SQL poizvedba"],
+      "Chart": ["Grafikon"],
+      "Dashboard": ["Nadzorna plošča"],
+      "Profile": ["Profil"],
+      "Info": ["Informacije"],
+      "Logout": ["Odjava"],
+      "Login": ["Prijava"],
+      "Record Count": ["Število zapisov"],
+      "No records found": ["Ni zapisov"],
+      "Filter List": ["Seznam filtrov"],
+      "Search": ["Iskanje"],
+      "Refresh": ["Osveži"],
+      "Import dashboards": ["Uvozi nadzorne plošče"],
+      "Import Dashboard(s)": ["Uvozi nadzorne plošče"],
+      "File": ["Datoteka"],
+      "Choose File": ["Izberite datoteko"],
+      "Upload": ["Naloži"],
+      "No Access!": ["Ni dostopa!"],
+      "You do not have permissions to access the datasource(s): %(name)s.": [
+        "Nimate dovoljenj za dostop do podatkovnih virov: %(name)s."
+      ],
+      "Request Permissions": ["Zahtevaj dovoljenja"],
+      "Cancel": ["Prekliči"],
+      "Use the edit buttom to change this field": [
+        "Za spreminjanje tega polja uporabite gumb za urejanje"
+      ],
+      "Test Connection": ["Preizkusi povezavo"],
+      "[Superset] Access to the datasource %(name)s was granted": [
+        "[Superset] dostop do podatkovnega vira %(name)s je odobren"
+      ],
+      "Unable to find such a holiday: [%(holiday)s]": [
+        "Ni mogoče najti takšnega praznika: [%(holiday)s]"
+      ],
+      "Referenced columns not available in DataFrame.": [
+        "Referencirani stolpci niso razpoložljivi v Dataframe-u."
+      ],
+      "Column referenced by aggregate is undefined: %(column)s": [
+        "Stolpec referenciran z agregacijo ni definiran: %(column)s"
+      ],
+      "Operator undefined for aggregator: %(name)s": [
+        "Operand ni definiran za agregatorja: %(name)s"
+      ],
+      "Invalid numpy function: %(operator)s": [
+        "Neveljavna numpy funkcija: %(operator)s"
+      ],
+      "Pivot operation requires at least one index": [
+        "Vrtilna operacija zahteva vsaj en indeks"
+      ],
+      "Pivot operation must include at least one aggregate": [
+        "Vrtilna operacija mora vsebovati vsaj en agregat"
+      ],
+      "Undefined window for rolling operation": [
+        "Nedefinirano okno za drsečo operacijo"
+      ],
+      "Invalid rolling_type: %(type)s": ["Neveljaven rolling_type: %(type)s"],
+      "Invalid options for %(rolling_type)s: %(options)s": [
+        "Neveljavne možnosti za %(rolling_type)s: %(options)s"
+      ],
+      "Invalid cumulative operator: %(operator)s": [
+        "Neveljaven kumulativni operand: %(operator)s"
+      ],
+      "Invalid geohash string": ["Neveljaven niz za geohash"],
+      "Invalid longitude/latitude": ["Neveljavna zemljepisna dolžina/širina"],
+      "Invalid geodetic string": ["Neveljaven geodetski niz"],
+      "Column \"%(column)s\" is not numeric or does not exists in the query results.": [
+        "Stolpec \"%(column)s\" ni numeričen ali ne obstaja v rezultatu poizvedbe."
+      ],
+      "`rename_columns` must have the same length as `columns`.": [
+        "`rename_columns` morajo imeti enako dolžino kot `columns`."
+      ],
+      "`prophet` package not installed": ["Knjižnica `prophet` ni nameščena"],
+      "Time grain missing": ["Časovna granulacija manjka"],
+      "Unsupported time grain: %(time_grain)s": [
+        "Nepodprta časovna granulacija: %(time_grain)s"
+      ],
+      "Periods must be a positive integer value": [
+        "Periode morajo biti pozitivno celo število"
+      ],
+      "Confidence interval must be between 0 and 1 (exclusive)": [
+        "Interval zaupanja mora biti med 0 in 1 (odprt)"
+      ],
+      "DataFrame must include temporal column": [
+        "DataFrame mora vsebovati časovni stolpec"
+      ],
+      "DataFrame include at least one series": [
+        "DataFrame vsebuje vsaj eno serijo"
+      ],
+      "percentiles must be a list or tuple with two numeric values, of which the first is lower than the second value": [
+        "percentili morajo biti tipa list ali tuple z vsaj dvema numeričnima vrednostma, pri čemer je prva manjša od druge"
+      ],
+      "User": ["Uporabnik"],
+      "User Roles": ["Vloge uporabnikov"],
+      "Database URL": ["URL podatkovne baze"],
+      "Roles to grant": ["Vloge za dovoljevanje"],
+      "Created On": ["Ustvarjeno"],
+      "List Observations": ["Naštej opažanja"],
+      "Show Observation": ["Prikaži opažanja"],
+      "Error Message": ["Sporočilo napake"],
+      "Log Retentions (days)": ["Ohranjanje dnevnika (dnevi)"],
+      "A semicolon ';' delimited list of email addresses": [
+        "S podpičjem ';' ločen seznam naslovov e-pošte"
+      ],
+      "How long to keep the logs around for this alert": [
+        "Kako dolgo ohraniti dnevnike za to opozorilo"
+      ],
+      "Once an alert is triggered, how long, in seconds, before Superset nags you again.": [
+        "Kako dolgo naj traja (v sekundah), da vas Superset ponovno opomni, ko je opozorilo sproženo."
+      ],
+      "A SQL statement that defines whether the alert should get triggered or not. The query is expected to return either NULL or a number value.": [
+        "SQL izraz, ki definira ali naj se opozorilo sproži ali ne. Od poizvedbe se pričakuje, da vrne bodisi NULL bodisi številsko vrednost."
+      ],
+      "This feature is deprecated and will be removed on 2.0. Take a look at the replacement feature <a href='https://superset.apache.org/docs/installation/alerts-reports'>Alerts & Reports documentation</a>": [
+        "Ta funkcija je zastarela in bo odstranjena v verziji 2.0. Oglejte si zamenjavo <a href='https://superset.apache.org/docs/installation/alerts-reports'>Dokumentacija za Opozorila & Poročila</a>"
+      ],
+      "annotation start time or end time is required.": [
+        "začetni in končni čas oznake je obvezen."
+      ],
+      "Annotation end time must be no earlier than start time.": [
+        "Končni čas oznake ne sem biti pred začetnim."
+      ],
+      "Annotations": ["Oznake"],
+      "Show Annotation": ["Prikaži oznako"],
+      "Add Annotation": ["Dodaj oznako"],
+      "Edit Annotation": ["Uredi oznako"],
+      "Layer": ["Sloj"],
+      "Label": ["Naziv"],
+      "Start": ["Začetek"],
+      "End": ["Konec"],
+      "JSON Metadata": ["JSON metapodatki"],
+      "Show Annotation Layer": ["Prikaži sloj z oznakami"],
+      "Add Annotation Layer": ["Dodaj sloj z oznakami"],
+      "Edit Annotation Layer": ["Uredi sloj z oznakami"],
+      "Name": ["Ime"],
+      "Table [%{table}s] could not be found, please double check your database connection, schema, and table name, error: {}": [
+        "Tabela [%{table}s] ni najdena. Preverite povezavo, shemo in ime tabele v podatkovni bazi. Napaka: {}"
+      ],
+      "json isn't valid": ["json ni veljaven"],
+      "Export to YAML": ["Izvozi v YAML"],
+      "Export to YAML?": ["Izvozim v YAML?"],
+      "Delete": ["Izbriši"],
+      "Delete all Really?": ["Ali resnično vse izbrišem?"],
+      "Is favorite": ["Je priljubljen"],
+      "The data source seems to have been deleted": [
+        "Zdi se, da je bil podatkovni vir izbrisan"
+      ],
+      "The user seems to have been deleted": [
+        "Zdi se, da je bil uporabnik izbrisan"
+      ],
+      "Access was requested": ["Zahtevan je bil dostop"],
+      "The access requests seem to have been deleted": [
+        "Zdi se, da je bila zahteva za dostop izbrisana"
+      ],
+      "%(user)s was granted the role %(role)s that gives access to the %(datasource)s": [
+        "Uporabniku %(user)s je bila dodeljena vloga %(role)s, ki omogoča dostop do %(datasource)s"
+      ],
+      "Role %(r)s was extended to provide the access to the datasource %(ds)s": [
+        "Vloga %(r)s je bila razširjena za zagotovitev dostopa do podatkovnega vira %(ds)s"
+      ],
+      "You have no permission to approve this request": [
+        "Nimate dovoljenja za odobritev te zahteve"
+      ],
+      "You don't have the rights to ": ["Nimate pravic za "],
+      "download as csv": ["prenos kot csv"],
+      "Cannot import dashboard: %(db_error)s.\nMake sure to create the database before importing the dashboard.": [
+        "Nadzorne plošče ni mogoče uvoziti: %(db_error)s.\nPred uvozom poskrbite za ustvarjenje podatkovne baze."
+      ],
+      "An unknown error occurred. Please contact your Superset administrator": [
+        "Zgodila se je neznana napaka. Kontaktirajte svojega administratorja za Superset"
+      ],
+      "[Missing Dataset]": ["[Manjka podatkovni set]"],
+      "alter this ": ["spreminjanje tega "],
+      "chart": ["grafikona"],
+      "create a ": ["ustvarite "],
+      "Explore - %(table)s": ["Razišči - %(table)s"],
+      "Explore": ["Raziskovanje"],
+      "Chart [{}] has been saved": ["Grafikon [{}] je bil shranjen"],
+      "Chart [{}] has been overwritten": ["Grafikon [{}] je bil prepisan"],
+      "dashboard": ["nadzorna plošča"],
+      "Chart [{}] was added to dashboard [{}]": [
+        "Grafikon [{}] je bil dodan na nadzorno ploščo [{}]"
+      ],
+      "Dashboard [{}] just got created and chart [{}] was added to it": [
+        "Nadzorna plošča [{}] je bila ravno ustvarjena in grafikon [{}] dodan nanjo"
+      ],
+      "This dashboard was changed recently. Please reload dashboard to get latest version.": [
+        "Nadzorna plošča je bila pred kratkim spremenjena. Ponovno jo naložite, da dobite zadnjo verzijo."
+      ],
+      "Could not load database driver: %(driver_name)s": [
+        "Gonilnika podatkovne baze ni mogoče naložiti: %(driver_name)s"
+      ],
+      "Invalid connection string, a valid string usually follows:\n'DRIVER://USER:PASSWORD@DB-HOST/DATABASE-NAME'": [
+        "Neveljaven niz povezave, veljaven niz običajno sledi:\n'DRIVER://USER:PASSWORD@DB-HOST/DATABASE-NAME'"
+      ],
+      "Malformed request. slice_id or table_name and db_name arguments are expected": [
+        "Deformirana zahteva. Pričakovani so argumenti slice_id ali table_name in db_name"
+      ],
+      "Chart %(id)s not found": ["Grafikon %(id)s ni najden"],
+      "Table %(table)s wasn't found in the database %(db)s": [
+        "Tabela %(table)s ni bila najdena v podatkovni bazi %(db)s"
+      ],
+      "Can't find User '%(name)s', please ask your admin to create one.": [
+        "Uporabnika '%(name)s' ni mogoče najti. Prosite administratorja, da ga ustvari."
+      ],
+      "Can't find DruidCluster with cluster_name = '%(name)s'": [
+        "Ni mogoče najti DruidCluster s cluster_name = '%(name)s'"
+      ],
+      "Data could not be deserialized. You may want to re-run the query.": [
+        "Podatkov ni mogoče deserializirati. Poskusite ponovno pognati poizvedbo."
+      ],
+      "%(validator)s was unable to check your query.\nPlease recheck your query.\nException: %(ex)s": [
+        "%(validator)s ni mogel preveriti vaše poizvedbe.\nPonovno preverite poizvedbo.\nIzjema: %(ex)s"
+      ],
+      "Failed to start remote query on a worker. Tell your administrator to verify the availability of the message queue.": [
+        "Zagon daljinske poizvedbe na delavcu ni bil uspešen. Administratorja prosite, da preveri razpoložljivost zaporedja sporočil."
+      ],
+      "Query record was not created as expected.": [
+        "Zapis poizvedbe ni bil ustvarjen, kot je bilo pričakovano."
+      ],
+      "The parameter %(parameters)s in your query is undefined.": [
+        "V vaši poizvedbi ni definiranih naslednjih parametrov: %(parameters)s.",
+        "V vaši poizvedbi ni definiranih naslednjih parametrov: %(parameters)s.",
+        "V vaši poizvedbi ni definiranih naslednjih parametrov: %(parameters)s.",
+        "V vaši poizvedbi ni definiranih naslednjih parametrov: %(parameters)s."
+      ],
+      "%(user)s's profile": ["Profil uporabnika: %(user)s"],
+      "Show CSS Template": ["Prikaži CSS predlogo"],
+      "Add CSS Template": ["Dodaj CSS predlogo"],
+      "Edit CSS Template": ["Uredi CSS predlogo"],
+      "Template Name": ["Ime predloge"],
+      "Request missing data field.": ["Zahtevaj manjkajoča podatkovna polja."],
+      "Duplicate column name(s): %(columns)s": [
+        "Podvojena imena stolpcev: %(columns)s"
+      ],
+      "A human-friendly name": ["Človeku prijazno ime"],
+      "Used internally to identify the plugin. Should be set to the package name from the pluginʼs package.json": [
+        "Uporablja se za interno identifikacijo vtičnika. Naj bo nastavljeno na ime paketa v vtičnikovem package.json"
+      ],
+      "A full URL pointing to the location of the built plugin (could be hosted on a CDN for example)": [
+        "Celoten URL, ki kaže na lokacijo zgrajenega vtičnika (lahko gostuje npr. na CDN)"
+      ],
+      "Custom Plugins": ["Prilagojeni vtičniki"],
+      "Custom Plugin": ["Prilagojeni vtičnik"],
+      "Add a Plugin": ["Dodaj vtičnik"],
+      "Edit Plugin": ["Uredi vtičnik"],
+      "Schedule Email Reports for Dashboards": [
+        "Razporedi e-poštna poročila za nadzorne plošče"
+      ],
+      "Manage Email Reports for Dashboards": [
+        "Upravljaj e-poštna poročila za nadzorne plošče"
+      ],
+      "Changed On": ["Spremenjeno"],
+      "Active": ["Aktiven"],
+      "Crontab": ["Crontab"],
+      "Recipients": ["Prejemniki"],
+      "Slack Channel": ["Slack Channel"],
+      "Deliver As Group": ["Dostavi kot skupino"],
+      "Delivery Type": ["Tip dostave"],
+      "Schedule Email Reports for Charts": [
+        "Razporedi e-poštna poročila za grafikone"
+      ],
+      "Manage Email Reports for Charts": [
+        "Upravljaj e-poštna poročila za grafikone"
+      ],
+      "Email Format": ["Oblika e-pošte"],
+      "List Saved Query": ["Seznam shranjenih poizvedb"],
+      "Show Saved Query": ["Prikaži shranjeno poizvedbo"],
+      "Add Saved Query": ["Dodaj shranjeno poizvedbo"],
+      "Edit Saved Query": ["Uredi shranjeno poizvedbo"],
+      "End Time": ["Končni čas"],
+      "Pop Tab Link": ["Prikaži povezavo zavihka"],
+      "Changed on": ["Spremenjen"],
+      "The dataset associated with this chart no longer exists": [
+        "Podatkovni set, povezan s tem grafikonom, ne obstaja več"
+      ],
+      "Could not determine datasource type": [
+        "Ni mogoče določiti tipa podatkovnega vira"
+      ],
+      "Could not find viz object": [
+        "Ni mogoče najti vizualizacijskega objekta"
+      ],
+      "Show Chart": ["Prikaži grafikon"],
+      "Add Chart": ["Dodaj grafikon"],
+      "Edit Chart": ["Uredi grafikon"],
+      "These parameters are generated dynamically when clicking the save or overwrite button in the explore view. This JSON object is exposed here for reference and for power users who may want to alter specific parameters.": [
+        "Ti parametri se ustvarijo dinamično s klikom gumba Shrani ali Prepiši v raziskovalnem pogledu. Ta JSON objekt je prikazan kot vzorec za napredne uporabnike, ki želijo spreminjati posamezne parametre."
+      ],
+      "Duration (in seconds) of the caching timeout for this chart. Note this defaults to the datasource/table timeout if undefined.": [
+        "Časovna veljavnost (v sekundah) predpomnjenja za ta grafikon. Če ni definirana, je uporabljena vrednost za podatkovni vir/tabelo."
+      ],
+      "Last Modified": ["Zadnja sprememba"],
+      "Parameters": ["Parametri"],
+      "Visualization Type": ["Tip vizualizacije"],
+      "Show Dashboard": ["Prikaži nadzorno ploščo"],
+      "Add Dashboard": ["Dodaj nadzorno ploščo"],
+      "Edit Dashboard": ["Uredi nadzorno ploščo"],
+      "This json object describes the positioning of the widgets in the dashboard. It is dynamically generated when adjusting the widgets size and positions by using drag & drop in the dashboard view": [
+        "Ta JSON objekt opisuje postavitev pripomočkov na nadzorni plošči. Ustvari se dinamično, ko prilagajamo velikost in postavitev pripomočkov z uporabo povleci&spusti v pogledu nadzorne plošče"
+      ],
+      "The CSS for individual dashboards can be altered here, or in the dashboard view where changes are immediately visible": [
+        "CSS za posamezne nadzorne plošče lahko spreminjamo tukaj ali pa v pogledu nadzorne plošče, kjer so spremembe vidne takoj"
+      ],
+      "To get a readable URL for your dashboard": [
+        "Za pridobitev berljivega URL-ja za nadzorno ploščo"
+      ],
+      "This JSON object is generated dynamically when clicking the save or overwrite button in the dashboard view. It is exposed here for reference and for power users who may want to alter specific parameters.": [
+        "Ta JSON objekt se ustvari dinamično s klikom gumba Shrani ali Prepiši v pogledu nadzorne plošče. Tukaj je prikazan kot vzorec za napredne uporabnike, ki želijo spreminjati posamezne parametre."
+      ],
+      "Owners is a list of users who can alter the dashboard.": [
+        "\"Lastniki\" je seznam uporabnikov, ki lahko spreminjajo nadzorno ploščo."
+      ],
+      "Roles is a list which defines access to the dashboard. Granting a role access to a dashboard will bypass dataset level checks.If no roles defined then the dashboard is available to all roles.": [
+        "\"Vloge\" je seznam, ki definira dostop do nadzorne plošče. Dodelitev vloge za dostop do nadzorne plošče bo obšlo preverjanje na nivoju podatkovnega seta. Če vloga ni definirana, bo nadzorna plošča dostopna vsem vlogam."
+      ],
+      "Determines whether or not this dashboard is visible in the list of all dashboards": [
+        "Določa ali je nadzorna plošča vidna na seznamu vseh nadzornih plošč"
+      ],
+      "Title": ["Naslov"],
+      "Slug": ["Slug"],
+      "Published": ["Objavljeno"],
+      "Position JSON": ["JSON za postavitev"],
+      "CSS": ["CSS"],
+      "Underlying Tables": ["Temeljne tabele"],
+      "Export": ["Izvoz"],
+      "Export dashboards?": ["Izvozim nadzorne plošče?"],
+      "Name of table to be created from csv data.": [
+        "Ime tabele, ki bo ustvarjena iz CSV podatkov."
+      ],
+      "CSV File": ["CSV datoteka"],
+      "Select a CSV file to be uploaded to a database.": [
+        "Izberite CSV datoteko, ki bo naložena v podatkovno bazo."
+      ],
+      "Only the following file extensions are allowed: %(allowed_extensions)s": [
+        "Dovoljene so le naslednje končnice: %(allowed_extensions)s"
+      ],
+      "Specify a schema (if database flavor supports this).": [
+        "Podajte shemo (če vrsta podatkovne baze to podpira)"
+      ],
+      "Delimiter": ["Ločilnik"],
+      "Delimiter used by CSV file (for whitespace use \\s+).": [
+        "Ločilnik, uporabljen v CSV datoteki (za presledek uporabi \\s+)."
+      ],
+      "Table Exists": ["Tabela obstaja"],
+      "If table exists do one of the following: Fail (do nothing), Replace (drop and recreate table) or Append (insert data).": [
+        "Če tabela obstaja, naredite nekaj od sledečega: Prekini (ne naredi nič), Zamenjaj (zbriši in ponovno ustvari tabelo) ali Dodaj (vstavi podatke)."
+      ],
+      "Fail": ["Prekini"],
+      "Replace": ["Zamenjaj"],
+      "Append": ["Dodaj"],
+      "Header Row": ["Naslovna vrstica"],
+      "Row containing the headers to use as column names (0 is first line of data). Leave empty if there is no header row.": [
+        "Vrstica z naslovi, ki se uporabi za imena stolpcev (0 je prva vrstica podatkov). Pustite prazno, če ni naslovne vrstice."
+      ],
+      "Index Column": ["Indeksni stolpec"],
+      "Column to use as the row labels of the dataframe. Leave empty if no index column.": [
+        "Stolpec, ki se uporabi za naslove vrstic v dataframe-u. Pustite prazno, če ni indeksnega stolpca."
+      ],
+      "Mangle Duplicate Columns": ["Odstrani podvojene stolpce"],
+      "Specify duplicate columns as \"X.0, X.1\".": [
+        "Določite podvojene stolpce kot \"X.0, X.1\"."
+      ],
+      "Skip Initial Space": ["Izpusti začetni presledek"],
+      "Skip spaces after delimiter.": ["Izpusti presledek za ločilnikom."],
+      "Skip Rows": ["Izpusti vrstice"],
+      "Number of rows to skip at start of file.": [
+        "Število vrstic, ki se izpustijo na začetku datoteke."
+      ],
+      "Rows to Read": ["Vrstice za branje"],
+      "Number of rows of file to read.": [
+        "Število vrstic v datoteki za branje."
+      ],
+      "Skip Blank Lines": ["Izpusti prazne vrstice"],
+      "Skip blank lines rather than interpreting them as NaN values.": [
+        "Raje izpusti prazne vrstice, kot pa da so prepoznane kot NaN vrednosti."
+      ],
+      "Parse Dates": ["Prepoznaj datume"],
+      "A comma separated list of columns that should be parsed as dates.": [
+        "Z vejico ločen seznam stolpcev, v katerih bodo prepoznani datumi."
+      ],
+      "Infer Datetime Format": ["Prepoznaj obliko datuma/časa"],
+      "Use Pandas to interpret the datetime format automatically.": [
+        "Uporabi Pandas za samodejno prepoznavo oblike datumov/časov."
+      ],
+      "Decimal Character": ["Decimalno ločilo"],
+      "Character to interpret as decimal point.": [
+        "Znak, ki bo prepoznan kot decimalno ločilo."
+      ],
+      "Dataframe Index": ["Indeks dataframe-a"],
+      "Write dataframe index as a column.": [
+        "Zapiši indeks dataframe-a kot stolpec."
+      ],
+      "Column Label(s)": ["Naslovi stolpcev"],
+      "Column label for index column(s). If None is given and Dataframe Index is True, Index Names are used.": [
+        "Naslovi stolpcev za indeksne stolpce. Če le-ti niso podani in indeksi Dataframe-a obstajajo, se uporabijo imena indeksov."
+      ],
+      "Null values": ["Prazne (Null) vrednosti"],
+      "Json list of the values that should be treated as null. Examples: [\"\"], [\"None\", \"N/A\"], [\"nan\", \"null\"]. Warning: Hive database supports only single value. Use [\"\"] for empty string.": [
+        "JSON seznam vrednosti, ki naj bodo obravnavane kot prazne (Null). Primeri: [\"\"], [\"None\", \"N/A\"], [\"nan\", \"null\"]. Opozorilo: Podatkovna baza Hive podpira le eno vrednost. Uporabite [\"\"] za prazen znakovni niz."
+      ],
+      "Name of table to be created from excel data.": [
+        "Ime tabele, ki bo ustvarjena iz Excel-ovih podatkov."
+      ],
+      "Excel File": ["Excel-ova datoteka"],
+      "Select a Excel file to be uploaded to a database.": [
+        "Izberite Excel-ovo datoteko, ki bo naložena v podatkovno bazo."
+      ],
+      "Sheet Name": ["Ime zvezka"],
+      "Strings used for sheet names (default is the first sheet).": [
+        "Znakovni nizi uporabljeni za imena zvezkov (privzeto je prvi zvezek)."
+      ],
+      "Show Database": ["Prikaži podatkovno bazo"],
+      "Add Database": ["Dodaj podatkovno bazo"],
+      "Edit Database": ["Uredi podatkovno bazo"],
+      "Expose this DB in SQL Lab": [
+        "Uporabi to podatkovno bazo v SQL laboratoriju"
+      ],
+      "Operate the database in asynchronous mode, meaning  that the queries are executed on remote workers as opposed to on the web server itself. This assumes that you have a Celery worker setup as well as a results backend. Refer to the installation docs for more information.": [
+        "Upravljanje podatkovne baze v asinhronem načinu pomeni, da se poizvedbe zaženejo na oddaljenih »delavcih« in ne na samem spletnem strežniku. S tem je predpostavljeno, da imate nastavljenega »delavca« za Celery in zaledni sistem za rezultate. Več informacij je v navodilih za namestitev."
+      ],
+      "Allow CREATE TABLE AS option in SQL Lab": [
+        "Dovoli opcijo CREATE TABLE AS v SQL laboratoriju"
+      ],
+      "Allow CREATE VIEW AS option in SQL Lab": [
+        "Dovoli opcijo CREATE VIEW AS v SQL laboratoriju"
+      ],
+      "Allow users to run non-SELECT statements (UPDATE, DELETE, CREATE, ...) in SQL Lab": [
+        "Dovoli uporabnikom poganjanje ne-SELECT stavkov (UPDATE, DELETE, CREATE, ...) v SQL laboratoriju"
+      ],
+      "When allowing CREATE TABLE AS option in SQL Lab, this option forces the table to be created in this schema": [
+        "Z dovolitvijo opcije CREATE TABLE AS v SQL laboratoriju se tabele ustvarjajo s to shemo"
+      ],
+      "If Presto, all the queries in SQL Lab are going to be executed as the currently logged on user who must have permission to run them.<br/>If Hive and hive.server2.enable.doAs is enabled, will run the queries as service account, but impersonate the currently logged on user via hive.server2.proxy.user property.": [
+        "V primeru Presto se vse poizvedbe v SQL laboratoriju zaženejo pod trenutno prijavljenim uporabnikom, ki mora imeti pravice za poganjanje.<br/>Če je omogočen Hive in hive.server2.enable.doAs, poizvedbe tečejo pod servisnim računom, vendar je trenutno prijavljen uporabnik predstavljen z lastnostjo hive.server2.proxy.user."
+      ],
+      "Allow SQL Lab to fetch a list of all tables and all views across all database schemas. For large data warehouse with thousands of tables, this can be expensive and put strain on the system.": [
+        "Dovoli SQL laboratoriju, da pridobi seznam vseh tabel in pogledov iz vseh shem podatkovne baze. Pri velikih podatkovnih skladiščih s tisoči tabel je to lahko potratno in obremeni sistem."
+      ],
+      "Duration (in seconds) of the caching timeout for charts of this database. A timeout of 0 indicates that the cache never expires. Note this defaults to the global timeout if undefined.": [
+        "Trajanje (v sekundah) predpomnjenja za grafikon v tej podatkovni bazi. Vrednost 0 označuje, da predpomnilnik nikoli ne poteče. V primeru, da ni definirano, ima globalno nastavitev."
+      ],
+      "If selected, please set the schemas allowed for csv upload in Extra.": [
+        "Če je izbrano, nastavite dovoljene sheme za nalaganje CSV v Dodatno."
+      ],
+      "Expose in SQL Lab": ["Uporabi v SQL laboratoriju"],
+      "Allow CREATE TABLE AS": ["Dovoli CREATE TABLE AS"],
+      "Allow CREATE VIEW AS": ["Dovoli CREATE VIEW AS"],
+      "Allow DML": ["Dovoli DML"],
+      "CTAS Schema": ["CTAS shema"],
+      "SQLAlchemy URI": ["SQLAlchemy URI"],
+      "Chart Cache Timeout": ["Trajanje predpomnilnika grafikona"],
+      "Secure Extra": ["Dodatna varnost"],
+      "Root certificate": ["Korenski certifikat"],
+      "Async Execution": ["Asinhrono izvajanje"],
+      "Impersonate the logged on user": [
+        "Predstavljaj se kot prijavljeni uporabnik"
+      ],
+      "Allow Csv Upload": ["Dovoli nalaganje CSV"],
+      "Allow Multi Schema Metadata Fetch": [
+        "Dovoli pridobivanje metapodatkov z več shemami"
+      ],
+      "Backend": ["Vrsta"],
+      "Extra field cannot be decoded by JSON. %(msg)s": [
+        "Dodatnega polja ni mogoče dekodirati z JSON. %(msg)s"
+      ],
+      "Invalid connection string, a valid string usually follows:'DRIVER://USER:PASSWORD@DB-HOST/DATABASE-NAME'<p>Example:'postgresql://user:password@your-postgres-db/database'</p>": [
+        "Neveljaven niz povezave. Veljaven niz običajno sledi zapisu:'DRIVER://USER:PASSWORD@DB-HOST/DATABASE-NAME'<p>Primer:'postgresql://user:password@your-postgres-db/database'</p>"
+      ],
+      "CSV to Database configuration": [
+        "Nastavitve pretvorbe CSV v podatkovno bazo"
+      ],
+      "Database \"%(database_name)s\" schema \"%(schema_name)s\" is not allowed for csv uploads. Please contact your Superset Admin.": [
+        "Shema \"%(schema_name)s\" podatkovne baze \"%(database_name)s\" ni dovoljena za nalaganje CSV. Kontaktirajte administratorja za Superset."
+      ],
+      "You cannot specify a namespace both in the name of the table: \"%(csv_table.table)s\" and in the schema field: \"%(csv_table.schema)s\". Please remove one": [
+        "Imenskega prostora ni mogoče podati hkrati v tabeli: \"%(csv_table.table)s\" in polju sheme: \"%(csv_table.schema)s\". Odstranite enega"
+      ],
+      "Unable to upload CSV file \"%(filename)s\" to table \"%(table_name)s\" in database \"%(db_name)s\". Error message: %(error_msg)s": [
+        "CSV datoteke \"%(filename)s\" ni mogoče naložiti v tabelo \"%(table_name)s\" v podatkovni bazi \"%(db_name)s\". Sporočilo napake: %(error_msg)s"
+      ],
+      "CSV file \"%(csv_filename)s\" uploaded to table \"%(table_name)s\" in database \"%(db_name)s\"": [
+        "CSV datoteka \"%(csv_filename)s\" naložena v tabelo \"%(table_name)s\" v podatkovni bazi \"%(db_name)s\""
+      ],
+      "Excel to Database configuration": [
+        "Nastavitve pretvorbe Excel v Podatkovno bazo"
+      ],
+      "Database \"%(database_name)s\" schema \"%(schema_name)s\" is not allowed for excel uploads. Please contact your Superset Admin.": [
+        "Shema \"%(schema_name)s\" podatkovne baze \"%(database_name)s\" ni dovoljena za nalaganje Excel datotek. Kontaktirajte administratorja za Superset."
+      ],
+      "You cannot specify a namespace both in the name of the table: \"%(excel_table.table)s\" and in the schema field: \"%(excel_table.schema)s\". Please remove one": [
+        "Imenskega prostora ni mogoče podati hkrati v tabeli: \"%(excel_table.table)s\" in polju sheme: \"%(excel_table.schema)s\". Odstranite enega"
+      ],
+      "Unable to upload Excel file \"%(filename)s\" to table \"%(table_name)s\" in database \"%(db_name)s\". Error message: %(error_msg)s": [
+        "Excel datoteke \"%(filename)s\" ni mogoče naložiti v tabelo \"%(table_name)s\" v podatkovni bazi \"%(db_name)s\". Sporočilo napake: %(error_msg)s"
+      ],
+      "Excel file \"%(excel_filename)s\" uploaded to table \"%(table_name)s\" in database \"%(db_name)s\"": [
+        "Excel datoteka \"%(excel_filename)s\" naložena v tabelo \"%(table_name)s\" v podatkovni bazi \"%(db_name)s\""
+      ],
+      "Logs": ["Dnevniki"],
+      "Show Log": ["Prikaži dnevnik"],
+      "Add Log": ["Dodaj dnevnik"],
+      "Edit Log": ["Uredi dnevnik"],
+      "Action": ["Aktivnost"],
+      "dttm": ["dttm"],
+      "Add item": ["Dodaj"],
+      "The query couldn't be loaded": ["Poizvedbe ni mogoče naložiti"],
+      "Your query has been scheduled. To see details of your query, navigate to Saved queries": [
+        "Vaša poizvedba je v urniku. Za ogled podrobnosti poizvedbe pojdite na shranjene poizvedbe"
+      ],
+      "Your query could not be scheduled": [
+        "Vaše poizvedbe ni mogoče uvrstiti v urnik"
+      ],
+      "Failed at retrieving results": ["Napaka pri pridobivanju rezultatov"],
+      "An error occurred while storing the latest query id in the backend. Please contact your administrator if this problem persists.": [
+        "Pri shranjevanju zadnjega id-ja poizvedbe v sistem je prišlo do napake. Če se težava ponavlja, kontaktirajte administratorja."
+      ],
+      "Unknown error": ["Neznana napaka"],
+      "Query was stopped.": ["Poizvedba je bila ustavljena."],
+      "Unable to migrate table schema state to backend. Superset will retry later. Please contact your administrator if this problem persists.": [
+        "Stanja sheme tabele ni mogoče prenesti v sistem. Superset bo ponovil poskus kasneje. Če se težava ponavlja, kontaktirajte administratorja."
+      ],
+      "Unable to migrate query state to backend. Superset will retry later. Please contact your administrator if this problem persists.": [
+        "Stanja poizvedbe ni mogoče prenesti v sistem. Superset bo ponovil poskus kasneje. Če se težava ponavlja, kontaktirajte administratorja."
+      ],
+      "Unable to migrate query editor state to backend. Superset will retry later. Please contact your administrator if this problem persists.": [
+        "Stanja urejevalnika poizvedb ni mogoče prenesti v sistem. Superset bo ponovil poskus kasneje. Če se težava ponavlja, kontaktirajte administratorja."
+      ],
+      "Unable to add a new tab to the backend. Please contact your administrator.": [
+        "Novega zavihka ni mogoče dodati v sistem. Kontaktirajte administratorja."
+      ],
+      "Copy of %s": ["Kopija %s"],
+      "An error occurred while setting the active tab. Please contact your administrator.": [
+        "Pri določanju aktivnega zavihka je prišlo do napake. Kontaktirajte administratorja."
+      ],
+      "An error occurred while fetching tab state": [
+        "Pri pridobivanju stanja zavihka je prišlo do napake"
+      ],
+      "An error occurred while hiding the left bar. Please contact your administrator.": [
+        "Pri skrivanju leve vrstice je prišlo do napake. Kontaktirajte administratorja."
+      ],
+      "An error occurred while removing tab. Please contact your administrator.": [
+        "Pri odstranjevanju zavihka je prišlo do napake. Kontaktirajte administratorja."
+      ],
+      "An error occurred while removing query. Please contact your administrator.": [
+        "Pri odstranjevanju poizvedbe je prišlo do napake. Kontaktirajte administratorja."
+      ],
+      "An error occurred while setting the tab database ID. Please contact your administrator.": [
+        "Pri določanju ID-ja v podatkovne baze za zavihek je prišlo do napake. Kontaktirajte administratorja."
+      ],
+      "An error occurred while setting the tab schema. Please contact your administrator.": [
+        "Pri določanju sheme zavihka je prišlo do napake. Kontaktirajte administratorja."
+      ],
+      "An error occurred while setting the tab autorun. Please contact your administrator.": [
+        "Pri določanju samodejnega zagona zavihka je prišlo do napake. Kontaktirajte administratorja."
+      ],
+      "An error occurred while setting the tab title. Please contact your administrator.": [
+        "Pri določanju naslova zavihka je prišlo do napake. Kontaktirajte administratorja."
+      ],
+      "Your query was saved": ["Vaša poizvedba je shranjena"],
+      "Your query could not be saved": ["Vaše poizvedbe ni mogoče shraniti"],
+      "Your query was updated": ["Vaša poizvedba je posodobljena"],
+      "Your query could not be updated": [
+        "Vaše poizvedbe ni mogoče posodobiti"
+      ],
+      "An error occurred while storing your query in the backend. To avoid losing your changes, please save your query using the \"Save Query\" button.": [
+        "Pri shranjevanju vaše poizvedbe v sistem je prišlo do napake. Da ne izgubite sprememb, shranite poizvedbo z gumbom \"Shrani poizvedbo\"."
+      ],
+      "An error occurred while setting the tab template parameters. Please contact your administrator.": [
+        "Pri določanju parametrov predloge zavihka je prišlo do napake. Kontaktirajte administratorja."
+      ],
+      "An error occurred while fetching table metadata": [
+        "Pri pridobivanju metapodatkov tabele je prišlo do napake"
+      ],
+      "An error occurred while fetching table metadata. Please contact your administrator.": [
+        "Pri pridobivanju metapodatkov tabele je prišlo do napake. Kontaktirajte administratorja."
+      ],
+      "An error occurred while expanding the table schema. Please contact your administrator.": [
+        "Pri širitvi sheme tabele je prišlo do napake. Kontaktirajte administratorja."
+      ],
+      "An error occurred while collapsing the table schema. Please contact your administrator.": [
+        "Pri krčenju sheme tabele je prišlo do napake. Kontaktirajte administratorja."
+      ],
+      "An error occurred while removing the table schema. Please contact your administrator.": [
+        "Pri odstranjevanju sheme tabele je prišlo do napake. Kontaktirajte administratorja."
+      ],
+      "Shared query": ["Deljene poizvedbe"],
+      "The datasource couldn't be loaded": [
+        "Podatkovnega vira ni mogoče naložiti"
+      ],
+      "An error occurred while creating the data source": [
+        "Pri ustvarjanju podatkovnega vira je prišlo do težave"
+      ],
+      "An error occurred while fetching function names.": [
+        "Pri pridobivanju imen funkcij je prišlo do napake."
+      ],
+      "SQL Lab uses your browser's local storage to store queries and results.\n Currently, you are using ${currentUsage.toFixed(\r\n            2,\r\n          )} KB out of ${LOCALSTORAGE_MAX_USAGE_KB} KB. storage space.\n To keep SQL Lab from crashing, please delete some query tabs.\n You can re-access these queries by using the Save feature before you delete the tab. Note that you will need to close other SQL Lab windows before you do this.": [
+        "SQL laboratorij za shranjevanje poizvedb in rezultatov uporablja brskalnikovo lokalno shrambo.\nTrenutno uporabljate ${currentUsage.toFixed(\r\n            2,\r\n          )} KB od ${LOCALSTORAGE_MAX_USAGE_KB} KB prostora shrambe.\nDa se izognete sesutju SQL laboratorija, izbrišite nekaj zavihkov s poizvedbami.\nTe poizvedbe lahko ponovno uporabite, tako da jih pred izbrisom shranite. Preden storite to, boste morali zapreti druga okna SQL laboratorija."
+      ],
+      "Estimate selected query cost": ["Oceni potratnost izbrane poizvedbe"],
+      "Estimate cost": ["Oceni potratnost"],
+      "Cost estimate": ["Ocena potratnosti"],
+      "Creating a data source and creating a new tab": [
+        "Ustvarjanje podatkovnega vira in novega zavihka"
+      ],
+      "An error occurred": ["Prišlo je do napake"],
+      "Explore the result set in the data exploration view": [
+        "Raziščite rezultate v pogledu raziskovanja podatkov"
+      ],
+      "This query took %s seconds to run, ": [
+        "Trajanje poizvedbe v sekundah: %s, "
+      ],
+      "and the explore view times out at %s seconds ": [
+        "čas izteka raziskovalnega pogleda v sekundah: %s "
+      ],
+      "following this flow will most likely lead to your query timing out. ": [
+        "s takšnim potekom, bo poizvedba najverjetneje potekla. "
+      ],
+      "We recommend your summarize your data further before following that flow. ": [
+        "Priporočamo, da zahtevane podatke pred nadaljevanjem strnete. "
+      ],
+      "If activated you can use the ": ["Če je aktivirana, lahko uporabite "],
+      "feature to store a summarized data set that you can then explore.": [
+        "funkcijo shranjevanja strnjenega podatkovnega seta, ki ga lahko raziščete."
+      ],
+      "Column name(s) ": ["Imena stolpcev "],
+      "cannot be used as a column name. The column name/alias \"__timestamp\"\r\n          is reserved for the main temporal expression, and column aliases ending with\r\n          double underscores followed by a numeric value (e.g. \"my_col__1\") are reserved\r\n          for deduplicating duplicate column names. Please use aliases to rename the\r\n          invalid column names.": [
+        "ni mogoče uporabiti kot imena stolpcev. Ime stolpca \"__timestamp\"\r\n          je rezervirano za glavni časovni izraz. Imena stolpcev, ki se končajo z\r\n          dvojnim podčrtajem, ki mu sledi številska vrednost (npr. \"moj_stolpec__1\" so rezervirana\r\n          za deduplikacijo duplikatov imen stolpcev. Za preimenovanje neustreznih imen\r\n          uporabite psevdonime."
+      ],
+      "Source SQL": ["Izvorni SQL"],
+      "Raw SQL": ["Surovi SQL"],
+      "SQL": ["SQL"],
+      "No query history yet...": ["Zgodovine poizvedb še ni..."],
+      "An error occurred when refreshing queries": [
+        "Pri osveževanju poizvedb je prišlo do napake"
+      ],
+      "It seems you don't have access to any database": [
+        "Zdi se, da nimate dostopa do nobene podatkovne baz"
+      ],
+      "Filter by user": ["Filtriraj po uporabniku"],
+      "Filter by database": ["Filtriraj po podatkovni bazi"],
+      "Query search string": ["Iskalni niz za poizvedbo"],
+      "[From]-": ["[Od]-"],
+      "[To]-": ["[Do]-"],
+      "Filter by status": ["Filtriraj po statusu"],
+      "Edit": ["Urejanje"],
+      "View results": ["Ogled rezultatov"],
+      "Data preview": ["Ogled podatkov"],
+      "Overwrite text in the editor with a query on this table": [
+        "Besedilo v urejevalniku prepišite s poizvedbo na to tabelo"
+      ],
+      "Run query in a new tab": ["Zaženi poizvedbo v novem zavihku"],
+      "Remove query from log": ["Odstrani poizvedbo iz dnevnika"],
+      "An error occurred saving dataset": [
+        "Pri shranjevanju podatkovnega seta je prišlo do napake"
+      ],
+      "Download to CSV": ["Izvozi kot CSV"],
+      "Copy to Clipboard": ["Kopiraj na odložišče"],
+      "Filter results": ["Filtriraj rezultate"],
+      "The number of results displayed is limited to %(rows)d by the configuration DISPLAY_MAX_ROWS. ": [
+        "Število prikazanih rezultatov je omejeno na %(rows)d preko parametra DISPLAY_MAX_ROWS. "
+      ],
+      "Please add additional limits/filters or download to csv to see more rows up to ": [
+        "Dodajte omejitve/filtre ali izvozite csv, če želite videti več vrstic do "
+      ],
+      "the %(limit)d limit.": ["omejitve %(limit)d ."],
+      "The number of results displayed is limited to %(rows)d. ": [
+        "Število prikazanih rezultatov je omejeno na %(rows)d. "
+      ],
+      "Please add additional limits/filters, download to csv, or contact an admin ": [
+        "Dodajte omejitve/filtre ali izvozite csv oz. kontaktirajte administratorja "
+      ],
+      "to see more rows up to the %(limit)d limit.": [
+        "za prikaz več vrstic, kot je omejitev %(limit)d ."
+      ],
+      "The number of rows displayed is limited to %(rows)d by the query": [
+        "Število prikazanih vrstic je omejeno na %(rows)d s poizvedbo"
+      ],
+      "The number of rows displayed is limited to %(rows)d by the limit dropdown.": [
+        "Število prikazanih rezultatov je omejeno na %(rows)d s poizvedbo."
+      ],
+      "The number of rows displayed is limited to %(rows)d by the query and limit dropdown.": [
+        "Število prikazanih vrstic je omejeno na %(rows)d s poizvedbo in spustnim izbirnikom omejitev."
+      ],
+      "%(rows)d rows returned": ["%(rows)d vrnjenih vrstic"],
+      "The number of rows displayed is limited to %s by the dropdown.": [
+        "Število prikazanih vrstic je omejeno na %s s spustnim izbirnikom."
+      ],
+      "Query was stopped": ["Poizvedba je bila ustavljena"],
+      "Database error": ["Napaka podatkovne baze"],
+      "was created": ["ustvarjeno"],
+      "Query in a new tab": ["Poizvedba v novem zavihku"],
+      "The query returned no data": ["Poizvedba ni vrnila podatkov"],
+      "Fetch data preview": ["Pridobi predogled podatkov"],
+      "Refetch results": ["Ponovno pridobi rezultate"],
+      "Track job": ["Sledi opravilom"],
+      "Stop": ["Ustavi"],
+      "Run selection": ["Zaženi izbrano"],
+      "Run": ["Zaženi"],
+      "Stop running (Ctrl + x)": ["Ustavi (Ctrl + x)"],
+      "Run query (Ctrl + Return)": ["Zaženi poizvedbo (Ctrl + Return)"],
+      "Save & Explore": ["Shrani & Razišči"],
+      "Overwrite & Explore": ["Prepiši & Razišči"],
+      "Undefined": ["Ni definirano"],
+      "Save": ["Shrani"],
+      "Save as": ["Shrani kot"],
+      "Save query": ["Shrani poizvedbo"],
+      "Save as new": ["Shrani kot novo"],
+      "Update": ["Posodobi"],
+      "Label for your query": ["Ime vaše poizvedbe"],
+      "Write a description for your query": ["Dodajte opis vaše poizvedbe"],
+      "Schedule query": ["Urnik poizvedb"],
+      "Schedule": ["Urnik"],
+      "There was an error with your request": [
+        "Pri zahtevi je prišlo do napake"
+      ],
+      "Please save the query to enable sharing": [
+        "Shranite poizvedbo za deljenje"
+      ],
+      "Copy query link to your clipboard": [
+        "Kopiraj povezavo do poizvedbe v odložišče"
+      ],
+      "Save the query to enable this feature": [
+        "Za omogočenje te funkcije shranite poizvedbo"
+      ],
+      "Copy link": ["Kopiraj povezavo"],
+      "Run query": ["Zaženi poizvedbo"],
+      "New tab": ["Nov zavihek"],
+      "Untitled query": ["Neimenovana poizvedba"],
+      "Stop query": ["Ustavi poizvedbo"],
+      "Schedule the query periodically": ["Periodično zaganjaj poizvedbo"],
+      "You must run the query successfully first": [
+        "Najprej morate uspešno izvesti poizvedbo"
+      ],
+      "Autocomplete": ["Samodokončaj"],
+      "CREATE TABLE AS": ["CREATE TABLE AS"],
+      "CREATE VIEW AS": ["CREATE VIEW AS"],
+      "Estimate the cost before running a query": [
+        "Oceni potratnost pred zagonom poizvedbe"
+      ],
+      "Reset state": ["Ponastavi stanje"],
+      "Enter a new title for the tab": ["Vnesite novo naslov zavihka"],
+      "Untitled Query %s": ["Neimenovana poizvedba %s"],
+      "Close tab": ["Zapri zavihek"],
+      "Rename tab": ["Preimenuj zavihek"],
+      "Expand tool bar": ["Razširi orodno vrstico"],
+      "Hide tool bar": ["Skrij orodno vrstico"],
+      "Close all other tabs": ["Zapri vse ostale zavihke"],
+      "Duplicate tab": ["Podvoji zavihek"],
+      "New tab (Ctrl + q)": ["Nov zavihek (Ctrl + q)"],
+      "New tab (Ctrl + t)": ["Nov zavihek (Ctrl + t)"],
+      "Copy partition query to clipboard": [
+        "Kopiraj particijsko poizvedbo na odložišče"
+      ],
+      "latest partition:": ["zadnja particija:"],
+      "Keys for table": ["Ključi za tabele"],
+      "View keys & indexes (%s)": ["Ogled ključev in indeksov (%s)"],
+      "Sort columns alphabetically": ["Razvrsti stolpce po abecedi"],
+      "Original table column order": ["Vrstni red stolpcev izvorne tabele"],
+      "Copy SELECT statement to the clipboard": [
+        "Kopiraj stavek SELECT na odložišče"
+      ],
+      "Show CREATE VIEW statement": ["Prikaži CREATE VIEW stavek"],
+      "CREATE VIEW statement": ["CREATE VIEW stavek"],
+      "Remove table preview": ["Odstrani predogled tabele"],
+      "Edit template parameters": ["Uredi parametre predloge"],
+      "Invalid JSON": ["Neveljaven JSON"],
+      "No stored results found, you need to re-run your query": [
+        "Rezultatov še ni shranjenih, ponovno morate zagnati poizvedbo"
+      ],
+      "Run a query to display results here": [
+        "Za prikaz rezultatov morate zagnati poizvedbo"
+      ],
+      "Preview: `%s`": ["Predogled: `%s`"],
+      "Results": ["Rezultati"],
+      "Query history": ["Zgodovina poizvedb"],
+      "Create a new chart": ["Ustvari nov grafikon"],
+      "Choose a dataset": ["Izberite podatkovni set"],
+      "If the dataset you are looking for is not available in the list, follow the instructions on how to add it in the Superset tutorial.": [
+        "Če podatkovnega seta, ki ga iščete, ni na seznamu, sledite navodilom za dodajanje v navodilih za Superset."
+      ],
+      "Choose a visualization type": ["Izberite tip vizualizacije"],
+      "Create new chart": ["Ustvari nov grafikon"],
+      "An error occurred while loading the SQL": [
+        "Pri nalaganju SQL je prišlo do napake"
+      ],
+      "Updating chart was stopped": [
+        "Posodabljanje grafikona je bilo ustavljeno"
+      ],
+      "An error occurred while rendering the visualization: %s": [
+        "Pri prikazovanju vizualizacije je prišlo do napake: %s"
+      ],
+      "Network error.": ["Napaka omrežja."],
+      "Click to see difference": ["Kliknite za prikaz razlike"],
+      "Altered": ["Spremenjeno"],
+      "Chart changes": ["Spremembe grafikona"],
+      "Superset chart": ["Superset grafikon"],
+      "Check out this chart in dashboard:": [
+        "Preizkusite ta grafikon v nadzorni plošči:"
+      ],
+      "Select ...": ["Izberite ..."],
+      "Loaded data cached": ["Podatki so naloženi v predpomnilnik"],
+      "Loaded from cache": ["Naloženo iz predpomnilnika"],
+      "Click to force-refresh": ["Kliknite za prisilno osvežitev"],
+      "cached": ["predpomnjen"],
+      "Certified by %s": ["Certificiral/a %s"],
+      "Copy to clipboard": ["Kopiraj na odložišče"],
+      "Copied to clipboard!": ["Kopirano na odložišče!"],
+      "Sorry, your browser does not support copying. Use Ctrl / Cmd + C!": [
+        "Vaš brskalnik ne podpira kopiranja. Uporabite Ctrl / Cmd + C!"
+      ],
+      "every": ["vsak"],
+      "every month": ["vsak mesec"],
+      "every day of the month": ["vsak dan v mesecu"],
+      "day of the month": ["dan v mesecu"],
+      "every day of the week": ["vsak dan v tednu"],
+      "day of the week": ["dan v tednu"],
+      "every hour": ["vsako uro"],
+      "every minute UTC": ["vsako minuto UTC"],
+      "year": ["leto"],
+      "month": ["mesec"],
+      "week": ["teden"],
+      "day": ["dan"],
+      "hour": ["ura"],
+      "minute": ["minuta"],
+      "reboot": ["ponovni zagon"],
+      "Every": ["Vsak"],
+      "in": ["v"],
+      "on": ["na"],
+      "and": ["in"],
+      "at": ["v"],
+      ":": [":"],
+      "minute(s) UTC": ["minute UTC"],
+      "Invalid cron expression": ["Neveljaven cron izraz"],
+      "Clear": ["Počisti"],
+      "Sunday": ["Nedelja"],
+      "Monday": ["Ponedeljek"],
+      "Tuesday": ["Torek"],
+      "Wednesday": ["Sreda"],
+      "Thursday": ["Četrtek"],
+      "Friday": ["Petek"],
+      "Saturday": ["Sobota"],
+      "January": ["Januar"],
+      "February": ["Februar"],
+      "March": ["Marec"],
+      "April": ["April"],
+      "May": ["Maj"],
+      "June": ["Junij"],
+      "July": ["Julij"],
+      "August": ["Avgust"],
+      "September": ["September"],
+      "October": ["Oktober"],
+      "November": ["November"],
+      "December": ["December"],
+      "SUN": ["NED"],
+      "MON": ["PON"],
+      "TUE": ["TOR"],
+      "WED": ["SRE"],
+      "THU": ["ČET"],
+      "FRI": ["PET"],
+      "SAT": ["SOB"],
+      "JAN": ["JAN"],
+      "FEB": ["FEB"],
+      "MAR": ["MAR"],
+      "APR": ["APR"],
+      "MAY": ["MAJ"],
+      "JUN": ["JUN"],
+      "JUL": ["JUL"],
+      "AUG": ["AVG"],
+      "SEP": ["SEP"],
+      "OCT": ["OKT"],
+      "NOV": ["NOV"],
+      "DEC": ["DEC"],
+      "Error while fetching schema list": [
+        "Napaka pri pridobivanju seznama shem"
+      ],
+      "Error while fetching database list": [
+        "Napaka pri pridobivanju seznama podatkovnih baz"
+      ],
+      "Database:": ["Podatkovna baza:"],
+      "Select a database": ["Izberite podatkovno bazo"],
+      "Force refresh schema list": ["Osveži seznam shem"],
+      "Select a schema (%s)": ["Izberite shemo (%s)"],
+      "Schema:": ["Shema:"],
+      "datasource": ["podatkovni vir"],
+      "schema": ["shema"],
+      "delete": ["izbriši"],
+      "Type \"%s\" to confirm": ["Vnesite \"%s\" za potrditev"],
+      "DELETE": ["IZBRIŠI"],
+      "Click to edit": ["Kliknite za urejanje"],
+      "You don't have the rights to alter this title.": [
+        "Nimate pravic za spreminjanje tega naslova."
+      ],
+      "Unexpected error": ["Nepričakovana napaka"],
+      "This may be triggered by:": ["To je lahko sproženo z/s:"],
+      "Please reach out to the Chart Owner for assistance.": [
+        "Za pomoč se obrnite na lastnika grafikona."
+      ],
+      "Chart Owner: %s": ["Lastnik grafikona: %s"],
+      "%s Error": ["%s napaka"],
+      "See more": ["Oglejte si več"],
+      "See less": ["Oglejte si manj"],
+      "Copy message": ["Kopiraj sporočilo"],
+      "Close": ["Zapri"],
+      "This was triggered by:": ["To je bilo sproženo z/s:"],
+      "Did you mean:": ["Ste mislili:"],
+      "%(suggestion)s instead of \"%(undefinedParameter)s?\"": [
+        "%(suggestion)s namesto \"%(undefinedParameter)s?\""
+      ],
+      "Parameter error": ["Napaka parametra"],
+      "We’re having trouble loading this visualization. Queries are set to timeout after %s second.": [
+        "Težava pri nalaganju vizualizacije. Časovni iztek poizvedb je nastavljen na %s sekund."
+      ],
+      "We’re having trouble loading these results. Queries are set to timeout after %s second.": [
+        "Težava pri nalaganju rezultatov. Časovni iztek poizvedb je nastavljen na %s sekund."
+      ],
+      "Timeout error": ["Napaka pretečenega časa"],
+      "Click to favorite/unfavorite": [
+        "Kliknite za priljubljeno/nepriljubljeno"
+      ],
+      "Cell content": ["Vsebina celice"],
+      "The import was successful": ["Uvoz je uspel"],
+      "OVERWRITE": ["OVERWRITE"],
+      "Overwrite": ["Prepiši"],
+      "Import": ["Uvozi"],
+      "Import %s": ["Uvozi %s"],
+      "Last Updated %s": ["Zadnja posodobitev %s"],
+      "Sort:": ["Razvrščanje:"],
+      "%s Selected": ["Izbranih: %s"],
+      "Deselect all": ["Počisti izbor"],
+      "No Data": ["Ni podatkov"],
+      "%s-%s of %s": ["%s-%s od %s"],
+      "SQL query": ["SQL poizvedba"],
+      "About": ["O programu"],
+      "Documentation": ["Dokumentacija"],
+      "Report a bug": ["Sporočite napako"],
+      "OK": ["OK"],
+      "An error occurred while fetching dashboards": [
+        "Prišlo je do napake pri pridobivanju nadzornih plošč"
+      ],
+      "Error while fetching table list": [
+        "Napaka pri pridobivanju seznama tabel"
+      ],
+      "Select table or type table name": ["Izberite ali vnesite ime tabele"],
+      "Type to search ...": ["Vnesite za iskanje ..."],
+      "Select table ": ["Izberi tabelo "],
+      "Force refresh table list": ["Osveži seznam tabel"],
+      "See table schema": ["Ogled sheme tabele"],
+      "%s%s": ["%s%s"],
+      "There is not enough space for this component. Try decreasing its width, or increasing the destination width.": [
+        "Za to komponento ni dovolj prostora. Poskusite zmanjšati širino ali pa povečati širino cilja."
+      ],
+      "Can not move top level tab into nested tabs": [
+        "Najvišjega zavihka ni mogoče premakniti v gnezdene zavihke"
+      ],
+      "This chart has been moved to a different filter scope.": [
+        "Ta grafikon je bil prestavljen v drug obseg filtrov."
+      ],
+      "There was an issue fetching the favorite status of this dashboard.": [
+        "Pri pridobivanju statusa \"priljubljeno\" za to nadzorno ploščo je prišlo do težave."
+      ],
+      "There was an issue favoriting this dashboard.": [
+        "Pri uvrščanju nadzorne plošče med priljubljene je prišlo do težave."
+      ],
+      "This dashboard is now ${nowPublished}": [
+        "Ta nadzorna plošča je sedaj ${nowPublished}"
+      ],
+      "You do not have permissions to edit this dashboard.": [
+        "Nimate dovoljenj za urejanje te nadzorne plošče."
+      ],
+      "This dashboard was saved successfully.": [
+        "Nadzorna plošča je bila uspešno shranjena."
+      ],
+      "Could not fetch all saved charts": [
+        "Vseh shranjenih grafikonov ni bilo mogoče pridobiti"
+      ],
+      "Sorry there was an error fetching saved charts: ": [
+        "Prišlo je do napake pri pridobivanju shranjenih grafikonov: "
+      ],
+      "Visualization": ["Vizualizacija"],
+      "Data source": ["Podatkovni vir"],
+      "Added": ["Dodano"],
+      "Components": ["Komponente"],
+      "Any color palette selected here will override the colors applied to this dashboard's individual charts": [
+        "Na tem mestu izbrana barvna shema bo nadomestila barve posameznih grafikonov v tej nadzorni plošči"
+      ],
+      "Color scheme": ["Barvna shema"],
+      "You have unsaved changes.": ["Imate neshranjene spremembe."],
+      "There is no chart definition associated with this component, could it have been deleted?": [
+        "S to komponento ni povezana nobena definicija grafikona. Ali je bila izbrisana?"
+      ],
+      "Delete this container and save to remove this message.": [
+        "Izbrišite ta okvir in shranite za odpravo tega sporočila."
+      ],
+      "Don't refresh": ["Ne osvežuj"],
+      "10 seconds": ["10 sekund"],
+      "30 seconds": ["30 sekund"],
+      "1 minute": ["1 minuta"],
+      "5 minutes": ["5 minut"],
+      "30 minutes": ["30 minut"],
+      "1 hour": ["1 ura"],
+      "6 hours": ["6 ur"],
+      "12 hours": ["12 ur"],
+      "24 hours": ["24 ur"],
+      "Refresh interval": ["Interval osveževanja"],
+      "Refresh frequency": ["Frekvenca osveževanja"],
+      "Are you sure you want to proceed?": ["Ali želite nadaljevati?"],
+      "Save for this session": ["Shranite za to sejo"],
+      "You must pick a name for the new dashboard": [
+        "Izbrati morate ime nove nadzorne plošče"
+      ],
+      "Save dashboard": ["Shrani nadzorno ploščo"],
+      "Overwrite Dashboard [%s]": ["Prepiši nadzorno ploščo [%s]"],
+      "Save as:": ["Shrani kot:"],
+      "[dashboard name]": ["[ime nadzorne plošče]"],
+      "also copy (duplicate) charts": ["kopiraj tudi (podvoji) grafikone"],
+      "Filter your charts": ["Filtriraj grafikone"],
+      "Sort by": ["Razvrsti po"],
+      "Cross Filter Scoping": ["Obseg cross-filtra"],
+      "Load a template": ["Naloži predlogo"],
+      "Load a CSS template": ["Naloži CSS predlogo"],
+      "Live CSS editor": ["CSS urejevalnik v živo"],
+      "Applied Cross Filters (%d)": ["Uporabljeni cross-filtri (%d)"],
+      "Applied Filters (%d)": ["Uporabljeni filtri (%d)"],
+      "Incompatible Filters (%d)": ["Neskladni filtri (%d)"],
+      "Unset Filters (%d)": ["Neuporabljeni filtri (%d)"],
+      "This dashboard is currently force refreshing; the next force refresh will be in %s.": [
+        "Nadzorna plošča se trenutno prisilno osvežuje. Naslednja prisilna osvežitev bo v %s."
+      ],
+      "Your dashboard is too large. Please reduce the size before save it.": [
+        "Vaša nadzorna plošča je prevelika. Pred shranjevanjem jo zmanjšajte."
+      ],
+      "Discard changes": ["Zavrzi spremembe"],
+      "Edit dashboard": ["Uredi nadzorno ploščo"],
+      "An error occurred while fetching available CSS templates": [
+        "Pri pridobivanju CSS predlog je prišlo do napake"
+      ],
+      "Superset dashboard": ["Superset nadzorna plošča"],
+      "Check out this dashboard: ": ["Preizkusite to nadzorno ploščo: "],
+      "Copy dashboard URL": ["Kopiraj URL nadzorne plošče"],
+      "Share dashboard by email": ["Deli nadzorno ploščo po e-pošti"],
+      "Refresh dashboard": ["Osveži nadzorno ploščo"],
+      "Set auto-refresh interval": ["Nastavi interval samodejnega osveževanja"],
+      "Set filter mapping": ["Nastavi shemo filtrov"],
+      "Edit dashboard properties": ["Uredi lastnosti nadzorne plošče"],
+      "Edit CSS": ["Uredi CSS"],
+      "Download as image": ["Izvozi kot sliko"],
+      "Toggle fullscreen": ["Preklopi celozaslonski način"],
+      "An error has occurred": ["Prišlo je do napake"],
+      "You do not have permission to edit this dashboard": [
+        "Nimate dovoljenja za urejanje te nadzorne plošče"
+      ],
+      "A valid color scheme is required": [
+        "Zahtevana je veljavna barvna shema"
+      ],
+      "The dashboard has been saved": ["Nadzorna plošča je bila shranjena"],
+      "Access": ["Dostop"],
+      "Owners is a list of users who can alter the dashboard. Searchable by name or username.": [
+        "\"Lastniki\" je seznam uporabnikov, ki lahko spreminjajo nadzorno ploščo. Iskanje je možno po imenu ali uporabniškem imenu."
+      ],
+      "Colors": ["Barve"],
+      "Roles is a list which defines access to the dashboard. Granting a role access to a dashboard will bypass dataset level checks. If no roles defined then the dashboard is available to all roles.": [
+        "\"Vloge\" je seznam, ki definira dostop do nadzorne plošče. Dodelitev vloge za dostop do nadzorne plošče bo obšlo preverjanje na nivoju podatkovnega seta. Če vloga ni definirana, bo nadzorna plošča dostopna vsem vlogam."
+      ],
+      "Apply": ["Uporabi"],
+      "Dashboard properties": ["Lastnosti nadzorne plošče"],
+      "Basic information": ["Osnovne informacije"],
+      "URL slug": ["URL slug"],
+      "A readable URL for your dashboard": [
+        "Berljiv URL za vašo nadzorno ploščo"
+      ],
+      "Advanced": ["Napredno"],
+      "JSON metadata": ["JSON metapodatki"],
+      "This dashboard is not published, it will not show up in the list of dashboards. Click here to publish this dashboard.": [
+        "Ta nadzorna plošča ni objavljena in se ne bo prikazala na seznamu nadzornih plošč. Kliknite tukaj za njeno objavo."
+      ],
+      "This dashboard is not published which means it will not show up in the list of dashboards. Favorite it to see it there or access it by using the URL directly.": [
+        "Ta nadzorna plošča ni objavljena in se ne bo prikazala na seznamu nadzornih plošč. Uvrstite jo med priljubljene, da jo boste videli tam, ali pa uporabite URL za neposredni dostop."
+      ],
+      "This dashboard is published. Click to make it a draft.": [
+        "Ta nadzorna plošča je objavljena. Kliknite, da jo uvrstite med osnutke."
+      ],
+      "Draft": ["Osnutek"],
+      "Annotation layers are still loading.": [
+        "Sloj z oznakami se še vedno nalaga."
+      ],
+      "One ore more annotation layers failed loading.": [
+        "Eden ali več slojev z oznakami se ni naložil."
+      ],
+      "Emitted values": ["Oddane vrednosti"],
+      "Cached %s": ["Predpomnjeno %s"],
+      "Fetched %s": ["Pridobljeno %s"],
+      "Minimize chart": ["Pomanjšaj grafikon"],
+      "Maximize chart": ["Povečaj grafikon"],
+      "Force refresh": ["Osveži"],
+      "Toggle chart description": ["Preklopi opis grafikona"],
+      "View chart in Explore": ["Ogled grafikona v Raziskovalcu"],
+      "View query": ["Ogled poizvedbe"],
+      "Copy chart URL": ["Kopiraj URL grafikona"],
+      "Share chart by email": ["Deli grafikon po e-pošti"],
+      "Check out this chart: ": ["Preizkusite ta grafikon: "],
+      "Export CSV": ["Izvozi CSV"],
+      "Cross-filter scoping": ["Obseg cross-filtra"],
+      "Search...": ["Iskanje ..."],
+      "No filter is selected.": ["Noben filter ni izbran."],
+      "Editing 1 filter:": ["Urejanje enega filtra:"],
+      "Batch editing %d filters:": ["Skupinsko urejanje %d filtrov:"],
+      "Configure filter scopes": ["Nastavi obseg filtrov"],
+      "There are no filters in this dashboard.": [
+        "V nadzorni plošči ni filtrov."
+      ],
+      "Expand all": ["Razširi vse"],
+      "Collapse all": ["Skrči vse"],
+      "This markdown component has an error.": [
+        "Markdown komponenta ima napako."
+      ],
+      "This markdown component has an error. Please revert your recent changes.": [
+        "Markdown komponenta ima napako. Povrnite nedavne spremembe."
+      ],
+      "Delete dashboard tab?": ["Ali izbrišem zavihek nadzorne plošče?"],
+      "Divider": ["Ločilnik"],
+      "Header": ["Glava"],
+      "Row": ["Vrstica"],
+      "Tabs": ["Zavihki"],
+      "Preview": ["Predogled"],
+      "Sorry, your browser does not support copying.": [
+        "Vaš brskalnik ne podpira kopiranja."
+      ],
+      "Sorry, something went wrong. Try again later.": [
+        "Nekaj je šlo narobe. Poskusite ponovno kasneje."
+      ],
+      "All Filters (${filterValues.length})": [
+        "Vsi filtri (${filterValues.length})"
+      ],
+      "Filter Sets (${filterSetFilterValues.length})": [
+        "Nastavljeni filtri (${filterSetFilterValues.length})"
+      ],
+      "Select parent filters": ["Izberi starševske filtre"],
+      "Check configuration": ["Preveri nastavitve"],
+      "Cannot load filter": ["Filtra ni mogoče naložiti"],
+      "Editing filter set:": ["Urejanje seta filtrov:"],
+      "Filter set with this name already exists": [
+        "Set filtrov z enakim imenom že obstaja"
+      ],
+      "Filter set already exists": ["Set filtrov že obstaja"],
+      "This filter set is identical to: \"%s\"": [
+        "Ta set filtrov je enak: \"%s\""
+      ],
+      "Remove invalid filters": ["Odstrani neveljavne filtre"],
+      "Rebuild": ["Obnovi"],
+      "Filters (%d)": ["Filtri (%d)"],
+      "This filter doesn't exist in dashboard. It will not be applied.": [
+        "Ta filter ne obstaja v nadzorni plošči in ne bo uveljavljen."
+      ],
+      "Filter metadata changed in dashboard. It will not be applied.": [
+        "Metapodatki filtra so se spremenili v nadzorni plošči. Ne bo uveljavljen."
+      ],
+      "None": ["Brez"],
+      "Please filter set name": ["Vnesite ime seta filtrov"],
+      "Create": ["Ustvari"],
+      "Create new filter set": ["Ustvarite nov set filtrov"],
+      "New filter set": ["Nov set filtrov"],
+      "Please apply filter changes": ["Potrdite spremembe filtra"],
+      "Unknown value": ["Neznana vrednost"],
+      "Clear all": ["Počisti vse"],
+      "Add filter": ["Dodaj filter"],
+      "(Removed)": ["(Odstranjeno)"],
+      "Undo?": ["Povrni?"],
+      "New filter": ["Nov filter"],
+      "Filters configuration and scoping": ["Nastavitve in obseg filtrov"],
+      "Configuration": ["Nastavitve"],
+      "Scoping": ["Obseg"],
+      "Basic": ["Osnovno"],
+      "Filter name": ["Ime filtra"],
+      "Name is required": ["Zahtevano je ime"],
+      "Filter Type": ["Tip filtra"],
+      "Dataset": ["Podatkovni set"],
+      "Dataset is required": ["Zahtevan je podatkovni set"],
+      "Filter has default value": ["Filter ima privzeto vrednost"],
+      "Default Value": ["Privzeta vrednost"],
+      "Default value is required": ["Zahtevana je privzeta vrednost"],
+      "Fill all required fields to enable \"Default Value\"": [
+        "Izpolnite vsa polja, da omogočite \"Privzeto vrednost\""
+      ],
+      "Apply changes instantly": ["Spremembe uporabi takoj"],
+      "Filter is hierarchical": ["Filter je hierarhičen"],
+      "Parent filter": ["Nadrejeni filter"],
+      "Parent filter is required": ["Zahtevan je nadrejeni filter"],
+      "Pre-filter available values": ["Predfiltriraj razpoložljive vrednosti"],
+      "Adhoc filters is required": ["Zahtevan je ad hoc filter"],
+      "Adhoc filters": ["Adhoc filtri"],
+      "Time range": ["Časovno obdobje"],
+      "Sort filter values": ["Razvrsti vrednosti filtra"],
+      "Sort type": ["Vrsta razvrščanja"],
+      "Sort ascending": ["Razvrsti naraščajoče"],
+      "Sort descending": ["Razvrsti padajoče"],
+      "Sort Metric": ["Mera za razvrščanje"],
+      "You have removed this filter.": ["Odstranili ste ta filter."],
+      "Restore Filter": ["Povrni filter"],
+      "Populate \"Default value\" to enable this control": [
+        "Izpolnite \"Privzeto vrednost\", da omogočite ta kontrolnik"
+      ],
+      "Apply to all panels": ["Uporabi za vse panele"],
+      "Apply to specific panels": ["Uporabi za določene panele"],
+      "Only selected panels will be affected by this filter": [
+        "Ta filter bo vplival le na izbrane panele"
+      ],
+      "All panels with this column will be affected by this filter": [
+        "Ta filter bo vplival na vse panele s tem stolpcem"
+      ],
+      "All panels": ["Vsi paneli"],
+      "Keep editing": ["Nadaljuj z urejanjem"],
+      "Yes, cancel": ["Da, prekini"],
+      "Are you sure you want to cancel?": ["Ali želite prekiniti?"],
+      "will not be saved.": ["ne bo shranjeno."],
+      "Transparent": ["Prozorno"],
+      "White": ["Belo"],
+      "All filters": ["Vsi filtri"],
+      "All charts": ["Vsi grafikoni"],
+      "Small": ["Majhno"],
+      "Medium": ["Srednje"],
+      "Large": ["Veliko"],
+      "Tab title": ["Naslov zavihka"],
+      "Warning! Changing the dataset may break the chart if the metadata does not exist.": [
+        "Opozorilo! Sprememba podatkovnega seta lahko pokvari grafikon, če metapodatki ne obstajajo."
+      ],
+      "Changing the dataset may break the chart if the chart relies on columns or metadata that does not exist in the target dataset": [
+        "Sprememba podatkovnega seta lahko pokvari grafikon, če se le-ta zanaša na stolpce ali metapodatke, ki ne obstajajo v ciljnem podatkovnem nizu"
+      ],
+      "dataset": ["podatkovni set"],
+      "Change dataset": ["Spremeni podatkovni set"],
+      "Warning!": ["Opozorilo!"],
+      "Search / Filter": ["Iskanje / Filter"],
+      "Physical (table or view)": ["Fizičen (tabela ali pogled)"],
+      "Virtual (SQL)": ["Virtualen (SQL)"],
+      "SQL expression": ["SQL izraz"],
+      "Data type": ["Tip podatka"],
+      "Datetime format": ["Oblika datum-časa"],
+      "The pattern of timestamp format. For strings use ": [
+        "Vzorec zapisa časovne značke. Za znakovne nize uporabite "
+      ],
+      "Python datetime string pattern": ["Pythonov vzorec zapisa datum-časa"],
+      " expression which needs to adhere to the ": [" , ki mora upoštevati "],
+      "ISO 8601": ["ISO 8601"],
+      " standard to ensure that the lexicographical ordering\r\n                      coincides with the chronological ordering. If the\r\n                      timestamp format does not adhere to the ISO 8601 standard\r\n                      you will need to define an expression and type for\r\n                      transforming the string into a date or timestamp. Note\r\n                      currently time zones are not supported. If time is stored\r\n                      in epoch format, put `epoch_s` or `epoch_ms`. If no pattern\r\n                      is specified we fall back to using the optional defaults on a per\r\n                      database/column name level via the extra parameter.": [
+        " standard, ki zagotavlja, de se leksikografsko razvrščanje\r\n                      sklada s kronološkim razvrščanjem. Če oblika\r\n                      časovne značke ni v skladu s standardom ISO 8601,\r\n                      boste morali definirati izraz in tip za transformacijo\r\n                      znakovnega niza v datum ali časovno značko.\r\n                      Trenutno časovni pasovi niso podprti.\r\n                      Če je čas shranjen v obliki epohe, dodajte `epoch_s` ali `epoch_ms`.\r\n                      Če ni podan vzorec, se uporabijo privzete vrednosti na podlagi imena\r\n                      podatkovne baze oz. stolpca s pomočjo dodatnega parametra."
+      ],
+      "Is dimension": ["Dimenzija"],
+      "Is filterable": ["Filtriranje"],
+      "Modified columns: %s": ["Spremenjeni stolpci: %s"],
+      "Removed columns: %s": ["Odstranjeni stolpci: %s"],
+      "New columns added: %s": ["Dodani novi stolpci: %s"],
+      "Metadata has been synced": ["Metapodatki so sinhronizirani"],
+      "Column name [%s] is duplicated": ["Ime stolpca [%s] je podvojeno"],
+      "Metric name [%s] is duplicated": ["Ime mere [%s] je podvojeno"],
+      "Calculated column [%s] requires an expression": [
+        "Izračunan stolpec [%s] zahteva izraz"
+      ],
+      "Default URL": ["Privzeti URL"],
+      "Default URL to redirect to when accessing from the dataset list page": [
+        "Privzeti URL za preusmeritev, ko dostopate iz strani s seznamom podatkovnih setov"
+      ],
+      "Autocomplete filters": ["Samodokončaj filtre"],
+      "Whether to populate autocomplete filters options": [
+        "Če želite napolniti možnosti za samodokončanje filtrov"
+      ],
+      "Autocomplete query predicate": ["Predikat za samodokončanje poizvedb"],
+      "When using \"Autocomplete filters\", this can be used to improve performance of the query fetching the values. Use this option to apply a predicate (WHERE clause) to the query selecting the distinct values from the table. Typically the intent would be to limit the scan by applying a relative time filter on a partitioned or indexed time-related field.": [
+        "Ko uporabljate \"Samodokončaj filtre\", lahko s tem izboljšate hitrost pridobivanja rezultatov s poizvedbo. Z uporabo te možnosti dodate predikat (WHERE stavek) k poizvedbi za izbiro različnih vrednosti iz tabele. Običajno je namen omejiti poizvedbo z uporabo filtra za relativni čas na particioniranem ali indeksiranem časovnem polju."
+      ],
+      "Extra data to specify table metadata. Currently supports metadata of the format: `{ \"certification\": { \"certified_by\": \"Data Platform Team\", \"details\": \"This table is the source of truth.\" }, \"warning_markdown\": \"This is a warning.\" }`.": [
+        "Dodatni podatki za tabelo metapodatkov. Trenutno je podprta naslednja oblika zapisa metapodatkov: `{ \"certification\": { \"certified_by\": \"Tim za razvoj\", \"details\": \"Ta tabela je vir resnice.\" }, \"warning_markdown\": \"To je opozorilo.\" }`."
+      ],
+      "Owners of the dataset": ["Lastniki podatkovnega seta"],
+      "Cache timeout": ["Časovna omejitev predpomnilnika"],
+      "The duration of time in seconds before the cache is invalidated": [
+        "Trajanje (v sekundah) do razveljavitve predpomnilnika"
+      ],
+      "Hours offset": ["Urni premik"],
+      "The number of hours, negative or positive, to shift the time column. This can be used to move UTC time to local time.": [
+        "Število ur, negativno ali pozitivno, za zamik časovnega stolpca. Na ta način je mogoče UTC čas prestaviti na lokalni čas."
+      ],
+      "Spatial": ["Prostorski"],
+      "virtual": ["virtualni"],
+      "Dataset name": ["Ime podatkovnega seta"],
+      "When specifying SQL, the datasource acts as a view. Superset will use this statement as a subquery while grouping and filtering on the generated parent queries.": [
+        "Ko podajate SQL, se podatkovni vir obnaša kot pogled (view). Superset bo to izjavo uporabil kot podpoizvedbo, pri čemer bo grupiral in filtriral na podlagi ustvarjenih starševskih poizvedb."
+      ],
+      "The JSON metric or post aggregation definition.": [
+        "JSON mera ali po-agregacijska definicija."
+      ],
+      "Physical": ["Fizičen"],
+      "The pointer to a physical table (or view). Keep in mind that the chart is associated to this Superset logical table, and this logical table points the physical table referenced here.": [
+        "Kazalec na fizično tabelo (ali pogled). Grafikon je povezan s to Supersetovo logično tabelo, ki kaže na tukaj referencirano fizično tabelo."
+      ],
+      "Click the lock to make changes.": [
+        "Kliknite ključavnico, da omogočite spreminjanje."
+      ],
+      "Click the lock to prevent further changes.": [
+        "Kliknite ključavnico, da onemogočite spremembe."
+      ],
+      "D3 format": ["D3 format"],
+      "Certified by": ["Certificiral/a"],
+      "Person or group that has certified this metric": [
+        "Oseba ali skupina, ki je certificirala to mero"
+      ],
+      "Certification details": ["Podrobnosti certifikacije"],
+      "Details of the certification": ["Podrobnosti certifikacije"],
+      "Warning": ["Opozorilo"],
+      "Optional warning about use of this metric": [
+        "Opcijsko opozorilo za uporabo te mere"
+      ],
+      "Be careful.": ["Bodite previdni."],
+      "Changing these settings will affect all charts using this dataset, including charts owned by other people.": [
+        "Spreminjanje teh nastavitev bo vplivalo na vse grafikone, ki uporabljajo ta podatkovni set, vključno z grafikoni v lasti drugih oseb."
+      ],
+      "Source": ["Izvor"],
+      "Sync columns from source": ["Sinhroniziraj stolpce z virom"],
+      "Calculated columns": ["Izračunani stolpci"],
+      "Settings": ["Nastavitve"],
+      "The dataset has been saved": ["Podatkovni set je shranjen"],
+      "The dataset configuration exposed here\r\n                affects all the charts using this dataset.\r\n                Be mindful that changing settings\r\n                here may affect other charts\r\n                in undesirable ways.": [
+        "Tukaj prikazane nastavitve podatkovnega seta\r\n                vpliva na vse grafikone, ki uporabljajo\r\n                ta podatkovni set. Spreminjanje\r\n                nastavitev lahko nezaželeno vpliva\r\n                na druge grafikone."
+      ],
+      "Are you sure you want to save and apply changes?": [
+        "Ali resnično želite shraniti in uporabiti spremembe?"
+      ],
+      "Confirm save": ["Potrdite shranjevanje"],
+      "Edit Dataset ": ["Uredi podatkovni set "],
+      "Use legacy datasource editor": [
+        "Uporabi starejši urejevalnik podatkovnega vira"
+      ],
+      "Time column": ["Časovni stolpec"],
+      "Time grain": ["Granulacija časa"],
+      "Origin": ["Izhodišče"],
+      "Time granularity": ["Granulacija časa"],
+      "A reference to the [Time] configuration, taking granularity into account": [
+        "Sklic na nastavitve za [Čas], ki upošteva granulacijo"
+      ],
+      "Group by": ["Združevanje (Group by)"],
+      "One or many controls to group by": [
+        "En ali več kontrolnikov za združevanje"
+      ],
+      "One or many metrics to display": ["Ena ali več mer za prikaz"],
+      "Visualization type": ["Tip vizualizacije"],
+      "The type of visualization to display": ["Tip vizualizacije za prikaz"],
+      "Fixed color": ["Izbrana barva"],
+      "Use this to define a static color for all circles": [
+        "S tem definirate določeno barvo za vse kroge"
+      ],
+      "Right axis metric": ["Mera desne osi"],
+      "Choose a metric for right axis": ["Izberite mero za desno os"],
+      "Linear color scheme": ["Linearna barvna shema"],
+      "Color metric": ["P"],
+      "A metric to use for color": ["Mera za barvo"],
+      "One or many controls to pivot as columns": [
+        "En ali več kontrolnikov za stolpčno vrtenje"
+      ],
+      "Defines the origin where time buckets start, accepts natural dates as in `now`, `sunday` or `1970-01-01`": [
+        "Določa izhodišče, kadar se začnejo časovni razdelki. Sprejema naravne zapise kot so `zdaj`, `nedelja` ali `1970-01-01`"
+      ],
+      "The time granularity for the visualization. Note that you can type and use simple natural language as in `10 seconds`, `1 day` or `56 weeks`": [
+        "Granulacija časa za vizualizacijo. Uporabite lahko vnos z naravnim jezikom, kot npr. `10 sekund`, `1 dni` ali `56 tednov`"
+      ],
+      "The time column for the visualization. Note that you can define arbitrary expression that return a DATETIME column in the table. Also note that the filter below is applied against this column or expression": [
+        "Časovni stolpec za vizualizacijo. Določite lahko poljuben izraz, ki vrne DATETIME stolpec v tabeli. Spodnji filter se nanaša na ta stolpec ali izraz"
+      ],
+      "The time granularity for the visualization. This applies a date transformation to alter your time column and defines a new time granularity. The options here are defined on a per database engine basis in the Superset source code.": [
+        "Granulacija časa za to vizualizacijo. Izvede transformacijo podatkov, ki spremeni vaš časovni stolpec in določi novo časovno granulacija. Ta možnost je definirana na ravni sistema podatkovne baze v izvorni kodi Superseta."
+      ],
+      "No filter": ["Brez filtra"],
+      "The time range for the visualization. All relative times, e.g. \"Last month\", \"Last 7 days\", \"now\", etc. are evaluated on the server using the server's local time (sans timezone). All tooltips and placeholder times are expressed in UTC (sans timezone). The timestamps are then evaluated by the database using the engine's local timezone. Note one can explicitly set the timezone per the ISO 8601 format if specifying either the start and/or end time.": [
+        "Časovno obdobje za vizualizacijo. Vsi relativni časi, kot npr. \"Zadnji mesec\", Zadnjih 7 dni\", \"Zdaj\" so izračunani na strežniku z njegovim lokalnim časom. Vsi opisi orodij in časi so izraženi v UTC. Časovne značke se nato izračunajo v podatkovni bazi z njenim lokalnim časovnim pasom. Eksplicitno lahko nastavite časovni pas v ISO 8601 formatu, če določite čas začetka ali konca."
+      ],
+      "Row limit": ["Omejitev št. vrstic"],
+      "Series limit": ["Omejitev št. vrst"],
+      "Limits the number of time series that get displayed. A sub query (or an extra phase where sub queries are not supported) is applied to limit the number of time series that get fetched and displayed. This feature is useful when grouping by high cardinality dimension(s).": [
+        "Omeji število časovnih vrst za prikaz. S podpoizvedbo (ali dodatno fazo, kjer podpoizvedbe niso podprte) se omeji število časovnih vrst, ki bodo pridobljene za prikaz. Ta funkcija je uporabna pri združevanju dimenzij z veliko kardinalnostjo."
+      ],
+      "Metric used to define the top series": [
+        "Mera za določanje najvišje podatkovne serije"
+      ],
+      "Series": ["Niz"],
+      "Defines the grouping of entities. Each series is shown as a specific color on the chart and has a legend toggle": [
+        "Določa združevanje entitet. Vsak niz je na grafikonu prikazan z določeno barvo in ima lahko prikazano legendo"
+      ],
+      "Entity": ["Entiteta"],
+      "This defines the element to be plotted on the chart": [
+        "Določa element, ki bo izrisan na grafikonu"
+      ],
+      "X Axis": ["X os"],
+      "Metric assigned to the [X] axis": ["Mera za [X] os"],
+      "Y Axis": ["Y os"],
+      "Metric assigned to the [Y] axis": ["Mera za [Y] os"],
+      "Bubble size": ["Velikost mehurčka"],
+      "Y Axis Format": ["Oblika Y osi"],
+      "When `Calculation type` is set to \"Percentage change\", the Y Axis Format is forced to `.1%`": [
+        "Če je `Vrsta izračuna` nastavljena na \"Procentualna sprememba\", bo oblika Y-osi vsiljena na `.1%`"
+      ],
+      "The color scheme for rendering chart": [
+        "Barvna shema za izris grafikona"
+      ],
+      "Color map": ["Barvna lestvica"],
+      "An error occurred while starring this chart": [
+        "Pri ocenjevanju grafikona je prišlo do napake"
+      ],
+      "description": ["opis"],
+      "bolt": ["vijak"],
+      "Changing this control takes effect instantly": [
+        "Sprememba tega kontrolnika se odrazi takoj"
+      ],
+      "Customize": ["Prilagodi"],
+      "Height": ["Višina"],
+      "Width": ["Širina"],
+      "Copy chart URL to clipboard": ["Kopiraj URL grafikona na odložišče"],
+      "Loading...": ["Nalagam ..."],
+      "Superset Chart": ["Superset grafikon"],
+      "Export to .JSON format": ["Izvozi v .json format"],
+      "Export to .CSV format": ["Izvozi v .csv format"],
+      "%s - untitled": ["%s - neimenovan"],
+      "Edit chart properties": ["Uredi lastnosti grafikona"],
+      "Controls labeled ": ["Kontrolniki imenovani "],
+      "Control labeled ": ["Nastavitev "],
+      "Open Datasource tab": ["Odpri zavihek s podatkovnim virom"],
+      "rows": ["vrstic"],
+      "Limit reached": ["Omejitev dosežena"],
+      "**Select** a dashboard OR **create** a new one": [
+        "**Izberite** nadzorno ploščo ALI **ustvarite** novo"
+      ],
+      "Please enter a chart name": ["Vnesite ime grafikona"],
+      "Save chart": ["Shrani grafikon"],
+      "Save & go to dashboard": ["Shrani in pojdi na nadzorno ploščo"],
+      "Save as new chart": ["Shrani kot nov grafikon"],
+      "Save (Overwrite)": ["Shrani (prepiši)"],
+      "Save as ...": ["Shrani kot ..."],
+      "Chart name": ["Ime grafikona"],
+      "Add to dashboard": ["Dodaj na nadzorno ploščo"],
+      "rows retrieved": ["vrnjenih vrstic"],
+      "Sorry, An error occurred": ["Prišlo je do napake"],
+      "No data": ["Ni podatkov"],
+      "View samples": ["Ogled vzorcev"],
+      "Search Metrics & Columns": ["Iskanje mer in stolpcev"],
+      "Showing %s of %s": ["Prikazanih %s od %s"],
+      "New chart": ["Nov grafikon"],
+      "Edit properties": ["Uredi lastnosti"],
+      "Run in SQL Lab": ["Zaženi v SQL laboratoriju"],
+      "You do not have permission to edit this chart": [
+        "Nimate dovoljenja za urejanje tega grafikona"
+      ],
+      "The description can be displayed as widget headers in the dashboard view. Supports markdown.": [
+        "Opis je lahko prikazan kot glava gradnika in pogledu nadzorne plošče. Podpira markdown."
+      ],
+      "Duration (in seconds) of the caching timeout for this chart. Note this defaults to the dataset's timeout if undefined.": [
+        "Časovna veljavnost (v sekundah) predpomnjenja za ta grafikon. Če ni definirana, je uporabljena vrednost za podatkovni set."
+      ],
+      "A list of users who can alter the chart. Searchable by name or username.": [
+        "Seznam uporabnikov, ki lahko spreminjajo ta grafikon. Možno je iskanje po imenu ali uporabniškem imenu."
+      ],
+      "Min": ["Min"],
+      "Max": ["Max"],
+      "No results found": ["Rezultati niso najdeni"],
+      "%s option(s)": ["Možnosti: %s"],
+      "Invalid lat/long configuration.": [
+        "Neveljavna nastavitev zemljepisne dolžine/širine."
+      ],
+      "Reverse lat/long ": ["Zamenjaj zemljepisno dolžino/širino "],
+      "Longitude & Latitude columns": ["Stolpci zemljepisne dolžine in širine"],
+      "Delimited long & lat single column": [
+        "En stolpec z ločenima zemljepisno dolžino in širino"
+      ],
+      "Multiple formats accepted, look the geopy.points Python library for more details": [
+        "Sprejema različne zapise - podrobnosti najdete v Pythonovi knjižnici geopy.points"
+      ],
+      "Geohash": ["Geohash"],
+      "textarea": ["področje besedila"],
+      "in modal": ["v modalnem"],
+      "Failed to verify select options: %s": [
+        "Preverjanje možnosti izbire ni uspelo: %s"
+      ],
+      "Annotation Slice Configuration": ["Nastavitve rezine z oznakami"],
+      "This section allows you to configure how to use the slice\r\n               to generate annotations.": [
+        "V tem sklopu lahko nastavite način uporabe rezine\r\n               za ustvarjanje oznak."
+      ],
+      "Display configuration": ["Prikaži nastavitve"],
+      "Configure your how you overlay is displayed here.": [
+        "Nastavite kako se tukaj prikazuje vrhnja plast."
+      ],
+      "Style": ["Stil"],
+      "Opacity": ["Prosojnost"],
+      "Color": ["Barva"],
+      "Line width": ["Debelina črte"],
+      "Layer configuration": ["Nastavitve sloja"],
+      "Configure the basics of your Annotation Layer.": [
+        "Osnovne nastavitve sloja z oznakami."
+      ],
+      "Mandatory": ["Obvezno"],
+      "Hide layer": ["Skrij sloj"],
+      "Choose the annotation layer type": ["Izberite tip sloja z oznakami"],
+      "Annotation layer type": ["Tip sloja z oznakami"],
+      "Remove": ["Odstrani"],
+      "Edit annotation layer": ["Uredi sloj z oznakami"],
+      "Add annotation layer": ["Dodaj sloj z oznakami"],
+      "Empty collection": ["Prazen izbor"],
+      "Add an item": ["Dodaj element"],
+      "Remove item": ["Odstrani element"],
+      "Edit dataset": ["Uredi podatkovni set"],
+      "View in SQL Lab": ["Ogled v SQL laboratoriju"],
+      "More dataset related options": ["Več nastavitev za podatkovni set"],
+      "Missing dataset": ["Manjka podatkovni set"],
+      "The dataset linked to this chart may have been deleted.": [
+        "Podatkovni set, povezan s tem grafikonom, je bil izbrisan."
+      ],
+      "RANGE TYPE": ["TIP OBDOBJA"],
+      "Actual time range": ["Dejansko časovno obdobje"],
+      "CANCEL": ["PREKINI"],
+      "APPLY": ["UPORABI"],
+      "Edit time range": ["Uredi časovno obdobje"],
+      "Configure Advanced Time Range ": ["Nastavi napredno časovno obdobje "],
+      "START (INCLUSIVE)": ["ZAČETEK (VKLJUČEN)"],
+      "Start date included in time range": [
+        "Začetni datum je vključen v časovno obdobje"
+      ],
+      "END (EXCLUSIVE)": ["KONEC (NI VKLJUČEN)"],
+      "End date excluded from time range": [
+        "Končni datum ni vključen v časovno obdobje"
+      ],
+      "Configure Time Range: Previous...": [
+        "Nastavi časovno obdobje: Prejšnji ..."
+      ],
+      "Configure Time Range: Last...": ["Nastavi časovno obdobje: Zadnji ..."],
+      "Configure custom time range": ["Nastavi prilagojeno časovno obdobje"],
+      "Relative quantity": ["Relativne vrednosti"],
+      "Anchor to": ["Sidraj na"],
+      "NOW": ["ZDAJ"],
+      "Date/Time": ["Datum/Čas"],
+      "Return to specific datetime.": ["Vrne določen datum-čas."],
+      "Syntax": ["Sintaksa"],
+      "Example": ["Primer"],
+      "Moves the given set of dates by a specified interval.": [
+        "Premakne dani nabor datumov za definirano obdobje."
+      ],
+      "Truncates the specified date to the accuracy specified by the date unit.": [
+        "Zaokroži določen datum, glede na natančnost, definirano s časovno enoto."
+      ],
+      "Get the last date by the date unit.": [
+        "Pridobi zadnji datum glede na časovno enoto."
+      ],
+      "Get the specify date for the holiday": ["Določi datum praznika"],
+      "Last": ["Zadnji"],
+      "Previous": ["Prejšnji"],
+      "Custom": ["Prilagojen"],
+      "last day": ["zadnji dan"],
+      "last week": ["zadnji teden"],
+      "last month": ["zadnji mesec"],
+      "last quarter": ["zadnje četrletje"],
+      "last year": ["zadnje leto"],
+      "previous calendar week": ["prejšnji koledarski teden"],
+      "previous calendar month": ["prejšnji koledarski mesec"],
+      "previous calendar year": ["prejšnje koledarsko leto"],
+      "Before": ["PRED"],
+      "After": ["PO"],
+      "Specific Date/Time": ["Fiksen Datum/Čas"],
+      "Relative Date/Time": ["Relativen Datum/Čas"],
+      "Now": ["Zdaj"],
+      "Midnight": ["Polnoč"],
+      "Drop column": ["Izpusti stolpec"],
+      "Drop columns or metrics": ["Izpusti stolpce ali mere"],
+      "Drop column or metric": ["Izpusti stolpec ali mero"],
+      "Drop columns": ["Izpusti stolpce"],
+      "Default": ["Privzeto"],
+      "(optional) default value for the filter, when using the multiple option, you can use a semicolon-delimited list of options.": [
+        "(opcijsko) privzeta vrednost za filter, če uporabite opcijo izbire večih , lahko uporabite seznam nastavitev ločen s podpičji."
+      ],
+      "Sort metric": ["Mera za razvrščanje"],
+      "Metric to sort the results by": ["Mera za razvrščanje rezultatov"],
+      "Check for sorting ascending": ["Označi za naraščajoče razvrščanje"],
+      "Allow multiple selections": ["Dovoli več izbir"],
+      "Multiple selections allowed, otherwise filter is limited to a single value": [
+        "Lahko izberete več elementov, drugače pa je filter omejen na eno vrednost"
+      ],
+      "Search all filter options": ["PoIšči vse možnosti filtra"],
+      "By default, each filter loads at most 1000 choices at the initial page load. Check this box if you have more than 1000 filter values and want to enable dynamically searching that loads filter values as users type (may add stress to your database).": [
+        "Privzeto vsak filter pri nalaganju začetne strani naloži največ 1000 možnosti. Označite polje, če imate več kot 1000 vrednosti filtra in želite omogočiti dinamično iskanje, ki nalaga vrednosti filtra ko uporabnik tipka (to lahko preobremeni vašo podatkovno bazo)."
+      ],
+      "Required": ["Obvezno"],
+      "User must select a value for this filter": [
+        "Uporabnik mora izbrati vrednost za ta filter"
+      ],
+      "Filter configuration": ["Nastavitve filtra"],
+      "Simple": ["Preprosto"],
+      "Custom SQL": ["Prilagojen SQL"],
+      "No such column found. To filter on a metric, try the Custom SQL tab.": [
+        "Tak stolpec ni najden. Za filtriranje po meri uporabite prilagojen SQL zavihek."
+      ],
+      "%s column(s) and metric(s)": ["Stolpcev in mer: %s"],
+      "%s column(s)": ["Stolpci: %s"],
+      "To filter on a metric, use Custom SQL tab.": [
+        "Za filtriranje po meri uporabite prilagojen SQL zavihek."
+      ],
+      "%s operator(s)": ["Operatorji: %s"],
+      "Type a value here": ["Vnesite vrednost sem"],
+      "Filter value (case sensitive)": [
+        "Vrednost filtra (razlik. velikih/malih črk)"
+      ],
+      "choose WHERE or HAVING...": ["izberite WHERE ali HAVING..."],
+      "Filters by columns": ["Filtrira po stolpcu"],
+      "Filters by metrics": ["Filtrira po merah"],
+      "Fixed": ["Fiksno"],
+      "Based on a metric": ["Osnovan na meri"],
+      "My metric": ["Moja mera"],
+      "Add metric": ["Dodaj mero"],
+      "%s aggregates(s)": ["Agreg. funkcije: %s"],
+      "%s saved metric(s)": ["Shranjene mere: %s"],
+      "Saved": ["Shranjeno"],
+      "Saved metric": ["Shranjena mera"],
+      "column": ["stolpec"],
+      "aggregate": ["agregacija"],
+      "\r\n                This filter was inherited from the dashboard's context.\r\n                It won't be saved when saving the chart.\r\n              ": [
+        "\r\n                Ta filter izvira iz nadzorne plošče.\r\n                Ne bo se shranil pri shranjevanju grafikona.\r\n                "
+      ],
+      "Error while fetching data": ["Napaka pri pridobivanju podatkov"],
+      "Time series columns": ["Stolpci s časovnimi vrstami"],
+      "This visualization type is not supported.": [
+        "Ta tip vizualizacije ni podprt."
+      ],
+      "Click to change visualization type": [
+        "Kliknite za spremembo tipa vizualizacije"
+      ],
+      "Select a visualization type": ["Izberite tip vizualizacije"],
+      "Code": ["Koda"],
+      "Markup type": ["Tip označevanja"],
+      "Pick your favorite markup language": [
+        "Izberite svoj priljubljen označevalni jezik"
+      ],
+      "Put your code here": ["Vstavite svojo kodo sem"],
+      "Query": ["Poizvedba"],
+      "URL": ["URL"],
+      "Templated link, it's possible to include {{ metric }} or other values coming from the controls.": [
+        "Vzorčna povezava, vključiti je mogoče {{ metric }} ali drugo vrednost iz kontrolnikov."
+      ],
+      "Time": ["Čas"],
+      "Time related form attributes": ["S časom povezani atributi prikaza"],
+      "Chart type": ["Tip grafikona"],
+      "Chart ID": ["ID grafikona"],
+      "The id of the active chart": ["Identifikator aktivnega grafikona"],
+      "Cache Timeout (seconds)": ["Trajanje predpomnilnika (sekunde)"],
+      "The number of seconds before expiring the cache": [
+        "Trajanje (v sekundah) do razveljavitve predpomnilnika"
+      ],
+      "URL parameters": ["Parametri URL"],
+      "Extra parameters for use in jinja templated queries": [
+        "Dodatni parametri za poizvedbe z jinja predlogami"
+      ],
+      "Time range endpoints": ["Krajne točke časovnega obdobja"],
+      "Time range endpoints (SIP-15)": [
+        "Krajne točke časovnega obdobja (SIP-15)"
+      ],
+      "Annotations and layers": ["Oznake in sloji"],
+      "Whether to sort descending or ascending": [
+        "Če želite padajoče ali naraščajoče razvrščanje"
+      ],
+      "Contribution": ["Prispevek"],
+      "Compute the contribution to the total": ["Izračunaj prispevek k celoti"],
+      "Advanced analytics": ["Napredna analitika"],
+      "This section contains options that allow for advanced analytical post processing of query results": [
+        "Ta sekcija vsebuje možnosti, ki omogočajo napredno analitično poprocesiranje rezultatov poizvedb"
+      ],
+      "Rolling window": ["Drseče okno"],
+      "Rolling function": ["Drseča funkcija"],
+      "Defines a rolling window function to apply, works along with the [Periods] text box": [
+        "Določi funkcijo drsečega okna. Dela skupaj s tekstovnim okvirjem [Obdobja]"
+      ],
+      "Periods": ["Št. period"],
+      "Defines the size of the rolling window function, relative to the time granularity selected": [
+        "Določi velikost funkcije drsečega okna, glede na izbrano granulacijo časa"
+      ],
+      "Min periods": ["Min. št. period"],
+      "The minimum number of rolling periods required to show a value. For instance if you do a cumulative sum on 7 days you may want your \"Min Period\" to be 7, so that all data points shown are the total of 7 periods. This will hide the \"ramp up\" taking place over the first 7 periods": [
+        "Minimalno število drsečih obdobij, potrebnih za prikaz vrednosti. Če računate kumulativno vsoto 7-dnevnega obdobja, boste nastavili \"Min. št. period\" na 7. Tako bodo vse prikazane točke skupaj obsegale 7 obdobij. To bo prikrilo rampo, ki bi trajala prvih 7 obdobij"
+      ],
+      "Time comparison": ["Časovna primerjava"],
+      "Time shift": ["Časovni zamik"],
+      "Overlay one or more timeseries from a relative time period. Expects relative time deltas in natural language (example:  24 hours, 7 days, 52 weeks, 365 days). Free text is supported.": [
+        "Zamaknite eno ali več časovnih vrst za relativno časovno obdobje. Vnaša se relativne časovne razlike v naravnem jeziku (npr. 24 ur, 7 dni, 52 tednov, 365 dni). Prosto besedilo je podprto."
+      ],
+      "Calculation type": ["Tip izračuna"],
+      "How to display time shifts: as individual lines; as the absolute difference between the main time series and each time shift; as the percentage change; or as the ratio between series and time shifts.": [
+        "Način prikaza časovnih zamikov: kot samostojne črte; kot absolutne razlike med osnovno časovno vrsto in vsakim časovnim zamikom; kot procentualna sprememba; kot razmerje med vrsto in časovnim zamikom."
+      ],
+      "Python functions": ["Pythonove funkcije"],
+      "Rule": ["Pravilo"],
+      "Pandas resample rule": ["Pravilo za prevzorčenje v Pandas"],
+      "Method": ["Metoda"],
+      "Pandas resample method": ["Metoda za prevzorčenje v Pandas"],
+      "No columns": ["Brez stolpcev"],
+      "%s option": ["%s možnost"],
+      "UI Configuration": ["UI nastavitve"],
+      "Multiple select": ["Več izborov"],
+      "Allow selecting multiple values": ["Dovoli izbiro več vrednosti"],
+      "Group By": ["Združevanje (Group by)"],
+      "Group By filter plugin": ["Vtičnik za filter za združevanje"],
+      "Chosen non-numeric column": ["Izbran ne-numeričen stolpec"],
+      "Range filter": ["Filter obdobja"],
+      "Range filter plugin using AntD": [
+        "Vtičnik za filter obdobja z uporabo AntD"
+      ],
+      "User must select a value for this filter when filter is in single select mode. If selection is empty, an always false filter is emitted.": [
+        "Uporabnik mora izbrati vrednost filtra, ko je le-ta v načinu posamičnega izbora. Če je izbor prazen, je oddan vedno napačen (false) filter."
+      ],
+      "Default to first item": ["Privzet prvi element"],
+      "Select first item by default": [
+        "Kot privzeta vrednost je izbran prvi element"
+      ],
+      "Inverse selection": ["Invertiraj izbiro"],
+      "Exclude selected values": ["Izloči izbrane vrednosti"],
+      "Select filter": ["Izbirni filter"],
+      "Select filter plugin using AntD": [
+        "Izberite Vtičnik za filter z uporabo AntD"
+      ],
+      "Time filter": ["Časovni filter"],
+      "Custom time filter plugin": ["Prilagojeni vtičnik za časovni filter"],
+      "No time columns": ["Ni časovnih stolpcev"],
+      "Time column filter plugin": ["Vtičnik za časovni filter"],
+      "Time grain filter plugin": ["Vtičnik za filter časovne granulacije"],
+      "Favorites": ["Priljubljene"],
+      "Created content": ["Ustvarjena vsebina"],
+      "Recent activity": ["Nedavna aktivnost"],
+      "Security & Access": ["Varnost in Dostopi"],
+      "No charts": ["Ni grafikonov"],
+      "No dashboards": ["Ni nadzornih plošč"],
+      "No favorite charts yet, go click on stars!": [
+        "Priljubljenih grafikonov še ni. Kliknite na zvezdice!"
+      ],
+      "No favorite dashboards yet, go click on stars!": [
+        "Priljubljenih nadzornih plošč še ni. Kliknite na zvezdice!"
+      ],
+      "Profile picture provided by Gravatar": [
+        "Profilno sliko je zagotovil Gravatar"
+      ],
+      "joined": ["pridružen"],
+      "id:": ["id:"],
+      "Image download failed, please refresh and try again.": [
+        "Prenos slike ni uspel. Osvežite in poskusite ponovno."
+      ],
+      "Unexpected error: ": ["Nepričakovana napaka: "],
+      "(no description, click to see stack trace)": [
+        "(ni opisa, kliknite za ogled zapisov)"
+      ],
+      "Issue 1000 - The dataset is too large to query.": [
+        "Težava 1000 - podatkovni vir je prevelik za poizvedbo."
+      ],
+      "An error occurred while fetching %s info: %s": [
+        "Napaka pri pridobivanju informacij za %s: %s"
+      ],
+      "An error occurred while fetching %ss: %s": [
+        "Napaka pri pridobivanju informacij za %s: %s"
+      ],
+      "An error occurred while creating %ss: %s": [
+        "Napaka pri ustvarjanju %s: %s"
+      ],
+      "An error occurred while importing %s: %s": [
+        "Napaka pri uvažanju %s: %s"
+      ],
+      "There was an error fetching the favorite status: %s": [
+        "Napaka pri pridobivanju statusa \"Priljubljeno\": %s"
+      ],
+      "There was an error saving the favorite status: %s": [
+        "Napaka pri shranjevanju statusa \"Priljubljeno\": %s"
+      ],
+      "Link Copied!": ["Povezava kopirana!"],
+      "Connection looks good!": ["Povezava izgleda v redu!"],
+      "${t('ERROR: ')}${parsedErrorMessage(errMsg)}": [
+        "${t('NAPAKA: ')}${parsedErrorMessage(errMsg)}"
+      ],
+      "There was an error fetching your recent activity:": [
+        "Pri pridobivanju nedavnih aktivnosti je prišlo do napake:"
+      ],
+      "Deleted: %s": ["Izbrisanih: %s"],
+      "There was an issue deleting: %s": ["Težava pri brisanju: %s"],
+      "There was an issue deleting %s: %s": ["Težava pri brisanju %s: %s"],
+      "report": ["poročilo"],
+      "alert": ["opozorilo"],
+      "reports": ["poročila"],
+      "alerts": ["opozorila"],
+      "There was an issue deleting the selected %s: %s": [
+        "Težava pri brisanju izbranih %s: %s"
+      ],
+      "Last run": ["Zadnji zagon"],
+      "Notification method": ["Način obveščanja"],
+      "Execution log": ["Dnevnik izvajanja"],
+      "Actions": ["Aktivnosti"],
+      "Bulk select": ["Izberi hkrati"],
+      "No %s yet": ["%s še ne obstajajo"],
+      "Created by": ["Ustvaril/a"],
+      "An error occurred while fetching created by values: %s": [
+        "Pri pridobivanju vrednosti \"ustvaril/a\" je prišlo do napake: %s"
+      ],
+      "Status": ["Status"],
+      "${AlertState.success}": ["${AlertState.success}"],
+      "${AlertState.working}": ["${AlertState.working}"],
+      "${AlertState.error}": ["${AlertState.error}"],
+      "${AlertState.noop}": ["${AlertState.noop}"],
+      "${AlertState.grace}": ["${AlertState.grace}"],
+      "Alerts & reports": ["Opozorila in poročila"],
+      "Reports": ["Poročila"],
+      "This action will permanently delete %s.": [
+        "S tem dejanjem boste trajno izbrisali %s."
+      ],
+      "Delete %s?": ["Izbrišem %s?"],
+      "Please confirm": ["Prosim, potrdite"],
+      "Are you sure you want to delete the selected %s?": [
+        "Ali ste prepričani, da želite izbrisati izbrane %s?"
+      ],
+      "< (Smaller than)": ["< (manjše kot)"],
+      "> (Larger than)": ["> (večje kot)"],
+      "<= (Smaller or equal)": ["<= (manjše ali enako)"],
+      ">= (Larger or equal)": [">= (večje ali enako)"],
+      "== (Is equal)": ["== (je enako)"],
+      "!= (Is not equal)": ["!= (ni enako)"],
+      "Not null": ["Ni nič (null)"],
+      "30 days": ["30 dni"],
+      "60 days": ["60 dni"],
+      "90 days": ["90 dni"],
+      "Add notification method": ["Dodajte način obveščanja"],
+      "Add delivery method": ["Dodajte način dostave"],
+      "Add": ["Dodaj"],
+      "Edit ${isReport ? 'Report' : 'Alert'}": [
+        "Uredi ${isReport ? 'Report' : 'Alert'}"
+      ],
+      "Add ${isReport ? 'Report' : 'Alert'}": [
+        "Add ${isReport ? 'Report' : 'Alert'}"
+      ],
+      "Report name": ["Naslov poročila"],
+      "Alert name": ["Naslov opozorila"],
+      "Alert condition": ["Status opozorila"],
+      "Trigger Alert If...": ["Sproži opozorilo v primeru ..."],
+      "Value": ["Vrednost"],
+      "Report schedule": ["Urnik poročanja"],
+      "Alert condition schedule": ["Urnik statusov opozoril"],
+      "Schedule settings": ["Nastavitve urnika"],
+      "Log retention": ["Hranjenje dnevnikov"],
+      "Working timeout": ["Pretek delovanja"],
+      "Time in seconds": ["Čas v sekundah"],
+      "Grace period": ["Obdobje mirovanja"],
+      "Message content": ["Vsebina sporočila"],
+      "Send as PNG": ["Pošlji kot PNG"],
+      "Send as CSV": ["Pošlji kot CSV"],
+      "log": ["dnevnik"],
+      "State": ["Status"],
+      "Execution ID": ["ID izvedbe"],
+      "Scheduled at (UTC)": ["Izvede se ob (UTC)"],
+      "Start at (UTC)": ["Zažene se ob (UTC)"],
+      "Duration": ["Trajanje"],
+      "Error message": ["Sporočilo napake"],
+      "${alertResource?.type}": ["${alertResource?.type}"],
+      "CRON expression": ["Izraz CRON"],
+      "Report sent": ["Poročilo poslano"],
+      "Alert triggered, notification sent": [
+        "Opozorilo sproženo, obvestilo poslano"
+      ],
+      "Report sending": ["Pošiljanje poročila"],
+      "Alert running": ["Opozorilo aktivno"],
+      "Report failed": ["Poročilo ni uspelo"],
+      "Alert failed": ["Opozorilo ni uspelo"],
+      "Nothing triggered": ["Ni ni sproženo"],
+      "Alert Triggered, In Grace Period": [
+        "Opozorilo sproženo, v obdobju mirovanja"
+      ],
+      "Recipients are separated by \",\" or \";\"": [
+        "Prejemniki so ločeni z \",\" ali \";\""
+      ],
+      "${RecipientIconName.email}": ["${RecipientIconName.email}"],
+      "${RecipientIconName.slack}": ["${RecipientIconName.slack}"],
+      "annotation": ["oznaka"],
+      "There was an issue deleting the selected annotations: %s": [
+        "Pri brisanju izbranih oznak je prišlo do težave: %s"
+      ],
+      "Edit annotation": ["Uredi oznako"],
+      "Delete annotation": ["Izbriši oznako"],
+      "Annotation": ["Oznaka"],
+      "No annotation yet": ["Oznak še ni"],
+      "Annotation Layer ${annotationLayerName}": [
+        "Sloj z oznakami ${annotationLayerName}"
+      ],
+      "Are you sure you want to delete ${annotationCurrentlyDeleting?.short_descr}?": [
+        "Ste prepričani, da želite izbrisati ${annotationCurrentlyDeleting?.short_descr}?"
+      ],
+      "Delete Annotation?": ["Izbrišem oznako?"],
+      "Are you sure you want to delete the selected annotations?": [
+        "Ali ste prepričani, da želite izbrisati izbrane oznake?"
+      ],
+      "Add annotation": ["Dodaj oznako"],
+      "Annotation name": ["Ime oznake"],
+      "date": ["datum"],
+      "Additional information": ["Dodatne informacije"],
+      "Description (this can be seen in the list)": [
+        "Opis (lahko je viden na seznamu)"
+      ],
+      "annotation_layer": ["annotation_layer"],
+      "Edit annotation layer properties": ["Uredi lastnosti sloja z oznakami"],
+      "Annotation layer name": ["Ime sloja z oznakami"],
+      "Annotation layers": ["Sloji z oznakami"],
+      "There was an issue deleting the selected layers: %s": [
+        "Pri brisanju izbranih slojev je prišlo do težave: %s"
+      ],
+      "Last modified": ["Zadnja sprememba"],
+      "Created on": ["Ustvarjeno"],
+      "Edit template": ["Uredi predlogo"],
+      "Delete template": ["Izbriši predlogo"],
+      "Annotation layer": ["Sloj z oznakami"],
+      "An error occurred while fetching dataset datasource values: %s": [
+        "Pri pridobivanju vrednosti podatkovnega vira podatkovnega seta je prišlo do napake: %s"
+      ],
+      "No annotation layers yet": ["Slojev z oznakami še ni"],
+      "This action will permanently delete the layer.": [
+        "S tem dejanjem boste trajno izbrisali sloj."
+      ],
+      "Delete Layer?": ["Izbrišem sloj?"],
+      "Are you sure you want to delete the selected layers?": [
+        "Ali ste prepričani, da želite izbrisati izbrane sloje?"
+      ],
+      "Are you sure you want to delete": [
+        "Ali ste prepričani, da želite izbrisati"
+      ],
+      "Last modified %s": ["Zadnja sprememba %s"],
+      "The passwords for the databases below are needed in order to import them together with the charts. Please note that the \"Secure Extra\" and \"Certificate\" sections of the database configuration are not present in export files, and should be added manually after the import if they are needed.": [
+        "Gesla za spodnje podatkovne baze so potrebna za uvoz skupaj z grafikoni. Sekciji \"Dodatna varnost\" in \"Certifikati\" v nastavitvah podatkovne baze nista prisotni v izvoženih datotekah in jih je potrebno dodati ročno po uvozu, če je to potrebno."
+      ],
+      "You are importing one or more charts that already exist. Overwriting might cause you to lose some of your work. Are you sure you want to overwrite?": [
+        "Uvažate enega ali več grafikonov, ki že obstajajo. S prepisom lahko izgubite podatke. Ali ste prepričani, da želite prepisati?"
+      ],
+      "There was an issue deleting the selected charts: %s": [
+        "Pri brisanju izbranih grafikonov je prišlo do težave: %s"
+      ],
+      "Modified by": ["Spremenil/a"],
+      "Favorite": ["Priljubljene"],
+      "Any": ["Katerikoli"],
+      "Yes": ["Da"],
+      "No": ["Ne"],
+      "Owner": ["Lastnik"],
+      "All": ["Vsi"],
+      "An error occurred while fetching chart owners values: %s": [
+        "Pri pridobivanju polja lastnik grafikona je prišlo do napake: %s"
+      ],
+      "An error occurred while fetching chart created by values: %s": [
+        "Pri pridobivanju polja grafikon ustvaril/a je prišlo do napake: %s"
+      ],
+      "Viz type": ["Tip vizualizacije"],
+      "An error occurred while fetching chart dataset values: %s": [
+        "Pri pridobivanju polja podatkovni set za grafikon je prišlo do napake: %s"
+      ],
+      "Alphabetical": ["Po abecedi"],
+      "Recently modified": ["Nedavno spremenjeno"],
+      "Least recently modified": ["Zadnje spremenjeno"],
+      "Import charts": ["Uvozi grafikone"],
+      "Are you sure you want to delete the selected charts?": [
+        "Ali ste prepričani, da želite izbrisati izbrane grafikone?"
+      ],
+      "css_template": ["css_template"],
+      "Edit CSS template properties": ["Uredi lastnosti CSS predloge"],
+      "Add CSS template": ["Dodaj CSS predlogo"],
+      "CSS template name": ["Ime CSS predloge"],
+      "css": ["css"],
+      "CSS templates": ["CSS predloge"],
+      "There was an issue deleting the selected templates: %s": [
+        "Pri brisanju izbranih predlog je prišlo do težave: %s"
+      ],
+      "Last modified by %s": ["Nazadnje spremenil/a %s"],
+      "CSS template": ["CSS predloga"],
+      "This action will permanently delete the template.": [
+        "S tem dejanjem boste trajno izbrisali predlogo."
+      ],
+      "Delete Template?": ["Izbrišem predlogo?"],
+      "Are you sure you want to delete the selected templates?": [
+        "Ali ste prepričani, da želite izbrisati izbrane predloge?"
+      ],
+      "published": ["objavljeno"],
+      "draft": ["osnutek"],
+      "The passwords for the databases below are needed in order to import them together with the dashboards. Please note that the \"Secure Extra\" and \"Certificate\" sections of the database configuration are not present in export files, and should be added manually after the import if they are needed.": [
+        "Gesla za spodnje podatkovne baze so potrebna za uvoz skupaj z nadzornimi ploščami. Sekciji \"Dodatna varnost\" in \"Certifikati\" v nastavitvah podatkovne baze nista prisotni v izvoženih datotekah in jih je potrebno dodati ročno po uvozu, če je to potrebno."
+      ],
+      "You are importing one or more dashboards that already exist. Overwriting might cause you to lose some of your work. Are you sure you want to overwrite?": [
+        "Uvažate eno ali več nadzornih plošč, ki že obstajajo. S prepisom lahko izgubite podatke. Ali ste prepričani, da želite prepisati?"
+      ],
+      "An error occurred while fetching dashboards: %s": [
+        "Prišlo je do napake pri pridobivanju nadzornih plošč: %s"
+      ],
+      "There was an issue deleting the selected dashboards: ": [
+        "Pri brisanju izbranih nadzornih plošč je prišlo do težave: "
+      ],
+      "An error occurred while fetching dashboard owner values: %s": [
+        "Pri pridobivanju polja lastnik nadzorne plošče je prišlo do napake: %s"
+      ],
+      "An error occurred while fetching dashboard created by values: %s": [
+        "Pri pridobivanju polja nadzorno ploščo ustvaril/a je prišlo do napake: %s"
+      ],
+      "Are you sure you want to delete the selected dashboards?": [
+        "Ali ste prepričani, da želite izbrisati izbrane nadzorne plošče?"
+      ],
+      "Saved queries": ["Shranjene poizvedbe"],
+      "SQL Copied!": ["SQL kopiran!"],
+      "The passwords for the databases below are needed in order to import them. Please note that the \"Secure Extra\" and \"Certificate\" sections of the database configuration are not present in export files, and should be added manually after the import if they are needed.": [
+        "Gesla za spodnje podatkovne baze so potrebna za njihov uvoz. Sekciji \"Dodatna varnost\" in \"Certifikati\" v nastavitvah podatkovne baze nista prisotni v izvoženih datotekah in jih je potrebno dodati ročno po uvozu, če je to potrebno."
+      ],
+      "You are importing one or more databases that already exist. Overwriting might cause you to lose some of your work. Are you sure you want to overwrite?": [
+        "Uvažate eno ali več podatkovnih baz, ki že obstajajo. S prepisom lahko izgubite podatke. Ali ste prepričani, da želite prepisati?"
+      ],
+      "database": ["podatkovna baza"],
+      "An error occurred while fetching database related data: %s": [
+        "Pri pridobivanju podatkov iz podatkovne baze je prišlo do napake: %s"
+      ],
+      "Import databases": ["Uvozi podatkovne baze"],
+      "Asynchronous query execution": ["Asinhroni zagon poizvedb"],
+      "AQE": ["AQE"],
+      "Allow data manipulation language": [
+        "Dovoli jezik za manipulacijo podatkov (DML)"
+      ],
+      "DML": ["DML"],
+      "CSV upload": ["Nalaganje CSV"],
+      "Delete database": ["Izbriši podatkovno bazo"],
+      "The database %s is linked to %s charts that appear on %s dashboards. Are you sure you want to continue? Deleting the database will break those objects.": [
+        "Podatkovna baza %s je povezana z grafikoni %s, ki so prisotni na nadzorni plošči %s. Ali želite nadaljevati? Izbris podatkovne baze bo pokvaril te objekte."
+      ],
+      "Delete Database?": ["Izbrišem podatkovno bazo?"],
+      "Allow this database to be queried in SQL Lab": [
+        "Dovoli poizvedbo na to podatkovno bazo v SQL laboratoriju"
+      ],
+      "Allow creation of new tables based on queries": [
+        "Dovoli ustvarjanje novih tabel s poizvedbami"
+      ],
+      "Allow creation of new views based on queries": [
+        "Dovoli ustvarjanje novih pogledov s poizvedbami"
+      ],
+      "CTAS & CVAS SCHEMA": ["CTAS & CVAS SHEMA"],
+      "Search or select schema": ["Poiščite ali izberite shemo"],
+      "When allowing CREATE TABLE AS option in SQL Lab, this option forces the table to be created in this schema.": [
+        "Z dovolitvijo opcije CREATE TABLE AS v SQL laboratoriju se tabele ustvarjajo s to shemo."
+      ],
+      "Allow manipulation of the database using non-SELECT statements such as UPDATE, DELETE, CREATE, etc.": [
+        "Dovoli manipulacije podatkovne baze z uporabo ne-SELECT stavkov, kot so UPDATE, DELETE, CREATE, itd."
+      ],
+      "Allow multi schema metadata fetch": [
+        "Dovoli pridobivanje metapodatkov z več shemami"
+      ],
+      "Chart cache timeout": ["Trajanje predpomnilnika grafikona"],
+      "Operate the database in asynchronous mode, meaning that the queries are executed on remote workers as opposed to on the web server itself. This assumes that you have a Celery worker setup as well as a results backend. Refer to the installation docs for more information.": [
+        "Upravljanje podatkovne baze v asinhronem načinu pomeni, da se poizvedbe zaženejo na oddaljenih »delavcih« in ne na samem spletnem strežniku. S tem je predpostavljeno, da imate nastavljenega »delavca« za Celery in zaledni sistem za rezultate. Več informacij je v navodilih za namestitev."
+      ],
+      "Secure extra": ["Dodatna varnost"],
+      "JSON string containing additional connection configuration.": [
+        "JSON niz vsebuje dodatne nastavitve povezave."
+      ],
+      "This is used to provide connection information for systems like Hive, Presto, and BigQuery, which do not conform to the username:password syntax normally used by SQLAlchemy.": [
+        "S tem pridobite informacije o povezavi za sisteme, kot so Hive, Presto in BigQuery, ki niso skladni s shemo uporabniško_ime:geslo, ki se običajno uporablja v SQLAlchemy."
+      ],
+      "Optional CA_BUNDLE contents to validate HTTPS requests. Only available on certain database engines.": [
+        "Opcijska CA_BUNDLE vsebina, za potrjevanje HTTPS zahtev. Razpoložljivo le na določenih sistemih podatkovnih baz."
+      ],
+      "Impersonate Logged In User (Presto, Hive, and GSheets)": [
+        "Predstavljanje kot prijavljeni uporabnik (Presto, Hive in GSheets)"
+      ],
+      "If Presto, all the queries in SQL Lab are going to be executed as the currently logged on user who must have permission to run them. If Hive and hive.server2.enable.doAs is enabled, will run the queries as service account, but impersonate the currently logged on user via hive.server2.proxy.user property.": [
+        "V Presto se vse poizvedbe v SQL laboratoriju zaženejo pod trenutno prijavljenim uporabnikom, ki mora imeti pravice za poganjanje. Če je omogočen Hive in hive.server2.enable.doAs, poizvedbe tečejo pod servisnim računom, vendar je trenutno prijavljen uporabnik predstavljen z lastnostjo hive.server2.proxy.user."
+      ],
+      "Allow data upload": ["Dovoli nalaganje podatkov"],
+      "If selected, please set the schemas allowed for data upload in Extra.": [
+        "Če je izbrano, nastavite dovoljene sheme za nalaganje podatkov v Dodatno."
+      ],
+      "JSON string containing extra configuration elements.": [
+        "JSON niz, ki vsebuje dodatne nastavitve povezave."
+      ],
+      "1. The engine_params object gets unpacked into the sqlalchemy.create_engine call, while the metadata_params gets unpacked into the sqlalchemy.MetaData call.": [
+        "1. Objekt engine_params se razširi v klic sqlalchemy.create_engine, medtem ko se metadata_params razširijo v sqlalchemy.MetaData call."
+      ],
+      "2. The metadata_cache_timeout is a cache timeout setting in seconds for metadata fetch of this database. Specify it as \"metadata_cache_timeout\": {\"schema_cache_timeout\": 600, \"table_cache_timeout\": 600}. If unset, cache will not be enabled for the functionality. A timeout of 0 indicates that the cache never expires.": [
+        "2. metadata_cache_timeout je trajanje predpomnilnik v sekundah za pridobivanje metapodatkov za to podatkovno bazo. Definirajte ga kot \"metadata_cache_timeout\": {\"schema_cache_timeout\": 600, \"table_cache_timeout\": 600}. Če ni definirano, predpomnilnik ne bo omogčen pri tej funkciji. Trajanje 0 določa, da se predpomnilnik ne izteče."
+      ],
+      "3. The schemas_allowed_for_csv_upload is a comma separated list of schemas that CSVs are allowed to upload to. Specify it as \"schemas_allowed_for_csv_upload\": [\"public\", \"csv_upload\"]. If database flavor does not support schema or any schema is allowed to be accessed, just leave the list empty.": [
+        "3. schemas_allowed_for_csv_upload je z vejicami ločen seznam shem, ki jih je dovoljeno nalagati s CSV-ji. Definirajte ga kot \"schemas_allowed_for_csv_upload\": [\"public\", \"csv_upload\"]. Če tip podatkovne baza ne podpira sheme ali pa je dovoljen dostop do vseh shem, pustite seznam prazen."
+      ],
+      "4. The version field is a string specifying this db's version. This should be used with Presto DBs so that the syntax is correct.": [
+        "4. Polje \"version\" je znakovni niz, ki določa verzijo podatkovne baze. Uporabljeno mora biti s Presto bazo, da je sintaksa pravilna."
+      ],
+      "5. The allows_virtual_table_explore field is a boolean specifying whether or not the Explore button in SQL Lab results is shown.": [
+        "5. Polje \"allows_virtual_table_explore\" je binarnega tipa in določa, prikaz gumba \"Razišči\" v rezultatih SQL laboratorija."
+      ],
+      "Display Name": ["Ime za prikaz"],
+      "Name your database": ["Poimenujte podatkovno bazo"],
+      "Pick a name to help you identify this database.": [
+        "Izberite ime za lažjo prepoznavo podatkovne baze."
+      ],
+      "dialect+driver://username:password@host:port/database": [
+        "dialect+driver://username:password@host:port/database"
+      ],
+      "Refer to the": ["Obrnite se na"],
+      "for more information on how to structure your URI.": [
+        "za več informacij o oblikovanju URI."
+      ],
+      "Test connection": ["Preizkus povezave"],
+      "Please enter a SQLAlchemy URI to test": [
+        "Vnesite SQLAlchemy URI za test"
+      ],
+      "Sorry there was an error fetching database information: %s": [
+        "Pri pridobivanju informacij o podatkovni bazi je prišlo do napake: %s"
+      ],
+      "Connect": ["Poveži"],
+      "Edit database": ["Uredi podatkovno bazo"],
+      "Connect a database": ["Poveži se s podatkovno bazo"],
+      "Finish": ["Končaj"],
+      "Add dataset": ["Dodaj podatkovni set"],
+      "The passwords for the databases below are needed in order to import them together with the datasets. Please note that the \"Secure Extra\" and \"Certificate\" sections of the database configuration are not present in export files, and should be added manually after the import if they are needed.": [
+        "Gesla za spodnje podatkovne baze so potrebna za uvoz skupaj s podatkovnimi seti. Sekciji \"Dodatna varnost\" in \"Certifikati\" v nastavitvah podatkovne baze nista prisotni v izvoženih datotekah in jih je potrebno dodati ročno po uvozu, če je to potrebno."
+      ],
+      "You are importing one or more datasets that already exist. Overwriting might cause you to lose some of your work. Are you sure you want to overwrite?": [
+        "Uvažate enega ali več podatkovnih setov, ki že obstajajo. S prepisom lahko izgubite podatke. Ali ste prepričani, da želite prepisati?"
+      ],
+      "An error occurred while fetching dataset related data": [
+        "Napaka pri pridobivanju podatkov iz podatkovnega seta"
+      ],
+      "An error occurred while fetching dataset related data: %s": [
+        "Napaka pri pridobivanju podatkov iz podatkovnega seta: %s"
+      ],
+      "Physical dataset": ["Fizičen podatkovni set"],
+      "Virtual dataset": ["Virtualen podatkovni set"],
+      "An error occurred while fetching dataset owner values: %s": [
+        "Pri pridobivanju polja lastnik podatkovnega seta je prišlo do napake: %s"
+      ],
+      "An error occurred while fetching datasets: %s": [
+        "Prišlo je do napake pri pridobivanju podatkovnih setov: %s"
+      ],
+      "An error occurred while fetching schema values: %s": [
+        "Pri pridobivanju vrednosti shem je prišlo do napake: %s"
+      ],
+      "Import datasets": ["Uvozi podatkovne sete"],
+      "There was an issue deleting the selected datasets: %s": [
+        "Pri brisanju izbranih podatkovnih setov je prišlo do težave: %s"
+      ],
+      "The dataset %s is linked to %s charts that appear on %s dashboards. Are you sure you want to continue? Deleting the dataset will break those objects.": [
+        "Podatkovni set %s je povezan z grafikoni %s, ki so prisotni na nadzorni plošči %s. Ali želite nadaljevati? Izbris podatkovnega seta bo pokvaril te objekte."
+      ],
+      "Delete Dataset?": ["Izbrišem podatkovni set?"],
+      "Are you sure you want to delete the selected datasets?": [
+        "Ali ste prepričani, da želite izbrisati izbrane podatkovne sete?"
+      ],
+      "0 Selected": ["Izbranih: 0"],
+      "%s Selected (Virtual)": ["Izbranih: %s (virtualni)"],
+      "%s Selected (Physical)": ["Izbranih: %s (fizični)"],
+      "%s Selected (%s Physical, %s Virtual)": [
+        "Izbranih: %s (fizični: %s, virtualni: %s)"
+      ],
+      "There was an issue previewing the selected query. %s": [
+        "Pri predogledu izbrane poizvedbe je prišlo do težave. %s"
+      ],
+      "Success": ["Uspelo"],
+      "Failed": ["Ni uspelo"],
+      "Running": ["V teku"],
+      "Offline": ["Offline"],
+      "Scheduled": ["V urniku"],
+      "Duration: %s": ["Trajanje: %s"],
+      "Tab name": ["Naslov zavihka"],
+      "TABLES": ["TABELE"],
+      "Rows": ["Vrstice"],
+      "Open query in SQL Lab": ["Odpri poizvedbo v SQL laboratoriju"],
+      "An error occurred while fetching database values: %s": [
+        "Pri pridobivanju vrednosti podatkovne baze je prišlo do napake: %s"
+      ],
+      "Search by query text": ["Išči z besedilom poizvedbe"],
+      "Query preview": ["Predogled poizvedbe"],
+      "Next": ["Naslednji"],
+      "Open in SQL Lab": ["Odpri v SQL laboratoriju"],
+      "User query": ["Uporabnikova poizvedba"],
+      "Executed query": ["Zagnana poizvedba"],
+      "The passwords for the databases below are needed in order to import them together with the saved queries. Please note that the \"Secure Extra\" and \"Certificate\" sections of the database configuration are not present in export files, and should be added manually after the import if they are needed.": [
+        "Gesla za spodnje podatkovne baze so potrebna za uvoz skupaj s shranjenimi poizvedbami. Sekciji \"Dodatna varnost\" in \"Certifikati\" v nastavitvah podatkovne baze nista prisotni v izvoženih datotekah in jih je potrebno dodati ročno po uvozu, če je to potrebno."
+      ],
+      "You are importing one or more saved queries that already exist. Overwriting might cause you to lose some of your work. Are you sure you want to overwrite?": [
+        "Uvažate eno ali več shranjenih poizvedb, ki že obstajajo. S prepisom lahko izgubite podatke. Ali ste prepričani, da želite prepisati?"
+      ],
+      "There was an issue previewing the selected query %s": [
+        "Do težave je prišlo pri predogledu izbrane poizvedbe %s"
+      ],
+      "Import queries": ["Uvozi poizvedbe"],
+      "There was an issue deleting the selected queries: %s": [
+        "Do težave je prišlo pri brisanju izbranih poizvedb: %s"
+      ],
+      "Edit query": ["Uredi poizvedbo"],
+      "Copy query URL": ["Kopiraj URL poizvedbe"],
+      "Export query": ["Izvozi poizvedbe"],
+      "Delete query": ["Izbriši poizvedbo"],
+      "This action will permanently delete the saved query.": [
+        "S tem dejanjem boste trajno izbrisali shranjeno poizvedbo."
+      ],
+      "Delete Query?": ["Izbrišem poizvedbo?"],
+      "Are you sure you want to delete the selected queries?": [
+        "Ali ste prepričani, da želite izbrisati izbrane poizvedbe?"
+      ],
+      "queries": ["poizvedbe"],
+      "Query name": ["Ime poizvedbe"],
+      "[Untitled]": ["[Neimenovana]"],
+      "Unknown": ["Neznano"],
+      "Edited": ["Urejane"],
+      "Created": ["Ustvarjene"],
+      "Viewed": ["Ogledane"],
+      "Examples": ["Vzorci"],
+      "Mine": ["Moje"],
+      "Recently viewed charts, dashboards, and saved queries will appear here": [
+        "Nedavno ogledani grafikoni, nadzorne plošče in shranjene poizvedbe bodo prikazane tukaj"
+      ],
+      "Recently created charts, dashboards, and saved queries will appear here": [
+        "Nedavno ustvarjeni grafikoni, nadzorne plošče in shranjene poizvedbe bodo prikazane tukaj"
+      ],
+      "Recent example charts, dashboards, and saved queries will appear here": [
+        "Nedavni vzorci grafikonov, nadzornih plošč in shranjenih poizvedb bodo prikazani tukaj"
+      ],
+      "Recently edited charts, dashboards, and saved queries will appear here": [
+        "Nedavno urejani grafikoni, nadzorne plošče in shranjene poizvedbe bodo prikazane tukaj"
+      ],
+      "${tableName\r\n                      .split('')\r\n                      .slice(0, tableName.length - 1)\r\n                      .join('')}\r\n                    ": [
+        "${tableName\r\n                        .split('')\r\n                        .slice(0, tableName.length - 1)\r\n                        .join('')}\r\n                    "
+      ],
+      "You don't have any favorites yet!": ["Priljubljenih še niste izbrali!"],
+      "SQL Lab queries": ["Poizvedbe SQL laboratorija"],
+      "${tableName}": ["${tableName}"],
+      "query": ["poizvedba"],
+      "Share": ["Deljenje"],
+      "Last run %s": ["Zadnji zagon %s"],
+      "There was an issue fetching your recent activity: %s": [
+        "Pri pridobivanju vaše nedavne aktivnosti je prišlo do napake: %s"
+      ],
+      "There was an issues fetching your dashboards: %s": [
+        "Prišlo je do napake pri pridobivanju nadzornih plošč: %s"
+      ],
+      "There was an issues fetching your chart: %s": [
+        "Prišlo je do napake pri pridobivanju grafikona: %s"
+      ],
+      "There was an issues fetching your saved queries: %s": [
+        "Prišlo je do napake pri pridobivanju shranjenih poizvedb: %s"
+      ],
+      "Recents": ["Nedavno"],
+      "Select start and end date": ["Izberite začetni in končni datum"],
+      "Type or Select [%s]": ["Vnesite ali izberite [%s]"],
+      "Filter box": ["Izbirnik za filtriranje"],
+      "Filters configuration": ["Nastavitve filtrov"],
+      "Filter configuration for the filter box": ["Nastavitve za polje filtra"],
+      "Date filter": ["Filter po datumu"],
+      "Whether to include a time filter": [
+        "Če želite vključiti časovni filter"
+      ],
+      "Instant filtering": ["Takojšnje filtriranje"],
+      "Check to apply filters instantly as they change instead of displaying [Apply] button": [
+        "Izberite za takojšnjo uporabo filtrov, ko se spremenijo, brez prikazovanja gumba Uveljavi"
+      ],
+      "Show SQL granularity dropdown": [
+        "Prikaži SQL spustni seznam za granulacijo"
+      ],
+      "Check to include SQL granularity dropdown": [
+        "Izberite za vključitev spustnega seznama za SQL granulacijo"
+      ],
+      "Show SQL time column": ["Prikaži stolpec SQL čas"],
+      "Check to include time column dropdown": [
+        "Izberite za vključitev časovnega stolpca v spustni seznam"
+      ],
+      "Show Druid granularity dropdown": [
+        "Prikaži spustni seznam za Druid granulacijo"
+      ],
+      "Check to include Druid granularity dropdown": [
+        "Izberite za vključitev spustnega seznama za Druid granulacijo"
+      ],
+      "Show Druid time origin": ["Prikaži časovno izhodišče za Druid"],
+      "Check to include time origin dropdown": [
+        "Izberi za vključitev spustnega seznama za časovno izhodišče"
+      ],
+      "Limit selector values": ["Omeji vrednosti izbirnikov"],
+      "These filters apply to the values available in the dropdowns": [
+        "Ti filtri se nanašajo na vrednosti v spustnih seznamih"
+      ],
+      "Time-series Table": ["Tabela s časovno vrsto"],
+      "Time Range": ["Časovno obdobje"],
+      "Time Column": ["Časovni stolpec"],
+      "Time Grain": ["Granulacija časa"],
+      "Time Granularity": ["Granulacija časa"],
+      "Aggregate": ["Agregiraj"],
+      "Raw records": ["Surovi podatki"],
+      "Datasource & Chart Type": ["Tip podatkovnega vira in grafikona"],
+      "URL Parameters": ["Parametri URL"],
+      "Extra url parameters for use in Jinja templated queries": [
+        "Dodatni parametri za poizvedbe z Jinja predlogami"
+      ],
+      "Extra Parameters": ["Dodatni parametri"],
+      "Extra parameters that any plugins can choose to set for use in Jinja templated queries": [
+        "Dodatni parametri, ki jih lahko uporabi kateri koli vtičnik za poizvedbe z Jinja predlogami"
+      ],
+      "Color Scheme": ["Barvna shema"],
+      "Annotations and Layers": ["Oznake in sloji"],
+      "Show info tooltip": ["Prikaži opis orodja"],
+      "One or many columns to group by": [
+        "Eden ali več stolpcev za združevanje"
+      ],
+      "One or many columns to pivot as columns": [
+        "En ali več stolpcev za stolpčno vrtenje"
+      ],
+      "Bubble Size": ["Velikost mehurčka"],
+      "Metric used to calculate bubble size": [
+        "Mera za izračun velikosti mehurčkov"
+      ],
+      "Color Metric": ["Mera za barvo"],
+      "Fixed Color": ["Izbrana barva"],
+      "Right Axis Metric": ["Mera desne osi"],
+      "Linear Color Scheme": ["Linearna barvna shema"],
+      "Sort By": ["Razvrščanje"],
+      "Time format": ["Oblika zapisa časa"],
+      "Color Map": ["Barvna lestvica"],
+      "Show less columns": ["Prikaži manj stolpcev"],
+      "Show all columns": ["Prikaži vse stolpce"],
+      "Fraction digits": ["Število decimalk"],
+      "Number of decimal digits to round numbers to": [
+        "Število decimalnih mest za zaokroževanje števil"
+      ],
+      "Min Width": ["Min. širina"],
+      "Default minimal column width in pixels, actual width may still be larger than this if other columns don't need much space": [
+        "Privzeta min. širina stolpca v pikslih. Dejanska širina bo lahko večja, če drugi stolpci ne potrebujejo veliko prostora"
+      ],
+      "Text align": ["Poravnava besedila"],
+      "Horizontal alignment": ["Vodoravna poravnava"],
+      "Left": ["Levo"],
+      "Center": ["Na sredino"],
+      "Right": ["Desno"],
+      "Show cell bars": ["Prikaži stolp. graf v celicah"],
+      "Whether to display a bar chart background in table columns": [
+        "Če želite omogočiti prikaz manjših stolpčnih grafikonov v ozadju stolpcev tabele"
+      ],
+      "Align +/-": ["Poravnaj +/-"],
+      "Whether to align positive and negative values in cell bar chart at 0": [
+        "Če želite poravnati pozitivne in negativne vrednosti v stolpčnem grafikonu celic pri 0"
+      ],
+      "Color +/-": ["Barva +/-"],
+      "Whether to colorize numeric values by if they are positive or negative": [
+        "Če želite obarvati številske vrednosti, ko so le-te pozitivne ali negativne"
+      ],
+      "Small number format": ["Oblika zapisa majhnih števil"],
+      "D3 number format for numbers between -1.0 and 1.0, useful when you want to have different siginificant digits for small and large numbers": [
+        "D3 oblika zapisa za števila med -1.0 in 1.0. Uporabno, če želite različno število števk za majhna in velika števila"
+      ],
+      "Adaptative formating": ["Adaptivno oblikovanje"],
+      "Duration in ms (66000 => 1m 6s)": ["Trajanje v ms (66000 => 1m 6s)"],
+      "Duration in ms (1.40008 => 1ms 400µs 80ns)": [
+        "Trajanje v ms (1.40008 => 1ms 400µs 80ns)"
+      ],
+      "D3 time format syntax: https://github.com/d3/d3-time-format": [
+        "Sintaksa D3 časovnega formata:: https://github.com/d3/d3-time-format"
+      ],
+      "Found invalid orderby options": [
+        "Najdene so neveljavne možnosti razvrščanja"
+      ],
+      "is expected to be an integer": ["pričakovano je celo število"],
+      "is expected to be a number": ["pričakovano je število"],
+      "cannot be empty": ["ne sme biti prazna"],
+      "haha": ["haha"],
+      "foo": ["foo"],
+      "bar": ["bar"],
+      "yes": ["da"],
+      "second": ["sekunda"],
+      "ox": ["ox"],
+      "Domain": ["Domena"],
+      "The time unit used for the grouping of blocks": [
+        "Časovna enota za združevanje blokov"
+      ],
+      "Subdomain": ["Poddomena"],
+      "The time unit for each block. Should be a smaller unit than domain_granularity. Should be larger or equal to Time Grain": [
+        "Časovna enota za vsak blok. Mora biti manjša enota kot domenska_granulacija. Mora biti večja ali enaka Granulaciji časa"
+      ],
+      "Chart Options": ["Možnosti grafikona"],
+      "Cell Size": ["Velikost celice"],
+      "The size of the square cell, in pixels": [
+        "Velikost kvadratne celice v pikslih"
+      ],
+      "Cell Padding": ["Razmak med celicami"],
+      "The distance between cells, in pixels": [
+        "Razdalja med celicami v pikslih"
+      ],
+      "Cell Radius": ["Polmer celice"],
+      "The pixel radius": ["Polmer piksla"],
+      "Color Steps": ["Barvni koraki"],
+      "The number color \"steps\"": ["Število barvnih korakov"],
+      "Time Format": ["Oblika zapisa časa"],
+      "Legend": ["Legenda"],
+      "Whether to display the legend (toggles)": [
+        "Preklapljanje prikaza legende"
+      ],
+      "Show Values": ["Pokaži vrednosti"],
+      "Whether to display the numerical values within the cells": [
+        "Če želite v celicah prikazati numerične vrednosti"
+      ],
+      "Show Metric Names": ["Pokaži imena mer"],
+      "Whether to display the metric name as a title": [
+        "Če želite prikazati ime mere kot naslov"
+      ],
+      "Number Format": ["Oblika zapisa števila"],
+      "Sort by metric": ["Mera za razvrščanje"],
+      "Whether to sort results by the selected metric in descending order.": [
+        "Če želite padajoče razvrstiti rezultate z izbrano mero."
+      ],
+      "Number format": ["Oblika zapisa števila"],
+      "Choose a number format": ["Izberite obliko zapisa števila"],
+      "Choose a source": ["Izberite vir"],
+      "Target": ["Cilj"],
+      "Choose a target": ["Izberite cilj"],
+      "Chord Diagram": ["Tetivni grafikon"],
+      "Country": ["Država"],
+      "Which country to plot the map for?": [
+        "Za katero državo želite grafikon?"
+      ],
+      "ISO 3166-2 Codes": ["Oznake po ISO 3166-2"],
+      "Column containing ISO 3166-2 codes of region/province/department in your table.": [
+        "Stolpec, ki vsebuje ISO 3166-2 oznake regij/provinc/departmajev v vaši tabeli."
+      ],
+      "Sorry, there appears to be no data": ["Ni podatkov"],
+      "Event definition": ["Definicija dogodka"],
+      "Event Names": ["Imena dogodkov"],
+      "Columns to display": ["Stolpci za prikaz"],
+      "Order by entity id": ["Uredi po ID entitete"],
+      "Important! Select this if the table is not already sorted by entity id, else there is no guarantee that all events for each entity are returned.": [
+        "Pomembno! Izberite, če tabela še ni razvrščena po ID entitete, v nasprotnem primeru ni nujno, da bodo vrnjeni vsi dogodki za posamezno entiteto."
+      ],
+      "Minimum leaf node event count": ["Min. število dogodkov za list"],
+      "Leaf nodes that represent fewer than this number of events will be initially hidden in the visualization": [
+        "Listna vozlišča, ki predstavljajo manjše število dogodkov od te vrednosti, bodo v vizualizaciji skrita"
+      ],
+      "Additional metadata": ["Dodatni metapodatki"],
+      "Metadata": ["Metapodatki"],
+      "Select any columns for metadata inspection": [
+        "Izberite poljubne stolpce za pregled metapodatkov"
+      ],
+      "Entity ID": ["ID entitete"],
+      "e.g., a \"user id\" column": ["t.j. stolpec \"id uporabnika\""],
+      "Max Events": ["Max. dogodkov"],
+      "The maximum number of events to return, equivalent to the number of rows": [
+        "Največje število dogodkov, ki bodo vrnjeni - enako številu vrstic"
+      ],
+      "Event Flow": ["Potek dogodkov"],
+      "Link Length": ["Dolžina povezave"],
+      "Link length in the force layout": ["Dolžina povezave v postavitvi sil"],
+      "Charge": ["Naboj"],
+      "Charge in the force layout": ["Naboj v postavitvi sil"],
+      "Source / Target": ["Izhodišče/Cilj"],
+      "Choose a source and a target": ["Izberite izhodišče in cilj"],
+      "Force-directed Graph": ["Graf usmerjenih sil"],
+      "Axis ascending": ["Naraščajoča os"],
+      "Axis descending": ["Padajoča os"],
+      "Metric ascending": ["Naraščajoča mera"],
+      "Metric descending": ["Padajoča mera"],
+      "Heatmap Options": ["Možnosti toplotnega prikaza"],
+      "XScale Interval": ["Interval X-osi"],
+      "Number of steps to take between ticks when displaying the X scale": [
+        "Število korakov med oznakami pri prikazu X-osi"
+      ],
+      "YScale Interval": ["Interval Y-osi"],
+      "Number of steps to take between ticks when displaying the Y scale": [
+        "Število korakov med oznakami pri prikazu Y-osi"
+      ],
+      "Rendering": ["Izris"],
+      "image-rendering CSS attribute of the canvas object that defines how the browser scales up the image": [
+        "atribut CSS za izris objekta platna, ki določa, kako brskalnik poveča sliko"
+      ],
+      "Normalize Across": ["Normiraj glede na"],
+      "Color will be rendered based on a ratio of the cell against the sum of across this criteria": [
+        "Barva bo prikazana na osnovi razmerja med celico in vsoto glede na ta kriterij"
+      ],
+      "Left Margin": ["Levi rob"],
+      "Left margin, in pixels, allowing for more room for axis labels": [
+        "Levi rob, v pikslih, s katerim povečamo prostor za oznake osi"
+      ],
+      "Bottom Margin": ["Spodnji rob"],
+      "Bottom margin, in pixels, allowing for more room for axis labels": [
+        "Spodnji rob, v pikslih, s katerim povečamo prostor za oznake osi"
+      ],
+      "Value bounds": ["Meje vrednosti"],
+      "Hard value bounds applied for color coding. Is only relevant and applied when the normalization is applied against the whole heatmap.": [
+        "Mejne vrednosti za barvno lestvico. Upošteva se le, če je normiranje uporabljeno glede na celotni toplotni prikaz."
+      ],
+      "Show percentage": ["Prikaži procente"],
+      "Whether to include the percentage in the tooltip": [
+        "Če želite prikaz procentov v opisu orodja"
+      ],
+      "Normalized": ["Normiran"],
+      "Whether to apply a normal distribution based on rank on the color scale": [
+        "Če želite uporabiti normalno porazdelitev glede na stopnjo na barvni lestvici"
+      ],
+      "Sort X Axis": ["Razvrsti X-os"],
+      "Sort Y Axis": ["Razvrsti Y-os"],
+      "Value Format": ["Oblika zapisa vrednosti"],
+      "count": ["število"],
+      "cumulative": ["kumulativno"],
+      "Select the numeric columns to draw the histogram": [
+        "Izberite numerične stolpce za izris histograma"
+      ],
+      "No of Bins": ["Št. razdelkov"],
+      "Select the number of bins for the histogram": [
+        "Izberite število razdelkov za histogram"
+      ],
+      "X Axis Label": ["Naslov X osi"],
+      "Y Axis Label": ["Naslov Y osi"],
+      "Whether to normalize the histogram": ["Če želite normirati histogram"],
+      "Sort Descending": ["Razvrsti padajoče"],
+      "Series Height": ["Višina serije"],
+      "Pixel height of each series": ["Višina vsake serije v pikslih"],
+      "Value Domain": ["Domena vrednosti"],
+      "series: Treat each series independently; overall: All series use the same scale; change: Show changes compared to the first data point in each series": [
+        "serije: Obravnavaj vsako podatkovno serijo neodvisno; skupno: Vse vrste uporabljajo enako skalo; razlika: Pokaži razlike glede na prvo točko vsake serije"
+      ],
+      "Horizon Chart": ["Horizontni grafikon"],
+      "Longitude": ["Dolžina"],
+      "Column containing longitude data": [
+        "Stolpec s podatki zemljepisne dolžine"
+      ],
+      "Latitude": ["Širina"],
+      "Column containing latitude data": [
+        "Stolpec s podatki zemljepisne širine"
+      ],
+      "Clustering Radius": ["Radij gručenja"],
+      "The radius (in pixels) the algorithm uses to define a cluster. Choose 0 to turn off clustering, but beware that a large number of points (>1000) will cause lag.": [
+        "Radij (v pikslih), s katerim algoritem definira gručo. Izberite 0 za izklop gručenja - veliko število točk (>1000) bo povzročilo upočasnitev."
+      ],
+      "Points": ["Točke"],
+      "Point Radius": ["Radij točk"],
+      "The radius of individual points (ones that are not in a cluster). Either a numerical column or `Auto`, which scales the point based on the largest cluster": [
+        "Radij posameznih točk (tistih, ki niso v gruči). Numerični stolpec ali `Auto` (skalira točke na osnovi največje gruče)"
+      ],
+      "Point Radius Unit": ["Enota radija točk"],
+      "The unit of measure for the specified point radius": [
+        "Enota merila za definiran radij točk"
+      ],
+      "Labelling": ["Oznake"],
+      "label": ["oznaka"],
+      "`count` is COUNT(*) if a group by is used. Numerical columns will be aggregated with the aggregator. Non-numerical columns will be used to label points. Leave empty to get a count of points in each cluster.": [
+        "`število` je COUNT(*), če je uporabljeno združevanje (group by). Numerični stolpci bodo agregirani z agregatorjem. Ne-numerični stolpci, bodo uporabljeni za oznake točk. Pustite prazno, da dobite število točk v posamezni gruči."
+      ],
+      "Cluster label aggregator": ["Agregator za oznako gruče"],
+      "Aggregate function applied to the list of points in each cluster to produce the cluster label.": [
+        "Agregacijska funkcija za seznam točk v vsaki gruči, s katero se ustvari oznaka gruče."
+      ],
+      "Visual Tweaks": ["Nastavitve izgleda"],
+      "Live render": ["Sprotni izris"],
+      "Points and clusters will update as the viewport is being changed": [
+        "Točke in gruče se bodo posodabljale, če se bo spremenil pogled"
+      ],
+      "Map Style": ["Slog zemljevida"],
+      "Base layer map style": ["Slog osnovnega sloja zemljevida"],
+      "Opacity of all clusters, points, and labels. Between 0 and 1.": [
+        "Prosojnost vseh gruč, točk in oznak (vrednost med 0 in 1)."
+      ],
+      "RGB Color": ["RGB barva"],
+      "The color for points and clusters in RGB": [
+        "Barva točk in gruč v RGB zapisu"
+      ],
+      "Viewport": ["Pogled"],
+      "Default longitude": ["Privzeta dolžina"],
+      "Longitude of default viewport": ["Dolžina privzetega pogleda"],
+      "Default latitude": ["Privzeta širina"],
+      "Latitude of default viewport": ["Širina privzetega pogleda"],
+      "Zoom": ["Povečava"],
+      "Zoom level of the map": ["Stopnja povečave zemljevida"],
+      "One or many controls to group by. If grouping, latitude and longitude columns must be present.": [
+        "Eden ali več kontrolnikov za združevanje. Pri združevanju morata biti prisotna stolpca širine in dolžine."
+      ],
+      "MapBox": ["MapBox"],
+      "Significance Level": ["Stopnja značilnosti"],
+      "Threshold alpha level for determining significance": [
+        "Mejna vrednost alfa za določanje značilnosti"
+      ],
+      "p-value precision": ["točnost p-vrednosti"],
+      "Number of decimal places with which to display p-values": [
+        "Število decimalnih mest za prikaz p-vrednosti"
+      ],
+      "Lift percent precision": ["Točnost procentualnega dviga"],
+      "Number of decimal places with which to display lift values": [
+        "Število decimalnih mest za prikaz vrednosti dviga"
+      ],
+      "Paired t-test Table": ["Tabela t-testa za odvisne vzorce"],
+      "Options": ["Možnosti"],
+      "Data Table": ["Tabela podatkov"],
+      "Whether to display the interactive data table": [
+        "Če želite prikaz interaktivne podatkovne tabele"
+      ],
+      "Include Series": ["Vključi serijo"],
+      "Include series name as an axis": [
+        "Vključi ime podatkovne serije v naslov osi"
+      ],
+      "Time Series Options": ["Možnosti časovne vrste"],
+      "Not Time Series": ["Ni časovna vrsta"],
+      "Ignore time": ["Ne upoštevaj časa"],
+      "Time Series": ["Časovna vrsta"],
+      "Standard time series": ["Standardna časovna vrsta"],
+      "Aggregate Mean": ["Agregirano povprečje"],
+      "Mean of values over specified period": [
+        "Povprečna vrednost v dani periodi"
+      ],
+      "Aggregate Sum": ["Agregirana vsota"],
+      "Sum of values over specified period": ["Vsota vrednosti v dani periodi"],
+      "Difference": ["Razlika"],
+      "Metric change in value from `since` to `until`": [
+        "Sprememba mere od vrednosti \"OD\" do \"DO\""
+      ],
+      "Percent Change": ["Procentualna sprememba"],
+      "Metric percent change in value from `since` to `until`": [
+        "Procentualna sprememba mere od vrednosti \"OD\" do \"DO\""
+      ],
+      "Factor": ["Faktor"],
+      "Metric factor change from `since` to `until`": [
+        "Sprememba faktorja mere od vrednosti \"OD\" do \"DO\""
+      ],
+      "Advanced Analytics": ["Napredna analitika"],
+      "Use the Advanced Analytics options below": [
+        "Uporabite spodnje možnosti napredne analitike"
+      ],
+      "Settings for time series": ["Nastavitve časovne vrste"],
+      "Date Time Format": ["Oblika zapisa Datum-Časa"],
+      "Partition Limit": ["Omejitev particij"],
+      "The maximum number of subdivisions of each group; lower values are pruned first": [
+        "Največje število podrazdelkov posamezne skupine; nižje vrednosti so zanemarjene prve"
+      ],
+      "Partition Threshold": ["Prag particije"],
+      "Partitions whose height to parent height proportions are below this value are pruned": [
+        "Particije z nižjim razmerjem med njihovo višino in dolžino starša so zanemarjene"
+      ],
+      "Log Scale": ["Logaritemska skala"],
+      "Use a log scale": ["Uporabi logaritemsko skalo"],
+      "Equal Date Sizes": ["Enaki datumi"],
+      "Check to force date partitions to have the same height": [
+        "Če želite, da imajo datumske particije enako višino"
+      ],
+      "Rich Tooltip": ["Podroben opis orodja"],
+      "The rich tooltip shows a list of all series for that point in time": [
+        "Podroben opis orodja prikaže seznam vseh podatkovnih serij za posamezno istočasno točko"
+      ],
+      "Rolling Window": ["Drseče okno"],
+      "Rolling Function": ["Drseča funkcija"],
+      "Min Periods": ["Min. št. period"],
+      "Time Comparison": ["Časovna primerjava"],
+      "Time Shift": ["Časovni zamik"],
+      "Python Functions": ["Pythonove funkcije"],
+      "Partition Chart": ["Grafikon razdelkov"],
+      "Pivot Options": ["Vrtilne možnosti"],
+      "Aggregation function": ["Agregacijska funkcija"],
+      "Aggregate function to apply when pivoting and computing the total rows and columns": [
+        "Agregacijska funkcija za vrtenje in izračun vseh vrstic in stolpcev"
+      ],
+      "Show totals": ["Pokaži vsote"],
+      "Display total row/column": ["Pokaži vsote vrstic/stolpcev"],
+      "Combine Metrics": ["Združuj mere"],
+      "Display metrics side by side within each column, as opposed to each column being displayed side by side for each metric.": [
+        "Prikazuj mere eno ob drugi ob vsakem stolpcu, drugače je vsak stolpec prikazan en ob drugem za vsako mero."
+      ],
+      "Transpose Pivot": ["Transponirano vrtenje"],
+      "Swap Groups and Columns": ["Zamenjaj Skupine in Stolpce"],
+      "Date format": ["Oblika zapisa datuma"],
+      "Use Area Proportions": ["Uporabi razmerje površin"],
+      "Check if the Rose Chart should use segment area instead of segment radius for proportioning": [
+        "Če želite, da grafikon \"Rose\" uporablja površino segmenta namesto radija za proporcioniranje"
+      ],
+      "Nightingale Rose Chart": ["Nightingale Rose grafikon"],
+      "Limiting rows may result in incomplete data and misleading charts. Consider filtering or grouping source/target names instead.": [
+        "Omejitev vrstic lahko povzroči nepopolne podatke in zavajajoč grafikon. Premislite o uporabi filtriranja ali združevanja imen izvorov/ciljev."
+      ],
+      "Sankey Diagram": ["Sankey grafikon"],
+      "Sankey Diagram with Loops": ["Sankey grafikon z zankami"],
+      "Primary Metric": ["Primarna mera"],
+      "The primary metric is used to define the arc segment sizes": [
+        "Primarna mera določa velikost lokov segmentov"
+      ],
+      "Secondary Metric": ["Sekundarna mera"],
+      "[optional] this secondary metric is used to define the color as a ratio against the primary metric. When omitted, the color is categorical and based on labels": [
+        "[opcijsko] sekundarna mera določa barvo kot razmerje do primarne mere. Če je izpuščena, je barva določena kategorično na podlagi oznak"
+      ],
+      "When only a primary metric is provided, a categorical color scale is used.": [
+        "Če je podana samo primarna metrika, je uporabljena kategorična barvna skala."
+      ],
+      "When a secondary metric is provided, a linear color scale is used.": [
+        "Če je podana sekundarna metrika, je uporabljena linearna barvna skala."
+      ],
+      "Hierarchy": ["Hierarhija"],
+      "This defines the level of the hierarchy": ["Določa stopnjo hierarhije"],
+      "Sunburst Chart": ["Večnivojski tortni grafikon"],
+      "Time Series Columns": ["Stolpci s časovnimi vrstami"],
+      "Ratio": ["Razmerje"],
+      "Target aspect ratio for treemap tiles.": [
+        "Ciljno razmerje za razdelke drevesnega grafikona."
+      ],
+      "Country Field Type": ["Tip polja za države"],
+      "The country code standard that Superset should expect to find in the [country] column": [
+        "Standard za oznake držav, ki bodo podane v stolpcu z državami"
+      ],
+      "Show Bubbles": ["Prikaži mehurčke"],
+      "Whether to display bubbles on top of countries": [
+        "Če želite prikaz mehurčkov nad državami"
+      ],
+      "Max Bubble Size": ["Max. velikost mehurčka"],
+      "Country Column": ["Stolpec z državami"],
+      "3 letter code of the country": ["Tričrkovna oznaka države"],
+      "Metric for Color": ["Mera za barvo"],
+      "Metric that defines the color of the country": [
+        "Mera, ki določa barvo države"
+      ],
+      "Metric that defines the size of the bubble": [
+        "Mera, ki določa velikost mehurčka"
+      ],
+      "Bubble Color": ["Barva mehurčka"],
+      "Country Color Scheme": ["Barvna shema držav"],
+      "Big Number Font Size": ["Velikost pisave Velike številke"],
+      "Tiny": ["Drobna"],
+      "Normal": ["Normalna"],
+      "Huge": ["Ogromna"],
+      "Subheader Font Size": ["Velikost pisave podnaslova"],
+      "N/A": ["N/A"],
+      "Last available value seen on %s": [
+        "Zadnja razpoložljiva vrednost na %s"
+      ],
+      "Not up to date": ["Ni posodobljeno"],
+      "No data after filtering or data is NULL for the latest time record": [
+        "Ni podatkov po filtriranju ali pa imajo vrednost NULL za zadnji časovni zapis"
+      ],
+      "Try applying different filters or ensuring your datasource has data": [
+        "Poskusite uporabiti druge filtre oz. zagotovite, da so v podatkovnem viru podatki"
+      ],
+      "Comparison Period Lag": ["Zaostanek obdobja za primerjavo"],
+      "Based on granularity, number of time periods to compare against": [
+        "Na osnovi granulacije, število časovnih obdobij za primerjavo"
+      ],
+      "Comparison suffix": ["Pripona za primerjavo"],
+      "Suffix to apply after the percentage display": [
+        "Pripona za prikaz procenta"
+      ],
+      "Show Trend Line": ["Pokaži trendno črto"],
+      "Whether to display the trend line": ["Če želite prikazati trendno črto"],
+      "Start y-axis at 0": ["Začni y-os z 0"],
+      "Start y-axis at zero. Uncheck to start y-axis at minimum value in the data.": [
+        "Začni y-os z nič. Ne izberite, če želite, da se y-os začne z najmanjšo vrednostjo podatkov."
+      ],
+      "Fix to selected Time Range": ["Nastavi na izbrano časovno obdobje"],
+      "Fix the trend line to the full time range specified in case filtered results do not include the start or end dates": [
+        "Trendno črto nastavite na izbrano obdobje, v primeru, da filtrirani rezultati ne vsebujejo začetnega in/ali končnega datuma"
+      ],
+      "Subheader": ["Podnaslov"],
+      "Description text that shows up below your Big Number": [
+        "Besedilo, ki se prikaže pod veliko številko"
+      ],
+      "Right Axis Format": ["Oblika desne osi"],
+      "Show Markers": ["Prikaži markerje"],
+      "Show data points as circle markers on the lines": [
+        "Pokaži točke kot krožne markerje na krivuljah"
+      ],
+      "Y bounds": ["Y meje"],
+      "Whether to display the min and max values of the Y-axis": [
+        "Če želite prikaz min. in max. vrednosti Y-osi"
+      ],
+      "Y 2 bounds": ["Meje Y 2"],
+      "Line Style": ["Slog črte"],
+      "Line interpolation as defined by d3.js": [
+        "Interpolacija krivulje na osnovi d3.js"
+      ],
+      "Show Range Filter": ["Pokaži filter obdobja"],
+      "Whether to display the time range interactive selector": [
+        "Če želite prikaz interaktivnega izbirnika časovnega obdobja"
+      ],
+      "Extra Controls": ["Dodatni kontrolniki"],
+      "Whether to show extra controls or not. Extra controls include things like making mulitBar charts stacked or side by side.": [
+        "Če želite prikaz dodatnih kontrolnikov. Dodatni kontrolniki vključujejo možnost izdelave večstolpčnih grafikonov, naloženih ali drug ob drugem."
+      ],
+      "X Tick Layout": ["Postavitev oznak na X-osi"],
+      "The way the ticks are laid out on the X-axis": [
+        "Način razporeditve oznak na X-osi"
+      ],
+      "X Axis Format": ["Oblika X-osi"],
+      "Y Log Scale": ["Logaritemska Y-os"],
+      "Use a log scale for the Y-axis": ["Uporabi logaritemsko skalo za Y-os"],
+      "Y Axis Bounds": ["Meje Y-osi"],
+      "Bounds for the Y-axis. When left empty, the bounds are dynamically defined based on the min/max of the data. Note that this feature will only expand the axis range. It won't narrow the data's extent.": [
+        "Meje Y-osi. Če je prazno, se meje nastavijo dinamično na podlagi min./max. vrednosti podatkov. Funkcija omeji le prikaz, obseg podatkov pa ostane enak."
+      ],
+      "Y Axis 2 Bounds": ["Meje Y 2-osi"],
+      "X bounds": ["Meje X-osi"],
+      "Whether to display the min and max values of the X-axis": [
+        "Če želite prikaz min. in max. vrednosti X-osi"
+      ],
+      "Bar Values": ["Vrednosti stolpcev"],
+      "Show the value on top of the bar": [
+        "Prikaži vrednosti na vrhu stolpcev"
+      ],
+      "Stacked Bars": ["Naloženi stolpci"],
+      "Reduce X ticks": ["Manj oznak X-osi"],
+      "Reduces the number of X-axis ticks to be rendered. If true, the x-axis will not overflow and labels may be missing. If false, a minimum width will be applied to columns and the width may overflow into an horizontal scroll.": [
+        "Zmanjša število izrisanih oznak na X-osi. Če je vklopljeno, se x-os ne bo prelila in lahko oznake manjkajo. Če je izklopljeno, bo upoštevana min. širina stolpcev, ki pa se lahko prelije v horizontalni drsnik."
+      ],
+      "You cannot use 45° tick layout along with the time range filter": [
+        "Skupaj s filtriranjem časovnega obdobja ne morete uporabiti oznak pod 45° kotom"
+      ],
+      "Stacked Style": ["Slog nalaganja"],
+      "Area Chart": ["Ploščinski grafikon"],
+      "Time-series Bar Chart": ["Stolpčni grafikon za časovno vrsto"],
+      "Box Plot": ["Box Plot"],
+      "X Log Scale": ["Logaritemska X-os"],
+      "Use a log scale for the X-axis": ["Uporabi logaritemsko skalo za X-os"],
+      "Ranges": ["Razponi"],
+      "Ranges to highlight with shading": ["Razponi za označitev s senčenjem"],
+      "Range labels": ["Oznake razponov"],
+      "Labels for the ranges": ["Oznake za razpone"],
+      "Markers": ["Markerji"],
+      "List of values to mark with triangles": [
+        "Seznam vrednosti, ki bodo markirane s trikotniki"
+      ],
+      "Marker labels": ["Oznake markerjev"],
+      "Labels for the markers": ["Oznake za markerje"],
+      "Marker lines": ["Markirne črtice"],
+      "List of values to mark with lines": [
+        "Seznam vrednosti, ki bodo markirane s črticami"
+      ],
+      "Marker line labels": ["Oznake markirnih črtic"],
+      "Labels for the marker lines": ["Oznake za markirne črtice"],
+      "A line chart component where you can compare the % change over time": [
+        "Komponenta grafikona, kjer lahko primerjate % cpremembo skozi čas"
+      ],
+      "Time-series Percent Change": ["Časovna vrsta - Procentualna sprememba"],
+      "Sort Bars": ["Uredi stolpce"],
+      "Sort bars by x labels.": ["Uredi stolpce po x-oznakah."],
+      "Breakdowns": ["Razčlenitev"],
+      "Defines how each series is broken down": [
+        "Določa, kako se vsaka podatkovna serija razčleni"
+      ],
+      "A bar chart where the x axis is time": [
+        "Stolpčni grafikon, kjer je na x-osi čas"
+      ],
+      "Bar Chart": ["Stolpčni grafikon"],
+      "Y Axis 1": ["Y-os 1"],
+      "Y Axis 2": ["Y-os 2"],
+      "Left Axis Metric": ["Mera za levo os"],
+      "Choose a metric for left axis": ["Izberite mero za levo os"],
+      "Left Axis Format": ["Oblika leve osi"],
+      "Dual Line Chart": ["Grafikon z dvojno krivuljo"],
+      "Propagate": ["Razširi"],
+      "Send range filter events to other charts": [
+        "Pošlji dogodke filtra obdobja na druge grafikone"
+      ],
+      "Line Chart": ["Črtni grafikon"],
+      "Prefix metric name with slice name": ["Imenu mere pripni ime rezine"],
+      "Y Axis Left": ["Y-os levo"],
+      "Left Axis chart(s)": ["Grafikoni leve osi"],
+      "Choose one or more charts for left axis": [
+        "Izberite enega ali več grafikonov za levo os"
+      ],
+      "Select charts": ["Izberi grafikone"],
+      "Error while fetching charts": ["Napaka pri pridobivanju grafikonov"],
+      "Y Axis Right": ["Y-os desno"],
+      "Right Axis chart(s)": ["Grafikoni desne osi"],
+      "Choose one or more charts for right axis": [
+        "Izberite enega ali več grafikonov za desno os"
+      ],
+      "Multiple Line Charts": ["Veččrtni grafikon"],
+      "Label Type": ["Oblika oznake"],
+      "What should be shown on the label?": ["Kaj bo prikazano na oznaki?"],
+      "Donut": ["Kolobar"],
+      "Do you want a donut or a pie?": ["Želite kolobar ali torto?"],
+      "Show Labels": ["Pokaži oznake"],
+      "Whether to display the labels. Note that the label only displays when the the 5% threshold.": [
+        "Če želite prikazati oznake. Oznake so prikazane le pri vsaj 5-odstotnem pragu."
+      ],
+      "Put labels outside": ["Postavi oznake zunaj"],
+      "Put the labels outside the pie?": ["Postavim oznake zunaj torte?"],
+      "Pie Chart": ["Tortni grafikon"],
+      "Frequency": ["Frekvenca"],
+      "The periodicity over which to pivot time. Users can provide\r\n            \"Pandas\" offset alias.\r\n            Click on the info bubble for more details on accepted \"freq\" expressions.": [
+        "Periodičnost za vrtenje časa. Uporabnik lahko poda\n            psevdonim za zamik v \"Pandas\".\n            Kliknite na mehurček za podrobnosti dovoljenih izrazov za \"freq\"."
+      ],
+      "Time-series Period Pivot": ["Časovna serija - Vrtenje periode"],
+      "Show legend": ["Prikaži legendo"],
+      "Whether to display a legend for the chart": [
+        "Če želite prikaz legende za grafikon"
+      ],
+      "Margin": ["Rob"],
+      "Additional padding for legend.": ["Dodatni razmak za legendo."],
+      "Legend type": ["Tip legende"],
+      "Whisker/outlier options": ["Možnosti grafikona kvantilov"],
+      "Determines how whiskers and outliers are calculated.": [
+        "Določa kako so izračunani kvantili in izstopajoče vrednosti."
+      ],
+      "Enable emitting filters": ["Omogoči oddajanje filtrov"],
+      "Enable emmiting filters.": ["Omogoči oddajanje filtrov."],
+      "Categories to group by on the x-axis.": [
+        "Kategorije za združevanje po x-osi."
+      ],
+      "Distribute across": ["Porazdeli glede na"],
+      "Columns to calculate distribution across. Defaults to temporal column if left empty.": [
+        "Stolpci za izračun porazdelitve. Privzeto je izbran časovni stolpec (če je prazno)."
+      ],
+      "Labels": ["Oznake"],
+      "Whether to display the labels.": ["Če želite prikaz oznak."],
+      "Funnel Chart": ["Lijakasti grafikon"],
+      "Columns to group by": ["Stolpci za združevanje"],
+      "General": ["Splošno"],
+      "Minimum value on the gauge axis": ["Najmanjša vrednost na številčnici"],
+      "Maximum value on the gauge axis": ["Največja vrednost na številčnici"],
+      "Start angle": ["Začetni kot"],
+      "Angle at which to start progress axis": [
+        "Kot, pri katerem se začne os območja"
+      ],
+      "End angle": ["Končni kot"],
+      "Angle at which to end progress axis": [
+        "Kot, pri katerem se konča os območja"
+      ],
+      "Font size": ["Velikost pisave"],
+      "Font size for axis labels, detail value and other text elements": [
+        "Velikost pisave za oznake osi, podrobnosti in druge besedilne elemente"
+      ],
+      "Value format": ["Oblika zapisa vrednosti"],
+      "Additional text to add before or after the value, e.g. unit": [
+        "Dodatno besedilo, ki ga dodate pred ali za vrednost, npr. enota"
+      ],
+      "Show pointer": ["Prikaži kazalec"],
+      "Whether to show the pointer": ["Če želite prikazati kazalec"],
+      "Animation": ["Animacija"],
+      "Whether to animate the progress and the value or just display them": [
+        "Če želite animiran prikaz grafikona"
+      ],
+      "Axis": ["Os"],
+      "Show axis line ticks": ["Prikaži oznake na X-osi"],
+      "Whether to show minor ticks on the axis": [
+        "Če želite prikaz manjših oznak na osi"
+      ],
+      "Show split lines": ["Prikaži razdelitvene črte"],
+      "Whether to show the split lines on the axis": [
+        "Če želite prikazati razdelitvene črte na osi"
+      ],
+      "Split number": ["Število razdelitev"],
+      "Number of split segments on the axis": ["Število razdelkov na osi"],
+      "Progress": ["Območje"],
+      "Show progress": ["Prikaži območje"],
+      "Whether to show the progress of gauge chart": [
+        "Prikaži merilno območje števčnega grafikona"
+      ],
+      "Overlap": ["Prekrivanje"],
+      "Whether the progress bar overlaps when there are multiple groups of data": [
+        "Če želite prekrivanje območij, ko imate več skupin podatkov"
+      ],
+      "Round cap": ["Zaobljeni konci"],
+      "Style the ends of the progress bar with a round cap": [
+        "Zaobljena oblika koncev območja"
+      ],
+      "Intervals": ["Intervali"],
+      "Interval bounds": ["Meje intervalov"],
+      "Comma-separated interval bounds, e.g. 2,4,5 for intervals 0-2, 2-4 and 4-5. Last number should match the value provided for MAX.": [
+        "Z vejico ločeni intervali, npr. 2,4,5 za intervale 0-2, 2-4 in 4-5. Zadnja številka naj bo enaka vrednosti za MAX."
+      ],
+      "Interval colors": ["Barve intervalov"],
+      "Comma-separated color picks for the intervals, e.g. 1,2,4. Integers denote colors from the chosen color scheme and are 1-indexed. Length must be matching that of interval bounds.": [
+        "Z vejico ločene barve za intervale, npr. 1,2,4. Cela števila predstavljajo barve iz barvne sheme (začnejo se z 1). Dolžina mora ustrezati mejam intervala."
+      ],
+      "Gauge Chart": ["Števčni grafikon"],
+      "Name of the source nodes": ["Imena izvornih vozlišč"],
+      "Name of the target nodes": ["Imena ciljnih vozlišč"],
+      "Source category": ["Kategorija izvora"],
+      "The category of source nodes used to assign colors. If a node is associated with more than one category, only the first will be used.": [
+        "Kategorija izvornih vozlišč, na podlagi katere je določena barva. Če je vozlišče povezano z več kot eno kategorijo, bo uporabljena samo prva."
+      ],
+      "Target category": ["Kategorija cilja"],
+      "Category of target nodes": ["Kategorija ciljnih vozlišč"],
+      "Chart options": ["Možnosti grafikona"],
+      "Layout": ["Izgled"],
+      "Graph layout": ["Izgled grafikona"],
+      "Force": ["Sila"],
+      "Circular": ["Krožno"],
+      "Layout type of graph": ["Tip izgleda grafikona"],
+      "Edge symbols": ["Simboli povezav"],
+      "Symbol of two ends of edge line": ["Simbol za konca povezave"],
+      "None -> None": ["Brez -> Brez"],
+      "None -> Arrow": ["Brez -> Puščica"],
+      "Circle -> Arrow": ["Krog -> Puščica"],
+      "Circle -> Circle": ["Krog -> Krog"],
+      "Enable node dragging": ["Omogoči premikanje vozlišč"],
+      "Whether to enable node dragging in force layout mode.": [
+        "Če želite omogočiti premikanje vozlišč v načinu vsiljenega prikaza."
+      ],
+      "Enable graph roaming": ["Omogoči preoblikovanje grafikona"],
+      "Disabled": ["Onemogočeno"],
+      "Scale only": ["Samo povečava"],
+      "Move only": ["Samo premikanje"],
+      "Scale and Move": ["Povečava in premikanje"],
+      "Whether to enable changing graph position and scaling.": [
+        "Če želite omogočiti premikanje in povečevanje/zmanjševanje grafikona."
+      ],
+      "Node select mode": ["Način izbire vozlišč"],
+      "Single": ["Posamezno"],
+      "Multiple": ["Več"],
+      "Allow node selections": ["Dovoli izbiro vozlišča"],
+      "Label threshold": ["Prag oznak"],
+      "Minimum value for label to be displayed on graph.": [
+        "Najmanjša vrednost, za katero bo na grafikonu prikazana oznaka."
+      ],
+      "Node size": ["Velikost vozlišča"],
+      "Median node size, the largest node will be 4 times larger than the smallest": [
+        "Mediana velikosti vozlišča. Največje vozlišče bo 4-krat večje od najmanjšega"
+      ],
+      "Edge width": ["Debelina povezave"],
+      "Median edge width, the thickest edge will be 4 times thicker than the thinnest.": [
+        "Mediana debeline povezave. Najdebelejša povezava bo 4-krat debelejša od najtanjše."
+      ],
+      "Edge length": ["Dolžina povezave"],
+      "Edge length between nodes": ["Dolžina povezave med vozlišči"],
+      "Gravity": ["Gravitacija"],
+      "Strength to pull the graph toward center": [
+        "Sila privlačnosti med grafikonom in središčem"
+      ],
+      "Repulsion": ["Odbijanje"],
+      "Repulsion strength between nodes": ["Odbojna sila med vozlišči"],
+      "Friction": ["Trenje"],
+      "Friction between nodes": ["Trenje med vozlišči"],
+      "Graph Chart": ["Graf"],
+      "Series type": ["Tip serije"],
+      "Series chart type (line, bar etc)": [
+        "Tip grafikona za posamezno podatkovno serijo (črtni, stolpčni, ...)"
+      ],
+      "Stack series": ["Nalagaj serije"],
+      "Stack series on top of each other": ["Nalagaj serije eno na drugo"],
+      "Area chart": ["Ploščinski grafikon"],
+      "Draw area under curves. Only applicable for line types.": [
+        "Izriši površino pod krivuljo. Samo za črtne grafikone."
+      ],
+      "Opacity of area chart.": ["Prosojnost ploščinskega grafikona."],
+      "Marker": ["Marker"],
+      "Draw a marker on data points. Only applicable for line types.": [
+        "Nariši markerje na točke grafikona. Samo za črtne grafikone."
+      ],
+      "Marker size": ["Velikost markerja"],
+      "Size of marker. Also applies to forecast observations.": [
+        "Velikost markerja. Upošteva se tudi za napovedi."
+      ],
+      "Primary": ["Primarna"],
+      "Secondary": ["Sekundarna"],
+      "Primary or secondary y-axis": ["Primarna ali sekundarna y-os"],
+      "Query A": ["Poizvedba A"],
+      "Query B": ["Poizvedba B"],
+      "Data Zoom": ["Zoom funkcija"],
+      "Enable data zooming controls": [
+        "Omogoči kontrolnik za povečavo podatkov"
+      ],
+      "Show Min Label": ["Pokaži oznako Min"],
+      "Show Max Label": ["Pokaži oznako Max"],
+      "Rotate x axis label": ["Zavrti oznako x-osi"],
+      "Input field supports custom rotation. e.g. 30 for 30°": [
+        "Vnosno polje omogoča poljubno rotacijo (vnesite 30 za 30°)"
+      ],
+      "Tooltip": ["Opis orodja"],
+      "Rich tooltip": ["Podroben opis orodja"],
+      "Shows a list of all series available at that point in time": [
+        "Prikaže seznam vseh razpoložljivih podatkovnih serij za istočasno točko"
+      ],
+      "Minor Split Line": ["Manjša ločilna črta"],
+      "Draw split lines for minor y-axis ticks": [
+        "Izriši ločilne črte za pomožne oznake y-osi"
+      ],
+      "Truncate Y Axis": ["Prireži Y-os"],
+      "Truncate Y Axis. Can be overridden by specifying a min or max bound.": [
+        "Prireži Y-os. Preprečite, tako da določite spodnjo in zgornjo mejo."
+      ],
+      "Primary y-axis format": ["Oblika primarne y-osi"],
+      "Primary y-axis title": ["Naslov primarne y-osi"],
+      "Title for y-axis": ["Naslov y-osi"],
+      "Logarithmic y-axis": ["Logaritemska y-os"],
+      "Logarithmic scale on primary y-axis": [
+        "Logaritemska skala na primarni y-osi"
+      ],
+      "Secondary y-axis format": ["Oblika sekundarne y-osi"],
+      "Secondary y-axis title": ["Naslov sekundarne y-osi"],
+      "Logarithmic scale on secondary y-axis": [
+        "Logaritemska skala na sekundarni y-osi"
+      ],
+      "Mixed timeseries chart": ["Kombinirani grafikon časovne vrste"],
+      "Percentage threshold": ["Procentualni prag"],
+      "Minimum threshold in percentage points for showing labels.": [
+        "Minimalni prag v odstotnih točkah za prikaz oznak."
+      ],
+      "Put the labels outside of the pie?": ["Postavim oznake zunaj torte?"],
+      "Label Line": ["Črta oznake"],
+      "Draw line from Pie to label when labels outside?": [
+        "Ali želite črto do oznake, ko so le-te zunaj?"
+      ],
+      "Pie shape": ["Oblika torte"],
+      "Outer Radius": ["Zunanji polmer"],
+      "Outer edge of Pie chart": ["Zunanji rob tortnega grafikona"],
+      "Inner Radius": ["Notranji polmer"],
+      "Inner radius of donut hole": ["Notranji polmer kolobarja"],
+      "The maximum value of metrics. It is an optional configuration": [
+        "Največja vrednost mere. To je opcijska nastavitev"
+      ],
+      "Label position": ["Položaj oznake"],
+      "Radar": ["Radar"],
+      "Customize Metrics": ["Prilagodi mere"],
+      "Further customize how to display each metric": [
+        "Dodatne prilagoditve prikaza posameznih mer"
+      ],
+      "Circle radar shape": ["Okrogla oblika radarja"],
+      "Radar render type, whether to display 'circle' shape.": [
+        "Način prikaza radarja - če se prikaže okrogla oblika."
+      ],
+      "Radar Chart": ["Radarski grafikon"],
+      "Contribution Mode": ["Način deležev"],
+      "Calculate contribution per series or total": [
+        "Izračunaj delež za podatkovno serijo ali skupnega"
+      ],
+      "Predictive Analytics": ["Prediktivna analitika"],
+      "Enable forecast": ["Omogoči napoved"],
+      "Enable forecasting": ["Omogoči napovedovanje"],
+      "Forecast periods": ["Obdobja napovedi"],
+      "How many periods into the future do we want to predict": [
+        "Za koliko period v prihodnosti želite napoved"
+      ],
+      "Confidence interval": ["Interval zaupanja"],
+      "Width of the confidence interval. Should be between 0 and 1": [
+        "Širina intervala zaupanja. Mora bit med 0 in 1"
+      ],
+      "Should yearly seasonality be applied. An integer value will specify Fourier order of seasonality.": [
+        "Če želite letno sezonskost. Celo število določa Fourier-jev red sezonskosti."
+      ],
+      "Should weekly seasonality be applied. An integer value will specify Fourier order of seasonality.": [
+        "Če želite tedensko sezonskost. Celo število določa Fourier-jev red sezonskosti."
+      ],
+      "Should daily seasonality be applied. An integer value will specify Fourier order of seasonality.": [
+        "Če želite dnevno sezonskost. Celo število določa Fourier-jev red sezonskosti."
+      ],
+      "Series Style": ["Slog serije"],
+      "Area chart opacity": ["Prosojnost ploščinskega grafikona"],
+      "Opacity of Area Chart. Also applies to confidence band.": [
+        "Prosojnost ploščinskega grafikona. Upošteva se tudi za interval zaupanja."
+      ],
+      "Marker Size": ["Velikost markerja"],
+      "Tooltip time format": ["Oblika zapisa časa v opisu orodja"],
+      "Time-series Chart": ["Grafikon časovne vrste"],
+      "Id": ["Id"],
+      "Name of the id column": ["Naziv id-stolpca"],
+      "Parent": ["Nadrejeni"],
+      "Name of the column containing the id of the parent node": [
+        "Ime stolpca, ki vsebuje id nadrejenega vozlišča"
+      ],
+      "Optional name of the data column.": [
+        "Opcijsko ime podatkovnega stolpca."
+      ],
+      "Root node id": ["Id korenskega vozlišča"],
+      "Id of root node of the tree.": ["Id korenskega vozlišča drevesa."],
+      "Metric for node values": ["Mera za vrednosti vozlišč"],
+      "Tree layout": ["Oblika drevesa"],
+      "Orthogonal": ["Pravokotna"],
+      "Radial": ["Radialna"],
+      "Layout type of tree": ["Način izgleda drevesa"],
+      "Tree orientation": ["Orientacija drevesa"],
+      "Left to Right": ["Iz leve proti desni"],
+      "Right to Left": ["Iz desne proti levi"],
+      "Top to Bottom": ["Iz vrha proti dnu"],
+      "Bottom to Top": ["Iz dna proti vrhu"],
+      "Orientation of tree": ["Orientacija drevesa"],
+      "Node label position": ["Položaj oznake vozlišča"],
+      "left": ["levo"],
+      "top": ["zgoraj"],
+      "right": ["desno"],
+      "bottom": ["spodaj"],
+      "Position of intermidiate node label on tree": [
+        "Položaj vmesne oznake vozlišča na drevesu"
+      ],
+      "Child label position": ["Položaj podrejene oznake"],
+      "Position of child node label on tree": [
+        "Položaj oznake podrejenega vozlišča na drevesu"
+      ],
+      "Emphasis": ["Poudari"],
+      "ancestor": ["nadrejeni"],
+      "descendant": ["podrejeni"],
+      "Which relatives to highlight on hover": [
+        "Kateri element se poudari na prehodu z miško"
+      ],
+      "Symbol": ["Simbol"],
+      "Empty circle": ["Prazen krog"],
+      "Circle": ["Krog"],
+      "Rectangle": ["Pravokotnik"],
+      "Triangle": ["Trikotnik"],
+      "Diamond": ["Karo"],
+      "Pin": ["Žebljiček"],
+      "Arrow": ["Puščica"],
+      "Symbol size": ["Velikost simbola"],
+      "Size of edge symbols": ["Velikost simbola povezave"],
+      "Tree Chart": ["Drevesni grafikon"],
+      "Show Upper Labels": ["Prikaži zgornje oznake"],
+      "Show labels when the node has children.": [
+        "Prikaži oznake, ko ima vozlišče podrejene elemente."
+      ],
+      "Treemap v2": ["Drevesni grafikon s pravokotniki v2"],
+      "Columns to group by on the rows": ["Stolpci za združevanje vrstic"],
+      "Columns to group by on the columns": ["Stolpci za združevanje stolpcev"],
+      "Transpose pivot": ["Transponirano vrtenje"],
+      "Swap rows and columns": ["Zamenjaj vrstice in stolpce"],
+      "Pivot table type": ["Tip vrtilne tabele"],
+      "Table Heatmap": ["Barvanje tabele"],
+      "Table Col Heatmap": ["Barvanje stolpcev tabele"],
+      "Table Row Heatmap": ["Barvanje vrstic tabele"],
+      "Table Barchart": ["Stolpčni grafi po tabeli"],
+      "Table Col Barchart": ["Stolpčni grafi po stolpcih"],
+      "Table Row Barchart": ["Stolpčni grafi po vrsticah"],
+      "The type of pivot table visualization": [
+        "Način za vizualizacijo vrtilne tabele"
+      ],
+      "Rows sort by": ["Razvrsti vrst."],
+      "key a-z": ["a - ž"],
+      "key z-a": ["ž - a"],
+      "value ascending": ["0 - 9"],
+      "value descending": ["9 - 0"],
+      "Order of rows": ["Vrstni red vrstic"],
+      "Cols sort by": ["Razvrsti stolp."],
+      "Order of columns": ["Vrstni red stolpcev"],
+      "Rows subtotals position": ["Položaj vsot vrstic"],
+      "Top": ["Zgoraj"],
+      "Bottom": ["Spodaj"],
+      "Position of row level subtotals": ["Položaj vsot na nivoju vrstic"],
+      "Cols subtotals position": ["Položaj vsot stolp."],
+      "Position of column level subtotals": ["Položaj vsot na nivoju stolpcev"],
+      "Show rows totals": ["Prikaži vsoto vrstic"],
+      "Display row level totals": ["Prikaže vsoto vseh vrstic"],
+      "Show cols totals": ["Prik. vsoto stolpcev"],
+      "Display column level totals": ["Prikaže vsoto vseh stolpcev"],
+      "Whether to apply filter to dashboards when table cells are clicked": [
+        "Če želite uporabiti filter na nadzorni plošči, ko kliknete na celico v tabeli"
+      ],
+      "Pivot Table v2": ["Vrtilna tabela v2"],
+      "search.num_records": ["search.num_records"],
+      "page_size.show": ["page_size.show"],
+      "page_size.entries": ["page_size.entries"],
+      "Totals": ["Vsote"],
+      "page_size.all": ["page_size.all"],
+      "Group By, Metrics or Percentage Metrics must have a value": [
+        "Združevanje, Mera ali Procentualna mera morajo imeti vrednost"
+      ],
+      "Query mode": ["Poizvedbeni način"],
+      "must have a value": ["mora imeti vrednost"],
+      "Percentage metrics": ["Procentualne mere"],
+      "Metrics for which percentage of total are to be displayed. Calculated from only data within the row limit.": [
+        "Mera, za katero je prikazan odstotek od celote. Izračunan je samo iz podatkov znotraj omejitve števila vrstic."
+      ],
+      "Ordering": ["Razvrščanje"],
+      "Order results by selected columns": [
+        "Razvrsti rezultate glede na izbrani stolpec"
+      ],
+      "Server pagination": ["Številčenje strani strežnika"],
+      "Enable server side pagination of results (experimental feature)": [
+        "Omogoči številčenje strani rezultatov na strani strežnika (preizkusna funkcija)"
+      ],
+      "Server Page Length": ["Dolžina strani strežnika"],
+      "Rows per page, 0 means no pagination": [
+        "Vrstic na stran (0 pomeni brez številčenja strani)"
+      ],
+      "Include time": ["Vključi čas"],
+      "Whether to include the time granularity as defined in the time section": [
+        "Če želite vključiti granulacijo časa, ki je določena v sekciji Čas"
+      ],
+      "Show total aggregations of selected metrics. Note that row limit does not apply to the result.": [
+        "Prikaži skupno agregacijo izbrane mere. Omejitev števila vrstic ne vpliva na rezultat."
+      ],
+      "Timestamp format": ["Oblika zapisa časovne značke"],
+      "D3 time format for datetime columns": [
+        "D3 oblika zapisa za časovne stolpce"
+      ],
+      "Page length": ["Dolžina strani"],
+      "Search box": ["Iskalno polje"],
+      "Whether to include a client-side search box": [
+        "Če želite vključiti iskalno polje za uporabnika"
+      ],
+      "Cell bars": ["Stolp. graf v celicah"],
+      "Whether to align background charts with both positive and negative values at 0": [
+        "Če želite poravnati graf v ozadju celic za negativne in pozitivne vrednosti okrog 0"
+      ],
+      "Customize columns": ["Prilagodi stolpce"],
+      "Further customize how to display each column": [
+        "Dodatne prilagoditve prikaza posameznih stolpcev"
+      ],
+      "Word Cloud": ["Oblak besed"],
+      "Minimum Font Size": ["Min. velikost pisave"],
+      "Font size for the smallest value in the list": [
+        "Velikost pisave za najmanjšo vrednost na seznamu"
+      ],
+      "Maximum Font Size": ["Max. velikost pisave"],
+      "Font size for the biggest value in the list": [
+        "Velikost pisave za največjo vrednost na seznamu"
+      ],
+      "Word Rotation": ["Vrtenje besed"],
+      "Rotation to apply to words in the cloud": [
+        "Če želite vrtenje besed v oblaku"
+      ],
+      "Scatter Plot": ["Raztreseni grafikon"],
+      "Hide Mini Map": ["Skrij majhen zemljevid"],
+      "Show Mini Map": ["Prikaži majhen zemljevid"],
+      "Choropleth Map": ["Koroplet zemljevid"],
+      "ChoroplethMap": ["ChoroplethMap"],
+      "Icicle Event Chart": ["Grafikon Icicle dogodkov"],
+      "Map": ["Zemljevid"],
+      "deck.gl charts": ["grafikoni deck.gl"],
+      "Pick a set of deck.gl charts to layer on top of one another": [
+        "Izberite nabor deck.gl grafikonov, ki bodo nanizani en na drugem"
+      ],
+      "deck.gl Multiple Layers": ["deck.gl - Večplastni grafikon"],
+      "Data has no time steps": ["Podatki nimajo časovnih korakov"],
+      "Start Longitude & Latitude": ["Začetna Dolž. in Širina"],
+      "Point to your spatial columns": [
+        "Pokažite na stolpec z lokacijskimi podatki"
+      ],
+      "End Longitude & Latitude": ["Končna Dolž. in Širina"],
+      "Arc": ["Lok"],
+      "Target Color": ["Ciljna barva"],
+      "Color of the target location": ["Barva ciljne lokacije"],
+      "Categorical Color": ["Kategorična barva"],
+      "Pick a dimension from which categorical colors are defined": [
+        "Izberite dimenzijo, ki bo določala kategorične barve"
+      ],
+      "Stroke Width": ["Debelina obrobe"],
+      "deck.gl Arc": ["deck.gl - Lok"],
+      "GeoJson Settings": ["GeoJson nastavitve"],
+      "Point Radius Scale": ["Skaliranje radija točk"],
+      "deck.gl Geojson": ["deck.gl - GeoJSON"],
+      "Metric used to control height": ["Mera za določanje višine"],
+      "deck.gl Grid": ["deck.gl - Mreža"],
+      "deck.gl 3D Hexagon": ["deck.gl - 3D HEX"],
+      "deck.gl Path": ["deck.gl - Poti"],
+      "Polygon Column": ["Stolpec poligonov"],
+      "Polygon Encoding": ["Kodiranje poligonov"],
+      "Elevation": ["Dvig"],
+      "Polygon Settings": ["Nastavitve poligonov"],
+      "Opacity, expects values between 0 and 100": [
+        "Prosojnost, vnesite vrednosti med 0 in 100"
+      ],
+      "Number of buckets to group data": [
+        "Število razdelkov za združevanje podatkov"
+      ],
+      "How many buckets should the data be grouped in.": [
+        "V koliko razdelkov bodo razvrščeni podatki."
+      ],
+      "Bucket break points": ["Točke za razčlenitev razdelkov"],
+      "List of n+1 values for bucketing metric into n buckets.": [
+        "Seznam n+1 vrednosti za mero razvrščanja v n razdelkov."
+      ],
+      "Emit Filter Events": ["Prikaži dogodke filtrov"],
+      "Whether to apply filter when items are clicked": [
+        "Če želite uporabiti filter, ko kliknete na elemente"
+      ],
+      "Multiple filtering": ["Večkratno filtriranje"],
+      "Allow sending multiple polygons as a filter event": [
+        "Dovoli pošiljanje več poligonov kot dogodek filtra"
+      ],
+      "deck.gl Polygon": ["deck.gl - Poligon"],
+      "Point Size": ["Velikost točke"],
+      "Point Unit": ["Enota točke"],
+      "Minimum Radius": ["Min. polmer"],
+      "Minimum radius size of the circle, in pixels. As the zoom level changes, this insures that the circle respects this minimum radius.": [
+        "Minimalni polmer kroga v pikslih. S tem je določen min. polmer kroga, ko se spreminja stopnja povečave."
+      ],
+      "Maximum Radius": ["Max. polmer"],
+      "Maxium radius size of the circle, in pixels. As the zoom level changes, this insures that the circle respects this maximum radius.": [
+        "Maksimalni polmer kroga v pikslih. S tem je določen max. polmer kroga, ko se spreminja stopnja povečave."
+      ],
+      "Point Color": ["Barva točke"],
+      "deck.gl Scatterplot": ["deck.gl - Raztreseni grafikon"],
+      "Grid": ["Mreža"],
+      "Weight": ["Utež"],
+      "Metric used as a weight for the grid's coloring": [
+        "Mera, ki služi kot utež za barvo mreže"
+      ],
+      "deck.gl Screen Grid": ["deck.gl - Mreža"],
+      "For more information about objects are in context in the scope of this function, refer to the": [
+        "Za dodatne informacije o objektih v kontekstu te funkcije si oglejte"
+      ],
+      " source code of Superset's sandboxed parser": [
+        " izvorno kodo za Supersetov \"sandboxed parser\""
+      ],
+      "This functionality is disabled in your environment for security reasons.": [
+        "Ta funkcionalnost je v vašem okolju onemogočena zaradi varnosti."
+      ],
+      "Ignore null locations": ["Izpusti prazne lokacije"],
+      "Whether to ignore locations that are null": [
+        "Če ne želite upoštevati praznih (NULL) lokacij"
+      ],
+      "Auto Zoom": ["Samodejna povečava"],
+      "When checked, the map will zoom to your data after each query": [
+        "Če želite, da se zemljevid prilagodi vašim podatkom po vsaki poizvedbi"
+      ],
+      "Dimension": ["Dimenzija"],
+      "Select a dimension": ["Izberite dimenzijo"],
+      "Extra data for JS": ["Dodatni podatki za JS"],
+      "List of extra columns made available in Javascript functions": [
+        "Seznam dodatnih podatkov, ki so na razpolago v Javascript funkcijah"
+      ],
+      "Javascript data interceptor": ["Javascript prestreznik podatkov"],
+      "Define a javascript function that receives the data array used in the visualization and is expected to return a modified version of that array. This can be used to alter properties of the data, filter, or enrich the array.": [
+        "Določite Javascript funkcijo, ki sprejme podatkovni niz za vizualizacijo in vrne spremenjeno verzijo tega niza. Lahko se uporabi za spreminjanje lastnosti podatkov, filtra ali obogatitve niza."
+      ],
+      "Javascript tooltip generator": ["Javascript generator opisa orodja"],
+      "Define a function that receives the input and outputs the content for a tooltip": [
+        "Določite funkcijo, ki sprejme vhodne podatke in vrne vsebino opisa orodja"
+      ],
+      "Javascript onClick href": ["Javascript onClick href"],
+      "Define a function that returns a URL to navigate to when user clicks": [
+        "Določite funkcijo, ki vrne URL za navigacijo, ko uporabnik klikne"
+      ],
+      "Legend Format": ["Oblika legende"],
+      "Choose the format for legend values": [
+        "Izberite obliko vrednosti legende"
+      ],
+      "Legend Position": ["Položaj legende"],
+      "Choose the position of the legend": ["Izberite položaj legende"],
+      "Lines column": ["Stolpec črt"],
+      "The database columns that contains lines information": [
+        "Stolpec v podatkovni bazi, ki vsebuje podatke črt"
+      ],
+      "The width of the lines": ["Debelina črt"],
+      "Fill Color": ["Barva polnila"],
+      " Set the opacity to 0 if you do not want to override the color specified in the GeoJSON": [
+        " Nastavite prosojnost na 0, če želite obdržati barvo določeno v GeoJSON"
+      ],
+      "Stroke Color": ["Barva obrobe"],
+      "Filled": ["Zapolnjeno"],
+      "Whether to fill the objects": ["Če želite zapolniti objekte"],
+      "Stroked": ["Obrobljeno"],
+      "Whether to display the stroke": ["Če želite prikazati obrobe"],
+      "Extruded": ["Relief"],
+      "Grid Size": ["Velikost mreže"],
+      "Defines the grid size in pixels": ["Določa velikost mreže v pikslih"],
+      "Parameters related to the view and perspective on the map": [
+        "Parametri povezani s pogledom in perspektivo zemljevida"
+      ],
+      "Longitude & Latitude": ["Dolžina in širina"],
+      "Fixed point radius": ["Fiksni radij točk"],
+      "Multiplier": ["Množitelj"],
+      "Factor to multiply the metric by": ["Faktor, s katerim množite mero"],
+      "Lines encoding": ["Kodiranje črt"],
+      "The encoding format of the lines": ["Oblika kodiranja črt"],
+      "Reverse Lat & Long": ["Zamenjaj Dolž. in Širino"],
+      "GeoJson Column": ["GeoJson stolpec"],
+      "Select the geojson column": ["Izberite geojson stolpec"],
+      "Kepler.gl": ["Kepler.gl"],
+      "List Users": ["Seznam uporabnikov"],
+      "List Roles": ["Seznam vlog"],
+      "Your user information": ["Vaše uporabniške informacije"],
+      "User info": ["Informacije o uporabniku"],
+      "User Name": ["Uporabniško ime"],
+      "Is Active?": ["Je aktiven?"],
+      "Login count": ["Število prijav"],
+      "Personal Info": ["Osebne informacije"],
+      "First Name": ["Ime"],
+      "Last Name": ["Priimek"],
+      "Email": ["E-pošta"],
+      "Audit Info": ["Revizijske informacije"],
+      "Last login": ["Zadnja prijava"],
+      "Failed login count": ["Število neuspešnih prijav"],
+      "Changed by": ["Spremenil/a"],
+      "Reset Password": ["Ponastavi geslo"],
+      "Show User": ["Prikaži uporabnika"],
+      "Username valid for authentication on DB or LDAP, unused for OID auth": [
+        "Uporabniško ime za DB ali LDAP avtentikacijo. Ni uporabljeno za OID avtentikacijo"
+      ],
+      "It's not a good policy to remove a user, just make it inactive": [
+        "Izbris uporabnika ni dobra praksa, raje ga deaktivirajte"
+      ],
+      "The user's email, this will also be used for OID auth": [
+        "Uporabnikov e-naslov, uporabljen bo tudi za OID avtentikacijo"
+      ],
+      "The user role on the application, this will associate with a list of permissions": [
+        "Uporabnikova vloga v tej aplikaciji, povezana bo s seznamom dovoljenj"
+      ],
+      "User confirmation needed": ["Potrebna je potrditev s strani uporabnika"],
+      "You sure you want to delete this item?": [
+        "Ste prepričani, da želite izbrisati ta vnos?"
+      ],
+      "Reset my password": ["Ponastavi geslo"],
+      "Reset Password Form": ["Obrazec za ponastavitev gesla"],
+      "Please use a good password policy, this application does not check this for you": [
+        "Uporabite varno geslo. Ta aplikacija tega ne bo preverila"
+      ],
+      "Confirm Password": ["Potrdite geslo"],
+      "Please rewrite the password to confirm": [
+        "Ponovno vpišite geslo za potrditev"
+      ],
+      "Back": ["Nazaj"],
+      "Edit User": ["Uredite uporabnika"],
+      "Edit User Information": ["Uredite informacije o uporabniku"],
+      "Write the user first name or names": ["Vpišite ime uporabnika"],
+      "Write the user last name": ["Vpišite priimek uporabnika"],
+      "Embed code": ["Vstavi kodo"],
+      "creator": ["avtor"],
+      "favorited": ["priljubljeno"],
+      "name": ["ime"],
+      "type": ["tip"],
+      "time": ["čas"],
+      "Toggle SortBy": ["Preklopite razvrščanje"],
+      "Page size": ["Velikost strani"],
+      "Edit record": ["Uredi zapis"],
+      "Delete record": ["Izbriši zapis"],
+      "Show record": ["Pokaži zapis"],
+      "Orientation": ["Postavitev"],
+      "Scroll": ["Drsnik"],
+      "Plain": ["Celotna"]
+    }
+  }
+}
diff --git a/superset/translations/sl/LC_MESSAGES/messages.po b/superset/translations/sl/LC_MESSAGES/messages.po
new file mode 100644
index 000000000000..2aba536662e6
--- /dev/null
+++ b/superset/translations/sl/LC_MESSAGES/messages.po
@@ -0,0 +1,13575 @@
+# 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.
+msgid ""
+msgstr ""
+"Project-Id-Version: Superset\n"
+"Report-Msgid-Bugs-To: dkrat7 @github.com\n"
+"POT-Creation-Date: 2021-05-27 16:46+0200\n"
+"PO-Revision-Date: 2021-05-28 23:11+0200\n"
+"Last-Translator: dkrat7 <dkrat7 @github.com>\n"
+"Language: sl_SI\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100>=3 && n"
+"%100<=4 ? 2 : 3);\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"X-Generator: Poedit 2.3\n"
+
+#: superset/app.py:231
+msgid "Home"
+msgstr "Domov"
+
+#: superset/app.py:238 superset/views/annotations.py:119
+msgid "Annotation Layers"
+msgstr "Sloji z oznakami"
+
+#: superset/app.py:241 superset/app.py:284 superset/app.py:296
+#: superset/app.py:345 superset/app.py:441 superset/app.py:450
+#: superset/app.py:465 superset/app.py:477
+msgid "Manage"
+msgstr "Upravljaj"
+
+#: superset-frontend/src/profile/components/Security.tsx:46
+#: superset-frontend/src/views/CRUD/data/common.ts:26 superset/app.py:247
+#: superset/views/database/mixins.py:33
+msgid "Databases"
+msgstr "Podatkovne baze"
+
+#: superset-frontend/src/explore/components/ControlPanelsContainer.tsx:415
+#: superset-frontend/src/explore/components/DataTablesPane/index.tsx:295
+#: superset-frontend/src/views/CRUD/data/common.ts:22 superset/app.py:250
+#: superset/app.py:259 superset/app.py:381 superset/app.py:399
+#: superset/app.py:504 superset/app.py:514 superset/app.py:527
+#: superset/app.py:540
+msgid "Data"
+msgstr "Podatki"
+
+#: superset-frontend/src/profile/components/Security.tsx:60
+#: superset-frontend/src/views/CRUD/data/common.ts:32 superset/app.py:255
+msgid "Datasets"
+msgstr "Podatkovni seti"
+
+#: superset-frontend/src/dashboard/components/BuilderComponentPane.tsx:77
+#: superset-frontend/src/profile/components/CreatedContent.tsx:76
+#: superset-frontend/src/profile/components/Favorites.tsx:77
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:586
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:242 superset/app.py:266
+#: superset/views/chart/mixin.py:26 superset/views/dashboard/mixin.py:81
+msgid "Charts"
+msgstr "Grafikoni"
+
+#: superset-frontend/src/profile/components/CreatedContent.tsx:73
+#: superset-frontend/src/profile/components/Favorites.tsx:74
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:533
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:219 superset/app.py:274
+#: superset/views/chart/mixin.py:79 superset/views/dashboard/mixin.py:25
+msgid "Dashboards"
+msgstr "Nadzorne plošče"
+
+#: superset/app.py:282
+msgid "Plugins"
+msgstr "Vtičniki"
+
+#: superset/app.py:293 superset/views/css_templates.py:38
+msgid "CSS Templates"
+msgstr "CSS predloge"
+
+#: superset/app.py:302
+msgid "Row level security"
+msgstr "Varnost na nivoju vrstic"
+
+#: superset/app.py:304 superset/app.py:416 superset/app.py:488
+msgid "Security"
+msgstr "Varnost"
+
+#: superset/app.py:341
+msgid "Import Dashboards"
+msgstr "Uvozi nadzorne plošče"
+
+#: superset/app.py:353
+msgid "SQL Editor"
+msgstr "SQL urejevalnik"
+
+#: superset/app.py:358 superset/app.py:373
+msgid "SQL Lab"
+msgstr "SQL laboratorij"
+
+#: superset/app.py:361
+msgid "Saved Queries"
+msgstr "Shranjene poizvedbe"
+
+#: superset/app.py:368
+msgid "Query History"
+msgstr "Zgodovina poizvedb"
+
+#: superset/app.py:377
+msgid "Upload a CSV"
+msgstr "Naloži CSV"
+
+#: superset/app.py:395
+msgid "Upload Excel"
+msgstr "Naloži Excel"
+
+#: superset/app.py:414
+msgid "Action Log"
+msgstr "Dnevnik aktivnosti"
+
+#: superset/app.py:439
+msgid "Dashboard Emails"
+msgstr "E-pošta za nadzorno ploščo"
+
+#: superset/app.py:448
+msgid "Chart Email Schedules"
+msgstr "Urniki za e-pošto grafikonov"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:421 superset/app.py:463
+msgid "Alerts"
+msgstr "Opozorila"
+
+#: superset/app.py:475
+msgid "Alerts & Reports"
+msgstr "Opozorila in poročila"
+
+#: superset/app.py:486
+msgid "Access requests"
+msgstr "Zahteve za dostop"
+
+#: superset/app.py:502 superset/connectors/druid/views.py:274
+msgid "Druid Datasources"
+msgstr "Druid podatkovni viri"
+
+#: superset/app.py:511 superset/connectors/druid/views.py:210
+msgid "Druid Clusters"
+msgstr "Druid gruče"
+
+#: superset/app.py:524
+msgid "Scan New Datasources"
+msgstr "Preišči nove podatkovne vire"
+
+#: superset/app.py:537
+msgid "Refresh Druid Metadata"
+msgstr "Osveži metapodatke za Druid"
+
+#: superset/errors.py:83
+msgid "Issue 1000 - The datasource is too large to query."
+msgstr "Težava 1000 - podatkovni vir je prevelik za poizvedbo."
+
+#: superset-frontend/src/utils/getClientErrorObject.ts:129
+#: superset/errors.py:87
+msgid "Issue 1001 - The database is under an unusual load."
+msgstr "Težava 1001 - podatkovni vir je neobičajno obremenjen."
+
+#: superset/errors.py:93
+msgid "Issue 1002 - The database returned an unexpected error."
+msgstr "Težava 1002 - podatkovna baza je vrnila nepričakovano napako."
+
+#: superset/errors.py:99 superset/errors.py:114 superset/errors.py:129
+msgid ""
+"Issue 1003 - There is a syntax error in the SQL query. Perhaps there was a "
+"misspelling or a typo."
+msgstr ""
+"Težava 1003 - v SQL-poizvedbi je sintaktična napaka. Mogoče ste se zatipkali."
+
+#: superset/errors.py:106
+msgid "Issue 1004 - The column was deleted or renamed in the database."
+msgstr ""
+"Težava 1004 - stolpec je bil izbrisan ali preimenovan v podatkovni bazi."
+
+#: superset/errors.py:121
+msgid "Issue 1005 - The table was deleted or renamed in the database."
+msgstr ""
+"Težava 1005 - tabela je bila izbrisana ali preimenovana v podatkovni bazi."
+
+#: superset/errors.py:136
+msgid "Issue 1005 - The schema was deleted or renamed in the database."
+msgstr ""
+"Težava 1005 - shema je bila izbrisana ali preimenovana v podatkovni bazi."
+
+#: superset/errors.py:144
+msgid "Issue 1006 - One or more parameters specified in the query are missing."
+msgstr "Težava 1006 - en ali več parametrov v SQL-poizvedbi manjka."
+
+#: superset/errors.py:153
+msgid "Issue 1007 - The hostname provided can't be resolved."
+msgstr "Težava 1007 - imena gostitelja ni mogoče razrešiti."
+
+#: superset/errors.py:157
+msgid "Issue 1008 - The port is closed."
+msgstr "Težava 1008 - Vrata so zaprta."
+
+#: superset/errors.py:162
+msgid ""
+"Issue 1009 - The host might be down, and can't be reached on the provided "
+"port."
+msgstr ""
+"Težava 1009 - Gostitelj mogoče ne deluje in ga ni mogoče doseči preko "
+"podanih vrat."
+
+#: superset/errors.py:171
+msgid "Issue 1010 - Superset encountered an error while running a command."
+msgstr "Težava 1010 - Superset je naletel na napako pri izvajanju ukaza."
+
+#: superset/errors.py:179
+msgid "Issue 1011 - Superset encountered an unexpected error."
+msgstr "Težava 1011 - Superset je naletel na nepričakovano napako."
+
+#: superset/errors.py:185
+msgid ""
+"Issue 1012 - The username provided when connecting to a database is not "
+"valid."
+msgstr ""
+"Težava 1012 - Uporabniško ime za povezavo s podatkovno bazo je neveljavno."
+
+#: superset/errors.py:194
+msgid ""
+"Issue 1013 - The password provided when connecting to a database is not "
+"valid."
+msgstr "Težava 1013 - Geslo za povezavo s podatkovno bazo je neveljavno."
+
+#: superset/errors.py:203
+msgid "Issue 1014 - Either the username or the password is wrong."
+msgstr "Težava 1014 - Uporabniško ime ali/in geslo sta napačna."
+
+#: superset/errors.py:207 superset/errors.py:216
+msgid ""
+"Issue 1015 - Either the database is spelled incorrectly or does not exist."
+msgstr ""
+"Težava 1015 - Ime podatkovne baze je zapisano napačno ali pa ne obstaja."
+
+#: superset/errors.py:225
+msgid "Issue 1017 - User doesn't have the proper permissions."
+msgstr "Težava 1017 - Uporabnik nima ustreznih dovoljenj."
+
+#: superset/errors.py:231
+msgid ""
+"Issue 1018 - One or more parameters needed to configure a database are "
+"missing."
+msgstr ""
+"Težava 1018 - Eden ali več parametrov, potrebnih za nastavitev podatkovne "
+"baze, manjka."
+
+#: superset/errors.py:240
+msgid "Issue 1019 - The submitted payload has the incorrect format."
+msgstr "Težava 1019 - Podani podatki so v neustrezni obliki."
+
+#: superset/errors.py:248
+msgid "Issue 1020 - The submitted payload has the incorrect schema."
+msgstr "Težava 1020 - Podani podatki imajo neustrezno shemo."
+
+#: superset/databases/schemas.py:170 superset/exceptions.py:139
+msgid "Invalid certificate"
+msgstr "Neveljaven certifikat"
+
+#: superset/jinja_context.py:328
+#, python-format
+msgid "Unsafe return type for function %(func)s: %(value_type)s"
+msgstr "Nevaren tip rezultata, ki ga vrne funkcija %(func)s: %(value_type)s"
+
+#: superset/jinja_context.py:339
+#, python-format
+msgid "Unsupported return value for method %(name)s"
+msgstr "Nepodprt rezultat vračanja za metodo %(name)s"
+
+#: superset/jinja_context.py:352
+#, python-format
+msgid "Unsafe template value for key %(key)s: %(value_type)s"
+msgstr "Nevaren vzorec za ključ %(key)s: %(value_type)s"
+
+#: superset/jinja_context.py:363
+#, python-format
+msgid "Unsupported template value for key %(key)s"
+msgstr "Nepodprta vrednost vzorca za ključ %(key)s"
+
+#: superset/sql_lab.py:172
+msgid ""
+"SQL Lab timeout. This environment's policy is to kill queries after {} "
+"seconds."
+msgstr ""
+"Iztek časa SQL laboratorija. Nastavitev okolja določa prekinitev poizvedb po "
+"izteku {} sekund."
+
+#: superset/sql_lab.py:204
+msgid "Only `SELECT` statements are allowed against this database"
+msgstr "Za to podatkovno bazo so dovoljeni le `SELECT` stavki"
+
+#: superset/sql_lab.py:371
+msgid ""
+"CTAS (create table as select) can only be run with a query where the last "
+"statement is a SELECT. Please make sure your query has a SELECT as its last "
+"statement. Then, try running your query again."
+msgstr ""
+"CTAS (create table as select) lahko izvajate le v poizvedbah, kjer je zadnji "
+"stavek SELECT. Poskrbite, da bo zadnji stavek v vaši poizvedbi SELECT in "
+"poskusite ponovno zagnati poizvedbo."
+
+#: superset/sql_lab.py:383
+msgid ""
+"CVAS (create view as select) can only be run with a query with a single "
+"SELECT statement. Please make sure your query has only a SELECT statement. "
+"Then, try running your query again."
+msgstr ""
+"CVAS (create view as select) lahko izvajate le v poizvedbah z enim SELECT "
+"stavkom. Poskrbite, da bo v vaši poizvedbi le en SELECT stavek in poskusite "
+"ponovno zagnati poizvedbo."
+
+#: superset/viz.py:131
+msgid "Viz is missing a datasource"
+msgstr "Vizualizaciji manjka podatkovni vir"
+
+#: superset/viz.py:237
+msgid ""
+"Applied rolling window did not return any data. Please make sure the source "
+"query satisfies the minimum periods defined in the rolling window."
+msgstr ""
+"Izbrano drseče okno ni vrnilo podatkov. Poskrbite, da izvorna poizvedba "
+"ustreza minimalni periodi drsečega okna."
+
+#: superset/utils/date_parser.py:264 superset/viz.py:355
+msgid "From date cannot be larger than to date"
+msgstr "Začetni datum ne sme biti večji od končnega datuma"
+
+#: superset/viz.py:522
+msgid "Cached value not found"
+msgstr "Predpomnjena vrednost ni najdena"
+
+#: superset/common/query_context.py:358 superset/viz.py:538
+#, python-format
+msgid "Columns missing in datasource: %(invalid_columns)s"
+msgstr "V podatkovnem viru manjkajo stolpci: %(invalid_columns)s"
+
+#: superset/viz.py:650
+msgid "Table View"
+msgstr "Tabelarični pogled"
+
+#: superset/viz.py:672
+msgid ""
+"You cannot use [Columns] in combination with [Group By]/[Metrics]/"
+"[Percentage Metrics]. Please choose one or the other."
+msgstr ""
+"Ne smete uporabiti [Stolpci] v kombinaciji z [Združevanje]/[Mere]/"
+"[Procentualne mere]. Izberite eno ali drugo."
+
+#: superset/viz.py:709
+msgid "Pick a granularity in the Time section or uncheck 'Include Time'"
+msgstr "Izberite granulacijo v razdelku 'Čas' ali odstranite 'Vključi čas'"
+
+#: superset/viz.py:782
+msgid "Time Table View"
+msgstr "Pogled urnika"
+
+#: superset/viz.py:791 superset/viz.py:1735
+msgid "Pick at least one metric"
+msgstr "Izberite vsaj eno mero"
+
+#: superset/viz.py:795
+msgid "When using 'Group By' you are limited to use a single metric"
+msgstr "Ko uporabljate 'Group By', ste omejeni na uporabo ene mere"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/index.js:26
+#: superset/viz.py:824
+msgid "Pivot Table"
+msgstr "Vrtilna tabela"
+
+#: superset/viz.py:841
+msgid "Please choose at least one 'Group by' field "
+msgstr "Izberite vsaj eno 'Group by' polje "
+
+#: superset/viz.py:853
+msgid "Please choose at least one metric"
+msgstr "Izberite vsaj eno mero"
+
+#: superset/viz.py:855
+msgid "Group By' and 'Columns' can't overlap"
+msgstr "'Združevanje' in 'Stolpci' se ne smeta prekrivati"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-treemap/src/index.js:27
+#: superset/viz.py:957
+msgid "Treemap"
+msgstr "Drevesni grafikon s pravokotniki"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/index.js:27
+#: superset/viz.py:1000
+msgid "Calendar Heatmap"
+msgstr "Koledarska barvna lestvica"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js:27
+#: superset/viz.py:1092
+msgid "Bubble Chart"
+msgstr "Mehurčkasti grafikon"
+
+#: superset/viz.py:1114
+msgid "Please use 3 different metric labels"
+msgstr "Uporabite 3 različne oznake mer"
+
+#: superset/viz.py:1116
+msgid "Pick a metric for x, y and size"
+msgstr "Izberite mere za x, y in velikost"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js:27
+#: superset/viz.py:1143
+msgid "Bullet Chart"
+msgstr "'Bullet' grafikon"
+
+#: superset/viz.py:1153
+msgid "Pick a metric to display"
+msgstr "Izberite mero za prikaz"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/index.ts:26
+#: superset/viz.py:1171
+msgid "Big Number with Trendline"
+msgstr "Velika številka s trendno krivuljo"
+
+#: superset/viz.py:1179 superset/viz.py:1213
+msgid "Pick a metric!"
+msgstr "Izberite mero!"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumberTotal/index.ts:29
+#: superset/viz.py:1205
+msgid "Big Number"
+msgstr "Velika številka"
+
+#: superset/viz.py:1227
+msgid "Time Series - Line Chart"
+msgstr "Časovna vrsta - Črtni grafikon"
+
+#: superset/viz.py:1308 superset/viz.py:1574
+msgid "Pick a time granularity for your time series"
+msgstr "Izberite granulacijo časa za časovno vrsto"
+
+#: superset/viz.py:1367
+msgid ""
+"An enclosed time range (both start and end) must be specified when using a "
+"Time Comparison."
+msgstr ""
+"Pri časovni primerjavi mora biti določeno zaprto časovno obdobje (s časom "
+"začetka in konca)."
+
+#: superset/viz.py:1439
+msgid "Time Series - Multiple Line Charts"
+msgstr "Časovna vrsta - Veččrtni grafikon"
+
+#: superset/viz.py:1516
+msgid "Time Series - Dual Axis Line Chart"
+msgstr "Časovna vrsta - Črtni grafikon z dvojno osjo"
+
+#: superset/viz.py:1526
+msgid "Pick a metric for left axis!"
+msgstr "Izberite mero za levo os!"
+
+#: superset/viz.py:1528
+msgid "Pick a metric for right axis!"
+msgstr "Izberite mero za desno os!"
+
+#: superset/viz.py:1531
+msgid "Please choose different metrics on left and right axis"
+msgstr "Izberite različni meri za levo in desno os"
+
+#: superset/viz.py:1591
+msgid "Time Series - Bar Chart"
+msgstr "Časovna vrsta - Stolpčni grafikon"
+
+#: superset/viz.py:1600
+msgid "Time Series - Period Pivot"
+msgstr "Časovna vrsta - Vrtenje period"
+
+#: superset/viz.py:1647
+msgid "Time Series - Percent Change"
+msgstr "Časovna vrsta - Procentualna sprememba"
+
+#: superset/viz.py:1655
+msgid "Time Series - Stacked"
+msgstr "Časovna vrsta - Naložen graf"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/index.js:26
+#: superset/viz.py:1665
+msgid "Histogram"
+msgstr "Histogram"
+
+#: superset/viz.py:1675
+msgid "Must have at least one numeric column specified"
+msgstr "Definiran mora biti vsaj en numerični stolpec"
+
+#: superset/viz.py:1722
+msgid "Distribution - Bar Chart"
+msgstr "Porazdelitev - Stolpčni grafikon"
+
+#: superset/viz.py:1732
+msgid "Can't have overlap between Series and Breakdowns"
+msgstr "Ne sme imeti prekrivanja med podatkovnimi serijami in členitvami"
+
+#: superset/viz.py:1737
+msgid "Pick at least one field for [Series]"
+msgstr "Izberite vsaj eno polje za [Serije]"
+
+#: superset/viz.py:1803
+msgid "Sunburst"
+msgstr "Sunburst"
+
+#: superset/viz.py:1851
+msgid "Sankey"
+msgstr "Sankey"
+
+#: superset/viz.py:1859
+msgid "Pick exactly 2 columns as [Source / Target]"
+msgstr "Izberite natanko dva stolpca za [Izvor / Cilj]"
+
+#: superset/viz.py:1903
+msgid ""
+"There's a loop in your Sankey, please provide a tree. Here's a faulty link: "
+"{}"
+msgstr "V 'Sankey' je zanka, določite drevo. To je okvarjena povezava: {}"
+
+#: superset/viz.py:1916
+msgid "Directed Force Layout"
+msgstr "Izgled usmerjene sile"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-country-map/src/index.js:27
+#: superset/viz.py:1951
+msgid "Country Map"
+msgstr "Zemljevid držav"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/index.js:27
+#: superset/viz.py:1988
+msgid "World Map"
+msgstr "Zemljevid sveta"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx:104
+#: superset-frontend/src/explore/controls.jsx:466
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:72
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:429
+#: superset/viz.py:2048
+msgid "Filters"
+msgstr "Filtri"
+
+#: superset/viz.py:2068
+msgid "Invalid filter configuration, please select a column"
+msgstr "Neveljavna nastavitev filtrov, izberite stolpec"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-parallel-coordinates/src/index.js:27
+#: superset/viz.py:2119
+msgid "Parallel Coordinates"
+msgstr "Vzporedne koordinate"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/index.js:27
+#: superset/viz.py:2148
+msgid "Heatmap"
+msgstr "Toplotni prikaz"
+
+#: superset/viz.py:2208
+msgid "Horizon Charts"
+msgstr "Horizontni grafikon"
+
+#: superset/viz.py:2220
+msgid "Mapbox"
+msgstr "Mapbox"
+
+#: superset/viz.py:2232
+msgid "[Longitude] and [Latitude] must be set"
+msgstr "[Zemljepisna dolžina] in [Zemljepisna širina] morata biti nastavljeni"
+
+#: superset/viz.py:2239
+msgid "Must have a [Group By] column to have 'count' as the [Label]"
+msgstr "Mora imeti stolpec [Združevanje], da ima število (count) kot [Oznaka]"
+
+#: superset/viz.py:2263
+msgid "Choice of [Label] must be present in [Group By]"
+msgstr "Izbira [Oznaka] mora biti prisotna v [Združevanje]"
+
+#: superset/viz.py:2271
+msgid "Choice of [Point Radius] must be present in [Group By]"
+msgstr "Izbran [Point Radius] mora biti prisoten v [Združevanje]"
+
+#: superset/viz.py:2279
+msgid "[Longitude] and [Latitude] columns must be present in [Group By]"
+msgstr ""
+"Stolpca [Zemljepisna dolžina] in [Zemljepisna širina] morata biti prisotna v "
+"[Združevanje]"
+
+#: superset/viz.py:2359
+msgid "Deck.gl - Multiple Layers"
+msgstr "Deck.gl - Večplastni"
+
+#: superset/viz.py:2399 superset/viz.py:2431
+msgid "Bad spatial key"
+msgstr "Neutrezen prostorski ključ"
+
+#: superset/viz.py:2417
+#, python-format
+msgid "Invalid spatial point encountered: %s"
+msgstr "Neustrezna prostorska točka: %s"
+
+#: superset/viz.py:2453
+msgid ""
+"Encountered invalid NULL spatial "
+"entry,                                        please consider filtering "
+"those out"
+msgstr ""
+"Prišlo je do neveljavnega NULL prostorskega "
+"vnosa,                                        poskusite ga izločiti s filtrom"
+
+#: superset/viz.py:2547
+msgid "Deck.gl - Scatter plot"
+msgstr "Deck.gl - Raztreseni graf"
+
+#: superset/viz.py:2596
+msgid "Deck.gl - Screen Grid"
+msgstr "Deck.gl - Mreža"
+
+#: superset/viz.py:2622
+msgid "Deck.gl - 3D Grid"
+msgstr "Deck.gl - 3D mreža"
+
+#: superset/viz.py:2652
+msgid "Deck.gl - Paths"
+msgstr "Deck.gl - Poti"
+
+#: superset/viz.py:2700
+msgid "Deck.gl - Polygon"
+msgstr "Deck.gl - Poligon"
+
+#: superset/viz.py:2729
+msgid "Deck.gl - 3D HEX"
+msgstr "Deck.gl - 3D HEX"
+
+#: superset/viz.py:2748
+msgid "Deck.gl - GeoJSON"
+msgstr "Deck.gl - GeoJSON"
+
+#: superset/viz.py:2767
+msgid "Deck.gl - Arc"
+msgstr "Deck.gl - Arc"
+
+#: superset/viz.py:2802
+msgid "Event flow"
+msgstr "Potek dogodkov"
+
+#: superset/viz.py:2834
+msgid "Time Series - Paired t-test"
+msgstr "Časovna vrsta - t-test za odvisne vzorce"
+
+#: superset/viz.py:2901
+msgid "Time Series - Nightingale Rose Chart"
+msgstr "Časovna vrsta - Nightingale Rose grafikon"
+
+#: superset/viz.py:2936
+msgid "Partition Diagram"
+msgstr "Grafikon s pravokotniki"
+
+#: superset/annotation_layers/api.py:353
+#, python-format
+msgid "Deleted %(num)d annotation layer"
+msgid_plural "Deleted %(num)d annotation layers"
+msgstr[0] "Izbrisan je %(num)d sloj z oznakami"
+msgstr[1] "Izbrisana sta %(num)d sloja z oznakami"
+msgstr[2] "Izbrisanih so %(num)d sloji z oznakami"
+msgstr[3] "Izbrisanih je %(num)d slojev z oznakami"
+
+#: superset/annotation_layers/annotations/filters.py:28
+#: superset/annotation_layers/filters.py:30 superset/charts/filters.py:31
+#: superset/css_templates/filters.py:28
+#: superset/queries/saved_queries/filters.py:31 superset/reports/filters.py:28
+msgid "All Text"
+msgstr "Celotno besedilo"
+
+#: superset/annotation_layers/annotations/api.py:502
+#, python-format
+msgid "Deleted %(num)d annotation"
+msgid_plural "Deleted %(num)d annotations"
+msgstr[0] "Izbrisana je %(num)d oznaka"
+msgstr[1] "Izbrisani sta %(num)d oznaki"
+msgstr[2] "Izbrisane so %(num)d oznake"
+msgstr[3] "Izbrisanih je %(num)d oznak"
+
+#: superset/annotation_layers/annotations/commands/exceptions.py:35
+msgid "End date must be after start date"
+msgstr "Končni datum mora biti za začetnim"
+
+#: superset/annotation_layers/annotations/commands/exceptions.py:46
+msgid "Short description must be unique for this layer"
+msgstr "Kratek opis mora biti za ta sloj unikaten"
+
+#: superset/annotation_layers/annotations/commands/exceptions.py:52
+msgid "Annotations could not be deleted."
+msgstr "Oznak ni mogoče izbrisati."
+
+#: superset/annotation_layers/annotations/commands/exceptions.py:56
+msgid "Annotation not found."
+msgstr "Oznaka ni najdena."
+
+#: superset/annotation_layers/annotations/commands/exceptions.py:60
+msgid "Annotation parameters are invalid."
+msgstr "Parametri oznak so neveljavni."
+
+#: superset/annotation_layers/annotations/commands/exceptions.py:64
+msgid "Annotation could not be created."
+msgstr "Oznake ni mogoče ustvariti."
+
+#: superset/annotation_layers/annotations/commands/exceptions.py:68
+msgid "Annotation could not be updated."
+msgstr "Oznake ni mogoče posodobiti."
+
+#: superset/annotation_layers/annotations/commands/exceptions.py:72
+msgid "Annotation delete failed."
+msgstr "Izbris oznake ni uspel."
+
+#: superset/annotation_layers/commands/exceptions.py:29
+msgid "Annotation layer parameters are invalid."
+msgstr "Parametri sloja z oznakami so neveljavni."
+
+#: superset/annotation_layers/commands/exceptions.py:33
+msgid "Annotation layer could not be deleted."
+msgstr "Sloja z oznakami ni mogoče izbrisati."
+
+#: superset/annotation_layers/commands/exceptions.py:37
+msgid "Annotation layer could not be created."
+msgstr "Sloja z oznakami ni mogoče ustvariti."
+
+#: superset/annotation_layers/commands/exceptions.py:41
+msgid "Annotation layer could not be updated."
+msgstr "Sloja z oznakami ni mogoče posodobiti."
+
+#: superset/annotation_layers/commands/exceptions.py:45
+msgid "Annotation layer not found."
+msgstr "Sloja z oznakami ni mogoče najti."
+
+#: superset/annotation_layers/commands/exceptions.py:49
+msgid "Annotation layer delete failed."
+msgstr "Izbris sloja z oznakami ni uspel."
+
+#: superset/annotation_layers/commands/exceptions.py:53
+#: superset/annotation_layers/commands/exceptions.py:57
+msgid "Annotation layer has associated annotations."
+msgstr "Sloj z oznakami ima povezane oznake."
+
+#: superset/annotation_layers/commands/exceptions.py:66
+#: superset/reports/commands/exceptions.py:137
+msgid "Name must be unique"
+msgstr "Ime mora biti unikatno"
+
+#: superset/charts/api.py:473
+#, python-format
+msgid "Deleted %(num)d chart"
+msgid_plural "Deleted %(num)d charts"
+msgstr[0] "Izbrisan je %(num)d grafikon"
+msgstr[1] "Izbrisana sta %(num)d grafikona"
+msgstr[2] "Izbrisani so %(num)d grafikoni"
+msgstr[3] "Izbrisanih je %(num)d grafikonov"
+
+#: superset/charts/api.py:571
+msgid "Request is not JSON"
+msgstr "Zahtevek ni JSON"
+
+#: superset/charts/api.py:582 superset/charts/api.py:652
+#, python-format
+msgid "Request is incorrect: %(error)s"
+msgstr "Zahtevek je napačen: %(error)s"
+
+#: superset/charts/schemas.py:510
+msgid "`confidence_interval` must be between 0 and 1 (exclusive)"
+msgstr "`confidence_interval` mora biti med 0 in 1 (odprt)"
+
+#: superset/charts/schemas.py:576
+msgid ""
+"lower percentile must be greater than 0 and less than 100. Must be lower "
+"than upper percentile."
+msgstr ""
+"spodnji percentil mora biti večji od 0 in manjši od 100 ter mora biti manjši "
+"od zgornjega percentila."
+
+#: superset/charts/schemas.py:591
+msgid ""
+"upper percentile must be greater than 0 and less than 100. Must be higher "
+"than lower percentile."
+msgstr ""
+"zgornji percentil mora biti večji od 0 in manjši od 100 ter mora biti večji "
+"od spodnjega percentila."
+
+#: superset/charts/schemas.py:871
+msgid "`width` must be greater or equal to 0"
+msgstr "`width` mora biti večja ali enaka 0"
+
+#: superset/charts/schemas.py:986
+msgid "`row_limit` must be greater than or equal to 0"
+msgstr "`row_limit` mora biti večja ali enaka 0"
+
+#: superset/charts/schemas.py:993
+msgid "`row_offset` must be greater than or equal to 0"
+msgstr "`row_offset` mora biti večja ali enaka 1"
+
+#: superset/charts/commands/bulk_delete.py:64
+#: superset/charts/commands/delete.py:68
+#: superset/dashboards/commands/bulk_delete.py:65
+#: superset/dashboards/commands/delete.py:66
+#: superset/databases/commands/delete.py:65
+#, python-format
+msgid "There are associated alerts or reports: %s,"
+msgstr "Prisotna so opozorila in poročila: %s,"
+
+#: superset/charts/commands/exceptions.py:38
+#, python-format
+msgid ""
+"Time string is unclear. Please specify [%(human_readable)s ago] or "
+"[%(human_readable)s later]."
+msgstr ""
+"Časovni izraz je nejasen. Podajte [%(human_readable)s ago] ali "
+"[%(human_readable)s later]."
+
+#: superset/charts/commands/exceptions.py:51
+#, python-format
+msgid "Cannot parse time string [%(human_readable)s]"
+msgstr "Ni mogoče razčleniti časovnega izraza [%(human_readable)s]"
+
+#: superset/charts/commands/exceptions.py:65
+#: superset/datasets/commands/exceptions.py:41
+#: superset/reports/commands/exceptions.py:35
+msgid "Database does not exist"
+msgstr "Podatkovna baza ne obstaja"
+
+#: superset/charts/commands/exceptions.py:74
+msgid "Dashboards do not exist"
+msgstr "Nadzorna plošča ne obstaja"
+
+#: superset/charts/commands/exceptions.py:84
+msgid "Datasource type is required when datasource_id is given"
+msgstr "Ko se podaja datasource_id, je potreben tip podatkovnega vira"
+
+#: superset/charts/commands/exceptions.py:94
+msgid "Chart parameters are invalid."
+msgstr "Parametri grafikona so neveljavni."
+
+#: superset/charts/commands/exceptions.py:98
+msgid "Chart could not be created."
+msgstr "Grafikona ni mogoče ustvariti."
+
+#: superset/charts/commands/exceptions.py:102
+msgid "Chart could not be updated."
+msgstr "Grafikona ni mogoče posodobiti."
+
+#: superset/charts/commands/exceptions.py:106
+msgid "Chart could not be deleted."
+msgstr "Grafikona ni mogoče izbrisati."
+
+#: superset/charts/commands/exceptions.py:110
+#: superset/charts/commands/exceptions.py:130
+#: superset/dashboards/commands/exceptions.py:57
+#: superset/dashboards/commands/exceptions.py:69
+#: superset/databases/commands/exceptions.py:117
+msgid "There are associated alerts or reports"
+msgstr "Prisotna so povezana opozorila in poročila"
+
+#: superset/charts/commands/exceptions.py:114
+msgid "Changing this chart is forbidden"
+msgstr "Spreminjanje tega grafikona ni dovoljeno"
+
+#: superset/charts/commands/exceptions.py:118
+msgid "Charts could not be deleted."
+msgstr "Grafikonov ni mogoče izbrisati."
+
+#: superset/charts/commands/exceptions.py:134
+msgid "Import chart failed for an unknown reason"
+msgstr "Uvoz grafikona ni uspel zaradi neznanega razloga"
+
+#: superset/commands/exceptions.py:85
+#: superset/datasets/commands/exceptions.py:144
+msgid "Owners are invalid"
+msgstr "Lastniki niso veljavni"
+
+#: superset/commands/exceptions.py:92
+msgid "Some roles do not exist"
+msgstr "Nekatere vloge ne obstajajo"
+
+#: superset/commands/exceptions.py:99
+#: superset/datasets/commands/exceptions.py:149
+msgid "Dataset does not exist"
+msgstr "Podatkovni set ne obstaja"
+
+#: superset/common/query_actions.py:183
+msgid "Invalid result type: %(result_type)"
+msgstr "Neveljaven tip rezultata: %(result_type)"
+
+#: superset/common/query_context.py:276
+msgid "The chart does not exist"
+msgstr "Grafikon ne obstaja"
+
+#: superset/common/query_object.py:259
+#, python-format
+msgid ""
+"Duplicate column/metric labels: %(labels)s. Please make sure all columns and "
+"metrics have a unique label."
+msgstr ""
+"Podvojene oznake stolpcev/mer: %(labels)s. Poskrbite, da bodo imeli stolpci "
+"in mere unikatne oznake."
+
+#: superset/common/query_object.py:351
+msgid "`operation` property of post processing object undefined"
+msgstr "Lastnost  `operation` poprocesirnega objekta ni definirana"
+
+#: superset/common/query_object.py:355
+#, python-format
+msgid "Unsupported post processing operation: %(operation)s"
+msgstr "Nepodprta poprocesirna operacija: %(operation)s"
+
+#: superset/connectors/druid/models.py:239
+msgid "Adding new datasource [{}]"
+msgstr "Dodajanje novega podatkovnega vira [{}]"
+
+#: superset/connectors/druid/models.py:242
+msgid "Refreshing datasource [{}]"
+msgstr "Osveževanje podatkovnega vira [{}]"
+
+#: superset/connectors/druid/models.py:1053
+msgid "Metric(s) {} must be aggregations."
+msgstr "Mere {} morajo biti agregacije."
+
+#: superset/connectors/druid/models.py:1471
+msgid "Unsupported extraction function: "
+msgstr "Nepodprta ekstrakcijska funkcija: "
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1041
+#: superset-frontend/src/explore/components/DatasourcePanel/index.tsx:224
+#: superset-frontend/src/explore/controls.jsx:247
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:45
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:202
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.ts:31
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:49
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:94
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:117
+#: superset/connectors/druid/views.py:69 superset/connectors/sqla/views.py:65
+msgid "Columns"
+msgstr "Stolpci"
+
+#: superset/connectors/druid/views.py:70
+msgid "Show Druid Column"
+msgstr "Pokaži Druid stolpec"
+
+#: superset/connectors/druid/views.py:71
+msgid "Add Druid Column"
+msgstr "Dodaj Druid stolpec"
+
+#: superset/connectors/druid/views.py:72
+msgid "Edit Druid Column"
+msgstr "Uredi Druid stolpec"
+
+#: superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.jsx:31
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:516
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:228
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:139
+#: superset-frontend/src/explore/components/controls/SpatialControl.jsx:193
+#: superset/connectors/druid/views.py:90 superset/connectors/sqla/views.py:136
+msgid "Column"
+msgstr "Stolpec"
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:272
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:450
+#: superset/connectors/druid/views.py:91 superset/connectors/druid/views.py:187
+#: superset/connectors/sqla/views.py:145 superset/connectors/sqla/views.py:253
+msgid "Type"
+msgstr "Tip"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:149
+#: superset/connectors/druid/views.py:92 superset/views/access_requests.py:46
+#: superset/views/chart/mixin.py:80
+msgid "Datasource"
+msgstr "Podatkovni vir"
+
+#: superset/connectors/druid/views.py:93 superset/connectors/sqla/views.py:139
+msgid "Groupable"
+msgstr "Združevanje"
+
+#: superset/connectors/druid/views.py:94 superset/connectors/sqla/views.py:140
+msgid "Filterable"
+msgstr "Filtriranje"
+
+#: superset/connectors/druid/views.py:97 superset/connectors/sqla/views.py:100
+msgid ""
+"Whether this column is exposed in the `Filters` section of the explore view."
+msgstr ""
+"Če želite, da je ta stolpec na voljo v sekciji `Filtri` v raziskovalnem "
+"pogledu."
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1030
+#: superset-frontend/src/explore/components/DatasourcePanel/index.tsx:202
+#: superset-frontend/src/explore/controls.jsx:154
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:89
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:130
+#: superset/connectors/druid/views.py:156 superset/connectors/sqla/views.py:207
+msgid "Metrics"
+msgstr "Mere"
+
+#: superset/connectors/druid/views.py:157
+msgid "Show Druid Metric"
+msgstr "Prikaži Druid mere"
+
+#: superset/connectors/druid/views.py:158
+msgid "Add Druid Metric"
+msgstr "Dodaj Druid mere"
+
+#: superset/connectors/druid/views.py:159
+msgid "Edit Druid Metric"
+msgstr "Uredi Druid mere"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:874
+#: superset-frontend/src/explore/controls.jsx:169
+#: superset-frontend/src/explore/controls.jsx:170
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:102
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:103
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:143
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:144
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-country-map/src/controlPanel.ts:84
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:90
+#: superset/connectors/druid/views.py:184 superset/connectors/sqla/views.py:250
+msgid "Metric"
+msgstr "Mera"
+
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:125
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:159
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:175
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:179
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:546
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:888
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:892
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:208
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1076
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1082
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:153
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:162
+#: superset/connectors/druid/views.py:185
+#: superset/connectors/druid/views.py:342 superset/connectors/sqla/views.py:138
+#: superset/connectors/sqla/views.py:251 superset/connectors/sqla/views.py:499
+#: superset/views/annotations.py:80 superset/views/annotations.py:128
+#: superset/views/chart/mixin.py:81 superset/views/sql_lab.py:73
+msgid "Description"
+msgstr "Opis"
+
+#: superset/connectors/druid/views.py:186
+#: superset/connectors/druid/views.py:235 superset/connectors/sqla/views.py:137
+#: superset/connectors/sqla/views.py:252
+msgid "Verbose Name"
+msgstr "Podrobno ime"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:772
+#: superset/connectors/druid/views.py:188 superset/views/log/__init__.py:33
+msgid "JSON"
+msgstr "JSON"
+
+#: superset/connectors/druid/views.py:189
+msgid "Druid Datasource"
+msgstr "Podatkovni vir Druid"
+
+#: superset/connectors/druid/views.py:190 superset/connectors/sqla/views.py:258
+msgid "Warning Message"
+msgstr "Opozorilo"
+
+#: superset/connectors/druid/views.py:211
+msgid "Show Druid Cluster"
+msgstr "Pokaži Druid gručo"
+
+#: superset/connectors/druid/views.py:212
+msgid "Add Druid Cluster"
+msgstr "Dodaj Druid gručo"
+
+#: superset/connectors/druid/views.py:213
+msgid "Edit Druid Cluster"
+msgstr "Uredi Druid gručo"
+
+#: superset/connectors/druid/views.py:229
+msgid "Cluster Name"
+msgstr "Ime gruče"
+
+#: superset/connectors/druid/views.py:230
+msgid "Broker Host"
+msgstr "Gostitelj posrednika"
+
+#: superset/connectors/druid/views.py:231
+msgid "Broker Port"
+msgstr "Vrata posrednika"
+
+#: superset/connectors/druid/views.py:232
+msgid "Broker Username"
+msgstr "Uporabniško ime posrednika"
+
+#: superset/connectors/druid/views.py:233
+msgid "Broker Password"
+msgstr "Geslo posrednika"
+
+#: superset/connectors/druid/views.py:234
+msgid "Broker Endpoint"
+msgstr "Končna točka posrednika"
+
+#: superset/connectors/druid/views.py:236
+#: superset/connectors/druid/views.py:348 superset/connectors/sqla/views.py:494
+#: superset/views/chart/mixin.py:77
+msgid "Cache Timeout"
+msgstr "Trajanje predpomnilnika"
+
+#: superset/connectors/druid/views.py:237
+msgid "Metadata Last Refreshed"
+msgstr "Meta-podatki nazadnje osveženi"
+
+#: superset/connectors/druid/views.py:240
+msgid ""
+"Duration (in seconds) of the caching timeout for this cluster. A timeout of "
+"0 indicates that the cache never expires. Note this defaults to the global "
+"timeout if undefined."
+msgstr ""
+"Trajanje (v sekundah) predpomnjenja za to gručo. Vrednost 0 označuje, da "
+"predpomnilnik nikoli ne poteče. V primeru, da ni definirano, ima globalno "
+"nastavitev trajanja."
+
+#: superset/connectors/druid/views.py:245
+#: superset/connectors/druid/views.py:250
+msgid ""
+"Druid supports basic authentication. See [auth](http://druid.io/docs/latest/"
+"design/auth.html) and druid-basic-security extension"
+msgstr ""
+"Druid podpira osnovno avtentikacijo. Glejte [auth](http://druid.io/docs/"
+"latest/design/auth.html) in razširitev druid-basic-security"
+
+#: superset/connectors/druid/views.py:275
+msgid "Show Druid Datasource"
+msgstr "Prikaži podatkovni vir za Druid"
+
+#: superset/connectors/druid/views.py:276
+msgid "Add Druid Datasource"
+msgstr "Dodaj podatkovni vir za Druid"
+
+#: superset/connectors/druid/views.py:277
+msgid "Edit Druid Datasource"
+msgstr "Uredi podatkovni vir za Druid"
+
+#: superset/connectors/druid/views.py:300 superset/connectors/sqla/views.py:426
+msgid ""
+"The list of charts associated with this table. By altering this datasource, "
+"you may change how these associated charts behave. Also note that charts "
+"need to point to a datasource, so this form will fail at saving if removing "
+"charts from a datasource. If you want to change the datasource for a chart, "
+"overwrite the chart from the 'explore view'"
+msgstr ""
+"Seznam grafikonov, povezanih s to tabelo. S spreminjanjem podatkovnega vira "
+"lahko spremenite, kako se povezani grafikoni obnašajo. Poleg tega morajo "
+"biti grafikoni povezani s podatkovnim virom. Če odstranite grafikon s "
+"podatkovnega vira ne bo mogoče shraniti tega vnosa. Če želite spremeniti "
+"podatkovni vir grafikona, prepišite grafikon v raziskovalnem pogledu."
+
+#: superset/connectors/druid/views.py:309 superset/connectors/sqla/views.py:435
+msgid "Timezone offset (in hours) for this datasource"
+msgstr "Razlika časovnega pasu (v urah) za ta podatkovni vir"
+
+#: superset/connectors/druid/views.py:314
+msgid ""
+"Time expression to use as a predicate when retrieving distinct values to "
+"populate the filter component. Only applies when `Enable Filter Select` is "
+"on. If you enter `7 days ago`, the distinct list of values in the filter "
+"will be populated based on the distinct value over the past week"
+msgstr ""
+"Prednastavljeni časovni izraz za pridobitev različnih vrednosti filtrirne "
+"komponente. Upošteva se le v primeru, da je vključeno `Omogoči izbiro "
+"filtra`. Če vnesete `7 days ago`, bo seznam vrednosti filtra napolnjen na "
+"podlagi različnih vrednosti v prejšnjem tednu"
+
+#: superset/connectors/druid/views.py:322 superset/connectors/sqla/views.py:458
+msgid ""
+"Whether to populate the filter's dropdown in the explore view's filter "
+"section with a list of distinct values fetched from the backend on the fly"
+msgstr ""
+"Če želite napolniti spustni seznam filtra v raziskovalnem pogledu filtrske "
+"sekcije z različnimi vrednostmi, pridobljenimi sproti v ozadju"
+
+#: superset/connectors/druid/views.py:327
+msgid ""
+"Redirects to this endpoint when clicking on the datasource from the "
+"datasource list"
+msgstr ""
+"Preusmeri v to končno točko, ko kliknete na podatkovni vir v seznamu "
+"podatkovnih virov"
+
+#: superset/connectors/druid/views.py:331
+msgid ""
+"Duration (in seconds) of the caching timeout for this datasource. A timeout "
+"of 0 indicates that the cache never expires. Note this defaults to the "
+"cluster timeout if undefined."
+msgstr ""
+"Trajanje (v sekundah) predpomnjenja za ta podatkovni vir. Vrednost 0 "
+"označuje, da predpomnilnik nikoli ne poteče. V primeru, da ni definirano, "
+"ima nastavitev trajanja za gručo."
+
+#: superset/connectors/druid/views.py:339 superset/connectors/sqla/views.py:484
+msgid "Associated Charts"
+msgstr "Povezani grafikoni"
+
+#: superset/connectors/druid/views.py:340
+msgid "Data Source"
+msgstr "Podatkovni vir"
+
+#: superset/connectors/druid/views.py:341
+msgid "Cluster"
+msgstr "Gruča"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:337
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:381
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:601
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:244
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:267
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1059
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:276
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:318
+#: superset/connectors/druid/views.py:343 superset/connectors/sqla/views.py:497
+#: superset/views/chart/mixin.py:83 superset/views/dashboard/mixin.py:82
+msgid "Owners"
+msgstr "Lastniki"
+
+#: superset/connectors/druid/views.py:344
+msgid "Is Hidden"
+msgstr "Skrito"
+
+#: superset/connectors/druid/views.py:345 superset/connectors/sqla/views.py:490
+msgid "Enable Filter Select"
+msgstr "Omogoči izbiro filtra"
+
+#: superset/connectors/druid/views.py:346 superset/connectors/sqla/views.py:492
+msgid "Default Endpoint"
+msgstr "Privzeta končna točka"
+
+#: superset/connectors/druid/views.py:347
+msgid "Time Offset"
+msgstr "Časovni zamik"
+
+#: superset/connectors/druid/views.py:349
+msgid "Datasource Name"
+msgstr "Ime podatkovnega vira"
+
+#: superset/connectors/druid/views.py:350
+msgid "Fetch Values From"
+msgstr "Pridobi vrednosti iz"
+
+#: superset/connectors/druid/views.py:351 superset/connectors/sqla/views.py:486
+msgid "Changed By"
+msgstr "Spremenil/a"
+
+#: superset-frontend/src/dashboard/components/AddSliceCard.jsx:128
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:254
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:293
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:351
+#: superset/connectors/druid/views.py:352 superset/connectors/sqla/views.py:368
+#: superset/connectors/sqla/views.py:503 superset/views/dashboard/mixin.py:86
+#: superset/views/dashboard/views.py:148 superset/views/database/mixins.py:202
+#: superset/views/sql_lab.py:74
+msgid "Modified"
+msgstr "Sprememba"
+
+#: superset/connectors/druid/views.py:417
+msgid "Refreshed metadata from cluster [{}]"
+msgstr "Osveženi meta-podatki iz gruče [{}]"
+
+#: superset/connectors/sqla/models.py:645
+msgid "Only `SELECT` statements are allowed"
+msgstr "Dovoljeni so le `SELECT` stavki"
+
+#: superset/connectors/sqla/models.py:654
+msgid "Only single queries supported"
+msgstr "Podprte so le enojne poizvedbe"
+
+#: superset/connectors/sqla/models.py:738
+#, python-format
+msgid "Error in jinja expression in fetch values predicate: %(msg)s"
+msgstr "Napaka v jinja izrazu za pridobivanje vrednosti predikatov: %(msg)s"
+
+#: superset/connectors/sqla/models.py:820
+msgid "Virtual dataset query must be read-only"
+msgstr "Poizvedba na virtualnem podatkovnem setu mora biti samo za branje"
+
+#: superset/connectors/sqla/models.py:837
+#, python-format
+msgid "Error while rendering virtual dataset query: %(msg)s"
+msgstr "Napaka pri izvajanju poizvedbe virtualnega podatkovnega seta: %(msg)s"
+
+#: superset/connectors/sqla/models.py:844
+msgid "Virtual dataset query cannot be empty"
+msgstr "Poizvedba na virtualnem podatkovnem setu ne sme biti prazna"
+
+#: superset/connectors/sqla/models.py:847
+msgid "Virtual dataset query cannot consist of multiple statements"
+msgstr ""
+"Poizvedba na virtualnem podatkovnem setu ne sme biti sestavljena iz več "
+"stavkov"
+
+#: superset/connectors/sqla/models.py:948
+#, python-format
+msgid "Error in jinja expression in RLS filters: %(msg)s"
+msgstr "Napaka v jinja izrazu RLS filtrov: %(msg)s"
+
+#: superset/connectors/sqla/models.py:1013
+msgid ""
+"Datetime column not provided as part table configuration and is required by "
+"this type of chart"
+msgstr ""
+"Stolpec datum-čas ni podan kot del tabele, čeprav mora biti za ta tip "
+"grafikona"
+
+#: superset/connectors/sqla/models.py:1019
+msgid "Empty query?"
+msgstr "Prazna poizvedba?"
+
+#: superset/connectors/sqla/models.py:1030
+#: superset/connectors/sqla/models.py:1423
+#, python-format
+msgid "Metric '%(metric)s' does not exist"
+msgstr "Mera '%(metric)s' ne obstaja"
+
+#: superset/connectors/sqla/models.py:1070
+#, python-format
+msgid "Unknown column used in orderby: %(col)s"
+msgstr "Za razvrščanje je uporabljen neznan stolpec: %(col)s"
+
+#: superset/connectors/sqla/models.py:1112
+#, python-format
+msgid "Time column \"%(col)s\" does not exist in dataset"
+msgstr "Časovni stolpec \"%(col)s\" ne obstaja v podatkovnem setu"
+
+#: superset/connectors/sqla/models.py:1199
+msgid "Filter value list cannot be empty"
+msgstr "Seznam vrednosti filtra ne sme biti prazen"
+
+#: superset/connectors/sqla/models.py:1224
+msgid "Must specify a value for filters with comparison operators"
+msgstr "Potrebno je podati vrednost za filter s primerjalnim operandom"
+
+#: superset/connectors/sqla/models.py:1247
+#, python-format
+msgid "Invalid filter operation type: %(op)s"
+msgstr "Neveljaven tip operacije filtra: %(op)s"
+
+#: superset/connectors/sqla/models.py:1258
+#, python-format
+msgid "Error in jinja expression in WHERE clause: %(msg)s"
+msgstr "Napaka v jinja izrazu WHERE stavka: %(msg)s"
+
+#: superset/connectors/sqla/models.py:1270
+#, python-format
+msgid "Error in jinja expression in HAVING clause: %(msg)s"
+msgstr "Napaka v jinja izrazu HAVING stavka: %(msg)s"
+
+#: superset/connectors/sqla/models.py:1393
+msgid "Database does not support subqueries"
+msgstr "Podatkovna baza ne podpira podpoizvedb"
+
+#: superset/connectors/sqla/models.py:1468
+msgid "Db engine did not return all queried columns"
+msgstr "Sitem podatkovne baze ni vrnil vse stolpcev poizvedbe"
+
+#: superset/connectors/sqla/views.py:66
+msgid "Show Column"
+msgstr "Pokaži stolpec"
+
+#: superset/connectors/sqla/views.py:67
+msgid "Add Column"
+msgstr "Dodaj stolpec"
+
+#: superset/connectors/sqla/views.py:68
+msgid "Edit Column"
+msgstr "Uredi stolpec"
+
+#: superset/connectors/sqla/views.py:95
+msgid ""
+"Whether to make this column available as a [Time Granularity] option, column "
+"has to be DATETIME or DATETIME-like"
+msgstr ""
+"Če želite, da bo ta stolpec na razpolago kot možnost [Granulacija časa]. "
+"Stolpec mora biti tipa DATETIME ali DATETIME-like"
+
+#: superset/connectors/sqla/views.py:104
+msgid ""
+"The data type that was inferred by the database. It may be necessary to "
+"input a type manually for expression-defined columns in some cases. In most "
+"case users should not need to alter this."
+msgstr ""
+"Podatkovni tip, ki izvira iz podatkovne baze. V nekaterih primerih je "
+"potrebno ročno vnesti tip za stolpce, ki temeljijo na izrazih. V večini "
+"primerov uporabniku tega ni potrebno spreminjati."
+
+#: superset-frontend/src/components/TableSelector/index.tsx:405
+#: superset-ui/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/createMetadata.ts:9
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:148
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/index.ts:35
+#: superset-ui/superset-ui/temporary-plugins/hold-potentially-deprecate/superset-ui-plugin-chart-table/src/createMetadata.ts:8
+#: superset/connectors/sqla/views.py:141 superset/connectors/sqla/views.py:255
+#: superset/connectors/sqla/views.py:485 superset/views/chart/mixin.py:87
+msgid "Table"
+msgstr "Tabela"
+
+#: superset/connectors/sqla/views.py:142
+msgid "Expression"
+msgstr "Izraz"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:231
+#: superset/connectors/sqla/views.py:143
+msgid "Is temporal"
+msgstr "Časoven"
+
+#: superset/connectors/sqla/views.py:144
+msgid "Datetime Format"
+msgstr "Oblika zapisa datuma,časa"
+
+#: superset/connectors/sqla/views.py:161 superset/datasets/schemas.py:39
+msgid "Invalid date/timestamp format"
+msgstr "Neveljaven zapis datuma/časa"
+
+#: superset/connectors/sqla/views.py:208
+msgid "Show Metric"
+msgstr "Pokaži mero"
+
+#: superset/connectors/sqla/views.py:209
+msgid "Add Metric"
+msgstr "Dodaj mero"
+
+#: superset/connectors/sqla/views.py:210
+msgid "Edit Metric"
+msgstr "Uredi mero"
+
+#: superset/connectors/sqla/views.py:254
+msgid "SQL Expression"
+msgstr "SQL izraz"
+
+#: superset/connectors/sqla/views.py:256
+msgid "D3 Format"
+msgstr "D3 zapis"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:583
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:326
+#: superset/connectors/sqla/views.py:257 superset/connectors/sqla/views.py:502
+#: superset/views/database/mixins.py:196
+msgid "Extra"
+msgstr "Dodatno"
+
+#: superset/connectors/sqla/views.py:311
+msgid "Row level security filter"
+msgstr "Filter za varnost na nivoju vrstic"
+
+#: superset/connectors/sqla/views.py:312
+msgid "Show Row level security filter"
+msgstr "Prikaži filter za varnost na nivoju vrstic"
+
+#: superset/connectors/sqla/views.py:313
+msgid "Add Row level security filter"
+msgstr "Dodaj filter za varnost na nivoju vrstic"
+
+#: superset/connectors/sqla/views.py:314
+msgid "Edit Row level security filter"
+msgstr "Uredi filter za varnost na nivoju vrstic"
+
+#: superset/connectors/sqla/views.py:332
+msgid ""
+"Regular filters add where clauses to queries if a user belongs to a role "
+"referenced in the filter. Base filters apply filters to all queries except "
+"the roles defined in the filter, and can be used to define what users can "
+"see if no RLS filters within a filter group apply to them."
+msgstr ""
+"Navadni filtri dodajo WHERE stavek v poizvedbe, če ima uporabnik vlogo "
+"podano v filtru. Osnovni filtri filtrirajo vse poizvedbe, razen vlog, "
+"definiranih v filtru, in jih je mogoče uporabiti za nastavitev tega kaj "
+"uporabnik vidi, če v skupini filtrov ni RLS-filtrov, ki bi se nanašali nanje."
+
+#: superset/connectors/sqla/views.py:338
+msgid "These are the tables this filter will be applied to."
+msgstr "To so tabele, na katere se nanaša ta filter."
+
+#: superset/connectors/sqla/views.py:339
+msgid ""
+"For regular filters, these are the roles this filter will be applied to. For "
+"base filters, these are the roles that the filter DOES NOT apply to, e.g. "
+"Admin if admin should see all data."
+msgstr ""
+"Za regularne filtre so te vloge tiste, ki bodo filtrirane. Za osnovne "
+"filtre, so te vloge tiste, ki NE bodo filtrirane, npr. Admin, če naj "
+"administrator vidi vse podatke."
+
+#: superset/connectors/sqla/views.py:345
+msgid ""
+"Filters with the same group key will be ORed together within the group, "
+"while different filter groups will be ANDed together. Undefined group keys "
+"are treated as unique groups, i.e. are not grouped together. For example, if "
+"a table has three filters, of which two are for departments Finance and "
+"Marketing (group key = 'department'), and one refers to the region Europe "
+"(group key = 'region'), the filter clause would apply the filter (department "
+"= 'Finance' OR department = 'Marketing') AND (region = 'Europe')."
+msgstr ""
+"Filtri z enakim skupinskim ključem bodo znotraj skupine združeni z OR "
+"funkcijo, medtem ko bodo različne skupine združene z AND funkcijo. "
+"Nedefinirani skupinski ključi so obravnavani kot unikatne skupine in niso "
+"združeni v svojo skupino. Npr., če ima tabela tri filtre, pri čemer sta dva "
+"za oddelka marketinga in financ (skupinski ključ = 'oddelek') tretji pa se "
+"nanaša na regijo Evropa (skupinski ključ = 'regija'), bo filtrski izraz "
+"(oddelek = 'Finance' OR oddelek = 'Marketing') AND (regija = 'Evropa')."
+
+#: superset/connectors/sqla/views.py:355
+msgid ""
+"This is the condition that will be added to the WHERE clause. For example, "
+"to only return rows for a particular client, you might define a regular "
+"filter with the clause `client_id = 9`. To display no rows unless a user "
+"belongs to a RLS filter role, a base filter can be created with the clause "
+"`1 = 0` (always false)."
+msgstr ""
+"To je pogoj, ki bo dodan WHERE stavku. Npr., če želite dobiti vrstice za "
+"določeno stranko, lahko definirate regularni filter z izrazom 'id_stranke = "
+"9'. Če ne želimo prikazati vrstic, razen če uporabnik pripada RLS vlogi, "
+"lahko filter ustvarimo z izrazom `1 = 0` (vedno neresnično)."
+
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:278
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:316
+#: superset/connectors/sqla/views.py:364 superset/connectors/sqla/views.py:392
+msgid "Tables"
+msgstr "Tabele"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:403
+#: superset-frontend/src/profile/components/Security.tsx:35
+#: superset/connectors/sqla/views.py:365 superset/views/dashboard/mixin.py:83
+msgid "Roles"
+msgstr "Vloge"
+
+#: superset/connectors/sqla/views.py:366
+msgid "Clause"
+msgstr "Stavek"
+
+#: superset/connectors/sqla/views.py:367 superset/views/chart/mixin.py:78
+#: superset/views/dashboard/mixin.py:85 superset/views/dashboard/views.py:147
+#: superset/views/database/mixins.py:192
+msgid "Creator"
+msgstr "Avtor"
+
+#: superset/connectors/sqla/views.py:393
+msgid "Show Table"
+msgstr "Prikaži tabelo"
+
+#: superset/connectors/sqla/views.py:394
+msgid "Import a table definition"
+msgstr "Uvozi definicijo tabele"
+
+#: superset/connectors/sqla/views.py:395
+msgid "Edit Table"
+msgstr "Uredi tabelo"
+
+#: superset/connectors/sqla/views.py:436
+msgid "Name of the table that exists in the source database"
+msgstr "Ime tabele, ki obstaja v izvorni podatkovni bazi"
+
+#: superset/connectors/sqla/views.py:437
+msgid "Schema, as used only in some databases like Postgres, Redshift and DB2"
+msgstr ""
+"Shema, ki se uporablja pri nekaterih podatkovnih bazah, kot so Postgres, "
+"Redshift in DB2"
+
+#: superset/connectors/sqla/views.py:444
+msgid ""
+"This fields acts a Superset view, meaning that Superset will run a query "
+"against this string as a subquery."
+msgstr ""
+"To polje se obnaša kot Supersetov pogled, kar pomeni, da bo Superset izvedel "
+"poizvedbo za ta niz kot podpoizvedbo."
+
+#: superset/connectors/sqla/views.py:448
+msgid ""
+"Predicate applied when fetching distinct value to populate the filter "
+"control component. Supports jinja template syntax. Applies only when `Enable "
+"Filter Select` is on."
+msgstr ""
+"Privzeta vrednost za pridobivanje različnih vrednost pri oblikovanju "
+"filtrov. Podpira sintakso za jinja predloge. Potrebno le, ko je vključeno "
+"`Omogoči izbiro filtra`."
+
+#: superset/connectors/sqla/views.py:454
+msgid ""
+"Redirects to this endpoint when clicking on the table from the table list"
+msgstr "Preusmeri v to končno točko, ko kliknete na tabelo v seznamu tabel"
+
+#: superset/connectors/sqla/views.py:463
+msgid "Whether the table was generated by the 'Visualize' flow in SQL Lab"
+msgstr ""
+"Če želite, da je tabela ustvarjena s postopkom 'Vizualizacija' v SQL "
+"laboratoriju"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:649
+#: superset/connectors/sqla/views.py:466
+msgid ""
+"A set of parameters that become available in the query using Jinja "
+"templating syntax"
+msgstr ""
+"Nabor parametrov, ki postanejo razpoložljivi za poizvedbo z uporabo sintakse "
+"za Jinja predloge"
+
+#: superset/connectors/sqla/views.py:470
+msgid ""
+"Duration (in seconds) of the caching timeout for this table. A timeout of 0 "
+"indicates that the cache never expires. Note this defaults to the database "
+"timeout if undefined."
+msgstr ""
+"Trajanje (v sekundah) predpomnjenja za to tabelo. Vrednost 0 označuje, da "
+"predpomnilnik nikoli ne poteče. V primeru, da ni definirano, ima nastavitev "
+"trajanja za podatkovno bazo."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:178
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:218
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:420
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:232
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:340
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:269
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:416
+#: superset/connectors/sqla/views.py:487 superset/connectors/sqla/views.py:488
+#: superset/templates/superset/import_dashboards.html:53
+#: superset/views/database/forms.py:112 superset/views/database/forms.py:309
+#: superset/views/database/mixins.py:191 superset/views/sql_lab.py:72
+msgid "Database"
+msgstr "Podatkovna baza"
+
+#: superset/connectors/sqla/views.py:489 superset/views/database/mixins.py:193
+msgid "Last Changed"
+msgstr "Zadnja sprememba"
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:283
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:435
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:241
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:279
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:436
+#: superset/connectors/sqla/views.py:491 superset/views/database/forms.py:118
+#: superset/views/database/forms.py:315
+msgid "Schema"
+msgstr "Shema"
+
+#: superset/connectors/sqla/views.py:493
+msgid "Offset"
+msgstr "Odmik"
+
+#: superset/connectors/sqla/views.py:495 superset/views/database/forms.py:87
+#: superset/views/database/forms.py:276
+msgid "Table Name"
+msgstr "Ime tabele"
+
+#: superset/connectors/sqla/views.py:496
+msgid "Fetch Values Predicate"
+msgstr "Pridobi vrednosti predikatov"
+
+#: superset/connectors/sqla/views.py:498
+msgid "Main Datetime Column"
+msgstr "Glavni stolpec Datum-Čas"
+
+#: superset/connectors/sqla/views.py:500
+msgid "SQL Lab View"
+msgstr "Pogled SQL laboratorija"
+
+#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.tsx:94
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:648
+#: superset/connectors/sqla/views.py:501
+msgid "Template parameters"
+msgstr "Parametri predlog"
+
+#: superset/connectors/sqla/views.py:537
+msgid ""
+"The table was created. As part of this two-phase configuration process, you "
+"should now click the edit button by the new table to configure it."
+msgstr ""
+"Tabela je ustvarjena. Sedaj morate v tem dvodelnem postopku klikniti gumb za "
+"urejanje nove tabele."
+
+#: superset/connectors/sqla/views.py:562
+msgid "Refresh Metadata"
+msgstr "Osveži metapodatke"
+
+#: superset/connectors/sqla/views.py:562
+msgid "Refresh column metadata"
+msgstr "Osveži metapodatke stolpca"
+
+#: superset/connectors/sqla/views.py:599
+#, python-format
+msgid "Metadata refreshed for the following table(s): %(tables)s"
+msgstr "Metapodatki osveženi za naslednje tabele: %(tables)s"
+
+#: superset/connectors/sqla/views.py:609
+#, python-format
+msgid "The following tables added new columns: %(tables)s"
+msgstr "Nove stolpce so dodale naslednje tabele: %(tables)s"
+
+#: superset/connectors/sqla/views.py:620
+#, python-format
+msgid "The following tables removed columns: %(tables)s"
+msgstr "Stolpce so odstranile naslednje tabele: %(tables)s"
+
+#: superset/connectors/sqla/views.py:631
+#, python-format
+msgid "The following tables update column metadata: %(tables)s"
+msgstr "Metapodatke stolpcev so posodobile naslednje tabele: %(tables)s"
+
+#: superset/connectors/sqla/views.py:638
+#, python-format
+msgid "Unable to refresh metadata for the following table(s): %(tables)s"
+msgstr "Ni mogoče osvežiti metapodatkov za naslednje tabele: %(tables)s"
+
+#: superset/css_templates/api.py:137
+#, python-format
+msgid "Deleted %(num)d css template"
+msgid_plural "Deleted %(num)d css templates"
+msgstr[0] "Izbrisana %(num)d css predloga"
+msgstr[1] "Izbrisani %(num)d css predlogi"
+msgstr[2] "Izbrisane %(num)d css predloge"
+msgstr[3] "Izbrisanih %(num)d css predlog"
+
+#: superset/css_templates/commands/exceptions.py:23
+msgid "CSS template could not be deleted."
+msgstr "CSS predloge ni mogoče izbrisati."
+
+#: superset/css_templates/commands/exceptions.py:27
+msgid "CSS template not found."
+msgstr "CSS predloga ni najdena."
+
+#: superset/dashboards/api.py:657
+#, python-format
+msgid "Deleted %(num)d dashboard"
+msgid_plural "Deleted %(num)d dashboards"
+msgstr[0] "Izbrisana je %(num)d nadzorna plošča"
+msgstr[1] "Izbrisani sta %(num)d nadzorni plošči"
+msgstr[2] "Izbrisane so %(num)d nadzorne plošče"
+msgstr[3] "Izbrisanih je %(num)d nadzornih plošč"
+
+#: superset/dashboards/filters.py:35
+msgid "Title or Slug"
+msgstr "Naslov ali `Slug`"
+
+#: superset/dashboards/filters.py:153
+msgid "Role"
+msgstr "Vloga"
+
+#: superset/dashboards/commands/exceptions.py:37
+msgid "Must be unique"
+msgstr "Mora biti unikaten"
+
+#: superset/dashboards/commands/exceptions.py:41
+msgid "Dashboard parameters are invalid."
+msgstr "Parametri nadzorne plošče so neveljavni."
+
+#: superset/dashboards/commands/exceptions.py:45
+msgid "Dashboard not found."
+msgstr "Nadzorna plošča ni najdena."
+
+#: superset/dashboards/commands/exceptions.py:49
+msgid "Dashboard could not be created."
+msgstr "Nadzorne plošče ni mogoče ustvariti."
+
+#: superset/dashboards/commands/exceptions.py:53
+msgid "Dashboards could not be deleted."
+msgstr "Nadzornih plošč ni mogoče izbrisati."
+
+#: superset/dashboards/commands/exceptions.py:61
+msgid "Dashboard could not be updated."
+msgstr "Nadzorne plošče ni mogoče posodobiti."
+
+#: superset/dashboards/commands/exceptions.py:65
+msgid "Dashboard could not be deleted."
+msgstr "Nadzorne plošče ni mogoče izbrisati."
+
+#: superset/dashboards/commands/exceptions.py:73
+msgid "Changing this Dashboard is forbidden"
+msgstr "Spreminjanje te nadzorne plošče ni dovoljeno"
+
+#: superset/dashboards/commands/exceptions.py:77
+msgid "Import dashboard failed for an unknown reason"
+msgstr "Uvoz nadzorne plošče ni uspel zaradi neznanega razloga"
+
+#: superset/dashboards/commands/exceptions.py:81
+msgid "You don't have access to this dashboard."
+msgstr "Nimate dostopa do te nadzorne plošče."
+
+#: superset/dashboards/commands/importers/v0.py:303
+msgid "No data in file"
+msgstr "V datoteki ni podatkov"
+
+#: superset/databases/decorators.py:46
+msgid "Table name undefined"
+msgstr "Ime tabele ni definirano"
+
+#: superset/databases/schemas.py:148
+msgid ""
+"Invalid connection string, a valid string usually follows: driver://user:"
+"password@database-host/database-name"
+msgstr ""
+"Neveljaven niz povezave - veljaven niz običajno sledi: driver://user:"
+"password@database-host/database-name"
+
+#: superset/databases/schemas.py:183 superset/databases/schemas.py:198
+#, python-format
+msgid "Field cannot be decoded by JSON. %(msg)s"
+msgstr "Polja ni mogoče dekodirati z JSON. %(msg)s"
+
+#: superset/databases/schemas.py:206
+#, python-format
+msgid ""
+"The metadata_params in Extra field is not configured correctly. The key "
+"%(key)s is invalid."
+msgstr ""
+"Metadata_params v polju Dodatno niso pravilno nastavljeni. Ključ %(key)s je "
+"neveljaven."
+
+#: superset/databases/schemas.py:266
+msgid ""
+"An engine must be specified when passing individual parameters to a database."
+msgstr ""
+"Pri podajanju posameznih parametrov podatkovne baze mora biti podan njen tip."
+
+#: superset/databases/commands/validate.py:51 superset/databases/schemas.py:275
+#, python-format
+msgid "Engine \"%(engine)s\" is not a valid engine."
+msgstr "\"%(engine)s\" ni veljaven tip podatkovne baze."
+
+#: superset/databases/schemas.py:282
+msgid ""
+"Engine spec \"InvalidEngine\" does not support being configured via "
+"individual parameters."
+msgstr ""
+"Specifikacija baze \"InvalidEngine\" ne podpira konfiguracije s posameznimi "
+"parametri."
+
+#: superset/databases/commands/exceptions.py:32
+msgid "Database parameters are invalid."
+msgstr "Parametri podatkovne baze so neveljavni."
+
+#: superset/databases/commands/exceptions.py:42
+msgid "A database with the same name already exists"
+msgstr "Podatkovna baza z enakim imenom že obstaja"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:518
+#: superset/databases/commands/exceptions.py:50
+msgid "Field is required"
+msgstr "Polje je obvezno"
+
+#: superset/databases/commands/exceptions.py:62
+msgid "Field cannot be decoded by JSON.  %{json_error}s"
+msgstr "Polja ni mogoče dekodirati z JSON.  %{json_error}s"
+
+#: superset/databases/commands/exceptions.py:79
+#: superset/views/database/mixins.py:252
+msgid ""
+"The metadata_params in Extra field is not configured correctly. The key "
+"%{key}s is invalid."
+msgstr ""
+"Metadata_params v polju Dodatno niso pravilno nastavljeni. Ključ %{key}s je "
+"neveljaven."
+
+#: superset/databases/commands/exceptions.py:91
+msgid "Database not found."
+msgstr "Podatkovna baza ni najdena."
+
+#: superset/databases/commands/exceptions.py:95
+msgid "Database could not be created."
+msgstr "Podatkovne baze ni mogoče ustvariti."
+
+#: superset/databases/commands/exceptions.py:99
+msgid "Database could not be updated."
+msgstr "Podatkovne baze ni mogoče posodobiti."
+
+#: superset/databases/commands/exceptions.py:105
+#: superset/databases/commands/exceptions.py:122 superset/views/core.py:1317
+msgid "Connection failed, please check your connection settings"
+msgstr "Povezava neuspešna. Preverite nastavitve povezave"
+
+#: superset/databases/commands/exceptions.py:109
+msgid "Cannot delete a database that has tables attached"
+msgstr "Podatkovne baze s povezanimi tabelami ni mogoče izbrisati"
+
+#: superset/databases/commands/exceptions.py:113
+msgid "Database could not be deleted."
+msgstr "Podatkovne baze ni mogoče izbrisati."
+
+#: superset/databases/commands/exceptions.py:126
+msgid "Stopped an unsafe database connection"
+msgstr "Nevarna povezava s podatkovno bazo je bila ustavljena"
+
+#: superset/databases/commands/exceptions.py:130
+msgid "Could not load database driver"
+msgstr "Ni mogoče naložiti gonilnika podatkovne baze"
+
+#: superset/databases/commands/exceptions.py:135 superset/views/core.py:1325
+msgid "Unexpected error occurred, please check your logs for details"
+msgstr "Zgodila se je nepričakovana napaka. Podrobnosti preverite v dnevnikih"
+
+#: superset/databases/commands/exceptions.py:139
+msgid "Import database failed for an unknown reason"
+msgstr "Uvoz podatkovne baze ni uspel zaradi neznanega razloga"
+
+#: superset/databases/commands/test_connection.py:95
+msgid "Could not load database driver: {}"
+msgstr "Ni mogoče naložiti gonilnika podatkovne baze: {}"
+
+#: superset/databases/commands/validate.py:63
+#, python-format
+msgid "Engine \"%(engine)s\" cannot be configured through parameters."
+msgstr ""
+"Podatkovne baze tipa \"%(engine)s\" ni mogoče konfigurirati s parametri."
+
+#: superset/databases/commands/validate.py:126
+msgid "Database is offline."
+msgstr "Podatkovna baza ni povezana."
+
+#: superset/datasets/api.py:646
+#, python-format
+msgid "Deleted %(num)d dataset"
+msgid_plural "Deleted %(num)d datasets"
+msgstr[0] "Izbrisan %(num)d podatkovni set"
+msgstr[1] "Izbrisana %(num)d podatkovna niza"
+msgstr[2] "Izbrisani %(num)d podatkovni nizi"
+msgstr[3] "Izbrisanih %(num)d podatkovnih nizov"
+
+#: superset/datasets/filters.py:26
+msgid "Null or Empty"
+msgstr "Nič (NULL) ali prazen"
+
+#: superset/datasets/columns/commands/exceptions.py:23
+msgid "Dataset column not found."
+msgstr "Stolpec podatkovnega seta ni najden."
+
+#: superset/datasets/columns/commands/exceptions.py:27
+msgid "Dataset column delete failed."
+msgstr "Brisanje stolpca podatkovnega seta neuspešno."
+
+#: superset/datasets/columns/commands/exceptions.py:31
+#: superset/datasets/metrics/commands/exceptions.py:31
+msgid "Changing this dataset is forbidden."
+msgstr "Spreminjanje tega podatkovnega seta ni dovoljeno."
+
+#: superset/datasets/commands/exceptions.py:32
+#, python-format
+msgid "Dataset %(name)s already exists"
+msgstr "Podatkovni set %(name)s že obstaja"
+
+#: superset/datasets/commands/exceptions.py:50
+msgid "Database not allowed to change"
+msgstr "Podatkovne baze ni dovoljeno spreminjati"
+
+#: superset/datasets/commands/exceptions.py:70
+msgid "One or more columns do not exist"
+msgstr "En ali več stolpcev ne obstaja"
+
+#: superset/datasets/commands/exceptions.py:80
+msgid "One or more columns are duplicated"
+msgstr "En ali več stolpcev je podvojenih"
+
+#: superset/datasets/commands/exceptions.py:90
+msgid "One or more columns already exist"
+msgstr "En ali več stolpcev že obstaja"
+
+#: superset/datasets/commands/exceptions.py:99
+msgid "One or more metrics do not exist"
+msgstr "Ena ali več mer ne obstaja"
+
+#: superset/datasets/commands/exceptions.py:109
+msgid "One or more metrics are duplicated"
+msgstr "Ena ali več mer je podvojenih"
+
+#: superset/datasets/commands/exceptions.py:119
+msgid "One or more metrics already exist"
+msgstr "Ena ali več mer že obstaja"
+
+#: superset/datasets/commands/exceptions.py:130
+#, python-format
+msgid ""
+"Table [%(table_name)s] could not be found, please double check your database "
+"connection, schema, and table name"
+msgstr ""
+"Tabele [%(table_name)s] ni mogoče najti. Preverite povezavo, shemo in ime "
+"podatkovne baze"
+
+#: superset/datasets/commands/exceptions.py:153
+msgid "Dataset parameters are invalid."
+msgstr "Parametri podatkovnega seta so neveljavni."
+
+#: superset/datasets/commands/exceptions.py:157
+msgid "Dataset could not be created."
+msgstr "Podatkovnega niza ni mogoče ustvariti."
+
+#: superset/datasets/commands/exceptions.py:161
+#: superset/datasets/commands/exceptions.py:173
+msgid "Dataset could not be updated."
+msgstr "Podatkovnega niza ni mogoče posodobiti."
+
+#: superset/datasets/commands/exceptions.py:165
+msgid "Dataset could not be deleted."
+msgstr "Podatkovnega niza ni mogoče izbrisati."
+
+#: superset/datasets/commands/exceptions.py:169
+msgid "Dataset(s) could not be bulk deleted."
+msgstr "Podatkovnih nizov ni mogoče množično izbrisati."
+
+#: superset/datasets/commands/exceptions.py:177
+msgid "Changing this dataset is forbidden"
+msgstr "Spreminjanje tega podatkovnega seta ni dovoljeno"
+
+#: superset/datasets/commands/exceptions.py:181
+msgid "Import dataset failed for an unknown reason"
+msgstr "Uvoz podatkovnega seta ni uspel zaradi neznanega razloga"
+
+#: superset/datasets/metrics/commands/exceptions.py:23
+msgid "Dataset metric not found."
+msgstr "Mer podatkovnega seta ni najdena."
+
+#: superset/datasets/metrics/commands/exceptions.py:27
+msgid "Dataset metric delete failed."
+msgstr "Brisanje mere podatkovnega seta ni uspelo."
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/utils/D3Formatting.ts:29
+#: superset/db_engine_specs/base.py:86
+msgid "Original value"
+msgstr "Izvorna vrednost"
+
+#: superset/db_engine_specs/base.py:87
+msgid "Second"
+msgstr "Sekunda"
+
+#: superset/db_engine_specs/base.py:88
+msgid "Minute"
+msgstr "Minuta"
+
+#: superset/db_engine_specs/base.py:89
+msgid "5 minute"
+msgstr "5 minut"
+
+#: superset/db_engine_specs/base.py:90
+msgid "10 minute"
+msgstr "10 minut"
+
+#: superset/db_engine_specs/base.py:91
+msgid "15 minute"
+msgstr "15 minut"
+
+#: superset/db_engine_specs/base.py:92
+msgid "Half hour"
+msgstr "Pol ure"
+
+#: superset/db_engine_specs/base.py:93
+msgid "Hour"
+msgstr "Ura"
+
+#: superset/db_engine_specs/base.py:94
+msgid "Day"
+msgstr "Dan"
+
+#: superset/db_engine_specs/base.py:95
+msgid "Week"
+msgstr "Teden"
+
+#: superset/db_engine_specs/base.py:96
+msgid "Month"
+msgstr "Mesec"
+
+#: superset/db_engine_specs/base.py:97
+msgid "Quarter"
+msgstr "Četrtletje"
+
+#: superset/db_engine_specs/base.py:98
+msgid "Year"
+msgstr "Leto"
+
+#: superset/db_engine_specs/base.py:99
+msgid "Week starting sunday"
+msgstr "Teden z začetkom v nedeljo"
+
+#: superset/db_engine_specs/base.py:100
+msgid "Week starting monday"
+msgstr "Teden z začetkom v ponedeljek"
+
+#: superset/db_engine_specs/base.py:101
+msgid "Week ending saturday"
+msgstr "Teden s koncem v soboto"
+
+#: superset/db_engine_specs/base.py:102
+msgid "Week_ending sunday"
+msgstr "Teden s koncem v nedeljo"
+
+#: superset/db_engine_specs/base.py:1299
+msgid "Username"
+msgstr "Uporabniško ime"
+
+#: superset/db_engine_specs/base.py:1300
+msgid "Password"
+msgstr "Geslo"
+
+#: superset/db_engine_specs/base.py:1301
+msgid "Hostname or IP address"
+msgstr "Ime gostitelja ali IP naslov"
+
+#: superset/db_engine_specs/base.py:1302
+msgid "Database port"
+msgstr "Vrata podatkovne baze"
+
+#: superset/db_engine_specs/base.py:1303
+msgid "Database name"
+msgstr "Ime podatkovne baze"
+
+#: superset/db_engine_specs/base.py:1305
+msgid "Additional parameters"
+msgstr "Dodatni parametri"
+
+#: superset/db_engine_specs/base.py:1308
+msgid "Use an encrypted connection to the database"
+msgstr "Uporabite šifrirano povezavo s podatkovno bazo"
+
+#: superset/db_engine_specs/bigquery.py:122
+msgid ""
+"We were unable to connect to your database. Please confirm that your service "
+"account has the Viewer and Job User roles on the project."
+msgstr ""
+"Povezava s podatkovno bazo ni uspela. Preverite, da ima vaš dostop dodeljeni "
+"vlogi Viewer in Job User."
+
+#: superset/db_engine_specs/mssql.py:69
+#, python-format
+msgid ""
+"Either the username \"%(username)s\", password, or database name "
+"\"%(database)s\" is incorrect."
+msgstr ""
+"Uporabniško ime \"%(username)s\", geslo ali ime podatkovne baze "
+"\"%(database)s\" so napačni."
+
+#: superset/db_engine_specs/mssql.py:77
+#: superset/db_engine_specs/postgres.py:120
+#: superset/db_engine_specs/presto.py:199
+#: superset/db_engine_specs/redshift.py:67
+#, python-format
+msgid "The hostname \"%(hostname)s\" cannot be resolved."
+msgstr "Imena gostitelja \"%(hostname)s\" ni mogoče razrešiti."
+
+#: superset/db_engine_specs/mssql.py:82
+#: superset/db_engine_specs/postgres.py:125
+#: superset/db_engine_specs/presto.py:212
+#: superset/db_engine_specs/redshift.py:72
+#, python-format
+msgid "Port %(port)s on hostname \"%(hostname)s\" refused the connection."
+msgstr "Vrata %(port)s na gostitelju \"%(hostname)s\" niso sprejela povezave."
+
+#: superset/db_engine_specs/mssql.py:87
+#: superset/db_engine_specs/postgres.py:130
+#: superset/db_engine_specs/presto.py:204
+#: superset/db_engine_specs/redshift.py:77
+#, python-format
+msgid ""
+"The host \"%(hostname)s\" might be down, and can't be reached on port "
+"%(port)s."
+msgstr ""
+"Gostitelj \"%(hostname)s\" mogoče ne deluje in ga ni mogoče doseči na vratih "
+"%(port)s."
+
+#: superset/db_engine_specs/mysql.py:118 superset/db_engine_specs/presto.py:194
+#: superset/db_engine_specs/redshift.py:62
+#, python-format
+msgid "Either the username \"%(username)s\" or the password is incorrect."
+msgstr "Uporabniško ime \"%(username)s\" ali geslo sta napačna."
+
+#: superset/db_engine_specs/mysql.py:123
+#, python-format
+msgid "Unknown MySQL server host \"%(hostname)s\"."
+msgstr "Neznan MySQL strežnik \"%(hostname)s\"."
+
+#: superset/db_engine_specs/mysql.py:128
+#, python-format
+msgid "The host \"%(hostname)s\" might be down and can't be reached."
+msgstr "Gostitelj \"%(hostname)s\" mogoče ne deluje in ga ni mogoče doseči."
+
+#: superset/db_engine_specs/mysql.py:133
+#: superset/db_engine_specs/postgres.py:138
+#, python-format
+msgid "Unable to connect to database \"%(database)s\"."
+msgstr "Povezava s podatkovno bazo \"%(database)s\" ni uspela."
+
+#: superset/db_engine_specs/postgres.py:105
+#, python-format
+msgid "The username \"%(username)s\" does not exist."
+msgstr "Uporabniško ime \"%(username)s\" ne obstaja."
+
+#: superset/db_engine_specs/postgres.py:110
+#, python-format
+msgid "The password provided for username \"%(username)s\" is incorrect."
+msgstr "Geslo za uporabniško ime \"%(username)s\" je napačno."
+
+#: superset/db_engine_specs/postgres.py:115
+msgid "Please re-enter the password."
+msgstr "Ponovno vpišite geslo."
+
+#: superset/db_engine_specs/presto.py:170
+#, python-format
+msgid ""
+"We can't seem to resolve the column \"%(column_name)s\" at line %(location)s."
+msgstr ""
+"Zdi se, da ni mogoče razrešiti stolpca \"%(column_name)s\" v vrstici "
+"%(location)s."
+
+#: superset/db_engine_specs/presto.py:178
+#, python-format
+msgid ""
+"The table \"%(table_name)s\" does not exist. A valid table must be used to "
+"run this query."
+msgstr ""
+"Tabela \"%(table_name)s\" ne obstaja. V poizvedbi mora biti uporabljena "
+"veljavna tabela."
+
+#: superset/db_engine_specs/presto.py:186
+#, python-format
+msgid ""
+"The schema \"%(schema_name)s\" does not exist. A valid schema must be used "
+"to run this query."
+msgstr ""
+"Shema \"%(schema_name)s\" ne obstaja. Za poizvedbo mora biti uporabljena "
+"veljavna shema."
+
+#: superset/db_engine_specs/presto.py:217
+#, python-format
+msgid "Unable to connect to catalog named \"%(catalog_name)s\"."
+msgstr "Povezava na katalog \"%(catalog_name)s\" ni uspela."
+
+#: superset/db_engine_specs/presto.py:1005
+msgid "Unknown Presto Error"
+msgstr "Neznana Presto napaka"
+
+#: superset/db_engine_specs/redshift.py:85
+#, python-format
+msgid ""
+"We were unable to connect to your database named \"%(database)s\". Please "
+"verify your database name and try again."
+msgstr ""
+"Povezava s podatkovno bazo \"%(database)s\" ni uspela. Preverite ime "
+"podatkovne baze in poskusite ponovno."
+
+#: superset/models/sql_types/base.py:50
+#, python-format
+msgid "Temporal expression not supported for type: %(col_type)s"
+msgstr "Časovni izraz ni podprt za podatkovne tipe: %(col_type)s"
+
+#: superset/queries/saved_queries/api.py:197
+#, python-format
+msgid "Deleted %(num)d saved query"
+msgid_plural "Deleted %(num)d saved queries"
+msgstr[0] "Izbrisana %(num)d shranjena poizvedba"
+msgstr[1] "Izbrisani %(num)d shranjeni poizvedbi"
+msgstr[2] "Izbrisane %(num)d shranjene poizvedbe"
+msgstr[3] "Izbrisanih %(num)d shranjenih poizvedb"
+
+#: superset/queries/saved_queries/commands/exceptions.py:28
+msgid "Saved queries could not be deleted."
+msgstr "Shranjenih poizvedb ni mogoče izbrisati."
+
+#: superset/queries/saved_queries/commands/exceptions.py:32
+msgid "Saved query not found."
+msgstr "Shranjena poizvedba ni najdena."
+
+#: superset/queries/saved_queries/commands/exceptions.py:36
+msgid "Import saved query failed for an unknown reason."
+msgstr "Uvoz shranjene poizvedbe ni uspel zaradi neznanega razloga."
+
+#: superset/queries/saved_queries/commands/exceptions.py:40
+msgid "Saved query parameters are invalid."
+msgstr "Parametri shranjene poizvedbe so neveljavni."
+
+#: superset/reports/api.py:435
+#, python-format
+msgid "Deleted %(num)d report schedule"
+msgid_plural "Deleted %(num)d report schedules"
+msgstr[0] "Izbrisan %(num)d urnik poročanja"
+msgstr[1] "Izbrisana %(num)d urnika poročanja"
+msgstr[2] "Izbrisani %(num)d urniki poročanja"
+msgstr[3] "Izbrisanih %(num)d urnikov poročanja"
+
+#: superset/reports/schemas.py:166 superset/reports/schemas.py:172
+#: superset/reports/schemas.py:178 superset/reports/schemas.py:245
+#: superset/reports/schemas.py:251 superset/reports/schemas.py:258
+msgid "Value must be greater than 0"
+msgstr "Vrednost mora biti večja od 0"
+
+#: superset/reports/commands/alert.py:96
+#, python-format
+msgid "Alert query returned more then one row. %s rows returned"
+msgstr ""
+"Opozorilna poizvedba je vrnila več kot eno vrstico. Število vrnjenih vrstic: "
+"%s"
+
+#: superset/reports/commands/alert.py:105
+#, python-format
+msgid "Alert query returned more then one column. %s columns returned"
+msgstr ""
+"Opozorilna poizvedba je vrnila več kot en stolpec. Število vrnjenih "
+"stolpcev: %s"
+
+#: superset/reports/commands/exceptions.py:44
+msgid "Dashboard does not exist"
+msgstr "Nadzorna plošča ne obstaja"
+
+#: superset/reports/commands/exceptions.py:53
+msgid "Chart does not exist"
+msgstr "Grafikon ne obstaja"
+
+#: superset/reports/commands/exceptions.py:62
+msgid "Database is required for alerts"
+msgstr "Podatkovna baza je obvezna za opozorila"
+
+#: superset/reports/commands/exceptions.py:71
+msgid "Type is required"
+msgstr "Tip je obvezen"
+
+#: superset/reports/commands/exceptions.py:80
+msgid "Choose a chart or dashboard not both"
+msgstr "Izberite grafikon ali nadzorno ploščo, ne obojega"
+
+#: superset/reports/commands/exceptions.py:84
+msgid "Report Schedule parameters are invalid."
+msgstr "Parametri urnika poročanja so neveljavni."
+
+#: superset/reports/commands/exceptions.py:88
+msgid "Report Schedule could not be deleted."
+msgstr "Urnika poročanja ni mogoče izbrisati."
+
+#: superset/reports/commands/exceptions.py:92
+msgid "Report Schedule could not be created."
+msgstr "Urnika poročanja ni mogoče ustvariti."
+
+#: superset/reports/commands/exceptions.py:96
+msgid "Report Schedule could not be updated."
+msgstr "Urnika poročanja ni mogoče posodobiti."
+
+#: superset/reports/commands/exceptions.py:100
+msgid "Report Schedule not found."
+msgstr "Urnika poročanja ni najden."
+
+#: superset/reports/commands/exceptions.py:104
+msgid "Report Schedule delete failed."
+msgstr "Izbris urnika poročanja ni uspel."
+
+#: superset/reports/commands/exceptions.py:108
+msgid "Report Schedule log prune failed."
+msgstr "Krajšanje dnevnika urnika poročanja ni uspelo."
+
+#: superset/reports/commands/exceptions.py:112
+msgid "Report Schedule execution failed when generating a screenshot."
+msgstr ""
+"Izvajanje urnika poročanja je bilo neuspešno pri ustvarjanju zaslonske slike."
+
+#: superset/reports/commands/exceptions.py:116
+msgid "Report Schedule execution failed when generating a csv."
+msgstr "Izvajanje urnika poročanja je bilo neuspešno pri ustvarjanju csv."
+
+#: superset/reports/commands/exceptions.py:120
+msgid "Report Schedule execution got an unexpected error."
+msgstr "Pri izvajanju urnika poročanja je prišlo do nepričakovane napake."
+
+#: superset/reports/commands/exceptions.py:124
+msgid "Report Schedule is still working, refusing to re-compute."
+msgstr "Urnik poročanja se še vedno izvaja, ponovni izračun je zavrnjen."
+
+#: superset/reports/commands/exceptions.py:128
+msgid "Report Schedule reached a working timeout."
+msgstr "Urnik poročanja je dosegel mejo časa izvedbe."
+
+#: superset/reports/commands/exceptions.py:142
+msgid "Alert query returned more then one row."
+msgstr "Opozorilna poizvedba je vrnila več kot eno vrstico."
+
+#: superset/reports/commands/exceptions.py:147
+msgid "Alert validator config error."
+msgstr "Napaka nastavitev potrjevalnika opozoril."
+
+#: superset/reports/commands/exceptions.py:151
+msgid "Alert query returned more then one column."
+msgstr "Opozorilna poizvedba je vrnila več kot en stolpec."
+
+#: superset/reports/commands/exceptions.py:155
+msgid "Alert query returned a non-number value."
+msgstr "Opozorilna poizvedba je vrnila neštevilsko vrednost."
+
+#: superset/reports/commands/exceptions.py:159
+msgid "Alert found an error while executing a query."
+msgstr "Opozorilo je našlo napako pri izvajanju poizvedbe."
+
+#: superset/reports/commands/exceptions.py:163
+msgid "A timeout occurred while executing the query."
+msgstr "Pri izvajanju poizvedbe je potekel čas."
+
+#: superset/reports/commands/exceptions.py:167
+msgid "A timeout occurred while taking a screenshot."
+msgstr "Pri ustvarjanju zaslonske slike je potekel čas."
+
+#: superset/reports/commands/exceptions.py:171
+msgid "A timeout occurred while generating a csv."
+msgstr "Pri ustvarjanju csv je potekel čas."
+
+#: superset/reports/commands/exceptions.py:175
+msgid "Alert fired during grace period."
+msgstr "Opozorilo sproženo med obdobjem mirovanja."
+
+#: superset/reports/commands/exceptions.py:179
+msgid "Alert ended grace period."
+msgstr "Opozorilo je končalo obdobje mirovanja."
+
+#: superset/reports/commands/exceptions.py:183
+msgid "Alert on grace period"
+msgstr "Opozorilo v obdobju mirovanja"
+
+#: superset/reports/commands/exceptions.py:187
+msgid "Report Schedule sellenium user not found"
+msgstr "Selenium uporabnik za urnik poročanja ni najden"
+
+#: superset/reports/commands/exceptions.py:191
+msgid "Report Schedule state not found"
+msgstr "Stanje urnika poročanj ni najdeno"
+
+#: superset/reports/commands/exceptions.py:195
+msgid "Report schedule unexpected error"
+msgstr "Nepričakovana napaka urnika poročanja"
+
+#: superset/reports/commands/exceptions.py:199
+msgid "Changing this report is forbidden"
+msgstr "Spreminjanje tega poročila ni dovoljeno"
+
+#: superset/reports/commands/exceptions.py:203
+msgid "An error occurred while pruning logs "
+msgstr "Pri krajšanju dnevnikov je prišlo do napake "
+
+#: superset/reports/notifications/email.py:55
+#, python-format
+msgid ""
+"\n"
+"            Error: %(text)s\n"
+"            "
+msgstr ""
+"\n"
+"            Napaka: %(text)s\n"
+"            "
+
+#: superset/reports/notifications/email.py:79
+#, python-format
+msgid ""
+"\n"
+"            <p>%(description)s</p>\n"
+"            <b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>\n"
+"            %(img_tag)s\n"
+"            "
+msgstr ""
+"\n"
+"            <p>%(description)s</p>\n"
+"            <b><a href=\"%(url)s\">Razišči v Supersetu</a></b><p></p>\n"
+"            %(img_tag)s\n"
+"            "
+
+#: superset/reports/notifications/email.py:86 superset/tasks/schedules.py:362
+#, python-format
+msgid "%(name)s.csv"
+msgstr "%(name)s.csv"
+
+#: superset/reports/notifications/email.py:90 superset/tasks/schedules.py:294
+#: superset/tasks/schedules.py:463
+#, python-format
+msgid "%(prefix)s %(title)s"
+msgstr "%(prefix)s %(title)s"
+
+#: superset/reports/notifications/slack.py:48
+#, python-format
+msgid ""
+"\n"
+"            *%(name)s*\n"
+"\n"
+"            %(description)s\n"
+"\n"
+"            Error: %(text)s\n"
+"            "
+msgstr ""
+"\n"
+"            *%(name)s*\n"
+"\n"
+"            %(description)s\n"
+"\n"
+"            Napaka: %(text)s\n"
+"            "
+
+#: superset/reports/notifications/slack.py:64
+#, python-format
+msgid ""
+"\n"
+"            *%(name)s*\n"
+"\n"
+"            %(description)s\n"
+"\n"
+"            <%(url)s|Explore in Superset>\n"
+"            "
+msgstr ""
+"\n"
+"            *%(name)s*\n"
+"\n"
+"            %(description)s\n"
+"\n"
+"            <%(url)s|Razišči v Supersetu>\n"
+"            "
+
+#: superset/security/analytics_db_safety.py:44
+#, python-format
+msgid "%(dialect)s cannot be used as a data source for security reasons."
+msgstr ""
+"%(dialect)s ni mogoče uporabiti kot podatkovni vir zaradi varnostnih "
+"razlogov."
+
+#: superset/tasks/schedules.py:160
+#, python-format
+msgid ""
+"\n"
+"        *%(name)s*\n"
+"\n"
+"        <%(url)s|Explore in Superset>\n"
+"        "
+msgstr ""
+"\n"
+"        *%(name)s*\n"
+"\n"
+"        <%(url)s|Razišči v Supersetu>\n"
+"        "
+
+#: superset/tasks/schedules.py:172 superset/tasks/schedules.py:363
+#, python-format
+msgid "<b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>"
+msgstr "<b><a href=\"%(url)s\">Razišči v Supersetu</a></b><p></p>"
+
+#: superset/tasks/schedules.py:185
+#, python-format
+msgid ""
+"\n"
+"            <b><a href=\"%(url)s\">Explore in Superset</a></b><p></p>\n"
+"            <img src=\"cid:%(msgid)s\">\n"
+"            "
+msgstr ""
+"\n"
+"            <b><a href=\"%(url)s\">Razišči v Supersetu</a></b><p></p>\n"
+"            <img src=\"cid:%(msgid)s\">\n"
+"            "
+
+#: superset/tasks/schedules.py:370
+#, python-format
+msgid ""
+"\n"
+"        *%(slice_name)s*\n"
+"\n"
+"        <%(slice_url_user_friendly)s|Explore in Superset>\n"
+"        "
+msgstr ""
+"\n"
+"        *%(slice_name)s*\n"
+"\n"
+"        <%(slice_url_user_friendly)s|Razišči v Supersetu>\n"
+"        "
+
+#: superset/tasks/schedules.py:656
+#, python-format
+msgid "[Alert] %(label)s"
+msgstr "[Alert] %(label)s"
+
+#: superset/templates/appbuilder/navbar_right.html:35
+msgid "New"
+msgstr "Nov"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1127
+#: superset/templates/appbuilder/navbar_right.html:38
+msgid "SQL Query"
+msgstr "SQL poizvedba"
+
+#: superset-frontend/src/components/Menu/MenuRight.tsx:34
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:408
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1275
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:232
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:560
+#: superset-frontend/src/views/CRUD/welcome/ChartTable.tsx:174
+#: superset/templates/appbuilder/navbar_right.html:39
+#: superset/views/chart/mixin.py:85 superset/views/chart/views.py:117
+#: superset/views/schedules.py:318
+msgid "Chart"
+msgstr "Grafikon"
+
+#: superset-frontend/src/components/Menu/MenuRight.tsx:39
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1274
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:507
+#: superset/templates/appbuilder/navbar_right.html:40
+#: superset/views/dashboard/mixin.py:78 superset/views/dashboard/views.py:145
+#: superset/views/schedules.py:238
+msgid "Dashboard"
+msgstr "Nadzorna plošča"
+
+#: superset-frontend/src/components/Menu/MenuRight.tsx:133
+#: superset/templates/appbuilder/navbar_right.html:109
+msgid "Profile"
+msgstr "Profil"
+
+#: superset-frontend/src/components/Menu/MenuRight.tsx:137
+#: superset/templates/appbuilder/navbar_right.html:110
+msgid "Info"
+msgstr "Informacije"
+
+#: superset-frontend/src/components/Menu/MenuRight.tsx:140
+#: superset/templates/appbuilder/navbar_right.html:111
+msgid "Logout"
+msgstr "Odjava"
+
+#: superset-frontend/src/components/Menu/MenuRight.tsx:193
+#: superset/templates/appbuilder/navbar_right.html:126
+msgid "Login"
+msgstr "Prijava"
+
+#: superset/templates/appbuilder/general/widgets/base_list.html:55
+msgid "Record Count"
+msgstr "Število zapisov"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/TableChart.tsx:416
+#: superset/templates/appbuilder/general/widgets/base_list.html:64
+msgid "No records found"
+msgstr "Ni zapisov"
+
+#: superset/templates/appbuilder/general/widgets/search.html:24
+msgid "Filter List"
+msgstr "Seznam filtrov"
+
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:257
+#: superset-frontend/src/explore/components/DataTableControl/index.tsx:76
+#: superset-frontend/src/explore/components/controls/VizTypeControl/index.jsx:224
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:404
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:310
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:496
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:295
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:442
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:411
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:461
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:453
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/TableChart.tsx:108
+#: superset/templates/appbuilder/general/widgets/search.html:40
+msgid "Search"
+msgstr "Iskanje"
+
+#: superset/templates/appbuilder/general/widgets/search.html:57
+msgid "Refresh"
+msgstr "Osveži"
+
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:521
+#: superset/templates/superset/import_dashboards.html:21
+msgid "Import dashboards"
+msgstr "Uvozi nadzorne plošče"
+
+#: superset/templates/superset/import_dashboards.html:26
+msgid "Import Dashboard(s)"
+msgstr "Uvozi nadzorne plošče"
+
+#: superset-frontend/src/components/ImportModal/index.tsx:277
+#: superset/templates/superset/import_dashboards.html:37
+msgid "File"
+msgstr "Datoteka"
+
+#: superset/templates/superset/import_dashboards.html:47
+msgid "Choose File"
+msgstr "Izberite datoteko"
+
+#: superset/templates/superset/import_dashboards.html:63
+msgid "Upload"
+msgstr "Naloži"
+
+#: superset/templates/superset/request_access.html:20
+msgid "No Access!"
+msgstr "Ni dostopa!"
+
+#: superset/templates/superset/request_access.html:25
+#, python-format
+msgid "You do not have permissions to access the datasource(s): %(name)s."
+msgstr "Nimate dovoljenj za dostop do podatkovnih virov: %(name)s."
+
+#: superset/templates/superset/request_access.html:31
+msgid "Request Permissions"
+msgstr "Zahtevaj dovoljenja"
+
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:172
+#: superset-frontend/src/components/Modal/Modal.tsx:146
+#: superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingModal.tsx:80
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:458
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:151
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.tsx:142
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx:76
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/Footer.tsx:83
+#: superset-frontend/src/datasource/DatasourceModal.tsx:208
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:173
+#: superset-frontend/src/explore/components/SaveModal.tsx:180
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:797
+#: superset/templates/superset/request_access.html:34
+msgid "Cancel"
+msgstr "Prekliči"
+
+#: superset/templates/superset/fab_overrides/list_with_checkboxes.html:82
+msgid "Use the edit buttom to change this field"
+msgstr "Za spreminjanje tega polja uporabite gumb za urejanje"
+
+#: superset/templates/superset/models/database/macros.html:22
+msgid "Test Connection"
+msgstr "Preizkusi povezavo"
+
+#: superset/utils/core.py:881
+#, python-format
+msgid "[Superset] Access to the datasource %(name)s was granted"
+msgstr "[Superset] dostop do podatkovnega vira %(name)s je odobren"
+
+#: superset/utils/date_parser.py:386
+#, python-format
+msgid "Unable to find such a holiday: [%(holiday)s]"
+msgstr "Ni mogoče najti takšnega praznika: [%(holiday)s]"
+
+#: superset/utils/pandas_postprocessing.py:138
+msgid "Referenced columns not available in DataFrame."
+msgstr "Referencirani stolpci niso razpoložljivi v Dataframe-u."
+
+#: superset/utils/pandas_postprocessing.py:163
+#, python-format
+msgid "Column referenced by aggregate is undefined: %(column)s"
+msgstr "Stolpec referenciran z agregacijo ni definiran: %(column)s"
+
+#: superset/utils/pandas_postprocessing.py:170
+#, python-format
+msgid "Operator undefined for aggregator: %(name)s"
+msgstr "Operand ni definiran za agregatorja: %(name)s"
+
+#: superset/utils/pandas_postprocessing.py:179
+#, python-format
+msgid "Invalid numpy function: %(operator)s"
+msgstr "Neveljavna numpy funkcija: %(operator)s"
+
+#: superset/utils/pandas_postprocessing.py:249
+msgid "Pivot operation requires at least one index"
+msgstr "Vrtilna operacija zahteva vsaj en indeks"
+
+#: superset/utils/pandas_postprocessing.py:253
+msgid "Pivot operation must include at least one aggregate"
+msgstr "Vrtilna operacija mora vsebovati vsaj en agregat"
+
+#: superset/utils/pandas_postprocessing.py:361
+msgid "Undefined window for rolling operation"
+msgstr "Nedefinirano okno za drsečo operacijo"
+
+#: superset/utils/pandas_postprocessing.py:376
+#, python-format
+msgid "Invalid rolling_type: %(type)s"
+msgstr "Neveljaven rolling_type: %(type)s"
+
+#: superset/utils/pandas_postprocessing.py:382
+#, python-format
+msgid "Invalid options for %(rolling_type)s: %(options)s"
+msgstr "Neveljavne možnosti za %(rolling_type)s: %(options)s"
+
+#: superset/utils/pandas_postprocessing.py:467
+#, python-format
+msgid "Invalid cumulative operator: %(operator)s"
+msgstr "Neveljaven kumulativni operand: %(operator)s"
+
+#: superset/utils/pandas_postprocessing.py:493
+msgid "Invalid geohash string"
+msgstr "Neveljaven niz za geohash"
+
+#: superset/utils/pandas_postprocessing.py:516
+msgid "Invalid longitude/latitude"
+msgstr "Neveljavna zemljepisna dolžina/širina"
+
+#: superset/utils/pandas_postprocessing.py:558
+msgid "Invalid geodetic string"
+msgstr "Neveljaven geodetski niz"
+
+#: superset/utils/pandas_postprocessing.py:591
+#, python-format
+msgid ""
+"Column \"%(column)s\" is not numeric or does not exists in the query results."
+msgstr ""
+"Stolpec \"%(column)s\" ni numeričen ali ne obstaja v rezultatu poizvedbe."
+
+#: superset/utils/pandas_postprocessing.py:601
+msgid "`rename_columns` must have the same length as `columns`."
+msgstr "`rename_columns` morajo imeti enako dolžino kot `columns`."
+
+#: superset/utils/pandas_postprocessing.py:644
+msgid "`prophet` package not installed"
+msgstr "Knjižnica `prophet` ni nameščena"
+
+#: superset/utils/pandas_postprocessing.py:695
+msgid "Time grain missing"
+msgstr "Časovna granulacija manjka"
+
+#: superset/utils/pandas_postprocessing.py:698
+#, python-format
+msgid "Unsupported time grain: %(time_grain)s"
+msgstr "Nepodprta časovna granulacija: %(time_grain)s"
+
+#: superset/utils/pandas_postprocessing.py:704
+msgid "Periods must be a positive integer value"
+msgstr "Periode morajo biti pozitivno celo število"
+
+#: superset/utils/pandas_postprocessing.py:707
+msgid "Confidence interval must be between 0 and 1 (exclusive)"
+msgstr "Interval zaupanja mora biti med 0 in 1 (odprt)"
+
+#: superset/utils/pandas_postprocessing.py:710
+msgid "DataFrame must include temporal column"
+msgstr "DataFrame mora vsebovati časovni stolpec"
+
+#: superset/utils/pandas_postprocessing.py:712
+msgid "DataFrame include at least one series"
+msgstr "DataFrame vsebuje vsaj eno serijo"
+
+#: superset/utils/pandas_postprocessing.py:801
+msgid ""
+"percentiles must be a list or tuple with two numeric values, of which the "
+"first is lower than the second value"
+msgstr ""
+"percentili morajo biti tipa list ali tuple z vsaj dvema numeričnima "
+"vrednostma, pri čemer je prva manjša od druge"
+
+#: superset-frontend/src/components/Menu/MenuRight.tsx:130
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:284
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:374
+#: superset/views/access_requests.py:43 superset/views/log/__init__.py:30
+#: superset/views/schedules.py:241 superset/views/schedules.py:321
+#: superset/views/sql_lab.py:71
+msgid "User"
+msgstr "Uporabnik"
+
+#: superset/views/access_requests.py:44
+msgid "User Roles"
+msgstr "Vloge uporabnikov"
+
+#: superset/views/access_requests.py:45
+msgid "Database URL"
+msgstr "URL podatkovne baze"
+
+#: superset/views/access_requests.py:47
+msgid "Roles to grant"
+msgstr "Vloge za dovoljevanje"
+
+#: superset/views/access_requests.py:48 superset/views/schedules.py:239
+#: superset/views/schedules.py:319
+msgid "Created On"
+msgstr "Ustvarjeno"
+
+#: superset/views/alerts.py:75
+msgid "List Observations"
+msgstr "Naštej opažanja"
+
+#: superset/views/alerts.py:76
+msgid "Show Observation"
+msgstr "Prikaži opažanja"
+
+#: superset/views/alerts.py:83
+msgid "Error Message"
+msgstr "Sporočilo napake"
+
+#: superset/views/alerts.py:182
+msgid "Log Retentions (days)"
+msgstr "Ohranjanje dnevnika (dnevi)"
+
+#: superset/views/alerts.py:191
+msgid "A semicolon ';' delimited list of email addresses"
+msgstr "S podpičjem ';' ločen seznam naslovov e-pošte"
+
+#: superset/views/alerts.py:192
+msgid "How long to keep the logs around for this alert"
+msgstr "Kako dolgo ohraniti dnevnike za to opozorilo"
+
+#: superset/views/alerts.py:193
+msgid ""
+"Once an alert is triggered, how long, in seconds, before Superset nags you "
+"again."
+msgstr ""
+"Kako dolgo naj traja (v sekundah), da vas Superset ponovno opomni, ko je "
+"opozorilo sproženo."
+
+#: superset/views/alerts.py:197
+msgid ""
+"A SQL statement that defines whether the alert should get triggered or not. "
+"The query is expected to return either NULL or a number value."
+msgstr ""
+"SQL izraz, ki definira ali naj se opozorilo sproži ali ne. Od poizvedbe se "
+"pričakuje, da vrne bodisi NULL bodisi številsko vrednost."
+
+#: superset/views/alerts.py:234 superset/views/schedules.py:255
+#: superset/views/schedules.py:336
+msgid ""
+"This feature is deprecated and will be removed on 2.0. Take a look at the "
+"replacement feature <a href='https://superset.apache.org/docs/installation/"
+"alerts-reports'>Alerts & Reports documentation</a>"
+msgstr ""
+"Ta funkcija je zastarela in bo odstranjena v verziji 2.0. Oglejte si "
+"zamenjavo <a href='https://superset.apache.org/docs/installation/alerts-"
+"reports'>Dokumentacija za Opozorila & Poročila</a>"
+
+#: superset/views/annotations.py:40
+msgid "annotation start time or end time is required."
+msgstr "začetni in končni čas oznake je obvezen."
+
+#: superset/views/annotations.py:47
+msgid "Annotation end time must be no earlier than start time."
+msgstr "Končni čas oznake ne sem biti pred začetnim."
+
+#: superset/views/annotations.py:60
+msgid "Annotations"
+msgstr "Oznake"
+
+#: superset/views/annotations.py:61
+msgid "Show Annotation"
+msgstr "Prikaži oznako"
+
+#: superset/views/annotations.py:62
+msgid "Add Annotation"
+msgstr "Dodaj oznako"
+
+#: superset/views/annotations.py:63
+msgid "Edit Annotation"
+msgstr "Uredi oznako"
+
+#: superset/views/annotations.py:78
+msgid "Layer"
+msgstr "Sloj"
+
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:145
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:165
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:169
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:875
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:883
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:159
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:149
+#: superset/views/annotations.py:79 superset/views/sql_lab.py:70
+msgid "Label"
+msgstr "Naziv"
+
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:161
+#: superset/views/annotations.py:81
+msgid "Start"
+msgstr "Začetek"
+
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:170
+#: superset/views/annotations.py:82
+msgid "End"
+msgstr "Konec"
+
+#: superset/views/annotations.py:83 superset/views/dashboard/mixin.py:89
+msgid "JSON Metadata"
+msgstr "JSON metapodatki"
+
+#: superset/views/annotations.py:120
+msgid "Show Annotation Layer"
+msgstr "Prikaži sloj z oznakami"
+
+#: superset/views/annotations.py:121
+msgid "Add Annotation Layer"
+msgstr "Dodaj sloj z oznakami"
+
+#: superset/views/annotations.py:122
+msgid "Edit Annotation Layer"
+msgstr "Uredi sloj z oznakami"
+
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:117
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:197
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:748
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:224
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:135
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:134
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:263
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:265
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:66
+#: superset/views/annotations.py:128 superset/views/chart/mixin.py:86
+msgid "Name"
+msgstr "Ime"
+
+#: superset/views/base.py:247
+msgid ""
+"Table [%{table}s] could not be found, please double check your database "
+"connection, schema, and table name, error: {}"
+msgstr ""
+"Tabela [%{table}s] ni najdena. Preverite povezavo, shemo in ime tabele v "
+"podatkovni bazi. Napaka: {}"
+
+#: superset/views/base.py:493
+msgid "json isn't valid"
+msgstr "json ni veljaven"
+
+#: superset/views/base.py:504
+msgid "Export to YAML"
+msgstr "Izvozi v YAML"
+
+#: superset/views/base.py:504
+msgid "Export to YAML?"
+msgstr "Izvozim v YAML?"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSetUnit.tsx:82
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:316
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:481
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:316
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:379
+#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:101
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:330
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:605
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:339
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:132
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:309
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:546
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:341
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:611
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:500
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:233
+#: superset/views/base.py:561
+msgid "Delete"
+msgstr "Izbriši"
+
+#: superset/views/base.py:561
+msgid "Delete all Really?"
+msgstr "Ali resnično vse izbrišem?"
+
+#: superset/views/base_api.py:107
+msgid "Is favorite"
+msgstr "Je priljubljen"
+
+#: superset/views/core.py:163
+msgid "The data source seems to have been deleted"
+msgstr "Zdi se, da je bil podatkovni vir izbrisan"
+
+#: superset/views/core.py:164
+msgid "The user seems to have been deleted"
+msgstr "Zdi se, da je bil uporabnik izbrisan"
+
+#: superset/views/core.py:279
+msgid "Access was requested"
+msgstr "Zahtevan je bil dostop"
+
+#: superset/views/core.py:333
+msgid "The access requests seem to have been deleted"
+msgstr "Zdi se, da je bila zahteva za dostop izbrisana"
+
+#: superset/views/core.py:345
+#, python-format
+msgid ""
+"%(user)s was granted the role %(role)s that gives access to the "
+"%(datasource)s"
+msgstr ""
+"Uporabniku %(user)s je bila dodeljena vloga %(role)s, ki omogoča dostop do "
+"%(datasource)s"
+
+#: superset/views/core.py:368
+#, python-format
+msgid "Role %(r)s was extended to provide the access to the datasource %(ds)s"
+msgstr ""
+"Vloga %(r)s je bila razširjena za zagotovitev dostopa do podatkovnega vira "
+"%(ds)s"
+
+#: superset/views/core.py:385
+msgid "You have no permission to approve this request"
+msgstr "Nimate dovoljenja za odobritev te zahteve"
+
+#: superset/views/core.py:593 superset/views/core.py:776
+#: superset/views/core.py:782 superset/views/core.py:943
+#: superset/views/core.py:961
+msgid "You don't have the rights to "
+msgstr "Nimate pravic za "
+
+#: superset/views/core.py:593
+msgid "download as csv"
+msgstr "prenos kot csv"
+
+#: superset/views/core.py:653
+#, python-format
+msgid ""
+"Cannot import dashboard: %(db_error)s.\n"
+"Make sure to create the database before importing the dashboard."
+msgstr ""
+"Nadzorne plošče ni mogoče uvoziti: %(db_error)s.\n"
+"Pred uvozom poskrbite za ustvarjenje podatkovne baze."
+
+#: superset/views/core.py:664
+msgid "An unknown error occurred. Please contact your Superset administrator"
+msgstr ""
+"Zgodila se je neznana napaka. Kontaktirajte svojega administratorja za "
+"Superset"
+
+#: superset/views/core.py:736
+msgid "[Missing Dataset]"
+msgstr "[Manjka podatkovni set]"
+
+#: superset/views/core.py:776 superset/views/core.py:944
+msgid "alter this "
+msgstr "spreminjanje tega "
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:142
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:646
+#: superset-frontend/src/views/CRUD/welcome/ChartTable.tsx:70
+#: superset/views/core.py:776 superset/views/core.py:782
+msgid "chart"
+msgstr "grafikona"
+
+#: superset/views/core.py:782 superset/views/core.py:962
+msgid "create a "
+msgstr "ustvarite "
+
+#: superset/views/core.py:832
+#, python-format
+msgid "Explore - %(table)s"
+msgstr "Razišči - %(table)s"
+
+#: superset-frontend/src/SqlLab/components/ExploreCtasResultsButton.jsx:100
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:172
+#: superset/views/core.py:834
+msgid "Explore"
+msgstr "Raziskovanje"
+
+#: superset/views/core.py:919
+msgid "Chart [{}] has been saved"
+msgstr "Grafikon [{}] je bil shranjen"
+
+#: superset/views/core.py:923
+msgid "Chart [{}] has been overwritten"
+msgstr "Grafikon [{}] je bil prepisan"
+
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:110
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:597
+#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:60
+#: superset/views/core.py:945 superset/views/core.py:963
+msgid "dashboard"
+msgstr "nadzorna plošča"
+
+#: superset/views/core.py:950
+msgid "Chart [{}] was added to dashboard [{}]"
+msgstr "Grafikon [{}] je bil dodan na nadzorno ploščo [{}]"
+
+#: superset/views/core.py:972
+msgid "Dashboard [{}] just got created and chart [{}] was added to it"
+msgstr ""
+"Nadzorna plošča [{}] je bila ravno ustvarjena in grafikon [{}] dodan nanjo"
+
+#: superset/views/core.py:1205
+msgid ""
+"This dashboard was changed recently. Please reload dashboard to get latest "
+"version."
+msgstr ""
+"Nadzorna plošča je bila pred kratkim spremenjena. Ponovno jo naložite, da "
+"dobite zadnjo verzijo."
+
+#: superset/views/core.py:1300
+#, python-format
+msgid "Could not load database driver: %(driver_name)s"
+msgstr "Gonilnika podatkovne baze ni mogoče naložiti: %(driver_name)s"
+
+#: superset/views/core.py:1309
+msgid ""
+"Invalid connection string, a valid string usually follows:\n"
+"'DRIVER://USER:PASSWORD@DB-HOST/DATABASE-NAME'"
+msgstr ""
+"Neveljaven niz povezave, veljaven niz običajno sledi:\n"
+"'DRIVER://USER:PASSWORD@DB-HOST/DATABASE-NAME'"
+
+#: superset/views/core.py:1672
+msgid ""
+"Malformed request. slice_id or table_name and db_name arguments are expected"
+msgstr ""
+"Deformirana zahteva. Pričakovani so argumenti slice_id ali table_name in "
+"db_name"
+
+#: superset/views/core.py:1682
+#, python-format
+msgid "Chart %(id)s not found"
+msgstr "Grafikon %(id)s ni najden"
+
+#: superset/views/core.py:1695
+#, python-format
+msgid "Table %(table)s wasn't found in the database %(db)s"
+msgstr "Tabela %(table)s ni bila najdena v podatkovni bazi %(db)s"
+
+#: superset/views/core.py:1931
+#, python-format
+msgid "Can't find User '%(name)s', please ask your admin to create one."
+msgstr ""
+"Uporabnika '%(name)s' ni mogoče najti. Prosite administratorja, da ga "
+"ustvari."
+
+#: superset/views/core.py:1943
+#, python-format
+msgid "Can't find DruidCluster with cluster_name = '%(name)s'"
+msgstr "Ni mogoče najti DruidCluster s cluster_name = '%(name)s'"
+
+#: superset/views/core.py:2186
+msgid "Data could not be deserialized. You may want to re-run the query."
+msgstr ""
+"Podatkov ni mogoče deserializirati. Poskusite ponovno pognati poizvedbo."
+
+#: superset/views/core.py:2293
+#, python-format
+msgid ""
+"%(validator)s was unable to check your query.\n"
+"Please recheck your query.\n"
+"Exception: %(ex)s"
+msgstr ""
+"%(validator)s ni mogel preveriti vaše poizvedbe.\n"
+"Ponovno preverite poizvedbo.\n"
+"Izjema: %(ex)s"
+
+#: superset/views/core.py:2349
+msgid ""
+"Failed to start remote query on a worker. Tell your administrator to verify "
+"the availability of the message queue."
+msgstr ""
+"Zagon daljinske poizvedbe na delavcu ni bil uspešen. Administratorja "
+"prosite, da preveri razpoložljivost zaporedja sporočil."
+
+#: superset/views/core.py:2516 superset/views/core.py:2518
+msgid "Query record was not created as expected."
+msgstr "Zapis poizvedbe ni bil ustvarjen, kot je bilo pričakovano."
+
+#: superset/views/core.py:2555
+#, python-format
+msgid "The parameter %(parameters)s in your query is undefined."
+msgid_plural ""
+"The following parameters in your query are undefined: %(parameters)s."
+msgstr[0] ""
+"V vaši poizvedbi ni definiranih naslednjih parametrov: %(parameters)s."
+msgstr[1] ""
+"V vaši poizvedbi ni definiranih naslednjih parametrov: %(parameters)s."
+msgstr[2] ""
+"V vaši poizvedbi ni definiranih naslednjih parametrov: %(parameters)s."
+msgstr[3] ""
+"V vaši poizvedbi ni definiranih naslednjih parametrov: %(parameters)s."
+
+#: superset/views/core.py:2840
+#, python-format
+msgid "%(user)s's profile"
+msgstr "Profil uporabnika: %(user)s"
+
+#: superset/views/css_templates.py:39
+msgid "Show CSS Template"
+msgstr "Prikaži CSS predlogo"
+
+#: superset/views/css_templates.py:40
+msgid "Add CSS Template"
+msgstr "Dodaj CSS predlogo"
+
+#: superset/views/css_templates.py:41
+msgid "Edit CSS Template"
+msgstr "Uredi CSS predlogo"
+
+#: superset/views/css_templates.py:46
+msgid "Template Name"
+msgstr "Ime predloge"
+
+#: superset/views/datasource.py:49
+msgid "Request missing data field."
+msgstr "Zahtevaj manjkajoča podatkovna polja."
+
+#: superset/views/datasource.py:85
+#, python-format
+msgid "Duplicate column name(s): %(columns)s"
+msgstr "Podvojena imena stolpcev: %(columns)s"
+
+#: superset/views/dynamic_plugins.py:47
+msgid "A human-friendly name"
+msgstr "Človeku prijazno ime"
+
+#: superset/views/dynamic_plugins.py:48
+msgid ""
+"Used internally to identify the plugin. Should be set to the package name "
+"from the pluginʼs package.json"
+msgstr ""
+"Uporablja se za interno identifikacijo vtičnika. Naj bo nastavljeno na ime "
+"paketa v vtičnikovem package.json"
+
+#: superset/views/dynamic_plugins.py:52
+msgid ""
+"A full URL pointing to the location of the built plugin (could be hosted on "
+"a CDN for example)"
+msgstr ""
+"Celoten URL, ki kaže na lokacijo zgrajenega vtičnika (lahko gostuje npr. na "
+"CDN)"
+
+#: superset/views/dynamic_plugins.py:58
+msgid "Custom Plugins"
+msgstr "Prilagojeni vtičniki"
+
+#: superset/views/dynamic_plugins.py:59
+msgid "Custom Plugin"
+msgstr "Prilagojeni vtičnik"
+
+#: superset/views/dynamic_plugins.py:60
+msgid "Add a Plugin"
+msgstr "Dodaj vtičnik"
+
+#: superset/views/dynamic_plugins.py:61
+msgid "Edit Plugin"
+msgstr "Uredi vtičnik"
+
+#: superset/views/schedules.py:198
+msgid "Schedule Email Reports for Dashboards"
+msgstr "Razporedi e-poštna poročila za nadzorne plošče"
+
+#: superset/views/schedules.py:200
+msgid "Manage Email Reports for Dashboards"
+msgstr "Upravljaj e-poštna poročila za nadzorne plošče"
+
+#: superset/views/schedules.py:240 superset/views/schedules.py:320
+msgid "Changed On"
+msgstr "Spremenjeno"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:281
+#: superset/views/schedules.py:242 superset/views/schedules.py:322
+msgid "Active"
+msgstr "Aktiven"
+
+#: superset/views/schedules.py:243 superset/views/schedules.py:323
+msgid "Crontab"
+msgstr "Crontab"
+
+#: superset/views/schedules.py:244 superset/views/schedules.py:324
+msgid "Recipients"
+msgstr "Prejemniki"
+
+#: superset/views/schedules.py:245 superset/views/schedules.py:325
+msgid "Slack Channel"
+msgstr "Slack Channel"
+
+#: superset/views/schedules.py:246 superset/views/schedules.py:326
+msgid "Deliver As Group"
+msgstr "Dostavi kot skupino"
+
+#: superset/views/schedules.py:247 superset/views/schedules.py:327
+msgid "Delivery Type"
+msgstr "Tip dostave"
+
+#: superset/views/schedules.py:276
+msgid "Schedule Email Reports for Charts"
+msgstr "Razporedi e-poštna poročila za grafikone"
+
+#: superset/views/schedules.py:278
+msgid "Manage Email Reports for Charts"
+msgstr "Upravljaj e-poštna poročila za grafikone"
+
+#: superset/views/schedules.py:328
+msgid "Email Format"
+msgstr "Oblika e-pošte"
+
+#: superset/views/sql_lab.py:41
+msgid "List Saved Query"
+msgstr "Seznam shranjenih poizvedb"
+
+#: superset/views/sql_lab.py:42
+msgid "Show Saved Query"
+msgstr "Prikaži shranjeno poizvedbo"
+
+#: superset/views/sql_lab.py:43
+msgid "Add Saved Query"
+msgstr "Dodaj shranjeno poizvedbo"
+
+#: superset/views/sql_lab.py:44
+msgid "Edit Saved Query"
+msgstr "Uredi shranjeno poizvedbo"
+
+#: superset/views/sql_lab.py:75
+msgid "End Time"
+msgstr "Končni čas"
+
+#: superset/views/sql_lab.py:76
+msgid "Pop Tab Link"
+msgstr "Prikaži povezavo zavihka"
+
+#: superset/views/sql_lab.py:77
+msgid "Changed on"
+msgstr "Spremenjen"
+
+#: superset/views/utils.py:227
+msgid "The dataset associated with this chart no longer exists"
+msgstr "Podatkovni set, povezan s tem grafikonom, ne obstaja več"
+
+#: superset/views/utils.py:506
+msgid "Could not determine datasource type"
+msgstr "Ni mogoče določiti tipa podatkovnega vira"
+
+#: superset/views/utils.py:522
+msgid "Could not find viz object"
+msgstr "Ni mogoče najti vizualizacijskega objekta"
+
+#: superset/views/chart/mixin.py:27
+msgid "Show Chart"
+msgstr "Prikaži grafikon"
+
+#: superset/views/chart/mixin.py:28
+msgid "Add Chart"
+msgstr "Dodaj grafikon"
+
+#: superset/views/chart/mixin.py:29
+msgid "Edit Chart"
+msgstr "Uredi grafikon"
+
+#: superset/views/chart/mixin.py:64
+msgid ""
+"These parameters are generated dynamically when clicking the save or "
+"overwrite button in the explore view. This JSON object is exposed here for "
+"reference and for power users who may want to alter specific parameters."
+msgstr ""
+"Ti parametri se ustvarijo dinamično s klikom gumba Shrani ali Prepiši v "
+"raziskovalnem pogledu. Ta JSON objekt je prikazan kot vzorec za napredne "
+"uporabnike, ki želijo spreminjati posamezne parametre."
+
+#: superset/views/chart/mixin.py:70
+msgid ""
+"Duration (in seconds) of the caching timeout for this chart. Note this "
+"defaults to the datasource/table timeout if undefined."
+msgstr ""
+"Časovna veljavnost (v sekundah) predpomnjenja za ta grafikon. Če ni "
+"definirana, je uporabljena vrednost za podatkovni vir/tabelo."
+
+#: superset/views/chart/mixin.py:82
+msgid "Last Modified"
+msgstr "Zadnja sprememba"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/controlPanel.ts:64
+#: superset/views/chart/mixin.py:84
+msgid "Parameters"
+msgstr "Parametri"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:159
+#: superset/views/chart/mixin.py:88
+msgid "Visualization Type"
+msgstr "Tip vizualizacije"
+
+#: superset/views/dashboard/mixin.py:26
+msgid "Show Dashboard"
+msgstr "Prikaži nadzorno ploščo"
+
+#: superset/views/dashboard/mixin.py:27
+msgid "Add Dashboard"
+msgstr "Dodaj nadzorno ploščo"
+
+#: superset/views/dashboard/mixin.py:28
+msgid "Edit Dashboard"
+msgstr "Uredi nadzorno ploščo"
+
+#: superset/views/dashboard/mixin.py:47
+msgid ""
+"This json object describes the positioning of the widgets in the dashboard. "
+"It is dynamically generated when adjusting the widgets size and positions by "
+"using drag & drop in the dashboard view"
+msgstr ""
+"Ta JSON objekt opisuje postavitev pripomočkov na nadzorni plošči. Ustvari se "
+"dinamično, ko prilagajamo velikost in postavitev pripomočkov z uporabo "
+"povleci&spusti v pogledu nadzorne plošče"
+
+#: superset/views/dashboard/mixin.py:53
+msgid ""
+"The CSS for individual dashboards can be altered here, or in the dashboard "
+"view where changes are immediately visible"
+msgstr ""
+"CSS za posamezne nadzorne plošče lahko spreminjamo tukaj ali pa v pogledu "
+"nadzorne plošče, kjer so spremembe vidne takoj"
+
+#: superset/views/dashboard/mixin.py:58
+msgid "To get a readable URL for your dashboard"
+msgstr "Za pridobitev berljivega URL-ja za nadzorno ploščo"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:542
+#: superset/views/dashboard/mixin.py:59
+msgid ""
+"This JSON object is generated dynamically when clicking the save or "
+"overwrite button in the dashboard view. It is exposed here for reference and "
+"for power users who may want to alter specific parameters."
+msgstr ""
+"Ta JSON objekt se ustvari dinamično s klikom gumba Shrani ali Prepiši v "
+"pogledu nadzorne plošče. Tukaj je prikazan kot vzorec za napredne "
+"uporabnike, ki želijo spreminjati posamezne parametre."
+
+#: superset/views/dashboard/mixin.py:65
+msgid "Owners is a list of users who can alter the dashboard."
+msgstr ""
+"\"Lastniki\" je seznam uporabnikov, ki lahko spreminjajo nadzorno ploščo."
+
+#: superset/views/dashboard/mixin.py:66
+msgid ""
+"Roles is a list which defines access to the dashboard. Granting a role "
+"access to a dashboard will bypass dataset level checks.If no roles defined "
+"then the dashboard is available to all roles."
+msgstr ""
+"\"Vloge\" je seznam, ki definira dostop do nadzorne plošče. Dodelitev vloge "
+"za dostop do nadzorne plošče bo obšlo preverjanje na nivoju podatkovnega "
+"seta. Če vloga ni definirana, bo nadzorna plošča dostopna vsem vlogam."
+
+#: superset/views/dashboard/mixin.py:71
+msgid ""
+"Determines whether or not this dashboard is visible in the list of all "
+"dashboards"
+msgstr "Določa ali je nadzorna plošča vidna na seznamu vseh nadzornih plošč"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:486
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:220
+#: superset/views/dashboard/mixin.py:79 superset/views/dashboard/views.py:146
+msgid "Title"
+msgstr "Naslov"
+
+#: superset/views/dashboard/mixin.py:80
+msgid "Slug"
+msgstr "Slug"
+
+#: superset-frontend/src/dashboard/components/PublishedStatus/index.jsx:104
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:243
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:436
+#: superset/views/dashboard/mixin.py:84
+msgid "Published"
+msgstr "Objavljeno"
+
+#: superset/views/dashboard/mixin.py:87
+msgid "Position JSON"
+msgstr "JSON za postavitev"
+
+#: superset-frontend/src/dashboard/components/CssEditor/index.jsx:82
+#: superset/views/dashboard/mixin.py:88
+msgid "CSS"
+msgstr "CSS"
+
+#: superset/views/dashboard/mixin.py:90
+msgid "Underlying Tables"
+msgstr "Temeljne tabele"
+
+#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:114
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:349
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:613
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:99
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:327
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:554
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:336
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:357
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:619
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:508
+#: superset/views/dashboard/views.py:66
+msgid "Export"
+msgstr "Izvoz"
+
+#: superset/views/dashboard/views.py:66
+msgid "Export dashboards?"
+msgstr "Izvozim nadzorne plošče?"
+
+#: superset/views/database/forms.py:88
+msgid "Name of table to be created from csv data."
+msgstr "Ime tabele, ki bo ustvarjena iz CSV podatkov."
+
+#: superset/views/database/forms.py:93
+msgid "CSV File"
+msgstr "CSV datoteka"
+
+#: superset/views/database/forms.py:94
+msgid "Select a CSV file to be uploaded to a database."
+msgstr "Izberite CSV datoteko, ki bo naložena v podatkovno bazo."
+
+#: superset/views/database/forms.py:103 superset/views/database/forms.py:292
+#, python-format
+msgid "Only the following file extensions are allowed: %(allowed_extensions)s"
+msgstr "Dovoljene so le naslednje končnice: %(allowed_extensions)s"
+
+#: superset/views/database/forms.py:119 superset/views/database/forms.py:316
+msgid "Specify a schema (if database flavor supports this)."
+msgstr "Podajte shemo (če vrsta podatkovne baze to podpira)"
+
+#: superset/views/database/forms.py:124
+msgid "Delimiter"
+msgstr "Ločilnik"
+
+#: superset/views/database/forms.py:125
+msgid "Delimiter used by CSV file (for whitespace use \\s+)."
+msgstr "Ločilnik, uporabljen v CSV datoteki (za presledek uporabi \\s+)."
+
+#: superset/views/database/forms.py:130 superset/views/database/forms.py:321
+msgid "Table Exists"
+msgstr "Tabela obstaja"
+
+#: superset/views/database/forms.py:131 superset/views/database/forms.py:322
+msgid ""
+"If table exists do one of the following: Fail (do nothing), Replace (drop "
+"and recreate table) or Append (insert data)."
+msgstr ""
+"Če tabela obstaja, naredite nekaj od sledečega: Prekini (ne naredi nič), "
+"Zamenjaj (zbriši in ponovno ustvari tabelo) ali Dodaj (vstavi podatke)."
+
+#: superset/views/database/forms.py:137 superset/views/database/forms.py:328
+msgid "Fail"
+msgstr "Prekini"
+
+#: superset/views/database/forms.py:138 superset/views/database/forms.py:329
+msgid "Replace"
+msgstr "Zamenjaj"
+
+#: superset/views/database/forms.py:139 superset/views/database/forms.py:330
+msgid "Append"
+msgstr "Dodaj"
+
+#: superset/views/database/forms.py:144 superset/views/database/forms.py:335
+msgid "Header Row"
+msgstr "Naslovna vrstica"
+
+#: superset/views/database/forms.py:145 superset/views/database/forms.py:336
+msgid ""
+"Row containing the headers to use as column names (0 is first line of data). "
+"Leave empty if there is no header row."
+msgstr ""
+"Vrstica z naslovi, ki se uporabi za imena stolpcev (0 je prva vrstica "
+"podatkov). Pustite prazno, če ni naslovne vrstice."
+
+#: superset/views/database/forms.py:154 superset/views/database/forms.py:345
+msgid "Index Column"
+msgstr "Indeksni stolpec"
+
+#: superset/views/database/forms.py:155 superset/views/database/forms.py:346
+msgid ""
+"Column to use as the row labels of the dataframe. Leave empty if no index "
+"column."
+msgstr ""
+"Stolpec, ki se uporabi za naslove vrstic v dataframe-u. Pustite prazno, če "
+"ni indeksnega stolpca."
+
+#: superset/views/database/forms.py:163 superset/views/database/forms.py:354
+msgid "Mangle Duplicate Columns"
+msgstr "Odstrani podvojene stolpce"
+
+#: superset/views/database/forms.py:164 superset/views/database/forms.py:355
+msgid "Specify duplicate columns as \"X.0, X.1\"."
+msgstr "Določite podvojene stolpce kot \"X.0, X.1\"."
+
+#: superset/views/database/forms.py:167
+msgid "Skip Initial Space"
+msgstr "Izpusti začetni presledek"
+
+#: superset/views/database/forms.py:167
+msgid "Skip spaces after delimiter."
+msgstr "Izpusti presledek za ločilnikom."
+
+#: superset/views/database/forms.py:170 superset/views/database/forms.py:358
+msgid "Skip Rows"
+msgstr "Izpusti vrstice"
+
+#: superset/views/database/forms.py:171 superset/views/database/forms.py:359
+msgid "Number of rows to skip at start of file."
+msgstr "Število vrstic, ki se izpustijo na začetku datoteke."
+
+#: superset/views/database/forms.py:176 superset/views/database/forms.py:364
+msgid "Rows to Read"
+msgstr "Vrstice za branje"
+
+#: superset/views/database/forms.py:177 superset/views/database/forms.py:365
+msgid "Number of rows of file to read."
+msgstr "Število vrstic v datoteki za branje."
+
+#: superset/views/database/forms.py:182
+msgid "Skip Blank Lines"
+msgstr "Izpusti prazne vrstice"
+
+#: superset/views/database/forms.py:183
+msgid "Skip blank lines rather than interpreting them as NaN values."
+msgstr ""
+"Raje izpusti prazne vrstice, kot pa da so prepoznane kot NaN vrednosti."
+
+#: superset/views/database/forms.py:186 superset/views/database/forms.py:370
+msgid "Parse Dates"
+msgstr "Prepoznaj datume"
+
+#: superset/views/database/forms.py:187 superset/views/database/forms.py:371
+msgid "A comma separated list of columns that should be parsed as dates."
+msgstr "Z vejico ločen seznam stolpcev, v katerih bodo prepoznani datumi."
+
+#: superset/views/database/forms.py:193
+msgid "Infer Datetime Format"
+msgstr "Prepoznaj obliko datuma/časa"
+
+#: superset/views/database/forms.py:194
+msgid "Use Pandas to interpret the datetime format automatically."
+msgstr "Uporabi Pandas za samodejno prepoznavo oblike datumov/časov."
+
+#: superset/views/database/forms.py:197 superset/views/database/forms.py:377
+msgid "Decimal Character"
+msgstr "Decimalno ločilo"
+
+#: superset/views/database/forms.py:199 superset/views/database/forms.py:379
+msgid "Character to interpret as decimal point."
+msgstr "Znak, ki bo prepoznan kot decimalno ločilo."
+
+#: superset/views/database/forms.py:204 superset/views/database/forms.py:384
+msgid "Dataframe Index"
+msgstr "Indeks dataframe-a"
+
+#: superset/views/database/forms.py:204 superset/views/database/forms.py:384
+msgid "Write dataframe index as a column."
+msgstr "Zapiši indeks dataframe-a kot stolpec."
+
+#: superset/views/database/forms.py:207 superset/views/database/forms.py:387
+msgid "Column Label(s)"
+msgstr "Naslovi stolpcev"
+
+#: superset/views/database/forms.py:208 superset/views/database/forms.py:388
+msgid ""
+"Column label for index column(s). If None is given and Dataframe Index is "
+"True, Index Names are used."
+msgstr ""
+"Naslovi stolpcev za indeksne stolpce. Če le-ti niso podani in indeksi "
+"Dataframe-a obstajajo, se uporabijo imena indeksov."
+
+#: superset/views/database/forms.py:216 superset/views/database/forms.py:396
+msgid "Null values"
+msgstr "Prazne (Null) vrednosti"
+
+#: superset/views/database/forms.py:218 superset/views/database/forms.py:398
+msgid ""
+"Json list of the values that should be treated as null. Examples: [\"\"], "
+"[\"None\", \"N/A\"], [\"nan\", \"null\"]. Warning: Hive database supports "
+"only single value. Use [\"\"] for empty string."
+msgstr ""
+"JSON seznam vrednosti, ki naj bodo obravnavane kot prazne (Null). Primeri: "
+"[\"\"], [\"None\", \"N/A\"], [\"nan\", \"null\"]. Opozorilo: Podatkovna baza "
+"Hive podpira le eno vrednost. Uporabite [\"\"] za prazen znakovni niz."
+
+#: superset/views/database/forms.py:277
+msgid "Name of table to be created from excel data."
+msgstr "Ime tabele, ki bo ustvarjena iz Excel-ovih podatkov."
+
+#: superset/views/database/forms.py:282
+msgid "Excel File"
+msgstr "Excel-ova datoteka"
+
+#: superset/views/database/forms.py:283
+msgid "Select a Excel file to be uploaded to a database."
+msgstr "Izberite Excel-ovo datoteko, ki bo naložena v podatkovno bazo."
+
+#: superset/views/database/forms.py:302
+msgid "Sheet Name"
+msgstr "Ime zvezka"
+
+#: superset/views/database/forms.py:303
+msgid "Strings used for sheet names (default is the first sheet)."
+msgstr "Znakovni nizi uporabljeni za imena zvezkov (privzeto je prvi zvezek)."
+
+#: superset/views/database/mixins.py:34
+msgid "Show Database"
+msgstr "Prikaži podatkovno bazo"
+
+#: superset/views/database/mixins.py:35
+msgid "Add Database"
+msgstr "Dodaj podatkovno bazo"
+
+#: superset/views/database/mixins.py:36
+msgid "Edit Database"
+msgstr "Uredi podatkovno bazo"
+
+#: superset/views/database/mixins.py:104
+msgid "Expose this DB in SQL Lab"
+msgstr "Uporabi to podatkovno bazo v SQL laboratoriju"
+
+#: superset/views/database/mixins.py:105
+msgid ""
+"Operate the database in asynchronous mode, meaning  that the queries are "
+"executed on remote workers as opposed to on the web server itself. This "
+"assumes that you have a Celery worker setup as well as a results backend. "
+"Refer to the installation docs for more information."
+msgstr ""
+"Upravljanje podatkovne baze v asinhronem načinu pomeni, da se poizvedbe "
+"zaženejo na oddaljenih »delavcih« in ne na samem spletnem strežniku. S tem "
+"je predpostavljeno, da imate nastavljenega »delavca« za Celery in zaledni "
+"sistem za rezultate. Več informacij je v navodilih za namestitev."
+
+#: superset/views/database/mixins.py:113
+msgid "Allow CREATE TABLE AS option in SQL Lab"
+msgstr "Dovoli opcijo CREATE TABLE AS v SQL laboratoriju"
+
+#: superset/views/database/mixins.py:114
+msgid "Allow CREATE VIEW AS option in SQL Lab"
+msgstr "Dovoli opcijo CREATE VIEW AS v SQL laboratoriju"
+
+#: superset/views/database/mixins.py:115
+msgid ""
+"Allow users to run non-SELECT statements (UPDATE, DELETE, CREATE, ...) in "
+"SQL Lab"
+msgstr ""
+"Dovoli uporabnikom poganjanje ne-SELECT stavkov (UPDATE, DELETE, "
+"CREATE, ...) v SQL laboratoriju"
+
+#: superset/views/database/mixins.py:120
+msgid ""
+"When allowing CREATE TABLE AS option in SQL Lab, this option forces the "
+"table to be created in this schema"
+msgstr ""
+"Z dovolitvijo opcije CREATE TABLE AS v SQL laboratoriju se tabele ustvarjajo "
+"s to shemo"
+
+#: superset/views/database/mixins.py:163
+msgid ""
+"If Presto, all the queries in SQL Lab are going to be executed as the "
+"currently logged on user who must have permission to run them.<br/>If Hive "
+"and hive.server2.enable.doAs is enabled, will run the queries as service "
+"account, but impersonate the currently logged on user via hive.server2.proxy."
+"user property."
+msgstr ""
+"V primeru Presto se vse poizvedbe v SQL laboratoriju zaženejo pod trenutno "
+"prijavljenim uporabnikom, ki mora imeti pravice za poganjanje.<br/>Če je "
+"omogočen Hive in hive.server2.enable.doAs, poizvedbe tečejo pod servisnim "
+"računom, vendar je trenutno prijavljen uporabnik predstavljen z lastnostjo "
+"hive.server2.proxy.user."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:161
+#: superset/views/database/mixins.py:170
+msgid ""
+"Allow SQL Lab to fetch a list of all tables and all views across all "
+"database schemas. For large data warehouse with thousands of tables, this "
+"can be expensive and put strain on the system."
+msgstr ""
+"Dovoli SQL laboratoriju, da pridobi seznam vseh tabel in pogledov iz vseh "
+"shem podatkovne baze. Pri velikih podatkovnih skladiščih s tisoči tabel je "
+"to lahko potratno in obremeni sistem."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:195
+#: superset/views/database/mixins.py:175
+msgid ""
+"Duration (in seconds) of the caching timeout for charts of this database. A "
+"timeout of 0 indicates that the cache never expires. Note this defaults to "
+"the global timeout if undefined."
+msgstr ""
+"Trajanje (v sekundah) predpomnjenja za grafikon v tej podatkovni bazi. "
+"Vrednost 0 označuje, da predpomnilnik nikoli ne poteče. V primeru, da ni "
+"definirano, ima globalno nastavitev."
+
+#: superset/views/database/mixins.py:180
+msgid "If selected, please set the schemas allowed for csv upload in Extra."
+msgstr "Če je izbrano, nastavite dovoljene sheme za nalaganje CSV v Dodatno."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:275
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:381
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:75
+#: superset/views/database/mixins.py:186
+msgid "Expose in SQL Lab"
+msgstr "Uporabi v SQL laboratoriju"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:94
+#: superset/views/database/mixins.py:187
+msgid "Allow CREATE TABLE AS"
+msgstr "Dovoli CREATE TABLE AS"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:108
+#: superset/views/database/mixins.py:188
+msgid "Allow CREATE VIEW AS"
+msgstr "Dovoli CREATE VIEW AS"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:142
+#: superset/views/database/mixins.py:189
+msgid "Allow DML"
+msgstr "Dovoli DML"
+
+#: superset/views/database/mixins.py:190
+msgid "CTAS Schema"
+msgstr "CTAS shema"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/SqlAlchemyForm.tsx:59
+#: superset/views/database/mixins.py:194
+msgid "SQLAlchemy URI"
+msgstr "SQLAlchemy URI"
+
+#: superset/views/database/mixins.py:195
+msgid "Chart Cache Timeout"
+msgstr "Trajanje predpomnilnika grafikona"
+
+#: superset/views/database/mixins.py:197
+msgid "Secure Extra"
+msgstr "Dodatna varnost"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:261
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:266
+#: superset/views/database/mixins.py:198
+msgid "Root certificate"
+msgstr "Korenski certifikat"
+
+#: superset/views/database/mixins.py:199
+msgid "Async Execution"
+msgstr "Asinhrono izvajanje"
+
+#: superset/views/database/mixins.py:200
+msgid "Impersonate the logged on user"
+msgstr "Predstavljaj se kot prijavljeni uporabnik"
+
+#: superset/views/database/mixins.py:201
+msgid "Allow Csv Upload"
+msgstr "Dovoli nalaganje CSV"
+
+#: superset/views/database/mixins.py:203
+msgid "Allow Multi Schema Metadata Fetch"
+msgstr "Dovoli pridobivanje metapodatkov z več shemami"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:222
+#: superset/views/database/mixins.py:204
+msgid "Backend"
+msgstr "Vrsta"
+
+#: superset/views/database/mixins.py:244 superset/views/database/mixins.py:268
+#, python-format
+msgid "Extra field cannot be decoded by JSON. %(msg)s"
+msgstr "Dodatnega polja ni mogoče dekodirati z JSON. %(msg)s"
+
+#: superset/views/database/validators.py:40
+msgid ""
+"Invalid connection string, a valid string usually follows:'DRIVER://USER:"
+"PASSWORD@DB-HOST/DATABASE-NAME'<p>Example:'postgresql://user:password@your-"
+"postgres-db/database'</p>"
+msgstr ""
+"Neveljaven niz povezave. Veljaven niz običajno sledi zapisu:'DRIVER://USER:"
+"PASSWORD@DB-HOST/DATABASE-NAME'<p>Primer:'postgresql://user:password@your-"
+"postgres-db/database'</p>"
+
+#: superset/views/database/views.py:115
+msgid "CSV to Database configuration"
+msgstr "Nastavitve pretvorbe CSV v podatkovno bazo"
+
+#: superset/views/database/views.py:133
+#, python-format
+msgid ""
+"Database \"%(database_name)s\" schema \"%(schema_name)s\" is not allowed for "
+"csv uploads. Please contact your Superset Admin."
+msgstr ""
+"Shema \"%(schema_name)s\" podatkovne baze \"%(database_name)s\" ni dovoljena "
+"za nalaganje CSV. Kontaktirajte administratorja za Superset."
+
+#: superset/views/database/views.py:143
+msgid ""
+"You cannot specify a namespace both in the name of the table: \"%(csv_table."
+"table)s\" and in the schema field: \"%(csv_table.schema)s\". Please remove "
+"one"
+msgstr ""
+"Imenskega prostora ni mogoče podati hkrati v tabeli: \"%(csv_table.table)s\" "
+"in polju sheme: \"%(csv_table.schema)s\". Odstranite enega"
+
+#: superset/views/database/views.py:236
+#, python-format
+msgid ""
+"Unable to upload CSV file \"%(filename)s\" to table \"%(table_name)s\" in "
+"database \"%(db_name)s\". Error message: %(error_msg)s"
+msgstr ""
+"CSV datoteke \"%(filename)s\" ni mogoče naložiti v tabelo \"%(table_name)s\" "
+"v podatkovni bazi \"%(db_name)s\". Sporočilo napake: %(error_msg)s"
+
+#: superset/views/database/views.py:248
+#, python-format
+msgid ""
+"CSV file \"%(csv_filename)s\" uploaded to table \"%(table_name)s\" in "
+"database \"%(db_name)s\""
+msgstr ""
+"CSV datoteka \"%(csv_filename)s\" naložena v tabelo \"%(table_name)s\" v "
+"podatkovni bazi \"%(db_name)s\""
+
+#: superset/views/database/views.py:259
+msgid "Excel to Database configuration"
+msgstr "Nastavitve pretvorbe Excel v Podatkovno bazo"
+
+#: superset/views/database/views.py:274
+#, python-format
+msgid ""
+"Database \"%(database_name)s\" schema \"%(schema_name)s\" is not allowed for "
+"excel uploads. Please contact your Superset Admin."
+msgstr ""
+"Shema \"%(schema_name)s\" podatkovne baze \"%(database_name)s\" ni dovoljena "
+"za nalaganje Excel datotek. Kontaktirajte administratorja za Superset."
+
+#: superset/views/database/views.py:284
+msgid ""
+"You cannot specify a namespace both in the name of the table: "
+"\"%(excel_table.table)s\" and in the schema field: \"%(excel_table.schema)s"
+"\". Please remove one"
+msgstr ""
+"Imenskega prostora ni mogoče podati hkrati v tabeli: \"%(excel_table.table)s"
+"\" in polju sheme: \"%(excel_table.schema)s\". Odstranite enega"
+
+#: superset/views/database/views.py:377
+#, python-format
+msgid ""
+"Unable to upload Excel file \"%(filename)s\" to table \"%(table_name)s\" in "
+"database \"%(db_name)s\". Error message: %(error_msg)s"
+msgstr ""
+"Excel datoteke \"%(filename)s\" ni mogoče naložiti v tabelo \"%(table_name)s"
+"\" v podatkovni bazi \"%(db_name)s\". Sporočilo napake: %(error_msg)s"
+
+#: superset/views/database/views.py:389
+#, python-format
+msgid ""
+"Excel file \"%(excel_filename)s\" uploaded to table \"%(table_name)s\" in "
+"database \"%(db_name)s\""
+msgstr ""
+"Excel datoteka \"%(excel_filename)s\" naložena v tabelo \"%(table_name)s\" v "
+"podatkovni bazi \"%(db_name)s\""
+
+#: superset/views/log/__init__.py:21
+msgid "Logs"
+msgstr "Dnevniki"
+
+#: superset/views/log/__init__.py:22
+msgid "Show Log"
+msgstr "Prikaži dnevnik"
+
+#: superset/views/log/__init__.py:23
+msgid "Add Log"
+msgstr "Dodaj dnevnik"
+
+#: superset/views/log/__init__.py:24
+msgid "Edit Log"
+msgstr "Uredi dnevnik"
+
+#: superset/views/log/__init__.py:31
+msgid "Action"
+msgstr "Aktivnost"
+
+#: superset/views/log/__init__.py:32
+msgid "dttm"
+msgstr "dttm"
+
+#: superset-frontend/src/CRUD/CollectionTable.tsx:324
+msgid "Add item"
+msgstr "Dodaj"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:106
+msgid "The query couldn't be loaded"
+msgstr "Poizvedbe ni mogoče naložiti"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:163
+msgid ""
+"Your query has been scheduled. To see details of your query, navigate to "
+"Saved queries"
+msgstr ""
+"Vaša poizvedba je v urniku. Za ogled podrobnosti poizvedbe pojdite na "
+"shranjene poizvedbe"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:170
+msgid "Your query could not be scheduled"
+msgstr "Vaše poizvedbe ni mogoče uvrstiti v urnik"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:198
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:305
+msgid "Failed at retrieving results"
+msgstr "Napaka pri pridobivanju rezultatov"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:236
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:262
+msgid ""
+"An error occurred while storing the latest query id in the backend. Please "
+"contact your administrator if this problem persists."
+msgstr ""
+"Pri shranjevanju zadnjega id-ja poizvedbe v sistem je prišlo do napake. Če "
+"se težava ponavlja, kontaktirajte administratorja."
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:349
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:390
+msgid "Unknown error"
+msgstr "Neznana napaka"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:408
+msgid "Query was stopped."
+msgstr "Poizvedba je bila ustavljena."
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:437
+msgid ""
+"Unable to migrate table schema state to backend. Superset will retry later. "
+"Please contact your administrator if this problem persists."
+msgstr ""
+"Stanja sheme tabele ni mogoče prenesti v sistem. Superset bo ponovil poskus "
+"kasneje. Če se težava ponavlja, kontaktirajte administratorja."
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:455
+msgid ""
+"Unable to migrate query state to backend. Superset will retry later. Please "
+"contact your administrator if this problem persists."
+msgstr ""
+"Stanja poizvedbe ni mogoče prenesti v sistem. Superset bo ponovil poskus "
+"kasneje. Če se težava ponavlja, kontaktirajte administratorja."
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:501
+msgid ""
+"Unable to migrate query editor state to backend. Superset will retry later. "
+"Please contact your administrator if this problem persists."
+msgstr ""
+"Stanja urejevalnika poizvedb ni mogoče prenesti v sistem. Superset bo "
+"ponovil poskus kasneje. Če se težava ponavlja, kontaktirajte administratorja."
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:534
+msgid ""
+"Unable to add a new tab to the backend. Please contact your administrator."
+msgstr ""
+"Novega zavihka ni mogoče dodati v sistem. Kontaktirajte administratorja."
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:551
+#: superset-frontend/src/SqlLab/reducers/sqlLab.js:74
+#, python-format
+msgid "Copy of %s"
+msgstr "Kopija %s"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:578
+msgid ""
+"An error occurred while setting the active tab. Please contact your "
+"administrator."
+msgstr ""
+"Pri določanju aktivnega zavihka je prišlo do napake. Kontaktirajte "
+"administratorja."
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:665
+msgid "An error occurred while fetching tab state"
+msgstr "Pri pridobivanju stanja zavihka je prišlo do napake"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:701
+msgid ""
+"An error occurred while hiding the left bar. Please contact your "
+"administrator."
+msgstr ""
+"Pri skrivanju leve vrstice je prišlo do napake. Kontaktirajte "
+"administratorja."
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:723
+msgid ""
+"An error occurred while removing tab. Please contact your administrator."
+msgstr ""
+"Pri odstranjevanju zavihka je prišlo do napake. Kontaktirajte "
+"administratorja."
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:747
+msgid ""
+"An error occurred while removing query. Please contact your administrator."
+msgstr ""
+"Pri odstranjevanju poizvedbe je prišlo do napake. Kontaktirajte "
+"administratorja."
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:770
+msgid ""
+"An error occurred while setting the tab database ID. Please contact your "
+"administrator."
+msgstr ""
+"Pri določanju ID-ja v podatkovne baze za zavihek je prišlo do napake. "
+"Kontaktirajte administratorja."
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:795
+msgid ""
+"An error occurred while setting the tab schema. Please contact your "
+"administrator."
+msgstr ""
+"Pri določanju sheme zavihka je prišlo do napake. Kontaktirajte "
+"administratorja."
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:828
+msgid ""
+"An error occurred while setting the tab autorun. Please contact your "
+"administrator."
+msgstr ""
+"Pri določanju samodejnega zagona zavihka je prišlo do napake. Kontaktirajte "
+"administratorja."
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:853
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:945
+msgid ""
+"An error occurred while setting the tab title. Please contact your "
+"administrator."
+msgstr ""
+"Pri določanju naslova zavihka je prišlo do napake. Kontaktirajte "
+"administratorja."
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:875
+msgid "Your query was saved"
+msgstr "Vaša poizvedba je shranjena"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:879
+msgid "Your query could not be saved"
+msgstr "Vaše poizvedbe ni mogoče shraniti"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:891
+msgid "Your query was updated"
+msgstr "Vaša poizvedba je posodobljena"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:895
+msgid "Your query could not be updated"
+msgstr "Vaše poizvedbe ni mogoče posodobiti"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:914
+msgid ""
+"An error occurred while storing your query in the backend. To avoid losing "
+"your changes, please save your query using the \"Save Query\" button."
+msgstr ""
+"Pri shranjevanju vaše poizvedbe v sistem je prišlo do napake. Da ne izgubite "
+"sprememb, shranite poizvedbo z gumbom \"Shrani poizvedbo\"."
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:974
+msgid ""
+"An error occurred while setting the tab template parameters. Please contact "
+"your administrator."
+msgstr ""
+"Pri določanju parametrov predloge zavihka je prišlo do napake. Kontaktirajte "
+"administratorja."
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1036
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1061
+msgid "An error occurred while fetching table metadata"
+msgstr "Pri pridobivanju metapodatkov tabele je prišlo do napake"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1102
+msgid ""
+"An error occurred while fetching table metadata. Please contact your "
+"administrator."
+msgstr ""
+"Pri pridobivanju metapodatkov tabele je prišlo do napake. Kontaktirajte "
+"administratorja."
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1150
+msgid ""
+"An error occurred while expanding the table schema. Please contact your "
+"administrator."
+msgstr ""
+"Pri širitvi sheme tabele je prišlo do napake. Kontaktirajte administratorja."
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1174
+msgid ""
+"An error occurred while collapsing the table schema. Please contact your "
+"administrator."
+msgstr ""
+"Pri krčenju sheme tabele je prišlo do napake. Kontaktirajte administratorja."
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1197
+msgid ""
+"An error occurred while removing the table schema. Please contact your "
+"administrator."
+msgstr ""
+"Pri odstranjevanju sheme tabele je prišlo do napake. Kontaktirajte "
+"administratorja."
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1230
+msgid "Shared query"
+msgstr "Deljene poizvedbe"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1292
+msgid "The datasource couldn't be loaded"
+msgstr "Podatkovnega vira ni mogoče naložiti"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1322
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1344
+msgid "An error occurred while creating the data source"
+msgstr "Pri ustvarjanju podatkovnega vira je prišlo do težave"
+
+#: superset-frontend/src/SqlLab/actions/sqlLab.js:1365
+msgid "An error occurred while fetching function names."
+msgstr "Pri pridobivanju imen funkcij je prišlo do napake."
+
+#: superset-frontend/src/SqlLab/components/App.jsx:76
+msgid ""
+"SQL Lab uses your browser's local storage to store queries and results.\n"
+" Currently, you are using ${currentUsage.toFixed(\r\n"
+"            2,\r\n"
+"          )} KB out of ${LOCALSTORAGE_MAX_USAGE_KB} KB. storage space.\n"
+" To keep SQL Lab from crashing, please delete some query tabs.\n"
+" You can re-access these queries by using the Save feature before you delete "
+"the tab. Note that you will need to close other SQL Lab windows before you "
+"do this."
+msgstr ""
+"SQL laboratorij za shranjevanje poizvedb in rezultatov uporablja "
+"brskalnikovo lokalno shrambo.\n"
+"Trenutno uporabljate ${currentUsage.toFixed(\r\n"
+"            2,\r\n"
+"          )} KB od ${LOCALSTORAGE_MAX_USAGE_KB} KB prostora shrambe.\n"
+"Da se izognete sesutju SQL laboratorija, izbrišite nekaj zavihkov s "
+"poizvedbami.\n"
+"Te poizvedbe lahko ponovno uporabite, tako da jih pred izbrisom shranite. "
+"Preden storite to, boste morali zapreti druga okna SQL laboratorija."
+
+#: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:87
+msgid "Estimate selected query cost"
+msgstr "Oceni potratnost izbrane poizvedbe"
+
+#: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:88
+msgid "Estimate cost"
+msgstr "Oceni potratnost"
+
+#: superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx:92
+msgid "Cost estimate"
+msgstr "Ocena potratnosti"
+
+#: superset-frontend/src/SqlLab/components/ExploreCtasResultsButton.jsx:73
+msgid "Creating a data source and creating a new tab"
+msgstr "Ustvarjanje podatkovnega vira in novega zavihka"
+
+#: superset-frontend/src/SqlLab/components/ExploreCtasResultsButton.jsx:82
+#: superset-frontend/src/components/TableLoader/index.tsx:48
+#: superset-frontend/src/utils/getClientErrorObject.ts:148
+msgid "An error occurred"
+msgstr "Prišlo je do napake"
+
+#: superset-frontend/src/SqlLab/components/ExploreCtasResultsButton.jsx:93
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:165
+msgid "Explore the result set in the data exploration view"
+msgstr "Raziščite rezultate v pogledu raziskovanja podatkov"
+
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:113
+#, python-format
+msgid "This query took %s seconds to run, "
+msgstr "Trajanje poizvedbe v sekundah: %s, "
+
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:115
+#, python-format
+msgid "and the explore view times out at %s seconds "
+msgstr "čas izteka raziskovalnega pogleda v sekundah: %s "
+
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:119
+msgid "following this flow will most likely lead to your query timing out. "
+msgstr "s takšnim potekom, bo poizvedba najverjetneje potekla. "
+
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:122
+msgid ""
+"We recommend your summarize your data further before following that flow. "
+msgstr "Priporočamo, da zahtevane podatke pred nadaljevanjem strnete. "
+
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:125
+msgid "If activated you can use the "
+msgstr "Če je aktivirana, lahko uporabite "
+
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:127
+msgid "feature to store a summarized data set that you can then explore."
+msgstr ""
+"funkcijo shranjevanja strnjenega podatkovnega seta, ki ga lahko raziščete."
+
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:143
+msgid "Column name(s) "
+msgstr "Imena stolpcev "
+
+#: superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx:147
+msgid ""
+"cannot be used as a column name. The column name/alias \"__timestamp\"\r\n"
+"          is reserved for the main temporal expression, and column aliases "
+"ending with\r\n"
+"          double underscores followed by a numeric value (e.g. "
+"\"my_col__1\") are reserved\r\n"
+"          for deduplicating duplicate column names. Please use aliases to "
+"rename the\r\n"
+"          invalid column names."
+msgstr ""
+"ni mogoče uporabiti kot imena stolpcev. Ime stolpca \"__timestamp\"\r\n"
+"          je rezervirano za glavni časovni izraz. Imena stolpcev, ki se "
+"končajo z\r\n"
+"          dvojnim podčrtajem, ki mu sledi številska vrednost (npr. "
+"\"moj_stolpec__1\" so rezervirana\r\n"
+"          za deduplikacijo duplikatov imen stolpcev. Za preimenovanje "
+"neustreznih imen\r\n"
+"          uporabite psevdonime."
+
+#: superset-frontend/src/SqlLab/components/HighlightedSql.tsx:77
+msgid "Source SQL"
+msgstr "Izvorni SQL"
+
+#: superset-frontend/src/SqlLab/components/HighlightedSql.tsx:83
+msgid "Raw SQL"
+msgstr "Surovi SQL"
+
+#: superset-frontend/src/SqlLab/components/HighlightedSql.tsx:102
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:751
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:303
+msgid "SQL"
+msgstr "SQL"
+
+#: superset-frontend/src/SqlLab/components/QueryHistory.tsx:50
+msgid "No query history yet..."
+msgstr "Zgodovine poizvedb še ni..."
+
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:132
+msgid "An error occurred when refreshing queries"
+msgstr "Pri osveževanju poizvedb je prišlo do napake"
+
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:181
+#: superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx:117
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:156
+msgid "It seems you don't have access to any database"
+msgstr "Zdi se, da nimate dostopa do nobene podatkovne baz"
+
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:196
+msgid "Filter by user"
+msgstr "Filtriraj po uporabniku"
+
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:205
+msgid "Filter by database"
+msgstr "Filtriraj po podatkovni bazi"
+
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:214
+msgid "Query search string"
+msgstr "Iskalni niz za poizvedbo"
+
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:220
+msgid "[From]-"
+msgstr "[Od]-"
+
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:232
+msgid "[To]-"
+msgstr "[Do]-"
+
+#: superset-frontend/src/SqlLab/components/QuerySearch.tsx:241
+msgid "Filter by status"
+msgstr "Filtriraj po statusu"
+
+#: superset-frontend/src/SqlLab/components/QueryTable.jsx:134
+#: superset-frontend/src/dashboard/components/menu/MarkdownModeDropdown.tsx:35
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSetUnit.tsx:75
+#: superset-frontend/src/explore/components/controls/TextAreaControl.jsx:132
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:307
+#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:126
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:365
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:86
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:343
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:352
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:373
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:214
+msgid "Edit"
+msgstr "Urejanje"
+
+#: superset-frontend/src/SqlLab/components/QueryTable.jsx:153
+#: superset-frontend/src/explore/components/DataTablesPane/index.tsx:303
+msgid "View results"
+msgstr "Ogled rezultatov"
+
+#: superset-frontend/src/SqlLab/components/QueryTable.jsx:156
+msgid "Data preview"
+msgstr "Ogled podatkov"
+
+#: superset-frontend/src/SqlLab/components/QueryTable.jsx:203
+msgid "Overwrite text in the editor with a query on this table"
+msgstr "Besedilo v urejevalniku prepišite s poizvedbo na to tabelo"
+
+#: superset-frontend/src/SqlLab/components/QueryTable.jsx:211
+msgid "Run query in a new tab"
+msgstr "Zaženi poizvedbo v novem zavihku"
+
+#: superset-frontend/src/SqlLab/components/QueryTable.jsx:216
+msgid "Remove query from log"
+msgstr "Odstrani poizvedbo iz dnevnika"
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:304
+msgid "An error occurred saving dataset"
+msgstr "Pri shranjevanju podatkovnega seta je prišlo do napake"
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:502
+msgid "Download to CSV"
+msgstr "Izvozi kot CSV"
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:511
+msgid "Copy to Clipboard"
+msgstr "Kopiraj na odložišče"
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:522
+msgid "Filter results"
+msgstr "Filtriraj rezultate"
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:542
+#, python-format
+msgid ""
+"The number of results displayed is limited to %(rows)d by the configuration "
+"DISPLAY_MAX_ROWS. "
+msgstr ""
+"Število prikazanih rezultatov je omejeno na %(rows)d preko parametra "
+"DISPLAY_MAX_ROWS. "
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:546
+msgid ""
+"Please add additional limits/filters or download to csv to see more rows up "
+"to "
+msgstr ""
+"Dodajte omejitve/filtre ali izvozite csv, če želite videti več vrstic do "
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:549
+#, python-format
+msgid "the %(limit)d limit."
+msgstr "omejitve %(limit)d ."
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:551
+#, python-format
+msgid "The number of results displayed is limited to %(rows)d. "
+msgstr "Število prikazanih rezultatov je omejeno na %(rows)d. "
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:555
+msgid ""
+"Please add additional limits/filters, download to csv, or contact an admin "
+msgstr ""
+"Dodajte omejitve/filtre ali izvozite csv oz. kontaktirajte administratorja "
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:558
+#, python-format
+msgid "to see more rows up to the %(limit)d limit."
+msgstr "za prikaz več vrstic, kot je omejitev %(limit)d ."
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:570
+#, python-format
+msgid "The number of rows displayed is limited to %(rows)d by the query"
+msgstr "Število prikazanih vrstic je omejeno na %(rows)d s poizvedbo"
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:582
+#, python-format
+msgid ""
+"The number of rows displayed is limited to %(rows)d by the limit dropdown."
+msgstr "Število prikazanih rezultatov je omejeno na %(rows)d s poizvedbo."
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:591
+#, python-format
+msgid ""
+"The number of rows displayed is limited to %(rows)d by the query and limit "
+"dropdown."
+msgstr ""
+"Število prikazanih vrstic je omejeno na %(rows)d s poizvedbo in spustnim "
+"izbirnikom omejitev."
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:602
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:609
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:623
+#, python-format
+msgid "%(rows)d rows returned"
+msgstr "%(rows)d vrnjenih vrstic"
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:611
+#, python-format
+msgid "The number of rows displayed is limited to %s by the dropdown."
+msgstr "Število prikazanih vrstic je omejeno na %s s spustnim izbirnikom."
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:649
+msgid "Query was stopped"
+msgstr "Poizvedba je bila ustavljena"
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:655
+msgid "Database error"
+msgstr "Napaka podatkovne baze"
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:682
+msgid "was created"
+msgstr "ustvarjeno"
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:689
+msgid "Query in a new tab"
+msgstr "Poizvedba v novem zavihku"
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:739
+msgid "The query returned no data"
+msgstr "Poizvedba ni vrnila podatkov"
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:756
+msgid "Fetch data preview"
+msgstr "Pridobi predogled podatkov"
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:767
+msgid "Refetch results"
+msgstr "Ponovno pridobi rezultate"
+
+#: superset-frontend/src/SqlLab/components/ResultSet.tsx:788
+msgid "Track job"
+msgstr "Sledi opravilom"
+
+#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:49
+#: superset-frontend/src/explore/components/QueryAndSaveBtns.jsx:66
+msgid "Stop"
+msgstr "Ustavi"
+
+#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:54
+msgid "Run selection"
+msgstr "Zaženi izbrano"
+
+#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:56
+#: superset-frontend/src/explore/components/QueryAndSaveBtns.jsx:76
+msgid "Run"
+msgstr "Zaženi"
+
+#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:111
+msgid "Stop running (Ctrl + x)"
+msgstr "Ustavi (Ctrl + x)"
+
+#: superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx:112
+msgid "Run query (Ctrl + Return)"
+msgstr "Zaženi poizvedbo (Ctrl + Return)"
+
+#: superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx:109
+msgid "Save & Explore"
+msgstr "Shrani & Razišči"
+
+#: superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx:121
+msgid "Overwrite & Explore"
+msgstr "Prepiši & Razišči"
+
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:69
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:110
+msgid "Undefined"
+msgstr "Ni definirano"
+
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:159
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:165
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:180
+#: superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingModal.tsx:88
+#: superset-frontend/src/dashboard/components/Header/index.jsx:476
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:442
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:148
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:226
+#: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:564
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.tsx:162
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/Footer.tsx:91
+#: superset-frontend/src/datasource/DatasourceModal.tsx:217
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:186
+#: superset-frontend/src/explore/components/QueryAndSaveBtns.jsx:112
+#: superset-frontend/src/explore/components/SaveModal.tsx:203
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx:254
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:460
+#: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx:345
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1023
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:289
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:241
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:232
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx:370
+msgid "Save"
+msgstr "Shrani"
+
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:159
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:165
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:242
+msgid "Save as"
+msgstr "Shrani kot"
+
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:168
+msgid "Save query"
+msgstr "Shrani poizvedbo"
+
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:180
+msgid "Save as new"
+msgstr "Shrani kot novo"
+
+#: superset-frontend/src/SqlLab/components/SaveQuery.tsx:189
+msgid "Update"
+msgstr "Posodobi"
+
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:148
+msgid "Label for your query"
+msgstr "Ime vaše poizvedbe"
+
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:162
+msgid "Write a description for your query"
+msgstr "Dodajte opis vaše poizvedbe"
+
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:207
+msgid "Schedule query"
+msgstr "Urnik poizvedb"
+
+#: superset-frontend/src/SqlLab/components/ScheduleQueryButton.tsx:217
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:228
+msgid "Schedule"
+msgstr "Urnik"
+
+#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.tsx:58
+msgid "There was an error with your request"
+msgstr "Pri zahtevi je prišlo do napake"
+
+#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.tsx:72
+msgid "Please save the query to enable sharing"
+msgstr "Shranite poizvedbo za deljenje"
+
+#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.tsx:85
+msgid "Copy query link to your clipboard"
+msgstr "Kopiraj povezavo do poizvedbe v odložišče"
+
+#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.tsx:86
+msgid "Save the query to enable this feature"
+msgstr "Za omogočenje te funkcije shranite poizvedbo"
+
+#: superset-frontend/src/SqlLab/components/ShareSqlLabQuery.tsx:97
+msgid "Copy link"
+msgstr "Kopiraj povezavo"
+
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:295
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:305
+#: superset-frontend/src/chart/Chart.jsx:242
+msgid "Run query"
+msgstr "Zaženi poizvedbo"
+
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:315
+msgid "New tab"
+msgstr "Nov zavihek"
+
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:319
+#: superset-frontend/src/SqlLab/reducers/getInitialState.js:44
+msgid "Untitled query"
+msgstr "Neimenovana poizvedba"
+
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:327
+msgid "Stop query"
+msgstr "Ustavi poizvedbo"
+
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:510
+msgid "Schedule the query periodically"
+msgstr "Periodično zaganjaj poizvedbo"
+
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:511
+msgid "You must run the query successfully first"
+msgstr "Najprej morate uspešno izvesti poizvedbo"
+
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:516
+msgid "Autocomplete"
+msgstr "Samodokončaj"
+
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:595
+msgid "CREATE TABLE AS"
+msgstr "CREATE TABLE AS"
+
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:608
+msgid "CREATE VIEW AS"
+msgstr "CREATE VIEW AS"
+
+#: superset-frontend/src/SqlLab/components/SqlEditor.jsx:642
+msgid "Estimate the cost before running a query"
+msgstr "Oceni potratnost pred zagonom poizvedbe"
+
+#: superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx:205
+msgid "Reset state"
+msgstr "Ponastavi stanje"
+
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:251
+msgid "Enter a new title for the tab"
+msgstr "Vnesite novo naslov zavihka"
+
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:277
+#, python-format
+msgid "Untitled Query %s"
+msgstr "Neimenovana poizvedba %s"
+
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:352
+msgid "Close tab"
+msgstr "Zapri zavihek"
+
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:358
+msgid "Rename tab"
+msgstr "Preimenuj zavihek"
+
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:364
+msgid "Expand tool bar"
+msgstr "Razširi orodno vrstico"
+
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:364
+msgid "Hide tool bar"
+msgstr "Skrij orodno vrstico"
+
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:373
+msgid "Close all other tabs"
+msgstr "Zapri vse ostale zavihke"
+
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:379
+msgid "Duplicate tab"
+msgstr "Podvoji zavihek"
+
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:434
+msgid "New tab (Ctrl + q)"
+msgstr "Nov zavihek (Ctrl + q)"
+
+#: superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx:435
+msgid "New tab (Ctrl + t)"
+msgstr "Nov zavihek (Ctrl + t)"
+
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:103
+msgid "Copy partition query to clipboard"
+msgstr "Kopiraj particijsko poizvedbo na odložišče"
+
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:121
+msgid "latest partition:"
+msgstr "zadnja particija:"
+
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:139
+msgid "Keys for table"
+msgstr "Ključi za tabele"
+
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:148
+#, python-format
+msgid "View keys & indexes (%s)"
+msgstr "Ogled ključev in indeksov (%s)"
+
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:165
+msgid "Sort columns alphabetically"
+msgstr "Razvrsti stolpce po abecedi"
+
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:166
+msgid "Original table column order"
+msgstr "Vrstni red stolpcev izvorne tabele"
+
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:178
+msgid "Copy SELECT statement to the clipboard"
+msgstr "Kopiraj stavek SELECT na odložišče"
+
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:184
+msgid "Show CREATE VIEW statement"
+msgstr "Prikaži CREATE VIEW stavek"
+
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:185
+msgid "CREATE VIEW statement"
+msgstr "CREATE VIEW stavek"
+
+#: superset-frontend/src/SqlLab/components/TableElement.jsx:191
+msgid "Remove table preview"
+msgstr "Odstrani predogled tabele"
+
+#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.tsx:99
+msgid "Edit template parameters"
+msgstr "Uredi parametre predloge"
+
+#: superset-frontend/src/SqlLab/components/TemplateParamsEditor.tsx:109
+msgid "Invalid JSON"
+msgstr "Neveljaven JSON"
+
+#: superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx:131
+msgid "No stored results found, you need to re-run your query"
+msgstr "Rezultatov še ni shranjenih, ponovno morate zagnati poizvedbo"
+
+#: superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx:155
+msgid "Run a query to display results here"
+msgstr "Za prikaz rezultatov morate zagnati poizvedbo"
+
+#: superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx:164
+#, python-format
+msgid "Preview: `%s`"
+msgstr "Predogled: `%s`"
+
+#: superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx:192
+msgid "Results"
+msgstr "Rezultati"
+
+#: superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx:195
+#: superset-frontend/src/views/CRUD/data/common.ts:44
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:102
+msgid "Query history"
+msgstr "Zgodovina poizvedb"
+
+#: superset-frontend/src/addSlice/AddSliceContainer.tsx:99
+msgid "Create a new chart"
+msgstr "Ustvari nov grafikon"
+
+#: superset-frontend/src/addSlice/AddSliceContainer.tsx:101
+#: superset-frontend/src/addSlice/AddSliceContainer.tsx:109
+msgid "Choose a dataset"
+msgstr "Izberite podatkovni set"
+
+#: superset-frontend/src/addSlice/AddSliceContainer.tsx:121
+msgid ""
+"If the dataset you are looking for is not available in the list, follow the "
+"instructions on how to add it in the Superset tutorial."
+msgstr ""
+"Če podatkovnega seta, ki ga iščete, ni na seznamu, sledite navodilom za "
+"dodajanje v navodilih za Superset."
+
+#: superset-frontend/src/addSlice/AddSliceContainer.tsx:135
+msgid "Choose a visualization type"
+msgstr "Izberite tip vizualizacije"
+
+#: superset-frontend/src/addSlice/AddSliceContainer.tsx:150
+msgid "Create new chart"
+msgstr "Ustvari nov grafikon"
+
+#: superset-frontend/src/chart/chartAction.js:564
+msgid "An error occurred while loading the SQL"
+msgstr "Pri nalaganju SQL je prišlo do napake"
+
+#: superset-frontend/src/chart/chartReducer.ts:81
+msgid "Updating chart was stopped"
+msgstr "Posodabljanje grafikona je bilo ustavljeno"
+
+#: superset-frontend/src/chart/chartReducer.ts:93
+#, python-format
+msgid "An error occurred while rendering the visualization: %s"
+msgstr "Pri prikazovanju vizualizacije je prišlo do napake: %s"
+
+#: superset-frontend/src/chart/chartReducer.ts:105
+#: superset-frontend/src/chart/chartReducer.ts:169
+msgid "Network error."
+msgstr "Napaka omrežja."
+
+#: superset-frontend/src/components/AlteredSliceTag/index.jsx:184
+msgid "Click to see difference"
+msgstr "Kliknite za prikaz razlike"
+
+#: superset-frontend/src/components/AlteredSliceTag/index.jsx:189
+msgid "Altered"
+msgstr "Spremenjeno"
+
+#: superset-frontend/src/components/AlteredSliceTag/index.jsx:210
+msgid "Chart changes"
+msgstr "Spremembe grafikona"
+
+#: superset-frontend/src/components/AnchorLink/index.jsx:88
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:290
+msgid "Superset chart"
+msgstr "Superset grafikon"
+
+#: superset-frontend/src/components/AnchorLink/index.jsx:89
+msgid "Check out this chart in dashboard:"
+msgstr "Preizkusite ta grafikon v nadzorni plošči:"
+
+#: superset-frontend/src/components/AsyncSelect/index.jsx:42
+#: superset-frontend/src/explore/components/controls/SelectAsyncControl/index.jsx:47
+msgid "Select ..."
+msgstr "Izberite ..."
+
+#: superset-frontend/src/components/CachedLabel/TooltipContent.tsx:30
+msgid "Loaded data cached"
+msgstr "Podatki so naloženi v predpomnilnik"
+
+#: superset-frontend/src/components/CachedLabel/TooltipContent.tsx:34
+msgid "Loaded from cache"
+msgstr "Naloženo iz predpomnilnika"
+
+#: superset-frontend/src/components/CachedLabel/TooltipContent.tsx:39
+msgid "Click to force-refresh"
+msgstr "Kliknite za prisilno osvežitev"
+
+#: superset-frontend/src/components/CachedLabel/index.tsx:51
+msgid "cached"
+msgstr "predpomnjen"
+
+#: superset-frontend/src/components/CertifiedIcon/index.tsx:42
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/components/CertifiedIconWithTooltip.tsx:45
+#, python-format
+msgid "Certified by %s"
+msgstr "Certificiral/a %s"
+
+#: superset-frontend/src/components/CopyToClipboard/index.jsx:43
+#: superset-frontend/src/components/URLShortLinkButton/index.jsx:65
+#: superset-frontend/src/explore/components/EmbedCodeButton.jsx:106
+msgid "Copy to clipboard"
+msgstr "Kopiraj na odložišče"
+
+#: superset-frontend/src/components/CopyToClipboard/index.jsx:76
+#: superset-frontend/src/dashboard/components/menu/ShareMenuItems/index.tsx:53
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:107
+msgid "Copied to clipboard!"
+msgstr "Kopirano na odložišče!"
+
+#: superset-frontend/src/components/CopyToClipboard/index.jsx:80
+msgid "Sorry, your browser does not support copying. Use Ctrl / Cmd + C!"
+msgstr "Vaš brskalnik ne podpira kopiranja. Uporabite Ctrl / Cmd + C!"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:27
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:35
+msgid "every"
+msgstr "vsak"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:28
+msgid "every month"
+msgstr "vsak mesec"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:29
+msgid "every day of the month"
+msgstr "vsak dan v mesecu"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:30
+msgid "day of the month"
+msgstr "dan v mesecu"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:31
+msgid "every day of the week"
+msgstr "vsak dan v tednu"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:32
+msgid "day of the week"
+msgstr "dan v tednu"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:33
+msgid "every hour"
+msgstr "vsako uro"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:34
+msgid "every minute UTC"
+msgstr "vsako minuto UTC"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:36
+msgid "year"
+msgstr "leto"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:37
+msgid "month"
+msgstr "mesec"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:38
+msgid "week"
+msgstr "teden"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:39
+msgid "day"
+msgstr "dan"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:40
+msgid "hour"
+msgstr "ura"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:41
+msgid "minute"
+msgstr "minuta"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:42
+msgid "reboot"
+msgstr "ponovni zagon"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:43
+msgid "Every"
+msgstr "Vsak"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:44
+msgid "in"
+msgstr "v"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:45
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:46
+msgid "on"
+msgstr "na"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:47
+msgid "and"
+msgstr "in"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:48
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:50
+msgid "at"
+msgstr "v"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:49
+msgid ":"
+msgstr ":"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:51
+msgid "minute(s) UTC"
+msgstr "minute UTC"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:52
+msgid "Invalid cron expression"
+msgstr "Neveljaven cron izraz"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:53
+msgid "Clear"
+msgstr "Počisti"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:57
+msgid "Sunday"
+msgstr "Nedelja"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:59
+msgid "Monday"
+msgstr "Ponedeljek"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:60
+msgid "Tuesday"
+msgstr "Torek"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:61
+msgid "Wednesday"
+msgstr "Sreda"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:62
+msgid "Thursday"
+msgstr "Četrtek"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:63
+msgid "Friday"
+msgstr "Petek"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:64
+msgid "Saturday"
+msgstr "Sobota"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:69
+msgid "January"
+msgstr "Januar"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:70
+msgid "February"
+msgstr "Februar"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:71
+msgid "March"
+msgstr "Marec"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:72
+msgid "April"
+msgstr "April"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:73
+msgid "May"
+msgstr "Maj"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:74
+msgid "June"
+msgstr "Junij"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:75
+msgid "July"
+msgstr "Julij"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:76
+msgid "August"
+msgstr "Avgust"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:77
+msgid "September"
+msgstr "September"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:78
+msgid "October"
+msgstr "Oktober"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:79
+msgid "November"
+msgstr "November"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:80
+msgid "December"
+msgstr "December"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:85
+msgid "SUN"
+msgstr "NED"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:87
+msgid "MON"
+msgstr "PON"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:88
+msgid "TUE"
+msgstr "TOR"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:89
+msgid "WED"
+msgstr "SRE"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:90
+msgid "THU"
+msgstr "ČET"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:91
+msgid "FRI"
+msgstr "PET"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:92
+msgid "SAT"
+msgstr "SOB"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:97
+msgid "JAN"
+msgstr "JAN"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:98
+msgid "FEB"
+msgstr "FEB"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:99
+msgid "MAR"
+msgstr "MAR"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:100
+msgid "APR"
+msgstr "APR"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:101
+msgid "MAY"
+msgstr "MAJ"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:102
+msgid "JUN"
+msgstr "JUN"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:103
+msgid "JUL"
+msgstr "JUL"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:104
+msgid "AUG"
+msgstr "AVG"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:105
+msgid "SEP"
+msgstr "SEP"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:106
+msgid "OCT"
+msgstr "OKT"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:107
+msgid "NOV"
+msgstr "NOV"
+
+#: superset-frontend/src/components/CronPicker/CronPicker.tsx:108
+msgid "DEC"
+msgstr "DEC"
+
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:131
+msgid "Error while fetching schema list"
+msgstr "Napaka pri pridobivanju seznama shem"
+
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:233
+msgid "Error while fetching database list"
+msgstr "Napaka pri pridobivanju seznama podatkovnih baz"
+
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:240
+msgid "Database:"
+msgstr "Podatkovna baza:"
+
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:246
+msgid "Select a database"
+msgstr "Izberite podatkovno bazo"
+
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:259
+msgid "Force refresh schema list"
+msgstr "Osveži seznam shem"
+
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:266
+#, python-format
+msgid "Select a schema (%s)"
+msgstr "Izberite shemo (%s)"
+
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:271
+msgid "Schema:"
+msgstr "Shema:"
+
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:285
+msgid "datasource"
+msgstr "podatkovni vir"
+
+#: superset-frontend/src/components/DatabaseSelector/index.tsx:287
+msgid "schema"
+msgstr "shema"
+
+#: superset-frontend/src/components/DeleteModal/index.tsx:61
+msgid "delete"
+msgstr "izbriši"
+
+#: superset-frontend/src/components/DeleteModal/index.tsx:69
+#: superset-frontend/src/components/ImportModal/index.tsx:240
+#, python-format
+msgid "Type \"%s\" to confirm"
+msgstr "Vnesite \"%s\" za potrditev"
+
+#: superset-frontend/src/components/DeleteModal/index.tsx:78
+msgid "DELETE"
+msgstr "IZBRIŠI"
+
+#: superset-frontend/src/components/EditableTitle/index.tsx:203
+msgid "Click to edit"
+msgstr "Kliknite za urejanje"
+
+#: superset-frontend/src/components/EditableTitle/index.tsx:205
+msgid "You don't have the rights to alter this title."
+msgstr "Nimate pravic za spreminjanje tega naslova."
+
+#: superset-frontend/src/components/ErrorBoundary/index.jsx:51
+#: superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.tsx:26
+msgid "Unexpected error"
+msgstr "Nepričakovana napaka"
+
+#: superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx:46
+#: superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx:63
+msgid "This may be triggered by:"
+msgstr "To je lahko sproženo z/s:"
+
+#: superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx:58
+#: superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx:73
+msgid "Please reach out to the Chart Owner for assistance."
+msgstr "Za pomoč se obrnite na lastnika grafikona."
+
+#: superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx:69
+#: superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx:84
+#, python-format
+msgid "Chart Owner: %s"
+msgstr "Lastnik grafikona: %s"
+
+#: superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx:83
+#, python-format
+msgid "%s Error"
+msgstr "%s napaka"
+
+#: superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx:123
+#: superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx:139
+msgid "See more"
+msgstr "Oglejte si več"
+
+#: superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx:152
+msgid "See less"
+msgstr "Oglejte si manj"
+
+#: superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx:181
+msgid "Copy message"
+msgstr "Kopiraj sporočilo"
+
+#: superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx:189
+#: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:556
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx:241
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:448
+#: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx:337
+msgid "Close"
+msgstr "Zapri"
+
+#: superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.tsx:60
+msgid "This was triggered by:"
+msgstr "To je bilo sproženo z/s:"
+
+#: superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.tsx:76
+msgid "Did you mean:"
+msgstr "Ste mislili:"
+
+#: superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.tsx:87
+#, python-format
+msgid "%(suggestion)s instead of \"%(undefinedParameter)s?\""
+msgstr "%(suggestion)s namesto \"%(undefinedParameter)s?\""
+
+#: superset-frontend/src/components/ErrorMessage/ParameterErrorMessage.tsx:114
+msgid "Parameter error"
+msgstr "Napaka parametra"
+
+#: superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx:47
+#, python-format
+msgid ""
+"We’re having trouble loading this visualization. Queries are set to timeout "
+"after %s second."
+msgstr ""
+"Težava pri nalaganju vizualizacije. Časovni iztek poizvedb je nastavljen na "
+"%s sekund."
+
+#: superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx:53
+#, python-format
+msgid ""
+"We’re having trouble loading these results. Queries are set to timeout after "
+"%s second."
+msgstr ""
+"Težava pri nalaganju rezultatov. Časovni iztek poizvedb je nastavljen na %s "
+"sekund."
+
+#: superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx:98
+msgid "Timeout error"
+msgstr "Napaka pretečenega časa"
+
+#: superset-frontend/src/components/FaveStar/index.tsx:77
+msgid "Click to favorite/unfavorite"
+msgstr "Kliknite za priljubljeno/nepriljubljeno"
+
+#: superset-frontend/src/components/FilterableTable/FilterableTable.tsx:328
+msgid "Cell content"
+msgstr "Vsebina celice"
+
+#: superset-frontend/src/components/ImportModal/index.tsx:183
+msgid "The import was successful"
+msgstr "Uvoz je uspel"
+
+#: superset-frontend/src/components/ImportModal/index.tsx:197
+msgid "OVERWRITE"
+msgstr "OVERWRITE"
+
+#: superset-frontend/src/components/ImportModal/index.tsx:268
+msgid "Overwrite"
+msgstr "Prepiši"
+
+#: superset-frontend/src/components/ImportModal/index.tsx:268
+msgid "Import"
+msgstr "Uvozi"
+
+#: superset-frontend/src/components/ImportModal/index.tsx:272
+#, python-format
+msgid "Import %s"
+msgstr "Uvozi %s"
+
+#: superset-frontend/src/components/LastUpdated/index.tsx:76
+#, python-format
+msgid "Last Updated %s"
+msgstr "Zadnja posodobitev %s"
+
+#: superset-frontend/src/components/ListView/CardSortSelect.tsx:103
+msgid "Sort:"
+msgstr "Razvrščanje:"
+
+#: superset-frontend/src/components/ListView/ListView.tsx:239
+#, python-format
+msgid "%s Selected"
+msgstr "Izbranih: %s"
+
+#: superset-frontend/src/components/ListView/ListView.tsx:345
+msgid "Deselect all"
+msgstr "Počisti izbor"
+
+#: superset-frontend/src/components/ListView/ListView.tsx:394
+msgid "No Data"
+msgstr "Ni podatkov"
+
+#: superset-frontend/src/components/ListView/ListView.tsx:415
+#: superset-frontend/src/components/TableView/TableView.tsx:183
+#, python-format
+msgid "%s-%s of %s"
+msgstr "%s-%s od %s"
+
+#: superset-frontend/src/components/Menu/MenuRight.tsx:29
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:112
+msgid "SQL query"
+msgstr "SQL poizvedba"
+
+#: superset-frontend/src/components/Menu/MenuRight.tsx:146
+msgid "About"
+msgstr "O programu"
+
+#: superset-frontend/src/components/Menu/MenuRight.tsx:174
+msgid "Documentation"
+msgstr "Dokumentacija"
+
+#: superset-frontend/src/components/Menu/MenuRight.tsx:185
+msgid "Report a bug"
+msgstr "Sporočite napako"
+
+#: superset-frontend/src/components/Modal/Modal.tsx:129
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:819
+msgid "OK"
+msgstr "OK"
+
+#: superset-frontend/src/components/OmniContainer/getDashboards.ts:50
+msgid "An error occurred while fetching dashboards"
+msgstr "Prišlo je do napake pri pridobivanju nadzornih plošč"
+
+#: superset-frontend/src/components/TableSelector/index.tsx:172
+msgid "Error while fetching table list"
+msgstr "Napaka pri pridobivanju seznama tabel"
+
+#: superset-frontend/src/components/TableSelector/index.tsx:321
+#: superset-frontend/src/components/TableSelector/index.tsx:339
+msgid "Select table or type table name"
+msgstr "Izberite ali vnesite ime tabele"
+
+#: superset-frontend/src/components/TableSelector/index.tsx:355
+msgid "Type to search ..."
+msgstr "Vnesite za iskanje ..."
+
+#: superset-frontend/src/components/TableSelector/index.tsx:357
+msgid "Select table "
+msgstr "Izberi tabelo "
+
+#: superset-frontend/src/components/TableSelector/index.tsx:378
+msgid "Force refresh table list"
+msgstr "Osveži seznam tabel"
+
+#: superset-frontend/src/components/TableSelector/index.tsx:388
+msgid "See table schema"
+msgstr "Ogled sheme tabele"
+
+#: superset-frontend/src/components/URLShortLinkButton/index.jsx:59
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:117
+#, python-format
+msgid "%s%s"
+msgstr "%s%s"
+
+#: superset-frontend/src/dashboard/actions/dashboardLayout.js:190
+msgid ""
+"There is not enough space for this component. Try decreasing its width, or "
+"increasing the destination width."
+msgstr ""
+"Za to komponento ni dovolj prostora. Poskusite zmanjšati širino ali pa "
+"povečati širino cilja."
+
+#: superset-frontend/src/dashboard/actions/dashboardLayout.js:227
+msgid "Can not move top level tab into nested tabs"
+msgstr "Najvišjega zavihka ni mogoče premakniti v gnezdene zavihke"
+
+#: superset-frontend/src/dashboard/actions/dashboardLayout.js:279
+msgid "This chart has been moved to a different filter scope."
+msgstr "Ta grafikon je bil prestavljen v drug obseg filtrov."
+
+#: superset-frontend/src/dashboard/actions/dashboardState.js:80
+msgid "There was an issue fetching the favorite status of this dashboard."
+msgstr ""
+"Pri pridobivanju statusa \"priljubljeno\" za to nadzorno ploščo je prišlo do "
+"težave."
+
+#: superset-frontend/src/dashboard/actions/dashboardState.js:101
+msgid "There was an issue favoriting this dashboard."
+msgstr "Pri uvrščanju nadzorne plošče med priljubljene je prišlo do težave."
+
+#: superset-frontend/src/dashboard/actions/dashboardState.js:123
+msgid "This dashboard is now ${nowPublished}"
+msgstr "Ta nadzorna plošča je sedaj ${nowPublished}"
+
+#: superset-frontend/src/dashboard/actions/dashboardState.js:129
+msgid "You do not have permissions to edit this dashboard."
+msgstr "Nimate dovoljenj za urejanje te nadzorne plošče."
+
+#: superset-frontend/src/dashboard/actions/dashboardState.js:231
+msgid "This dashboard was saved successfully."
+msgstr "Nadzorna plošča je bila uspešno shranjena."
+
+#: superset-frontend/src/dashboard/actions/sliceEntities.js:112
+#: superset-frontend/src/dashboard/reducers/sliceEntities.js:65
+msgid "Could not fetch all saved charts"
+msgstr "Vseh shranjenih grafikonov ni bilo mogoče pridobiti"
+
+#: superset-frontend/src/dashboard/actions/sliceEntities.js:117
+msgid "Sorry there was an error fetching saved charts: "
+msgstr "Prišlo je do napake pri pridobivanju shranjenih grafikonov: "
+
+#: superset-frontend/src/dashboard/components/AddSliceCard.jsx:132
+msgid "Visualization"
+msgstr "Vizualizacija"
+
+#: superset-frontend/src/dashboard/components/AddSliceCard.jsx:136
+msgid "Data source"
+msgstr "Podatkovni vir"
+
+#: superset-frontend/src/dashboard/components/AddSliceCard.jsx:141
+msgid "Added"
+msgstr "Dodano"
+
+#: superset-frontend/src/dashboard/components/BuilderComponentPane.tsx:67
+msgid "Components"
+msgstr "Komponente"
+
+#: superset-frontend/src/dashboard/components/ColorSchemeControlWrapper.jsx:54
+msgid ""
+"Any color palette selected here will override the colors applied to this "
+"dashboard's individual charts"
+msgstr ""
+"Na tem mestu izbrana barvna shema bo nadomestila barve posameznih grafikonov "
+"v tej nadzorni plošči"
+
+#: superset-frontend/src/dashboard/components/ColorSchemeControlWrapper.jsx:57
+#: superset-frontend/src/explore/controlPanels/sections.tsx:79
+#: superset-frontend/src/explore/controls.jsx:480
+msgid "Color scheme"
+msgstr "Barvna shema"
+
+#: superset-frontend/src/dashboard/components/Dashboard.jsx:87
+msgid "You have unsaved changes."
+msgstr "Imate neshranjene spremembe."
+
+#: superset-frontend/src/dashboard/components/MissingChart.jsx:31
+msgid ""
+"There is no chart definition associated with this component, could it have "
+"been deleted?"
+msgstr ""
+"S to komponento ni povezana nobena definicija grafikona. Ali je bila "
+"izbrisana?"
+
+#: superset-frontend/src/dashboard/components/MissingChart.jsx:36
+msgid "Delete this container and save to remove this message."
+msgstr "Izbrišite ta okvir in shranite za odpravo tega sporočila."
+
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:29
+msgid "Don't refresh"
+msgstr "Ne osvežuj"
+
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:30
+msgid "10 seconds"
+msgstr "10 sekund"
+
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:31
+msgid "30 seconds"
+msgstr "30 sekund"
+
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:32
+msgid "1 minute"
+msgstr "1 minuta"
+
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:33
+msgid "5 minutes"
+msgstr "5 minut"
+
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:34
+msgid "30 minutes"
+msgstr "30 minut"
+
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:35
+msgid "1 hour"
+msgstr "1 ura"
+
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:36
+msgid "6 hours"
+msgstr "6 ur"
+
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:37
+msgid "12 hours"
+msgstr "12 ur"
+
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:38
+msgid "24 hours"
+msgstr "24 ur"
+
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:115
+msgid "Refresh interval"
+msgstr "Interval osveževanja"
+
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:118
+msgid "Refresh frequency"
+msgstr "Frekvenca osveževanja"
+
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:133
+msgid "Are you sure you want to proceed?"
+msgstr "Ali želite nadaljevati?"
+
+#: superset-frontend/src/dashboard/components/RefreshIntervalModal.tsx:148
+msgid "Save for this session"
+msgstr "Shranite za to sejo"
+
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:162
+msgid "You must pick a name for the new dashboard"
+msgstr "Izbrati morate ime nove nadzorne plošče"
+
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:184
+msgid "Save dashboard"
+msgstr "Shrani nadzorno ploščo"
+
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:193
+#, python-format
+msgid "Overwrite Dashboard [%s]"
+msgstr "Prepiši nadzorno ploščo [%s]"
+
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:201
+msgid "Save as:"
+msgstr "Shrani kot:"
+
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:205
+msgid "[dashboard name]"
+msgstr "[ime nadzorne plošče]"
+
+#: superset-frontend/src/dashboard/components/SaveModal.tsx:215
+msgid "also copy (duplicate) charts"
+msgstr "kopiraj tudi (podvoji) grafikone"
+
+#: superset-frontend/src/dashboard/components/SliceAdder.jsx:242
+msgid "Filter your charts"
+msgstr "Filtriraj grafikone"
+
+#: superset-frontend/src/dashboard/components/SliceAdder.jsx:256
+#: superset-frontend/src/explore/controls.jsx:387
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:108
+msgid "Sort by"
+msgstr "Razvrsti po"
+
+#: superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingModal.tsx:65
+msgid "Cross Filter Scoping"
+msgstr "Obseg cross-filtra"
+
+#: superset-frontend/src/dashboard/components/CssEditor/index.jsx:66
+msgid "Load a template"
+msgstr "Naloži predlogo"
+
+#: superset-frontend/src/dashboard/components/CssEditor/index.jsx:69
+msgid "Load a CSS template"
+msgstr "Naloži CSS predlogo"
+
+#: superset-frontend/src/dashboard/components/CssEditor/index.jsx:87
+msgid "Live CSS editor"
+msgstr "CSS urejevalnik v živo"
+
+#: superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx:166
+#, python-format
+msgid "Applied Cross Filters (%d)"
+msgstr "Uporabljeni cross-filtri (%d)"
+
+#: superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx:190
+#, python-format
+msgid "Applied Filters (%d)"
+msgstr "Uporabljeni filtri (%d)"
+
+#: superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx:211
+#, python-format
+msgid "Incompatible Filters (%d)"
+msgstr "Neskladni filtri (%d)"
+
+#: superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx:235
+#, python-format
+msgid "Unset Filters (%d)"
+msgstr "Neuporabljeni filtri (%d)"
+
+#: superset-frontend/src/dashboard/components/Header/index.jsx:250
+#, python-format
+msgid ""
+"This dashboard is currently force refreshing; the next force refresh will be "
+"in %s."
+msgstr ""
+"Nadzorna plošča se trenutno prisilno osvežuje. Naslednja prisilna osvežitev "
+"bo v %s."
+
+#: superset-frontend/src/dashboard/components/Header/index.jsx:336
+msgid "Your dashboard is too large. Please reduce the size before save it."
+msgstr "Vaša nadzorna plošča je prevelika. Pred shranjevanjem jo zmanjšajte."
+
+#: superset-frontend/src/dashboard/components/Header/index.jsx:467
+msgid "Discard changes"
+msgstr "Zavrzi spremembe"
+
+#: superset-frontend/src/dashboard/components/Header/index.jsx:493
+msgid "Edit dashboard"
+msgstr "Uredi nadzorno ploščo"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:125
+msgid "An error occurred while fetching available CSS templates"
+msgstr "Pri pridobivanju CSS predlog je prišlo do napake"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:208
+msgid "Superset dashboard"
+msgstr "Superset nadzorna plošča"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:210
+msgid "Check out this dashboard: "
+msgstr "Preizkusite to nadzorno ploščo: "
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:251
+msgid "Copy dashboard URL"
+msgstr "Kopiraj URL nadzorne plošče"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:252
+msgid "Share dashboard by email"
+msgstr "Deli nadzorno ploščo po e-pošti"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:264
+msgid "Refresh dashboard"
+msgstr "Osveži nadzorno ploščo"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:274
+msgid "Set auto-refresh interval"
+msgstr "Nastavi interval samodejnega osveževanja"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:282
+msgid "Set filter mapping"
+msgstr "Nastavi shemo filtrov"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:289
+msgid "Edit dashboard properties"
+msgstr "Uredi lastnosti nadzorne plošče"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:296
+msgid "Edit CSS"
+msgstr "Uredi CSS"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:306
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:300
+#: superset-frontend/src/explore/components/ExploreAdditionalActionsMenu/index.jsx:104
+msgid "Download as image"
+msgstr "Izvozi kot sliko"
+
+#: superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/index.jsx:312
+msgid "Toggle fullscreen"
+msgstr "Preklopi celozaslonski način"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:71
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.tsx:89
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:382
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:478
+#: superset-frontend/src/datasource/DatasourceModal.tsx:130
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:61
+msgid "An error has occurred"
+msgstr "Prišlo je do napake"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:79
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.tsx:91
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:384
+msgid "You do not have permission to edit this dashboard"
+msgstr "Nimate dovoljenja za urejanje te nadzorne plošče"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:150
+msgid "A valid color scheme is required"
+msgstr "Zahtevana je veljavna barvna shema"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:316
+msgid "The dashboard has been saved"
+msgstr "Nadzorna plošča je bila shranjena"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:336
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:376
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:243
+msgid "Access"
+msgstr "Dostop"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:352
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:396
+msgid ""
+"Owners is a list of users who can alter the dashboard. Searchable by name or "
+"username."
+msgstr ""
+"\"Lastniki\" je seznam uporabnikov, ki lahko spreminjajo nadzorno ploščo. "
+"Iskanje je možno po imenu ali uporabniškem imenu."
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:359
+msgid "Colors"
+msgstr "Barve"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:418
+msgid ""
+"Roles is a list which defines access to the dashboard. Granting a role "
+"access to a dashboard will bypass dataset level checks. If no roles defined "
+"then the dashboard is available to all roles."
+msgstr ""
+"\"Vloge\" je seznam, ki definira dostop do nadzorne plošče. Dodelitev vloge "
+"za dostop do nadzorne plošče bo obšlo preverjanje na nivoju podatkovnega "
+"seta. Če vloga ni definirana, bo nadzorna plošča dostopna vsem vlogam."
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:442
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx:137
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:810
+#: superset-frontend/src/visualizations/FilterBox/FilterBox.jsx:445
+msgid "Apply"
+msgstr "Uporabi"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:448
+msgid "Dashboard properties"
+msgstr "Lastnosti nadzorne plošče"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:481
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:196
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:304
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:258
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:249
+msgid "Basic information"
+msgstr "Osnovne informacije"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:498
+msgid "URL slug"
+msgstr "URL slug"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:507
+msgid "A readable URL for your dashboard"
+msgstr "Berljiv URL za vašo nadzorno ploščo"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:525
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:187
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:625
+#: superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts:34
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx:447
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.js:128
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Geojson/controlPanel.js:82
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Grid/controlPanel.js:52
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Hex/controlPanel.js:82
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Path/controlPanel.js:72
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.js:178
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.js:142
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Screengrid/controlPanel.js:56
+msgid "Advanced"
+msgstr "Napredno"
+
+#: superset-frontend/src/dashboard/components/PropertiesModal/index.jsx:529
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:352
+msgid "JSON metadata"
+msgstr "JSON metapodatki"
+
+#: superset-frontend/src/dashboard/components/PublishedStatus/index.jsx:33
+msgid ""
+"This dashboard is not published, it will not show up in the list of "
+"dashboards. Click here to publish this dashboard."
+msgstr ""
+"Ta nadzorna plošča ni objavljena in se ne bo prikazala na seznamu nadzornih "
+"plošč. Kliknite tukaj za njeno objavo."
+
+#: superset-frontend/src/dashboard/components/PublishedStatus/index.jsx:38
+msgid ""
+"This dashboard is not published which means it will not show up in the list "
+"of dashboards. Favorite it to see it there or access it by using the URL "
+"directly."
+msgstr ""
+"Ta nadzorna plošča ni objavljena in se ne bo prikazala na seznamu nadzornih "
+"plošč. Uvrstite jo med priljubljene, da jo boste videli tam, ali pa "
+"uporabite URL za neposredni dostop."
+
+#: superset-frontend/src/dashboard/components/PublishedStatus/index.jsx:43
+msgid "This dashboard is published. Click to make it a draft."
+msgstr ""
+"Ta nadzorna plošča je objavljena. Kliknite, da jo uvrstite med osnutke."
+
+#: superset-frontend/src/dashboard/components/PublishedStatus/index.jsx:74
+#: superset-frontend/src/dashboard/components/PublishedStatus/index.jsx:85
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:243
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:437
+msgid "Draft"
+msgstr "Osnutek"
+
+#: superset-frontend/src/dashboard/components/SliceHeader/index.tsx:62
+msgid "Annotation layers are still loading."
+msgstr "Sloj z oznakami se še vedno nalaga."
+
+#: superset-frontend/src/dashboard/components/SliceHeader/index.tsx:63
+msgid "One ore more annotation layers failed loading."
+msgstr "Eden ali več slojev z oznakami se ni naložil."
+
+#: superset-frontend/src/dashboard/components/SliceHeader/index.tsx:160
+msgid "Emitted values"
+msgstr "Oddane vrednosti"
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:215
+#, python-format
+msgid "Cached %s"
+msgstr "Predpomnjeno %s"
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:218
+#, python-format
+msgid "Fetched %s"
+msgstr "Pridobljeno %s"
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:233
+msgid "Minimize chart"
+msgstr "Pomanjšaj grafikon"
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:233
+msgid "Maximize chart"
+msgstr "Povečaj grafikon"
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:246
+msgid "Force refresh"
+msgstr "Osveži"
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:256
+msgid "Toggle chart description"
+msgstr "Preklopi opis grafikona"
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:262
+msgid "View chart in Explore"
+msgstr "Ogled grafikona v Raziskovalcu"
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:270
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:272
+#: superset-frontend/src/explore/components/ExploreAdditionalActionsMenu/index.jsx:87
+#: superset-frontend/src/explore/components/ExploreAdditionalActionsMenu/index.jsx:89
+msgid "View query"
+msgstr "Ogled poizvedbe"
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:288
+msgid "Copy chart URL"
+msgstr "Kopiraj URL grafikona"
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:289
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:161
+msgid "Share chart by email"
+msgstr "Deli grafikon po e-pošti"
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:291
+msgid "Check out this chart: "
+msgstr "Preizkusite ta grafikon: "
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:304
+msgid "Export CSV"
+msgstr "Izvozi CSV"
+
+#: superset-frontend/src/dashboard/components/SliceHeaderControls/index.jsx:309
+msgid "Cross-filter scoping"
+msgstr "Obseg cross-filtra"
+
+#: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:483
+msgid "Search..."
+msgstr "Iskanje ..."
+
+#: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:516
+msgid "No filter is selected."
+msgstr "Noben filter ni izbran."
+
+#: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:517
+msgid "Editing 1 filter:"
+msgstr "Urejanje enega filtra:"
+
+#: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:519
+#, python-format
+msgid "Batch editing %d filters:"
+msgstr "Skupinsko urejanje %d filtrov:"
+
+#: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:533
+msgid "Configure filter scopes"
+msgstr "Nastavi obseg filtrov"
+
+#: superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx:540
+msgid "There are no filters in this dashboard."
+msgstr "V nadzorni plošči ni filtrov."
+
+#: superset-frontend/src/dashboard/components/filterscope/treeIcons.jsx:36
+msgid "Expand all"
+msgstr "Razširi vse"
+
+#: superset-frontend/src/dashboard/components/filterscope/treeIcons.jsx:39
+msgid "Collapse all"
+msgstr "Skrči vse"
+
+#: superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx:81
+msgid "This markdown component has an error."
+msgstr "Markdown komponenta ima napako."
+
+#: superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx:175
+msgid ""
+"This markdown component has an error. Please revert your recent changes."
+msgstr "Markdown komponenta ima napako. Povrnite nedavne spremembe."
+
+#: superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx:178
+msgid "Delete dashboard tab?"
+msgstr "Ali izbrišem zavihek nadzorne plošče?"
+
+#: superset-frontend/src/dashboard/components/gridComponents/new/NewDivider.jsx:31
+msgid "Divider"
+msgstr "Ločilnik"
+
+#: superset-frontend/src/dashboard/components/gridComponents/new/NewHeader.jsx:31
+msgid "Header"
+msgstr "Glava"
+
+#: superset-frontend/src/dashboard/components/gridComponents/new/NewRow.jsx:31
+msgid "Row"
+msgstr "Vrstica"
+
+#: superset-frontend/src/dashboard/components/gridComponents/new/NewTabs.jsx:31
+msgid "Tabs"
+msgstr "Zavihki"
+
+#: superset-frontend/src/dashboard/components/menu/MarkdownModeDropdown.tsx:39
+msgid "Preview"
+msgstr "Predogled"
+
+#: superset-frontend/src/dashboard/components/menu/ShareMenuItems/index.tsx:55
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:109
+#: superset-frontend/src/views/CRUD/data/components/SyntaxHighlighterCopy/index.tsx:75
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:221
+#: superset-frontend/src/views/CRUD/hooks.ts:635
+msgid "Sorry, your browser does not support copying."
+msgstr "Vaš brskalnik ne podpira kopiranja."
+
+#: superset-frontend/src/dashboard/components/menu/ShareMenuItems/index.tsx:65
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:120
+msgid "Sorry, something went wrong. Try again later."
+msgstr "Nekaj je šlo narobe. Poskusite ponovno kasneje."
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx:264
+msgid "All Filters (${filterValues.length})"
+msgstr "Vsi filtri (${filterValues.length})"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx:283
+msgid "Filter Sets (${filterSetFilterValues.length})"
+msgstr "Nastavljeni filtri (${filterSetFilterValues.length})"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadePopover/index.tsx:164
+msgid "Select parent filters"
+msgstr "Izberi starševske filtre"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx:118
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:340
+msgid "Check configuration"
+msgstr "Preveri nastavitve"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx:165
+msgid "Cannot load filter"
+msgstr "Filtra ni mogoče naložiti"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.tsx:124
+msgid "Editing filter set:"
+msgstr "Urejanje seta filtrov:"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.tsx:148
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx:83
+msgid "Filter set with this name already exists"
+msgstr "Set filtrov z enakim imenom že obstaja"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.tsx:149
+msgid "Filter set already exists"
+msgstr "Set filtrov že obstaja"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.tsx:170
+#, python-format
+msgid "This filter set is identical to: \"%s\""
+msgstr "Ta set filtrov je enak: \"%s\""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSetUnit.tsx:77
+msgid "Remove invalid filters"
+msgstr "Odstrani neveljavne filtre"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSetUnit.tsx:78
+msgid "Rebuild"
+msgstr "Obnovi"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FiltersHeader.tsx:75
+#, python-format
+msgid "Filters (%d)"
+msgstr "Filtri (%d)"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FiltersHeader.tsx:92
+msgid "This filter doesn't exist in dashboard. It will not be applied."
+msgstr "Ta filter ne obstaja v nadzorni plošči in ne bo uveljavljen."
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FiltersHeader.tsx:96
+msgid "Filter metadata changed in dashboard. It will not be applied."
+msgstr ""
+"Metapodatki filtra so se spremenili v nadzorni plošči. Ne bo uveljavljen."
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FiltersHeader.tsx:107
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:657
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:99
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:235
+msgid "None"
+msgstr "Brez"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx:81
+msgid "Please filter set name"
+msgstr "Vnesite ime seta filtrov"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx:96
+msgid "Create"
+msgstr "Ustvari"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx:111
+msgid "Create new filter set"
+msgstr "Ustvarite nov set filtrov"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/index.tsx:76
+msgid "New filter set"
+msgstr "Nov set filtrov"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/utils/index.ts:28
+msgid "Please apply filter changes"
+msgstr "Potrdite spremembe filtra"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/utils/index.ts:45
+msgid "Unknown value"
+msgstr "Neznana vrednost"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx:127
+msgid "Clear all"
+msgstr "Počisti vse"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTabs.tsx:172
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.jsx:363
+msgid "Add filter"
+msgstr "Dodaj filter"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTabs.tsx:182
+msgid "(Removed)"
+msgstr "(Odstranjeno)"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTabs.tsx:191
+msgid "Undo?"
+msgstr "Povrni?"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx:197
+msgid "New filter"
+msgstr "Nov filter"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx:251
+msgid "Filters configuration and scoping"
+msgstr "Nastavitve in obseg filtrov"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:172
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:226
+msgid "Configuration"
+msgstr "Nastavitve"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:176
+msgid "Scoping"
+msgstr "Obseg"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:183
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:540
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx:405
+msgid "Basic"
+msgstr "Osnovno"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:444
+msgid "Filter name"
+msgstr "Ime filtra"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:446
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:452
+msgid "Name is required"
+msgstr "Zahtevano je ime"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:454
+msgid "Filter Type"
+msgstr "Tip filtra"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:479
+#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:492
+#: superset-frontend/src/explore/controls.jsx:191
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:254
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:477
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:489
+msgid "Dataset"
+msgstr "Podatkovni set"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:481
+msgid "Dataset is required"
+msgstr "Zahtevan je podatkovni set"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:557
+msgid "Filter has default value"
+msgstr "Filter ima privzeto vrednost"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:565
+msgid "Default Value"
+msgstr "Privzeta vrednost"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:578
+msgid "Default value is required"
+msgstr "Zahtevana je privzeta vrednost"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:602
+msgid "Fill all required fields to enable \"Default Value\""
+msgstr "Izpolnite vsa polja, da omogočite \"Privzeto vrednost\""
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:616
+msgid "Apply changes instantly"
+msgstr "Spremembe uporabi takoj"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:627
+msgid "Filter is hierarchical"
+msgstr "Filter je hierarhičen"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:645
+msgid "Parent filter"
+msgstr "Nadrejeni filter"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:652
+msgid "Parent filter is required"
+msgstr "Zahtevan je nadrejeni filter"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:669
+msgid "Pre-filter available values"
+msgstr "Predfiltriraj razpoložljive vrednosti"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:695
+msgid "Adhoc filters is required"
+msgstr "Zahtevan je ad hoc filter"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:716
+msgid "Adhoc filters"
+msgstr "Adhoc filtri"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:723
+#: superset-frontend/src/explore/constants.ts:85
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:391
+msgid "Time range"
+msgstr "Časovno obdobje"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:739
+msgid "Sort filter values"
+msgstr "Razvrsti vrednosti filtra"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:755
+msgid "Sort type"
+msgstr "Vrsta razvrščanja"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:764
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:206
+#: superset-frontend/src/filters/components/Select/controlPanel.ts:52
+msgid "Sort ascending"
+msgstr "Razvrsti naraščajoče"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:768
+#: superset-frontend/src/explore/controlPanels/sections.tsx:125
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:315
+msgid "Sort descending"
+msgstr "Razvrsti padajoče"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx:780
+msgid "Sort Metric"
+msgstr "Mera za razvrščanje"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/RemovedFilter.tsx:39
+msgid "You have removed this filter."
+msgstr "Odstranili ste ta filter."
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/RemovedFilter.tsx:46
+msgid "Restore Filter"
+msgstr "Povrni filter"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.tsx:69
+msgid "Populate \"Default value\" to enable this control"
+msgstr "Izpolnite \"Privzeto vrednost\", da omogočite ta kontrolnik"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx:82
+msgid "Apply to all panels"
+msgstr "Uporabi za vse panele"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx:84
+msgid "Apply to specific panels"
+msgstr "Uporabi za določene panele"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx:90
+msgid "Only selected panels will be affected by this filter"
+msgstr "Ta filter bo vplival le na izbrane panele"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope.tsx:91
+msgid "All panels with this column will be affected by this filter"
+msgstr "Ta filter bo vplival na vse panele s tem stolpcem"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/state.ts:48
+msgid "All panels"
+msgstr "Vsi paneli"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/CancelConfirmationAlert.tsx:56
+msgid "Keep editing"
+msgstr "Nadaljuj z urejanjem"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/CancelConfirmationAlert.tsx:64
+msgid "Yes, cancel"
+msgstr "Da, prekini"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/Footer.tsx:69
+msgid "Are you sure you want to cancel?"
+msgstr "Ali želite prekiniti?"
+
+#: superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/Footer/Footer.tsx:70
+msgid "will not be saved."
+msgstr "ne bo shranjeno."
+
+#: superset-frontend/src/dashboard/util/backgroundStyleOptions.ts:25
+msgid "Transparent"
+msgstr "Prozorno"
+
+#: superset-frontend/src/dashboard/util/backgroundStyleOptions.ts:30
+msgid "White"
+msgstr "Belo"
+
+#: superset-frontend/src/dashboard/util/getFilterFieldNodesTree.js:44
+msgid "All filters"
+msgstr "Vsi filtri"
+
+#: superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js:85
+msgid "All charts"
+msgstr "Vsi grafikoni"
+
+#: superset-frontend/src/dashboard/util/headerStyleOptions.ts:25
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/sharedControls.ts:41
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/sharedControls.ts:76
+msgid "Small"
+msgstr "Majhno"
+
+#: superset-frontend/src/dashboard/util/headerStyleOptions.ts:30
+msgid "Medium"
+msgstr "Srednje"
+
+#: superset-frontend/src/dashboard/util/headerStyleOptions.ts:35
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/sharedControls.ts:49
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/sharedControls.ts:84
+msgid "Large"
+msgstr "Veliko"
+
+#: superset-frontend/src/dashboard/util/newComponentFactory.js:56
+#: superset-frontend/src/dashboard/util/newComponentFactory.js:57
+msgid "Tab title"
+msgstr "Naslov zavihka"
+
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:39
+msgid ""
+"Warning! Changing the dataset may break the chart if the metadata does not "
+"exist."
+msgstr ""
+"Opozorilo! Sprememba podatkovnega seta lahko pokvari grafikon, če "
+"metapodatki ne obstajajo."
+
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:43
+msgid ""
+"Changing the dataset may break the chart if the chart relies on columns or "
+"metadata that does not exist in the target dataset"
+msgstr ""
+"Sprememba podatkovnega seta lahko pokvari grafikon, če se le-ta zanaša na "
+"stolpce ali metapodatke, ki ne obstajajo v ciljnem podatkovnem nizu"
+
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:115
+#: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:64
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:125
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:682
+msgid "dataset"
+msgstr "podatkovni set"
+
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:216
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:174
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:253
+msgid "Change dataset"
+msgstr "Spremeni podatkovni set"
+
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:248
+msgid "Warning!"
+msgstr "Opozorilo!"
+
+#: superset-frontend/src/datasource/ChangeDatasourceModal.tsx:256
+msgid "Search / Filter"
+msgstr "Iskanje / Filter"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:110
+msgid "Physical (table or view)"
+msgstr "Fizičen (tabela ali pogled)"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:111
+msgid "Virtual (SQL)"
+msgstr "Virtualen (SQL)"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:154
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:876
+msgid "SQL expression"
+msgstr "SQL izraz"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:186
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:229
+msgid "Data type"
+msgstr "Tip podatka"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:194
+msgid "Datetime format"
+msgstr "Oblika datum-časa"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:198
+msgid "The pattern of timestamp format. For strings use "
+msgstr "Vzorec zapisa časovne značke. Za znakovne nize uporabite "
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:200
+msgid "Python datetime string pattern"
+msgstr "Pythonov vzorec zapisa datum-časa"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:202
+msgid " expression which needs to adhere to the "
+msgstr " , ki mora upoštevati "
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:204
+msgid "ISO 8601"
+msgstr "ISO 8601"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:206
+msgid ""
+" standard to ensure that the lexicographical ordering\r\n"
+"                      coincides with the chronological ordering. If the\r\n"
+"                      timestamp format does not adhere to the ISO 8601 "
+"standard\r\n"
+"                      you will need to define an expression and type for\r\n"
+"                      transforming the string into a date or timestamp. Note"
+"\r\n"
+"                      currently time zones are not supported. If time is "
+"stored\r\n"
+"                      in epoch format, put `epoch_s` or `epoch_ms`. If no "
+"pattern\r\n"
+"                      is specified we fall back to using the optional "
+"defaults on a per\r\n"
+"                      database/column name level via the extra parameter."
+msgstr ""
+" standard, ki zagotavlja, de se leksikografsko razvrščanje\r\n"
+"                      sklada s kronološkim razvrščanjem. Če oblika\r\n"
+"                      časovne značke ni v skladu s standardom ISO 8601,\r\n"
+"                      boste morali definirati izraz in tip za transformacijo"
+"\r\n"
+"                      znakovnega niza v datum ali časovno značko.\r\n"
+"                      Trenutno časovni pasovi niso podprti.\r\n"
+"                      Če je čas shranjen v obliki epohe, dodajte `epoch_s` "
+"ali `epoch_ms`.\r\n"
+"                      Če ni podan vzorec, se uporabijo privzete vrednosti na "
+"podlagi imena\r\n"
+"                      podatkovne baze oz. stolpca s pomočjo dodatnega "
+"parametra."
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:230
+msgid "Is dimension"
+msgstr "Dimenzija"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:232
+msgid "Is filterable"
+msgstr "Filtriranje"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:459
+#, python-format
+msgid "Modified columns: %s"
+msgstr "Spremenjeni stolpci: %s"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:464
+#, python-format
+msgid "Removed columns: %s"
+msgstr "Odstranjeni stolpci: %s"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:469
+#, python-format
+msgid "New columns added: %s"
+msgstr "Dodani novi stolpci: %s"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:472
+msgid "Metadata has been synced"
+msgstr "Metapodatki so sinhronizirani"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:508
+#, python-format
+msgid "Column name [%s] is duplicated"
+msgstr "Ime stolpca [%s] je podvojeno"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:515
+#, python-format
+msgid "Metric name [%s] is duplicated"
+msgstr "Ime mere [%s] je podvojeno"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:525
+#, python-format
+msgid "Calculated column [%s] requires an expression"
+msgstr "Izračunan stolpec [%s] zahteva izraz"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:553
+msgid "Default URL"
+msgstr "Privzeti URL"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:554
+msgid "Default URL to redirect to when accessing from the dataset list page"
+msgstr ""
+"Privzeti URL za preusmeritev, ko dostopate iz strani s seznamom podatkovnih "
+"setov"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:562
+msgid "Autocomplete filters"
+msgstr "Samodokončaj filtre"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:563
+msgid "Whether to populate autocomplete filters options"
+msgstr "Če želite napolniti možnosti za samodokončanje filtrov"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:569
+msgid "Autocomplete query predicate"
+msgstr "Predikat za samodokončanje poizvedb"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:570
+msgid ""
+"When using \"Autocomplete filters\", this can be used to improve performance "
+"of the query fetching the values. Use this option to apply a predicate "
+"(WHERE clause) to the query selecting the distinct values from the table. "
+"Typically the intent would be to limit the scan by applying a relative time "
+"filter on a partitioned or indexed time-related field."
+msgstr ""
+"Ko uporabljate \"Samodokončaj filtre\", lahko s tem izboljšate hitrost "
+"pridobivanja rezultatov s poizvedbo. Z uporabo te možnosti dodate predikat "
+"(WHERE stavek) k poizvedbi za izbiro različnih vrednosti iz tabele. Običajno "
+"je namen omejiti poizvedbo z uporabo filtra za relativni čas na "
+"particioniranem ali indeksiranem časovnem polju."
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:584
+msgid ""
+"Extra data to specify table metadata. Currently supports metadata of the "
+"format: `{ \"certification\": { \"certified_by\": \"Data Platform Team\", "
+"\"details\": \"This table is the source of truth.\" }, \"warning_markdown\": "
+"\"This is a warning.\" }`."
+msgstr ""
+"Dodatni podatki za tabelo metapodatkov. Trenutno je podprta naslednja oblika "
+"zapisa metapodatkov: `{ \"certification\": { \"certified_by\": \"Tim za "
+"razvoj\", \"details\": \"Ta tabela je vir resnice.\" }, \"warning_markdown"
+"\": \"To je opozorilo.\" }`."
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:602
+msgid "Owners of the dataset"
+msgstr "Lastniki podatkovnega seta"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:631
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:227
+msgid "Cache timeout"
+msgstr "Časovna omejitev predpomnilnika"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:632
+msgid "The duration of time in seconds before the cache is invalidated"
+msgstr "Trajanje (v sekundah) do razveljavitve predpomnilnika"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:639
+msgid "Hours offset"
+msgstr "Urni premik"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:641
+msgid ""
+"The number of hours, negative or positive, to shift the time column. This "
+"can be used to move UTC time to local time."
+msgstr ""
+"Število ur, negativno ali pozitivno, za zamik časovnega stolpca. Na ta način "
+"je mogoče UTC čas prestaviti na lokalni čas."
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:664
+msgid "Spatial"
+msgstr "Prostorski"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:716
+msgid "virtual"
+msgstr "virtualni"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:737
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:744
+msgid "Dataset name"
+msgstr "Ime podatkovnega seta"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:752
+msgid ""
+"When specifying SQL, the datasource acts as a view. Superset will use this "
+"statement as a subquery while grouping and filtering on the generated parent "
+"queries."
+msgstr ""
+"Ko podajate SQL, se podatkovni vir obnaša kot pogled (view). Superset bo to "
+"izjavo uporabil kot podpoizvedbo, pri čemer bo grupiral in filtriral na "
+"podlagi ustvarjenih starševskih poizvedb."
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:775
+msgid "The JSON metric or post aggregation definition."
+msgstr "JSON mera ali po-agregacijska definicija."
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:790
+msgid "Physical"
+msgstr "Fizičen"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:820
+msgid ""
+"The pointer to a physical table (or view). Keep in mind that the chart is "
+"associated to this Superset logical table, and this logical table points the "
+"physical table referenced here."
+msgstr ""
+"Kazalec na fizično tabelo (ali pogled). Grafikon je povezan s to Supersetovo "
+"logično tabelo, ki kaže na tukaj referencirano fizično tabelo."
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:839
+msgid "Click the lock to make changes."
+msgstr "Kliknite ključavnico, da omogočite spreminjanje."
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:842
+msgid "Click the lock to prevent further changes."
+msgstr "Kliknite ključavnico, da onemogočite spremembe."
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:898
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx:44
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx:55
+msgid "D3 format"
+msgstr "D3 format"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:904
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:912
+msgid "Certified by"
+msgstr "Certificiral/a"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:906
+msgid "Person or group that has certified this metric"
+msgstr "Oseba ali skupina, ki je certificirala to mero"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:917
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:923
+msgid "Certification details"
+msgstr "Podrobnosti certifikacije"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:919
+msgid "Details of the certification"
+msgstr "Podrobnosti certifikacije"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:928
+msgid "Warning"
+msgstr "Opozorilo"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:930
+msgid "Optional warning about use of this metric"
+msgstr "Opcijsko opozorilo za uporabo te mere"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1009
+msgid "Be careful."
+msgstr "Bodite previdni."
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1010
+msgid ""
+"Changing these settings will affect all charts using this dataset, including "
+"charts owned by other people."
+msgstr ""
+"Spreminjanje teh nastavitev bo vplivalo na vse grafikone, ki uporabljajo ta "
+"podatkovni set, vključno z grafikoni v lasti drugih oseb."
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1023
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1103
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:278
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-chord/src/controlPanel.ts:61
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:48
+msgid "Source"
+msgstr "Izvor"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1056
+msgid "Sync columns from source"
+msgstr "Sinhroniziraj stolpce z virom"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1074
+msgid "Calculated columns"
+msgstr "Izračunani stolpci"
+
+#: superset-frontend/src/datasource/DatasourceEditor.jsx:1097
+msgid "Settings"
+msgstr "Nastavitve"
+
+#: superset-frontend/src/datasource/DatasourceModal.tsx:121
+#: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:96
+msgid "The dataset has been saved"
+msgstr "Podatkovni set je shranjen"
+
+#: superset-frontend/src/datasource/DatasourceModal.tsx:157
+msgid ""
+"The dataset configuration exposed here\r\n"
+"                affects all the charts using this dataset.\r\n"
+"                Be mindful that changing settings\r\n"
+"                here may affect other charts\r\n"
+"                in undesirable ways."
+msgstr ""
+"Tukaj prikazane nastavitve podatkovnega seta\r\n"
+"                vpliva na vse grafikone, ki uporabljajo\r\n"
+"                ta podatkovni set. Spreminjanje\r\n"
+"                nastavitev lahko nezaželeno vpliva\r\n"
+"                na druge grafikone."
+
+#: superset-frontend/src/datasource/DatasourceModal.tsx:163
+msgid "Are you sure you want to save and apply changes?"
+msgstr "Ali resnično želite shraniti in uporabiti spremembe?"
+
+#: superset-frontend/src/datasource/DatasourceModal.tsx:169
+msgid "Confirm save"
+msgstr "Potrdite shranjevanje"
+
+#: superset-frontend/src/datasource/DatasourceModal.tsx:182
+msgid "Edit Dataset "
+msgstr "Uredi podatkovni set "
+
+#: superset-frontend/src/datasource/DatasourceModal.tsx:199
+msgid "Use legacy datasource editor"
+msgstr "Uporabi starejši urejevalnik podatkovnega vira"
+
+#: superset-frontend/src/explore/constants.ts:86
+#: superset-frontend/src/filters/components/TimeColumn/index.ts:28
+msgid "Time column"
+msgstr "Časovni stolpec"
+
+#: superset-frontend/src/explore/constants.ts:87
+#: superset-frontend/src/filters/components/TimeGrain/index.ts:28
+msgid "Time grain"
+msgstr "Granulacija časa"
+
+#: superset-frontend/src/explore/constants.ts:88
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/constants.ts:28
+msgid "Origin"
+msgstr "Izhodišče"
+
+#: superset-frontend/src/explore/constants.ts:89
+msgid "Time granularity"
+msgstr "Granulacija časa"
+
+#: superset-frontend/src/explore/controls.jsx:114
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/constants.ts:40
+msgid ""
+"A reference to the [Time] configuration, taking granularity into account"
+msgstr "Sklic na nastavitve za [Čas], ki upošteva granulacijo"
+
+#: superset-frontend/src/explore/controls.jsx:124
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:26
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:97
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:41
+msgid "Group by"
+msgstr "Združevanje (Group by)"
+
+#: superset-frontend/src/explore/controls.jsx:127
+msgid "One or many controls to group by"
+msgstr "En ali več kontrolnikov za združevanje"
+
+#: superset-frontend/src/explore/controls.jsx:164
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:96
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:137
+msgid "One or many metrics to display"
+msgstr "Ena ali več mer za prikaz"
+
+#: superset-frontend/src/explore/controls.jsx:202
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:241
+msgid "Visualization type"
+msgstr "Tip vizualizacije"
+
+#: superset-frontend/src/explore/controls.jsx:204
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:161
+msgid "The type of visualization to display"
+msgstr "Tip vizualizacije za prikaz"
+
+#: superset-frontend/src/explore/controls.jsx:208
+msgid "Fixed color"
+msgstr "Izbrana barva"
+
+#: superset-frontend/src/explore/controls.jsx:209
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:167
+msgid "Use this to define a static color for all circles"
+msgstr "S tem definirate določeno barvo za vse kroge"
+
+#: superset-frontend/src/explore/controls.jsx:217
+msgid "Right axis metric"
+msgstr "Mera desne osi"
+
+#: superset-frontend/src/explore/controls.jsx:219
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:176
+msgid "Choose a metric for right axis"
+msgstr "Izberite mero za desno os"
+
+#: superset-frontend/src/explore/controls.jsx:224
+msgid "Linear color scheme"
+msgstr "Linearna barvna shema"
+
+#: superset-frontend/src/explore/controls.jsx:237
+msgid "Color metric"
+msgstr "P"
+
+#: superset-frontend/src/explore/controls.jsx:240
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:140
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:197
+msgid "A metric to use for color"
+msgstr "Mera za barvo"
+
+#: superset-frontend/src/explore/controls.jsx:248
+msgid "One or many controls to pivot as columns"
+msgstr "En ali več kontrolnikov za stolpčno vrtenje"
+
+#: superset-frontend/src/explore/controls.jsx:260
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:215
+msgid ""
+"Defines the origin where time buckets start, accepts natural dates as in "
+"`now`, `sunday` or `1970-01-01`"
+msgstr ""
+"Določa izhodišče, kadar se začnejo časovni razdelki. Sprejema naravne zapise "
+"kot so `zdaj`, `nedelja` ali `1970-01-01`"
+
+#: superset-frontend/src/explore/controls.jsx:289
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:244
+msgid ""
+"The time granularity for the visualization. Note that you can type and use "
+"simple natural language as in `10 seconds`, `1 day` or `56 weeks`"
+msgstr ""
+"Granulacija časa za vizualizacijo. Uporabite lahko vnos z naravnim jezikom, "
+"kot npr. `10 sekund`, `1 dni` ali `56 tednov`"
+
+#: superset-frontend/src/explore/controls.jsx:299
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:254
+msgid ""
+"The time column for the visualization. Note that you can define arbitrary "
+"expression that return a DATETIME column in the table. Also note that the "
+"filter below is applied against this column or expression"
+msgstr ""
+"Časovni stolpec za vizualizacijo. Določite lahko poljuben izraz, ki vrne "
+"DATETIME stolpec v tabeli. Spodnji filter se nanaša na ta stolpec ali izraz"
+
+#: superset-frontend/src/explore/controls.jsx:329
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:285
+msgid ""
+"The time granularity for the visualization. This applies a date "
+"transformation to alter your time column and defines a new time granularity. "
+"The options here are defined on a per database engine basis in the Superset "
+"source code."
+msgstr ""
+"Granulacija časa za to vizualizacijo. Izvede transformacijo podatkov, ki "
+"spremeni vaš časovni stolpec in določi novo časovno granulacija. Ta možnost "
+"je definirana na ravni sistema podatkovne baze v izvorni kodi Superseta."
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts:35
+#: superset-frontend/src/explore/controls.jsx:345
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:301
+msgid "No filter"
+msgstr "Brez filtra"
+
+#: superset-frontend/src/explore/controls.jsx:347
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:303
+msgid ""
+"The time range for the visualization. All relative times, e.g. \"Last month"
+"\", \"Last 7 days\", \"now\", etc. are evaluated on the server using the "
+"server's local time (sans timezone). All tooltips and placeholder times are "
+"expressed in UTC (sans timezone). The timestamps are then evaluated by the "
+"database using the engine's local timezone. Note one can explicitly set the "
+"timezone per the ISO 8601 format if specifying either the start and/or end "
+"time."
+msgstr ""
+"Časovno obdobje za vizualizacijo. Vsi relativni časi, kot npr. \"Zadnji mesec"
+"\", Zadnjih 7 dni\", \"Zdaj\" so izračunani na strežniku z njegovim lokalnim "
+"časom. Vsi opisi orodij in časi so izraženi v UTC. Časovne značke se nato "
+"izračunajo v podatkovni bazi z njenim lokalnim časovnim pasom. Eksplicitno "
+"lahko nastavite časovni pas v ISO 8601 formatu, če določite čas začetka ali "
+"konca."
+
+#: superset-frontend/src/explore/controls.jsx:365
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:320
+msgid "Row limit"
+msgstr "Omejitev št. vrstic"
+
+#: superset-frontend/src/explore/controls.jsx:374
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:329
+msgid "Series limit"
+msgstr "Omejitev št. vrst"
+
+#: superset-frontend/src/explore/controls.jsx:377
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:333
+msgid ""
+"Limits the number of time series that get displayed. A sub query (or an "
+"extra phase where sub queries are not supported) is applied to limit the "
+"number of time series that get fetched and displayed. This feature is useful "
+"when grouping by high cardinality dimension(s)."
+msgstr ""
+"Omeji število časovnih vrst za prikaz. S podpoizvedbo (ali dodatno fazo, "
+"kjer podpoizvedbe niso podprte) se omeji število časovnih vrst, ki bodo "
+"pridobljene za prikaz. Ta funkcija je uporabna pri združevanju dimenzij z "
+"veliko kardinalnostjo."
+
+#: superset-frontend/src/explore/controls.jsx:390
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:110
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:345
+msgid "Metric used to define the top series"
+msgstr "Mera za določanje najvišje podatkovne serije"
+
+#: superset-frontend/src/explore/controls.jsx:400
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:51
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:355
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:108
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts:131
+msgid "Series"
+msgstr "Niz"
+
+#: superset-frontend/src/explore/controls.jsx:403
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:54
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:358
+msgid ""
+"Defines the grouping of entities. Each series is shown as a specific color "
+"on the chart and has a legend toggle"
+msgstr ""
+"Določa združevanje entitet. Vsak niz je na grafikonu prikazan z določeno "
+"barvo in ima lahko prikazano legendo"
+
+#: superset-frontend/src/explore/controls.jsx:412
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:63
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:367
+msgid "Entity"
+msgstr "Entiteta"
+
+#: superset-frontend/src/explore/controls.jsx:416
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:67
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:371
+msgid "This defines the element to be plotted on the chart"
+msgstr "Določa element, ki bo izrisan na grafikonu"
+
+#: superset-frontend/src/explore/controls.jsx:421
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:126
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:376
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Area/controlPanel.ts:69
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bar/controlPanel.ts:64
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:77
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:45
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:101
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:70
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:77
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/TimePivot/controlPanel.ts:82
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:261
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:324
+msgid "X Axis"
+msgstr "X os"
+
+#: superset-frontend/src/explore/controls.jsx:422
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:127
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:377
+msgid "Metric assigned to the [X] axis"
+msgstr "Mera za [X] os"
+
+#: superset-frontend/src/explore/controls.jsx:428
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:132
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:383
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Area/controlPanel.ts:79
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bar/controlPanel.ts:76
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:109
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:54
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:81
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/TimePivot/controlPanel.ts:101
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:205
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:322
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:407
+msgid "Y Axis"
+msgstr "Y os"
+
+#: superset-frontend/src/explore/controls.jsx:430
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:133
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:385
+msgid "Metric assigned to the [Y] axis"
+msgstr "Mera za [Y] os"
+
+#: superset-frontend/src/explore/controls.jsx:435
+msgid "Bubble size"
+msgstr "Velikost mehurčka"
+
+#: superset-frontend/src/explore/controls.jsx:442
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:398
+msgid "Y Axis Format"
+msgstr "Oblika Y osi"
+
+#: superset-frontend/src/explore/controls.jsx:454
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:407
+msgid ""
+"When `Calculation type` is set to \"Percentage change\", the Y Axis Format "
+"is forced to `.1%`"
+msgstr ""
+"Če je `Vrsta izračuna` nastavljena na \"Procentualna sprememba\", bo oblika "
+"Y-osi vsiljena na `.1%`"
+
+#: superset-frontend/src/explore/controls.jsx:484
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:448
+msgid "The color scheme for rendering chart"
+msgstr "Barvna shema za izris grafikona"
+
+#: superset-frontend/src/explore/controls.jsx:490
+#: superset-frontend/src/utils/getControlsForVizType.test.js:86
+msgid "Color map"
+msgstr "Barvna lestvica"
+
+#: superset-frontend/src/explore/actions/exploreActions.ts:92
+msgid "An error occurred while starring this chart"
+msgstr "Pri ocenjevanju grafikona je prišlo do napake"
+
+#: superset-frontend/src/explore/components/ControlHeader.jsx:65
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:343
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:273
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/components/ControlHeader.tsx:64
+msgid "description"
+msgstr "opis"
+
+#: superset-frontend/src/explore/components/ControlHeader.jsx:75
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/components/ControlHeader.tsx:74
+msgid "bolt"
+msgstr "vijak"
+
+#: superset-frontend/src/explore/components/ControlHeader.jsx:76
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/components/ControlHeader.tsx:75
+msgid "Changing this control takes effect instantly"
+msgstr "Sprememba tega kontrolnika se odrazi takoj"
+
+#: superset-frontend/src/explore/components/ControlPanelsContainer.tsx:431
+msgid "Customize"
+msgstr "Prilagodi"
+
+#: superset-frontend/src/explore/components/EmbedCodeButton.jsx:116
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Grid/controlPanel.js:58
+msgid "Height"
+msgstr "Višina"
+
+#: superset-frontend/src/explore/components/EmbedCodeButton.jsx:130
+msgid "Width"
+msgstr "Širina"
+
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:97
+msgid "Copy chart URL to clipboard"
+msgstr "Kopiraj URL grafikona na odložišče"
+
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:104
+msgid "Loading..."
+msgstr "Nalagam ..."
+
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:115
+msgid "Superset Chart"
+msgstr "Superset grafikon"
+
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:168
+msgid "Export to .JSON format"
+msgstr "Izvozi v .json format"
+
+#: superset-frontend/src/explore/components/ExploreActionButtons.tsx:174
+msgid "Export to .CSV format"
+msgstr "Izvozi v .csv format"
+
+#: superset-frontend/src/explore/components/ExploreChartHeader.jsx:101
+#, python-format
+msgid "%s - untitled"
+msgstr "%s - neimenovan"
+
+#: superset-frontend/src/explore/components/ExploreChartHeader.jsx:169
+msgid "Edit chart properties"
+msgstr "Uredi lastnosti grafikona"
+
+#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:402
+msgid "Controls labeled "
+msgstr "Kontrolniki imenovani "
+
+#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:402
+msgid "Control labeled "
+msgstr "Nastavitev "
+
+#: superset-frontend/src/explore/components/ExploreViewContainer.jsx:521
+msgid "Open Datasource tab"
+msgstr "Odpri zavihek s podatkovnim virom"
+
+#: superset-frontend/src/explore/components/RowCountLabel.jsx:35
+msgid "rows"
+msgstr "vrstic"
+
+#: superset-frontend/src/explore/components/RowCountLabel.jsx:45
+msgid "Limit reached"
+msgstr "Omejitev dosežena"
+
+#: superset-frontend/src/explore/components/SaveModal.tsx:35
+msgid "**Select** a dashboard OR **create** a new one"
+msgstr "**Izberite** nadzorno ploščo ALI **ustvarite** novo"
+
+#: superset-frontend/src/explore/components/SaveModal.tsx:130
+msgid "Please enter a chart name"
+msgstr "Vnesite ime grafikona"
+
+#: superset-frontend/src/explore/components/SaveModal.tsx:172
+msgid "Save chart"
+msgstr "Shrani grafikon"
+
+#: superset-frontend/src/explore/components/SaveModal.tsx:191
+msgid "Save & go to dashboard"
+msgstr "Shrani in pojdi na nadzorno ploščo"
+
+#: superset-frontend/src/explore/components/SaveModal.tsx:202
+msgid "Save as new chart"
+msgstr "Shrani kot nov grafikon"
+
+#: superset-frontend/src/explore/components/SaveModal.tsx:235
+msgid "Save (Overwrite)"
+msgstr "Shrani (prepiši)"
+
+#: superset-frontend/src/explore/components/SaveModal.tsx:244
+msgid "Save as ..."
+msgstr "Shrani kot ..."
+
+#: superset-frontend/src/explore/components/SaveModal.tsx:248
+msgid "Chart name"
+msgstr "Ime grafikona"
+
+#: superset-frontend/src/explore/components/SaveModal.tsx:259
+msgid "Add to dashboard"
+msgstr "Dodaj na nadzorno ploščo"
+
+#: superset-frontend/src/explore/components/DataTableControl/index.tsx:95
+msgid "rows retrieved"
+msgstr "vrnjenih vrstic"
+
+#: superset-frontend/src/explore/components/DataTablesPane/index.tsx:168
+#: superset-frontend/src/explore/components/controls/ViewQueryModal.tsx:76
+msgid "Sorry, An error occurred"
+msgstr "Prišlo je do napake"
+
+#: superset-frontend/src/explore/components/DataTablesPane/index.tsx:258
+#: superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx:245
+#: superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.tsx:81
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx:148
+msgid "No data"
+msgstr "Ni podatkov"
+
+#: superset-frontend/src/explore/components/DataTablesPane/index.tsx:309
+msgid "View samples"
+msgstr "Ogled vzorcev"
+
+#: superset-frontend/src/explore/components/DatasourcePanel/index.tsx:192
+msgid "Search Metrics & Columns"
+msgstr "Iskanje mer in stolpcev"
+
+#: superset-frontend/src/explore/components/DatasourcePanel/index.tsx:206
+#: superset-frontend/src/explore/components/DatasourcePanel/index.tsx:228
+#, python-format
+msgid "Showing %s of %s"
+msgstr "Prikazanih %s od %s"
+
+#: superset-frontend/src/explore/components/ExploreAdditionalActionsMenu/index.jsx:62
+msgid "New chart"
+msgstr "Nov grafikon"
+
+#: superset-frontend/src/explore/components/ExploreAdditionalActionsMenu/index.jsx:81
+msgid "Edit properties"
+msgstr "Uredi lastnosti"
+
+#: superset-frontend/src/explore/components/ExploreAdditionalActionsMenu/index.jsx:100
+msgid "Run in SQL Lab"
+msgstr "Zaženi v SQL laboratoriju"
+
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:63
+msgid "You do not have permission to edit this chart"
+msgstr "Nimate dovoljenja za urejanje tega grafikona"
+
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:219
+msgid ""
+"The description can be displayed as widget headers in the dashboard view. "
+"Supports markdown."
+msgstr ""
+"Opis je lahko prikazan kot glava gradnika in pogledu nadzorne plošče. "
+"Podpira markdown."
+
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:238
+msgid ""
+"Duration (in seconds) of the caching timeout for this chart. Note this "
+"defaults to the dataset's timeout if undefined."
+msgstr ""
+"Časovna veljavnost (v sekundah) predpomnjenja za ta grafikon. Če ni "
+"definirana, je uporabljena vrednost za podatkovni set."
+
+#: superset-frontend/src/explore/components/PropertiesModal/index.tsx:259
+msgid ""
+"A list of users who can alter the chart. Searchable by name or username."
+msgstr ""
+"Seznam uporabnikov, ki lahko spreminjajo ta grafikon. Možno je iskanje po "
+"imenu ali uporabniškem imenu."
+
+#: superset-frontend/src/explore/components/controls/BoundsControl.jsx:112
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:84
+msgid "Min"
+msgstr "Min"
+
+#: superset-frontend/src/explore/components/controls/BoundsControl.jsx:118
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:96
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx:55
+msgid "Max"
+msgstr "Max"
+
+#: superset-frontend/src/explore/components/controls/SelectControl.jsx:76
+#: superset-frontend/src/visualizations/FilterBox/FilterBox.jsx:412
+msgid "No results found"
+msgstr "Rezultati niso najdeni"
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:301
+#: superset-frontend/src/explore/components/controls/SelectControl.jsx:252
+#, python-format
+msgid "%s option(s)"
+msgstr "Možnosti: %s"
+
+#: superset-frontend/src/explore/components/controls/SpatialControl.jsx:82
+msgid "Invalid lat/long configuration."
+msgstr "Neveljavna nastavitev zemljepisne dolžine/širine."
+
+#: superset-frontend/src/explore/components/controls/SpatialControl.jsx:154
+msgid "Reverse lat/long "
+msgstr "Zamenjaj zemljepisno dolžino/širino "
+
+#: superset-frontend/src/explore/components/controls/SpatialControl.jsx:167
+msgid "Longitude & Latitude columns"
+msgstr "Stolpci zemljepisne dolžine in širine"
+
+#: superset-frontend/src/explore/components/controls/SpatialControl.jsx:183
+msgid "Delimited long & lat single column"
+msgstr "En stolpec z ločenima zemljepisno dolžino in širino"
+
+#: superset-frontend/src/explore/components/controls/SpatialControl.jsx:184
+msgid ""
+"Multiple formats accepted, look the geopy.points Python library for more "
+"details"
+msgstr ""
+"Sprejema različne zapise - podrobnosti najdete v Pythonovi knjižnici geopy."
+"points"
+
+#: superset-frontend/src/explore/components/controls/SpatialControl.jsx:202
+msgid "Geohash"
+msgstr "Geohash"
+
+#: superset-frontend/src/explore/components/controls/TextAreaControl.jsx:103
+msgid "textarea"
+msgstr "področje besedila"
+
+#: superset-frontend/src/explore/components/controls/TextAreaControl.jsx:133
+msgid "in modal"
+msgstr "v modalnem"
+
+#: superset-frontend/src/explore/components/controls/withAsyncVerification.tsx:208
+#, python-format
+msgid "Failed to verify select options: %s"
+msgstr "Preverjanje možnosti izbire ni uspelo: %s"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:485
+msgid "Annotation Slice Configuration"
+msgstr "Nastavitve rezine z oznakami"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:486
+msgid ""
+"This section allows you to configure how to use the slice\r\n"
+"               to generate annotations."
+msgstr ""
+"V tem sklopu lahko nastavite način uporabe rezine\r\n"
+"               za ustvarjanje oznak."
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:638
+msgid "Display configuration"
+msgstr "Prikaži nastavitve"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:639
+msgid "Configure your how you overlay is displayed here."
+msgstr "Nastavite kako se tukaj prikazuje vrhnja plast."
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:643
+msgid "Style"
+msgstr "Stil"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:658
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.js:115
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:220
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:164
+msgid "Opacity"
+msgstr "Prosojnost"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:675
+msgid "Color"
+msgstr "Barva"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:694
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:194
+msgid "Line width"
+msgstr "Debelina črte"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:743
+msgid "Layer configuration"
+msgstr "Nastavitve sloja"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:744
+msgid "Configure the basics of your Annotation Layer."
+msgstr "Osnovne nastavitve sloja z oznakami."
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:752
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:785
+msgid "Mandatory"
+msgstr "Obvezno"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:756
+msgid "Hide layer"
+msgstr "Skrij sloj"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:762
+msgid "Choose the annotation layer type"
+msgstr "Izberite tip sloja z oznakami"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:763
+msgid "Annotation layer type"
+msgstr "Tip sloja z oznakami"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx:801
+msgid "Remove"
+msgstr "Odstrani"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.jsx:185
+msgid "Edit annotation layer"
+msgstr "Uredi sloj z oznakami"
+
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.jsx:216
+#: superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.jsx:228
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:253
+msgid "Add annotation layer"
+msgstr "Dodaj sloj z oznakami"
+
+#: superset-frontend/src/explore/components/controls/CollectionControl/index.jsx:59
+msgid "Empty collection"
+msgstr "Prazen izbor"
+
+#: superset-frontend/src/explore/components/controls/CollectionControl/index.jsx:63
+msgid "Add an item"
+msgstr "Dodaj element"
+
+#: superset-frontend/src/explore/components/controls/CollectionControl/index.jsx:142
+msgid "Remove item"
+msgstr "Odstrani element"
+
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:171
+msgid "Edit dataset"
+msgstr "Uredi podatkovni set"
+
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:176
+msgid "View in SQL Lab"
+msgstr "Ogled v SQL laboratoriju"
+
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:223
+msgid "More dataset related options"
+msgstr "Več nastavitev za podatkovni set"
+
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:237
+msgid "Missing dataset"
+msgstr "Manjka podatkovni set"
+
+#: superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx:242
+msgid "The dataset linked to this chart may have been deleted."
+msgstr "Podatkovni set, povezan s tem grafikonom, je bil izbrisan."
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx:279
+msgid "RANGE TYPE"
+msgstr "TIP OBDOBJA"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx:302
+msgid "Actual time range"
+msgstr "Dejansko časovno obdobje"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx:323
+msgid "CANCEL"
+msgstr "PREKINI"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx:333
+msgid "APPLY"
+msgstr "UPORABI"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx:342
+msgid "Edit time range"
+msgstr "Uredi časovno obdobje"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/AdvancedFrame.tsx:58
+msgid "Configure Advanced Time Range "
+msgstr "Nastavi napredno časovno obdobje "
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/AdvancedFrame.tsx:64
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:115
+msgid "START (INCLUSIVE)"
+msgstr "ZAČETEK (VKLJUČEN)"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/AdvancedFrame.tsx:66
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:117
+msgid "Start date included in time range"
+msgstr "Začetni datum je vključen v časovno obdobje"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/AdvancedFrame.tsx:76
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:173
+msgid "END (EXCLUSIVE)"
+msgstr "KONEC (NI VKLJUČEN)"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/AdvancedFrame.tsx:78
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:175
+msgid "End date excluded from time range"
+msgstr "Končni datum ni vključen v časovno obdobje"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CalendarFrame.tsx:43
+msgid "Configure Time Range: Previous..."
+msgstr "Nastavi časovno obdobje: Prejšnji ..."
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CommonFrame.tsx:41
+msgid "Configure Time Range: Last..."
+msgstr "Nastavi časovno obdobje: Zadnji ..."
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:111
+msgid "Configure custom time range"
+msgstr "Nastavi prilagojeno časovno obdobje"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:147
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:204
+msgid "Relative quantity"
+msgstr "Relativne vrednosti"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:231
+msgid "Anchor to"
+msgstr "Sidraj na"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:240
+msgid "NOW"
+msgstr "ZDAJ"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx:243
+msgid "Date/Time"
+msgstr "Datum/Čas"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:29
+msgid "Return to specific datetime."
+msgstr "Vrne določen datum-čas."
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:30
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:44
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:62
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:76
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:89
+msgid "Syntax"
+msgstr "Sintaksa"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:34
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:49
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:67
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:81
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:95
+msgid "Example"
+msgstr "Primer"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:43
+msgid "Moves the given set of dates by a specified interval."
+msgstr "Premakne dani nabor datumov za definirano obdobje."
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:58
+msgid ""
+"Truncates the specified date to the accuracy specified by the date unit."
+msgstr ""
+"Zaokroži določen datum, glede na natančnost, definirano s časovno enoto."
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:75
+msgid "Get the last date by the date unit."
+msgstr "Pridobi zadnji datum glede na časovno enoto."
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx:88
+msgid "Get the specify date for the holiday"
+msgstr "Določi datum praznika"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts:31
+msgid "Last"
+msgstr "Zadnji"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts:32
+#: superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx:127
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx:106
+msgid "Previous"
+msgstr "Prejšnji"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts:33
+msgid "Custom"
+msgstr "Prilagojen"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts:39
+msgid "last day"
+msgstr "zadnji dan"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts:40
+msgid "last week"
+msgstr "zadnji teden"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts:41
+msgid "last month"
+msgstr "zadnji mesec"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts:42
+msgid "last quarter"
+msgstr "zadnje četrletje"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts:43
+msgid "last year"
+msgstr "zadnje leto"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts:50
+msgid "previous calendar week"
+msgstr "prejšnji koledarski teden"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts:51
+msgid "previous calendar month"
+msgstr "prejšnji koledarski mesec"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts:52
+msgid "previous calendar year"
+msgstr "prejšnje koledarsko leto"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts:72
+msgid "Before"
+msgstr "PRED"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts:79
+msgid "After"
+msgstr "PO"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts:84
+msgid "Specific Date/Time"
+msgstr "Fiksen Datum/Čas"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts:85
+msgid "Relative Date/Time"
+msgstr "Relativen Datum/Čas"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts:86
+msgid "Now"
+msgstr "Zdaj"
+
+#: superset-frontend/src/explore/components/controls/DateFilterControl/utils/constants.ts:87
+msgid "Midnight"
+msgstr "Polnoč"
+
+#: superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.tsx:83
+msgid "Drop column"
+msgstr "Izpusti stolpec"
+
+#: superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx:324
+msgid "Drop columns or metrics"
+msgstr "Izpusti stolpce ali mere"
+
+#: superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.tsx:280
+msgid "Drop column or metric"
+msgstr "Izpusti stolpec ali mero"
+
+#: superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.tsx:58
+msgid "Drop columns"
+msgstr "Izpusti stolpce"
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:169
+msgid "Default"
+msgstr "Privzeto"
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:170
+msgid ""
+"(optional) default value for the filter, when using the multiple option, you "
+"can use a semicolon-delimited list of options."
+msgstr ""
+"(opcijsko) privzeta vrednost za filter, če uporabite opcijo izbire večih , "
+"lahko uporabite seznam nastavitev ločen s podpičji."
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:186
+msgid "Sort metric"
+msgstr "Mera za razvrščanje"
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:187
+msgid "Metric to sort the results by"
+msgstr "Mera za razvrščanje rezultatov"
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:207
+#: superset-frontend/src/filters/components/Select/controlPanel.ts:54
+msgid "Check for sorting ascending"
+msgstr "Označi za naraščajoče razvrščanje"
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:217
+msgid "Allow multiple selections"
+msgstr "Dovoli več izbir"
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:219
+msgid ""
+"Multiple selections allowed, otherwise filter is limited to a single value"
+msgstr ""
+"Lahko izberete več elementov, drugače pa je filter omejen na eno vrednost"
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:233
+#: superset-frontend/src/filters/components/Select/controlPanel.ts:121
+msgid "Search all filter options"
+msgstr "PoIšči vse možnosti filtra"
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:234
+#: superset-frontend/src/filters/components/Select/controlPanel.ts:123
+msgid ""
+"By default, each filter loads at most 1000 choices at the initial page load. "
+"Check this box if you have more than 1000 filter values and want to enable "
+"dynamically searching that loads filter values as users type (may add stress "
+"to your database)."
+msgstr ""
+"Privzeto vsak filter pri nalaganju začetne strani naloži največ 1000 "
+"možnosti. Označite polje, če imate več kot 1000 vrednosti filtra in želite "
+"omogočiti dinamično iskanje, ki nalaga vrednosti filtra ko uporabnik tipka "
+"(to lahko preobremeni vašo podatkovno bazo)."
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:253
+#: superset-frontend/src/filters/components/Select/controlPanel.ts:77
+msgid "Required"
+msgstr "Obvezno"
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:254
+msgid "User must select a value for this filter"
+msgstr "Uporabnik mora izbrati vrednost za ta filter"
+
+#: superset-frontend/src/explore/components/controls/FilterBoxItemControl/index.jsx:283
+msgid "Filter configuration"
+msgstr "Nastavitve filtra"
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx:202
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:379
+msgid "Simple"
+msgstr "Preprosto"
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx:219
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:413
+msgid "Custom SQL"
+msgstr "Prilagojen SQL"
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:321
+msgid "No such column found. To filter on a metric, try the Custom SQL tab."
+msgstr ""
+"Tak stolpec ni najden. Za filtriranje po meri uporabite prilagojen SQL "
+"zavihek."
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:330
+#, python-format
+msgid "%s column(s) and metric(s)"
+msgstr "Stolpcev in mer: %s"
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:343
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:296
+#, python-format
+msgid "%s column(s)"
+msgstr "Stolpci: %s"
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:344
+msgid "To filter on a metric, use Custom SQL tab."
+msgstr "Za filtriranje po meri uporabite prilagojen SQL zavihek."
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:351
+#, python-format
+msgid "%s operator(s)"
+msgstr "Operatorji: %s"
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:373
+msgid "Type a value here"
+msgstr "Vnesite vrednost sem"
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.jsx:452
+msgid "Filter value (case sensitive)"
+msgstr "Vrednost filtra (razlik. velikih/malih črk)"
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent/index.jsx:95
+msgid "choose WHERE or HAVING..."
+msgstr "izberite WHERE ali HAVING..."
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent/index.jsx:131
+msgid "Filters by columns"
+msgstr "Filtrira po stolpcu"
+
+#: superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent/index.jsx:133
+msgid "Filters by metrics"
+msgstr "Filtrira po merah"
+
+#: superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.jsx:149
+msgid "Fixed"
+msgstr "Fiksno"
+
+#: superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.jsx:165
+msgid "Based on a metric"
+msgstr "Osnovan na meri"
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopoverTitle.jsx:73
+msgid "My metric"
+msgstr "Moja mera"
+
+#: superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.jsx:415
+msgid "Add metric"
+msgstr "Dodaj mero"
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:307
+#, python-format
+msgid "%s aggregates(s)"
+msgstr "Agreg. funkcije: %s"
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:316
+#, python-format
+msgid "%s saved metric(s)"
+msgstr "Shranjene mere: %s"
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:357
+msgid "Saved"
+msgstr "Shranjeno"
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:358
+msgid "Saved metric"
+msgstr "Shranjena mera"
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:380
+msgid "column"
+msgstr "stolpec"
+
+#: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx:397
+msgid "aggregate"
+msgstr "agregacija"
+
+#: superset-frontend/src/explore/components/controls/OptionControls/index.tsx:301
+msgid ""
+"\r\n"
+"                This filter was inherited from the dashboard's context.\r\n"
+"                It won't be saved when saving the chart.\r\n"
+"              "
+msgstr ""
+"\r\n"
+"                Ta filter izvira iz nadzorne plošče.\r\n"
+"                Ne bo se shranil pri shranjevanju grafikona.\r\n"
+"                "
+
+#: superset-frontend/src/explore/components/controls/SelectAsyncControl/index.jsx:45
+msgid "Error while fetching data"
+msgstr "Napaka pri pridobivanju podatkov"
+
+#: superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.jsx:48
+#: superset-frontend/src/explore/controlPanels/TimeTable.js:38
+msgid "Time series columns"
+msgstr "Stolpci s časovnimi vrstami"
+
+#: superset-frontend/src/explore/components/controls/VizTypeControl/index.jsx:106
+msgid "This visualization type is not supported."
+msgstr "Ta tip vizualizacije ni podprt."
+
+#: superset-frontend/src/explore/components/controls/VizTypeControl/index.jsx:198
+msgid "Click to change visualization type"
+msgstr "Kliknite za spremembo tipa vizualizacije"
+
+#: superset-frontend/src/explore/components/controls/VizTypeControl/index.jsx:214
+msgid "Select a visualization type"
+msgstr "Izberite tip vizualizacije"
+
+#: superset-frontend/src/explore/controlPanels/Separator.js:25
+#: superset-frontend/src/explore/controlPanels/Separator.js:46
+msgid "Code"
+msgstr "Koda"
+
+#: superset-frontend/src/explore/controlPanels/Separator.js:32
+msgid "Markup type"
+msgstr "Tip označevanja"
+
+#: superset-frontend/src/explore/controlPanels/Separator.js:37
+msgid "Pick your favorite markup language"
+msgstr "Izberite svoj priljubljen označevalni jezik"
+
+#: superset-frontend/src/explore/controlPanels/Separator.js:47
+msgid "Put your code here"
+msgstr "Vstavite svojo kodo sem"
+
+#: superset-frontend/src/explore/controlPanels/TimeTable.js:26
+#: superset-frontend/src/explore/controlPanels/sections.tsx:113
+#: superset-frontend/src/filters/components/Range/controlPanel.ts:30
+#: superset-frontend/src/filters/components/Select/controlPanel.ts:38
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:179
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/Multi/controlPanel.js:60
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.js:44
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Geojson/controlPanel.js:47
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Grid/controlPanel.js:39
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Hex/controlPanel.js:47
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Path/controlPanel.js:41
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.js:56
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.js:54
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Screengrid/controlPanel.js:39
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:32
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-chord/src/controlPanel.ts:26
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-country-map/src/controlPanel.ts:32
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx:90
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/controlPanel.ts:26
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:60
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.ts:55
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.ts:26
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:45
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/controlPanel.ts:26
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-parallel-coordinates/src/controlPanel.ts:26
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:36
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.ts:33
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:34
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sankey-loop/src/controlPanel.ts:26
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sankey/src/controlPanel.ts:26
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sunburst/src/controlPanel.ts:26
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-time-table/src/controlPanel.ts:26
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-treemap/src/controlPanel.ts:31
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.ts:26
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:28
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumberTotal/controlPanel.ts:27
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:43
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:26
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:39
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:50
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:156
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:335
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:26
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/TimePivot/controlPanel.ts:39
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts:35
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx:40
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:33
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:40
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:48
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx:68
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:66
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:38
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Treemap/controlPanel.tsx:43
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:31
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:169
+#: superset-ui/superset-ui/plugins/plugin-chart-word-cloud/src/plugin/controlPanel.ts:26
+#: superset-ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/controlPanel.ts:26
+msgid "Query"
+msgstr "Poizvedba"
+
+#: superset-frontend/src/explore/controlPanels/TimeTable.js:50
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-time-table/src/controlPanel.ts:49
+msgid "URL"
+msgstr "URL"
+
+#: superset-frontend/src/explore/controlPanels/TimeTable.js:51
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-time-table/src/controlPanel.ts:50
+msgid ""
+"Templated link, it's possible to include {{ metric }} or other values coming "
+"from the controls."
+msgstr ""
+"Vzorčna povezava, vključiti je mogoče {{ metric }} ali drugo vrednost iz "
+"kontrolnikov."
+
+# SUPERSET UI
+#: superset-frontend/src/explore/controlPanels/sections.tsx:25
+#: superset-frontend/src/explore/controlPanels/sections.tsx:84
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:191
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/constants.ts:33
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/sections.tsx:28
+msgid "Time"
+msgstr "Čas"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:27
+#: superset-frontend/src/explore/controlPanels/sections.tsx:85
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/sections.tsx:30
+msgid "Time related form attributes"
+msgstr "S časom povezani atributi prikaza"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:32
+msgid "Chart type"
+msgstr "Tip grafikona"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:42
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/sections.tsx:60
+msgid "Chart ID"
+msgstr "ID grafikona"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:44
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/sections.tsx:62
+msgid "The id of the active chart"
+msgstr "Identifikator aktivnega grafikona"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:51
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/sections.tsx:69
+msgid "Cache Timeout (seconds)"
+msgstr "Trajanje predpomnilnika (sekunde)"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:53
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/sections.tsx:71
+msgid "The number of seconds before expiring the cache"
+msgstr "Trajanje (v sekundah) do razveljavitve predpomnilnika"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:60
+msgid "URL parameters"
+msgstr "Parametri URL"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:62
+msgid "Extra parameters for use in jinja templated queries"
+msgstr "Dodatni parametri za poizvedbe z jinja predlogami"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:69
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/sections.tsx:98
+msgid "Time range endpoints"
+msgstr "Krajne točke časovnega obdobja"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:71
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/sections.tsx:100
+msgid "Time range endpoints (SIP-15)"
+msgstr "Krajne točke časovnega obdobja (SIP-15)"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:91
+msgid "Annotations and layers"
+msgstr "Oznake in sloji"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:127
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.ts:40
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/controlPanel.ts:47
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-parallel-coordinates/src/controlPanel.ts:42
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:50
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.ts:49
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:48
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-treemap/src/controlPanel.ts:46
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:55
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:350
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:94
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:97
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:317
+msgid "Whether to sort descending or ascending"
+msgstr "Če želite padajoče ali naraščajoče razvrščanje"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:134
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.ts:47
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/controlPanel.ts:54
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:57
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:55
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:64
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:359
+msgid "Contribution"
+msgstr "Prispevek"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:136
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.ts:49
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/controlPanel.ts:56
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:59
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:57
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:66
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:361
+msgid "Compute the contribution to the total"
+msgstr "Izračunaj prispevek k celoti"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:144
+msgid "Advanced analytics"
+msgstr "Napredna analitika"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:146
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:230
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:125
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:371
+msgid ""
+"This section contains options that allow for advanced analytical post "
+"processing of query results"
+msgstr ""
+"Ta sekcija vsebuje možnosti, ki omogočajo napredno analitično poprocesiranje "
+"rezultatov poizvedb"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:152
+msgid "Rolling window"
+msgstr "Drseče okno"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:158
+msgid "Rolling function"
+msgstr "Drseča funkcija"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:167
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:247
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:142
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:126
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:386
+msgid ""
+"Defines a rolling window function to apply, works along with the [Periods] "
+"text box"
+msgstr ""
+"Določi funkcijo drsečega okna. Dela skupaj s tekstovnim okvirjem [Obdobja]"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:177
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:259
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:154
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:138
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:398
+msgid "Periods"
+msgstr "Št. period"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:179
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:261
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:156
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:140
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:400
+msgid ""
+"Defines the size of the rolling window function, relative to the time "
+"granularity selected"
+msgstr ""
+"Določi velikost funkcije drsečega okna, glede na izbrano granulacijo časa"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:189
+msgid "Min periods"
+msgstr "Min. št. period"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:191
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:273
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:168
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:154
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:414
+msgid ""
+"The minimum number of rolling periods required to show a value. For instance "
+"if you do a cumulative sum on 7 days you may want your \"Min Period\" to be "
+"7, so that all data points shown are the total of 7 periods. This will hide "
+"the \"ramp up\" taking place over the first 7 periods"
+msgstr ""
+"Minimalno število drsečih obdobij, potrebnih za prikaz vrednosti. Če "
+"računate kumulativno vsoto 7-dnevnega obdobja, boste nastavili \"Min. št. "
+"period\" na 7. Tako bodo vse prikazane točke skupaj obsegale 7 obdobij. To "
+"bo prikrilo rampo, ki bi trajala prvih 7 obdobij"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:201
+msgid "Time comparison"
+msgstr "Časovna primerjava"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:209
+msgid "Time shift"
+msgstr "Časovni zamik"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:220
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:304
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:199
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:443
+msgid ""
+"Overlay one or more timeseries from a relative time period. Expects relative "
+"time deltas in natural language (example:  24 hours, 7 days, 52 weeks, 365 "
+"days). Free text is supported."
+msgstr ""
+"Zamaknite eno ali več časovnih vrst za relativno časovno obdobje. Vnaša se "
+"relativne časovne razlike v naravnem jeziku (npr. 24 ur, 7 dni, 52 tednov, "
+"365 dni). Prosto besedilo je podprto."
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:232
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:316
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:211
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:457
+msgid "Calculation type"
+msgstr "Tip izračuna"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:240
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:324
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:219
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:465
+msgid ""
+"How to display time shifts: as individual lines; as the absolute difference "
+"between the main time series and each time shift; as the percentage change; "
+"or as the ratio between series and time shifts."
+msgstr ""
+"Način prikaza časovnih zamikov: kot samostojne črte; kot absolutne razlike "
+"med osnovno časovno vrsto in vsakim časovnim zamikom; kot procentualna "
+"sprememba; kot razmerje med vrsto in časovnim zamikom."
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:248
+msgid "Python functions"
+msgstr "Pythonove funkcije"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:258
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:344
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:239
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:481
+msgid "Rule"
+msgstr "Pravilo"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:261
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:347
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:242
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:484
+msgid "Pandas resample rule"
+msgstr "Pravilo za prevzorčenje v Pandas"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:269
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:355
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:250
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:494
+msgid "Method"
+msgstr "Metoda"
+
+#: superset-frontend/src/explore/controlPanels/sections.tsx:279
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:358
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:253
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:497
+msgid "Pandas resample method"
+msgstr "Metoda za prevzorčenje v Pandas"
+
+#: superset-frontend/src/filters/components/GroupBy/GroupByFilterPlugin.tsx:71
+msgid "No columns"
+msgstr "Brez stolpcev"
+
+#: superset-frontend/src/filters/components/GroupBy/GroupByFilterPlugin.tsx:72
+#: superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx:246
+#: superset-frontend/src/filters/components/TimeColumn/TimeColumnFilterPlugin.tsx:85
+#: superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.tsx:82
+#, python-format
+msgid "%s option"
+msgstr "%s možnost"
+
+#: superset-frontend/src/filters/components/GroupBy/controlPanel.ts:31
+#: superset-frontend/src/filters/components/Select/controlPanel.ts:43
+msgid "UI Configuration"
+msgstr "UI nastavitve"
+
+#: superset-frontend/src/filters/components/GroupBy/controlPanel.ts:39
+#: superset-frontend/src/filters/components/Select/controlPanel.ts:63
+msgid "Multiple select"
+msgstr "Več izborov"
+
+#: superset-frontend/src/filters/components/GroupBy/controlPanel.ts:44
+#: superset-frontend/src/filters/components/Select/controlPanel.ts:68
+msgid "Allow selecting multiple values"
+msgstr "Dovoli izbiro več vrednosti"
+
+#: superset-frontend/src/filters/components/GroupBy/index.ts:28
+msgid "Group By"
+msgstr "Združevanje (Group by)"
+
+#: superset-frontend/src/filters/components/GroupBy/index.ts:29
+msgid "Group By filter plugin"
+msgstr "Vtičnik za filter za združevanje"
+
+#: superset-frontend/src/filters/components/Range/RangeFilterPlugin.tsx:79
+msgid "Chosen non-numeric column"
+msgstr "Izbran ne-numeričen stolpec"
+
+#: superset-frontend/src/filters/components/Range/index.ts:28
+msgid "Range filter"
+msgstr "Filter obdobja"
+
+#: superset-frontend/src/filters/components/Range/index.ts:29
+msgid "Range filter plugin using AntD"
+msgstr "Vtičnik za filter obdobja z uporabo AntD"
+
+#: superset-frontend/src/filters/components/Select/controlPanel.ts:80
+msgid ""
+"User must select a value for this filter when filter is in single select "
+"mode. If selection is empty, an always false filter is emitted."
+msgstr ""
+"Uporabnik mora izbrati vrednost filtra, ko je le-ta v načinu posamičnega "
+"izbora. Če je izbor prazen, je oddan vedno napačen (false) filter."
+
+#: superset-frontend/src/filters/components/Select/controlPanel.ts:92
+msgid "Default to first item"
+msgstr "Privzet prvi element"
+
+#: superset-frontend/src/filters/components/Select/controlPanel.ts:97
+msgid "Select first item by default"
+msgstr "Kot privzeta vrednost je izbran prvi element"
+
+#: superset-frontend/src/filters/components/Select/controlPanel.ts:108
+msgid "Inverse selection"
+msgstr "Invertiraj izbiro"
+
+#: superset-frontend/src/filters/components/Select/controlPanel.ts:110
+msgid "Exclude selected values"
+msgstr "Izloči izbrane vrednosti"
+
+#: superset-frontend/src/filters/components/Select/index.ts:28
+msgid "Select filter"
+msgstr "Izbirni filter"
+
+#: superset-frontend/src/filters/components/Select/index.ts:29
+msgid "Select filter plugin using AntD"
+msgstr "Izberite Vtičnik za filter z uporabo AntD"
+
+#: superset-frontend/src/filters/components/Time/index.ts:27
+msgid "Time filter"
+msgstr "Časovni filter"
+
+#: superset-frontend/src/filters/components/Time/index.ts:28
+msgid "Custom time filter plugin"
+msgstr "Prilagojeni vtičnik za časovni filter"
+
+#: superset-frontend/src/filters/components/TimeColumn/TimeColumnFilterPlugin.tsx:84
+msgid "No time columns"
+msgstr "Ni časovnih stolpcev"
+
+#: superset-frontend/src/filters/components/TimeColumn/index.ts:29
+msgid "Time column filter plugin"
+msgstr "Vtičnik za časovni filter"
+
+#: superset-frontend/src/filters/components/TimeGrain/index.ts:29
+msgid "Time grain filter plugin"
+msgstr "Vtičnik za filter časovne granulacije"
+
+#: superset-frontend/src/profile/components/App.tsx:52
+msgid "Favorites"
+msgstr "Priljubljene"
+
+#: superset-frontend/src/profile/components/App.tsx:62
+msgid "Created content"
+msgstr "Ustvarjena vsebina"
+
+#: superset-frontend/src/profile/components/App.tsx:72
+msgid "Recent activity"
+msgstr "Nedavna aktivnost"
+
+#: superset-frontend/src/profile/components/App.tsx:82
+msgid "Security & Access"
+msgstr "Varnost in Dostopi"
+
+#: superset-frontend/src/profile/components/CreatedContent.tsx:45
+msgid "No charts"
+msgstr "Ni grafikonov"
+
+#: superset-frontend/src/profile/components/CreatedContent.tsx:63
+msgid "No dashboards"
+msgstr "Ni nadzornih plošč"
+
+#: superset-frontend/src/profile/components/Favorites.tsx:46
+msgid "No favorite charts yet, go click on stars!"
+msgstr "Priljubljenih grafikonov še ni. Kliknite na zvezdice!"
+
+#: superset-frontend/src/profile/components/Favorites.tsx:64
+msgid "No favorite dashboards yet, go click on stars!"
+msgstr "Priljubljenih nadzornih plošč še ni. Kliknite na zvezdice!"
+
+#: superset-frontend/src/profile/components/UserInfo.tsx:44
+msgid "Profile picture provided by Gravatar"
+msgstr "Profilno sliko je zagotovil Gravatar"
+
+#: superset-frontend/src/profile/components/UserInfo.tsx:63
+msgid "joined"
+msgstr "pridružen"
+
+#: superset-frontend/src/profile/components/UserInfo.tsx:75
+msgid "id:"
+msgstr "id:"
+
+#: superset-frontend/src/utils/downloadAsImage.ts:63
+msgid "Image download failed, please refresh and try again."
+msgstr "Prenos slike ni uspel. Osvežite in poskusite ponovno."
+
+#: superset-frontend/src/utils/getClientErrorObject.ts:60
+msgid "Unexpected error: "
+msgstr "Nepričakovana napaka: "
+
+#: superset-frontend/src/utils/getClientErrorObject.ts:61
+msgid "(no description, click to see stack trace)"
+msgstr "(ni opisa, kliknite za ogled zapisov)"
+
+#: superset-frontend/src/utils/getClientErrorObject.ts:123
+msgid "Issue 1000 - The dataset is too large to query."
+msgstr "Težava 1000 - podatkovni vir je prevelik za poizvedbo."
+
+#: superset-frontend/src/views/CRUD/hooks.ts:99
+#, python-format
+msgid "An error occurred while fetching %s info: %s"
+msgstr "Napaka pri pridobivanju informacij za %s: %s"
+
+#: superset-frontend/src/views/CRUD/hooks.ts:165
+#: superset-frontend/src/views/CRUD/hooks.ts:255
+#: superset-frontend/src/views/CRUD/hooks.ts:339
+#, python-format
+msgid "An error occurred while fetching %ss: %s"
+msgstr "Napaka pri pridobivanju informacij za %s: %s"
+
+#: superset-frontend/src/views/CRUD/hooks.ts:297
+#, python-format
+msgid "An error occurred while creating %ss: %s"
+msgstr "Napaka pri ustvarjanju %s: %s"
+
+#: superset-frontend/src/views/CRUD/hooks.ts:471
+#: superset-frontend/src/views/CRUD/hooks.ts:481
+#, python-format
+msgid "An error occurred while importing %s: %s"
+msgstr "Napaka pri uvažanju %s: %s"
+
+#: superset-frontend/src/views/CRUD/hooks.ts:552
+#, python-format
+msgid "There was an error fetching the favorite status: %s"
+msgstr "Napaka pri pridobivanju statusa \"Priljubljeno\": %s"
+
+#: superset-frontend/src/views/CRUD/hooks.ts:573
+#, python-format
+msgid "There was an error saving the favorite status: %s"
+msgstr "Napaka pri shranjevanju statusa \"Priljubljeno\": %s"
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:218
+#: superset-frontend/src/views/CRUD/hooks.ts:632
+msgid "Link Copied!"
+msgstr "Povezava kopirana!"
+
+#: superset-frontend/src/views/CRUD/hooks.ts:650
+msgid "Connection looks good!"
+msgstr "Povezava izgleda v redu!"
+
+#: superset-frontend/src/views/CRUD/hooks.ts:653
+msgid "${t('ERROR: ')}${parsedErrorMessage(errMsg)}"
+msgstr "${t('NAPAKA: ')}${parsedErrorMessage(errMsg)}"
+
+#: superset-frontend/src/views/CRUD/utils.tsx:146
+msgid "There was an error fetching your recent activity:"
+msgstr "Pri pridobivanju nedavnih aktivnosti je prišlo do napake:"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:153
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:108
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:95
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:96
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:139
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:530
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:234
+#: superset-frontend/src/views/CRUD/utils.tsx:216
+#: superset-frontend/src/views/CRUD/utils.tsx:281
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:167
+#, python-format
+msgid "Deleted: %s"
+msgstr "Izbrisanih: %s"
+
+#: superset-frontend/src/views/CRUD/utils.tsx:219
+#, python-format
+msgid "There was an issue deleting: %s"
+msgstr "Težava pri brisanju: %s"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:156
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:112
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:98
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:100
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:146
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:534
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:237
+#: superset-frontend/src/views/CRUD/utils.tsx:285
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:170
+#, python-format
+msgid "There was an issue deleting %s: %s"
+msgstr "Težava pri brisanju %s: %s"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:80
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:473
+msgid "report"
+msgstr "poročilo"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:80
+msgid "alert"
+msgstr "opozorilo"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:81
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:107
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:116
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:72
+msgid "reports"
+msgstr "poročila"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:81
+msgid "alerts"
+msgstr "opozorila"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:171
+#, python-format
+msgid "There was an issue deleting the selected %s: %s"
+msgstr "Težava pri brisanju izbranih %s: %s"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:219
+msgid "Last run"
+msgstr "Zadnji zagon"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:251
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1331
+msgid "Notification method"
+msgstr "Način obveščanja"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:298
+msgid "Execution log"
+msgstr "Dnevnik izvajanja"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:326
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:195
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:254
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:381
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:232
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:359
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:369
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:389
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:318
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:405
+msgid "Actions"
+msgstr "Aktivnosti"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:353
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:218
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:282
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:550
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:265
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:497
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:479
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:170
+msgid "Bulk select"
+msgstr "Izberi hkrati"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:367
+#, python-format
+msgid "No %s yet"
+msgstr "%s še ne obstajajo"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:374
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:217
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:291
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:294
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:431
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:195
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:276
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:265
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:409
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:286
+msgid "Created by"
+msgstr "Ustvaril/a"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:383
+#, python-format
+msgid "An error occurred while fetching created by values: %s"
+msgstr "Pri pridobivanju vrednosti \"ustvaril/a\" je prišlo do napake: %s"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:390
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:244
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:430
+msgid "Status"
+msgstr "Status"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:396
+msgid "${AlertState.success}"
+msgstr "${AlertState.success}"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:397
+msgid "${AlertState.working}"
+msgstr "${AlertState.working}"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:398
+msgid "${AlertState.error}"
+msgstr "${AlertState.error}"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:399
+msgid "${AlertState.noop}"
+msgstr "${AlertState.noop}"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:400
+msgid "${AlertState.grace}"
+msgstr "${AlertState.grace}"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:417
+msgid "Alerts & reports"
+msgstr "Opozorila in poročila"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:428
+msgid "Reports"
+msgstr "Poročila"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:454
+#, python-format
+msgid "This action will permanently delete %s."
+msgstr "S tem dejanjem boste trajno izbrisali %s."
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:465
+#, python-format
+msgid "Delete %s?"
+msgstr "Izbrišem %s?"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:469
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:306
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:370
+#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:75
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:318
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:596
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:328
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:106
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:297
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:535
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:600
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:491
+msgid "Please confirm"
+msgstr "Prosim, potrdite"
+
+#: superset-frontend/src/views/CRUD/alert/AlertList.tsx:470
+#, python-format
+msgid "Are you sure you want to delete the selected %s?"
+msgstr "Ali ste prepričani, da želite izbrisati izbrane %s?"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:68
+msgid "< (Smaller than)"
+msgstr "< (manjše kot)"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:72
+msgid "> (Larger than)"
+msgstr "> (večje kot)"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:76
+msgid "<= (Smaller or equal)"
+msgstr "<= (manjše ali enako)"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:80
+msgid ">= (Larger or equal)"
+msgstr ">= (večje ali enako)"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:84
+msgid "== (Is equal)"
+msgstr "== (je enako)"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:88
+msgid "!= (Is not equal)"
+msgstr "!= (ni enako)"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:92
+msgid "Not null"
+msgstr "Ni nič (null)"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:103
+msgid "30 days"
+msgstr "30 dni"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:107
+msgid "60 days"
+msgstr "60 dni"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:111
+msgid "90 days"
+msgstr "90 dni"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:375
+msgid "Add notification method"
+msgstr "Dodajte način obveščanja"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:376
+msgid "Add delivery method"
+msgstr "Dodajte način dostave"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1023
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:289
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:241
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:232
+#: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:106
+msgid "Add"
+msgstr "Dodaj"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1035
+msgid "Edit ${isReport ? 'Report' : 'Alert'}"
+msgstr "Uredi ${isReport ? 'Report' : 'Alert'}"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1036
+msgid "Add ${isReport ? 'Report' : 'Alert'}"
+msgstr "Add ${isReport ? 'Report' : 'Alert'}"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1044
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1052
+msgid "Report name"
+msgstr "Naslov poročila"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1044
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1052
+msgid "Alert name"
+msgstr "Naslov opozorila"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1099
+msgid "Alert condition"
+msgstr "Status opozorila"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1144
+msgid "Trigger Alert If..."
+msgstr "Sproži opozorilo v primeru ..."
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1168
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1184
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:140
+msgid "Value"
+msgstr "Vrednost"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1196
+msgid "Report schedule"
+msgstr "Urnik poročanja"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1197
+msgid "Alert condition schedule"
+msgstr "Urnik statusov opozoril"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1208
+msgid "Schedule settings"
+msgstr "Nastavitve urnika"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1212
+msgid "Log retention"
+msgstr "Hranjenje dnevnikov"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1236
+msgid "Working timeout"
+msgstr "Pretek delovanja"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1245
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1260
+msgid "Time in seconds"
+msgstr "Čas v sekundah"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1253
+msgid "Grace period"
+msgstr "Obdobje mirovanja"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1270
+msgid "Message content"
+msgstr "Vsebina sporočila"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1283
+msgid "Send as PNG"
+msgstr "Pošlji kot PNG"
+
+#: superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx:1284
+msgid "Send as CSV"
+msgstr "Pošlji kot CSV"
+
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:63
+msgid "log"
+msgstr "dnevnik"
+
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:94
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:357
+msgid "State"
+msgstr "Status"
+
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:105
+msgid "Execution ID"
+msgstr "ID izvedbe"
+
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:117
+msgid "Scheduled at (UTC)"
+msgstr "Izvede se ob (UTC)"
+
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:125
+msgid "Start at (UTC)"
+msgstr "Zažene se ob (UTC)"
+
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:135
+msgid "Duration"
+msgstr "Trajanje"
+
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:144
+msgid "Error message"
+msgstr "Sporočilo napake"
+
+#: superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx:156
+msgid "${alertResource?.type}"
+msgstr "${alertResource?.type}"
+
+#: superset-frontend/src/views/CRUD/alert/components/AlertReportCronScheduler.tsx:77
+msgid "CRON expression"
+msgstr "Izraz CRON"
+
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:67
+msgid "Report sent"
+msgstr "Poročilo poslano"
+
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:68
+msgid "Alert triggered, notification sent"
+msgstr "Opozorilo sproženo, obvestilo poslano"
+
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:74
+msgid "Report sending"
+msgstr "Pošiljanje poročila"
+
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:75
+msgid "Alert running"
+msgstr "Opozorilo aktivno"
+
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:81
+msgid "Report failed"
+msgstr "Poročilo ni uspelo"
+
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:82
+msgid "Alert failed"
+msgstr "Opozorilo ni uspelo"
+
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:87
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:97
+msgid "Nothing triggered"
+msgstr "Ni ni sproženo"
+
+#: superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx:92
+msgid "Alert Triggered, In Grace Period"
+msgstr "Opozorilo sproženo, v obdobju mirovanja"
+
+#: superset-frontend/src/views/CRUD/alert/components/NotificationMethod.tsx:164
+msgid "Recipients are separated by \",\" or \";\""
+msgstr "Prejemniki so ločeni z \",\" ali \";\""
+
+#: superset-frontend/src/views/CRUD/alert/components/RecipientIcon.tsx:38
+msgid "${RecipientIconName.email}"
+msgstr "${RecipientIconName.email}"
+
+#: superset-frontend/src/views/CRUD/alert/components/RecipientIcon.tsx:42
+msgid "${RecipientIconName.slack}"
+msgstr "${RecipientIconName.slack}"
+
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:64
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:111
+msgid "annotation"
+msgstr "oznaka"
+
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:132
+#, python-format
+msgid "There was an issue deleting the selected annotations: %s"
+msgstr "Pri brisanju izbranih oznak je prišlo do težave: %s"
+
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:180
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:299
+msgid "Edit annotation"
+msgstr "Uredi oznako"
+
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:187
+msgid "Delete annotation"
+msgstr "Izbriši oznako"
+
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:208
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:255
+msgid "Annotation"
+msgstr "Oznaka"
+
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:261
+msgid "No annotation yet"
+msgstr "Oznak še ni"
+
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:270
+msgid "Annotation Layer ${annotationLayerName}"
+msgstr "Sloj z oznakami ${annotationLayerName}"
+
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:292
+msgid ""
+"Are you sure you want to delete ${annotationCurrentlyDeleting?.short_descr}?"
+msgstr ""
+"Ste prepričani, da želite izbrisati ${annotationCurrentlyDeleting?."
+"short_descr}?"
+
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:302
+msgid "Delete Annotation?"
+msgstr "Izbrišem oznako?"
+
+#: superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx:307
+msgid "Are you sure you want to delete the selected annotations?"
+msgstr "Ali ste prepričani, da želite izbrisati izbrane oznake?"
+
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:299
+msgid "Add annotation"
+msgstr "Dodaj oznako"
+
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:308
+msgid "Annotation name"
+msgstr "Ime oznake"
+
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:320
+msgid "date"
+msgstr "datum"
+
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:340
+msgid "Additional information"
+msgstr "Dodatne informacije"
+
+#: superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx:347
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:277
+msgid "Description (this can be seen in the list)"
+msgstr "Opis (lahko je viden na seznamu)"
+
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:108
+msgid "annotation_layer"
+msgstr "annotation_layer"
+
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:252
+msgid "Edit annotation layer properties"
+msgstr "Uredi lastnosti sloja z oznakami"
+
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx:262
+msgid "Annotation layer name"
+msgstr "Ime sloja z oznakami"
+
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:70
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:348
+msgid "Annotation layers"
+msgstr "Sloji z oznakami"
+
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:115
+#, python-format
+msgid "There was an issue deleting the selected layers: %s"
+msgstr "Pri brisanju izbranih slojev je prišlo do težave: %s"
+
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:185
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:278
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:161
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:301
+msgid "Last modified"
+msgstr "Zadnja sprememba"
+
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:210
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:187
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:341
+msgid "Created on"
+msgstr "Ustvarjeno"
+
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:235
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:213
+msgid "Edit template"
+msgstr "Uredi predlogo"
+
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:244
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:222
+msgid "Delete template"
+msgstr "Izbriši predlogo"
+
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:270
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:327
+msgid "Annotation layer"
+msgstr "Sloj z oznakami"
+
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:300
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:285
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:426
+#, python-format
+msgid "An error occurred while fetching dataset datasource values: %s"
+msgstr ""
+"Pri pridobivanju vrednosti podatkovnega vira podatkovnega seta je prišlo do "
+"napake: %s"
+
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:333
+msgid "No annotation layers yet"
+msgstr "Slojev z oznakami še ni"
+
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:358
+msgid "This action will permanently delete the layer."
+msgstr "S tem dejanjem boste trajno izbrisali sloj."
+
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:366
+msgid "Delete Layer?"
+msgstr "Izbrišem sloj?"
+
+#: superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx:371
+msgid "Are you sure you want to delete the selected layers?"
+msgstr "Ali ste prepričani, da želite izbrisati izbrane sloje?"
+
+#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:78
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:321
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:109
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:300
+msgid "Are you sure you want to delete"
+msgstr "Ali ste prepričani, da želite izbrisati"
+
+#: superset-frontend/src/views/CRUD/chart/ChartCard.tsx:151
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:163
+#, python-format
+msgid "Last modified %s"
+msgstr "Zadnja sprememba %s"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:61
+msgid ""
+"The passwords for the databases below are needed in order to import them "
+"together with the charts. Please note that the \"Secure Extra\" and "
+"\"Certificate\" sections of the database configuration are not present in "
+"export files, and should be added manually after the import if they are "
+"needed."
+msgstr ""
+"Gesla za spodnje podatkovne baze so potrebna za uvoz skupaj z grafikoni. "
+"Sekciji \"Dodatna varnost\" in \"Certifikati\" v nastavitvah podatkovne baze "
+"nista prisotni v izvoženih datotekah in jih je potrebno dodati ročno po "
+"uvozu, če je to potrebno."
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:68
+msgid ""
+"You are importing one or more charts that already exist. Overwriting might "
+"cause you to lose some of your work. Are you sure you want to overwrite?"
+msgstr ""
+"Uvažate enega ali več grafikonov, ki že obstajajo. S prepisom lahko izgubite "
+"podatke. Ali ste prepričani, da želite prepisati?"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:193
+#, python-format
+msgid "There was an issue deleting the selected charts: %s"
+msgstr "Pri brisanju izbranih grafikonov je prišlo do težave: %s"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:268
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:233
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:303
+msgid "Modified by"
+msgstr "Spremenil/a"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:396
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:374
+#: superset-frontend/src/views/CRUD/welcome/ChartTable.tsx:152
+#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:125
+#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:151
+msgid "Favorite"
+msgstr "Priljubljene"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:401
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:379
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:434
+msgid "Any"
+msgstr "Katerikoli"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:403
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:381
+msgid "Yes"
+msgstr "Da"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:404
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:382
+msgid "No"
+msgstr "Ne"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:410
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:388
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:401
+msgid "Owner"
+msgstr "Lastnik"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:414
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:435
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:456
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:481
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:392
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:413
+msgid "All"
+msgstr "Vsi"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:420
+#, python-format
+msgid "An error occurred while fetching chart owners values: %s"
+msgstr "Pri pridobivanju polja lastnik grafikona je prišlo do napake: %s"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:441
+#, python-format
+msgid "An error occurred while fetching chart created by values: %s"
+msgstr "Pri pridobivanju polja grafikon ustvaril/a je prišlo do napake: %s"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:452
+msgid "Viz type"
+msgstr "Tip vizualizacije"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:485
+#, python-format
+msgid "An error occurred while fetching chart dataset values: %s"
+msgstr ""
+"Pri pridobivanju polja podatkovni set za grafikon je prišlo do napake: %s"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:507
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:453
+msgid "Alphabetical"
+msgstr "Po abecedi"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:513
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:459
+msgid "Recently modified"
+msgstr "Nedavno spremenjeno"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:519
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:465
+msgid "Least recently modified"
+msgstr "Zadnje spremenjeno"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:574
+msgid "Import charts"
+msgstr "Uvozi grafikone"
+
+#: superset-frontend/src/views/CRUD/chart/ChartList.tsx:597
+msgid "Are you sure you want to delete the selected charts?"
+msgstr "Ali ste prepričani, da želite izbrisati izbrane grafikone?"
+
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:97
+msgid "css_template"
+msgstr "css_template"
+
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:243
+msgid "Edit CSS template properties"
+msgstr "Uredi lastnosti CSS predloge"
+
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:244
+msgid "Add CSS template"
+msgstr "Dodaj CSS predlogo"
+
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:253
+msgid "CSS template name"
+msgstr "Ime CSS predloge"
+
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx:265
+msgid "css"
+msgstr "css"
+
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:69
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:243
+msgid "CSS templates"
+msgstr "CSS predloge"
+
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:118
+#, python-format
+msgid "There was an issue deleting the selected templates: %s"
+msgstr "Pri brisanju izbranih predlog je prišlo do težave: %s"
+
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:154
+#, python-format
+msgid "Last modified by %s"
+msgstr "Nazadnje spremenil/a %s"
+
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:252
+msgid "CSS template"
+msgstr "CSS predloga"
+
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:316
+msgid "This action will permanently delete the template."
+msgstr "S tem dejanjem boste trajno izbrisali predlogo."
+
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:324
+msgid "Delete Template?"
+msgstr "Izbrišem predlogo?"
+
+#: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx:329
+msgid "Are you sure you want to delete the selected templates?"
+msgstr "Ali ste prepričani, da želite izbrisati izbrane predloge?"
+
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:152
+msgid "published"
+msgstr "objavljeno"
+
+#: superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx:152
+msgid "draft"
+msgstr "osnutek"
+
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:54
+msgid ""
+"The passwords for the databases below are needed in order to import them "
+"together with the dashboards. Please note that the \"Secure Extra\" and "
+"\"Certificate\" sections of the database configuration are not present in "
+"export files, and should be added manually after the import if they are "
+"needed."
+msgstr ""
+"Gesla za spodnje podatkovne baze so potrebna za uvoz skupaj z nadzornimi "
+"ploščami. Sekciji \"Dodatna varnost\" in \"Certifikati\" v nastavitvah "
+"podatkovne baze nista prisotni v izvoženih datotekah in jih je potrebno "
+"dodati ročno po uvozu, če je to potrebno."
+
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:61
+msgid ""
+"You are importing one or more dashboards that already exist. Overwriting "
+"might cause you to lose some of your work. Are you sure you want to "
+"overwrite?"
+msgstr ""
+"Uvažate eno ali več nadzornih plošč, ki že obstajajo. S prepisom lahko "
+"izgubite podatke. Ali ste prepričani, da želite prepisati?"
+
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:167
+#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:99
+#, python-format
+msgid "An error occurred while fetching dashboards: %s"
+msgstr "Prišlo je do napake pri pridobivanju nadzornih plošč: %s"
+
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:185
+msgid "There was an issue deleting the selected dashboards: "
+msgstr "Pri brisanju izbranih nadzornih plošč je prišlo do težave: "
+
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:398
+#, python-format
+msgid "An error occurred while fetching dashboard owner values: %s"
+msgstr "Pri pridobivanju polja lastnik nadzorne plošče je prišlo do napake: %s"
+
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:419
+#, python-format
+msgid "An error occurred while fetching dashboard created by values: %s"
+msgstr ""
+"Pri pridobivanju polja nadzorno ploščo ustvaril/a je prišlo do napake: %s"
+
+#: superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx:536
+msgid "Are you sure you want to delete the selected dashboards?"
+msgstr "Ali ste prepričani, da želite izbrisati izbrane nadzorne plošče?"
+
+#: superset-frontend/src/views/CRUD/data/common.ts:38
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:107
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:230
+msgid "Saved queries"
+msgstr "Shranjene poizvedbe"
+
+#: superset-frontend/src/views/CRUD/data/components/SyntaxHighlighterCopy/index.tsx:70
+msgid "SQL Copied!"
+msgstr "SQL kopiran!"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:37
+msgid ""
+"The passwords for the databases below are needed in order to import them. "
+"Please note that the \"Secure Extra\" and \"Certificate\" sections of the "
+"database configuration are not present in export files, and should be added "
+"manually after the import if they are needed."
+msgstr ""
+"Gesla za spodnje podatkovne baze so potrebna za njihov uvoz. Sekciji "
+"\"Dodatna varnost\" in \"Certifikati\" v nastavitvah podatkovne baze nista "
+"prisotni v izvoženih datotekah in jih je potrebno dodati ročno po uvozu, če "
+"je to potrebno."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:43
+msgid ""
+"You are importing one or more databases that already exist. Overwriting "
+"might cause you to lose some of your work. Are you sure you want to "
+"overwrite?"
+msgstr ""
+"Uvažate eno ali več podatkovnih baz, ki že obstajajo. S prepisom lahko "
+"izgubite podatke. Ali ste prepričani, da želite prepisati?"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:86
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:464
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx:217
+msgid "database"
+msgstr "podatkovna baza"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:126
+#, python-format
+msgid "An error occurred while fetching database related data: %s"
+msgstr "Pri pridobivanju podatkov iz podatkovne baze je prišlo do napake: %s"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:195
+msgid "Import databases"
+msgstr "Uvozi podatkovne baze"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:232
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:395
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:209
+msgid "Asynchronous query execution"
+msgstr "Asinhroni zagon poizvedb"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:235
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:398
+msgid "AQE"
+msgstr "AQE"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:250
+msgid "Allow data manipulation language"
+msgstr "Dovoli jezik za manipulacijo podatkov (DML)"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:253
+msgid "DML"
+msgstr "DML"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:265
+msgid "CSV upload"
+msgstr "Nalaganje CSV"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:326
+msgid "Delete database"
+msgstr "Izbriši podatkovno bazo"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:433
+#, python-format
+msgid ""
+"The database %s is linked to %s charts that appear on %s dashboards. Are you "
+"sure you want to continue? Deleting the database will break those objects."
+msgstr ""
+"Podatkovna baza %s je povezana z grafikoni %s, ki so prisotni na nadzorni "
+"plošči %s. Ali želite nadaljevati? Izbris podatkovne baze bo pokvaril te "
+"objekte."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx:446
+msgid "Delete Database?"
+msgstr "Izbrišem podatkovno bazo?"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:78
+msgid "Allow this database to be queried in SQL Lab"
+msgstr "Dovoli poizvedbo na to podatkovno bazo v SQL laboratoriju"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:97
+msgid "Allow creation of new tables based on queries"
+msgstr "Dovoli ustvarjanje novih tabel s poizvedbami"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:111
+msgid "Allow creation of new views based on queries"
+msgstr "Dovoli ustvarjanje novih pogledov s poizvedbami"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:117
+msgid "CTAS & CVAS SCHEMA"
+msgstr "CTAS & CVAS SHEMA"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:123
+msgid "Search or select schema"
+msgstr "Poiščite ali izberite shemo"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:128
+msgid ""
+"When allowing CREATE TABLE AS option in SQL Lab, this option forces the "
+"table to be created in this schema."
+msgstr ""
+"Z dovolitvijo opcije CREATE TABLE AS v SQL laboratoriju se tabele ustvarjajo "
+"s to shemo."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:145
+msgid ""
+"Allow manipulation of the database using non-SELECT statements such as "
+"UPDATE, DELETE, CREATE, etc."
+msgstr ""
+"Dovoli manipulacije podatkovne baze z uporabo ne-SELECT stavkov, kot so "
+"UPDATE, DELETE, CREATE, itd."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:158
+msgid "Allow multi schema metadata fetch"
+msgstr "Dovoli pridobivanje metapodatkov z več shemami"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:184
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:190
+msgid "Chart cache timeout"
+msgstr "Trajanje predpomnilnika grafikona"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:212
+msgid ""
+"Operate the database in asynchronous mode, meaning that the queries are "
+"executed on remote workers as opposed to on the web server itself. This "
+"assumes that you have a Celery worker setup as well as a results backend. "
+"Refer to the installation docs for more information."
+msgstr ""
+"Upravljanje podatkovne baze v asinhronem načinu pomeni, da se poizvedbe "
+"zaženejo na oddaljenih »delavcih« in ne na samem spletnem strežniku. S tem "
+"je predpostavljeno, da imate nastavljenega »delavca« za Celery in zaledni "
+"sistem za rezultate. Več informacij je v navodilih za namestitev."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:234
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:239
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:331
+msgid "Secure extra"
+msgstr "Dodatna varnost"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:249
+msgid "JSON string containing additional connection configuration."
+msgstr "JSON niz vsebuje dodatne nastavitve povezave."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:252
+msgid ""
+"This is used to provide connection information for systems like Hive, "
+"Presto, and BigQuery, which do not conform to the username:password syntax "
+"normally used by SQLAlchemy."
+msgstr ""
+"S tem pridobite informacije o povezavi za sisteme, kot so Hive, Presto in "
+"BigQuery, ki niso skladni s shemo uporabniško_ime:geslo, ki se običajno "
+"uporablja v SQLAlchemy."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:271
+msgid ""
+"Optional CA_BUNDLE contents to validate HTTPS requests. Only available on "
+"certain database engines."
+msgstr ""
+"Opcijska CA_BUNDLE vsebina, za potrjevanje HTTPS zahtev. Razpoložljivo le na "
+"določenih sistemih podatkovnih baz."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:294
+msgid "Impersonate Logged In User (Presto, Hive, and GSheets)"
+msgstr "Predstavljanje kot prijavljeni uporabnik (Presto, Hive in GSheets)"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:299
+msgid ""
+"If Presto, all the queries in SQL Lab are going to be executed as the "
+"currently logged on user who must have permission to run them. If Hive and "
+"hive.server2.enable.doAs is enabled, will run the queries as service "
+"account, but impersonate the currently logged on user via hive.server2.proxy."
+"user property."
+msgstr ""
+"V Presto se vse poizvedbe v SQL laboratoriju zaženejo pod trenutno "
+"prijavljenim uporabnikom, ki mora imeti pravice za poganjanje. Če je "
+"omogočen Hive in hive.server2.enable.doAs, poizvedbe tečejo pod servisnim "
+"računom, vendar je trenutno prijavljen uporabnik predstavljen z lastnostjo "
+"hive.server2.proxy.user."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:316
+msgid "Allow data upload"
+msgstr "Dovoli nalaganje podatkov"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:319
+msgid "If selected, please set the schemas allowed for data upload in Extra."
+msgstr ""
+"Če je izbrano, nastavite dovoljene sheme za nalaganje podatkov v Dodatno."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:341
+msgid "JSON string containing extra configuration elements."
+msgstr "JSON niz, ki vsebuje dodatne nastavitve povezave."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:344
+msgid ""
+"1. The engine_params object gets unpacked into the sqlalchemy.create_engine "
+"call, while the metadata_params gets unpacked into the sqlalchemy.MetaData "
+"call."
+msgstr ""
+"1. Objekt engine_params se razširi v klic sqlalchemy.create_engine, medtem "
+"ko se metadata_params razširijo v sqlalchemy.MetaData call."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:351
+msgid ""
+"2. The metadata_cache_timeout is a cache timeout setting in seconds for "
+"metadata fetch of this database. Specify it as \"metadata_cache_timeout\": "
+"{\"schema_cache_timeout\": 600, \"table_cache_timeout\": 600}. If unset, "
+"cache will not be enabled for the functionality. A timeout of 0 indicates "
+"that the cache never expires."
+msgstr ""
+"2. metadata_cache_timeout je trajanje predpomnilnik v sekundah za "
+"pridobivanje metapodatkov za to podatkovno bazo. Definirajte ga kot "
+"\"metadata_cache_timeout\": {\"schema_cache_timeout\": 600, "
+"\"table_cache_timeout\": 600}. Če ni definirano, predpomnilnik ne bo omogčen "
+"pri tej funkciji. Trajanje 0 določa, da se predpomnilnik ne izteče."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:360
+msgid ""
+"3. The schemas_allowed_for_csv_upload is a comma separated list of schemas "
+"that CSVs are allowed to upload to. Specify it as "
+"\"schemas_allowed_for_csv_upload\": [\"public\", \"csv_upload\"]. If "
+"database flavor does not support schema or any schema is allowed to be "
+"accessed, just leave the list empty."
+msgstr ""
+"3. schemas_allowed_for_csv_upload je z vejicami ločen seznam shem, ki jih je "
+"dovoljeno nalagati s CSV-ji. Definirajte ga kot "
+"\"schemas_allowed_for_csv_upload\": [\"public\", \"csv_upload\"]. Če tip "
+"podatkovne baza ne podpira sheme ali pa je dovoljen dostop do vseh shem, "
+"pustite seznam prazen."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:369
+msgid ""
+"4. The version field is a string specifying this db's version. This should "
+"be used with Presto DBs so that the syntax is correct."
+msgstr ""
+"4. Polje \"version\" je znakovni niz, ki določa verzijo podatkovne baze. "
+"Uporabljeno mora biti s Presto bazo, da je sintaksa pravilna."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx:375
+msgid ""
+"5. The allows_virtual_table_explore field is a boolean specifying whether or "
+"not the Explore button in SQL Lab results is shown."
+msgstr ""
+"5. Polje \"allows_virtual_table_explore\" je binarnega tipa in določa, "
+"prikaz gumba \"Razišči\" v rezultatih SQL laboratorija."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/SqlAlchemyForm.tsx:40
+msgid "Display Name"
+msgstr "Ime za prikaz"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/SqlAlchemyForm.tsx:49
+msgid "Name your database"
+msgstr "Poimenujte podatkovno bazo"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/SqlAlchemyForm.tsx:54
+msgid "Pick a name to help you identify this database."
+msgstr "Izberite ime za lažjo prepoznavo podatkovne baze."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/SqlAlchemyForm.tsx:69
+msgid "dialect+driver://username:password@host:port/database"
+msgstr "dialect+driver://username:password@host:port/database"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/SqlAlchemyForm.tsx:76
+msgid "Refer to the"
+msgstr "Obrnite se na"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/SqlAlchemyForm.tsx:84
+msgid "for more information on how to structure your URI."
+msgstr "za več informacij o oblikovanju URI."
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/SqlAlchemyForm.tsx:93
+msgid "Test connection"
+msgstr "Preizkus povezave"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx:225
+msgid "Please enter a SQLAlchemy URI to test"
+msgstr "Vnesite SQLAlchemy URI za test"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx:296
+#, python-format
+msgid "Sorry there was an error fetching database information: %s"
+msgstr "Pri pridobivanju informacij o podatkovni bazi je prišlo do napake: %s"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx:370
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx:484
+msgid "Connect"
+msgstr "Poveži"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx:374
+msgid "Edit database"
+msgstr "Uredi podatkovno bazo"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx:374
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx:487
+msgid "Connect a database"
+msgstr "Poveži se s podatkovno bazo"
+
+#: superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx:484
+msgid "Finish"
+msgstr "Končaj"
+
+#: superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx:111
+msgid "Add dataset"
+msgstr "Dodaj podatkovni set"
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:58
+msgid ""
+"The passwords for the databases below are needed in order to import them "
+"together with the datasets. Please note that the \"Secure Extra\" and "
+"\"Certificate\" sections of the database configuration are not present in "
+"export files, and should be added manually after the import if they are "
+"needed."
+msgstr ""
+"Gesla za spodnje podatkovne baze so potrebna za uvoz skupaj s podatkovnimi "
+"seti. Sekciji \"Dodatna varnost\" in \"Certifikati\" v nastavitvah "
+"podatkovne baze nista prisotni v izvoženih datotekah in jih je potrebno "
+"dodati ročno po uvozu, če je to potrebno."
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:65
+msgid ""
+"You are importing one or more datasets that already exist. Overwriting might "
+"cause you to lose some of your work. Are you sure you want to overwrite?"
+msgstr ""
+"Uvažate enega ali več podatkovnih setov, ki že obstajajo. S prepisom lahko "
+"izgubite podatke. Ali ste prepričani, da želite prepisati?"
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:174
+msgid "An error occurred while fetching dataset related data"
+msgstr "Napaka pri pridobivanju podatkov iz podatkovnega seta"
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:194
+#, python-format
+msgid "An error occurred while fetching dataset related data: %s"
+msgstr "Napaka pri pridobivanju podatkov iz podatkovnega seta: %s"
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:213
+msgid "Physical dataset"
+msgstr "Fizičen podatkovni set"
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:221
+msgid "Virtual dataset"
+msgstr "Virtualen podatkovni set"
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:410
+#, python-format
+msgid "An error occurred while fetching dataset owner values: %s"
+msgstr ""
+"Pri pridobivanju polja lastnik podatkovnega seta je prišlo do napake: %s"
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:429
+#, python-format
+msgid "An error occurred while fetching datasets: %s"
+msgstr "Prišlo je do napake pri pridobivanju podatkovnih setov: %s"
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:444
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:367
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:446
+#, python-format
+msgid "An error occurred while fetching schema values: %s"
+msgstr "Pri pridobivanju vrednosti shem je prišlo do napake: %s"
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:502
+msgid "Import datasets"
+msgstr "Uvozi podatkovne sete"
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:552
+#, python-format
+msgid "There was an issue deleting the selected datasets: %s"
+msgstr "Pri brisanju izbranih podatkovnih setov je prišlo do težave: %s"
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:575
+#, python-format
+msgid ""
+"The dataset %s is linked to %s charts that appear on %s dashboards. Are you "
+"sure you want to continue? Deleting the dataset will break those objects."
+msgstr ""
+"Podatkovni set %s je povezan z grafikoni %s, ki so prisotni na nadzorni "
+"plošči %s. Ali želite nadaljevati? Izbris podatkovnega seta bo pokvaril te "
+"objekte."
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:588
+msgid "Delete Dataset?"
+msgstr "Izbrišem podatkovni set?"
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:601
+msgid "Are you sure you want to delete the selected datasets?"
+msgstr "Ali ste prepričani, da želite izbrisati izbrane podatkovne sete?"
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:651
+msgid "0 Selected"
+msgstr "Izbranih: 0"
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:654
+#, python-format
+msgid "%s Selected (Virtual)"
+msgstr "Izbranih: %s (virtualni)"
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:661
+#, python-format
+msgid "%s Selected (Physical)"
+msgstr "Izbranih: %s (fizični)"
+
+#: superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx:668
+#, python-format
+msgid "%s Selected (%s Physical, %s Virtual)"
+msgstr "Izbranih: %s (fizični: %s, virtualni: %s)"
+
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:122
+#, python-format
+msgid "There was an issue previewing the selected query. %s"
+msgstr "Pri predogledu izbrane poizvedbe je prišlo do težave. %s"
+
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:151
+msgid "Success"
+msgstr "Uspelo"
+
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:156
+msgid "Failed"
+msgstr "Ni uspelo"
+
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:161
+msgid "Running"
+msgstr "V teku"
+
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:166
+msgid "Offline"
+msgstr "Offline"
+
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:171
+msgid "Scheduled"
+msgstr "V urniku"
+
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:214
+#, python-format
+msgid "Duration: %s"
+msgstr "Trajanje: %s"
+
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:227
+#: superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx:147
+msgid "Tab name"
+msgstr "Naslov zavihka"
+
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:259
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:297
+msgid "TABLES"
+msgstr "TABELE"
+
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:298
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:39
+msgid "Rows"
+msgstr "Vrstice"
+
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:326
+msgid "Open query in SQL Lab"
+msgstr "Odpri poizvedbo v SQL laboratoriju"
+
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:350
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:384
+#, python-format
+msgid "An error occurred while fetching database values: %s"
+msgstr "Pri pridobivanju vrednosti podatkovne baze je prišlo do napake: %s"
+
+#: superset-frontend/src/views/CRUD/data/query/QueryList.tsx:397
+msgid "Search by query text"
+msgstr "Išči z besedilom poizvedbe"
+
+#: superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx:119
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:368
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx:98
+msgid "Query preview"
+msgstr "Predogled poizvedbe"
+
+#: superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx:135
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx:114
+msgid "Next"
+msgstr "Naslednji"
+
+#: superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx:143
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx:122
+msgid "Open in SQL Lab"
+msgstr "Odpri v SQL laboratoriju"
+
+#: superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx:156
+msgid "User query"
+msgstr "Uporabnikova poizvedba"
+
+#: superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx:164
+msgid "Executed query"
+msgstr "Zagnana poizvedba"
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:55
+msgid ""
+"The passwords for the databases below are needed in order to import them "
+"together with the saved queries. Please note that the \"Secure Extra\" and "
+"\"Certificate\" sections of the database configuration are not present in "
+"export files, and should be added manually after the import if they are "
+"needed."
+msgstr ""
+"Gesla za spodnje podatkovne baze so potrebna za uvoz skupaj s shranjenimi "
+"poizvedbami. Sekciji \"Dodatna varnost\" in \"Certifikati\" v nastavitvah "
+"podatkovne baze nista prisotni v izvoženih datotekah in jih je potrebno "
+"dodati ročno po uvozu, če je to potrebno."
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:62
+msgid ""
+"You are importing one or more saved queries that already exist. Overwriting "
+"might cause you to lose some of your work. Are you sure you want to "
+"overwrite?"
+msgstr ""
+"Uvažate eno ali več shranjenih poizvedb, ki že obstajajo. S prepisom lahko "
+"izgubite podatke. Ali ste prepričani, da želite prepisati?"
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:153
+#, python-format
+msgid "There was an issue previewing the selected query %s"
+msgstr "Do težave je prišlo pri predogledu izbrane poizvedbe %s"
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:191
+msgid "Import queries"
+msgstr "Uvozi poizvedbe"
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:254
+#, python-format
+msgid "There was an issue deleting the selected queries: %s"
+msgstr "Do težave je prišlo pri brisanju izbranih poizvedb: %s"
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:375
+msgid "Edit query"
+msgstr "Uredi poizvedbo"
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:382
+msgid "Copy query URL"
+msgstr "Kopiraj URL poizvedbe"
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:389
+msgid "Export query"
+msgstr "Izvozi poizvedbe"
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:396
+msgid "Delete query"
+msgstr "Izbriši poizvedbo"
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:467
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:244
+msgid "This action will permanently delete the saved query."
+msgstr "S tem dejanjem boste trajno izbrisali shranjeno poizvedbo."
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:477
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:256
+msgid "Delete Query?"
+msgstr "Izbrišem poizvedbo?"
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:492
+msgid "Are you sure you want to delete the selected queries?"
+msgstr "Ali ste prepričani, da želite izbrisati izbrane poizvedbe?"
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx:535
+msgid "queries"
+msgstr "poizvedbe"
+
+#: superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx:126
+msgid "Query name"
+msgstr "Ime poizvedbe"
+
+#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:101
+msgid "[Untitled]"
+msgstr "[Neimenovana]"
+
+#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:102
+msgid "Unknown"
+msgstr "Neznano"
+
+#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:191
+msgid "Edited"
+msgstr "Urejane"
+
+#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:200
+msgid "Created"
+msgstr "Ustvarjene"
+
+#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:211
+msgid "Viewed"
+msgstr "Ogledane"
+
+#: superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx:220
+msgid "Examples"
+msgstr "Vzorci"
+
+#: superset-frontend/src/views/CRUD/welcome/ChartTable.tsx:161
+#: superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx:161
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:273
+msgid "Mine"
+msgstr "Moje"
+
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:70
+msgid "Recently viewed charts, dashboards, and saved queries will appear here"
+msgstr ""
+"Nedavno ogledani grafikoni, nadzorne plošče in shranjene poizvedbe bodo "
+"prikazane tukaj"
+
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:75
+msgid "Recently created charts, dashboards, and saved queries will appear here"
+msgstr ""
+"Nedavno ustvarjeni grafikoni, nadzorne plošče in shranjene poizvedbe bodo "
+"prikazane tukaj"
+
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:80
+msgid "Recent example charts, dashboards, and saved queries will appear here"
+msgstr ""
+"Nedavni vzorci grafikonov, nadzornih plošč in shranjenih poizvedb bodo "
+"prikazani tukaj"
+
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:85
+msgid "Recently edited charts, dashboards, and saved queries will appear here"
+msgstr ""
+"Nedavno urejani grafikoni, nadzorne plošče in shranjene poizvedbe bodo "
+"prikazane tukaj"
+
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:113
+msgid ""
+"${tableName\r\n"
+"                      .split('')\r\n"
+"                      .slice(0, tableName.length - 1)\r\n"
+"                      .join('')}\r\n"
+"                    "
+msgstr ""
+"${tableName\r\n"
+"                        .split('')\r\n"
+"                        .slice(0, tableName.length - 1)\r\n"
+"                        .join('')}\r\n"
+"                    "
+
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:133
+msgid "You don't have any favorites yet!"
+msgstr "Priljubljenih še niste izbrali!"
+
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:145
+msgid "SQL Lab queries"
+msgstr "Poizvedbe SQL laboratorija"
+
+#: superset-frontend/src/views/CRUD/welcome/EmptyState.tsx:146
+msgid "${tableName}"
+msgstr "${tableName}"
+
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:125
+msgid "query"
+msgstr "poizvedba"
+
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:224
+msgid "Share"
+msgstr "Deljenje"
+
+#: superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx:313
+#, python-format
+msgid "Last run %s"
+msgstr "Zadnji zagon %s"
+
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:142
+#, python-format
+msgid "There was an issue fetching your recent activity: %s"
+msgstr "Pri pridobivanju vaše nedavne aktivnosti je prišlo do napake: %s"
+
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:156
+#, python-format
+msgid "There was an issues fetching your dashboards: %s"
+msgstr "Prišlo je do napake pri pridobivanju nadzornih plošč: %s"
+
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:165
+#, python-format
+msgid "There was an issues fetching your chart: %s"
+msgstr "Prišlo je do napake pri pridobivanju grafikona: %s"
+
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:174
+#, python-format
+msgid "There was an issues fetching your saved queries: %s"
+msgstr "Prišlo je do napake pri pridobivanju shranjenih poizvedb: %s"
+
+#: superset-frontend/src/views/CRUD/welcome/Welcome.tsx:207
+msgid "Recents"
+msgstr "Nedavno"
+
+#: superset-frontend/src/visualizations/FilterBox/FilterBox.jsx:277
+msgid "Select start and end date"
+msgstr "Izberite začetni in končni datum"
+
+#: superset-frontend/src/visualizations/FilterBox/FilterBox.jsx:388
+#, python-format
+msgid "Type or Select [%s]"
+msgstr "Vnesite ali izberite [%s]"
+
+#: superset-frontend/src/visualizations/FilterBox/FilterBoxChartPlugin.js:25
+msgid "Filter box"
+msgstr "Izbirnik za filtriranje"
+
+#: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:27
+msgid "Filters configuration"
+msgstr "Nastavitve filtrov"
+
+#: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:36
+msgid "Filter configuration for the filter box"
+msgstr "Nastavitve za polje filtra"
+
+#: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:49
+msgid "Date filter"
+msgstr "Filter po datumu"
+
+#: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:51
+msgid "Whether to include a time filter"
+msgstr "Če želite vključiti časovni filter"
+
+#: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:58
+msgid "Instant filtering"
+msgstr "Takojšnje filtriranje"
+
+#: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:61
+msgid ""
+"Check to apply filters instantly as they change instead of displaying "
+"[Apply] button"
+msgstr ""
+"Izberite za takojšnjo uporabo filtrov, ko se spremenijo, brez prikazovanja "
+"gumba Uveljavi"
+
+#: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:72
+msgid "Show SQL granularity dropdown"
+msgstr "Prikaži SQL spustni seznam za granulacijo"
+
+#: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:74
+msgid "Check to include SQL granularity dropdown"
+msgstr "Izberite za vključitev spustnega seznama za SQL granulacijo"
+
+#: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:81
+msgid "Show SQL time column"
+msgstr "Prikaži stolpec SQL čas"
+
+#: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:83
+msgid "Check to include time column dropdown"
+msgstr "Izberite za vključitev časovnega stolpca v spustni seznam"
+
+#: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:92
+msgid "Show Druid granularity dropdown"
+msgstr "Prikaži spustni seznam za Druid granulacijo"
+
+#: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:94
+msgid "Check to include Druid granularity dropdown"
+msgstr "Izberite za vključitev spustnega seznama za Druid granulacijo"
+
+#: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:101
+msgid "Show Druid time origin"
+msgstr "Prikaži časovno izhodišče za Druid"
+
+#: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:103
+msgid "Check to include time origin dropdown"
+msgstr "Izberi za vključitev spustnega seznama za časovno izhodišče"
+
+#: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:113
+msgid "Limit selector values"
+msgstr "Omeji vrednosti izbirnikov"
+
+#: superset-frontend/src/visualizations/FilterBox/controlPanel.jsx:114
+msgid "These filters apply to the values available in the dropdowns"
+msgstr "Ti filtri se nanašajo na vrednosti v spustnih seznamih"
+
+#: superset-frontend/src/visualizations/TimeTable/TimeTableChartPlugin.js:24
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-time-table/src/TimeTableChartPlugin.ts:24
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-time-table/src/index.ts:25
+msgid "Time-series Table"
+msgstr "Tabela s časovno vrsto"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/constants.ts:25
+msgid "Time Range"
+msgstr "Časovno obdobje"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/constants.ts:26
+msgid "Time Column"
+msgstr "Časovni stolpec"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/constants.ts:27
+msgid "Time Grain"
+msgstr "Granulacija časa"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/constants.ts:29
+msgid "Time Granularity"
+msgstr "Granulacija časa"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/constants.ts:44
+msgid "Aggregate"
+msgstr "Agregiraj"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/constants.ts:45
+msgid "Raw records"
+msgstr "Surovi podatki"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/sections.tsx:50
+msgid "Datasource & Chart Type"
+msgstr "Tip podatkovnega vira in grafikona"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/sections.tsx:78
+msgid "URL Parameters"
+msgstr "Parametri URL"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/sections.tsx:80
+msgid "Extra url parameters for use in Jinja templated queries"
+msgstr "Dodatni parametri za poizvedbe z Jinja predlogami"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/sections.tsx:87
+msgid "Extra Parameters"
+msgstr "Dodatni parametri"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/sections.tsx:89
+msgid ""
+"Extra parameters that any plugins can choose to set for use in Jinja "
+"templated queries"
+msgstr ""
+"Dodatni parametri, ki jih lahko uporabi kateri koli vtičnik za poizvedbe z "
+"Jinja predlogami"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/sections.tsx:108
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:444
+msgid "Color Scheme"
+msgstr "Barvna shema"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/sections.tsx:113
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:225
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:105
+msgid "Annotations and Layers"
+msgstr "Oznake in sloji"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/components/InfoTooltipWithTrigger.tsx:48
+msgid "Show info tooltip"
+msgstr "Prikaži opis orodja"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:28
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:103
+msgid "One or many columns to group by"
+msgstr "Eden ali več stolpcev za združevanje"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:46
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:203
+msgid "One or many columns to pivot as columns"
+msgstr "En ali več stolpcev za stolpčno vrtenje"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:120
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:390
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.ts:109
+msgid "Bubble Size"
+msgstr "Velikost mehurčka"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:121
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:391
+msgid "Metric used to calculate bubble size"
+msgstr "Mera za izračun velikosti mehurčkov"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/dndControls.tsx:138
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:194
+msgid "Color Metric"
+msgstr "Mera za barvo"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:166
+msgid "Fixed Color"
+msgstr "Izbrana barva"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:174
+msgid "Right Axis Metric"
+msgstr "Mera desne osi"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:181
+msgid "Linear Color Scheme"
+msgstr "Linearna barvna shema"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:343
+msgid "Sort By"
+msgstr "Razvrščanje"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:420
+msgid "Time format"
+msgstr "Oblika zapisa časa"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/index.tsx:454
+msgid "Color Map"
+msgstr "Barvna lestvica"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/ColumnConfigControl.tsx:139
+msgid "Show less columns"
+msgstr "Prikaži manj stolpcev"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/ColumnConfigControl.tsx:144
+msgid "Show all columns"
+msgstr "Prikaži vse stolpce"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx:66
+msgid "Fraction digits"
+msgstr "Število decimalk"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx:67
+msgid "Number of decimal digits to round numbers to"
+msgstr "Število decimalnih mest za zaokroževanje števil"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx:76
+msgid "Min Width"
+msgstr "Min. širina"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx:77
+msgid ""
+"Default minimal column width in pixels, actual width may still be larger "
+"than this if other columns don't need much space"
+msgstr ""
+"Privzeta min. širina stolpca v pikslih. Dejanska širina bo lahko večja, če "
+"drugi stolpci ne potrebujejo veliko prostora"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx:91
+msgid "Text align"
+msgstr "Poravnava besedila"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx:92
+msgid "Horizontal alignment"
+msgstr "Vodoravna poravnava"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx:97
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:225
+msgid "Left"
+msgstr "Levo"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx:98
+msgid "Center"
+msgstr "Na sredino"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx:99
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:226
+msgid "Right"
+msgstr "Desno"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx:105
+msgid "Show cell bars"
+msgstr "Prikaži stolp. graf v celicah"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx:106
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:393
+msgid "Whether to display a bar chart background in table columns"
+msgstr ""
+"Če želite omogočiti prikaz manjših stolpčnih grafikonov v ozadju stolpcev "
+"tabele"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx:113
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:402
+msgid "Align +/-"
+msgstr "Poravnaj +/-"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx:114
+msgid "Whether to align positive and negative values in cell bar chart at 0"
+msgstr ""
+"Če želite poravnati pozitivne in negativne vrednosti v stolpčnem grafikonu "
+"celic pri 0"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx:121
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:414
+msgid "Color +/-"
+msgstr "Barva +/-"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx:122
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:417
+msgid "Whether to colorize numeric values by if they are positive or negative"
+msgstr ""
+"Če želite obarvati številske vrednosti, ko so le-te pozitivne ali negativne"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx:134
+msgid "Small number format"
+msgstr "Oblika zapisa majhnih števil"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx:135
+msgid ""
+"D3 number format for numbers between -1.0 and 1.0, useful when you want to "
+"have different siginificant digits for small and large numbers"
+msgstr ""
+"D3 oblika zapisa za števila med -1.0 in 1.0. Uporabno, če želite različno "
+"število števk za majhna in velika števila"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/utils/D3Formatting.ts:28
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/utils/D3Formatting.ts:46
+msgid "Adaptative formating"
+msgstr "Adaptivno oblikovanje"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/utils/D3Formatting.ts:39
+msgid "Duration in ms (66000 => 1m 6s)"
+msgstr "Trajanje v ms (66000 => 1m 6s)"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/utils/D3Formatting.ts:40
+msgid "Duration in ms (1.40008 => 1ms 400µs 80ns)"
+msgstr "Trajanje v ms (1.40008 => 1ms 400µs 80ns)"
+
+#: superset-ui/superset-ui/packages/superset-ui-chart-controls/src/utils/D3Formatting.ts:43
+msgid "D3 time format syntax: https://github.com/d3/d3-time-format"
+msgstr "Sintaksa D3 časovnega formata:: https://github.com/d3/d3-time-format"
+
+#: superset-ui/superset-ui/packages/superset-ui-core/src/query/extractQueryFields.ts:129
+msgid "Found invalid orderby options"
+msgstr "Najdene so neveljavne možnosti razvrščanja"
+
+#: superset-ui/superset-ui/packages/superset-ui-core/src/validator/legacyValidateInteger.ts:9
+#: superset-ui/superset-ui/packages/superset-ui-core/src/validator/validateInteger.ts:11
+msgid "is expected to be an integer"
+msgstr "pričakovano je celo število"
+
+#: superset-ui/superset-ui/packages/superset-ui-core/src/validator/legacyValidateNumber.ts:9
+#: superset-ui/superset-ui/packages/superset-ui-core/src/validator/validateNumber.ts:11
+msgid "is expected to be a number"
+msgstr "pričakovano je število"
+
+#: superset-ui/superset-ui/packages/superset-ui-core/src/validator/validateNonEmpty.ts:5
+msgid "cannot be empty"
+msgstr "ne sme biti prazna"
+
+#: superset-ui/superset-ui/packages/superset-ui-core/test/translation/Translator.test.ts:90
+#: superset-ui/superset-ui/packages/superset-ui-core/test/translation/Translator.test.ts:102
+#: superset-ui/superset-ui/packages/superset-ui-core/test/translation/Translator.test.ts:119
+msgid "haha"
+msgstr "haha"
+
+#: superset-ui/superset-ui/packages/superset-ui-core/test/translation/Translator.test.ts:105
+#: superset-ui/superset-ui/packages/superset-ui-core/test/translation/Translator.test.ts:106
+msgid "foo"
+msgstr "foo"
+
+#: superset-ui/superset-ui/packages/superset-ui-core/test/translation/Translator.test.ts:107
+#: superset-ui/superset-ui/packages/superset-ui-core/test/translation/Translator.test.ts:111
+msgid "bar"
+msgstr "bar"
+
+#: superset-ui/superset-ui/packages/superset-ui-core/test/translation/Translator.test.ts:130
+#: superset-ui/superset-ui/packages/superset-ui-core/test/translation/Translator.test.ts:154
+msgid "yes"
+msgstr "da"
+
+#: superset-ui/superset-ui/packages/superset-ui-core/test/translation/TranslatorSingleton.test.ts:14
+#: superset-ui/superset-ui/packages/superset-ui-core/test/translation/TranslatorSingleton.test.ts:39
+msgid "second"
+msgstr "sekunda"
+
+#: superset-ui/superset-ui/packages/superset-ui-core/test/translation/TranslatorSingleton.test.ts:22
+#: superset-ui/superset-ui/packages/superset-ui-core/test/translation/TranslatorSingleton.test.ts:47
+msgid "ox"
+msgstr "ox"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:40
+msgid "Domain"
+msgstr "Domena"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:43
+msgid "The time unit used for the grouping of blocks"
+msgstr "Časovna enota za združevanje blokov"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:50
+msgid "Subdomain"
+msgstr "Poddomena"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:53
+msgid ""
+"The time unit for each block. Should be a smaller unit than "
+"domain_granularity. Should be larger or equal to Time Grain"
+msgstr ""
+"Časovna enota za vsak blok. Mora biti manjša enota kot domenska_granulacija. "
+"Mora biti večja ali enaka Granulaciji časa"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:65
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-chord/src/controlPanel.ts:47
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-country-map/src/controlPanel.ts:54
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/controlPanel.ts:46
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.ts:70
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.ts:57
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:130
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:65
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sankey-loop/src/controlPanel.ts:31
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sankey/src/controlPanel.ts:63
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sunburst/src/controlPanel.ts:47
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-treemap/src/controlPanel.ts:53
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:107
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumberTotal/controlPanel.ts:49
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Area/controlPanel.ts:42
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bar/controlPanel.ts:48
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:68
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:31
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts:40
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:73
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:35
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:45
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:54
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:31
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/TimePivot/controlPanel.ts:77
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts:64
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx:69
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:71
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:242
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:69
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx:87
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:217
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Treemap/controlPanel.tsx:63
+#: superset-ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/controlPanel.ts:31
+msgid "Chart Options"
+msgstr "Možnosti grafikona"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:79
+msgid "Cell Size"
+msgstr "Velikost celice"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:80
+msgid "The size of the square cell, in pixels"
+msgstr "Velikost kvadratne celice v pikslih"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:91
+msgid "Cell Padding"
+msgstr "Razmak med celicami"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:92
+msgid "The distance between cells, in pixels"
+msgstr "Razdalja med celicami v pikslih"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:105
+msgid "Cell Radius"
+msgstr "Polmer celice"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:106
+msgid "The pixel radius"
+msgstr "Polmer piksla"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:117
+msgid "Color Steps"
+msgstr "Barvni koraki"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:118
+msgid "The number color \"steps\""
+msgstr "Število barvnih korakov"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:129
+msgid "Time Format"
+msgstr "Oblika zapisa časa"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:142
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:214
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.ts:79
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:147
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx:91
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/controls.tsx:90
+msgid "Legend"
+msgstr "Legenda"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:145
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:217
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.ts:82
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:150
+msgid "Whether to display the legend (toggles)"
+msgstr "Preklapljanje prikaza legende"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:152
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:236
+msgid "Show Values"
+msgstr "Pokaži vrednosti"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:155
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:239
+msgid "Whether to display the numerical values within the cells"
+msgstr "Če želite v celicah prikazati numerične vrednosti"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:164
+msgid "Show Metric Names"
+msgstr "Pokaži imena mer"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:167
+msgid "Whether to display the metric name as a title"
+msgstr "Če želite prikazati ime mere kot naslov"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts:177
+msgid "Number Format"
+msgstr "Oblika zapisa števila"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-chord/src/controlPanel.ts:39
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/controlPanel.ts:38
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:89
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sankey/src/controlPanel.ts:55
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sunburst/src/controlPanel.ts:39
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.ts:58
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx:61
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:63
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:61
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Treemap/controlPanel.tsx:54
+#: superset-ui/superset-ui/plugins/plugin-chart-word-cloud/src/plugin/controlPanel.ts:38
+msgid "Sort by metric"
+msgstr "Mera za razvrščanje"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-chord/src/controlPanel.ts:40
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/controlPanel.ts:39
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:90
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sankey/src/controlPanel.ts:56
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sunburst/src/controlPanel.ts:40
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.ts:59
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx:62
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:64
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:62
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Treemap/controlPanel.tsx:55
+#: superset-ui/superset-ui/plugins/plugin-chart-word-cloud/src/plugin/controlPanel.ts:39
+msgid "Whether to sort results by the selected metric in descending order."
+msgstr "Če želite padajoče razvrstiti rezultate z izbrano mero."
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-chord/src/controlPanel.ts:57
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-country-map/src/controlPanel.ts:64
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:141
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.ts:121
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:75
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-treemap/src/controlPanel.ts:78
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:169
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumberTotal/controlPanel.ts:56
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:58
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts:102
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx:117
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:143
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:130
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx:156
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Treemap/controlPanel.tsx:129
+msgid "Number format"
+msgstr "Oblika zapisa števila"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-chord/src/controlPanel.ts:58
+msgid "Choose a number format"
+msgstr "Izberite obliko zapisa števila"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-chord/src/controlPanel.ts:64
+msgid "Choose a source"
+msgstr "Izberite vir"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-chord/src/controlPanel.ts:67
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:58
+msgid "Target"
+msgstr "Cilj"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-chord/src/controlPanel.ts:70
+msgid "Choose a target"
+msgstr "Izberite cilj"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-chord/src/index.js:27
+msgid "Chord Diagram"
+msgstr "Tetivni grafikon"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-country-map/src/controlPanel.ts:40
+msgid "Country"
+msgstr "Država"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-country-map/src/controlPanel.ts:43
+msgid "Which country to plot the map for?"
+msgstr "Za katero državo želite grafikon?"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-country-map/src/controlPanel.ts:78
+msgid "ISO 3166-2 Codes"
+msgstr "Oznake po ISO 3166-2"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-country-map/src/controlPanel.ts:79
+msgid ""
+"Column containing ISO 3166-2 codes of region/province/department in your "
+"table."
+msgstr ""
+"Stolpec, ki vsebuje ISO 3166-2 oznake regij/provinc/departmajev v vaši "
+"tabeli."
+
+#: superset-ui/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-event-flow/src/EventFlow.jsx:54
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/EventFlow.tsx:50
+msgid "Sorry, there appears to be no data"
+msgstr "Ni podatkov"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx:35
+msgid "Event definition"
+msgstr "Definicija dogodka"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx:43
+msgid "Event Names"
+msgstr "Imena dogodkov"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx:44
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:40
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:49
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:95
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:118
+msgid "Columns to display"
+msgstr "Stolpci za prikaz"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx:62
+msgid "Order by entity id"
+msgstr "Uredi po ID entitete"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx:63
+msgid ""
+"Important! Select this if the table is not already sorted by entity id, else "
+"there is no guarantee that all events for each entity are returned."
+msgstr ""
+"Pomembno! Izberite, če tabela še ni razvrščena po ID entitete, v nasprotnem "
+"primeru ni nujno, da bodo vrnjeni vsi dogodki za posamezno entiteto."
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx:77
+msgid "Minimum leaf node event count"
+msgstr "Min. število dogodkov za list"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx:80
+msgid ""
+"Leaf nodes that represent fewer than this number of events will be initially "
+"hidden in the visualization"
+msgstr ""
+"Listna vozlišča, ki predstavljajo manjše število dogodkov od te vrednosti, "
+"bodo v vizualizaciji skrita"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx:95
+msgid "Additional metadata"
+msgstr "Dodatni metapodatki"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx:105
+msgid "Metadata"
+msgstr "Metapodatki"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx:107
+msgid "Select any columns for metadata inspection"
+msgstr "Izberite poljubne stolpce za pregled metapodatkov"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx:125
+msgid "Entity ID"
+msgstr "ID entitete"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx:126
+msgid "e.g., a \"user id\" column"
+msgstr "t.j. stolpec \"id uporabnika\""
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx:129
+msgid "Max Events"
+msgstr "Max. dogodkov"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx:130
+msgid ""
+"The maximum number of events to return, equivalent to the number of rows"
+msgstr "Največje število dogodkov, ki bodo vrnjeni - enako številu vrstic"
+
+#: superset-ui/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-event-flow/src/index.js:26
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/index.ts:26
+msgid "Event Flow"
+msgstr "Potek dogodkov"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/controlPanel.ts:56
+msgid "Link Length"
+msgstr "Dolžina povezave"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/controlPanel.ts:59
+msgid "Link length in the force layout"
+msgstr "Dolžina povezave v postavitvi sil"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/controlPanel.ts:70
+msgid "Charge"
+msgstr "Naboj"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/controlPanel.ts:84
+msgid "Charge in the force layout"
+msgstr "Naboj v postavitvi sil"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/controlPanel.ts:93
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sankey-loop/src/controlPanel.ts:38
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sankey/src/controlPanel.ts:33
+msgid "Source / Target"
+msgstr "Izhodišče/Cilj"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/controlPanel.ts:94
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sankey-loop/src/controlPanel.ts:39
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sankey/src/controlPanel.ts:34
+msgid "Choose a source and a target"
+msgstr "Izberite izhodišče in cilj"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/index.js:27
+msgid "Force-directed Graph"
+msgstr "Graf usmerjenih sil"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:31
+msgid "Axis ascending"
+msgstr "Naraščajoča os"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:32
+msgid "Axis descending"
+msgstr "Padajoča os"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:33
+msgid "Metric ascending"
+msgstr "Naraščajoča mera"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:34
+msgid "Metric descending"
+msgstr "Padajoča mera"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:97
+msgid "Heatmap Options"
+msgstr "Možnosti toplotnega prikaza"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:107
+msgid "XScale Interval"
+msgstr "Interval X-osi"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:112
+msgid "Number of steps to take between ticks when displaying the X scale"
+msgstr "Število korakov med oznakami pri prikazu X-osi"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:119
+msgid "YScale Interval"
+msgstr "Interval Y-osi"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:124
+msgid "Number of steps to take between ticks when displaying the Y scale"
+msgstr "Število korakov med oznakami pri prikazu Y-osi"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:133
+msgid "Rendering"
+msgstr "Izris"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:140
+msgid ""
+"image-rendering CSS attribute of the canvas object that defines how the "
+"browser scales up the image"
+msgstr ""
+"atribut CSS za izris objekta platna, ki določa, kako brskalnik poveča sliko"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:150
+msgid "Normalize Across"
+msgstr "Normiraj glede na"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:157
+msgid ""
+"Color will be rendered based on a ratio of the cell against the sum of "
+"across this criteria"
+msgstr ""
+"Barva bo prikazana na osnovi razmerja med celico in vsoto glede na ta "
+"kriterij"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:172
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:77
+msgid "Left Margin"
+msgstr "Levi rob"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:176
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:81
+msgid "Left margin, in pixels, allowing for more room for axis labels"
+msgstr "Levi rob, v pikslih, s katerim povečamo prostor za oznake osi"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:185
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:185
+msgid "Bottom Margin"
+msgstr "Spodnji rob"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:189
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:189
+msgid "Bottom margin, in pixels, allowing for more room for axis labels"
+msgstr "Spodnji rob, v pikslih, s katerim povečamo prostor za oznake osi"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:198
+msgid "Value bounds"
+msgstr "Meje vrednosti"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:201
+msgid ""
+"Hard value bounds applied for color coding. Is only relevant and applied "
+"when the normalization is applied against the whole heatmap."
+msgstr ""
+"Mejne vrednosti za barvno lestvico. Upošteva se le, če je normiranje "
+"uporabljeno glede na celotni toplotni prikaz."
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:224
+msgid "Show percentage"
+msgstr "Prikaži procente"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:226
+msgid "Whether to include the percentage in the tooltip"
+msgstr "Če želite prikaz procentov v opisu orodja"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:246
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.ts:125
+msgid "Normalized"
+msgstr "Normiran"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:248
+msgid "Whether to apply a normal distribution based on rank on the color scale"
+msgstr ""
+"Če želite uporabiti normalno porazdelitev glede na stopnjo na barvni lestvici"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:260
+msgid "Sort X Axis"
+msgstr "Razvrsti X-os"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:270
+msgid "Sort Y Axis"
+msgstr "Razvrsti Y-os"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts:282
+msgid "Value Format"
+msgstr "Oblika zapisa vrednosti"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/Histogram.jsx:112
+msgid "count"
+msgstr "število"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/Histogram.jsx:116
+msgid "cumulative"
+msgstr "kumulativno"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.ts:33
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.ts:43
+msgid "Select the numeric columns to draw the histogram"
+msgstr "Izberite numerične stolpce za izris histograma"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.ts:93
+msgid "No of Bins"
+msgstr "Št. razdelkov"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.ts:96
+msgid "Select the number of bins for the histogram"
+msgstr "Izberite število razdelkov za histogram"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.ts:105
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:173
+msgid "X Axis Label"
+msgstr "Naslov X osi"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.ts:114
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:327
+msgid "Y Axis Label"
+msgstr "Naslov Y osi"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.ts:127
+msgid "Whether to normalize the histogram"
+msgstr "Če želite normirati histogram"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.ts:38
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/controlPanel.ts:45
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-parallel-coordinates/src/controlPanel.ts:40
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:48
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.ts:47
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:46
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-treemap/src/controlPanel.ts:44
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:53
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:348
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:92
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:95
+msgid "Sort Descending"
+msgstr "Razvrsti padajoče"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.ts:67
+msgid "Series Height"
+msgstr "Višina serije"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.ts:70
+msgid "Pixel height of each series"
+msgstr "Višina vsake serije v pikslih"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.ts:78
+msgid "Value Domain"
+msgstr "Domena vrednosti"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.ts:85
+msgid ""
+"series: Treat each series independently; overall: All series use the same "
+"scale; change: Show changes compared to the first data point in each series"
+msgstr ""
+"serije: Obravnavaj vsako podatkovno serijo neodvisno; skupno: Vse vrste "
+"uporabljajo enako skalo; razlika: Pokaži razlike glede na prvo točko vsake "
+"serije"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/index.js:27
+msgid "Horizon Chart"
+msgstr "Horizontni grafikon"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:53
+msgid "Longitude"
+msgstr "Dolžina"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:54
+msgid "Column containing longitude data"
+msgstr "Stolpec s podatki zemljepisne dolžine"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:63
+msgid "Latitude"
+msgstr "Širina"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:64
+msgid "Column containing latitude data"
+msgstr "Stolpec s podatki zemljepisne širine"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:74
+msgid "Clustering Radius"
+msgstr "Radij gručenja"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:87
+msgid ""
+"The radius (in pixels) the algorithm uses to define a cluster. Choose 0 to "
+"turn off clustering, but beware that a large number of points (>1000) will "
+"cause lag."
+msgstr ""
+"Radij (v pikslih), s katerim algoritem definira gručo. Izberite 0 za izklop "
+"gručenja - veliko število točk (>1000) bo povzročilo upočasnitev."
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:101
+msgid "Points"
+msgstr "Točke"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:108
+msgid "Point Radius"
+msgstr "Radij točk"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:110
+msgid ""
+"The radius of individual points (ones that are not in a cluster). Either a "
+"numerical column or `Auto`, which scales the point based on the largest "
+"cluster"
+msgstr ""
+"Radij posameznih točk (tistih, ki niso v gruči). Numerični stolpec ali "
+"`Auto` (skalira točke na osnovi največje gruče)"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:130
+msgid "Point Radius Unit"
+msgstr "Enota radija točk"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.js:86
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:133
+msgid "The unit of measure for the specified point radius"
+msgstr "Enota merila za definiran radij točk"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:140
+msgid "Labelling"
+msgstr "Oznake"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:148
+msgid "label"
+msgstr "oznaka"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:150
+msgid ""
+"`count` is COUNT(*) if a group by is used. Numerical columns will be "
+"aggregated with the aggregator. Non-numerical columns will be used to label "
+"points. Leave empty to get a count of points in each cluster."
+msgstr ""
+"`število` je COUNT(*), če je uporabljeno združevanje (group by). Numerični "
+"stolpci bodo agregirani z agregatorjem. Ne-numerični stolpci, bodo "
+"uporabljeni za oznake točk. Pustite prazno, da dobite število točk v "
+"posamezni gruči."
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:167
+msgid "Cluster label aggregator"
+msgstr "Agregator za oznako gruče"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:171
+msgid ""
+"Aggregate function applied to the list of points in each cluster to produce "
+"the cluster label."
+msgstr ""
+"Agregacijska funkcija za seznam točk v vsaki gruči, s katero se ustvari "
+"oznaka gruče."
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:181
+msgid "Visual Tweaks"
+msgstr "Nastavitve izgleda"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:188
+msgid "Live render"
+msgstr "Sprotni izris"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:190
+msgid "Points and clusters will update as the viewport is being changed"
+msgstr "Točke in gruče se bodo posodabljale, če se bo spremenil pogled"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:356
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:199
+msgid "Map Style"
+msgstr "Slog zemljevida"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:368
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:211
+msgid "Base layer map style"
+msgstr "Slog osnovnega sloja zemljevida"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:223
+msgid "Opacity of all clusters, points, and labels. Between 0 and 1."
+msgstr "Prosojnost vseh gruč, točk in oznak (vrednost med 0 in 1)."
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:233
+msgid "RGB Color"
+msgstr "RGB barva"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:243
+msgid "The color for points and clusters in RGB"
+msgstr "Barva točk in gruč v RGB zapisu"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:277
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:250
+msgid "Viewport"
+msgstr "Pogled"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:258
+msgid "Default longitude"
+msgstr "Privzeta dolžina"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:262
+msgid "Longitude of default viewport"
+msgstr "Dolžina privzetega pogleda"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:273
+msgid "Default latitude"
+msgstr "Privzeta širina"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:277
+msgid "Latitude of default viewport"
+msgstr "Širina privzetega pogleda"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:290
+msgid "Zoom"
+msgstr "Povečava"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:294
+msgid "Zoom level of the map"
+msgstr "Stopnja povečave zemljevida"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts:308
+msgid ""
+"One or many controls to group by. If grouping, latitude and longitude "
+"columns must be present."
+msgstr ""
+"Eden ali več kontrolnikov za združevanje. Pri združevanju morata biti "
+"prisotna stolpca širine in dolžine."
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/index.js:26
+msgid "MapBox"
+msgstr "MapBox"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/controlPanel.ts:72
+msgid "Significance Level"
+msgstr "Stopnja značilnosti"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/controlPanel.ts:74
+msgid "Threshold alpha level for determining significance"
+msgstr "Mejna vrednost alfa za določanje značilnosti"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/controlPanel.ts:83
+msgid "p-value precision"
+msgstr "točnost p-vrednosti"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/controlPanel.ts:85
+msgid "Number of decimal places with which to display p-values"
+msgstr "Število decimalnih mest za prikaz p-vrednosti"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/controlPanel.ts:94
+msgid "Lift percent precision"
+msgstr "Točnost procentualnega dviga"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/controlPanel.ts:96
+msgid "Number of decimal places with which to display lift values"
+msgstr "Število decimalnih mest za prikaz vrednosti dviga"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/index.js:26
+msgid "Paired t-test Table"
+msgstr "Tabela t-testa za odvisne vzorce"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-parallel-coordinates/src/controlPanel.ts:49
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:75
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.ts:112
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.ts:66
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:33
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumberTotal/controlPanel.ts:32
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:75
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:129
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:340
+#: superset-ui/superset-ui/plugins/plugin-chart-word-cloud/src/plugin/controlPanel.ts:46
+msgid "Options"
+msgstr "Možnosti"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-parallel-coordinates/src/controlPanel.ts:57
+msgid "Data Table"
+msgstr "Tabela podatkov"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-parallel-coordinates/src/controlPanel.ts:60
+msgid "Whether to display the interactive data table"
+msgstr "Če želite prikaz interaktivne podatkovne tabele"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-parallel-coordinates/src/controlPanel.ts:67
+msgid "Include Series"
+msgstr "Vključi serijo"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-parallel-coordinates/src/controlPanel.ts:70
+msgid "Include series name as an axis"
+msgstr "Vključi ime podatkovne serije v naslov osi"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:67
+msgid "Time Series Options"
+msgstr "Možnosti časovne vrste"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:81
+msgid "Not Time Series"
+msgstr "Ni časovna vrsta"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:83
+msgid "Ignore time"
+msgstr "Ne upoštevaj časa"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:86
+msgid "Time Series"
+msgstr "Časovna vrsta"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:88
+msgid "Standard time series"
+msgstr "Standardna časovna vrsta"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:91
+msgid "Aggregate Mean"
+msgstr "Agregirano povprečje"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:93
+msgid "Mean of values over specified period"
+msgstr "Povprečna vrednost v dani periodi"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:96
+msgid "Aggregate Sum"
+msgstr "Agregirana vsota"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:98
+msgid "Sum of values over specified period"
+msgstr "Vsota vrednosti v dani periodi"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:101
+msgid "Difference"
+msgstr "Razlika"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:103
+msgid "Metric change in value from `since` to `until`"
+msgstr "Sprememba mere od vrednosti \"OD\" do \"DO\""
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:106
+msgid "Percent Change"
+msgstr "Procentualna sprememba"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:108
+msgid "Metric percent change in value from `since` to `until`"
+msgstr "Procentualna sprememba mere od vrednosti \"OD\" do \"DO\""
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:111
+msgid "Factor"
+msgstr "Faktor"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:113
+msgid "Metric factor change from `since` to `until`"
+msgstr "Sprememba faktorja mere od vrednosti \"OD\" do \"DO\""
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:116
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:228
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:123
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:112
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:369
+msgid "Advanced Analytics"
+msgstr "Napredna analitika"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:118
+msgid "Use the Advanced Analytics options below"
+msgstr "Uporabite spodnje možnosti napredne analitike"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:123
+msgid "Settings for time series"
+msgstr "Nastavitve časovne vrste"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:153
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:87
+msgid "Date Time Format"
+msgstr "Oblika zapisa Datum-Časa"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:166
+msgid "Partition Limit"
+msgstr "Omejitev particij"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:169
+msgid ""
+"The maximum number of subdivisions of each group; lower values are pruned "
+"first"
+msgstr ""
+"Največje število podrazdelkov posamezne skupine; nižje vrednosti so "
+"zanemarjene prve"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:179
+msgid "Partition Threshold"
+msgstr "Prag particije"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:182
+msgid ""
+"Partitions whose height to parent height proportions are below this value "
+"are pruned"
+msgstr ""
+"Particije z nižjim razmerjem med njihovo višino in dolžino starša so "
+"zanemarjene"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:194
+msgid "Log Scale"
+msgstr "Logaritemska skala"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:197
+msgid "Use a log scale"
+msgstr "Uporabi logaritemsko skalo"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:206
+msgid "Equal Date Sizes"
+msgstr "Enaki datumi"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:209
+msgid "Check to force date partitions to have the same height"
+msgstr "Če želite, da imajo datumske particije enako višino"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:218
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:100
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:277
+msgid "Rich Tooltip"
+msgstr "Podroben opis orodja"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:221
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:103
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:280
+msgid "The rich tooltip shows a list of all series for that point in time"
+msgstr ""
+"Podroben opis orodja prikaže seznam vseh podatkovnih serij za posamezno "
+"istočasno točko"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:238
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:133
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:117
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:377
+msgid "Rolling Window"
+msgstr "Drseče okno"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:244
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:139
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:123
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:383
+msgid "Rolling Function"
+msgstr "Drseča funkcija"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:271
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:166
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:152
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:412
+msgid "Min Periods"
+msgstr "Min. št. period"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:285
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:180
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:424
+msgid "Time Comparison"
+msgstr "Časovna primerjava"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:293
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:188
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:432
+msgid "Time Shift"
+msgstr "Časovni zamik"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx:334
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:229
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:473
+msgid "Python Functions"
+msgstr "Pythonove funkcije"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-partition/src/index.js:26
+msgid "Partition Chart"
+msgstr "Grafikon razdelkov"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.ts:56
+msgid "Pivot Options"
+msgstr "Vrtilne možnosti"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.ts:63
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:84
+msgid "Aggregation function"
+msgstr "Agregacijska funkcija"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.ts:67
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:107
+msgid ""
+"Aggregate function to apply when pivoting and computing the total rows and "
+"columns"
+msgstr "Agregacijska funkcija za vrtenje in izračun vseh vrstic in stolpcev"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.ts:80
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:327
+msgid "Show totals"
+msgstr "Pokaži vsote"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.ts:82
+msgid "Display total row/column"
+msgstr "Pokaži vsote vrstic/stolpcev"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.ts:89
+msgid "Combine Metrics"
+msgstr "Združuj mere"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.ts:91
+msgid ""
+"Display metrics side by side within each column, as opposed to each column "
+"being displayed side by side for each metric."
+msgstr ""
+"Prikazuj mere eno ob drugi ob vsakem stolpcu, drugače je vsak stolpec "
+"prikazan en ob drugem za vsako mero."
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.ts:103
+msgid "Transpose Pivot"
+msgstr "Transponirano vrtenje"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.ts:105
+msgid "Swap Groups and Columns"
+msgstr "Zamenjaj Skupine in Stolpce"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.ts:135
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts:118
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:146
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx:172
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Treemap/controlPanel.tsx:145
+msgid "Date format"
+msgstr "Oblika zapisa datuma"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:110
+msgid "Use Area Proportions"
+msgstr "Uporabi razmerje površin"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx:111
+msgid ""
+"Check if the Rose Chart should use segment area instead of segment radius "
+"for proportioning"
+msgstr ""
+"Če želite, da grafikon \"Rose\" uporablja površino segmenta namesto radija "
+"za proporcioniranje"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-rose/src/index.js:26
+msgid "Nightingale Rose Chart"
+msgstr "Nightingale Rose grafikon"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sankey/src/controlPanel.ts:44
+msgid ""
+"Limiting rows may result in incomplete data and misleading charts. Consider "
+"filtering or grouping source/target names instead."
+msgstr ""
+"Omejitev vrstic lahko povzroči nepopolne podatke in zavajajoč grafikon. "
+"Premislite o uporabi filtriranja ali združevanja imen izvorov/ciljev."
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sankey/src/index.js:27
+msgid "Sankey Diagram"
+msgstr "Sankey grafikon"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sankey-loop/src/index.js:27
+msgid "Sankey Diagram with Loops"
+msgstr "Sankey grafikon z zankami"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sunburst/src/controlPanel.ts:54
+msgid "Primary Metric"
+msgstr "Primarna mera"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sunburst/src/controlPanel.ts:55
+msgid "The primary metric is used to define the arc segment sizes"
+msgstr "Primarna mera določa velikost lokov segmentov"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sunburst/src/controlPanel.ts:58
+msgid "Secondary Metric"
+msgstr "Sekundarna mera"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sunburst/src/controlPanel.ts:60
+msgid ""
+"[optional] this secondary metric is used to define the color as a ratio "
+"against the primary metric. When omitted, the color is categorical and based "
+"on labels"
+msgstr ""
+"[opcijsko] sekundarna mera določa barvo kot razmerje do primarne mere. Če je "
+"izpuščena, je barva določena kategorično na podlagi oznak"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sunburst/src/controlPanel.ts:67
+msgid ""
+"When only a primary metric is provided, a categorical color scale is used."
+msgstr ""
+"Če je podana samo primarna metrika, je uporabljena kategorična barvna skala."
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sunburst/src/controlPanel.ts:70
+msgid "When a secondary metric is provided, a linear color scale is used."
+msgstr "Če je podana sekundarna metrika, je uporabljena linearna barvna skala."
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sunburst/src/controlPanel.ts:73
+msgid "Hierarchy"
+msgstr "Hierarhija"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sunburst/src/controlPanel.ts:74
+msgid "This defines the level of the hierarchy"
+msgstr "Določa stopnjo hierarhije"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-sunburst/src/index.js:27
+msgid "Sunburst Chart"
+msgstr "Večnivojski tortni grafikon"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-time-table/src/controlPanel.ts:38
+msgid "Time Series Columns"
+msgstr "Stolpci s časovnimi vrstami"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-treemap/src/controlPanel.ts:63
+msgid "Ratio"
+msgstr "Razmerje"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-treemap/src/controlPanel.ts:68
+msgid "Target aspect ratio for treemap tiles."
+msgstr "Ciljno razmerje za razdelke drevesnega grafikona."
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.ts:35
+msgid "Country Field Type"
+msgstr "Tip polja za države"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.ts:43
+msgid ""
+"The country code standard that Superset should expect to find in the "
+"[country] column"
+msgstr "Standard za oznake držav, ki bodo podane v stolpcu z državami"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.ts:74
+msgid "Show Bubbles"
+msgstr "Prikaži mehurčke"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.ts:77
+msgid "Whether to display bubbles on top of countries"
+msgstr "Če želite prikaz mehurčkov nad državami"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.ts:88
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:58
+msgid "Max Bubble Size"
+msgstr "Max. velikost mehurčka"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.ts:101
+msgid "Country Column"
+msgstr "Stolpec z državami"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.ts:102
+msgid "3 letter code of the country"
+msgstr "Tričrkovna oznaka države"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.ts:105
+msgid "Metric for Color"
+msgstr "Mera za barvo"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.ts:106
+msgid "Metric that defines the color of the country"
+msgstr "Mera, ki določa barvo države"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.ts:110
+msgid "Metric that defines the size of the bubble"
+msgstr "Mera, ki določa velikost mehurčka"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.ts:113
+msgid "Bubble Color"
+msgstr "Barva mehurčka"
+
+#: superset-ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.ts:116
+msgid "Country Color Scheme"
+msgstr "Barvna shema držav"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/sharedControls.ts:29
+msgid "Big Number Font Size"
+msgstr "Velikost pisave Velike številke"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/sharedControls.ts:37
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/sharedControls.ts:72
+msgid "Tiny"
+msgstr "Drobna"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/sharedControls.ts:45
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/sharedControls.ts:80
+msgid "Normal"
+msgstr "Normalna"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/sharedControls.ts:53
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/sharedControls.ts:88
+msgid "Huge"
+msgstr "Ogromna"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/sharedControls.ts:64
+msgid "Subheader Font Size"
+msgstr "Velikost pisave podnaslova"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx:71
+msgid "N/A"
+msgstr "N/A"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx:139
+#, python-format
+msgid "Last available value seen on %s"
+msgstr "Zadnja razpoložljiva vrednost na %s"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx:141
+msgid "Not up to date"
+msgstr "Ni posodobljeno"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx:178
+msgid "No data after filtering or data is NULL for the latest time record"
+msgstr ""
+"Ni podatkov po filtriranju ali pa imajo vrednost NULL za zadnji časovni zapis"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx:181
+msgid "Try applying different filters or ensuring your datasource has data"
+msgstr ""
+"Poskusite uporabiti druge filtre oz. zagotovite, da so v podatkovnem viru "
+"podatki"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:42
+msgid "Comparison Period Lag"
+msgstr "Zaostanek obdobja za primerjavo"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:44
+msgid "Based on granularity, number of time periods to compare against"
+msgstr "Na osnovi granulacije, število časovnih obdobij za primerjavo"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:53
+msgid "Comparison suffix"
+msgstr "Pripona za primerjavo"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:54
+msgid "Suffix to apply after the percentage display"
+msgstr "Pripona za prikaz procenta"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:64
+msgid "Show Trend Line"
+msgstr "Pokaži trendno črto"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:67
+msgid "Whether to display the trend line"
+msgstr "Če želite prikazati trendno črto"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:76
+msgid "Start y-axis at 0"
+msgstr "Začni y-os z 0"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:79
+msgid ""
+"Start y-axis at zero. Uncheck to start y-axis at minimum value in the data."
+msgstr ""
+"Začni y-os z nič. Ne izberite, če želite, da se y-os začne z najmanjšo "
+"vrednostjo podatkov."
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:90
+msgid "Fix to selected Time Range"
+msgstr "Nastavi na izbrano časovno obdobje"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx:91
+msgid ""
+"Fix the trend line to the full time range specified in case filtered results "
+"do not include the start or end dates"
+msgstr ""
+"Trendno črto nastavite na izbrano obdobje, v primeru, da filtrirani "
+"rezultati ne vsebujejo začetnega in/ali končnega datuma"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumberTotal/controlPanel.ts:40
+msgid "Subheader"
+msgstr "Podnaslov"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumberTotal/controlPanel.ts:41
+msgid "Description text that shows up below your Big Number"
+msgstr "Besedilo, ki se prikaže pod veliko številko"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:53
+msgid "Right Axis Format"
+msgstr "Oblika desne osi"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:64
+msgid "Show Markers"
+msgstr "Prikaži markerje"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:67
+msgid "Show data points as circle markers on the lines"
+msgstr "Pokaži točke kot krožne markerje na krivuljah"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:89
+msgid "Y bounds"
+msgstr "Y meje"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:92
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:103
+msgid "Whether to display the min and max values of the Y-axis"
+msgstr "Če želite prikaz min. in max. vrednosti Y-osi"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:100
+msgid "Y 2 bounds"
+msgstr "Meje Y 2"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:111
+msgid "Line Style"
+msgstr "Slog črte"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:122
+msgid "Line interpolation as defined by d3.js"
+msgstr "Interpolacija krivulje na osnovi d3.js"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:130
+msgid "Show Range Filter"
+msgstr "Pokaži filter obdobja"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:139
+msgid "Whether to display the time range interactive selector"
+msgstr "Če želite prikaz interaktivnega izbirnika časovnega obdobja"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:158
+msgid "Extra Controls"
+msgstr "Dodatni kontrolniki"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:161
+msgid ""
+"Whether to show extra controls or not. Extra controls include things like "
+"making mulitBar charts stacked or side by side."
+msgstr ""
+"Če želite prikaz dodatnih kontrolnikov. Dodatni kontrolniki vključujejo "
+"možnost izdelave večstolpčnih grafikonov, naloženih ali drug ob drugem."
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:197
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts:87
+#: superset-ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/controlPanel.ts:56
+msgid "X Tick Layout"
+msgstr "Postavitev oznak na X-osi"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:202
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts:92
+#: superset-ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/controlPanel.ts:61
+msgid "The way the ticks are laid out on the X-axis"
+msgstr "Način razporeditve oznak na X-osi"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:211
+msgid "X Axis Format"
+msgstr "Oblika X-osi"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:223
+msgid "Y Log Scale"
+msgstr "Logaritemska Y-os"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:226
+msgid "Use a log scale for the Y-axis"
+msgstr "Uporabi logaritemsko skalo za Y-os"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:234
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:354
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:464
+msgid "Y Axis Bounds"
+msgstr "Meje Y-osi"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:237
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:253
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:357
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:467
+msgid ""
+"Bounds for the Y-axis. When left empty, the bounds are dynamically defined "
+"based on the min/max of the data. Note that this feature will only expand "
+"the axis range. It won't narrow the data's extent."
+msgstr ""
+"Meje Y-osi. Če je prazno, se meje nastavijo dinamično na podlagi min./max. "
+"vrednosti podatkov. Funkcija omeji le prikaz, obseg podatkov pa ostane enak."
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:250
+msgid "Y Axis 2 Bounds"
+msgstr "Meje Y 2-osi"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:266
+msgid "X bounds"
+msgstr "Meje X-osi"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:269
+msgid "Whether to display the min and max values of the X-axis"
+msgstr "Če želite prikaz min. in max. vrednosti X-osi"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:288
+msgid "Bar Values"
+msgstr "Vrednosti stolpcev"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:291
+msgid "Show the value on top of the bar"
+msgstr "Prikaži vrednosti na vrhu stolpcev"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:299
+msgid "Stacked Bars"
+msgstr "Naloženi stolpci"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:310
+msgid "Reduce X ticks"
+msgstr "Manj oznak X-osi"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx:313
+msgid ""
+"Reduces the number of X-axis ticks to be rendered. If true, the x-axis will "
+"not overflow and labels may be missing. If false, a minimum width will be "
+"applied to columns and the width may overflow into an horizontal scroll."
+msgstr ""
+"Zmanjša število izrisanih oznak na X-osi. Če je vklopljeno, se x-os ne bo "
+"prelila in lahko oznake manjkajo. Če je izklopljeno, bo upoštevana min. "
+"širina stolpcev, ki pa se lahko prelije v horizontalni drsnik."
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js:369
+msgid "You cannot use 45° tick layout along with the time range filter"
+msgstr ""
+"Skupaj s filtriranjem časovnega obdobja ne morete uporabiti oznak pod 45° "
+"kotom"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Area/controlPanel.ts:52
+msgid "Stacked Style"
+msgstr "Slog nalaganja"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Area/index.js:28
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:259
+msgid "Area Chart"
+msgstr "Ploščinski grafikon"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bar/index.js:28
+msgid "Time-series Bar Chart"
+msgstr "Stolpčni grafikon za časovno vrsto"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/BoxPlot/index.js:26
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/BoxPlot/index.ts:49
+#: superset-ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/createMetadata.ts:7
+msgid "Box Plot"
+msgstr "Box Plot"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:98
+msgid "X Log Scale"
+msgstr "Logaritemska X-os"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts:101
+msgid "Use a log scale for the X-axis"
+msgstr "Uporabi logaritemsko skalo za X-os"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:39
+msgid "Ranges"
+msgstr "Razponi"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:41
+msgid "Ranges to highlight with shading"
+msgstr "Razponi za označitev s senčenjem"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:48
+msgid "Range labels"
+msgstr "Oznake razponov"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:50
+msgid "Labels for the ranges"
+msgstr "Oznake za razpone"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:59
+msgid "Markers"
+msgstr "Markerji"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:61
+msgid "List of values to mark with triangles"
+msgstr "Seznam vrednosti, ki bodo markirane s trikotniki"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:68
+msgid "Marker labels"
+msgstr "Oznake markerjev"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:70
+msgid "Labels for the markers"
+msgstr "Oznake za markerje"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:79
+msgid "Marker lines"
+msgstr "Markirne črtice"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:81
+msgid "List of values to mark with lines"
+msgstr "Seznam vrednosti, ki bodo markirane s črticami"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:88
+msgid "Marker line labels"
+msgstr "Oznake markirnih črtic"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bullet/controlPanel.ts:90
+msgid "Labels for the marker lines"
+msgstr "Oznake za markirne črtice"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:26
+#, python-format
+msgid "A line chart component where you can compare the % change over time"
+msgstr "Komponenta grafikona, kjer lahko primerjate % cpremembo skozi čas"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Compare/index.js:27
+msgid "Time-series Percent Change"
+msgstr "Časovna vrsta - Procentualna sprememba"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:86
+msgid "Sort Bars"
+msgstr "Uredi stolpce"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:89
+msgid "Sort bars by x labels."
+msgstr "Uredi stolpce po x-oznakah."
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:112
+msgid "Breakdowns"
+msgstr "Razčlenitev"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts:113
+msgid "Defines how each series is broken down"
+msgstr "Določa, kako se vsaka podatkovna serija razčleni"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:26
+msgid "A bar chart where the x axis is time"
+msgstr "Stolpčni grafikon, kjer je na x-osi čas"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DistBar/index.js:27
+msgid "Bar Chart"
+msgstr "Stolpčni grafikon"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:40
+msgid "Y Axis 1"
+msgstr "Y-os 1"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:45
+msgid "Y Axis 2"
+msgstr "Y-os 2"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:58
+msgid "Left Axis Metric"
+msgstr "Mera za levo os"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:59
+msgid "Choose a metric for left axis"
+msgstr "Izberite mero za levo os"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts:62
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:164
+msgid "Left Axis Format"
+msgstr "Oblika leve osi"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DualLine/index.js:27
+msgid "Dual Line Chart"
+msgstr "Grafikon z dvojno krivuljo"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:56
+msgid "Propagate"
+msgstr "Razširi"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts:59
+msgid "Send range filter events to other charts"
+msgstr "Pošlji dogodke filtra obdobja na druge grafikone"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Line/index.js:29
+#: superset-ui/superset-ui/plugins/preset-chart-xy/src/Line/createMetadata.ts:7
+msgid "Line Chart"
+msgstr "Črtni grafikon"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:64
+msgid "Prefix metric name with slice name"
+msgstr "Imenu mere pripni ime rezine"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:88
+msgid "Y Axis Left"
+msgstr "Y-os levo"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:97
+msgid "Left Axis chart(s)"
+msgstr "Grafikoni leve osi"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:100
+msgid "Choose one or more charts for left axis"
+msgstr "Izberite enega ali več grafikonov za levo os"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/Multi/controlPanel.js:42
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:102
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:136
+msgid "Select charts"
+msgstr "Izberi grafikone"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/Multi/controlPanel.js:43
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:103
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:137
+msgid "Error while fetching charts"
+msgstr "Napaka pri pridobivanju grafikonov"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:122
+msgid "Y Axis Right"
+msgstr "Y-os desno"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:131
+msgid "Right Axis chart(s)"
+msgstr "Grafikoni desne osi"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts:134
+msgid "Choose one or more charts for right axis"
+msgstr "Izberite enega ali več grafikonov za desno os"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/LineMulti/index.js:27
+msgid "Multiple Line Charts"
+msgstr "Veččrtni grafikon"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:39
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx:96
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:109
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx:125
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Treemap/controlPanel.tsx:111
+msgid "Label Type"
+msgstr "Oblika oznake"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:50
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx:107
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:120
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx:132
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Treemap/controlPanel.tsx:119
+msgid "What should be shown on the label?"
+msgstr "Kaj bo prikazano na oznaki?"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:73
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:217
+msgid "Donut"
+msgstr "Kolobar"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:76
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:220
+msgid "Do you want a donut or a pie?"
+msgstr "Želite kolobar ali torto?"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:86
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx:132
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:159
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx:113
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Treemap/controlPanel.tsx:87
+msgid "Show Labels"
+msgstr "Pokaži oznake"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:89
+msgid ""
+"Whether to display the labels. Note that the label only displays when the "
+"the 5% threshold."
+msgstr ""
+"Če želite prikazati oznake. Oznake so prikazane le pri vsaj 5-odstotnem "
+"pragu."
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:99
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:171
+msgid "Put labels outside"
+msgstr "Postavi oznake zunaj"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts:102
+msgid "Put the labels outside the pie?"
+msgstr "Postavim oznake zunaj torte?"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Pie/index.js:27
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/index.ts:49
+msgid "Pie Chart"
+msgstr "Tortni grafikon"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/TimePivot/controlPanel.ts:49
+msgid "Frequency"
+msgstr "Frekvenca"
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/TimePivot/controlPanel.ts:61
+msgid ""
+"The periodicity over which to pivot time. Users can provide\r\n"
+"            \"Pandas\" offset alias.\r\n"
+"            Click on the info bubble for more details on accepted \"freq\" "
+"expressions."
+msgstr ""
+"Periodičnost za vrtenje časa. Uporabnik lahko poda\n"
+"            psevdonim za zamik v \"Pandas\".\n"
+"            Kliknite na mehurček za podrobnosti dovoljenih izrazov za \"freq"
+"\"."
+
+#: superset-ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js:27
+msgid "Time-series Period Pivot"
+msgstr "Časovna serija - Vrtenje periode"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/controls.tsx:30
+msgid "Show legend"
+msgstr "Prikaži legendo"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/controls.tsx:33
+msgid "Whether to display a legend for the chart"
+msgstr "Če želite prikaz legende za grafikon"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/controls.tsx:41
+msgid "Margin"
+msgstr "Rob"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/controls.tsx:45
+msgid "Additional padding for legend."
+msgstr "Dodatni razmak za legendo."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/controls.tsx:63
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/controls.tsx:83
+msgid "Legend type"
+msgstr "Tip legende"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts:49
+#: superset-ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/controlPanel.ts:41
+msgid "Whisker/outlier options"
+msgstr "Možnosti grafikona kvantilov"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts:51
+#: superset-ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/controlPanel.ts:43
+msgid "Determines how whiskers and outliers are calculated."
+msgstr "Določa kako so izračunani kvantili in izstopajoče vrednosti."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts:74
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx:79
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:92
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx:98
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Treemap/controlPanel.tsx:73
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:261
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:429
+msgid "Enable emitting filters"
+msgstr "Omogoči oddajanje filtrov"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts:77
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx:82
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:95
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx:101
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Treemap/controlPanel.tsx:76
+msgid "Enable emmiting filters."
+msgstr "Omogoči oddajanje filtrov."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts:132
+msgid "Categories to group by on the x-axis."
+msgstr "Kategorije za združevanje po x-osi."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts:135
+msgid "Distribute across"
+msgstr "Porazdeli glede na"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts:137
+msgid ""
+"Columns to calculate distribution across. Defaults to temporal column if "
+"left empty."
+msgstr ""
+"Stolpci za izračun porazdelitve. Privzeto je izbran časovni stolpec (če je "
+"prazno)."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx:90
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:103
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx:107
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Treemap/controlPanel.tsx:81
+msgid "Labels"
+msgstr "Oznake"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx:135
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:162
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx:116
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Treemap/controlPanel.tsx:90
+msgid "Whether to display the labels."
+msgstr "Če želite prikaz oznak."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/index.ts:49
+msgid "Funnel Chart"
+msgstr "Lijakasti grafikon"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:42
+msgid "Columns to group by"
+msgstr "Stolpci za združevanje"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:74
+msgid "General"
+msgstr "Splošno"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:85
+msgid "Minimum value on the gauge axis"
+msgstr "Najmanjša vrednost na številčnici"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:97
+msgid "Maximum value on the gauge axis"
+msgstr "Največja vrednost na številčnici"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:106
+msgid "Start angle"
+msgstr "Začetni kot"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:107
+msgid "Angle at which to start progress axis"
+msgstr "Kot, pri katerem se začne os območja"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:116
+msgid "End angle"
+msgstr "Končni kot"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:117
+msgid "Angle at which to end progress axis"
+msgstr "Kot, pri katerem se konča os območja"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:129
+msgid "Font size"
+msgstr "Velikost pisave"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:130
+msgid "Font size for axis labels, detail value and other text elements"
+msgstr "Velikost pisave za oznake osi, podrobnosti in druge besedilne elemente"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:157
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:135
+msgid "Value format"
+msgstr "Oblika zapisa vrednosti"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:158
+msgid "Additional text to add before or after the value, e.g. unit"
+msgstr "Dodatno besedilo, ki ga dodate pred ali za vrednost, npr. enota"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:169
+msgid "Show pointer"
+msgstr "Prikaži kazalec"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:170
+msgid "Whether to show the pointer"
+msgstr "Če želite prikazati kazalec"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:181
+msgid "Animation"
+msgstr "Animacija"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:182
+msgid "Whether to animate the progress and the value or just display them"
+msgstr "Če želite animiran prikaz grafikona"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:188
+msgid "Axis"
+msgstr "Os"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:194
+msgid "Show axis line ticks"
+msgstr "Prikaži oznake na X-osi"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:195
+msgid "Whether to show minor ticks on the axis"
+msgstr "Če želite prikaz manjših oznak na osi"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:206
+msgid "Show split lines"
+msgstr "Prikaži razdelitvene črte"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:207
+msgid "Whether to show the split lines on the axis"
+msgstr "Če želite prikazati razdelitvene črte na osi"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:218
+msgid "Split number"
+msgstr "Število razdelitev"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:219
+msgid "Number of split segments on the axis"
+msgstr "Število razdelkov na osi"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:227
+msgid "Progress"
+msgstr "Območje"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:233
+msgid "Show progress"
+msgstr "Prikaži območje"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:234
+msgid "Whether to show the progress of gauge chart"
+msgstr "Prikaži merilno območje števčnega grafikona"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:245
+msgid "Overlap"
+msgstr "Prekrivanje"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:246
+msgid ""
+"Whether the progress bar overlaps when there are multiple groups of data"
+msgstr "Če želite prekrivanje območij, ko imate več skupin podatkov"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:259
+msgid "Round cap"
+msgstr "Zaobljeni konci"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:260
+msgid "Style the ends of the progress bar with a round cap"
+msgstr "Zaobljena oblika koncev območja"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:266
+msgid "Intervals"
+msgstr "Intervali"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:272
+msgid "Interval bounds"
+msgstr "Meje intervalov"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:273
+msgid ""
+"Comma-separated interval bounds, e.g. 2,4,5 for intervals 0-2, 2-4 and 4-5. "
+"Last number should match the value provided for MAX."
+msgstr ""
+"Z vejico ločeni intervali, npr. 2,4,5 za intervale 0-2, 2-4 in 4-5. Zadnja "
+"številka naj bo enaka vrednosti za MAX."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:286
+msgid "Interval colors"
+msgstr "Barve intervalov"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx:287
+msgid ""
+"Comma-separated color picks for the intervals, e.g. 1,2,4. Integers denote "
+"colors from the chosen color scheme and are 1-indexed. Length must be "
+"matching that of interval bounds."
+msgstr ""
+"Z vejico ločene barve za intervale, npr. 1,2,4. Cela števila predstavljajo "
+"barve iz barvne sheme (začnejo se z 1). Dolžina mora ustrezati mejam "
+"intervala."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/index.ts:33
+msgid "Gauge Chart"
+msgstr "Števčni grafikon"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:49
+msgid "Name of the source nodes"
+msgstr "Imena izvornih vozlišč"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:59
+msgid "Name of the target nodes"
+msgstr "Imena ciljnih vozlišč"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:69
+msgid "Source category"
+msgstr "Kategorija izvora"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:70
+msgid ""
+"The category of source nodes used to assign colors. If a node is associated "
+"with more than one category, only the first will be used."
+msgstr ""
+"Kategorija izvornih vozlišč, na podlagi katere je določena barva. Če je "
+"vozlišče povezano z več kot eno kategorijo, bo uporabljena samo prva."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:82
+msgid "Target category"
+msgstr "Kategorija cilja"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:83
+msgid "Category of target nodes"
+msgstr "Kategorija ciljnih vozlišč"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:92
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:100
+msgid "Chart options"
+msgstr "Možnosti grafikona"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:97
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:103
+msgid "Layout"
+msgstr "Izgled"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:104
+msgid "Graph layout"
+msgstr "Izgled grafikona"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:107
+msgid "Force"
+msgstr "Sila"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:108
+msgid "Circular"
+msgstr "Krožno"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:110
+msgid "Layout type of graph"
+msgstr "Tip izgleda grafikona"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:120
+msgid "Edge symbols"
+msgstr "Simboli povezav"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:121
+msgid "Symbol of two ends of edge line"
+msgstr "Simbol za konca povezave"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:124
+msgid "None -> None"
+msgstr "Brez -> Brez"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:125
+msgid "None -> Arrow"
+msgstr "Brez -> Puščica"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:126
+msgid "Circle -> Arrow"
+msgstr "Krog -> Puščica"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:127
+msgid "Circle -> Circle"
+msgstr "Krog -> Krog"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:137
+msgid "Enable node dragging"
+msgstr "Omogoči premikanje vozlišč"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:140
+msgid "Whether to enable node dragging in force layout mode."
+msgstr "Če želite omogočiti premikanje vozlišč v načinu vsiljenega prikaza."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:152
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:263
+msgid "Enable graph roaming"
+msgstr "Omogoči preoblikovanje grafikona"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:156
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:174
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:267
+msgid "Disabled"
+msgstr "Onemogočeno"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:157
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:268
+msgid "Scale only"
+msgstr "Samo povečava"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:158
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:269
+msgid "Move only"
+msgstr "Samo premikanje"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:159
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:270
+msgid "Scale and Move"
+msgstr "Povečava in premikanje"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:161
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:272
+msgid "Whether to enable changing graph position and scaling."
+msgstr "Če želite omogočiti premikanje in povečevanje/zmanjševanje grafikona."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:171
+msgid "Node select mode"
+msgstr "Način izbire vozlišč"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:175
+msgid "Single"
+msgstr "Posamezno"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:176
+msgid "Multiple"
+msgstr "Več"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:178
+msgid "Allow node selections"
+msgstr "Dovoli izbiro vozlišča"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:187
+msgid "Label threshold"
+msgstr "Prag oznak"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:191
+msgid "Minimum value for label to be displayed on graph."
+msgstr "Najmanjša vrednost, za katero bo na grafikonu prikazana oznaka."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:200
+msgid "Node size"
+msgstr "Velikost vozlišča"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:204
+msgid ""
+"Median node size, the largest node will be 4 times larger than the smallest"
+msgstr ""
+"Mediana velikosti vozlišča. Največje vozlišče bo 4-krat večje od najmanjšega"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:213
+msgid "Edge width"
+msgstr "Debelina povezave"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:217
+msgid ""
+"Median edge width, the thickest edge will be 4 times thicker than the "
+"thinnest."
+msgstr ""
+"Mediana debeline povezave. Najdebelejša povezava bo 4-krat debelejša od "
+"najtanjše."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:228
+msgid "Edge length"
+msgstr "Dolžina povezave"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:234
+msgid "Edge length between nodes"
+msgstr "Dolžina povezave med vozlišči"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:246
+msgid "Gravity"
+msgstr "Gravitacija"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:252
+msgid "Strength to pull the graph toward center"
+msgstr "Sila privlačnosti med grafikonom in središčem"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:264
+msgid "Repulsion"
+msgstr "Odbijanje"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:270
+msgid "Repulsion strength between nodes"
+msgstr "Odbojna sila med vozlišči"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:282
+msgid "Friction"
+msgstr "Trenje"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/controlPanel.tsx:288
+msgid "Friction between nodes"
+msgstr "Trenje med vozlišči"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Graph/index.ts:33
+msgid "Graph Chart"
+msgstr "Graf"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:119
+msgid "Series type"
+msgstr "Tip serije"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:131
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:238
+msgid "Series chart type (line, bar etc)"
+msgstr "Tip grafikona za posamezno podatkovno serijo (črtni, stolpčni, ...)"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:140
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:247
+msgid "Stack series"
+msgstr "Nalagaj serije"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:143
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:250
+msgid "Stack series on top of each other"
+msgstr "Nalagaj serije eno na drugo"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:152
+msgid "Area chart"
+msgstr "Ploščinski grafikon"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:155
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:262
+msgid "Draw area under curves. Only applicable for line types."
+msgstr "Izriši površino pod krivuljo. Samo za črtne grafikone."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:170
+msgid "Opacity of area chart."
+msgstr "Prosojnost ploščinskega grafikona."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:179
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:288
+msgid "Marker"
+msgstr "Marker"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:182
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:291
+msgid "Draw a marker on data points. Only applicable for line types."
+msgstr "Nariši markerje na točke grafikona. Samo za črtne grafikone."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:191
+msgid "Marker size"
+msgstr "Velikost markerja"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:196
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:305
+msgid "Size of marker. Also applies to forecast observations."
+msgstr "Velikost markerja. Upošteva se tudi za napovedi."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:207
+msgid "Primary"
+msgstr "Primarna"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:208
+msgid "Secondary"
+msgstr "Sekundarna"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:212
+msgid "Primary or secondary y-axis"
+msgstr "Primarna ali sekundarna y-os"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:222
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:246
+msgid "Query A"
+msgstr "Poizvedba A"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:223
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:247
+msgid "Query B"
+msgstr "Poizvedba B"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:253
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:316
+msgid "Data Zoom"
+msgstr "Zoom funkcija"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:256
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:319
+msgid "Enable data zooming controls"
+msgstr "Omogoči kontrolnik za povečavo podatkov"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:268
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:271
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:342
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:345
+msgid "Show Min Label"
+msgstr "Pokaži oznako Min"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:280
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:283
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:354
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:357
+msgid "Show Max Label"
+msgstr "Pokaži oznako Max"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:294
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:368
+msgid "Rotate x axis label"
+msgstr "Zavrti oznako x-osi"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:301
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:375
+msgid "Input field supports custom rotation. e.g. 30 for 30°"
+msgstr "Vnosno polje omogoča poljubno rotacijo (vnesite 30 za 30°)"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:307
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:381
+msgid "Tooltip"
+msgstr "Opis orodja"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:313
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:387
+msgid "Rich tooltip"
+msgstr "Podroben opis orodja"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:316
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:390
+msgid "Shows a list of all series available at that point in time"
+msgstr ""
+"Prikaže seznam vseh razpoložljivih podatkovnih serij za istočasno točko"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:328
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:426
+msgid "Minor Split Line"
+msgstr "Manjša ločilna črta"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:331
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:429
+msgid "Draw split lines for minor y-axis ticks"
+msgstr "Izriši ločilne črte za pomožne oznake y-osi"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:340
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:450
+msgid "Truncate Y Axis"
+msgstr "Prireži Y-os"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:343
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:453
+msgid "Truncate Y Axis. Can be overridden by specifying a min or max bound."
+msgstr "Prireži Y-os. Preprečite, tako da določite spodnjo in zgornjo mejo."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:371
+msgid "Primary y-axis format"
+msgstr "Oblika primarne y-osi"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:380
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:438
+msgid "Primary y-axis title"
+msgstr "Naslov primarne y-osi"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:383
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:441
+msgid "Title for y-axis"
+msgstr "Naslov y-osi"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:392
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:416
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:425
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:414
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:417
+msgid "Logarithmic y-axis"
+msgstr "Logaritemska y-os"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:395
+msgid "Logarithmic scale on primary y-axis"
+msgstr "Logaritemska skala na primarni y-osi"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:404
+msgid "Secondary y-axis format"
+msgstr "Oblika sekundarne y-osi"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:413
+msgid "Secondary y-axis title"
+msgstr "Naslov sekundarne y-osi"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx:428
+msgid "Logarithmic scale on secondary y-axis"
+msgstr "Logaritemska skala na sekundarni y-osi"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/index.ts:50
+msgid "Mixed timeseries chart"
+msgstr "Kombinirani grafikon časovne vrste"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:78
+msgid "Percentage threshold"
+msgstr "Procentualni prag"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:82
+msgid "Minimum threshold in percentage points for showing labels."
+msgstr "Minimalni prag v odstotnih točkah za prikaz oznak."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:174
+msgid "Put the labels outside of the pie?"
+msgstr "Postavim oznake zunaj torte?"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:185
+msgid "Label Line"
+msgstr "Črta oznake"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:188
+msgid "Draw line from Pie to label when labels outside?"
+msgstr "Ali želite črto do oznake, ko so le-te zunaj?"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:196
+msgid "Pie shape"
+msgstr "Oblika torte"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:202
+msgid "Outer Radius"
+msgstr "Zunanji polmer"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:208
+msgid "Outer edge of Pie chart"
+msgstr "Zunanji rob tortnega grafikona"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:229
+msgid "Inner Radius"
+msgstr "Notranji polmer"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Pie/controlPanel.tsx:235
+msgid "Inner radius of donut hole"
+msgstr "Notranji polmer kolobarja"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx:56
+msgid "The maximum value of metrics. It is an optional configuration"
+msgstr "Največja vrednost mere. To je opcijska nastavitev"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx:142
+msgid "Label position"
+msgstr "Položaj oznake"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx:180
+msgid "Radar"
+msgstr "Radar"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx:186
+msgid "Customize Metrics"
+msgstr "Prilagodi mere"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx:187
+msgid "Further customize how to display each metric"
+msgstr "Dodatne prilagoditve prikaza posameznih mer"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx:213
+msgid "Circle radar shape"
+msgstr "Okrogla oblika radarja"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx:216
+msgid "Radar render type, whether to display 'circle' shape."
+msgstr "Način prikaza radarja - če se prikaže okrogla oblika."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Radar/index.ts:50
+msgid "Radar Chart"
+msgstr "Radarski grafikon"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:76
+msgid "Contribution Mode"
+msgstr "Način deležev"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:83
+msgid "Calculate contribution per series or total"
+msgstr "Izračunaj delež za podatkovno serijo ali skupnega"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:122
+msgid "Predictive Analytics"
+msgstr "Prediktivna analitika"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:130
+msgid "Enable forecast"
+msgstr "Omogoči napoved"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:133
+msgid "Enable forecasting"
+msgstr "Omogoči napovedovanje"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:142
+msgid "Forecast periods"
+msgstr "Obdobja napovedi"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:145
+msgid "How many periods into the future do we want to predict"
+msgstr "Za koliko period v prihodnosti želite napoved"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:154
+msgid "Confidence interval"
+msgstr "Interval zaupanja"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:157
+msgid "Width of the confidence interval. Should be between 0 and 1"
+msgstr "Širina intervala zaupanja. Mora bit med 0 in 1"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:172
+msgid ""
+"Should yearly seasonality be applied. An integer value will specify Fourier "
+"order of seasonality."
+msgstr ""
+"Če želite letno sezonskost. Celo število določa Fourier-jev red sezonskosti."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:191
+msgid ""
+"Should weekly seasonality be applied. An integer value will specify Fourier "
+"order of seasonality."
+msgstr ""
+"Če želite tedensko sezonskost. Celo število določa Fourier-jev red "
+"sezonskosti."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:208
+msgid ""
+"Should daily seasonality be applied. An integer value will specify Fourier "
+"order of seasonality."
+msgstr ""
+"Če želite dnevno sezonskost. Celo število določa Fourier-jev red sezonskosti."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:226
+msgid "Series Style"
+msgstr "Slog serije"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:271
+msgid "Area chart opacity"
+msgstr "Prosojnost ploščinskega grafikona"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:277
+msgid "Opacity of Area Chart. Also applies to confidence band."
+msgstr ""
+"Prosojnost ploščinskega grafikona. Upošteva se tudi za interval zaupanja."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:300
+msgid "Marker Size"
+msgstr "Velikost markerja"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx:399
+msgid "Tooltip time format"
+msgstr "Oblika zapisa časa v opisu orodja"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/index.ts:50
+msgid "Time-series Chart"
+msgstr "Grafikon časovne vrste"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:46
+msgid "Id"
+msgstr "Id"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:47
+msgid "Name of the id column"
+msgstr "Naziv id-stolpca"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:56
+msgid "Parent"
+msgstr "Nadrejeni"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:57
+msgid "Name of the column containing the id of the parent node"
+msgstr "Ime stolpca, ki vsebuje id nadrejenega vozlišča"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:67
+msgid "Optional name of the data column."
+msgstr "Opcijsko ime podatkovnega stolpca."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:79
+msgid "Root node id"
+msgstr "Id korenskega vozlišča"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:80
+msgid "Id of root node of the tree."
+msgstr "Id korenskega vozlišča drevesa."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:91
+msgid "Metric for node values"
+msgstr "Mera za vrednosti vozlišč"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:110
+msgid "Tree layout"
+msgstr "Oblika drevesa"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:113
+msgid "Orthogonal"
+msgstr "Pravokotna"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:114
+msgid "Radial"
+msgstr "Radialna"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:116
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:239
+msgid "Layout type of tree"
+msgstr "Način izgleda drevesa"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:127
+msgid "Tree orientation"
+msgstr "Orientacija drevesa"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:130
+msgid "Left to Right"
+msgstr "Iz leve proti desni"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:131
+msgid "Right to Left"
+msgstr "Iz desne proti levi"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:132
+msgid "Top to Bottom"
+msgstr "Iz vrha proti dnu"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:133
+msgid "Bottom to Top"
+msgstr "Iz dna proti vrhu"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:135
+msgid "Orientation of tree"
+msgstr "Orientacija drevesa"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:148
+msgid "Node label position"
+msgstr "Položaj oznake vozlišča"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:151
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:169
+msgid "left"
+msgstr "levo"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:152
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:170
+msgid "top"
+msgstr "zgoraj"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:153
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:171
+msgid "right"
+msgstr "desno"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:154
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:172
+msgid "bottom"
+msgstr "spodaj"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:156
+msgid "Position of intermidiate node label on tree"
+msgstr "Položaj vmesne oznake vozlišča na drevesu"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:166
+msgid "Child label position"
+msgstr "Položaj podrejene oznake"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:174
+msgid "Position of child node label on tree"
+msgstr "Položaj oznake podrejenega vozlišča na drevesu"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:184
+msgid "Emphasis"
+msgstr "Poudari"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:187
+msgid "ancestor"
+msgstr "nadrejeni"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:188
+msgid "descendant"
+msgstr "podrejeni"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:190
+msgid "Which relatives to highlight on hover"
+msgstr "Kateri element se poudari na prehodu z miško"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:203
+msgid "Symbol"
+msgstr "Simbol"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:207
+msgid "Empty circle"
+msgstr "Prazen krog"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:211
+msgid "Circle"
+msgstr "Krog"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:215
+msgid "Rectangle"
+msgstr "Pravokotnik"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:219
+msgid "Triangle"
+msgstr "Trikotnik"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:223
+msgid "Diamond"
+msgstr "Karo"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:227
+msgid "Pin"
+msgstr "Žebljiček"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:231
+msgid "Arrow"
+msgstr "Puščica"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:248
+msgid "Symbol size"
+msgstr "Velikost simbola"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx:254
+msgid "Size of edge symbols"
+msgstr "Velikost simbola povezave"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/index.ts:33
+msgid "Tree Chart"
+msgstr "Drevesni grafikon"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Treemap/controlPanel.tsx:99
+msgid "Show Upper Labels"
+msgstr "Prikaži zgornje oznake"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Treemap/controlPanel.tsx:102
+msgid "Show labels when the node has children."
+msgstr "Prikaži oznake, ko ima vozlišče podrejene elemente."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/Treemap/index.ts:50
+msgid "Treemap v2"
+msgstr "Drevesni grafikon s pravokotniki v2"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:40
+msgid "Columns to group by on the rows"
+msgstr "Stolpci za združevanje vrstic"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:50
+msgid "Columns to group by on the columns"
+msgstr "Stolpci za združevanje stolpcev"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:119
+msgid "Transpose pivot"
+msgstr "Transponirano vrtenje"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:121
+msgid "Swap rows and columns"
+msgstr "Zamenjaj vrstice in stolpce"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:143
+msgid "Pivot table type"
+msgstr "Tip vrtilne tabele"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:149
+msgid "Table Heatmap"
+msgstr "Barvanje tabele"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:150
+msgid "Table Col Heatmap"
+msgstr "Barvanje stolpcev tabele"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:151
+msgid "Table Row Heatmap"
+msgstr "Barvanje vrstic tabele"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:152
+msgid "Table Barchart"
+msgstr "Stolpčni grafi po tabeli"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:153
+msgid "Table Col Barchart"
+msgstr "Stolpčni grafi po stolpcih"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:154
+msgid "Table Row Barchart"
+msgstr "Stolpčni grafi po vrsticah"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:157
+msgid "The type of pivot table visualization"
+msgstr "Način za vizualizacijo vrtilne tabele"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:166
+msgid "Rows sort by"
+msgstr "Razvrsti vrst."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:171
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:189
+msgid "key a-z"
+msgstr "a - ž"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:172
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:190
+msgid "key z-a"
+msgstr "ž - a"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:173
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:191
+msgid "value ascending"
+msgstr "0 - 9"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:174
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:192
+msgid "value descending"
+msgstr "9 - 0"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:177
+msgid "Order of rows"
+msgstr "Vrstni red vrstic"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:184
+msgid "Cols sort by"
+msgstr "Razvrsti stolp."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:195
+msgid "Order of columns"
+msgstr "Vrstni red stolpcev"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:204
+msgid "Rows subtotals position"
+msgstr "Položaj vsot vrstic"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:209
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/controls.ts:72
+msgid "Top"
+msgstr "Zgoraj"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:210
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/controls.ts:73
+msgid "Bottom"
+msgstr "Spodaj"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:213
+msgid "Position of row level subtotals"
+msgstr "Položaj vsot na nivoju vrstic"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:220
+msgid "Cols subtotals position"
+msgstr "Položaj vsot stolp."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:229
+msgid "Position of column level subtotals"
+msgstr "Položaj vsot na nivoju stolpcev"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:238
+msgid "Show rows totals"
+msgstr "Prikaži vsoto vrstic"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:241
+msgid "Display row level totals"
+msgstr "Prikaže vsoto vseh vrstic"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:248
+msgid "Show cols totals"
+msgstr "Prik. vsoto stolpcev"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:251
+msgid "Display column level totals"
+msgstr "Prikaže vsoto vseh stolpcev"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts:264
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:432
+msgid "Whether to apply filter to dashboards when table cells are clicked"
+msgstr ""
+"Če želite uporabiti filter na nadzorni plošči, ko kliknete na celico v tabeli"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/index.ts:41
+msgid "Pivot Table v2"
+msgstr "Vrtilna tabela v2"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/TableChart.tsx:111
+msgid "search.num_records"
+msgstr "search.num_records"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/TableChart.tsx:122
+msgid "page_size.show"
+msgstr "page_size.show"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/TableChart.tsx:140
+msgid "page_size.entries"
+msgstr "page_size.entries"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/TableChart.tsx:368
+msgid "Totals"
+msgstr "Vsote"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/consts.ts:26
+msgid "page_size.all"
+msgstr "page_size.all"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:76
+msgid "Group By, Metrics or Percentage Metrics must have a value"
+msgstr "Združevanje, Mera ali Procentualna mera morajo imeti vrednost"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:82
+msgid "Query mode"
+msgstr "Poizvedbeni način"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:109
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:129
+msgid "must have a value"
+msgstr "mora imeti vrednost"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:138
+msgid "Percentage metrics"
+msgstr "Procentualne mere"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:139
+msgid ""
+"Metrics for which percentage of total are to be displayed. Calculated from "
+"only data within the row limit."
+msgstr ""
+"Mera, za katero je prikazan odstotek od celote. Izračunan je samo iz "
+"podatkov znotraj omejitve števila vrstic."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:254
+msgid "Ordering"
+msgstr "Razvrščanje"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:255
+msgid "Order results by selected columns"
+msgstr "Razvrsti rezultate glede na izbrani stolpec"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:270
+msgid "Server pagination"
+msgstr "Številčenje strani strežnika"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:271
+msgid "Enable server side pagination of results (experimental feature)"
+msgstr ""
+"Omogoči številčenje strani rezultatov na strani strežnika (preizkusna "
+"funkcija)"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:289
+msgid "Server Page Length"
+msgstr "Dolžina strani strežnika"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:292
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:368
+msgid "Rows per page, 0 means no pagination"
+msgstr "Vrstic na stran (0 pomeni brez številčenja strani)"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:303
+msgid "Include time"
+msgstr "Vključi čas"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:304
+msgid "Whether to include the time granularity as defined in the time section"
+msgstr "Če želite vključiti granulacijo časa, ki je določena v sekciji Čas"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:329
+msgid ""
+"Show total aggregations of selected metrics. Note that row limit does not "
+"apply to the result."
+msgstr ""
+"Prikaži skupno agregacijo izbrane mere. Omejitev števila vrstic ne vpliva na "
+"rezultat."
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:349
+msgid "Timestamp format"
+msgstr "Oblika zapisa časovne značke"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:354
+msgid "D3 time format for datetime columns"
+msgstr "D3 oblika zapisa za časovne stolpce"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:365
+msgid "Page length"
+msgstr "Dolžina strani"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:380
+msgid "Search box"
+msgstr "Iskalno polje"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:383
+msgid "Whether to include a client-side search box"
+msgstr "Če želite vključiti iskalno polje za uporabnika"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:390
+msgid "Cell bars"
+msgstr "Stolp. graf v celicah"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:405
+msgid ""
+"Whether to align background charts with both positive and negative values at "
+"0"
+msgstr ""
+"Če želite poravnati graf v ozadju celic za negativne in pozitivne vrednosti "
+"okrog 0"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:444
+msgid "Customize columns"
+msgstr "Prilagodi stolpce"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx:445
+msgid "Further customize how to display each column"
+msgstr "Dodatne prilagoditve prikaza posameznih stolpcev"
+
+#: superset-ui/superset-ui-plugins/packages/superset-ui-legacy-plugin-chart-word-cloud/src/index.js:27
+#: superset-ui/superset-ui/plugins/plugin-chart-word-cloud/src/legacyPlugin/index.ts:10
+#: superset-ui/superset-ui/plugins/plugin-chart-word-cloud/src/plugin/index.ts:14
+#: superset-ui/superset-ui/temporary-plugins/hold-potentially-deprecate/superset-ui-legacy-plugin-chart-word-cloud/src/index.js:26
+msgid "Word Cloud"
+msgstr "Oblak besed"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-word-cloud/src/plugin/controlPanel.ts:55
+msgid "Minimum Font Size"
+msgstr "Min. velikost pisave"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-word-cloud/src/plugin/controlPanel.ts:58
+msgid "Font size for the smallest value in the list"
+msgstr "Velikost pisave za najmanjšo vrednost na seznamu"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-word-cloud/src/plugin/controlPanel.ts:66
+msgid "Maximum Font Size"
+msgstr "Max. velikost pisave"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-word-cloud/src/plugin/controlPanel.ts:69
+msgid "Font size for the biggest value in the list"
+msgstr "Velikost pisave za največjo vrednost na seznamu"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-word-cloud/src/plugin/controlPanel.ts:78
+msgid "Word Rotation"
+msgstr "Vrtenje besed"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-word-cloud/src/plugin/controlPanel.ts:87
+msgid "Rotation to apply to words in the cloud"
+msgstr "Če želite vrtenje besed v oblaku"
+
+#: superset-ui/superset-ui/plugins/preset-chart-xy/src/ScatterPlot/createMetadata.ts:7
+msgid "Scatter Plot"
+msgstr "Raztreseni grafikon"
+
+#: superset-ui/superset-ui/temporary-plugins/plugin-chart-choropleth-map/src/chart/ChoroplethMap.tsx:309
+msgid "Hide Mini Map"
+msgstr "Skrij majhen zemljevid"
+
+#: superset-ui/superset-ui/temporary-plugins/plugin-chart-choropleth-map/src/chart/ChoroplethMap.tsx:309
+msgid "Show Mini Map"
+msgstr "Prikaži majhen zemljevid"
+
+#: superset-ui/superset-ui/temporary-plugins/plugin-chart-choropleth-map/src/plugin/index.ts:24
+msgid "Choropleth Map"
+msgstr "Koroplet zemljevid"
+
+#: superset-ui/superset-ui/temporary-plugins/plugin-chart-choropleth-map/src/plugin/index.ts:25
+msgid "ChoroplethMap"
+msgstr "ChoroplethMap"
+
+#: superset-ui/superset-ui-plugins/packages/superset-ui-plugin-chart-icicle-event/src/createMetadata.ts:26
+msgid "Icicle Event Chart"
+msgstr "Grafikon Icicle dogodkov"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/Multi/controlPanel.js:27
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.js:78
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Geojson/controlPanel.js:52
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Grid/controlPanel.js:44
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Hex/controlPanel.js:52
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Path/controlPanel.js:63
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.js:94
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.js:59
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Screengrid/controlPanel.js:44
+msgid "Map"
+msgstr "Zemljevid"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/Multi/controlPanel.js:37
+msgid "deck.gl charts"
+msgstr "grafikoni deck.gl"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/Multi/controlPanel.js:40
+msgid "Pick a set of deck.gl charts to layer on top of one another"
+msgstr "Izberite nabor deck.gl grafikonov, ki bodo nanizani en na drugem"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/Multi/index.js:27
+msgid "deck.gl Multiple Layers"
+msgstr "deck.gl - Večplastni grafikon"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/components/PlaySlider.jsx:147
+msgid "Data has no time steps"
+msgstr "Podatki nimajo časovnih korakov"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.js:52
+msgid "Start Longitude & Latitude"
+msgstr "Začetna Dolž. in Širina"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.js:54
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.js:66
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:295
+msgid "Point to your spatial columns"
+msgstr "Pokažite na stolpec z lokacijskimi podatki"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.js:64
+msgid "End Longitude & Latitude"
+msgstr "Končna Dolž. in Širina"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.js:85
+msgid "Arc"
+msgstr "Lok"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.js:92
+msgid "Target Color"
+msgstr "Ciljna barva"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.js:93
+msgid "Color of the target location"
+msgstr "Barva ciljne lokacije"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.js:103
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.js:133
+msgid "Categorical Color"
+msgstr "Kategorična barva"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.js:104
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.js:134
+msgid "Pick a dimension from which categorical colors are defined"
+msgstr "Izberite dimenzijo, ki bo določala kategorične barve"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.js:115
+msgid "Stroke Width"
+msgstr "Debelina obrobe"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/index.js:27
+msgid "deck.gl Arc"
+msgstr "deck.gl - Lok"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Geojson/controlPanel.js:60
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Hex/controlPanel.js:60
+msgid "GeoJson Settings"
+msgstr "GeoJson nastavitve"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Geojson/controlPanel.js:71
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Hex/controlPanel.js:71
+msgid "Point Radius Scale"
+msgstr "Skaliranje radija točk"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Geojson/index.js:27
+msgid "deck.gl Geojson"
+msgstr "deck.gl - GeoJSON"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Grid/controlPanel.js:59
+msgid "Metric used to control height"
+msgstr "Mera za določanje višine"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Grid/index.js:27
+msgid "deck.gl Grid"
+msgstr "deck.gl - Mreža"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Hex/index.js:27
+msgid "deck.gl 3D Hexagon"
+msgstr "deck.gl - 3D HEX"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Path/index.js:27
+msgid "deck.gl Path"
+msgstr "deck.gl - Poti"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.js:64
+msgid "Polygon Column"
+msgstr "Stolpec poligonov"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.js:73
+msgid "Polygon Encoding"
+msgstr "Kodiranje poligonov"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.js:84
+msgid "Elevation"
+msgstr "Dvig"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.js:102
+msgid "Polygon Settings"
+msgstr "Nastavitve poligonov"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.js:121
+msgid "Opacity, expects values between 0 and 100"
+msgstr "Prosojnost, vnesite vrednosti med 0 in 100"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.js:132
+msgid "Number of buckets to group data"
+msgstr "Število razdelkov za združevanje podatkov"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.js:135
+msgid "How many buckets should the data be grouped in."
+msgstr "V koliko razdelkov bodo razvrščeni podatki."
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.js:145
+msgid "Bucket break points"
+msgstr "Točke za razčlenitev razdelkov"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.js:147
+msgid "List of n+1 values for bucketing metric into n buckets."
+msgstr "Seznam n+1 vrednosti za mero razvrščanja v n razdelkov."
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.js:157
+msgid "Emit Filter Events"
+msgstr "Prikaži dogodke filtrov"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.js:160
+msgid "Whether to apply filter when items are clicked"
+msgstr "Če želite uporabiti filter, ko kliknete na elemente"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.js:167
+msgid "Multiple filtering"
+msgstr "Večkratno filtriranje"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.js:170
+msgid "Allow sending multiple polygons as a filter event"
+msgstr "Dovoli pošiljanje več poligonov kot dogodek filtra"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/index.js:27
+msgid "deck.gl Polygon"
+msgstr "deck.gl - Poligon"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.js:67
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:306
+msgid "Point Size"
+msgstr "Velikost točke"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.js:75
+msgid "Point Unit"
+msgstr "Enota točke"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.js:95
+msgid "Minimum Radius"
+msgstr "Min. polmer"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.js:100
+msgid ""
+"Minimum radius size of the circle, in pixels. As the zoom level changes, "
+"this insures that the circle respects this minimum radius."
+msgstr ""
+"Minimalni polmer kroga v pikslih. S tem je določen min. polmer kroga, ko se "
+"spreminja stopnja povečave."
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.js:110
+msgid "Maximum Radius"
+msgstr "Max. polmer"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.js:115
+msgid ""
+"Maxium radius size of the circle, in pixels. As the zoom level changes, this "
+"insures that the circle respects this maximum radius."
+msgstr ""
+"Maksimalni polmer kroga v pikslih. S tem je določen max. polmer kroga, ko se "
+"spreminja stopnja povečave."
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.js:126
+msgid "Point Color"
+msgstr "Barva točke"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/index.js:27
+msgid "deck.gl Scatterplot"
+msgstr "deck.gl - Raztreseni grafikon"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Screengrid/controlPanel.js:51
+msgid "Grid"
+msgstr "Mreža"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Screengrid/controlPanel.js:62
+msgid "Weight"
+msgstr "Utež"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Screengrid/controlPanel.js:63
+msgid "Metric used as a weight for the grid's coloring"
+msgstr "Mera, ki služi kot utež za barvo mreže"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Screengrid/index.js:27
+msgid "deck.gl Screen Grid"
+msgstr "deck.gl - Mreža"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:41
+msgid ""
+"For more information about objects are in context in the scope of this "
+"function, refer to the"
+msgstr "Za dodatne informacije o objektih v kontekstu te funkcije si oglejte"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:44
+msgid " source code of Superset's sandboxed parser"
+msgstr " izvorno kodo za Supersetov \"sandboxed parser\""
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:67
+msgid ""
+"This functionality is disabled in your environment for security reasons."
+msgstr "Ta funkcionalnost je v vašem okolju onemogočena zaradi varnosti."
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:78
+msgid "Ignore null locations"
+msgstr "Izpusti prazne lokacije"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:80
+msgid "Whether to ignore locations that are null"
+msgstr "Če ne želite upoštevati praznih (NULL) lokacij"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:88
+msgid "Auto Zoom"
+msgstr "Samodejna povečava"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:91
+msgid "When checked, the map will zoom to your data after each query"
+msgstr "Če želite, da se zemljevid prilagodi vašim podatkom po vsaki poizvedbi"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:99
+msgid "Dimension"
+msgstr "Dimenzija"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:100
+msgid "Select a dimension"
+msgstr "Izberite dimenzijo"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:110
+msgid "Extra data for JS"
+msgstr "Dodatni podatki za JS"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:112
+msgid "List of extra columns made available in Javascript functions"
+msgstr "Seznam dodatnih podatkov, ki so na razpolago v Javascript funkcijah"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:119
+msgid "Javascript data interceptor"
+msgstr "Javascript prestreznik podatkov"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:120
+msgid ""
+"Define a javascript function that receives the data array used in the "
+"visualization and is expected to return a modified version of that array. "
+"This can be used to alter properties of the data, filter, or enrich the "
+"array."
+msgstr ""
+"Določite Javascript funkcijo, ki sprejme podatkovni niz za vizualizacijo in "
+"vrne spremenjeno verzijo tega niza. Lahko se uporabi za spreminjanje "
+"lastnosti podatkov, filtra ali obogatitve niza."
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:131
+msgid "Javascript tooltip generator"
+msgstr "Javascript generator opisa orodja"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:132
+msgid ""
+"Define a function that receives the input and outputs the content for a "
+"tooltip"
+msgstr ""
+"Določite funkcijo, ki sprejme vhodne podatke in vrne vsebino opisa orodja"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:139
+msgid "Javascript onClick href"
+msgstr "Javascript onClick href"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:140
+msgid "Define a function that returns a URL to navigate to when user clicks"
+msgstr "Določite funkcijo, ki vrne URL za navigacijo, ko uporabnik klikne"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:147
+msgid "Legend Format"
+msgstr "Oblika legende"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:148
+msgid "Choose the format for legend values"
+msgstr "Izberite obliko vrednosti legende"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:160
+msgid "Legend Position"
+msgstr "Položaj legende"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:161
+msgid "Choose the position of the legend"
+msgstr "Izberite položaj legende"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:180
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/sharedDndControls.jsx:27
+msgid "Lines column"
+msgstr "Stolpec črt"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:182
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/sharedDndControls.jsx:28
+msgid "The database columns that contains lines information"
+msgstr "Stolpec v podatkovni bazi, ki vsebuje podatke črt"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:198
+msgid "The width of the lines"
+msgstr "Debelina črt"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:205
+msgid "Fill Color"
+msgstr "Barva polnila"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:206
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:219
+msgid ""
+" Set the opacity to 0 if you do not want to override the color specified in "
+"the GeoJSON"
+msgstr ""
+" Nastavite prosojnost na 0, če želite obdržati barvo določeno v GeoJSON"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:218
+msgid "Stroke Color"
+msgstr "Barva obrobe"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:232
+msgid "Filled"
+msgstr "Zapolnjeno"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:234
+msgid "Whether to fill the objects"
+msgstr "Če želite zapolniti objekte"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:243
+msgid "Stroked"
+msgstr "Obrobljeno"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:245
+msgid "Whether to display the stroke"
+msgstr "Če želite prikazati obrobe"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:254
+msgid "Extruded"
+msgstr "Relief"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:265
+msgid "Grid Size"
+msgstr "Velikost mreže"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:269
+msgid "Defines the grid size in pixels"
+msgstr "Določa velikost mreže v pikslih"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:279
+msgid "Parameters related to the view and perspective on the map"
+msgstr "Parametri povezani s pogledom in perspektivo zemljevida"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:293
+msgid "Longitude & Latitude"
+msgstr "Dolžina in širina"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:308
+msgid "Fixed point radius"
+msgstr "Fiksni radij točk"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:319
+msgid "Multiplier"
+msgstr "Množitelj"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:323
+msgid "Factor to multiply the metric by"
+msgstr "Faktor, s katerim množite mero"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:331
+msgid "Lines encoding"
+msgstr "Kodiranje črt"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:334
+msgid "The encoding format of the lines"
+msgstr "Oblika kodiranja črt"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:347
+msgid "Reverse Lat & Long"
+msgstr "Zamenjaj Dolž. in Širino"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:376
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/sharedDndControls.jsx:36
+msgid "GeoJson Column"
+msgstr "GeoJson stolpec"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx:378
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/sharedDndControls.jsx:37
+msgid "Select the geojson column"
+msgstr "Izberite geojson stolpec"
+
+#: superset-ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-kepler/src/KeplerChartPlugin.js:24
+msgid "Kepler.gl"
+msgstr "Kepler.gl"
+
+# ROCNI VNOS
+msgid "List Users"
+msgstr "Seznam uporabnikov"
+
+msgid "List Roles"
+msgstr "Seznam vlog"
+
+msgid "Your user information"
+msgstr "Vaše uporabniške informacije"
+
+msgid "User info"
+msgstr "Informacije o uporabniku"
+
+msgid "User Name"
+msgstr "Uporabniško ime"
+
+msgid "Is Active?"
+msgstr "Je aktiven?"
+
+msgid "Login count"
+msgstr "Število prijav"
+
+msgid "Personal Info"
+msgstr "Osebne informacije"
+
+msgid "First Name"
+msgstr "Ime"
+
+msgid "Last Name"
+msgstr "Priimek"
+
+msgid "Email"
+msgstr "E-pošta"
+
+msgid "Audit Info"
+msgstr "Revizijske informacije"
+
+msgid "Last login"
+msgstr "Zadnja prijava"
+
+msgid "Failed login count"
+msgstr "Število neuspešnih prijav"
+
+msgid "Changed by"
+msgstr "Spremenil/a"
+
+msgid "Reset Password"
+msgstr "Ponastavi geslo"
+
+msgid "Show User"
+msgstr "Prikaži uporabnika"
+
+msgid "Username valid for authentication on DB or LDAP, unused for OID auth"
+msgstr ""
+"Uporabniško ime za DB ali LDAP avtentikacijo. Ni uporabljeno za OID "
+"avtentikacijo"
+
+msgid "It's not a good policy to remove a user, just make it inactive"
+msgstr "Izbris uporabnika ni dobra praksa, raje ga deaktivirajte"
+
+msgid "The user's email, this will also be used for OID auth"
+msgstr "Uporabnikov e-naslov, uporabljen bo tudi za OID avtentikacijo"
+
+msgid ""
+"The user role on the application, this will associate with a list of "
+"permissions"
+msgstr "Uporabnikova vloga v tej aplikaciji, povezana bo s seznamom dovoljenj"
+
+msgid "User confirmation needed"
+msgstr "Potrebna je potrditev s strani uporabnika"
+
+msgid "You sure you want to delete this item?"
+msgstr "Ste prepričani, da želite izbrisati ta vnos?"
+
+msgid "Reset my password"
+msgstr "Ponastavi geslo"
+
+msgid "Reset Password Form"
+msgstr "Obrazec za ponastavitev gesla"
+
+msgid ""
+"Please use a good password policy, this application does not check this for "
+"you"
+msgstr "Uporabite varno geslo. Ta aplikacija tega ne bo preverila"
+
+msgid "Confirm Password"
+msgstr "Potrdite geslo"
+
+msgid "Please rewrite the password to confirm"
+msgstr "Ponovno vpišite geslo za potrditev"
+
+msgid "Back"
+msgstr "Nazaj"
+
+msgid "Edit User"
+msgstr "Uredite uporabnika"
+
+msgid "Edit User Information"
+msgstr "Uredite informacije o uporabniku"
+
+msgid "Write the user first name or names"
+msgstr "Vpišite ime uporabnika"
+
+msgid "Write the user last name"
+msgstr "Vpišite priimek uporabnika"
+
+msgid "Embed code"
+msgstr "Vstavi kodo"
+
+msgid "creator"
+msgstr "avtor"
+
+msgid "favorited"
+msgstr "priljubljeno"
+
+msgid "name"
+msgstr "ime"
+
+msgid "type"
+msgstr "tip"
+
+msgid "time"
+msgstr "čas"
+
+msgid "Toggle SortBy"
+msgstr "Preklopite razvrščanje"
+
+msgid "Page size"
+msgstr "Velikost strani"
+
+msgid "Edit record"
+msgstr "Uredi zapis"
+
+msgid "Delete record"
+msgstr "Izbriši zapis"
+
+msgid "Show record"
+msgstr "Pokaži zapis"
+
+#: superset-ui/superset-ui/plugins/plugin-chart-echarts/src/controls.ts:70
+msgid "Orientation"
+msgstr "Postavitev"
+
+msgid "Scroll"
+msgstr "Drsnik"
+
+msgid "Plain"
+msgstr "Celotna"
diff --git a/superset/translations/zh/LC_MESSAGES/messages.json b/superset/translations/zh/LC_MESSAGES/messages.json
index 5fd828d4e3ed..f2ad3aa1d174 100644
--- a/superset/translations/zh/LC_MESSAGES/messages.json
+++ b/superset/translations/zh/LC_MESSAGES/messages.json
@@ -986,7 +986,7 @@
         "在 SQL 编辑器中允许 CREATE TABLE AS 选项"
       ],
       "Allow CREATE VIEW AS option in SQL Lab": [
-        "在 SQL 编辑器中允许 CREATE TABLE AS 选项"
+        "在 SQL 编辑器中允许 CREATE VIEW AS 选项"
       ],
       "Allow users to run non-SELECT statements (UPDATE, DELETE, CREATE, ...) in SQL Lab": [
         "允许用户在 SQL 编辑器中运行非 SELECT 语句（UPDATE，DELETE，CREATE，...）"
@@ -1008,7 +1008,7 @@
       ],
       "Expose in SQL Lab": ["在 SQL 工具箱中公开"],
       "Allow CREATE TABLE AS": ["允许 CREATE TABLE AS"],
-      "Allow CREATE VIEW AS": ["允许 CREATE TABLE AS"],
+      "Allow CREATE VIEW AS": ["允许 CREATE VIEW AS"],
       "Allow DML": ["允许 DML"],
       "CTAS Schema": ["CTAS 模式"],
       "SQLAlchemy URI": ["SQLAlchemy URI"],
@@ -1248,7 +1248,7 @@
         "服务器端显示的查询结果中的行数似乎限制在 %s 以内。"
       ],
       "CREATE TABLE AS": ["允许 CREATE TABLE AS"],
-      "CREATE VIEW AS": ["允许 CREATE TABLE AS"],
+      "CREATE VIEW AS": ["允许 CREATE VIEW AS"],
       "Estimate the cost before running a query": [
         "在运行查询之前计算执行计划"
       ],
diff --git a/superset/translations/zh/LC_MESSAGES/messages.po b/superset/translations/zh/LC_MESSAGES/messages.po
index f1a1bf51baed..bfda8ecfe9c1 100644
--- a/superset/translations/zh/LC_MESSAGES/messages.po
+++ b/superset/translations/zh/LC_MESSAGES/messages.po
@@ -3058,7 +3058,7 @@ msgstr "在 SQL 编辑器中允许 CREATE TABLE AS 选项"
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:493
 #: superset/views/database/mixins.py:113
 msgid "Allow CREATE VIEW AS option in SQL Lab"
-msgstr "在 SQL 编辑器中允许 CREATE TABLE AS 选项"
+msgstr "在 SQL 编辑器中允许 CREATE VIEW AS 选项"
 
 #: superset/views/database/mixins.py:114
 msgid ""
@@ -3125,7 +3125,7 @@ msgstr "允许 CREATE TABLE AS"
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:491
 #: superset/views/database/mixins.py:187
 msgid "Allow CREATE VIEW AS"
-msgstr "允许 CREATE TABLE AS"
+msgstr "允许 CREATE VIEW AS"
 
 #: superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx:505
 #: superset/views/database/mixins.py:188
@@ -3893,7 +3893,7 @@ msgstr "允许 CREATE TABLE AS"
 
 #: superset-frontend/src/SqlLab/components/SqlEditor.jsx:610
 msgid "CREATE VIEW AS"
-msgstr "允许 CREATE TABLE AS"
+msgstr "允许 CREATE VIEW AS"
 
 #: superset-frontend/src/SqlLab/components/SqlEditor.jsx:645
 msgid "Estimate the cost before running a query"
diff --git a/superset/typing.py b/superset/typing.py
index 0a7ef598ad33..d076402df0ac 100644
--- a/superset/typing.py
+++ b/superset/typing.py
@@ -15,23 +15,63 @@
 # specific language governing permissions and limitations
 # under the License.
 from datetime import datetime
-from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union
+from typing import (
+    Any,
+    Callable,
+    Dict,
+    List,
+    Optional,
+    Sequence,
+    Tuple,
+    TYPE_CHECKING,
+    Union,
+)
 
 from flask import Flask
 from flask_caching import Cache
+from typing_extensions import Literal, TypedDict
 from werkzeug.wrappers import Response
 
+if TYPE_CHECKING:
+    from superset.utils.core import GenericDataType
+
+
+class LegacyMetric(TypedDict):
+    label: Optional[str]
+
+
+class AdhocMetricColumn(TypedDict, total=False):
+    column_name: Optional[str]
+    description: Optional[str]
+    expression: Optional[str]
+    filterable: bool
+    groupby: bool
+    id: int
+    is_dttm: bool
+    python_date_format: Optional[str]
+    type: str
+    type_generic: "GenericDataType"
+    verbose_name: Optional[str]
+
+
+class AdhocMetric(TypedDict, total=False):
+    aggregate: str
+    column: Optional[AdhocMetricColumn]
+    expressionType: Literal["SIMPLE", "SQL"]
+    label: Optional[str]
+    sqlExpression: Optional[str]
+
+
 CacheConfig = Union[Callable[[Flask], Cache], Dict[str, Any]]
 DbapiDescriptionRow = Tuple[
     str, str, Optional[str], Optional[str], Optional[int], Optional[int], bool
 ]
 DbapiDescription = Union[List[DbapiDescriptionRow], Tuple[DbapiDescriptionRow, ...]]
 DbapiResult = Sequence[Union[List[Any], Tuple[Any, ...]]]
-FilterValue = Union[datetime, float, int, str]
+FilterValue = Union[bool, datetime, float, int, str]
 FilterValues = Union[FilterValue, List[FilterValue], Tuple[FilterValue]]
 FormData = Dict[str, Any]
 Granularity = Union[str, Dict[str, Union[str, float]]]
-AdhocMetric = Dict[str, Any]
 Metric = Union[AdhocMetric, str]
 OrderBy = Tuple[Metric, bool]
 QueryObjectDict = Dict[str, Any]
@@ -43,5 +83,9 @@
 Status = Union[int, str]
 Headers = Dict[str, Any]
 FlaskResponse = Union[
-    Response, Base, Tuple[Base, Status], Tuple[Base, Status, Headers],
+    Response,
+    Base,
+    Tuple[Base, Status],
+    Tuple[Base, Status, Headers],
+    Tuple[Response, Status],
 ]
diff --git a/superset/utils/async_query_manager.py b/superset/utils/async_query_manager.py
index 90428a11ee3d..14f89a83a109 100644
--- a/superset/utils/async_query_manager.py
+++ b/superset/utils/async_query_manager.py
@@ -63,8 +63,6 @@ def increment_id(redis_id: str) -> str:
 
 
 class AsyncQueryManager:
-    # pylint: disable=too-many-instance-attributes
-
     MAX_EVENT_COUNT = 100
     STATUS_PENDING = "pending"
     STATUS_RUNNING = "running"
@@ -73,7 +71,7 @@ class AsyncQueryManager:
 
     def __init__(self) -> None:
         super().__init__()
-        self._redis: redis.Redis
+        self._redis: redis.Redis  # type: ignore
         self._stream_prefix: str = ""
         self._stream_limit: Optional[int]
         self._stream_limit_firehose: Optional[int]
@@ -100,7 +98,7 @@ def init_app(self, app: Flask) -> None:
                 "Please provide a JWT secret at least 32 bytes long"
             )
 
-        self._redis = redis.Redis(  # type: ignore
+        self._redis = redis.Redis(
             **config["GLOBAL_ASYNC_QUERIES_REDIS_CONFIG"], decode_responses=True
         )
         self._stream_prefix = config["GLOBAL_ASYNC_QUERIES_REDIS_STREAM_PREFIX"]
@@ -114,9 +112,7 @@ def init_app(self, app: Flask) -> None:
         self._jwt_secret = config["GLOBAL_ASYNC_QUERIES_JWT_SECRET"]
 
         @app.after_request
-        def validate_session(  # pylint: disable=unused-variable
-            response: Response,
-        ) -> Response:
+        def validate_session(response: Response) -> Response:
             user_id = None
 
             try:
@@ -165,9 +161,9 @@ def parse_jwt_from_request(self, req: Request) -> Dict[str, Any]:
 
         try:
             return self.parse_jwt(token)
-        except Exception as exc:
-            logger.warning(exc)
-            raise AsyncQueryTokenException("Failed to parse token")
+        except Exception as ex:
+            logger.warning(ex)
+            raise AsyncQueryTokenException("Failed to parse token") from ex
 
     def init_job(self, channel_id: str, user_id: Optional[str]) -> Dict[str, Any]:
         job_id = str(uuid.uuid4())
diff --git a/superset/utils/cache.py b/superset/utils/cache.py
index 2ad54ede1a1b..e7bdc35acda3 100644
--- a/superset/utils/cache.py
+++ b/superset/utils/cache.py
@@ -14,23 +14,28 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from __future__ import annotations
+
 import logging
 from datetime import datetime, timedelta
 from functools import wraps
-from typing import Any, Callable, Dict, Optional, Union
+from typing import Any, Callable, Dict, Optional, TYPE_CHECKING, Union
 
 from flask import current_app as app, request
 from flask_caching import Cache
+from flask_caching.backends import NullCache
 from werkzeug.wrappers.etag import ETagResponseMixin
 
 from superset import db
 from superset.extensions import cache_manager
 from superset.models.cache import CacheKey
-from superset.stats_logger import BaseStatsLogger
 from superset.utils.core import json_int_dttm_ser
 from superset.utils.hashing import md5_sha_from_dict
 
-config = app.config  # type: ignore
+if TYPE_CHECKING:
+    from superset.stats_logger import BaseStatsLogger
+
+config = app.config
 stats_logger: BaseStatsLogger = config["STATS_LOGGER"]
 logger = logging.getLogger(__name__)
 
@@ -47,6 +52,9 @@ def set_and_log_cache(
     cache_timeout: Optional[int] = None,
     datasource_uid: Optional[str] = None,
 ) -> None:
+    if isinstance(cache_instance.cache, NullCache):
+        return
+
     timeout = cache_timeout if cache_timeout else config["CACHE_DEFAULT_TIMEOUT"]
     try:
         dttm = datetime.utcnow().isoformat().split(".")[0]
diff --git a/superset/utils/celery.py b/superset/utils/celery.py
index be543a0c2ce8..89da812ec0b0 100644
--- a/superset/utils/celery.py
+++ b/superset/utils/celery.py
@@ -15,9 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 import logging
+from contextlib import contextmanager
 from typing import Iterator
 
-from contextlib2 import contextmanager
 from sqlalchemy import create_engine
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session, sessionmaker
diff --git a/superset/utils/core.py b/superset/utils/core.py
index 5ece0aeef6d6..a549a753c56a 100644
--- a/superset/utils/core.py
+++ b/superset/utils/core.py
@@ -18,7 +18,6 @@
 import collections
 import decimal
 import errno
-import functools
 import json
 import logging
 import os
@@ -82,10 +81,11 @@
 from sqlalchemy.engine.reflection import Inspector
 from sqlalchemy.sql.type_api import Variant
 from sqlalchemy.types import TEXT, TypeDecorator, TypeEngine
-from typing_extensions import TypedDict
+from typing_extensions import TypedDict, TypeGuard
 
 import _thread  # pylint: disable=C0411
 from superset.constants import (
+    EXAMPLES_DB_UUID,
     EXTRA_FORM_DATA_APPEND_KEYS,
     EXTRA_FORM_DATA_OVERRIDE_EXTRA_KEYS,
     EXTRA_FORM_DATA_OVERRIDE_REGULAR_MAPPINGS,
@@ -96,7 +96,14 @@
     SupersetException,
     SupersetTimeoutException,
 )
-from superset.typing import FlaskResponse, FormData, Metric
+from superset.typing import (
+    AdhocMetric,
+    AdhocMetricColumn,
+    FilterValues,
+    FlaskResponse,
+    FormData,
+    Metric,
+)
 from superset.utils.dates import datetime_to_epoch, EPOCH
 from superset.utils.hashing import md5_sha_from_dict, md5_sha_from_str
 
@@ -115,6 +122,10 @@
 
 DTTM_ALIAS = "__timestamp"
 
+NO_TIME_RANGE = "No filter"
+
+TIME_COMPARISION = "__"
+
 JS_MAX_INTEGER = 9007199254740991  # Largest int Java Script can handle 2^53-1
 
 InputType = TypeVar("InputType")
@@ -179,6 +190,7 @@ class ChartDataResultType(str, Enum):
     RESULTS = "results"
     SAMPLES = "samples"
     TIMEGRAINS = "timegrains"
+    POST_PROCESSED = "post_processed"
 
 
 class DatasourceDict(TypedDict):
@@ -186,6 +198,25 @@ class DatasourceDict(TypedDict):
     id: int
 
 
+class AdhocFilterClause(TypedDict, total=False):
+    clause: str
+    expressionType: str
+    filterOptionName: Optional[str]
+    comparator: Optional[FilterValues]
+    operator: str
+    subject: str
+    isExtra: Optional[bool]
+    sqlExpression: Optional[str]
+
+
+class QueryObjectFilterClause(TypedDict, total=False):
+    col: str
+    op: str  # pylint: disable=invalid-name
+    val: Optional[FilterValues]
+    grain: Optional[str]
+    isExtra: Optional[bool]
+
+
 class ExtraFiltersTimeColumnType(str, Enum):
     GRANULARITY = "__granularity"
     TIME_COL = "__time_col"
@@ -194,6 +225,12 @@ class ExtraFiltersTimeColumnType(str, Enum):
     TIME_RANGE = "__time_range"
 
 
+class ExtraFiltersReasonType(str, Enum):
+    NO_TEMPORAL_COLUMN = "no_temporal_column"
+    COL_NOT_IN_DATASOURCE = "not_in_datasource"
+    NOT_DRUID_DATASOURCE = "not_druid_datasource"
+
+
 class FilterOperator(str, Enum):
     """
     Operators used filter controls
@@ -209,7 +246,7 @@ class FilterOperator(str, Enum):
     ILIKE = "ILIKE"
     IS_NULL = "IS NULL"
     IS_NOT_NULL = "IS NOT NULL"
-    IN = "IN"  # pylint: disable=invalid-name
+    IN = "IN"
     NOT_IN = "NOT IN"
     REGEX = "REGEX"
     IS_TRUE = "IS TRUE"
@@ -218,7 +255,7 @@ class FilterOperator(str, Enum):
 
 class PostProcessingBoxplotWhiskerType(str, Enum):
     """
-    Calculate cell contibution to row/column total
+    Calculate cell contribution to row/column total
     """
 
     TUKEY = "tukey"
@@ -228,7 +265,7 @@ class PostProcessingBoxplotWhiskerType(str, Enum):
 
 class PostProcessingContributionOrientation(str, Enum):
     """
-    Calculate cell contibution to row/column total
+    Calculate cell contribution to row/column total
     """
 
     ROW = "row"
@@ -254,7 +291,7 @@ class QuerySource(Enum):
     SQL_LAB = 2
 
 
-class QueryStatus(str, Enum):  # pylint: disable=too-few-public-methods
+class QueryStatus(str, Enum):
     """Enum-type class for query statuses"""
 
     STOPPED: str = "stopped"
@@ -263,6 +300,7 @@ class QueryStatus(str, Enum):  # pylint: disable=too-few-public-methods
     RUNNING: str = "running"
     SCHEDULED: str = "scheduled"
     SUCCESS: str = "success"
+    FETCHING: str = "fetching"
     TIMED_OUT: str = "timed_out"
 
 
@@ -368,65 +406,6 @@ def flasher(msg: str, severity: str = "message") -> None:
             logger.info(msg)
 
 
-class _memoized:
-    """Decorator that caches a function's return value each time it is called
-
-    If called later with the same arguments, the cached value is returned, and
-    not re-evaluated.
-
-    Define ``watch`` as a tuple of attribute names if this Decorator
-    should account for instance variable changes.
-    """
-
-    def __init__(
-        self, func: Callable[..., Any], watch: Optional[Tuple[str, ...]] = None
-    ) -> None:
-        self.func = func
-        self.cache: Dict[Any, Any] = {}
-        self.is_method = False
-        self.watch = watch or ()
-
-    def __call__(self, *args: Any, **kwargs: Any) -> Any:
-        key = [args, frozenset(kwargs.items())]
-        if self.is_method:
-            key.append(tuple([getattr(args[0], v, None) for v in self.watch]))
-        key = tuple(key)  # type: ignore
-        if key in self.cache:
-            return self.cache[key]
-        try:
-            value = self.func(*args, **kwargs)
-            self.cache[key] = value
-            return value
-        except TypeError:
-            # uncachable -- for instance, passing a list as an argument.
-            # Better to not cache than to blow up entirely.
-            return self.func(*args, **kwargs)
-
-    def __repr__(self) -> str:
-        """Return the function's docstring."""
-        return self.func.__doc__ or ""
-
-    def __get__(
-        self, obj: Any, objtype: Type[Any]
-    ) -> functools.partial:  # type: ignore
-        if not self.is_method:
-            self.is_method = True
-        # Support instance methods.
-        return functools.partial(self.__call__, obj)
-
-
-def memoized(
-    func: Optional[Callable[..., Any]] = None, watch: Optional[Tuple[str, ...]] = None
-) -> Callable[..., Any]:
-    if func:
-        return _memoized(func)
-
-    def wrapper(f: Callable[..., Any]) -> Callable[..., Any]:
-        return _memoized(f, watch)
-
-    return wrapper
-
-
 def parse_js_uri_path_item(
     item: Optional[str], unquote: bool = True, eval_undefined: bool = False
 ) -> Optional[str]:
@@ -478,6 +457,35 @@ def cast_to_num(value: Optional[Union[float, int, str]]) -> Optional[Union[float
         return None
 
 
+def cast_to_boolean(value: Any) -> bool:
+    """Casts a value to an int/float
+
+    >>> cast_to_boolean(1)
+    True
+    >>> cast_to_boolean(0)
+    False
+    >>> cast_to_boolean(0.5)
+    True
+    >>> cast_to_boolean('true')
+    True
+    >>> cast_to_boolean('false')
+    False
+    >>> cast_to_boolean('False')
+    False
+    >>> cast_to_boolean(None)
+    False
+
+    :param value: value to be converted to boolean representation
+    :returns: value cast to `bool`. when value is 'true' or value that are not 0
+              converte into True
+    """
+    if isinstance(value, (int, float)):
+        return value != 0
+    if isinstance(value, str):
+        return value.strip().lower() == "true"
+    return False
+
+
 def list_minus(l: List[Any], minus: List[Any]) -> List[Any]:
     """Returns l without what is in minus
 
@@ -537,9 +545,7 @@ def format_timedelta(time_delta: timedelta) -> str:
     return str(time_delta)
 
 
-def base_json_conv(  # pylint: disable=inconsistent-return-statements,too-many-return-statements
-    obj: Any,
-) -> Any:
+def base_json_conv(obj: Any,) -> Any:  # pylint: disable=inconsistent-return-statements
     if isinstance(obj, memoryview):
         obj = obj.tobytes()
     if isinstance(obj, np.int64):
@@ -701,7 +707,7 @@ def generic_find_constraint_name(
     return None
 
 
-def generic_find_fk_constraint_name(  # pylint: disable=invalid-name
+def generic_find_fk_constraint_name(
     table: str, columns: Set[str], referenced: str, insp: Inspector
 ) -> Optional[str]:
     """Utility to find a foreign-key constraint name in alembic migrations"""
@@ -757,7 +763,7 @@ def validate_json(obj: Union[bytes, bytearray, str]) -> None:
             json.loads(obj)
         except Exception as ex:
             logger.error("JSON is not valid %s", str(ex), exc_info=True)
-            raise SupersetException("JSON is not valid")
+            raise SupersetException("JSON is not valid") from ex
 
 
 class SigalrmTimeout:
@@ -789,7 +795,7 @@ def __enter__(self) -> None:
             logger.warning("timeout can't be used in the current context")
             logger.exception(ex)
 
-    def __exit__(  # pylint: disable=redefined-outer-name,unused-variable,redefined-builtin
+    def __exit__(  # pylint: disable=redefined-outer-name,redefined-builtin
         self, type: Any, value: Any, traceback: TracebackType
     ) -> None:
         try:
@@ -808,7 +814,7 @@ def __init__(self, seconds: int = 1, error_message: str = "Timeout") -> None:
     def __enter__(self) -> None:
         self.timer.start()
 
-    def __exit__(  # pylint: disable=redefined-outer-name,unused-variable,redefined-builtin
+    def __exit__(  # pylint: disable=redefined-outer-name,redefined-builtin
         self, type: Any, value: Any, traceback: TracebackType
     ) -> None:
         self.timer.cancel()
@@ -829,9 +835,7 @@ def __exit__(  # pylint: disable=redefined-outer-name,unused-variable,redefined-
 
 def pessimistic_connection_handling(some_engine: Engine) -> None:
     @event.listens_for(some_engine, "engine_connect")
-    def ping_connection(  # pylint: disable=unused-variable
-        connection: Connection, branch: bool
-    ) -> None:
+    def ping_connection(connection: Connection, branch: bool) -> None:
         if branch:
             # 'branch' refers to a sub-connection of a connection,
             # we don't want to bother pinging on these.
@@ -1043,28 +1047,32 @@ def zlib_decompress(blob: bytes, decode: Optional[bool] = True) -> Union[bytes,
     return decompressed.decode("utf-8") if decode else decompressed
 
 
-def to_adhoc(
-    filt: Dict[str, Any], expression_type: str = "SIMPLE", clause: str = "where"
-) -> Dict[str, Any]:
-    result = {
+def simple_filter_to_adhoc(
+    filter_clause: QueryObjectFilterClause, clause: str = "where",
+) -> AdhocFilterClause:
+    result: AdhocFilterClause = {
         "clause": clause.upper(),
-        "expressionType": expression_type,
-        "isExtra": bool(filt.get("isExtra")),
+        "expressionType": "SIMPLE",
+        "comparator": filter_clause.get("val"),
+        "operator": filter_clause["op"],
+        "subject": filter_clause["col"],
     }
+    if filter_clause.get("isExtra"):
+        result["isExtra"] = True
+    result["filterOptionName"] = md5_sha_from_dict(cast(Dict[Any, Any], result))
 
-    if expression_type == "SIMPLE":
-        result.update(
-            {
-                "comparator": filt.get("val"),
-                "operator": filt.get("op"),
-                "subject": filt.get("col"),
-            }
-        )
-    elif expression_type == "SQL":
-        result.update({"sqlExpression": filt.get(clause)})
+    return result
 
-    deterministic_name = md5_sha_from_dict(result)
-    result["filterOptionName"] = deterministic_name
+
+def form_data_to_adhoc(form_data: Dict[str, Any], clause: str) -> AdhocFilterClause:
+    if clause not in ("where", "having"):
+        raise ValueError(__("Unsupported clause type: %(clause)s", clause=clause))
+    result: AdhocFilterClause = {
+        "clause": clause.upper(),
+        "expressionType": "SQL",
+        "sqlExpression": form_data.get(clause),
+    }
+    result["filterOptionName"] = md5_sha_from_dict(cast(Dict[Any, Any], result))
 
     return result
 
@@ -1076,7 +1084,7 @@ def merge_extra_form_data(form_data: Dict[str, Any]) -> None:
     """
     filter_keys = ["filters", "adhoc_filters"]
     extra_form_data = form_data.pop("extra_form_data", {})
-    append_filters = extra_form_data.get("filters", None)
+    append_filters: List[QueryObjectFilterClause] = extra_form_data.get("filters", None)
 
     # merge append extras
     for key in [key for key in EXTRA_FORM_DATA_APPEND_KEYS if key not in filter_keys]:
@@ -1101,19 +1109,23 @@ def merge_extra_form_data(form_data: Dict[str, Any]) -> None:
     if extras:
         form_data["extras"] = extras
 
-    adhoc_filters = form_data.get("adhoc_filters", [])
+    adhoc_filters: List[AdhocFilterClause] = form_data.get("adhoc_filters", [])
     form_data["adhoc_filters"] = adhoc_filters
-    append_adhoc_filters = extra_form_data.get("adhoc_filters", [])
-    adhoc_filters.extend({"isExtra": True, **fltr} for fltr in append_adhoc_filters)
+    append_adhoc_filters: List[AdhocFilterClause] = extra_form_data.get(
+        "adhoc_filters", []
+    )
+    adhoc_filters.extend(
+        {"isExtra": True, **fltr} for fltr in append_adhoc_filters  # type: ignore
+    )
     if append_filters:
         adhoc_filters.extend(
-            to_adhoc({"isExtra": True, **fltr}) for fltr in append_filters if fltr
+            simple_filter_to_adhoc({"isExtra": True, **fltr})  # type: ignore
+            for fltr in append_filters
+            if fltr
         )
 
 
-def merge_extra_filters(  # pylint: disable=too-many-branches
-    form_data: Dict[str, Any],
-) -> None:
+def merge_extra_filters(form_data: Dict[str, Any]) -> None:
     # extra_filters are temporary/contextual filters (using the legacy constructs)
     # that are external to the slice definition. We use those for dynamic
     # interactive filters like the ones emitted by the "Filter Box" visualization.
@@ -1174,16 +1186,16 @@ def get_filter_key(f: Dict[str, Any]) -> str:
                             # Add filters for unequal lists
                             # order doesn't matter
                             if set(existing_filters[filter_key]) != set(filtr["val"]):
-                                adhoc_filters.append(to_adhoc(filtr))
+                                adhoc_filters.append(simple_filter_to_adhoc(filtr))
                         else:
-                            adhoc_filters.append(to_adhoc(filtr))
+                            adhoc_filters.append(simple_filter_to_adhoc(filtr))
                     else:
                         # Do not add filter if same value already exists
                         if filtr["val"] != existing_filters[filter_key]:
-                            adhoc_filters.append(to_adhoc(filtr))
+                            adhoc_filters.append(simple_filter_to_adhoc(filtr))
                 else:
                     # Filter not found, add it
-                    adhoc_filters.append(to_adhoc(filtr))
+                    adhoc_filters.append(simple_filter_to_adhoc(filtr))
         # Remove extra filters from the form data since no longer needed
         del form_data["extra_filters"]
 
@@ -1219,6 +1231,7 @@ def user_label(user: User) -> Optional[str]:
 def get_or_create_db(
     database_name: str, sqlalchemy_uri: str, always_create: Optional[bool] = True
 ) -> "Database":
+    # pylint: disable=import-outside-toplevel
     from superset import db
     from superset.models import core as models
 
@@ -1226,9 +1239,16 @@ def get_or_create_db(
         db.session.query(models.Database).filter_by(database_name=database_name).first()
     )
 
+    # databases with a fixed UUID
+    uuids = {
+        "examples": EXAMPLES_DB_UUID,
+    }
+
     if not database and always_create:
         logger.info("Creating database reference for %s", database_name)
-        database = models.Database(database_name=database_name)
+        database = models.Database(
+            database_name=database_name, uuid=uuids.get(database_name)
+        )
         db.session.add(database)
 
     if database:
@@ -1239,16 +1259,15 @@ def get_or_create_db(
 
 
 def get_example_database() -> "Database":
-    from superset import conf
-
-    db_uri = conf.get("SQLALCHEMY_EXAMPLES_URI") or conf.get("SQLALCHEMY_DATABASE_URI")
+    db_uri = (
+        current_app.config.get("SQLALCHEMY_EXAMPLES_URI")
+        or current_app.config["SQLALCHEMY_DATABASE_URI"]
+    )
     return get_or_create_db("examples", db_uri)
 
 
 def get_main_database() -> "Database":
-    from superset import conf
-
-    db_uri = conf.get("SQLALCHEMY_DATABASE_URI")
+    db_uri = current_app.config["SQLALCHEMY_DATABASE_URI"]
     return get_or_create_db("main", db_uri)
 
 
@@ -1256,23 +1275,53 @@ def backend() -> str:
     return get_example_database().backend
 
 
-def is_adhoc_metric(metric: Metric) -> bool:
+def is_adhoc_metric(metric: Metric) -> TypeGuard[AdhocMetric]:
     return isinstance(metric, dict) and "expressionType" in metric
 
 
 def get_metric_name(metric: Metric) -> str:
-    return metric["label"] if is_adhoc_metric(metric) else metric  # type: ignore
+    """
+    Extract label from metric
+
+    :param metric: object to extract label from
+    :return: String representation of metric
+    :raises ValueError: if metric object is invalid
+    """
+    if is_adhoc_metric(metric):
+        label = metric.get("label")
+        if label:
+            return label
+        expression_type = metric.get("expressionType")
+        if expression_type == "SQL":
+            sql_expression = metric.get("sqlExpression")
+            if sql_expression:
+                return sql_expression
+        elif expression_type == "SIMPLE":
+            column: AdhocMetricColumn = metric.get("column") or {}
+            column_name = column.get("column_name")
+            aggregate = metric.get("aggregate")
+            if column and aggregate:
+                return f"{aggregate}({column_name})"
+            if column_name:
+                return column_name
+        raise ValueError(__("Invalid metric object"))
+    return metric  # type: ignore
 
 
 def get_metric_names(metrics: Sequence[Metric]) -> List[str]:
-    return [get_metric_name(metric) for metric in metrics]
+    return [metric for metric in map(get_metric_name, metrics) if metric]
+
+
+def get_first_metric_name(metrics: Sequence[Metric]) -> Optional[str]:
+    metric_labels = get_metric_names(metrics)
+    return metric_labels[0] if metric_labels else None
 
 
 def ensure_path_exists(path: str) -> None:
     try:
         os.makedirs(path)
-    except OSError as exc:
-        if not (os.path.isdir(path) and exc.errno == errno.EEXIST):
+    except OSError as ex:
+        if not (os.path.isdir(path) and ex.errno == errno.EEXIST):
             raise
 
 
@@ -1282,15 +1331,16 @@ def convert_legacy_filters_into_adhoc(  # pylint: disable=invalid-name
     mapping = {"having": "having_filters", "where": "filters"}
 
     if not form_data.get("adhoc_filters"):
-        form_data["adhoc_filters"] = []
+        adhoc_filters: List[AdhocFilterClause] = []
+        form_data["adhoc_filters"] = adhoc_filters
 
         for clause, filters in mapping.items():
             if clause in form_data and form_data[clause] != "":
-                form_data["adhoc_filters"].append(to_adhoc(form_data, "SQL", clause))
+                adhoc_filters.append(form_data_to_adhoc(form_data, clause))
 
             if filters in form_data:
                 for filt in filter(lambda x: x is not None, form_data[filters]):
-                    form_data["adhoc_filters"].append(to_adhoc(filt, "SIMPLE", clause))
+                    adhoc_filters.append(simple_filter_to_adhoc(filt, clause))
 
     for key in ("filters", "having", "having_filters", "where"):
         if key in form_data:
@@ -1368,8 +1418,8 @@ def parse_ssl_cert(certificate: str) -> _Certificate:
         return x509.load_pem_x509_certificate(
             certificate.encode("utf-8"), default_backend()
         )
-    except ValueError:
-        raise CertificateException("Invalid certificate")
+    except ValueError as ex:
+        raise CertificateException("Invalid certificate") from ex
 
 
 def create_ssl_cert_file(certificate: str) -> str:
@@ -1389,9 +1439,8 @@ def create_ssl_cert_file(certificate: str) -> str:
     if not os.path.exists(path):
         # Validate certificate prior to persisting to temporary directory
         parse_ssl_cert(certificate)
-        cert_file = open(path, "w")
-        cert_file.write(certificate)
-        cert_file.close()
+        with open(path, "w") as cert_file:
+            cert_file.write(certificate)
     return path
 
 
@@ -1470,7 +1519,6 @@ def get_iterable(x: Any) -> List[Any]:
     :param x: The object
     :returns: An iterable representation
     """
-
     return x if isinstance(x, list) else [x]
 
 
@@ -1493,7 +1541,7 @@ def get_column_name_from_metric(metric: Metric) -> Optional[str]:
     :return: column name if simple metric, otherwise None
     """
     if is_adhoc_metric(metric):
-        metric = cast(Dict[str, Any], metric)
+        metric = cast(AdhocMetric, metric)
         if metric["expressionType"] == AdhocMetricExpressionType.SIMPLE:
             return cast(Dict[str, Any], metric["column"])["column_name"]
     return None
@@ -1507,12 +1555,7 @@ def get_column_names_from_metrics(metrics: List[Metric]) -> List[str]:
     :param metrics: Ad-hoc metric
     :return: column name if simple metric, otherwise None
     """
-    columns: List[str] = []
-    for metric in metrics:
-        column_name = get_column_name_from_metric(metric)
-        if column_name:
-            columns.append(column_name)
-    return columns
+    return [col for col in map(get_column_name_from_metric, metrics) if col]
 
 
 def extract_dataframe_dtypes(df: pd.DataFrame) -> List[GenericDataType]:
@@ -1564,7 +1607,7 @@ def is_test() -> bool:
     return strtobool(os.environ.get("SUPERSET_TESTENV", "false"))
 
 
-def get_time_filter_status(  # pylint: disable=too-many-branches
+def get_time_filter_status(
     datasource: "BaseDatasource", applied_time_extras: Dict[str, str],
 ) -> Tuple[List[Dict[str, str]], List[Dict[str, str]]]:
     temporal_columns = {col.column_name for col in datasource.columns if col.is_dttm}
@@ -1577,7 +1620,7 @@ def get_time_filter_status(  # pylint: disable=too-many-branches
         else:
             rejected.append(
                 {
-                    "reason": "not_in_datasource",
+                    "reason": ExtraFiltersReasonType.COL_NOT_IN_DATASOURCE,
                     "column": ExtraFiltersTimeColumnType.TIME_COL,
                 }
             )
@@ -1589,19 +1632,20 @@ def get_time_filter_status(  # pylint: disable=too-many-branches
         else:
             rejected.append(
                 {
-                    "reason": "no_temporal_column",
+                    "reason": ExtraFiltersReasonType.NO_TEMPORAL_COLUMN,
                     "column": ExtraFiltersTimeColumnType.TIME_GRAIN,
                 }
             )
 
-    if ExtraFiltersTimeColumnType.TIME_RANGE in applied_time_extras:
+    time_range = applied_time_extras.get(ExtraFiltersTimeColumnType.TIME_RANGE)
+    if time_range and time_range != NO_TIME_RANGE:
         # are there any temporal columns to assign the time grain to?
         if temporal_columns:
             applied.append({"column": ExtraFiltersTimeColumnType.TIME_RANGE})
         else:
             rejected.append(
                 {
-                    "reason": "no_temporal_column",
+                    "reason": ExtraFiltersReasonType.NO_TEMPORAL_COLUMN,
                     "column": ExtraFiltersTimeColumnType.TIME_RANGE,
                 }
             )
@@ -1612,7 +1656,7 @@ def get_time_filter_status(  # pylint: disable=too-many-branches
         else:
             rejected.append(
                 {
-                    "reason": "not_druid_datasource",
+                    "reason": ExtraFiltersReasonType.NOT_DRUID_DATASOURCE,
                     "column": ExtraFiltersTimeColumnType.TIME_ORIGIN,
                 }
             )
@@ -1623,7 +1667,7 @@ def get_time_filter_status(  # pylint: disable=too-many-branches
         else:
             rejected.append(
                 {
-                    "reason": "not_druid_datasource",
+                    "reason": ExtraFiltersReasonType.NOT_DRUID_DATASOURCE,
                     "column": ExtraFiltersTimeColumnType.GRANULARITY,
                 }
             )
diff --git a/superset/utils/csv.py b/superset/utils/csv.py
index 3e5fe4621259..42d2c557832e 100644
--- a/superset/utils/csv.py
+++ b/superset/utils/csv.py
@@ -20,6 +20,7 @@
 from urllib.error import URLError
 
 import pandas as pd
+import simplejson
 
 negative_number_re = re.compile(r"^-[0-9.]+$")
 
@@ -84,3 +85,25 @@ def get_chart_csv_data(
     if content:
         return content
     return None
+
+
+def get_chart_dataframe(
+    chart_url: str, auth_cookies: Optional[Dict[str, str]] = None
+) -> Optional[pd.DataFrame]:
+    content = get_chart_csv_data(chart_url, auth_cookies)
+    if content is None:
+        return None
+
+    result = simplejson.loads(content.decode("utf-8"))
+    df = pd.DataFrame.from_dict(result["result"][0]["data"])
+
+    # rebuild hierarchical columns and index
+    df.columns = pd.MultiIndex.from_tuples(
+        tuple(colname) if isinstance(colname, list) else (colname,)
+        for colname in result["result"][0]["colnames"]
+    )
+    df.index = pd.MultiIndex.from_tuples(
+        tuple(indexname) if isinstance(indexname, list) else (indexname,)
+        for indexname in result["result"][0]["indexnames"]
+    )
+    return df
diff --git a/superset/utils/date_parser.py b/superset/utils/date_parser.py
index 42625e66a279..2bbfc185acbc 100644
--- a/superset/utils/date_parser.py
+++ b/superset/utils/date_parser.py
@@ -19,7 +19,7 @@
 import re
 from datetime import datetime, timedelta
 from time import struct_time
-from typing import List, Optional, Tuple
+from typing import Dict, List, Optional, Tuple
 
 import parsedatetime
 from dateutil.parser import parse
@@ -40,10 +40,12 @@
 )
 
 from superset.charts.commands.exceptions import (
+    TimeDeltaAmbiguousError,
+    TimeRangeAmbiguousError,
     TimeRangeParseFailError,
-    TimeRangeUnclearError,
 )
-from superset.utils.core import memoized
+from superset.utils.core import NO_TIME_RANGE
+from superset.utils.memoized import memoized
 
 ParserElement.enablePackrat()
 
@@ -51,33 +53,10 @@
 
 
 def parse_human_datetime(human_readable: str) -> datetime:
-    """
-    Returns ``datetime.datetime`` from human readable strings
-
-    >>> from datetime import date, timedelta
-    >>> from dateutil.relativedelta import relativedelta
-    >>> parse_human_datetime('2015-04-03')
-    datetime.datetime(2015, 4, 3, 0, 0)
-    >>> parse_human_datetime('2/3/1969')
-    datetime.datetime(1969, 2, 3, 0, 0)
-    >>> parse_human_datetime('now') <= datetime.now()
-    True
-    >>> parse_human_datetime('yesterday') <= datetime.now()
-    True
-    >>> date.today() - timedelta(1) == parse_human_datetime('yesterday').date()
-    True
-    >>> year_ago_1 = parse_human_datetime('one year ago').date()
-    >>> year_ago_2 = (datetime.now() - relativedelta(years=1)).date()
-    >>> year_ago_1 == year_ago_2
-    True
-    >>> year_after_1 = parse_human_datetime('2 years after').date()
-    >>> year_after_2 = (datetime.now() + relativedelta(years=2)).date()
-    >>> year_after_1 == year_after_2
-    True
-    """
+    """Returns ``datetime.datetime`` from human readable strings"""
     x_periods = r"^\s*([0-9]+)\s+(second|minute|hour|day|week|month|quarter|year)s?\s*$"
     if re.search(x_periods, human_readable, re.IGNORECASE):
-        raise TimeRangeUnclearError(human_readable)
+        raise TimeRangeAmbiguousError(human_readable)
     try:
         default = datetime(year=datetime.now().year, month=1, day=1)
         dttm = parse(human_readable, default=default)
@@ -87,7 +66,7 @@ def parse_human_datetime(human_readable: str) -> datetime:
         # 0 == not parsed at all
         if parsed_flags == 0:
             logger.debug(ex)
-            raise TimeRangeParseFailError(human_readable)
+            raise TimeRangeParseFailError(human_readable) from ex
         # when time is not extracted, we 'reset to midnight'
         if parsed_flags & 2 == 0:
             parsed_dttm = parsed_dttm.replace(hour=0, minute=0, second=0)
@@ -95,6 +74,18 @@ def parse_human_datetime(human_readable: str) -> datetime:
     return dttm
 
 
+def normalize_time_delta(human_readable: str) -> Dict[str, int]:
+    x_unit = r"^\s*([0-9]+)\s+(second|minute|hour|day|week|month|quarter|year)s?\s+(ago|later)*$"  # pylint: disable=line-too-long,useless-suppression
+    matched = re.match(x_unit, human_readable, re.IGNORECASE)
+    if not matched:
+        raise TimeDeltaAmbiguousError(human_readable)
+
+    key = matched[2] + "s"
+    value = int(matched[1])
+    value = -value if matched[3] == "ago" else value
+    return {key: value}
+
+
 def dttm_from_timetuple(date_: struct_time) -> datetime:
     return datetime(
         date_.tm_year,
@@ -106,6 +97,16 @@ def dttm_from_timetuple(date_: struct_time) -> datetime:
     )
 
 
+def get_past_or_future(
+    human_readable: Optional[str], source_time: Optional[datetime] = None,
+) -> datetime:
+    cal = parsedatetime.Calendar()
+    source_dttm = dttm_from_timetuple(
+        source_time.timetuple() if source_time else datetime.now().timetuple()
+    )
+    return dttm_from_timetuple(cal.parse(human_readable or "", source_dttm)[0])
+
+
 def parse_human_timedelta(
     human_readable: Optional[str], source_time: Optional[datetime] = None,
 ) -> timedelta:
@@ -115,12 +116,10 @@ def parse_human_timedelta(
     >>> parse_human_timedelta('1 day') == timedelta(days=1)
     True
     """
-    cal = parsedatetime.Calendar()
     source_dttm = dttm_from_timetuple(
         source_time.timetuple() if source_time else datetime.now().timetuple()
     )
-    modified_dttm = dttm_from_timetuple(cal.parse(human_readable or "", source_dttm)[0])
-    return modified_dttm - source_dttm
+    return get_past_or_future(human_readable, source_time) - source_dttm
 
 
 def parse_past_timedelta(
@@ -176,7 +175,7 @@ def get_since_until(
     _relative_start = relative_start if relative_start else "today"
     _relative_end = relative_end if relative_end else "today"
 
-    if time_range == "No filter":
+    if time_range == NO_TIME_RANGE:
         return None, None
 
     if time_range and time_range.startswith("Last") and separator not in time_range:
@@ -190,19 +189,19 @@ def get_since_until(
         and time_range.startswith("previous calendar week")
         and separator not in time_range
     ):
-        time_range = "DATETRUNC(DATEADD(DATETIME('today'), -1, WEEK), WEEK) : DATETRUNC(DATETIME('today'), WEEK)"  # pylint: disable=line-too-long
+        time_range = "DATETRUNC(DATEADD(DATETIME('today'), -1, WEEK), WEEK) : DATETRUNC(DATETIME('today'), WEEK)"  # pylint: disable=line-too-long,useless-suppression
     if (
         time_range
         and time_range.startswith("previous calendar month")
         and separator not in time_range
     ):
-        time_range = "DATETRUNC(DATEADD(DATETIME('today'), -1, MONTH), MONTH) : DATETRUNC(DATETIME('today'), MONTH)"  # pylint: disable=line-too-long
+        time_range = "DATETRUNC(DATEADD(DATETIME('today'), -1, MONTH), MONTH) : DATETRUNC(DATETIME('today'), MONTH)"  # pylint: disable=line-too-long,useless-suppression
     if (
         time_range
         and time_range.startswith("previous calendar year")
         and separator not in time_range
     ):
-        time_range = "DATETRUNC(DATEADD(DATETIME('today'), -1, YEAR), YEAR) : DATETRUNC(DATETIME('today'), YEAR)"  # pylint: disable=line-too-long
+        time_range = "DATETRUNC(DATEADD(DATETIME('today'), -1, YEAR), YEAR) : DATETRUNC(DATETIME('today'), YEAR)"  # pylint: disable=line-too-long,useless-suppression
 
     if time_range and separator in time_range:
         time_range_lookup = [
@@ -212,11 +211,11 @@ def get_since_until(
             ),
             (
                 r"^last\s+([0-9]+)\s+(second|minute|hour|day|week|month|year)s?$",
-                lambda delta, unit: f"DATEADD(DATETIME('{_relative_start}'), -{int(delta)}, {unit})",  # pylint: disable=line-too-long
+                lambda delta, unit: f"DATEADD(DATETIME('{_relative_start}'), -{int(delta)}, {unit})",  # pylint: disable=line-too-long,useless-suppression
             ),
             (
                 r"^next\s+([0-9]+)\s+(second|minute|hour|day|week|month|year)s?$",
-                lambda delta, unit: f"DATEADD(DATETIME('{_relative_end}'), {int(delta)}, {unit})",  # pylint: disable=line-too-long
+                lambda delta, unit: f"DATEADD(DATETIME('{_relative_end}'), {int(delta)}, {unit})",  # pylint: disable=line-too-long,useless-suppression
             ),
             (
                 r"^(DATETIME.*|DATEADD.*|DATETRUNC.*|LASTDAY.*|HOLIDAY.*)$",
@@ -477,8 +476,8 @@ def datetime_eval(datetime_expression: Optional[str] = None) -> Optional[datetim
     if datetime_expression:
         try:
             return datetime_parser().parseString(datetime_expression)[0].eval()
-        except ParseException as error:
-            raise ValueError(error)
+        except ParseException as ex:
+            raise ValueError(ex) from ex
     return None
 
 
diff --git a/superset/utils/decorators.py b/superset/utils/decorators.py
index 27abab30e9a7..ab4ee308787c 100644
--- a/superset/utils/decorators.py
+++ b/superset/utils/decorators.py
@@ -14,19 +14,23 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from __future__ import annotations
+
 import time
+from contextlib import contextmanager
 from functools import wraps
-from typing import Any, Callable, Dict, Iterator, Union
+from typing import Any, Callable, Dict, Iterator, TYPE_CHECKING, Union
 
-from contextlib2 import contextmanager
 from flask import current_app, Response
 
 from superset import is_feature_enabled
 from superset.dashboards.commands.exceptions import DashboardAccessDeniedError
-from superset.stats_logger import BaseStatsLogger
 from superset.utils import core as utils
 from superset.utils.dates import now_as_float
 
+if TYPE_CHECKING:
+    from superset.stats_logger import BaseStatsLogger
+
 
 @contextmanager
 def stats_timing(stats_key: str, stats_logger: BaseStatsLogger) -> Iterator[float]:
@@ -40,7 +44,7 @@ def stats_timing(stats_key: str, stats_logger: BaseStatsLogger) -> Iterator[floa
         stats_logger.timing(stats_key, now_as_float() - start_ts)
 
 
-def arghash(args: Any, kwargs: Dict[str, Any]) -> int:
+def arghash(args: Any, kwargs: Any) -> int:
     """Simple argument hash with kwargs sorted."""
     sorted_args = tuple(
         x if hasattr(x, "__repr__") else x for x in [*args, *sorted(kwargs.items())]
@@ -87,6 +91,7 @@ def check_dashboard_access(
     def decorator(f: Callable[..., Any]) -> Callable[..., Any]:
         @wraps(f)
         def wrapper(self: Any, *args: Any, **kwargs: Any) -> Any:
+            # pylint: disable=import-outside-toplevel
             from superset.models.dashboard import Dashboard
 
             dashboard = Dashboard.get(str(kwargs["dashboard_id_or_slug"]))
diff --git a/superset/utils/encrypt.py b/superset/utils/encrypt.py
index 10bc97d80fb8..240ca5aa8bf9 100644
--- a/superset/utils/encrypt.py
+++ b/superset/utils/encrypt.py
@@ -22,7 +22,7 @@
 from sqlalchemy_utils import EncryptedType
 
 
-class AbstractEncryptedFieldAdapter(ABC):
+class AbstractEncryptedFieldAdapter(ABC):  # pylint: disable=too-few-public-methods
     @abstractmethod
     def create(
         self,
@@ -33,7 +33,9 @@ def create(
         pass
 
 
-class SQLAlchemyUtilsAdapter(AbstractEncryptedFieldAdapter):
+class SQLAlchemyUtilsAdapter(  # pylint: disable=too-few-public-methods
+    AbstractEncryptedFieldAdapter
+):
     def create(
         self,
         app_config: Optional[Dict[str, Any]],
diff --git a/superset/utils/log.py b/superset/utils/log.py
index b2a7459d273a..ecee213ebef2 100644
--- a/superset/utils/log.py
+++ b/superset/utils/log.py
@@ -14,6 +14,8 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from __future__ import annotations
+
 import functools
 import inspect
 import json
@@ -22,14 +24,25 @@
 from abc import ABC, abstractmethod
 from contextlib import contextmanager
 from datetime import datetime, timedelta
-from typing import Any, Callable, cast, Dict, Iterator, Optional, Type, Union
+from typing import (
+    Any,
+    Callable,
+    cast,
+    Dict,
+    Iterator,
+    Optional,
+    Type,
+    TYPE_CHECKING,
+    Union,
+)
 
 from flask import current_app, g, request
 from flask_appbuilder.const import API_URI_RIS_KEY
 from sqlalchemy.exc import SQLAlchemyError
 from typing_extensions import Literal
 
-from superset.stats_logger import BaseStatsLogger
+if TYPE_CHECKING:
+    from superset.stats_logger import BaseStatsLogger
 
 
 def collect_request_payload() -> Dict[str, Any]:
@@ -112,6 +125,7 @@ def log_with_context(  # pylint: disable=too-many-locals
         log_to_statsd: bool = True,
         **payload_override: Optional[Dict[str, Any]],
     ) -> None:
+        # pylint: disable=import-outside-toplevel
         from superset.views.core import get_form_data
 
         referrer = request.referrer[:1000] if request and request.referrer else None
@@ -180,7 +194,7 @@ def log_with_context(  # pylint: disable=too-many-locals
         )
 
     @contextmanager
-    def log_context(  # pylint: disable=too-many-locals
+    def log_context(
         self, action: str, object_ref: Optional[str] = None, log_to_statsd: bool = True,
     ) -> Iterator[Callable[..., None]]:
         """
@@ -308,6 +322,7 @@ def log(  # pylint: disable=too-many-arguments,too-many-locals
         *args: Any,
         **kwargs: Any,
     ) -> None:
+        # pylint: disable=import-outside-toplevel
         from superset.models.core import Log
 
         records = kwargs.get("records", [])
diff --git a/superset/utils/memoized.py b/superset/utils/memoized.py
new file mode 100644
index 000000000000..916984c9b8c2
--- /dev/null
+++ b/superset/utils/memoized.py
@@ -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 functools
+from typing import Any, Callable, Dict, Optional, Tuple, Type
+
+
+class _memoized:
+    """Decorator that caches a function's return value each time it is called
+
+    If called later with the same arguments, the cached value is returned, and
+    not re-evaluated.
+
+    Define ``watch`` as a tuple of attribute names if this Decorator
+    should account for instance variable changes.
+    """
+
+    def __init__(
+        self, func: Callable[..., Any], watch: Optional[Tuple[str, ...]] = None
+    ) -> None:
+        self.func = func
+        self.cache: Dict[Any, Any] = {}
+        self.is_method = False
+        self.watch = watch or ()
+
+    def __call__(self, *args: Any, **kwargs: Any) -> Any:
+        key = [args, frozenset(kwargs.items())]
+        if self.is_method:
+            key.append(tuple(getattr(args[0], v, None) for v in self.watch))
+        key = tuple(key)  # type: ignore
+        try:
+            if key in self.cache:
+                return self.cache[key]
+        except TypeError as ex:
+            # Uncachable -- for instance, passing a list as an argument.
+            raise TypeError("Function cannot be memoized") from ex
+        value = self.func(*args, **kwargs)
+        try:
+            self.cache[key] = value
+        except TypeError as ex:
+            raise TypeError("Function cannot be memoized") from ex
+        return value
+
+    def __repr__(self) -> str:
+        """Return the function's docstring."""
+        return self.func.__doc__ or ""
+
+    def __get__(
+        self, obj: Any, objtype: Type[Any]
+    ) -> functools.partial:  # type: ignore
+        if not self.is_method:
+            self.is_method = True
+        # Support instance methods.
+        return functools.partial(self.__call__, obj)
+
+
+def memoized(
+    func: Optional[Callable[..., Any]] = None, watch: Optional[Tuple[str, ...]] = None
+) -> Callable[..., Any]:
+    if func:
+        return _memoized(func)
+
+    def wrapper(f: Callable[..., Any]) -> Callable[..., Any]:
+        return _memoized(f, watch)
+
+    return wrapper
diff --git a/superset/utils/mock_data.py b/superset/utils/mock_data.py
index 06327ef89262..6de9eca60bea 100644
--- a/superset/utils/mock_data.py
+++ b/superset/utils/mock_data.py
@@ -22,13 +22,14 @@
 import string
 import sys
 from datetime import date, datetime, time, timedelta
-from typing import Any, Callable, cast, Dict, List, Optional, Type
+from typing import Any, Callable, cast, Dict, Iterator, List, Optional, Type
 from uuid import uuid4
 
 import sqlalchemy.sql.sqltypes
 import sqlalchemy_utils
 from flask_appbuilder import Model
 from sqlalchemy import Column, inspect, MetaData, Table
+from sqlalchemy.dialects import postgresql
 from sqlalchemy.orm import Session
 from sqlalchemy.sql import func
 from sqlalchemy.sql.visitors import VisitableType
@@ -68,6 +69,9 @@
 
 # pylint: disable=too-many-return-statements, too-many-branches
 def get_type_generator(sqltype: sqlalchemy.sql.sqltypes) -> Callable[[], Any]:
+    if isinstance(sqltype, sqlalchemy.dialects.mysql.types.TINYINT):
+        return lambda: random.choice([0, 1])
+
     if isinstance(
         sqltype, (sqlalchemy.sql.sqltypes.INTEGER, sqlalchemy.sql.sqltypes.Integer)
     ):
@@ -82,7 +86,7 @@ def get_type_generator(sqltype: sqlalchemy.sql.sqltypes) -> Callable[[], Any]:
         length = random.randrange(sqltype.length or 255)
         length = max(8, length)  # for unique values
         length = min(100, length)  # for FAB perms
-        return lambda: "".join(random.choices(string.printable, k=length))
+        return lambda: "".join(random.choices(string.ascii_letters, k=length))
 
     if isinstance(
         sqltype, (sqlalchemy.sql.sqltypes.TEXT, sqlalchemy.sql.sqltypes.Text)
@@ -90,7 +94,7 @@ def get_type_generator(sqltype: sqlalchemy.sql.sqltypes) -> Callable[[], Any]:
         length = random.randrange(65535)
         # "practicality beats purity"
         length = max(length, 2048)
-        return lambda: "".join(random.choices(string.printable, k=length))
+        return lambda: "".join(random.choices(string.ascii_letters, k=length))
 
     if isinstance(
         sqltype, (sqlalchemy.sql.sqltypes.BOOLEAN, sqlalchemy.sql.sqltypes.Boolean)
@@ -129,7 +133,7 @@ def get_type_generator(sqltype: sqlalchemy.sql.sqltypes) -> Callable[[], Any]:
 
     if isinstance(sqltype, sqlalchemy.sql.sqltypes.JSON):
         return lambda: {
-            "".join(random.choices(string.printable, k=8)): random.randrange(65535)
+            "".join(random.choices(string.ascii_letters, k=8)): random.randrange(65535)
             for _ in range(10)
         }
 
@@ -146,6 +150,9 @@ def get_type_generator(sqltype: sqlalchemy.sql.sqltypes) -> Callable[[], Any]:
     if isinstance(sqltype, sqlalchemy_utils.types.uuid.UUIDType):
         return uuid4
 
+    if isinstance(sqltype, postgresql.base.UUID):
+        return lambda: str(uuid4())
+
     if isinstance(sqltype, sqlalchemy.sql.sqltypes.BLOB):
         length = random.randrange(sqltype.length or 255)
         return lambda: os.urandom(length)
@@ -153,7 +160,7 @@ def get_type_generator(sqltype: sqlalchemy.sql.sqltypes) -> Callable[[], Any]:
     logger.warning(
         "Unknown type %s. Please add it to `get_type_generator`.", type(sqltype)
     )
-    return lambda: "UNKNOWN TYPE"
+    return lambda: b"UNKNOWN TYPE"
 
 
 def add_data(
@@ -172,6 +179,7 @@ def add_data(
     :param str table_name: name of table, will be created if it doesn't exist
     :param bool append: if the table already exists, append data or replace?
     """
+    # pylint: disable=import-outside-toplevel
     from superset.utils.core import get_example_database
 
     database = get_example_database()
@@ -195,11 +203,11 @@ def add_data(
     metadata.create_all(engine)
 
     if not append:
-        # pylint: disable=no-value-for-parameter (sqlalchemy/issues/4656)
+        # pylint: disable=no-value-for-parameter # sqlalchemy/issues/4656
         engine.execute(table.delete())
 
     data = generate_data(columns, num_rows)
-    # pylint: disable=no-value-for-parameter (sqlalchemy/issues/4656)
+    # pylint: disable=no-value-for-parameter # sqlalchemy/issues/4656
     engine.execute(table.insert(), data)
 
 
@@ -225,10 +233,11 @@ def generate_column_data(column: ColumnInfo, num_rows: int) -> List[Any]:
     return [gen() for _ in range(num_rows)]
 
 
-def add_sample_rows(session: Session, model: Type[Model], count: int) -> List[Model]:
+def add_sample_rows(
+    session: Session, model: Type[Model], count: int
+) -> Iterator[Model]:
     """
     Add entities of a given model.
-
     :param Model model: a Superset/FAB model
     :param int count: how many entities to generate and insert
     """
@@ -238,7 +247,6 @@ def add_sample_rows(session: Session, model: Type[Model], count: int) -> List[Mo
     relationships = inspector.relationships.items()
     samples = session.query(model).limit(count).all() if relationships else []
 
-    entities: List[Model] = []
     max_primary_key: Optional[int] = None
     for i in range(count):
         sample = samples[i % len(samples)] if samples else None
@@ -269,10 +277,8 @@ def add_sample_rows(session: Session, model: Type[Model], count: int) -> List[Mo
             else:
                 kwargs[column.name] = generate_value(column)
 
-        entities.append(model(**kwargs))
-
-    session.add_all(entities)
-    return entities
+        entity = model(**kwargs)
+        yield entity
 
 
 def get_valid_foreign_key(column: Column) -> Any:
diff --git a/superset/utils/pandas_postprocessing.py b/superset/utils/pandas_postprocessing.py
index e22a9c744e78..ad6c6afedade 100644
--- a/superset/utils/pandas_postprocessing.py
+++ b/superset/utils/pandas_postprocessing.py
@@ -21,16 +21,18 @@
 
 import geohash as geohash_lib
 import numpy as np
+import pandas as pd
 from flask_babel import gettext as _
 from geopy.point import Point
 from pandas import DataFrame, NamedAgg, Series, Timestamp
 
-from superset.constants import NULL_STRING
+from superset.constants import NULL_STRING, PandasAxis, PandasPostprocessingCompare
 from superset.exceptions import QueryObjectValidationError
 from superset.utils.core import (
     DTTM_ALIAS,
     PostProcessingBoxplotWhiskerType,
     PostProcessingContributionOrientation,
+    TIME_COMPARISION,
 )
 
 NUMPY_FUNCTIONS = {
@@ -209,7 +211,7 @@ def _append_columns(
 
 
 @validate_column_args("index", "columns")
-def pivot(  # pylint: disable=too-many-arguments
+def pivot(  # pylint: disable=too-many-arguments,too-many-locals
     df: DataFrame,
     index: List[str],
     aggregates: Dict[str, Dict[str, Any]],
@@ -262,6 +264,16 @@ def pivot(  # pylint: disable=too-many-arguments
     #  Remove once/if support is added.
     aggfunc = {na.column: na.aggfunc for na in aggregate_funcs.values()}
 
+    # When dropna = False, the pivot_table function will calculate cartesian-product
+    # for MultiIndex.
+    # https://github.com/apache/superset/issues/15956
+    # https://github.com/pandas-dev/pandas/issues/18030
+    series_set = set()
+    if not drop_missing_columns and columns:
+        for row in df[columns].itertuples():
+            for metric in aggfunc.keys():
+                series_set.add(str(tuple([metric]) + tuple(row[1:])))
+
     df = df.pivot_table(
         values=aggfunc.keys(),
         index=index,
@@ -273,6 +285,12 @@ def pivot(  # pylint: disable=too-many-arguments
         margins_name=marginal_distribution_name,
     )
 
+    if not drop_missing_columns and len(series_set) > 0 and not df.empty:
+        for col in df.columns:
+            series = str(col)
+            if series not in series_set:
+                df = df.drop(col, axis=PandasAxis.COLUMN)
+
     if combine_value_with_metric:
         df = df.stack(0).unstack()
 
@@ -327,7 +345,7 @@ def rolling(  # pylint: disable=too-many-arguments
     df: DataFrame,
     columns: Dict[str, str],
     rolling_type: str,
-    window: int,
+    window: Optional[int] = None,
     rolling_type_options: Optional[Dict[str, Any]] = None,
     center: bool = False,
     win_type: Optional[str] = None,
@@ -357,8 +375,10 @@ def rolling(  # pylint: disable=too-many-arguments
     rolling_type_options = rolling_type_options or {}
     df_rolling = df[columns.keys()]
     kwargs: Dict[str, Union[str, int]] = {}
-    if not window:
+    if window is None:
         raise QueryObjectValidationError(_("Undefined window for rolling operation"))
+    if window == 0:
+        raise QueryObjectValidationError(_("Window must be > 0"))
 
     kwargs["window"] = window
     if min_periods is not None:
@@ -377,14 +397,14 @@ def rolling(  # pylint: disable=too-many-arguments
         )
     try:
         df_rolling = getattr(df_rolling, rolling_type)(**rolling_type_options)
-    except TypeError:
+    except TypeError as ex:
         raise QueryObjectValidationError(
             _(
                 "Invalid options for %(rolling_type)s: %(options)s",
                 rolling_type=rolling_type,
                 options=rolling_type_options,
             )
-        )
+        ) from ex
     df = _append_columns(df, df_rolling, columns)
     if min_periods:
         df = df[min_periods:]
@@ -425,9 +445,14 @@ def select(
 
 
 @validate_column_args("columns")
-def diff(df: DataFrame, columns: Dict[str, str], periods: int = 1,) -> DataFrame:
+def diff(
+    df: DataFrame,
+    columns: Dict[str, str],
+    periods: int = 1,
+    axis: PandasAxis = PandasAxis.ROW,
+) -> DataFrame:
     """
-    Calculate row-by-row difference for select columns.
+    Calculate row-by-row or column-by-column difference for select columns.
 
     :param df: DataFrame on which the diff will be based.
     :param columns: columns on which to perform diff, mapping source column to
@@ -436,14 +461,69 @@ def diff(df: DataFrame, columns: Dict[str, str], periods: int = 1,) -> DataFrame
            on diff values calculated from `y`, leaving the original column `y`
            unchanged.
     :param periods: periods to shift for calculating difference.
+    :param axis: 0 for row, 1 for column. default 0.
     :return: DataFrame with diffed columns
     :raises QueryObjectValidationError: If the request in incorrect
     """
     df_diff = df[columns.keys()]
-    df_diff = df_diff.diff(periods=periods)
+    df_diff = df_diff.diff(periods=periods, axis=axis)
     return _append_columns(df, df_diff, columns)
 
 
+# pylint: disable=too-many-arguments
+@validate_column_args("source_columns", "compare_columns")
+def compare(
+    df: DataFrame,
+    source_columns: List[str],
+    compare_columns: List[str],
+    compare_type: Optional[PandasPostprocessingCompare],
+    drop_original_columns: Optional[bool] = False,
+    precision: Optional[int] = 4,
+) -> DataFrame:
+    """
+    Calculate column-by-column changing for select columns.
+
+    :param df: DataFrame on which the compare will be based.
+    :param source_columns: Main query columns
+    :param compare_columns: Columns being compared
+    :param compare_type: Type of compare. Choice of `absolute`, `percentage` or `ratio`
+    :param drop_original_columns: Whether to remove the source columns and
+           compare columns.
+    :param precision: Round a change rate to a variable number of decimal places.
+    :return: DataFrame with compared columns.
+    :raises QueryObjectValidationError: If the request in incorrect.
+    """
+    if len(source_columns) != len(compare_columns):
+        raise QueryObjectValidationError(
+            _("`compare_columns` must have the same length as `source_columns`.")
+        )
+    if compare_type not in tuple(PandasPostprocessingCompare):
+        raise QueryObjectValidationError(
+            _("`compare_type` must be `absolute`, `percentage` or `ratio`")
+        )
+    if len(source_columns) == 0:
+        return df
+
+    for s_col, c_col in zip(source_columns, compare_columns):
+        if compare_type == PandasPostprocessingCompare.ABS:
+            diff_series = df[s_col] - df[c_col]
+        elif compare_type == PandasPostprocessingCompare.PCT:
+            diff_series = (
+                ((df[s_col] - df[c_col]) / df[s_col]).astype(float).round(precision)
+            )
+        else:
+            # compare_type == "ratio"
+            diff_series = (df[s_col] / df[c_col]).astype(float).round(precision)
+        diff_df = diff_series.to_frame(
+            name=TIME_COMPARISION.join([compare_type, s_col, c_col])
+        )
+        df = pd.concat([df, diff_df], axis=1)
+
+    if drop_original_columns:
+        df = df.drop(source_columns + compare_columns, axis=1)
+    return df
+
+
 @validate_column_args("columns")
 def cum(df: DataFrame, columns: Dict[str, str], operator: str) -> DataFrame:
     """
@@ -489,8 +569,8 @@ def geohash_decode(
         return _append_columns(
             df, lonlat_df, {"latitude": latitude, "longitude": longitude}
         )
-    except ValueError:
-        raise QueryObjectValidationError(_("Invalid geohash string"))
+    except ValueError as ex:
+        raise QueryObjectValidationError(_("Invalid geohash string")) from ex
 
 
 def geohash_encode(
@@ -512,8 +592,8 @@ def geohash_encode(
             lambda row: geohash_lib.encode(row["latitude"], row["longitude"]), axis=1,
         )
         return _append_columns(df, encode_df, {"geohash": geohash})
-    except ValueError:
-        QueryObjectValidationError(_("Invalid longitude/latitude"))
+    except ValueError as ex:
+        raise QueryObjectValidationError(_("Invalid longitude/latitude")) from ex
 
 
 def geodetic_parse(
@@ -554,8 +634,8 @@ def _parse_location(location: str) -> Tuple[float, float, float]:
         if altitude:
             columns["altitude"] = altitude
         return _append_columns(df, geodetic_df, columns)
-    except ValueError:
-        raise QueryObjectValidationError(_("Invalid geodetic string"))
+    except ValueError as ex:
+        raise QueryObjectValidationError(_("Invalid geodetic string")) from ex
 
 
 @validate_column_args("columns")
@@ -634,14 +714,14 @@ def _prophet_fit_and_predict(  # pylint: disable=too-many-arguments
     Fit a prophet model and return a DataFrame with predicted results.
     """
     try:
-        prophet_logger = logging.getLogger("prophet.plot")
+        # pylint: disable=import-error,import-outside-toplevel
+        from prophet import Prophet
 
+        prophet_logger = logging.getLogger("prophet.plot")
         prophet_logger.setLevel(logging.CRITICAL)
-        from prophet import Prophet  # pylint: disable=import-error
-
         prophet_logger.setLevel(logging.NOTSET)
-    except ModuleNotFoundError:
-        raise QueryObjectValidationError(_("`prophet` package not installed"))
+    except ModuleNotFoundError as ex:
+        raise QueryObjectValidationError(_("`prophet` package not installed")) from ex
     model = Prophet(
         interval_width=confidence_interval,
         yearly_seasonality=yearly_seasonality,
diff --git a/superset/utils/profiler.py b/superset/utils/profiler.py
new file mode 100644
index 000000000000..a4710bb24341
--- /dev/null
+++ b/superset/utils/profiler.py
@@ -0,0 +1,59 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from typing import Any, Callable
+from unittest import mock
+
+from werkzeug.wrappers import Request, Response
+
+try:
+    from pyinstrument import Profiler
+except ModuleNotFoundError:
+    Profiler = None
+
+
+class SupersetProfiler:  # pylint: disable=too-few-public-methods
+    """
+    WSGI middleware to instrument Superset.
+
+    To see the instrumentation for a given page, set `PROFILING=True`
+    in the config, and append `?_instrument=1` to the page.
+    """
+
+    def __init__(
+        self, app: Callable[[Any, Any], Any], interval: float = 0.0001,
+    ):
+        self.app = app
+        self.interval = interval
+
+    @Request.application
+    def __call__(self, request: Request) -> Response:
+        if request.args.get("_instrument") != "1":
+            return Response.from_app(self.app, request.environ)
+
+        if Profiler is None:
+            raise Exception("The module pyinstrument is not installed.")
+
+        profiler = Profiler(interval=self.interval)
+
+        # call original request
+        fake_start_response = mock.MagicMock()
+        with profiler:
+            self.app(request.environ, fake_start_response)
+
+        # return HTML profiling information
+        return Response(profiler.output_html(), mimetype="text/html")
diff --git a/superset/utils/retries.py b/superset/utils/retries.py
new file mode 100644
index 000000000000..d1c294714607
--- /dev/null
+++ b/superset/utils/retries.py
@@ -0,0 +1,38 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from typing import Any, Callable, Dict, Generator, List, Optional, Type
+
+import backoff
+
+
+def retry_call(
+    func: Callable[..., Any],
+    *args: Any,
+    strategy: Callable[..., Generator[int, None, None]] = backoff.constant,
+    exception: Type[Exception] = Exception,
+    fargs: Optional[List[Any]] = None,
+    fkwargs: Optional[Dict[str, Any]] = None,
+    **kwargs: Any
+) -> Any:
+    """
+    Retry a given call.
+    """
+    decorated = backoff.on_exception(strategy, exception, *args, **kwargs)(func)
+    fargs = fargs or []
+    fkwargs = fkwargs or {}
+    return decorated(*fargs, **fkwargs)
diff --git a/superset/utils/schema.py b/superset/utils/schema.py
index 2384e2851419..c082ae017c21 100644
--- a/superset/utils/schema.py
+++ b/superset/utils/schema.py
@@ -50,5 +50,5 @@ def validate_json(value: Union[bytes, bytearray, str]) -> None:
     """
     try:
         utils.validate_json(value)
-    except SupersetException:
-        raise ValidationError("JSON not valid")
+    except SupersetException as ex:
+        raise ValidationError("JSON not valid") from ex
diff --git a/superset/utils/url_map_converters.py b/superset/utils/url_map_converters.py
index 463dfcdc9af8..c6a14f3fd804 100644
--- a/superset/utils/url_map_converters.py
+++ b/superset/utils/url_map_converters.py
@@ -23,7 +23,7 @@
 
 class RegexConverter(BaseConverter):
     def __init__(self, url_map: Map, *items: List[str]) -> None:
-        super(RegexConverter, self).__init__(url_map)  # type: ignore
+        super().__init__(url_map)  # type: ignore
         self.regex = items[0]
 
 
diff --git a/superset/utils/webdriver.py b/superset/utils/webdriver.py
index e7155ff12932..c81f8c247f40 100644
--- a/superset/utils/webdriver.py
+++ b/superset/utils/webdriver.py
@@ -16,12 +16,17 @@
 # under the License.
 
 import logging
-import time
+from enum import Enum
+from time import sleep
 from typing import Any, Dict, Optional, Tuple, TYPE_CHECKING
 
 from flask import current_app
-from retry.api import retry_call
-from selenium.common.exceptions import TimeoutException, WebDriverException
+from requests.models import PreparedRequest
+from selenium.common.exceptions import (
+    StaleElementReferenceException,
+    TimeoutException,
+    WebDriverException,
+)
 from selenium.webdriver import chrome, firefox
 from selenium.webdriver.common.by import By
 from selenium.webdriver.remote.webdriver import WebDriver
@@ -29,20 +34,22 @@
 from selenium.webdriver.support.ui import WebDriverWait
 
 from superset.extensions import machine_auth_provider_factory
+from superset.utils.retries import retry_call
 
 WindowSize = Tuple[int, int]
 logger = logging.getLogger(__name__)
 
-# Time in seconds, we will wait for the page to load and render
-SELENIUM_CHECK_INTERVAL = 2
-SELENIUM_RETRIES = 5
-SELENIUM_HEADSTART = 3
-
 
 if TYPE_CHECKING:
     from flask_appbuilder.security.sqla.models import User
 
 
+class DashboardStandaloneMode(Enum):
+    HIDE_NAV = 1
+    HIDE_NAV_AND_TITLE = 2
+    REPORT = 3
+
+
 class WebDriverProxy:
     def __init__(
         self, driver_type: str, window: Optional[WindowSize] = None,
@@ -86,7 +93,7 @@ def destroy(driver: WebDriver, tries: int = 2) -> None:
         # This is some very flaky code in selenium. Hence the retries
         # and catch-all exceptions
         try:
-            retry_call(driver.close, tries=tries)
+            retry_call(driver.close, max_tries=tries)
         except Exception:  # pylint: disable=broad-except
             pass
         try:
@@ -95,18 +102,21 @@ def destroy(driver: WebDriver, tries: int = 2) -> None:
             pass
 
     def get_screenshot(
-        self,
-        url: str,
-        element_name: str,
-        user: "User",
-        retries: int = SELENIUM_RETRIES,
+        self, url: str, element_name: str, user: "User",
     ) -> Optional[bytes]:
+        params = {"standalone": DashboardStandaloneMode.REPORT.value}
+        req = PreparedRequest()
+        req.prepare_url(url, params)
+        url = req.url or ""
+
         driver = self.auth(user)
         driver.set_window_size(*self._window)
         driver.get(url)
         img: Optional[bytes] = None
-        logger.debug("Sleeping for %i seconds", SELENIUM_HEADSTART)
-        time.sleep(SELENIUM_HEADSTART)
+        selenium_headstart = current_app.config["SCREENSHOT_SELENIUM_HEADSTART"]
+        logger.debug("Sleeping for %i seconds", selenium_headstart)
+        sleep(selenium_headstart)
+
         try:
             logger.debug("Wait for the presence of %s", element_name)
             element = WebDriverWait(driver, self._screenshot_locate_wait).until(
@@ -116,15 +126,29 @@ def get_screenshot(
             WebDriverWait(driver, self._screenshot_load_wait).until_not(
                 EC.presence_of_all_elements_located((By.CLASS_NAME, "loading"))
             )
+            logger.debug("Wait for chart to have content")
+            WebDriverWait(driver, self._screenshot_locate_wait).until(
+                EC.visibility_of_all_elements_located(
+                    (By.CLASS_NAME, "slice_container")
+                )
+            )
+            selenium_animation_wait = current_app.config[
+                "SCREENSHOT_SELENIUM_ANIMATION_WAIT"
+            ]
+            logger.debug("Wait %i seconds for chart animation", selenium_animation_wait)
+            sleep(selenium_animation_wait)
             logger.info("Taking a PNG screenshot or url %s", url)
             img = element.screenshot_as_png
         except TimeoutException:
-            logger.error("Selenium timed out requesting url %s", url, exc_info=True)
+            logger.warning("Selenium timed out requesting url %s", url, exc_info=True)
+        except StaleElementReferenceException:
+            logger.error(
+                "Selenium got a stale element while requesting url %s",
+                url,
+                exc_info=True,
+            )
         except WebDriverException as ex:
             logger.error(ex, exc_info=True)
-            # Some webdrivers do not support screenshots for elements.
-            # In such cases, take a screenshot of the entire page.
-            img = driver.screenshot()  # pylint: disable=no-member
         finally:
-            self.destroy(driver, retries)
+            self.destroy(driver, current_app.config["SCREENSHOT_SELENIUM_RETRIES"])
         return img
diff --git a/superset/views/access_requests.py b/superset/views/access_requests.py
index bca2e7bfcc30..4d671f3086c0 100644
--- a/superset/views/access_requests.py
+++ b/superset/views/access_requests.py
@@ -25,9 +25,7 @@
 from superset.views.core import DAR
 
 
-class AccessRequestsModelView(  # pylint: disable=too-many-ancestors
-    SupersetModelView, DeleteMixin
-):
+class AccessRequestsModelView(SupersetModelView, DeleteMixin):
     datamodel = SQLAInterface(DAR)
     include_route_methods = RouteMethod.CRUD_SET
     list_columns = [
diff --git a/superset/views/alerts.py b/superset/views/alerts.py
index bf3ea7ae5cbf..e96f701c3d1b 100644
--- a/superset/views/alerts.py
+++ b/superset/views/alerts.py
@@ -122,9 +122,7 @@ class ReportView(BaseAlertReportView):
     class_permission_name = "ReportSchedule"
 
 
-class AlertModelView(
-    EnsureEnabledMixin, SupersetModelView
-):  # pylint: disable=too-many-ancestors
+class AlertModelView(EnsureEnabledMixin, SupersetModelView):
     datamodel = SQLAInterface(Alert)
     route_base = "/alerts"
     include_route_methods = RouteMethod.CRUD_SET | {"log"}
diff --git a/superset/views/annotations.py b/superset/views/annotations.py
index 345fd2c15a1f..4fa83c0ca4be 100644
--- a/superset/views/annotations.py
+++ b/superset/views/annotations.py
@@ -48,9 +48,7 @@ def __call__(self, form: Dict[str, Any], field: Any) -> None:
             )
 
 
-class AnnotationModelView(
-    SupersetModelView, CompactCRUDMixin
-):  # pylint: disable=too-many-ancestors
+class AnnotationModelView(SupersetModelView, CompactCRUDMixin):
     datamodel = SQLAInterface(Annotation)
     include_route_methods = RouteMethod.CRUD_SET | {"annotation"}
 
@@ -108,7 +106,7 @@ def annotation(self, pk: int) -> FlaskResponse:  # pylint: disable=unused-argume
         return super().render_app_template()
 
 
-class AnnotationLayerModelView(SupersetModelView):  # pylint: disable=too-many-ancestors
+class AnnotationLayerModelView(SupersetModelView):
     datamodel = SQLAInterface(AnnotationLayer)
     include_route_methods = RouteMethod.CRUD_SET | {RouteMethod.API_READ}
     related_views = [AnnotationModelView]
diff --git a/superset/views/api.py b/superset/views/api.py
index 80cb5b666482..c205ce9b091c 100644
--- a/superset/views/api.py
+++ b/superset/views/api.py
@@ -14,7 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# pylint: disable=R
 from typing import Any
 
 import simplejson as json
@@ -25,8 +24,8 @@
 
 from superset import db, event_logger
 from superset.charts.commands.exceptions import (
+    TimeRangeAmbiguousError,
     TimeRangeParseFailError,
-    TimeRangeUnclearError,
 )
 from superset.common.query_context import QueryContext
 from superset.legacy import update_time_range
@@ -45,7 +44,7 @@ class Api(BaseSupersetView):
     @handle_api_exception
     @has_access_api
     @expose("/v1/query/", methods=["POST"])
-    def query(self) -> FlaskResponse:
+    def query(self) -> FlaskResponse:  # pylint: disable=no-self-use
         """
         Takes a query_obj constructed in the client and returns payload data response
         for the given query_obj.
@@ -65,7 +64,7 @@ def query(self) -> FlaskResponse:
     @handle_api_exception
     @has_access_api
     @expose("/v1/form_data/", methods=["GET"])
-    def query_form_data(self) -> FlaskResponse:
+    def query_form_data(self) -> FlaskResponse:  # pylint: disable=no-self-use
         """
         Get the formdata stored in the database for existing slice.
         params: slice_id: integer
@@ -97,6 +96,6 @@ def time_range(self, **kwargs: Any) -> FlaskResponse:
                 "timeRange": time_range,
             }
             return self.json_response({"result": result})
-        except (ValueError, TimeRangeParseFailError, TimeRangeUnclearError) as error:
+        except (ValueError, TimeRangeParseFailError, TimeRangeAmbiguousError) as error:
             error_msg = {"message": f"Unexpected time range: {error}"}
             return self.json_response(error_msg, 400)
diff --git a/superset/views/base.py b/superset/views/base.py
index 949406a999f2..3d4f98825965 100644
--- a/superset/views/base.py
+++ b/superset/views/base.py
@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-import dataclasses  # pylint: disable=wrong-import-order
+import dataclasses
 import functools
 import logging
 import traceback
@@ -77,9 +77,7 @@
 from .utils import bootstrap_user_data
 
 if TYPE_CHECKING:
-    from superset.connectors.druid.views import (  # pylint: disable=unused-import
-        DruidClusterModelView,
-    )
+    from superset.connectors.druid.views import DruidClusterModelView
 
 FRONTEND_CONF_KEYS = (
     "SUPERSET_WEBSERVER_TIMEOUT",
@@ -180,7 +178,7 @@ def api(f: Callable[..., FlaskResponse]) -> Callable[..., FlaskResponse]:
     def wraps(self: "BaseSupersetView", *args: Any, **kwargs: Any) -> FlaskResponse:
         try:
             return f(self, *args, **kwargs)
-        except NoAuthorizationError as ex:  # pylint: disable=broad-except
+        except NoAuthorizationError as ex:
             logger.warning(ex)
             return json_error_response(get_error_msg(), status=401)
         except Exception as ex:  # pylint: disable=broad-except
@@ -207,6 +205,9 @@ def wraps(self: "BaseSupersetView", *args: Any, **kwargs: Any) -> FlaskResponse:
             return json_errors_response(
                 errors=[ex.error], status=ex.status, payload=ex.payload
             )
+        except SupersetErrorsException as ex:
+            logger.warning(ex, exc_info=True)
+            return json_errors_response(errors=ex.errors, status=ex.status)
         except SupersetErrorException as ex:
             logger.warning(ex)
             return json_errors_response(errors=[ex.error], status=ex.status)
@@ -251,7 +252,7 @@ def validate_sqlatable(table: models.SqlaTable) -> None:
                 "database connection, schema, and "
                 "table name, error: {}"
             ).format(table.name, str(ex))
-        )
+        ) from ex
 
 
 def create_table_permissions(table: models.SqlaTable) -> None:
@@ -274,9 +275,7 @@ def is_user_admin() -> bool:
 
 class BaseSupersetView(BaseView):
     @staticmethod
-    def json_response(
-        obj: Any, status: int = 200
-    ) -> FlaskResponse:  # pylint: disable=no-self-use
+    def json_response(obj: Any, status: int = 200) -> FlaskResponse:
         return Response(
             json.dumps(obj, default=utils.json_int_dttm_ser, ignore_nan=True),
             status=status,
@@ -306,6 +305,9 @@ def menu_data() -> Dict[str, Any]:
             **appbuilder.languages[lang],
             "url": appbuilder.get_url_for_locale(lang),
         }
+    brand_text = appbuilder.app.config["LOGO_RIGHT_TEXT"]
+    if callable(brand_text):
+        brand_text = brand_text()
     return {
         "menu": menu,
         "brand": {
@@ -313,8 +315,12 @@ def menu_data() -> Dict[str, Any]:
             "icon": appbuilder.app_icon,
             "alt": appbuilder.app_name,
             "width": appbuilder.app.config["APP_ICON_WIDTH"],
+            "tooltip": appbuilder.app.config["LOGO_TOOLTIP"],
+            "text": brand_text,
         },
         "navbar_right": {
+            # show the watermark if the default app icon has been overriden
+            "show_watermark": ("superset-logo-horiz" not in appbuilder.app_icon),
             "bug_report_url": appbuilder.app.config["BUG_REPORT_URL"],
             "documentation_url": appbuilder.app.config["DOCUMENTATION_URL"],
             "version_string": appbuilder.app.config["VERSION_STRING"],
@@ -322,11 +328,13 @@ def menu_data() -> Dict[str, Any]:
             "languages": languages,
             "show_language_picker": len(languages.keys()) > 1,
             "user_is_anonymous": g.user.is_anonymous,
-            "user_info_url": appbuilder.get_url_for_userinfo,
+            "user_info_url": None
+            if appbuilder.app.config["MENU_HIDE_USER_INFO"]
+            else appbuilder.get_url_for_userinfo,
             "user_logout_url": appbuilder.get_url_for_logout,
             "user_login_url": appbuilder.get_url_for_login,
             "user_profile_url": None
-            if g.user.is_anonymous
+            if g.user.is_anonymous or appbuilder.app.config["MENU_HIDE_USER_INFO"]
             else f"/superset/profile/{g.user.username}",
             "locale": session.get("locale", "en"),
         },
@@ -338,7 +346,7 @@ def common_bootstrap_payload() -> Dict[str, Any]:
     messages = get_flashed_messages(with_categories=True)
     locale = str(get_locale())
 
-    return {
+    bootstrap_data = {
         "flash_messages": messages,
         "conf": {k: conf.get(k) for k in FRONTEND_CONF_KEYS},
         "locale": locale,
@@ -349,6 +357,8 @@ def common_bootstrap_payload() -> Dict[str, Any]:
         "theme_overrides": conf["THEME_OVERRIDES"],
         "menu_data": menu_data(),
     }
+    bootstrap_data.update(conf["COMMON_BOOTSTRAP_OVERRIDES_FUNC"](bootstrap_data))
+    return bootstrap_data
 
 
 # pylint: disable=invalid-name
@@ -394,7 +404,7 @@ def show_http_exception(ex: HTTPException) -> FlaskResponse:
         and ex.code in {404, 500}
     ):
         path = resource_filename("superset", f"static/assets/{ex.code}.html")
-        return send_file(path)
+        return send_file(path), ex.code
 
     return json_errors_response(
         errors=[
@@ -402,7 +412,6 @@ def show_http_exception(ex: HTTPException) -> FlaskResponse:
                 message=utils.error_msg_from_exception(ex),
                 error_type=SupersetErrorType.GENERIC_BACKEND_ERROR,
                 level=ErrorLevel.ERROR,
-                extra={},
             ),
         ],
         status=ex.code or 500,
@@ -439,7 +448,6 @@ def show_unexpected_exception(ex: Exception) -> FlaskResponse:
                 message=utils.error_msg_from_exception(ex),
                 error_type=SupersetErrorType.GENERIC_BACKEND_ERROR,
                 level=ErrorLevel.ERROR,
-                extra={},
             ),
         ],
     )
@@ -491,7 +499,7 @@ def validate_json(form: Form, field: Field) -> None:  # pylint: disable=unused-a
         json.loads(field.data)
     except Exception as ex:
         logger.exception(ex)
-        raise Exception(_("json isn't valid"))
+        raise Exception(_("json isn't valid")) from ex
 
 
 class YamlExportMixin:  # pylint: disable=too-few-public-methods
diff --git a/superset/views/base_api.py b/superset/views/base_api.py
index b730ce12662c..7fb63ebb2ca0 100644
--- a/superset/views/base_api.py
+++ b/superset/views/base_api.py
@@ -164,7 +164,8 @@ class BaseSupersetModelRestApi(ModelRestApi):
             "<RELATED_FIELD>": ("<RELATED_FIELD_FIELD>", "<asc|desc>"),
              ...
         }
-    """  # pylint: disable=pointless-string-statement
+    """
+
     related_field_filters: Dict[str, Union[RelatedFieldFilter, str]] = {}
     """
     Declare the filters for related fields::
@@ -172,7 +173,8 @@ class BaseSupersetModelRestApi(ModelRestApi):
         related_fields = {
             "<RELATED_FIELD>": <RelatedFieldFilter>)
         }
-    """  # pylint: disable=pointless-string-statement
+    """
+
     filter_rel_fields: Dict[str, BaseFilter] = {}
     """
     Declare the related field base filter::
@@ -180,11 +182,9 @@ class BaseSupersetModelRestApi(ModelRestApi):
         filter_rel_fields_field = {
             "<RELATED_FIELD>": "<FILTER>")
         }
-    """  # pylint: disable=pointless-string-statement
-    allowed_rel_fields: Set[str] = set()
     """
-    Declare a set of allowed related fields that the `related` endpoint supports
-    """  # pylint: disable=pointless-string-statement
+    allowed_rel_fields: Set[str] = set()
+    # Declare a set of allowed related fields that the `related` endpoint supports.
 
     text_field_rel_fields: Dict[str, str] = {}
     """
@@ -193,15 +193,12 @@ class BaseSupersetModelRestApi(ModelRestApi):
         text_field_rel_fields = {
             "<RELATED_FIELD>": "<RELATED_OBJECT_FIELD>"
         }
-    """  # pylint: disable=pointless-string-statement
+    """
 
     allowed_distinct_fields: Set[str] = set()
 
     openapi_spec_component_schemas: Tuple[Type[Schema], ...] = tuple()
-    """
-    Add extra schemas to the OpenAPI component schemas section
-    """  # pylint: disable=pointless-string-statement
-
+    # Add extra schemas to the OpenAPI component schemas section.
     add_columns: List[str]
     edit_columns: List[str]
     list_columns: List[str]
diff --git a/superset/views/base_schemas.py b/superset/views/base_schemas.py
index 65c9a3567aa9..de39e7102762 100644
--- a/superset/views/base_schemas.py
+++ b/superset/views/base_schemas.py
@@ -31,8 +31,8 @@ def validate_owner(value: int) -> None:
             .filter_by(id=value)
             .one()
         )
-    except NoResultFound:
-        raise ValidationError(f"User {value} does not exist")
+    except NoResultFound as ex:
+        raise ValidationError(f"User {value} does not exist") from ex
 
 
 class BaseSupersetSchema(Schema):
diff --git a/superset/views/chart/views.py b/superset/views/chart/views.py
index e4fedac278d3..37ef9a043e88 100644
--- a/superset/views/chart/views.py
+++ b/superset/views/chart/views.py
@@ -21,8 +21,7 @@
 from flask_appbuilder.models.sqla.interface import SQLAInterface
 from flask_babel import lazy_gettext as _
 
-from superset import db, is_feature_enabled
-from superset.connectors.connector_registry import ConnectorRegistry
+from superset import is_feature_enabled
 from superset.constants import MODEL_VIEW_RW_METHOD_PERMISSION_MAP, RouteMethod
 from superset.models.slice import Slice
 from superset.typing import FlaskResponse
@@ -63,15 +62,7 @@ def pre_delete(self, item: "SliceModelView") -> None:
     @expose("/add", methods=["GET", "POST"])
     @has_access
     def add(self) -> FlaskResponse:
-        datasources = [
-            {"value": str(d.id) + "__" + d.type, "label": repr(d)}
-            for d in ConnectorRegistry.get_all_datasources(db.session)
-        ]
         payload = {
-            "datasources": sorted(
-                datasources,
-                key=lambda d: d["label"].lower() if isinstance(d["label"], str) else "",
-            ),
             "common": common_bootstrap_payload(),
             "user": bootstrap_user_data(g.user),
         }
diff --git a/superset/views/core.py b/superset/views/core.py
index 622b1170a7be..836bee4916b5 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 # pylint: disable=comparison-with-callable, line-too-long, too-many-branches
+import dataclasses
 import logging
 import re
 from contextlib import closing
@@ -73,13 +74,18 @@
 from superset.databases.dao import DatabaseDAO
 from superset.databases.filters import DatabaseFilter
 from superset.datasets.commands.exceptions import DatasetNotFoundError
+from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
 from superset.exceptions import (
     CacheLoadError,
     CertificateException,
     DatabaseNotFound,
     SerializationError,
+    SupersetCancelQueryException,
+    SupersetErrorException,
+    SupersetErrorsException,
     SupersetException,
     SupersetGenericDBErrorException,
+    SupersetGenericErrorException,
     SupersetSecurityException,
     SupersetTemplateParamsErrorException,
     SupersetTimeoutException,
@@ -116,6 +122,7 @@
     get_error_msg,
     get_user_roles,
     handle_api_exception,
+    is_user_admin,
     json_error_response,
     json_errors_response,
     json_success,
@@ -182,7 +189,7 @@ def datasources(self) -> FlaskResponse:
             sorted(
                 [
                     datasource.short_data
-                    for datasource in ConnectorRegistry.get_all_datasources(db.session)
+                    for datasource in security_manager.get_user_datasources()
                     if datasource.short_data.get("name")
                 ],
                 key=lambda datasource: datasource["name"],
@@ -432,6 +439,10 @@ def get_raw_results(self, viz_obj: BaseViz) -> FlaskResponse:
     def get_samples(self, viz_obj: BaseViz) -> FlaskResponse:
         return self.json_response({"data": viz_obj.get_samples()})
 
+    @staticmethod
+    def send_data_payload_response(viz_obj: BaseViz, payload: Any) -> FlaskResponse:
+        return data_payload_response(*viz_obj.payload_json_and_has_error(payload))
+
     def generate_json(
         self, viz_obj: BaseViz, response_type: Optional[str] = None
     ) -> FlaskResponse:
@@ -450,7 +461,7 @@ def generate_json(
             return self.get_samples(viz_obj)
 
         payload = viz_obj.get_payload()
-        return data_payload_response(*viz_obj.payload_json_and_has_error(payload))
+        return self.send_data_payload_response(viz_obj, payload)
 
     @event_logger.log_this
     @api
@@ -594,7 +605,6 @@ def explore_json(
             )
 
         form_data = get_form_data()[0]
-
         try:
             datasource_id, datasource_type = get_datasource_info(
                 datasource_id, datasource_type, form_data
@@ -607,6 +617,29 @@ def explore_json(
                 is_feature_enabled("GLOBAL_ASYNC_QUERIES")
                 and response_type == utils.ChartDataResultFormat.JSON
             ):
+                # First, look for the chart query results in the cache.
+                try:
+                    viz_obj = get_viz(
+                        datasource_type=cast(str, datasource_type),
+                        datasource_id=datasource_id,
+                        form_data=form_data,
+                        force_cached=True,
+                        force=force,
+                    )
+                    payload = viz_obj.get_payload()
+                except CacheLoadError:
+                    payload = None  # type: ignore
+
+                already_cached_result = payload is not None
+
+                # If the chart query has already been cached, return it immediately.
+                if already_cached_result:
+                    return self.send_data_payload_response(viz_obj, payload)
+
+                # Otherwise, kick off a background job to run the chart query.
+                # Clients will either poll or be notified of query completion,
+                # at which point they will call the /explore_json/data/<cache_key>
+                # endpoint to retrieve the results.
                 try:
                     async_channel_id = async_query_manager.parse_jwt_from_request(
                         request
@@ -680,12 +713,12 @@ def import_dashboards(self) -> FlaskResponse:
     @event_logger.log_this
     @expose("/explore/<datasource_type>/<int:datasource_id>/", methods=["GET", "POST"])
     @expose("/explore/", methods=["GET", "POST"])
-    def explore(  # pylint: disable=too-many-locals,too-many-return-statements,too-many-statements
+    def explore(  # pylint: disable=too-many-locals
         self, datasource_type: Optional[str] = None, datasource_id: Optional[int] = None
     ) -> FlaskResponse:
         user_id = g.user.get_id() if g.user else None
         form_data, slc = get_form_data(use_slice_data=True)
-
+        query_context = request.form.get("query_context")
         # Flash the SIP-15 message if the slice is owned by the current user and has not
         # been updated, i.e., is not using the [start, end) interval.
         if (
@@ -755,7 +788,9 @@ def explore(  # pylint: disable=too-many-locals,too-many-return-statements,too-m
 
         # slc perms
         slice_add_perm = security_manager.can_access("can_write", "Chart")
-        slice_overwrite_perm = is_owner(slc, g.user) if slc else False
+        slice_overwrite_perm = (
+            is_owner(slc, g.user) or is_user_admin() if slc else False
+        )
         slice_download_perm = security_manager.can_access("can_csv", "Superset")
 
         form_data["datasource"] = str(datasource_id) + "__" + cast(str, datasource_type)
@@ -792,6 +827,7 @@ def explore(  # pylint: disable=too-many-locals,too-many-return-statements,too-m
                 datasource.id,
                 datasource.type,
                 datasource.name,
+                query_context,
             )
         standalone_mode = ReservedUrlParameters.is_standalone_mode()
         dummy_datasource_data: Dict[str, Any] = {
@@ -882,7 +918,7 @@ def remove_extra_filters(filters: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
         return [f for f in filters if not f.get("isExtra")]
 
     def save_or_overwrite_slice(
-        # pylint: disable=too-many-arguments,too-many-locals,no-self-use
+        # pylint: disable=too-many-arguments,too-many-locals
         self,
         slc: Optional[Slice],
         slice_add_perm: bool,
@@ -891,6 +927,7 @@ def save_or_overwrite_slice(
         datasource_id: int,
         datasource_type: str,
         datasource_name: str,
+        query_context: Optional[str] = None,
     ) -> FlaskResponse:
         """Save or overwrite a slice"""
         slice_name = request.args.get("slice_name")
@@ -912,7 +949,10 @@ def save_or_overwrite_slice(
         slc.viz_type = form_data["viz_type"]
         slc.datasource_type = datasource_type
         slc.datasource_id = datasource_id
+        slc.last_saved_by = g.user
+        slc.last_saved_at = datetime.now()
         slc.slice_name = slice_name
+        slc.query_context = query_context
 
         if action == "saveas" and slice_add_perm:
             ChartDAO.save(slc)
@@ -1024,8 +1064,14 @@ def schemas(  # pylint: disable=no-self-use
     @event_logger.log_this
     @expose("/tables/<int:db_id>/<schema>/<substr>/")
     @expose("/tables/<int:db_id>/<schema>/<substr>/<force_refresh>/")
-    def tables(  # pylint: disable=too-many-locals,no-self-use
-        self, db_id: int, schema: str, substr: str, force_refresh: str = "false"
+    @expose("/tables/<int:db_id>/<schema>/<substr>/<force_refresh>/<exact_match>")
+    def tables(  # pylint: disable=too-many-locals,no-self-use,too-many-arguments
+        self,
+        db_id: int,
+        schema: str,
+        substr: str,
+        force_refresh: str = "false",
+        exact_match: str = "false",
     ) -> FlaskResponse:
         """Endpoint to fetch the list of tables for given database"""
         # Guarantees database filtering by security access
@@ -1038,6 +1084,7 @@ def tables(  # pylint: disable=too-many-locals,no-self-use
             return json_error_response("Not found", 404)
 
         force_refresh_parsed = force_refresh.lower() == "true"
+        exact_match_parsed = exact_match.lower() == "true"
         schema_parsed = utils.parse_js_uri_path_item(schema, eval_undefined=True)
         substr_parsed = utils.parse_js_uri_path_item(substr, eval_undefined=True)
 
@@ -1079,9 +1126,15 @@ def get_datasource_label(ds_name: utils.DatasourceName) -> str:
                 ds_name.table if schema_parsed else f"{ds_name.schema}.{ds_name.table}"
             )
 
+        def is_match(src: str, target: utils.DatasourceName) -> bool:
+            target_label = get_datasource_label(target)
+            if exact_match_parsed:
+                return src == target_label
+            return src in target_label
+
         if substr_parsed:
-            tables = [tn for tn in tables if substr_parsed in get_datasource_label(tn)]
-            views = [vn for vn in views if substr_parsed in get_datasource_label(vn)]
+            tables = [tn for tn in tables if is_match(substr_parsed, tn)]
+            views = [vn for vn in views if is_match(substr_parsed, vn)]
 
         if not schema_parsed and database.default_schemas:
             user_schemas = (
@@ -1246,9 +1299,7 @@ def add_slices(  # pylint: disable=no-self-use
     @has_access_api
     @event_logger.log_this
     @expose("/testconn", methods=["POST", "GET"])
-    def testconn(  # pylint: disable=too-many-return-statements,no-self-use
-        self,
-    ) -> FlaskResponse:
+    def testconn(self) -> FlaskResponse:  # pylint: disable=no-self-use
         """Tests a sqla connection"""
         db_name = request.json.get("name")
         uri = request.json.get("uri")
@@ -1507,11 +1558,7 @@ def created_dashboards(  # pylint: disable=no-self-use
         Dash = Dashboard
         qry = (
             db.session.query(Dash)
-            .filter(
-                or_(  # pylint: disable=comparison-with-callable
-                    Dash.created_by_fk == user_id, Dash.changed_by_fk == user_id
-                )
-            )
+            .filter(or_(Dash.created_by_fk == user_id, Dash.changed_by_fk == user_id))
             .order_by(Dash.changed_on.desc())
         )
         payload = [
@@ -1824,8 +1871,8 @@ def publish(  # pylint: disable=no-self-use
             utils.error_msg_from_exception(ex), status=403
         )
     )
-    def dashboard(  # pylint: disable=too-many-locals
-        self,  # pylint: disable=no-self-use
+    def dashboard(
+        self,
         dashboard_id_or_slug: str,  # pylint: disable=unused-argument
         add_extra_log_payload: Callable[..., None] = lambda **kwargs: None,
         dashboard: Optional[Dashboard] = None,
@@ -2003,11 +2050,24 @@ def sqllab_viz(self) -> FlaskResponse:  # pylint: disable=no-self-use
         try:
             table_name = data["datasourceName"]
             database_id = data["dbId"]
-        except KeyError:
-            return json_error_response("Missing required fields", status=400)
+        except KeyError as ex:
+            raise SupersetGenericErrorException(
+                __(
+                    "One or more required fields are missing in the request. Please try "
+                    "again, and if the problem persists conctact your administrator."
+                ),
+                status=400,
+            ) from ex
         database = db.session.query(Database).get(database_id)
         if not database:
-            return json_error_response("Database not found", status=400)
+            raise SupersetErrorException(
+                SupersetError(
+                    message=__("The database was not found."),
+                    error_type=SupersetErrorType.DATABASE_NOT_FOUND_ERROR,
+                    level=ErrorLevel.ERROR,
+                ),
+                status=404,
+            )
         table = (
             db.session.query(SqlaTable)
             .filter_by(database_id=database_id, table_name=table_name)
@@ -2070,7 +2130,14 @@ def select_star(
             stats_logger.incr(
                 f"deprecated.{self.__class__.__name__}.select_star.database_not_found"
             )
-            return json_error_response("Not found", 404)
+            raise SupersetErrorException(
+                SupersetError(
+                    message=__("The database was not found."),
+                    error_type=SupersetErrorType.DATABASE_NOT_FOUND_ERROR,
+                    level=ErrorLevel.ERROR,
+                ),
+                status=404,
+            )
         schema = utils.parse_js_uri_path_item(schema, eval_undefined=True)
         table_name = utils.parse_js_uri_path_item(table_name)  # type: ignore
         if not self.appbuilder.sm.can_access_table(database, Table(table_name, schema)):
@@ -2083,7 +2150,18 @@ def select_star(
                 table_name,
                 schema,
             )
-            return json_error_response("Not found", 404)
+            raise SupersetErrorException(
+                SupersetError(
+                    message=__(
+                        "You are not authorized to fetch samples from this table. If "
+                        "you think this is an error, please reach out to your "
+                        "administrator."
+                    ),
+                    error_type=SupersetErrorType.QUERY_SECURITY_ACCESS_ERROR,
+                    level=ErrorLevel.ERROR,
+                ),
+                status=403,
+            )
         stats_logger.incr(f"deprecated.{self.__class__.__name__}.select_star.success")
         return json_success(
             database.select_star(
@@ -2141,16 +2219,20 @@ def results(self, key: str) -> FlaskResponse:
         return self.results_exec(key)
 
     @staticmethod
-    def results_exec(  # pylint: disable=too-many-return-statements
-        key: str,
-    ) -> FlaskResponse:
+    def results_exec(key: str) -> FlaskResponse:
         """Serves a key off of the results backend
 
         It is possible to pass the `rows` query argument to limit the number
         of rows returned.
         """
         if not results_backend:
-            return json_error_response("Results backend isn't configured")
+            raise SupersetErrorException(
+                SupersetError(
+                    message=__("Results backend is not configured."),
+                    error_type=SupersetErrorType.RESULTS_BACKEND_NOT_CONFIGURED_ERROR,
+                    level=ErrorLevel.ERROR,
+                )
+            )
 
         read_from_results_backend_start = now_as_float()
         blob = results_backend.get(key)
@@ -2159,39 +2241,81 @@ def results_exec(  # pylint: disable=too-many-return-statements
             now_as_float() - read_from_results_backend_start,
         )
         if not blob:
-            return json_error_response(
-                "Data could not be retrieved. " "You may want to re-run the query.",
+            raise SupersetErrorException(
+                SupersetError(
+                    message=__(
+                        "Data could not be retrieved from the results backend. You "
+                        "need to re-run the original query."
+                    ),
+                    error_type=SupersetErrorType.RESULTS_BACKEND_ERROR,
+                    level=ErrorLevel.ERROR,
+                ),
                 status=410,
             )
 
         query = db.session.query(Query).filter_by(results_key=key).one_or_none()
         if query is None:
-            return json_error_response(
-                "Data could not be retrieved. You may want to re-run the query.",
+            raise SupersetErrorException(
+                SupersetError(
+                    message=__(
+                        "The query associated with these results could not be find. "
+                        "You need to re-run the original query."
+                    ),
+                    error_type=SupersetErrorType.RESULTS_BACKEND_ERROR,
+                    level=ErrorLevel.ERROR,
+                ),
                 status=404,
             )
 
         try:
             query.raise_for_access()
         except SupersetSecurityException as ex:
-            return json_errors_response([ex.error], status=403)
+            raise SupersetErrorException(
+                SupersetError(
+                    message=__(
+                        "You are not authorized to see this query. If you think this "
+                        "is an error, please reach out to your administrator."
+                    ),
+                    error_type=SupersetErrorType.QUERY_SECURITY_ACCESS_ERROR,
+                    level=ErrorLevel.ERROR,
+                ),
+                status=403,
+            ) from ex
 
         payload = utils.zlib_decompress(blob, decode=not results_backend_use_msgpack)
         try:
             obj = _deserialize_results_payload(
                 payload, query, cast(bool, results_backend_use_msgpack)
             )
-        except SerializationError:
-            return json_error_response(
-                __("Data could not be deserialized. You may want to re-run the query."),
+        except SerializationError as ex:
+            raise SupersetErrorException(
+                SupersetError(
+                    message=__(
+                        "Data could not be deserialized from the results backend. The "
+                        "storage format might have changed, rendering the old data "
+                        "stake. You need to re-run the original query."
+                    ),
+                    error_type=SupersetErrorType.RESULTS_BACKEND_ERROR,
+                    level=ErrorLevel.ERROR,
+                ),
                 status=404,
-            )
+            ) from ex
 
         if "rows" in request.args:
             try:
                 rows = int(request.args["rows"])
-            except ValueError:
-                return json_error_response("Invalid `rows` argument", status=400)
+            except ValueError as ex:
+                raise SupersetErrorException(
+                    SupersetError(
+                        message=__(
+                            "The provided `rows` argument is not a valid integer."
+                        ),
+                        error_type=SupersetErrorType.INVALID_PAYLOAD_SCHEMA_ERROR,
+                        level=ErrorLevel.ERROR,
+                    ),
+                    status=400,
+                ) from ex
+
             obj = apply_display_max_row_limit(obj, rows)
 
         return json_success(
@@ -2226,6 +2350,10 @@ def stop_query(self) -> FlaskResponse:
                 str(client_id),
             )
             return self.json_response("OK")
+
+        if not sql_lab.cancel_query(query, g.user.username if g.user else None):
+            raise SupersetCancelQueryException("Could not cancel query")
+
         query.status = QueryStatus.STOPPED
         db.session.commit()
 
@@ -2235,7 +2363,7 @@ def stop_query(self) -> FlaskResponse:
     @event_logger.log_this
     @expose("/validate_sql_json/", methods=["POST", "GET"])
     def validate_sql_json(
-        # pylint: disable=too-many-locals,too-many-return-statements,no-self-use
+        # pylint: disable=too-many-locals,no-self-use
         self,
     ) -> FlaskResponse:
         """Validates that arbitrary sql is acceptable for the given database.
@@ -2303,7 +2431,7 @@ def validate_sql_json(
             return json_error_response(f"{msg}")
 
     @staticmethod
-    def _sql_json_async(  # pylint: disable=too-many-arguments
+    def _sql_json_async(
         session: Session,
         rendered_query: str,
         query: Query,
@@ -2344,17 +2472,23 @@ def _sql_json_async(  # pylint: disable=too-many-arguments
                     "Unable to forget Celery task as backend"
                     "does not support this operation"
                 )
-        except Exception as ex:  # pylint: disable=broad-except
+        except Exception as ex:
             logger.exception("Query %i: %s", query.id, str(ex))
-            msg = _(
-                "Failed to start remote query on a worker. "
-                "Tell your administrator to verify the availability of "
-                "the message queue."
+
+            message = __("Failed to start remote query on a worker.")
+            error = SupersetError(
+                message=message,
+                error_type=SupersetErrorType.ASYNC_WORKERS_ERROR,
+                level=ErrorLevel.ERROR,
             )
+            error_payload = dataclasses.asdict(error)
+
+            query.set_extra_json_key("errors", [error_payload])
             query.status = QueryStatus.FAILED
-            query.error_message = msg
+            query.error_message = message
             session.commit()
-            return json_error_response("{}".format(msg))
+
+            raise SupersetErrorException(error) from ex
 
         # Update saved query with execution info from the query execution
         QueryDAO.update_saved_query_exec_info(query_id)
@@ -2421,12 +2555,21 @@ def _sql_json_sync(
         except SupersetTimeoutException as ex:
             # re-raise exception for api exception handler
             raise ex
-        except Exception as ex:  # pylint: disable=broad-except
+        except Exception as ex:
             logger.exception("Query %i failed unexpectedly", query.id)
-            raise SupersetGenericDBErrorException(utils.error_msg_from_exception(ex))
+            raise SupersetGenericDBErrorException(
+                utils.error_msg_from_exception(ex)
+            ) from ex
 
         if data.get("status") == QueryStatus.FAILED:
+            # new error payload with rich context
+            if data["errors"]:
+                raise SupersetErrorsException(
+                    [SupersetError(**params) for params in data["errors"]]
+                )
+            # old string-only error message
             raise SupersetGenericDBErrorException(data["error"])
+
         return json_success(payload)
 
     @has_access_api
@@ -2467,17 +2610,42 @@ def sql_json_exec(  # pylint: disable=too-many-statements,too-many-locals
             CtasMethod, query_params.get("ctas_method", CtasMethod.TABLE)
         )
         tmp_table_name: str = cast(str, query_params.get("tmp_table_name"))
-        client_id: str = cast(
-            str, query_params.get("client_id") or utils.shortid()[:10]
-        )
+        client_id: str = cast(str, query_params.get("client_id"))
+        client_id_or_short_id: str = cast(str, client_id or utils.shortid()[:10])
         sql_editor_id: str = cast(str, query_params.get("sql_editor_id"))
         tab_name: str = cast(str, query_params.get("tab"))
         status: str = QueryStatus.PENDING if async_flag else QueryStatus.RUNNING
+        user_id: int = g.user.get_id() if g.user else None
 
         session = db.session()
+
+        # check to see if this query is already running
+        query = (
+            session.query(Query)
+            .filter_by(
+                client_id=client_id, user_id=user_id, sql_editor_id=sql_editor_id
+            )
+            .one_or_none()
+        )
+        if query is not None and query.status in [
+            QueryStatus.RUNNING,
+            QueryStatus.PENDING,
+            QueryStatus.TIMED_OUT,
+        ]:
+            # return the existing query
+            payload = json.dumps(
+                {"query": query.to_dict()}, default=utils.json_int_dttm_ser
+            )
+            return json_success(payload)
+
         mydb = session.query(Database).get(database_id)
         if not mydb:
-            return json_error_response("Database with id %i is missing.", database_id)
+            raise SupersetGenericErrorException(
+                __(
+                    "The database referenced in this query was not found. Please "
+                    "contact an administrator for further assistance or try again."
+                )
+            )
 
         # Set tmp_schema_name for CTA
         # TODO(bkyryliuk): consider parsing, splitting tmp_schema_name from
@@ -2502,8 +2670,8 @@ def sql_json_exec(  # pylint: disable=too-many-statements,too-many-locals
             sql_editor_id=sql_editor_id,
             tmp_table_name=tmp_table_name,
             tmp_schema_name=tmp_schema_name,
-            user_id=g.user.get_id() if g.user else None,
-            client_id=client_id,
+            user_id=user_id,
+            client_id=client_id_or_short_id,
         )
         try:
             session.add(query)
@@ -2513,18 +2681,25 @@ def sql_json_exec(  # pylint: disable=too-many-statements,too-many-locals
         except SQLAlchemyError as ex:
             logger.error("Errors saving query details %s", str(ex), exc_info=True)
             session.rollback()
-            raise Exception(_("Query record was not created as expected."))
+            query_id = None
         if not query_id:
-            raise Exception(_("Query record was not created as expected."))
+            raise SupersetGenericErrorException(
+                __(
+                    "The query record was not created as expected. Please "
+                    "contact an administrator for further assistance or try again."
+                )
+            )
 
         logger.info("Triggering query_id: %i", query_id)
 
         try:
             query.raise_for_access()
         except SupersetSecurityException as ex:
+            query.set_extra_json_key("errors", [dataclasses.asdict(ex.error)])
             query.status = QueryStatus.FAILED
+            query.error_message = ex.error.message
             session.commit()
-            return json_errors_response([ex.error], status=403)
+            raise SupersetErrorException(ex.error, status=403) from ex
 
         try:
             template_processor = get_template_processor(
@@ -2537,8 +2712,11 @@ def sql_json_exec(  # pylint: disable=too-many-statements,too-many-locals
             query.status = QueryStatus.FAILED
             session.commit()
             raise SupersetTemplateParamsErrorException(
-                utils.error_msg_from_exception(ex)
-            )
+                message=__(
+                    'The query contains one or more malformed template parameters. Please check your query and confirm that all template parameters are surround by double braces, for example, "{{ ds }}". Then, try running your query again.'
+                ),
+                error=SupersetErrorType.INVALID_TEMPLATE_PARAMS_ERROR,
+            ) from ex
 
         if is_feature_enabled("ENABLE_TEMPLATE_PROCESSING"):
             # pylint: disable=protected-access
@@ -2556,6 +2734,7 @@ def sql_json_exec(  # pylint: disable=too-many-statements,too-many-locals
                     )
                     + " "
                     + PARAMETER_MISSING_ERR,
+                    error=SupersetErrorType.MISSING_TEMPLATE_PARAMS_ERROR,
                     extra={
                         "undefined_parameters": list(undefined_parameters),
                         "template_parameters": template_params,
@@ -2656,7 +2835,9 @@ def csv(  # pylint: disable=no-self-use,too-many-locals
             "exported_format": "csv",
         }
         event_rep = repr(event_info)
-        logger.info("CSV exported: %s", event_rep, extra={"superset_event": event_info})
+        logger.debug(
+            "CSV exported: %s", event_rep, extra={"superset_event": event_info}
+        )
         return response
 
     @api
diff --git a/superset/views/css_templates.py b/superset/views/css_templates.py
index c998aabc2d41..d26acea5cfac 100644
--- a/superset/views/css_templates.py
+++ b/superset/views/css_templates.py
@@ -26,9 +26,7 @@
 from superset.views.base import DeleteMixin, SupersetModelView
 
 
-class CssTemplateModelView(  # pylint: disable=too-many-ancestors
-    SupersetModelView, DeleteMixin
-):
+class CssTemplateModelView(SupersetModelView, DeleteMixin):
     datamodel = SQLAInterface(models.CssTemplate)
     include_route_methods = RouteMethod.CRUD_SET
 
diff --git a/superset/views/dashboard/mixin.py b/superset/views/dashboard/mixin.py
index a01354615a60..77748fdc3b10 100644
--- a/superset/views/dashboard/mixin.py
+++ b/superset/views/dashboard/mixin.py
@@ -39,7 +39,7 @@ class DashboardMixin:  # pylint: disable=too-few-public-methods
         "json_metadata",
         "published",
     ]
-    show_columns = edit_columns + ["table_names", "charts"]
+    show_columns = edit_columns + ["charts"]
     search_columns = ("dashboard_title", "slug", "owners", "published")
     add_columns = edit_columns
     base_order = ("changed_on", "desc")
@@ -87,7 +87,6 @@ class DashboardMixin:  # pylint: disable=too-few-public-methods
         "position_json": _("Position JSON"),
         "css": _("CSS"),
         "json_metadata": _("JSON Metadata"),
-        "table_names": _("Underlying Tables"),
     }
 
     def pre_delete(self, item: "DashboardMixin") -> None:  # pylint: disable=no-self-use
diff --git a/superset/views/database/mixins.py b/superset/views/database/mixins.py
index c415d68f376e..2c1fb26df692 100644
--- a/superset/views/database/mixins.py
+++ b/superset/views/database/mixins.py
@@ -242,7 +242,7 @@ def check_extra(self, database: Database) -> None:  # pylint: disable=no-self-us
         except Exception as ex:
             raise Exception(
                 _("Extra field cannot be decoded by JSON. %(msg)s", msg=str(ex))
-            )
+            ) from ex
 
         # this will check whether 'metadata_params' is configured correctly
         metadata_signature = inspect.signature(MetaData)
@@ -266,4 +266,4 @@ def check_encrypted_extra(  # pylint: disable=no-self-use
         except Exception as ex:
             raise Exception(
                 _("Extra field cannot be decoded by JSON. %(msg)s", msg=str(ex))
-            )
+            ) from ex
diff --git a/superset/views/database/validators.py b/superset/views/database/validators.py
index a54b853b43b3..bd3b3335c582 100644
--- a/superset/views/database/validators.py
+++ b/superset/views/database/validators.py
@@ -34,7 +34,7 @@ def sqlalchemy_uri_validator(
     """
     try:
         make_url(uri.strip())
-    except (ArgumentError, AttributeError):
+    except (ArgumentError, AttributeError) as ex:
         raise exception(
             [
                 _(
@@ -45,7 +45,7 @@ def sqlalchemy_uri_validator(
                     "</p>"
                 )
             ]
-        )
+        ) from ex
 
 
 def schema_allows_csv_upload(database: Database, schema: Optional[str]) -> bool:
diff --git a/superset/views/database/views.py b/superset/views/database/views.py
index 5236f31c495f..0a3a274c5acf 100644
--- a/superset/views/database/views.py
+++ b/superset/views/database/views.py
@@ -43,7 +43,7 @@
 from .validators import schema_allows_csv_upload, sqlalchemy_uri_validator
 
 if TYPE_CHECKING:
-    from werkzeug.datastructures import FileStorage  # pylint: disable=unused-import
+    from werkzeug.datastructures import FileStorage
 
 config = app.config
 stats_logger = config["STATS_LOGGER"]
@@ -65,7 +65,7 @@ def certificate_form_validator(_: _, field: StringField) -> None:
         try:
             utils.parse_ssl_cert(field.data)
         except CertificateException as ex:
-            raise ValidationError(ex.message)
+            raise ValidationError(ex.message) from ex
 
 
 def upload_stream_write(form_file_field: "FileStorage", path: str) -> None:
@@ -291,7 +291,7 @@ def form_post(self, form: ExcelToDatabaseForm) -> Response:
             flash(message, "danger")
             return redirect("/exceltodatabaseview/form")
 
-        uploaded_tmp_file_path = tempfile.NamedTemporaryFile(
+        uploaded_tmp_file_path = tempfile.NamedTemporaryFile(  # pylint: disable=consider-using-with
             dir=app.config["UPLOAD_FOLDER"],
             suffix=os.path.splitext(form.excel_file.data.filename)[1].lower(),
             delete=False,
diff --git a/tests/annotation_layers/__init__.py b/superset/views/datasource/__init__.py
similarity index 100%
rename from tests/annotation_layers/__init__.py
rename to superset/views/datasource/__init__.py
diff --git a/superset/views/datasource/schemas.py b/superset/views/datasource/schemas.py
new file mode 100644
index 000000000000..162f35b4730b
--- /dev/null
+++ b/superset/views/datasource/schemas.py
@@ -0,0 +1,54 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from typing import Any
+
+from marshmallow import fields, post_load, Schema
+from typing_extensions import TypedDict
+
+
+class ExternalMetadataParams(TypedDict):
+    datasource_type: str
+    database_name: str
+    schema_name: str
+    table_name: str
+
+
+get_external_metadata_schema = {
+    "datasource_type": "string",
+    "database_name": "string",
+    "schema_name": "string",
+    "table_name": "string",
+}
+
+
+class ExternalMetadataSchema(Schema):
+    datasource_type = fields.Str(required=True)
+    database_name = fields.Str(required=True)
+    schema_name = fields.Str(allow_none=True)
+    table_name = fields.Str(required=True)
+
+    # pylint: disable=no-self-use,unused-argument
+    @post_load
+    def normalize(
+        self, data: ExternalMetadataParams, **kwargs: Any,
+    ) -> ExternalMetadataParams:
+        return ExternalMetadataParams(
+            datasource_type=data["datasource_type"],
+            database_name=data["database_name"],
+            schema_name=data.get("schema_name", ""),
+            table_name=data["table_name"],
+        )
diff --git a/superset/views/datasource.py b/superset/views/datasource/views.py
similarity index 63%
rename from superset/views/datasource.py
rename to superset/views/datasource/views.py
index 5934733077ed..cc3d6d202ebb 100644
--- a/superset/views/datasource.py
+++ b/superset/views/datasource/views.py
@@ -16,20 +16,39 @@
 # under the License.
 import json
 from collections import Counter
+from typing import Any
 
 from flask import request
 from flask_appbuilder import expose
+from flask_appbuilder.api import rison
 from flask_appbuilder.security.decorators import has_access_api
 from flask_babel import _
+from marshmallow import ValidationError
+from sqlalchemy.exc import NoSuchTableError
+from sqlalchemy.orm.exc import NoResultFound
 
 from superset import app, db, event_logger
 from superset.connectors.connector_registry import ConnectorRegistry
-from superset.datasets.commands.exceptions import DatasetForbiddenError
+from superset.connectors.sqla.utils import get_physical_table_metadata
+from superset.datasets.commands.exceptions import (
+    DatasetForbiddenError,
+    DatasetNotFoundError,
+)
 from superset.exceptions import SupersetException, SupersetSecurityException
+from superset.models.core import Database
 from superset.typing import FlaskResponse
-from superset.views.base import check_ownership
-
-from .base import api, BaseSupersetView, handle_api_exception, json_error_response
+from superset.views.base import (
+    api,
+    BaseSupersetView,
+    check_ownership,
+    handle_api_exception,
+    json_error_response,
+)
+from superset.views.datasource.schemas import (
+    ExternalMetadataParams,
+    ExternalMetadataSchema,
+    get_external_metadata_schema,
+)
 
 
 class Datasource(BaseSupersetView):
@@ -62,8 +81,8 @@ def save(self) -> FlaskResponse:
             if app.config["OLD_API_CHECK_DATASET_OWNERSHIP"]:
                 try:
                     check_ownership(orm_datasource)
-                except SupersetSecurityException:
-                    raise DatasetForbiddenError()
+                except SupersetSecurityException as ex:
+                    raise DatasetForbiddenError() from ex
 
             datasource_dict["owners"] = (
                 db.session.query(orm_datasource.owner_class)
@@ -118,3 +137,44 @@ def external_metadata(
         except SupersetException as ex:
             return json_error_response(str(ex), status=400)
         return self.json_response(external_metadata)
+
+    @expose("/external_metadata_by_name/")
+    @has_access_api
+    @api
+    @handle_api_exception
+    @rison(get_external_metadata_schema)
+    def external_metadata_by_name(self, **kwargs: Any) -> FlaskResponse:
+        """Gets table metadata from the source system and SQLAlchemy inspector"""
+        try:
+            params: ExternalMetadataParams = (
+                ExternalMetadataSchema().load(kwargs.get("rison"))
+            )
+        except ValidationError as err:
+            return json_error_response(str(err), status=400)
+
+        datasource = ConnectorRegistry.get_datasource_by_name(
+            session=db.session,
+            datasource_type=params["datasource_type"],
+            database_name=params["database_name"],
+            schema=params["schema_name"],
+            datasource_name=params["table_name"],
+        )
+        try:
+            if datasource is not None:
+                # Get columns from Superset metadata
+                external_metadata = datasource.external_metadata()
+            else:
+                # Use the SQLAlchemy inspector to get columns
+                database = (
+                    db.session.query(Database)
+                    .filter_by(database_name=params["database_name"])
+                    .one()
+                )
+                external_metadata = get_physical_table_metadata(
+                    database=database,
+                    table_name=params["table_name"],
+                    schema_name=params["schema_name"],
+                )
+        except (NoResultFound, NoSuchTableError) as ex:
+            raise DatasetNotFoundError() from ex
+        return self.json_response(external_metadata)
diff --git a/superset/views/log/views.py b/superset/views/log/views.py
index 6cc8d2ffd6a6..383109fc0882 100644
--- a/superset/views/log/views.py
+++ b/superset/views/log/views.py
@@ -26,7 +26,7 @@
 from . import LogMixin
 
 
-class LogModelView(LogMixin, SupersetModelView):  # pylint: disable=too-many-ancestors
+class LogModelView(LogMixin, SupersetModelView):
     datamodel = SQLAInterface(models.Log)
     include_route_methods = {RouteMethod.LIST, RouteMethod.SHOW}
     class_permission_name = "Log"
diff --git a/superset/views/redirects.py b/superset/views/redirects.py
index 1be79b6461a2..cb4f721b0feb 100644
--- a/superset/views/redirects.py
+++ b/superset/views/redirects.py
@@ -45,7 +45,7 @@ def _validate_url(url: Optional[str] = None) -> bool:
 
     @event_logger.log_this
     @expose("/<int:url_id>")
-    def index(self, url_id: int) -> FlaskResponse:  # pylint: disable=no-self-use
+    def index(self, url_id: int) -> FlaskResponse:
         url = db.session.query(models.Url).get(url_id)
         if url and url.url:
             explore_url = "//superset/explore/?"
@@ -62,7 +62,7 @@ def index(self, url_id: int) -> FlaskResponse:  # pylint: disable=no-self-use
     @event_logger.log_this
     @has_access_api
     @expose("/shortner/", methods=["POST"])
-    def shortner(self) -> FlaskResponse:  # pylint: disable=no-self-use
+    def shortner(self) -> FlaskResponse:
         url = request.form.get("data")
         if not self._validate_url(url):
             logger.warning("Invalid URL: %s", url)
diff --git a/superset/views/schedules.py b/superset/views/schedules.py
index 93a3568c390e..d1c59f413c83 100644
--- a/superset/views/schedules.py
+++ b/superset/views/schedules.py
@@ -50,9 +50,7 @@
 from .base import DeleteMixin, SupersetModelView
 
 
-class EmailScheduleView(
-    SupersetModelView, DeleteMixin
-):  # pylint: disable=too-many-ancestors
+class EmailScheduleView(SupersetModelView, DeleteMixin):
     include_route_methods = RouteMethod.CRUD_SET
     _extra_data = {"test_email": False, "test_email_recipients": None}
 
@@ -134,8 +132,8 @@ def pre_add(self, item: "EmailScheduleView") -> None:
         try:
             recipients = get_email_address_list(item.recipients)
             item.recipients = ", ".join(recipients)
-        except Exception:
-            raise SupersetException("Invalid email list")
+        except Exception as ex:
+            raise SupersetException("Invalid email list") from ex
 
         item.user = item.user or g.user
         if not croniter.is_valid(item.crontab):
@@ -267,7 +265,7 @@ def list(self) -> FlaskResponse:
     def pre_add(self, item: "DashboardEmailScheduleView") -> None:
         if item.dashboard is None:
             raise SupersetException("Dashboard is mandatory")
-        super(DashboardEmailScheduleView, self).pre_add(item)
+        super().pre_add(item)
 
 
 class SliceEmailScheduleView(EmailScheduleView):  # pylint: disable=too-many-ancestors
@@ -348,4 +346,4 @@ def list(self) -> FlaskResponse:
     def pre_add(self, item: "SliceEmailScheduleView") -> None:
         if item.slice is None:
             raise SupersetException("Slice is mandatory")
-        super(SliceEmailScheduleView, self).pre_add(item)
+        super().pre_add(item)
diff --git a/superset/views/sql_lab.py b/superset/views/sql_lab.py
index ef3d901d4dec..6a5ce26d38ad 100644
--- a/superset/views/sql_lab.py
+++ b/superset/views/sql_lab.py
@@ -30,9 +30,7 @@
 from .base import BaseSupersetView, DeleteMixin, json_success, SupersetModelView
 
 
-class SavedQueryView(
-    SupersetModelView, DeleteMixin
-):  # pylint: disable=too-many-ancestors
+class SavedQueryView(SupersetModelView, DeleteMixin):
     datamodel = SQLAInterface(SavedQuery)
     include_route_methods = RouteMethod.CRUD_SET
 
@@ -228,10 +226,12 @@ def migrate_query(  # pylint: disable=no-self-use
     @has_access_api
     @expose("<int:tab_state_id>/query/<client_id>", methods=["DELETE"])
     def delete_query(  # pylint: disable=no-self-use
-        self, tab_state_id: str, client_id: str
+        self, tab_state_id: int, client_id: str
     ) -> FlaskResponse:
         db.session.query(Query).filter_by(
-            client_id=client_id, user_id=g.user.get_id(), sql_editor_id=tab_state_id
+            client_id=client_id,
+            user_id=g.user.get_id(),
+            sql_editor_id=str(tab_state_id),
         ).delete(synchronize_session=False)
         db.session.commit()
         return json_success(json.dumps("OK"))
diff --git a/superset/views/utils.py b/superset/views/utils.py
index a3dd432e4f37..6a61f66b0e70 100644
--- a/superset/views/utils.py
+++ b/superset/views/utils.py
@@ -62,16 +62,18 @@
 
 def bootstrap_user_data(user: User, include_perms: bool = False) -> Dict[str, Any]:
     if user.is_anonymous:
-        return {}
-    payload = {
-        "username": user.username,
-        "firstName": user.first_name,
-        "lastName": user.last_name,
-        "userId": user.id,
-        "isActive": user.is_active,
-        "createdOn": user.created_on.isoformat(),
-        "email": user.email,
-    }
+        payload = {}
+        user.roles = (security_manager.find_role("Public"),)
+    else:
+        payload = {
+            "username": user.username,
+            "firstName": user.first_name,
+            "lastName": user.last_name,
+            "userId": user.id,
+            "isActive": user.is_active,
+            "createdOn": user.created_on.isoformat(),
+            "email": user.email,
+        }
 
     if include_perms:
         roles, permissions = get_permissions(user)
@@ -350,7 +352,7 @@ def get_dashboard_extra_filters(
         dashboard is None
         or not dashboard.json_metadata
         or not dashboard.slices
-        or not any([slc for slc in dashboard.slices if slc.id == slice_id])
+        or not any(slc for slc in dashboard.slices if slc.id == slice_id)
     ):
         return []
 
@@ -453,7 +455,7 @@ def is_slice_in_container(
 
 
 def is_owner(obj: Union[Dashboard, Slice], user: User) -> bool:
-    """ Check if user is owner of the slice """
+    """Check if user is owner of the slice"""
     return obj and user in obj.owners
 
 
@@ -519,7 +521,7 @@ def check_datasource_perms(
                 level=ErrorLevel.ERROR,
                 message=str(ex),
             )
-        )
+        ) from ex
 
     if datasource_type is None:
         raise SupersetSecurityException(
@@ -537,14 +539,14 @@ def check_datasource_perms(
             form_data=form_data,
             force=False,
         )
-    except NoResultFound:
+    except NoResultFound as ex:
         raise SupersetSecurityException(
             SupersetError(
                 error_type=SupersetErrorType.UNKNOWN_DATASOURCE_TYPE_ERROR,
                 level=ErrorLevel.ERROR,
                 message=_("Could not find viz object"),
             )
-        )
+        ) from ex
 
     viz_obj.raise_for_access()
 
@@ -570,14 +572,14 @@ def check_slice_perms(_self: Any, slice_id: int) -> None:
                 form_data=form_data,
                 force=False,
             )
-        except NoResultFound:
+        except NoResultFound as ex:
             raise SupersetSecurityException(
                 SupersetError(
                     error_type=SupersetErrorType.UNKNOWN_DATASOURCE_TYPE_ERROR,
                     level=ErrorLevel.ERROR,
                     message="Could not find viz object",
                 )
-            )
+            ) from ex
 
         viz_obj.raise_for_access()
 
@@ -595,8 +597,8 @@ def _deserialize_results_payload(
         with stats_timing("sqllab.query.results_backend_pa_deserialize", stats_logger):
             try:
                 pa_table = pa.deserialize(ds_payload["data"])
-            except pa.ArrowSerializationError:
-                raise SerializationError("Unable to deserialize table")
+            except pa.ArrowSerializationError as ex:
+                raise SerializationError("Unable to deserialize table") from ex
 
         df = result_set.SupersetResultSet.convert_table_to_df(pa_table)
         ds_payload["data"] = dataframe.df_to_records(df) or []
diff --git a/superset/viz.py b/superset/viz.py
index 53ea2ca4deef..57eb1a8e2af4 100644
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# pylint: disable=C,R,W
+# pylint: disable=C,R,W,useless-suppression
 """This module contains the 'Viz' objects
 
 These objects represent the backend of all the visualizations that
@@ -66,15 +66,16 @@
 from superset.extensions import cache_manager, security_manager
 from superset.models.cache import CacheKey
 from superset.models.helpers import QueryResult
-from superset.typing import QueryObjectDict, VizData, VizPayload
+from superset.typing import Metric, QueryObjectDict, VizData, VizPayload
 from superset.utils import core as utils, csv
 from superset.utils.cache import set_and_log_cache
 from superset.utils.core import (
     DTTM_ALIAS,
+    ExtraFiltersReasonType,
     JS_MAX_INTEGER,
     merge_extra_filters,
     QueryMode,
-    to_adhoc,
+    simple_filter_to_adhoc,
 )
 from superset.utils.date_parser import get_since_until, parse_past_timedelta
 from superset.utils.dates import datetime_to_epoch
@@ -477,7 +478,7 @@ def get_payload(self, query_obj: Optional[QueryObjectDict] = None) -> VizPayload
             if col in columns or col in filter_values_columns
         ] + applied_time_columns
         payload["rejected_filters"] = [
-            {"reason": "not_in_datasource", "column": col}
+            {"reason": ExtraFiltersReasonType.COL_NOT_IN_DATASOURCE, "column": col}
             for col in filter_columns
             if col not in columns and col not in filter_values_columns
         ] + rejected_time_columns
@@ -526,10 +527,7 @@ def get_df_payload(
                     for col in (query_obj.get("columns") or [])
                     + (query_obj.get("groupby") or [])
                     + utils.get_column_names_from_metrics(
-                        cast(
-                            List[Union[str, Dict[str, Any]]],
-                            query_obj.get("metrics") or [],
-                        )
+                        cast(List[Metric], query_obj.get("metrics") or [],)
                     )
                     if col not in self.datasource.column_names
                 ]
@@ -1231,13 +1229,15 @@ class NVD3TimeSeriesViz(NVD3Viz):
 
     def query_obj(self) -> QueryObjectDict:
         d = super().query_obj()
-        sort_by = self.form_data.get("timeseries_limit_metric")
+        sort_by = self.form_data.get(
+            "timeseries_limit_metric"
+        ) or utils.get_first_metric_name(d.get("metrics") or [])
+        is_asc = not self.form_data.get("order_desc")
         if sort_by:
             sort_by_label = utils.get_metric_name(sort_by)
             if sort_by_label not in utils.get_metric_names(d["metrics"]):
                 d["metrics"].append(sort_by)
-            if self.form_data.get("order_desc"):
-                d["orderby"] = [(sort_by, not self.form_data.get("order_desc", True))]
+            d["orderby"] = [(sort_by, is_asc)]
         return d
 
     def to_series(
@@ -1763,8 +1763,12 @@ def get_data(self, df: pd.DataFrame) -> VizData:
         df = df.copy()
         df[filled_cols] = df[filled_cols].fillna(value=NULL_STRING)
 
-        row = df.groupby(self.groupby).sum()[metrics[0]].copy()
-        row.sort_values(ascending=False, inplace=True)
+        sortby = utils.get_metric_name(
+            self.form_data.get("timeseries_limit_metric") or metrics[0]
+        )
+        row = df.groupby(self.groupby).sum()[sortby].copy()
+        is_asc = not self.form_data.get("order_desc")
+        row.sort_values(ascending=is_asc, inplace=True)
         pt = df.pivot_table(index=self.groupby, columns=columns, values=metrics)
         if fd.get("contribution"):
             pt = pt.T
@@ -2472,7 +2476,9 @@ def add_null_filters(self) -> None:
             spatial_columns.add(line_column)
 
         for column in sorted(spatial_columns):
-            filter_ = to_adhoc({"col": column, "op": "IS NOT NULL", "val": ""})
+            filter_ = simple_filter_to_adhoc(
+                {"col": column, "op": "IS NOT NULL", "val": ""}
+            )
             fd["adhoc_filters"].append(filter_)
 
     def query_obj(self) -> QueryObjectDict:
diff --git a/tests/db_engine_specs/snowflake_tests.py b/tests/db_engine_specs/snowflake_tests.py
deleted file mode 100644
index e8f76fe7b6fc..000000000000
--- a/tests/db_engine_specs/snowflake_tests.py
+++ /dev/null
@@ -1,45 +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 json
-
-from superset.db_engine_specs.snowflake import SnowflakeEngineSpec
-from superset.models.core import Database
-from tests.db_engine_specs.base_tests import TestDbEngineSpec
-
-
-class TestSnowflakeDbEngineSpec(TestDbEngineSpec):
-    def test_convert_dttm(self):
-        dttm = self.get_dttm()
-
-        test_cases = {
-            "DATE": "TO_DATE('2019-01-02')",
-            "DATETIME": "CAST('2019-01-02T03:04:05.678900' AS DATETIME)",
-            "TIMESTAMP": "TO_TIMESTAMP('2019-01-02T03:04:05.678900')",
-        }
-
-        for type_, expected in test_cases.items():
-            self.assertEqual(SnowflakeEngineSpec.convert_dttm(type_, dttm), expected)
-
-    def test_database_connection_test_mutator(self):
-        database = Database(sqlalchemy_uri="snowflake://abc")
-        SnowflakeEngineSpec.mutate_db_for_connection_test(database)
-        engine_params = json.loads(database.extra or "{}")
-
-        self.assertDictEqual(
-            {"engine_params": {"connect_args": {"validate_default_parameters": True}}},
-            engine_params,
-        )
diff --git a/tests/fixtures/datasource.py b/tests/fixtures/datasource.py
deleted file mode 100644
index fad2bfeea179..000000000000
--- a/tests/fixtures/datasource.py
+++ /dev/null
@@ -1,152 +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.
-"""Fixtures for test_datasource.py"""
-datasource_post = {
-    "id": None,
-    "column_formats": {"ratio": ".2%"},
-    "database": {"id": 1},
-    "description": "Adding a DESCRip",
-    "default_endpoint": "",
-    "filter_select_enabled": True,
-    "name": "birth_names",
-    "table_name": "birth_names",
-    "datasource_name": "birth_names",
-    "type": "table",
-    "schema": "",
-    "offset": 66,
-    "cache_timeout": 55,
-    "sql": "",
-    "columns": [
-        {
-            "id": 504,
-            "column_name": "ds",
-            "verbose_name": "",
-            "description": None,
-            "expression": "",
-            "filterable": True,
-            "groupby": True,
-            "is_dttm": True,
-            "type": "DATETIME",
-        },
-        {
-            "id": 505,
-            "column_name": "gender",
-            "verbose_name": None,
-            "description": None,
-            "expression": "",
-            "filterable": True,
-            "groupby": True,
-            "is_dttm": False,
-            "type": "VARCHAR(16)",
-        },
-        {
-            "id": 506,
-            "column_name": "name",
-            "verbose_name": None,
-            "description": None,
-            "expression": None,
-            "filterable": True,
-            "groupby": True,
-            "is_dttm": None,
-            "type": "VARCHAR(255)",
-        },
-        {
-            "id": 508,
-            "column_name": "state",
-            "verbose_name": None,
-            "description": None,
-            "expression": None,
-            "filterable": True,
-            "groupby": True,
-            "is_dttm": None,
-            "type": "VARCHAR(10)",
-        },
-        {
-            "id": 509,
-            "column_name": "num_boys",
-            "verbose_name": None,
-            "description": None,
-            "expression": None,
-            "filterable": True,
-            "groupby": True,
-            "is_dttm": None,
-            "type": "BIGINT(20)",
-        },
-        {
-            "id": 510,
-            "column_name": "num_girls",
-            "verbose_name": None,
-            "description": None,
-            "expression": "",
-            "filterable": False,
-            "groupby": False,
-            "is_dttm": False,
-            "type": "BIGINT(20)",
-        },
-        {
-            "id": 532,
-            "column_name": "num",
-            "verbose_name": None,
-            "description": None,
-            "expression": None,
-            "filterable": True,
-            "groupby": True,
-            "is_dttm": None,
-            "type": "BIGINT(20)",
-        },
-        {
-            "id": 522,
-            "column_name": "num_california",
-            "verbose_name": None,
-            "description": None,
-            "expression": "CASE WHEN state = 'CA' THEN num ELSE 0 END",
-            "filterable": False,
-            "groupby": False,
-            "is_dttm": False,
-            "type": "NUMBER",
-        },
-    ],
-    "metrics": [
-        {
-            "id": 824,
-            "metric_name": "sum__num",
-            "verbose_name": "Babies",
-            "description": "",
-            "expression": "SUM(num)",
-            "warning_text": "",
-            "d3format": "",
-        },
-        {
-            "id": 836,
-            "metric_name": "count",
-            "verbose_name": "",
-            "description": None,
-            "expression": "count(1)",
-            "warning_text": None,
-            "d3format": None,
-        },
-        {
-            "id": 843,
-            "metric_name": "ratio",
-            "verbose_name": "Ratio Boys/Girls",
-            "description": "This represents the ratio of boys/girls",
-            "expression": "sum(num_boys) / sum(num_girls)",
-            "warning_text": "no warning",
-            "d3format": ".2%",
-        },
-    ],
-}
diff --git a/tests/async_events/__init__.py b/tests/integration_tests/__init__.py
similarity index 100%
rename from tests/async_events/__init__.py
rename to tests/integration_tests/__init__.py
diff --git a/tests/access_tests.py b/tests/integration_tests/access_tests.py
similarity index 97%
rename from tests/access_tests.py
rename to tests/integration_tests/access_tests.py
index d3cc55a1c9df..d888dbf53c19 100644
--- a/tests/access_tests.py
+++ b/tests/integration_tests/access_tests.py
@@ -19,13 +19,19 @@
 import json
 import unittest
 from unittest import mock
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
 
 import pytest
-from tests.fixtures.world_bank_dashboard import load_world_bank_dashboard_with_slices
+from tests.integration_tests.fixtures.world_bank_dashboard import (
+    load_world_bank_dashboard_with_slices,
+)
 
-from tests.fixtures.energy_dashboard import load_energy_table_with_slice
-from tests.test_app import app  # isort:skip
+from tests.integration_tests.fixtures.energy_dashboard import (
+    load_energy_table_with_slice,
+)
+from tests.integration_tests.test_app import app  # isort:skip
 from superset import db, security_manager
 from superset.connectors.connector_registry import ConnectorRegistry
 from superset.connectors.druid.models import DruidDatasource
@@ -155,7 +161,7 @@ def test_override_role_permissions_1_table(self):
 
         updated_override_me = security_manager.find_role("override_me")
         self.assertEqual(1, len(updated_override_me.permissions))
-        birth_names = self.get_table_by_name("birth_names")
+        birth_names = self.get_table(name="birth_names")
         self.assertEqual(
             birth_names.perm, updated_override_me.permissions[0].view_menu.name
         )
@@ -184,7 +190,7 @@ def test_override_role_permissions_druid_and_table(self):
             "datasource_access", updated_role.permissions[1].permission.name
         )
 
-        birth_names = self.get_table_by_name("birth_names")
+        birth_names = self.get_table(name="birth_names")
         self.assertEqual(birth_names.perm, perms[2].view_menu.name)
         self.assertEqual(
             "datasource_access", updated_role.permissions[2].permission.name
@@ -198,7 +204,7 @@ def test_override_role_permissions_drops_absent_perms(self):
         override_me = security_manager.find_role("override_me")
         override_me.permissions.append(
             security_manager.find_permission_view_menu(
-                view_menu_name=self.get_table_by_name("energy_usage").perm,
+                view_menu_name=self.get_table(name="energy_usage").perm,
                 permission_name="datasource_access",
             )
         )
@@ -212,7 +218,7 @@ def test_override_role_permissions_drops_absent_perms(self):
         self.assertEqual(201, response.status_code)
         updated_override_me = security_manager.find_role("override_me")
         self.assertEqual(1, len(updated_override_me.permissions))
-        birth_names = self.get_table_by_name("birth_names")
+        birth_names = self.get_table(name="birth_names")
         self.assertEqual(
             birth_names.perm, updated_override_me.permissions[0].view_menu.name
         )
diff --git a/tests/alerts_tests.py b/tests/integration_tests/alerts_tests.py
similarity index 98%
rename from tests/alerts_tests.py
rename to tests/integration_tests/alerts_tests.py
index fec52447633b..5f8f36fe749d 100644
--- a/tests/alerts_tests.py
+++ b/tests/integration_tests/alerts_tests.py
@@ -45,9 +45,9 @@
     AlertModelView,
     AlertObservationModelView,
 )
-from tests.base_tests import SupersetTestCase
-from tests.test_app import app
-from tests.utils import read_fixture
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.test_app import app
+from tests.integration_tests.utils import read_fixture
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
@@ -76,7 +76,7 @@ def setup_database():
 def create_alert(
     db_session: Session,
     sql: str,
-    validator_type: AlertValidatorType = AlertValidatorType.operator,
+    validator_type: AlertValidatorType = AlertValidatorType.OPERATOR,
     validator_config: str = "",
 ) -> Alert:
     db_session.commit()
diff --git a/tests/cachekeys/__init__.py b/tests/integration_tests/annotation_layers/__init__.py
similarity index 100%
rename from tests/cachekeys/__init__.py
rename to tests/integration_tests/annotation_layers/__init__.py
diff --git a/tests/annotation_layers/api_tests.py b/tests/integration_tests/annotation_layers/api_tests.py
similarity index 99%
rename from tests/annotation_layers/api_tests.py
rename to tests/integration_tests/annotation_layers/api_tests.py
index b53624394ef4..292829c8cf6b 100644
--- a/tests/annotation_layers/api_tests.py
+++ b/tests/integration_tests/annotation_layers/api_tests.py
@@ -22,12 +22,12 @@
 import prison
 from sqlalchemy.sql import func
 
-import tests.test_app
+import tests.integration_tests.test_app
 from superset import db
 from superset.models.annotations import Annotation, AnnotationLayer
 
-from tests.base_tests import SupersetTestCase
-from tests.annotation_layers.fixtures import (
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.annotation_layers.fixtures import (
     create_annotation_layers,
     get_end_dttm,
     get_start_dttm,
diff --git a/tests/annotation_layers/fixtures.py b/tests/integration_tests/annotation_layers/fixtures.py
similarity index 98%
rename from tests/annotation_layers/fixtures.py
rename to tests/integration_tests/annotation_layers/fixtures.py
index d2960acad5b4..cb7647d30cdb 100644
--- a/tests/annotation_layers/fixtures.py
+++ b/tests/integration_tests/annotation_layers/fixtures.py
@@ -22,7 +22,7 @@
 from superset import db
 from superset.models.annotations import Annotation, AnnotationLayer
 
-from tests.test_app import app
+from tests.integration_tests.test_app import app
 
 
 ANNOTATION_LAYERS_COUNT = 10
diff --git a/tests/charts/__init__.py b/tests/integration_tests/async_events/__init__.py
similarity index 100%
rename from tests/charts/__init__.py
rename to tests/integration_tests/async_events/__init__.py
diff --git a/tests/async_events/api_tests.py b/tests/integration_tests/async_events/api_tests.py
similarity index 97%
rename from tests/async_events/api_tests.py
rename to tests/integration_tests/async_events/api_tests.py
index 04d838b97b0a..a63f540dd0f8 100644
--- a/tests/async_events/api_tests.py
+++ b/tests/integration_tests/async_events/api_tests.py
@@ -19,8 +19,8 @@
 from unittest import mock
 
 from superset.extensions import async_query_manager
-from tests.base_tests import SupersetTestCase
-from tests.test_app import app
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.test_app import app
 
 
 class TestAsyncEventApi(SupersetTestCase):
diff --git a/tests/base_api_tests.py b/tests/integration_tests/base_api_tests.py
similarity index 98%
rename from tests/base_api_tests.py
rename to tests/integration_tests/base_api_tests.py
index 76084ecbc2ef..e6e795f4d6b2 100644
--- a/tests/base_api_tests.py
+++ b/tests/integration_tests/base_api_tests.py
@@ -16,13 +16,15 @@
 # under the License.
 # isort:skip_file
 import json
-from tests.fixtures.world_bank_dashboard import load_world_bank_dashboard_with_slices
+from tests.integration_tests.fixtures.world_bank_dashboard import (
+    load_world_bank_dashboard_with_slices,
+)
 
 import pytest
 from flask_appbuilder.models.sqla.interface import SQLAInterface
 import prison
 
-import tests.test_app
+import tests.integration_tests.test_app
 from superset import db, security_manager
 from superset.extensions import appbuilder
 from superset.models.dashboard import Dashboard
diff --git a/tests/base_tests.py b/tests/integration_tests/base_tests.py
similarity index 96%
rename from tests/base_tests.py
rename to tests/integration_tests/base_tests.py
index 14883929b1e1..7e4ebfd7df03 100644
--- a/tests/base_tests.py
+++ b/tests/integration_tests/base_tests.py
@@ -32,7 +32,7 @@
 from sqlalchemy.orm import Session
 from sqlalchemy.sql import func
 
-from tests.test_app import app
+from tests.integration_tests.test_app import app
 from superset.sql_parse import CtasMethod
 from superset import db, security_manager
 from superset.connectors.base.models import BaseDatasource
@@ -99,10 +99,6 @@ def post_assert_metric(
     return rv
 
 
-def get_table_by_name(name: str) -> SqlaTable:
-    return db.session.query(SqlaTable).filter_by(table_name=name).one()
-
-
 @pytest.fixture
 def logged_in_admin():
     """Fixture with app context and logged in admin user."""
@@ -132,12 +128,7 @@ def get_nonexistent_numeric_id(model):
 
     @staticmethod
     def get_birth_names_dataset() -> SqlaTable:
-        example_db = get_example_database()
-        return (
-            db.session.query(SqlaTable)
-            .filter_by(database=example_db, table_name="birth_names")
-            .one()
-        )
+        return SupersetTestCase.get_table(name="birth_names")
 
     @staticmethod
     def create_user_with_roles(
@@ -254,13 +245,31 @@ def get_slice(
         return slc
 
     @staticmethod
-    def get_table_by_name(name: str) -> SqlaTable:
-        return get_table_by_name(name)
+    def get_table(
+        name: str, database_id: Optional[int] = None, schema: Optional[str] = None
+    ) -> SqlaTable:
+        return (
+            db.session.query(SqlaTable)
+            .filter_by(
+                database_id=database_id
+                or SupersetTestCase.get_database_by_name("examples").id,
+                schema=schema,
+                table_name=name,
+            )
+            .one()
+        )
 
     @staticmethod
     def get_database_by_id(db_id: int) -> Database:
         return db.session.query(Database).filter_by(id=db_id).one()
 
+    @staticmethod
+    def get_database_by_name(database_name: str = "main") -> Database:
+        if database_name == "examples":
+            return get_example_database()
+        else:
+            raise ValueError("Database doesn't exist")
+
     @staticmethod
     def get_druid_ds_by_name(name: str) -> DruidDatasource:
         return db.session.query(DruidDatasource).filter_by(datasource_name=name).first()
@@ -340,12 +349,6 @@ def revoke_role_access_to_table(self, role_name, table):
             ):
                 security_manager.del_permission_role(public_role, perm)
 
-    def _get_database_by_name(self, database_name="main"):
-        if database_name == "examples":
-            return get_example_database()
-        else:
-            raise ValueError("Database doesn't exist")
-
     def run_sql(
         self,
         sql,
@@ -364,7 +367,7 @@ def run_sql(
         if user_name:
             self.logout()
             self.login(username=(user_name or "admin"))
-        dbid = self._get_database_by_name(database_name).id
+        dbid = SupersetTestCase.get_database_by_name(database_name).id
         json_payload = {
             "database_id": dbid,
             "sql": sql,
@@ -448,7 +451,7 @@ def validate_sql(
         if user_name:
             self.logout()
             self.login(username=(user_name if user_name else "admin"))
-        dbid = self._get_database_by_name(database_name).id
+        dbid = SupersetTestCase.get_database_by_name(database_name).id
         resp = self.get_json_resp(
             "/superset/validate_sql_json/",
             raise_on_error=False,
diff --git a/tests/cache_tests.py b/tests/integration_tests/cache_tests.py
similarity index 97%
rename from tests/cache_tests.py
rename to tests/integration_tests/cache_tests.py
index 43a4cf6f3fcd..9f0e6d9b2969 100644
--- a/tests/cache_tests.py
+++ b/tests/integration_tests/cache_tests.py
@@ -22,7 +22,9 @@
 from superset import app, db
 from superset.extensions import cache_manager
 from superset.utils.core import QueryStatus
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
 
 from .base_tests import SupersetTestCase
 
diff --git a/tests/css_templates/__init__.py b/tests/integration_tests/cachekeys/__init__.py
similarity index 100%
rename from tests/css_templates/__init__.py
rename to tests/integration_tests/cachekeys/__init__.py
diff --git a/tests/cachekeys/api_tests.py b/tests/integration_tests/cachekeys/api_tests.py
similarity index 98%
rename from tests/cachekeys/api_tests.py
rename to tests/integration_tests/cachekeys/api_tests.py
index 3f08750d8662..2ed4b7ef1e8e 100644
--- a/tests/cachekeys/api_tests.py
+++ b/tests/integration_tests/cachekeys/api_tests.py
@@ -18,11 +18,11 @@
 """Unit tests for Superset"""
 from typing import Dict, Any
 
-from tests.test_app import app  # noqa
+from tests.integration_tests.test_app import app  # noqa
 
 from superset.extensions import cache_manager, db
 from superset.models.cache import CacheKey
-from tests.base_tests import (
+from tests.integration_tests.base_tests import (
     SupersetTestCase,
     post_assert_metric,
     test_client,
diff --git a/tests/celery_tests.py b/tests/integration_tests/celery_tests.py
similarity index 92%
rename from tests/celery_tests.py
rename to tests/integration_tests/celery_tests.py
index 13c7ac3a8f08..e645ef78a232 100644
--- a/tests/celery_tests.py
+++ b/tests/integration_tests/celery_tests.py
@@ -23,16 +23,18 @@
 import time
 import unittest.mock as mock
 from typing import Optional
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
 
 import pytest
 
 import flask
 from flask import current_app
 
-from tests.base_tests import login
-from tests.conftest import CTAS_SCHEMA_NAME
-from tests.test_app import app
+from tests.integration_tests.base_tests import login
+from tests.integration_tests.conftest import CTAS_SCHEMA_NAME
+from tests.integration_tests.test_app import app
 from superset import db, sql_lab
 from superset.result_set import SupersetResultSet
 from superset.db_engine_specs.base import BaseEngineSpec
@@ -141,10 +143,31 @@ def get_select_star(table: str, schema: Optional[str] = None):
 
 @pytest.mark.parametrize("ctas_method", [CtasMethod.TABLE, CtasMethod.VIEW])
 def test_run_sync_query_dont_exist(setup_sqllab, ctas_method):
+    examples_db = get_example_database()
+    engine_name = examples_db.db_engine_spec.engine_name
     sql_dont_exist = "SELECT name FROM table_dont_exist"
     result = run_sql(sql_dont_exist, cta=True, ctas_method=ctas_method)
     if backend() == "sqlite" and ctas_method == CtasMethod.VIEW:
         assert QueryStatus.SUCCESS == result["status"], result
+    elif backend() == "presto":
+        assert (
+            result["errors"][0]["error_type"]
+            == SupersetErrorType.TABLE_DOES_NOT_EXIST_ERROR
+        )
+        assert result["errors"][0]["level"] == ErrorLevel.ERROR
+        assert result["errors"][0]["extra"] == {
+            "engine_name": "Presto",
+            "issue_codes": [
+                {
+                    "code": 1003,
+                    "message": "Issue 1003 - There is a syntax error in the SQL query. Perhaps there was a misspelling or a typo.",
+                },
+                {
+                    "code": 1005,
+                    "message": "Issue 1005 - The table was deleted or renamed in the database.",
+                },
+            ],
+        }
     else:
         assert (
             result["errors"][0]["error_type"]
@@ -157,7 +180,8 @@ def test_run_sync_query_dont_exist(setup_sqllab, ctas_method):
                     "code": 1002,
                     "message": "Issue 1002 - The database returned an unexpected error.",
                 }
-            ]
+            ],
+            "engine_name": engine_name,
         }
 
 
diff --git a/tests/dashboards/__init__.py b/tests/integration_tests/charts/__init__.py
similarity index 100%
rename from tests/dashboards/__init__.py
rename to tests/integration_tests/charts/__init__.py
diff --git a/tests/charts/api_tests.py b/tests/integration_tests/charts/api_tests.py
similarity index 90%
rename from tests/charts/api_tests.py
rename to tests/integration_tests/charts/api_tests.py
index b43abfb6641d..7499e9e3a459 100644
--- a/tests/charts/api_tests.py
+++ b/tests/integration_tests/charts/api_tests.py
@@ -17,15 +17,19 @@
 # isort:skip_file
 """Unit tests for Superset"""
 import json
+import unittest
 from datetime import datetime, timedelta
 from io import BytesIO
 from typing import Optional
 from unittest import mock
 from zipfile import is_zipfile, ZipFile
 
+from tests.integration_tests.conftest import with_feature_flags
 from superset.models.sql_lab import Query
-from tests.insert_chart_mixin import InsertChartMixin
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
+from tests.integration_tests.insert_chart_mixin import InsertChartMixin
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
 
 import humanize
 import prison
@@ -34,8 +38,10 @@
 from sqlalchemy import and_, or_
 from sqlalchemy.sql import func
 
-from tests.fixtures.world_bank_dashboard import load_world_bank_dashboard_with_slices
-from tests.test_app import app
+from tests.integration_tests.fixtures.world_bank_dashboard import (
+    load_world_bank_dashboard_with_slices,
+)
+from tests.integration_tests.test_app import app
 from superset.charts.commands.data import ChartDataCommand
 from superset.connectors.sqla.models import SqlaTable, TableColumn
 from superset.errors import SupersetErrorType
@@ -46,24 +52,40 @@
 from superset.models.reports import ReportSchedule, ReportScheduleType
 from superset.models.slice import Slice
 from superset.utils import core as utils
-from superset.utils.core import AnnotationType, get_example_database, get_main_database
+from superset.utils.core import (
+    AnnotationType,
+    ChartDataResultFormat,
+    get_example_database,
+    get_main_database,
+)
 
 
-from tests.base_api_tests import ApiOwnersTestCaseMixin
-from tests.base_tests import SupersetTestCase, post_assert_metric, test_client
+from tests.integration_tests.base_api_tests import ApiOwnersTestCaseMixin
+from tests.integration_tests.base_tests import (
+    SupersetTestCase,
+    post_assert_metric,
+    test_client,
+)
 
-from tests.fixtures.importexport import (
+from tests.integration_tests.fixtures.importexport import (
     chart_config,
     chart_metadata_config,
     database_config,
     dataset_config,
     dataset_metadata_config,
 )
-from tests.fixtures.energy_dashboard import load_energy_table_with_slice
-from tests.fixtures.query_context import get_query_context, ANNOTATION_LAYERS
-from tests.fixtures.unicode_dashboard import load_unicode_dashboard_with_slice
-from tests.annotation_layers.fixtures import create_annotation_layers
-from tests.utils.get_dashboards import get_dashboards_ids
+from tests.integration_tests.fixtures.energy_dashboard import (
+    load_energy_table_with_slice,
+)
+from tests.integration_tests.fixtures.query_context import (
+    get_query_context,
+    ANNOTATION_LAYERS,
+)
+from tests.integration_tests.fixtures.unicode_dashboard import (
+    load_unicode_dashboard_with_slice,
+)
+from tests.integration_tests.annotation_layers.fixtures import create_annotation_layers
+from tests.integration_tests.utils.get_dashboards import get_dashboards_ids
 
 CHART_DATA_URI = "api/v1/chart/data"
 CHARTS_FIXTURE_COUNT = 10
@@ -164,9 +186,10 @@ def test_info_security_chart(self):
         rv = self.get_assert_metric(uri, "info")
         data = json.loads(rv.data.decode("utf-8"))
         assert rv.status_code == 200
-        assert "can_read" in data["permissions"]
-        assert "can_write" in data["permissions"]
-        assert len(data["permissions"]) == 2
+        assert set(data["permissions"]) == {
+            "can_read",
+            "can_write",
+        }
 
     def create_chart_import(self):
         buf = BytesIO()
@@ -520,7 +543,7 @@ def test_update_chart(self):
         """
         admin = self.get_user("admin")
         gamma = self.get_user("gamma")
-        birth_names_table_id = SupersetTestCase.get_table_by_name("birth_names").id
+        birth_names_table_id = SupersetTestCase.get_table(name="birth_names").id
         chart_id = self.insert_chart(
             "title", [admin.id], birth_names_table_id, admin
         ).id
@@ -545,7 +568,7 @@ def test_update_chart(self):
         self.assertEqual(model.created_by, admin)
         self.assertEqual(model.slice_name, "title1_changed")
         self.assertEqual(model.description, "description1")
-        self.assertIn(admin, model.owners)
+        self.assertNotIn(admin, model.owners)
         self.assertIn(gamma, model.owners)
         self.assertEqual(model.viz_type, "viz_type1")
         self.assertEqual(model.params, """{"a": 1}""")
@@ -557,20 +580,39 @@ def test_update_chart(self):
         db.session.delete(model)
         db.session.commit()
 
-    def test_update_chart_new_owner(self):
+    def test_update_chart_new_owner_not_admin(self):
         """
-        Chart API: Test update set new owner to current user
+        Chart API: Test update set new owner implicitly adds logged in owner
+        """
+        gamma = self.get_user("gamma")
+        alpha = self.get_user("alpha")
+        chart_id = self.insert_chart("title", [alpha.id], 1).id
+        chart_data = {"slice_name": "title1_changed", "owners": [gamma.id]}
+        self.login(username="alpha")
+        uri = f"api/v1/chart/{chart_id}"
+        rv = self.put_assert_metric(uri, chart_data, "put")
+        self.assertEqual(rv.status_code, 200)
+        model = db.session.query(Slice).get(chart_id)
+        self.assertIn(alpha, model.owners)
+        self.assertIn(gamma, model.owners)
+        db.session.delete(model)
+        db.session.commit()
+
+    def test_update_chart_new_owner_admin(self):
+        """
+        Chart API: Test update set new owner as admin to other than current user
         """
         gamma = self.get_user("gamma")
         admin = self.get_user("admin")
-        chart_id = self.insert_chart("title", [gamma.id], 1).id
-        chart_data = {"slice_name": "title1_changed"}
+        chart_id = self.insert_chart("title", [admin.id], 1).id
+        chart_data = {"slice_name": "title1_changed", "owners": [gamma.id]}
         self.login(username="admin")
         uri = f"api/v1/chart/{chart_id}"
         rv = self.put_assert_metric(uri, chart_data, "put")
         self.assertEqual(rv.status_code, 200)
         model = db.session.query(Slice).get(chart_id)
-        self.assertIn(admin, model.owners)
+        self.assertNotIn(admin, model.owners)
+        self.assertIn(gamma, model.owners)
         db.session.delete(model)
         db.session.commit()
 
@@ -697,6 +739,7 @@ def test_get_chart(self):
             "params": None,
             "slice_name": "title",
             "viz_type": None,
+            "query_context": None,
         }
         data = json.loads(rv.data.decode("utf-8"))
         self.assertEqual(data["result"], expected_result)
@@ -1014,7 +1057,7 @@ def test_get_charts_no_data_access(self):
         Chart API: Test get charts no data access
         """
         self.login(username="gamma")
-        uri = f"api/v1/chart/"
+        uri = "api/v1/chart/"
         rv = self.get_assert_metric(uri, "get_list")
         self.assertEqual(rv.status_code, 200)
         data = json.loads(rv.data.decode("utf-8"))
@@ -1033,6 +1076,63 @@ def test_chart_data_simple(self):
         expected_row_count = self.get_expected_row_count("client_id_1")
         self.assertEqual(data["result"][0]["rowcount"], expected_row_count)
 
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    def test_chart_data_get_no_query_context(self):
+        """
+        Chart data API: Test GET endpoint when query context is null
+        """
+        self.login(username="admin")
+        chart = db.session.query(Slice).filter_by(slice_name="Genders").one()
+        rv = self.get_assert_metric(f"api/v1/chart/{chart.id}/data/", "get_data")
+        data = json.loads(rv.data.decode("utf-8"))
+        assert data == {
+            "message": "Chart has no query context saved. Please save the chart again."
+        }
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    def test_chart_data_get(self):
+        """
+        Chart data API: Test GET endpoint
+        """
+        self.login(username="admin")
+        chart = db.session.query(Slice).filter_by(slice_name="Genders").one()
+        chart.query_context = json.dumps(
+            {
+                "datasource": {"id": chart.table.id, "type": "table"},
+                "force": False,
+                "queries": [
+                    {
+                        "time_range": "1900-01-01T00:00:00 : 2000-01-01T00:00:00",
+                        "granularity": "ds",
+                        "filters": [],
+                        "extras": {
+                            "time_range_endpoints": ["inclusive", "exclusive"],
+                            "having": "",
+                            "having_druid": [],
+                            "where": "",
+                        },
+                        "applied_time_extras": {},
+                        "columns": ["gender"],
+                        "metrics": ["sum__num"],
+                        "orderby": [["sum__num", False]],
+                        "annotation_layers": [],
+                        "row_limit": 50000,
+                        "timeseries_limit": 0,
+                        "order_desc": True,
+                        "url_params": {},
+                        "custom_params": {},
+                        "custom_form_data": {},
+                    }
+                ],
+                "result_format": "json",
+                "result_type": "full",
+            }
+        )
+        rv = self.get_assert_metric(f"api/v1/chart/{chart.id}/data/", "get_data")
+        data = json.loads(rv.data.decode("utf-8"))
+        assert data["result"][0]["status"] == "success"
+        assert data["result"][0]["rowcount"] == 2
+
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_chart_data_applied_time_extras(self):
         """
@@ -1210,6 +1310,7 @@ def test_chart_data_mixed_case_filter_op(self):
         result = response_payload["result"][0]
         self.assertEqual(result["rowcount"], 10)
 
+    @unittest.skip("Failing due to timezone difference")
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_chart_data_dttm_filter(self):
         """
@@ -1386,10 +1487,8 @@ def test_chart_data_jinja_filter_request(self):
         if get_example_database().backend != "presto":
             assert "('boy' = 'boy')" in result
 
-    @mock.patch.dict(
-        "superset.extensions.feature_flag_manager._feature_flags",
-        GLOBAL_ASYNC_QUERIES=True,
-    )
+    @with_feature_flags(GLOBAL_ASYNC_QUERIES=True)
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_chart_data_async(self):
         """
         Chart data API: Test chart data query (async)
@@ -1405,10 +1504,37 @@ def test_chart_data_async(self):
             keys, ["channel_id", "job_id", "user_id", "status", "errors", "result_url"]
         )
 
-    @mock.patch.dict(
-        "superset.extensions.feature_flag_manager._feature_flags",
-        GLOBAL_ASYNC_QUERIES=True,
-    )
+    @with_feature_flags(GLOBAL_ASYNC_QUERIES=True)
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    def test_chart_data_async_cached_sync_response(self):
+        """
+        Chart data API: Test chart data query returns results synchronously
+        when results are already cached.
+        """
+        async_query_manager.init_app(app)
+        self.login(username="admin")
+
+        class QueryContext:
+            result_format = ChartDataResultFormat.JSON
+            result_type = utils.ChartDataResultType.FULL
+
+        cmd_run_val = {
+            "query_context": QueryContext(),
+            "queries": [{"query": "select * from foo"}],
+        }
+
+        with mock.patch.object(
+            ChartDataCommand, "run", return_value=cmd_run_val
+        ) as patched_run:
+            request_payload = get_query_context("birth_names")
+            request_payload["result_type"] = utils.ChartDataResultType.FULL
+            rv = self.post_assert_metric(CHART_DATA_URI, request_payload, "data")
+            self.assertEqual(rv.status_code, 200)
+            data = json.loads(rv.data.decode("utf-8"))
+            patched_run.assert_called_once_with(force_cached=True)
+            self.assertEqual(data, {"result": [{"query": "select * from foo"}]})
+
+    @with_feature_flags(GLOBAL_ASYNC_QUERIES=True)
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_chart_data_async_results_type(self):
         """
@@ -1421,10 +1547,8 @@ def test_chart_data_async_results_type(self):
         rv = self.post_assert_metric(CHART_DATA_URI, request_payload, "data")
         self.assertEqual(rv.status_code, 200)
 
-    @mock.patch.dict(
-        "superset.extensions.feature_flag_manager._feature_flags",
-        GLOBAL_ASYNC_QUERIES=True,
-    )
+    @with_feature_flags(GLOBAL_ASYNC_QUERIES=True)
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_chart_data_async_invalid_token(self):
         """
         Chart data API: Test chart data query (async)
@@ -1439,10 +1563,7 @@ def test_chart_data_async_invalid_token(self):
         self.assertEqual(rv.status_code, 401)
 
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
-    @mock.patch.dict(
-        "superset.extensions.feature_flag_manager._feature_flags",
-        GLOBAL_ASYNC_QUERIES=True,
-    )
+    @with_feature_flags(GLOBAL_ASYNC_QUERIES=True)
     @mock.patch.object(ChartDataCommand, "load_query_context_from_cache")
     def test_chart_data_cache(self, load_qc_mock):
         """
@@ -1469,11 +1590,9 @@ def mock_run(self, **kwargs):
         self.assertEqual(rv.status_code, 200)
         self.assertEqual(data["result"][0]["rowcount"], expected_row_count)
 
-    @mock.patch.dict(
-        "superset.extensions.feature_flag_manager._feature_flags",
-        GLOBAL_ASYNC_QUERIES=True,
-    )
+    @with_feature_flags(GLOBAL_ASYNC_QUERIES=True)
     @mock.patch.object(ChartDataCommand, "load_query_context_from_cache")
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_chart_data_cache_run_failed(self, load_qc_mock):
         """
         Chart data cache API: Test chart data async cache request with run failure
@@ -1490,11 +1609,9 @@ def test_chart_data_cache_run_failed(self, load_qc_mock):
         self.assertEqual(rv.status_code, 422)
         self.assertEqual(data["message"], "Error loading data from cache")
 
-    @mock.patch.dict(
-        "superset.extensions.feature_flag_manager._feature_flags",
-        GLOBAL_ASYNC_QUERIES=True,
-    )
+    @with_feature_flags(GLOBAL_ASYNC_QUERIES=True)
     @mock.patch.object(ChartDataCommand, "load_query_context_from_cache")
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_chart_data_cache_no_login(self, load_qc_mock):
         """
         Chart data cache API: Test chart data async cache request (no login)
@@ -1514,10 +1631,7 @@ def mock_run(self, **kwargs):
 
         self.assertEqual(rv.status_code, 401)
 
-    @mock.patch.dict(
-        "superset.extensions.feature_flag_manager._feature_flags",
-        GLOBAL_ASYNC_QUERIES=True,
-    )
+    @with_feature_flags(GLOBAL_ASYNC_QUERIES=True)
     def test_chart_data_cache_key_error(self):
         """
         Chart data cache API: Test chart data async cache request with invalid cache key
diff --git a/tests/charts/commands_tests.py b/tests/integration_tests/charts/commands_tests.py
similarity index 80%
rename from tests/charts/commands_tests.py
rename to tests/integration_tests/charts/commands_tests.py
index 5ad53bfc51ea..238a54e29c7f 100644
--- a/tests/charts/commands_tests.py
+++ b/tests/integration_tests/charts/commands_tests.py
@@ -17,23 +17,28 @@
 # pylint: disable=no-self-use, invalid-name
 
 import json
+from datetime import datetime
 from unittest.mock import patch
 
 import pytest
 import yaml
+from flask import g
 
 from superset import db, security_manager
 from superset.charts.commands.exceptions import ChartNotFoundError
 from superset.charts.commands.export import ExportChartsCommand
 from superset.charts.commands.importers.v1 import ImportChartsCommand
+from superset.charts.commands.update import UpdateChartCommand
 from superset.commands.exceptions import CommandInvalidError
 from superset.commands.importers.exceptions import IncorrectVersionError
 from superset.connectors.sqla.models import SqlaTable
 from superset.models.core import Database
 from superset.models.slice import Slice
-from tests.base_tests import SupersetTestCase
-from tests.fixtures.energy_dashboard import load_energy_table_with_slice
-from tests.fixtures.importexport import (
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.fixtures.energy_dashboard import (
+    load_energy_table_with_slice,
+)
+from tests.integration_tests.fixtures.importexport import (
     chart_config,
     chart_metadata_config,
     database_config,
@@ -76,6 +81,7 @@ def test_export_chart_command(self, mock_g):
                 "slice_name": "Energy Sankey",
                 "viz_type": "sankey",
             },
+            "query_context": None,
             "cache_timeout": None,
             "dataset_uuid": str(example_chart.table.uuid),
             "uuid": str(example_chart.uuid),
@@ -121,6 +127,7 @@ def test_export_chart_command_key_order(self, mock_g):
             "slice_name",
             "viz_type",
             "params",
+            "query_context",
             "cache_timeout",
             "uuid",
             "version",
@@ -140,9 +147,9 @@ def test_import_v1_chart(self):
         command = ImportChartsCommand(contents)
         command.run()
 
-        chart: Slice = db.session.query(Slice).filter_by(
-            uuid=chart_config["uuid"]
-        ).one()
+        chart: Slice = (
+            db.session.query(Slice).filter_by(uuid=chart_config["uuid"]).one()
+        )
         dataset = chart.datasource
         assert json.loads(chart.params) == {
             "color_picker": {"a": 1, "b": 135, "g": 122, "r": 0},
@@ -184,6 +191,34 @@ def test_import_v1_chart(self):
         )
         assert dataset.table_name == "imported_dataset"
         assert chart.table == dataset
+        assert json.loads(chart.query_context) == {
+            "datasource": {"id": dataset.id, "type": "table"},
+            "force": False,
+            "queries": [
+                {
+                    "time_range": " : ",
+                    "filters": [],
+                    "extras": {
+                        "time_grain_sqla": None,
+                        "having": "",
+                        "having_druid": [],
+                        "where": "",
+                    },
+                    "applied_time_extras": {},
+                    "columns": [],
+                    "metrics": [],
+                    "annotation_layers": [],
+                    "row_limit": 5000,
+                    "timeseries_limit": 0,
+                    "order_desc": True,
+                    "url_params": {},
+                    "custom_params": {},
+                    "custom_form_data": {},
+                }
+            ],
+            "result_format": "json",
+            "result_type": "full",
+        }
 
         database = (
             db.session.query(Database).filter_by(uuid=database_config["uuid"]).one()
@@ -271,3 +306,26 @@ def test_import_v1_chart_validation(self):
                 "database_name": ["Missing data for required field."],
             }
         }
+
+
+class TestChartsUpdateCommand(SupersetTestCase):
+    @patch("superset.views.base.g")
+    @patch("superset.security.manager.g")
+    @pytest.mark.usefixtures("load_energy_table_with_slice")
+    def test_update_v1_response(self, mock_sm_g, mock_g):
+        """"Test that a chart command updates properties"""
+        pk = db.session.query(Slice).all()[0].id
+        actor = security_manager.find_user(username="admin")
+        mock_g.user = mock_sm_g.user = actor
+        model_id = pk
+        json_obj = {
+            "description": "test for update",
+            "cache_timeout": None,
+            "owners": [1],
+        }
+        command = UpdateChartCommand(actor, model_id, json_obj)
+        last_saved_before = db.session.query(Slice).get(pk).last_saved_at
+        command.run()
+        chart = db.session.query(Slice).get(pk)
+        assert chart.last_saved_at != last_saved_before
+        assert chart.last_saved_by == actor
diff --git a/tests/dashboards/filter_sets/__init__.py b/tests/integration_tests/charts/filter_sets/__init__.py
similarity index 100%
rename from tests/dashboards/filter_sets/__init__.py
rename to tests/integration_tests/charts/filter_sets/__init__.py
diff --git a/tests/dashboards/filter_sets/conftest.py b/tests/integration_tests/charts/filter_sets/conftest.py
similarity index 100%
rename from tests/dashboards/filter_sets/conftest.py
rename to tests/integration_tests/charts/filter_sets/conftest.py
diff --git a/tests/dashboards/filter_sets/consts.py b/tests/integration_tests/charts/filter_sets/consts.py
similarity index 100%
rename from tests/dashboards/filter_sets/consts.py
rename to tests/integration_tests/charts/filter_sets/consts.py
diff --git a/tests/dashboards/filter_sets/create_api_tests.py b/tests/integration_tests/charts/filter_sets/create_api_tests.py
similarity index 100%
rename from tests/dashboards/filter_sets/create_api_tests.py
rename to tests/integration_tests/charts/filter_sets/create_api_tests.py
diff --git a/tests/dashboards/filter_sets/delete_api_tests.py b/tests/integration_tests/charts/filter_sets/delete_api_tests.py
similarity index 100%
rename from tests/dashboards/filter_sets/delete_api_tests.py
rename to tests/integration_tests/charts/filter_sets/delete_api_tests.py
diff --git a/tests/dashboards/filter_sets/get_api_tests.py b/tests/integration_tests/charts/filter_sets/get_api_tests.py
similarity index 100%
rename from tests/dashboards/filter_sets/get_api_tests.py
rename to tests/integration_tests/charts/filter_sets/get_api_tests.py
diff --git a/tests/dashboards/filter_sets/update_api_tests.py b/tests/integration_tests/charts/filter_sets/update_api_tests.py
similarity index 100%
rename from tests/dashboards/filter_sets/update_api_tests.py
rename to tests/integration_tests/charts/filter_sets/update_api_tests.py
diff --git a/tests/dashboards/filter_sets/utils.py b/tests/integration_tests/charts/filter_sets/utils.py
similarity index 100%
rename from tests/dashboards/filter_sets/utils.py
rename to tests/integration_tests/charts/filter_sets/utils.py
diff --git a/tests/charts/schema_tests.py b/tests/integration_tests/charts/schema_tests.py
similarity index 95%
rename from tests/charts/schema_tests.py
rename to tests/integration_tests/charts/schema_tests.py
index dc191904e85d..e34b7d71fb41 100644
--- a/tests/charts/schema_tests.py
+++ b/tests/integration_tests/charts/schema_tests.py
@@ -19,11 +19,11 @@
 from typing import Any, Dict, Tuple
 
 from marshmallow import ValidationError
-from tests.test_app import app
+from tests.integration_tests.test_app import app
 from superset.charts.schemas import ChartDataQueryContextSchema
 from superset.common.query_context import QueryContext
-from tests.base_tests import SupersetTestCase
-from tests.fixtures.query_context import get_query_context
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.fixtures.query_context import get_query_context
 
 
 class TestSchema(SupersetTestCase):
diff --git a/tests/cli_tests.py b/tests/integration_tests/cli_tests.py
similarity index 98%
rename from tests/cli_tests.py
rename to tests/integration_tests/cli_tests.py
index 7ea4b9350bb3..4ea464d56267 100644
--- a/tests/cli_tests.py
+++ b/tests/integration_tests/cli_tests.py
@@ -27,7 +27,9 @@
 
 import superset.cli
 from superset import app
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
 
 
 @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
diff --git a/tests/commands_test.py b/tests/integration_tests/commands_test.py
similarity index 95%
rename from tests/commands_test.py
rename to tests/integration_tests/commands_test.py
index 08c8d7ae4a0e..bd4206d6550b 100644
--- a/tests/commands_test.py
+++ b/tests/integration_tests/commands_test.py
@@ -18,7 +18,7 @@
 
 from superset.commands.exceptions import CommandInvalidError
 from superset.commands.importers.v1.utils import is_valid_config
-from tests.base_tests import SupersetTestCase
+from tests.integration_tests.base_tests import SupersetTestCase
 
 
 class TestCommandsExceptions(SupersetTestCase):
diff --git a/tests/config_tests.py b/tests/integration_tests/config_tests.py
similarity index 98%
rename from tests/config_tests.py
rename to tests/integration_tests/config_tests.py
index 1076e35c3fdc..6ac76793ca94 100644
--- a/tests/config_tests.py
+++ b/tests/integration_tests/config_tests.py
@@ -19,8 +19,8 @@
 import unittest
 from typing import Any, Dict
 
-from tests.base_tests import SupersetTestCase
-from tests.test_app import app
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.test_app import app
 
 from superset import db
 from superset.connectors.sqla.models import SqlaTable
diff --git a/tests/conftest.py b/tests/integration_tests/conftest.py
similarity index 95%
rename from tests/conftest.py
rename to tests/integration_tests/conftest.py
index 613aaca8d323..ca10a31a69dd 100644
--- a/tests/conftest.py
+++ b/tests/integration_tests/conftest.py
@@ -22,7 +22,7 @@
 from sqlalchemy.engine import Engine
 from unittest.mock import patch
 
-from tests.test_app import app
+from tests.integration_tests.test_app import app
 from superset import db
 from superset.extensions import feature_flag_manager
 from superset.utils.core import get_example_database, json_dumps_w_dates
@@ -41,7 +41,7 @@ def app_context():
 @pytest.fixture(autouse=True, scope="session")
 def setup_sample_data() -> Any:
     # TODO(john-bodley): Determine a cleaner way of setting up the sample data without
-    # relying on `tests.test_app.app` leveraging an  `app` fixture which is purposely
+    # relying on `tests.integration_tests.test_app.app` leveraging an  `app` fixture which is purposely
     # scoped to the function level to ensure tests remain idempotent.
     with app.app_context():
         setup_presto_if_needed()
@@ -115,7 +115,7 @@ def setup_presto_if_needed():
 
 def with_feature_flags(**mock_feature_flags):
     """
-    Use this decorator to mock feature flags in tests.
+    Use this decorator to mock feature flags in tests.integration_tests.
 
     Usage:
 
diff --git a/tests/core_tests.py b/tests/integration_tests/core_tests.py
similarity index 98%
rename from tests/core_tests.py
rename to tests/integration_tests/core_tests.py
index abf0ac3d4468..c609e6ba383d 100644
--- a/tests/core_tests.py
+++ b/tests/integration_tests/core_tests.py
@@ -25,7 +25,9 @@
 import logging
 from typing import Dict, List
 from urllib.parse import quote
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
 
 import pytest
 import pytz
@@ -39,9 +41,11 @@
 from sqlalchemy.exc import SQLAlchemyError
 from superset.models.cache import CacheKey
 from superset.utils.core import get_example_database
-from tests.conftest import with_feature_flags
-from tests.fixtures.energy_dashboard import load_energy_table_with_slice
-from tests.test_app import app
+from tests.integration_tests.conftest import with_feature_flags
+from tests.integration_tests.fixtures.energy_dashboard import (
+    load_energy_table_with_slice,
+)
+from tests.integration_tests.test_app import app
 import superset.views.utils
 from superset import (
     dataframe,
@@ -66,7 +70,9 @@
 from superset.views.database.views import DatabaseView
 
 from .base_tests import SupersetTestCase
-from tests.fixtures.world_bank_dashboard import load_world_bank_dashboard_with_slices
+from tests.integration_tests.fixtures.world_bank_dashboard import (
+    load_world_bank_dashboard_with_slices,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -742,7 +748,9 @@ def test_templated_sql_json(self):
         data = self.run_sql(sql, "fdaklj3ws")
         self.assertEqual(data["data"][0]["test"], "2")
 
-    @mock.patch("tests.superset_test_custom_template_processors.datetime")
+    @mock.patch(
+        "tests.integration_tests.superset_test_custom_template_processors.datetime"
+    )
     @mock.patch("superset.sql_lab.get_sql_results")
     def test_custom_templated_sql_json(self, sql_lab_mock, mock_dt) -> None:
         """Test sqllab receives macros expanded query."""
@@ -976,6 +984,7 @@ def test_explore_json_dist_bar_order(self):
                     "optionName": "metric_80g1qb9b6o7_ci5vquydcbe",
                 },
             ],
+            "order_desc": True,
             "adhoc_filters": [],
             "groupby": ["name"],
             "columns": [],
@@ -999,7 +1008,8 @@ def test_explore_json_dist_bar_order(self):
             SELECT count(name) AS count_name, count(ds) AS count_ds
             FROM birth_names
             WHERE ds >= '1921-01-22 00:00:00.000000' AND ds < '2021-01-22 00:00:00.000000'
-            GROUP BY name ORDER BY count_name DESC, count_ds DESC
+            GROUP BY name
+            ORDER BY count_name DESC
             LIMIT 10;
             """,
             client_id="client_id_1",
@@ -1195,7 +1205,7 @@ def test_get_select_star_not_allowed(self):
         self.login(username="gamma")
         example_db = utils.get_example_database()
         resp = self.client.get(f"/superset/select_star/{example_db.id}/birth_names")
-        self.assertEqual(resp.status_code, 404)
+        self.assertEqual(resp.status_code, 403)
 
     @mock.patch("superset.views.core.results_backend_use_msgpack", False)
     @mock.patch("superset.views.core.results_backend")
@@ -1412,7 +1422,7 @@ def test_sqllab_backend_persistence_payload(self):
             "client_id_1",
             user_name=username,
             raise_on_error=True,
-            sql_editor_id=tab_state_id,
+            sql_editor_id=str(tab_state_id),
         )
         # run an orphan query (no tab)
         self.run_sql(
diff --git a/tests/dashboards/security/__init__.py b/tests/integration_tests/css_templates/__init__.py
similarity index 100%
rename from tests/dashboards/security/__init__.py
rename to tests/integration_tests/css_templates/__init__.py
diff --git a/tests/css_templates/api_tests.py b/tests/integration_tests/css_templates/api_tests.py
similarity index 99%
rename from tests/css_templates/api_tests.py
rename to tests/integration_tests/css_templates/api_tests.py
index f4e1f65f8594..840149481dc0 100644
--- a/tests/css_templates/api_tests.py
+++ b/tests/integration_tests/css_templates/api_tests.py
@@ -21,12 +21,12 @@
 import prison
 from sqlalchemy.sql import func
 
-import tests.test_app
+import tests.integration_tests.test_app
 from superset import db
 from superset.models.core import CssTemplate
 from superset.utils.core import get_example_database
 
-from tests.base_tests import SupersetTestCase
+from tests.integration_tests.base_tests import SupersetTestCase
 
 
 CSS_TEMPLATES_FIXTURE_COUNT = 5
diff --git a/tests/csv_upload_tests.py b/tests/integration_tests/csv_upload_tests.py
similarity index 96%
rename from tests/csv_upload_tests.py
rename to tests/integration_tests/csv_upload_tests.py
index c12ff4434378..a8821fb0308d 100644
--- a/tests/csv_upload_tests.py
+++ b/tests/integration_tests/csv_upload_tests.py
@@ -27,12 +27,12 @@
 import pytest
 
 from superset.sql_parse import Table
-from tests.conftest import ADMIN_SCHEMA_NAME
-from tests.test_app import app  # isort:skip
+from tests.integration_tests.conftest import ADMIN_SCHEMA_NAME
+from tests.integration_tests.test_app import app  # isort:skip
 from superset import db
 from superset.models.core import Database
 from superset.utils import core as utils
-from tests.base_tests import get_resp, login, SupersetTestCase
+from tests.integration_tests.base_tests import get_resp, login, SupersetTestCase
 
 logger = logging.getLogger(__name__)
 
@@ -136,7 +136,7 @@ def upload_excel(
 
 def mock_upload_to_s3(filename: str, upload_prefix: str, table: Table) -> str:
     """
-    HDFS is used instead of S3 for the unit tests.
+    HDFS is used instead of S3 for the unit tests.integration_tests.
 
     :param filename: The file to upload
     :param upload_prefix: The S3 prefix
@@ -221,7 +221,7 @@ def test_import_csv_explore_database(setup_csv_upload, create_csv_files):
         f'CSV file "{CSV_FILENAME1}" uploaded to table "{CSV_UPLOAD_TABLE_W_EXPLORE}"'
         in resp
     )
-    table = SupersetTestCase.get_table_by_name(CSV_UPLOAD_TABLE_W_EXPLORE)
+    table = SupersetTestCase.get_table(name=CSV_UPLOAD_TABLE_W_EXPLORE)
     assert table.database_id == utils.get_example_database().id
 
 
@@ -267,7 +267,7 @@ def test_import_csv(setup_csv_upload, create_csv_files):
     )
     assert success_msg_f2 in resp
 
-    table = SupersetTestCase.get_table_by_name(CSV_UPLOAD_TABLE)
+    table = SupersetTestCase.get_table(name=CSV_UPLOAD_TABLE)
     # make sure the new column name is reflected in the table metadata
     assert "d" in table.column_names
 
diff --git a/tests/dashboard_tests.py b/tests/integration_tests/dashboard_tests.py
similarity index 97%
rename from tests/dashboard_tests.py
rename to tests/integration_tests/dashboard_tests.py
index b15e4b1306f9..feac2c60708c 100644
--- a/tests/dashboard_tests.py
+++ b/tests/integration_tests/dashboard_tests.py
@@ -25,17 +25,25 @@
 from flask import escape, url_for
 from sqlalchemy import func
 
-from tests.test_app import app
+from tests.integration_tests.test_app import app
 from superset import db, security_manager
 from superset.connectors.sqla.models import SqlaTable
 from superset.models import core as models
 from superset.models.dashboard import Dashboard
 from superset.models.slice import Slice
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
-from tests.fixtures.energy_dashboard import load_energy_table_with_slice
-from tests.fixtures.public_role import public_role_like_gamma
-from tests.fixtures.unicode_dashboard import load_unicode_dashboard_with_position
-from tests.fixtures.world_bank_dashboard import load_world_bank_dashboard_with_slices
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
+from tests.integration_tests.fixtures.energy_dashboard import (
+    load_energy_table_with_slice,
+)
+from tests.integration_tests.fixtures.public_role import public_role_like_gamma
+from tests.integration_tests.fixtures.unicode_dashboard import (
+    load_unicode_dashboard_with_position,
+)
+from tests.integration_tests.fixtures.world_bank_dashboard import (
+    load_world_bank_dashboard_with_slices,
+)
 
 from .base_tests import SupersetTestCase
 
diff --git a/tests/dashboard_utils.py b/tests/integration_tests/dashboard_utils.py
similarity index 91%
rename from tests/dashboard_utils.py
rename to tests/integration_tests/dashboard_utils.py
index 311dd5965adf..85daa0b1b8d0 100644
--- a/tests/dashboard_utils.py
+++ b/tests/integration_tests/dashboard_utils.py
@@ -35,6 +35,7 @@ def create_table_for_dashboard(
     dtype: Dict[str, Any],
     table_description: str = "",
     fetch_values_predicate: Optional[str] = None,
+    schema: Optional[str] = None,
 ) -> SqlaTable:
     df.to_sql(
         table_name,
@@ -44,14 +45,17 @@ def create_table_for_dashboard(
         dtype=dtype,
         index=False,
         method="multi",
+        schema=schema,
     )
 
     table_source = ConnectorRegistry.sources["table"]
     table = (
-        db.session.query(table_source).filter_by(table_name=table_name).one_or_none()
+        db.session.query(table_source)
+        .filter_by(database_id=database.id, schema=schema, table_name=table_name)
+        .one_or_none()
     )
     if not table:
-        table = table_source(table_name=table_name)
+        table = table_source(schema=schema, table_name=table_name)
     if fetch_values_predicate:
         table.fetch_values_predicate = fetch_values_predicate
     table.database = database
diff --git a/tests/databases/__init__.py b/tests/integration_tests/dashboards/__init__.py
similarity index 100%
rename from tests/databases/__init__.py
rename to tests/integration_tests/dashboards/__init__.py
diff --git a/tests/dashboards/api_tests.py b/tests/integration_tests/dashboards/api_tests.py
similarity index 96%
rename from tests/dashboards/api_tests.py
rename to tests/integration_tests/dashboards/api_tests.py
index 7bec82bb93a7..039ee20dd74a 100644
--- a/tests/dashboards/api_tests.py
+++ b/tests/integration_tests/dashboards/api_tests.py
@@ -23,7 +23,7 @@
 from unittest.mock import patch
 from zipfile import is_zipfile, ZipFile
 
-from tests.insert_chart_mixin import InsertChartMixin
+from tests.integration_tests.insert_chart_mixin import InsertChartMixin
 
 import pytest
 import prison
@@ -37,11 +37,12 @@
 from superset.models.core import FavStar, FavStarClassName
 from superset.models.reports import ReportSchedule, ReportScheduleType
 from superset.models.slice import Slice
+from superset.utils.core import backend
 from superset.views.base import generate_download_headers
 
-from tests.base_api_tests import ApiOwnersTestCaseMixin
-from tests.base_tests import SupersetTestCase
-from tests.fixtures.importexport import (
+from tests.integration_tests.base_api_tests import ApiOwnersTestCaseMixin
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.fixtures.importexport import (
     chart_config,
     database_config,
     dashboard_config,
@@ -50,9 +51,13 @@
     dataset_config,
     dataset_metadata_config,
 )
-from tests.utils.get_dashboards import get_dashboards_ids
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
-from tests.fixtures.world_bank_dashboard import load_world_bank_dashboard_with_slices
+from tests.integration_tests.utils.get_dashboards import get_dashboards_ids
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
+from tests.integration_tests.fixtures.world_bank_dashboard import (
+    load_world_bank_dashboard_with_slices,
+)
 
 DASHBOARDS_FIXTURE_COUNT = 10
 
@@ -179,8 +184,11 @@ def test_get_dashboard_datasets(self):
         data = json.loads(response.data.decode("utf-8"))
         dashboard = Dashboard.get("world_health")
         expected_dataset_ids = set([s.datasource_id for s in dashboard.slices])
-        actual_dataset_ids = set([dataset["id"] for dataset in data["result"]])
+        result = data["result"]
+        actual_dataset_ids = set([dataset["id"] for dataset in result])
         self.assertEqual(actual_dataset_ids, expected_dataset_ids)
+        expected_values = [0, 1] if backend() == "presto" else [0, 1, 2]
+        self.assertEqual(result[0]["column_types"], expected_values)
 
     @pytest.mark.usefixtures("load_world_bank_dashboard_with_slices")
     def test_get_dashboard_datasets_not_found(self):
@@ -331,14 +339,14 @@ def test_get_dashboard(self):
             "published": False,
             "url": "/superset/dashboard/slug1/",
             "slug": "slug1",
-            "table_names": "",
             "thumbnail_url": dashboard.thumbnail_url,
         }
         data = json.loads(rv.data.decode("utf-8"))
         self.assertIn("changed_on", data["result"])
+        self.assertIn("changed_on_delta_humanized", data["result"])
         for key, value in data["result"].items():
             # We can't assert timestamp values
-            if key != "changed_on":
+            if key not in ("changed_on", "changed_on_delta_humanized",):
                 self.assertEqual(value, expected_result[key])
         # rollback changes
         db.session.delete(dashboard)
@@ -1101,7 +1109,7 @@ def test_update_dashboard_chart_owners(self):
         for slice in slices:
             self.assertIn(user_alpha1, slice.owners)
             self.assertIn(user_alpha2, slice.owners)
-            self.assertIn(admin, slice.owners)
+            self.assertNotIn(admin, slice.owners)
             # Revert owners on slice
             slice.owners = []
             db.session.commit()
@@ -1141,22 +1149,45 @@ def test_update_partial_dashboard(self):
         db.session.delete(model)
         db.session.commit()
 
-    def test_update_dashboard_new_owner(self):
+    def test_update_dashboard_new_owner_not_admin(self):
         """
-        Dashboard API: Test update set new owner to current user
+        Dashboard API: Test update set new owner implicitly adds logged in owner
         """
-        gamma_id = self.get_user("gamma").id
+        gamma = self.get_user("gamma")
+        alpha = self.get_user("alpha")
+        dashboard_id = self.insert_dashboard("title1", "slug1", [alpha.id]).id
+        dashboard_data = {"dashboard_title": "title1_changed", "owners": [gamma.id]}
+        self.login(username="alpha")
+        uri = f"api/v1/dashboard/{dashboard_id}"
+        rv = self.client.put(uri, json=dashboard_data)
+        self.assertEqual(rv.status_code, 200)
+        model = db.session.query(Dashboard).get(dashboard_id)
+        self.assertIn(gamma, model.owners)
+        self.assertIn(alpha, model.owners)
+        for slc in model.slices:
+            self.assertIn(gamma, slc.owners)
+            self.assertIn(alpha, slc.owners)
+        db.session.delete(model)
+        db.session.commit()
+
+    def test_update_dashboard_new_owner_admin(self):
+        """
+        Dashboard API: Test update set new owner as admin to other than current user
+        """
+        gamma = self.get_user("gamma")
         admin = self.get_user("admin")
-        dashboard_id = self.insert_dashboard("title1", "slug1", [gamma_id]).id
-        dashboard_data = {"dashboard_title": "title1_changed"}
+        dashboard_id = self.insert_dashboard("title1", "slug1", [admin.id]).id
+        dashboard_data = {"dashboard_title": "title1_changed", "owners": [gamma.id]}
         self.login(username="admin")
         uri = f"api/v1/dashboard/{dashboard_id}"
         rv = self.client.put(uri, json=dashboard_data)
         self.assertEqual(rv.status_code, 200)
         model = db.session.query(Dashboard).get(dashboard_id)
-        self.assertIn(admin, model.owners)
+        self.assertIn(gamma, model.owners)
+        self.assertNotIn(admin, model.owners)
         for slc in model.slices:
-            self.assertIn(admin, slc.owners)
+            self.assertIn(gamma, slc.owners)
+            self.assertNotIn(admin, slc.owners)
         db.session.delete(model)
         db.session.commit()
 
diff --git a/tests/dashboards/base_case.py b/tests/integration_tests/dashboards/base_case.py
similarity index 93%
rename from tests/dashboards/base_case.py
rename to tests/integration_tests/dashboards/base_case.py
index 42cd87bfd93e..a0a1ff630f08 100644
--- a/tests/dashboards/base_case.py
+++ b/tests/integration_tests/dashboards/base_case.py
@@ -21,10 +21,14 @@
 from flask import Response
 
 from superset import app, security_manager
-from tests.base_tests import SupersetTestCase
-from tests.dashboards.consts import *
-from tests.dashboards.dashboard_test_utils import build_save_dash_parts
-from tests.dashboards.superset_factory_util import delete_all_inserted_objects
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.dashboards.consts import *
+from tests.integration_tests.dashboards.dashboard_test_utils import (
+    build_save_dash_parts,
+)
+from tests.integration_tests.dashboards.superset_factory_util import (
+    delete_all_inserted_objects,
+)
 
 
 class DashboardTestCase(SupersetTestCase):
diff --git a/tests/dashboards/commands_tests.py b/tests/integration_tests/dashboards/commands_tests.py
similarity index 99%
rename from tests/dashboards/commands_tests.py
rename to tests/integration_tests/dashboards/commands_tests.py
index 3449c001d982..7e466b8fcdfd 100644
--- a/tests/dashboards/commands_tests.py
+++ b/tests/integration_tests/dashboards/commands_tests.py
@@ -38,8 +38,8 @@
 from superset.models.core import Database
 from superset.models.dashboard import Dashboard
 from superset.models.slice import Slice
-from tests.base_tests import SupersetTestCase
-from tests.fixtures.importexport import (
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.fixtures.importexport import (
     chart_config,
     dashboard_config,
     dashboard_export,
@@ -48,7 +48,9 @@
     dataset_config,
     dataset_metadata_config,
 )
-from tests.fixtures.world_bank_dashboard import load_world_bank_dashboard_with_slices
+from tests.integration_tests.fixtures.world_bank_dashboard import (
+    load_world_bank_dashboard_with_slices,
+)
 
 
 class TestExportDashboardsCommand(SupersetTestCase):
diff --git a/tests/dashboards/consts.py b/tests/integration_tests/dashboards/consts.py
similarity index 100%
rename from tests/dashboards/consts.py
rename to tests/integration_tests/dashboards/consts.py
diff --git a/tests/dashboards/dao_tests.py b/tests/integration_tests/dashboards/dao_tests.py
similarity index 94%
rename from tests/dashboards/dao_tests.py
rename to tests/integration_tests/dashboards/dao_tests.py
index d8e5a735364d..6f6708a13d07 100644
--- a/tests/dashboards/dao_tests.py
+++ b/tests/integration_tests/dashboards/dao_tests.py
@@ -21,12 +21,14 @@
 
 import pytest
 
-import tests.test_app  # pylint: disable=unused-import
+import tests.integration_tests.test_app  # pylint: disable=unused-import
 from superset import db
 from superset.dashboards.dao import DashboardDAO
 from superset.models.dashboard import Dashboard
-from tests.base_tests import SupersetTestCase
-from tests.fixtures.world_bank_dashboard import load_world_bank_dashboard_with_slices
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.fixtures.world_bank_dashboard import (
+    load_world_bank_dashboard_with_slices,
+)
 
 
 class TestDashboardDAO(SupersetTestCase):
diff --git a/tests/dashboards/dashboard_test_utils.py b/tests/integration_tests/dashboards/dashboard_test_utils.py
similarity index 97%
rename from tests/dashboards/dashboard_test_utils.py
rename to tests/integration_tests/dashboards/dashboard_test_utils.py
index c7032f87e648..df2687fba939 100644
--- a/tests/dashboards/dashboard_test_utils.py
+++ b/tests/integration_tests/dashboards/dashboard_test_utils.py
@@ -25,7 +25,7 @@
 from superset.connectors.sqla.models import SqlaTable
 from superset.models.dashboard import Dashboard
 from superset.models.slice import Slice
-from tests.dashboards.consts import DEFAULT_DASHBOARD_SLUG_TO_TEST
+from tests.integration_tests.dashboards.consts import DEFAULT_DASHBOARD_SLUG_TO_TEST
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/datasets/__init__.py b/tests/integration_tests/dashboards/security/__init__.py
similarity index 100%
rename from tests/datasets/__init__.py
rename to tests/integration_tests/dashboards/security/__init__.py
diff --git a/tests/dashboards/security/base_case.py b/tests/integration_tests/dashboards/security/base_case.py
similarity index 97%
rename from tests/dashboards/security/base_case.py
rename to tests/integration_tests/dashboards/security/base_case.py
index 5c8e82151dd5..75e8772b59a4 100644
--- a/tests/dashboards/security/base_case.py
+++ b/tests/integration_tests/dashboards/security/base_case.py
@@ -19,7 +19,7 @@
 from flask import escape, Response
 
 from superset.models.dashboard import Dashboard
-from tests.dashboards.base_case import DashboardTestCase
+from tests.integration_tests.dashboards.base_case import DashboardTestCase
 
 
 class BaseTestDashboardSecurity(DashboardTestCase):
diff --git a/tests/dashboards/security/security_dataset_tests.py b/tests/integration_tests/dashboards/security/security_dataset_tests.py
similarity index 95%
rename from tests/dashboards/security/security_dataset_tests.py
rename to tests/integration_tests/dashboards/security/security_dataset_tests.py
index b22e1fee143f..de5a14ef375f 100644
--- a/tests/dashboards/security/security_dataset_tests.py
+++ b/tests/integration_tests/dashboards/security/security_dataset_tests.py
@@ -23,11 +23,13 @@
 
 from superset import app
 from superset.models import core as models
-from tests.dashboards.base_case import DashboardTestCase
-from tests.dashboards.consts import *
-from tests.dashboards.dashboard_test_utils import *
-from tests.dashboards.superset_factory_util import *
-from tests.fixtures.energy_dashboard import load_energy_table_with_slice
+from tests.integration_tests.dashboards.base_case import DashboardTestCase
+from tests.integration_tests.dashboards.consts import *
+from tests.integration_tests.dashboards.dashboard_test_utils import *
+from tests.integration_tests.dashboards.superset_factory_util import *
+from tests.integration_tests.fixtures.energy_dashboard import (
+    load_energy_table_with_slice,
+)
 
 
 class TestDashboardDatasetSecurity(DashboardTestCase):
diff --git a/tests/dashboards/security/security_rbac_tests.py b/tests/integration_tests/dashboards/security/security_rbac_tests.py
similarity index 96%
rename from tests/dashboards/security/security_rbac_tests.py
rename to tests/integration_tests/dashboards/security/security_rbac_tests.py
index bb8666845f2a..c1be5a911ae3 100644
--- a/tests/dashboards/security/security_rbac_tests.py
+++ b/tests/integration_tests/dashboards/security/security_rbac_tests.py
@@ -19,17 +19,21 @@
 
 import pytest
 
-from tests.dashboards.dashboard_test_utils import *
-from tests.dashboards.security.base_case import BaseTestDashboardSecurity
-from tests.dashboards.superset_factory_util import (
+from tests.integration_tests.dashboards.dashboard_test_utils import *
+from tests.integration_tests.dashboards.security.base_case import (
+    BaseTestDashboardSecurity,
+)
+from tests.integration_tests.dashboards.superset_factory_util import (
     create_dashboard_to_db,
     create_database_to_db,
     create_datasource_table_to_db,
     create_slice_to_db,
 )
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
-from tests.fixtures.public_role import public_role_like_gamma
-from tests.fixtures.query_context import get_query_context
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
+from tests.integration_tests.fixtures.public_role import public_role_like_gamma
+from tests.integration_tests.fixtures.query_context import get_query_context
 
 CHART_DATA_URI = "api/v1/chart/data"
 
diff --git a/tests/dashboards/superset_factory_util.py b/tests/integration_tests/dashboards/superset_factory_util.py
similarity index 98%
rename from tests/dashboards/superset_factory_util.py
rename to tests/integration_tests/dashboards/superset_factory_util.py
index 59044c2c95b4..b67c60ca0736 100644
--- a/tests/dashboards/superset_factory_util.py
+++ b/tests/integration_tests/dashboards/superset_factory_util.py
@@ -30,7 +30,11 @@
     DashboardRoles,
 )
 from superset.models.slice import Slice, slice_user
-from tests.dashboards.dashboard_test_utils import random_slug, random_str, random_title
+from tests.integration_tests.dashboards.dashboard_test_utils import (
+    random_slug,
+    random_str,
+    random_title,
+)
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/db_engine_specs/__init__.py b/tests/integration_tests/databases/__init__.py
similarity index 100%
rename from tests/db_engine_specs/__init__.py
rename to tests/integration_tests/databases/__init__.py
diff --git a/tests/databases/api_tests.py b/tests/integration_tests/databases/api_tests.py
similarity index 87%
rename from tests/databases/api_tests.py
rename to tests/integration_tests/databases/api_tests.py
index fad93ade8ee8..7c3406bf11ec 100644
--- a/tests/databases/api_tests.py
+++ b/tests/integration_tests/databases/api_tests.py
@@ -23,6 +23,7 @@
 from io import BytesIO
 from unittest import mock
 from zipfile import is_zipfile, ZipFile
+from operator import itemgetter
 
 import prison
 import pytest
@@ -38,24 +39,33 @@
 from superset.db_engine_specs.postgres import PostgresEngineSpec
 from superset.db_engine_specs.redshift import RedshiftEngineSpec
 from superset.db_engine_specs.bigquery import BigQueryEngineSpec
+from superset.db_engine_specs.gsheets import GSheetsEngineSpec
 from superset.db_engine_specs.hana import HanaEngineSpec
 from superset.errors import SupersetError
 from superset.models.core import Database, ConfigurationMethod
 from superset.models.reports import ReportSchedule, ReportScheduleType
 from superset.utils.core import get_example_database, get_main_database
-from tests.base_tests import SupersetTestCase
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
-from tests.fixtures.certificates import ssl_certificate
-from tests.fixtures.energy_dashboard import load_energy_table_with_slice
-from tests.fixtures.world_bank_dashboard import load_world_bank_dashboard_with_slices
-from tests.fixtures.importexport import (
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
+from tests.integration_tests.fixtures.certificates import ssl_certificate
+from tests.integration_tests.fixtures.energy_dashboard import (
+    load_energy_table_with_slice,
+)
+from tests.integration_tests.fixtures.world_bank_dashboard import (
+    load_world_bank_dashboard_with_slices,
+)
+from tests.integration_tests.fixtures.importexport import (
     database_config,
     dataset_config,
     database_metadata_config,
     dataset_metadata_config,
 )
-from tests.fixtures.unicode_dashboard import load_unicode_dashboard_with_position
-from tests.test_app import app
+from tests.integration_tests.fixtures.unicode_dashboard import (
+    load_unicode_dashboard_with_position,
+)
+from tests.integration_tests.test_app import app
 
 
 class TestDatabaseApi(SupersetTestCase):
@@ -168,6 +178,7 @@ def test_get_items(self):
             "database_name",
             "explore_database_id",
             "expose_in_sqllab",
+            "extra",
             "force_ctas_schema",
             "id",
         ]
@@ -278,36 +289,33 @@ def test_create_database_invalid_configuration_method(self):
         }
         assert rv.status_code == 400
 
-    # add this test back in when config method becomes required for creation.
-    # def test_create_database_no_configuration_method(self):
-    #     """
-    #     Database API: Test create with no config method.
-    #     """
-    #     extra = {
-    #         "metadata_params": {},
-    #         "engine_params": {},
-    #         "metadata_cache_timeout": {},
-    #         "schemas_allowed_for_csv_upload": [],
-    #     }
-
-    #     self.login(username="admin")
-    #     example_db = get_example_database()
-    #     if example_db.backend == "sqlite":
-    #         return
-    #     database_data = {
-    #         "database_name": "test-create-database",
-    #         "sqlalchemy_uri": example_db.sqlalchemy_uri_decrypted,
-    #         "server_cert": None,
-    #         "extra": json.dumps(extra),
-    #     }
-
-    #     uri = "api/v1/database/"
-    #     rv = self.client.post(uri, json=database_data)
-    #     response = json.loads(rv.data.decode("utf-8"))
-    #     assert response == {
-    #         "message": {"configuration_method": ["Missing data for required field."]}
-    #     }
-    #     assert rv.status_code == 400
+    def test_create_database_no_configuration_method(self):
+        """
+        Database API: Test create with no config method.
+        """
+        extra = {
+            "metadata_params": {},
+            "engine_params": {},
+            "metadata_cache_timeout": {},
+            "schemas_allowed_for_csv_upload": [],
+        }
+
+        self.login(username="admin")
+        example_db = get_example_database()
+        if example_db.backend == "sqlite":
+            return
+        database_data = {
+            "database_name": "test-create-database",
+            "sqlalchemy_uri": example_db.sqlalchemy_uri_decrypted,
+            "server_cert": None,
+            "extra": json.dumps(extra),
+        }
+
+        uri = "api/v1/database/"
+        rv = self.client.post(uri, json=database_data)
+        response = json.loads(rv.data.decode("utf-8"))
+        assert rv.status_code == 201
+        self.assertIn("sqlalchemy_form", response["result"]["configuration_method"])
 
     def test_create_database_server_cert_validate(self):
         """
@@ -422,7 +430,9 @@ def test_create_database_unique_validate(self):
         rv = self.client.post(uri, json=database_data)
         response = json.loads(rv.data.decode("utf-8"))
         expected_response = {
-            "message": {"database_name": "A database with the same name already exists"}
+            "message": {
+                "database_name": "A database with the same name already exists."
+            }
         }
         self.assertEqual(rv.status_code, 422)
         self.assertEqual(response, expected_response)
@@ -568,7 +578,9 @@ def test_update_database_uniqueness(self):
         rv = self.client.put(uri, json=database_data)
         response = json.loads(rv.data.decode("utf-8"))
         expected_response = {
-            "message": {"database_name": "A database with the same name already exists"}
+            "message": {
+                "database_name": "A database with the same name already exists."
+            }
         }
         self.assertEqual(rv.status_code, 422)
         self.assertEqual(response, expected_response)
@@ -976,7 +988,7 @@ def test_test_connection_failed(self):
         expected_response = {
             "errors": [
                 {
-                    "message": "Could not load database driver: MssqlEngineSpec",
+                    "message": "Could not load database driver: AzureSynapseSpec",
                     "error_type": "GENERIC_COMMAND_ERROR",
                     "level": "warning",
                     "extra": {
@@ -1427,6 +1439,7 @@ def test_available(self, app, get_available_engine_specs):
             PostgresEngineSpec: {"psycopg2"},
             BigQueryEngineSpec: {"bigquery"},
             MySQLEngineSpec: {"mysqlconnector", "mysqldb"},
+            GSheetsEngineSpec: {"apsw"},
             RedshiftEngineSpec: {"psycopg2"},
             HanaEngineSpec: {""},
         }
@@ -1466,6 +1479,8 @@ def test_available(self, app, get_available_engine_specs):
                             "port": {
                                 "description": "Database port",
                                 "format": "int32",
+                                "maximum": 65536,
+                                "minimum": 0,
                                 "type": "integer",
                             },
                             "query": {
@@ -1496,9 +1511,9 @@ def test_available(self, app, get_available_engine_specs):
                                 "description": "Contents of BigQuery JSON credentials.",
                                 "type": "string",
                                 "x-encrypted-extra": True,
-                            }
+                            },
+                            "query": {"type": "object"},
                         },
-                        "required": ["credentials_info"],
                         "type": "object",
                     },
                     "preferred": True,
@@ -1531,6 +1546,8 @@ def test_available(self, app, get_available_engine_specs):
                             "port": {
                                 "description": "Database port",
                                 "format": "int32",
+                                "maximum": 65536,
+                                "minimum": 0,
                                 "type": "integer",
                             },
                             "query": {
@@ -1550,6 +1567,18 @@ def test_available(self, app, get_available_engine_specs):
                     "preferred": False,
                     "sqlalchemy_uri_placeholder": "redshift+psycopg2://user:password@host:port/dbname[?key=value&key=value...]",
                 },
+                {
+                    "available_drivers": ["apsw"],
+                    "default_driver": "apsw",
+                    "engine": "gsheets",
+                    "name": "Google Sheets",
+                    "parameters": {
+                        "properties": {"catalog": {"type": "object"},},
+                        "type": "object",
+                    },
+                    "preferred": False,
+                    "sqlalchemy_uri_placeholder": "gsheets://",
+                },
                 {
                     "available_drivers": ["mysqlconnector", "mysqldb"],
                     "default_driver": "mysqldb",
@@ -1577,6 +1606,8 @@ def test_available(self, app, get_available_engine_specs):
                             "port": {
                                 "description": "Database port",
                                 "format": "int32",
+                                "maximum": 65536,
+                                "minimum": 0,
                                 "type": "integer",
                             },
                             "query": {
@@ -1671,17 +1702,15 @@ def test_validate_parameters_invalid_payload_schema(self):
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 422
+        response["errors"].sort(key=lambda error: error["extra"]["invalid"][0])
         assert response == {
             "errors": [
                 {
-                    "message": "An error happened when validating the request",
+                    "message": "Missing data for required field.",
                     "error_type": "INVALID_PAYLOAD_SCHEMA_ERROR",
                     "level": "error",
                     "extra": {
-                        "messages": {
-                            "engine": ["Missing data for required field."],
-                            "foo": ["Unknown field."],
-                        },
+                        "invalid": ["configuration_method"],
                         "issue_codes": [
                             {
                                 "code": 1020,
@@ -1689,7 +1718,21 @@ def test_validate_parameters_invalid_payload_schema(self):
                             }
                         ],
                     },
-                }
+                },
+                {
+                    "message": "Missing data for required field.",
+                    "error_type": "INVALID_PAYLOAD_SCHEMA_ERROR",
+                    "level": "error",
+                    "extra": {
+                        "invalid": ["engine"],
+                        "issue_codes": [
+                            {
+                                "code": 1020,
+                                "message": "Issue 1020 - The submitted payload has the incorrect schema.",
+                            }
+                        ],
+                    },
+                },
             ]
         }
 
@@ -1697,6 +1740,7 @@ def test_validate_parameters_missing_fields(self):
         self.login(username="admin")
         url = "api/v1/database/validate_parameters"
         payload = {
+            "configuration_method": ConfigurationMethod.SQLALCHEMY_FORM,
             "engine": "postgresql",
             "parameters": defaultdict(dict),
         }
@@ -1733,6 +1777,93 @@ def test_validate_parameters_missing_fields(self):
             ]
         }
 
+    @mock.patch("superset.db_engine_specs.base.is_hostname_valid")
+    @mock.patch("superset.db_engine_specs.base.is_port_open")
+    @mock.patch("superset.databases.api.ValidateDatabaseParametersCommand")
+    def test_validate_parameters_valid_payload(
+        self, ValidateDatabaseParametersCommand, is_port_open, is_hostname_valid
+    ):
+        is_hostname_valid.return_value = True
+        is_port_open.return_value = True
+
+        self.login(username="admin")
+        url = "api/v1/database/validate_parameters"
+        payload = {
+            "engine": "postgresql",
+            "parameters": defaultdict(dict),
+            "configuration_method": ConfigurationMethod.SQLALCHEMY_FORM,
+        }
+        payload["parameters"].update(
+            {
+                "host": "localhost",
+                "port": 6789,
+                "username": "superset",
+                "password": "XXX",
+                "database": "test",
+                "query": {},
+            }
+        )
+        rv = self.client.post(url, json=payload)
+        response = json.loads(rv.data.decode("utf-8"))
+
+        assert rv.status_code == 200
+        assert response == {"message": "OK"}
+
+    def test_validate_parameters_invalid_port(self):
+        self.login(username="admin")
+        url = "api/v1/database/validate_parameters"
+        payload = {
+            "engine": "postgresql",
+            "parameters": defaultdict(dict),
+            "configuration_method": ConfigurationMethod.SQLALCHEMY_FORM,
+        }
+        payload["parameters"].update(
+            {
+                "host": "localhost",
+                "port": "string",
+                "username": "superset",
+                "password": "XXX",
+                "database": "test",
+                "query": {},
+            }
+        )
+        rv = self.client.post(url, json=payload)
+        response = json.loads(rv.data.decode("utf-8"))
+
+        assert rv.status_code == 422
+        assert response == {
+            "errors": [
+                {
+                    "message": "Port must be a valid integer.",
+                    "error_type": "CONNECTION_INVALID_PORT_ERROR",
+                    "level": "error",
+                    "extra": {
+                        "invalid": ["port"],
+                        "issue_codes": [
+                            {
+                                "code": 1034,
+                                "message": "Issue 1034 - The port number is invalid.",
+                            }
+                        ],
+                    },
+                },
+                {
+                    "message": "The port must be an integer between 0 and 65535 (inclusive).",
+                    "error_type": "CONNECTION_INVALID_PORT_ERROR",
+                    "level": "error",
+                    "extra": {
+                        "invalid": ["port"],
+                        "issue_codes": [
+                            {
+                                "code": 1034,
+                                "message": "Issue 1034 - The port number is invalid.",
+                            }
+                        ],
+                    },
+                },
+            ]
+        }
+
     @mock.patch("superset.db_engine_specs.base.is_hostname_valid")
     def test_validate_parameters_invalid_host(self, is_hostname_valid):
         is_hostname_valid.return_value = False
@@ -1742,6 +1873,7 @@ def test_validate_parameters_invalid_host(self, is_hostname_valid):
         payload = {
             "engine": "postgresql",
             "parameters": defaultdict(dict),
+            "configuration_method": ConfigurationMethod.SQLALCHEMY_FORM,
         }
         payload["parameters"].update(
             {
@@ -1789,3 +1921,61 @@ def test_validate_parameters_invalid_host(self, is_hostname_valid):
                 },
             ]
         }
+
+    @mock.patch("superset.db_engine_specs.base.is_hostname_valid")
+    def test_validate_parameters_invalid_port_range(self, is_hostname_valid):
+        is_hostname_valid.return_value = True
+
+        self.login(username="admin")
+        url = "api/v1/database/validate_parameters"
+        payload = {
+            "engine": "postgresql",
+            "parameters": defaultdict(dict),
+            "configuration_method": ConfigurationMethod.SQLALCHEMY_FORM,
+        }
+        payload["parameters"].update(
+            {
+                "host": "localhost",
+                "port": 65536,
+                "username": "",
+                "password": "",
+                "database": "",
+                "query": {},
+            }
+        )
+        rv = self.client.post(url, json=payload)
+        response = json.loads(rv.data.decode("utf-8"))
+
+        assert rv.status_code == 422
+        assert response == {
+            "errors": [
+                {
+                    "message": "One or more parameters are missing: database, username",
+                    "error_type": "CONNECTION_MISSING_PARAMETERS_ERROR",
+                    "level": "warning",
+                    "extra": {
+                        "missing": ["database", "username"],
+                        "issue_codes": [
+                            {
+                                "code": 1018,
+                                "message": "Issue 1018 - One or more parameters needed to configure a database are missing.",
+                            }
+                        ],
+                    },
+                },
+                {
+                    "message": "The port must be an integer between 0 and 65535 (inclusive).",
+                    "error_type": "CONNECTION_INVALID_PORT_ERROR",
+                    "level": "error",
+                    "extra": {
+                        "invalid": ["port"],
+                        "issue_codes": [
+                            {
+                                "code": 1034,
+                                "message": "Issue 1034 - The port number is invalid.",
+                            }
+                        ],
+                    },
+                },
+            ]
+        }
diff --git a/tests/databases/commands_tests.py b/tests/integration_tests/databases/commands_tests.py
similarity index 98%
rename from tests/databases/commands_tests.py
rename to tests/integration_tests/databases/commands_tests.py
index 92152173ebc8..7d762b10fb55 100644
--- a/tests/databases/commands_tests.py
+++ b/tests/integration_tests/databases/commands_tests.py
@@ -42,10 +42,14 @@
 from superset.exceptions import SupersetErrorsException, SupersetSecurityException
 from superset.models.core import Database
 from superset.utils.core import backend, get_example_database
-from tests.base_tests import SupersetTestCase
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
-from tests.fixtures.energy_dashboard import load_energy_table_with_slice
-from tests.fixtures.importexport import (
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
+from tests.integration_tests.fixtures.energy_dashboard import (
+    load_energy_table_with_slice,
+)
+from tests.integration_tests.fixtures.importexport import (
     database_config,
     database_metadata_config,
     dataset_config,
@@ -583,7 +587,7 @@ def test_connection_superset_security_connection(
         connection exc is raised"""
         database = get_example_database()
         mock_get_sqla_engine.side_effect = SupersetSecurityException(
-            SupersetError(error_type=500, message="test", level="info", extra={})
+            SupersetError(error_type=500, message="test", level="info")
         )
         db_uri = database.sqlalchemy_uri_decrypted
         json_payload = {"sqlalchemy_uri": db_uri}
diff --git a/tests/databases/schema_tests.py b/tests/integration_tests/databases/schema_tests.py
similarity index 100%
rename from tests/databases/schema_tests.py
rename to tests/integration_tests/databases/schema_tests.py
diff --git a/tests/dataframe_test.py b/tests/integration_tests/dataframe_test.py
similarity index 98%
rename from tests/dataframe_test.py
rename to tests/integration_tests/dataframe_test.py
index a6dbbac3014e..6d747edd73d1 100644
--- a/tests/dataframe_test.py
+++ b/tests/integration_tests/dataframe_test.py
@@ -18,7 +18,7 @@
 import numpy as np
 import pandas as pd
 
-import tests.test_app
+import tests.integration_tests.test_app
 from superset.dataframe import df_to_records
 from superset.db_engine_specs import BaseEngineSpec
 from superset.result_set import SupersetResultSet
diff --git a/tests/fixtures/__init__.py b/tests/integration_tests/datasets/__init__.py
similarity index 100%
rename from tests/fixtures/__init__.py
rename to tests/integration_tests/datasets/__init__.py
diff --git a/tests/datasets/api_tests.py b/tests/integration_tests/datasets/api_tests.py
similarity index 97%
rename from tests/datasets/api_tests.py
rename to tests/integration_tests/datasets/api_tests.py
index ea0e17277a93..c9701534b266 100644
--- a/tests/datasets/api_tests.py
+++ b/tests/integration_tests/datasets/api_tests.py
@@ -38,11 +38,15 @@
 from superset.models.core import Database
 from superset.utils.core import backend, get_example_database, get_main_database
 from superset.utils.dict_import_export import export_to_dict
-from tests.base_tests import SupersetTestCase
-from tests.conftest import CTAS_SCHEMA_NAME
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
-from tests.fixtures.energy_dashboard import load_energy_table_with_slice
-from tests.fixtures.importexport import (
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.conftest import CTAS_SCHEMA_NAME
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
+from tests.integration_tests.fixtures.energy_dashboard import (
+    load_energy_table_with_slice,
+)
+from tests.integration_tests.fixtures.importexport import (
     database_config,
     database_metadata_config,
     dataset_config,
@@ -59,10 +63,10 @@ class TestDatasetApi(SupersetTestCase):
     @staticmethod
     def insert_dataset(
         table_name: str,
-        schema: str,
         owners: List[int],
         database: Database,
         sql: Optional[str] = None,
+        schema: Optional[str] = None,
     ) -> SqlaTable:
         obj_owners = list()
         for owner in owners:
@@ -82,7 +86,7 @@ def insert_dataset(
 
     def insert_default_dataset(self):
         return self.insert_dataset(
-            "ab_permission", "", [self.get_user("admin").id], get_main_database()
+            "ab_permission", [self.get_user("admin").id], get_main_database()
         )
 
     def get_fixture_datasets(self) -> List[SqlaTable]:
@@ -101,11 +105,7 @@ def create_virtual_datasets(self):
             for table_name in self.fixture_virtual_table_names:
                 datasets.append(
                     self.insert_dataset(
-                        table_name,
-                        "",
-                        [admin.id],
-                        main_db,
-                        "SELECT * from ab_view_menu;",
+                        table_name, [admin.id], main_db, "SELECT * from ab_view_menu;",
                     )
                 )
             yield datasets
@@ -122,9 +122,7 @@ def create_datasets(self):
             admin = self.get_user("admin")
             main_db = get_main_database()
             for tables_name in self.fixture_tables_names:
-                datasets.append(
-                    self.insert_dataset(tables_name, "", [admin.id], main_db)
-                )
+                datasets.append(self.insert_dataset(tables_name, [admin.id], main_db))
             yield datasets
 
             # rollback changes
@@ -181,7 +179,9 @@ def test_get_dataset_list(self):
             "changed_on_delta_humanized",
             "changed_on_utc",
             "database",
+            "datasource_type",
             "default_endpoint",
+            "description",
             "explore_url",
             "extra",
             "id",
@@ -222,6 +222,7 @@ def test_get_dataset_item(self):
         Dataset API: Test get dataset item
         """
         table = self.get_energy_usage_dataset()
+        main_db = get_main_database()
         self.login(username="admin")
         uri = f"api/v1/dataset/{table.id}"
         rv = self.get_assert_metric(uri, "get")
@@ -229,7 +230,11 @@ def test_get_dataset_item(self):
         response = json.loads(rv.data.decode("utf-8"))
         expected_result = {
             "cache_timeout": None,
-            "database": {"database_name": "examples", "id": 1},
+            "database": {
+                "backend": main_db.backend,
+                "database_name": "examples",
+                "id": 1,
+            },
             "default_endpoint": None,
             "description": "Energy consumption",
             "extra": None,
@@ -244,9 +249,10 @@ def test_get_dataset_item(self):
             "table_name": "energy_usage",
             "template_params": None,
         }
-        assert {
-            k: v for k, v in response["result"].items() if k in expected_result
-        } == expected_result
+        if response["result"]["database"]["backend"] not in ("presto", "hive"):
+            assert {
+                k: v for k, v in response["result"].items() if k in expected_result
+            } == expected_result
         assert len(response["result"]["columns"]) == 3
         assert len(response["result"]["metrics"]) == 2
 
@@ -266,11 +272,13 @@ def pg_test_query_parameter(query_parameter, expected_response):
         datasets = []
         if example_db.backend == "postgresql":
             datasets.append(
-                self.insert_dataset("ab_permission", "public", [], get_main_database())
+                self.insert_dataset(
+                    "ab_permission", [], get_main_database(), schema="public"
+                )
             )
             datasets.append(
                 self.insert_dataset(
-                    "columns", "information_schema", [], get_main_database()
+                    "columns", [], get_main_database(), schema="information_schema",
                 )
             )
             schema_values = [
@@ -630,6 +638,7 @@ def test_update_dataset_create_column(self):
         for column in data["result"]["columns"]:
             column.pop("changed_on", None)
             column.pop("created_on", None)
+            column.pop("type_generic", None)
 
         data["result"]["columns"].append(new_column_data)
         rv = self.client.put(uri, json={"columns": data["result"]["columns"]})
@@ -676,6 +685,7 @@ def test_update_dataset_delete_column(self):
         for column in data["result"]["columns"]:
             column.pop("changed_on", None)
             column.pop("created_on", None)
+            column.pop("type_generic", None)
 
         data["result"]["columns"].append(new_column_data)
         rv = self.client.put(uri, json={"columns": data["result"]["columns"]})
@@ -714,6 +724,7 @@ def test_update_dataset_update_column(self):
         for column in resp_columns:
             column.pop("changed_on", None)
             column.pop("created_on", None)
+            column.pop("type_generic", None)
 
         resp_columns[0]["groupby"] = False
         resp_columns[0]["filterable"] = False
@@ -914,7 +925,7 @@ def test_update_dataset_item_uniqueness(self):
         dataset = self.insert_default_dataset()
         self.login(username="admin")
         ab_user = self.insert_dataset(
-            "ab_user", "", [self.get_user("admin").id], get_main_database()
+            "ab_user", [self.get_user("admin").id], get_main_database()
         )
         table_data = {"table_name": "ab_user"}
         uri = f"api/v1/dataset/{dataset.id}"
diff --git a/tests/datasets/commands_tests.py b/tests/integration_tests/datasets/commands_tests.py
similarity index 97%
rename from tests/datasets/commands_tests.py
rename to tests/integration_tests/datasets/commands_tests.py
index 4df7365a5527..62e8414f79f1 100644
--- a/tests/datasets/commands_tests.py
+++ b/tests/integration_tests/datasets/commands_tests.py
@@ -33,9 +33,11 @@
 from superset.datasets.commands.importers import v0, v1
 from superset.models.core import Database
 from superset.utils.core import get_example_database
-from tests.base_tests import SupersetTestCase
-from tests.fixtures.energy_dashboard import load_energy_table_with_slice
-from tests.fixtures.importexport import (
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.fixtures.energy_dashboard import (
+    load_energy_table_with_slice,
+)
+from tests.integration_tests.fixtures.importexport import (
     database_config,
     database_metadata_config,
     dataset_cli_export,
@@ -43,7 +45,9 @@
     dataset_metadata_config,
     dataset_ui_export,
 )
-from tests.fixtures.world_bank_dashboard import load_world_bank_dashboard_with_slices
+from tests.integration_tests.fixtures.world_bank_dashboard import (
+    load_world_bank_dashboard_with_slices,
+)
 
 
 class TestExportDatasetsCommand(SupersetTestCase):
@@ -328,7 +332,7 @@ def test_import_v1_dataset(self):
         assert metric.expression == "count(1)"
         assert metric.description is None
         assert metric.d3format is None
-        assert metric.extra is None
+        assert metric.extra == "{}"
         assert metric.warning_text is None
 
         assert len(dataset.columns) == 1
diff --git a/tests/datasource_tests.py b/tests/integration_tests/datasource_tests.py
similarity index 61%
rename from tests/datasource_tests.py
rename to tests/integration_tests/datasource_tests.py
index 4ae3957f7748..2c64d7c03c06 100644
--- a/tests/datasource_tests.py
+++ b/tests/integration_tests/datasource_tests.py
@@ -16,38 +16,52 @@
 # under the License.
 """Unit tests for Superset"""
 import json
-from copy import deepcopy
+from contextlib import contextmanager
 from unittest import mock
 
+import prison
 import pytest
 
 from superset import app, ConnectorRegistry, db
 from superset.connectors.sqla.models import SqlaTable
 from superset.datasets.commands.exceptions import DatasetNotFoundError
-from superset.exceptions import SupersetException, SupersetGenericDBErrorException
+from superset.exceptions import SupersetGenericDBErrorException
+from superset.models.core import Database
 from superset.utils.core import get_example_database
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
+from tests.integration_tests.base_tests import db_insert_temp_object, SupersetTestCase
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
+from tests.integration_tests.fixtures.datasource import get_datasource_post
 
-from .base_tests import db_insert_temp_object, SupersetTestCase
-from .fixtures.datasource import datasource_post
+
+@contextmanager
+def create_test_table_context(database: Database):
+    database.get_sqla_engine().execute(
+        "CREATE TABLE test_table AS SELECT 1 as first, 2 as second"
+    )
+    database.get_sqla_engine().execute(
+        "INSERT INTO test_table (first, second) VALUES (1, 2)"
+    )
+    database.get_sqla_engine().execute(
+        "INSERT INTO test_table (first, second) VALUES (3, 4)"
+    )
+
+    yield db.session
+    database.get_sqla_engine().execute("DROP TABLE test_table")
 
 
 class TestDatasource(SupersetTestCase):
     def setUp(self):
-        self.original_attrs = {}
-        self.datasource = None
+        db.session.begin(subtransactions=True)
 
     def tearDown(self):
-        if self.datasource:
-            for key, value in self.original_attrs.items():
-                setattr(self.datasource, key, value)
-
-            db.session.commit()
+        db.session.rollback()
 
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_external_metadata_for_physical_table(self):
         self.login(username="admin")
-        tbl = self.get_table_by_name("birth_names")
+        tbl = self.get_table(name="birth_names")
         url = f"/datasource/external_metadata/table/{tbl.id}/"
         resp = self.get_json_resp(url)
         col_names = {o.get("name") for o in resp}
@@ -66,13 +80,108 @@ def test_external_metadata_for_virtual_table(self):
         session.add(table)
         session.commit()
 
-        table = self.get_table_by_name("dummy_sql_table")
+        table = self.get_table(name="dummy_sql_table")
         url = f"/datasource/external_metadata/table/{table.id}/"
         resp = self.get_json_resp(url)
         assert {o.get("name") for o in resp} == {"intcol", "strcol"}
         session.delete(table)
         session.commit()
 
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    def test_external_metadata_by_name_for_physical_table(self):
+        self.login(username="admin")
+        tbl = self.get_table(name="birth_names")
+        params = prison.dumps(
+            {
+                "datasource_type": "table",
+                "database_name": tbl.database.database_name,
+                "schema_name": tbl.schema,
+                "table_name": tbl.table_name,
+            }
+        )
+        url = f"/datasource/external_metadata_by_name/?q={params}"
+        resp = self.get_json_resp(url)
+        col_names = {o.get("name") for o in resp}
+        self.assertEqual(
+            col_names, {"num_boys", "num", "gender", "name", "ds", "state", "num_girls"}
+        )
+
+    def test_external_metadata_by_name_for_virtual_table(self):
+        self.login(username="admin")
+        session = db.session
+        table = SqlaTable(
+            table_name="dummy_sql_table",
+            database=get_example_database(),
+            sql="select 123 as intcol, 'abc' as strcol",
+        )
+        session.add(table)
+        session.commit()
+
+        tbl = self.get_table(name="dummy_sql_table")
+        params = prison.dumps(
+            {
+                "datasource_type": "table",
+                "database_name": tbl.database.database_name,
+                "schema_name": tbl.schema,
+                "table_name": tbl.table_name,
+            }
+        )
+        url = f"/datasource/external_metadata_by_name/?q={params}"
+        resp = self.get_json_resp(url)
+        assert {o.get("name") for o in resp} == {"intcol", "strcol"}
+        session.delete(tbl)
+        session.commit()
+
+    def test_external_metadata_by_name_from_sqla_inspector(self):
+        self.login(username="admin")
+        example_database = get_example_database()
+        with create_test_table_context(example_database):
+            params = prison.dumps(
+                {
+                    "datasource_type": "table",
+                    "database_name": example_database.database_name,
+                    "table_name": "test_table",
+                }
+            )
+            url = f"/datasource/external_metadata_by_name/?q={params}"
+            resp = self.get_json_resp(url)
+            col_names = {o.get("name") for o in resp}
+            self.assertEqual(col_names, {"first", "second"})
+
+        # No databases found
+        params = prison.dumps(
+            {"datasource_type": "table", "database_name": "foo", "table_name": "bar",}
+        )
+        url = f"/datasource/external_metadata_by_name/?q={params}"
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, DatasetNotFoundError.status)
+        self.assertEqual(
+            json.loads(resp.data.decode("utf-8")).get("error"),
+            DatasetNotFoundError.message,
+        )
+
+        # No table found
+        params = prison.dumps(
+            {
+                "datasource_type": "table",
+                "database_name": example_database.database_name,
+                "table_name": "fooooooooobarrrrrr",
+            }
+        )
+        url = f"/datasource/external_metadata_by_name/?q={params}"
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, DatasetNotFoundError.status)
+        self.assertEqual(
+            json.loads(resp.data.decode("utf-8")).get("error"),
+            DatasetNotFoundError.message,
+        )
+
+        # invalid query params
+        params = prison.dumps({"datasource_type": "table",})
+        url = f"/datasource/external_metadata_by_name/?q={params}"
+        resp = self.get_json_resp(url)
+        self.assertIn("error", resp)
+
     def test_external_metadata_for_virtual_table_template_params(self):
         self.login(username="admin")
         session = db.session
@@ -85,7 +194,7 @@ def test_external_metadata_for_virtual_table_template_params(self):
         session.add(table)
         session.commit()
 
-        table = self.get_table_by_name("dummy_sql_table_with_template_params")
+        table = self.get_table(name="dummy_sql_table_with_template_params")
         url = f"/datasource/external_metadata/table/{table.id}/"
         resp = self.get_json_resp(url)
         assert {o.get("name") for o in resp} == {"intcol"}
@@ -121,7 +230,7 @@ def test_external_metadata_for_mutistatement_virtual_table(self):
     @mock.patch("superset.connectors.sqla.models.SqlaTable.external_metadata")
     def test_external_metadata_error_return_400(self, mock_get_datasource):
         self.login(username="admin")
-        tbl = self.get_table_by_name("birth_names")
+        tbl = self.get_table(name="birth_names")
         url = f"/datasource/external_metadata/table/{tbl.id}/"
 
         mock_get_datasource.side_effect = SupersetGenericDBErrorException("oops")
@@ -146,13 +255,9 @@ def compare_lists(self, l1, l2, key):
 
     def test_save(self):
         self.login(username="admin")
-        tbl_id = self.get_table_by_name("birth_names").id
-
-        self.datasource = ConnectorRegistry.get_datasource("table", tbl_id, db.session)
-
-        for key in self.datasource.export_fields:
-            self.original_attrs[key] = getattr(self.datasource, key)
+        tbl_id = self.get_table(name="birth_names").id
 
+        datasource_post = get_datasource_post()
         datasource_post["id"] = tbl_id
         data = dict(data=json.dumps(datasource_post))
         resp = self.get_json_resp("/datasource/save/", data)
@@ -166,25 +271,21 @@ def test_save(self):
             else:
                 self.assertEqual(resp[k], datasource_post[k])
 
-    def save_datasource_from_dict(self, datasource_dict):
+    def save_datasource_from_dict(self, datasource_post):
         data = dict(data=json.dumps(datasource_post))
         resp = self.get_json_resp("/datasource/save/", data)
         return resp
 
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_change_database(self):
         self.login(username="admin")
-        tbl = self.get_table_by_name("birth_names")
+        tbl = self.get_table(name="birth_names")
         tbl_id = tbl.id
         db_id = tbl.database_id
+        datasource_post = get_datasource_post()
         datasource_post["id"] = tbl_id
 
-        self.datasource = ConnectorRegistry.get_datasource("table", tbl_id, db.session)
-
-        for key in self.datasource.export_fields:
-            self.original_attrs[key] = getattr(self.datasource, key)
-
         new_db = self.create_fake_db()
-
         datasource_post["database"]["id"] = new_db.id
         resp = self.save_datasource_from_dict(datasource_post)
         self.assertEqual(resp["database"]["id"], new_db.id)
@@ -197,15 +298,11 @@ def test_change_database(self):
 
     def test_save_duplicate_key(self):
         self.login(username="admin")
-        tbl_id = self.get_table_by_name("birth_names").id
-        self.datasource = ConnectorRegistry.get_datasource("table", tbl_id, db.session)
-
-        for key in self.datasource.export_fields:
-            self.original_attrs[key] = getattr(self.datasource, key)
+        tbl_id = self.get_table(name="birth_names").id
 
-        datasource_post_copy = deepcopy(datasource_post)
-        datasource_post_copy["id"] = tbl_id
-        datasource_post_copy["columns"].extend(
+        datasource_post = get_datasource_post()
+        datasource_post["id"] = tbl_id
+        datasource_post["columns"].extend(
             [
                 {
                     "column_name": "<new column>",
@@ -223,18 +320,15 @@ def test_save_duplicate_key(self):
                 },
             ]
         )
-        data = dict(data=json.dumps(datasource_post_copy))
+        data = dict(data=json.dumps(datasource_post))
         resp = self.get_json_resp("/datasource/save/", data, raise_on_error=False)
         self.assertIn("Duplicate column name(s): <new column>", resp["error"])
 
     def test_get_datasource(self):
         self.login(username="admin")
-        tbl = self.get_table_by_name("birth_names")
-        self.datasource = ConnectorRegistry.get_datasource("table", tbl.id, db.session)
-
-        for key in self.datasource.export_fields:
-            self.original_attrs[key] = getattr(self.datasource, key)
+        tbl = self.get_table(name="birth_names")
 
+        datasource_post = get_datasource_post()
         datasource_post["id"] = tbl.id
         data = dict(data=json.dumps(datasource_post))
         self.get_json_resp("/datasource/save/", data)
@@ -262,7 +356,7 @@ def my_check(datasource):
 
         app.config["DATASET_HEALTH_CHECK"] = my_check
         self.login(username="admin")
-        tbl = self.get_table_by_name("birth_names")
+        tbl = self.get_table(name="birth_names")
         datasource = ConnectorRegistry.get_datasource("table", tbl.id, db.session)
         assert datasource.health_check_message == "Warning message!"
         app.config["DATASET_HEALTH_CHECK"] = None
diff --git a/tests/migrations/__init__.py b/tests/integration_tests/db_engine_specs/__init__.py
similarity index 100%
rename from tests/migrations/__init__.py
rename to tests/integration_tests/db_engine_specs/__init__.py
diff --git a/tests/db_engine_specs/athena_tests.py b/tests/integration_tests/db_engine_specs/ascend_tests.py
similarity index 69%
rename from tests/db_engine_specs/athena_tests.py
rename to tests/integration_tests/db_engine_specs/ascend_tests.py
index d928a986daf3..ff1265674381 100644
--- a/tests/db_engine_specs/athena_tests.py
+++ b/tests/integration_tests/db_engine_specs/ascend_tests.py
@@ -14,20 +14,19 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from superset.db_engine_specs.athena import AthenaEngineSpec
-from tests.db_engine_specs.base_tests import TestDbEngineSpec
+from superset.db_engine_specs.ascend import AscendEngineSpec
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
 
 
-class TestAthenaDbEngineSpec(TestDbEngineSpec):
+class TestAscendDbEngineSpec(TestDbEngineSpec):
     def test_convert_dttm(self):
         dttm = self.get_dttm()
 
         self.assertEqual(
-            AthenaEngineSpec.convert_dttm("DATE", dttm),
-            "from_iso8601_date('2019-01-02')",
+            AscendEngineSpec.convert_dttm("DATE", dttm), "CAST('2019-01-02' AS DATE)"
         )
 
         self.assertEqual(
-            AthenaEngineSpec.convert_dttm("TIMESTAMP", dttm),
-            "from_iso8601_timestamp('2019-01-02T03:04:05.678900')",
+            AscendEngineSpec.convert_dttm("TIMESTAMP", dttm),
+            "CAST('2019-01-02T03:04:05.678900' AS TIMESTAMP)",
         )
diff --git a/tests/integration_tests/db_engine_specs/athena_tests.py b/tests/integration_tests/db_engine_specs/athena_tests.py
new file mode 100644
index 000000000000..484788f13707
--- /dev/null
+++ b/tests/integration_tests/db_engine_specs/athena_tests.py
@@ -0,0 +1,57 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from superset.db_engine_specs.athena import AthenaEngineSpec
+from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
+
+
+class TestAthenaDbEngineSpec(TestDbEngineSpec):
+    def test_convert_dttm(self):
+        dttm = self.get_dttm()
+
+        self.assertEqual(
+            AthenaEngineSpec.convert_dttm("DATE", dttm),
+            "from_iso8601_date('2019-01-02')",
+        )
+
+        self.assertEqual(
+            AthenaEngineSpec.convert_dttm("TIMESTAMP", dttm),
+            "from_iso8601_timestamp('2019-01-02T03:04:05.678900')",
+        )
+
+    def test_extract_errors(self):
+        """
+        Test that custom error messages are extracted correctly.
+        """
+        msg = ": mismatched input 'fromm'. Expecting: "
+        result = AthenaEngineSpec.extract_errors(Exception(msg))
+        assert result == [
+            SupersetError(
+                message='Please check your query for syntax errors at or near "fromm". Then, try running your query again.',
+                error_type=SupersetErrorType.SYNTAX_ERROR,
+                level=ErrorLevel.ERROR,
+                extra={
+                    "engine_name": "Amazon Athena",
+                    "issue_codes": [
+                        {
+                            "code": 1030,
+                            "message": "Issue 1030 - The query has a syntax error.",
+                        }
+                    ],
+                },
+            )
+        ]
diff --git a/tests/db_engine_specs/base_engine_spec_tests.py b/tests/integration_tests/db_engine_specs/base_engine_spec_tests.py
similarity index 99%
rename from tests/db_engine_specs/base_engine_spec_tests.py
rename to tests/integration_tests/db_engine_specs/base_engine_spec_tests.py
index b937eeadad23..3b69a0729b5c 100644
--- a/tests/db_engine_specs/base_engine_spec_tests.py
+++ b/tests/integration_tests/db_engine_specs/base_engine_spec_tests.py
@@ -31,8 +31,8 @@
 from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
 from superset.sql_parse import ParsedQuery
 from superset.utils.core import get_example_database
-from tests.db_engine_specs.base_tests import TestDbEngineSpec
-from tests.test_app import app
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
+from tests.integration_tests.test_app import app
 
 from ..fixtures.energy_dashboard import load_energy_table_with_slice
 from ..fixtures.pyodbcRow import Row
diff --git a/tests/db_engine_specs/base_tests.py b/tests/integration_tests/db_engine_specs/base_tests.py
similarity index 94%
rename from tests/db_engine_specs/base_tests.py
rename to tests/integration_tests/db_engine_specs/base_tests.py
index a0aee9ebdffd..6496d4609ab8 100644
--- a/tests/db_engine_specs/base_tests.py
+++ b/tests/integration_tests/db_engine_specs/base_tests.py
@@ -18,8 +18,8 @@
 from datetime import datetime
 from typing import Tuple, Type
 
-from tests.test_app import app
-from tests.base_tests import SupersetTestCase
+from tests.integration_tests.test_app import app
+from tests.integration_tests.base_tests import SupersetTestCase
 from superset.db_engine_specs.base import BaseEngineSpec
 from superset.models.core import Database
 from superset.utils.core import GenericDataType
diff --git a/tests/db_engine_specs/bigquery_tests.py b/tests/integration_tests/db_engine_specs/bigquery_tests.py
similarity index 70%
rename from tests/db_engine_specs/bigquery_tests.py
rename to tests/integration_tests/db_engine_specs/bigquery_tests.py
index 81a9f064429f..42022ff4669b 100644
--- a/tests/db_engine_specs/bigquery_tests.py
+++ b/tests/integration_tests/db_engine_specs/bigquery_tests.py
@@ -24,7 +24,7 @@
 from superset.db_engine_specs.bigquery import BigQueryEngineSpec
 from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
 from superset.sql_parse import Table
-from tests.db_engine_specs.base_tests import TestDbEngineSpec
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
 
 
 class TestBigQueryDbEngineSpec(TestDbEngineSpec):
@@ -247,3 +247,91 @@ def test_extract_errors(self):
                 },
             )
         ]
+
+        msg = "bigquery error: 404 Not found: Dataset fakeDataset:bogusSchema was not found in location"
+        result = BigQueryEngineSpec.extract_errors(Exception(msg))
+        assert result == [
+            SupersetError(
+                message='The schema "bogusSchema" does not exist. A valid schema must be used to run this query.',
+                error_type=SupersetErrorType.SCHEMA_DOES_NOT_EXIST_ERROR,
+                level=ErrorLevel.ERROR,
+                extra={
+                    "engine_name": "Google BigQuery",
+                    "issue_codes": [
+                        {
+                            "code": 1003,
+                            "message": "Issue 1003 - There is a syntax error in the SQL query. Perhaps there was a misspelling or a typo.",
+                        },
+                        {
+                            "code": 1004,
+                            "message": "Issue 1004 - The column was deleted or renamed in the database.",
+                        },
+                    ],
+                },
+            )
+        ]
+
+        msg = 'Table name "badtable" missing dataset while no default dataset is set in the request'
+        result = BigQueryEngineSpec.extract_errors(Exception(msg))
+        assert result == [
+            SupersetError(
+                message='The table "badtable" does not exist. A valid table must be used to run this query.',
+                error_type=SupersetErrorType.TABLE_DOES_NOT_EXIST_ERROR,
+                level=ErrorLevel.ERROR,
+                extra={
+                    "engine_name": "Google BigQuery",
+                    "issue_codes": [
+                        {
+                            "code": 1003,
+                            "message": "Issue 1003 - There is a syntax error in the SQL query. Perhaps there was a misspelling or a typo.",
+                        },
+                        {
+                            "code": 1005,
+                            "message": "Issue 1005 - The table was deleted or renamed in the database.",
+                        },
+                    ],
+                },
+            )
+        ]
+
+        msg = "Unrecognized name: badColumn at [1:8]"
+        result = BigQueryEngineSpec.extract_errors(Exception(msg))
+        assert result == [
+            SupersetError(
+                message='We can\'t seem to resolve column "badColumn" at line 1:8.',
+                error_type=SupersetErrorType.COLUMN_DOES_NOT_EXIST_ERROR,
+                level=ErrorLevel.ERROR,
+                extra={
+                    "engine_name": "Google BigQuery",
+                    "issue_codes": [
+                        {
+                            "code": 1003,
+                            "message": "Issue 1003 - There is a syntax error in the SQL query. Perhaps there was a misspelling or a typo.",
+                        },
+                        {
+                            "code": 1004,
+                            "message": "Issue 1004 - The column was deleted or renamed in the database.",
+                        },
+                    ],
+                },
+            )
+        ]
+
+        msg = 'Syntax error: Expected end of input but got identifier "fromm"'
+        result = BigQueryEngineSpec.extract_errors(Exception(msg))
+        assert result == [
+            SupersetError(
+                message='Please check your query for syntax errors at or near "fromm". Then, try running your query again.',
+                error_type=SupersetErrorType.SYNTAX_ERROR,
+                level=ErrorLevel.ERROR,
+                extra={
+                    "engine_name": "Google BigQuery",
+                    "issue_codes": [
+                        {
+                            "code": 1030,
+                            "message": "Issue 1030 - The query has a syntax error.",
+                        }
+                    ],
+                },
+            )
+        ]
diff --git a/tests/db_engine_specs/clickhouse_tests.py b/tests/integration_tests/db_engine_specs/clickhouse_tests.py
similarity index 95%
rename from tests/db_engine_specs/clickhouse_tests.py
rename to tests/integration_tests/db_engine_specs/clickhouse_tests.py
index c6f506cdf4ff..c8019a8758db 100644
--- a/tests/db_engine_specs/clickhouse_tests.py
+++ b/tests/integration_tests/db_engine_specs/clickhouse_tests.py
@@ -20,7 +20,7 @@
 
 from superset.db_engine_specs.clickhouse import ClickHouseEngineSpec
 from superset.db_engine_specs.exceptions import SupersetDBAPIDatabaseError
-from tests.db_engine_specs.base_tests import TestDbEngineSpec
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
 
 
 class TestClickHouseDbEngineSpec(TestDbEngineSpec):
diff --git a/tests/db_engine_specs/crate_tests.py b/tests/integration_tests/db_engine_specs/crate_tests.py
similarity index 96%
rename from tests/db_engine_specs/crate_tests.py
rename to tests/integration_tests/db_engine_specs/crate_tests.py
index c385ea29a095..7c86b34b335f 100644
--- a/tests/db_engine_specs/crate_tests.py
+++ b/tests/integration_tests/db_engine_specs/crate_tests.py
@@ -17,7 +17,7 @@
 from superset.connectors.sqla.models import SqlaTable, TableColumn
 from superset.db_engine_specs.crate import CrateEngineSpec
 from superset.models.core import Database
-from tests.db_engine_specs.base_tests import TestDbEngineSpec
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
 
 
 class TestCrateDbEngineSpec(TestDbEngineSpec):
diff --git a/tests/db_engine_specs/dremio_tests.py b/tests/integration_tests/db_engine_specs/dremio_tests.py
similarity index 94%
rename from tests/db_engine_specs/dremio_tests.py
rename to tests/integration_tests/db_engine_specs/dremio_tests.py
index 02d21c653cdc..5d678c947bb2 100644
--- a/tests/db_engine_specs/dremio_tests.py
+++ b/tests/integration_tests/db_engine_specs/dremio_tests.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 from superset.db_engine_specs.dremio import DremioEngineSpec
-from tests.db_engine_specs.base_tests import TestDbEngineSpec
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
 
 
 class TestDremioDbEngineSpec(TestDbEngineSpec):
diff --git a/tests/db_engine_specs/drill_tests.py b/tests/integration_tests/db_engine_specs/drill_tests.py
similarity index 94%
rename from tests/db_engine_specs/drill_tests.py
rename to tests/integration_tests/db_engine_specs/drill_tests.py
index 9897a5dcccd3..e89462ee5f86 100644
--- a/tests/db_engine_specs/drill_tests.py
+++ b/tests/integration_tests/db_engine_specs/drill_tests.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 from superset.db_engine_specs.drill import DrillEngineSpec
-from tests.db_engine_specs.base_tests import TestDbEngineSpec
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
 
 
 class TestDrillDbEngineSpec(TestDbEngineSpec):
diff --git a/tests/db_engine_specs/druid_tests.py b/tests/integration_tests/db_engine_specs/druid_tests.py
similarity index 92%
rename from tests/db_engine_specs/druid_tests.py
rename to tests/integration_tests/db_engine_specs/druid_tests.py
index 3ff561640b6e..142acdfbf61f 100644
--- a/tests/db_engine_specs/druid_tests.py
+++ b/tests/integration_tests/db_engine_specs/druid_tests.py
@@ -19,9 +19,9 @@
 from sqlalchemy import column
 
 from superset.db_engine_specs.druid import DruidEngineSpec
-from tests.db_engine_specs.base_tests import TestDbEngineSpec
-from tests.fixtures.certificates import ssl_certificate
-from tests.fixtures.database import default_db_extra
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
+from tests.integration_tests.fixtures.certificates import ssl_certificate
+from tests.integration_tests.fixtures.database import default_db_extra
 
 
 class TestDruidDbEngineSpec(TestDbEngineSpec):
diff --git a/tests/db_engine_specs/elasticsearch_tests.py b/tests/integration_tests/db_engine_specs/elasticsearch_tests.py
similarity index 96%
rename from tests/db_engine_specs/elasticsearch_tests.py
rename to tests/integration_tests/db_engine_specs/elasticsearch_tests.py
index fd0dcc7e97c5..92c25aa84351 100644
--- a/tests/db_engine_specs/elasticsearch_tests.py
+++ b/tests/integration_tests/db_engine_specs/elasticsearch_tests.py
@@ -22,7 +22,7 @@
     ElasticSearchEngineSpec,
     OpenDistroEngineSpec,
 )
-from tests.db_engine_specs.base_tests import TestDbEngineSpec
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
 
 
 class TestElasticSearchDbEngineSpec(TestDbEngineSpec):
diff --git a/tests/db_engine_specs/firebird_tests.py b/tests/integration_tests/db_engine_specs/firebird_tests.py
similarity index 100%
rename from tests/db_engine_specs/firebird_tests.py
rename to tests/integration_tests/db_engine_specs/firebird_tests.py
diff --git a/tests/integration_tests/db_engine_specs/gsheets_tests.py b/tests/integration_tests/db_engine_specs/gsheets_tests.py
new file mode 100644
index 000000000000..fe34b7266753
--- /dev/null
+++ b/tests/integration_tests/db_engine_specs/gsheets_tests.py
@@ -0,0 +1,44 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from superset.db_engine_specs.gsheets import GSheetsEngineSpec
+from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
+
+
+class TestGsheetsDbEngineSpec(TestDbEngineSpec):
+    def test_extract_errors(self):
+        """
+        Test that custom error messages are extracted correctly.
+        """
+        msg = 'SQLError: near "fromm": syntax error'
+        result = GSheetsEngineSpec.extract_errors(Exception(msg))
+        assert result == [
+            SupersetError(
+                message='Please check your query for syntax errors near "fromm". Then, try running your query again.',
+                error_type=SupersetErrorType.SYNTAX_ERROR,
+                level=ErrorLevel.ERROR,
+                extra={
+                    "engine_name": "Google Sheets",
+                    "issue_codes": [
+                        {
+                            "code": 1030,
+                            "message": "Issue 1030 - The query has a syntax error.",
+                        }
+                    ],
+                },
+            )
+        ]
diff --git a/tests/db_engine_specs/hana_tests.py b/tests/integration_tests/db_engine_specs/hana_tests.py
similarity index 94%
rename from tests/db_engine_specs/hana_tests.py
rename to tests/integration_tests/db_engine_specs/hana_tests.py
index cdc8aeb41413..06eee032e8d2 100644
--- a/tests/db_engine_specs/hana_tests.py
+++ b/tests/integration_tests/db_engine_specs/hana_tests.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 from superset.db_engine_specs.hana import HanaEngineSpec
-from tests.db_engine_specs.base_tests import TestDbEngineSpec
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
 
 
 class TestHanaDbEngineSpec(TestDbEngineSpec):
diff --git a/tests/db_engine_specs/hive_tests.py b/tests/integration_tests/db_engine_specs/hive_tests.py
similarity index 99%
rename from tests/db_engine_specs/hive_tests.py
rename to tests/integration_tests/db_engine_specs/hive_tests.py
index 1e978b71bf8f..76a4370fa0f8 100644
--- a/tests/db_engine_specs/hive_tests.py
+++ b/tests/integration_tests/db_engine_specs/hive_tests.py
@@ -25,7 +25,7 @@
 from superset.db_engine_specs.hive import HiveEngineSpec, upload_to_s3
 from superset.exceptions import SupersetException
 from superset.sql_parse import Table, ParsedQuery
-from tests.test_app import app
+from tests.integration_tests.test_app import app
 
 
 def test_0_progress():
diff --git a/tests/db_engine_specs/impala_tests.py b/tests/integration_tests/db_engine_specs/impala_tests.py
similarity index 93%
rename from tests/db_engine_specs/impala_tests.py
rename to tests/integration_tests/db_engine_specs/impala_tests.py
index 8d2e40392b05..936ace98be39 100644
--- a/tests/db_engine_specs/impala_tests.py
+++ b/tests/integration_tests/db_engine_specs/impala_tests.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 from superset.db_engine_specs.impala import ImpalaEngineSpec
-from tests.db_engine_specs.base_tests import TestDbEngineSpec
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
 
 
 class TestImpalaDbEngineSpec(TestDbEngineSpec):
diff --git a/tests/db_engine_specs/kylin_tests.py b/tests/integration_tests/db_engine_specs/kylin_tests.py
similarity index 93%
rename from tests/db_engine_specs/kylin_tests.py
rename to tests/integration_tests/db_engine_specs/kylin_tests.py
index 8e6c0204d018..a607565d5b41 100644
--- a/tests/db_engine_specs/kylin_tests.py
+++ b/tests/integration_tests/db_engine_specs/kylin_tests.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 from superset.db_engine_specs.kylin import KylinEngineSpec
-from tests.db_engine_specs.base_tests import TestDbEngineSpec
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
 
 
 class TestKylinDbEngineSpec(TestDbEngineSpec):
diff --git a/tests/db_engine_specs/mssql_tests.py b/tests/integration_tests/db_engine_specs/mssql_tests.py
similarity index 97%
rename from tests/db_engine_specs/mssql_tests.py
rename to tests/integration_tests/db_engine_specs/mssql_tests.py
index b37bb371ce2b..c14515b27c86 100644
--- a/tests/db_engine_specs/mssql_tests.py
+++ b/tests/integration_tests/db_engine_specs/mssql_tests.py
@@ -27,7 +27,7 @@
 from superset.db_engine_specs.mssql import MssqlEngineSpec
 from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
 from superset.utils.core import GenericDataType
-from tests.db_engine_specs.base_tests import TestDbEngineSpec
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
 
 
 class TestMssqlEngineSpec(TestDbEngineSpec):
@@ -169,7 +169,7 @@ def test_extract_errors(self):
                 message='The hostname "locahost" cannot be resolved.',
                 level=ErrorLevel.ERROR,
                 extra={
-                    "engine_name": "Microsoft SQL",
+                    "engine_name": "Microsoft SQL Server",
                     "issue_codes": [
                         {
                             "code": 1007,
@@ -199,7 +199,7 @@ def test_extract_errors(self):
                 message='Port 12345 on hostname "localhost" refused the connection.',
                 level=ErrorLevel.ERROR,
                 extra={
-                    "engine_name": "Microsoft SQL",
+                    "engine_name": "Microsoft SQL Server",
                     "issue_codes": [
                         {"code": 1008, "message": "Issue 1008 - The port is closed."}
                     ],
@@ -229,7 +229,7 @@ def test_extract_errors(self):
                 ),
                 level=ErrorLevel.ERROR,
                 extra={
-                    "engine_name": "Microsoft SQL",
+                    "engine_name": "Microsoft SQL Server",
                     "issue_codes": [
                         {
                             "code": 1009,
@@ -262,7 +262,7 @@ def test_extract_errors(self):
                 ),
                 level=ErrorLevel.ERROR,
                 extra={
-                    "engine_name": "Microsoft SQL",
+                    "engine_name": "Microsoft SQL Server",
                     "issue_codes": [
                         {
                             "code": 1009,
@@ -292,7 +292,7 @@ def test_extract_errors(self):
                 error_type=SupersetErrorType.CONNECTION_ACCESS_DENIED_ERROR,
                 level=ErrorLevel.ERROR,
                 extra={
-                    "engine_name": "Microsoft SQL",
+                    "engine_name": "Microsoft SQL Server",
                     "issue_codes": [
                         {
                             "code": 1014,
diff --git a/tests/db_engine_specs/mysql_tests.py b/tests/integration_tests/db_engine_specs/mysql_tests.py
similarity index 82%
rename from tests/db_engine_specs/mysql_tests.py
rename to tests/integration_tests/db_engine_specs/mysql_tests.py
index aa23f2935f58..b069bba69047 100644
--- a/tests/db_engine_specs/mysql_tests.py
+++ b/tests/integration_tests/db_engine_specs/mysql_tests.py
@@ -21,8 +21,12 @@
 
 from superset.db_engine_specs.mysql import MySQLEngineSpec
 from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
+from superset.models.sql_lab import Query
 from superset.utils.core import GenericDataType
-from tests.db_engine_specs.base_tests import assert_generic_types, TestDbEngineSpec
+from tests.integration_tests.db_engine_specs.base_tests import (
+    assert_generic_types,
+    TestDbEngineSpec,
+)
 
 
 class TestMySQLEngineSpecsDbEngineSpec(TestDbEngineSpec):
@@ -199,7 +203,6 @@ def test_extract_errors(self):
 
         msg = "mysql: Unknown database 'badDB'"
         result = MySQLEngineSpec.extract_errors(Exception(msg))
-        print(result)
         assert result == [
             SupersetError(
                 message='Unable to connect to database "badDB".',
@@ -217,3 +220,41 @@ def test_extract_errors(self):
                 },
             )
         ]
+
+        msg = "check the manual that corresponds to your MySQL server version for the right syntax to use near 'fromm"
+        result = MySQLEngineSpec.extract_errors(Exception(msg))
+        assert result == [
+            SupersetError(
+                message='Please check your query for syntax errors near "fromm". Then, try running your query again.',
+                error_type=SupersetErrorType.SYNTAX_ERROR,
+                level=ErrorLevel.ERROR,
+                extra={
+                    "engine_name": "MySQL",
+                    "issue_codes": [
+                        {
+                            "code": 1030,
+                            "message": "Issue 1030 - The query has a syntax error.",
+                        }
+                    ],
+                },
+            )
+        ]
+
+    @unittest.mock.patch("sqlalchemy.engine.Engine.connect")
+    def test_get_cancel_query_id(self, engine_mock):
+        query = Query()
+        cursor_mock = engine_mock.return_value.__enter__.return_value
+        cursor_mock.fetchone.return_value = [123]
+        assert MySQLEngineSpec.get_cancel_query_id(cursor_mock, query) == 123
+
+    @unittest.mock.patch("sqlalchemy.engine.Engine.connect")
+    def test_cancel_query(self, engine_mock):
+        query = Query()
+        cursor_mock = engine_mock.return_value.__enter__.return_value
+        assert MySQLEngineSpec.cancel_query(cursor_mock, query, 123) is True
+
+    @unittest.mock.patch("sqlalchemy.engine.Engine.connect")
+    def test_cancel_query_failed(self, engine_mock):
+        query = Query()
+        cursor_mock = engine_mock.raiseError.side_effect = Exception()
+        assert MySQLEngineSpec.cancel_query(cursor_mock, query, 123) is False
diff --git a/tests/db_engine_specs/oracle_tests.py b/tests/integration_tests/db_engine_specs/oracle_tests.py
similarity index 97%
rename from tests/db_engine_specs/oracle_tests.py
rename to tests/integration_tests/db_engine_specs/oracle_tests.py
index 4f476ab39e6a..b2f4f9f23120 100644
--- a/tests/db_engine_specs/oracle_tests.py
+++ b/tests/integration_tests/db_engine_specs/oracle_tests.py
@@ -22,7 +22,7 @@
 from sqlalchemy.dialects.oracle import DATE, NVARCHAR, VARCHAR
 
 from superset.db_engine_specs.oracle import OracleEngineSpec
-from tests.db_engine_specs.base_tests import TestDbEngineSpec
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
 
 
 class TestOracleDbEngineSpec(TestDbEngineSpec):
diff --git a/tests/db_engine_specs/pinot_tests.py b/tests/integration_tests/db_engine_specs/pinot_tests.py
similarity index 97%
rename from tests/db_engine_specs/pinot_tests.py
rename to tests/integration_tests/db_engine_specs/pinot_tests.py
index c38a22d50070..fa31efdb388d 100644
--- a/tests/db_engine_specs/pinot_tests.py
+++ b/tests/integration_tests/db_engine_specs/pinot_tests.py
@@ -17,7 +17,7 @@
 from sqlalchemy import column
 
 from superset.db_engine_specs.pinot import PinotEngineSpec
-from tests.db_engine_specs.base_tests import TestDbEngineSpec
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
 
 
 class TestPinotDbEngineSpec(TestDbEngineSpec):
diff --git a/tests/db_engine_specs/postgres_tests.py b/tests/integration_tests/db_engine_specs/postgres_tests.py
similarity index 90%
rename from tests/db_engine_specs/postgres_tests.py
rename to tests/integration_tests/db_engine_specs/postgres_tests.py
index 135621b5e5c9..dcf5310fecac 100644
--- a/tests/db_engine_specs/postgres_tests.py
+++ b/tests/integration_tests/db_engine_specs/postgres_tests.py
@@ -23,10 +23,14 @@
 from superset.db_engine_specs import get_engine_specs
 from superset.db_engine_specs.postgres import PostgresEngineSpec
 from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
+from superset.models.sql_lab import Query
 from superset.utils.core import GenericDataType
-from tests.db_engine_specs.base_tests import assert_generic_types, TestDbEngineSpec
-from tests.fixtures.certificates import ssl_certificate
-from tests.fixtures.database import default_db_extra
+from tests.integration_tests.db_engine_specs.base_tests import (
+    assert_generic_types,
+    TestDbEngineSpec,
+)
+from tests.integration_tests.fixtures.certificates import ssl_certificate
+from tests.integration_tests.fixtures.database import default_db_extra
 
 
 class TestPostgresDbEngineSpec(TestDbEngineSpec):
@@ -421,6 +425,44 @@ def test_extract_errors(self):
             )
         ]
 
+        msg = 'syntax error at or near "fromm"'
+        result = PostgresEngineSpec.extract_errors(Exception(msg))
+        assert result == [
+            SupersetError(
+                message='Please check your query for syntax errors at or near "fromm". Then, try running your query again.',
+                error_type=SupersetErrorType.SYNTAX_ERROR,
+                level=ErrorLevel.ERROR,
+                extra={
+                    "engine_name": "PostgreSQL",
+                    "issue_codes": [
+                        {
+                            "code": 1030,
+                            "message": "Issue 1030 - The query has a syntax error.",
+                        }
+                    ],
+                },
+            )
+        ]
+
+    @mock.patch("sqlalchemy.engine.Engine.connect")
+    def test_get_cancel_query_id(self, engine_mock):
+        query = Query()
+        cursor_mock = engine_mock.return_value.__enter__.return_value
+        cursor_mock.fetchone.return_value = [123]
+        assert PostgresEngineSpec.get_cancel_query_id(cursor_mock, query) == 123
+
+    @mock.patch("sqlalchemy.engine.Engine.connect")
+    def test_cancel_query(self, engine_mock):
+        query = Query()
+        cursor_mock = engine_mock.return_value.__enter__.return_value
+        assert PostgresEngineSpec.cancel_query(cursor_mock, query, 123) is True
+
+    @mock.patch("sqlalchemy.engine.Engine.connect")
+    def test_cancel_query_failed(self, engine_mock):
+        query = Query()
+        cursor_mock = engine_mock.raiseError.side_effect = Exception()
+        assert PostgresEngineSpec.cancel_query(cursor_mock, query, 123) is False
+
 
 def test_base_parameters_mixin():
     parameters = {
@@ -438,7 +480,7 @@ def test_base_parameters_mixin():
     )
     assert sqlalchemy_uri == (
         "postgresql+psycopg2://username:password@localhost:5432/dbname?"
-        "foo=bar&sslmode=verify-ca"
+        "foo=bar&sslmode=require"
     )
 
     parameters_from_uri = PostgresEngineSpec.get_parameters_from_uri(sqlalchemy_uri)
@@ -448,24 +490,26 @@ def test_base_parameters_mixin():
     assert json_schema == {
         "type": "object",
         "properties": {
+            "encryption": {
+                "type": "boolean",
+                "description": "Use an encrypted connection to the database",
+            },
+            "host": {"type": "string", "description": "Hostname or IP address"},
+            "database": {"type": "string", "description": "Database name"},
             "port": {
                 "type": "integer",
                 "format": "int32",
+                "minimum": 0,
+                "maximum": 65536,
                 "description": "Database port",
             },
             "password": {"type": "string", "nullable": True, "description": "Password"},
-            "host": {"type": "string", "description": "Hostname or IP address"},
             "username": {"type": "string", "nullable": True, "description": "Username"},
             "query": {
                 "type": "object",
                 "description": "Additional parameters",
                 "additionalProperties": {},
             },
-            "database": {"type": "string", "description": "Database name"},
-            "encryption": {
-                "type": "boolean",
-                "description": "Use an encrypted connection to the database",
-            },
         },
         "required": ["database", "host", "port", "username"],
     }
diff --git a/tests/db_engine_specs/presto_tests.py b/tests/integration_tests/db_engine_specs/presto_tests.py
similarity index 99%
rename from tests/db_engine_specs/presto_tests.py
rename to tests/integration_tests/db_engine_specs/presto_tests.py
index 336c01e5dee8..3b48f6788676 100644
--- a/tests/db_engine_specs/presto_tests.py
+++ b/tests/integration_tests/db_engine_specs/presto_tests.py
@@ -26,7 +26,7 @@
 from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
 from superset.sql_parse import ParsedQuery
 from superset.utils.core import DatasourceName, GenericDataType
-from tests.db_engine_specs.base_tests import TestDbEngineSpec
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
 
 
 class TestPrestoDbEngineSpec(TestDbEngineSpec):
diff --git a/tests/db_engine_specs/redshift_tests.py b/tests/integration_tests/db_engine_specs/redshift_tests.py
similarity index 98%
rename from tests/db_engine_specs/redshift_tests.py
rename to tests/integration_tests/db_engine_specs/redshift_tests.py
index 49e34b158644..cdfe8d16cb71 100644
--- a/tests/db_engine_specs/redshift_tests.py
+++ b/tests/integration_tests/db_engine_specs/redshift_tests.py
@@ -18,7 +18,7 @@
 
 from superset.db_engine_specs.redshift import RedshiftEngineSpec
 from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
-from tests.db_engine_specs.base_tests import TestDbEngineSpec
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
 
 
 class TestRedshiftDbEngineSpec(TestDbEngineSpec):
diff --git a/tests/integration_tests/db_engine_specs/snowflake_tests.py b/tests/integration_tests/db_engine_specs/snowflake_tests.py
new file mode 100644
index 000000000000..7478056027d9
--- /dev/null
+++ b/tests/integration_tests/db_engine_specs/snowflake_tests.py
@@ -0,0 +1,106 @@
+# 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 json
+from unittest import mock
+
+from superset.db_engine_specs.snowflake import SnowflakeEngineSpec
+from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
+from superset.models.core import Database
+from superset.models.sql_lab import Query
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
+
+
+class TestSnowflakeDbEngineSpec(TestDbEngineSpec):
+    def test_convert_dttm(self):
+        dttm = self.get_dttm()
+
+        test_cases = {
+            "DATE": "TO_DATE('2019-01-02')",
+            "DATETIME": "CAST('2019-01-02T03:04:05.678900' AS DATETIME)",
+            "TIMESTAMP": "TO_TIMESTAMP('2019-01-02T03:04:05.678900')",
+        }
+
+        for type_, expected in test_cases.items():
+            self.assertEqual(SnowflakeEngineSpec.convert_dttm(type_, dttm), expected)
+
+    def test_database_connection_test_mutator(self):
+        database = Database(sqlalchemy_uri="snowflake://abc")
+        SnowflakeEngineSpec.mutate_db_for_connection_test(database)
+        engine_params = json.loads(database.extra or "{}")
+
+        self.assertDictEqual(
+            {"engine_params": {"connect_args": {"validate_default_parameters": True}}},
+            engine_params,
+        )
+
+    def test_extract_errors(self):
+        msg = "Object dumbBrick does not exist or not authorized."
+        result = SnowflakeEngineSpec.extract_errors(Exception(msg))
+        assert result == [
+            SupersetError(
+                message="dumbBrick does not exist in this database.",
+                error_type=SupersetErrorType.OBJECT_DOES_NOT_EXIST_ERROR,
+                level=ErrorLevel.ERROR,
+                extra={
+                    "engine_name": "Snowflake",
+                    "issue_codes": [
+                        {
+                            "code": 1029,
+                            "message": "Issue 1029 - The object does not exist in the given database.",
+                        }
+                    ],
+                },
+            )
+        ]
+
+        msg = "syntax error line 1 at position 10 unexpected 'limmmited'."
+        result = SnowflakeEngineSpec.extract_errors(Exception(msg))
+        assert result == [
+            SupersetError(
+                message='Please check your query for syntax errors at or near "limmmited". Then, try running your query again.',
+                error_type=SupersetErrorType.SYNTAX_ERROR,
+                level=ErrorLevel.ERROR,
+                extra={
+                    "engine_name": "Snowflake",
+                    "issue_codes": [
+                        {
+                            "code": 1030,
+                            "message": "Issue 1030 - The query has a syntax error.",
+                        }
+                    ],
+                },
+            )
+        ]
+
+    @mock.patch("sqlalchemy.engine.Engine.connect")
+    def test_get_cancel_query_id(self, engine_mock):
+        query = Query()
+        cursor_mock = engine_mock.return_value.__enter__.return_value
+        cursor_mock.fetchone.return_value = [123]
+        assert SnowflakeEngineSpec.get_cancel_query_id(cursor_mock, query) == 123
+
+    @mock.patch("sqlalchemy.engine.Engine.connect")
+    def test_cancel_query(self, engine_mock):
+        query = Query()
+        cursor_mock = engine_mock.return_value.__enter__.return_value
+        assert SnowflakeEngineSpec.cancel_query(cursor_mock, query, 123) is True
+
+    @mock.patch("sqlalchemy.engine.Engine.connect")
+    def test_cancel_query_failed(self, engine_mock):
+        query = Query()
+        cursor_mock = engine_mock.raiseError.side_effect = Exception()
+        assert SnowflakeEngineSpec.cancel_query(cursor_mock, query, 123) is False
diff --git a/tests/db_engine_specs/sqlite_tests.py b/tests/integration_tests/db_engine_specs/sqlite_tests.py
similarity index 97%
rename from tests/db_engine_specs/sqlite_tests.py
rename to tests/integration_tests/db_engine_specs/sqlite_tests.py
index bb4a19f7c54a..7d98b6b6fa78 100644
--- a/tests/db_engine_specs/sqlite_tests.py
+++ b/tests/integration_tests/db_engine_specs/sqlite_tests.py
@@ -17,7 +17,7 @@
 from unittest import mock
 
 from superset.db_engine_specs.sqlite import SqliteEngineSpec
-from tests.db_engine_specs.base_tests import TestDbEngineSpec
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
 
 
 class TestSQliteDbEngineSpec(TestDbEngineSpec):
diff --git a/tests/db_engine_specs/trino_tests.py b/tests/integration_tests/db_engine_specs/trino_tests.py
similarity index 96%
rename from tests/db_engine_specs/trino_tests.py
rename to tests/integration_tests/db_engine_specs/trino_tests.py
index 557d3bda265c..211d00405ecd 100644
--- a/tests/db_engine_specs/trino_tests.py
+++ b/tests/integration_tests/db_engine_specs/trino_tests.py
@@ -17,7 +17,7 @@
 from sqlalchemy.engine.url import URL
 
 from superset.db_engine_specs.trino import TrinoEngineSpec
-from tests.db_engine_specs.base_tests import TestDbEngineSpec
+from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
 
 
 class TestTrinoDbEngineSpec(TestDbEngineSpec):
diff --git a/tests/dict_import_export_tests.py b/tests/integration_tests/dict_import_export_tests.py
similarity index 98%
rename from tests/dict_import_export_tests.py
rename to tests/integration_tests/dict_import_export_tests.py
index 176ecd07549e..fe7ff512f1fe 100644
--- a/tests/dict_import_export_tests.py
+++ b/tests/integration_tests/dict_import_export_tests.py
@@ -22,7 +22,7 @@
 
 import yaml
 
-from tests.test_app import app
+from tests.integration_tests.test_app import app
 from superset import db
 from superset.connectors.druid.models import (
     DruidColumn,
@@ -66,7 +66,7 @@ def tearDownClass(cls):
         cls.delete_imports()
 
     def create_table(
-        self, name, schema="", id=0, cols_names=[], cols_uuids=None, metric_names=[]
+        self, name, schema=None, id=0, cols_names=[], cols_uuids=None, metric_names=[]
     ):
         database_name = "main"
         name = "{0}{1}".format(NAME_PREFIX, name)
@@ -128,9 +128,6 @@ def create_druid_datasource(self, name, id=0, cols_names=[], metric_names=[]):
     def get_datasource(self, datasource_id):
         return db.session.query(DruidDatasource).filter_by(id=datasource_id).first()
 
-    def get_table_by_name(self, name):
-        return db.session.query(SqlaTable).filter_by(table_name=name).first()
-
     def yaml_compare(self, obj_1, obj_2):
         obj_1_str = yaml.safe_dump(obj_1, default_flow_style=False)
         obj_2_str = yaml.safe_dump(obj_2, default_flow_style=False)
diff --git a/tests/druid_func_tests.py b/tests/integration_tests/druid_func_tests.py
similarity index 99%
rename from tests/druid_func_tests.py
rename to tests/integration_tests/druid_func_tests.py
index a8b16922f557..af310810d721 100644
--- a/tests/druid_func_tests.py
+++ b/tests/integration_tests/druid_func_tests.py
@@ -19,7 +19,7 @@
 import unittest
 from unittest.mock import Mock
 
-import tests.test_app
+import tests.integration_tests.test_app
 import superset.connectors.druid.models as models
 from superset.connectors.druid.models import DruidColumn, DruidDatasource, DruidMetric
 from superset.exceptions import SupersetException
diff --git a/tests/druid_func_tests_sip38.py b/tests/integration_tests/druid_func_tests_sip38.py
similarity index 99%
rename from tests/druid_func_tests_sip38.py
rename to tests/integration_tests/druid_func_tests_sip38.py
index fb2837e70a11..79bd130f5588 100644
--- a/tests/druid_func_tests_sip38.py
+++ b/tests/integration_tests/druid_func_tests_sip38.py
@@ -19,7 +19,7 @@
 import unittest
 from unittest.mock import Mock, patch
 
-import tests.test_app
+import tests.integration_tests.test_app
 import superset.connectors.druid.models as models
 from superset.connectors.druid.models import DruidColumn, DruidDatasource, DruidMetric
 from superset.exceptions import SupersetException
diff --git a/tests/druid_tests.py b/tests/integration_tests/druid_tests.py
similarity index 99%
rename from tests/druid_tests.py
rename to tests/integration_tests/druid_tests.py
index 09f2d6101a1a..a9c787ecc8a8 100644
--- a/tests/druid_tests.py
+++ b/tests/integration_tests/druid_tests.py
@@ -21,7 +21,7 @@
 from datetime import datetime
 from unittest.mock import Mock, patch
 
-from tests.test_app import app
+from tests.integration_tests.test_app import app
 
 from superset import db, security_manager
 from superset.connectors.druid.views import (
diff --git a/tests/dynamic_plugins_tests.py b/tests/integration_tests/dynamic_plugins_tests.py
similarity index 100%
rename from tests/dynamic_plugins_tests.py
rename to tests/integration_tests/dynamic_plugins_tests.py
diff --git a/tests/email_tests.py b/tests/integration_tests/email_tests.py
similarity index 99%
rename from tests/email_tests.py
rename to tests/integration_tests/email_tests.py
index 89b0c4b142aa..d6c46a08d92d 100644
--- a/tests/email_tests.py
+++ b/tests/integration_tests/email_tests.py
@@ -26,7 +26,7 @@
 
 from superset import app
 from superset.utils import core as utils
-from tests.base_tests import SupersetTestCase
+from tests.integration_tests.base_tests import SupersetTestCase
 
 from .utils import read_fixture
 
diff --git a/tests/event_logger_tests.py b/tests/integration_tests/event_logger_tests.py
similarity index 99%
rename from tests/event_logger_tests.py
rename to tests/integration_tests/event_logger_tests.py
index 5727da7c396b..ddbe42bb4fc5 100644
--- a/tests/event_logger_tests.py
+++ b/tests/integration_tests/event_logger_tests.py
@@ -30,7 +30,7 @@
     DBEventLogger,
     get_event_logger_from_cfg_value,
 )
-from tests.test_app import app
+from tests.integration_tests.test_app import app
 
 
 class TestEventLogger(unittest.TestCase):
diff --git a/tests/feature_flag_tests.py b/tests/integration_tests/feature_flag_tests.py
similarity index 95%
rename from tests/feature_flag_tests.py
rename to tests/integration_tests/feature_flag_tests.py
index 2ce9649be579..500cb572e5e2 100644
--- a/tests/feature_flag_tests.py
+++ b/tests/integration_tests/feature_flag_tests.py
@@ -17,7 +17,7 @@
 from unittest.mock import patch
 
 from superset import is_feature_enabled
-from tests.base_tests import SupersetTestCase
+from tests.integration_tests.base_tests import SupersetTestCase
 
 
 class TestFeatureFlag(SupersetTestCase):
diff --git a/tests/integration_tests/fixtures/__init__.py b/tests/integration_tests/fixtures/__init__.py
new file mode 100644
index 000000000000..d3531aa29e89
--- /dev/null
+++ b/tests/integration_tests/fixtures/__init__.py
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from .birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+    load_birth_names_dashboard_with_slices_module_scope,
+)
+from .energy_dashboard import load_energy_table_with_slice
+from .public_role import public_role_like_gamma, public_role_like_test_role
+from .unicode_dashboard import (
+    load_unicode_dashboard_with_position,
+    load_unicode_dashboard_with_slice,
+)
+from .world_bank_dashboard import (
+    load_world_bank_dashboard_with_slices,
+    load_world_bank_dashboard_with_slices_module_scope,
+)
diff --git a/tests/fixtures/birth_names_dashboard.py b/tests/integration_tests/fixtures/birth_names_dashboard.py
similarity index 97%
rename from tests/fixtures/birth_names_dashboard.py
rename to tests/integration_tests/fixtures/birth_names_dashboard.py
index d9368fe71dc4..67ea016e26d7 100644
--- a/tests/fixtures/birth_names_dashboard.py
+++ b/tests/integration_tests/fixtures/birth_names_dashboard.py
@@ -31,8 +31,8 @@
 from superset.models.dashboard import Dashboard
 from superset.models.slice import Slice
 from superset.utils.core import get_example_database
-from tests.dashboard_utils import create_table_for_dashboard
-from tests.test_app import app
+from tests.integration_tests.dashboard_utils import create_table_for_dashboard
+from tests.integration_tests.test_app import app
 
 
 @pytest.fixture()
diff --git a/tests/fixtures/certificates.py b/tests/integration_tests/fixtures/certificates.py
similarity index 100%
rename from tests/fixtures/certificates.py
rename to tests/integration_tests/fixtures/certificates.py
diff --git a/tests/fixtures/database.py b/tests/integration_tests/fixtures/database.py
similarity index 100%
rename from tests/fixtures/database.py
rename to tests/integration_tests/fixtures/database.py
diff --git a/tests/fixtures/dataframes.py b/tests/integration_tests/fixtures/dataframes.py
similarity index 94%
rename from tests/fixtures/dataframes.py
rename to tests/integration_tests/fixtures/dataframes.py
index ab50425d733d..28bc32fade77 100644
--- a/tests/fixtures/dataframes.py
+++ b/tests/integration_tests/fixtures/dataframes.py
@@ -130,6 +130,15 @@
     data={"label": ["x", "y", "z", "q"], "y": [1.0, 2.0, 3.0, 4.0]},
 )
 
+timeseries_df2 = DataFrame(
+    index=to_datetime(["2019-01-01", "2019-01-02", "2019-01-05", "2019-01-07"]),
+    data={
+        "label": ["x", "y", "z", "q"],
+        "y": [2.0, 2.0, 2.0, 2.0],
+        "z": [2.0, 4.0, 10.0, 8.0],
+    },
+)
+
 lonlat_df = DataFrame(
     {
         "city": ["New York City", "Sydney"],
diff --git a/tests/integration_tests/fixtures/datasource.py b/tests/integration_tests/fixtures/datasource.py
new file mode 100644
index 000000000000..e6cd7e8229cc
--- /dev/null
+++ b/tests/integration_tests/fixtures/datasource.py
@@ -0,0 +1,156 @@
+# 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.
+"""Fixtures for test_datasource.py"""
+from typing import Any, Dict
+
+
+def get_datasource_post() -> Dict[str, Any]:
+    return {
+        "id": None,
+        "column_formats": {"ratio": ".2%"},
+        "database": {"id": 1},
+        "description": "Adding a DESCRip",
+        "default_endpoint": "",
+        "filter_select_enabled": True,
+        "name": "birth_names",
+        "table_name": "birth_names",
+        "datasource_name": "birth_names",
+        "type": "table",
+        "schema": None,
+        "offset": 66,
+        "cache_timeout": 55,
+        "sql": "",
+        "columns": [
+            {
+                "id": 504,
+                "column_name": "ds",
+                "verbose_name": "",
+                "description": None,
+                "expression": "",
+                "filterable": True,
+                "groupby": True,
+                "is_dttm": True,
+                "type": "DATETIME",
+            },
+            {
+                "id": 505,
+                "column_name": "gender",
+                "verbose_name": None,
+                "description": None,
+                "expression": "",
+                "filterable": True,
+                "groupby": True,
+                "is_dttm": False,
+                "type": "VARCHAR(16)",
+            },
+            {
+                "id": 506,
+                "column_name": "name",
+                "verbose_name": None,
+                "description": None,
+                "expression": None,
+                "filterable": True,
+                "groupby": True,
+                "is_dttm": None,
+                "type": "VARCHAR(255)",
+            },
+            {
+                "id": 508,
+                "column_name": "state",
+                "verbose_name": None,
+                "description": None,
+                "expression": None,
+                "filterable": True,
+                "groupby": True,
+                "is_dttm": None,
+                "type": "VARCHAR(10)",
+            },
+            {
+                "id": 509,
+                "column_name": "num_boys",
+                "verbose_name": None,
+                "description": None,
+                "expression": None,
+                "filterable": True,
+                "groupby": True,
+                "is_dttm": None,
+                "type": "BIGINT(20)",
+            },
+            {
+                "id": 510,
+                "column_name": "num_girls",
+                "verbose_name": None,
+                "description": None,
+                "expression": "",
+                "filterable": False,
+                "groupby": False,
+                "is_dttm": False,
+                "type": "BIGINT(20)",
+            },
+            {
+                "id": 532,
+                "column_name": "num",
+                "verbose_name": None,
+                "description": None,
+                "expression": None,
+                "filterable": True,
+                "groupby": True,
+                "is_dttm": None,
+                "type": "BIGINT(20)",
+            },
+            {
+                "id": 522,
+                "column_name": "num_california",
+                "verbose_name": None,
+                "description": None,
+                "expression": "CASE WHEN state = 'CA' THEN num ELSE 0 END",
+                "filterable": False,
+                "groupby": False,
+                "is_dttm": False,
+                "type": "NUMBER",
+            },
+        ],
+        "metrics": [
+            {
+                "id": 824,
+                "metric_name": "sum__num",
+                "verbose_name": "Babies",
+                "description": "",
+                "expression": "SUM(num)",
+                "warning_text": "",
+                "d3format": "",
+            },
+            {
+                "id": 836,
+                "metric_name": "count",
+                "verbose_name": "",
+                "description": None,
+                "expression": "count(1)",
+                "warning_text": None,
+                "d3format": None,
+            },
+            {
+                "id": 843,
+                "metric_name": "ratio",
+                "verbose_name": "Ratio Boys/Girls",
+                "description": "This represents the ratio of boys/girls",
+                "expression": "sum(num_boys) / sum(num_girls)",
+                "warning_text": "no warning",
+                "d3format": ".2%",
+            },
+        ],
+    }
diff --git a/tests/fixtures/deck_geojson_form_data.json b/tests/integration_tests/fixtures/deck_geojson_form_data.json
similarity index 100%
rename from tests/fixtures/deck_geojson_form_data.json
rename to tests/integration_tests/fixtures/deck_geojson_form_data.json
diff --git a/tests/fixtures/deck_path_form_data.json b/tests/integration_tests/fixtures/deck_path_form_data.json
similarity index 100%
rename from tests/fixtures/deck_path_form_data.json
rename to tests/integration_tests/fixtures/deck_path_form_data.json
diff --git a/tests/fixtures/energy_dashboard.py b/tests/integration_tests/fixtures/energy_dashboard.py
similarity index 97%
rename from tests/fixtures/energy_dashboard.py
rename to tests/integration_tests/fixtures/energy_dashboard.py
index 42fb46ead7aa..2c25eecdc26e 100644
--- a/tests/fixtures/energy_dashboard.py
+++ b/tests/integration_tests/fixtures/energy_dashboard.py
@@ -28,8 +28,11 @@
 from superset.models.dashboard import Dashboard
 from superset.models.slice import Slice
 from superset.utils.core import get_example_database
-from tests.dashboard_utils import create_slice, create_table_for_dashboard
-from tests.test_app import app
+from tests.integration_tests.dashboard_utils import (
+    create_slice,
+    create_table_for_dashboard,
+)
+from tests.integration_tests.test_app import app
 
 misc_dash_slices: Set[str] = set()
 
diff --git a/tests/fixtures/importexport.py b/tests/integration_tests/fixtures/importexport.py
similarity index 97%
rename from tests/fixtures/importexport.py
rename to tests/integration_tests/fixtures/importexport.py
index 04aaaa3945cf..78f643c587af 100644
--- a/tests/fixtures/importexport.py
+++ b/tests/integration_tests/fixtures/importexport.py
@@ -384,7 +384,7 @@
             "expression": "count(1)",
             "description": None,
             "d3format": None,
-            "extra": None,
+            "extra": {},
             "warning_text": None,
         },
     ],
@@ -444,6 +444,7 @@
         },
         "viz_type": "deck_path",
     },
+    "query_context": '{"datasource":{"id":12,"type":"table"},"force":false,"queries":[{"time_range":" : ","filters":[],"extras":{"time_grain_sqla":null,"having":"","having_druid":[],"where":""},"applied_time_extras":{},"columns":[],"metrics":[],"annotation_layers":[],"row_limit":5000,"timeseries_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{}}],"result_format":"json","result_type":"full"}',
     "cache_timeout": None,
     "uuid": "0c23747a-6528-4629-97bf-e4b78d3b9df1",
     "version": "1.0.0",
diff --git a/tests/fixtures/public_role.py b/tests/integration_tests/fixtures/public_role.py
similarity index 96%
rename from tests/fixtures/public_role.py
rename to tests/integration_tests/fixtures/public_role.py
index 0e3dc8cd103d..892098b401b2 100644
--- a/tests/fixtures/public_role.py
+++ b/tests/integration_tests/fixtures/public_role.py
@@ -17,7 +17,7 @@
 import pytest
 
 from superset.extensions import db, security_manager
-from tests.test_app import app
+from tests.integration_tests.test_app import app
 
 
 @pytest.fixture()
diff --git a/tests/fixtures/pyodbcRow.py b/tests/integration_tests/fixtures/pyodbcRow.py
similarity index 100%
rename from tests/fixtures/pyodbcRow.py
rename to tests/integration_tests/fixtures/pyodbcRow.py
diff --git a/tests/fixtures/query_context.py b/tests/integration_tests/fixtures/query_context.py
similarity index 92%
rename from tests/fixtures/query_context.py
rename to tests/integration_tests/fixtures/query_context.py
index 12fddc630d49..beb961cd6159 100644
--- a/tests/fixtures/query_context.py
+++ b/tests/integration_tests/fixtures/query_context.py
@@ -18,7 +18,7 @@
 from typing import Any, Dict, List
 
 from superset.utils.core import AnnotationType, DTTM_ALIAS, TimeRangeEndpoint
-from tests.base_tests import get_table_by_name
+from tests.integration_tests.base_tests import SupersetTestCase
 
 query_birth_names = {
     "extras": {
@@ -31,7 +31,7 @@
     },
     "groupby": ["name"],
     "metrics": [{"label": "sum__num"}],
-    "orderby": [["sum__num", False]],
+    "orderby": [("sum__num", False)],
     "row_limit": 100,
     "granularity": "ds",
     "time_range": "100 years ago : now",
@@ -195,7 +195,7 @@
 
 
 def get_query_object(
-    query_name: str, add_postprocessing_operations: bool
+    query_name: str, add_postprocessing_operations: bool, add_time_offsets: bool,
 ) -> Dict[str, Any]:
     if query_name not in QUERY_OBJECTS:
         raise Exception(f"QueryObject fixture not defined for datasource: {query_name}")
@@ -212,6 +212,9 @@ def get_query_object(
     query_object = copy.deepcopy(obj)
     if add_postprocessing_operations:
         query_object["post_processing"] = _get_postprocessing_operation(query_name)
+    if add_time_offsets:
+        query_object["time_offsets"] = ["1 year ago"]
+
     return query_object
 
 
@@ -224,7 +227,9 @@ def _get_postprocessing_operation(query_name: str) -> List[Dict[str, Any]]:
 
 
 def get_query_context(
-    query_name: str, add_postprocessing_operations: bool = False,
+    query_name: str,
+    add_postprocessing_operations: bool = False,
+    add_time_offsets: bool = False,
 ) -> Dict[str, Any]:
     """
     Create a request payload for retrieving a QueryContext object via the
@@ -236,11 +241,16 @@ def get_query_context(
     :param datasource_id: id of datasource to query.
     :param datasource_type: type of datasource to query.
     :param add_postprocessing_operations: Add post-processing operations to QueryObject
+    :param add_time_offsets: Add time offsets to QueryObject(advanced analytics)
     :return: Request payload
     """
     table_name = query_name.split(":")[0]
-    table = get_table_by_name(table_name)
+    table = SupersetTestCase.get_table(name=table_name)
     return {
         "datasource": {"id": table.id, "type": table.type},
-        "queries": [get_query_object(query_name, add_postprocessing_operations)],
+        "queries": [
+            get_query_object(
+                query_name, add_postprocessing_operations, add_time_offsets,
+            )
+        ],
     }
diff --git a/tests/fixtures/sample.png b/tests/integration_tests/fixtures/sample.png
similarity index 100%
rename from tests/fixtures/sample.png
rename to tests/integration_tests/fixtures/sample.png
diff --git a/tests/fixtures/trends.csv b/tests/integration_tests/fixtures/trends.csv
similarity index 100%
rename from tests/fixtures/trends.csv
rename to tests/integration_tests/fixtures/trends.csv
diff --git a/tests/fixtures/unicode_dashboard.py b/tests/integration_tests/fixtures/unicode_dashboard.py
similarity index 97%
rename from tests/fixtures/unicode_dashboard.py
rename to tests/integration_tests/fixtures/unicode_dashboard.py
index 02dbd4c378ea..c670e086b7e6 100644
--- a/tests/fixtures/unicode_dashboard.py
+++ b/tests/integration_tests/fixtures/unicode_dashboard.py
@@ -24,12 +24,12 @@
 from superset.models.dashboard import Dashboard
 from superset.models.slice import Slice
 from superset.utils.core import get_example_database
-from tests.dashboard_utils import (
+from tests.integration_tests.dashboard_utils import (
     create_dashboard,
     create_slice,
     create_table_for_dashboard,
 )
-from tests.test_app import app
+from tests.integration_tests.test_app import app
 
 
 @pytest.fixture()
diff --git a/tests/fixtures/world_bank_dashboard.py b/tests/integration_tests/fixtures/world_bank_dashboard.py
similarity index 99%
rename from tests/fixtures/world_bank_dashboard.py
rename to tests/integration_tests/fixtures/world_bank_dashboard.py
index 4f27b56cc99d..5e5906774685 100644
--- a/tests/fixtures/world_bank_dashboard.py
+++ b/tests/integration_tests/fixtures/world_bank_dashboard.py
@@ -30,8 +30,11 @@
 from superset.models.dashboard import Dashboard
 from superset.models.slice import Slice
 from superset.utils.core import get_example_database
-from tests.dashboard_utils import create_dashboard, create_table_for_dashboard
-from tests.test_app import app
+from tests.integration_tests.dashboard_utils import (
+    create_dashboard,
+    create_table_for_dashboard,
+)
+from tests.integration_tests.test_app import app
 
 
 @pytest.fixture()
diff --git a/tests/form_tests.py b/tests/integration_tests/form_tests.py
similarity index 96%
rename from tests/form_tests.py
rename to tests/integration_tests/form_tests.py
index 92aea641ce45..b15dfdea79a5 100644
--- a/tests/form_tests.py
+++ b/tests/integration_tests/form_tests.py
@@ -17,7 +17,7 @@
 from wtforms.form import Form
 
 from superset.forms import CommaSeparatedListField, filter_not_empty_values
-from tests.base_tests import SupersetTestCase
+from tests.integration_tests.base_tests import SupersetTestCase
 
 
 class TestForm(SupersetTestCase):
diff --git a/tests/import_export_tests.py b/tests/integration_tests/import_export_tests.py
similarity index 95%
rename from tests/import_export_tests.py
rename to tests/integration_tests/import_export_tests.py
index 4aaf8fbc66e8..2c94c1b3a4a9 100644
--- a/tests/import_export_tests.py
+++ b/tests/integration_tests/import_export_tests.py
@@ -18,14 +18,18 @@
 """Unit tests for Superset"""
 import json
 import unittest
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
 
 import pytest
 from flask import g
 from sqlalchemy.orm.session import make_transient
 
-from tests.fixtures.energy_dashboard import load_energy_table_with_slice
-from tests.test_app import app
+from tests.integration_tests.fixtures.energy_dashboard import (
+    load_energy_table_with_slice,
+)
+from tests.integration_tests.test_app import app
 from superset.dashboards.commands.importers.v0 import decode_dashboards
 from superset import db, security_manager
 from superset.connectors.druid.models import (
@@ -41,7 +45,9 @@
 from superset.models.slice import Slice
 from superset.utils.core import get_example_database
 
-from tests.fixtures.world_bank_dashboard import load_world_bank_dashboard_with_slices
+from tests.integration_tests.fixtures.world_bank_dashboard import (
+    load_world_bank_dashboard_with_slices,
+)
 from .base_tests import SupersetTestCase
 
 
@@ -83,19 +89,20 @@ def create_slice(
         id=None,
         db_name="examples",
         table_name="wb_health_population",
+        schema=None,
     ):
         params = {
             "num_period_compare": "10",
             "remote_id": id,
             "datasource_name": table_name,
             "database_name": db_name,
-            "schema": "",
+            "schema": schema,
             # Test for trailing commas
             "metrics": ["sum__signup_attempt_email", "sum__signup_attempt_facebook"],
         }
 
         if table_name and not ds_id:
-            table = self.get_table_by_name(table_name)
+            table = self.get_table(schema=schema, name=table_name)
             if table:
                 ds_id = table.id
 
@@ -161,9 +168,6 @@ def get_dash(self, dash_id):
     def get_datasource(self, datasource_id):
         return db.session.query(DruidDatasource).filter_by(id=datasource_id).first()
 
-    def get_table_by_name(self, name):
-        return db.session.query(SqlaTable).filter_by(table_name=name).first()
-
     def assert_dash_equals(
         self, expected_dash, actual_dash, check_position=True, check_slugs=True
     ):
@@ -267,9 +271,7 @@ def test_export_1_dashboard(self):
             resp.data.decode("utf-8"), object_hook=decode_dashboards
         )["datasources"]
         self.assertEqual(1, len(exported_tables))
-        self.assert_table_equals(
-            self.get_table_by_name("birth_names"), exported_tables[0]
-        )
+        self.assert_table_equals(self.get_table(name="birth_names"), exported_tables[0])
 
     @pytest.mark.usefixtures(
         "load_world_bank_dashboard_with_slices",
@@ -308,11 +310,9 @@ def test_export_2_dashboards(self):
             resp_data.get("datasources"), key=lambda t: t.table_name
         )
         self.assertEqual(2, len(exported_tables))
+        self.assert_table_equals(self.get_table(name="birth_names"), exported_tables[0])
         self.assert_table_equals(
-            self.get_table_by_name("birth_names"), exported_tables[0]
-        )
-        self.assert_table_equals(
-            self.get_table_by_name("wb_health_population"), exported_tables[1]
+            self.get_table(name="wb_health_population"), exported_tables[1]
         )
 
     @pytest.mark.usefixtures("load_world_bank_dashboard_with_slices")
@@ -323,16 +323,15 @@ def test_import_1_slice(self):
         self.assertEqual(slc.datasource.perm, slc.perm)
         self.assert_slice_equals(expected_slice, slc)
 
-        table_id = self.get_table_by_name("wb_health_population").id
+        table_id = self.get_table(name="wb_health_population").id
         self.assertEqual(table_id, self.get_slice(slc_id).datasource_id)
 
     @pytest.mark.usefixtures("load_world_bank_dashboard_with_slices")
     def test_import_2_slices_for_same_table(self):
-        table_id = self.get_table_by_name("wb_health_population").id
-        # table_id != 666, import func will have to find the table
-        slc_1 = self.create_slice("Import Me 1", ds_id=666, id=10002)
+        table_id = self.get_table(name="wb_health_population").id
+        slc_1 = self.create_slice("Import Me 1", ds_id=table_id, id=10002)
         slc_id_1 = import_chart(slc_1, None)
-        slc_2 = self.create_slice("Import Me 2", ds_id=666, id=10003)
+        slc_2 = self.create_slice("Import Me 2", ds_id=table_id, id=10003)
         slc_id_2 = import_chart(slc_2, None)
 
         imported_slc_1 = self.get_slice(slc_id_1)
@@ -345,13 +344,6 @@ def test_import_2_slices_for_same_table(self):
         self.assert_slice_equals(slc_2, imported_slc_2)
         self.assertEqual(imported_slc_2.datasource.perm, imported_slc_2.perm)
 
-    def test_import_slices_for_non_existent_table(self):
-        with self.assertRaises(AttributeError):
-            import_chart(
-                self.create_slice("Import Me 3", id=10004, table_name="non_existent"),
-                None,
-            )
-
     def test_import_slices_override(self):
         slc = self.create_slice("Import Me New", id=10005)
         slc_1_id = import_chart(slc, None, import_time=1990)
diff --git a/tests/queries/__init__.py b/tests/integration_tests/importexport/__init__.py
similarity index 100%
rename from tests/queries/__init__.py
rename to tests/integration_tests/importexport/__init__.py
diff --git a/tests/importexport/commands_tests.py b/tests/integration_tests/importexport/commands_tests.py
similarity index 96%
rename from tests/importexport/commands_tests.py
rename to tests/integration_tests/importexport/commands_tests.py
index a8055c1b9095..230462d097d7 100644
--- a/tests/importexport/commands_tests.py
+++ b/tests/integration_tests/importexport/commands_tests.py
@@ -23,7 +23,7 @@
 from superset import security_manager
 from superset.databases.commands.export import ExportDatabasesCommand
 from superset.utils.core import get_example_database
-from tests.base_tests import SupersetTestCase
+from tests.integration_tests.base_tests import SupersetTestCase
 
 
 class TestExportModelsCommand(SupersetTestCase):
diff --git a/tests/insert_chart_mixin.py b/tests/integration_tests/insert_chart_mixin.py
similarity index 100%
rename from tests/insert_chart_mixin.py
rename to tests/integration_tests/insert_chart_mixin.py
diff --git a/tests/jinja_context_tests.py b/tests/integration_tests/jinja_context_tests.py
similarity index 98%
rename from tests/jinja_context_tests.py
rename to tests/integration_tests/jinja_context_tests.py
index 0628bbe87aa2..a990968e5ada 100644
--- a/tests/jinja_context_tests.py
+++ b/tests/integration_tests/jinja_context_tests.py
@@ -21,12 +21,12 @@
 
 import pytest
 
-import tests.test_app
+import tests.integration_tests.test_app
 from superset import app
 from superset.exceptions import SupersetTemplateException
 from superset.jinja_context import ExtraCache, get_template_processor, safe_proxy
 from superset.utils import core as utils
-from tests.base_tests import SupersetTestCase
+from tests.integration_tests.base_tests import SupersetTestCase
 
 
 class TestJinja2Context(SupersetTestCase):
@@ -323,7 +323,9 @@ def test_template_context_addons(self, addons_mock) -> None:
         rendered = tp.process_template(s)
         self.assertEqual("SELECT '2017-01-01T00:00:00'", rendered)
 
-    @mock.patch("tests.superset_test_custom_template_processors.datetime")
+    @mock.patch(
+        "tests.integration_tests.superset_test_custom_template_processors.datetime"
+    )
     def test_custom_process_template(self, mock_dt) -> None:
         """Test macro defined in custom template processor works."""
         mock_dt.utcnow = mock.Mock(return_value=datetime(1970, 1, 1))
diff --git a/tests/log_api_tests.py b/tests/integration_tests/log_api_tests.py
similarity index 100%
rename from tests/log_api_tests.py
rename to tests/integration_tests/log_api_tests.py
diff --git a/tests/log_model_view_tests.py b/tests/integration_tests/log_model_view_tests.py
similarity index 100%
rename from tests/log_model_view_tests.py
rename to tests/integration_tests/log_model_view_tests.py
diff --git a/tests/logging_configurator_tests.py b/tests/integration_tests/logging_configurator_tests.py
similarity index 100%
rename from tests/logging_configurator_tests.py
rename to tests/integration_tests/logging_configurator_tests.py
diff --git a/tests/migration_tests.py b/tests/integration_tests/migration_tests.py
similarity index 100%
rename from tests/migration_tests.py
rename to tests/integration_tests/migration_tests.py
diff --git a/tests/queries/saved_queries/__init__.py b/tests/integration_tests/migrations/__init__.py
similarity index 100%
rename from tests/queries/saved_queries/__init__.py
rename to tests/integration_tests/migrations/__init__.py
diff --git a/tests/migrations/f1410ed7ec95_tests.py b/tests/integration_tests/migrations/f1410ed7ec95_tests.py
similarity index 100%
rename from tests/migrations/f1410ed7ec95_tests.py
rename to tests/integration_tests/migrations/f1410ed7ec95_tests.py
diff --git a/tests/migrations/fc3a3a8ff221_tests.py b/tests/integration_tests/migrations/fc3a3a8ff221_tests.py
similarity index 100%
rename from tests/migrations/fc3a3a8ff221_tests.py
rename to tests/integration_tests/migrations/fc3a3a8ff221_tests.py
diff --git a/tests/model_tests.py b/tests/integration_tests/model_tests.py
similarity index 93%
rename from tests/model_tests.py
rename to tests/integration_tests/model_tests.py
index 83b826ff800c..deb78460b68a 100644
--- a/tests/model_tests.py
+++ b/tests/integration_tests/model_tests.py
@@ -18,13 +18,14 @@
 import textwrap
 import unittest
 from unittest import mock
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
 
-import pandas
 import pytest
 from sqlalchemy.engine.url import make_url
 
-import tests.test_app
+import tests.integration_tests.test_app
 from superset import app, db as metadata_db
 from superset.models.core import Database
 from superset.models.slice import Slice
@@ -337,12 +338,19 @@ def test_multi_statement(self):
 class TestSqlaTableModel(SupersetTestCase):
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_get_timestamp_expression(self):
-        tbl = self.get_table_by_name("birth_names")
+        col_type = (
+            "VARCHAR"
+            if get_example_database().backend == "presto"
+            else "TemporalWrapperType"
+        )
+        tbl = self.get_table(name="birth_names")
         ds_col = tbl.get_column("ds")
         sqla_literal = ds_col.get_timestamp_expression(None)
         self.assertEqual(str(sqla_literal.compile()), "ds")
+        assert type(sqla_literal.type).__name__ == col_type
 
         sqla_literal = ds_col.get_timestamp_expression("P1D")
+        assert type(sqla_literal.type).__name__ == col_type
         compiled = "{}".format(sqla_literal.compile())
         if tbl.database.backend == "mysql":
             self.assertEqual(compiled, "DATE(ds)")
@@ -350,6 +358,7 @@ def test_get_timestamp_expression(self):
         prev_ds_expr = ds_col.expression
         ds_col.expression = "DATE_ADD(ds, 1)"
         sqla_literal = ds_col.get_timestamp_expression("P1D")
+        assert type(sqla_literal.type).__name__ == col_type
         compiled = "{}".format(sqla_literal.compile())
         if tbl.database.backend == "mysql":
             self.assertEqual(compiled, "DATE(DATE_ADD(ds, 1))")
@@ -357,7 +366,7 @@ def test_get_timestamp_expression(self):
 
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_get_timestamp_expression_epoch(self):
-        tbl = self.get_table_by_name("birth_names")
+        tbl = self.get_table(name="birth_names")
         ds_col = tbl.get_column("ds")
 
         ds_col.expression = None
@@ -382,7 +391,7 @@ def test_get_timestamp_expression_epoch(self):
         ds_col.expression = prev_ds_expr
 
     def query_with_expr_helper(self, is_timeseries, inner_join=True):
-        tbl = self.get_table_by_name("birth_names")
+        tbl = self.get_table(name="birth_names")
         ds_col = tbl.get_column("ds")
         ds_col.expression = None
         ds_col.python_date_format = None
@@ -445,7 +454,7 @@ def test_query_with_expr_groupby(self):
 
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_sql_mutator(self):
-        tbl = self.get_table_by_name("birth_names")
+        tbl = self.get_table(name="birth_names")
         query_obj = dict(
             groupby=[],
             metrics=None,
@@ -470,7 +479,7 @@ def mutator(*args):
         app.config["SQL_QUERY_MUTATOR"] = None
 
     def test_query_with_non_existent_metrics(self):
-        tbl = self.get_table_by_name("birth_names")
+        tbl = self.get_table(name="birth_names")
 
         query_obj = dict(
             groupby=[],
@@ -491,17 +500,19 @@ def test_query_with_non_existent_metrics(self):
 
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_data_for_slices(self):
-        tbl = self.get_table_by_name("birth_names")
+        tbl = self.get_table(name="birth_names")
         slc = (
             metadata_db.session.query(Slice)
             .filter_by(
-                datasource_id=tbl.id,
-                datasource_type=tbl.type,
-                slice_name="Participants",
+                datasource_id=tbl.id, datasource_type=tbl.type, slice_name="Genders",
             )
             .first()
         )
         data_for_slices = tbl.data_for_slices([slc])
-        self.assertEqual(len(data_for_slices["columns"]), 0)
-        self.assertEqual(len(data_for_slices["metrics"]), 1)
-        self.assertEqual(len(data_for_slices["verbose_map"].keys()), 2)
+        assert len(data_for_slices["metrics"]) == 1
+        assert len(data_for_slices["columns"]) == 1
+        assert data_for_slices["metrics"][0]["metric_name"] == "sum__num"
+        assert data_for_slices["columns"][0]["column_name"] == "gender"
+        assert set(data_for_slices["verbose_map"].keys()) == set(
+            ["__timestamp", "sum__num", "gender",]
+        )
diff --git a/tests/pandas_postprocessing_tests.py b/tests/integration_tests/pandas_postprocessing_tests.py
similarity index 87%
rename from tests/pandas_postprocessing_tests.py
rename to tests/integration_tests/pandas_postprocessing_tests.py
index 3f54f7e79db7..1763dad33614 100644
--- a/tests/pandas_postprocessing_tests.py
+++ b/tests/integration_tests/pandas_postprocessing_tests.py
@@ -20,7 +20,8 @@
 import math
 from typing import Any, List, Optional
 
-from pandas import DataFrame, Series, Timestamp
+import numpy as np
+from pandas import DataFrame, Series, Timestamp, to_datetime
 import pytest
 
 from superset.exceptions import QueryObjectValidationError
@@ -38,6 +39,7 @@
     names_df,
     timeseries_df,
     prophet_df,
+    timeseries_df2,
 )
 
 AGGREGATES_SINGLE = {"idx_nulls": {"operator": "sum"}}
@@ -255,6 +257,54 @@ def test_pivot_exceptions(self):
             aggregates={"idx_nulls": {}},
         )
 
+    def test_pivot_eliminate_cartesian_product_columns(self):
+        # single metric
+        mock_df = DataFrame(
+            {
+                "dttm": to_datetime(["2019-01-01", "2019-01-01"]),
+                "a": [0, 1],
+                "b": [0, 1],
+                "metric": [9, np.NAN],
+            }
+        )
+
+        df = proc.pivot(
+            df=mock_df,
+            index=["dttm"],
+            columns=["a", "b"],
+            aggregates={"metric": {"operator": "mean"}},
+            drop_missing_columns=False,
+        )
+        self.assertEqual(list(df.columns), ["dttm", "0, 0", "1, 1"])
+        self.assertTrue(np.isnan(df["1, 1"][0]))
+
+        # multiple metrics
+        mock_df = DataFrame(
+            {
+                "dttm": to_datetime(["2019-01-01", "2019-01-01"]),
+                "a": [0, 1],
+                "b": [0, 1],
+                "metric": [9, np.NAN],
+                "metric2": [10, 11],
+            }
+        )
+
+        df = proc.pivot(
+            df=mock_df,
+            index=["dttm"],
+            columns=["a", "b"],
+            aggregates={
+                "metric": {"operator": "mean"},
+                "metric2": {"operator": "mean"},
+            },
+            drop_missing_columns=False,
+        )
+        self.assertEqual(
+            list(df.columns),
+            ["dttm", "metric, 0, 0", "metric, 1, 1", "metric2, 0, 0", "metric2, 1, 1"],
+        )
+        self.assertTrue(np.isnan(df["metric, 1, 1"][0]))
+
     def test_aggregate(self):
         aggregates = {
             "asc sum": {"column": "asc_idx", "operator": "sum"},
@@ -422,6 +472,64 @@ def test_diff(self):
             columns={"abc": "abc"},
         )
 
+        # diff by columns
+        post_df = proc.diff(df=timeseries_df2, columns={"y": "y", "z": "z"}, axis=1)
+        self.assertListEqual(post_df.columns.tolist(), ["label", "y", "z"])
+        self.assertListEqual(series_to_list(post_df["z"]), [0.0, 2.0, 8.0, 6.0])
+
+    def test_compare(self):
+        # `absolute` comparison
+        post_df = proc.compare(
+            df=timeseries_df2,
+            source_columns=["y"],
+            compare_columns=["z"],
+            compare_type="absolute",
+        )
+        self.assertListEqual(
+            post_df.columns.tolist(), ["label", "y", "z", "absolute__y__z",]
+        )
+        self.assertListEqual(
+            series_to_list(post_df["absolute__y__z"]), [0.0, -2.0, -8.0, -6.0],
+        )
+
+        # drop original columns
+        post_df = proc.compare(
+            df=timeseries_df2,
+            source_columns=["y"],
+            compare_columns=["z"],
+            compare_type="absolute",
+            drop_original_columns=True,
+        )
+        self.assertListEqual(post_df.columns.tolist(), ["label", "absolute__y__z",])
+
+        # `percentage` comparison
+        post_df = proc.compare(
+            df=timeseries_df2,
+            source_columns=["y"],
+            compare_columns=["z"],
+            compare_type="percentage",
+        )
+        self.assertListEqual(
+            post_df.columns.tolist(), ["label", "y", "z", "percentage__y__z",]
+        )
+        self.assertListEqual(
+            series_to_list(post_df["percentage__y__z"]), [0.0, -1.0, -4.0, -3],
+        )
+
+        # `ratio` comparison
+        post_df = proc.compare(
+            df=timeseries_df2,
+            source_columns=["y"],
+            compare_columns=["z"],
+            compare_type="ratio",
+        )
+        self.assertListEqual(
+            post_df.columns.tolist(), ["label", "y", "z", "ratio__y__z",]
+        )
+        self.assertListEqual(
+            series_to_list(post_df["ratio__y__z"]), [1.0, 0.5, 0.2, 0.25],
+        )
+
     def test_cum(self):
         # create new column (cumsum)
         post_df = proc.cum(df=timeseries_df, columns={"y": "y2"}, operator="sum",)
diff --git a/tests/reports/__init__.py b/tests/integration_tests/queries/__init__.py
similarity index 100%
rename from tests/reports/__init__.py
rename to tests/integration_tests/queries/__init__.py
diff --git a/tests/queries/api_tests.py b/tests/integration_tests/queries/api_tests.py
similarity index 99%
rename from tests/queries/api_tests.py
rename to tests/integration_tests/queries/api_tests.py
index a2fc02fe751f..e734af16543c 100644
--- a/tests/queries/api_tests.py
+++ b/tests/integration_tests/queries/api_tests.py
@@ -25,13 +25,13 @@
 import prison
 from sqlalchemy.sql import func
 
-import tests.test_app
+import tests.integration_tests.test_app
 from superset import db, security_manager
 from superset.models.core import Database
 from superset.utils.core import get_example_database, get_main_database, QueryStatus
 from superset.models.sql_lab import Query
 
-from tests.base_tests import SupersetTestCase
+from tests.integration_tests.base_tests import SupersetTestCase
 
 QUERIES_FIXTURE_COUNT = 10
 
diff --git a/tests/security/__init__.py b/tests/integration_tests/queries/saved_queries/__init__.py
similarity index 100%
rename from tests/security/__init__.py
rename to tests/integration_tests/queries/saved_queries/__init__.py
diff --git a/tests/queries/saved_queries/api_tests.py b/tests/integration_tests/queries/saved_queries/api_tests.py
similarity index 99%
rename from tests/queries/saved_queries/api_tests.py
rename to tests/integration_tests/queries/saved_queries/api_tests.py
index bfffebf00cb2..7cb150894b82 100644
--- a/tests/queries/saved_queries/api_tests.py
+++ b/tests/integration_tests/queries/saved_queries/api_tests.py
@@ -26,15 +26,15 @@
 import prison
 from sqlalchemy.sql import func, and_
 
-import tests.test_app
+import tests.integration_tests.test_app
 from superset import db
 from superset.models.core import Database
 from superset.models.core import FavStar
 from superset.models.sql_lab import SavedQuery
 from superset.utils.core import get_example_database
 
-from tests.base_tests import SupersetTestCase
-from tests.fixtures.importexport import (
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.fixtures.importexport import (
     database_config,
     saved_queries_config,
     saved_queries_metadata_config,
diff --git a/tests/queries/saved_queries/commands_tests.py b/tests/integration_tests/queries/saved_queries/commands_tests.py
similarity index 98%
rename from tests/queries/saved_queries/commands_tests.py
rename to tests/integration_tests/queries/saved_queries/commands_tests.py
index aad393673e48..1bf4b26cab3c 100644
--- a/tests/queries/saved_queries/commands_tests.py
+++ b/tests/integration_tests/queries/saved_queries/commands_tests.py
@@ -31,8 +31,8 @@
     ImportSavedQueriesCommand,
 )
 from superset.utils.core import get_example_database
-from tests.base_tests import SupersetTestCase
-from tests.fixtures.importexport import (
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.fixtures.importexport import (
     database_config,
     database_metadata_config,
     saved_queries_config,
diff --git a/tests/query_context_tests.py b/tests/integration_tests/query_context_tests.py
similarity index 74%
rename from tests/query_context_tests.py
rename to tests/integration_tests/query_context_tests.py
index 660bcddccff3..87af4c931b98 100644
--- a/tests/query_context_tests.py
+++ b/tests/integration_tests/query_context_tests.py
@@ -14,7 +14,9 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+import datetime
 import re
+import time
 from typing import Any, Dict
 
 import pytest
@@ -24,6 +26,7 @@
 from superset.common.query_context import QueryContext
 from superset.common.query_object import QueryObject
 from superset.connectors.connector_registry import ConnectorRegistry
+from superset.connectors.sqla.models import SqlMetric
 from superset.extensions import cache_manager
 from superset.utils.core import (
     AdhocMetricExpressionType,
@@ -32,9 +35,11 @@
     ChartDataResultType,
     TimeRangeEndpoint,
 )
-from tests.base_tests import SupersetTestCase
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
-from tests.fixtures.query_context import get_query_context
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
+from tests.integration_tests.fixtures.query_context import get_query_context
 
 
 def get_sql_text(payload: Dict[str, Any]) -> str:
@@ -87,7 +92,7 @@ def test_schema_deserialization(self):
 
     def test_cache(self):
         table_name = "birth_names"
-        table = self.get_table_by_name(table_name)
+        table = self.get_table(name=table_name)
         payload = get_query_context(table.name, table.id)
         payload["force"] = True
 
@@ -142,6 +147,42 @@ def test_query_cache_key_changes_when_datasource_is_updated(self):
         # the new cache_key should be different due to updated datasource
         self.assertNotEqual(cache_key_original, cache_key_new)
 
+    def test_query_cache_key_changes_when_metric_is_updated(self):
+        self.login(username="admin")
+        payload = get_query_context("birth_names")
+
+        # make temporary change and revert it to refresh the changed_on property
+        datasource = ConnectorRegistry.get_datasource(
+            datasource_type=payload["datasource"]["type"],
+            datasource_id=payload["datasource"]["id"],
+            session=db.session,
+        )
+
+        datasource.metrics.append(SqlMetric(metric_name="foo", expression="select 1;"))
+        db.session.commit()
+
+        # construct baseline query_cache_key
+        query_context = ChartDataQueryContextSchema().load(payload)
+        query_object = query_context.queries[0]
+        cache_key_original = query_context.query_cache_key(query_object)
+
+        # wait a second since mysql records timestamps in second granularity
+        time.sleep(1)
+
+        datasource.metrics[0].expression = "select 2;"
+        db.session.commit()
+
+        # create new QueryContext with unchanged attributes, extract new query_cache_key
+        query_context = ChartDataQueryContextSchema().load(payload)
+        query_object = query_context.queries[0]
+        cache_key_new = query_context.query_cache_key(query_object)
+
+        datasource.metrics = []
+        db.session.commit()
+
+        # the new cache_key should be different due to updated datasource
+        self.assertNotEqual(cache_key_original, cache_key_new)
+
     def test_query_cache_key_does_not_change_for_non_existent_or_null(self):
         self.login(username="admin")
         payload = get_query_context("birth_names", add_postprocessing_operations=True)
@@ -181,6 +222,20 @@ def test_query_cache_key_changes_when_post_processing_is_updated(self):
         cache_key = query_context.query_cache_key(query_object)
         self.assertNotEqual(cache_key_original, cache_key)
 
+    def test_query_cache_key_changes_when_time_offsets_is_updated(self):
+        self.login(username="admin")
+        payload = get_query_context("birth_names", add_time_offsets=True)
+
+        query_context = ChartDataQueryContextSchema().load(payload)
+        query_object = query_context.queries[0]
+        cache_key_original = query_context.query_cache_key(query_object)
+
+        payload["queries"][0]["time_offsets"].pop()
+        query_context = ChartDataQueryContextSchema().load(payload)
+        query_object = query_context.queries[0]
+        cache_key = query_context.query_cache_key(query_object)
+        self.assertNotEqual(cache_key_original, cache_key)
+
     def test_query_context_time_range_endpoints(self):
         """
         Ensure that time_range_endpoints are populated automatically when missing
@@ -435,3 +490,92 @@ def test_query_object_unknown_fields(self):
         responses = query_context.get_payload()
         new_cache_key = responses["queries"][0]["cache_key"]
         self.assertEqual(orig_cache_key, new_cache_key)
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    def test_time_offsets_in_query_object(self):
+        """
+        Ensure that time_offsets can generate the correct query
+        """
+        self.login(username="admin")
+        payload = get_query_context("birth_names")
+        payload["queries"][0]["metrics"] = ["sum__num"]
+        payload["queries"][0]["groupby"] = ["name"]
+        payload["queries"][0]["is_timeseries"] = True
+        payload["queries"][0]["timeseries_limit"] = 5
+        payload["queries"][0]["time_offsets"] = ["1 year ago", "1 year later"]
+        payload["queries"][0]["time_range"] = "1990 : 1991"
+        query_context = ChartDataQueryContextSchema().load(payload)
+        responses = query_context.get_payload()
+        self.assertEqual(
+            responses["queries"][0]["colnames"],
+            [
+                "__timestamp",
+                "name",
+                "sum__num",
+                "sum__num__1 year ago",
+                "sum__num__1 year later",
+            ],
+        )
+
+        sqls = [
+            sql for sql in responses["queries"][0]["query"].split(";") if sql.strip()
+        ]
+        self.assertEqual(len(sqls), 3)
+        # 1 year ago
+        assert re.search(r"1989-01-01.+1990-01-01", sqls[1], re.S)
+        assert re.search(r"1990-01-01.+1991-01-01", sqls[1], re.S)
+
+        # # 1 year later
+        assert re.search(r"1991-01-01.+1992-01-01", sqls[2], re.S)
+        assert re.search(r"1990-01-01.+1991-01-01", sqls[2], re.S)
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    def test_processing_time_offsets_cache(self):
+        """
+        Ensure that time_offsets can generate the correct query
+        """
+        self.login(username="admin")
+        payload = get_query_context("birth_names")
+        payload["queries"][0]["metrics"] = ["sum__num"]
+        payload["queries"][0]["groupby"] = ["name"]
+        payload["queries"][0]["is_timeseries"] = True
+        payload["queries"][0]["timeseries_limit"] = 5
+        payload["queries"][0]["time_offsets"] = []
+        payload["queries"][0]["time_range"] = "1990 : 1991"
+        query_context = ChartDataQueryContextSchema().load(payload)
+        query_object = query_context.queries[0]
+        query_result = query_context.get_query_result(query_object)
+        # get main query dataframe
+        df = query_result.df
+
+        payload["queries"][0]["time_offsets"] = ["1 year ago", "1 year later"]
+        query_context = ChartDataQueryContextSchema().load(payload)
+        query_object = query_context.queries[0]
+        # query without cache
+        query_context.processing_time_offsets(df, query_object)
+        # query with cache
+        rv = query_context.processing_time_offsets(df, query_object)
+        cache_keys = rv["cache_keys"]
+        cache_keys__1_year_ago = cache_keys[0]
+        cache_keys__1_year_later = cache_keys[1]
+        self.assertIsNotNone(cache_keys__1_year_ago)
+        self.assertIsNotNone(cache_keys__1_year_later)
+        self.assertNotEqual(cache_keys__1_year_ago, cache_keys__1_year_later)
+
+        # swap offsets
+        payload["queries"][0]["time_offsets"] = ["1 year later", "1 year ago"]
+        query_context = ChartDataQueryContextSchema().load(payload)
+        query_object = query_context.queries[0]
+        rv = query_context.processing_time_offsets(df, query_object)
+        cache_keys = rv["cache_keys"]
+        self.assertEqual(cache_keys__1_year_ago, cache_keys[1])
+        self.assertEqual(cache_keys__1_year_later, cache_keys[0])
+
+        # remove all offsets
+        payload["queries"][0]["time_offsets"] = []
+        query_context = ChartDataQueryContextSchema().load(payload)
+        query_object = query_context.queries[0]
+        rv = query_context.processing_time_offsets(df, query_object,)
+        self.assertIs(rv["df"], df)
+        self.assertEqual(rv["queries"], [])
+        self.assertEqual(rv["cache_keys"], [])
diff --git a/tests/tasks/__init__.py b/tests/integration_tests/reports/__init__.py
similarity index 100%
rename from tests/tasks/__init__.py
rename to tests/integration_tests/reports/__init__.py
diff --git a/tests/reports/api_tests.py b/tests/integration_tests/reports/api_tests.py
similarity index 82%
rename from tests/reports/api_tests.py
rename to tests/integration_tests/reports/api_tests.py
index 24abfaf8b9a1..55fce65162ea 100644
--- a/tests/reports/api_tests.py
+++ b/tests/integration_tests/reports/api_tests.py
@@ -29,6 +29,7 @@
 from superset.models.dashboard import Dashboard
 from superset.models.reports import (
     ReportSchedule,
+    ReportCreationMethodType,
     ReportRecipients,
     ReportExecutionLog,
     ReportScheduleType,
@@ -36,10 +37,12 @@
     ReportState,
 )
 from superset.utils.core import get_example_database
-from tests.base_tests import SupersetTestCase
-from tests.conftest import with_feature_flags
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
-from tests.reports.utils import insert_report_schedule
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.conftest import with_feature_flags
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
+from tests.integration_tests.reports.utils import insert_report_schedule
 
 
 REPORTS_COUNT = 10
@@ -57,10 +60,10 @@ def create_working_report_schedule(self):
 
             report_schedule = insert_report_schedule(
                 type=ReportScheduleType.ALERT,
-                name=f"name_working",
-                crontab=f"* * * * *",
-                sql=f"SELECT value from table",
-                description=f"Report working",
+                name="name_working",
+                crontab="* * * * *",
+                sql="SELECT value from table",
+                description="Report working",
                 chart=chart,
                 database=example_db,
                 owners=[admin_user, alpha_user],
@@ -178,6 +181,7 @@ def test_get_report_schedule(self):
             "chart": {
                 "id": report_schedule.chart.id,
                 "slice_name": report_schedule.chart.slice_name,
+                "viz_type": report_schedule.chart.viz_type,
             },
             "context_markdown": report_schedule.context_markdown,
             "crontab": report_schedule.crontab,
@@ -202,6 +206,7 @@ def test_get_report_schedule(self):
                     "type": "Email",
                 }
             ],
+            "timezone": report_schedule.timezone,
             "type": report_schedule.type,
             "validator_config_json": report_schedule.validator_config_json,
             "validator_type": report_schedule.validator_type,
@@ -267,14 +272,17 @@ def test_get_list_report_schedule(self):
             "changed_on_delta_humanized",
             "created_by",
             "created_on",
+            "creation_method",
             "crontab",
             "crontab_humanized",
+            "description",
             "id",
             "last_eval_dttm",
             "last_state",
             "name",
             "owners",
             "recipients",
+            "timezone",
             "type",
         ]
         assert rv.status_code == 200
@@ -298,7 +306,7 @@ def test_get_list_report_schedule_sorting(self):
         ReportSchedule Api: Test sorting on get list report schedules
         """
         self.login(username="admin")
-        uri = f"api/v1/report/"
+        uri = "api/v1/report/"
 
         order_columns = [
             "active",
@@ -308,6 +316,7 @@ def test_get_list_report_schedule_sorting(self):
             "changed_on_delta_humanized",
             "created_on",
             "crontab",
+            "description",
             "last_eval_dttm",
             "name",
             "type",
@@ -440,6 +449,7 @@ def test_create_report_schedule(self):
             "name": "new3",
             "description": "description",
             "crontab": "0 9 * * *",
+            "creation_method": ReportCreationMethodType.ALERTS_REPORTS,
             "recipients": [
                 {
                     "type": ReportRecipientType.EMAIL,
@@ -468,6 +478,7 @@ def test_create_report_schedule(self):
         assert created_model.crontab == report_schedule_data["crontab"]
         assert created_model.chart.id == report_schedule_data["chart"]
         assert created_model.database.id == report_schedule_data["database"]
+        assert created_model.creation_method == report_schedule_data["creation_method"]
         # Rollback changes
         db.session.delete(created_model)
         db.session.commit()
@@ -485,6 +496,7 @@ def test_create_report_schedule_uniqueness(self):
             "type": ReportScheduleType.ALERT,
             "name": "name3",
             "description": "description",
+            "creation_method": ReportCreationMethodType.ALERTS_REPORTS,
             "crontab": "0 9 * * *",
             "chart": chart.id,
             "database": example_db.id,
@@ -501,6 +513,7 @@ def test_create_report_schedule_uniqueness(self):
             "name": "name3",
             "description": "description",
             "crontab": "0 9 * * *",
+            "creation_method": ReportCreationMethodType.ALERTS_REPORTS,
             "chart": chart.id,
         }
         uri = "api/v1/report/"
@@ -530,6 +543,7 @@ def test_create_report_schedule_schema(self):
             "type": ReportScheduleType.REPORT,
             "name": "name3",
             "description": "description",
+            "creation_method": ReportCreationMethodType.ALERTS_REPORTS,
             "crontab": "0 9 * * *",
             "chart": chart.id,
             "database": example_db.id,
@@ -543,6 +557,7 @@ def test_create_report_schedule_schema(self):
             "type": ReportScheduleType.ALERT,
             "name": "new3",
             "description": "description",
+            "creation_method": ReportCreationMethodType.ALERTS_REPORTS,
             "crontab": "0 9 * * *",
             "recipients": [
                 {
@@ -567,6 +582,7 @@ def test_create_report_schedule_schema(self):
             "type": ReportScheduleType.ALERT,
             "name": "new3",
             "description": "description",
+            "creation_method": ReportCreationMethodType.ALERTS_REPORTS,
             "crontab": "0 9 * * *",
             "recipients": [
                 {
@@ -590,6 +606,7 @@ def test_create_report_schedule_schema(self):
             "type": ReportScheduleType.ALERT,
             "name": "new3",
             "description": "description",
+            "creation_method": ReportCreationMethodType.ALERTS_REPORTS,
             "crontab": "0 9 * * *",
             "recipients": [
                 {
@@ -615,6 +632,7 @@ def test_create_report_schedule_schema(self):
             "type": ReportScheduleType.ALERT,
             "name": "new4",
             "description": "description",
+            "creation_method": ReportCreationMethodType.ALERTS_REPORTS,
             "crontab": "0 9 * * *",
             "recipients": [
                 {
@@ -640,6 +658,7 @@ def test_create_report_schedule_schema(self):
             "type": ReportScheduleType.ALERT,
             "name": "new5",
             "description": "description",
+            "creation_method": ReportCreationMethodType.ALERTS_REPORTS,
             "crontab": "0 9 * * *",
             "recipients": [
                 {
@@ -660,6 +679,117 @@ def test_create_report_schedule_schema(self):
         rv = self.client.post(uri, json=report_schedule_data)
         assert rv.status_code == 201
 
+        # Test that report cannot be created with null timezone
+        report_schedule_data = {
+            "type": ReportScheduleType.ALERT,
+            "name": "new5",
+            "description": "description",
+            "creation_method": ReportCreationMethodType.ALERTS_REPORTS,
+            "crontab": "0 9 * * *",
+            "recipients": [
+                {
+                    "type": ReportRecipientType.EMAIL,
+                    "recipient_config_json": {"target": "target@superset.org"},
+                },
+                {
+                    "type": ReportRecipientType.SLACK,
+                    "recipient_config_json": {"target": "channel"},
+                },
+            ],
+            "working_timeout": 3600,
+            "timezone": None,
+            "dashboard": dashboard.id,
+            "database": example_db.id,
+        }
+        rv = self.client.post(uri, json=report_schedule_data)
+        assert rv.status_code == 400
+        data = json.loads(rv.data.decode("utf-8"))
+        assert data == {"message": {"timezone": ["Field may not be null."]}}
+
+        # Test that report should reflect the timezone value passed in
+        report_schedule_data = {
+            "type": ReportScheduleType.ALERT,
+            "name": "new6",
+            "description": "description",
+            "creation_method": ReportCreationMethodType.ALERTS_REPORTS,
+            "crontab": "0 9 * * *",
+            "recipients": [
+                {
+                    "type": ReportRecipientType.EMAIL,
+                    "recipient_config_json": {"target": "target@superset.org"},
+                },
+                {
+                    "type": ReportRecipientType.SLACK,
+                    "recipient_config_json": {"target": "channel"},
+                },
+            ],
+            "working_timeout": 3600,
+            "timezone": "America/Los_Angeles",
+            "dashboard": dashboard.id,
+            "database": example_db.id,
+        }
+        uri = "api/v1/report/"
+        rv = self.client.post(uri, json=report_schedule_data)
+        data = json.loads(rv.data.decode("utf-8"))
+        assert data["result"]["timezone"] == "America/Los_Angeles"
+        assert rv.status_code == 201
+
+    @pytest.mark.usefixtures(
+        "load_birth_names_dashboard_with_slices", "create_report_schedules"
+    )
+    def test_unsaved_report_schedule_schema(self):
+        """
+        ReportSchedule Api: Test create report schedule with unsaved chart
+        """
+        self.login(username="admin")
+        chart = db.session.query(Slice).first()
+        dashboard = db.session.query(Dashboard).first()
+        example_db = get_example_database()
+
+        report_schedule_data = {
+            "type": ReportScheduleType.REPORT,
+            "name": "name3",
+            "description": "description",
+            "creation_method": ReportCreationMethodType.CHARTS,
+            "crontab": "0 9 * * *",
+            "chart": 0,
+        }
+        uri = "api/v1/report/"
+        rv = self.client.post(uri, json=report_schedule_data)
+        data = json.loads(rv.data.decode("utf-8"))
+        assert rv.status_code == 422
+        assert (
+            data["message"]["chart"]
+            == "Please save your chart first, then try creating a new email report."
+        )
+
+    @pytest.mark.usefixtures(
+        "load_birth_names_dashboard_with_slices", "create_report_schedules"
+    )
+    def test_no_dashboard_report_schedule_schema(self):
+        """
+        ReportSchedule Api: Test create report schedule with not dashboard id
+        """
+        self.login(username="admin")
+        chart = db.session.query(Slice).first()
+        dashboard = db.session.query(Dashboard).first()
+        example_db = get_example_database()
+        report_schedule_data = {
+            "type": ReportScheduleType.REPORT,
+            "name": "name3",
+            "description": "description",
+            "creation_method": ReportCreationMethodType.DASHBOARDS,
+            "crontab": "0 9 * * *",
+        }
+        uri = "api/v1/report/"
+        rv = self.client.post(uri, json=report_schedule_data)
+        data = json.loads(rv.data.decode("utf-8"))
+        assert rv.status_code == 422
+        assert (
+            data["message"]["dashboard"]
+            == "Please save your dashboard first, then try creating a new email report."
+        )
+
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_create_report_schedule_chart_dash_validation(self):
         """
@@ -676,6 +806,7 @@ def test_create_report_schedule_chart_dash_validation(self):
             "name": "new3",
             "description": "description",
             "crontab": "0 9 * * *",
+            "creation_method": ReportCreationMethodType.ALERTS_REPORTS,
             "chart": chart.id,
             "dashboard": dashboard.id,
             "database": example_db.id,
@@ -699,6 +830,7 @@ def test_create_report_schedule_chart_db_validation(self):
             "type": ReportScheduleType.ALERT,
             "name": "new3",
             "description": "description",
+            "creation_method": ReportCreationMethodType.ALERTS_REPORTS,
             "crontab": "0 9 * * *",
             "chart": chart.id,
         }
@@ -724,6 +856,7 @@ def test_create_report_schedule_relations_exist(self):
             "type": ReportScheduleType.ALERT,
             "name": "new3",
             "description": "description",
+            "creation_method": ReportCreationMethodType.ALERTS_REPORTS,
             "crontab": "0 9 * * *",
             "chart": chart_max_id + 1,
             "database": database_max_id + 1,
@@ -746,6 +879,7 @@ def test_create_report_schedule_relations_exist(self):
             "name": "new3",
             "description": "description",
             "crontab": "0 9 * * *",
+            "creation_method": ReportCreationMethodType.ALERTS_REPORTS,
             "dashboard": dashboard_max_id + 1,
             "database": examples_db.id,
         }
@@ -755,6 +889,82 @@ def test_create_report_schedule_relations_exist(self):
         data = json.loads(rv.data.decode("utf-8"))
         assert data == {"message": {"dashboard": "Dashboard does not exist"}}
 
+    # @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    # TODO (AAfghahi): I am going to enable this when the report schedule feature is fully finished
+    # def test_create_report_schedule_no_creation_method(self):
+    #     """
+    #     ReportSchedule Api: Test create report schedule
+    #     """
+    #     self.login(username="admin")
+
+    #     chart = db.session.query(Slice).first()
+    #     example_db = get_example_database()
+    #     report_schedule_data = {
+    #         "type": ReportScheduleType.ALERT,
+    #         "name": "new3",
+    #         "description": "description",
+    #         "crontab": "0 9 * * *",
+    #         "recipients": [
+    #             {
+    #                 "type": ReportRecipientType.EMAIL,
+    #                 "recipient_config_json": {"target": "target@superset.org"},
+    #             },
+    #             {
+    #                 "type": ReportRecipientType.SLACK,
+    #                 "recipient_config_json": {"target": "channel"},
+    #             },
+    #         ],
+    #         "grace_period": 14400,
+    #         "working_timeout": 3600,
+    #         "chart": chart.id,
+    #         "database": example_db.id,
+    #     }
+    #     uri = "api/v1/report/"
+    #     rv = self.client.post(uri, json=report_schedule_data)
+    #     response = json.loads(rv.data.decode("utf-8"))
+    #     assert response == {
+    #         "message": {"creation_method": ["Missing data for required field."]}
+    #     }
+    #     assert rv.status_code == 400
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    def test_create_report_schedule_invalid_creation_method(self):
+        """
+        ReportSchedule API: Test create report schedule
+        """
+        self.login(username="admin")
+
+        chart = db.session.query(Slice).first()
+        example_db = get_example_database()
+        report_schedule_data = {
+            "type": ReportScheduleType.ALERT,
+            "name": "new3",
+            "description": "description",
+            "creation_method": "BAD_CREATION_METHOD",
+            "crontab": "0 9 * * *",
+            "recipients": [
+                {
+                    "type": ReportRecipientType.EMAIL,
+                    "recipient_config_json": {"target": "target@superset.org"},
+                },
+                {
+                    "type": ReportRecipientType.SLACK,
+                    "recipient_config_json": {"target": "channel"},
+                },
+            ],
+            "grace_period": 14400,
+            "working_timeout": 3600,
+            "chart": chart.id,
+            "database": example_db.id,
+        }
+        uri = "api/v1/report/"
+        rv = self.client.post(uri, json=report_schedule_data)
+        response = json.loads(rv.data.decode("utf-8"))
+        assert response == {
+            "message": {"creation_method": ["Invalid enum value BAD_CREATION_METHOD"]}
+        }
+        assert rv.status_code == 400
+
     @pytest.mark.usefixtures("create_report_schedules")
     def test_update_report_schedule(self):
         """
diff --git a/tests/reports/commands_tests.py b/tests/integration_tests/reports/commands_tests.py
similarity index 87%
rename from tests/reports/commands_tests.py
rename to tests/integration_tests/reports/commands_tests.py
index e274f9c04066..733b75a2e52c 100644
--- a/tests/reports/commands_tests.py
+++ b/tests/integration_tests/reports/commands_tests.py
@@ -15,13 +15,13 @@
 # specific language governing permissions and limitations
 # under the License.
 import json
+from contextlib import contextmanager
 from datetime import datetime, timedelta
 from typing import List, Optional
 from unittest.mock import Mock, patch
 from uuid import uuid4
 
 import pytest
-from contextlib2 import contextmanager
 from flask_sqlalchemy import BaseQuery
 from freezegun import freeze_time
 from sqlalchemy.sql import func
@@ -50,7 +50,6 @@
     ReportScheduleNotFoundError,
     ReportScheduleNotificationError,
     ReportSchedulePreviousWorkingError,
-    ReportSchedulePruneLogError,
     ReportScheduleScreenshotFailedError,
     ReportScheduleScreenshotTimeout,
     ReportScheduleWorkingTimeoutError,
@@ -58,13 +57,15 @@
 from superset.reports.commands.execute import AsyncExecuteReportScheduleCommand
 from superset.reports.commands.log_prune import AsyncPruneReportScheduleLogCommand
 from superset.utils.core import get_example_database
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
-from tests.fixtures.world_bank_dashboard import (
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
+from tests.integration_tests.fixtures.world_bank_dashboard import (
     load_world_bank_dashboard_with_slices_module_scope,
 )
-from tests.reports.utils import insert_report_schedule
-from tests.test_app import app
-from tests.utils import read_fixture
+from tests.integration_tests.reports.utils import insert_report_schedule
+from tests.integration_tests.test_app import app
+from tests.integration_tests.utils import read_fixture
 
 pytestmark = pytest.mark.usefixtures(
     "load_world_bank_dashboard_with_slices_module_scope"
@@ -131,6 +132,7 @@ def create_report_notification(
     validator_config_json: Optional[str] = None,
     grace_period: Optional[int] = None,
     report_format: Optional[ReportDataFormat] = None,
+    name: Optional[str] = None,
 ) -> ReportSchedule:
     report_type = report_type or ReportScheduleType.REPORT
     target = email_target or slack_channel
@@ -152,11 +154,14 @@ def create_report_notification(
             recipient_config_json=json.dumps(config_json),
         )
 
+    if name is None:
+        name = "report_with_csv" if report_format else "report"
+
     report_schedule = insert_report_schedule(
         type=report_type,
-        name=f"report_with_csv" if report_format else f"report",
-        crontab=f"0 9 * * *",
-        description=f"Daily report",
+        name=name,
+        crontab="0 9 * * *",
+        description="Daily report",
         sql=sql,
         chart=chart,
         dashboard=dashboard,
@@ -215,6 +220,7 @@ def create_report_email_chart():
 def create_report_email_chart_with_csv():
     with app.app_context():
         chart = db.session.query(Slice).first()
+        chart.query_context = '{"mock": "query_context"}'
         report_schedule = create_report_notification(
             email_target="target@email.com",
             chart=chart,
@@ -224,6 +230,35 @@ def create_report_email_chart_with_csv():
         cleanup_report_schedule(report_schedule)
 
 
+@pytest.fixture()
+def create_report_email_chart_with_text():
+    with app.app_context():
+        chart = db.session.query(Slice).first()
+        chart.query_context = '{"mock": "query_context"}'
+        report_schedule = create_report_notification(
+            email_target="target@email.com",
+            chart=chart,
+            report_format=ReportDataFormat.TEXT,
+        )
+        yield report_schedule
+        cleanup_report_schedule(report_schedule)
+
+
+@pytest.fixture()
+def create_report_email_chart_with_csv_no_query_context():
+    with app.app_context():
+        chart = db.session.query(Slice).first()
+        chart.query_context = None
+        report_schedule = create_report_notification(
+            email_target="target@email.com",
+            chart=chart,
+            report_format=ReportDataFormat.DATA,
+            name="report_csv_no_query_context",
+        )
+        yield report_schedule
+        cleanup_report_schedule(report_schedule)
+
+
 @pytest.fixture()
 def create_report_email_dashboard():
     with app.app_context():
@@ -252,6 +287,7 @@ def create_report_slack_chart():
 def create_report_slack_chart_with_csv():
     with app.app_context():
         chart = db.session.query(Slice).first()
+        chart.query_context = '{"mock": "query_context"}'
         report_schedule = create_report_notification(
             slack_channel="slack_channel",
             chart=chart,
@@ -262,6 +298,21 @@ def create_report_slack_chart_with_csv():
         cleanup_report_schedule(report_schedule)
 
 
+@pytest.fixture()
+def create_report_slack_chart_with_text():
+    with app.app_context():
+        chart = db.session.query(Slice).first()
+        chart.query_context = '{"mock": "query_context"}'
+        report_schedule = create_report_notification(
+            slack_channel="slack_channel",
+            chart=chart,
+            report_format=ReportDataFormat.TEXT,
+        )
+        yield report_schedule
+
+        cleanup_report_schedule(report_schedule)
+
+
 @pytest.fixture()
 def create_report_slack_chart_working():
     with app.app_context():
@@ -658,6 +709,121 @@ def test_email_chart_report_schedule_with_csv(
         assert_log(ReportState.SUCCESS)
 
 
+@pytest.mark.usefixtures(
+    "load_birth_names_dashboard_with_slices",
+    "create_report_email_chart_with_csv_no_query_context",
+)
+@patch("superset.utils.csv.urllib.request.urlopen")
+@patch("superset.utils.csv.urllib.request.OpenerDirector.open")
+@patch("superset.reports.notifications.email.send_email_smtp")
+@patch("superset.utils.csv.get_chart_csv_data")
+@patch("superset.utils.screenshots.ChartScreenshot.get_screenshot")
+def test_email_chart_report_schedule_with_csv_no_query_context(
+    screenshot_mock,
+    csv_mock,
+    email_mock,
+    mock_open,
+    mock_urlopen,
+    create_report_email_chart_with_csv_no_query_context,
+):
+    """
+    ExecuteReport Command: Test chart email report schedule with CSV (no query context)
+    """
+    # setup screenshot mock
+    screenshot_mock.return_value = SCREENSHOT_FILE
+
+    # setup csv mock
+    response = Mock()
+    mock_open.return_value = response
+    mock_urlopen.return_value = response
+    mock_urlopen.return_value.getcode.return_value = 200
+    response.read.return_value = CSV_FILE
+
+    with freeze_time("2020-01-01T00:00:00Z"):
+        AsyncExecuteReportScheduleCommand(
+            TEST_ID,
+            create_report_email_chart_with_csv_no_query_context.id,
+            datetime.utcnow(),
+        ).run()
+
+        # verify that when query context is null we request a screenshot
+        screenshot_mock.assert_called_once()
+
+
+@pytest.mark.usefixtures(
+    "load_birth_names_dashboard_with_slices", "create_report_email_chart_with_text"
+)
+@patch("superset.utils.csv.urllib.request.urlopen")
+@patch("superset.utils.csv.urllib.request.OpenerDirector.open")
+@patch("superset.reports.notifications.email.send_email_smtp")
+@patch("superset.utils.csv.get_chart_dataframe")
+def test_email_chart_report_schedule_with_text(
+    dataframe_mock,
+    email_mock,
+    mock_open,
+    mock_urlopen,
+    create_report_email_chart_with_text,
+):
+    """
+    ExecuteReport Command: Test chart email report schedule with text
+    """
+    # setup dataframe mock
+    response = Mock()
+    mock_open.return_value = response
+    mock_urlopen.return_value = response
+    mock_urlopen.return_value.getcode.return_value = 200
+    response.read.return_value = json.dumps(
+        {
+            "result": [
+                {
+                    "data": {
+                        "t1": {0: "c11", 1: "c21"},
+                        "t2": {0: "c12", 1: "c22"},
+                        "t3__sum": {0: "c13", 1: "c23"},
+                    },
+                    "colnames": [("t1",), ("t2",), ("t3__sum",)],
+                    "indexnames": [(0,), (1,)],
+                },
+            ],
+        }
+    ).encode("utf-8")
+
+    with freeze_time("2020-01-01T00:00:00Z"):
+        AsyncExecuteReportScheduleCommand(
+            TEST_ID, create_report_email_chart_with_text.id, datetime.utcnow()
+        ).run()
+
+        # assert that the data is embedded correctly
+        table_html = """<table border="1" class="dataframe">
+  <thead>
+    <tr>
+      <th></th>
+      <th>t1</th>
+      <th>t2</th>
+      <th>t3__sum</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <th>0</th>
+      <td>c11</td>
+      <td>c12</td>
+      <td>c13</td>
+    </tr>
+    <tr>
+      <th>1</th>
+      <td>c21</td>
+      <td>c22</td>
+      <td>c23</td>
+    </tr>
+  </tbody>
+</table>"""
+        assert table_html in email_mock.call_args[0][2]
+
+        # Assert logs are correct
+        assert_log(ReportState.SUCCESS)
+
+
 @pytest.mark.usefixtures(
     "load_birth_names_dashboard_with_slices", "create_report_email_dashboard"
 )
@@ -757,6 +923,59 @@ def test_slack_chart_report_schedule_with_csv(
         assert_log(ReportState.SUCCESS)
 
 
+@pytest.mark.usefixtures(
+    "load_birth_names_dashboard_with_slices", "create_report_slack_chart_with_text"
+)
+@patch("superset.reports.notifications.slack.WebClient.chat_postMessage")
+@patch("superset.utils.csv.urllib.request.urlopen")
+@patch("superset.utils.csv.urllib.request.OpenerDirector.open")
+@patch("superset.utils.csv.get_chart_dataframe")
+def test_slack_chart_report_schedule_with_text(
+    dataframe_mock,
+    mock_open,
+    mock_urlopen,
+    post_message_mock,
+    create_report_slack_chart_with_text,
+):
+    """
+    ExecuteReport Command: Test chart slack report schedule with text
+    """
+    # setup dataframe mock
+    response = Mock()
+    mock_open.return_value = response
+    mock_urlopen.return_value = response
+    mock_urlopen.return_value.getcode.return_value = 200
+    response.read.return_value = json.dumps(
+        {
+            "result": [
+                {
+                    "data": {
+                        "t1": {0: "c11", 1: "c21"},
+                        "t2": {0: "c12", 1: "c22"},
+                        "t3__sum": {0: "c13", 1: "c23"},
+                    },
+                    "colnames": [("t1",), ("t2",), ("t3__sum",)],
+                    "indexnames": [(0,), (1,)],
+                },
+            ],
+        }
+    ).encode("utf-8")
+
+    with freeze_time("2020-01-01T00:00:00Z"):
+        AsyncExecuteReportScheduleCommand(
+            TEST_ID, create_report_slack_chart_with_text.id, datetime.utcnow()
+        ).run()
+
+        table_markdown = """|    | t1   | t2   | t3__sum   |
+|---:|:-----|:-----|:----------|
+|  0 | c11  | c12  | c13       |
+|  1 | c21  | c22  | c23       |"""
+        assert table_markdown in post_message_mock.call_args[1]["text"]
+
+        # Assert logs are correct
+        assert_log(ReportState.SUCCESS)
+
+
 @pytest.mark.usefixtures("create_report_slack_chart")
 def test_report_schedule_not_found(create_report_slack_chart):
     """
diff --git a/tests/reports/scheduler_tests.py b/tests/integration_tests/reports/scheduler_tests.py
similarity index 50%
rename from tests/reports/scheduler_tests.py
rename to tests/integration_tests/reports/scheduler_tests.py
index afbaeec9056a..73783f496762 100644
--- a/tests/reports/scheduler_tests.py
+++ b/tests/integration_tests/reports/scheduler_tests.py
@@ -23,47 +23,72 @@
 
 from superset.extensions import db
 from superset.models.reports import ReportScheduleType
-from superset.tasks.scheduler import cron_schedule_window, scheduler
-from tests.reports.utils import insert_report_schedule
-from tests.test_app import app
-
-
-@pytest.mark.parametrize(
-    "current_dttm, cron, excepted",
-    [
-        ("2020-01-01T08:59:01Z", "0 9 * * *", []),
-        ("2020-01-01T08:59:02Z", "0 9 * * *", [FakeDatetime(2020, 1, 1, 9, 0)]),
-        ("2020-01-01T08:59:59Z", "0 9 * * *", [FakeDatetime(2020, 1, 1, 9, 0)]),
-        ("2020-01-01T09:00:00Z", "0 9 * * *", [FakeDatetime(2020, 1, 1, 9, 0)]),
-        ("2020-01-01T09:00:01Z", "0 9 * * *", []),
-    ],
-)
-def test_cron_schedule_window(
-    current_dttm: str, cron: str, excepted: List[FakeDatetime]
-):
+from superset.tasks.scheduler import scheduler
+from tests.integration_tests.reports.utils import insert_report_schedule
+from tests.integration_tests.test_app import app
+
+
+@patch("superset.tasks.scheduler.execute.apply_async")
+def test_scheduler_celery_timeout_ny(execute_mock):
     """
-    Reports scheduler: Test cron schedule window
+    Reports scheduler: Test scheduler setting celery soft and hard timeout
     """
     with app.app_context():
 
-        with freeze_time(current_dttm):
-            datetimes = cron_schedule_window(cron)
-            assert list(datetimes) == excepted
+        report_schedule = insert_report_schedule(
+            type=ReportScheduleType.ALERT,
+            name="report",
+            crontab="0 4 * * *",
+            timezone="America/New_York",
+        )
+
+        with freeze_time("2020-01-01T09:00:00Z"):
+            scheduler()
+            assert execute_mock.call_args[1]["soft_time_limit"] == 3601
+            assert execute_mock.call_args[1]["time_limit"] == 3610
+        db.session.delete(report_schedule)
+        db.session.commit()
+
+
+@patch("superset.tasks.scheduler.execute.apply_async")
+def test_scheduler_celery_no_timeout_ny(execute_mock):
+    """
+    Reports scheduler: Test scheduler setting celery soft and hard timeout
+    """
+    with app.app_context():
+        app.config["ALERT_REPORTS_WORKING_TIME_OUT_KILL"] = False
+        report_schedule = insert_report_schedule(
+            type=ReportScheduleType.ALERT,
+            name="report",
+            crontab="0 4 * * *",
+            timezone="America/New_York",
+        )
+
+        with freeze_time("2020-01-01T09:00:00Z"):
+            scheduler()
+            assert execute_mock.call_args[1] == {"eta": FakeDatetime(2020, 1, 1, 9, 0)}
+        db.session.delete(report_schedule)
+        db.session.commit()
+        app.config["ALERT_REPORTS_WORKING_TIME_OUT_KILL"] = True
 
 
 @patch("superset.tasks.scheduler.execute.apply_async")
-def test_scheduler_celery_timeout(execute_mock):
+def test_scheduler_celery_timeout_utc(execute_mock):
     """
     Reports scheduler: Test scheduler setting celery soft and hard timeout
     """
     with app.app_context():
 
         report_schedule = insert_report_schedule(
-            type=ReportScheduleType.ALERT, name=f"report", crontab=f"0 9 * * *",
+            type=ReportScheduleType.ALERT,
+            name="report",
+            crontab="0 9 * * *",
+            timezone="UTC",
         )
 
         with freeze_time("2020-01-01T09:00:00Z"):
             scheduler()
+            print(execute_mock.call_args)
             assert execute_mock.call_args[1]["soft_time_limit"] == 3601
             assert execute_mock.call_args[1]["time_limit"] == 3610
         db.session.delete(report_schedule)
@@ -71,14 +96,17 @@ def test_scheduler_celery_timeout(execute_mock):
 
 
 @patch("superset.tasks.scheduler.execute.apply_async")
-def test_scheduler_celery_no_timeout(execute_mock):
+def test_scheduler_celery_no_timeout_utc(execute_mock):
     """
     Reports scheduler: Test scheduler setting celery soft and hard timeout
     """
     with app.app_context():
         app.config["ALERT_REPORTS_WORKING_TIME_OUT_KILL"] = False
         report_schedule = insert_report_schedule(
-            type=ReportScheduleType.ALERT, name=f"report", crontab=f"0 9 * * *",
+            type=ReportScheduleType.ALERT,
+            name="report",
+            crontab="0 9 * * *",
+            timezone="UTC",
         )
 
         with freeze_time("2020-01-01T09:00:00Z"):
@@ -86,3 +114,4 @@ def test_scheduler_celery_no_timeout(execute_mock):
             assert execute_mock.call_args[1] == {"eta": FakeDatetime(2020, 1, 1, 9, 0)}
         db.session.delete(report_schedule)
         db.session.commit()
+        app.config["ALERT_REPORTS_WORKING_TIME_OUT_KILL"] = True
diff --git a/tests/reports/utils.py b/tests/integration_tests/reports/utils.py
similarity index 97%
rename from tests/reports/utils.py
rename to tests/integration_tests/reports/utils.py
index 1c1f08ac63eb..6cf55a1c1f6e 100644
--- a/tests/reports/utils.py
+++ b/tests/integration_tests/reports/utils.py
@@ -36,6 +36,7 @@ def insert_report_schedule(
     type: str,
     name: str,
     crontab: str,
+    timezone: Optional[str] = None,
     sql: Optional[str] = None,
     description: Optional[str] = None,
     chart: Optional[Slice] = None,
@@ -59,6 +60,7 @@ def insert_report_schedule(
         type=type,
         name=name,
         crontab=crontab,
+        timezone=timezone,
         sql=sql,
         description=description,
         chart=chart,
diff --git a/tests/result_set_tests.py b/tests/integration_tests/result_set_tests.py
similarity index 99%
rename from tests/result_set_tests.py
rename to tests/integration_tests/result_set_tests.py
index 888b69568837..bd44661d8d4f 100644
--- a/tests/result_set_tests.py
+++ b/tests/integration_tests/result_set_tests.py
@@ -17,7 +17,7 @@
 # isort:skip_file
 from datetime import datetime
 
-import tests.test_app
+import tests.integration_tests.test_app
 from superset.dataframe import df_to_records
 from superset.db_engine_specs import BaseEngineSpec
 from superset.result_set import dedup, SupersetResultSet
diff --git a/tests/schedules_test.py b/tests/integration_tests/schedules_test.py
similarity index 98%
rename from tests/schedules_test.py
rename to tests/integration_tests/schedules_test.py
index dd7a2a71c4ed..c47bf5fc8696 100644
--- a/tests/schedules_test.py
+++ b/tests/integration_tests/schedules_test.py
@@ -24,8 +24,10 @@
 from selenium.common.exceptions import WebDriverException
 from slack import errors, WebClient
 
-from tests.fixtures.world_bank_dashboard import load_world_bank_dashboard_with_slices
-from tests.test_app import app
+from tests.integration_tests.fixtures.world_bank_dashboard import (
+    load_world_bank_dashboard_with_slices,
+)
+from tests.integration_tests.test_app import app
 from superset import db
 from superset.models.dashboard import Dashboard
 from superset.models.schedules import (
@@ -41,8 +43,8 @@
     next_schedules,
 )
 from superset.models.slice import Slice
-from tests.base_tests import SupersetTestCase
-from tests.utils import read_fixture
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.utils import read_fixture
 
 
 class TestSchedules(SupersetTestCase):
diff --git a/tests/integration_tests/security/__init__.py b/tests/integration_tests/security/__init__.py
new file mode 100644
index 000000000000..13a83393a912
--- /dev/null
+++ b/tests/integration_tests/security/__init__.py
@@ -0,0 +1,16 @@
+# 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.
diff --git a/tests/security/analytics_db_safety_tests.py b/tests/integration_tests/security/analytics_db_safety_tests.py
similarity index 96%
rename from tests/security/analytics_db_safety_tests.py
rename to tests/integration_tests/security/analytics_db_safety_tests.py
index ebab520f7a18..f6518fe93564 100644
--- a/tests/security/analytics_db_safety_tests.py
+++ b/tests/integration_tests/security/analytics_db_safety_tests.py
@@ -20,7 +20,7 @@
 
 from superset.exceptions import SupersetSecurityException
 from superset.security.analytics_db_safety import check_sqlalchemy_uri
-from tests.base_tests import SupersetTestCase
+from tests.integration_tests.base_tests import SupersetTestCase
 
 
 class TestDBConnections(SupersetTestCase):
diff --git a/tests/security/api_tests.py b/tests/integration_tests/security/api_tests.py
similarity index 96%
rename from tests/security/api_tests.py
rename to tests/integration_tests/security/api_tests.py
index d10387768311..8cae667cd0b5 100644
--- a/tests/security/api_tests.py
+++ b/tests/integration_tests/security/api_tests.py
@@ -19,7 +19,7 @@
 """Unit tests for Superset"""
 import json
 
-from tests.base_tests import SupersetTestCase
+from tests.integration_tests.base_tests import SupersetTestCase
 from flask_wtf.csrf import generate_csrf
 
 
diff --git a/tests/security/migrate_roles_tests.py b/tests/integration_tests/security/migrate_roles_tests.py
similarity index 99%
rename from tests/security/migrate_roles_tests.py
rename to tests/integration_tests/security/migrate_roles_tests.py
index 81f067a48e4c..2f88cfa9b49a 100644
--- a/tests/security/migrate_roles_tests.py
+++ b/tests/integration_tests/security/migrate_roles_tests.py
@@ -17,10 +17,10 @@
 """Unit tests for alerting in Superset"""
 import json
 import logging
+from contextlib import contextmanager
 from unittest.mock import patch
 
 import pytest
-from contextlib2 import contextmanager
 from flask_appbuilder.security.sqla.models import Role
 
 from superset.extensions import db, security_manager
@@ -30,7 +30,7 @@
     Pvm,
     PvmMigrationMapType,
 )
-from tests.test_app import app
+from tests.integration_tests.test_app import app
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
diff --git a/tests/security_tests.py b/tests/integration_tests/security_tests.py
similarity index 91%
rename from tests/security_tests.py
rename to tests/integration_tests/security_tests.py
index ae636a75ac15..56bfe846957b 100644
--- a/tests/security_tests.py
+++ b/tests/integration_tests/security_tests.py
@@ -18,7 +18,8 @@
 import inspect
 import re
 import unittest
-
+from collections import namedtuple
+from unittest import mock
 from unittest.mock import Mock, patch
 from typing import Any, Dict
 
@@ -41,14 +42,22 @@
 from superset.views.access_requests import AccessRequestsModelView
 
 from .base_tests import SupersetTestCase
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
-from tests.fixtures.energy_dashboard import load_energy_table_with_slice
-from tests.fixtures.public_role import (
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
+from tests.integration_tests.fixtures.energy_dashboard import (
+    load_energy_table_with_slice,
+)
+from tests.integration_tests.fixtures.public_role import (
     public_role_like_gamma,
     public_role_like_test_role,
 )
-from tests.fixtures.unicode_dashboard import load_unicode_dashboard_with_slice
-from tests.fixtures.world_bank_dashboard import load_world_bank_dashboard_with_slices
+from tests.integration_tests.fixtures.unicode_dashboard import (
+    load_unicode_dashboard_with_slice,
+)
+from tests.integration_tests.fixtures.world_bank_dashboard import (
+    load_world_bank_dashboard_with_slices,
+)
 
 NEW_SECURITY_CONVERGE_VIEWS = (
     "Annotation",
@@ -1142,7 +1151,7 @@ def tearDown(self):
     @pytest.mark.usefixtures("load_energy_table_with_slice")
     def test_rls_filter_alters_energy_query(self):
         g.user = self.get_user(username="alpha")
-        tbl = self.get_table_by_name("energy_usage")
+        tbl = self.get_table(name="energy_usage")
         sql = tbl.get_query_str(self.query_obj)
         assert tbl.get_extra_cache_keys(self.query_obj) == [1]
         assert "value > 1" in sql
@@ -1152,7 +1161,7 @@ def test_rls_filter_doesnt_alter_energy_query(self):
         g.user = self.get_user(
             username="admin"
         )  # self.login() doesn't actually set the user
-        tbl = self.get_table_by_name("energy_usage")
+        tbl = self.get_table(name="energy_usage")
         sql = tbl.get_query_str(self.query_obj)
         assert tbl.get_extra_cache_keys(self.query_obj) == []
         assert "value > 1" not in sql
@@ -1162,7 +1171,7 @@ def test_multiple_table_filter_alters_another_tables_query(self):
         g.user = self.get_user(
             username="alpha"
         )  # self.login() doesn't actually set the user
-        tbl = self.get_table_by_name("unicode_test")
+        tbl = self.get_table(name="unicode_test")
         sql = tbl.get_query_str(self.query_obj)
         assert tbl.get_extra_cache_keys(self.query_obj) == [1]
         assert "value > 1" in sql
@@ -1170,7 +1179,7 @@ def test_multiple_table_filter_alters_another_tables_query(self):
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_rls_filter_alters_gamma_birth_names_query(self):
         g.user = self.get_user(username="gamma")
-        tbl = self.get_table_by_name("birth_names")
+        tbl = self.get_table(name="birth_names")
         sql = tbl.get_query_str(self.query_obj)
 
         # establish that the filters are grouped together correctly with
@@ -1183,7 +1192,7 @@ def test_rls_filter_alters_gamma_birth_names_query(self):
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_rls_filter_alters_no_role_user_birth_names_query(self):
         g.user = self.get_user(username="NoRlsRoleUser")
-        tbl = self.get_table_by_name("birth_names")
+        tbl = self.get_table(name="birth_names")
         sql = tbl.get_query_str(self.query_obj)
 
         # gamma's filters should not be present query
@@ -1196,7 +1205,7 @@ def test_rls_filter_alters_no_role_user_birth_names_query(self):
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_rls_filter_doesnt_alter_admin_birth_names_query(self):
         g.user = self.get_user(username="admin")
-        tbl = self.get_table_by_name("birth_names")
+        tbl = self.get_table(name="birth_names")
         sql = tbl.get_query_str(self.query_obj)
 
         # no filters are applied for admin user
@@ -1220,3 +1229,88 @@ def test_access_request_enabled(self):
             uri = "/accessrequestsmodelview/list/"
             rv = self.client.get(uri)
             self.assertLess(rv.status_code, 400)
+
+
+class TestDatasources(SupersetTestCase):
+    @patch("superset.security.manager.g")
+    @patch("superset.security.SupersetSecurityManager.can_access_database")
+    @patch("superset.security.SupersetSecurityManager.get_session")
+    def test_get_user_datasources_admin(
+        self, mock_get_session, mock_can_access_database, mock_g
+    ):
+        Datasource = namedtuple("Datasource", ["database", "schema", "name"])
+        mock_g.user = security_manager.find_user("admin")
+        mock_can_access_database.return_value = True
+        mock_get_session.query.return_value.filter.return_value.all.return_value = []
+
+        with mock.patch.object(
+            ConnectorRegistry, "get_all_datasources"
+        ) as mock_get_all_datasources:
+            mock_get_all_datasources.return_value = [
+                Datasource("database1", "schema1", "table1"),
+                Datasource("database1", "schema1", "table2"),
+                Datasource("database2", None, "table1"),
+            ]
+
+            datasources = security_manager.get_user_datasources()
+
+        assert sorted(datasources) == [
+            Datasource("database1", "schema1", "table1"),
+            Datasource("database1", "schema1", "table2"),
+            Datasource("database2", None, "table1"),
+        ]
+
+    @patch("superset.security.manager.g")
+    @patch("superset.security.SupersetSecurityManager.can_access_database")
+    @patch("superset.security.SupersetSecurityManager.get_session")
+    def test_get_user_datasources_gamma(
+        self, mock_get_session, mock_can_access_database, mock_g
+    ):
+        Datasource = namedtuple("Datasource", ["database", "schema", "name"])
+        mock_g.user = security_manager.find_user("gamma")
+        mock_can_access_database.return_value = False
+        mock_get_session.query.return_value.filter.return_value.all.return_value = []
+
+        with mock.patch.object(
+            ConnectorRegistry, "get_all_datasources"
+        ) as mock_get_all_datasources:
+            mock_get_all_datasources.return_value = [
+                Datasource("database1", "schema1", "table1"),
+                Datasource("database1", "schema1", "table2"),
+                Datasource("database2", None, "table1"),
+            ]
+
+            datasources = security_manager.get_user_datasources()
+
+        assert datasources == []
+
+    @patch("superset.security.manager.g")
+    @patch("superset.security.SupersetSecurityManager.can_access_database")
+    @patch("superset.security.SupersetSecurityManager.get_session")
+    def test_get_user_datasources_gamma_with_schema(
+        self, mock_get_session, mock_can_access_database, mock_g
+    ):
+        Datasource = namedtuple("Datasource", ["database", "schema", "name"])
+        mock_g.user = security_manager.find_user("gamma")
+        mock_can_access_database.return_value = False
+
+        mock_get_session.query.return_value.filter.return_value.all.return_value = [
+            Datasource("database1", "schema1", "table1"),
+            Datasource("database1", "schema1", "table2"),
+        ]
+
+        with mock.patch.object(
+            ConnectorRegistry, "get_all_datasources"
+        ) as mock_get_all_datasources:
+            mock_get_all_datasources.return_value = [
+                Datasource("database1", "schema1", "table1"),
+                Datasource("database1", "schema1", "table2"),
+                Datasource("database2", None, "table1"),
+            ]
+
+            datasources = security_manager.get_user_datasources()
+
+        assert sorted(datasources) == [
+            Datasource("database1", "schema1", "table1"),
+            Datasource("database1", "schema1", "table2"),
+        ]
diff --git a/tests/sql_parse_tests.py b/tests/integration_tests/sql_parse_tests.py
similarity index 100%
rename from tests/sql_parse_tests.py
rename to tests/integration_tests/sql_parse_tests.py
diff --git a/tests/sql_validator_tests.py b/tests/integration_tests/sql_validator_tests.py
similarity index 100%
rename from tests/sql_validator_tests.py
rename to tests/integration_tests/sql_validator_tests.py
diff --git a/tests/sqla_models_tests.py b/tests/integration_tests/sqla_models_tests.py
similarity index 81%
rename from tests/sqla_models_tests.py
rename to tests/integration_tests/sqla_models_tests.py
index a759270809c2..f17cedb7c0ec 100644
--- a/tests/sqla_models_tests.py
+++ b/tests/integration_tests/sqla_models_tests.py
@@ -20,14 +20,23 @@
 from unittest.mock import patch
 import pytest
 
+import sqlalchemy as sa
+
 from superset import db
 from superset.connectors.sqla.models import SqlaTable, TableColumn
 from superset.db_engine_specs.bigquery import BigQueryEngineSpec
 from superset.db_engine_specs.druid import DruidEngineSpec
 from superset.exceptions import QueryObjectValidationError
 from superset.models.core import Database
-from superset.utils.core import GenericDataType, get_example_database, FilterOperator
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
+from superset.utils.core import (
+    AdhocMetricExpressionType,
+    FilterOperator,
+    GenericDataType,
+    get_example_database,
+)
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
 
 from .base_tests import SupersetTestCase
 
@@ -168,6 +177,50 @@ def test_extra_cache_keys(self, flask_g):
             db.session.delete(table)
         db.session.commit()
 
+    @patch("superset.jinja_context.g")
+    def test_jinja_metrics_and_calc_columns(self, flask_g):
+        flask_g.user.username = "abc"
+        base_query_obj = {
+            "granularity": None,
+            "from_dttm": None,
+            "to_dttm": None,
+            "groupby": ["user", "expr"],
+            "metrics": [
+                {
+                    "expressionType": AdhocMetricExpressionType.SQL,
+                    "sqlExpression": "SUM(case when user = '{{ current_username() }}' "
+                    "then 1 else 0 end)",
+                    "label": "SUM(userid)",
+                }
+            ],
+            "is_timeseries": False,
+            "filter": [],
+        }
+
+        table = SqlaTable(
+            table_name="test_has_jinja_metric_and_expr",
+            sql="SELECT '{{ current_username() }}' as user",
+            database=get_example_database(),
+        )
+        TableColumn(
+            column_name="expr",
+            expression="case when '{{ current_username() }}' = 'abc' "
+            "then 'yes' else 'no' end",
+            type="VARCHAR(100)",
+            table=table,
+        )
+        db.session.commit()
+
+        sqla_query = table.get_sqla_query(**base_query_obj)
+        query = table.database.compile_sqla_query(sqla_query.sqla_query)
+        # assert expression
+        assert "case when 'abc' = 'abc' then 'yes' else 'no' end" in query
+        # assert metric
+        assert "SUM(case when user = 'abc' then 1 else 0 end)" in query
+        # Cleanup
+        db.session.delete(table)
+        db.session.commit()
+
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_where_operators(self):
         class FilterTestCase(NamedTuple):
@@ -190,7 +243,7 @@ class FilterTestCase(NamedTuple):
             FilterTestCase(FilterOperator.IN, ["1", "2"], "IN (1, 2)"),
             FilterTestCase(FilterOperator.NOT_IN, ["1", "2"], "NOT IN (1, 2)"),
         )
-        table = self.get_table_by_name("birth_names")
+        table = self.get_table(name="birth_names")
         for filter_ in filters:
             query_obj = {
                 "granularity": None,
@@ -213,6 +266,43 @@ class FilterTestCase(NamedTuple):
             else:
                 self.assertIn(filter_.expected, sql)
 
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    def test_boolean_type_where_operators(self):
+        table = self.get_table(name="birth_names")
+        db.session.add(
+            TableColumn(
+                column_name="boolean_gender",
+                expression="case when gender = 'boy' then True else False end",
+                type="BOOLEAN",
+                table=table,
+            )
+        )
+        query_obj = {
+            "granularity": None,
+            "from_dttm": None,
+            "to_dttm": None,
+            "groupby": ["boolean_gender"],
+            "metrics": ["count"],
+            "is_timeseries": False,
+            "filter": [
+                {
+                    "col": "boolean_gender",
+                    "op": FilterOperator.IN,
+                    "val": ["true", "false"],
+                }
+            ],
+            "extras": {},
+        }
+        sqla_query = table.get_sqla_query(**query_obj)
+        sql = table.database.compile_sqla_query(sqla_query.sqla_query)
+        dialect = table.database.get_dialect()
+        operand = "(true, false)"
+        # override native_boolean=False behavior in MySQLCompiler
+        # https://github.com/sqlalchemy/sqlalchemy/blob/master/lib/sqlalchemy/dialects/mysql/base.py
+        if not dialect.supports_native_boolean and dialect.name != "mysql":
+            operand = "(1, 0)"
+        self.assertIn(f"IN {operand}", sql)
+
     def test_incorrect_jinja_syntax_raises_correct_exception(self):
         query_obj = {
             "granularity": None,
diff --git a/tests/sqla_views_tests.py b/tests/integration_tests/sqla_views_tests.py
similarity index 92%
rename from tests/sqla_views_tests.py
rename to tests/integration_tests/sqla_views_tests.py
index 532d6e8eb66c..92c350c8785c 100644
--- a/tests/sqla_views_tests.py
+++ b/tests/integration_tests/sqla_views_tests.py
@@ -14,8 +14,8 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from tests.base_tests import SupersetTestCase
-from tests.conftest import with_feature_flags
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.conftest import with_feature_flags
 
 
 class TestRowLevelSecurityFiltersModelView(SupersetTestCase):
diff --git a/tests/sqllab_tests.py b/tests/integration_tests/sqllab_tests.py
similarity index 78%
rename from tests/sqllab_tests.py
rename to tests/integration_tests/sqllab_tests.py
index 8e1e88da23dd..f5b7859ba975 100644
--- a/tests/sqllab_tests.py
+++ b/tests/integration_tests/sqllab_tests.py
@@ -20,6 +20,7 @@
 from datetime import datetime, timedelta
 
 import pytest
+from celery.exceptions import SoftTimeLimitExceeded
 from parameterized import parameterized
 from random import random
 from unittest import mock
@@ -29,19 +30,23 @@
 from superset import db, security_manager
 from superset.connectors.sqla.models import SqlaTable
 from superset.db_engine_specs import BaseEngineSpec
-from superset.errors import ErrorLevel, SupersetErrorType
+from superset.db_engine_specs.hive import HiveEngineSpec
+from superset.db_engine_specs.presto import PrestoEngineSpec
+from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
+from superset.exceptions import SupersetErrorException
 from superset.models.core import Database
 from superset.models.sql_lab import LimitingFactor, Query, SavedQuery
 from superset.result_set import SupersetResultSet
 from superset.sql_lab import (
+    cancel_query,
     execute_sql_statements,
     execute_sql_statement,
     get_sql_results,
     SqlLabException,
-    SqlLabTimeoutException,
 )
 from superset.sql_parse import CtasMethod
 from superset.utils.core import (
+    backend,
     datetime_to_epoch,
     get_example_database,
     get_main_database,
@@ -49,7 +54,9 @@
 
 from .base_tests import SupersetTestCase
 from .conftest import CTAS_SCHEMA_NAME
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
 
 QUERY_1 = "SELECT * FROM birth_names LIMIT 1"
 QUERY_2 = "SELECT * FROM NO_TABLE"
@@ -75,21 +82,69 @@ def tearDown(self):
 
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_sql_json(self):
+        examples_db = get_example_database()
+        engine_name = examples_db.db_engine_spec.engine_name
+
         self.login("admin")
 
         data = self.run_sql("SELECT * FROM birth_names LIMIT 10", "1")
         self.assertLess(0, len(data["data"]))
 
         data = self.run_sql("SELECT * FROM unexistant_table", "2")
-        assert (
-            data["errors"][0]["error_type"] == SupersetErrorType.GENERIC_DB_ENGINE_ERROR
-        )
-        assert data["errors"][0]["level"] == ErrorLevel.ERROR
-        assert data["errors"][0]["extra"] == {
-            "issue_codes": [
+        if backend() == "presto":
+            assert (
+                data["errors"][0]["error_type"]
+                == SupersetErrorType.TABLE_DOES_NOT_EXIST_ERROR
+            )
+            assert data["errors"][0]["level"] == ErrorLevel.ERROR
+            assert data["errors"][0]["extra"] == {
+                "engine_name": "Presto",
+                "issue_codes": [
+                    {
+                        "code": 1003,
+                        "message": "Issue 1003 - There is a syntax error in the SQL query. Perhaps there was a misspelling or a typo.",
+                    },
+                    {
+                        "code": 1005,
+                        "message": "Issue 1005 - The table was deleted or renamed in the database.",
+                    },
+                ],
+            }
+        else:
+            assert (
+                data["errors"][0]["error_type"]
+                == SupersetErrorType.GENERIC_DB_ENGINE_ERROR
+            )
+            assert data["errors"][0]["level"] == ErrorLevel.ERROR
+            assert data["errors"][0]["extra"] == {
+                "issue_codes": [
+                    {
+                        "code": 1002,
+                        "message": "Issue 1002 - The database returned an unexpected error.",
+                    }
+                ],
+                "engine_name": engine_name,
+            }
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    def test_sql_json_dml_disallowed(self):
+        self.login("admin")
+
+        data = self.run_sql("DELETE FROM birth_names", "1")
+        assert data == {
+            "errors": [
                 {
-                    "code": 1002,
-                    "message": "Issue 1002 - The database returned an unexpected error.",
+                    "message": "Only SELECT statements are allowed against this database.",
+                    "error_type": SupersetErrorType.DML_NOT_ALLOWED_ERROR,
+                    "level": ErrorLevel.ERROR,
+                    "extra": {
+                        "issue_codes": [
+                            {
+                                "code": 1022,
+                                "message": "Issue 1022 - Database does not allow data manipulation.",
+                            }
+                        ]
+                    },
                 }
             ]
         }
@@ -718,6 +773,58 @@ def test_execute_sql_statements(self, mock_execute_sql_statement, mock_get_query
             ]
         )
 
+    @mock.patch("superset.sql_lab.results_backend", None)
+    @mock.patch("superset.sql_lab.get_query")
+    @mock.patch("superset.sql_lab.execute_sql_statement")
+    def test_execute_sql_statements_no_results_backend(
+        self, mock_execute_sql_statement, mock_get_query
+    ):
+        sql = """
+            -- comment
+            SET @value = 42;
+            SELECT @value AS foo;
+            -- comment
+        """
+        mock_session = mock.MagicMock()
+        mock_query = mock.MagicMock()
+        mock_query.database.allow_run_async = True
+        mock_cursor = mock.MagicMock()
+        mock_query.database.get_sqla_engine.return_value.raw_connection.return_value.cursor.return_value = (
+            mock_cursor
+        )
+        mock_query.database.db_engine_spec.run_multiple_statements_as_one = False
+        mock_get_query.return_value = mock_query
+
+        with pytest.raises(SupersetErrorException) as excinfo:
+            execute_sql_statements(
+                query_id=1,
+                rendered_query=sql,
+                return_results=True,
+                store_results=False,
+                user_name="admin",
+                session=mock_session,
+                start_time=None,
+                expand_data=False,
+                log_params=None,
+            )
+
+        assert excinfo.value.error == SupersetError(
+            message="Results backend is not configured.",
+            error_type=SupersetErrorType.RESULTS_BACKEND_NOT_CONFIGURED_ERROR,
+            level=ErrorLevel.ERROR,
+            extra={
+                "issue_codes": [
+                    {
+                        "code": 1021,
+                        "message": (
+                            "Issue 1021 - Results backend needed for asynchronous "
+                            "queries is not configured."
+                        ),
+                    }
+                ]
+            },
+        )
+
     @mock.patch("superset.sql_lab.get_query")
     @mock.patch("superset.sql_lab.execute_sql_statement")
     def test_execute_sql_statements_ctas(
@@ -779,7 +886,7 @@ def test_execute_sql_statements_ctas(
 
         # try invalid CTAS
         sql = "DROP TABLE my_table"
-        with pytest.raises(SqlLabException) as excinfo:
+        with pytest.raises(SupersetErrorException) as excinfo:
             execute_sql_statements(
                 query_id=1,
                 rendered_query=sql,
@@ -791,11 +898,18 @@ def test_execute_sql_statements_ctas(
                 expand_data=False,
                 log_params=None,
             )
-        assert str(excinfo.value) == (
-            "CTAS (create table as select) can only be run with "
-            "a query where the last statement is a SELECT. Please "
-            "make sure your query has a SELECT as its last "
-            "statement. Then, try running your query again."
+        assert excinfo.value.error == SupersetError(
+            message="CTAS (create table as select) can only be run with a query where the last statement is a SELECT. Please make sure your query has a SELECT as its last statement. Then, try running your query again.",
+            error_type=SupersetErrorType.INVALID_CTAS_QUERY_ERROR,
+            level=ErrorLevel.ERROR,
+            extra={
+                "issue_codes": [
+                    {
+                        "code": 1023,
+                        "message": "Issue 1023 - The CTAS (create table as select) doesn't have a SELECT statement at the end. Please make sure your query has a SELECT as its last statement. Then, try running your query again.",
+                    }
+                ]
+            },
         )
 
         # try invalid CVAS
@@ -806,7 +920,7 @@ def test_execute_sql_statements_ctas(
             SELECT @value AS foo;
             -- comment
         """
-        with pytest.raises(SqlLabException) as excinfo:
+        with pytest.raises(SupersetErrorException) as excinfo:
             execute_sql_statements(
                 query_id=1,
                 rendered_query=sql,
@@ -818,32 +932,66 @@ def test_execute_sql_statements_ctas(
                 expand_data=False,
                 log_params=None,
             )
-        assert str(excinfo.value) == (
-            "CVAS (create view as select) can only be run with a "
-            "query with a single SELECT statement. Please make "
-            "sure your query has only a SELECT statement. Then, "
-            "try running your query again."
+        assert excinfo.value.error == SupersetError(
+            message="CVAS (create view as select) can only be run with a query with a single SELECT statement. Please make sure your query has only a SELECT statement. Then, try running your query again.",
+            error_type=SupersetErrorType.INVALID_CVAS_QUERY_ERROR,
+            level=ErrorLevel.ERROR,
+            extra={
+                "issue_codes": [
+                    {
+                        "code": 1024,
+                        "message": "Issue 1024 - CVAS (create view as select) query has more than one statement.",
+                    },
+                    {
+                        "code": 1025,
+                        "message": "Issue 1025 - CVAS (create view as select) query is not a SELECT statement.",
+                    },
+                ]
+            },
         )
 
-    @mock.patch("superset.sql_lab.get_query")
-    @mock.patch("superset.sql_lab.execute_sql_statement")
-    def test_get_sql_results_soft_time_limit(
-        self, mock_execute_sql_statement, mock_get_query
-    ):
-        from celery.exceptions import SoftTimeLimitExceeded
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    def test_sql_json_soft_timeout(self):
+        examples_db = get_example_database()
+        if examples_db.backend == "sqlite":
+            return
 
-        sql = """
-            -- comment
-            SET @value = 42;
-            SELECT @value AS foo;
-            -- comment
-        """
-        mock_get_query.side_effect = SoftTimeLimitExceeded()
-        with pytest.raises(SqlLabTimeoutException) as excinfo:
-            get_sql_results(
-                1, sql, return_results=True, store_results=False,
-            )
-        assert (
-            str(excinfo.value)
-            == "SQL Lab timeout. This environment's policy is to kill queries after 21600 seconds."
-        )
+        self.login("admin")
+
+        with mock.patch.object(
+            examples_db.db_engine_spec, "handle_cursor"
+        ) as handle_cursor:
+            handle_cursor.side_effect = SoftTimeLimitExceeded()
+            data = self.run_sql("SELECT * FROM birth_names LIMIT 1", "1")
+
+        assert data == {
+            "errors": [
+                {
+                    "message": (
+                        "The query was killed after 21600 seconds. It might be too complex, "
+                        "or the database might be under heavy load."
+                    ),
+                    "error_type": SupersetErrorType.SQLLAB_TIMEOUT_ERROR,
+                    "level": ErrorLevel.ERROR,
+                    "extra": {
+                        "issue_codes": [
+                            {
+                                "code": 1026,
+                                "message": "Issue 1026 - Query is too complex and takes too long to run.",
+                            },
+                            {
+                                "code": 1027,
+                                "message": "Issue 1027 - The database is currently running too many queries.",
+                            },
+                        ]
+                    },
+                }
+            ]
+        }
+
+
+@pytest.mark.parametrize("spec", [HiveEngineSpec, PrestoEngineSpec])
+def test_cancel_query_implicit(spec: BaseEngineSpec) -> None:
+    query = mock.MagicMock()
+    query.database.db_engine_spec = spec
+    assert cancel_query(query)
diff --git a/tests/stats_logger_tests.py b/tests/integration_tests/stats_logger_tests.py
similarity index 100%
rename from tests/stats_logger_tests.py
rename to tests/integration_tests/stats_logger_tests.py
diff --git a/tests/strategy_tests.py b/tests/integration_tests/strategy_tests.py
similarity index 98%
rename from tests/strategy_tests.py
rename to tests/integration_tests/strategy_tests.py
index bba560f642b3..1ba41d65bf35 100644
--- a/tests/strategy_tests.py
+++ b/tests/integration_tests/strategy_tests.py
@@ -19,7 +19,9 @@
 import datetime
 import json
 from unittest.mock import MagicMock
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
 
 from sqlalchemy import String, Date, Float
 
diff --git a/tests/superset_test_config.py b/tests/integration_tests/superset_test_config.py
similarity index 87%
rename from tests/superset_test_config.py
rename to tests/integration_tests/superset_test_config.py
index 04dcf11bfd56..698440c36383 100644
--- a/tests/superset_test_config.py
+++ b/tests/integration_tests/superset_test_config.py
@@ -16,13 +16,18 @@
 # under the License.
 # type: ignore
 from copy import copy
+from datetime import timedelta
 
 from superset.config import *
-from tests.superset_test_custom_template_processors import CustomPrestoTemplateProcessor
+from tests.integration_tests.superset_test_custom_template_processors import (
+    CustomPrestoTemplateProcessor,
+)
 
 AUTH_USER_REGISTRATION_ROLE = "alpha"
-SQLALCHEMY_DATABASE_URI = "sqlite:///" + os.path.join(DATA_DIR, "unittests.db")
-DEBUG = True
+SQLALCHEMY_DATABASE_URI = "sqlite:///" + os.path.join(
+    DATA_DIR, "unittests.integration_tests.db"
+)
+DEBUG = False
 SUPERSET_WEBSERVER_PORT = 8081
 SILENCE_FAB = False
 # Allowing SQLALCHEMY_DATABASE_URI and SQLALCHEMY_EXAMPLES_URI to be defined as an env vars for
@@ -43,7 +48,7 @@
         "removed in a future version of Superset."
     )
 
-# Speeding up the tests.
+# Speeding up the tests.integration_tests.
 PRESTO_POLL_INTERVAL = 0.1
 HIVE_POLL_INTERVAL = 0.1
 
@@ -80,18 +85,18 @@ def GET_FEATURE_FLAGS_FUNC(ff):
 REDIS_RESULTS_DB = os.environ.get("REDIS_RESULTS_DB", 3)
 REDIS_CACHE_DB = os.environ.get("REDIS_CACHE_DB", 4)
 
-CACHE_DEFAULT_TIMEOUT = 600
+CACHE_DEFAULT_TIMEOUT = int(timedelta(minutes=10).total_seconds())
 
 CACHE_CONFIG = {
     "CACHE_TYPE": "redis",
-    "CACHE_DEFAULT_TIMEOUT": 60,
+    "CACHE_DEFAULT_TIMEOUT": int(timedelta(minutes=1).total_seconds()),
     "CACHE_KEY_PREFIX": "superset_cache",
     "CACHE_REDIS_URL": f"redis://{REDIS_HOST}:{REDIS_PORT}/{REDIS_CACHE_DB}",
 }
 
 DATA_CACHE_CONFIG = {
     **CACHE_CONFIG,
-    "CACHE_DEFAULT_TIMEOUT": 30,
+    "CACHE_DEFAULT_TIMEOUT": int(timedelta(seconds=30).total_seconds()),
     "CACHE_KEY_PREFIX": "superset_data_cache",
 }
 
diff --git a/tests/superset_test_config_sqllab_backend_persist.py b/tests/integration_tests/superset_test_config_sqllab_backend_persist.py
similarity index 100%
rename from tests/superset_test_config_sqllab_backend_persist.py
rename to tests/integration_tests/superset_test_config_sqllab_backend_persist.py
diff --git a/tests/superset_test_config_thumbnails.py b/tests/integration_tests/superset_test_config_thumbnails.py
similarity index 96%
rename from tests/superset_test_config_thumbnails.py
rename to tests/integration_tests/superset_test_config_thumbnails.py
index ddd59987ee73..964164cf79ce 100644
--- a/tests/superset_test_config_thumbnails.py
+++ b/tests/integration_tests/superset_test_config_thumbnails.py
@@ -20,7 +20,9 @@
 from superset.config import *
 
 AUTH_USER_REGISTRATION_ROLE = "alpha"
-SQLALCHEMY_DATABASE_URI = "sqlite:///" + os.path.join(DATA_DIR, "unittests.db")
+SQLALCHEMY_DATABASE_URI = "sqlite:///" + os.path.join(
+    DATA_DIR, "unittests.integration_tests.db"
+)
 DEBUG = True
 SUPERSET_WEBSERVER_PORT = 8081
 
diff --git a/tests/superset_test_custom_template_processors.py b/tests/integration_tests/superset_test_custom_template_processors.py
similarity index 100%
rename from tests/superset_test_custom_template_processors.py
rename to tests/integration_tests/superset_test_custom_template_processors.py
diff --git a/tests/tagging_tests.py b/tests/integration_tests/tagging_tests.py
similarity index 90%
rename from tests/tagging_tests.py
rename to tests/integration_tests/tagging_tests.py
index d19f2abe1f8f..9ae8764d40d5 100644
--- a/tests/tagging_tests.py
+++ b/tests/integration_tests/tagging_tests.py
@@ -15,8 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from tests.base_tests import SupersetTestCase
-from tests.conftest import with_feature_flags
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.conftest import with_feature_flags
 
 
 class TestTagging(SupersetTestCase):
diff --git a/tests/integration_tests/tasks/__init__.py b/tests/integration_tests/tasks/__init__.py
new file mode 100644
index 000000000000..13a83393a912
--- /dev/null
+++ b/tests/integration_tests/tasks/__init__.py
@@ -0,0 +1,16 @@
+# 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.
diff --git a/tests/tasks/async_queries_tests.py b/tests/integration_tests/tasks/async_queries_tests.py
similarity index 95%
rename from tests/tasks/async_queries_tests.py
rename to tests/integration_tests/tasks/async_queries_tests.py
index 6914854cad48..57b0df5ad227 100644
--- a/tests/tasks/async_queries_tests.py
+++ b/tests/integration_tests/tasks/async_queries_tests.py
@@ -34,15 +34,12 @@
     load_chart_data_into_cache,
     load_explore_json_into_cache,
 )
-from tests.base_tests import SupersetTestCase
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
-from tests.fixtures.query_context import get_query_context
-from tests.test_app import app
-
-
-def get_table_by_name(name: str) -> SqlaTable:
-    with app.app_context():
-        return db.session.query(SqlaTable).filter_by(table_name=name).one()
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
+from tests.integration_tests.fixtures.query_context import get_query_context
+from tests.integration_tests.test_app import app
 
 
 class TestAsyncQueries(SupersetTestCase):
@@ -125,7 +122,7 @@ def test_soft_timeout_load_chart_data_into_cache(
     @mock.patch.object(async_query_manager, "update_job")
     def test_load_explore_json_into_cache(self, mock_update_job):
         async_query_manager.init_app(app)
-        table = get_table_by_name("birth_names")
+        table = self.get_table(name="birth_names")
         user = security_manager.find_user("gamma")
         form_data = {
             "datasource": f"{table.id}__table",
diff --git a/tests/test_app.py b/tests/integration_tests/test_app.py
similarity index 96%
rename from tests/test_app.py
rename to tests/integration_tests/test_app.py
index f3e708b550fd..798f3e9cda28 100644
--- a/tests/test_app.py
+++ b/tests/integration_tests/test_app.py
@@ -16,7 +16,7 @@
 # under the License.
 
 """
-Here is where we create the app which ends up being shared across all tests. A future
+Here is where we create the app which ends up being shared across all tests.integration_tests. A future
 optimization will be to create a separate app instance for each test class.
 """
 from superset.app import create_app
diff --git a/tests/thumbnails_tests.py b/tests/integration_tests/thumbnails_tests.py
similarity index 75%
rename from tests/thumbnails_tests.py
rename to tests/integration_tests/thumbnails_tests.py
index 4c0bd4ccbdf4..5eabc4da0009 100644
--- a/tests/thumbnails_tests.py
+++ b/tests/integration_tests/thumbnails_tests.py
@@ -19,7 +19,7 @@
 import urllib.request
 from io import BytesIO
 from unittest import skipUnless
-from unittest.mock import patch
+from unittest.mock import ANY, call, patch
 
 from flask_testing import LiveServerTestCase
 from sqlalchemy.sql import func
@@ -29,9 +29,10 @@
 from superset.models.dashboard import Dashboard
 from superset.models.slice import Slice
 from superset.utils.screenshots import ChartScreenshot, DashboardScreenshot
-from superset.utils.urls import get_url_host
-from tests.conftest import with_feature_flags
-from tests.test_app import app
+from superset.utils.urls import get_url_host, get_url_path
+from superset.utils.webdriver import WebDriverProxy
+from tests.integration_tests.conftest import with_feature_flags
+from tests.integration_tests.test_app import app
 
 from .base_tests import SupersetTestCase
 
@@ -61,6 +62,62 @@ def test_get_async_dashboard_screenshot(self):
             self.assertEqual(response.getcode(), 202)
 
 
+class TestWebDriverProxy(SupersetTestCase):
+    @patch("superset.utils.webdriver.WebDriverWait")
+    @patch("superset.utils.webdriver.firefox")
+    @patch("superset.utils.webdriver.sleep")
+    def test_screenshot_selenium_headstart(
+        self, mock_sleep, mock_webdriver, mock_webdriver_wait
+    ):
+        webdriver = WebDriverProxy("firefox")
+        user = security_manager.get_user_by_username(
+            app.config["THUMBNAIL_SELENIUM_USER"]
+        )
+        url = get_url_path("Superset.slice", slice_id=1, standalone="true")
+        app.config["SCREENSHOT_SELENIUM_HEADSTART"] = 5
+        webdriver.get_screenshot(url, "chart-container", user=user)
+        assert mock_sleep.call_args_list[0] == call(5)
+
+    @patch("superset.utils.webdriver.WebDriverWait")
+    @patch("superset.utils.webdriver.firefox")
+    def test_screenshot_selenium_locate_wait(self, mock_webdriver, mock_webdriver_wait):
+        app.config["SCREENSHOT_LOCATE_WAIT"] = 15
+        webdriver = WebDriverProxy("firefox")
+        user = security_manager.get_user_by_username(
+            app.config["THUMBNAIL_SELENIUM_USER"]
+        )
+        url = get_url_path("Superset.slice", slice_id=1, standalone="true")
+        webdriver.get_screenshot(url, "chart-container", user=user)
+        assert mock_webdriver_wait.call_args_list[0] == call(ANY, 15)
+
+    @patch("superset.utils.webdriver.WebDriverWait")
+    @patch("superset.utils.webdriver.firefox")
+    def test_screenshot_selenium_load_wait(self, mock_webdriver, mock_webdriver_wait):
+        app.config["SCREENSHOT_LOAD_WAIT"] = 15
+        webdriver = WebDriverProxy("firefox")
+        user = security_manager.get_user_by_username(
+            app.config["THUMBNAIL_SELENIUM_USER"]
+        )
+        url = get_url_path("Superset.slice", slice_id=1, standalone="true")
+        webdriver.get_screenshot(url, "chart-container", user=user)
+        assert mock_webdriver_wait.call_args_list[1] == call(ANY, 15)
+
+    @patch("superset.utils.webdriver.WebDriverWait")
+    @patch("superset.utils.webdriver.firefox")
+    @patch("superset.utils.webdriver.sleep")
+    def test_screenshot_selenium_animation_wait(
+        self, mock_sleep, mock_webdriver, mock_webdriver_wait
+    ):
+        webdriver = WebDriverProxy("firefox")
+        user = security_manager.get_user_by_username(
+            app.config["THUMBNAIL_SELENIUM_USER"]
+        )
+        url = get_url_path("Superset.slice", slice_id=1, standalone="true")
+        app.config["SCREENSHOT_SELENIUM_ANIMATION_WAIT"] = 4
+        webdriver.get_screenshot(url, "chart-container", user=user)
+        assert mock_sleep.call_args_list[1] == call(4)
+
+
 class TestThumbnails(SupersetTestCase):
 
     mock_image = b"bytes mock image"
diff --git a/tests/utils/__init__.py b/tests/integration_tests/utils/__init__.py
similarity index 95%
rename from tests/utils/__init__.py
rename to tests/integration_tests/utils/__init__.py
index 832ddd5d886d..d493d5b63464 100644
--- a/tests/utils/__init__.py
+++ b/tests/integration_tests/utils/__init__.py
@@ -17,7 +17,7 @@
 import json
 from os import path
 
-FIXTURES_DIR = "tests/fixtures"
+FIXTURES_DIR = "tests/integration_tests/fixtures"
 
 
 def read_fixture(fixture_file_name):
diff --git a/tests/integration_tests/utils/core_tests.py b/tests/integration_tests/utils/core_tests.py
new file mode 100644
index 000000000000..3ba39032e426
--- /dev/null
+++ b/tests/integration_tests/utils/core_tests.py
@@ -0,0 +1,85 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# pylint: disable=no-self-use
+import pytest
+
+from superset.utils.core import form_data_to_adhoc, simple_filter_to_adhoc
+
+
+def test_simple_filter_to_adhoc_generates_deterministic_values():
+    input_1 = {
+        "op": "IS NOT NULL",
+        "col": "LATITUDE",
+        "val": "",
+    }
+
+    input_2 = {**input_1, "col": "LONGITUDE"}
+
+    # The result is the same when given the same input
+    assert simple_filter_to_adhoc(input_1) == simple_filter_to_adhoc(input_1)
+    assert simple_filter_to_adhoc(input_1) == {
+        "clause": "WHERE",
+        "expressionType": "SIMPLE",
+        "comparator": "",
+        "operator": "IS NOT NULL",
+        "subject": "LATITUDE",
+        "filterOptionName": "6ac89d498115da22396f80a765cffc70",
+    }
+
+    # The result is different when given different input
+    assert simple_filter_to_adhoc(input_1) != simple_filter_to_adhoc(input_2)
+    assert simple_filter_to_adhoc(input_2) == {
+        "clause": "WHERE",
+        "expressionType": "SIMPLE",
+        "comparator": "",
+        "operator": "IS NOT NULL",
+        "subject": "LONGITUDE",
+        "filterOptionName": "9c984bd3714883ca859948354ce26ab9",
+    }
+
+
+def test_form_data_to_adhoc_generates_deterministic_values():
+    form_data = {"where": "1 = 1", "having": "count(*) > 1"}
+
+    # The result is the same when given the same input
+    assert form_data_to_adhoc(form_data, "where") == form_data_to_adhoc(
+        form_data, "where"
+    )
+    assert form_data_to_adhoc(form_data, "where") == {
+        "clause": "WHERE",
+        "expressionType": "SQL",
+        "sqlExpression": "1 = 1",
+        "filterOptionName": "99fe79985afbddea4492626dc6a87b74",
+    }
+
+    # The result is different when given different input
+    assert form_data_to_adhoc(form_data, "having") == form_data_to_adhoc(
+        form_data, "having"
+    )
+    assert form_data_to_adhoc(form_data, "having") == {
+        "clause": "HAVING",
+        "expressionType": "SQL",
+        "sqlExpression": "count(*) > 1",
+        "filterOptionName": "1da11f6b709c3190daeabb84f77fc8c2",
+    }
+
+
+def test_form_data_to_adhoc_incorrect_clause_type():
+    form_data = {"where": "1 = 1", "having": "count(*) > 1"}
+
+    with pytest.raises(ValueError):
+        form_data_to_adhoc(form_data, "foobar")
diff --git a/tests/utils/csv_tests.py b/tests/integration_tests/utils/csv_tests.py
similarity index 100%
rename from tests/utils/csv_tests.py
rename to tests/integration_tests/utils/csv_tests.py
diff --git a/tests/utils/date_parser_tests.py b/tests/integration_tests/utils/date_parser_tests.py
similarity index 89%
rename from tests/utils/date_parser_tests.py
rename to tests/integration_tests/utils/date_parser_tests.py
index ad87f40dc821..4cf979e83c67 100644
--- a/tests/utils/date_parser_tests.py
+++ b/tests/integration_tests/utils/date_parser_tests.py
@@ -14,22 +14,25 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from datetime import datetime, timedelta
+from datetime import date, datetime, timedelta
 from unittest.mock import patch
 
+from dateutil.relativedelta import relativedelta
+
 from superset.charts.commands.exceptions import (
+    TimeRangeAmbiguousError,
     TimeRangeParseFailError,
-    TimeRangeUnclearError,
 )
 from superset.utils.date_parser import (
     DateRangeMigration,
     datetime_eval,
+    get_past_or_future,
     get_since_until,
     parse_human_datetime,
     parse_human_timedelta,
     parse_past_timedelta,
 )
-from tests.base_tests import SupersetTestCase
+from tests.integration_tests.base_tests import SupersetTestCase
 
 
 def mock_parse_human_datetime(s):
@@ -288,16 +291,48 @@ def test_parse_past_timedelta(self, mock_datetime):
         self.assertEqual(parse_past_timedelta("52 weeks"), timedelta(364))
         self.assertEqual(parse_past_timedelta("1 month"), timedelta(31))
 
+    def test_get_past_or_future(self):
+        # 2020 is a leap year
+        dttm = datetime(2020, 2, 29)
+        self.assertEqual(get_past_or_future("1 year", dttm), datetime(2021, 2, 28))
+        self.assertEqual(get_past_or_future("-1 year", dttm), datetime(2019, 2, 28))
+        self.assertEqual(get_past_or_future("1 month", dttm), datetime(2020, 3, 29))
+        self.assertEqual(get_past_or_future("3 month", dttm), datetime(2020, 5, 29))
+
     def test_parse_human_datetime(self):
-        with self.assertRaises(TimeRangeUnclearError):
+        with self.assertRaises(TimeRangeAmbiguousError):
             parse_human_datetime("  2 days  ")
 
-        with self.assertRaises(TimeRangeUnclearError):
+        with self.assertRaises(TimeRangeAmbiguousError):
             parse_human_datetime("2 day")
 
         with self.assertRaises(TimeRangeParseFailError):
             parse_human_datetime("xxxxxxx")
 
+        self.assertEqual(parse_human_datetime("2015-04-03"), datetime(2015, 4, 3, 0, 0))
+
+        self.assertEqual(
+            parse_human_datetime("2/3/1969"), datetime(1969, 2, 3, 0, 0),
+        )
+
+        self.assertLessEqual(parse_human_datetime("now"), datetime.now())
+
+        self.assertLess(parse_human_datetime("yesterday"), datetime.now())
+
+        self.assertEqual(
+            date.today() - timedelta(1), parse_human_datetime("yesterday").date()
+        )
+
+        self.assertEqual(
+            parse_human_datetime("one year ago").date(),
+            (datetime.now() - relativedelta(years=1)).date(),
+        )
+
+        self.assertEqual(
+            parse_human_datetime("2 years after").date(),
+            (datetime.now() + relativedelta(years=2)).date(),
+        )
+
     def test_DateRangeMigration(self):
         params = '{"time_range": "   8 days     : 2020-03-10T00:00:00"}'
         self.assertRegex(params, DateRangeMigration.x_dateunit_in_since)
diff --git a/tests/utils/decorators_tests.py b/tests/integration_tests/utils/decorators_tests.py
similarity index 96%
rename from tests/utils/decorators_tests.py
rename to tests/integration_tests/utils/decorators_tests.py
index 84812546926f..98faa8a2ba6a 100644
--- a/tests/utils/decorators_tests.py
+++ b/tests/integration_tests/utils/decorators_tests.py
@@ -17,7 +17,7 @@
 from unittest.mock import call, Mock
 
 from superset.utils import decorators
-from tests.base_tests import SupersetTestCase
+from tests.integration_tests.base_tests import SupersetTestCase
 
 
 class UtilsDecoratorsTests(SupersetTestCase):
diff --git a/tests/utils/encrypt_tests.py b/tests/integration_tests/utils/encrypt_tests.py
similarity index 97%
rename from tests/utils/encrypt_tests.py
rename to tests/integration_tests/utils/encrypt_tests.py
index e131b9224a07..2199783529b8 100644
--- a/tests/utils/encrypt_tests.py
+++ b/tests/integration_tests/utils/encrypt_tests.py
@@ -22,7 +22,7 @@
 
 from superset.extensions import encrypted_field_factory
 from superset.utils.encrypt import AbstractEncryptedFieldAdapter, SQLAlchemyUtilsAdapter
-from tests.base_tests import SupersetTestCase
+from tests.integration_tests.base_tests import SupersetTestCase
 
 
 class CustomEncFieldAdapter(AbstractEncryptedFieldAdapter):
diff --git a/tests/utils/get_dashboards.py b/tests/integration_tests/utils/get_dashboards.py
similarity index 100%
rename from tests/utils/get_dashboards.py
rename to tests/integration_tests/utils/get_dashboards.py
diff --git a/tests/utils/hashing_tests.py b/tests/integration_tests/utils/hashing_tests.py
similarity index 100%
rename from tests/utils/hashing_tests.py
rename to tests/integration_tests/utils/hashing_tests.py
diff --git a/tests/utils/machine_auth_tests.py b/tests/integration_tests/utils/machine_auth_tests.py
similarity index 97%
rename from tests/utils/machine_auth_tests.py
rename to tests/integration_tests/utils/machine_auth_tests.py
index 1bc08e8eb5d6..0dc8d4a1249f 100644
--- a/tests/utils/machine_auth_tests.py
+++ b/tests/integration_tests/utils/machine_auth_tests.py
@@ -18,7 +18,7 @@
 from unittest.mock import call, Mock, patch
 
 from superset.extensions import machine_auth_provider_factory
-from tests.base_tests import SupersetTestCase
+from tests.integration_tests.base_tests import SupersetTestCase
 
 
 class MachineAuthProviderTests(SupersetTestCase):
diff --git a/tests/utils/public_interfaces_test.py b/tests/integration_tests/utils/public_interfaces_test.py
similarity index 98%
rename from tests/utils/public_interfaces_test.py
rename to tests/integration_tests/utils/public_interfaces_test.py
index 65612c36b35c..03bd0dee4203 100644
--- a/tests/utils/public_interfaces_test.py
+++ b/tests/integration_tests/utils/public_interfaces_test.py
@@ -19,7 +19,7 @@
 
 from superset.sql_lab import dummy_sql_query_mutator
 from superset.utils.public_interfaces import compute_hash, get_warning_message
-from tests.base_tests import SupersetTestCase
+from tests.integration_tests.base_tests import SupersetTestCase
 
 # These are public interfaces exposed by Superset. Make sure
 # to only change the interfaces and update the hashes in new
diff --git a/tests/utils_tests.py b/tests/integration_tests/utils_tests.py
similarity index 90%
rename from tests/utils_tests.py
rename to tests/integration_tests/utils_tests.py
index 5781965ae833..07a444519ac6 100644
--- a/tests/utils_tests.py
+++ b/tests/integration_tests/utils_tests.py
@@ -24,7 +24,9 @@
 import re
 from typing import Any, Tuple, List, Optional
 from unittest.mock import Mock, patch
-from tests.fixtures.birth_names_dashboard import load_birth_names_dashboard_with_slices
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,
+)
 
 import numpy as np
 import pandas as pd
@@ -33,7 +35,7 @@
 import marshmallow
 from sqlalchemy.exc import ArgumentError
 
-import tests.test_app
+import tests.integration_tests.test_app
 from superset import app, db, security_manager
 from superset.exceptions import CertificateException, SupersetException
 from superset.models.core import Database, Log
@@ -55,7 +57,6 @@
     json_int_dttm_ser,
     json_iso_dttm_ser,
     JSONEncodedDict,
-    memoized,
     merge_extra_filters,
     merge_extra_form_data,
     merge_request_params,
@@ -76,25 +77,14 @@
     get_form_data,
     get_time_range_endpoints,
 )
-from tests.base_tests import SupersetTestCase
-from tests.fixtures.world_bank_dashboard import load_world_bank_dashboard_with_slices
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.fixtures.world_bank_dashboard import (
+    load_world_bank_dashboard_with_slices,
+)
 
 from .fixtures.certificates import ssl_certificate
 
 
-def mock_to_adhoc(filt, expressionType="SIMPLE", clause="where"):
-    result = {"clause": clause.upper(), "expressionType": expressionType}
-
-    if expressionType == "SIMPLE":
-        result.update(
-            {"comparator": filt["val"], "operator": filt["op"], "subject": filt["col"]}
-        )
-    elif expressionType == "SQL":
-        result.update({"sqlExpression": filt[clause]})
-
-    return result
-
-
 class TestUtils(SupersetTestCase):
     def test_json_int_dttm_ser(self):
         dttm = datetime(2020, 1, 1)
@@ -134,7 +124,6 @@ def test_zlib_compression(self):
         got_str = zlib_decompress(blob)
         self.assertEqual(json_str, got_str)
 
-    @patch("superset.utils.core.to_adhoc", mock_to_adhoc)
     def test_merge_extra_filters(self):
         # does nothing if no extra filters
         form_data = {"A": 1, "B": 2, "c": "test"}
@@ -165,6 +154,8 @@ def test_merge_extra_filters(self):
                     "clause": "WHERE",
                     "comparator": "someval",
                     "expressionType": "SIMPLE",
+                    "filterOptionName": "90cfb3c34852eb3bc741b0cc20053b46",
+                    "isExtra": True,
                     "operator": "in",
                     "subject": "a",
                 },
@@ -172,6 +163,8 @@ def test_merge_extra_filters(self):
                     "clause": "WHERE",
                     "comparator": ["c1", "c2"],
                     "expressionType": "SIMPLE",
+                    "filterOptionName": "6c178d069965f1c02640661280415d96",
+                    "isExtra": True,
                     "operator": "==",
                     "subject": "B",
                 },
@@ -209,6 +202,8 @@ def test_merge_extra_filters(self):
                     "clause": "WHERE",
                     "comparator": "someval",
                     "expressionType": "SIMPLE",
+                    "filterOptionName": "90cfb3c34852eb3bc741b0cc20053b46",
+                    "isExtra": True,
                     "operator": "in",
                     "subject": "a",
                 },
@@ -216,6 +211,8 @@ def test_merge_extra_filters(self):
                     "clause": "WHERE",
                     "comparator": ["c1", "c2"],
                     "expressionType": "SIMPLE",
+                    "filterOptionName": "6c178d069965f1c02640661280415d96",
+                    "isExtra": True,
                     "operator": "==",
                     "subject": "B",
                 },
@@ -241,6 +238,8 @@ def test_merge_extra_filters(self):
                     "clause": "WHERE",
                     "comparator": "hello",
                     "expressionType": "SIMPLE",
+                    "filterOptionName": "e3cbdd92a2ae23ca92c6d7fca42e36a6",
+                    "isExtra": True,
                     "operator": "like",
                     "subject": "A",
                 }
@@ -261,7 +260,6 @@ def test_merge_extra_filters(self):
         merge_extra_filters(form_data)
         self.assertEqual(form_data, expected)
 
-    @patch("superset.utils.core.to_adhoc", mock_to_adhoc)
     def test_merge_extra_filters_ignores_empty_filters(self):
         form_data = {
             "extra_filters": [
@@ -273,7 +271,6 @@ def test_merge_extra_filters_ignores_empty_filters(self):
         merge_extra_filters(form_data)
         self.assertEqual(form_data, expected)
 
-    @patch("superset.utils.core.to_adhoc", mock_to_adhoc)
     def test_merge_extra_filters_ignores_nones(self):
         form_data = {
             "adhoc_filters": [
@@ -302,7 +299,6 @@ def test_merge_extra_filters_ignores_nones(self):
         merge_extra_filters(form_data)
         self.assertEqual(form_data, expected)
 
-    @patch("superset.utils.core.to_adhoc", mock_to_adhoc)
     def test_merge_extra_filters_ignores_equal_filters(self):
         form_data = {
             "extra_filters": [
@@ -363,7 +359,6 @@ def test_merge_extra_filters_ignores_equal_filters(self):
         merge_extra_filters(form_data)
         self.assertEqual(form_data, expected)
 
-    @patch("superset.utils.core.to_adhoc", mock_to_adhoc)
     def test_merge_extra_filters_merges_different_val_types(self):
         form_data = {
             "extra_filters": [
@@ -407,6 +402,8 @@ def test_merge_extra_filters_merges_different_val_types(self):
                     "clause": "WHERE",
                     "comparator": ["g1", "g2"],
                     "expressionType": "SIMPLE",
+                    "filterOptionName": "c11969c994b40a83a4ae7d48ff1ea28e",
+                    "isExtra": True,
                     "operator": "in",
                     "subject": "a",
                 },
@@ -457,6 +454,8 @@ def test_merge_extra_filters_merges_different_val_types(self):
                     "clause": "WHERE",
                     "comparator": "someval",
                     "expressionType": "SIMPLE",
+                    "filterOptionName": "90cfb3c34852eb3bc741b0cc20053b46",
+                    "isExtra": True,
                     "operator": "in",
                     "subject": "a",
                 },
@@ -466,7 +465,6 @@ def test_merge_extra_filters_merges_different_val_types(self):
         merge_extra_filters(form_data)
         self.assertEqual(form_data, expected)
 
-    @patch("superset.utils.core.to_adhoc", mock_to_adhoc)
     def test_merge_extra_filters_adds_unequal_lists(self):
         form_data = {
             "extra_filters": [
@@ -510,6 +508,8 @@ def test_merge_extra_filters_adds_unequal_lists(self):
                     "clause": "WHERE",
                     "comparator": ["g1", "g2", "g3"],
                     "expressionType": "SIMPLE",
+                    "filterOptionName": "21cbb68af7b17e62b3b2f75e2190bfd7",
+                    "isExtra": True,
                     "operator": "in",
                     "subject": "a",
                 },
@@ -517,6 +517,8 @@ def test_merge_extra_filters_adds_unequal_lists(self):
                     "clause": "WHERE",
                     "comparator": ["c1", "c2", "c3"],
                     "expressionType": "SIMPLE",
+                    "filterOptionName": "0a8dcb928f1f4bba97643c6e68d672f1",
+                    "isExtra": True,
                     "operator": "==",
                     "subject": "B",
                 },
@@ -577,91 +579,21 @@ def test_validate_json(self):
         with self.assertRaises(SupersetException):
             validate_json(invalid)
 
-    def test_memoized_on_functions(self):
-        watcher = {"val": 0}
-
-        @memoized
-        def test_function(a, b, c):
-            watcher["val"] += 1
-            return a * b * c
-
-        result1 = test_function(1, 2, 3)
-        result2 = test_function(1, 2, 3)
-        self.assertEqual(result1, result2)
-        self.assertEqual(watcher["val"], 1)
-
-    def test_memoized_on_methods(self):
-        class test_class:
-            def __init__(self, num):
-                self.num = num
-                self.watcher = 0
-
-            @memoized
-            def test_method(self, a, b, c):
-                self.watcher += 1
-                return a * b * c * self.num
-
-        instance = test_class(5)
-        result1 = instance.test_method(1, 2, 3)
-        result2 = instance.test_method(1, 2, 3)
-        self.assertEqual(result1, result2)
-        self.assertEqual(instance.watcher, 1)
-        instance.num = 10
-        self.assertEqual(result2, instance.test_method(1, 2, 3))
-
-    def test_memoized_on_methods_with_watches(self):
-        class test_class:
-            def __init__(self, x, y):
-                self.x = x
-                self.y = y
-                self.watcher = 0
-
-            @memoized(watch=("x", "y"))
-            def test_method(self, a, b, c):
-                self.watcher += 1
-                return a * b * c * self.x * self.y
-
-        instance = test_class(3, 12)
-        result1 = instance.test_method(1, 2, 3)
-        result2 = instance.test_method(1, 2, 3)
-        self.assertEqual(result1, result2)
-        self.assertEqual(instance.watcher, 1)
-        result3 = instance.test_method(2, 3, 4)
-        self.assertEqual(instance.watcher, 2)
-        result4 = instance.test_method(2, 3, 4)
-        self.assertEqual(instance.watcher, 2)
-        self.assertEqual(result3, result4)
-        self.assertNotEqual(result3, result1)
-        instance.x = 1
-        result5 = instance.test_method(2, 3, 4)
-        self.assertEqual(instance.watcher, 3)
-        self.assertNotEqual(result5, result4)
-        result6 = instance.test_method(2, 3, 4)
-        self.assertEqual(instance.watcher, 3)
-        self.assertEqual(result6, result5)
-        instance.x = 10
-        instance.y = 10
-        result7 = instance.test_method(2, 3, 4)
-        self.assertEqual(instance.watcher, 4)
-        self.assertNotEqual(result7, result6)
-        instance.x = 3
-        instance.y = 12
-        result8 = instance.test_method(1, 2, 3)
-        self.assertEqual(instance.watcher, 4)
-        self.assertEqual(result1, result8)
-
-    @patch("superset.utils.core.to_adhoc", mock_to_adhoc)
     def test_convert_legacy_filters_into_adhoc_where(self):
         form_data = {"where": "a = 1"}
         expected = {
             "adhoc_filters": [
-                {"clause": "WHERE", "expressionType": "SQL", "sqlExpression": "a = 1"}
+                {
+                    "clause": "WHERE",
+                    "expressionType": "SQL",
+                    "filterOptionName": "46fb6d7891e23596e42ae38da94a57e0",
+                    "sqlExpression": "a = 1",
+                }
             ]
         }
         convert_legacy_filters_into_adhoc(form_data)
         self.assertEqual(form_data, expected)
 
-    @patch("superset.utils.core.to_adhoc", mock_to_adhoc)
     def test_convert_legacy_filters_into_adhoc_filters(self):
         form_data = {"filters": [{"col": "a", "op": "in", "val": "someval"}]}
         expected = {
@@ -670,6 +602,7 @@ def test_convert_legacy_filters_into_adhoc_filters(self):
                     "clause": "WHERE",
                     "comparator": "someval",
                     "expressionType": "SIMPLE",
+                    "filterOptionName": "135c7ee246666b840a3d7a9c3a30cf38",
                     "operator": "in",
                     "subject": "a",
                 }
@@ -678,7 +611,6 @@ def test_convert_legacy_filters_into_adhoc_filters(self):
         convert_legacy_filters_into_adhoc(form_data)
         self.assertEqual(form_data, expected)
 
-    @patch("superset.utils.core.to_adhoc", mock_to_adhoc)
     def test_convert_legacy_filters_into_adhoc_having(self):
         form_data = {"having": "COUNT(1) = 1"}
         expected = {
@@ -686,6 +618,7 @@ def test_convert_legacy_filters_into_adhoc_having(self):
                 {
                     "clause": "HAVING",
                     "expressionType": "SQL",
+                    "filterOptionName": "683f1c26466ab912f75a00842e0f2f7b",
                     "sqlExpression": "COUNT(1) = 1",
                 }
             ]
@@ -693,7 +626,6 @@ def test_convert_legacy_filters_into_adhoc_having(self):
         convert_legacy_filters_into_adhoc(form_data)
         self.assertEqual(form_data, expected)
 
-    @patch("superset.utils.core.to_adhoc", mock_to_adhoc)
     def test_convert_legacy_filters_into_adhoc_having_filters(self):
         form_data = {"having_filters": [{"col": "COUNT(1)", "op": "==", "val": 1}]}
         expected = {
@@ -702,6 +634,7 @@ def test_convert_legacy_filters_into_adhoc_having_filters(self):
                     "clause": "HAVING",
                     "comparator": 1,
                     "expressionType": "SIMPLE",
+                    "filterOptionName": "967d0fb409f6d9c7a6c03a46cf933c9c",
                     "operator": "==",
                     "subject": "COUNT(1)",
                 }
@@ -710,18 +643,21 @@ def test_convert_legacy_filters_into_adhoc_having_filters(self):
         convert_legacy_filters_into_adhoc(form_data)
         self.assertEqual(form_data, expected)
 
-    @patch("superset.utils.core.to_adhoc", mock_to_adhoc)
     def test_convert_legacy_filters_into_adhoc_present_and_empty(self):
         form_data = {"adhoc_filters": [], "where": "a = 1"}
         expected = {
             "adhoc_filters": [
-                {"clause": "WHERE", "expressionType": "SQL", "sqlExpression": "a = 1"}
+                {
+                    "clause": "WHERE",
+                    "expressionType": "SQL",
+                    "filterOptionName": "46fb6d7891e23596e42ae38da94a57e0",
+                    "sqlExpression": "a = 1",
+                }
             ]
         }
         convert_legacy_filters_into_adhoc(form_data)
         self.assertEqual(form_data, expected)
 
-    @patch("superset.utils.core.to_adhoc", mock_to_adhoc)
     def test_convert_legacy_filters_into_adhoc_present_and_nonempty(self):
         form_data = {
             "adhoc_filters": [
diff --git a/tests/viz_tests.py b/tests/integration_tests/viz_tests.py
similarity index 99%
rename from tests/viz_tests.py
rename to tests/integration_tests/viz_tests.py
index 1e001c98e99b..aa4036734bb7 100644
--- a/tests/viz_tests.py
+++ b/tests/integration_tests/viz_tests.py
@@ -25,7 +25,7 @@
 import pandas as pd
 import pytest
 
-import tests.test_app
+import tests.integration_tests.test_app
 import superset.viz as viz
 from superset import app
 from superset.constants import NULL_STRING
@@ -462,6 +462,7 @@ def test_groupby_nulls(self):
             "adhoc_filters": [],
             "groupby": ["toppings"],
             "columns": [],
+            "order_desc": True,
         }
         datasource = self.get_datasource_mock()
         df = pd.DataFrame(
@@ -487,6 +488,7 @@ def test_groupby_nans(self):
             "adhoc_filters": [],
             "groupby": ["beds"],
             "columns": [],
+            "order_desc": True,
         }
         datasource = self.get_datasource_mock()
         df = pd.DataFrame({"beds": [0, 1, nan, 2], "count": [30, 42, 3, 29]})
@@ -508,6 +510,7 @@ def test_column_nulls(self):
             "adhoc_filters": [],
             "groupby": ["toppings"],
             "columns": ["role"],
+            "order_desc": True,
         }
         datasource = self.get_datasource_mock()
         df = pd.DataFrame(
@@ -537,6 +540,7 @@ def test_column_metrics_in_order(self):
             "adhoc_filters": [],
             "groupby": ["toppings"],
             "columns": [],
+            "order_desc": True,
         }
         datasource = self.get_datasource_mock()
         df = pd.DataFrame(
@@ -574,6 +578,7 @@ def test_column_metrics_in_order_with_breakdowns(self):
             "adhoc_filters": [],
             "groupby": ["toppings"],
             "columns": ["role"],
+            "order_desc": True,
         }
         datasource = self.get_datasource_mock()
         df = pd.DataFrame(
@@ -1191,42 +1196,38 @@ def test_filter_nulls(self):
                 {
                     "clause": "WHERE",
                     "expressionType": "SIMPLE",
-                    "filterOptionName": "bfa3a42a6f3de3c781b7d4f8e8d6613d",
+                    "filterOptionName": "c7f171cf3204bcbf456acfeac5cd9afd",
                     "comparator": "",
                     "operator": "IS NOT NULL",
                     "subject": "lat",
-                    "isExtra": False,
                 },
                 {
                     "clause": "WHERE",
                     "expressionType": "SIMPLE",
-                    "filterOptionName": "2d35d87b57c6f1a5ae139f1a6b0cbd0a",
+                    "filterOptionName": "52634073fbb8ae0a3aa59ad48abac55e",
                     "comparator": "",
                     "operator": "IS NOT NULL",
                     "subject": "lon",
-                    "isExtra": False,
                 },
             ],
             "delimited_key": [
                 {
                     "clause": "WHERE",
                     "expressionType": "SIMPLE",
-                    "filterOptionName": "89cc0fafe39a4eabc5df2cd52e4d6514",
+                    "filterOptionName": "cae5c925c140593743da08499e6fb207",
                     "comparator": "",
                     "operator": "IS NOT NULL",
                     "subject": "lonlat",
-                    "isExtra": False,
                 }
             ],
             "geohash_key": [
                 {
                     "clause": "WHERE",
                     "expressionType": "SIMPLE",
-                    "filterOptionName": "fa734d9a7bab254a53b41540d46cdb6c",
+                    "filterOptionName": "d84f55222d8e414e888fa5f990b341d2",
                     "comparator": "",
                     "operator": "IS NOT NULL",
                     "subject": "geo",
-                    "isExtra": False,
                 }
             ],
         }
diff --git a/tests/unit_tests/__init__.py b/tests/unit_tests/__init__.py
new file mode 100644
index 000000000000..13a83393a912
--- /dev/null
+++ b/tests/unit_tests/__init__.py
@@ -0,0 +1,16 @@
+# 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.
diff --git a/tests/unit_tests/charts/__init__.py b/tests/unit_tests/charts/__init__.py
new file mode 100644
index 000000000000..13a83393a912
--- /dev/null
+++ b/tests/unit_tests/charts/__init__.py
@@ -0,0 +1,16 @@
+# 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.
diff --git a/tests/unit_tests/charts/test_post_processing.py b/tests/unit_tests/charts/test_post_processing.py
new file mode 100644
index 000000000000..c82ae7ab715f
--- /dev/null
+++ b/tests/unit_tests/charts/test_post_processing.py
@@ -0,0 +1,731 @@
+# 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 pandas as pd
+
+from superset.charts.post_processing import pivot_df
+
+
+def test_pivot_df_no_cols_no_rows_single_metric():
+    """
+    Pivot table when no cols/rows and 1 metric are selected.
+    """
+    # when no cols/rows are selected there are no groupbys in the query,
+    # and the data has only the metric(s)
+    df = pd.DataFrame.from_dict({"SUM(num)": {0: 80679663}})
+    assert (
+        df.to_markdown()
+        == """
+|    |    SUM(num) |
+|---:|------------:|
+|  0 | 8.06797e+07 |
+    """.strip()
+    )
+
+    pivoted = pivot_df(
+        df,
+        rows=[],
+        columns=[],
+        metrics=["SUM(num)"],
+        aggfunc="Sum",
+        transpose_pivot=False,
+        combine_metrics=False,
+        show_rows_total=False,
+        show_columns_total=False,
+        apply_metrics_on_rows=False,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|                  |   ('SUM(num)',) |
+|:-----------------|----------------:|
+| ('Total (Sum)',) |     8.06797e+07 |
+    """.strip()
+    )
+
+    # tranpose_pivot and combine_metrics do nothing in this case
+    pivoted = pivot_df(
+        df,
+        rows=[],
+        columns=[],
+        metrics=["SUM(num)"],
+        aggfunc="Sum",
+        transpose_pivot=True,
+        combine_metrics=True,
+        show_rows_total=False,
+        show_columns_total=False,
+        apply_metrics_on_rows=False,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|                  |   ('SUM(num)',) |
+|:-----------------|----------------:|
+| ('Total (Sum)',) |     8.06797e+07 |
+    """.strip()
+    )
+
+    # apply_metrics_on_rows will pivot the table, moving the metrics
+    # to rows
+    pivoted = pivot_df(
+        df,
+        rows=[],
+        columns=[],
+        metrics=["SUM(num)"],
+        aggfunc="Sum",
+        transpose_pivot=True,
+        combine_metrics=True,
+        show_rows_total=False,
+        show_columns_total=False,
+        apply_metrics_on_rows=True,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|               |   ('Total (Sum)',) |
+|:--------------|-------------------:|
+| ('SUM(num)',) |        8.06797e+07 |
+    """.strip()
+    )
+
+    # showing totals
+    pivoted = pivot_df(
+        df,
+        rows=[],
+        columns=[],
+        metrics=["SUM(num)"],
+        aggfunc="Sum",
+        transpose_pivot=True,
+        combine_metrics=True,
+        show_rows_total=True,
+        show_columns_total=True,
+        apply_metrics_on_rows=False,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|                  |   ('SUM(num)',) |   ('Total (Sum)',) |
+|:-----------------|----------------:|-------------------:|
+| ('Total (Sum)',) |     8.06797e+07 |        8.06797e+07 |
+    """.strip()
+    )
+
+
+def test_pivot_df_no_cols_no_rows_two_metrics():
+    """
+    Pivot table when no cols/rows and 2 metrics are selected.
+    """
+    # when no cols/rows are selected there are no groupbys in the query,
+    # and the data has only the metrics
+    df = pd.DataFrame.from_dict({"SUM(num)": {0: 80679663}, "MAX(num)": {0: 37296}})
+    assert (
+        df.to_markdown()
+        == """
+|    |    SUM(num) |   MAX(num) |
+|---:|------------:|-----------:|
+|  0 | 8.06797e+07 |      37296 |
+    """.strip()
+    )
+
+    pivoted = pivot_df(
+        df,
+        rows=[],
+        columns=[],
+        metrics=["SUM(num)", "MAX(num)"],
+        aggfunc="Sum",
+        transpose_pivot=False,
+        combine_metrics=False,
+        show_rows_total=False,
+        show_columns_total=False,
+        apply_metrics_on_rows=False,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|                  |   ('SUM(num)',) |   ('MAX(num)',) |
+|:-----------------|----------------:|----------------:|
+| ('Total (Sum)',) |     8.06797e+07 |           37296 |
+    """.strip()
+    )
+
+    # tranpose_pivot and combine_metrics do nothing in this case
+    pivoted = pivot_df(
+        df,
+        rows=[],
+        columns=[],
+        metrics=["SUM(num)", "MAX(num)"],
+        aggfunc="Sum",
+        transpose_pivot=True,
+        combine_metrics=True,
+        show_rows_total=False,
+        show_columns_total=False,
+        apply_metrics_on_rows=False,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|                  |   ('SUM(num)',) |   ('MAX(num)',) |
+|:-----------------|----------------:|----------------:|
+| ('Total (Sum)',) |     8.06797e+07 |           37296 |
+    """.strip()
+    )
+
+    # apply_metrics_on_rows will pivot the table, moving the metrics
+    # to rows
+    pivoted = pivot_df(
+        df,
+        rows=[],
+        columns=[],
+        metrics=["SUM(num)", "MAX(num)"],
+        aggfunc="Sum",
+        transpose_pivot=True,
+        combine_metrics=True,
+        show_rows_total=False,
+        show_columns_total=False,
+        apply_metrics_on_rows=True,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|               |   ('Total (Sum)',) |
+|:--------------|-------------------:|
+| ('SUM(num)',) |        8.06797e+07 |
+| ('MAX(num)',) |    37296           |
+    """.strip()
+    )
+
+    # when showing totals we only add a column, since adding a row
+    # would be redundant
+    pivoted = pivot_df(
+        df,
+        rows=[],
+        columns=[],
+        metrics=["SUM(num)", "MAX(num)"],
+        aggfunc="Sum",
+        transpose_pivot=True,
+        combine_metrics=True,
+        show_rows_total=True,
+        show_columns_total=True,
+        apply_metrics_on_rows=False,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|                  |   ('SUM(num)',) |   ('MAX(num)',) |   ('Total (Sum)',) |
+|:-----------------|----------------:|----------------:|-------------------:|
+| ('Total (Sum)',) |     8.06797e+07 |           37296 |         8.0717e+07 |
+    """.strip()
+    )
+
+
+def test_pivot_df_single_row_two_metrics():
+    """
+    Pivot table when a single column and 2 metrics are selected.
+    """
+    df = pd.DataFrame.from_dict(
+        {
+            "gender": {0: "girl", 1: "boy"},
+            "SUM(num)": {0: 118065, 1: 47123},
+            "MAX(num)": {0: 2588, 1: 1280},
+        }
+    )
+    assert (
+        df.to_markdown()
+        == """
+|    | gender   |   SUM(num) |   MAX(num) |
+|---:|:---------|-----------:|-----------:|
+|  0 | girl     |     118065 |       2588 |
+|  1 | boy      |      47123 |       1280 |
+    """.strip()
+    )
+
+    pivoted = pivot_df(
+        df,
+        rows=["gender"],
+        columns=[],
+        metrics=["SUM(num)", "MAX(num)"],
+        aggfunc="Sum",
+        transpose_pivot=False,
+        combine_metrics=False,
+        show_rows_total=False,
+        show_columns_total=False,
+        apply_metrics_on_rows=False,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|           |   ('SUM(num)',) |   ('MAX(num)',) |
+|:----------|----------------:|----------------:|
+| ('boy',)  |           47123 |            1280 |
+| ('girl',) |          118065 |            2588 |
+    """.strip()
+    )
+
+    # transpose_pivot
+    pivoted = pivot_df(
+        df,
+        rows=["gender"],
+        columns=[],
+        metrics=["SUM(num)", "MAX(num)"],
+        aggfunc="Sum",
+        transpose_pivot=True,
+        combine_metrics=False,
+        show_rows_total=False,
+        show_columns_total=False,
+        apply_metrics_on_rows=False,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|                  |   ('SUM(num)', 'boy') |   ('SUM(num)', 'girl') |   ('MAX(num)', 'boy') |   ('MAX(num)', 'girl') |
+|:-----------------|----------------------:|-----------------------:|----------------------:|-----------------------:|
+| ('Total (Sum)',) |                 47123 |                 118065 |                  1280 |                   2588 |
+    """.strip()
+    )
+
+    # combine_metrics does nothing in this case
+    pivoted = pivot_df(
+        df,
+        rows=["gender"],
+        columns=[],
+        metrics=["SUM(num)", "MAX(num)"],
+        aggfunc="Sum",
+        transpose_pivot=False,
+        combine_metrics=True,
+        show_rows_total=False,
+        show_columns_total=False,
+        apply_metrics_on_rows=False,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|           |   ('SUM(num)',) |   ('MAX(num)',) |
+|:----------|----------------:|----------------:|
+| ('boy',)  |           47123 |            1280 |
+| ('girl',) |          118065 |            2588 |
+    """.strip()
+    )
+
+    # show totals
+    pivoted = pivot_df(
+        df,
+        rows=["gender"],
+        columns=[],
+        metrics=["SUM(num)", "MAX(num)"],
+        aggfunc="Sum",
+        transpose_pivot=False,
+        combine_metrics=False,
+        show_rows_total=True,
+        show_columns_total=True,
+        apply_metrics_on_rows=False,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|                  |   ('SUM(num)',) |   ('MAX(num)',) |   ('Total (Sum)',) |
+|:-----------------|----------------:|----------------:|-------------------:|
+| ('boy',)         |           47123 |            1280 |              48403 |
+| ('girl',)        |          118065 |            2588 |             120653 |
+| ('Total (Sum)',) |          165188 |            3868 |             169056 |
+    """.strip()
+    )
+
+    # apply_metrics_on_rows
+    pivoted = pivot_df(
+        df,
+        rows=["gender"],
+        columns=[],
+        metrics=["SUM(num)", "MAX(num)"],
+        aggfunc="Sum",
+        transpose_pivot=False,
+        combine_metrics=False,
+        show_rows_total=True,
+        show_columns_total=True,
+        apply_metrics_on_rows=True,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|                          |   ('Total (Sum)',) |
+|:-------------------------|-------------------:|
+| ('SUM(num)', 'boy')      |              47123 |
+| ('SUM(num)', 'girl')     |             118065 |
+| ('SUM(num)', 'Subtotal') |             165188 |
+| ('MAX(num)', 'boy')      |               1280 |
+| ('MAX(num)', 'girl')     |               2588 |
+| ('MAX(num)', 'Subtotal') |               3868 |
+| ('Total (Sum)', '')      |             169056 |
+    """.strip()
+    )
+
+    # apply_metrics_on_rows with combine_metrics
+    pivoted = pivot_df(
+        df,
+        rows=["gender"],
+        columns=[],
+        metrics=["SUM(num)", "MAX(num)"],
+        aggfunc="Sum",
+        transpose_pivot=False,
+        combine_metrics=True,
+        show_rows_total=True,
+        show_columns_total=True,
+        apply_metrics_on_rows=True,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|                      |   ('Total (Sum)',) |
+|:---------------------|-------------------:|
+| ('boy', 'SUM(num)')  |              47123 |
+| ('boy', 'MAX(num)')  |               1280 |
+| ('boy', 'Subtotal')  |              48403 |
+| ('girl', 'SUM(num)') |             118065 |
+| ('girl', 'MAX(num)') |               2588 |
+| ('girl', 'Subtotal') |             120653 |
+| ('Total (Sum)', '')  |             169056 |
+    """.strip()
+    )
+
+
+def test_pivot_df_complex():
+    """
+    Pivot table when a column, rows and 2 metrics are selected.
+    """
+    df = pd.DataFrame.from_dict(
+        {
+            "state": {
+                0: "CA",
+                1: "CA",
+                2: "CA",
+                3: "FL",
+                4: "CA",
+                5: "CA",
+                6: "FL",
+                7: "FL",
+                8: "FL",
+                9: "CA",
+                10: "FL",
+                11: "FL",
+            },
+            "gender": {
+                0: "girl",
+                1: "boy",
+                2: "girl",
+                3: "girl",
+                4: "girl",
+                5: "girl",
+                6: "boy",
+                7: "girl",
+                8: "girl",
+                9: "boy",
+                10: "boy",
+                11: "girl",
+            },
+            "name": {
+                0: "Amy",
+                1: "Edward",
+                2: "Sophia",
+                3: "Amy",
+                4: "Cindy",
+                5: "Dawn",
+                6: "Edward",
+                7: "Sophia",
+                8: "Dawn",
+                9: "Tony",
+                10: "Tony",
+                11: "Cindy",
+            },
+            "SUM(num)": {
+                0: 45426,
+                1: 31290,
+                2: 18859,
+                3: 14740,
+                4: 14149,
+                5: 11403,
+                6: 9395,
+                7: 7181,
+                8: 5089,
+                9: 3765,
+                10: 2673,
+                11: 1218,
+            },
+            "MAX(num)": {
+                0: 2227,
+                1: 1280,
+                2: 2588,
+                3: 854,
+                4: 842,
+                5: 1157,
+                6: 389,
+                7: 1187,
+                8: 461,
+                9: 598,
+                10: 247,
+                11: 217,
+            },
+        }
+    )
+    assert (
+        df.to_markdown()
+        == """
+|    | state   | gender   | name   |   SUM(num) |   MAX(num) |
+|---:|:--------|:---------|:-------|-----------:|-----------:|
+|  0 | CA      | girl     | Amy    |      45426 |       2227 |
+|  1 | CA      | boy      | Edward |      31290 |       1280 |
+|  2 | CA      | girl     | Sophia |      18859 |       2588 |
+|  3 | FL      | girl     | Amy    |      14740 |        854 |
+|  4 | CA      | girl     | Cindy  |      14149 |        842 |
+|  5 | CA      | girl     | Dawn   |      11403 |       1157 |
+|  6 | FL      | boy      | Edward |       9395 |        389 |
+|  7 | FL      | girl     | Sophia |       7181 |       1187 |
+|  8 | FL      | girl     | Dawn   |       5089 |        461 |
+|  9 | CA      | boy      | Tony   |       3765 |        598 |
+| 10 | FL      | boy      | Tony   |       2673 |        247 |
+| 11 | FL      | girl     | Cindy  |       1218 |        217 |
+    """.strip()
+    )
+
+    pivoted = pivot_df(
+        df,
+        rows=["gender", "name"],
+        columns=["state"],
+        metrics=["SUM(num)", "MAX(num)"],
+        aggfunc="Sum",
+        transpose_pivot=False,
+        combine_metrics=False,
+        show_rows_total=False,
+        show_columns_total=False,
+        apply_metrics_on_rows=False,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|                    |   ('SUM(num)', 'CA') |   ('SUM(num)', 'FL') |   ('MAX(num)', 'CA') |   ('MAX(num)', 'FL') |
+|:-------------------|---------------------:|---------------------:|---------------------:|---------------------:|
+| ('boy', 'Edward')  |                31290 |                 9395 |                 1280 |                  389 |
+| ('boy', 'Tony')    |                 3765 |                 2673 |                  598 |                  247 |
+| ('girl', 'Amy')    |                45426 |                14740 |                 2227 |                  854 |
+| ('girl', 'Cindy')  |                14149 |                 1218 |                  842 |                  217 |
+| ('girl', 'Dawn')   |                11403 |                 5089 |                 1157 |                  461 |
+| ('girl', 'Sophia') |                18859 |                 7181 |                 2588 |                 1187 |
+    """.strip()
+    )
+
+    # transpose_pivot
+    pivoted = pivot_df(
+        df,
+        rows=["gender", "name"],
+        columns=["state"],
+        metrics=["SUM(num)", "MAX(num)"],
+        aggfunc="Sum",
+        transpose_pivot=True,
+        combine_metrics=False,
+        show_rows_total=False,
+        show_columns_total=False,
+        apply_metrics_on_rows=False,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|         |   ('SUM(num)', 'boy', 'Edward') |   ('SUM(num)', 'boy', 'Tony') |   ('SUM(num)', 'girl', 'Amy') |   ('SUM(num)', 'girl', 'Cindy') |   ('SUM(num)', 'girl', 'Dawn') |   ('SUM(num)', 'girl', 'Sophia') |   ('MAX(num)', 'boy', 'Edward') |   ('MAX(num)', 'boy', 'Tony') |   ('MAX(num)', 'girl', 'Amy') |   ('MAX(num)', 'girl', 'Cindy') |   ('MAX(num)', 'girl', 'Dawn') |   ('MAX(num)', 'girl', 'Sophia') |
+|:--------|--------------------------------:|------------------------------:|------------------------------:|--------------------------------:|-------------------------------:|---------------------------------:|--------------------------------:|------------------------------:|------------------------------:|--------------------------------:|-------------------------------:|---------------------------------:|
+| ('CA',) |                           31290 |                          3765 |                         45426 |                           14149 |                          11403 |                            18859 |                            1280 |                           598 |                          2227 |                             842 |                           1157 |                             2588 |
+| ('FL',) |                            9395 |                          2673 |                         14740 |                            1218 |                           5089 |                             7181 |                             389 |                           247 |                           854 |                             217 |                            461 |                             1187 |
+    """.strip()
+    )
+
+    # combine_metrics
+    pivoted = pivot_df(
+        df,
+        rows=["gender", "name"],
+        columns=["state"],
+        metrics=["SUM(num)", "MAX(num)"],
+        aggfunc="Sum",
+        transpose_pivot=False,
+        combine_metrics=True,
+        show_rows_total=False,
+        show_columns_total=False,
+        apply_metrics_on_rows=False,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|                    |   ('CA', 'SUM(num)') |   ('CA', 'MAX(num)') |   ('FL', 'SUM(num)') |   ('FL', 'MAX(num)') |
+|:-------------------|---------------------:|---------------------:|---------------------:|---------------------:|
+| ('boy', 'Edward')  |                31290 |                 1280 |                 9395 |                  389 |
+| ('boy', 'Tony')    |                 3765 |                  598 |                 2673 |                  247 |
+| ('girl', 'Amy')    |                45426 |                 2227 |                14740 |                  854 |
+| ('girl', 'Cindy')  |                14149 |                  842 |                 1218 |                  217 |
+| ('girl', 'Dawn')   |                11403 |                 1157 |                 5089 |                  461 |
+| ('girl', 'Sophia') |                18859 |                 2588 |                 7181 |                 1187 |
+    """.strip()
+    )
+
+    # show totals
+    pivoted = pivot_df(
+        df,
+        rows=["gender", "name"],
+        columns=["state"],
+        metrics=["SUM(num)", "MAX(num)"],
+        aggfunc="Sum",
+        transpose_pivot=False,
+        combine_metrics=False,
+        show_rows_total=True,
+        show_columns_total=True,
+        apply_metrics_on_rows=False,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|                      |   ('SUM(num)', 'CA') |   ('SUM(num)', 'FL') |   ('SUM(num)', 'Subtotal') |   ('MAX(num)', 'CA') |   ('MAX(num)', 'FL') |   ('MAX(num)', 'Subtotal') |   ('Total (Sum)', '') |
+|:---------------------|---------------------:|---------------------:|---------------------------:|---------------------:|---------------------:|---------------------------:|----------------------:|
+| ('boy', 'Edward')    |                31290 |                 9395 |                      40685 |                 1280 |                  389 |                       1669 |                 42354 |
+| ('boy', 'Tony')      |                 3765 |                 2673 |                       6438 |                  598 |                  247 |                        845 |                  7283 |
+| ('boy', 'Subtotal')  |                35055 |                12068 |                      47123 |                 1878 |                  636 |                       2514 |                 49637 |
+| ('girl', 'Amy')      |                45426 |                14740 |                      60166 |                 2227 |                  854 |                       3081 |                 63247 |
+| ('girl', 'Cindy')    |                14149 |                 1218 |                      15367 |                  842 |                  217 |                       1059 |                 16426 |
+| ('girl', 'Dawn')     |                11403 |                 5089 |                      16492 |                 1157 |                  461 |                       1618 |                 18110 |
+| ('girl', 'Sophia')   |                18859 |                 7181 |                      26040 |                 2588 |                 1187 |                       3775 |                 29815 |
+| ('girl', 'Subtotal') |                89837 |                28228 |                     118065 |                 6814 |                 2719 |                       9533 |                127598 |
+| ('Total (Sum)', '')  |               124892 |                40296 |                     165188 |                 8692 |                 3355 |                      12047 |                177235 |
+    """.strip()
+    )
+
+    # apply_metrics_on_rows
+    pivoted = pivot_df(
+        df,
+        rows=["gender", "name"],
+        columns=["state"],
+        metrics=["SUM(num)", "MAX(num)"],
+        aggfunc="Sum",
+        transpose_pivot=False,
+        combine_metrics=False,
+        show_rows_total=False,
+        show_columns_total=False,
+        apply_metrics_on_rows=True,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|                                |   ('CA',) |   ('FL',) |
+|:-------------------------------|----------:|----------:|
+| ('SUM(num)', 'boy', 'Edward')  |     31290 |      9395 |
+| ('SUM(num)', 'boy', 'Tony')    |      3765 |      2673 |
+| ('SUM(num)', 'girl', 'Amy')    |     45426 |     14740 |
+| ('SUM(num)', 'girl', 'Cindy')  |     14149 |      1218 |
+| ('SUM(num)', 'girl', 'Dawn')   |     11403 |      5089 |
+| ('SUM(num)', 'girl', 'Sophia') |     18859 |      7181 |
+| ('MAX(num)', 'boy', 'Edward')  |      1280 |       389 |
+| ('MAX(num)', 'boy', 'Tony')    |       598 |       247 |
+| ('MAX(num)', 'girl', 'Amy')    |      2227 |       854 |
+| ('MAX(num)', 'girl', 'Cindy')  |       842 |       217 |
+| ('MAX(num)', 'girl', 'Dawn')   |      1157 |       461 |
+| ('MAX(num)', 'girl', 'Sophia') |      2588 |      1187 |
+    """.strip()
+    )
+
+    # apply_metrics_on_rows with combine_metrics
+    pivoted = pivot_df(
+        df,
+        rows=["gender", "name"],
+        columns=["state"],
+        metrics=["SUM(num)", "MAX(num)"],
+        aggfunc="Sum",
+        transpose_pivot=False,
+        combine_metrics=True,
+        show_rows_total=False,
+        show_columns_total=False,
+        apply_metrics_on_rows=True,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|                                |   ('CA',) |   ('FL',) |
+|:-------------------------------|----------:|----------:|
+| ('boy', 'Edward', 'SUM(num)')  |     31290 |      9395 |
+| ('boy', 'Edward', 'MAX(num)')  |      1280 |       389 |
+| ('boy', 'Tony', 'SUM(num)')    |      3765 |      2673 |
+| ('boy', 'Tony', 'MAX(num)')    |       598 |       247 |
+| ('girl', 'Amy', 'SUM(num)')    |     45426 |     14740 |
+| ('girl', 'Amy', 'MAX(num)')    |      2227 |       854 |
+| ('girl', 'Cindy', 'SUM(num)')  |     14149 |      1218 |
+| ('girl', 'Cindy', 'MAX(num)')  |       842 |       217 |
+| ('girl', 'Dawn', 'SUM(num)')   |     11403 |      5089 |
+| ('girl', 'Dawn', 'MAX(num)')   |      1157 |       461 |
+| ('girl', 'Sophia', 'SUM(num)') |     18859 |      7181 |
+| ('girl', 'Sophia', 'MAX(num)') |      2588 |      1187 |
+    """.strip()
+    )
+
+    # everything
+    pivoted = pivot_df(
+        df,
+        rows=["gender", "name"],
+        columns=["state"],
+        metrics=["SUM(num)", "MAX(num)"],
+        aggfunc="Sum",
+        transpose_pivot=True,
+        combine_metrics=True,
+        show_rows_total=True,
+        show_columns_total=True,
+        apply_metrics_on_rows=True,
+    )
+    print(pivoted.to_markdown())
+    assert (
+        pivoted.to_markdown()
+        == """
+|                     |   ('boy', 'Edward') |   ('boy', 'Tony') |   ('boy', 'Subtotal') |   ('girl', 'Amy') |   ('girl', 'Cindy') |   ('girl', 'Dawn') |   ('girl', 'Sophia') |   ('girl', 'Subtotal') |   ('Total (Sum)', '') |
+|:--------------------|--------------------:|------------------:|----------------------:|------------------:|--------------------:|-------------------:|---------------------:|-----------------------:|----------------------:|
+| ('CA', 'SUM(num)')  |               31290 |              3765 |                 35055 |             45426 |               14149 |              11403 |                18859 |                  89837 |                124892 |
+| ('CA', 'MAX(num)')  |                1280 |               598 |                  1878 |              2227 |                 842 |               1157 |                 2588 |                   6814 |                  8692 |
+| ('CA', 'Subtotal')  |               32570 |              4363 |                 36933 |             47653 |               14991 |              12560 |                21447 |                  96651 |                133584 |
+| ('FL', 'SUM(num)')  |                9395 |              2673 |                 12068 |             14740 |                1218 |               5089 |                 7181 |                  28228 |                 40296 |
+| ('FL', 'MAX(num)')  |                 389 |               247 |                   636 |               854 |                 217 |                461 |                 1187 |                   2719 |                  3355 |
+| ('FL', 'Subtotal')  |                9784 |              2920 |                 12704 |             15594 |                1435 |               5550 |                 8368 |                  30947 |                 43651 |
+| ('Total (Sum)', '') |               42354 |              7283 |                 49637 |             63247 |               16426 |              18110 |                29815 |                 127598 |                177235 |
+    """.strip()
+    )
+
+    # fraction
+    pivoted = pivot_df(
+        df,
+        rows=["gender", "name"],
+        columns=["state"],
+        metrics=["SUM(num)", "MAX(num)"],
+        aggfunc="Sum as Fraction of Columns",
+        transpose_pivot=False,
+        combine_metrics=False,
+        show_rows_total=False,
+        show_columns_total=True,
+        apply_metrics_on_rows=False,
+    )
+    assert (
+        pivoted.to_markdown()
+        == """
+|                                            |   ('SUM(num)', 'CA') |   ('SUM(num)', 'FL') |   ('MAX(num)', 'CA') |   ('MAX(num)', 'FL') |
+|:-------------------------------------------|---------------------:|---------------------:|---------------------:|---------------------:|
+| ('boy', 'Edward')                          |            0.250536  |            0.23315   |            0.147262  |            0.115946  |
+| ('boy', 'Tony')                            |            0.030146  |            0.0663341 |            0.0687989 |            0.0736215 |
+| ('boy', 'Subtotal')                        |            0.280683  |            0.299484  |            0.216061  |            0.189568  |
+| ('girl', 'Amy')                            |            0.363722  |            0.365793  |            0.256213  |            0.254545  |
+| ('girl', 'Cindy')                          |            0.11329   |            0.0302263 |            0.0968707 |            0.0646796 |
+| ('girl', 'Dawn')                           |            0.0913029 |            0.12629   |            0.133111  |            0.137407  |
+| ('girl', 'Sophia')                         |            0.151002  |            0.178206  |            0.297745  |            0.3538    |
+| ('girl', 'Subtotal')                       |            0.719317  |            0.700516  |            0.783939  |            0.810432  |
+| ('Total (Sum as Fraction of Columns)', '') |            1         |            1         |            1         |            1         |
+    """.strip()
+    )
diff --git a/tests/unit_tests/conftest.py b/tests/unit_tests/conftest.py
new file mode 100644
index 000000000000..04d793a860e4
--- /dev/null
+++ b/tests/unit_tests/conftest.py
@@ -0,0 +1,30 @@
+# 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 pytest
+
+
+@pytest.fixture
+def app_context():
+    """
+    A fixture for running the test inside an app context.
+    """
+    from superset.app import create_app
+
+    app = create_app()
+    with app.app_context():
+        yield
diff --git a/tests/unit_tests/core_tests.py b/tests/unit_tests/core_tests.py
new file mode 100644
index 000000000000..1238f509d4c5
--- /dev/null
+++ b/tests/unit_tests/core_tests.py
@@ -0,0 +1,174 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from copy import deepcopy
+
+import pytest
+
+from superset.utils.core import (
+    AdhocMetric,
+    ExtraFiltersReasonType,
+    ExtraFiltersTimeColumnType,
+    GenericDataType,
+    get_metric_name,
+    get_metric_names,
+    get_time_filter_status,
+    is_adhoc_metric,
+    NO_TIME_RANGE,
+)
+from tests.unit_tests.fixtures.datasets import get_dataset_mock
+
+STR_METRIC = "my_metric"
+SIMPLE_SUM_ADHOC_METRIC: AdhocMetric = {
+    "aggregate": "SUM",
+    "column": {
+        "column_name": "my_col",
+        "type": "INT",
+        "type_generic": GenericDataType.NUMERIC,
+    },
+    "expressionType": "SIMPLE",
+    "label": "my SUM",
+}
+SQL_ADHOC_METRIC: AdhocMetric = {
+    "expressionType": "SQL",
+    "label": "my_sql",
+    "sqlExpression": "SUM(my_col)",
+}
+
+
+def test_get_metric_name_saved_metric():
+    assert get_metric_name(STR_METRIC) == "my_metric"
+
+
+def test_get_metric_name_adhoc():
+    metric = deepcopy(SIMPLE_SUM_ADHOC_METRIC)
+    assert get_metric_name(metric) == "my SUM"
+    del metric["label"]
+    assert get_metric_name(metric) == "SUM(my_col)"
+    metric["label"] = ""
+    assert get_metric_name(metric) == "SUM(my_col)"
+    del metric["aggregate"]
+    assert get_metric_name(metric) == "my_col"
+    metric["aggregate"] = ""
+    assert get_metric_name(metric) == "my_col"
+
+    metric = deepcopy(SQL_ADHOC_METRIC)
+    assert get_metric_name(metric) == "my_sql"
+    del metric["label"]
+    assert get_metric_name(metric) == "SUM(my_col)"
+    metric["label"] = ""
+    assert get_metric_name(metric) == "SUM(my_col)"
+
+
+def test_get_metric_name_invalid_metric():
+    metric = deepcopy(SIMPLE_SUM_ADHOC_METRIC)
+    del metric["label"]
+    del metric["column"]
+    with pytest.raises(ValueError):
+        get_metric_name(metric)
+
+    metric = deepcopy(SIMPLE_SUM_ADHOC_METRIC)
+    del metric["label"]
+    metric["expressionType"] = "FOO"
+    with pytest.raises(ValueError):
+        get_metric_name(metric)
+
+    metric = deepcopy(SQL_ADHOC_METRIC)
+    del metric["label"]
+    metric["expressionType"] = "FOO"
+    with pytest.raises(ValueError):
+        get_metric_name(metric)
+
+
+def test_get_metric_names():
+    assert get_metric_names(
+        [STR_METRIC, SIMPLE_SUM_ADHOC_METRIC, SQL_ADHOC_METRIC]
+    ) == ["my_metric", "my SUM", "my_sql"]
+
+
+def test_is_adhoc_metric():
+    assert is_adhoc_metric(STR_METRIC) is False
+    assert is_adhoc_metric(SIMPLE_SUM_ADHOC_METRIC) is True
+    assert is_adhoc_metric(SQL_ADHOC_METRIC) is True
+
+
+def test_get_time_filter_status_time_col():
+    dataset = get_dataset_mock()
+
+    assert get_time_filter_status(
+        dataset, {ExtraFiltersTimeColumnType.TIME_COL: "ds"}
+    ) == ([{"column": ExtraFiltersTimeColumnType.TIME_COL}], [])
+
+
+def test_get_time_filter_status_time_range():
+    dataset = get_dataset_mock()
+
+    assert get_time_filter_status(
+        dataset, {ExtraFiltersTimeColumnType.TIME_RANGE: NO_TIME_RANGE}
+    ) == ([], [])
+
+    assert get_time_filter_status(
+        dataset, {ExtraFiltersTimeColumnType.TIME_RANGE: "1 year ago"}
+    ) == ([{"column": ExtraFiltersTimeColumnType.TIME_RANGE}], [])
+
+
+def test_get_time_filter_status_time_grain():
+    dataset = get_dataset_mock()
+
+    assert get_time_filter_status(
+        dataset, {ExtraFiltersTimeColumnType.TIME_GRAIN: "PT1M"}
+    ) == ([{"column": ExtraFiltersTimeColumnType.TIME_GRAIN}], [])
+
+
+def test_get_time_filter_status_no_temporal_col():
+    dataset = get_dataset_mock()
+    dataset.columns[0].is_dttm = False
+
+    assert get_time_filter_status(
+        dataset, {ExtraFiltersTimeColumnType.TIME_COL: "foobar"}
+    ) == (
+        [],
+        [
+            {
+                "reason": ExtraFiltersReasonType.COL_NOT_IN_DATASOURCE,
+                "column": ExtraFiltersTimeColumnType.TIME_COL,
+            }
+        ],
+    )
+
+    assert get_time_filter_status(
+        dataset, {ExtraFiltersTimeColumnType.TIME_RANGE: "1 year ago"}
+    ) == (
+        [],
+        [
+            {
+                "reason": ExtraFiltersReasonType.NO_TEMPORAL_COLUMN,
+                "column": ExtraFiltersTimeColumnType.TIME_RANGE,
+            }
+        ],
+    )
+
+    assert get_time_filter_status(
+        dataset, {ExtraFiltersTimeColumnType.TIME_GRAIN: "PT1M"}
+    ) == (
+        [],
+        [
+            {
+                "reason": ExtraFiltersReasonType.NO_TEMPORAL_COLUMN,
+                "column": ExtraFiltersTimeColumnType.TIME_GRAIN,
+            }
+        ],
+    )
diff --git a/tests/unit_tests/db_engine_specs/test_gsheets.py b/tests/unit_tests/db_engine_specs/test_gsheets.py
new file mode 100644
index 000000000000..0caa7afc8e44
--- /dev/null
+++ b/tests/unit_tests/db_engine_specs/test_gsheets.py
@@ -0,0 +1,172 @@
+# 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.
+# pylint: disable=unused-argument, invalid-name
+from flask.ctx import AppContext
+from pytest_mock import MockFixture
+
+from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
+
+
+class ProgrammingError(Exception):
+    """
+    Dummy ProgrammingError so we don't need to import the optional gsheets.
+    """
+
+
+def test_validate_parameters_simple(
+    mocker: MockFixture, app_context: AppContext,
+) -> None:
+    from superset.db_engine_specs.gsheets import (
+        GSheetsEngineSpec,
+        GSheetsParametersType,
+    )
+
+    parameters: GSheetsParametersType = {
+        "credentials_info": {},
+        "catalog": {},
+    }
+    errors = GSheetsEngineSpec.validate_parameters(parameters)
+    assert errors == []
+
+
+def test_validate_parameters_catalog(
+    mocker: MockFixture, app_context: AppContext,
+) -> None:
+    from superset.db_engine_specs.gsheets import (
+        GSheetsEngineSpec,
+        GSheetsParametersType,
+    )
+
+    g = mocker.patch("superset.db_engine_specs.gsheets.g")
+    g.user.email = "admin@example.com"
+
+    create_engine = mocker.patch("superset.db_engine_specs.gsheets.create_engine")
+    conn = create_engine.return_value.connect.return_value
+    results = conn.execute.return_value
+    results.fetchall.side_effect = [
+        ProgrammingError("The caller does not have permission"),
+        [(1,)],
+        ProgrammingError("Unsupported table: https://www.google.com/"),
+    ]
+
+    parameters: GSheetsParametersType = {
+        "credentials_info": {},
+        "catalog": {
+            "private_sheet": "https://docs.google.com/spreadsheets/d/1/edit",
+            "public_sheet": "https://docs.google.com/spreadsheets/d/1/edit#gid=1",
+            "not_a_sheet": "https://www.google.com/",
+        },
+    }
+    errors = GSheetsEngineSpec.validate_parameters(parameters)  # ignore: type
+
+    assert errors == [
+        SupersetError(
+            message="URL could not be identified",
+            error_type=SupersetErrorType.TABLE_DOES_NOT_EXIST_ERROR,
+            level=ErrorLevel.WARNING,
+            extra={
+                "catalog": {"idx": 0, "url": True,},
+                "issue_codes": [
+                    {
+                        "code": 1003,
+                        "message": "Issue 1003 - There is a syntax error in the SQL query. Perhaps there was a misspelling or a typo.",
+                    },
+                    {
+                        "code": 1005,
+                        "message": "Issue 1005 - The table was deleted or renamed in the database.",
+                    },
+                ],
+            },
+        ),
+        SupersetError(
+            message="URL could not be identified",
+            error_type=SupersetErrorType.TABLE_DOES_NOT_EXIST_ERROR,
+            level=ErrorLevel.WARNING,
+            extra={
+                "catalog": {"idx": 2, "url": True,},
+                "issue_codes": [
+                    {
+                        "code": 1003,
+                        "message": "Issue 1003 - There is a syntax error in the SQL query. Perhaps there was a misspelling or a typo.",
+                    },
+                    {
+                        "code": 1005,
+                        "message": "Issue 1005 - The table was deleted or renamed in the database.",
+                    },
+                ],
+            },
+        ),
+    ]
+
+    create_engine.assert_called_with(
+        "gsheets://", service_account_info={}, subject="admin@example.com",
+    )
+
+
+def test_validate_parameters_catalog_and_credentials(
+    mocker: MockFixture, app_context: AppContext,
+) -> None:
+    from superset.db_engine_specs.gsheets import (
+        GSheetsEngineSpec,
+        GSheetsParametersType,
+    )
+
+    g = mocker.patch("superset.db_engine_specs.gsheets.g")
+    g.user.email = "admin@example.com"
+
+    create_engine = mocker.patch("superset.db_engine_specs.gsheets.create_engine")
+    conn = create_engine.return_value.connect.return_value
+    results = conn.execute.return_value
+    results.fetchall.side_effect = [
+        [(2,)],
+        [(1,)],
+        ProgrammingError("Unsupported table: https://www.google.com/"),
+    ]
+
+    parameters: GSheetsParametersType = {
+        "credentials_info": {},
+        "catalog": {
+            "private_sheet": "https://docs.google.com/spreadsheets/d/1/edit",
+            "public_sheet": "https://docs.google.com/spreadsheets/d/1/edit#gid=1",
+            "not_a_sheet": "https://www.google.com/",
+        },
+    }
+    errors = GSheetsEngineSpec.validate_parameters(parameters)  # ignore: type
+    assert errors == [
+        SupersetError(
+            message="URL could not be identified",
+            error_type=SupersetErrorType.TABLE_DOES_NOT_EXIST_ERROR,
+            level=ErrorLevel.WARNING,
+            extra={
+                "catalog": {"idx": 2, "url": True,},
+                "issue_codes": [
+                    {
+                        "code": 1003,
+                        "message": "Issue 1003 - There is a syntax error in the SQL query. Perhaps there was a misspelling or a typo.",
+                    },
+                    {
+                        "code": 1005,
+                        "message": "Issue 1005 - The table was deleted or renamed in the database.",
+                    },
+                ],
+            },
+        )
+    ]
+
+    create_engine.assert_called_with(
+        "gsheets://", service_account_info={}, subject="admin@example.com",
+    )
diff --git a/tests/unit_tests/fixtures/datasets.py b/tests/unit_tests/fixtures/datasets.py
new file mode 100644
index 000000000000..5d5466a5e813
--- /dev/null
+++ b/tests/unit_tests/fixtures/datasets.py
@@ -0,0 +1,206 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from typing import Any, Dict
+from unittest.mock import Mock
+
+
+def get_column_mock(params: Dict[str, Any]) -> Mock:
+    mock = Mock()
+    mock.id = params["id"]
+    mock.column_name = params["column_name"]
+    mock.verbose_name = params["verbose_name"]
+    mock.description = params["description"]
+    mock.expression = params["expression"]
+    mock.filterable = params["filterable"]
+    mock.groupby = params["groupby"]
+    mock.is_dttm = params["is_dttm"]
+    mock.type = params["type"]
+    return mock
+
+
+def get_metric_mock(params: Dict[str, Any]) -> Mock:
+    mock = Mock()
+    mock.id = params["id"]
+    mock.metric_name = params["metric_name"]
+    mock.metric_name = params["verbose_name"]
+    mock.description = params["description"]
+    mock.expression = params["expression"]
+    mock.warning_text = params["warning_text"]
+    mock.d3format = params["d3format"]
+    return mock
+
+
+def get_dataset_mock() -> Mock:
+    mock = Mock()
+    mock.id = None
+    mock.column_formats = {"ratio": ".2%"}
+    mock.database = {"id": 1}
+    mock.description = "Adding a DESCRip"
+    mock.default_endpoint = ""
+    mock.filter_select_enabled = True
+    mock.name = "birth_names"
+    mock.table_name = "birth_names"
+    mock.datasource_name = "birth_names"
+    mock.type = "table"
+    mock.schema = None
+    mock.offset = 66
+    mock.cache_timeout = 55
+    mock.sql = ""
+    mock.columns = [
+        get_column_mock(
+            {
+                "id": 504,
+                "column_name": "ds",
+                "verbose_name": "",
+                "description": None,
+                "expression": "",
+                "filterable": True,
+                "groupby": True,
+                "is_dttm": True,
+                "type": "DATETIME",
+            }
+        ),
+        get_column_mock(
+            {
+                "id": 505,
+                "column_name": "gender",
+                "verbose_name": None,
+                "description": None,
+                "expression": "",
+                "filterable": True,
+                "groupby": True,
+                "is_dttm": False,
+                "type": "VARCHAR(16)",
+            }
+        ),
+        get_column_mock(
+            {
+                "id": 506,
+                "column_name": "name",
+                "verbose_name": None,
+                "description": None,
+                "expression": None,
+                "filterable": True,
+                "groupby": True,
+                "is_dttm": None,
+                "type": "VARCHAR(255)",
+            }
+        ),
+        get_column_mock(
+            {
+                "id": 508,
+                "column_name": "state",
+                "verbose_name": None,
+                "description": None,
+                "expression": None,
+                "filterable": True,
+                "groupby": True,
+                "is_dttm": None,
+                "type": "VARCHAR(10)",
+            }
+        ),
+        get_column_mock(
+            {
+                "id": 509,
+                "column_name": "num_boys",
+                "verbose_name": None,
+                "description": None,
+                "expression": None,
+                "filterable": True,
+                "groupby": True,
+                "is_dttm": None,
+                "type": "BIGINT(20)",
+            }
+        ),
+        get_column_mock(
+            {
+                "id": 510,
+                "column_name": "num_girls",
+                "verbose_name": None,
+                "description": None,
+                "expression": "",
+                "filterable": False,
+                "groupby": False,
+                "is_dttm": False,
+                "type": "BIGINT(20)",
+            }
+        ),
+        get_column_mock(
+            {
+                "id": 532,
+                "column_name": "num",
+                "verbose_name": None,
+                "description": None,
+                "expression": None,
+                "filterable": True,
+                "groupby": True,
+                "is_dttm": None,
+                "type": "BIGINT(20)",
+            }
+        ),
+        get_column_mock(
+            {
+                "id": 522,
+                "column_name": "num_california",
+                "verbose_name": None,
+                "description": None,
+                "expression": "CASE WHEN state = 'CA' THEN num ELSE 0 END",
+                "filterable": False,
+                "groupby": False,
+                "is_dttm": False,
+                "type": "NUMBER",
+            }
+        ),
+    ]
+    mock.metrics = (
+        [
+            get_metric_mock(
+                {
+                    "id": 824,
+                    "metric_name": "sum__num",
+                    "verbose_name": "Babies",
+                    "description": "",
+                    "expression": "SUM(num)",
+                    "warning_text": "",
+                    "d3format": "",
+                }
+            ),
+            get_metric_mock(
+                {
+                    "id": 836,
+                    "metric_name": "count",
+                    "verbose_name": "",
+                    "description": None,
+                    "expression": "count(1)",
+                    "warning_text": None,
+                    "d3format": None,
+                }
+            ),
+            get_metric_mock(
+                {
+                    "id": 843,
+                    "metric_name": "ratio",
+                    "verbose_name": "Ratio Boys/Girls",
+                    "description": "This represents the ratio of boys/girls",
+                    "expression": "sum(num_boys) / sum(num_girls)",
+                    "warning_text": "no warning",
+                    "d3format": ".2%",
+                }
+            ),
+        ],
+    )
+    return mock
diff --git a/tests/unit_tests/memoized_tests.py b/tests/unit_tests/memoized_tests.py
new file mode 100644
index 000000000000..3b3f436606f5
--- /dev/null
+++ b/tests/unit_tests/memoized_tests.py
@@ -0,0 +1,96 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from pytest import mark
+
+from superset.utils.memoized import memoized
+
+
+@mark.unittest
+class TestMemoized:
+    def test_memoized_on_functions(self):
+        watcher = {"val": 0}
+
+        @memoized
+        def test_function(a, b, c):
+            watcher["val"] += 1
+            return a * b * c
+
+        result1 = test_function(1, 2, 3)
+        result2 = test_function(1, 2, 3)
+        assert result1 == result2
+        assert watcher["val"] == 1
+
+    def test_memoized_on_methods(self):
+        class test_class:
+            def __init__(self, num):
+                self.num = num
+                self.watcher = 0
+
+            @memoized
+            def test_method(self, a, b, c):
+                self.watcher += 1
+                return a * b * c * self.num
+
+        instance = test_class(5)
+        result1 = instance.test_method(1, 2, 3)
+        result2 = instance.test_method(1, 2, 3)
+        assert result1 == result2
+        assert instance.watcher == 1
+        instance.num = 10
+        assert result2 == instance.test_method(1, 2, 3)
+
+    def test_memoized_on_methods_with_watches(self):
+        class test_class:
+            def __init__(self, x, y):
+                self.x = x
+                self.y = y
+                self.watcher = 0
+
+            @memoized(watch=("x", "y"))
+            def test_method(self, a, b, c):
+                self.watcher += 1
+                return a * b * c * self.x * self.y
+
+        instance = test_class(3, 12)
+        result1 = instance.test_method(1, 2, 3)
+        result2 = instance.test_method(1, 2, 3)
+        assert result1 == result2
+        assert instance.watcher == 1
+        result3 = instance.test_method(2, 3, 4)
+        assert instance.watcher == 2
+        result4 = instance.test_method(2, 3, 4)
+        assert instance.watcher == 2
+        assert result3 == result4
+        assert result3 != result1
+        instance.x = 1
+        result5 = instance.test_method(2, 3, 4)
+        assert instance.watcher == 3
+        assert result5 != result4
+        result6 = instance.test_method(2, 3, 4)
+        assert instance.watcher == 3
+        assert result6 == result5
+        instance.x = 10
+        instance.y = 10
+        result7 = instance.test_method(2, 3, 4)
+        assert instance.watcher == 4
+        assert result7 != result6
+        instance.x = 3
+        instance.y = 12
+        result8 = instance.test_method(1, 2, 3)
+        assert instance.watcher == 4
+        assert result1 == result8
diff --git a/tests/unit_tests/tasks/test_cron_util.py b/tests/unit_tests/tasks/test_cron_util.py
new file mode 100644
index 000000000000..8a4a511351c8
--- /dev/null
+++ b/tests/unit_tests/tasks/test_cron_util.py
@@ -0,0 +1,177 @@
+# 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.
+# pylint: disable=unused-argument, invalid-name
+
+from datetime import datetime
+from typing import List
+
+import pytest
+import pytz
+from dateutil import parser
+from flask.ctx import AppContext
+from freezegun import freeze_time
+from freezegun.api import FakeDatetime  # type: ignore
+
+from superset.tasks.cron_util import cron_schedule_window
+
+
+@pytest.mark.parametrize(
+    "current_dttm, cron, expected",
+    [
+        ("2020-01-01T08:59:01Z", "0 1 * * *", []),
+        (
+            "2020-01-01T08:59:02Z",
+            "0 1 * * *",
+            [FakeDatetime(2020, 1, 1, 9, 0).strftime("%A, %d %B %Y, %H:%M:%S")],
+        ),
+        (
+            "2020-01-01T08:59:59Z",
+            "0 1 * * *",
+            [FakeDatetime(2020, 1, 1, 9, 0).strftime("%A, %d %B %Y, %H:%M:%S")],
+        ),
+        (
+            "2020-01-01T09:00:00Z",
+            "0 1 * * *",
+            [FakeDatetime(2020, 1, 1, 9, 0).strftime("%A, %d %B %Y, %H:%M:%S")],
+        ),
+        ("2020-01-01T09:00:01Z", "0 1 * * *", []),
+    ],
+)
+def test_cron_schedule_window_los_angeles(
+    app_context: AppContext, current_dttm: str, cron: str, expected: List[FakeDatetime]
+) -> None:
+    """
+    Reports scheduler: Test cron schedule window for "America/Los_Angeles"
+    """
+
+    with freeze_time(current_dttm):
+        datetimes = cron_schedule_window(cron, "America/Los_Angeles")
+        assert (
+            list(cron.strftime("%A, %d %B %Y, %H:%M:%S") for cron in datetimes)
+            == expected
+        )
+
+
+@pytest.mark.parametrize(
+    "current_dttm, cron, expected",
+    [
+        ("2020-01-01T05:59:01Z", "0 1 * * *", []),
+        (
+            "2020-01-01T05:59:02Z",
+            "0 1 * * *",
+            [FakeDatetime(2020, 1, 1, 6, 0).strftime("%A, %d %B %Y, %H:%M:%S")],
+        ),
+        (
+            "2020-01-01T5:59:59Z",
+            "0 1 * * *",
+            [FakeDatetime(2020, 1, 1, 6, 0).strftime("%A, %d %B %Y, %H:%M:%S")],
+        ),
+        (
+            "2020-01-01T6:00:00",
+            "0 1 * * *",
+            [FakeDatetime(2020, 1, 1, 6, 0).strftime("%A, %d %B %Y, %H:%M:%S")],
+        ),
+        ("2020-01-01T6:00:01Z", "0 1 * * *", []),
+    ],
+)
+def test_cron_schedule_window_new_york(
+    app_context: AppContext, current_dttm: str, cron: str, expected: List[FakeDatetime]
+) -> None:
+    """
+    Reports scheduler: Test cron schedule window for "America/New_York"
+    """
+
+    with freeze_time(current_dttm, tz_offset=0):
+        datetimes = cron_schedule_window(cron, "America/New_York")
+        assert (
+            list(cron.strftime("%A, %d %B %Y, %H:%M:%S") for cron in datetimes)
+            == expected
+        )
+
+
+@pytest.mark.parametrize(
+    "current_dttm, cron, expected",
+    [
+        ("2020-01-01T06:59:01Z", "0 1 * * *", []),
+        (
+            "2020-01-01T06:59:02Z",
+            "0 1 * * *",
+            [FakeDatetime(2020, 1, 1, 7, 0).strftime("%A, %d %B %Y, %H:%M:%S")],
+        ),
+        (
+            "2020-01-01T06:59:59Z",
+            "0 1 * * *",
+            [FakeDatetime(2020, 1, 1, 7, 0).strftime("%A, %d %B %Y, %H:%M:%S")],
+        ),
+        (
+            "2020-01-01T07:00:00",
+            "0 1 * * *",
+            [FakeDatetime(2020, 1, 1, 7, 0).strftime("%A, %d %B %Y, %H:%M:%S")],
+        ),
+        ("2020-01-01T07:00:01Z", "0 1 * * *", []),
+    ],
+)
+def test_cron_schedule_window_chicago(
+    app_context: AppContext, current_dttm: str, cron: str, expected: List[FakeDatetime]
+) -> None:
+    """
+    Reports scheduler: Test cron schedule window for "America/Chicago"
+    """
+
+    with freeze_time(current_dttm, tz_offset=0):
+        datetimes = cron_schedule_window(cron, "America/Chicago")
+        assert (
+            list(cron.strftime("%A, %d %B %Y, %H:%M:%S") for cron in datetimes)
+            == expected
+        )
+
+
+@pytest.mark.parametrize(
+    "current_dttm, cron, expected",
+    [
+        ("2020-07-01T05:59:01Z", "0 1 * * *", []),
+        (
+            "2020-07-01T05:59:02Z",
+            "0 1 * * *",
+            [FakeDatetime(2020, 7, 1, 6, 0).strftime("%A, %d %B %Y, %H:%M:%S")],
+        ),
+        (
+            "2020-07-01T05:59:59Z",
+            "0 1 * * *",
+            [FakeDatetime(2020, 7, 1, 6, 0).strftime("%A, %d %B %Y, %H:%M:%S")],
+        ),
+        (
+            "2020-07-01T06:00:00",
+            "0 1 * * *",
+            [FakeDatetime(2020, 7, 1, 6, 0).strftime("%A, %d %B %Y, %H:%M:%S")],
+        ),
+        ("2020-07-01T06:00:01Z", "0 1 * * *", []),
+    ],
+)
+def test_cron_schedule_window_chicago_daylight(
+    app_context: AppContext, current_dttm: str, cron: str, expected: List[FakeDatetime]
+) -> None:
+    """
+    Reports scheduler: Test cron schedule window for "America/Chicago"
+    """
+
+    with freeze_time(current_dttm, tz_offset=0):
+        datetimes = cron_schedule_window(cron, "America/Chicago")
+        assert (
+            list(cron.strftime("%A, %d %B %Y, %H:%M:%S") for cron in datetimes)
+            == expected
+        )
diff --git a/tests/utils/core_tests.py b/tests/utils/core_tests.py
deleted file mode 100644
index 8699dd7ea7f6..000000000000
--- a/tests/utils/core_tests.py
+++ /dev/null
@@ -1,54 +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.
-# pylint: disable=no-self-use
-import pytest
-
-from superset.utils.core import to_adhoc
-
-
-def test_to_adhoc_generates_deterministic_values():
-    input_1 = {
-        "op": "IS NOT NULL",
-        "col": "LATITUDE",
-        "val": "",
-    }
-
-    input_2 = {**input_1, "col": "LONGITUDE"}
-
-    # The result is the same when given the same input
-    assert to_adhoc(input_1) == to_adhoc(input_1)
-    assert to_adhoc(input_1) == {
-        "clause": "WHERE",
-        "expressionType": "SIMPLE",
-        "isExtra": False,
-        "comparator": "",
-        "operator": "IS NOT NULL",
-        "subject": "LATITUDE",
-        "filterOptionName": "d0908f77d950131db7a69fdc820cb739",
-    }
-
-    # The result is different when given different input
-    assert to_adhoc(input_1) != to_adhoc(input_2)
-    assert to_adhoc(input_2) == {
-        "clause": "WHERE",
-        "expressionType": "SIMPLE",
-        "isExtra": False,
-        "comparator": "",
-        "operator": "IS NOT NULL",
-        "subject": "LONGITUDE",
-        "filterOptionName": "c5f283f727d4dfc6258b351d4a8663bc",
-    }
diff --git a/tox.ini b/tox.ini
index 970930b27880..839bce55867e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,7 @@
 #
 
 # Remember to start celery workers to run celery tests, e.g.
-# celery worker --app=superset.tasks.celery_app:app -Ofair -c 2
+# celery --app=superset.tasks.celery_app:app worker -Ofair -c 2
 [testenv]
 basepython = python3.8
 ignore_basepython_conflict = true
@@ -31,7 +31,7 @@ deps =
 setenv =
     PYTHONPATH = {toxinidir}
     SUPERSET_TESTENV = true
-    SUPERSET_CONFIG = tests.superset_test_config
+    SUPERSET_CONFIG = tests.integration_tests.superset_test_config
     SUPERSET_HOME = {envtmpdir}
     mysql: SUPERSET__SQLALCHEMY_DATABASE_URI = mysql://mysqluser:mysqluserpassword@localhost/superset?charset=utf8
     postgres: SUPERSET__SQLALCHEMY_DATABASE_URI = postgresql+psycopg2://superset:superset@localhost/test
@@ -54,7 +54,7 @@ allowlist_externals =
 setenv =
     PYTHONPATH = {toxinidir}
     SUPERSET_TESTENV = true
-    SUPERSET_CONFIG = tests.superset_test_config
+    SUPERSET_CONFIG = tests.integration_tests.superset_test_config
     SUPERSET_HOME = {envtmpdir}
     ENABLE_REACT_CRUD_VIEWS = true
 commands =
@@ -68,7 +68,7 @@ commands_post =
 setenv =
     PYTHONPATH = {toxinidir}
     SUPERSET_TESTENV = true
-    SUPERSET_CONFIG = tests.superset_test_config
+    SUPERSET_CONFIG = tests.integration_tests.superset_test_config
     SUPERSET_HOME = {envtmpdir}
     ENABLE_REACT_CRUD_VIEWS = true
 commands =
@@ -82,7 +82,7 @@ commands_post =
 setenv =
     PYTHONPATH = {toxinidir}
     SUPERSET_TESTENV = true
-    SUPERSET_CONFIG = tests.superset_test_config
+    SUPERSET_CONFIG = tests.integration_tests.superset_test_config
     SUPERSET_HOME = {envtmpdir}
     ENABLE_REACT_CRUD_VIEWS = true
 commands =
@@ -96,7 +96,7 @@ commands_post =
 setenv =
     PYTHONPATH = {toxinidir}
     SUPERSET_TESTENV = true
-    SUPERSET_CONFIG = tests.superset_test_config
+    SUPERSET_CONFIG = tests.integration_tests.superset_test_config
     SUPERSET_HOME = {envtmpdir}
     ENABLE_REACT_CRUD_VIEWS = true
 commands =
@@ -110,7 +110,7 @@ commands_post =
 setenv =
     PYTHONPATH = {toxinidir}
     SUPERSET_TESTENV = true
-    SUPERSET_CONFIG = tests.superset_test_config
+    SUPERSET_CONFIG = tests.integration_tests.superset_test_config
     SUPERSET_HOME = {envtmpdir}
     ENABLE_REACT_CRUD_VIEWS = true
 commands =
@@ -161,7 +161,7 @@ deps =
 
 [testenv:thumbnails]
 setenv =
-    SUPERSET_CONFIG = tests.superset_test_config_thumbnails
+    SUPERSET_CONFIG = tests.integration_tests.superset_test_config_thumbnails
 deps =
     -rrequirements/testing.txt