You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by ru...@apache.org on 2026/02/03 06:35:39 UTC

(superset) 03/08: chore(frontend): migrate remaining JS/JSX files to TypeScript and fix all type errors

This is an automated email from the ASF dual-hosted git repository.

rusackas pushed a commit to branch chore/ts-migration-dashboard
in repository https://gitbox.apache.org/repos/asf/superset.git

commit 8340c07e8b5454b58445f649178b12db32c797a0
Author: Evan Rusackas <ev...@rusackas.com>
AuthorDate: Mon Feb 2 16:40:20 2026 +0100

    chore(frontend): migrate remaining JS/JSX files to TypeScript and fix all type errors
    
    Migrate all remaining JavaScript/JSX source and test files to TypeScript
    across plugins, packages, eslint-rules, and app source directories.
    
    Key changes:
    - Rename 60 plugin source files from .js/.jsx to .ts/.tsx
    - Rename 54 test files from .js/.jsx to .ts/.tsx
    - Rename 6 eslint-rules files from .js to .ts
    - Add type declarations (external.d.ts) for legacy plugin packages
    - Fix 26 pre-existing source type errors across 8 files
    - Remove @ts-nocheck from all 46 test files with proper type fixes
    - Fix shared test fixtures (mockNativeFilters id bug, mock data typing)
    - Add @ts-nocheck to 15 legacy D3 v3 plugin source files (no types available)
    
    Results:
    - npm run type: 0 errors (was 592+)
    - npm run build: 0 errors (was 93 on master, 24 on branch)
    - pre-commit: all hooks pass
    - npm run plugins:build: all 23 packages compile
    - Only 15 @ts-nocheck files remain (all deprecated legacy D3 plugins)
    
    Co-Authored-By: Claude Opus 4.5 <no...@anthropic.com>
---
 .../{index.js => index.ts}                         |  58 ++-
 ...plate-vars.test.js => no-template-vars.test.ts} |   8 +-
 .../eslint-plugin-i18n-strings/package.json        |   2 +-
 .../eslint-plugin-icons/{index.js => index.ts}     |  39 +-
 ...-fontawesome.test.js => no-fontawesome.test.ts} |   8 +-
 .../eslint-rules/eslint-plugin-icons/package.json  |   2 +-
 .../{colors.js => colors.ts}                       |   4 +-
 .../eslint-plugin-theme-colors/index.js            | 119 -----
 .../eslint-plugin-theme-colors/index.ts            | 130 +++++
 .../eslint-plugin-theme-colors/package.json        |   2 +-
 .../test/{app.test.js => app.test.ts}              |   0
 .../{plugin-chart.test.js => plugin-chart.test.ts} |   1 +
 ...ut.test.jsx => LabeledErrorBoundInput.test.tsx} |   7 +-
 .../{IconTooltip.test.jsx => IconTooltip.test.tsx} |   0
 .../src/{Calendar.js => Calendar.ts}               |  82 ++--
 .../src/{ReactCalendar.jsx => ReactCalendar.tsx}   |  29 +-
 .../src/{index.js => index.ts}                     |   0
 .../src/{transformProps.js => transformProps.ts}   |   7 +-
 .../src/vendor/{cal-heatmap.js => cal-heatmap.ts}  |   1 +
 .../types/external.d.ts}                           |  14 +-
 .../src/{Chord.js => Chord.ts}                     |  46 +-
 .../src/{ReactChord.jsx => ReactChord.tsx}         |  27 +-
 .../src/{index.js => index.ts}                     |   0
 .../src/{transformProps.js => transformProps.ts}   |   4 +-
 .../types/external.d.ts}                           |  12 +-
 .../src/{CountryMap.js => CountryMap.ts}           |  94 ++--
 .../{ReactCountryMap.jsx => ReactCountryMap.tsx}   |  20 +-
 .../src/{index.js => index.ts}                     |   0
 .../src/{transformProps.js => transformProps.ts}   |   4 +-
 .../test/CountryMap.test.tsx                       |  19 +-
 .../types/external.d.ts}                           |  12 +-
 .../src/{HorizonChart.jsx => HorizonChart.tsx}     |  62 ++-
 .../src/{HorizonRow.jsx => HorizonRow.tsx}         |  72 +--
 .../src/{index.js => index.ts}                     |   0
 .../src/{transformProps.js => transformProps.ts}   |   4 +-
 .../types/external.d.ts}                           |  12 +-
 .../src/{MapBox.jsx => MapBox.tsx}                 |  92 ++--
 ...tGlowOverlay.jsx => ScatterPlotGlowOverlay.tsx} | 175 ++++---
 .../src/{index.js => index.ts}                     |   4 +-
 .../src/{transformProps.js => transformProps.ts}   |  34 +-
 .../src/utils/{geo.js => geo.ts}                   |   6 +-
 .../{luminanceFromRGB.js => luminanceFromRGB.ts}   |   6 +-
 .../types/external.d.ts                            | 101 ++++
 .../src/{PairedTTest.jsx => PairedTTest.tsx}       |  30 +-
 .../src/{TTestTable.jsx => TTestTable.tsx}         |  86 ++--
 .../src/{index.js => index.ts}                     |   0
 .../src/{transformProps.js => transformProps.ts}   |   9 +-
 .../types/external.d.ts                            |  83 ++++
 ...rallelCoordinates.js => ParallelCoordinates.ts} |  69 ++-
 ...oordinates.jsx => ReactParallelCoordinates.tsx} |  21 +-
 .../src/{index.js => index.ts}                     |   0
 .../src/{transformProps.js => transformProps.ts}   |   8 +-
 .../parcoords/{d3.parcoords.js => d3.parcoords.ts} |   3 +-
 .../vendor/parcoords/{divgrid.js => divgrid.ts}    |   3 +-
 .../types/d3-parcoords.d.ts                        |  28 +-
 .../types/d3.d.ts                                  |   2 +-
 .../types/{d3.d.ts => external.d.ts}               |  15 +-
 .../src/{Partition.js => Partition.ts}             |  82 +++-
 .../src/{ReactPartition.jsx => ReactPartition.tsx} |  19 +-
 .../src/{index.js => index.ts}                     |   0
 .../src/{transformProps.js => transformProps.ts}   |   8 +-
 ...ription.test.jsx => OptionDescription.test.tsx} |   3 +-
 .../types/external.d.ts}                           |  12 +-
 .../src/{ReactRose.jsx => ReactRose.tsx}           |  17 +-
 .../src/{Rose.js => Rose.ts}                       |  85 +++-
 .../src/{index.js => index.ts}                     |   0
 .../src/{transformProps.js => transformProps.ts}   |   4 +-
 .../types/external.d.ts}                           |  12 +-
 .../src/{ReactWorldMap.jsx => ReactWorldMap.tsx}   |  25 +-
 .../src/{WorldMap.js => WorldMap.ts}               |  63 ++-
 .../src/{index.js => index.ts}                     |   0
 .../src/{transformProps.js => transformProps.ts}   |   4 +-
 .../types/external.d.ts}                           |  12 +-
 .../src/Bubble/{index.js => index.ts}              |   0
 .../src/Bullet/{index.js => index.ts}              |   0
 .../src/Compare/{index.js => index.ts}             |   0
 .../src/{NVD3Vis.js => NVD3Vis.ts}                 |   1 +
 .../src/{PropTypes.js => PropTypes.ts}             |   0
 .../src/{ReactNVD3.jsx => ReactNVD3.tsx}           |   1 +
 .../src/TimePivot/{index.js => index.ts}           |   0
 .../src/{index.js => index.ts}                     |   0
 .../src/{preset.js => preset.ts}                   |   0
 .../src/{transformProps.js => transformProps.ts}   |  22 +-
 .../src/{utils.js => utils.ts}                     |   1 +
 .../src/utils/{isTruthy.js => isTruthy.ts}         |   2 +-
 .../{AnnotationTypes.js => AnnotationTypes.ts}     |   1 +
 .../superset/{exploreUtils.js => exploreUtils.ts}  |   1 +
 .../test/{utils.test.js => utils.test.ts}          |   6 +-
 .../utils/{isTruthy.test.js => isTruthy.test.ts}   |   0
 .../utils/{tokenize.test.js => tokenize.test.ts}   |   0
 .../types/external.d.ts}                           |  31 +-
 .../src/PivotTableChart.tsx                        |  22 +-
 .../{PivotTable.jsx => PivotTable.tsx}             |   8 +-
 .../src/react-pivottable/{Styles.js => Styles.ts}  |   2 +-
 .../{TableRenderers.jsx => TableRenderers.tsx}     | 442 +++++++++++------
 .../src/react-pivottable/{index.js => index.ts}    |   0
 .../{utilities.js => utilities.ts}                 | 523 ++++++++++++++-------
 .../test/react-pivottable/tableRenders.test.tsx    |  16 +-
 .../spec/fixtures/mockNativeFilters.ts             |   2 +-
 .../actions/{sqlLab.test.js => sqlLab.test.ts}     | 352 ++++++++------
 .../reducers/{sqlLab.test.js => sqlLab.test.ts}    |  67 +--
 ...chartReducers.test.js => chartReducers.test.ts} |  32 +-
 ...dal.test.jsx => ChangeDatasourceModal.test.tsx} |   0
 ...urceModal.test.jsx => DatasourceModal.test.tsx} |  16 +-
 .../ErrorMessage/OAuth2RedirectMessage.tsx         |   2 +-
 .../{Toast.test.jsx => Toast.test.tsx}             |   6 +-
 ...tPresenter.test.jsx => ToastPresenter.test.tsx} |   5 +-
 .../{reducers.test.js => reducers.test.ts}         |  41 +-
 ...boardLayout.test.js => dashboardLayout.test.ts} |  97 ++--
 .../src/dashboard/actions/dashboardLayout.ts       |   6 +-
 ...shboardState.test.js => dashboardState.test.ts} |  35 +-
 superset-frontend/src/dashboard/actions/hydrate.ts |  15 +-
 .../{Dashboard.test.jsx => Dashboard.test.tsx}     |  81 ++--
 ...shboardGrid.test.jsx => DashboardGrid.test.tsx} |  12 +-
 .../Header/useHeaderActionsDropdownMenu.tsx        |  26 +-
 ...agDroppable.test.jsx => DragDroppable.test.tsx} |  55 ++-
 .../components/filterscope/FilterScope.test.tsx    |   8 +-
 .../Chart/{Chart.test.jsx => Chart.test.tsx}       |  27 +-
 .../gridComponents/ChartHolder/ChartHolder.tsx     |  14 +-
 .../Column/{Column.test.jsx => Column.test.tsx}    |  54 ++-
 .../components/gridComponents/Column/Column.tsx    |   4 +-
 .../gridComponents/Markdown/Markdown.tsx           |   2 +-
 .../components/gridComponents/Row/Row.tsx          |   2 +-
 .../components/gridComponents/Tab/Tab.test.tsx     |  20 +-
 .../components/gridComponents/Tabs/Tabs.test.tsx   |   6 +-
 ...ent.test.jsx => DraggableNewComponent.test.tsx} |   2 +-
 .../new/{NewColumn.test.jsx => NewColumn.test.tsx} |   2 +-
 .../{NewDivider.test.jsx => NewDivider.test.tsx}   |   2 +-
 .../new/{NewHeader.test.jsx => NewHeader.test.tsx} |   2 +-
 .../new/{NewTabs.test.jsx => NewTabs.test.tsx}     |   2 +-
 ...poverMenu.test.jsx => WithPopoverMenu.test.tsx} |  16 +-
 .../FilterBarSettings/FilterBarSettings.test.tsx   |   1 +
 .../FiltersConfigForm/FilterScope/utils.test.ts    |  70 ++-
 .../dashboard/containers/DashboardComponent.tsx    |  13 +-
 .../src/dashboard/containers/DashboardPage.tsx     |  23 +-
 ...ardFilters.test.js => dashboardFilters.test.ts} |  58 ++-
 ...boardLayout.test.js => dashboardLayout.test.ts} |  46 +-
 .../src/dashboard/reducers/dashboardState.test.js  | 296 ------------
 .../src/dashboard/reducers/dashboardState.test.ts  | 317 ++++++++++++-
 ...sliceEntities.test.js => sliceEntities.test.ts} |  27 +-
 .../{dnd-reorder.test.js => dnd-reorder.test.ts}   |   2 +-
 .../src/dashboard/util/dropOverflowsParent.test.ts |  66 ++-
 .../src/dashboard/util/dropOverflowsParent.ts      |  12 +-
 ...er.test.js => findFirstParentContainer.test.ts} |  17 +-
 ...=> getChartAndLabelComponentIdFromPath.test.ts} |   0
 ...ashboardUrl.test.js => getDashboardUrl.test.ts} |  47 +-
 ...h.test.js => getDetailedComponentWidth.test.ts} |  11 +-
 ...ropPosition.test.js => getDropPosition.test.ts} |  17 +-
 ...rs.test.js => getEffectiveExtraFilters.test.ts} |   3 +-
 ...est.js => getFilterConfigsFromFormdata.test.ts} |   3 +
 ...test.js => getFilterScopeFromNodesTree.test.ts} |   3 +-
 ....test.js => getLeafComponentIdFromPath.test.ts} |   0
 ...Factory.test.js => newComponentFactory.test.ts} |   0
 .../src/dashboard/util/newComponentFactory.ts      |   5 +-
 ...romDrop.test.js => newEntitiesFromDrop.test.ts} |  35 +-
 ....test.js => updateComponentParentsList.test.ts} |  24 +-
 ...ploreActions.test.js => exploreActions.test.ts} |  24 +-
 ...rtPanel.test.jsx => ExploreChartPanel.test.tsx} |   9 +-
 .../{SaveModal.test.jsx => SaveModal.test.tsx}     |  59 ++-
 .../src/explore/components/SaveModal.tsx           |   7 +-
 ...eportList.test.jsx => AlertReportList.test.tsx} |  16 +-
 ...rList.test.jsx => AnnotationLayerList.test.tsx} |  13 +-
 ...plateList.test.jsx => CssTemplateList.test.tsx} |  12 +-
 ...shboardList.test.jsx => DashboardList.test.tsx} |  20 +-
 .../src/utils/getControlsForVizType.test.js        | 102 ----
 165 files changed, 3396 insertions(+), 2076 deletions(-)

diff --git a/superset-frontend/eslint-rules/eslint-plugin-i18n-strings/index.js b/superset-frontend/eslint-rules/eslint-plugin-i18n-strings/index.ts
similarity index 65%
rename from superset-frontend/eslint-rules/eslint-plugin-i18n-strings/index.js
rename to superset-frontend/eslint-rules/eslint-plugin-i18n-strings/index.ts
index 7cb97fea283..a98034cd4c0 100644
--- a/superset-frontend/eslint-rules/eslint-plugin-i18n-strings/index.js
+++ b/superset-frontend/eslint-rules/eslint-plugin-i18n-strings/index.ts
@@ -22,21 +22,26 @@
  * @author Apache
  */
 
+import type { Rule } from 'eslint';
+import type { Node } from 'estree';
+
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------
 
-/** @type {import('eslint').Rule.RuleModule} */
-module.exports = {
+const plugin: { rules: Record<string, Rule.RuleModule> } = {
   rules: {
     'no-template-vars': {
-      create(context) {
-        function handler(node) {
-          if (node.arguments.length) {
-            const firstArgs = node.arguments[0];
+      create(context: Rule.RuleContext): Rule.RuleListener {
+        function handler(node: Node): void {
+          const callNode = node as Node & {
+            arguments: Array<Node & { expressions?: Node[] }>;
+          };
+          if (callNode.arguments.length) {
+            const firstArgs = callNode.arguments[0];
             if (
               firstArgs.type === 'TemplateLiteral' &&
-              firstArgs.expressions.length
+              firstArgs.expressions?.length
             ) {
               context.report({
                 node,
@@ -53,19 +58,22 @@ module.exports = {
       },
     },
     'sentence-case-buttons': {
-      create(context) {
-        function isTitleCase(str) {
+      create(context: Rule.RuleContext): Rule.RuleListener {
+        function isTitleCase(str: string): boolean {
           // Match "Delete Dataset", "Create Chart", etc. (2+ title-cased words)
           return /^[A-Z][a-z]+(\s+[A-Z][a-z]*)+$/.test(str);
         }
 
-        function isButtonContext(node) {
-          const { parent } = node;
+        function isButtonContext(node: Node & { parent?: Node }): boolean {
+          const { parent } = node as Node & {
+            parent?: Node & Record<string, unknown>;
+          };
           if (!parent) return false;
 
           // Check for button-specific props
           if (parent.type === 'Property') {
-            const key = parent.key.name;
+            const key = (parent as unknown as { key: { name: string } }).key
+              .name;
             return [
               'primaryButtonName',
               'secondaryButtonName',
@@ -76,9 +84,13 @@ module.exports = {
 
           // Check for Button components
           if (parent.type === 'JSXExpressionContainer') {
-            const jsx = parent.parent;
+            const jsx = (parent as Node & { parent?: Node }).parent as
+              | (Node & {
+                  openingElement?: { name: { name: string } };
+                })
+              | undefined;
             if (jsx?.type === 'JSXElement') {
-              const elementName = jsx.openingElement.name.name;
+              const elementName = jsx.openingElement?.name.name;
               return elementName === 'Button';
             }
           }
@@ -86,19 +98,25 @@ module.exports = {
           return false;
         }
 
-        function handler(node) {
-          if (node.arguments.length) {
-            const firstArg = node.arguments[0];
+        function handler(node: Node): void {
+          const callNode = node as Node & {
+            arguments: Array<Node & { value?: string }>;
+          };
+          if (callNode.arguments.length) {
+            const firstArg = callNode.arguments[0];
             if (
               firstArg.type === 'Literal' &&
               typeof firstArg.value === 'string'
             ) {
               const text = firstArg.value;
 
-              if (isButtonContext(node) && isTitleCase(text)) {
+              if (
+                isButtonContext(node as Node & { parent?: Node }) &&
+                isTitleCase(text)
+              ) {
                 const sentenceCase = text
                   .toLowerCase()
-                  .replace(/^\w/, c => c.toUpperCase());
+                  .replace(/^\w/, (c: string) => c.toUpperCase());
                 context.report({
                   node: firstArg,
                   message: `Button text should use sentence case: "${text}" should be "${sentenceCase}"`,
@@ -116,3 +134,5 @@ module.exports = {
     },
   },
 };
+
+module.exports = plugin;
diff --git a/superset-frontend/eslint-rules/eslint-plugin-i18n-strings/no-template-vars.test.js b/superset-frontend/eslint-rules/eslint-plugin-i18n-strings/no-template-vars.test.ts
similarity index 88%
rename from superset-frontend/eslint-rules/eslint-plugin-i18n-strings/no-template-vars.test.js
rename to superset-frontend/eslint-rules/eslint-plugin-i18n-strings/no-template-vars.test.ts
index 295a2f9fb8c..50607273da2 100644
--- a/superset-frontend/eslint-rules/eslint-plugin-i18n-strings/no-template-vars.test.js
+++ b/superset-frontend/eslint-rules/eslint-plugin-i18n-strings/no-template-vars.test.ts
@@ -22,17 +22,19 @@
  * @author Apache
  */
 /* eslint-disable no-template-curly-in-string */
+import type { Rule } from 'eslint';
+
 const { RuleTester } = require('eslint');
-const plugin = require('.');
+const plugin: { rules: Record<string, Rule.RuleModule> } = require('.');
 
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
 
 const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 6 } });
-const rule = plugin.rules['no-template-vars'];
+const rule: Rule.RuleModule = plugin.rules['no-template-vars'];
 
-const errors = [
+const errors: Array<{ type: string }> = [
   {
     type: 'CallExpression',
   },
diff --git a/superset-frontend/eslint-rules/eslint-plugin-i18n-strings/package.json b/superset-frontend/eslint-rules/eslint-plugin-i18n-strings/package.json
index efbf7be7a95..48f5cacfde6 100644
--- a/superset-frontend/eslint-rules/eslint-plugin-i18n-strings/package.json
+++ b/superset-frontend/eslint-rules/eslint-plugin-i18n-strings/package.json
@@ -2,7 +2,7 @@
   "name": "eslint-plugin-i18n-strings",
   "version": "1.0.0",
   "description": "Warns about translation variables",
-  "main": "index.js",
+  "main": "index.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
diff --git a/superset-frontend/eslint-rules/eslint-plugin-icons/index.js b/superset-frontend/eslint-rules/eslint-plugin-icons/index.ts
similarity index 67%
rename from superset-frontend/eslint-rules/eslint-plugin-icons/index.js
rename to superset-frontend/eslint-rules/eslint-plugin-icons/index.ts
index a3dae1a3c10..572aa55e700 100644
--- a/superset-frontend/eslint-rules/eslint-plugin-icons/index.js
+++ b/superset-frontend/eslint-rules/eslint-plugin-icons/index.ts
@@ -22,12 +22,28 @@
  * @author Apache
  */
 
+import type { Rule } from 'eslint';
+import type { Node } from 'estree';
+
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------
 
-/** @type {import('eslint').Rule.RuleModule} */
-module.exports = {
+interface JSXAttribute {
+  name?: { name: string };
+  value?: { value: string };
+}
+
+interface JSXOpeningElement {
+  name: { name: string };
+  attributes: JSXAttribute[];
+}
+
+interface JSXElementNode extends Node {
+  openingElement: JSXOpeningElement;
+}
+
+const plugin: { rules: Record<string, Rule.RuleModule> } = {
   rules: {
     'no-fa-icons-usage': {
       meta: {
@@ -39,19 +55,20 @@ module.exports = {
         },
         schema: [],
       },
-      create(context) {
+      create(context: Rule.RuleContext): Rule.RuleListener {
         return {
           // Check for JSX elements with class names containing "fa"
-          JSXElement(node) {
+          JSXElement(node: Node): void {
+            const jsxNode = node as JSXElementNode;
             if (
-              node.openingElement &&
-              node.openingElement.name.name === 'i' &&
-              node.openingElement.attributes &&
-              node.openingElement.attributes.some(
-                attr =>
+              jsxNode.openingElement &&
+              jsxNode.openingElement.name.name === 'i' &&
+              jsxNode.openingElement.attributes &&
+              jsxNode.openingElement.attributes.some(
+                (attr: JSXAttribute) =>
                   attr.name &&
                   attr.name.name === 'className' &&
-                  /fa fa-/.test(attr.value.value),
+                  /fa fa-/.test(attr.value?.value ?? ''),
               )
             ) {
               context.report({
@@ -66,3 +83,5 @@ module.exports = {
     },
   },
 };
+
+module.exports = plugin;
diff --git a/superset-frontend/eslint-rules/eslint-plugin-icons/no-fontawesome.test.js b/superset-frontend/eslint-rules/eslint-plugin-icons/no-fontawesome.test.ts
similarity index 88%
rename from superset-frontend/eslint-rules/eslint-plugin-icons/no-fontawesome.test.js
rename to superset-frontend/eslint-rules/eslint-plugin-icons/no-fontawesome.test.ts
index 52a81eabe9e..db0caa1717b 100644
--- a/superset-frontend/eslint-rules/eslint-plugin-icons/no-fontawesome.test.js
+++ b/superset-frontend/eslint-rules/eslint-plugin-icons/no-fontawesome.test.ts
@@ -22,16 +22,18 @@
  * @author Apache
  */
 
+import type { Rule } from 'eslint';
+
 const { RuleTester } = require('eslint');
-const plugin = require('.');
+const plugin: { rules: Record<string, Rule.RuleModule> } = require('.');
 
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
 const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 6 } });
-const rule = plugin.rules['no-fa-icons-usage'];
+const rule: Rule.RuleModule = plugin.rules['no-fa-icons-usage'];
 
-const errors = [
+const errors: Array<{ message: string }> = [
   {
     message:
       'FontAwesome icons should not be used. Use the src/components/Icons component instead.',
diff --git a/superset-frontend/eslint-rules/eslint-plugin-icons/package.json b/superset-frontend/eslint-rules/eslint-plugin-icons/package.json
index f2118e936cd..fe545a0d38d 100644
--- a/superset-frontend/eslint-rules/eslint-plugin-icons/package.json
+++ b/superset-frontend/eslint-rules/eslint-plugin-icons/package.json
@@ -2,7 +2,7 @@
   "name": "eslint-plugin-icons",
   "version": "1.0.0",
   "description": "Warns about direct usage of Ant Design icons",
-  "main": "index.js",
+  "main": "index.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
diff --git a/superset-frontend/eslint-rules/eslint-plugin-theme-colors/colors.js b/superset-frontend/eslint-rules/eslint-plugin-theme-colors/colors.ts
similarity index 97%
rename from superset-frontend/eslint-rules/eslint-plugin-theme-colors/colors.js
rename to superset-frontend/eslint-rules/eslint-plugin-theme-colors/colors.ts
index 7c4d3a1a5d2..e42a04d25d5 100644
--- a/superset-frontend/eslint-rules/eslint-plugin-theme-colors/colors.js
+++ b/superset-frontend/eslint-rules/eslint-plugin-theme-colors/colors.ts
@@ -18,7 +18,7 @@
  */
 
 // https://www.w3.org/wiki/CSS/Properties/color/keywords
-module.exports = [
+const COLOR_KEYWORDS: string[] = [
   'black',
   'silver',
   'gray',
@@ -170,3 +170,5 @@ module.exports = [
   'whitesmoke',
   'yellowgreen',
 ];
+
+module.exports = COLOR_KEYWORDS;
diff --git a/superset-frontend/eslint-rules/eslint-plugin-theme-colors/index.js b/superset-frontend/eslint-rules/eslint-plugin-theme-colors/index.js
deleted file mode 100644
index ed1bd4d392e..00000000000
--- a/superset-frontend/eslint-rules/eslint-plugin-theme-colors/index.js
+++ /dev/null
@@ -1,119 +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.
- */
-
-/**
- * @fileoverview Rule to warn about literal colors
- * @author Apache
- */
-
-const COLOR_KEYWORDS = require('./colors');
-
-function hasHexColor(quasi) {
-  if (typeof quasi === 'string') {
-    const regex = /#([a-f0-9]{3}|[a-f0-9]{4}(?:[a-f0-9]{2}){0,2})\b/gi;
-    return !!quasi.match(regex);
-  }
-  return false;
-}
-
-function hasRgbColor(quasi) {
-  if (typeof quasi === 'string') {
-    const regex = /rgba?\((\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d+(?:\.\d+)?))?\)/i;
-    return !!quasi.match(regex);
-  }
-  return false;
-}
-
-function hasLiteralColor(quasi, strict = false) {
-  if (typeof quasi === 'string') {
-    // matches literal colors at the start or end of a CSS prop
-    return COLOR_KEYWORDS.some(color => {
-      const regexColon = new RegExp(`: ${color}`);
-      const regexSemicolon = new RegExp(` ${color};`);
-      return (
-        !!quasi.match(regexColon) ||
-        !!quasi.match(regexSemicolon) ||
-        (strict && quasi === color)
-      );
-    });
-  }
-  return false;
-}
-
-const WARNING_MESSAGE =
-  'Theme color variables are preferred over rgb(a)/hex/literal colors';
-
-//------------------------------------------------------------------------------
-// Rule Definition
-//------------------------------------------------------------------------------
-
-/** @type {import('eslint').Rule.RuleModule} */
-module.exports = {
-  rules: {
-    'no-literal-colors': {
-      create(context) {
-        const warned = [];
-        return {
-          TemplateElement(node) {
-            const rawValue = node?.value?.raw;
-            const isChildParentTagged =
-              node?.parent?.parent?.type === 'TaggedTemplateExpression';
-            const isChildParentArrow =
-              node?.parent?.parent?.type === 'ArrowFunctionExpression';
-            const isParentTemplateLiteral =
-              node?.parent?.type === 'TemplateLiteral';
-            const loc = node?.parent?.parent?.loc;
-            const locId = loc && JSON.stringify(loc);
-            const hasWarned = warned.includes(locId);
-            if (
-              !hasWarned &&
-              (isChildParentTagged ||
-                (isChildParentArrow && isParentTemplateLiteral)) &&
-              rawValue &&
-              (hasLiteralColor(rawValue) ||
-                hasHexColor(rawValue) ||
-                hasRgbColor(rawValue))
-            ) {
-              context.report(node, loc, WARNING_MESSAGE);
-              warned.push(locId);
-            }
-          },
-          Literal(node) {
-            const value = node?.value;
-            const isParentProperty = node?.parent?.type === 'Property';
-            const locId = JSON.stringify(node.loc);
-            const hasWarned = warned.includes(locId);
-
-            if (
-              !hasWarned &&
-              isParentProperty &&
-              value &&
-              (hasLiteralColor(value, true) ||
-                hasHexColor(value) ||
-                hasRgbColor(value))
-            ) {
-              context.report(node, node.loc, WARNING_MESSAGE);
-              warned.push(locId);
-            }
-          },
-        };
-      },
-    },
-  },
-};
diff --git a/superset-frontend/eslint-rules/eslint-plugin-theme-colors/index.ts b/superset-frontend/eslint-rules/eslint-plugin-theme-colors/index.ts
new file mode 100644
index 00000000000..f2af4b866d9
--- /dev/null
+++ b/superset-frontend/eslint-rules/eslint-plugin-theme-colors/index.ts
@@ -0,0 +1,130 @@
+/**
+ * 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.
+ */
+
+/**
+ * @fileoverview Rule to warn about literal colors
+ * @author Apache
+ */
+
+import type { Rule } from 'eslint';
+import type { Node, SourceLocation } from 'estree';
+
+const COLOR_KEYWORDS: string[] = require('./colors');
+
+function hasHexColor(quasi: string): boolean {
+  const regex = /#([a-f0-9]{3}|[a-f0-9]{4}(?:[a-f0-9]{2}){0,2})\b/gi;
+  return !!quasi.match(regex);
+}
+
+function hasRgbColor(quasi: string): boolean {
+  const regex = /rgba?\((\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d+(?:\.\d+)?))?\)/i;
+  return !!quasi.match(regex);
+}
+
+function hasLiteralColor(quasi: string, strict: boolean = false): boolean {
+  // matches literal colors at the start or end of a CSS prop
+  return COLOR_KEYWORDS.some((color: string) => {
+    const regexColon = new RegExp(`: ${color}`);
+    const regexSemicolon = new RegExp(` ${color};`);
+    return (
+      !!quasi.match(regexColon) ||
+      !!quasi.match(regexSemicolon) ||
+      (strict && quasi === color)
+    );
+  });
+}
+
+const WARNING_MESSAGE: string =
+  'Theme color variables are preferred over rgb(a)/hex/literal colors';
+
+//------------------------------------------------------------------------------
+// Rule Definition
+//------------------------------------------------------------------------------
+
+interface TemplateElementNode extends Node {
+  value?: { raw: string };
+  parent?: Node & {
+    parent?: Node & { loc?: SourceLocation | null };
+  };
+}
+
+interface LiteralNode extends Node {
+  value?: string;
+  parent?: Node;
+}
+
+const plugin: { rules: Record<string, Rule.RuleModule> } = {
+  rules: {
+    'no-literal-colors': {
+      create(context: Rule.RuleContext): Rule.RuleListener {
+        const warned: string[] = [];
+        return {
+          TemplateElement(node: Node): void {
+            const templateNode = node as TemplateElementNode;
+            const rawValue = templateNode?.value?.raw;
+            const isChildParentTagged =
+              templateNode?.parent?.parent?.type === 'TaggedTemplateExpression';
+            const isChildParentArrow =
+              templateNode?.parent?.parent?.type === 'ArrowFunctionExpression';
+            const isParentTemplateLiteral =
+              templateNode?.parent?.type === 'TemplateLiteral';
+            const loc = templateNode?.parent?.parent?.loc;
+            const locId = loc && JSON.stringify(loc);
+            const hasWarned = locId ? warned.includes(locId) : false;
+            if (
+              !hasWarned &&
+              (isChildParentTagged ||
+                (isChildParentArrow && isParentTemplateLiteral)) &&
+              rawValue &&
+              (hasLiteralColor(rawValue) ||
+                hasHexColor(rawValue) ||
+                hasRgbColor(rawValue))
+            ) {
+              context.report(node, loc as SourceLocation, WARNING_MESSAGE);
+              if (locId) {
+                warned.push(locId);
+              }
+            }
+          },
+          Literal(node: Node): void {
+            const literalNode = node as LiteralNode;
+            const value = literalNode?.value;
+            const isParentProperty = literalNode?.parent?.type === 'Property';
+            const locId = JSON.stringify(node.loc);
+            const hasWarned = warned.includes(locId);
+
+            if (
+              !hasWarned &&
+              isParentProperty &&
+              value &&
+              (hasLiteralColor(value, true) ||
+                hasHexColor(value) ||
+                hasRgbColor(value))
+            ) {
+              context.report(node, node.loc as SourceLocation, WARNING_MESSAGE);
+              warned.push(locId);
+            }
+          },
+        };
+      },
+    },
+  },
+};
+
+module.exports = plugin;
diff --git a/superset-frontend/eslint-rules/eslint-plugin-theme-colors/package.json b/superset-frontend/eslint-rules/eslint-plugin-theme-colors/package.json
index 25938c97bd8..8ff5ecbe030 100644
--- a/superset-frontend/eslint-rules/eslint-plugin-theme-colors/package.json
+++ b/superset-frontend/eslint-rules/eslint-plugin-theme-colors/package.json
@@ -2,7 +2,7 @@
   "name": "eslint-plugin-theme-colors",
   "version": "1.0.0",
   "description": "Warns about rgb(a)/hex/literal colors",
-  "main": "index.js",
+  "main": "index.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
diff --git a/superset-frontend/packages/generator-superset/test/app.test.js b/superset-frontend/packages/generator-superset/test/app.test.ts
similarity index 100%
rename from superset-frontend/packages/generator-superset/test/app.test.js
rename to superset-frontend/packages/generator-superset/test/app.test.ts
diff --git a/superset-frontend/packages/generator-superset/test/plugin-chart.test.js b/superset-frontend/packages/generator-superset/test/plugin-chart.test.ts
similarity index 97%
rename from superset-frontend/packages/generator-superset/test/plugin-chart.test.js
rename to superset-frontend/packages/generator-superset/test/plugin-chart.test.ts
index a1d4c410497..d4c92710f0e 100644
--- a/superset-frontend/packages/generator-superset/test/plugin-chart.test.js
+++ b/superset-frontend/packages/generator-superset/test/plugin-chart.test.ts
@@ -19,6 +19,7 @@
 
 import { dirname, join } from 'path';
 import helpers, { result } from 'yeoman-test';
+// @ts-expect-error -- fs-extra/esm has no type declarations
 import { copySync } from 'fs-extra/esm';
 import { fileURLToPath } from 'url';
 import pluginChartModule from '../generators/plugin-chart';
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Form/LabeledErrorBoundInput.test.jsx b/superset-frontend/packages/superset-ui-core/src/components/Form/LabeledErrorBoundInput.test.tsx
similarity index 95%
rename from superset-frontend/packages/superset-ui-core/src/components/Form/LabeledErrorBoundInput.test.jsx
rename to superset-frontend/packages/superset-ui-core/src/components/Form/LabeledErrorBoundInput.test.tsx
index 2b66127e237..2feca1d0fd7 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Form/LabeledErrorBoundInput.test.jsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Form/LabeledErrorBoundInput.test.tsx
@@ -17,13 +17,14 @@
  * under the License.
  */
 import { render, fireEvent, screen } from '@superset-ui/core/spec';
+import type { LabeledErrorBoundInputProps } from './types';
 import { LabeledErrorBoundInput } from './LabeledErrorBoundInput';
 
-const defaultProps = {
-  id: 1,
+const defaultProps: LabeledErrorBoundInputProps = {
+  id: '1',
   label: 'Username',
   name: 'Username',
-  validationMethods: () => {},
+  validationMethods: { onBlur: () => {} },
   errorMessage: '',
   helpText: 'This is a line of example help text',
   hasTooltip: false,
diff --git a/superset-frontend/packages/superset-ui-core/src/components/IconTooltip/IconTooltip.test.jsx b/superset-frontend/packages/superset-ui-core/src/components/IconTooltip/IconTooltip.test.tsx
similarity index 100%
rename from superset-frontend/packages/superset-ui-core/src/components/IconTooltip/IconTooltip.test.jsx
rename to superset-frontend/packages/superset-ui-core/src/components/IconTooltip/IconTooltip.test.tsx
diff --git a/superset-frontend/plugins/legacy-plugin-chart-calendar/src/Calendar.js b/superset-frontend/plugins/legacy-plugin-chart-calendar/src/Calendar.ts
similarity index 67%
rename from superset-frontend/plugins/legacy-plugin-chart-calendar/src/Calendar.js
rename to superset-frontend/plugins/legacy-plugin-chart-calendar/src/Calendar.ts
index bff582d62e0..eed94ea3a60 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-calendar/src/Calendar.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-calendar/src/Calendar.ts
@@ -16,46 +16,48 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import PropTypes from 'prop-types';
 import { extent as d3Extent, range as d3Range } from 'd3-array';
 import { select as d3Select } from 'd3-selection';
 import { getSequentialSchemeRegistry } from '@superset-ui/core';
-import { t } from '@apache-superset/core/ui';
-import CalHeatMap from './vendor/cal-heatmap';
+import { SupersetTheme, t } from '@apache-superset/core/ui';
+import CalHeatMapImport from './vendor/cal-heatmap';
 import { convertUTCTimestampToLocal } from './utils';
 
-const propTypes = {
-  data: PropTypes.shape({
-    // Object hashed by metric name,
-    // then hashed by timestamp (in seconds, not milliseconds) as float
-    // the innermost value is count
-    // e.g. { count_distinct_something: { 1535034236.0: 3 } }
-    data: PropTypes.object,
-    domain: PropTypes.string,
-    range: PropTypes.number,
-    // timestamp in milliseconds
-    start: PropTypes.number,
-    subdomain: PropTypes.string,
-  }),
-  height: PropTypes.number,
-  // eslint-disable-next-line react/sort-prop-types
-  cellPadding: PropTypes.number,
-  // eslint-disable-next-line react/sort-prop-types
-  cellRadius: PropTypes.number,
-  // eslint-disable-next-line react/sort-prop-types
-  cellSize: PropTypes.number,
-  linearColorScheme: PropTypes.string,
-  showLegend: PropTypes.bool,
-  showMetricName: PropTypes.bool,
-  showValues: PropTypes.bool,
-  steps: PropTypes.number,
-  timeFormatter: PropTypes.func,
-  valueFormatter: PropTypes.func,
-  verboseMap: PropTypes.object,
-  theme: PropTypes.object,
-};
+// The vendor file is @ts-nocheck, so its export lacks type info.
+// Define a minimal constructor interface for use in this file.
+interface CalHeatMapInstance {
+  init(config: Record<string, unknown>): void;
+}
+const CalHeatMap = CalHeatMapImport as unknown as new () => CalHeatMapInstance;
+
+interface CalendarData {
+  data: Record<string, Record<string, number>>;
+  domain: string;
+  range: number;
+  start: number;
+  subdomain: string;
+}
+
+interface CalendarProps {
+  data: CalendarData;
+  height: number;
+  cellPadding?: number;
+  cellRadius?: number;
+  cellSize?: number;
+  domainGranularity: string;
+  linearColorScheme: string;
+  showLegend: boolean;
+  showMetricName: boolean;
+  showValues: boolean;
+  steps: number;
+  subdomainGranularity: string;
+  timeFormatter: (ts: number | string) => string;
+  valueFormatter: (value: number) => string;
+  verboseMap: Record<string, string>;
+  theme: SupersetTheme;
+}
 
-function Calendar(element, props) {
+function Calendar(element: HTMLElement, props: CalendarProps) {
   const {
     data,
     height,
@@ -82,7 +84,7 @@ function Calendar(element, props) {
   const div = container.append('div');
 
   const subDomainTextFormat = showValues
-    ? (date, value) => valueFormatter(value)
+    ? (_date: Date, value: number) => valueFormatter(value)
     : null;
 
   const metricsData = data.data;
@@ -96,12 +98,13 @@ function Calendar(element, props) {
     }
     const timestamps = metricsData[metric];
     const extents = d3Extent(Object.keys(timestamps), key => timestamps[key]);
-    const step = (extents[1] - extents[0]) / (steps - 1);
+    const step =
+      ((extents[1] as number) - (extents[0] as number)) / (steps - 1);
     const colorScale = getSequentialSchemeRegistry()
-      .get(linearColorScheme)
-      .createLinearScale(extents);
+      .get(linearColorScheme)!
+      .createLinearScale(extents as [number, number]);
 
-    const legend = d3Range(steps).map(i => extents[0] + step * i);
+    const legend = d3Range(steps).map(i => (extents[0] as number) + step * i);
     const legendColors = legend.map(x => colorScale(x));
 
     const cal = new CalHeatMap();
@@ -138,6 +141,5 @@ function Calendar(element, props) {
 }
 
 Calendar.displayName = 'Calendar';
-Calendar.propTypes = propTypes;
 
 export default Calendar;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-calendar/src/ReactCalendar.jsx b/superset-frontend/plugins/legacy-plugin-chart-calendar/src/ReactCalendar.tsx
similarity index 91%
rename from superset-frontend/plugins/legacy-plugin-chart-calendar/src/ReactCalendar.jsx
rename to superset-frontend/plugins/legacy-plugin-chart-calendar/src/ReactCalendar.tsx
index f028b94b116..a14bc9b4a22 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-calendar/src/ReactCalendar.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-calendar/src/ReactCalendar.tsx
@@ -16,15 +16,27 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import PropTypes from 'prop-types';
 import { reactify } from '@superset-ui/core';
 import { styled, css, useTheme } from '@apache-superset/core/ui';
 import { Global } from '@emotion/react';
 import Component from './Calendar';
 
-const ReactComponent = reactify(Component);
-
-const Calendar = ({ className, ...otherProps }) => {
+// Type-erase the render function to allow flexible prop spreading in the wrapper.
+// The Calendar render function has typed props, but the wrapper passes props via spread
+// which TypeScript cannot verify at compile time. Props are validated at runtime.
+const ReactComponent = reactify(
+  Component as unknown as (
+    container: HTMLDivElement,
+    props: Record<string, unknown>,
+  ) => void,
+);
+
+interface CalendarWrapperProps {
+  className?: string;
+  [key: string]: unknown;
+}
+
+const Calendar = ({ className, ...otherProps }: CalendarWrapperProps) => {
   const theme = useTheme();
   return (
     <div className={className}>
@@ -88,15 +100,6 @@ const Calendar = ({ className, ...otherProps }) => {
   );
 };
 
-Calendar.defaultProps = {
-  otherProps: {},
-};
-
-Calendar.propTypes = {
-  className: PropTypes.string.isRequired,
-  otherProps: PropTypes.objectOf(PropTypes.any),
-};
-
 export default styled(Calendar)`
   ${({ theme }) => `
     .superset-legacy-chart-calendar {
diff --git a/superset-frontend/plugins/legacy-plugin-chart-calendar/src/index.js b/superset-frontend/plugins/legacy-plugin-chart-calendar/src/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-calendar/src/index.js
rename to superset-frontend/plugins/legacy-plugin-chart-calendar/src/index.ts
diff --git a/superset-frontend/plugins/legacy-plugin-chart-calendar/src/transformProps.js b/superset-frontend/plugins/legacy-plugin-chart-calendar/src/transformProps.ts
similarity index 87%
rename from superset-frontend/plugins/legacy-plugin-chart-calendar/src/transformProps.js
rename to superset-frontend/plugins/legacy-plugin-chart-calendar/src/transformProps.ts
index 379a206f513..b20773ee70d 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-calendar/src/transformProps.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-calendar/src/transformProps.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { getNumberFormatter } from '@superset-ui/core';
+import { ChartProps, getNumberFormatter } from '@superset-ui/core';
 import { getFormattedUTCTime } from './utils';
 
-export default function transformProps(chartProps) {
+export default function transformProps(chartProps: ChartProps) {
   const { height, formData, queriesData, datasource } = chartProps;
   const {
     cellPadding,
@@ -38,7 +38,8 @@ export default function transformProps(chartProps) {
   } = formData;
 
   const { verboseMap } = datasource;
-  const timeFormatter = ts => getFormattedUTCTime(ts, xAxisTimeFormat);
+  const timeFormatter = (ts: number | string) =>
+    getFormattedUTCTime(ts, xAxisTimeFormat);
   const valueFormatter = getNumberFormatter(yAxisFormat);
 
   return {
diff --git a/superset-frontend/plugins/legacy-plugin-chart-calendar/src/vendor/cal-heatmap.js b/superset-frontend/plugins/legacy-plugin-chart-calendar/src/vendor/cal-heatmap.ts
similarity index 99%
rename from superset-frontend/plugins/legacy-plugin-chart-calendar/src/vendor/cal-heatmap.js
rename to superset-frontend/plugins/legacy-plugin-chart-calendar/src/vendor/cal-heatmap.ts
index 3240dd7b741..1ccf62f996a 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-calendar/src/vendor/cal-heatmap.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-calendar/src/vendor/cal-heatmap.ts
@@ -1,3 +1,4 @@
+// @ts-nocheck
 // [LICENSE TBD]
 /* Copied and altered from http://cal-heatmap.com/ , alterations around:
  * - tuning tooltips
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts b/superset-frontend/plugins/legacy-plugin-chart-calendar/types/external.d.ts
similarity index 81%
copy from superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
copy to superset-frontend/plugins/legacy-plugin-chart-calendar/types/external.d.ts
index 34a150e873e..fd3221d1a68 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
+++ b/superset-frontend/plugins/legacy-plugin-chart-calendar/types/external.d.ts
@@ -16,7 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-declare module 'd3' {
-  const d3: any;
-  export = d3;
+
+declare module '*.png' {
+  const value: string;
+  export default value;
 }
+
+declare module '*.jpg' {
+  const value: string;
+  export default value;
+}
+
+declare module 'd3-selection';
diff --git a/superset-frontend/plugins/legacy-plugin-chart-chord/src/Chord.js b/superset-frontend/plugins/legacy-plugin-chart-chord/src/Chord.ts
similarity index 76%
rename from superset-frontend/plugins/legacy-plugin-chart-chord/src/Chord.js
rename to superset-frontend/plugins/legacy-plugin-chart-chord/src/Chord.ts
index 1d5ed45683f..62483c2d331 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-chord/src/Chord.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-chord/src/Chord.ts
@@ -1,3 +1,4 @@
+// @ts-nocheck
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,24 +19,26 @@
  */
 /* eslint-disable no-param-reassign, react/sort-prop-types */
 import d3 from 'd3';
-import PropTypes from 'prop-types';
 import {
   getNumberFormatter,
   CategoricalColorNamespace,
 } from '@superset-ui/core';
 
-const propTypes = {
-  data: PropTypes.shape({
-    matrix: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.number)),
-    nodes: PropTypes.arrayOf(PropTypes.string),
-  }),
-  width: PropTypes.number,
-  height: PropTypes.number,
-  colorScheme: PropTypes.string,
-  numberFormat: PropTypes.string,
-};
-
-function Chord(element, props) {
+interface ChordData {
+  matrix: number[][];
+  nodes: string[];
+}
+
+interface ChordProps {
+  data: ChordData;
+  width: number;
+  height: number;
+  colorScheme: string;
+  numberFormat: string;
+  sliceId: number;
+}
+
+function Chord(element: HTMLElement, props: ChordProps) {
   const { data, width, height, numberFormat, colorScheme, sliceId } = props;
 
   element.innerHTML = '';
@@ -49,7 +52,10 @@ function Chord(element, props) {
   const outerRadius = Math.min(width, height) / 2 - 10;
   const innerRadius = outerRadius - 24;
 
-  let chord;
+  // d3 v3 data-bound selections use any for the datum generic parameter
+  // because the d3 v3 typings cannot represent the actual chord layout data types
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  let chord: d3.Selection<any>;
 
   const arc = d3.svg.arc().innerRadius(innerRadius).outerRadius(outerRadius);
 
@@ -92,6 +98,7 @@ function Chord(element, props) {
   const groupPath = group
     .append('path')
     .attr('id', (d, i) => `group${i}`)
+    // @ts-expect-error -- d3 v3 arc layout is callable at runtime but not typed as Primitive
     .attr('d', arc)
     .style('fill', (d, i) => colorFn(nodes[i], sliceId));
 
@@ -104,9 +111,10 @@ function Chord(element, props) {
     .text((d, i) => nodes[i]);
   // Remove the labels that don't fit. :(
   groupText
-    .filter(function filter(d, i) {
+    .filter(function filter(this: SVGTextElement, d, i) {
       return (
-        groupPath[0][i].getTotalLength() / 2 - 16 < this.getComputedTextLength()
+        (groupPath[0][i] as SVGPathElement).getTotalLength() / 2 - 16 <
+        this.getComputedTextLength()
       );
     })
     .remove();
@@ -122,6 +130,7 @@ function Chord(element, props) {
       chord.classed('fade', p => p !== d);
     })
     .style('fill', d => colorFn(nodes[d.source.index], sliceId))
+    // @ts-expect-error -- d3 v3 chord layout is callable at runtime but not typed as Primitive
     .attr('d', path);
 
   // Add an elaborate mouseover title for each chord.
@@ -129,15 +138,14 @@ function Chord(element, props) {
     .append('title')
     .text(
       d =>
-        `${nodes[d.source.index]} → ${nodes[d.target.index]}: ${f(
+        `${nodes[d.source.index]} \u2192 ${nodes[d.target.index]}: ${f(
           d.target.value,
-        )}\n${nodes[d.target.index]} → ${nodes[d.source.index]}: ${f(
+        )}\n${nodes[d.target.index]} \u2192 ${nodes[d.source.index]}: ${f(
           d.source.value,
         )}`,
     );
 }
 
 Chord.displayName = 'Chord';
-Chord.propTypes = propTypes;
 
 export default Chord;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-chord/src/ReactChord.jsx b/superset-frontend/plugins/legacy-plugin-chart-chord/src/ReactChord.tsx
similarity index 73%
rename from superset-frontend/plugins/legacy-plugin-chart-chord/src/ReactChord.jsx
rename to superset-frontend/plugins/legacy-plugin-chart-chord/src/ReactChord.tsx
index fbefe58e3f7..040e67e6d3c 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-chord/src/ReactChord.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-chord/src/ReactChord.tsx
@@ -18,26 +18,29 @@
  */
 import { reactify } from '@superset-ui/core';
 import { styled } from '@apache-superset/core/ui';
-import PropTypes from 'prop-types';
 import Component from './Chord';
 
-const ReactComponent = reactify(Component);
+// Type-erase the render function to allow flexible prop spreading in the wrapper.
+// The Chord render function has typed props, but the wrapper passes props via spread
+// which TypeScript cannot verify at compile time. Props are validated at runtime.
+const ReactComponent = reactify(
+  Component as unknown as (
+    container: HTMLDivElement,
+    props: Record<string, unknown>,
+  ) => void,
+);
+
+interface ChordWrapperProps {
+  className?: string;
+  [key: string]: unknown;
+}
 
-const Chord = ({ className, ...otherProps }) => (
+const Chord = ({ className, ...otherProps }: ChordWrapperProps) => (
   <div className={className}>
     <ReactComponent {...otherProps} />
   </div>
 );
 
-Chord.defaultProps = {
-  otherProps: {},
-};
-
-Chord.propTypes = {
-  className: PropTypes.string.isRequired,
-  otherProps: PropTypes.objectOf(PropTypes.any),
-};
-
 export default styled(Chord)`
   ${({ theme }) => `
     .superset-legacy-chart-chord svg #circle circle {
diff --git a/superset-frontend/plugins/legacy-plugin-chart-chord/src/index.js b/superset-frontend/plugins/legacy-plugin-chart-chord/src/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-chord/src/index.js
rename to superset-frontend/plugins/legacy-plugin-chart-chord/src/index.ts
diff --git a/superset-frontend/plugins/legacy-plugin-chart-chord/src/transformProps.js b/superset-frontend/plugins/legacy-plugin-chart-chord/src/transformProps.ts
similarity index 90%
rename from superset-frontend/plugins/legacy-plugin-chart-chord/src/transformProps.js
rename to superset-frontend/plugins/legacy-plugin-chart-chord/src/transformProps.ts
index 7503ff4ea1f..4b8fef75104 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-chord/src/transformProps.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-chord/src/transformProps.ts
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-export default function transformProps(chartProps) {
+import { ChartProps } from '@superset-ui/core';
+
+export default function transformProps(chartProps: ChartProps) {
   const { width, height, formData, queriesData } = chartProps;
   const { yAxisFormat, colorScheme, sliceId } = formData;
 
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts b/superset-frontend/plugins/legacy-plugin-chart-chord/types/external.d.ts
similarity index 84%
copy from superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
copy to superset-frontend/plugins/legacy-plugin-chart-chord/types/external.d.ts
index 34a150e873e..66677a600a6 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
+++ b/superset-frontend/plugins/legacy-plugin-chart-chord/types/external.d.ts
@@ -16,7 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-declare module 'd3' {
-  const d3: any;
-  export = d3;
+
+declare module '*.png' {
+  const value: string;
+  export default value;
+}
+
+declare module '*.jpg' {
+  const value: string;
+  export default value;
 }
diff --git a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/CountryMap.js b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/CountryMap.ts
similarity index 78%
rename from superset-frontend/plugins/legacy-plugin-chart-country-map/src/CountryMap.js
rename to superset-frontend/plugins/legacy-plugin-chart-country-map/src/CountryMap.ts
index e8e14d6a44c..3afc9fc24d1 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/CountryMap.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/CountryMap.ts
@@ -1,3 +1,4 @@
+// @ts-nocheck
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,7 +19,6 @@
  */
 /* eslint-disable react/sort-prop-types */
 import d3 from 'd3';
-import PropTypes from 'prop-types';
 import { extent as d3Extent } from 'd3-array';
 import {
   getNumberFormatter,
@@ -27,25 +27,38 @@ import {
 } from '@superset-ui/core';
 import countries, { countryOptions } from './countries';
 
-const propTypes = {
-  data: PropTypes.arrayOf(
-    PropTypes.shape({
-      country_id: PropTypes.string,
-      metric: PropTypes.number,
-    }),
-  ),
-  width: PropTypes.number,
-  height: PropTypes.number,
-  country: PropTypes.string,
-  colorScheme: PropTypes.string,
-  linearColorScheme: PropTypes.string,
-  mapBaseUrl: PropTypes.string,
-  numberFormat: PropTypes.string,
-};
-
-const maps = {};
-
-function CountryMap(element, props) {
+interface CountryMapDataItem {
+  country_id: string;
+  metric: number;
+}
+
+interface GeoFeature {
+  properties: {
+    ISO: string;
+    ID_2?: string;
+    NAME_1?: string;
+    NAME_2?: string;
+  };
+}
+
+interface GeoData {
+  features: GeoFeature[];
+}
+
+interface CountryMapProps {
+  data: CountryMapDataItem[];
+  width: number;
+  height: number;
+  country: string;
+  linearColorScheme: string;
+  numberFormat: string;
+  colorScheme: string;
+  sliceId: number;
+}
+
+const maps: Record<string, GeoData> = {};
+
+function CountryMap(element: HTMLElement, props: CountryMapProps) {
   const {
     data,
     width,
@@ -60,17 +73,17 @@ function CountryMap(element, props) {
   const container = element;
   const format = getNumberFormatter(numberFormat);
   const linearColorScale = getSequentialSchemeRegistry()
-    .get(linearColorScheme)
-    .createLinearScale(d3Extent(data, v => v.metric));
+    .get(linearColorScheme)!
+    .createLinearScale(d3Extent(data, v => v.metric) as [number, number]);
   const colorScale = CategoricalColorNamespace.getScale(colorScheme);
 
-  const colorMap = {};
+  const colorMap: Record<string, string> = {};
   data.forEach(d => {
     colorMap[d.country_id] = colorScheme
       ? colorScale(d.country_id, sliceId)
-      : linearColorScale(d.metric);
+      : (linearColorScale(d.metric) ?? '');
   });
-  const colorFn = d => colorMap[d.properties.ISO] || 'none';
+  const colorFn = (d: GeoFeature) => colorMap[d.properties.ISO] || 'none';
 
   const path = d3.geo.path();
   const div = d3.select(container);
@@ -92,13 +105,13 @@ function CountryMap(element, props) {
   const mapLayer = g.append('g').classed('map-layer', true);
   const hoverPopup = div.append('div').attr('class', 'hover-popup');
 
-  let centered;
+  let centered: GeoFeature | null;
 
-  const clicked = function clicked(d) {
+  const clicked = function clicked(d: GeoFeature) {
     const hasCenter = d && centered !== d;
-    let x;
-    let y;
-    let k;
+    let x: number;
+    let y: number;
+    let k: number;
     const halfWidth = width / 2;
     const halfHeight = height / 2;
 
@@ -124,19 +137,21 @@ function CountryMap(element, props) {
 
   backgroundRect.on('click', clicked);
 
-  const getNameOfRegion = function getNameOfRegion(feature) {
+  const getNameOfRegion = function getNameOfRegion(
+    feature: GeoFeature,
+  ): string {
     if (feature && feature.properties) {
       if (feature.properties.ID_2) {
-        return feature.properties.NAME_2;
+        return feature.properties.NAME_2 || '';
       }
-      return feature.properties.NAME_1;
+      return feature.properties.NAME_1 || '';
     }
     return '';
   };
 
-  const mouseenter = function mouseenter(d) {
+  const mouseenter = function mouseenter(this: SVGPathElement, d: GeoFeature) {
     // Darken color
-    let c = colorFn(d);
+    let c: string = colorFn(d);
     if (c !== 'none') {
       c = d3.rgb(c).darker().toString();
     }
@@ -163,12 +178,12 @@ function CountryMap(element, props) {
       .style('left', `${position[0]}px`);
   };
 
-  const mouseout = function mouseout() {
+  const mouseout = function mouseout(this: SVGPathElement) {
     d3.select(this).style('fill', colorFn);
     hoverPopup.style('display', 'none');
   };
 
-  function drawMap(mapData) {
+  function drawMap(mapData: GeoData) {
     const { features } = mapData;
     const center = d3.geo.centroid(mapData);
     const scale = 100;
@@ -213,8 +228,8 @@ function CountryMap(element, props) {
   if (map) {
     drawMap(map);
   } else {
-    const url = countries[country];
-    d3.json(url, (error, mapData) => {
+    const url = (countries as Record<string, string>)[country];
+    d3.json(url, (error: unknown, mapData: GeoData) => {
       if (error) {
         const countryName =
           countryOptions.find(x => x[0] === country)?.[1] || country;
@@ -230,6 +245,5 @@ function CountryMap(element, props) {
 }
 
 CountryMap.displayName = 'CountryMap';
-CountryMap.propTypes = propTypes;
 
 export default CountryMap;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/ReactCountryMap.jsx b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/ReactCountryMap.tsx
similarity index 78%
rename from superset-frontend/plugins/legacy-plugin-chart-country-map/src/ReactCountryMap.jsx
rename to superset-frontend/plugins/legacy-plugin-chart-country-map/src/ReactCountryMap.tsx
index aa937377982..d1afe8289d9 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/ReactCountryMap.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/ReactCountryMap.tsx
@@ -20,9 +20,25 @@ import { reactify } from '@superset-ui/core';
 import { styled } from '@apache-superset/core/ui';
 import Component from './CountryMap';
 
-const ReactComponent = reactify(Component);
+// Type-erase the render function to allow flexible prop spreading in the wrapper.
+// The CountryMap render function has typed props, but the wrapper passes props via spread
+// which TypeScript cannot verify at compile time. Props are validated at runtime.
+const ReactComponent = reactify(
+  Component as unknown as (
+    container: HTMLDivElement,
+    props: Record<string, unknown>,
+  ) => void,
+);
+
+interface CountryMapWrapperProps {
+  className?: string;
+  [key: string]: unknown;
+}
 
-const CountryMap = ({ className = '', ...otherProps }) => (
+const CountryMap = ({
+  className = '',
+  ...otherProps
+}: CountryMapWrapperProps) => (
   <div className={className}>
     <ReactComponent {...otherProps} />
   </div>
diff --git a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/index.js b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-country-map/src/index.js
rename to superset-frontend/plugins/legacy-plugin-chart-country-map/src/index.ts
diff --git a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/transformProps.js b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/transformProps.ts
similarity index 91%
rename from superset-frontend/plugins/legacy-plugin-chart-country-map/src/transformProps.js
rename to superset-frontend/plugins/legacy-plugin-chart-country-map/src/transformProps.ts
index 8789c3d2f34..946a5c9fd44 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/transformProps.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/transformProps.ts
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-export default function transformProps(chartProps) {
+import { ChartProps } from '@superset-ui/core';
+
+export default function transformProps(chartProps: ChartProps) {
   const { width, height, formData, queriesData } = chartProps;
   const {
     linearColorScheme,
diff --git a/superset-frontend/plugins/legacy-plugin-chart-country-map/test/CountryMap.test.tsx b/superset-frontend/plugins/legacy-plugin-chart-country-map/test/CountryMap.test.tsx
index b73c5831c71..97628a5fb68 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-country-map/test/CountryMap.test.tsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-country-map/test/CountryMap.test.tsx
@@ -22,7 +22,10 @@ import { render, fireEvent } from '@testing-library/react';
 import d3 from 'd3';
 import ReactCountryMap from '../src/ReactCountryMap';
 
-jest.spyOn(d3, 'json');
+// d3 v3 APIs have loose types; cast to allow jest mock operations
+const d3Any = d3 as any;
+
+jest.spyOn(d3Any, 'json');
 
 type Projection = ((...args: unknown[]) => void) & {
   scale: () => Projection;
@@ -44,10 +47,10 @@ mockPath.bounds = jest.fn(() => [
 ]);
 mockPath.centroid = jest.fn(() => [50, 50]);
 
-jest.spyOn(d3.geo, 'path').mockImplementation(() => mockPath);
+jest.spyOn(d3Any.geo, 'path').mockImplementation(() => mockPath);
 
 // Mock d3.geo.mercator
-jest.spyOn(d3.geo, 'mercator').mockImplementation(() => {
+jest.spyOn(d3Any.geo, 'mercator').mockImplementation(() => {
   const proj = (() => {}) as Projection;
   proj.scale = () => proj;
   proj.center = () => proj;
@@ -56,7 +59,7 @@ jest.spyOn(d3.geo, 'mercator').mockImplementation(() => {
 });
 
 // Mock d3.mouse
-jest.spyOn(d3, 'mouse').mockReturnValue([100, 50]);
+jest.spyOn(d3Any, 'mouse').mockReturnValue([100, 50]);
 
 const mockMapData = {
   type: 'FeatureCollection',
@@ -77,7 +80,7 @@ describe('CountryMap (legacy d3)', () => {
   });
 
   it('renders a map after d3.json loads data', async () => {
-    d3.json.mockImplementation((_url: string, cb: D3JsonCallback) =>
+    d3Any.json.mockImplementation((_url: string, cb: D3JsonCallback) =>
       cb(null, mockMapData),
     );
 
@@ -93,14 +96,14 @@ describe('CountryMap (legacy d3)', () => {
       />,
     );
 
-    expect(d3.json).toHaveBeenCalledTimes(1);
+    expect(d3Any.json).toHaveBeenCalledTimes(1);
 
     const region = document.querySelector('path.region');
     expect(region).not.toBeNull();
   });
 
   it('shows tooltip on mouseenter/mousemove/mouseout', async () => {
-    d3.json.mockImplementation((_url: string, cb: D3JsonCallback) =>
+    d3Any.json.mockImplementation((_url: string, cb: D3JsonCallback) =>
       cb(null, mockMapData),
     );
 
@@ -129,7 +132,7 @@ describe('CountryMap (legacy d3)', () => {
   });
 
   it('shows tooltip on mouseenter/mousemove/mouseout', async () => {
-    d3.json.mockImplementation((_url: string, cb: D3JsonCallback) =>
+    d3Any.json.mockImplementation((_url: string, cb: D3JsonCallback) =>
       cb(null, mockMapData),
     );
 
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts b/superset-frontend/plugins/legacy-plugin-chart-country-map/types/external.d.ts
similarity index 84%
copy from superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
copy to superset-frontend/plugins/legacy-plugin-chart-country-map/types/external.d.ts
index 34a150e873e..66677a600a6 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
+++ b/superset-frontend/plugins/legacy-plugin-chart-country-map/types/external.d.ts
@@ -16,7 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-declare module 'd3' {
-  const d3: any;
-  export = d3;
+
+declare module '*.png' {
+  const value: string;
+  export default value;
+}
+
+declare module '*.jpg' {
+  const value: string;
+  export default value;
 }
diff --git a/superset-frontend/plugins/legacy-plugin-chart-horizon/src/HorizonChart.jsx b/superset-frontend/plugins/legacy-plugin-chart-horizon/src/HorizonChart.tsx
similarity index 75%
rename from superset-frontend/plugins/legacy-plugin-chart-horizon/src/HorizonChart.jsx
rename to superset-frontend/plugins/legacy-plugin-chart-horizon/src/HorizonChart.tsx
index d3ebde9bd5e..03004c583f3 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-horizon/src/HorizonChart.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-horizon/src/HorizonChart.tsx
@@ -18,35 +18,34 @@
  */
 /* eslint-disable react/jsx-sort-default-props, react/sort-prop-types */
 import { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { extent as d3Extent } from 'd3-array';
 import { ensureIsArray } from '@superset-ui/core';
 import { styled } from '@apache-superset/core/ui';
 import HorizonRow, { DEFAULT_COLORS } from './HorizonRow';
 
-const propTypes = {
-  className: PropTypes.string,
-  width: PropTypes.number,
-  height: PropTypes.number,
-  seriesHeight: PropTypes.number,
-  data: PropTypes.arrayOf(
-    PropTypes.shape({
-      key: PropTypes.arrayOf(PropTypes.string),
-      values: PropTypes.arrayOf(
-        PropTypes.shape({
-          y: PropTypes.number,
-        }),
-      ),
-    }),
-  ).isRequired,
-  // number of bands in each direction (positive / negative)
-  bands: PropTypes.number,
-  colors: PropTypes.arrayOf(PropTypes.string),
-  colorScale: PropTypes.string,
-  mode: PropTypes.string,
-  offsetX: PropTypes.number,
-};
-const defaultProps = {
+interface DataValue {
+  y: number;
+}
+
+interface DataSeries {
+  key: string[];
+  values: DataValue[];
+}
+
+interface HorizonChartProps {
+  className?: string;
+  width?: number;
+  height?: number;
+  seriesHeight?: number;
+  data: DataSeries[];
+  bands?: number;
+  colors?: string[];
+  colorScale?: string;
+  mode?: string;
+  offsetX?: number;
+}
+
+const defaultProps: Partial<HorizonChartProps> = {
   className: '',
   width: 800,
   height: 600,
@@ -81,7 +80,9 @@ const StyledDiv = styled.div`
   `}
 `;
 
-class HorizonChart extends PureComponent {
+class HorizonChart extends PureComponent<HorizonChartProps> {
+  static defaultProps = defaultProps;
+
   render() {
     const {
       className,
@@ -96,13 +97,13 @@ class HorizonChart extends PureComponent {
       offsetX,
     } = this.props;
 
-    let yDomain;
+    let yDomain: [number, number] | undefined;
     if (colorScale === 'overall') {
-      const allValues = data.reduce(
+      const allValues = data.reduce<DataValue[]>(
         (acc, current) => acc.concat(current.values),
         [],
       );
-      yDomain = d3Extent(allValues, d => d.y);
+      yDomain = d3Extent(allValues, d => d.y) as [number, number];
     }
 
     return (
@@ -113,7 +114,7 @@ class HorizonChart extends PureComponent {
         >
           {data.map(row => (
             <HorizonRow
-              key={row.key}
+              key={row.key as unknown as string}
               width={width}
               height={seriesHeight}
               title={ensureIsArray(row.key).join(', ')}
@@ -132,7 +133,4 @@ class HorizonChart extends PureComponent {
   }
 }
 
-HorizonChart.propTypes = propTypes;
-HorizonChart.defaultProps = defaultProps;
-
 export default HorizonChart;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-horizon/src/HorizonRow.jsx b/superset-frontend/plugins/legacy-plugin-chart-horizon/src/HorizonRow.tsx
similarity index 83%
rename from superset-frontend/plugins/legacy-plugin-chart-horizon/src/HorizonRow.jsx
rename to superset-frontend/plugins/legacy-plugin-chart-horizon/src/HorizonRow.tsx
index b043abd4351..f399d850d7c 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-horizon/src/HorizonRow.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-horizon/src/HorizonRow.tsx
@@ -20,7 +20,6 @@
 /* eslint-disable react/jsx-sort-default-props */
 /* eslint-disable react/sort-prop-types */
 import { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { extent as d3Extent } from 'd3-array';
 import { scaleLinear } from 'd3-scale';
 
@@ -35,25 +34,25 @@ export const DEFAULT_COLORS = [
   '#d73027',
 ];
 
-const propTypes = {
-  className: PropTypes.string,
-  width: PropTypes.number,
-  height: PropTypes.number,
-  data: PropTypes.arrayOf(
-    PropTypes.shape({
-      y: PropTypes.number,
-    }),
-  ).isRequired,
-  bands: PropTypes.number,
-  colors: PropTypes.arrayOf(PropTypes.string),
-  colorScale: PropTypes.string,
-  mode: PropTypes.string,
-  offsetX: PropTypes.number,
-  title: PropTypes.string,
-  yDomain: PropTypes.arrayOf(PropTypes.number),
-};
+interface DataPoint {
+  y: number;
+}
+
+interface HorizonRowProps {
+  className?: string;
+  width?: number;
+  height?: number;
+  data: DataPoint[];
+  bands?: number;
+  colors?: string[];
+  colorScale?: string;
+  mode?: string;
+  offsetX?: number;
+  title?: string;
+  yDomain?: [number, number];
+}
 
-const defaultProps = {
+const defaultProps: Partial<HorizonRowProps> = {
   className: '',
   width: 800,
   height: 20,
@@ -66,7 +65,11 @@ const defaultProps = {
   yDomain: undefined,
 };
 
-class HorizonRow extends PureComponent {
+class HorizonRow extends PureComponent<HorizonRowProps> {
+  static defaultProps = defaultProps;
+
+  private canvas: HTMLCanvasElement | null = null;
+
   componentDidMount() {
     this.drawChart();
   }
@@ -84,12 +87,12 @@ class HorizonRow extends PureComponent {
       const {
         data: rawData,
         yDomain,
-        width,
-        height,
-        bands,
-        colors,
+        width = 800,
+        height = 20,
+        bands = DEFAULT_COLORS.length >> 1,
+        colors = DEFAULT_COLORS,
         colorScale,
-        offsetX,
+        offsetX = 0,
         mode,
       } = this.props;
 
@@ -99,6 +102,7 @@ class HorizonRow extends PureComponent {
           : rawData;
 
       const context = this.canvas.getContext('2d');
+      if (!context) return;
       context.imageSmoothingEnabled = false;
       context.clearRect(0, 0, width, height);
       // Reset transform
@@ -118,7 +122,8 @@ class HorizonRow extends PureComponent {
       }
 
       // Create y-scale
-      const [min, max] = yDomain || d3Extent(data, d => d.y);
+      const [min, max] =
+        yDomain || (d3Extent(data, d => d.y) as [number, number]);
       const y = scaleLinear()
         .domain([0, Math.max(-min, max)])
         .range([0, height]);
@@ -127,8 +132,8 @@ class HorizonRow extends PureComponent {
       // http://www.html5rocks.com/en/tutorials/canvas/performance/
       let hasNegative = false;
       // draw positive bands
-      let value;
-      let bExtents;
+      let value: number;
+      let bExtents: number;
       for (let b = 0; b < bands; b += 1) {
         context.fillStyle = colors[bands + b];
 
@@ -146,9 +151,9 @@ class HorizonRow extends PureComponent {
           if (value !== undefined) {
             context.fillRect(
               offsetX + i * step,
-              y(value),
+              y(value)!,
               step + 1,
-              y(0) - y(value),
+              y(0)! - y(value)!,
             );
           }
         }
@@ -177,9 +182,9 @@ class HorizonRow extends PureComponent {
             }
             context.fillRect(
               offsetX + ii * step,
-              y(-value),
+              y(-value)!,
               step + 1,
-              y(0) - y(-value),
+              y(0)! - y(-value)!,
             );
           }
         }
@@ -205,7 +210,4 @@ class HorizonRow extends PureComponent {
   }
 }
 
-HorizonRow.propTypes = propTypes;
-HorizonRow.defaultProps = defaultProps;
-
 export default HorizonRow;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-horizon/src/index.js b/superset-frontend/plugins/legacy-plugin-chart-horizon/src/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-horizon/src/index.js
rename to superset-frontend/plugins/legacy-plugin-chart-horizon/src/index.ts
diff --git a/superset-frontend/plugins/legacy-plugin-chart-horizon/src/transformProps.js b/superset-frontend/plugins/legacy-plugin-chart-horizon/src/transformProps.ts
similarity index 90%
rename from superset-frontend/plugins/legacy-plugin-chart-horizon/src/transformProps.js
rename to superset-frontend/plugins/legacy-plugin-chart-horizon/src/transformProps.ts
index 9fba63a88a5..fdd1b0134fa 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-horizon/src/transformProps.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-horizon/src/transformProps.ts
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-export default function transformProps(chartProps) {
+import { ChartProps } from '@superset-ui/core';
+
+export default function transformProps(chartProps: ChartProps) {
   const { height, width, formData, queriesData } = chartProps;
   const { horizonColorScale, seriesHeight } = formData;
 
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts b/superset-frontend/plugins/legacy-plugin-chart-horizon/types/external.d.ts
similarity index 84%
copy from superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
copy to superset-frontend/plugins/legacy-plugin-chart-horizon/types/external.d.ts
index 34a150e873e..66677a600a6 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
+++ b/superset-frontend/plugins/legacy-plugin-chart-horizon/types/external.d.ts
@@ -16,7 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-declare module 'd3' {
-  const d3: any;
-  export = d3;
+
+declare module '*.png' {
+  const value: string;
+  export default value;
+}
+
+declare module '*.jpg' {
+  const value: string;
+  export default value;
 }
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/MapBox.jsx b/superset-frontend/plugins/legacy-plugin-chart-map-box/src/MapBox.tsx
similarity index 68%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/src/MapBox.jsx
rename to superset-frontend/plugins/legacy-plugin-chart-map-box/src/MapBox.tsx
index 943cf7174b9..0f67057b7a5 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/MapBox.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-map-box/src/MapBox.tsx
@@ -19,7 +19,6 @@
 /* eslint-disable react/jsx-sort-default-props, react/sort-prop-types */
 /* eslint-disable react/forbid-prop-types, react/require-default-props */
 import { Component } from 'react';
-import PropTypes from 'prop-types';
 import MapGL from 'react-map-gl';
 import { WebMercatorViewport } from '@math.gl/web-mercator';
 import ScatterPlotGlowOverlay from './ScatterPlotGlowOverlay';
@@ -29,24 +28,46 @@ const NOOP = () => {};
 export const DEFAULT_MAX_ZOOM = 16;
 export const DEFAULT_POINT_RADIUS = 60;
 
-const propTypes = {
-  width: PropTypes.number,
-  height: PropTypes.number,
-  aggregatorName: PropTypes.string,
-  clusterer: PropTypes.object,
-  globalOpacity: PropTypes.number,
-  hasCustomMetric: PropTypes.bool,
-  mapStyle: PropTypes.string,
-  mapboxApiKey: PropTypes.string.isRequired,
-  onViewportChange: PropTypes.func,
-  pointRadius: PropTypes.number,
-  pointRadiusUnit: PropTypes.string,
-  renderWhileDragging: PropTypes.bool,
-  rgb: PropTypes.array,
-  bounds: PropTypes.array,
-};
+interface Viewport {
+  longitude: number;
+  latitude: number;
+  zoom: number;
+  isDragging?: boolean;
+}
+
+interface Clusterer {
+  getClusters(bbox: number[], zoom: number): GeoJSONLocation[];
+}
+
+interface GeoJSONLocation {
+  geometry: {
+    coordinates: [number, number];
+  };
+  properties: Record<string, number | string | boolean | null | undefined>;
+}
 
-const defaultProps = {
+interface MapBoxProps {
+  width?: number;
+  height?: number;
+  aggregatorName?: string;
+  clusterer?: Clusterer;
+  globalOpacity?: number;
+  hasCustomMetric?: boolean;
+  mapStyle?: string;
+  mapboxApiKey: string;
+  onViewportChange?: (viewport: Viewport) => void;
+  pointRadius?: number;
+  pointRadiusUnit?: string;
+  renderWhileDragging?: boolean;
+  rgb?: (string | number)[];
+  bounds?: [[number, number], [number, number]];
+}
+
+interface MapBoxState {
+  viewport: Viewport;
+}
+
+const defaultProps: Partial<MapBoxProps> = {
   width: 400,
   height: 400,
   globalOpacity: 1,
@@ -55,18 +76,20 @@ const defaultProps = {
   pointRadiusUnit: 'Pixels',
 };
 
-class MapBox extends Component {
-  constructor(props) {
+class MapBox extends Component<MapBoxProps, MapBoxState> {
+  static defaultProps = defaultProps;
+
+  constructor(props: MapBoxProps) {
     super(props);
 
-    const { width, height, bounds } = this.props;
+    const { width = 400, height = 400, bounds } = this.props;
     // Get a viewport that fits the given bounds, which all marks to be clustered.
     // Derive lat, lon and zoom from this viewport. This is only done on initial
     // render as the bounds don't update as we pan/zoom in the current design.
     const mercator = new WebMercatorViewport({
       width,
       height,
-    }).fitBounds(bounds);
+    }).fitBounds(bounds!);
     const { latitude, longitude, zoom } = mercator;
 
     this.state = {
@@ -79,10 +102,10 @@ class MapBox extends Component {
     this.handleViewportChange = this.handleViewportChange.bind(this);
   }
 
-  handleViewportChange(viewport) {
+  handleViewportChange(viewport: Viewport) {
     this.setState({ viewport });
     const { onViewportChange } = this.props;
-    onViewportChange(viewport);
+    onViewportChange!(viewport);
   }
 
   render() {
@@ -109,15 +132,15 @@ class MapBox extends Component {
     // to an area outside of the original bounds, no additional queries are made to the backend to
     // retrieve additional data.
     // add this variable to widen the visible area
-    const offsetHorizontal = (width * 0.5) / 100;
-    const offsetVertical = (height * 0.5) / 100;
+    const offsetHorizontal = ((width ?? 400) * 0.5) / 100;
+    const offsetVertical = ((height ?? 400) * 0.5) / 100;
     const bbox = [
-      bounds[0][0] - offsetHorizontal,
-      bounds[0][1] - offsetVertical,
-      bounds[1][0] + offsetHorizontal,
-      bounds[1][1] + offsetVertical,
+      bounds![0][0] - offsetHorizontal,
+      bounds![0][1] - offsetVertical,
+      bounds![1][0] + offsetHorizontal,
+      bounds![1][1] + offsetVertical,
     ];
-    const clusters = clusterer.getClusters(bbox, Math.round(viewport.zoom));
+    const clusters = clusterer!.getClusters(bbox, Math.round(viewport.zoom));
 
     return (
       <MapGL
@@ -139,8 +162,8 @@ class MapBox extends Component {
           globalOpacity={globalOpacity}
           compositeOperation="screen"
           renderWhileDragging={renderWhileDragging}
-          aggregation={hasCustomMetric ? aggregatorName : null}
-          lngLatAccessor={location => {
+          aggregation={hasCustomMetric ? aggregatorName : undefined}
+          lngLatAccessor={(location: GeoJSONLocation) => {
             const { coordinates } = location.geometry;
 
             return [coordinates[0], coordinates[1]];
@@ -151,7 +174,4 @@ class MapBox extends Component {
   }
 }
 
-MapBox.propTypes = propTypes;
-MapBox.defaultProps = defaultProps;
-
 export default MapBox;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/ScatterPlotGlowOverlay.jsx b/superset-frontend/plugins/legacy-plugin-chart-map-box/src/ScatterPlotGlowOverlay.tsx
similarity index 67%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/src/ScatterPlotGlowOverlay.jsx
rename to superset-frontend/plugins/legacy-plugin-chart-map-box/src/ScatterPlotGlowOverlay.tsx
index e70862f1d9c..b96d34e0cec 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/ScatterPlotGlowOverlay.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-map-box/src/ScatterPlotGlowOverlay.tsx
@@ -17,7 +17,6 @@
  * under the License.
  */
 /* eslint-disable react/require-default-props */
-import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 import { CanvasOverlay } from 'react-map-gl';
 import { kmToPixels, MILES_PER_KM } from './utils/geo';
@@ -25,43 +24,71 @@ import roundDecimal from './utils/roundDecimal';
 import luminanceFromRGB from './utils/luminanceFromRGB';
 import 'mapbox-gl/dist/mapbox-gl.css';
 
-const propTypes = {
-  aggregation: PropTypes.string,
-  compositeOperation: PropTypes.string,
-  dotRadius: PropTypes.number,
-  globalOpacity: PropTypes.number,
-  lngLatAccessor: PropTypes.func,
-  locations: PropTypes.arrayOf(PropTypes.object).isRequired,
-  pointRadiusUnit: PropTypes.string,
-  renderWhileDragging: PropTypes.bool,
-  rgb: PropTypes.arrayOf(
-    PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-  ),
-  zoom: PropTypes.number,
-};
+interface GeoJSONLocation {
+  geometry: {
+    coordinates: [number, number];
+  };
+  properties: Record<string, number | string | boolean | null | undefined>;
+}
+
+interface RedrawParams {
+  width: number;
+  height: number;
+  ctx: CanvasRenderingContext2D;
+  isDragging: boolean;
+  project: (lngLat: [number, number]) => [number, number];
+}
+
+interface DrawTextOptions {
+  fontHeight?: number;
+  label?: string | number;
+  radius?: number;
+  rgb?: (string | number)[];
+  shadow?: boolean;
+}
+
+interface ScatterPlotGlowOverlayProps {
+  aggregation?: string;
+  compositeOperation?: string;
+  dotRadius?: number;
+  globalOpacity?: number;
+  lngLatAccessor?: (location: GeoJSONLocation) => [number, number];
+  locations: GeoJSONLocation[];
+  pointRadiusUnit?: string;
+  renderWhileDragging?: boolean;
+  rgb?: (string | number)[];
+  zoom?: number;
+  isDragging?: boolean;
+}
 
-const defaultProps = {
+const defaultProps: Partial<ScatterPlotGlowOverlayProps> = {
   // Same as browser default.
   compositeOperation: 'source-over',
   dotRadius: 4,
-  lngLatAccessor: location => [location[0], location[1]],
+  lngLatAccessor: (location: GeoJSONLocation) => [
+    location.geometry.coordinates[0],
+    location.geometry.coordinates[1],
+  ],
   renderWhileDragging: true,
 };
 
-const computeClusterLabel = (properties, aggregation) => {
-  const count = properties.point_count;
+const computeClusterLabel = (
+  properties: Record<string, number | string | boolean | null | undefined>,
+  aggregation: string | undefined,
+): number | string => {
+  const count = properties.point_count as number;
   if (!aggregation) {
     return count;
   }
   if (aggregation === 'sum' || aggregation === 'min' || aggregation === 'max') {
-    return properties[aggregation];
+    return properties[aggregation] as number;
   }
-  const { sum } = properties;
+  const { sum } = properties as { sum: number };
   const mean = sum / count;
   if (aggregation === 'mean') {
     return Math.round(100 * mean) / 100;
   }
-  const { squaredSum } = properties;
+  const { squaredSum } = properties as { squaredSum: number };
   const variance = squaredSum / count - (sum / count) ** 2;
   if (aggregation === 'var') {
     return Math.round(100 * variance) / 100;
@@ -74,13 +101,19 @@ const computeClusterLabel = (properties, aggregation) => {
   return count;
 };
 
-class ScatterPlotGlowOverlay extends PureComponent {
-  constructor(props) {
+class ScatterPlotGlowOverlay extends PureComponent<ScatterPlotGlowOverlayProps> {
+  static defaultProps = defaultProps;
+
+  constructor(props: ScatterPlotGlowOverlayProps) {
     super(props);
     this.redraw = this.redraw.bind(this);
   }
 
-  drawText(ctx, pixel, options = {}) {
+  drawText(
+    ctx: CanvasRenderingContext2D,
+    pixel: [number, number],
+    options: DrawTextOptions = {},
+  ) {
     const IS_DARK_THRESHOLD = 110;
     const {
       fontHeight = 0,
@@ -90,7 +123,11 @@ class ScatterPlotGlowOverlay extends PureComponent {
       shadow = false,
     } = options;
     const maxWidth = radius * 1.8;
-    const luminance = luminanceFromRGB(rgb[1], rgb[2], rgb[3]);
+    const luminance = luminanceFromRGB(
+      rgb[1] as number,
+      rgb[2] as number,
+      rgb[3] as number,
+    );
 
     ctx.globalCompositeOperation = 'source-over';
     ctx.fillStyle = luminance <= IS_DARK_THRESHOLD ? 'white' : 'black';
@@ -102,7 +139,7 @@ class ScatterPlotGlowOverlay extends PureComponent {
       ctx.shadowColor = luminance <= IS_DARK_THRESHOLD ? 'black' : '';
     }
 
-    const textWidth = ctx.measureText(label).width;
+    const textWidth = ctx.measureText(String(label)).width;
     if (textWidth > maxWidth) {
       const scale = fontHeight / textWidth;
       ctx.font = `${scale * maxWidth}px sans-serif`;
@@ -110,14 +147,15 @@ class ScatterPlotGlowOverlay extends PureComponent {
 
     const { compositeOperation } = this.props;
 
-    ctx.fillText(label, pixel[0], pixel[1]);
-    ctx.globalCompositeOperation = compositeOperation;
+    ctx.fillText(String(label), pixel[0], pixel[1]);
+    ctx.globalCompositeOperation = (compositeOperation ??
+      'source-over') as GlobalCompositeOperation;
     ctx.shadowBlur = 0;
     ctx.shadowColor = '';
   }
 
   // Modified: https://github.com/uber/react-map-gl/blob/master/overlays/scatterplot.react.js
-  redraw({ width, height, ctx, isDragging, project }) {
+  redraw({ width, height, ctx, isDragging, project }: RedrawParams) {
     const {
       aggregation,
       compositeOperation,
@@ -131,8 +169,8 @@ class ScatterPlotGlowOverlay extends PureComponent {
       zoom,
     } = this.props;
 
-    const radius = dotRadius;
-    const clusterLabelMap = [];
+    const radius = dotRadius ?? 4;
+    const clusterLabelMap: (number | string)[] = [];
 
     locations.forEach((location, i) => {
       if (location.properties.cluster) {
@@ -141,9 +179,11 @@ class ScatterPlotGlowOverlay extends PureComponent {
           aggregation,
         );
       }
-    }, this);
+    });
 
-    const maxLabel = Math.max(...clusterLabelMap.filter(v => !Number.isNaN(v)));
+    const maxLabel = Math.max(
+      ...(clusterLabelMap.filter(v => !Number.isNaN(v)) as number[]),
+    );
 
     // Calculate min/max radius values for Pixels mode scaling
     let minRadiusValue = Infinity;
@@ -166,12 +206,17 @@ class ScatterPlotGlowOverlay extends PureComponent {
     }
 
     ctx.clearRect(0, 0, width, height);
-    ctx.globalCompositeOperation = compositeOperation;
+    ctx.globalCompositeOperation = (compositeOperation ??
+      'source-over') as GlobalCompositeOperation;
 
     if ((renderWhileDragging || !isDragging) && locations) {
-      locations.forEach(function _forEach(location, i) {
-        const pixel = project(lngLatAccessor(location));
-        const pixelRounded = [
+      locations.forEach(function _forEach(
+        this: ScatterPlotGlowOverlay,
+        location: GeoJSONLocation,
+        i: number,
+      ) {
+        const pixel = project(lngLatAccessor!(location)) as [number, number];
+        const pixelRounded: [number, number] = [
           roundDecimal(pixel[0], 1),
           roundDecimal(pixel[1], 1),
         ];
@@ -186,7 +231,7 @@ class ScatterPlotGlowOverlay extends PureComponent {
           if (location.properties.cluster) {
             let clusterLabel = clusterLabelMap[i];
             const scaledRadius = roundDecimal(
-              (clusterLabel / maxLabel) ** 0.5 * radius,
+              ((clusterLabel as number) / maxLabel) ** 0.5 * radius,
               1,
             );
             const fontHeight = roundDecimal(scaledRadius * 0.5, 1);
@@ -202,11 +247,11 @@ class ScatterPlotGlowOverlay extends PureComponent {
 
             gradient.addColorStop(
               1,
-              `rgba(${rgb[1]}, ${rgb[2]}, ${rgb[3]}, ${0.8 * globalOpacity})`,
+              `rgba(${rgb![1]}, ${rgb![2]}, ${rgb![3]}, ${0.8 * (globalOpacity ?? 1)})`,
             );
             gradient.addColorStop(
               0,
-              `rgba(${rgb[1]}, ${rgb[2]}, ${rgb[3]}, 0)`,
+              `rgba(${rgb![1]}, ${rgb![2]}, ${rgb![3]}, 0)`,
             );
             ctx.arc(
               pixelRounded[0],
@@ -218,11 +263,11 @@ class ScatterPlotGlowOverlay extends PureComponent {
             ctx.fillStyle = gradient;
             ctx.fill();
 
-            if (Number.isFinite(parseFloat(clusterLabel))) {
-              if (clusterLabel >= 10000) {
-                clusterLabel = `${Math.round(clusterLabel / 1000)}k`;
-              } else if (clusterLabel >= 1000) {
-                clusterLabel = `${Math.round(clusterLabel / 100) / 10}k`;
+            if (Number.isFinite(parseFloat(String(clusterLabel)))) {
+              if ((clusterLabel as number) >= 10000) {
+                clusterLabel = `${Math.round((clusterLabel as number) / 1000)}k`;
+              } else if ((clusterLabel as number) >= 1000) {
+                clusterLabel = `${Math.round((clusterLabel as number) / 100) / 10}k`;
               }
               this.drawText(ctx, pixelRounded, {
                 fontHeight,
@@ -234,23 +279,28 @@ class ScatterPlotGlowOverlay extends PureComponent {
             }
           } else {
             const defaultRadius = radius / 6;
-            const radiusProperty = location.properties.radius;
-            const pointMetric = location.properties.metric;
-            let pointRadius =
-              radiusProperty === null ? defaultRadius : radiusProperty;
-            let pointLabel;
+            const radiusProperty = location.properties.radius as number | null;
+            const pointMetric = location.properties.metric as
+              | number
+              | string
+              | null;
+            let pointRadius: number =
+              radiusProperty === null
+                ? defaultRadius
+                : (radiusProperty as number);
+            let pointLabel: string | number | undefined;
 
             if (radiusProperty !== null) {
-              const pointLatitude = lngLatAccessor(location)[1];
+              const pointLatitude = lngLatAccessor!(location)[1];
               if (pointRadiusUnit === 'Kilometers') {
                 pointLabel = `${roundDecimal(pointRadius, 2)}km`;
-                pointRadius = kmToPixels(pointRadius, pointLatitude, zoom);
+                pointRadius = kmToPixels(pointRadius, pointLatitude, zoom ?? 0);
               } else if (pointRadiusUnit === 'Miles') {
                 pointLabel = `${roundDecimal(pointRadius, 2)}mi`;
                 pointRadius = kmToPixels(
                   pointRadius * MILES_PER_KM,
                   pointLatitude,
-                  zoom,
+                  zoom ?? 0,
                 );
               } else if (pointRadiusUnit === 'Pixels') {
                 // Scale pixel values to a reasonable range (radius/6 to radius/3)
@@ -280,29 +330,29 @@ class ScatterPlotGlowOverlay extends PureComponent {
                       MIN_POINT_RADIUS +
                       normalizedValue * (MAX_POINT_RADIUS - MIN_POINT_RADIUS);
                   }
-                  pointLabel = `${roundDecimal(radiusProperty, 2)}`;
+                  pointLabel = `${roundDecimal(radiusProperty as number, 2)}`;
                 } else if (
                   Number.isFinite(minRadiusValue) &&
                   minRadiusValue === maxRadiusValue
                 ) {
                   // All values are the same, use a fixed medium size
                   pointRadius = (MIN_POINT_RADIUS + MAX_POINT_RADIUS) / 2;
-                  pointLabel = `${roundDecimal(radiusProperty, 2)}`;
+                  pointLabel = `${roundDecimal(radiusProperty as number, 2)}`;
                 } else {
                   // Use raw pixel values if they're already in a reasonable range
                   pointRadius = Math.max(
                     MIN_POINT_RADIUS,
                     Math.min(pointRadius, MAX_POINT_RADIUS),
                   );
-                  pointLabel = `${roundDecimal(radiusProperty, 2)}`;
+                  pointLabel = `${roundDecimal(radiusProperty as number, 2)}`;
                 }
               }
             }
 
             if (pointMetric !== null) {
-              pointLabel = Number.isFinite(parseFloat(pointMetric))
-                ? roundDecimal(pointMetric, 2)
-                : pointMetric;
+              pointLabel = Number.isFinite(parseFloat(String(pointMetric)))
+                ? roundDecimal(pointMetric as number, 2)
+                : (pointMetric as string);
             }
 
             // Fall back to default points if pointRadius wasn't a numerical column
@@ -317,7 +367,7 @@ class ScatterPlotGlowOverlay extends PureComponent {
               0,
               Math.PI * 2,
             );
-            ctx.fillStyle = `rgba(${rgb[1]}, ${rgb[2]}, ${rgb[3]}, ${globalOpacity})`;
+            ctx.fillStyle = `rgba(${rgb![1]}, ${rgb![2]}, ${rgb![3]}, ${globalOpacity})`;
             ctx.fill();
 
             if (pointLabel !== undefined) {
@@ -340,7 +390,4 @@ class ScatterPlotGlowOverlay extends PureComponent {
   }
 }
 
-ScatterPlotGlowOverlay.propTypes = propTypes;
-ScatterPlotGlowOverlay.defaultProps = defaultProps;
-
 export default ScatterPlotGlowOverlay;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/index.js b/superset-frontend/plugins/legacy-plugin-chart-map-box/src/index.ts
similarity index 92%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/src/index.js
rename to superset-frontend/plugins/legacy-plugin-chart-map-box/src/index.ts
index af58b4e70b1..595387721da 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/index.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-map-box/src/index.ts
@@ -31,8 +31,8 @@ const metadata = new ChartMetadata({
   credits: ['https://www.mapbox.com/mapbox-gl-js/api/'],
   description: '',
   exampleGallery: [
-    { url: example1, urlDark: example1Dark, description: t('Light mode') },
-    { url: example2, urlDark: example2Dark, description: t('Dark mode') },
+    { url: example1, urlDark: example1Dark, caption: t('Light mode') },
+    { url: example2, urlDark: example2Dark, caption: t('Dark mode') },
   ],
   name: t('MapBox'),
   tags: [
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/transformProps.js b/superset-frontend/plugins/legacy-plugin-chart-map-box/src/transformProps.ts
similarity index 79%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/src/transformProps.js
rename to superset-frontend/plugins/legacy-plugin-chart-map-box/src/transformProps.ts
index 14a5581926b..caaeb9b3f55 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/transformProps.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-map-box/src/transformProps.ts
@@ -16,12 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import Supercluster from 'supercluster';
+import Supercluster, {
+  type Options as SuperclusterOptions,
+} from 'supercluster';
+import { ChartProps } from '@superset-ui/core';
 import { DEFAULT_POINT_RADIUS, DEFAULT_MAX_ZOOM } from './MapBox';
 
 const NOOP = () => {};
 
-export default function transformProps(chartProps) {
+interface ClusterProperties {
+  metric: number;
+  sum: number;
+  squaredSum: number;
+  min: number;
+  max: number;
+}
+
+export default function transformProps(chartProps: ChartProps) {
   const { width, height, formData, hooks, queriesData } = chartProps;
   const { onError = NOOP, setControlValue = NOOP } = hooks;
   const { bounds, geoJSON, hasCustomMetric, mapboxApiKey } =
@@ -32,7 +43,6 @@ export default function transformProps(chartProps) {
     mapboxColor,
     mapboxStyle,
     pandasAggfunc,
-    pointRadius,
     pointRadiusUnit,
     renderWhileDragging,
   } = formData;
@@ -45,24 +55,26 @@ export default function transformProps(chartProps) {
     return {};
   }
 
-  const opts = {
+  const opts: SuperclusterOptions<ClusterProperties, ClusterProperties> = {
     maxZoom: DEFAULT_MAX_ZOOM,
     radius: clusteringRadius,
   };
   if (hasCustomMetric) {
     opts.initial = () => ({
+      metric: 0,
       sum: 0,
       squaredSum: 0,
       min: Infinity,
       max: -Infinity,
     });
-    opts.map = prop => ({
+    opts.map = (prop: ClusterProperties) => ({
+      metric: prop.metric,
       sum: prop.metric,
       squaredSum: prop.metric ** 2,
       min: prop.metric,
       max: prop.metric,
     });
-    opts.reduce = (accu, prop) => {
+    opts.reduce = (accu: ClusterProperties, prop: ClusterProperties) => {
       // Temporarily disable param-reassignment linting to work with supercluster's api
       /* eslint-disable no-param-reassign */
       accu.sum += prop.sum;
@@ -85,7 +97,15 @@ export default function transformProps(chartProps) {
     hasCustomMetric,
     mapboxApiKey,
     mapStyle: mapboxStyle,
-    onViewportChange({ latitude, longitude, zoom }) {
+    onViewportChange({
+      latitude,
+      longitude,
+      zoom,
+    }: {
+      latitude: number;
+      longitude: number;
+      zoom: number;
+    }) {
       setControlValue('viewport_longitude', longitude);
       setControlValue('viewport_latitude', latitude);
       setControlValue('viewport_zoom', zoom);
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/utils/geo.js b/superset-frontend/plugins/legacy-plugin-chart-map-box/src/utils/geo.ts
similarity index 92%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/src/utils/geo.js
rename to superset-frontend/plugins/legacy-plugin-chart-map-box/src/utils/geo.ts
index d2e48a65f6d..cfb434db475 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/utils/geo.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-map-box/src/utils/geo.ts
@@ -22,7 +22,11 @@ import roundDecimal from './roundDecimal';
 export const EARTH_CIRCUMFERENCE_KM = 40075.16;
 export const MILES_PER_KM = 1.60934;
 
-export function kmToPixels(kilometers, latitude, zoomLevel) {
+export function kmToPixels(
+  kilometers: number,
+  latitude: number,
+  zoomLevel: number,
+): number {
   // Algorithm from: http://wiki.openstreetmap.org/wiki/Zoom_levels
   const latitudeRad = latitude * (Math.PI / 180);
   // Seems like the zoomLevel is off by one
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/utils/luminanceFromRGB.js b/superset-frontend/plugins/legacy-plugin-chart-map-box/src/utils/luminanceFromRGB.ts
similarity index 92%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/src/utils/luminanceFromRGB.js
rename to superset-frontend/plugins/legacy-plugin-chart-map-box/src/utils/luminanceFromRGB.ts
index 545d6b04ec7..3ab019130af 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/utils/luminanceFromRGB.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-map-box/src/utils/luminanceFromRGB.ts
@@ -21,7 +21,11 @@ export const LUMINANCE_RED_WEIGHT = 0.2126;
 export const LUMINANCE_GREEN_WEIGHT = 0.7152;
 export const LUMINANCE_BLUE_WEIGHT = 0.0722;
 
-export default function luminanceFromRGB(r, g, b) {
+export default function luminanceFromRGB(
+  r: number,
+  g: number,
+  b: number,
+): number {
   // Formula: https://en.wikipedia.org/wiki/Relative_luminance
   return (
     LUMINANCE_RED_WEIGHT * r +
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/types/external.d.ts b/superset-frontend/plugins/legacy-plugin-chart-map-box/types/external.d.ts
new file mode 100644
index 00000000000..89134501f25
--- /dev/null
+++ b/superset-frontend/plugins/legacy-plugin-chart-map-box/types/external.d.ts
@@ -0,0 +1,101 @@
+/**
+ * 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 '*.png' {
+  const value: string;
+  export default value;
+}
+
+declare module '*.jpg' {
+  const value: string;
+  export default value;
+}
+
+declare module 'supercluster' {
+  interface Options<P = Record<string, unknown>, C = Record<string, unknown>> {
+    minZoom?: number;
+    maxZoom?: number;
+    minPoints?: number;
+    radius?: number;
+    extent?: number;
+    nodeSize?: number;
+    log?: boolean;
+    initial?: () => C;
+    map?: (props: P) => C;
+    reduce?: (accumulated: C, props: C) => void;
+  }
+
+  interface GeoJSONFeature {
+    type: string;
+    geometry: {
+      type: string;
+      coordinates: [number, number];
+    };
+    properties: Record<string, unknown>;
+  }
+
+  class Supercluster<P = Record<string, unknown>, C = Record<string, unknown>> {
+    constructor(options?: Options<P, C>);
+    load(points: GeoJSONFeature[]): Supercluster<P, C>;
+    getClusters(bbox: number[], zoom: number): GeoJSONFeature[];
+    getTile(z: number, x: number, y: number): GeoJSONFeature[] | null;
+    getChildren(clusterId: number): GeoJSONFeature[];
+    getLeaves(
+      clusterId: number,
+      limit?: number,
+      offset?: number,
+    ): GeoJSONFeature[];
+    getClusterExpansionZoom(clusterId: number): number;
+  }
+
+  export default Supercluster;
+  export { Options, GeoJSONFeature };
+}
+
+declare module 'react-map-gl' {
+  import { Component, ReactNode } from 'react';
+
+  interface MapGLProps {
+    width?: number;
+    height?: number;
+    latitude?: number;
+    longitude?: number;
+    zoom?: number;
+    mapStyle?: string;
+    mapboxApiAccessToken?: string;
+    onViewportChange?: Function;
+    preserveDrawingBuffer?: boolean;
+    children?: ReactNode;
+    [key: string]: unknown;
+  }
+
+  export default class MapGL extends Component<MapGLProps> {}
+
+  interface CanvasOverlayProps {
+    redraw: (params: {
+      width: number;
+      height: number;
+      ctx: CanvasRenderingContext2D;
+      isDragging: boolean;
+      project: (lngLat: [number, number]) => [number, number];
+    }) => void;
+  }
+
+  export class CanvasOverlay extends Component<CanvasOverlayProps> {}
+}
diff --git a/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/PairedTTest.jsx b/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/PairedTTest.tsx
similarity index 86%
rename from superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/PairedTTest.jsx
rename to superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/PairedTTest.tsx
index e3c4812a609..65f94ea66b7 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/PairedTTest.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/PairedTTest.tsx
@@ -17,20 +17,19 @@
  * under the License.
  */
 /* eslint-disable react/no-array-index-key */
-import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 import { styled } from '@apache-superset/core/ui';
-import TTestTable, { dataPropType } from './TTestTable';
-
-const propTypes = {
-  alpha: PropTypes.number,
-  className: PropTypes.string,
-  data: PropTypes.objectOf(dataPropType).isRequired,
-  groups: PropTypes.arrayOf(PropTypes.string).isRequired,
-  liftValPrec: PropTypes.number,
-  metrics: PropTypes.arrayOf(PropTypes.string).isRequired,
-  pValPrec: PropTypes.number,
-};
+import TTestTable, { DataEntry } from './TTestTable';
+
+interface PairedTTestProps {
+  alpha: number;
+  className: string;
+  data: Record<string, DataEntry[]>;
+  groups: string[];
+  liftValPrec: number;
+  metrics: string[];
+  pValPrec: number;
+}
 
 const defaultProps = {
   alpha: 0.05,
@@ -115,7 +114,9 @@ const StyledDiv = styled.div`
   `}
 `;
 
-class PairedTTest extends PureComponent {
+class PairedTTest extends PureComponent<PairedTTestProps> {
+  static defaultProps = defaultProps;
+
   render() {
     const { className, metrics, groups, data, alpha, pValPrec, liftValPrec } =
       this.props;
@@ -144,7 +145,4 @@ class PairedTTest extends PureComponent {
   }
 }
 
-PairedTTest.propTypes = propTypes;
-PairedTTest.defaultProps = defaultProps;
-
 export default PairedTTest;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/TTestTable.jsx b/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/TTestTable.tsx
similarity index 82%
rename from superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/TTestTable.jsx
rename to superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/TTestTable.tsx
index 9bbaccc432e..abc2a2ccff2 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/TTestTable.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/TTestTable.tsx
@@ -20,28 +20,31 @@
 import dist from 'distributions';
 import { Component } from 'react';
 import { Table, Tr, Td, Thead, Th } from 'reactable';
-import PropTypes from 'prop-types';
 
-export const dataPropType = PropTypes.arrayOf(
-  PropTypes.shape({
-    group: PropTypes.arrayOf(PropTypes.string),
-    values: PropTypes.arrayOf(
-      PropTypes.shape({
-        x: PropTypes.number,
-        y: PropTypes.number,
-      }),
-    ),
-  }),
-);
+interface DataPointValue {
+  x: number;
+  y: number;
+}
 
-const propTypes = {
-  alpha: PropTypes.number,
-  data: dataPropType.isRequired,
-  groups: PropTypes.arrayOf(PropTypes.string).isRequired,
-  liftValPrec: PropTypes.number,
-  metric: PropTypes.string.isRequired,
-  pValPrec: PropTypes.number,
-};
+export interface DataEntry {
+  group: string[];
+  values: DataPointValue[];
+}
+
+interface TTestTableProps {
+  alpha: number;
+  data: DataEntry[];
+  groups: string[];
+  liftValPrec: number;
+  metric: string;
+  pValPrec: number;
+}
+
+interface TTestTableState {
+  control: number;
+  liftValues: (string | number)[];
+  pValues: (string | number)[];
+}
 
 const defaultProps = {
   alpha: 0.05,
@@ -49,8 +52,10 @@ const defaultProps = {
   pValPrec: 6,
 };
 
-class TTestTable extends Component {
-  constructor(props) {
+class TTestTable extends Component<TTestTableProps, TTestTableState> {
+  static defaultProps = defaultProps;
+
+  constructor(props: TTestTableProps) {
     super(props);
     this.state = {
       control: 0,
@@ -64,7 +69,7 @@ class TTestTable extends Component {
     this.computeTTest(control); // initially populate table
   }
 
-  getLiftStatus(row) {
+  getLiftStatus(row: number): string {
     const { control, liftValues } = this.state;
     // Get a css class name for coloring
     if (row === control) {
@@ -75,10 +80,10 @@ class TTestTable extends Component {
       return 'invalid'; // infinite or NaN values
     }
 
-    return liftVal >= 0 ? 'true' : 'false'; // green on true, red on false
+    return Number(liftVal) >= 0 ? 'true' : 'false'; // green on true, red on false
   }
 
-  getPValueStatus(row) {
+  getPValueStatus(row: number): string {
     const { control, pValues } = this.state;
     if (row === control) {
       return 'control';
@@ -91,7 +96,7 @@ class TTestTable extends Component {
     return ''; // p-values won't normally be colored
   }
 
-  getSignificance(row) {
+  getSignificance(row: number): string | boolean {
     const { control, pValues } = this.state;
     const { alpha } = this.props;
     // Color significant as green, else red
@@ -100,10 +105,10 @@ class TTestTable extends Component {
     }
 
     // p-values significant below set threshold
-    return pValues[row] <= alpha;
+    return Number(pValues[row]) <= alpha;
   }
 
-  computeLift(values, control) {
+  computeLift(values: DataPointValue[], control: DataPointValue[]): string {
     const { liftValPrec } = this.props;
     // Compute the lift value between two time series
     let sumValues = 0;
@@ -116,7 +121,10 @@ class TTestTable extends Component {
     return (((sumValues - sumControl) / sumControl) * 100).toFixed(liftValPrec);
   }
 
-  computePValue(values, control) {
+  computePValue(
+    values: DataPointValue[],
+    control: DataPointValue[],
+  ): string | number {
     const { pValPrec } = this.props;
     // Compute the p-value from Student's t-test
     // between two time series
@@ -147,12 +155,12 @@ class TTestTable extends Component {
     }
   }
 
-  computeTTest(control) {
+  computeTTest(control: number) {
     // Compute lift and p-values for each row
     // against the selected control
     const { data } = this.props;
-    const pValues = [];
-    const liftValues = [];
+    const pValues: (string | number)[] = [];
+    const liftValues: (string | number)[] = [];
     if (!data) {
       return;
     }
@@ -242,10 +250,13 @@ class TTestTable extends Component {
       );
     });
     // When sorted ascending, 'control' will always be at top
-    const sortConfig = groups.concat([
+    type SortConfigItem =
+      | string
+      | { column: string; sortFunction: (a: string, b: string) => number };
+    const sortConfig: SortConfigItem[] = (groups as SortConfigItem[]).concat([
       {
         column: 'pValue',
-        sortFunction: (a, b) => {
+        sortFunction: (a: string, b: string) => {
           if (a === 'control') {
             return -1;
           }
@@ -258,7 +269,7 @@ class TTestTable extends Component {
       },
       {
         column: 'liftValue',
-        sortFunction: (a, b) => {
+        sortFunction: (a: string, b: string) => {
           if (a === 'control') {
             return -1;
           }
@@ -271,7 +282,7 @@ class TTestTable extends Component {
       },
       {
         column: 'significant',
-        sortFunction: (a, b) => {
+        sortFunction: (a: string, b: string) => {
           if (a === 'control') {
             return -1;
           }
@@ -296,7 +307,4 @@ class TTestTable extends Component {
   }
 }
 
-TTestTable.propTypes = propTypes;
-TTestTable.defaultProps = defaultProps;
-
 export default TTestTable;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/index.js b/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/index.js
rename to superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/index.ts
diff --git a/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/transformProps.js b/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/transformProps.ts
similarity index 80%
rename from superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/transformProps.js
rename to superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/transformProps.ts
index 73027a54a22..4decf04962c 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/transformProps.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/transformProps.ts
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-export default function transformProps(chartProps) {
+import { ChartProps } from '@superset-ui/core';
+
+export default function transformProps(chartProps: ChartProps) {
   const { formData, queriesData } = chartProps;
   const {
     groupby,
@@ -31,8 +33,9 @@ export default function transformProps(chartProps) {
     data: queriesData[0].data,
     groups: groupby,
     liftValPrec: parseInt(liftvaluePrecision, 10),
-    metrics: metrics.map(metric =>
-      typeof metric === 'string' ? metric : metric.label,
+    metrics: (metrics as (string | { label: string })[]).map(
+      (metric: string | { label: string }) =>
+        typeof metric === 'string' ? metric : metric.label,
     ),
     pValPrec: parseInt(pvaluePrecision, 10),
   };
diff --git a/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/types/external.d.ts b/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/types/external.d.ts
new file mode 100644
index 00000000000..40dbbf9ccbd
--- /dev/null
+++ b/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/types/external.d.ts
@@ -0,0 +1,83 @@
+/**
+ * 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 '*.png' {
+  const value: string;
+  export default value;
+}
+
+declare module '*.jpg' {
+  const value: string;
+  export default value;
+}
+
+declare module 'distributions' {
+  class Studentt {
+    constructor(degreesOfFreedom: number);
+    cdf(x: number): number;
+  }
+  const dist: {
+    Studentt: typeof Studentt;
+  };
+  export default dist;
+}
+
+declare module 'reactable' {
+  import { ComponentType, ReactNode } from 'react';
+
+  interface TableProps {
+    className?: string;
+    id?: string;
+    sortable?: (
+      | string
+      | {
+          column: string;
+          sortFunction: (a: string, b: string) => number;
+        }
+    )[];
+    children?: ReactNode;
+  }
+
+  interface TrProps {
+    className?: string;
+    onClick?: () => void;
+    children?: ReactNode;
+  }
+
+  interface TdProps {
+    className?: string;
+    column?: string;
+    data?: string | number | boolean;
+    children?: ReactNode;
+  }
+
+  interface ThProps {
+    column?: string;
+    children?: ReactNode;
+  }
+
+  interface TheadProps {
+    children?: ReactNode;
+  }
+
+  export const Table: ComponentType<TableProps>;
+  export const Tr: ComponentType<TrProps>;
+  export const Td: ComponentType<TdProps>;
+  export const Th: ComponentType<ThProps>;
+  export const Thead: ComponentType<TheadProps>;
+}
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ParallelCoordinates.js b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ParallelCoordinates.ts
similarity index 64%
rename from superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ParallelCoordinates.js
rename to superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ParallelCoordinates.ts
index c2970979eb7..67ae1c2686c 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ParallelCoordinates.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ParallelCoordinates.ts
@@ -18,26 +18,46 @@
  */
 /* eslint-disable react/sort-prop-types */
 import * as d3 from 'd3v3';
-import PropTypes from 'prop-types';
 import { getSequentialSchemeRegistry } from '@superset-ui/core';
 
 import parcoords from './vendor/parcoords/d3.parcoords';
 import divgrid from './vendor/parcoords/divgrid';
 
-const propTypes = {
-  // Standard tabular data [{ fieldName1: value1, fieldName2: value2 }]
-  data: PropTypes.arrayOf(PropTypes.object),
-  width: PropTypes.number,
-  height: PropTypes.number,
-  colorMetric: PropTypes.string,
-  includeSeries: PropTypes.bool,
-  linearColorScheme: PropTypes.string,
-  metrics: PropTypes.arrayOf(PropTypes.string),
-  series: PropTypes.string,
-  showDatatable: PropTypes.bool,
-};
+interface ParcoordChart {
+  width(w: number): ParcoordChart;
+  height(h: number): ParcoordChart;
+  color(c: Function): ParcoordChart;
+  alpha(a: number): ParcoordChart;
+  composite(c: string): ParcoordChart;
+  data(d: Record<string, unknown>[]): ParcoordChart;
+  dimensions(cols: string[]): ParcoordChart;
+  types(t: Record<string, string>): ParcoordChart;
+  render(): ParcoordChart;
+  createAxes(): ParcoordChart;
+  shadows(): ParcoordChart;
+  reorderable(): ParcoordChart;
+  brushMode(mode: string): ParcoordChart;
+  highlight(d: Record<string, unknown>[]): void;
+  unhighlight(): void;
+  on(event: string, callback: Function): void;
+}
+
+interface ParallelCoordinatesProps {
+  data: Record<string, unknown>[];
+  width: number;
+  height: number;
+  colorMetric: string;
+  includeSeries: boolean;
+  linearColorScheme: string;
+  metrics: string[];
+  series: string;
+  showDatatable: boolean;
+}
 
-function ParallelCoordinates(element, props) {
+function ParallelCoordinates(
+  element: HTMLElement,
+  props: ParallelCoordinatesProps,
+) {
   const {
     data,
     width,
@@ -52,7 +72,7 @@ function ParallelCoordinates(element, props) {
 
   const cols = includeSeries ? [series].concat(metrics) : metrics;
 
-  const ttypes = {};
+  const ttypes: Record<string, string> = {};
   ttypes[series] = 'string';
   metrics.forEach(v => {
     ttypes[v] = 'number';
@@ -61,9 +81,15 @@ function ParallelCoordinates(element, props) {
   const colorScale = colorMetric
     ? getSequentialSchemeRegistry()
         .get(linearColorScheme)
-        .createLinearScale(d3.extent(data, d => d[colorMetric]))
+        ?.createLinearScale(
+          d3.extent(
+            data,
+            (d: Record<string, unknown>) => d[colorMetric] as number,
+          ),
+        )
     : () => 'grey';
-  const color = d => colorScale(d[colorMetric]);
+  const color = (d: Record<string, unknown>) =>
+    (colorScale as Function)(d[colorMetric]);
   const container = d3
     .select(element)
     .classed('superset-legacy-chart-parallel-coordinates', true);
@@ -75,7 +101,7 @@ function ParallelCoordinates(element, props) {
     .style('height', `${effHeight}px`)
     .classed('parcoords', true);
 
-  const chart = parcoords()(div.node())
+  const chart = (parcoords()(div.node()) as unknown as ParcoordChart)
     .width(width)
     .color(color)
     .alpha(0.5)
@@ -101,19 +127,19 @@ function ParallelCoordinates(element, props) {
       .classed('parcoords grid', true)
       .selectAll('.row')
       .on({
-        mouseover(d) {
+        mouseover(d: Record<string, unknown>) {
           chart.highlight([d]);
         },
         mouseout: chart.unhighlight,
       });
     // update data table on brush event
-    chart.on('brush', d => {
+    chart.on('brush', (d: Record<string, unknown>[]) => {
       d3.select('.grid')
         .datum(d)
         .call(grid)
         .selectAll('.row')
         .on({
-          mouseover(dd) {
+          mouseover(dd: Record<string, unknown>) {
             chart.highlight([dd]);
           },
           mouseout: chart.unhighlight,
@@ -123,6 +149,5 @@ function ParallelCoordinates(element, props) {
 }
 
 ParallelCoordinates.displayName = 'ParallelCoordinates';
-ParallelCoordinates.propTypes = propTypes;
 
 export default ParallelCoordinates;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ReactParallelCoordinates.jsx b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ReactParallelCoordinates.tsx
similarity index 88%
rename from superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ReactParallelCoordinates.jsx
rename to superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ReactParallelCoordinates.tsx
index 7bd02eed42f..6f989daa1ae 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ReactParallelCoordinates.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ReactParallelCoordinates.tsx
@@ -16,23 +16,30 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { type ComponentProps } from 'react';
 import { reactify, addAlpha } from '@superset-ui/core';
 import { styled } from '@apache-superset/core/ui';
-import PropTypes from 'prop-types';
 import Component from './ParallelCoordinates';
 
 const ReactComponent = reactify(Component);
 
-const ParallelCoordinates = ({ className, ...otherProps }) => (
+interface ParallelCoordinatesWrapperProps {
+  className?: string;
+  [key: string]: unknown;
+}
+
+const ParallelCoordinates = ({
+  className,
+  ...otherProps
+}: ParallelCoordinatesWrapperProps) => (
   <div className={className}>
-    <ReactComponent {...otherProps} />
+    {/* Props are injected by the chart framework at runtime */}
+    <ReactComponent
+      {...(otherProps as unknown as ComponentProps<typeof ReactComponent>)}
+    />
   </div>
 );
 
-ParallelCoordinates.propTypes = {
-  className: PropTypes.string.isRequired,
-};
-
 export default styled(ParallelCoordinates)`
   ${({ theme }) => `
     .superset-legacy-chart-parallel-coordinates {
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/index.js b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/index.js
rename to superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/index.ts
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/transformProps.js b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/transformProps.ts
similarity index 84%
rename from superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/transformProps.js
rename to superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/transformProps.ts
index 5d9a1457533..afb4759bf88 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/transformProps.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/transformProps.ts
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-export default function transformProps(chartProps) {
+import { ChartProps } from '@superset-ui/core';
+
+export default function transformProps(chartProps: ChartProps) {
   const { width, height, formData, queriesData } = chartProps;
   const {
     includeSeries,
@@ -33,7 +35,9 @@ export default function transformProps(chartProps) {
     data: queriesData[0].data,
     includeSeries,
     linearColorScheme,
-    metrics: metrics.map(m => m.label || m),
+    metrics: metrics.map((m: { label?: string } | string) =>
+      typeof m === 'string' ? m : m.label || m,
+    ),
     colorMetric:
       secondaryMetric && secondaryMetric.label
         ? secondaryMetric.label
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/vendor/parcoords/d3.parcoords.js b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/vendor/parcoords/d3.parcoords.ts
similarity index 99%
rename from superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/vendor/parcoords/d3.parcoords.js
rename to superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/vendor/parcoords/d3.parcoords.ts
index 69652a8111c..e6c324daf1d 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/vendor/parcoords/d3.parcoords.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/vendor/parcoords/d3.parcoords.ts
@@ -1,6 +1,7 @@
 /* [LICENSE TBD] */
+// @ts-nocheck
 /* eslint-disable */
-export default function (config) {
+export default function (config?) {
   var __ = {
     data: [],
     highlighted: [],
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/vendor/parcoords/divgrid.js b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/vendor/parcoords/divgrid.ts
similarity index 96%
rename from superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/vendor/parcoords/divgrid.js
rename to superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/vendor/parcoords/divgrid.ts
index 2d79761ebd5..92f86192120 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/vendor/parcoords/divgrid.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/vendor/parcoords/divgrid.ts
@@ -1,7 +1,8 @@
 /* [LICENSE TBD] */
+// @ts-nocheck
 /* eslint-disable */
 // from http://bl.ocks.org/3687826
-export default function (config) {
+export default function (config?) {
   var columns = [];
 
   var dg = function (selection) {
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3-parcoords.d.ts b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3-parcoords.d.ts
index e8026f2e2ac..91aa2e2c4b4 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3-parcoords.d.ts
+++ b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3-parcoords.d.ts
@@ -16,7 +16,31 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-declare module 'src/vendor/parcoords/d3.parcoords' {
-  const parcoords: any;
+declare module './vendor/parcoords/d3.parcoords' {
+  function parcoords(config?: Record<string, unknown>): (
+    selection: Element | null,
+  ) => Record<string, Function> & {
+    width: Function;
+    height: Function;
+    color: Function;
+    alpha: Function;
+    composite: Function;
+    data: Function;
+    dimensions: Function;
+    types: Function;
+    render: Function;
+    createAxes: Function;
+    shadows: Function;
+    reorderable: Function;
+    brushMode: Function;
+    highlight: Function;
+    unhighlight: Function;
+    on: Function;
+  };
   export default parcoords;
 }
+
+declare module './vendor/parcoords/divgrid' {
+  function divgrid(config?: Record<string, unknown>): Function;
+  export default divgrid;
+}
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
index 34a150e873e..934fe411c68 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
+++ b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
@@ -17,6 +17,6 @@
  * under the License.
  */
 declare module 'd3' {
-  const d3: any;
+  const d3: Record<string, Function>;
   export = d3;
 }
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/external.d.ts
similarity index 79%
copy from superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
copy to superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/external.d.ts
index 34a150e873e..3143530e5dc 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
+++ b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/external.d.ts
@@ -16,7 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-declare module 'd3' {
-  const d3: any;
+
+declare module '*.png' {
+  const value: string;
+  export default value;
+}
+
+declare module '*.jpg' {
+  const value: string;
+  export default value;
+}
+
+declare module 'd3v3' {
+  const d3: Record<string, Function>;
   export = d3;
 }
diff --git a/superset-frontend/plugins/legacy-plugin-chart-partition/src/Partition.js b/superset-frontend/plugins/legacy-plugin-chart-partition/src/Partition.ts
similarity index 84%
rename from superset-frontend/plugins/legacy-plugin-chart-partition/src/Partition.js
rename to superset-frontend/plugins/legacy-plugin-chart-partition/src/Partition.ts
index fddc0f928d8..db5d47726a8 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-partition/src/Partition.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-partition/src/Partition.ts
@@ -17,27 +17,67 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+// @ts-nocheck -- Legacy D3 visualization using d3-hierarchy v1 APIs without proper type definitions.
+// Uses the same approach as NVD3Vis.ts and other heavily D3-dependent files.
 /* eslint no-param-reassign: [2, {"props": false}] */
 import d3 from 'd3';
 import PropTypes from 'prop-types';
-import { hierarchy } from 'd3-hierarchy';
+import { hierarchy, HierarchyNode } from 'd3-hierarchy';
 import {
   getNumberFormatter,
   getTimeFormatter,
   CategoricalColorNamespace,
 } from '@superset-ui/core';
 
+interface PartitionDataNode {
+  name: string;
+  val: number;
+  children?: PartitionDataNode[];
+}
+
+interface PartitionNode extends HierarchyNode<PartitionDataNode> {
+  x: number;
+  dx: number;
+  y: number;
+  dy: number;
+  weight: number;
+  sum: number;
+  name: string;
+  disp: string | number;
+  color: string;
+  children?: PartitionNode[];
+  parent: PartitionNode | null;
+}
+
+interface IcicleProps {
+  data: PartitionDataNode[];
+  width: number;
+  height: number;
+  colorScheme: string;
+  dateTimeFormat: string;
+  equalDateSize: boolean;
+  levels: string[];
+  metrics: (string | Record<string, unknown>)[];
+  numberFormat: string;
+  partitionLimit: number;
+  partitionThreshold: number;
+  timeSeriesOption: string;
+  useLogScale: boolean;
+  useRichTooltip: boolean;
+  sliceId: number;
+}
+
 // Compute dx, dy, x, y for each node and
 // return an array of nodes in breadth-first order
-function init(root) {
-  const flat = [];
+function init(root: PartitionNode): PartitionNode[] {
+  const flat: PartitionNode[] = [];
   const dy = 1 / (root.height + 1);
-  let prev = null;
-  root.each(n => {
+  let prev: PartitionNode | null = null;
+  root.each((n: PartitionNode) => {
     n.y = dy * n.depth;
     n.dy = dy;
     if (n.parent) {
-      n.x = prev.depth === n.parent.depth ? 0 : prev.x + prev.dx;
+      n.x = prev!.depth === n.parent.depth ? 0 : prev!.x + prev!.dx;
       n.dx = (n.weight / n.parent.sum) * n.parent.dx;
     } else {
       n.x = 0;
@@ -52,8 +92,11 @@ function init(root) {
 
 // Declare PropTypes for recursive data structures
 // https://github.com/facebook/react/issues/5676
-/* eslint-disable-next-line  no-undef */
-const lazyFunction = f => () => f().apply(this, arguments);
+// eslint-disable-next-line func-names
+const lazyFunction = (f: () => Record<string, unknown>) =>
+  function (...args: unknown[]) {
+    return f().apply(this, args);
+  };
 const leafType = PropTypes.shape({
   name: PropTypes.string,
   val: PropTypes.number.isRequired,
@@ -89,9 +132,9 @@ const propTypes = {
   useRichTooltip: PropTypes.bool,
 };
 
-function getAncestors(d) {
-  const ancestors = [d];
-  let node = d;
+function getAncestors(d: PartitionNode): PartitionNode[] {
+  const ancestors: PartitionNode[] = [d];
+  let node: PartitionNode = d;
   while (node.parent) {
     ancestors.push(node.parent);
     node = node.parent;
@@ -102,7 +145,7 @@ function getAncestors(d) {
 
 // This vis is based on
 // http://mbostock.github.io/d3/talk/20111018/partition.html
-function Icicle(element, props) {
+function Icicle(element: HTMLElement, props: IcicleProps): void {
   const {
     width,
     height,
@@ -134,11 +177,11 @@ function Icicle(element, props) {
   div.selectAll('*').remove();
   const tooltip = div.append('div').classed('partition-tooltip', true);
 
-  function hasDateNode(n) {
+  function hasDateNode(n: PartitionNode): boolean {
     return metrics.includes(n.data.name) && hasTime;
   }
 
-  function getCategory(depth) {
+  function getCategory(depth: number): string {
     if (!depth) {
       return 'Metric';
     }
@@ -149,7 +192,7 @@ function Icicle(element, props) {
     return levels[depth - (hasTime ? 2 : 1)];
   }
 
-  function drawVis(i, dat) {
+  function drawVis(i: number, dat: PartitionDataNode[]): void {
     const datum = dat[i];
     const w = width;
     const h = height / data.length;
@@ -262,7 +305,10 @@ function Icicle(element, props) {
         : 1;
     });
 
-    function positionAndPopulate(tip, d) {
+    function positionAndPopulate(
+      tip: ReturnType<typeof div.append>,
+      d: PartitionNode,
+    ): void {
       let t = '<table>';
       if (useRichTooltip) {
         const nodes = getAncestors(d);
@@ -310,7 +356,7 @@ function Icicle(element, props) {
     let zoomY = h / 1;
 
     // Keep text centered in its division
-    function transform(d) {
+    function transform(d: PartitionNode): string {
       return `translate(8,${(d.dx * zoomY) / 2})`;
     }
 
@@ -332,7 +378,7 @@ function Icicle(element, props) {
       });
 
     // When clicking a subdivision, the vis will zoom into it
-    function click(d) {
+    function click(d: PartitionNode): boolean {
       if (!d.children) {
         if (d.parent) {
           // Clicking on the rightmost level should zoom in
diff --git a/superset-frontend/plugins/legacy-plugin-chart-partition/src/ReactPartition.jsx b/superset-frontend/plugins/legacy-plugin-chart-partition/src/ReactPartition.tsx
similarity index 78%
rename from superset-frontend/plugins/legacy-plugin-chart-partition/src/ReactPartition.jsx
rename to superset-frontend/plugins/legacy-plugin-chart-partition/src/ReactPartition.tsx
index 77a15ffe5a0..8677fa1b805 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-partition/src/ReactPartition.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-partition/src/ReactPartition.tsx
@@ -20,9 +20,22 @@ import { reactify } from '@superset-ui/core';
 import { styled } from '@apache-superset/core/ui';
 import Component from './Partition';
 
-const ReactComponent = reactify(Component);
+// Type-erase the render function to allow flexible prop spreading in the wrapper.
+// The Partition render function has typed props, but the wrapper passes props via spread
+// which TypeScript cannot verify at compile time. Props are validated at runtime.
+const ReactComponent = reactify(
+  Component as unknown as (
+    container: HTMLDivElement,
+    props: Record<string, unknown>,
+  ) => void,
+);
+
+interface PartitionWrapperProps {
+  className?: string;
+  [key: string]: unknown;
+}
 
-const Partition = ({ className, ...otherProps }) => (
+const Partition = ({ className, ...otherProps }: PartitionWrapperProps) => (
   <div className={className}>
     <ReactComponent {...otherProps} />
   </div>
@@ -41,7 +54,7 @@ export default styled(Partition)`
     }
 
     .superset-legacy-chart-partition rect {
-      stroke: ${theme.borderColorSecondary};
+      stroke: ${theme.colorBorderSecondary};
       fill: ${theme.colorBgLayout};
       fill-opacity: 80%;
       transition: fill-opacity 180ms linear;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-partition/src/index.js b/superset-frontend/plugins/legacy-plugin-chart-partition/src/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-partition/src/index.js
rename to superset-frontend/plugins/legacy-plugin-chart-partition/src/index.ts
diff --git a/superset-frontend/plugins/legacy-plugin-chart-partition/src/transformProps.js b/superset-frontend/plugins/legacy-plugin-chart-partition/src/transformProps.ts
similarity index 87%
rename from superset-frontend/plugins/legacy-plugin-chart-partition/src/transformProps.js
rename to superset-frontend/plugins/legacy-plugin-chart-partition/src/transformProps.ts
index da58cd61608..1422701dab2 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-partition/src/transformProps.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-partition/src/transformProps.ts
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-export default function transformProps(chartProps) {
+import { ChartProps } from '@superset-ui/core';
+
+export default function transformProps(chartProps: ChartProps) {
   const { width, height, datasource, formData, queriesData } = chartProps;
   const {
     colorScheme,
@@ -32,7 +34,7 @@ export default function transformProps(chartProps) {
     timeSeriesOption,
     sliceId,
   } = formData;
-  const { verboseMap } = datasource;
+  const { verboseMap = {} } = datasource;
 
   return {
     width,
@@ -41,7 +43,7 @@ export default function transformProps(chartProps) {
     colorScheme,
     dateTimeFormat,
     equalDateSize,
-    levels: groupby.map(g => verboseMap[g] || g),
+    levels: groupby.map((g: string) => verboseMap[g] || g),
     metrics,
     numberFormat,
     partitionLimit: partitionLimit && parseInt(partitionLimit, 10),
diff --git a/superset-frontend/plugins/legacy-plugin-chart-partition/test/OptionDescription.test.jsx b/superset-frontend/plugins/legacy-plugin-chart-partition/test/OptionDescription.test.tsx
similarity index 95%
rename from superset-frontend/plugins/legacy-plugin-chart-partition/test/OptionDescription.test.jsx
rename to superset-frontend/plugins/legacy-plugin-chart-partition/test/OptionDescription.test.tsx
index 0b93f3e476e..b878dc7b330 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-partition/test/OptionDescription.test.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-partition/test/OptionDescription.test.tsx
@@ -18,13 +18,14 @@
  */
 import '@testing-library/jest-dom';
 import { screen, render, fireEvent, act } from '@superset-ui/core/spec';
+import type { ColumnMeta } from '@superset-ui/chart-controls';
 import OptionDescription from '../src/OptionDescription';
 
 const defaultProps = {
   option: {
     label: 'Some option',
     description: 'Description for some option',
-  },
+  } as unknown as ColumnMeta,
 };
 
 beforeEach(() => {
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts b/superset-frontend/plugins/legacy-plugin-chart-partition/types/external.d.ts
similarity index 84%
copy from superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
copy to superset-frontend/plugins/legacy-plugin-chart-partition/types/external.d.ts
index 34a150e873e..66677a600a6 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
+++ b/superset-frontend/plugins/legacy-plugin-chart-partition/types/external.d.ts
@@ -16,7 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-declare module 'd3' {
-  const d3: any;
-  export = d3;
+
+declare module '*.png' {
+  const value: string;
+  export default value;
+}
+
+declare module '*.jpg' {
+  const value: string;
+  export default value;
 }
diff --git a/superset-frontend/plugins/legacy-plugin-chart-rose/src/ReactRose.jsx b/superset-frontend/plugins/legacy-plugin-chart-rose/src/ReactRose.tsx
similarity index 79%
rename from superset-frontend/plugins/legacy-plugin-chart-rose/src/ReactRose.jsx
rename to superset-frontend/plugins/legacy-plugin-chart-rose/src/ReactRose.tsx
index 824897d26e0..6ac6afdf59f 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-rose/src/ReactRose.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-rose/src/ReactRose.tsx
@@ -21,9 +21,22 @@ import { styled, css } from '@apache-superset/core/ui';
 import { Global } from '@emotion/react';
 import Component from './Rose';
 
-const ReactComponent = reactify(Component);
+// Type-erase the render function to allow flexible prop spreading in the wrapper.
+// The Rose render function has typed props, but the wrapper passes props via spread
+// which TypeScript cannot verify at compile time. Props are validated at runtime.
+const ReactComponent = reactify(
+  Component as unknown as (
+    container: HTMLDivElement,
+    props: Record<string, unknown>,
+  ) => void,
+);
+
+interface RoseWrapperProps {
+  className?: string;
+  [key: string]: unknown;
+}
 
-const Rose = ({ className, ...otherProps }) => (
+const Rose = ({ className, ...otherProps }: RoseWrapperProps) => (
   <div className={className}>
     <Global
       styles={theme => css`
diff --git a/superset-frontend/plugins/legacy-plugin-chart-rose/src/Rose.js b/superset-frontend/plugins/legacy-plugin-chart-rose/src/Rose.ts
similarity index 89%
rename from superset-frontend/plugins/legacy-plugin-chart-rose/src/Rose.js
rename to superset-frontend/plugins/legacy-plugin-chart-rose/src/Rose.ts
index 93d402cb61b..4ead29792ce 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-rose/src/Rose.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-rose/src/Rose.ts
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+// @ts-nocheck
 /* eslint no-use-before-define: ["error", { "functions": false }] */
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable react/sort-prop-types */
@@ -28,6 +29,42 @@ import {
   CategoricalColorNamespace,
 } from '@superset-ui/core';
 
+interface RoseDataEntry {
+  key: string[];
+  name: string;
+  time: number;
+  value: number;
+  id: number;
+}
+
+interface RoseData {
+  [timestamp: string]: RoseDataEntry[];
+}
+
+interface ArcDatum {
+  startAngle: number;
+  endAngle: number;
+  innerRadius: number;
+  outerRadius: number;
+  name?: string;
+  arcId?: number;
+  val?: number;
+  time?: number;
+  percent?: number;
+}
+
+interface RoseProps {
+  data: RoseData;
+  width: number;
+  height: number;
+  colorScheme: string;
+  dateTimeFormat: string;
+  numberFormat: string;
+  useRichTooltip: boolean;
+  useAreaProportions: boolean;
+  sliceId: number;
+}
+
 const propTypes = {
   // Data is an object hashed by numeric value, perhaps timestamp
   data: PropTypes.objectOf(
@@ -49,7 +86,7 @@ const propTypes = {
   colorScheme: PropTypes.string,
 };
 
-function copyArc(d) {
+function copyArc(d: ArcDatum): ArcDatum {
   return {
     startAngle: d.startAngle,
     endAngle: d.endAngle,
@@ -58,7 +95,7 @@ function copyArc(d) {
   };
 }
 
-function sortValues(a, b) {
+function sortValues(a: RoseDataEntry, b: RoseDataEntry): number {
   if (a.value === b.value) {
     return a.name > b.name ? 1 : -1;
   }
@@ -66,7 +103,7 @@ function sortValues(a, b) {
   return b.value - a.value;
 }
 
-function Rose(element, props) {
+function Rose(element: HTMLElement, props: RoseProps): void {
   const {
     data,
     width,
@@ -106,14 +143,14 @@ function Rose(element, props) {
 
   const legendWrap = g.append('g').attr('class', 'legendWrap');
 
-  function legendData(adatum) {
-    return adatum[times[0]].map((v, i) => ({
+  function legendData(adatum: RoseData) {
+    return adatum[times[0]].map((v: RoseDataEntry, i: number) => ({
       disabled: state.disabled[i],
       key: v.name,
     }));
   }
 
-  function tooltipData(d, i, adatum) {
+  function tooltipData(d: ArcDatum, i: number, adatum: RoseData) {
     const timeIndex = Math.floor(d.arcId / numGroups);
     const series = useRichTooltip
       ? adatum[times[timeIndex]]
@@ -173,7 +210,7 @@ function Rose(element, props) {
     .attr('class', 'groupLabelsWrap');
 
   // Compute inner and outer angles for each data point
-  function computeArcStates(adatum) {
+  function computeArcStates(adatum: RoseData) {
     // Find the max sum of values across all time
     let maxSum = 0;
     let grain = 0;
@@ -198,7 +235,7 @@ function Rose(element, props) {
     // Compute proportion
     const P = maxRadius / maxSum;
     const Q = P * maxRadius;
-    const computeOuterRadius = (value, innerRadius) =>
+    const computeOuterRadius = (value: number, innerRadius: number): number =>
       useAreaProportions
         ? Math.sqrt(Q * value + innerRadius * innerRadius)
         : P * value + innerRadius;
@@ -297,26 +334,26 @@ function Rose(element, props) {
 
   let arcSt = computeArcStates(datum);
 
-  function tween(target, resFunc) {
-    return function doTween(d) {
+  function tween(target: ArcDatum, resFunc: (d: ArcDatum) => string) {
+    return function doTween(d: ArcDatum) {
       const interpolate = d3.interpolate(copyArc(d), copyArc(target));
 
-      return t => resFunc(Object.assign(d, interpolate(t)));
+      return (t: number) => resFunc(Object.assign(d, interpolate(t)));
     };
   }
 
-  function arcTween(target) {
-    return tween(target, d => arc(d));
+  function arcTween(target: ArcDatum) {
+    return tween(target, (d: ArcDatum) => arc(d));
   }
 
-  function translateTween(target) {
-    return tween(target, d => `translate(${arc.centroid(d)})`);
+  function translateTween(target: ArcDatum) {
+    return tween(target, (d: ArcDatum) => `translate(${arc.centroid(d)})`);
   }
 
   // Grab the ID range of segments stand between
   // this segment and the edge of the circle
-  const segmentsToEdgeCache = {};
-  function getSegmentsToEdge(arcId) {
+  const segmentsToEdgeCache: Record<number, [number, number]> = {};
+  function getSegmentsToEdge(arcId: number): [number, number] {
     if (segmentsToEdgeCache[arcId]) {
       return segmentsToEdgeCache[arcId];
     }
@@ -327,8 +364,8 @@ function Rose(element, props) {
   }
 
   // Get the IDs of all segments in a timeIndex
-  const segmentsInTimeCache = {};
-  function getSegmentsInTime(arcId) {
+  const segmentsInTimeCache: Record<number, [number, number]> = {};
+  function getSegmentsInTime(arcId: number): [number, number] {
     if (segmentsInTimeCache[arcId]) {
       return segmentsInTimeCache[arcId];
     }
@@ -389,11 +426,11 @@ function Rose(element, props) {
     .attr('fill', d => colorFn(d.name, sliceId))
     .attr('d', arc);
 
-  function mousemove() {
+  function mousemove(): void {
     tooltip();
   }
 
-  function mouseover(b, i) {
+  function mouseover(this: Element, b: ArcDatum, i: number): void {
     tooltip.data(tooltipData(b, i, datum)).hidden(false);
     const $this = d3.select(this);
     $this.classed('hover', true);
@@ -424,7 +461,7 @@ function Rose(element, props) {
     }
   }
 
-  function mouseout(b, i) {
+  function mouseout(this: Element, b: ArcDatum, i: number): void {
     tooltip.hidden(true);
     const $this = d3.select(this);
     $this.classed('hover', false);
@@ -455,7 +492,7 @@ function Rose(element, props) {
     }
   }
 
-  function click(b, i) {
+  function click(b: ArcDatum, i: number): void {
     if (inTransition) {
       return;
     }
@@ -577,7 +614,7 @@ function Rose(element, props) {
     }
   }
 
-  function updateActive() {
+  function updateActive(): void {
     const delay = d3.event.altKey ? 3000 : 300;
     legendWrap.datum(legendData(datum)).call(legend);
     const nArcSt = computeArcStates(datum);
diff --git a/superset-frontend/plugins/legacy-plugin-chart-rose/src/index.js b/superset-frontend/plugins/legacy-plugin-chart-rose/src/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-rose/src/index.js
rename to superset-frontend/plugins/legacy-plugin-chart-rose/src/index.ts
diff --git a/superset-frontend/plugins/legacy-plugin-chart-rose/src/transformProps.js b/superset-frontend/plugins/legacy-plugin-chart-rose/src/transformProps.ts
similarity index 91%
rename from superset-frontend/plugins/legacy-plugin-chart-rose/src/transformProps.js
rename to superset-frontend/plugins/legacy-plugin-chart-rose/src/transformProps.ts
index b907e40ecff..b37e26a8722 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-rose/src/transformProps.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-rose/src/transformProps.ts
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-export default function transformProps(chartProps) {
+import { ChartProps } from '@superset-ui/core';
+
+export default function transformProps(chartProps: ChartProps) {
   const { width, height, formData, queriesData } = chartProps;
   const {
     colorScheme,
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts b/superset-frontend/plugins/legacy-plugin-chart-rose/types/external.d.ts
similarity index 84%
copy from superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
copy to superset-frontend/plugins/legacy-plugin-chart-rose/types/external.d.ts
index 34a150e873e..66677a600a6 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
+++ b/superset-frontend/plugins/legacy-plugin-chart-rose/types/external.d.ts
@@ -16,7 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-declare module 'd3' {
-  const d3: any;
-  export = d3;
+
+declare module '*.png' {
+  const value: string;
+  export default value;
+}
+
+declare module '*.jpg' {
+  const value: string;
+  export default value;
 }
diff --git a/superset-frontend/plugins/legacy-plugin-chart-world-map/src/ReactWorldMap.jsx b/superset-frontend/plugins/legacy-plugin-chart-world-map/src/ReactWorldMap.tsx
similarity index 71%
rename from superset-frontend/plugins/legacy-plugin-chart-world-map/src/ReactWorldMap.jsx
rename to superset-frontend/plugins/legacy-plugin-chart-world-map/src/ReactWorldMap.tsx
index ef972bb039e..53dca6da86f 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-world-map/src/ReactWorldMap.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-world-map/src/ReactWorldMap.tsx
@@ -16,14 +16,29 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import PropTypes from 'prop-types';
 import { reactify } from '@superset-ui/core';
 import { styled, useTheme } from '@apache-superset/core/ui';
 import WorldMap from './WorldMap';
 
-const ReactWorldMap = reactify(WorldMap);
+// Type-erase the render function to allow flexible prop spreading in the wrapper.
+// The WorldMap render function has typed props, but the wrapper passes props via spread
+// which TypeScript cannot verify at compile time. Props are validated at runtime.
+const ReactWorldMap = reactify(
+  WorldMap as unknown as (
+    container: HTMLDivElement,
+    props: Record<string, unknown>,
+  ) => void,
+);
 
-const WorldMapComponent = ({ className, ...otherProps }) => {
+interface WorldMapComponentProps {
+  className: string;
+  [key: string]: unknown;
+}
+
+const WorldMapComponent = ({
+  className,
+  ...otherProps
+}: WorldMapComponentProps) => {
   const theme = useTheme();
   return (
     <div className={className}>
@@ -32,10 +47,6 @@ const WorldMapComponent = ({ className, ...otherProps }) => {
   );
 };
 
-WorldMapComponent.propTypes = {
-  className: PropTypes.string.isRequired,
-};
-
 export default styled(WorldMapComponent)`
   .superset-legacy-chart-world-map {
     position: relative;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-world-map/src/WorldMap.js b/superset-frontend/plugins/legacy-plugin-chart-world-map/src/WorldMap.ts
similarity index 84%
rename from superset-frontend/plugins/legacy-plugin-chart-world-map/src/WorldMap.js
rename to superset-frontend/plugins/legacy-plugin-chart-world-map/src/WorldMap.ts
index 36fb436e2e3..f7d64bcae81 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-world-map/src/WorldMap.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-world-map/src/WorldMap.ts
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+// @ts-nocheck
 /* eslint-disable react/sort-prop-types */
 import d3 from 'd3';
 import PropTypes from 'prop-types';
@@ -23,10 +24,62 @@ import { extent as d3Extent } from 'd3-array';
 import {
   getSequentialSchemeRegistry,
   CategoricalColorNamespace,
+  ValueFormatter,
 } from '@superset-ui/core';
 import Datamap from 'datamaps/dist/datamaps.all.min';
 import { ColorBy } from './utils';
 
+interface WorldMapDataEntry {
+  country: string;
+  code: string;
+  latitude: number;
+  longitude: number;
+  name: string;
+  m1: number;
+  m2: number;
+}
+
+interface ProcessedDataEntry extends WorldMapDataEntry {
+  radius: number;
+  fillColor: string;
+}
+
+interface WorldMapFilterState {
+  selectedValues?: string[];
+  [key: string]: unknown;
+}
+
+interface WorldMapProps {
+  countryFieldtype: string;
+  entity: string;
+  data: WorldMapDataEntry[];
+  width: number;
+  height: number;
+  maxBubbleSize: number;
+  showBubbles: boolean;
+  linearColorScheme: string;
+  color: string;
+  colorBy: ColorBy;
+  colorScheme: string;
+  sliceId: number;
+  theme: Record<string, unknown>;
+  onContextMenu: (
+    x: number,
+    y: number,
+    payload: Record<string, unknown>,
+  ) => void;
+  setDataMask: (dataMask: Record<string, unknown>) => void;
+  inContextMenu: boolean;
+  filterState: WorldMapFilterState;
+  emitCrossFilters: boolean;
+  formatter: ValueFormatter;
+}
+
+interface DatamapSource {
+  id?: string;
+  country?: string;
+}
+
 const propTypes = {
   data: PropTypes.arrayOf(
     PropTypes.shape({
@@ -51,7 +104,7 @@ const propTypes = {
   formatter: PropTypes.object,
 };
 
-function WorldMap(element, props) {
+function WorldMap(element: HTMLElement, props: WorldMapProps): void {
   const {
     countryFieldtype,
     entity,
@@ -108,12 +161,12 @@ function WorldMap(element, props) {
     }));
   }
 
-  const mapData = {};
+  const mapData: Record<string, ProcessedDataEntry> = {};
   processedData.forEach(d => {
     mapData[d.country] = d;
   });
 
-  const getCrossFilterDataMask = source => {
+  const getCrossFilterDataMask = (source: DatamapSource) => {
     const selected = Object.values(filterState.selectedValues || {});
     const key = source.id || source.country;
     const country =
@@ -152,7 +205,7 @@ function WorldMap(element, props) {
     };
   };
 
-  const handleClick = source => {
+  const handleClick = (source: DatamapSource) => {
     if (!emitCrossFilters) {
       return;
     }
@@ -166,7 +219,7 @@ function WorldMap(element, props) {
     }
   };
 
-  const handleContextMenu = source => {
+  const handleContextMenu = (source: DatamapSource) => {
     const pointerEvent = d3.event;
     pointerEvent.preventDefault();
     const key = source.id || source.country;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-world-map/src/index.js b/superset-frontend/plugins/legacy-plugin-chart-world-map/src/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-world-map/src/index.js
rename to superset-frontend/plugins/legacy-plugin-chart-world-map/src/index.ts
diff --git a/superset-frontend/plugins/legacy-plugin-chart-world-map/src/transformProps.js b/superset-frontend/plugins/legacy-plugin-chart-world-map/src/transformProps.ts
similarity index 94%
rename from superset-frontend/plugins/legacy-plugin-chart-world-map/src/transformProps.js
rename to superset-frontend/plugins/legacy-plugin-chart-world-map/src/transformProps.ts
index 92be0f8b01c..0c541297fcb 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-world-map/src/transformProps.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-world-map/src/transformProps.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 import { rgb } from 'd3-color';
-import { getValueFormatter } from '@superset-ui/core';
+import { ChartProps, getValueFormatter } from '@superset-ui/core';
 
-export default function transformProps(chartProps) {
+export default function transformProps(chartProps: ChartProps) {
   const {
     width,
     height,
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts b/superset-frontend/plugins/legacy-plugin-chart-world-map/types/external.d.ts
similarity index 84%
copy from superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
copy to superset-frontend/plugins/legacy-plugin-chart-world-map/types/external.d.ts
index 34a150e873e..66677a600a6 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
+++ b/superset-frontend/plugins/legacy-plugin-chart-world-map/types/external.d.ts
@@ -16,7 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-declare module 'd3' {
-  const d3: any;
-  export = d3;
+
+declare module '*.png' {
+  const value: string;
+  export default value;
+}
+
+declare module '*.jpg' {
+  const value: string;
+  export default value;
 }
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js
rename to superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.js
rename to superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bullet/index.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.js
rename to superset-frontend/plugins/legacy-preset-chart-nvd3/src/Compare/index.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.ts
similarity index 99%
rename from superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js
rename to superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.ts
index 1b1bd1fedf3..d3dc4acea32 100644
--- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js
+++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.ts
@@ -1,3 +1,4 @@
+// @ts-nocheck -- legacy file heavily dependent on untyped d3 v3 and nvd3 APIs
 /* eslint-disable react/sort-prop-types */
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/PropTypes.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/PropTypes.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-nvd3/src/PropTypes.js
rename to superset-frontend/plugins/legacy-preset-chart-nvd3/src/PropTypes.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/ReactNVD3.jsx b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/ReactNVD3.tsx
similarity index 98%
rename from superset-frontend/plugins/legacy-preset-chart-nvd3/src/ReactNVD3.jsx
rename to superset-frontend/plugins/legacy-preset-chart-nvd3/src/ReactNVD3.tsx
index d1f5e64edc1..368f3b2183a 100644
--- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/ReactNVD3.jsx
+++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/ReactNVD3.tsx
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+// @ts-nocheck -- legacy reactified component with untyped `this` context from reactify callbacks
 import { reactify } from '@superset-ui/core';
 import { styled } from '@apache-superset/core/ui';
 import PropTypes from 'prop-types';
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.js
rename to superset-frontend/plugins/legacy-preset-chart-nvd3/src/TimePivot/index.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/index.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-nvd3/src/index.js
rename to superset-frontend/plugins/legacy-preset-chart-nvd3/src/index.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/preset.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/preset.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-nvd3/src/preset.js
rename to superset-frontend/plugins/legacy-preset-chart-nvd3/src/preset.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/transformProps.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/transformProps.ts
similarity index 88%
rename from superset-frontend/plugins/legacy-preset-chart-nvd3/src/transformProps.js
rename to superset-frontend/plugins/legacy-preset-chart-nvd3/src/transformProps.ts
index 36465e97a43..edcc82a7e18 100644
--- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/transformProps.js
+++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/transformProps.ts
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { VizType } from '@superset-ui/core';
+// @ts-nocheck -- legacy transformProps with loosely-typed formData from ChartProps
+import { ChartProps, VizType } from '@superset-ui/core';
 import isTruthy from './utils/isTruthy';
 import {
   tokenizeToNumericArray,
@@ -26,8 +27,21 @@ import { formatLabel } from './utils';
 
 const NOOP = () => {};
 
-const grabD3Format = (datasource, targetMetric) => {
-  let foundFormatter;
+interface DatasourceMetric {
+  d3format?: string;
+  metric_name?: string;
+}
+
+interface NVD3Datasource {
+  metrics?: DatasourceMetric[];
+  verboseMap?: Record<string, string>;
+}
+
+const grabD3Format = (
+  datasource: NVD3Datasource | undefined,
+  targetMetric: string,
+): string | undefined => {
+  let foundFormatter: string | undefined;
   const { metrics = [] } = datasource || {};
   metrics.forEach(metric => {
     if (metric.d3format && metric.metric_name === targetMetric) {
@@ -38,7 +52,7 @@ const grabD3Format = (datasource, targetMetric) => {
   return foundFormatter;
 };
 
-export default function transformProps(chartProps) {
+export default function transformProps(chartProps: ChartProps) {
   const {
     width,
     height,
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/utils.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/utils.ts
similarity index 99%
rename from superset-frontend/plugins/legacy-preset-chart-nvd3/src/utils.js
rename to superset-frontend/plugins/legacy-preset-chart-nvd3/src/utils.ts
index dccc9e4184a..9fdeeeafa61 100644
--- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/utils.js
+++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/utils.ts
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+// @ts-nocheck -- legacy file heavily dependent on untyped d3 v3 and nvd3 APIs
 import d3 from 'd3';
 import d3tip from 'd3-tip';
 import dompurify from 'dompurify';
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/utils/isTruthy.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/utils/isTruthy.ts
similarity index 94%
rename from superset-frontend/plugins/legacy-preset-chart-nvd3/src/utils/isTruthy.js
rename to superset-frontend/plugins/legacy-preset-chart-nvd3/src/utils/isTruthy.ts
index 2594a63633b..d06eafe1b23 100644
--- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/utils/isTruthy.js
+++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/utils/isTruthy.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-export default function isTruthy(obj) {
+export default function isTruthy(obj: unknown): boolean {
   if (typeof obj === 'boolean') {
     return obj;
   }
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/vendor/superset/AnnotationTypes.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/vendor/superset/AnnotationTypes.ts
similarity index 97%
rename from superset-frontend/plugins/legacy-preset-chart-nvd3/src/vendor/superset/AnnotationTypes.js
rename to superset-frontend/plugins/legacy-preset-chart-nvd3/src/vendor/superset/AnnotationTypes.ts
index e9ff8299fb7..19b2af126df 100644
--- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/vendor/superset/AnnotationTypes.js
+++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/vendor/superset/AnnotationTypes.ts
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+// @ts-nocheck -- vendor file; not fully typed
 import { t } from '@apache-superset/core/ui';
 
 function extractTypes(metadata) {
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/vendor/superset/exploreUtils.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/vendor/superset/exploreUtils.ts
similarity index 97%
rename from superset-frontend/plugins/legacy-preset-chart-nvd3/src/vendor/superset/exploreUtils.js
rename to superset-frontend/plugins/legacy-preset-chart-nvd3/src/vendor/superset/exploreUtils.ts
index c4c9c3264ec..098b3a73f2e 100644
--- a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/vendor/superset/exploreUtils.js
+++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/vendor/superset/exploreUtils.ts
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+// @ts-nocheck -- vendor file; not fully typed
 /* eslint camelcase: 0 */
 import URI from 'urijs';
 import safeStringify from 'fast-safe-stringify';
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/test/utils.test.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/test/utils.test.ts
similarity index 95%
rename from superset-frontend/plugins/legacy-preset-chart-nvd3/test/utils.test.js
rename to superset-frontend/plugins/legacy-preset-chart-nvd3/test/utils.test.ts
index 137a20e6256..d5d5f5c13f1 100644
--- a/superset-frontend/plugins/legacy-preset-chart-nvd3/test/utils.test.js
+++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/test/utils.test.ts
@@ -128,11 +128,13 @@ describe('nvd3/utils', () => {
     });
     it('returns a date formatter if format is smart_date', () => {
       const time = new Date(Date.UTC(2018, 10, 21, 22, 11));
-      expect(getTimeOrNumberFormatter('smart_date')(time)).toBe('10:11');
+      expect(
+        getTimeOrNumberFormatter('smart_date')(time as unknown as number),
+      ).toBe('10:11');
     });
     it('returns a number formatter otherwise', () => {
       expect(getTimeOrNumberFormatter('.3s')(3000000)).toBe('3.00M');
-      expect(getTimeOrNumberFormatter()(3000100)).toBe('3M');
+      expect(getTimeOrNumberFormatter(undefined)(3000100)).toBe('3M');
     });
   });
 
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/test/utils/isTruthy.test.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/test/utils/isTruthy.test.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-nvd3/test/utils/isTruthy.test.js
rename to superset-frontend/plugins/legacy-preset-chart-nvd3/test/utils/isTruthy.test.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/test/utils/tokenize.test.js b/superset-frontend/plugins/legacy-preset-chart-nvd3/test/utils/tokenize.test.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-nvd3/test/utils/tokenize.test.js
rename to superset-frontend/plugins/legacy-preset-chart-nvd3/test/utils/tokenize.test.ts
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts b/superset-frontend/plugins/legacy-preset-chart-nvd3/types/external.d.ts
similarity index 61%
copy from superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
copy to superset-frontend/plugins/legacy-preset-chart-nvd3/types/external.d.ts
index 34a150e873e..cd1101eb3d0 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/types/d3.d.ts
+++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/types/external.d.ts
@@ -16,7 +16,34 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+declare module '*.png' {
+  const value: string;
+  export default value;
+}
+
+declare module '*.jpg' {
+  const value: string;
+  export default value;
+}
+
+declare module '*.jpeg' {
+  const value: string;
+  export default value;
+}
+
 declare module 'd3' {
-  const d3: any;
-  export = d3;
+  const d3: Record<string, unknown>;
+  export default d3;
+}
+
+declare module 'nvd3-fork' {
+  const nv: Record<string, unknown>;
+  export default nv;
+}
+
+declare module 'nvd3-fork/build/nv.d3.css';
+
+declare module 'd3-tip' {
+  const d3tip: () => Record<string, unknown>;
+  export default d3tip;
 }
diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx b/superset-frontend/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx
index 1c2f5cbc05e..596d730a215 100644
--- a/superset-frontend/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx
+++ b/superset-frontend/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx
@@ -16,7 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useCallback, useMemo } from 'react';
+import {
+  useCallback,
+  useMemo,
+  type MouseEvent as ReactMouseEvent,
+} from 'react';
 import { MinusSquareOutlined, PlusSquareOutlined } from '@ant-design/icons';
 import { t } from '@apache-superset/core';
 import {
@@ -598,10 +602,10 @@ export default function PivotTableChart(props: PivotTableProps) {
 
   const handleContextMenu = useCallback(
     (
-      e: MouseEvent,
-      colKey: (string | number | boolean)[] | undefined,
-      rowKey: (string | number | boolean)[] | undefined,
-      dataPoint: { [key: string]: string },
+      e: ReactMouseEvent,
+      colKey?: string[],
+      rowKey?: string[],
+      dataPoint?: { [key: string]: string },
     ) => {
       if (onContextMenu) {
         e.preventDefault();
@@ -611,7 +615,7 @@ export default function PivotTableChart(props: PivotTableProps) {
           colKey.forEach((val, i) => {
             const col = cols[i];
             const formatter = dateFormatters[col];
-            const formattedVal = formatter?.(val as number) || String(val);
+            const formattedVal = formatter?.(Number(val)) || String(val);
             if (i > 0) {
               drillToDetailFilters.push({
                 col,
@@ -627,7 +631,7 @@ export default function PivotTableChart(props: PivotTableProps) {
           rowKey.forEach((val, i) => {
             const col = rows[i];
             const formatter = dateFormatters[col];
-            const formattedVal = formatter?.(val as number) || String(val);
+            const formattedVal = formatter?.(Number(val)) || String(val);
             drillToDetailFilters.push({
               col,
               op: '==',
@@ -639,7 +643,9 @@ export default function PivotTableChart(props: PivotTableProps) {
         }
         onContextMenu(e.clientX, e.clientY, {
           drillToDetail: drillToDetailFilters,
-          crossFilter: getCrossFilterDataMask(dataPoint),
+          crossFilter: dataPoint
+            ? getCrossFilterDataMask(dataPoint)
+            : undefined,
           drillBy: dataPoint && {
             filters: [
               {
diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/PivotTable.jsx b/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/PivotTable.tsx
similarity index 85%
rename from superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/PivotTable.jsx
rename to superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/PivotTable.tsx
index aa8fbe4f5b5..9e5565b9f26 100644
--- a/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/PivotTable.jsx
+++ b/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/PivotTable.tsx
@@ -19,14 +19,14 @@
 
 import { PureComponent } from 'react';
 import { TableRenderer } from './TableRenderers';
+import type { ComponentProps } from 'react';
 
-class PivotTable extends PureComponent {
+type PivotTableProps = ComponentProps<typeof TableRenderer>;
+
+class PivotTable extends PureComponent<PivotTableProps> {
   render() {
     return <TableRenderer {...this.props} />;
   }
 }
 
-PivotTable.propTypes = TableRenderer.propTypes;
-PivotTable.defaultProps = TableRenderer.defaultProps;
-
 export default PivotTable;
diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/Styles.js b/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/Styles.ts
similarity index 98%
rename from superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/Styles.js
rename to superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/Styles.ts
index 4b9cbd4d4c8..dcc8ccb590b 100644
--- a/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/Styles.js
+++ b/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/Styles.ts
@@ -19,7 +19,7 @@
 
 import { css, styled } from '@apache-superset/core/ui';
 
-export const Styles = styled.div`
+export const Styles = styled.div<{ isDashboardEditMode: boolean }>`
   ${({ theme, isDashboardEditMode }) => css`
     table.pvtTable {
       position: ${isDashboardEditMode ? 'inherit' : 'relative'};
diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.jsx b/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.tsx
similarity index 71%
rename from superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.jsx
rename to superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.tsx
index 489813de6cb..874ec61108c 100644
--- a/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.jsx
+++ b/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Component } from 'react';
+import { Component, ReactNode, MouseEvent } from 'react';
 import { safeHtmlSpan } from '@superset-ui/core';
 import { t } from '@apache-superset/core/ui';
 import PropTypes from 'prop-types';
@@ -27,7 +27,57 @@ import { FaSortUp as FaSortAsc } from '@react-icons/all-files/fa/FaSortUp';
 import { PivotData, flatKey } from './utilities';
 import { Styles } from './Styles';
 
-const parseLabel = value => {
+interface TableRendererProps {
+  cols: string[];
+  rows: string[];
+  aggregatorName: string;
+  tableOptions: Record<string, unknown>;
+  subtotalOptions?: Record<string, unknown>;
+  namesMapping?: Record<string, string>;
+  onContextMenu: (
+    e: MouseEvent,
+    colKey?: string[],
+    rowKey?: string[],
+    filters?: Record<string, string>,
+  ) => void;
+  allowRenderHtml?: boolean;
+  [key: string]: unknown;
+}
+
+interface TableRendererState {
+  collapsedRows: Record<string, boolean>;
+  collapsedCols: Record<string, boolean>;
+  sortingOrder: string[];
+  activeSortColumn?: number | null;
+}
+
+interface PivotSettings {
+  pivotData: InstanceType<typeof PivotData>;
+  colAttrs: string[];
+  rowAttrs: string[];
+  colKeys: string[][];
+  rowKeys: string[][];
+  rowTotals: boolean;
+  colTotals: boolean;
+  arrowCollapsed: string;
+  arrowExpanded: string;
+  colSubtotalDisplay: Record<string, unknown>;
+  rowSubtotalDisplay: Record<string, unknown>;
+  cellCallbacks: Record<string, Record<string, (e: MouseEvent) => void>>;
+  rowTotalCallbacks: Record<string, (e: MouseEvent) => void>;
+  colTotalCallbacks: Record<string, (e: MouseEvent) => void>;
+  grandTotalCallback: ((e: MouseEvent) => void) | null;
+  namesMapping: Record<string, string>;
+  allowRenderHtml?: boolean;
+  visibleRowKeys?: string[][];
+  visibleColKeys?: string[][];
+  maxRowVisible?: number;
+  maxColVisible?: number;
+  rowAttrSpans?: number[][];
+  colAttrSpans?: number[][];
+}
+
+const parseLabel = (value: unknown): string | number => {
   if (typeof value === 'string') {
     if (value === 'metric') return t('metric');
     return value;
@@ -38,21 +88,21 @@ const parseLabel = value => {
   return String(value);
 };
 
-function displayCell(value, allowRenderHtml) {
+function displayCell(value: unknown, allowRenderHtml?: boolean): ReactNode {
   if (allowRenderHtml && typeof value === 'string') {
     return safeHtmlSpan(value);
   }
   return parseLabel(value);
 }
 function displayHeaderCell(
-  needToggle,
-  ArrowIcon,
-  onArrowClick,
-  value,
-  namesMapping,
-  allowRenderHtml,
-) {
-  const name = namesMapping[value] || value;
+  needToggle: boolean,
+  ArrowIcon: ReactNode,
+  onArrowClick: ((e: MouseEvent<HTMLSpanElement>) => void) | null,
+  value: unknown,
+  namesMapping: Record<string, string>,
+  allowRenderHtml?: boolean,
+): ReactNode {
+  const name = namesMapping[String(value)] || value;
   const parsedLabel = parseLabel(name);
   const labelContent =
     allowRenderHtml && typeof parsedLabel === 'string'
@@ -62,9 +112,9 @@ function displayHeaderCell(
     <span className="toggle-wrapper">
       <span
         role="button"
-        tabIndex="0"
+        tabIndex={0}
         className="toggle"
-        onClick={onArrowClick}
+        onClick={onArrowClick || undefined}
       >
         {ArrowIcon}
       </span>
@@ -75,7 +125,16 @@ function displayHeaderCell(
   );
 }
 
-function sortHierarchicalObject(obj, objSort, rowPartialOnTop) {
+interface HierarchicalNode {
+  currentVal?: number;
+  [key: string]: HierarchicalNode | number | undefined;
+}
+
+function sortHierarchicalObject(
+  obj: Record<string, HierarchicalNode>,
+  objSort: string,
+  rowPartialOnTop: boolean | undefined,
+): Map<string, unknown> {
   // Performs a recursive sort of nested object structures. Sorts objects based on
   // their currentVal property. The function preserves the hierarchical structure
   // while sorting each level according to the specified criteria.
@@ -93,11 +152,18 @@ function sortHierarchicalObject(obj, objSort, rowPartialOnTop) {
     return objSort === 'asc' ? valA - valB : valB - valA;
   });
 
-  const result = new Map();
+  const result = new Map<string, unknown>();
   sortedKeys.forEach(key => {
     const value = obj[key];
     if (typeof value === 'object' && !Array.isArray(value)) {
-      result.set(key, sortHierarchicalObject(value, objSort, rowPartialOnTop));
+      result.set(
+        key,
+        sortHierarchicalObject(
+          value as Record<string, HierarchicalNode>,
+          objSort,
+          rowPartialOnTop,
+        ),
+      );
     } else {
       result.set(key, value);
     }
@@ -106,21 +172,21 @@ function sortHierarchicalObject(obj, objSort, rowPartialOnTop) {
 }
 
 function convertToArray(
-  obj,
-  rowEnabled,
-  rowPartialOnTop,
-  maxRowIndex,
-  parentKeys = [],
-  result = [],
+  obj: Map<string, unknown>,
+  rowEnabled: boolean | undefined,
+  rowPartialOnTop: boolean | undefined,
+  maxRowIndex: number,
+  parentKeys: string[] = [],
+  result: string[][] = [],
   flag = false,
-) {
+): string[][] {
   // Recursively flattens a hierarchical Map structure into an array of key paths.
   // Handles different rendering scenarios based on row grouping configurations and
   // depth limitations. The function supports complex hierarchy flattening with
   let updatedFlag = flag;
 
   const keys = Array.from(obj.keys());
-  const getValue = key => obj.get(key);
+  const getValue = (key: string) => obj.get(key);
 
   keys.forEach(key => {
     if (key === 'currentVal') {
@@ -131,9 +197,9 @@ function convertToArray(
       result.push(parentKeys.length > 0 ? [...parentKeys, key] : [key]);
       updatedFlag = true;
     }
-    if (typeof value === 'object' && !Array.isArray(value)) {
+    if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
       convertToArray(
-        value,
+        value as Map<string, unknown>,
         rowEnabled,
         rowPartialOnTop,
         maxRowIndex,
@@ -157,8 +223,18 @@ function convertToArray(
   return result;
 }
 
-export class TableRenderer extends Component {
-  constructor(props) {
+export class TableRenderer extends Component<
+  TableRendererProps,
+  TableRendererState
+> {
+  sortCache: Map<string, string[][]>;
+  cachedProps: TableRendererProps | null;
+  cachedBasePivotSettings: PivotSettings | null;
+
+  static propTypes: Record<string, unknown>;
+  static defaultProps: Record<string, unknown>;
+
+  constructor(props: TableRendererProps) {
     super(props);
 
     // We need state to record which entries are collapsed and which aren't.
@@ -166,27 +242,31 @@ export class TableRenderer extends Component {
     // should be collapsed.
     this.state = { collapsedRows: {}, collapsedCols: {}, sortingOrder: [] };
     this.sortCache = new Map();
+    this.cachedProps = null;
+    this.cachedBasePivotSettings = null;
     this.clickHeaderHandler = this.clickHeaderHandler.bind(this);
     this.clickHandler = this.clickHandler.bind(this);
   }
 
-  getBasePivotSettings() {
+  getBasePivotSettings(): PivotSettings {
     // One-time extraction of pivot settings that we'll use throughout the render.
 
     const { props } = this;
     const colAttrs = props.cols;
     const rowAttrs = props.rows;
 
-    const tableOptions = {
+    const tableOptions: Record<string, unknown> = {
       rowTotals: true,
       colTotals: true,
       ...props.tableOptions,
     };
-    const rowTotals = tableOptions.rowTotals || colAttrs.length === 0;
-    const colTotals = tableOptions.colTotals || rowAttrs.length === 0;
+    const rowTotals =
+      (tableOptions.rowTotals as boolean) || colAttrs.length === 0;
+    const colTotals =
+      (tableOptions.colTotals as boolean) || rowAttrs.length === 0;
 
     const namesMapping = props.namesMapping || {};
-    const subtotalOptions = {
+    const subtotalOptions: Record<string, unknown> = {
       arrowCollapsed: '\u25B2',
       arrowExpanded: '\u25BC',
       ...props.subtotalOptions,
@@ -194,21 +274,25 @@ export class TableRenderer extends Component {
 
     const colSubtotalDisplay = {
       displayOnTop: false,
-      enabled: tableOptions.colSubTotals,
+      enabled: tableOptions.colSubTotals as boolean | undefined,
       hideOnExpand: false,
-      ...subtotalOptions.colSubtotalDisplay,
+      ...(subtotalOptions.colSubtotalDisplay as
+        | Record<string, unknown>
+        | undefined),
     };
 
     const rowSubtotalDisplay = {
       displayOnTop: false,
-      enabled: tableOptions.rowSubTotals,
+      enabled: tableOptions.rowSubTotals as boolean | undefined,
       hideOnExpand: false,
-      ...subtotalOptions.rowSubtotalDisplay,
+      ...(subtotalOptions.rowSubtotalDisplay as
+        | Record<string, unknown>
+        | undefined),
     };
 
-    const pivotData = new PivotData(props, {
-      rowEnabled: rowSubtotalDisplay.enabled,
-      colEnabled: colSubtotalDisplay.enabled,
+    const pivotData = new PivotData(props as Record<string, unknown>, {
+      rowEnabled: rowSubtotalDisplay.enabled as boolean | undefined,
+      colEnabled: colSubtotalDisplay.enabled as boolean | undefined,
       rowPartialOnTop: rowSubtotalDisplay.displayOnTop,
       colPartialOnTop: colSubtotalDisplay.displayOnTop,
     });
@@ -217,10 +301,13 @@ export class TableRenderer extends Component {
 
     // Also pre-calculate all the callbacks for cells, etc... This is nice to have to
     // avoid re-calculations of the call-backs on cell expansions, etc...
-    const cellCallbacks = {};
-    const rowTotalCallbacks = {};
-    const colTotalCallbacks = {};
-    let grandTotalCallback = null;
+    const cellCallbacks: Record<
+      string,
+      Record<string, (e: MouseEvent) => void>
+    > = {};
+    const rowTotalCallbacks: Record<string, (e: MouseEvent) => void> = {};
+    const colTotalCallbacks: Record<string, (e: MouseEvent) => void> = {};
+    let grandTotalCallback: ((e: MouseEvent) => void) | null = null;
     if (tableOptions.clickCallback) {
       rowKeys.forEach(rowKey => {
         const flatRowKey = flatKey(rowKey);
@@ -268,8 +355,8 @@ export class TableRenderer extends Component {
       rowKeys,
       rowTotals,
       colTotals,
-      arrowCollapsed: subtotalOptions.arrowCollapsed,
-      arrowExpanded: subtotalOptions.arrowExpanded,
+      arrowCollapsed: subtotalOptions.arrowCollapsed as string,
+      arrowExpanded: subtotalOptions.arrowExpanded as string,
       colSubtotalDisplay,
       rowSubtotalDisplay,
       cellCallbacks,
@@ -281,11 +368,15 @@ export class TableRenderer extends Component {
     };
   }
 
-  clickHandler(pivotData, rowValues, colValues) {
+  clickHandler(
+    pivotData: InstanceType<typeof PivotData>,
+    rowValues: string[],
+    colValues: string[],
+  ) {
     const colAttrs = this.props.cols;
     const rowAttrs = this.props.rows;
     const value = pivotData.getAggregator(rowValues, colValues).value();
-    const filters = {};
+    const filters: Record<string, string> = {};
     const colLimit = Math.min(colAttrs.length, colValues.length);
     for (let i = 0; i < colLimit; i += 1) {
       const attr = colAttrs[i];
@@ -300,26 +391,27 @@ export class TableRenderer extends Component {
         filters[attr] = rowValues[i];
       }
     }
-    return e =>
-      this.props.tableOptions.clickCallback(e, value, filters, pivotData);
+    const clickCallback = (this.props.tableOptions as Record<string, unknown>)
+      .clickCallback as ((...args: unknown[]) => void) | undefined;
+    return (e: MouseEvent) => clickCallback?.(e, value, filters, pivotData);
   }
 
   clickHeaderHandler(
-    pivotData,
-    values,
-    attrs,
-    attrIdx,
-    callback,
+    pivotData: InstanceType<typeof PivotData>,
+    values: string[],
+    attrs: string[],
+    attrIdx: number,
+    callback: ((...args: unknown[]) => void) | undefined,
     isSubtotal = false,
     isGrandTotal = false,
   ) {
-    const filters = {};
+    const filters: Record<string, string> = {};
     for (let i = 0; i <= attrIdx; i += 1) {
       const attr = attrs[i];
       filters[attr] = values[i];
     }
-    return e =>
-      callback(
+    return (e: MouseEvent) =>
+      callback?.(
         e,
         values[attrIdx],
         filters,
@@ -329,15 +421,17 @@ export class TableRenderer extends Component {
       );
   }
 
-  collapseAttr(rowOrCol, attrIdx, allKeys) {
-    return e => {
+  collapseAttr(rowOrCol: boolean, attrIdx: number, allKeys: string[][]) {
+    return (e: MouseEvent<HTMLSpanElement>) => {
       // Collapse an entire attribute.
       e.stopPropagation();
       const keyLen = attrIdx + 1;
-      const collapsed = allKeys.filter(k => k.length === keyLen).map(flatKey);
+      const collapsed = allKeys
+        .filter((k: string[]) => k.length === keyLen)
+        .map(flatKey);
 
-      const updates = {};
-      collapsed.forEach(k => {
+      const updates: Record<string, boolean> = {};
+      collapsed.forEach((k: string) => {
         updates[k] = true;
       });
 
@@ -353,13 +447,13 @@ export class TableRenderer extends Component {
     };
   }
 
-  expandAttr(rowOrCol, attrIdx, allKeys) {
-    return e => {
+  expandAttr(rowOrCol: boolean, attrIdx: number, allKeys: string[][]) {
+    return (e: MouseEvent<HTMLSpanElement>) => {
       // Expand an entire attribute. This implicitly implies expanding all of the
       // parents as well. It's a bit inefficient but ah well...
       e.stopPropagation();
-      const updates = {};
-      allKeys.forEach(k => {
+      const updates: Record<string, boolean> = {};
+      allKeys.forEach((k: string[]) => {
         for (let i = 0; i <= attrIdx; i += 1) {
           updates[flatKey(k.slice(0, i + 1))] = false;
         }
@@ -377,8 +471,8 @@ export class TableRenderer extends Component {
     };
   }
 
-  toggleRowKey(flatRowKey) {
-    return e => {
+  toggleRowKey(flatRowKey: string) {
+    return (e: MouseEvent<HTMLSpanElement>) => {
       e.stopPropagation();
       this.setState(state => ({
         collapsedRows: {
@@ -389,8 +483,8 @@ export class TableRenderer extends Component {
     };
   }
 
-  toggleColKey(flatColKey) {
-    return e => {
+  toggleColKey(flatColKey: string) {
+    return (e: MouseEvent<HTMLSpanElement>) => {
       e.stopPropagation();
       this.setState(state => ({
         collapsedCols: {
@@ -401,7 +495,7 @@ export class TableRenderer extends Component {
     };
   }
 
-  calcAttrSpans(attrArr, numAttrs) {
+  calcAttrSpans(attrArr: string[][], numAttrs: number) {
     // Given an array of attribute values (i.e. each element is another array with
     // the value at every level), compute the spans for every attribute value at
     // every level. The return value is a nested array of the same shape. It has
@@ -410,7 +504,7 @@ export class TableRenderer extends Component {
     const spans = [];
     // Index of the last new value
     const li = Array(numAttrs).map(() => 0);
-    let lv = Array(numAttrs).map(() => null);
+    let lv: (string | null)[] = Array(numAttrs).map(() => null);
     for (let i = 0; i < attrArr.length; i += 1) {
       // Keep increasing span values as long as the last keys are the same. For
       // the rest, record spans of 1. Update the indices too.
@@ -434,12 +528,16 @@ export class TableRenderer extends Component {
     return spans;
   }
 
-  getAggregatedData(pivotData, visibleColName, rowPartialOnTop) {
+  getAggregatedData(
+    pivotData: InstanceType<typeof PivotData>,
+    visibleColName: string[],
+    rowPartialOnTop: boolean | undefined,
+  ) {
     // Transforms flat row keys into a hierarchical group structure where each level
     // represents a grouping dimension. For each row key path, it calculates the
     // aggregated value for the specified column and builds a nested object that
     // preserves the hierarchy while storing aggregation values at each level.
-    const groups = {};
+    const groups: Record<string, HierarchicalNode> = {};
     const rows = pivotData.rowKeys;
     rows.forEach(rowKey => {
       const aggValue =
@@ -448,13 +546,17 @@ export class TableRenderer extends Component {
       if (rowPartialOnTop) {
         const parent = rowKey
           .slice(0, -1)
-          .reduce((acc, key) => (acc[key] ??= {}), groups);
-        parent[rowKey.at(-1)] = { currentVal: aggValue };
+          .reduce(
+            (acc: Record<string, HierarchicalNode>, key: string) =>
+              (acc[key] ??= {}) as Record<string, HierarchicalNode>,
+            groups,
+          );
+        parent[rowKey.at(-1)!] = { currentVal: aggValue as number };
       } else {
-        rowKey.reduce((acc, key) => {
+        rowKey.reduce((acc: Record<string, HierarchicalNode>, key: string) => {
           acc[key] = acc[key] || { currentVal: 0 };
-          acc[key].currentVal = aggValue;
-          return acc[key];
+          (acc[key] as HierarchicalNode).currentVal = aggValue as number;
+          return acc[key] as Record<string, HierarchicalNode>;
         }, groups);
       }
     });
@@ -462,11 +564,11 @@ export class TableRenderer extends Component {
   }
 
   sortAndCacheData(
-    groups,
-    sortOrder,
-    rowEnabled,
-    rowPartialOnTop,
-    maxRowIndex,
+    groups: Record<string, HierarchicalNode>,
+    sortOrder: string,
+    rowEnabled: boolean | undefined,
+    rowPartialOnTop: boolean | undefined,
+    maxRowIndex: number,
   ) {
     // Processes hierarchical data by first sorting it according to the specified order
     // and then converting the sorted structure into a flat array format. This function
@@ -485,7 +587,12 @@ export class TableRenderer extends Component {
     );
   }
 
-  sortData(columnIndex, visibleColKeys, pivotData, maxRowIndex) {
+  sortData(
+    columnIndex: number,
+    visibleColKeys: string[][],
+    pivotData: InstanceType<typeof PivotData>,
+    maxRowIndex: number,
+  ) {
     // Handles column sorting with direction toggling (asc/desc) and implements
     // caching mechanism to avoid redundant sorting operations. When sorting the same
     // column multiple times, it cycles through sorting directions. Uses composite
@@ -500,7 +607,10 @@ export class TableRenderer extends Component {
         newDirection = sortingOrder[columnIndex] === 'asc' ? 'desc' : 'asc';
       }
 
-      const { rowEnabled, rowPartialOnTop } = pivotData.subtotals;
+      const { rowEnabled, rowPartialOnTop } = pivotData.subtotals as {
+        rowEnabled?: boolean;
+        rowPartialOnTop?: boolean;
+      };
       newSortingOrder[columnIndex] = newDirection;
 
       const cacheKey = `${columnIndex}-${visibleColKeys.length}-${rowEnabled}-${rowPartialOnTop}-${newDirection}`;
@@ -525,8 +635,8 @@ export class TableRenderer extends Component {
         newRowKeys = sortedRowKeys;
       }
       this.cachedBasePivotSettings = {
-        ...this.cachedBasePivotSettings,
-        rowKeys: newRowKeys,
+        ...this.cachedBasePivotSettings!,
+        rowKeys: newRowKeys!,
       };
 
       return {
@@ -536,7 +646,11 @@ export class TableRenderer extends Component {
     });
   }
 
-  renderColHeaderRow(attrName, attrIdx, pivotSettings) {
+  renderColHeaderRow(
+    attrName: string,
+    attrIdx: number,
+    pivotSettings: PivotSettings,
+  ) {
     // Render a single row in the column header at the top of the pivot table.
 
     const {
@@ -554,12 +668,18 @@ export class TableRenderer extends Component {
       namesMapping,
       allowRenderHtml,
     } = pivotSettings;
+    const tableOpts = this.props.tableOptions as Record<string, unknown>;
     const {
       highlightHeaderCellsOnHover,
       omittedHighlightHeaderGroups = [],
       highlightedHeaderCells,
       dateFormatters,
-    } = this.props.tableOptions;
+    } = tableOpts as {
+      highlightHeaderCellsOnHover?: boolean;
+      omittedHighlightHeaderGroups?: string[];
+      highlightedHeaderCells?: Record<string, string[]>;
+      dateFormatters?: Record<string, (val: unknown) => string>;
+    };
 
     const spaceCell =
       attrIdx === 0 && rowAttrs.length !== 0 ? (
@@ -572,15 +692,15 @@ export class TableRenderer extends Component {
       ) : null;
 
     const needToggle =
-      colSubtotalDisplay.enabled && attrIdx !== colAttrs.length - 1;
+      !!colSubtotalDisplay.enabled && attrIdx !== colAttrs.length - 1;
     let arrowClickHandle = null;
     let subArrow = null;
     if (needToggle) {
       arrowClickHandle =
-        attrIdx + 1 < maxColVisible
+        attrIdx + 1 < maxColVisible!
           ? this.collapseAttr(false, attrIdx, colKeys)
           : this.expandAttr(false, attrIdx, colKeys);
-      subArrow = attrIdx + 1 < maxColVisible ? arrowExpanded : arrowCollapsed;
+      subArrow = attrIdx + 1 < maxColVisible! ? arrowExpanded : arrowCollapsed;
     }
     const attrNameCell = (
       <th key="label" className="pvtAxisLabel">
@@ -599,17 +719,17 @@ export class TableRenderer extends Component {
     const rowIncrSpan = rowAttrs.length !== 0 ? 1 : 0;
     // Iterate through columns. Jump over duplicate values.
     let i = 0;
-    while (i < visibleColKeys.length) {
-      let handleContextMenu;
-      const colKey = visibleColKeys[i];
-      const colSpan = attrIdx < colKey.length ? colAttrSpans[i][attrIdx] : 1;
+    while (i < visibleColKeys!.length) {
+      let handleContextMenu: ((e: MouseEvent) => void) | undefined;
+      const colKey = visibleColKeys![i];
+      const colSpan = attrIdx < colKey.length ? colAttrSpans![i][attrIdx] : 1;
       let colLabelClass = 'pvtColLabel';
       if (attrIdx < colKey.length) {
         if (!omittedHighlightHeaderGroups.includes(colAttrs[attrIdx])) {
           if (highlightHeaderCellsOnHover) {
             colLabelClass += ' hoverable';
           }
-          handleContextMenu = e =>
+          handleContextMenu = (e: MouseEvent) =>
             this.props.onContextMenu(e, colKey, undefined, {
               [attrName]: colKey[attrIdx],
             });
@@ -621,21 +741,22 @@ export class TableRenderer extends Component {
         ) {
           colLabelClass += ' active';
         }
-        const { maxRowVisible: maxRowIndex, maxColVisible } = pivotSettings;
-        const visibleSortIcon = maxColVisible - 1 === attrIdx;
-        const columnName = colKey[maxColVisible - 1];
+        const maxRowIndex = pivotSettings.maxRowVisible!;
+        const mColVisible = pivotSettings.maxColVisible!;
+        const visibleSortIcon = mColVisible - 1 === attrIdx;
+        const columnName = colKey[mColVisible - 1];
 
         const rowSpan = 1 + (attrIdx === colAttrs.length - 1 ? rowIncrSpan : 0);
         const flatColKey = flatKey(colKey.slice(0, attrIdx + 1));
         const onArrowClick = needToggle ? this.toggleColKey(flatColKey) : null;
-        const getSortIcon = key => {
+        const getSortIcon = (key: number) => {
           const { activeSortColumn, sortingOrder } = this.state;
 
           if (activeSortColumn !== key) {
             return (
               <FaSort
                 onClick={() =>
-                  this.sortData(key, visibleColKeys, pivotData, maxRowIndex)
+                  this.sortData(key, visibleColKeys!, pivotData, maxRowIndex)
                 }
               />
             );
@@ -645,7 +766,7 @@ export class TableRenderer extends Component {
           return (
             <SortIcon
               onClick={() =>
-                this.sortData(key, visibleColKeys, pivotData, maxRowIndex)
+                this.sortData(key, visibleColKeys!, pivotData, maxRowIndex)
               }
             />
           );
@@ -668,7 +789,10 @@ export class TableRenderer extends Component {
               colKey,
               this.props.cols,
               attrIdx,
-              this.props.tableOptions.clickColumnHeaderCallback,
+              (this.props.tableOptions as Record<string, unknown>)
+                .clickColumnHeaderCallback as
+                | ((...args: unknown[]) => void)
+                | undefined,
             )}
             onContextMenu={handleContextMenu}
           >
@@ -714,7 +838,10 @@ export class TableRenderer extends Component {
               colKey,
               this.props.cols,
               attrIdx,
-              this.props.tableOptions.clickColumnHeaderCallback,
+              (this.props.tableOptions as Record<string, unknown>)
+                .clickColumnHeaderCallback as
+                | ((...args: unknown[]) => void)
+                | undefined,
               true,
             )}
           >
@@ -738,7 +865,10 @@ export class TableRenderer extends Component {
             [],
             this.props.cols,
             attrIdx,
-            this.props.tableOptions.clickColumnHeaderCallback,
+            (this.props.tableOptions as Record<string, unknown>)
+              .clickColumnHeaderCallback as
+              | ((...args: unknown[]) => void)
+              | undefined,
             false,
             true,
           )}
@@ -753,7 +883,7 @@ export class TableRenderer extends Component {
     return <tr key={`colAttr-${attrIdx}`}>{cells}</tr>;
   }
 
-  renderRowHeaderRow(pivotSettings) {
+  renderRowHeaderRow(pivotSettings: PivotSettings) {
     // Render just the attribute names of the rows (the actual attribute values
     // will show up in the individual rows).
 
@@ -773,15 +903,15 @@ export class TableRenderer extends Component {
       <tr key="rowHdr">
         {rowAttrs.map((r, i) => {
           const needLabelToggle =
-            rowSubtotalDisplay.enabled && i !== rowAttrs.length - 1;
+            !!rowSubtotalDisplay.enabled && i !== rowAttrs.length - 1;
           let arrowClickHandle = null;
           let subArrow = null;
           if (needLabelToggle) {
             arrowClickHandle =
-              i + 1 < maxRowVisible
+              i + 1 < maxRowVisible!
                 ? this.collapseAttr(true, i, rowKeys)
                 : this.expandAttr(true, i, rowKeys);
-            subArrow = i + 1 < maxRowVisible ? arrowExpanded : arrowCollapsed;
+            subArrow = i + 1 < maxRowVisible! ? arrowExpanded : arrowCollapsed;
           }
           return (
             <th className="pvtAxisLabel" key={`rowAttr-${i}`}>
@@ -805,7 +935,10 @@ export class TableRenderer extends Component {
             [],
             this.props.rows,
             0,
-            this.props.tableOptions.clickRowHeaderCallback,
+            (this.props.tableOptions as Record<string, unknown>)
+              .clickRowHeaderCallback as
+              | ((...args: unknown[]) => void)
+              | undefined,
             false,
             true,
           )}
@@ -820,7 +953,11 @@ export class TableRenderer extends Component {
     );
   }
 
-  renderTableRow(rowKey, rowIdx, pivotSettings) {
+  renderTableRow(
+    rowKey: string[],
+    rowIdx: number,
+    pivotSettings: PivotSettings,
+  ) {
     // Render a single row in the pivot table.
 
     const {
@@ -845,18 +982,24 @@ export class TableRenderer extends Component {
       highlightedHeaderCells,
       cellColorFormatters,
       dateFormatters,
-    } = this.props.tableOptions;
+    } = this.props.tableOptions as {
+      highlightHeaderCellsOnHover?: boolean;
+      omittedHighlightHeaderGroups?: string[];
+      highlightedHeaderCells?: Record<string, string[]>;
+      cellColorFormatters?: Record<string, unknown>;
+      dateFormatters?: Record<string, (val: unknown) => string>;
+    };
     const flatRowKey = flatKey(rowKey);
 
     const colIncrSpan = colAttrs.length !== 0 ? 1 : 0;
-    const attrValueCells = rowKey.map((r, i) => {
-      let handleContextMenu;
+    const attrValueCells = rowKey.map((r: string, i: number) => {
+      let handleContextMenu: ((e: MouseEvent) => void) | undefined;
       let valueCellClassName = 'pvtRowLabel';
       if (!omittedHighlightHeaderGroups.includes(rowAttrs[i])) {
         if (highlightHeaderCellsOnHover) {
           valueCellClassName += ' hoverable';
         }
-        handleContextMenu = e =>
+        handleContextMenu = (e: MouseEvent) =>
           this.props.onContextMenu(e, undefined, rowKey, {
             [rowAttrs[i]]: r,
           });
@@ -868,12 +1011,12 @@ export class TableRenderer extends Component {
       ) {
         valueCellClassName += ' active';
       }
-      const rowSpan = rowAttrSpans[rowIdx][i];
+      const rowSpan = rowAttrSpans![rowIdx][i];
       if (rowSpan > 0) {
         const flatRowKey = flatKey(rowKey.slice(0, i + 1));
         const colSpan = 1 + (i === rowAttrs.length - 1 ? colIncrSpan : 0);
         const needRowToggle =
-          rowSubtotalDisplay.enabled && i !== rowAttrs.length - 1;
+          !!rowSubtotalDisplay.enabled && i !== rowAttrs.length - 1;
         const onArrowClick = needRowToggle
           ? this.toggleRowKey(flatRowKey)
           : null;
@@ -894,7 +1037,10 @@ export class TableRenderer extends Component {
               rowKey,
               this.props.rows,
               i,
-              this.props.tableOptions.clickRowHeaderCallback,
+              (this.props.tableOptions as Record<string, unknown>)
+                .clickRowHeaderCallback as
+                | ((...args: unknown[]) => void)
+                | undefined,
             )}
             onContextMenu={handleContextMenu}
           >
@@ -927,7 +1073,10 @@ export class TableRenderer extends Component {
             rowKey,
             this.props.rows,
             rowKey.length,
-            this.props.tableOptions.clickRowHeaderCallback,
+            (this.props.tableOptions as Record<string, unknown>)
+              .clickRowHeaderCallback as
+              | ((...args: unknown[]) => void)
+              | undefined,
             true,
           )}
         >
@@ -936,13 +1085,13 @@ export class TableRenderer extends Component {
       ) : null;
 
     const rowClickHandlers = cellCallbacks[flatRowKey] || {};
-    const valueCells = visibleColKeys.map(colKey => {
+    const valueCells = visibleColKeys!.map((colKey: string[]) => {
       const flatColKey = flatKey(colKey);
       const agg = pivotData.getAggregator(rowKey, colKey);
       const aggValue = agg.value();
 
       const keys = [...rowKey, ...colKey];
-      let backgroundColor;
+      let backgroundColor: string | undefined;
       if (cellColorFormatters) {
         Object.values(cellColorFormatters).forEach(cellColorFormatter => {
           if (Array.isArray(cellColorFormatter)) {
@@ -1008,7 +1157,7 @@ export class TableRenderer extends Component {
     return <tr key={`keyRow-${flatRowKey}`}>{rowCells}</tr>;
   }
 
-  renderTotalsRow(pivotSettings) {
+  renderTotalsRow(pivotSettings: PivotSettings) {
     // Render the final totals rows that has the totals for all the columns.
 
     const {
@@ -1032,7 +1181,10 @@ export class TableRenderer extends Component {
           [],
           this.props.rows,
           0,
-          this.props.tableOptions.clickRowHeaderCallback,
+          (this.props.tableOptions as Record<string, unknown>)
+            .clickRowHeaderCallback as
+            | ((...args: unknown[]) => void)
+            | undefined,
           false,
           true,
         )}
@@ -1043,7 +1195,7 @@ export class TableRenderer extends Component {
       </th>
     );
 
-    const totalValueCells = visibleColKeys.map(colKey => {
+    const totalValueCells = visibleColKeys!.map((colKey: string[]) => {
       const flatColKey = flatKey(colKey);
       const agg = pivotData.getAggregator([], colKey);
       const aggValue = agg.value();
@@ -1071,7 +1223,7 @@ export class TableRenderer extends Component {
           role="gridcell"
           key="total"
           className="pvtGrandTotal pvtRowTotal"
-          onClick={grandTotalCallback}
+          onClick={grandTotalCallback || undefined}
           onContextMenu={e => this.props.onContextMenu(e, undefined, undefined)}
         >
           {displayCell(agg.format(aggValue, agg), this.props.allowRenderHtml)}
@@ -1088,11 +1240,18 @@ export class TableRenderer extends Component {
     );
   }
 
-  visibleKeys(keys, collapsed, numAttrs, subtotalDisplay) {
+  visibleKeys(
+    keys: string[][],
+    collapsed: Record<string, boolean>,
+    numAttrs: number,
+    subtotalDisplay: Record<string, unknown>,
+  ) {
     return keys.filter(
-      key =>
+      (key: string[]) =>
         // Is the key hidden by one of its parents?
-        !key.some((k, j) => collapsed[flatKey(key.slice(0, j))]) &&
+        !key.some(
+          (_k: string, j: number) => collapsed[flatKey(key.slice(0, j))],
+        ) &&
         // Leaf key.
         (key.length === numAttrs ||
           // Children hidden. Must show total.
@@ -1113,11 +1272,14 @@ export class TableRenderer extends Component {
   render() {
     if (this.cachedProps !== this.props) {
       this.sortCache.clear();
-      this.state.sortingOrder = [];
-      this.state.activeSortColumn = null;
+      // Reset sort state without using setState to avoid re-render during render.
+      // This is safe because the state is being synchronized with new props.
+      (this.state as TableRendererState).sortingOrder = [];
+      (this.state as TableRendererState).activeSortColumn = null;
       this.cachedProps = this.props;
       this.cachedBasePivotSettings = this.getBasePivotSettings();
     }
+    const basePivotSettings = this.cachedBasePivotSettings!;
     const {
       colAttrs,
       rowAttrs,
@@ -1127,7 +1289,7 @@ export class TableRenderer extends Component {
       rowSubtotalDisplay,
       colSubtotalDisplay,
       allowRenderHtml,
-    } = this.cachedBasePivotSettings;
+    } = basePivotSettings;
 
     // Need to account for exclusions to compute the effective row
     // and column keys.
@@ -1144,28 +1306,28 @@ export class TableRenderer extends Component {
       colSubtotalDisplay,
     );
 
-    const pivotSettings = {
+    const pivotSettings: PivotSettings = {
       visibleRowKeys,
-      maxRowVisible: Math.max(...visibleRowKeys.map(k => k.length)),
+      maxRowVisible: Math.max(...visibleRowKeys.map((k: string[]) => k.length)),
       visibleColKeys,
-      maxColVisible: Math.max(...visibleColKeys.map(k => k.length)),
+      maxColVisible: Math.max(...visibleColKeys.map((k: string[]) => k.length)),
       rowAttrSpans: this.calcAttrSpans(visibleRowKeys, rowAttrs.length),
       colAttrSpans: this.calcAttrSpans(visibleColKeys, colAttrs.length),
       allowRenderHtml,
-      ...this.cachedBasePivotSettings,
+      ...basePivotSettings,
     };
 
     return (
       <Styles isDashboardEditMode={this.isDashboardEditMode()}>
         <table className="pvtTable" role="grid">
           <thead>
-            {colAttrs.map((c, j) =>
+            {colAttrs.map((c: string, j: number) =>
               this.renderColHeaderRow(c, j, pivotSettings),
             )}
             {rowAttrs.length !== 0 && this.renderRowHeaderRow(pivotSettings)}
           </thead>
           <tbody>
-            {visibleRowKeys.map((r, i) =>
+            {visibleRowKeys.map((r: string[], i: number) =>
               this.renderTableRow(r, i, pivotSettings),
             )}
             {colTotals && this.renderTotalsRow(pivotSettings)}
diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/index.js b/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/index.ts
similarity index 100%
rename from superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/index.js
rename to superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/index.ts
diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/utilities.js b/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/utilities.ts
similarity index 61%
rename from superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/utilities.js
rename to superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/utilities.ts
index 100f2defa0e..f4991ba4e1f 100644
--- a/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/utilities.js
+++ b/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/utilities.ts
@@ -20,7 +20,45 @@
 import PropTypes from 'prop-types';
 import { t } from '@apache-superset/core/ui';
 
-const addSeparators = function (nStr, thousandsSep, decimalSep) {
+type SortFunction = (
+  a: string | number | null,
+  b: string | number | null,
+) => number;
+type Formatter = (x: number) => string;
+type PivotRecord = Record<string, string | number | boolean>;
+
+interface NumberFormatOptions {
+  digitsAfterDecimal?: number;
+  scaler?: number;
+  thousandsSep?: string;
+  decimalSep?: string;
+  prefix?: string;
+  suffix?: string;
+}
+
+interface Aggregator {
+  push(record: PivotRecord): void;
+  value(): string | number | null;
+  format(x: string | number | null, agg?: Aggregator): string;
+  numInputs?: number;
+  getCurrencies?(): string[];
+  isSubtotal?: boolean;
+  isRowSubtotal?: boolean;
+  isColSubtotal?: boolean;
+}
+
+interface SubtotalOptions {
+  rowEnabled?: boolean;
+  colEnabled?: boolean;
+  rowPartialOnTop?: boolean;
+  colPartialOnTop?: boolean;
+}
+
+const addSeparators = function (
+  nStr: string,
+  thousandsSep: string,
+  decimalSep: string,
+): string {
   const x = String(nStr).split('.');
   let x1 = x[0];
   const x2 = x.length > 1 ? decimalSep + x[1] : '';
@@ -31,7 +69,7 @@ const addSeparators = function (nStr, thousandsSep, decimalSep) {
   return x1 + x2;
 };
 
-const numberFormat = function (optsIn) {
+const numberFormat = function (optsIn?: NumberFormatOptions): Formatter {
   const defaults = {
     digitsAfterDecimal: 2,
     scaler: 1,
@@ -41,7 +79,7 @@ const numberFormat = function (optsIn) {
     suffix: '',
   };
   const opts = { ...defaults, ...optsIn };
-  return function (x) {
+  return function (x: number): string {
     if (Number.isNaN(x) || !Number.isFinite(x)) {
       return '';
     }
@@ -57,7 +95,7 @@ const numberFormat = function (optsIn) {
 const rx = /(\d+)|(\D+)/g;
 const rd = /\d/;
 const rz = /^0/;
-const naturalSort = (as, bs) => {
+const naturalSort: SortFunction = (as, bs) => {
   // nulls first
   if (bs !== null && as === null) {
     return -1;
@@ -114,56 +152,68 @@ const naturalSort = (as, bs) => {
   }
 
   // special treatment for strings containing digits
-  a = a.match(rx);
-  b = b.match(rx);
-  while (a.length && b.length) {
-    const a1 = a.shift();
-    const b1 = b.shift();
+  const aArr = a.match(rx)!;
+  const bArr = b.match(rx)!;
+  while (aArr.length && bArr.length) {
+    const a1 = aArr.shift()!;
+    const b1 = bArr.shift()!;
     if (a1 !== b1) {
       if (rd.test(a1) && rd.test(b1)) {
-        return a1.replace(rz, '.0') - b1.replace(rz, '.0');
+        return Number(a1.replace(rz, '.0')) - Number(b1.replace(rz, '.0'));
       }
       return a1 > b1 ? 1 : -1;
     }
   }
-  return a.length - b.length;
+  return aArr.length - bArr.length;
 };
 
-const sortAs = function (order) {
-  const mapping = {};
+const sortAs = function (order: (string | number)[]): SortFunction {
+  const mapping: Record<string | number, number> = {};
 
   // sort lowercased keys similarly
-  const lMapping = {};
-  order.forEach((element, i) => {
+  const lMapping: Record<string, number> = {};
+  order.forEach((element: string | number, i: number) => {
     mapping[element] = i;
     if (typeof element === 'string') {
       lMapping[element.toLowerCase()] = i;
     }
   });
-  return function (a, b) {
-    if (a in mapping && b in mapping) {
-      return mapping[a] - mapping[b];
+  return function (
+    a: string | number | null,
+    b: string | number | null,
+  ): number {
+    const aKey = a !== null ? String(a) : '';
+    const bKey = b !== null ? String(b) : '';
+    if (aKey in mapping && bKey in mapping) {
+      return mapping[aKey] - mapping[bKey];
     }
-    if (a in mapping) {
+    if (aKey in mapping) {
       return -1;
     }
-    if (b in mapping) {
+    if (bKey in mapping) {
       return 1;
     }
-    if (a in lMapping && b in lMapping) {
-      return lMapping[a] - lMapping[b];
+    if (aKey in lMapping && bKey in lMapping) {
+      return lMapping[aKey] - lMapping[bKey];
     }
-    if (a in lMapping) {
+    if (aKey in lMapping) {
       return -1;
     }
-    if (b in lMapping) {
+    if (bKey in lMapping) {
       return 1;
     }
     return naturalSort(a, b);
   };
 };
 
-const getSort = function (sorters, attr) {
+const getSort = function (
+  sorters:
+    | ((attr: string) => SortFunction | undefined)
+    | Record<string, SortFunction>
+    | null
+    | undefined,
+  attr: string,
+): SortFunction {
   if (sorters) {
     if (typeof sorters === 'function') {
       const sort = sorters(attr);
@@ -186,13 +236,16 @@ const usFmtPct = numberFormat({
   suffix: '%',
 });
 
-const fmtNonString = formatter => (x, aggregator) =>
-  typeof x === 'string' ? x : formatter(x, aggregator);
+const fmtNonString =
+  (formatter: Formatter) =>
+  (x: string | number | null): string =>
+    typeof x === 'string' ? x : formatter(x as number);
 
 /*
  * Aggregators track currencies via push() and expose them via getCurrencies()
  * for per-cell currency detection in AUTO mode.
  */
+/* eslint-disable @typescript-eslint/no-explicit-any */
 const baseAggregatorTemplates = {
   count(formatter = usFmtInt) {
     return () =>
@@ -210,18 +263,23 @@ const baseAggregatorTemplates = {
       };
   },
 
-  uniques(fn, formatter = usFmtInt) {
-    return function ([attr]) {
+  uniques(fn: (uniq: any[]) => any, formatter = usFmtInt) {
+    return function ([attr]: string[]) {
       return function () {
         return {
-          uniq: [],
-          currencySet: new Set(),
-          push(record) {
+          uniq: [] as any[],
+          currencySet: new Set<string>(),
+          push(record: PivotRecord) {
             if (!Array.from(this.uniq).includes(record[attr])) {
               this.uniq.push(record[attr]);
             }
-            if (record.__currencyColumn && record[record.__currencyColumn]) {
-              this.currencySet.add(record[record.__currencyColumn]);
+            if (
+              record.__currencyColumn &&
+              record[record.__currencyColumn as string]
+            ) {
+              this.currencySet.add(
+                String(record[record.__currencyColumn as string]),
+              );
             }
           },
           value() {
@@ -238,19 +296,24 @@ const baseAggregatorTemplates = {
   },
 
   sum(formatter = usFmt) {
-    return function ([attr]) {
+    return function ([attr]: string[]) {
       return function () {
         return {
-          sum: 0,
-          currencySet: new Set(),
-          push(record) {
+          sum: 0 as any,
+          currencySet: new Set<string>(),
+          push(record: PivotRecord) {
             if (Number.isNaN(Number(record[attr]))) {
               this.sum = record[attr];
             } else {
-              this.sum += parseFloat(record[attr]);
+              this.sum += parseFloat(String(record[attr]));
             }
-            if (record.__currencyColumn && record[record.__currencyColumn]) {
-              this.currencySet.add(record[record.__currencyColumn]);
+            if (
+              record.__currencyColumn &&
+              record[record.__currencyColumn as string]
+            ) {
+              this.currencySet.add(
+                String(record[record.__currencyColumn as string]),
+              );
             }
           },
           value() {
@@ -266,17 +329,17 @@ const baseAggregatorTemplates = {
     };
   },
 
-  extremes(mode, formatter = usFmt) {
-    return function ([attr]) {
-      return function (data) {
+  extremes(mode: string, formatter = usFmt) {
+    return function ([attr]: string[]) {
+      return function (data: any) {
         return {
-          val: null,
-          currencySet: new Set(),
+          val: null as any,
+          currencySet: new Set<string>(),
           sorter: getSort(
             typeof data !== 'undefined' ? data.sorters : null,
             attr,
           ),
-          push(record) {
+          push(record: PivotRecord) {
             const x = record[attr];
             if (['min', 'max'].includes(mode)) {
               const coercedValue = Number(x);
@@ -288,24 +351,36 @@ const baseAggregatorTemplates = {
                     ? x
                     : this.val;
               } else {
-                this.val = Math[mode](
+                const mathFn = mode === 'min' ? Math.min : Math.max;
+                this.val = mathFn(
                   coercedValue,
                   this.val !== null ? this.val : coercedValue,
                 );
               }
             } else if (
               mode === 'first' &&
-              this.sorter(x, this.val !== null ? this.val : x) <= 0
+              this.sorter(
+                x as any,
+                this.val !== null ? this.val : (x as any),
+              ) <= 0
             ) {
               this.val = x;
             } else if (
               mode === 'last' &&
-              this.sorter(x, this.val !== null ? this.val : x) >= 0
+              this.sorter(
+                x as any,
+                this.val !== null ? this.val : (x as any),
+              ) >= 0
             ) {
               this.val = x;
             }
-            if (record.__currencyColumn && record[record.__currencyColumn]) {
-              this.currencySet.add(record[record.__currencyColumn]);
+            if (
+              record.__currencyColumn &&
+              record[record.__currencyColumn as string]
+            ) {
+              this.currencySet.add(
+                String(record[record.__currencyColumn as string]),
+              );
             }
           },
           value() {
@@ -314,7 +389,7 @@ const baseAggregatorTemplates = {
           getCurrencies() {
             return Array.from(this.currencySet);
           },
-          format(x) {
+          format(x: any) {
             if (typeof x === 'number') {
               return formatter(x);
             }
@@ -326,24 +401,29 @@ const baseAggregatorTemplates = {
     };
   },
 
-  quantile(q, formatter = usFmt) {
-    return function ([attr]) {
+  quantile(q: number, formatter = usFmt) {
+    return function ([attr]: string[]) {
       return function () {
         return {
-          vals: [],
-          strMap: {},
-          currencySet: new Set(),
-          push(record) {
+          vals: [] as number[],
+          strMap: {} as Record<string, number>,
+          currencySet: new Set<string>(),
+          push(record: PivotRecord) {
             const val = record[attr];
             const x = Number(val);
 
             if (Number.isNaN(x)) {
-              this.strMap[val] = (this.strMap[val] || 0) + 1;
+              this.strMap[String(val)] = (this.strMap[String(val)] || 0) + 1;
             } else {
               this.vals.push(x);
             }
-            if (record.__currencyColumn && record[record.__currencyColumn]) {
-              this.currencySet.add(record[record.__currencyColumn]);
+            if (
+              record.__currencyColumn &&
+              record[record.__currencyColumn as string]
+            ) {
+              this.currencySet.add(
+                String(record[record.__currencyColumn as string]),
+              );
             }
           },
           value() {
@@ -355,16 +435,18 @@ const baseAggregatorTemplates = {
             }
 
             if (Object.keys(this.strMap).length) {
-              const values = Object.values(this.strMap).sort((a, b) => a - b);
+              const values = (Object.values(this.strMap) as number[]).sort(
+                (a: number, b: number) => a - b,
+              );
               const middle = Math.floor(values.length / 2);
 
               const keys = Object.keys(this.strMap);
               return keys.length % 2 !== 0
                 ? keys[middle]
-                : (keys[middle - 1] + keys[middle]) / 2;
+                : (Number(keys[middle - 1]) + Number(keys[middle])) / 2;
             }
 
-            this.vals.sort((a, b) => a - b);
+            this.vals.sort((a: number, b: number) => a - b);
             const i = (this.vals.length - 1) * q;
             return (this.vals[Math.floor(i)] + this.vals[Math.ceil(i)]) / 2.0;
           },
@@ -379,21 +461,28 @@ const baseAggregatorTemplates = {
   },
 
   runningStat(mode = 'mean', ddof = 1, formatter = usFmt) {
-    return function ([attr]) {
+    return function ([attr]: string[]) {
       return function () {
         return {
           n: 0.0,
           m: 0.0,
           s: 0.0,
-          strValue: null,
-          currencySet: new Set(),
-          push(record) {
+          strValue: null as string | null,
+          currencySet: new Set<string>(),
+          push(record: PivotRecord) {
             const x = Number(record[attr]);
             if (Number.isNaN(x)) {
               this.strValue =
-                typeof record[attr] === 'string' ? record[attr] : this.strValue;
-              if (record.__currencyColumn && record[record.__currencyColumn]) {
-                this.currencySet.add(record[record.__currencyColumn]);
+                typeof record[attr] === 'string'
+                  ? (record[attr] as string)
+                  : this.strValue;
+              if (
+                record.__currencyColumn &&
+                record[record.__currencyColumn as string]
+              ) {
+                this.currencySet.add(
+                  String(record[record.__currencyColumn as string]),
+                );
               }
               return;
             }
@@ -404,8 +493,13 @@ const baseAggregatorTemplates = {
             const mNew = this.m + (x - this.m) / this.n;
             this.s += (x - this.m) * (x - mNew);
             this.m = mNew;
-            if (record.__currencyColumn && record[record.__currencyColumn]) {
-              this.currencySet.add(record[record.__currencyColumn]);
+            if (
+              record.__currencyColumn &&
+              record[record.__currencyColumn as string]
+            ) {
+              this.currencySet.add(
+                String(record[record.__currencyColumn as string]),
+              );
             }
           },
           value() {
@@ -442,21 +536,26 @@ const baseAggregatorTemplates = {
   },
 
   sumOverSum(formatter = usFmt) {
-    return function ([num, denom]) {
+    return function ([num, denom]: string[]) {
       return function () {
         return {
           sumNum: 0,
           sumDenom: 0,
-          currencySet: new Set(),
-          push(record) {
+          currencySet: new Set<string>(),
+          push(record: PivotRecord) {
             if (!Number.isNaN(Number(record[num]))) {
-              this.sumNum += parseFloat(record[num]);
+              this.sumNum += parseFloat(String(record[num]));
             }
             if (!Number.isNaN(Number(record[denom]))) {
-              this.sumDenom += parseFloat(record[denom]);
+              this.sumDenom += parseFloat(String(record[denom]));
             }
-            if (record.__currencyColumn && record[record.__currencyColumn]) {
-              this.currencySet.add(record[record.__currencyColumn]);
+            if (
+              record.__currencyColumn &&
+              record[record.__currencyColumn as string]
+            ) {
+              this.currencySet.add(
+                String(record[record.__currencyColumn as string]),
+              );
             }
           },
           value() {
@@ -473,15 +572,19 @@ const baseAggregatorTemplates = {
     };
   },
 
-  fractionOf(wrapped, type = 'total', formatter = usFmtPct) {
-    return (...x) =>
-      function (data, rowKey, colKey) {
+  fractionOf(
+    wrapped: (...args: any[]) => any,
+    type = 'total',
+    formatter = usFmtPct,
+  ) {
+    return (...x: any[]) =>
+      function (data: any, rowKey: any, colKey: any) {
         return {
           selector: { total: [[], []], row: [rowKey, []], col: [[], colKey] }[
             type
           ],
           inner: wrapped(...Array.from(x || []))(data, rowKey, colKey),
-          push(record) {
+          push(record: PivotRecord) {
             this.inner.push(record);
           },
           format: fmtNonString(formatter),
@@ -504,36 +607,40 @@ const baseAggregatorTemplates = {
       };
   },
 };
+/* eslint-enable @typescript-eslint/no-explicit-any */
 
 const extendedAggregatorTemplates = {
-  countUnique(f) {
-    return baseAggregatorTemplates.uniques(x => x.length, f);
+  countUnique(f?: Formatter) {
+    return baseAggregatorTemplates.uniques((x: unknown[]) => x.length, f);
   },
-  listUnique(s, f) {
-    return baseAggregatorTemplates.uniques(x => x.join(s), f || (x => x));
+  listUnique(s: string, f?: Formatter) {
+    return baseAggregatorTemplates.uniques(
+      (x: unknown[]) => x.join(s),
+      f || (((x: unknown) => x) as unknown as Formatter),
+    );
   },
-  max(f) {
+  max(f?: Formatter) {
     return baseAggregatorTemplates.extremes('max', f);
   },
-  min(f) {
+  min(f?: Formatter) {
     return baseAggregatorTemplates.extremes('min', f);
   },
-  first(f) {
+  first(f?: Formatter) {
     return baseAggregatorTemplates.extremes('first', f);
   },
-  last(f) {
+  last(f?: Formatter) {
     return baseAggregatorTemplates.extremes('last', f);
   },
-  median(f) {
+  median(f?: Formatter) {
     return baseAggregatorTemplates.quantile(0.5, f);
   },
-  average(f) {
+  average(f?: Formatter) {
     return baseAggregatorTemplates.runningStat('mean', 1, f);
   },
-  var(ddof, f) {
+  var(ddof: number, f?: Formatter) {
     return baseAggregatorTemplates.runningStat('var', ddof, f);
   },
-  stdev(ddof, f) {
+  stdev(ddof: number, f?: Formatter) {
     return baseAggregatorTemplates.runningStat('stdev', ddof, f);
   },
 };
@@ -603,63 +710,92 @@ const mthNamesEn = [
   'Dec',
 ];
 const dayNamesEn = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
-const zeroPad = number => `0${number}`.substr(-2, 2); // eslint-disable-line no-magic-numbers
+const zeroPad = (number: number): string => `0${number}`.substr(-2, 2); // eslint-disable-line no-magic-numbers
 
 const derivers = {
-  bin(col, binWidth) {
-    return record => record[col] - (record[col] % binWidth);
+  bin(col: string, binWidth: number) {
+    return (record: PivotRecord) =>
+      (record[col] as number) - ((record[col] as number) % binWidth);
   },
   dateFormat(
-    col,
-    formatString,
+    col: string,
+    formatString: string,
     utcOutput = false,
     mthNames = mthNamesEn,
     dayNames = dayNamesEn,
   ) {
     const utc = utcOutput ? 'UTC' : '';
-    return function (record) {
-      const date = new Date(Date.parse(record[col]));
-      if (Number.isNaN(date)) {
+    return function (record: PivotRecord) {
+      const date = new Date(Date.parse(String(record[col])));
+      if (Number.isNaN(date.getTime())) {
         return '';
       }
-      return formatString.replace(/%(.)/g, function (m, p) {
-        switch (p) {
-          case 'y':
-            return date[`get${utc}FullYear`]();
-          case 'm':
-            return zeroPad(date[`get${utc}Month`]() + 1);
-          case 'n':
-            return mthNames[date[`get${utc}Month`]()];
-          case 'd':
-            return zeroPad(date[`get${utc}Date`]());
-          case 'w':
-            return dayNames[date[`get${utc}Day`]()];
-          case 'x':
-            return date[`get${utc}Day`]();
-          case 'H':
-            return zeroPad(date[`get${utc}Hours`]());
-          case 'M':
-            return zeroPad(date[`get${utc}Minutes`]());
-          case 'S':
-            return zeroPad(date[`get${utc}Seconds`]());
-          default:
-            return `%${p}`;
-        }
-      });
+      return formatString.replace(
+        /%(.)/g,
+        function (m: string, p: string): string {
+          switch (p) {
+            case 'y':
+              return String(date[`get${utc}FullYear`]());
+            case 'm':
+              return zeroPad(date[`get${utc}Month`]() + 1);
+            case 'n':
+              return mthNames[date[`get${utc}Month`]()];
+            case 'd':
+              return zeroPad(date[`get${utc}Date`]());
+            case 'w':
+              return dayNames[date[`get${utc}Day`]()];
+            case 'x':
+              return String(date[`get${utc}Day`]());
+            case 'H':
+              return zeroPad(date[`get${utc}Hours`]());
+            case 'M':
+              return zeroPad(date[`get${utc}Minutes`]());
+            case 'S':
+              return zeroPad(date[`get${utc}Seconds`]());
+            default:
+              return `%${p}`;
+          }
+        },
+      );
     };
   },
 };
 
 // Given an array of attribute values, convert to a key that
 // can be used in objects.
-const flatKey = attrVals => attrVals.join(String.fromCharCode(0));
+const flatKey = (attrVals: string[]): string =>
+  attrVals.join(String.fromCharCode(0));
 
 /*
 Data Model class
 */
 
 class PivotData {
-  constructor(inputProps = {}, subtotals = {}) {
+  props: Record<string, unknown>;
+  aggregator: (...args: unknown[]) => Aggregator;
+  formattedAggregators:
+    | Record<string, Record<string, (...args: unknown[]) => Aggregator>>
+    | false;
+  tree: Record<string, Record<string, Aggregator>>;
+  rowKeys: string[][];
+  colKeys: string[][];
+  rowTotals: Record<string, Aggregator>;
+  colTotals: Record<string, Aggregator>;
+  allTotal: Aggregator;
+  subtotals: SubtotalOptions;
+  sorted: boolean;
+
+  static forEachRecord: (
+    input: unknown,
+    processRecord: (record: PivotRecord) => void,
+  ) => void;
+  static defaultProps: Record<string, unknown>;
+  static propTypes: Record<string, unknown>;
+
+  constructor(
+    inputProps: Record<string, unknown> = {},
+    subtotals: SubtotalOptions = {},
+  ) {
     this.props = { ...PivotData.defaultProps, ...inputProps };
     this.processRecord = this.processRecord.bind(this);
     PropTypes.checkPropTypes(
@@ -669,23 +805,38 @@ class PivotData {
       'PivotData',
     );
 
-    this.aggregator = this.props
-      .aggregatorsFactory(this.props.defaultFormatter)
-      [this.props.aggregatorName](this.props.vals);
-    this.formattedAggregators =
-      this.props.customFormatters &&
-      Object.entries(this.props.customFormatters).reduce(
-        (acc, [key, columnFormatter]) => {
-          acc[key] = {};
-          Object.entries(columnFormatter).forEach(([column, formatter]) => {
-            acc[key][column] = this.props
-              .aggregatorsFactory(formatter)
-              [this.props.aggregatorName](this.props.vals);
-          });
-          return acc;
-        },
-        {},
-      );
+    const aggregatorsFactory = this.props.aggregatorsFactory as (
+      fmt: unknown,
+    ) => Record<string, (vals: unknown) => (...args: unknown[]) => Aggregator>;
+    const aggregatorName = this.props.aggregatorName as string;
+    const vals = this.props.vals as string[];
+    this.aggregator = aggregatorsFactory(this.props.defaultFormatter)[
+      aggregatorName
+    ](vals);
+    this.formattedAggregators = this.props.customFormatters
+      ? Object.entries(
+          this.props.customFormatters as Record<
+            string,
+            Record<string, unknown>
+          >,
+        ).reduce(
+          (
+            acc: Record<
+              string,
+              Record<string, (...args: unknown[]) => Aggregator>
+            >,
+            [key, columnFormatter],
+          ) => {
+            acc[key] = {};
+            Object.entries(columnFormatter).forEach(([column, formatter]) => {
+              acc[key][column] =
+                aggregatorsFactory(formatter)[aggregatorName](vals);
+            });
+            return acc;
+          },
+          {},
+        )
+      : false;
     this.tree = {};
     this.rowKeys = [];
     this.colKeys = [];
@@ -699,29 +850,36 @@ class PivotData {
     PivotData.forEachRecord(this.props.data, this.processRecord);
   }
 
-  getFormattedAggregator(record, totalsKeys) {
+  getFormattedAggregator(record: PivotRecord, totalsKeys?: string[]) {
     if (!this.formattedAggregators) {
       return this.aggregator;
     }
+    const fmtAggs = this.formattedAggregators;
     const [groupName, groupValue] =
       Object.entries(record).find(
-        ([name, value]) =>
-          this.formattedAggregators[name] &&
-          this.formattedAggregators[name][value],
+        ([name, value]) => fmtAggs[name] && fmtAggs[name][String(value)],
       ) || [];
     if (
       !groupName ||
       !groupValue ||
-      (totalsKeys && !totalsKeys.includes(groupValue))
+      (totalsKeys && !totalsKeys.includes(String(groupValue)))
     ) {
       return this.aggregator;
     }
-    return this.formattedAggregators[groupName][groupValue] || this.aggregator;
+    return fmtAggs[groupName][String(groupValue)] || this.aggregator;
   }
 
-  arrSort(attrs, partialOnTop, reverse = false) {
-    const sortersArr = attrs.map(a => getSort(this.props.sorters, a));
-    return function (a, b) {
+  arrSort(attrs: string[], partialOnTop: boolean | undefined, reverse = false) {
+    const sortersArr = attrs.map(a =>
+      getSort(
+        this.props.sorters as
+          | ((attr: string) => SortFunction | undefined)
+          | Record<string, SortFunction>
+          | null,
+        a,
+      ),
+    );
+    return function (a: string[], b: string[]) {
       const limit = Math.min(a.length, b.length);
       for (let i = 0; i < limit; i += 1) {
         const sorter = sortersArr[i];
@@ -734,14 +892,16 @@ class PivotData {
     };
   }
 
-  sortKeys() {
+  sortKeys(): void {
     if (!this.sorted) {
       this.sorted = true;
-      const v = (r, c) => this.getAggregator(r, c).value();
+      const rows = this.props.rows as string[];
+      const cols = this.props.cols as string[];
+      const v = (r: string[], c: string[]) => this.getAggregator(r, c).value();
       switch (this.props.rowOrder) {
         case 'key_z_to_a':
           this.rowKeys.sort(
-            this.arrSort(this.props.rows, this.subtotals.rowPartialOnTop, true),
+            this.arrSort(rows, this.subtotals.rowPartialOnTop, true),
           );
           break;
         case 'value_a_to_z':
@@ -751,14 +911,12 @@ class PivotData {
           this.rowKeys.sort((a, b) => -naturalSort(v(a, []), v(b, [])));
           break;
         default:
-          this.rowKeys.sort(
-            this.arrSort(this.props.rows, this.subtotals.rowPartialOnTop),
-          );
+          this.rowKeys.sort(this.arrSort(rows, this.subtotals.rowPartialOnTop));
       }
       switch (this.props.colOrder) {
         case 'key_z_to_a':
           this.colKeys.sort(
-            this.arrSort(this.props.cols, this.subtotals.colPartialOnTop, true),
+            this.arrSort(cols, this.subtotals.colPartialOnTop, true),
           );
           break;
         case 'value_a_to_z':
@@ -768,32 +926,30 @@ class PivotData {
           this.colKeys.sort((a, b) => -naturalSort(v([], a), v([], b)));
           break;
         default:
-          this.colKeys.sort(
-            this.arrSort(this.props.cols, this.subtotals.colPartialOnTop),
-          );
+          this.colKeys.sort(this.arrSort(cols, this.subtotals.colPartialOnTop));
       }
     }
   }
 
-  getColKeys() {
+  getColKeys(): string[][] {
     this.sortKeys();
     return this.colKeys;
   }
 
-  getRowKeys() {
+  getRowKeys(): string[][] {
     this.sortKeys();
     return this.rowKeys;
   }
 
-  processRecord(record) {
+  processRecord(record: PivotRecord): void {
     // this code is called in a tight loop
-    const colKey = [];
-    const rowKey = [];
-    this.props.cols.forEach(col => {
-      colKey.push(col in record ? record[col] : 'null');
+    const colKey: string[] = [];
+    const rowKey: string[] = [];
+    (this.props.cols as string[]).forEach((col: string) => {
+      colKey.push(col in record ? String(record[col]) : 'null');
     });
-    this.props.rows.forEach(row => {
-      rowKey.push(row in record ? record[row] : 'null');
+    (this.props.rows as string[]).forEach((row: string) => {
+      rowKey.push(row in record ? String(record[row]) : 'null');
     });
 
     this.allTotal.push(record);
@@ -860,7 +1016,7 @@ class PivotData {
     }
   }
 
-  getAggregator(rowKey, colKey) {
+  getAggregator(rowKey: string[], colKey: string[]): Aggregator {
     let agg;
     const flatRowKey = flatKey(rowKey);
     const flatColKey = flatKey(colKey);
@@ -887,7 +1043,10 @@ class PivotData {
 }
 
 // can handle arrays or jQuery selections of tables
-PivotData.forEachRecord = function (input, processRecord) {
+PivotData.forEachRecord = function (
+  input: unknown,
+  processRecord: (record: PivotRecord) => void,
+) {
   if (Array.isArray(input)) {
     // array of objects
     return input.map(record => processRecord(record));
@@ -933,6 +1092,14 @@ PivotData.propTypes = {
   ]),
 };
 
+export type {
+  SortFunction,
+  Formatter,
+  PivotRecord,
+  Aggregator,
+  SubtotalOptions,
+};
+
 export {
   aggregatorTemplates,
   aggregators,
diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/test/react-pivottable/tableRenders.test.tsx b/superset-frontend/plugins/plugin-chart-pivot-table/test/react-pivottable/tableRenders.test.tsx
index 29828720d4d..57bd4fcb7ca 100644
--- a/superset-frontend/plugins/plugin-chart-pivot-table/test/react-pivottable/tableRenders.test.tsx
+++ b/superset-frontend/plugins/plugin-chart-pivot-table/test/react-pivottable/tableRenders.test.tsx
@@ -17,6 +17,7 @@
  * under the License.
  */
 import { TableRenderer } from '../../src/react-pivottable/TableRenderers';
+import type { PivotData } from '../../src/react-pivottable/utilities';
 
 let tableRenderer: TableRenderer;
 let mockGetAggregatedData: jest.Mock;
@@ -102,14 +103,13 @@ const mockGroups = {
   },
 };
 
-const createMockPivotData = (rowData: Record<string, number>) => {
-  return {
+const createMockPivotData = (rowData: Record<string, number>) =>
+  ({
     rowKeys: Object.keys(rowData).map(key => key.split('.')),
     getAggregator: (rowKey: string[], colName: string) => ({
       value: () => rowData[rowKey.join('.')],
     }),
-  };
-};
+  }) as unknown as PivotData;
 
 test('should set initial ascending sort when no active sort column', () => {
   mockGetAggregatedData.mockReturnValue({
@@ -477,7 +477,7 @@ test('create hierarchical structure with subtotal at bottom', () => {
   };
 
   const pivotData = createMockPivotData(rowData);
-  const result = tableRenderer.getAggregatedData(pivotData, 'Col1', false);
+  const result = tableRenderer.getAggregatedData(pivotData, ['Col1'], false);
 
   expect(result).toEqual({
     A: {
@@ -513,7 +513,7 @@ test('create hierarchical structure with subtotal at top', () => {
   };
 
   const pivotData = createMockPivotData(rowData);
-  const result = tableRenderer.getAggregatedData(pivotData, 'Col1', true);
+  const result = tableRenderer.getAggregatedData(pivotData, ['Col1'], true);
 
   expect(result).toEqual({
     A: {
@@ -546,7 +546,7 @@ test('values ​​from the 3rd level of the hierarchy with a subtotal at the bo
   };
 
   const pivotData = createMockPivotData(rowData);
-  const result = tableRenderer.getAggregatedData(pivotData, 'Col1', false);
+  const result = tableRenderer.getAggregatedData(pivotData, ['Col1'], false);
 
   expect(result).toEqual({
     A: {
@@ -574,7 +574,7 @@ test('values ​​from the 3rd level of the hierarchy with a subtotal at the to
   };
 
   const pivotData = createMockPivotData(rowData);
-  const result = tableRenderer.getAggregatedData(pivotData, 'Col1', true);
+  const result = tableRenderer.getAggregatedData(pivotData, ['Col1'], true);
 
   expect(result).toEqual({
     A: {
diff --git a/superset-frontend/spec/fixtures/mockNativeFilters.ts b/superset-frontend/spec/fixtures/mockNativeFilters.ts
index 414935c8b36..a93801ccbdc 100644
--- a/superset-frontend/spec/fixtures/mockNativeFilters.ts
+++ b/superset-frontend/spec/fixtures/mockNativeFilters.ts
@@ -132,7 +132,7 @@ export const NATIVE_FILTER_ID = 'NATIVE_FILTER-p4LImrSgA';
 export const singleNativeFiltersState = {
   filters: {
     [NATIVE_FILTER_ID]: {
-      id: [NATIVE_FILTER_ID],
+      id: NATIVE_FILTER_ID,
       name: 'eth',
       type: 'text',
       filterType: 'filter_select',
diff --git a/superset-frontend/src/SqlLab/actions/sqlLab.test.js b/superset-frontend/src/SqlLab/actions/sqlLab.test.ts
similarity index 86%
rename from superset-frontend/src/SqlLab/actions/sqlLab.test.js
rename to superset-frontend/src/SqlLab/actions/sqlLab.test.ts
index ae547da87d3..bf15df3d805 100644
--- a/superset-frontend/src/SqlLab/actions/sqlLab.test.js
+++ b/superset-frontend/src/SqlLab/actions/sqlLab.test.ts
@@ -22,10 +22,11 @@ import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import { waitFor } from 'spec/helpers/testing-library';
 import * as actions from 'src/SqlLab/actions/sqlLab';
+import type { QueryEditor, Table } from 'src/SqlLab/types';
 import { LOG_EVENT } from 'src/logger/actions';
 import {
   defaultQueryEditor,
-  query,
+  query as queryFixture,
   initialState,
   queryId,
 } from 'src/SqlLab/fixtures';
@@ -33,6 +34,9 @@ import { SupersetClient, isFeatureEnabled } from '@superset-ui/core';
 import { ADD_TOAST } from 'src/components/MessageToasts/actions';
 import { ToastType } from '../../components/MessageToasts/types';
 
+const isFeatureEnabledMock = isFeatureEnabled as unknown as jest.Mock;
+const query = { ...queryFixture, id: queryId } as any;
+
 const middlewares = [thunk];
 const mockStore = configureMockStore(middlewares);
 
@@ -54,7 +58,7 @@ describe('getUpToDateQuery', () => {
   test('should return the up to date query editor state', () => {
     const outOfUpdatedQueryEditor = {
       ...defaultQueryEditor,
-      schema: null,
+      schema: null as unknown as string,
       sql: 'SELECT ...',
     };
     const queryEditor = {
@@ -85,7 +89,7 @@ describe('async actions', () => {
     name: 'Untitled Query 1',
   };
 
-  let dispatch;
+  let dispatch: sinon.SinonSpy;
   const fetchQueryEndpoint = 'glob:*/api/v1/sqllab/results/*';
   const runQueryEndpoint = 'glob:*/api/v1/sqllab/execute/';
 
@@ -134,7 +138,7 @@ describe('async actions', () => {
       const store = mockStore(initialState);
       return store.dispatch(actions.saveQuery(query, queryId)).then(() => {
         const call = fetchMock.callHistory.calls(saveQueryEndpoint)[0];
-        const formData = JSON.parse(call.options.body);
+        const formData = JSON.parse(call.options.body as string);
         const mappedQueryToServer = actions.convertQueryToServer(query);
 
         Object.keys(mappedQueryToServer).forEach(key => {
@@ -167,7 +171,7 @@ describe('async actions', () => {
         actions.QUERY_EDITOR_SAVED,
         actions.QUERY_EDITOR_SET_TITLE,
       ];
-      return store.dispatch(actions.saveQuery(query)).then(() => {
+      return store.dispatch(actions.saveQuery(query, queryId)).then(() => {
         expect(store.getActions().map(a => a.type)).toEqual(
           expectedActionTypes,
         );
@@ -193,7 +197,7 @@ describe('async actions', () => {
 
     test('posts to the correct url', async () => {
       const store = mockStore(initialState);
-      store.dispatch(actions.formatQuery(query, queryId));
+      store.dispatch(actions.formatQuery(query as unknown as QueryEditor));
       await waitFor(() =>
         expect(fetchMock.callHistory.calls(formatQueryEndpoint)).toHaveLength(
           1,
@@ -218,7 +222,9 @@ describe('async actions', () => {
       };
       const store = mockStore(state);
 
-      store.dispatch(actions.formatQuery(queryEditorWithoutExtras));
+      store.dispatch(
+        actions.formatQuery(queryEditorWithoutExtras as unknown as QueryEditor),
+      );
 
       await waitFor(() =>
         expect(fetchMock.callHistory.calls(formatQueryEndpoint)).toHaveLength(
@@ -227,7 +233,7 @@ describe('async actions', () => {
       );
 
       const call = fetchMock.callHistory.calls(formatQueryEndpoint)[0];
-      const body = JSON.parse(call.options.body);
+      const body = JSON.parse(call.options.body as string);
 
       expect(body).toEqual({ sql: 'SELECT * FROM table' });
       expect(body.database_id).toBeUndefined();
@@ -249,7 +255,9 @@ describe('async actions', () => {
       };
       const store = mockStore(state);
 
-      store.dispatch(actions.formatQuery(queryEditorWithDb));
+      store.dispatch(
+        actions.formatQuery(queryEditorWithDb as unknown as QueryEditor),
+      );
 
       await waitFor(() =>
         expect(fetchMock.callHistory.calls(formatQueryEndpoint)).toHaveLength(
@@ -258,7 +266,7 @@ describe('async actions', () => {
       );
 
       const call = fetchMock.callHistory.calls(formatQueryEndpoint)[0];
-      const body = JSON.parse(call.options.body);
+      const body = JSON.parse(call.options.body as string);
 
       expect(body).toEqual({
         sql: 'SELECT * FROM table',
@@ -281,7 +289,11 @@ describe('async actions', () => {
       };
       const store = mockStore(state);
 
-      store.dispatch(actions.formatQuery(queryEditorWithTemplateString));
+      store.dispatch(
+        actions.formatQuery(
+          queryEditorWithTemplateString as unknown as QueryEditor,
+        ),
+      );
 
       await waitFor(() =>
         expect(fetchMock.callHistory.calls(formatQueryEndpoint)).toHaveLength(
@@ -290,7 +302,7 @@ describe('async actions', () => {
       );
 
       const call = fetchMock.callHistory.calls(formatQueryEndpoint)[0];
-      const body = JSON.parse(call.options.body);
+      const body = JSON.parse(call.options.body as string);
 
       expect(body).toEqual({
         sql: 'SELECT * FROM table WHERE id = {{ user_id }}',
@@ -314,7 +326,11 @@ describe('async actions', () => {
       };
       const store = mockStore(state);
 
-      store.dispatch(actions.formatQuery(queryEditorWithTemplateObject));
+      store.dispatch(
+        actions.formatQuery(
+          queryEditorWithTemplateObject as unknown as QueryEditor,
+        ),
+      );
 
       await waitFor(() =>
         expect(fetchMock.callHistory.calls(formatQueryEndpoint)).toHaveLength(
@@ -323,7 +339,7 @@ describe('async actions', () => {
       );
 
       const call = fetchMock.callHistory.calls(formatQueryEndpoint)[0];
-      const body = JSON.parse(call.options.body);
+      const body = JSON.parse(call.options.body as string);
 
       expect(body).toEqual({
         sql: 'SELECT * FROM table WHERE id = {{ user_id }}',
@@ -390,7 +406,7 @@ describe('async actions', () => {
       );
 
       const call = fetchMock.callHistory.calls(formatQueryEndpoint)[0];
-      const body = JSON.parse(call.options.body);
+      const body = JSON.parse(call.options.body as string);
 
       expect(body.sql).toBe('SELECT * FROM updated_table');
       expect(body.database_id).toBe(10);
@@ -551,12 +567,12 @@ describe('async actions', () => {
     const { location } = window;
 
     beforeAll(() => {
-      delete window.location;
-      window.location = new URL('http://localhost/sqllab/?foo=bar');
+      delete (window as any).location;
+      (window as any).location = new URL('http://localhost/sqllab/?foo=bar');
     });
 
     afterAll(() => {
-      delete window.location;
+      delete (window as any).location;
       window.location = location;
     });
 
@@ -633,7 +649,7 @@ describe('async actions', () => {
 
       return makeRequest().then(() => {
         const call = fetchMock.callHistory.calls(stopQueryEndpoint)[0];
-        const body = JSON.parse(call.options.body);
+        const body = JSON.parse(call.options.body as string);
         expect(body.client_id).toBe(baseQuery.id);
       });
     });
@@ -721,8 +737,8 @@ describe('async actions', () => {
       template_parameters: null,
     };
 
-    const makeRequest = id => {
-      const request = actions.popSavedQuery(id);
+    const makeRequest = (id: string | number) => {
+      const request = actions.popSavedQuery(String(id));
       const { dispatch } = store;
 
       return request(dispatch, () => initialState);
@@ -740,7 +756,7 @@ describe('async actions', () => {
     test('calls API endpint with correct params', async () => {
       supersetClientGetSpy.mockResolvedValue({
         json: { result: mockSavedQueryApiResponse },
-      });
+      } as any);
 
       await makeRequest(123);
 
@@ -752,7 +768,7 @@ describe('async actions', () => {
     test('dispatches addQueryEditor with correct params on successful API call', async () => {
       supersetClientGetSpy.mockResolvedValue({
         json: { result: mockSavedQueryApiResponse },
-      });
+      } as any);
 
       const expectedParams = {
         name: 'Query 1',
@@ -777,7 +793,7 @@ describe('async actions', () => {
     });
 
     test('should dispatch addDangerToast on API error', async () => {
-      supersetClientGetSpy.mockResolvedValue(new Error());
+      supersetClientGetSpy.mockResolvedValue(new Error() as any);
 
       await makeRequest(1);
 
@@ -838,7 +854,7 @@ describe('async actions', () => {
               schema: defaultQueryEditor.schema,
               autorun: false,
               queryLimit:
-                defaultQueryEditor.queryLimit ||
+                (defaultQueryEditor as any).queryLimit ||
                 initialState.common.conf.DEFAULT_SQLLAB_LIMIT,
               inLocalStorage: true,
               loaded: true,
@@ -971,13 +987,13 @@ describe('async actions', () => {
     fetchMock.get(getExtraTableMetadataEndpoint, {});
 
     beforeEach(() => {
-      isFeatureEnabled.mockImplementation(
-        feature => feature === 'SQLLAB_BACKEND_PERSISTENCE',
+      isFeatureEnabledMock.mockImplementation(
+        (feature: string) => feature === 'SQLLAB_BACKEND_PERSISTENCE',
       );
     });
 
     afterEach(() => {
-      isFeatureEnabled.mockRestore();
+      isFeatureEnabledMock.mockRestore();
     });
 
     afterEach(() => fetchMock.clearHistory());
@@ -1157,8 +1173,8 @@ describe('async actions', () => {
       // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
       describe('with backend persistence flag off', () => {
         test('does not update the tab state in the backend', () => {
-          isFeatureEnabled.mockImplementation(
-            feature => !(feature === 'SQLLAB_BACKEND_PERSISTENCE'),
+          isFeatureEnabledMock.mockImplementation(
+            (feature: string) => !(feature === 'SQLLAB_BACKEND_PERSISTENCE'),
           );
 
           const store = mockStore({
@@ -1175,7 +1191,7 @@ describe('async actions', () => {
           expect(
             fetchMock.callHistory.calls(updateTabStateEndpoint),
           ).toHaveLength(0);
-          isFeatureEnabled.mockRestore();
+          isFeatureEnabledMock.mockRestore();
         });
       });
     });
@@ -1350,7 +1366,11 @@ describe('async actions', () => {
         const expectedActionTypes = [
           actions.MERGE_TABLE, // syncTable
         ];
-        const request = actions.syncTable(query, tableName, schemaName);
+        const request = actions.syncTable(
+          query as any,
+          tableName as any,
+          schemaName,
+        );
         return request(store.dispatch, store.getState).then(() => {
           expect(store.getActions().map(a => a.type)).toEqual(
             expectedActionTypes,
@@ -1466,18 +1486,20 @@ describe('async actions', () => {
             table,
           },
         ];
-        return store.dispatch(actions.expandTable(table)).then(() => {
-          expect(store.getActions()).toEqual(expectedActions);
-          const expandedCalls = fetchMock.callHistory
-            .calls()
-            .filter(
-              call =>
-                call.url &&
-                call.url.includes('/tableschemaview/') &&
-                call.url.includes('/expanded'),
-            );
-          expect(expandedCalls).toHaveLength(1);
-        });
+        return store
+          .dispatch(actions.expandTable(table as unknown as Table))
+          .then(() => {
+            expect(store.getActions()).toEqual(expectedActions);
+            const expandedCalls = fetchMock.callHistory
+              .calls()
+              .filter(
+                call =>
+                  call.url &&
+                  call.url.includes('/tableschemaview/') &&
+                  call.url.includes('/expanded'),
+              );
+            expect(expandedCalls).toHaveLength(1);
+          });
       });
 
       test('does not call backend when table is not initialized', () => {
@@ -1491,19 +1513,21 @@ describe('async actions', () => {
             table,
           },
         ];
-        return store.dispatch(actions.expandTable(table)).then(() => {
-          expect(store.getActions()).toEqual(expectedActions);
-          // Check all POST calls to find the expanded endpoint
-          const expandedCalls = fetchMock.callHistory
-            .calls()
-            .filter(
-              call =>
-                call[0] &&
-                call[0].includes('/tableschemaview/') &&
-                call[0].includes('/expanded'),
-            );
-          expect(expandedCalls).toHaveLength(0);
-        });
+        return store
+          .dispatch(actions.expandTable(table as unknown as Table))
+          .then(() => {
+            expect(store.getActions()).toEqual(expectedActions);
+            // Check all POST calls to find the expanded endpoint
+            const expandedCalls = fetchMock.callHistory
+              .calls()
+              .filter(
+                call =>
+                  call.url &&
+                  call.url.includes('/tableschemaview/') &&
+                  call.url.includes('/expanded'),
+              );
+            expect(expandedCalls).toHaveLength(0);
+          });
       });
 
       test('does not call backend when initialized is undefined', () => {
@@ -1517,26 +1541,28 @@ describe('async actions', () => {
             table,
           },
         ];
-        return store.dispatch(actions.expandTable(table)).then(() => {
-          expect(store.getActions()).toEqual(expectedActions);
-          // Check all POST calls to find the expanded endpoint
-          const expandedCalls = fetchMock.callHistory
-            .calls()
-            .filter(
-              call =>
-                call.url &&
-                call.url.includes('/tableschemaview/') &&
-                call.url.includes('/expanded'),
-            );
-          expect(expandedCalls).toHaveLength(0);
-        });
+        return store
+          .dispatch(actions.expandTable(table as unknown as Table))
+          .then(() => {
+            expect(store.getActions()).toEqual(expectedActions);
+            // Check all POST calls to find the expanded endpoint
+            const expandedCalls = fetchMock.callHistory
+              .calls()
+              .filter(
+                call =>
+                  call.url &&
+                  call.url.includes('/tableschemaview/') &&
+                  call.url.includes('/expanded'),
+              );
+            expect(expandedCalls).toHaveLength(0);
+          });
       });
 
       test('does not call backend when feature flag is off', () => {
         expect.assertions(2);
 
-        isFeatureEnabled.mockImplementation(
-          feature => !(feature === 'SQLLAB_BACKEND_PERSISTENCE'),
+        isFeatureEnabledMock.mockImplementation(
+          (feature: string) => !(feature === 'SQLLAB_BACKEND_PERSISTENCE'),
         );
 
         const table = { id: 1, initialized: true };
@@ -1547,20 +1573,22 @@ describe('async actions', () => {
             table,
           },
         ];
-        return store.dispatch(actions.expandTable(table)).then(() => {
-          expect(store.getActions()).toEqual(expectedActions);
-          // Check all POST calls to find the expanded endpoint
-          const expandedCalls = fetchMock.callHistory
-            .calls()
-            .filter(
-              call =>
-                call.url &&
-                call.url.includes('/tableschemaview/') &&
-                call.url.includes('/expanded'),
-            );
-          expect(expandedCalls).toHaveLength(0);
-          isFeatureEnabled.mockRestore();
-        });
+        return store
+          .dispatch(actions.expandTable(table as unknown as Table))
+          .then(() => {
+            expect(store.getActions()).toEqual(expectedActions);
+            // Check all POST calls to find the expanded endpoint
+            const expandedCalls = fetchMock.callHistory
+              .calls()
+              .filter(
+                call =>
+                  call.url &&
+                  call.url.includes('/tableschemaview/') &&
+                  call.url.includes('/expanded'),
+              );
+            expect(expandedCalls).toHaveLength(0);
+            isFeatureEnabledMock.mockRestore();
+          });
       });
     });
 
@@ -1577,18 +1605,20 @@ describe('async actions', () => {
             table,
           },
         ];
-        return store.dispatch(actions.collapseTable(table)).then(() => {
-          expect(store.getActions()).toEqual(expectedActions);
-          const expandedCalls = fetchMock.callHistory
-            .calls()
-            .filter(
-              call =>
-                call.url &&
-                call.url.includes('/tableschemaview/') &&
-                call.url.includes('/expanded'),
-            );
-          expect(expandedCalls).toHaveLength(1);
-        });
+        return store
+          .dispatch(actions.collapseTable(table as unknown as Table))
+          .then(() => {
+            expect(store.getActions()).toEqual(expectedActions);
+            const expandedCalls = fetchMock.callHistory
+              .calls()
+              .filter(
+                call =>
+                  call.url &&
+                  call.url.includes('/tableschemaview/') &&
+                  call.url.includes('/expanded'),
+              );
+            expect(expandedCalls).toHaveLength(1);
+          });
       });
 
       test('does not call backend when table is not initialized', () => {
@@ -1602,18 +1632,20 @@ describe('async actions', () => {
             table,
           },
         ];
-        return store.dispatch(actions.collapseTable(table)).then(() => {
-          expect(store.getActions()).toEqual(expectedActions);
-          const expandedCalls = fetchMock.callHistory
-            .calls()
-            .filter(
-              call =>
-                call.url &&
-                call.url.includes('/tableschemaview/') &&
-                call.url.includes('/expanded'),
-            );
-          expect(expandedCalls).toHaveLength(0);
-        });
+        return store
+          .dispatch(actions.collapseTable(table as unknown as Table))
+          .then(() => {
+            expect(store.getActions()).toEqual(expectedActions);
+            const expandedCalls = fetchMock.callHistory
+              .calls()
+              .filter(
+                call =>
+                  call.url &&
+                  call.url.includes('/tableschemaview/') &&
+                  call.url.includes('/expanded'),
+              );
+            expect(expandedCalls).toHaveLength(0);
+          });
       });
 
       test('does not call backend when initialized is undefined', () => {
@@ -1627,25 +1659,27 @@ describe('async actions', () => {
             table,
           },
         ];
-        return store.dispatch(actions.collapseTable(table)).then(() => {
-          expect(store.getActions()).toEqual(expectedActions);
-          const expandedCalls = fetchMock.callHistory
-            .calls()
-            .filter(
-              call =>
-                call.url &&
-                call.url.includes('/tableschemaview/') &&
-                call.url.includes('/expanded'),
-            );
-          expect(expandedCalls).toHaveLength(0);
-        });
+        return store
+          .dispatch(actions.collapseTable(table as unknown as Table))
+          .then(() => {
+            expect(store.getActions()).toEqual(expectedActions);
+            const expandedCalls = fetchMock.callHistory
+              .calls()
+              .filter(
+                call =>
+                  call.url &&
+                  call.url.includes('/tableschemaview/') &&
+                  call.url.includes('/expanded'),
+              );
+            expect(expandedCalls).toHaveLength(0);
+          });
       });
 
       test('does not call backend when feature flag is off', () => {
         expect.assertions(2);
 
-        isFeatureEnabled.mockImplementation(
-          feature => !(feature === 'SQLLAB_BACKEND_PERSISTENCE'),
+        isFeatureEnabledMock.mockImplementation(
+          (feature: string) => !(feature === 'SQLLAB_BACKEND_PERSISTENCE'),
         );
 
         const table = { id: 1, initialized: true };
@@ -1656,19 +1690,21 @@ describe('async actions', () => {
             table,
           },
         ];
-        return store.dispatch(actions.collapseTable(table)).then(() => {
-          expect(store.getActions()).toEqual(expectedActions);
-          const expandedCalls = fetchMock.callHistory
-            .calls()
-            .filter(
-              call =>
-                call[0] &&
-                call[0].includes('/tableschemaview/') &&
-                call[0].includes('/expanded'),
-            );
-          expect(expandedCalls).toHaveLength(0);
-          isFeatureEnabled.mockRestore();
-        });
+        return store
+          .dispatch(actions.collapseTable(table as unknown as Table))
+          .then(() => {
+            expect(store.getActions()).toEqual(expectedActions);
+            const expandedCalls = fetchMock.callHistory
+              .calls()
+              .filter(
+                call =>
+                  call.url &&
+                  call.url.includes('/tableschemaview/') &&
+                  call.url.includes('/expanded'),
+              );
+            expect(expandedCalls).toHaveLength(0);
+            isFeatureEnabledMock.mockRestore();
+          });
       });
     });
 
@@ -1685,12 +1721,14 @@ describe('async actions', () => {
             tables: [table],
           },
         ];
-        return store.dispatch(actions.removeTables([table])).then(() => {
-          expect(store.getActions()).toEqual(expectedActions);
-          expect(
-            fetchMock.callHistory.calls(updateTableSchemaEndpoint),
-          ).toHaveLength(1);
-        });
+        return store
+          .dispatch(actions.removeTables([table] as unknown as Table[]))
+          .then(() => {
+            expect(store.getActions()).toEqual(expectedActions);
+            expect(
+              fetchMock.callHistory.calls(updateTableSchemaEndpoint),
+            ).toHaveLength(1);
+          });
       });
 
       test('deletes multiple tables and updates the table schema state in the backend', () => {
@@ -1707,12 +1745,14 @@ describe('async actions', () => {
             tables,
           },
         ];
-        return store.dispatch(actions.removeTables(tables)).then(() => {
-          expect(store.getActions()).toEqual(expectedActions);
-          expect(
-            fetchMock.callHistory.calls(updateTableSchemaEndpoint),
-          ).toHaveLength(2);
-        });
+        return store
+          .dispatch(actions.removeTables(tables as unknown as Table[]))
+          .then(() => {
+            expect(store.getActions()).toEqual(expectedActions);
+            expect(
+              fetchMock.callHistory.calls(updateTableSchemaEndpoint),
+            ).toHaveLength(2);
+          });
       });
 
       test('only updates the initialized table schema state in the backend', () => {
@@ -1726,12 +1766,14 @@ describe('async actions', () => {
             tables,
           },
         ];
-        return store.dispatch(actions.removeTables(tables)).then(() => {
-          expect(store.getActions()).toEqual(expectedActions);
-          expect(
-            fetchMock.callHistory.calls(updateTableSchemaEndpoint),
-          ).toHaveLength(1);
-        });
+        return store
+          .dispatch(actions.removeTables(tables as unknown as Table[]))
+          .then(() => {
+            expect(store.getActions()).toEqual(expectedActions);
+            expect(
+              fetchMock.callHistory.calls(updateTableSchemaEndpoint),
+            ).toHaveLength(1);
+          });
       });
     });
 
diff --git a/superset-frontend/src/SqlLab/reducers/sqlLab.test.js b/superset-frontend/src/SqlLab/reducers/sqlLab.test.ts
similarity index 92%
rename from superset-frontend/src/SqlLab/reducers/sqlLab.test.js
rename to superset-frontend/src/SqlLab/reducers/sqlLab.test.ts
index fedca09e391..b61fde0c351 100644
--- a/superset-frontend/src/SqlLab/reducers/sqlLab.test.js
+++ b/superset-frontend/src/SqlLab/reducers/sqlLab.test.ts
@@ -19,17 +19,20 @@
 import { QueryState } from '@superset-ui/core';
 import sqlLabReducer from 'src/SqlLab/reducers/sqlLab';
 import * as actions from 'src/SqlLab/actions/sqlLab';
+import type { SqlLabAction } from 'src/SqlLab/actions/sqlLab';
+import type { SqlLabRootState } from 'src/SqlLab/types';
 import { table, initialState as mockState } from '../fixtures';
 
-const initialState = mockState.sqlLab;
+type SqlLabState = SqlLabRootState['sqlLab'];
+const initialState = mockState.sqlLab as unknown as SqlLabState;
 
 // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
 describe('sqlLabReducer', () => {
   // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
   describe('Query editors actions', () => {
-    let newState;
-    let defaultQueryEditor;
-    let qe;
+    let newState: SqlLabState;
+    let defaultQueryEditor: SqlLabState['queryEditors'][number];
+    let qe: SqlLabState['queryEditors'][number] | undefined;
     beforeEach(() => {
       newState = { ...initialState };
       defaultQueryEditor = newState.queryEditors[0];
@@ -81,7 +84,7 @@ describe('sqlLabReducer', () => {
       const currentQE = newState.queryEditors[0];
       newState = {
         ...initialState,
-        tabHistory: [initialState.queryEditors[0]],
+        tabHistory: [initialState.queryEditors[0].id],
       };
       const action = {
         type: actions.REMOVE_QUERY_EDITOR,
@@ -100,18 +103,18 @@ describe('sqlLabReducer', () => {
       expect(newState.queryEditors).toHaveLength(
         initialState.queryEditors.length + 1,
       );
-      let action = {
+      const setDbAction = {
         type: actions.QUERY_EDITOR_SETDB,
         queryEditor: qe,
         dbId: 123,
       };
-      newState = sqlLabReducer(newState, action);
-      expect(newState.unsavedQueryEditor.dbId).toEqual(action.dbId);
-      action = {
+      newState = sqlLabReducer(newState, setDbAction);
+      expect(newState.unsavedQueryEditor.dbId).toEqual(setDbAction.dbId);
+      const removeAction = {
         type: actions.REMOVE_QUERY_EDITOR,
         queryEditor: qe,
-      };
-      newState = sqlLabReducer(newState, action);
+      } as SqlLabAction;
+      newState = sqlLabReducer(newState, removeAction);
       expect(newState.queryEditors).toHaveLength(
         initialState.queryEditors.length,
       );
@@ -150,7 +153,7 @@ describe('sqlLabReducer', () => {
       };
       newState = sqlLabReducer(newState, action);
       expect(newState.unsavedQueryEditor.dbId).toBe(dbId);
-      expect(newState.unsavedQueryEditor.id).toBe(qe.id);
+      expect(newState.unsavedQueryEditor.id).toBe(qe!.id);
     });
     test('should not fail while setting schema', () => {
       const schema = 'foo';
@@ -161,7 +164,7 @@ describe('sqlLabReducer', () => {
       };
       newState = sqlLabReducer(newState, action);
       expect(newState.unsavedQueryEditor.schema).toBe(schema);
-      expect(newState.unsavedQueryEditor.id).toBe(qe.id);
+      expect(newState.unsavedQueryEditor.id).toBe(qe!.id);
     });
     test('should not fail while setting autorun', () => {
       const action = {
@@ -170,10 +173,10 @@ describe('sqlLabReducer', () => {
       };
       newState = sqlLabReducer(newState, { ...action, autorun: false });
       expect(newState.unsavedQueryEditor.autorun).toBe(false);
-      expect(newState.unsavedQueryEditor.id).toBe(qe.id);
+      expect(newState.unsavedQueryEditor.id).toBe(qe!.id);
       newState = sqlLabReducer(newState, { ...action, autorun: true });
       expect(newState.unsavedQueryEditor.autorun).toBe(true);
-      expect(newState.unsavedQueryEditor.id).toBe(qe.id);
+      expect(newState.unsavedQueryEditor.id).toBe(qe!.id);
     });
     test('should not fail while setting title', () => {
       const title = 'Untitled Query 1';
@@ -184,7 +187,7 @@ describe('sqlLabReducer', () => {
       };
       newState = sqlLabReducer(newState, action);
       expect(newState.unsavedQueryEditor.name).toBe(title);
-      expect(newState.unsavedQueryEditor.id).toBe(qe.id);
+      expect(newState.unsavedQueryEditor.id).toBe(qe!.id);
     });
     test('should not fail while setting Sql', () => {
       const sql = 'SELECT nothing from dev_null';
@@ -195,7 +198,7 @@ describe('sqlLabReducer', () => {
       };
       newState = sqlLabReducer(newState, action);
       expect(newState.unsavedQueryEditor.sql).toBe(sql);
-      expect(newState.unsavedQueryEditor.id).toBe(qe.id);
+      expect(newState.unsavedQueryEditor.id).toBe(qe!.id);
     });
     test('should not fail while setting queryLimit', () => {
       const queryLimit = 101;
@@ -206,7 +209,7 @@ describe('sqlLabReducer', () => {
       };
       newState = sqlLabReducer(newState, action);
       expect(newState.unsavedQueryEditor.queryLimit).toBe(queryLimit);
-      expect(newState.unsavedQueryEditor.id).toBe(qe.id);
+      expect(newState.unsavedQueryEditor.id).toBe(qe!.id);
     });
     test('should set selectedText', () => {
       const selectedText = 'TEST';
@@ -215,10 +218,10 @@ describe('sqlLabReducer', () => {
         queryEditor: qe,
         sql: selectedText,
       };
-      expect(qe.selectedText).toBeFalsy();
+      expect(qe!.selectedText).toBeFalsy();
       newState = sqlLabReducer(newState, action);
       expect(newState.unsavedQueryEditor.selectedText).toBe(selectedText);
-      expect(newState.unsavedQueryEditor.id).toBe(qe.id);
+      expect(newState.unsavedQueryEditor.id).toBe(qe!.id);
     });
     test('should not wiped out unsaved changes while delayed async call intercepted', () => {
       const expectedSql = 'Updated SQL WORKING IN PROGRESS--';
@@ -243,9 +246,9 @@ describe('sqlLabReducer', () => {
     });
     test('should migrate query editor by new query editor id', () => {
       const { length } = newState.queryEditors;
-      const index = newState.queryEditors.findIndex(({ id }) => id === qe.id);
+      const index = newState.queryEditors.findIndex(({ id }) => id === qe!.id);
       const newQueryEditor = {
-        ...qe,
+        ...qe!,
         tabViewId: 'updatedNewId',
         schema: 'updatedSchema',
         inLocalStorage: false,
@@ -255,8 +258,8 @@ describe('sqlLabReducer', () => {
         oldQueryEditor: qe,
         newQueryEditor,
       };
-      newState = sqlLabReducer(newState, action);
-      expect(newState.queryEditors[index].id).toEqual(qe.id);
+      newState = sqlLabReducer(newState, action as SqlLabAction);
+      expect(newState.queryEditors[index].id).toEqual(qe!.id);
       expect(newState.queryEditors[index].tabViewId).toEqual('updatedNewId');
       expect(newState.queryEditors[index]).toEqual(newQueryEditor);
       const removeAction = {
@@ -289,8 +292,8 @@ describe('sqlLabReducer', () => {
   });
   // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
   describe('Tables', () => {
-    let newState;
-    let newTable;
+    let newState: SqlLabState;
+    let newTable: any;
     beforeEach(() => {
       newTable = { ...table };
       const action = {
@@ -314,7 +317,9 @@ describe('sqlLabReducer', () => {
       };
       newState = sqlLabReducer(newState, action);
       expect(newState.tables).toHaveLength(1);
-      expect(newState.tables[0].extra).toBe(true);
+      expect(
+        (newState.tables[0] as unknown as Record<string, unknown>).extra,
+      ).toBe(true);
     });
     test('should overwrite table ID be ignored when the existing table is already initialized', () => {
       const action = {
@@ -462,8 +467,8 @@ describe('sqlLabReducer', () => {
   describe('Run Query', () => {
     const DENORMALIZED_CHANGED_ON = '2023-06-26T07:53:05.439';
     const CHANGED_ON_TIMESTAMP = 1687765985439;
-    let newState;
-    let query;
+    let newState: any;
+    let query: any;
     beforeEach(() => {
       newState = { ...initialState };
       query = {
@@ -575,8 +580,8 @@ describe('sqlLabReducer', () => {
   });
   // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
   describe('CLEAR_INACTIVE_QUERIES', () => {
-    let newState;
-    let query;
+    let newState: any;
+    let query: any;
     beforeEach(() => {
       query = {
         id: 'abcd',
diff --git a/superset-frontend/src/components/Chart/chartReducers.test.js b/superset-frontend/src/components/Chart/chartReducers.test.ts
similarity index 76%
rename from superset-frontend/src/components/Chart/chartReducers.test.js
rename to superset-frontend/src/components/Chart/chartReducers.test.ts
index a4081aa851b..06aceebddbf 100644
--- a/superset-frontend/src/components/Chart/chartReducers.test.js
+++ b/superset-frontend/src/components/Chart/chartReducers.test.ts
@@ -16,14 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { JsonObject } from '@superset-ui/core';
 import chartReducer, { chart } from 'src/components/Chart/chartReducer';
 import * as actions from 'src/components/Chart/chartAction';
+import { ChartState } from 'src/explore/types';
 
 // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
 describe('chart reducers', () => {
   const chartKey = 1;
-  let testChart;
-  let charts;
+  let testChart: ChartState;
+  let charts: Record<number, ChartState>;
   beforeEach(() => {
     testChart = {
       ...chart,
@@ -42,18 +44,20 @@ describe('chart reducers', () => {
     const newState = chartReducer(
       charts,
       actions.chartUpdateFailed(
-        {
-          statusText: 'timeout',
-          error: 'Request timed out',
-          errors: [
-            {
-              error_type: 'FRONTEND_TIMEOUT_ERROR',
-              extra: { timeout: 1 },
-              level: 'error',
-              message: 'Request timed out',
-            },
-          ],
-        },
+        [
+          {
+            statusText: 'timeout',
+            error: 'Request timed out',
+            errors: [
+              {
+                error_type: 'FRONTEND_TIMEOUT_ERROR',
+                extra: { timeout: 1 },
+                level: 'error',
+                message: 'Request timed out',
+              },
+            ],
+          } as JsonObject,
+        ],
         chartKey,
       ),
     );
diff --git a/superset-frontend/src/components/Datasource/ChangeDatasourceModal/ChangeDatasourceModal.test.jsx b/superset-frontend/src/components/Datasource/ChangeDatasourceModal/ChangeDatasourceModal.test.tsx
similarity index 100%
rename from superset-frontend/src/components/Datasource/ChangeDatasourceModal/ChangeDatasourceModal.test.jsx
rename to superset-frontend/src/components/Datasource/ChangeDatasourceModal/ChangeDatasourceModal.test.tsx
diff --git a/superset-frontend/src/components/Datasource/DatasourceModal/DatasourceModal.test.jsx b/superset-frontend/src/components/Datasource/DatasourceModal/DatasourceModal.test.tsx
similarity index 96%
rename from superset-frontend/src/components/Datasource/DatasourceModal/DatasourceModal.test.jsx
rename to superset-frontend/src/components/Datasource/DatasourceModal/DatasourceModal.test.tsx
index afd35a26e72..e19b728a3ab 100644
--- a/superset-frontend/src/components/Datasource/DatasourceModal/DatasourceModal.test.jsx
+++ b/superset-frontend/src/components/Datasource/DatasourceModal/DatasourceModal.test.tsx
@@ -29,7 +29,13 @@ import fetchMock from 'fetch-mock';
 import sinon from 'sinon';
 import { SupersetClient } from '@superset-ui/core';
 import mockDatasource from 'spec/fixtures/mockDatasource';
-import DatasourceModal from '.';
+import React from 'react';
+import DatasourceModalComponent from '.';
+
+// Cast to accept partial mock props in tests
+const DatasourceModal = DatasourceModalComponent as unknown as React.FC<
+  Record<string, any>
+>;
 
 // Define your constants here
 const SAVE_ENDPOINT = 'glob:*/api/v1/dataset/7';
@@ -48,7 +54,7 @@ const mockedProps = {
   onDatasourceSave: sinon.spy(),
 };
 
-let container;
+let container: HTMLElement;
 const routeProps = {
   history: {},
   location: {},
@@ -109,7 +115,11 @@ describe('DatasourceModal', () => {
     cleanup();
     const onDatasourceSave = jest.fn();
 
-    renderAndWait({ ...mockedProps, onDatasourceSave });
+    renderAndWait({
+      ...mockedProps,
+      onDatasourceSave:
+        onDatasourceSave as unknown as typeof mockedProps.onDatasourceSave,
+    });
     const saveButton = screen.getByTestId('datasource-modal-save');
     await act(async () => {
       fireEvent.click(saveButton);
diff --git a/superset-frontend/src/components/ErrorMessage/OAuth2RedirectMessage.tsx b/superset-frontend/src/components/ErrorMessage/OAuth2RedirectMessage.tsx
index cb0e22b9873..b79e7b9c56f 100644
--- a/superset-frontend/src/components/ErrorMessage/OAuth2RedirectMessage.tsx
+++ b/superset-frontend/src/components/ErrorMessage/OAuth2RedirectMessage.tsx
@@ -124,7 +124,7 @@ export function OAuth2RedirectMessage({
         } else if (source === 'explore' && chartId) {
           dispatch(triggerQuery(true, chartId));
         } else if (source === 'dashboard') {
-          dispatch(onRefresh(chartList, true, 0, dashboardId));
+          dispatch(onRefresh(chartList.map(Number), true, 0, dashboardId));
         }
       }
     };
diff --git a/superset-frontend/src/components/MessageToasts/Toast.test.jsx b/superset-frontend/src/components/MessageToasts/Toast.test.tsx
similarity index 88%
rename from superset-frontend/src/components/MessageToasts/Toast.test.jsx
rename to superset-frontend/src/components/MessageToasts/Toast.test.tsx
index 130eaf156fb..ade8011da81 100644
--- a/superset-frontend/src/components/MessageToasts/Toast.test.jsx
+++ b/superset-frontend/src/components/MessageToasts/Toast.test.tsx
@@ -18,14 +18,16 @@
  */
 import { fireEvent, render, waitFor } from 'spec/helpers/testing-library';
 import Toast from 'src/components/MessageToasts/Toast';
+import { ToastMeta } from 'src/components/MessageToasts/types';
 import mockMessageToasts from './mockMessageToasts';
 
 const props = {
-  toast: mockMessageToasts[0],
+  toast: mockMessageToasts[0] as ToastMeta,
   onCloseToast() {},
 };
 
-const setup = overrideProps => render(<Toast {...props} {...overrideProps} />);
+const setup = (overrideProps?: Record<string, unknown>) =>
+  render(<Toast {...props} {...overrideProps} />);
 
 test('should render', () => {
   const { getByTestId } = setup();
diff --git a/superset-frontend/src/components/MessageToasts/ToastPresenter.test.jsx b/superset-frontend/src/components/MessageToasts/ToastPresenter.test.tsx
similarity index 91%
rename from superset-frontend/src/components/MessageToasts/ToastPresenter.test.jsx
rename to superset-frontend/src/components/MessageToasts/ToastPresenter.test.tsx
index f0b4ba738c0..1a3e4894816 100644
--- a/superset-frontend/src/components/MessageToasts/ToastPresenter.test.jsx
+++ b/superset-frontend/src/components/MessageToasts/ToastPresenter.test.tsx
@@ -19,14 +19,15 @@
 import { fireEvent, render, waitFor } from 'spec/helpers/testing-library';
 
 import ToastPresenter from 'src/components/MessageToasts/ToastPresenter';
+import { ToastMeta } from 'src/components/MessageToasts/types';
 import mockMessageToasts from './mockMessageToasts';
 
 const props = {
-  toasts: mockMessageToasts,
+  toasts: mockMessageToasts as ToastMeta[],
   removeToast() {},
 };
 
-function setup(overrideProps) {
+function setup(overrideProps?: Record<string, unknown>) {
   return render(<ToastPresenter {...props} {...overrideProps} />);
 }
 
diff --git a/superset-frontend/src/components/MessageToasts/reducers.test.js b/superset-frontend/src/components/MessageToasts/reducers.test.ts
similarity index 58%
rename from superset-frontend/src/components/MessageToasts/reducers.test.js
rename to superset-frontend/src/components/MessageToasts/reducers.test.ts
index d70ab28df92..62780f3b151 100644
--- a/superset-frontend/src/components/MessageToasts/reducers.test.js
+++ b/superset-frontend/src/components/MessageToasts/reducers.test.ts
@@ -18,26 +18,51 @@
  */
 import { ADD_TOAST, REMOVE_TOAST } from 'src/components/MessageToasts/actions';
 import messageToastsReducer from 'src/components/MessageToasts/reducers';
+import { ToastMeta, ToastType } from 'src/components/MessageToasts/types';
 
 // messageToasts reducer
 test('messageToasts reducer should return initial state', () => {
-  expect(messageToastsReducer(undefined, {})).toEqual([]);
+  expect(
+    messageToastsReducer(undefined, { type: '' } as unknown as Parameters<
+      typeof messageToastsReducer
+    >[1]),
+  ).toEqual([]);
 });
 
 test('messageToasts reducer should add a toast', () => {
   expect(
     messageToastsReducer([], {
       type: ADD_TOAST,
-      payload: { text: 'test', id: 'id', type: 'test_type' },
+      payload: {
+        text: 'test',
+        id: 'id',
+        toastType: ToastType.Info,
+        duration: 4000,
+      },
     }),
-  ).toEqual([{ text: 'test', id: 'id', type: 'test_type' }]);
+  ).toEqual([
+    { text: 'test', id: 'id', toastType: ToastType.Info, duration: 4000 },
+  ]);
 });
 
 test('messageToasts reducer should remove a toast', () => {
   expect(
-    messageToastsReducer([{ id: 'id' }, { id: 'id2' }], {
-      type: REMOVE_TOAST,
-      payload: { id: 'id' },
-    }),
-  ).toEqual([{ id: 'id2' }]);
+    messageToastsReducer(
+      [
+        { id: 'id', toastType: ToastType.Info, text: 'toast1', duration: 4000 },
+        {
+          id: 'id2',
+          toastType: ToastType.Info,
+          text: 'toast2',
+          duration: 4000,
+        },
+      ] as ToastMeta[],
+      {
+        type: REMOVE_TOAST,
+        payload: { id: 'id' },
+      },
+    ),
+  ).toEqual([
+    { id: 'id2', toastType: ToastType.Info, text: 'toast2', duration: 4000 },
+  ]);
 });
diff --git a/superset-frontend/src/dashboard/actions/dashboardLayout.test.js b/superset-frontend/src/dashboard/actions/dashboardLayout.test.ts
similarity index 86%
rename from superset-frontend/src/dashboard/actions/dashboardLayout.test.js
rename to superset-frontend/src/dashboard/actions/dashboardLayout.test.ts
index e89b3193cd0..25696d511da 100644
--- a/superset-frontend/src/dashboard/actions/dashboardLayout.test.js
+++ b/superset-frontend/src/dashboard/actions/dashboardLayout.test.ts
@@ -58,6 +58,11 @@ import {
   NEW_ROW_ID,
 } from 'src/dashboard/util/constants';
 
+import { DropResult } from 'src/dashboard/components/dnd/dragDroppableConfig';
+import type { RootState } from 'src/dashboard/types';
+
+type GetState = () => RootState;
+
 // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
 describe('dashboardLayout actions', () => {
   const mockState = {
@@ -72,9 +77,9 @@ describe('dashboardLayout actions', () => {
     },
   };
 
-  function setup(stateOverrides) {
+  function setup(stateOverrides: Record<string, unknown> = {}) {
     const state = { ...mockState, ...stateOverrides };
-    const getState = sinon.spy(() => state);
+    const getState = sinon.spy(() => state) as unknown as GetState;
     const dispatch = sinon.spy();
 
     return { getState, dispatch, state };
@@ -83,7 +88,7 @@ describe('dashboardLayout actions', () => {
     sinon.spy(dashboardFilters, 'updateLayoutComponents');
   });
   afterEach(() => {
-    dashboardFilters.updateLayoutComponents.restore();
+    (dashboardFilters.updateLayoutComponents as sinon.SinonSpy).restore();
   });
 
   // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
@@ -100,7 +105,9 @@ describe('dashboardLayout actions', () => {
       });
 
       // update component should not trigger action for dashboardFilters
-      expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(0);
+      expect(
+        (dashboardFilters.updateLayoutComponents as sinon.SinonSpy).callCount,
+      ).toEqual(0);
     });
 
     test('should dispatch a setUnsavedChanges action if hasUnsavedChanges=false', () => {
@@ -113,7 +120,9 @@ describe('dashboardLayout actions', () => {
       expect(dispatch.getCall(1).args[0]).toEqual(setUnsavedChanges(true));
 
       // update component should not trigger action for dashboardFilters
-      expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(0);
+      expect(
+        (dashboardFilters.updateLayoutComponents as sinon.SinonSpy).callCount,
+      ).toEqual(0);
     });
   });
 
@@ -129,7 +138,9 @@ describe('dashboardLayout actions', () => {
       });
 
       // delete components should trigger action for dashboardFilters
-      expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(1);
+      expect(
+        (dashboardFilters.updateLayoutComponents as sinon.SinonSpy).callCount,
+      ).toEqual(1);
     });
 
     test('should dispatch a setUnsavedChanges action if hasUnsavedChanges=false', () => {
@@ -141,7 +152,9 @@ describe('dashboardLayout actions', () => {
       expect(dispatch.getCall(2).args[0]).toEqual(setUnsavedChanges(true));
 
       // delete components should trigger action for dashboardFilters
-      expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(1);
+      expect(
+        (dashboardFilters.updateLayoutComponents as sinon.SinonSpy).callCount,
+      ).toEqual(1);
     });
   });
 
@@ -167,7 +180,9 @@ describe('dashboardLayout actions', () => {
       });
 
       // update dashboard title should not trigger action for dashboardFilters
-      expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(0);
+      expect(
+        (dashboardFilters.updateLayoutComponents as sinon.SinonSpy).callCount,
+      ).toEqual(0);
     });
   });
 
@@ -175,7 +190,7 @@ describe('dashboardLayout actions', () => {
   describe('createTopLevelTabs', () => {
     test('should dispatch a createTopLevelTabs action', () => {
       const { getState, dispatch } = setup();
-      const dropResult = {};
+      const dropResult = {} as DropResult;
       const thunk = createTopLevelTabs(dropResult);
       thunk(dispatch, getState);
       expect(dispatch.getCall(0).args[0]).toEqual({
@@ -184,20 +199,24 @@ describe('dashboardLayout actions', () => {
       });
 
       // create top level tabs should trigger action for dashboardFilters
-      expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(1);
+      expect(
+        (dashboardFilters.updateLayoutComponents as sinon.SinonSpy).callCount,
+      ).toEqual(1);
     });
 
     test('should dispatch a setUnsavedChanges action if hasUnsavedChanges=false', () => {
       const { getState, dispatch } = setup({
         dashboardState: { hasUnsavedChanges: false },
       });
-      const dropResult = {};
+      const dropResult = {} as DropResult;
       const thunk = createTopLevelTabs(dropResult);
       thunk(dispatch, getState);
       expect(dispatch.getCall(2).args[0]).toEqual(setUnsavedChanges(true));
 
       // create top level tabs should trigger action for dashboardFilters
-      expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(1);
+      expect(
+        (dashboardFilters.updateLayoutComponents as sinon.SinonSpy).callCount,
+      ).toEqual(1);
     });
   });
 
@@ -205,8 +224,7 @@ describe('dashboardLayout actions', () => {
   describe('deleteTopLevelTabs', () => {
     test('should dispatch a deleteTopLevelTabs action', () => {
       const { getState, dispatch } = setup();
-      const dropResult = {};
-      const thunk = deleteTopLevelTabs(dropResult);
+      const thunk = deleteTopLevelTabs();
       thunk(dispatch, getState);
       expect(dispatch.getCall(0).args[0]).toEqual({
         type: DELETE_TOP_LEVEL_TABS,
@@ -214,20 +232,23 @@ describe('dashboardLayout actions', () => {
       });
 
       // delete top level tabs should trigger action for dashboardFilters
-      expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(1);
+      expect(
+        (dashboardFilters.updateLayoutComponents as sinon.SinonSpy).callCount,
+      ).toEqual(1);
     });
 
     test('should dispatch a setUnsavedChanges action if hasUnsavedChanges=false', () => {
       const { getState, dispatch } = setup({
         dashboardState: { hasUnsavedChanges: false },
       });
-      const dropResult = {};
-      const thunk = deleteTopLevelTabs(dropResult);
+      const thunk = deleteTopLevelTabs();
       thunk(dispatch, getState);
       expect(dispatch.getCall(2).args[0]).toEqual(setUnsavedChanges(true));
 
       // delete top level tabs should trigger action for dashboardFilters
-      expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(1);
+      expect(
+        (dashboardFilters.updateLayoutComponents as sinon.SinonSpy).callCount,
+      ).toEqual(1);
     });
   });
 
@@ -236,8 +257,8 @@ describe('dashboardLayout actions', () => {
     const dashboardLayout = {
       ...mockState.dashboardLayout,
       present: {
-        1: {
-          id: 1,
+        '1': {
+          id: '1',
           children: [],
           meta: {
             width: 1,
@@ -252,7 +273,7 @@ describe('dashboardLayout actions', () => {
         dashboardLayout,
       });
 
-      const thunk1 = resizeComponent({ id: 1, width: 10, height: 3 });
+      const thunk1 = resizeComponent({ id: '1', width: 10, height: 3 });
       thunk1(dispatch, getState);
 
       const thunk2 = dispatch.getCall(0).args[0];
@@ -283,7 +304,7 @@ describe('dashboardLayout actions', () => {
         dashboardState: { hasUnsavedChanges: false },
         dashboardLayout,
       });
-      const thunk1 = resizeComponent({ id: 1, width: 10, height: 3 });
+      const thunk1 = resizeComponent({ id: '1', width: 10, height: 3 });
       thunk1(dispatch, getState);
 
       const thunk2 = dispatch.getCall(0).args[0];
@@ -292,7 +313,9 @@ describe('dashboardLayout actions', () => {
       expect(dispatch.callCount).toBe(3);
 
       // resize components should not trigger action for dashboardFilters
-      expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(0);
+      expect(
+        (dashboardFilters.updateLayoutComponents as sinon.SinonSpy).callCount,
+      ).toEqual(0);
     });
   });
 
@@ -304,7 +327,7 @@ describe('dashboardLayout actions', () => {
         source: { id: NEW_COMPONENTS_SOURCE_ID },
         destination: { id: DASHBOARD_GRID_ID, type: DASHBOARD_GRID_TYPE },
         dragging: { id: NEW_ROW_ID, type: ROW_TYPE },
-      };
+      } as unknown as DropResult;
 
       const handleComponentDropThunk = handleComponentDrop(dropResult);
       handleComponentDropThunk(dispatch, getState);
@@ -320,7 +343,9 @@ describe('dashboardLayout actions', () => {
       });
 
       // create components should trigger action for dashboardFilters
-      expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(1);
+      expect(
+        (dashboardFilters.updateLayoutComponents as sinon.SinonSpy).callCount,
+      ).toEqual(1);
     });
 
     test('should move a component if the component is not new', () => {
@@ -334,7 +359,7 @@ describe('dashboardLayout actions', () => {
         source: { id: 'id', index: 0, type: ROW_TYPE },
         destination: { id: DASHBOARD_GRID_ID, type: DASHBOARD_GRID_TYPE },
         dragging: { id: 'dragging', type: ROW_TYPE },
-      };
+      } as unknown as DropResult;
 
       const handleComponentDropThunk = handleComponentDrop(dropResult);
       handleComponentDropThunk(dispatch, getState);
@@ -350,7 +375,9 @@ describe('dashboardLayout actions', () => {
       });
 
       // create components should trigger action for dashboardFilters
-      expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(1);
+      expect(
+        (dashboardFilters.updateLayoutComponents as sinon.SinonSpy).callCount,
+      ).toEqual(1);
     });
 
     test('should dispatch a toast if the drop overflows the destination', () => {
@@ -372,7 +399,7 @@ describe('dashboardLayout actions', () => {
         source: { id: 'source', type: ROW_TYPE },
         destination: { id: 'destination', type: ROW_TYPE },
         dragging: { id: 'dragging', type: CHART_TYPE, meta: { width: 1 } },
-      };
+      } as unknown as DropResult;
 
       const thunk = handleComponentDrop(dropResult);
       thunk(dispatch, getState);
@@ -401,7 +428,7 @@ describe('dashboardLayout actions', () => {
         source: { id: 'tabsId', type: TABS_TYPE },
         destination: { id: DASHBOARD_GRID_ID, type: DASHBOARD_GRID_TYPE },
         dragging: { id: 'tabId', type: TAB_TYPE },
-      };
+      } as unknown as DropResult;
 
       const moveThunk = handleComponentDrop(dropResult);
       moveThunk(dispatch, getState);
@@ -425,7 +452,7 @@ describe('dashboardLayout actions', () => {
         source: { id: NEW_COMPONENTS_SOURCE_ID },
         destination: { id: DASHBOARD_ROOT_ID },
         dragging: { id: NEW_ROW_ID, type: ROW_TYPE },
-      };
+      } as unknown as DropResult;
 
       const thunk1 = handleComponentDrop(dropResult);
       thunk1(dispatch, getState);
@@ -488,7 +515,7 @@ describe('dashboardLayout actions', () => {
           meta: { text: 'New Tab' },
           type: 'TAB',
         },
-      };
+      } as unknown as DropResult;
 
       handleComponentDrop(dropResult)(dispatch, getState);
 
@@ -531,7 +558,9 @@ describe('dashboardLayout actions', () => {
       expect(dispatch.getCall(0).args[0]).toEqual(UndoActionCreators.redo());
 
       // redo/undo should trigger action for dashboardFilters
-      expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(1);
+      expect(
+        (dashboardFilters.updateLayoutComponents as sinon.SinonSpy).callCount,
+      ).toEqual(1);
     });
 
     test('should dispatch a setUnsavedChanges(true) action if hasUnsavedChanges=false', () => {
@@ -543,7 +572,9 @@ describe('dashboardLayout actions', () => {
       expect(dispatch.getCall(2).args[0]).toEqual(setUnsavedChanges(true));
 
       // redo/undo should trigger action for dashboardFilters
-      expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(1);
+      expect(
+        (dashboardFilters.updateLayoutComponents as sinon.SinonSpy).callCount,
+      ).toEqual(1);
     });
   });
 });
diff --git a/superset-frontend/src/dashboard/actions/dashboardLayout.ts b/superset-frontend/src/dashboard/actions/dashboardLayout.ts
index 1ada6c10755..fad59692fa7 100644
--- a/superset-frontend/src/dashboard/actions/dashboardLayout.ts
+++ b/superset-frontend/src/dashboard/actions/dashboardLayout.ts
@@ -26,9 +26,7 @@ import {
   NEW_COMPONENTS_SOURCE_ID,
   DASHBOARD_HEADER_ID,
 } from 'src/dashboard/util/constants';
-import dropOverflowsParent, {
-  DropResult as OverflowDropResult,
-} from 'src/dashboard/util/dropOverflowsParent';
+import dropOverflowsParent from 'src/dashboard/util/dropOverflowsParent';
 import findParentId from 'src/dashboard/util/findParentId';
 import isInDifferentFilterScopes from 'src/dashboard/util/isInDifferentFilterScopes';
 import { DropResult } from 'src/dashboard/components/dnd/dragDroppableConfig';
@@ -274,7 +272,7 @@ export const HANDLE_COMPONENT_DROP = 'HANDLE_COMPONENT_DROP';
 export function handleComponentDrop(dropResult: DropResult) {
   return (dispatch: Dispatch, getState: GetState): null | AnyAction | void => {
     const overflowsParent = dropOverflowsParent(
-      dropResult as unknown as OverflowDropResult,
+      dropResult,
       getState().dashboardLayout.present,
     );
 
diff --git a/superset-frontend/src/dashboard/actions/dashboardState.test.js b/superset-frontend/src/dashboard/actions/dashboardState.test.ts
similarity index 89%
rename from superset-frontend/src/dashboard/actions/dashboardState.test.js
rename to superset-frontend/src/dashboard/actions/dashboardState.test.ts
index a305a120906..853df56263a 100644
--- a/superset-frontend/src/dashboard/actions/dashboardState.test.js
+++ b/superset-frontend/src/dashboard/actions/dashboardState.test.ts
@@ -50,6 +50,9 @@ jest.mock('src/utils/navigationUtils', () => ({
   navigateWithState: jest.fn(),
 }));
 
+const mockIsFeatureEnabled = isFeatureEnabled as jest.Mock;
+const mockNavigateTo = navigateTo as jest.Mock;
+
 // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
 describe('dashboardState actions', () => {
   const mockState = {
@@ -73,15 +76,15 @@ describe('dashboardState actions', () => {
   };
   const newDashboardData = mockDashboardData;
 
-  let postStub;
-  let getStub;
-  let putStub;
+  let postStub: sinon.SinonStub;
+  let getStub: sinon.SinonStub;
+  let putStub: sinon.SinonStub;
   const updatedCss = '.updated_css_value {\n  color: black;\n}';
 
   beforeEach(() => {
     postStub = sinon
       .stub(SupersetClient, 'post')
-      .resolves('the value you want to return');
+      .resolves('the value you want to return' as any);
     getStub = sinon.stub(SupersetClient, 'get').resolves({
       json: {
         result: {
@@ -89,12 +92,12 @@ describe('dashboardState actions', () => {
           css: updatedCss,
         },
       },
-    });
+    } as any);
     putStub = sinon.stub(SupersetClient, 'put').resolves({
       json: {
         result: mockDashboardData,
       },
-    });
+    } as any);
   });
   afterEach(() => {
     postStub.restore();
@@ -102,9 +105,9 @@ describe('dashboardState actions', () => {
     putStub.restore();
   });
 
-  function setup(stateOverrides) {
+  function setup(stateOverrides: Record<string, unknown> = {}) {
     const state = { ...mockState, ...stateOverrides };
-    const getState = sinon.spy(() => state);
+    const getState = sinon.spy(() => state) as unknown as () => any;
     const dispatch = sinon.stub();
     return { getState, dispatch, state };
   }
@@ -131,13 +134,13 @@ describe('dashboardState actions', () => {
 
       // start with mockDashboardData, it didn't have parents attr
       expect(
-        newDashboardData.positions[DASHBOARD_GRID_ID].parents,
+        (newDashboardData.positions[DASHBOARD_GRID_ID] as any).parents,
       ).not.toBeDefined();
 
       // mock redux work: dispatch an event, cause modify redux state
       const mockParentsList = ['ROOT_ID'];
       dispatch.callsFake(() => {
-        mockState.dashboardLayout.present[DASHBOARD_GRID_ID].parents =
+        (mockState.dashboardLayout.present[DASHBOARD_GRID_ID] as any).parents =
           mockParentsList;
       });
 
@@ -156,13 +159,13 @@ describe('dashboardState actions', () => {
     // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
     describe('FeatureFlag.CONFIRM_DASHBOARD_DIFF', () => {
       beforeEach(() => {
-        isFeatureEnabled.mockImplementation(
-          feature => feature === 'CONFIRM_DASHBOARD_DIFF',
+        mockIsFeatureEnabled.mockImplementation(
+          (feature: string) => feature === 'CONFIRM_DASHBOARD_DIFF',
         );
       });
 
       afterEach(() => {
-        isFeatureEnabled.mockRestore();
+        mockIsFeatureEnabled.mockRestore();
       });
 
       test('dispatches SET_OVERRIDE_CONFIRM when an inspect value has diff', async () => {
@@ -219,17 +222,17 @@ describe('dashboardState actions', () => {
             id: newDashboardId,
           },
         },
-      });
+      } as any);
 
       const thunk = saveDashboardRequest(
         newDashboardData,
-        null,
+        null as unknown as number,
         SAVE_TYPE_NEWDASHBOARD,
       );
       await thunk(dispatch, getState);
 
       await waitFor(() => expect(postStub.callCount).toBe(1));
-      expect(navigateTo).toHaveBeenCalledWith(
+      expect(mockNavigateTo).toHaveBeenCalledWith(
         `/superset/dashboard/${newDashboardId}/`,
       );
     });
diff --git a/superset-frontend/src/dashboard/actions/hydrate.ts b/superset-frontend/src/dashboard/actions/hydrate.ts
index 2f1d2deeab7..0ff43faa093 100644
--- a/superset-frontend/src/dashboard/actions/hydrate.ts
+++ b/superset-frontend/src/dashboard/actions/hydrate.ts
@@ -135,8 +135,10 @@ export const hydrateDashboard =
     const chartIdToLayoutId: Record<number, string> = {};
     Object.values(layout).forEach(layoutComponent => {
       if (layoutComponent.type === CHART_TYPE) {
-        chartIdToLayoutId[(layoutComponent as LayoutItem).meta.chartId] =
-          layoutComponent.id;
+        const { chartId } = (layoutComponent as LayoutItem).meta;
+        if (chartId !== undefined) {
+          chartIdToLayoutId[chartId] = layoutComponent.id;
+        }
       }
     });
 
@@ -217,9 +219,12 @@ export const hydrateDashboard =
 
         layout[chartHolder.id] = chartHolder;
         newSlicesContainer!.children.push(chartHolder.id);
-        chartIdToLayoutId[
-          (chartHolder.meta as unknown as LayoutItem['meta']).chartId
-        ] = chartHolder.id;
+        const holderChartId = (
+          chartHolder.meta as unknown as LayoutItem['meta']
+        ).chartId;
+        if (holderChartId !== undefined) {
+          chartIdToLayoutId[holderChartId] = chartHolder.id;
+        }
         newSlicesContainerWidth += GRID_DEFAULT_CHART_WIDTH;
       }
 
diff --git a/superset-frontend/src/dashboard/components/Dashboard.test.jsx b/superset-frontend/src/dashboard/components/Dashboard.test.tsx
similarity index 82%
rename from superset-frontend/src/dashboard/components/Dashboard.test.jsx
rename to superset-frontend/src/dashboard/components/Dashboard.test.tsx
index 3c950fe7b5e..20f36d57d5c 100644
--- a/superset-frontend/src/dashboard/components/Dashboard.test.jsx
+++ b/superset-frontend/src/dashboard/components/Dashboard.test.tsx
@@ -18,11 +18,18 @@
  */
 import { render, screen } from 'spec/helpers/testing-library';
 import { PluginContext } from 'src/components';
+import type { PluginContextType } from 'src/components/DynamicPlugins/types';
 
-import Dashboard from 'src/dashboard/components/Dashboard';
+import DashboardComponent from 'src/dashboard/components/Dashboard';
 import { CHART_TYPE } from 'src/dashboard/util/componentTypes';
 import newComponentFactory from 'src/dashboard/util/newComponentFactory';
 
+// Test mock data doesn't perfectly match strict component prop types,
+// so we use a loosely-typed wrapper for test rendering
+const Dashboard = DashboardComponent as unknown as React.FC<
+  Record<string, unknown>
+>;
+
 // mock data
 import chartQueries from 'spec/fixtures/mockChartQueries';
 import datasources from 'spec/fixtures/mockDatasource';
@@ -39,6 +46,8 @@ import { getRelatedCharts } from 'src/dashboard/util/getRelatedCharts';
 
 jest.mock('src/dashboard/util/getRelatedCharts');
 
+const mockGetRelatedCharts = getRelatedCharts as jest.Mock;
+
 // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
 describe('Dashboard', () => {
   const mockAddSlice = jest.fn();
@@ -48,6 +57,14 @@ describe('Dashboard', () => {
   const mockClearDataMask = jest.fn();
   const mockClearAllChartStates = jest.fn();
 
+  const mockPluginContext: PluginContextType = {
+    loading: false,
+    dynamicPlugins: {},
+    keys: [],
+    mountedPluginMetadata: {},
+    fetchAll: jest.fn(),
+  };
+
   const props = {
     actions: {
       addSliceToDashboard: mockAddSlice,
@@ -56,9 +73,11 @@ describe('Dashboard', () => {
       logEvent: mockLogEvent,
       clearDataMaskState: mockClearDataMask,
       clearAllChartStates: mockClearAllChartStates,
+      setDatasources: jest.fn(),
     },
     dashboardState,
     dashboardInfo,
+    dashboardId: 1,
     charts: chartQueries,
     activeFilters: {},
     ownDataCharts: {},
@@ -74,9 +93,9 @@ describe('Dashboard', () => {
 
   const ChildrenComponent = () => <div>Test</div>;
 
-  const renderDashboard = (overrideProps = {}) =>
+  const renderDashboard = (overrideProps: Record<string, unknown> = {}) =>
     render(
-      <PluginContext.Provider value={{ loading: false }}>
+      <PluginContext.Provider value={mockPluginContext}>
         <Dashboard {...props} {...overrideProps}>
           <ChildrenComponent />
         </Dashboard>
@@ -110,7 +129,7 @@ describe('Dashboard', () => {
       const { rerender } = renderDashboard();
 
       rerender(
-        <PluginContext.Provider value={{ loading: false }}>
+        <PluginContext.Provider value={mockPluginContext}>
           <Dashboard {...props} layout={layoutWithExtraChart}>
             <ChildrenComponent />
           </Dashboard>
@@ -123,11 +142,14 @@ describe('Dashboard', () => {
     test('should call removeSliceFromDashboard if a slice is removed from the layout', () => {
       const { rerender } = renderDashboard({ layout: layoutWithExtraChart });
 
-      const nextLayout = { ...layoutWithExtraChart };
+      const nextLayout = { ...layoutWithExtraChart } as Record<
+        string | number,
+        unknown
+      >;
       delete nextLayout[1001];
 
       rerender(
-        <PluginContext.Provider value={{ loading: false }}>
+        <PluginContext.Provider value={mockPluginContext}>
           <Dashboard {...props} layout={nextLayout}>
             <ChildrenComponent />
           </Dashboard>
@@ -144,7 +166,7 @@ describe('Dashboard', () => {
       const { rerender } = renderDashboard({ activeFilters: OVERRIDE_FILTERS });
 
       rerender(
-        <PluginContext.Provider value={{ loading: false }}>
+        <PluginContext.Provider value={mockPluginContext}>
           <Dashboard
             {...props}
             activeFilters={OVERRIDE_FILTERS}
@@ -165,7 +187,7 @@ describe('Dashboard', () => {
       const { rerender } = renderDashboard({ activeFilters: OVERRIDE_FILTERS });
 
       rerender(
-        <PluginContext.Provider value={{ loading: false }}>
+        <PluginContext.Provider value={mockPluginContext}>
           <Dashboard {...props} activeFilters={OVERRIDE_FILTERS}>
             <ChildrenComponent />
           </Dashboard>
@@ -176,18 +198,21 @@ describe('Dashboard', () => {
     });
 
     test('should call refresh when native filters changed', () => {
-      getRelatedCharts.mockReturnValue([230]);
+      mockGetRelatedCharts.mockReturnValue([230]);
       const { rerender } = renderDashboard({ activeFilters: OVERRIDE_FILTERS });
 
       rerender(
-        <PluginContext.Provider value={{ loading: false }}>
+        <PluginContext.Provider value={mockPluginContext}>
           <Dashboard
             {...props}
             activeFilters={{
               ...OVERRIDE_FILTERS,
               ...getAllActiveFilters({
+                chartConfiguration: {},
                 dataMask: dataMaskWith1Filter,
-                nativeFilters: singleNativeFiltersState.filters,
+                nativeFilters: singleNativeFiltersState.filters as Parameters<
+                  typeof getAllActiveFilters
+                >[0]['nativeFilters'],
                 allSliceIds: [227, 229, 230],
               }),
             }}
@@ -201,7 +226,7 @@ describe('Dashboard', () => {
     });
 
     test('should call refresh if a filter is added', () => {
-      getRelatedCharts.mockReturnValue([1]);
+      mockGetRelatedCharts.mockReturnValue([1]);
       const { rerender } = renderDashboard({ activeFilters: OVERRIDE_FILTERS });
 
       const newFilter = {
@@ -209,7 +234,7 @@ describe('Dashboard', () => {
       };
 
       rerender(
-        <PluginContext.Provider value={{ loading: false }}>
+        <PluginContext.Provider value={mockPluginContext}>
           <Dashboard {...props} activeFilters={newFilter}>
             <ChildrenComponent />
           </Dashboard>
@@ -220,16 +245,12 @@ describe('Dashboard', () => {
     });
 
     test('should call refresh if a filter is removed', () => {
-      getRelatedCharts.mockReturnValue([1]); // Ensure we return some charts to refresh
+      mockGetRelatedCharts.mockReturnValue([1]); // Ensure we return some charts to refresh
       const { rerender } = renderDashboard({ activeFilters: OVERRIDE_FILTERS });
 
       rerender(
-        <PluginContext.Provider value={{ loading: false }}>
-          <Dashboard
-            {...props}
-            activeFilters={{}}
-            refreshCharts={mockTriggerQuery} // Add refreshCharts prop
-          >
+        <PluginContext.Provider value={mockPluginContext}>
+          <Dashboard {...props} activeFilters={{}}>
             <ChildrenComponent />
           </Dashboard>
         </PluginContext.Provider>,
@@ -239,7 +260,7 @@ describe('Dashboard', () => {
     });
 
     test('should call refresh if a filter is changed', () => {
-      getRelatedCharts.mockReturnValue([1]);
+      mockGetRelatedCharts.mockReturnValue([1]);
       const { rerender } = renderDashboard({ activeFilters: OVERRIDE_FILTERS });
 
       const newFilters = {
@@ -248,7 +269,7 @@ describe('Dashboard', () => {
       };
 
       rerender(
-        <PluginContext.Provider value={{ loading: false }}>
+        <PluginContext.Provider value={mockPluginContext}>
           <Dashboard {...props} activeFilters={newFilters}>
             <ChildrenComponent />
           </Dashboard>
@@ -259,7 +280,7 @@ describe('Dashboard', () => {
     });
 
     test('should call refresh with multiple chart ids', () => {
-      getRelatedCharts.mockReturnValue([1, 2]);
+      mockGetRelatedCharts.mockReturnValue([1, 2]);
       const { rerender } = renderDashboard({ activeFilters: OVERRIDE_FILTERS });
 
       const newFilters = {
@@ -268,7 +289,7 @@ describe('Dashboard', () => {
       };
 
       rerender(
-        <PluginContext.Provider value={{ loading: false }}>
+        <PluginContext.Provider value={mockPluginContext}>
           <Dashboard {...props} activeFilters={newFilters}>
             <ChildrenComponent />
           </Dashboard>
@@ -279,7 +300,7 @@ describe('Dashboard', () => {
     });
 
     test('should call refresh if a filter scope is changed', () => {
-      getRelatedCharts.mockReturnValue([2]);
+      mockGetRelatedCharts.mockReturnValue([2]);
       const { rerender } = renderDashboard({ activeFilters: OVERRIDE_FILTERS });
 
       const newFilters = {
@@ -288,7 +309,7 @@ describe('Dashboard', () => {
       };
 
       rerender(
-        <PluginContext.Provider value={{ loading: false }}>
+        <PluginContext.Provider value={mockPluginContext}>
           <Dashboard {...props} activeFilters={newFilters}>
             <ChildrenComponent />
           </Dashboard>
@@ -299,7 +320,7 @@ describe('Dashboard', () => {
     });
 
     test('should call refresh with empty [] if a filter is changed but scope is not applicable', () => {
-      getRelatedCharts.mockReturnValue([]);
+      mockGetRelatedCharts.mockReturnValue([]);
       const { rerender } = renderDashboard({
         activeFilters: OVERRIDE_FILTERS,
         dashboardState: {
@@ -314,7 +335,7 @@ describe('Dashboard', () => {
       };
 
       rerender(
-        <PluginContext.Provider value={{ loading: false }}>
+        <PluginContext.Provider value={mockPluginContext}>
           <Dashboard
             {...props}
             activeFilters={newFilters}
@@ -350,7 +371,7 @@ describe('Dashboard', () => {
 
     // Rerender with same ownDataCharts (simulates clientView-only change after stripping)
     rerender(
-      <PluginContext.Provider value={{ loading: false }}>
+      <PluginContext.Provider value={mockPluginContext}>
         <Dashboard
           {...props}
           ownDataCharts={initialOwnDataCharts}
@@ -385,7 +406,7 @@ describe('Dashboard', () => {
     };
 
     rerender(
-      <PluginContext.Provider value={{ loading: false }}>
+      <PluginContext.Provider value={mockPluginContext}>
         <Dashboard
           {...props}
           ownDataCharts={updatedOwnDataCharts}
diff --git a/superset-frontend/src/dashboard/components/DashboardGrid.test.jsx b/superset-frontend/src/dashboard/components/DashboardGrid.test.tsx
similarity index 94%
rename from superset-frontend/src/dashboard/components/DashboardGrid.test.jsx
rename to superset-frontend/src/dashboard/components/DashboardGrid.test.tsx
index 9f21e35d107..3df8b91f5c2 100644
--- a/superset-frontend/src/dashboard/components/DashboardGrid.test.jsx
+++ b/superset-frontend/src/dashboard/components/DashboardGrid.test.tsx
@@ -25,7 +25,13 @@ import { DASHBOARD_GRID_TYPE } from 'src/dashboard/util/componentTypes';
 import { GRID_COLUMN_COUNT } from 'src/dashboard/util/constants';
 
 jest.mock('src/dashboard/containers/DashboardComponent', () => {
-  const MockDashboardComponent = ({ onResizeStart, onResizeStop }) => (
+  const MockDashboardComponent = ({
+    onResizeStart,
+    onResizeStop,
+  }: {
+    onResizeStart: () => void;
+    onResizeStop: (...args: unknown[]) => void;
+  }) => (
     <button
       type="button"
       data-test="mock-dashboard-component"
@@ -55,7 +61,7 @@ const props = {
   setDirectPathToChild() {},
 };
 
-function setup(overrideProps) {
+function setup(overrideProps: Record<string, unknown> = {}) {
   return render(<DashboardGrid {...props} {...overrideProps} />, {
     useRedux: true,
     useDnd: true,
@@ -121,7 +127,7 @@ test('should apply flexbox centering and absolute positioning to empty state', (
 
   expect(emptyState).toBeInTheDocument();
 
-  const styles = window.getComputedStyle(emptyState);
+  const styles = window.getComputedStyle(emptyState!);
   expect(styles.display).toBe('flex');
   expect(styles.alignItems).toBe('center');
   expect(styles.justifyContent).toBe('center');
diff --git a/superset-frontend/src/dashboard/components/Header/useHeaderActionsDropdownMenu.tsx b/superset-frontend/src/dashboard/components/Header/useHeaderActionsDropdownMenu.tsx
index ef6be029e2b..f96638772d7 100644
--- a/superset-frontend/src/dashboard/components/Header/useHeaderActionsDropdownMenu.tsx
+++ b/superset-frontend/src/dashboard/components/Header/useHeaderActionsDropdownMenu.tsx
@@ -157,7 +157,7 @@ export const useHeaderActionsMenu = ({
   const downloadMenuItem = useDownloadMenuItems({
     pdfMenuItemTitle: t('Export to PDF'),
     imageMenuItemTitle: t('Download as Image'),
-    dashboardTitle,
+    dashboardTitle: dashboardTitle ?? '',
     dashboardId,
     title: t('Download'),
     disabled: isLoading,
@@ -168,7 +168,9 @@ export const useHeaderActionsMenu = ({
   const reportMenuItem = useHeaderReportMenuItems({
     dashboardId: dashboardInfo?.id,
     showReportModal,
-    setCurrentReportDeleting,
+    setCurrentReportDeleting: setCurrentReportDeleting as (
+      report: unknown,
+    ) => void,
   });
 
   // Helper function to create menu items for components with triggerNode
@@ -231,22 +233,22 @@ export const useHeaderActionsMenu = ({
             addSuccessToast={addSuccessToast}
             addDangerToast={addDangerToast}
             dashboardId={dashboardId}
-            dashboardTitle={dashboardTitle}
+            dashboardTitle={dashboardTitle ?? ''}
             dashboardInfo={dashboardInfo}
             saveType={SAVE_TYPE_NEWDASHBOARD}
             layout={layout}
-            expandedSlices={expandedSlices}
+            expandedSlices={expandedSlices ?? {}}
             refreshFrequency={refreshFrequency}
             shouldPersistRefreshFrequency={shouldPersistRefreshFrequency}
             lastModifiedTime={lastModifiedTime}
-            customCss={customCss}
+            customCss={customCss ?? ''}
             colorNamespace={colorNamespace}
             colorScheme={colorScheme}
             onSave={onSave}
             triggerNode={
               <div data-test="save-as-menu-item">{t('Save as')}</div>
             }
-            canOverwrite={userCanEdit}
+            canOverwrite={userCanEdit ?? false}
           />,
         ),
       );
@@ -271,7 +273,10 @@ export const useHeaderActionsMenu = ({
     // Only add divider if there are items after it
     const hasItemsAfterDivider =
       (!editMode && reportMenuItem) ||
-      (editMode && !isEmpty(dashboardInfo?.metadata?.filter_scopes));
+      (editMode &&
+        !isEmpty(
+          (dashboardInfo?.metadata as Record<string, unknown>)?.filter_scopes,
+        ));
 
     if (hasItemsAfterDivider) {
       menuItems.push({ type: 'divider' });
@@ -283,7 +288,12 @@ export const useHeaderActionsMenu = ({
     }
 
     // Set filter mapping
-    if (editMode && !isEmpty(dashboardInfo?.metadata?.filter_scopes)) {
+    if (
+      editMode &&
+      !isEmpty(
+        (dashboardInfo?.metadata as Record<string, unknown>)?.filter_scopes,
+      )
+    ) {
       menuItems.push(
         createModalMenuItem(
           MenuKeys.SetFilterMapping,
diff --git a/superset-frontend/src/dashboard/components/dnd/DragDroppable.test.jsx b/superset-frontend/src/dashboard/components/dnd/DragDroppable.test.tsx
similarity index 82%
rename from superset-frontend/src/dashboard/components/dnd/DragDroppable.test.jsx
rename to superset-frontend/src/dashboard/components/dnd/DragDroppable.test.tsx
index 87580466591..cce409d81ba 100644
--- a/superset-frontend/src/dashboard/components/dnd/DragDroppable.test.jsx
+++ b/superset-frontend/src/dashboard/components/dnd/DragDroppable.test.tsx
@@ -35,23 +35,26 @@ describe('DragDroppable', () => {
     editMode: false,
     depth: 1,
     index: 0,
+    disableDragDrop: false,
     isDragging: false,
     isDraggingOver: false,
     isDraggingOverShallow: false,
-    droppableRef() {},
-    dragSourceRef() {},
-    dragPreviewRef() {},
+    droppableRef: (() => {}) as any,
+    dragSourceRef: (() => {}) as any,
+    dragPreviewRef: (() => {}) as any,
   };
 
-  function setup(overrideProps = {}) {
-    const defaultChildren = provided => (
+  function setup(overrideProps: Record<string, any> = {}) {
+    const defaultChildren = (provided: Record<string, unknown>) => (
       <div data-test="child-content" {...provided}>
         Test Content
       </div>
     );
 
+    const allProps = { ...props, ...overrideProps } as any;
+
     const utils = render(
-      <DragDroppable {...props} {...overrideProps}>
+      <DragDroppable {...allProps}>
         {overrideProps.children || defaultChildren}
       </DragDroppable>,
     );
@@ -62,7 +65,7 @@ describe('DragDroppable', () => {
   }
 
   test('should call its child function', () => {
-    const renderChild = jest.fn(provided => (
+    const renderChild = jest.fn((provided: Record<string, unknown>) => (
       <div data-test="child-content" {...provided}>
         Test Content
       </div>
@@ -102,7 +105,7 @@ describe('DragDroppable', () => {
   });
 
   test('should call its child function with "dropIndicatorProps" dependent on editMode and isDraggingOver', () => {
-    const renderChild = jest.fn(provided => (
+    const renderChild = jest.fn((provided: Record<string, unknown>) => (
       <div data-test="child-content" {...provided}>
         Test Content
       </div>
@@ -110,15 +113,15 @@ describe('DragDroppable', () => {
 
     // Create a mock component with the dropIndicator state already set
     class MockDragDroppable extends DragDroppable {
-      constructor(props) {
-        super(props);
-        this.state = { dropIndicator: true };
+      constructor(mockProps: ConstructorParameters<typeof DragDroppable>[0]) {
+        super(mockProps);
+        this.state = { dropIndicator: 'DROP_TOP' as any };
       }
     }
 
     render(
       <MockDragDroppable
-        {...props}
+        {...(props as any)}
         editMode
         isDraggingOver
         component={newComponentFactory(TAB_TYPE)}
@@ -146,22 +149,22 @@ describe('DragDroppable', () => {
   });
 
   test('should handle forbidden drops correctly', () => {
-    const renderChild = jest.fn(provided => (
+    const renderChild = jest.fn((provided: Record<string, unknown>) => (
       <div data-test="child-content" {...provided}>
         Test Content
       </div>
     ));
 
     class MockDragDroppable extends DragDroppable {
-      constructor(props) {
-        super(props);
+      constructor(mockProps: ConstructorParameters<typeof DragDroppable>[0]) {
+        super(mockProps);
         this.state = { dropIndicator: 'DROP_FORBIDDEN' };
       }
     }
 
     render(
       <MockDragDroppable
-        {...props}
+        {...(props as any)}
         editMode
         isDraggingOver
         component={newComponentFactory(TAB_TYPE)}
@@ -188,22 +191,22 @@ describe('DragDroppable', () => {
   });
 
   test('should handle disabled drag and drop', () => {
-    const renderChild = jest.fn(provided => (
+    const renderChild = jest.fn((provided: Record<string, unknown>) => (
       <div data-test="child-content" {...provided}>
         Test Content
       </div>
     ));
 
     class MockDragDroppable extends DragDroppable {
-      constructor(props) {
-        super(props);
-        this.state = { dropIndicator: true };
+      constructor(mockProps: ConstructorParameters<typeof DragDroppable>[0]) {
+        super(mockProps);
+        this.state = { dropIndicator: 'DROP_TOP' as any };
       }
     }
 
     render(
       <MockDragDroppable
-        {...props}
+        {...(props as any)}
         editMode
         isDraggingOver
         disableDragDrop
@@ -247,12 +250,18 @@ describe('DragDroppable', () => {
 
     rerender(
       <DragDroppable
-        {...props}
+        {...(props as any)}
         component={newComponentFactory(TAB_TYPE)}
         onDropIndicatorChange={onDropIndicatorChange}
         isDraggingOver
         editMode
-      />,
+      >
+        {(provided: Record<string, unknown>) => (
+          <div data-test="child-content" {...provided}>
+            Test Content
+          </div>
+        )}
+      </DragDroppable>,
     );
 
     expect(onDropIndicatorChange).toHaveBeenCalledWith(
diff --git a/superset-frontend/src/dashboard/components/filterscope/FilterScope.test.tsx b/superset-frontend/src/dashboard/components/filterscope/FilterScope.test.tsx
index a06364dbe4b..35f544f18c8 100644
--- a/superset-frontend/src/dashboard/components/filterscope/FilterScope.test.tsx
+++ b/superset-frontend/src/dashboard/components/filterscope/FilterScope.test.tsx
@@ -23,7 +23,13 @@ import {
   screen,
   userEvent,
 } from 'spec/helpers/testing-library';
-import FilterScopeSelector from './FilterScopeSelector';
+import React from 'react';
+import FilterScopeSelectorComponent from './FilterScopeSelector';
+
+// Cast to accept partial mock props in tests
+const FilterScopeSelector = FilterScopeSelectorComponent as unknown as React.FC<
+  Record<string, any>
+>;
 
 // Add afterEach cleanup
 afterEach(async () => {
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Chart/Chart.test.jsx b/superset-frontend/src/dashboard/components/gridComponents/Chart/Chart.test.tsx
similarity index 95%
rename from superset-frontend/src/dashboard/components/gridComponents/Chart/Chart.test.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/Chart/Chart.test.tsx
index 158f9072fea..5b24fa9bd08 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Chart/Chart.test.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Chart/Chart.test.tsx
@@ -37,7 +37,9 @@ const props = {
   // from redux
   maxRows: 500, // will be overwritten with SQL_MAX_ROW from conf
   formData: chartQueries[queryId].form_data,
-  datasource: mockDatasource[sliceEntities.slices[queryId].datasource],
+  datasource: (mockDatasource as Record<string, unknown>)[
+    sliceEntities.slices[queryId].datasource
+  ],
   sliceName: sliceEntities.slices[queryId].slice_name,
   timeout: 60,
   filters: {},
@@ -88,7 +90,10 @@ const defaultState = {
   },
 };
 
-function setup(overrideProps, overrideState) {
+function setup(
+  overrideProps: Record<string, unknown> = {},
+  overrideState: Record<string, unknown> = {},
+) {
   return render(<Chart {...props} {...overrideProps} />, {
     useRedux: true,
     useRouter: true,
@@ -153,16 +158,16 @@ test('should call refreshChart when SliceHeader calls forceRefresh', () => {
 });
 
 test.skip('should call changeFilter when ChartContainer calls changeFilter', () => {
-  const changeFilter = jest.fn();
-  const wrapper = setup({ changeFilter });
+  const mockChangeFilter = jest.fn();
+  const wrapper = setup({ changeFilter: mockChangeFilter }) as any;
   wrapper.instance().changeFilter();
-  expect(changeFilter.callCount).toBe(1);
+  expect((mockChangeFilter as any).callCount).toBe(1);
 });
 
 test('should call exportChart when exportCSV is clicked', async () => {
   const stubbedExportCSV = jest
     .spyOn(exploreUtils, 'exportChart')
-    .mockImplementation(() => {});
+    .mockImplementation((() => {}) as any);
   const { findByText, getByRole } = setup(
     {},
     {
@@ -187,12 +192,12 @@ test('should call exportChart when exportCSV is clicked', async () => {
 });
 
 test('should call exportChart with row_limit props.maxRows when exportFullCSV is clicked', async () => {
-  global.featureFlags = {
+  (global as any).featureFlags = {
     [FeatureFlag.AllowFullCsvExport]: true,
   };
   const stubbedExportCSV = jest
     .spyOn(exploreUtils, 'exportChart')
-    .mockImplementation(() => {});
+    .mockImplementation((() => {}) as any);
   const { findByText, getByRole } = setup(
     {},
     {
@@ -220,7 +225,7 @@ test('should call exportChart with row_limit props.maxRows when exportFullCSV is
 test('should call exportChart when exportXLSX is clicked', async () => {
   const stubbedExportXLSX = jest
     .spyOn(exploreUtils, 'exportChart')
-    .mockImplementation(() => {});
+    .mockImplementation((() => {}) as any);
   const { findByText, getByRole } = setup(
     {},
     {
@@ -242,12 +247,12 @@ test('should call exportChart when exportXLSX is clicked', async () => {
 });
 
 test('should call exportChart with row_limit props.maxRows when exportFullXLSX is clicked', async () => {
-  global.featureFlags = {
+  (global as any).featureFlags = {
     [FeatureFlag.AllowFullCsvExport]: true,
   };
   const stubbedExportXLSX = jest
     .spyOn(exploreUtils, 'exportChart')
-    .mockImplementation(() => {});
+    .mockImplementation((() => {}) as any);
   const { findByText, getByRole } = setup(
     {},
     {
diff --git a/superset-frontend/src/dashboard/components/gridComponents/ChartHolder/ChartHolder.tsx b/superset-frontend/src/dashboard/components/gridComponents/ChartHolder/ChartHolder.tsx
index 7d68c8ceaec..6b7560d3613 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/ChartHolder/ChartHolder.tsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/ChartHolder/ChartHolder.tsx
@@ -106,7 +106,7 @@ const ChartHolder = ({
   const { chartId } = component.meta;
   const isFullSize = fullSizeChartId === chartId;
 
-  const focusHighlightStyles = useFilterFocusHighlightStyles(chartId);
+  const focusHighlightStyles = useFilterFocusHighlightStyles(chartId ?? 0);
   const directPathToChild = useSelector(
     (state: RootState) => state.dashboardState.directPathToChild,
   );
@@ -198,7 +198,7 @@ const ChartHolder = ({
           CHART_MARGIN,
       );
       height = Math.floor(
-        component.meta.height * GRID_BASE_UNIT - CHART_MARGIN,
+        (component.meta.height ?? 0) * GRID_BASE_UNIT - CHART_MARGIN,
       );
     }
 
@@ -228,7 +228,7 @@ const ChartHolder = ({
   );
 
   const handleToggleFullSize = useCallback(() => {
-    setFullSizeChartId(isFullSize ? null : chartId);
+    setFullSizeChartId(isFullSize ? null : (chartId ?? null));
   }, [chartId, isFullSize, setFullSizeChartId]);
 
   const handleExtraControl = useCallback((name: string, value: unknown) => {
@@ -247,7 +247,7 @@ const ChartHolder = ({
         widthStep={columnWidth}
         widthMultiple={widthMultiple}
         heightStep={GRID_BASE_UNIT}
-        heightMultiple={component.meta.height}
+        heightMultiple={component.meta.height ?? GRID_MIN_ROW_UNITS}
         minWidthMultiple={GRID_MIN_COLUMN_COUNT}
         minHeightMultiple={GRID_MIN_ROW_UNITS}
         maxWidthMultiple={availableColumnCount + widthMultiple}
@@ -285,14 +285,16 @@ const ChartHolder = ({
           )}
           <Chart
             componentId={component.id}
-            id={component.meta.chartId}
+            id={component.meta.chartId ?? 0}
             dashboardId={dashboardId}
             width={chartWidth}
             height={chartHeight}
             sliceName={
               component.meta.sliceNameOverride || component.meta.sliceName || ''
             }
-            updateSliceName={handleUpdateSliceName}
+            updateSliceName={(_sliceId: number, name: string) =>
+              handleUpdateSliceName(name)
+            }
             isComponentVisible={isComponentVisible}
             handleToggleFullSize={handleToggleFullSize}
             isFullSize={isFullSize}
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Column/Column.test.jsx b/superset-frontend/src/dashboard/components/gridComponents/Column/Column.test.tsx
similarity index 83%
rename from superset-frontend/src/dashboard/components/gridComponents/Column/Column.test.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/Column/Column.test.tsx
index e67be2c20d5..04c837d185f 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Column/Column.test.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Column/Column.test.tsx
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import React from 'react';
 import { fireEvent, render } from 'spec/helpers/testing-library';
 
 import BackgroundStyleDropdown from 'src/dashboard/components/menu/BackgroundStyleDropdown';
@@ -24,14 +25,25 @@ import IconButton from 'src/dashboard/components/IconButton';
 import { getMockStore } from 'spec/fixtures/mockStore';
 import { dashboardLayout as mockLayout } from 'spec/fixtures/mockDashboardLayout';
 import { initialState } from 'src/SqlLab/fixtures';
-import Column from './Column';
+import ColumnComponent from './Column';
+
+// Cast to accept partial mock props in tests
+const Column = ColumnComponent as unknown as React.FC<Record<string, unknown>>;
 
 jest.mock('src/dashboard/components/dnd/DragDroppable', () => ({
-  Draggable: ({ children }) => (
-    <div data-test="mock-draggable">{children({})}</div>
-  ),
-  Droppable: ({ children, depth }) => (
-    <div data-test="mock-droppable" depth={depth}>
+  Draggable: ({
+    children,
+  }: {
+    children: (arg: Record<string, unknown>) => React.ReactNode;
+  }) => <div data-test="mock-draggable">{children({})}</div>,
+  Droppable: ({
+    children,
+    depth,
+  }: {
+    children: (arg: Record<string, unknown>) => React.ReactNode;
+    depth: number;
+  }) => (
+    <div data-test="mock-droppable" data-depth={depth}>
       {children({})}
     </div>
   ),
@@ -39,8 +51,14 @@ jest.mock('src/dashboard/components/dnd/DragDroppable', () => ({
 jest.mock(
   'src/dashboard/containers/DashboardComponent',
   () =>
-    ({ availableColumnCount, depth }) => (
-      <div data-test="mock-dashboard-component" depth={depth}>
+    ({
+      availableColumnCount,
+      depth,
+    }: {
+      availableColumnCount: number;
+      depth: number;
+    }) => (
+      <div data-test="mock-dashboard-component" data-depth={depth}>
         {availableColumnCount}
       </div>
     ),
@@ -48,12 +66,14 @@ jest.mock(
 jest.mock(
   'src/dashboard/components/menu/WithPopoverMenu',
   () =>
-    ({ children }) => <div data-test="mock-with-popover-menu">{children}</div>,
+    ({ children }: { children: React.ReactNode }) => (
+      <div data-test="mock-with-popover-menu">{children}</div>
+    ),
 );
 jest.mock(
   'src/dashboard/components/DeleteComponentButton',
   () =>
-    ({ onDelete }) => (
+    ({ onDelete }: { onDelete: () => void }) => (
       <button
         type="button"
         data-test="mock-delete-component-button"
@@ -88,7 +108,7 @@ const props = {
   updateComponents() {},
 };
 
-function setup(overrideProps) {
+function setup(overrideProps: Record<string, unknown> = {}) {
   // We have to wrap provide DragDropContext for the underlying DragDroppable
   // otherwise we cannot assert on DragDroppable children
   const mockStore = getMockStore({
@@ -157,17 +177,19 @@ test('should render a DeleteComponentButton in editMode', () => {
 });
 
 test.skip('should render a BackgroundStyleDropdown when focused', () => {
-  let wrapper = setup({ component: columnWithoutChildren });
-  expect(wrapper.find(BackgroundStyleDropdown)).toBeFalsy();
+  let wrapper: ReturnType<typeof setup> = setup({
+    component: columnWithoutChildren,
+  });
+  expect((wrapper as any).find(BackgroundStyleDropdown)).toBeFalsy();
 
   // we cannot set props on the Row because of the WithDragDropContext wrapper
   wrapper = setup({ component: columnWithoutChildren, editMode: true });
-  wrapper
+  (wrapper as any)
     .find(IconButton)
     .at(1) // first one is delete button
     .simulate('click');
 
-  expect(wrapper.find(BackgroundStyleDropdown)).toBeTruthy();
+  expect((wrapper as any).find(BackgroundStyleDropdown)).toBeTruthy();
 });
 
 test('should call deleteComponent when deleted', () => {
@@ -180,7 +202,7 @@ test('should call deleteComponent when deleted', () => {
 test('should pass its own width as availableColumnCount to children', () => {
   const { getByTestId } = setup();
   expect(getByTestId('mock-dashboard-component')).toHaveTextContent(
-    props.component.meta.width,
+    String(props.component.meta.width),
   );
 });
 
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Column/Column.tsx b/superset-frontend/src/dashboard/components/gridComponents/Column/Column.tsx
index ef2f50265d0..eb095abee33 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Column/Column.tsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Column/Column.tsx
@@ -196,7 +196,7 @@ const Column = (props: ColumnProps) => {
         adjustableWidth
         adjustableHeight={false}
         widthStep={columnWidth}
-        widthMultiple={columnComponent.meta.width}
+        widthMultiple={columnComponent.meta.width ?? 0}
         heightMultiple={0}
         minWidthMultiple={minColumnWidth}
         maxWidthMultiple={
@@ -282,7 +282,7 @@ const Column = (props: ColumnProps) => {
                     parentId={columnComponent.id}
                     depth={depth + 1}
                     index={itemIndex}
-                    availableColumnCount={columnComponent.meta.width}
+                    availableColumnCount={columnComponent.meta.width ?? 0}
                     columnWidth={columnWidth}
                     onResizeStart={
                       onResizeStart as unknown as (
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Markdown/Markdown.tsx b/superset-frontend/src/dashboard/components/gridComponents/Markdown/Markdown.tsx
index a822b14e177..d5e14d87ef2 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Markdown/Markdown.tsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Markdown/Markdown.tsx
@@ -424,7 +424,7 @@ class Markdown extends PureComponent<MarkdownProps, MarkdownState> {
                 widthStep={columnWidth}
                 widthMultiple={widthMultiple}
                 heightStep={GRID_BASE_UNIT}
-                heightMultiple={component.meta.height}
+                heightMultiple={component.meta.height ?? GRID_MIN_ROW_UNITS}
                 minWidthMultiple={GRID_MIN_COLUMN_COUNT}
                 minHeightMultiple={GRID_MIN_ROW_UNITS}
                 maxWidthMultiple={availableColumnCount + widthMultiple}
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Row/Row.tsx b/superset-frontend/src/dashboard/components/gridComponents/Row/Row.tsx
index 28a274c49bb..5651712e29d 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Row/Row.tsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Row/Row.tsx
@@ -75,7 +75,7 @@ export type RowProps = {
 
   // visibility
   isComponentVisible: boolean;
-  onChangeTab: (tabId: string) => void;
+  onChangeTab: (args: { pathToTabIndex: string[] }) => void;
 };
 
 const GridRow = styled.div<{ editMode: boolean }>`
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Tab/Tab.test.tsx b/superset-frontend/src/dashboard/components/gridComponents/Tab/Tab.test.tsx
index 0d87eee4328..3accfa7eeaf 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Tab/Tab.test.tsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Tab/Tab.test.tsx
@@ -28,9 +28,13 @@ import DashboardComponent from 'src/dashboard/containers/DashboardComponent';
 import { EditableTitle } from '@superset-ui/core/components';
 import { setEditMode, onRefresh } from 'src/dashboard/actions/dashboardState';
 
-import Tab from './Tab';
+import type { FC } from 'react';
+import ActualTab from './Tab';
 import Markdown from '../Markdown';
 
+// Cast to loosely-typed component to avoid needing every required prop in test mocks
+const Tab = ActualTab as unknown as FC<Record<string, unknown>>;
+
 jest.mock('src/dashboard/util/getChartIdsFromComponent', () =>
   jest.fn(() => []),
 );
@@ -187,11 +191,15 @@ test('Drop on a tab', async () => {
       <Markdown
         id="MARKDOWN-1"
         parentId="GRID_ID"
-        parentComponent={{
-          id: 'GRID_ID',
-          type: 'GRID',
-          parents: ['ROOT_ID'],
-        }}
+        parentComponent={
+          {
+            id: 'GRID_ID',
+            type: 'GRID',
+            parents: ['ROOT_ID'],
+            children: [],
+            meta: {},
+          } as any
+        }
         depth={0}
         editMode
         index={1}
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Tabs/Tabs.test.tsx b/superset-frontend/src/dashboard/components/gridComponents/Tabs/Tabs.test.tsx
index 573fa268f64..3bb4a6592f2 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Tabs/Tabs.test.tsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Tabs/Tabs.test.tsx
@@ -28,7 +28,11 @@ import DashboardComponent from 'src/dashboard/containers/DashboardComponent';
 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 React from 'react';
+import TabsComponent from './Tabs';
+
+// Cast to accept partial mock props in tests
+const Tabs = TabsComponent as unknown as React.FC<Record<string, unknown>>;
 
 jest.mock('src/dashboard/containers/DashboardComponent', () =>
   jest.fn(props => (
diff --git a/superset-frontend/src/dashboard/components/gridComponents/new/DraggableNewComponent.test.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/DraggableNewComponent.test.tsx
similarity index 97%
rename from superset-frontend/src/dashboard/components/gridComponents/new/DraggableNewComponent.test.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/new/DraggableNewComponent.test.tsx
index a7ede957b67..d903eb3e79f 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/new/DraggableNewComponent.test.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/new/DraggableNewComponent.test.tsx
@@ -34,7 +34,7 @@ describe('DraggableNewComponent', () => {
     className: 'a_class',
   };
 
-  function setup(overrideProps) {
+  function setup(overrideProps: Record<string, unknown> = {}) {
     return render(
       <DndProvider backend={HTML5Backend}>
         <DraggableNewComponent {...props} {...overrideProps} />
diff --git a/superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.test.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.test.tsx
similarity index 96%
rename from superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.test.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.test.tsx
index 51f43c5035a..487a8bd3496 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.test.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.test.tsx
@@ -26,7 +26,7 @@ import { COLUMN_TYPE } from 'src/dashboard/util/componentTypes';
 jest.mock(
   'src/dashboard/components/gridComponents/new/DraggableNewComponent',
   () =>
-    ({ type, id }) => (
+    ({ type, id }: { type: string; id: string }) => (
       <div data-test="mock-draggable-new-component">{`${type}:${id}`}</div>
     ),
 );
diff --git a/superset-frontend/src/dashboard/components/gridComponents/new/NewDivider.test.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewDivider.test.tsx
similarity index 96%
rename from superset-frontend/src/dashboard/components/gridComponents/new/NewDivider.test.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/new/NewDivider.test.tsx
index c27cd744ecb..89b7a76810c 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/new/NewDivider.test.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/new/NewDivider.test.tsx
@@ -26,7 +26,7 @@ import { DIVIDER_TYPE } from 'src/dashboard/util/componentTypes';
 jest.mock(
   'src/dashboard/components/gridComponents/new/DraggableNewComponent',
   () =>
-    ({ type, id }) => (
+    ({ type, id }: { type: string; id: string }) => (
       <div data-test="mock-draggable-new-component">{`${type}:${id}`}</div>
     ),
 );
diff --git a/superset-frontend/src/dashboard/components/gridComponents/new/NewHeader.test.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewHeader.test.tsx
similarity index 96%
rename from superset-frontend/src/dashboard/components/gridComponents/new/NewHeader.test.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/new/NewHeader.test.tsx
index c1d9f25a068..053d27ec2ed 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/new/NewHeader.test.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/new/NewHeader.test.tsx
@@ -26,7 +26,7 @@ import { HEADER_TYPE } from 'src/dashboard/util/componentTypes';
 jest.mock(
   'src/dashboard/components/gridComponents/new/DraggableNewComponent',
   () =>
-    ({ type, id }) => (
+    ({ type, id }: { type: string; id: string }) => (
       <div data-test="mock-draggable-new-component">{`${type}:${id}`}</div>
     ),
 );
diff --git a/superset-frontend/src/dashboard/components/gridComponents/new/NewTabs.test.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewTabs.test.tsx
similarity index 97%
rename from superset-frontend/src/dashboard/components/gridComponents/new/NewTabs.test.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/new/NewTabs.test.tsx
index 7984d8eac72..6e3f0201bde 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/new/NewTabs.test.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/new/NewTabs.test.tsx
@@ -33,7 +33,7 @@ afterEach(async () => {
 jest.mock(
   'src/dashboard/components/gridComponents/new/DraggableNewComponent',
   () =>
-    ({ type, id }) => (
+    ({ type, id }: { type: string; id: string }) => (
       <div data-test="mock-draggable-new-component">{`${type}:${id}`}</div>
     ),
 );
diff --git a/superset-frontend/src/dashboard/components/menu/WithPopoverMenu.test.jsx b/superset-frontend/src/dashboard/components/menu/WithPopoverMenu.test.tsx
similarity index 96%
rename from superset-frontend/src/dashboard/components/menu/WithPopoverMenu.test.jsx
rename to superset-frontend/src/dashboard/components/menu/WithPopoverMenu.test.tsx
index 407907e7100..97c0f0bf2fa 100644
--- a/superset-frontend/src/dashboard/components/menu/WithPopoverMenu.test.jsx
+++ b/superset-frontend/src/dashboard/components/menu/WithPopoverMenu.test.tsx
@@ -30,7 +30,7 @@ const props = {
   editMode: false,
 };
 
-function setup(overrideProps) {
+function setup(overrideProps: Record<string, unknown> = {}) {
   return render(<WithPopoverMenu {...props} {...overrideProps} />);
 }
 
@@ -46,7 +46,7 @@ test('should render the passed children', () => {
 
 test('should focus on click in editMode', async () => {
   const { container } = setup({ editMode: true });
-  await userEvent.click(container.querySelector('.with-popover-menu'));
+  await userEvent.click(container.querySelector('.with-popover-menu')!);
   expect(
     container.querySelector('.with-popover-menu--focused'),
   ).toBeInTheDocument();
@@ -57,7 +57,7 @@ test('should render menuItems when focused', async () => {
   expect(container.querySelector('#menu1')).not.toBeInTheDocument();
   expect(container.querySelector('#menu2')).not.toBeInTheDocument();
 
-  await userEvent.click(container.querySelector('.with-popover-menu'));
+  await userEvent.click(container.querySelector('.with-popover-menu')!);
   expect(container.querySelector('#menu1')).toBeInTheDocument();
   expect(container.querySelector('#menu2')).toBeInTheDocument();
 });
@@ -65,7 +65,7 @@ test('should render menuItems when focused', async () => {
 test('should not focus when disableClick=true', async () => {
   const { container } = setup({ disableClick: true, editMode: true });
 
-  await userEvent.click(container.querySelector('.with-popover-menu'));
+  await userEvent.click(container.querySelector('.with-popover-menu')!);
   expect(
     container.querySelector('.with-popover-menu--focused'),
   ).not.toBeInTheDocument();
@@ -76,7 +76,7 @@ test('should use the passed shouldFocus func to determine if it should focus', a
   expect(
     container.querySelector('.with-popover-menu--focused'),
   ).not.toBeInTheDocument();
-  await userEvent.click(container.querySelector('.with-popover-menu'));
+  await userEvent.click(container.querySelector('.with-popover-menu')!);
   expect(
     container.querySelector('.with-popover-menu--focused'),
   ).not.toBeInTheDocument();
@@ -92,7 +92,7 @@ test('should allow event propagation to enable multiple components to work indep
     onChangeFocus,
   });
 
-  const menuComponent = container.querySelector('.with-popover-menu');
+  const menuComponent = container.querySelector('.with-popover-menu')!;
   await userEvent.click(menuComponent);
 
   expect(onChangeFocus).toHaveBeenCalledWith(true);
@@ -127,13 +127,13 @@ test('should unfocus when another component is clicked', async () => {
   const menuA = componentA.container.querySelector('.with-popover-menu');
   const menuB = componentB.container.querySelector('.with-popover-menu');
 
-  await userEvent.click(menuA);
+  await userEvent.click(menuA!);
   expect(onChangeFocusA).toHaveBeenCalledWith(true);
   expect(
     componentA.container.querySelector('.with-popover-menu--focused'),
   ).toBeInTheDocument();
 
-  await userEvent.click(menuB);
+  await userEvent.click(menuB!);
   expect(onChangeFocusB).toHaveBeenCalledWith(true);
   expect(onChangeFocusA).toHaveBeenCalledWith(false);
   expect(
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/FilterBarSettings.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/FilterBarSettings.test.tsx
index 8e5ae3b3616..ed501f3b4b0 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/FilterBarSettings.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/FilterBarSettings.test.tsx
@@ -53,6 +53,7 @@ const initialState: { dashboardInfo: DashboardInfo } = {
     created_on_delta_humanized: '',
     changed_on_delta_humanized: '',
     owners: [],
+    last_modified_time: 0,
   },
 };
 
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.test.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.test.ts
index 1071608e552..4ce48ed1cc7 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.test.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.test.ts
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Layout } from 'src/dashboard/types';
+import { Layout, LayoutItem, Charts } from 'src/dashboard/types';
 import { VizType } from '@superset-ui/core';
 import { buildTree } from './utils';
+import type { TreeItem } from './types';
 
 // The types defined for Layout and sub elements is not compatible with the data we get back fro a real dashboard layout
 // This test file is using data from a real example dashboard to test real world data sets.  ts-ignore is set for this entire file
@@ -40,7 +41,7 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in
     title: 'All panels',
   };
 
-  const layout: Layout = {
+  const layout = {
     'CHART-1L7NIcXvVN': {
       children: [],
       id: 'CHART-1L7NIcXvVN',
@@ -234,9 +235,7 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in
       parents: ['ROOT_ID', 'TABS-97PVJa11D_', 'TAB-2_QXp8aNq', 'ROW-yP9SB89PZ'],
       type: 'COLUMN',
     },
-    // @ts-expect-error
-    DASHBOARD_VERSION_KEY: 'v2',
-    // @ts-expect-error
+    DASHBOARD_VERSION_KEY: 'v2' as any,
     GRID_ID: {
       children: [],
       id: 'GRID_ID',
@@ -244,9 +243,9 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in
       type: 'GRID',
     },
     HEADER_ID: {
+      children: [],
       id: 'HEADER_ID',
       type: 'HEADER',
-      // @ts-expect-error
       meta: {
         text: 'Video Game Sales',
       },
@@ -284,7 +283,6 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in
       ],
       type: 'MARKDOWN',
     },
-    // @ts-expect-error
     ROOT_ID: {
       children: ['TABS-97PVJa11D_'],
       id: 'ROOT_ID',
@@ -350,7 +348,6 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in
     'TAB-2_QXp8aNq': {
       children: ['ROW-yP9SB89PZ', 'ROW-fjg6YQBkH'],
       id: 'TAB-2_QXp8aNq',
-      // @ts-expect-error
       meta: {
         text: '🤿 Explore Trends',
       },
@@ -365,7 +362,6 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in
         'ROW-NuR8GFQTO',
       ],
       id: 'TAB-lg-5ymUDgm',
-      // @ts-expect-error
       meta: {
         text: 'Overview',
       },
@@ -375,7 +371,6 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in
     'TABS-97PVJa11D_': {
       children: ['TAB-lg-5ymUDgm', 'TAB-2_QXp8aNq'],
       id: 'TABS-97PVJa11D_',
-      // @ts-expect-error
       meta: {},
       parents: ['ROOT_ID'],
       type: 'TABS',
@@ -18042,11 +18037,10 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in
   test('Succeeds with valid', () => {
     expect(() => {
       buildTree(
-        // @ts-ignore
-        node,
+        node as unknown as LayoutItem,
         treeItem,
-        layout,
-        charts,
+        layout as unknown as Layout,
+        charts as unknown as Charts,
         validNodes,
         initiallyExcludedCharts,
         () => 'Fake title',
@@ -18057,11 +18051,10 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in
   test('Avoids runtime error with invalid inputs', () => {
     expect(() => {
       buildTree(
-        // @ts-expect-error
-        undefined,
+        undefined as unknown as LayoutItem,
         treeItem,
-        layout,
-        charts,
+        layout as unknown as Layout,
+        charts as unknown as Charts,
         validNodes,
         initiallyExcludedCharts,
         () => 'Fake title',
@@ -18070,11 +18063,10 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in
 
     expect(() => {
       buildTree(
-        // @ts-expect-error
-        node,
-        null,
-        layout,
-        charts,
+        node as unknown as LayoutItem,
+        null as unknown as TreeItem,
+        layout as unknown as Layout,
+        charts as unknown as Charts,
         validNodes,
         initiallyExcludedCharts,
         () => 'Fake title',
@@ -18083,11 +18075,10 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in
 
     expect(() => {
       buildTree(
-        // @ts-expect-error
-        node,
+        node as unknown as LayoutItem,
         treeItem,
-        null,
-        charts,
+        null as unknown as Layout,
+        charts as unknown as Charts,
         validNodes,
         initiallyExcludedCharts,
         () => 'Fake title',
@@ -18096,11 +18087,10 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in
 
     expect(() => {
       buildTree(
-        // @ts-expect-error
-        node,
+        node as unknown as LayoutItem,
         treeItem,
-        layout,
-        null,
+        layout as unknown as Layout,
+        null as unknown as Charts,
         validNodes,
         initiallyExcludedCharts,
         () => 'Fake title',
@@ -18109,12 +18099,11 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in
 
     expect(() => {
       buildTree(
-        // @ts-expect-error
-        node,
+        node as unknown as LayoutItem,
         treeItem,
-        layout,
-        charts,
-        null,
+        layout as unknown as Layout,
+        charts as unknown as Charts,
+        null as unknown as string[],
         initiallyExcludedCharts,
         () => 'Fake title',
       );
@@ -18122,13 +18111,12 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in
 
     expect(() => {
       buildTree(
-        // @ts-expect-error
-        node,
+        node as unknown as LayoutItem,
         treeItem,
-        layout,
-        charts,
+        layout as unknown as Layout,
+        charts as unknown as Charts,
         validNodes,
-        null,
+        null as unknown as number[],
         () => 'Fake title',
       );
     }).not.toThrow();
diff --git a/superset-frontend/src/dashboard/containers/DashboardComponent.tsx b/superset-frontend/src/dashboard/containers/DashboardComponent.tsx
index 7ebfb060e7a..06a80850378 100644
--- a/superset-frontend/src/dashboard/containers/DashboardComponent.tsx
+++ b/superset-frontend/src/dashboard/containers/DashboardComponent.tsx
@@ -156,9 +156,16 @@ const DashboardComponent = (
       return {};
     }, [component, dashboardLayout, props.id]);
 
-  const Component = component ? componentLookup[component.type] : null;
-  return Component ? (
-    <Component
+  const Component = component
+    ? componentLookup[component.type as keyof typeof componentLookup]
+    : null;
+  // Component is a union of all grid component types; TypeScript
+  // cannot narrow the union here, so cast to a generic component type.
+  const ResolvedComponent = Component as React.ComponentType<
+    Record<string, unknown>
+  > | null;
+  return ResolvedComponent ? (
+    <ResolvedComponent
       {...props}
       {...boundActionCreators}
       component={component}
diff --git a/superset-frontend/src/dashboard/containers/DashboardPage.tsx b/superset-frontend/src/dashboard/containers/DashboardPage.tsx
index 6dd2ebd5256..3a6316f9d66 100644
--- a/superset-frontend/src/dashboard/containers/DashboardPage.tsx
+++ b/superset-frontend/src/dashboard/containers/DashboardPage.tsx
@@ -51,6 +51,7 @@ import CrudThemeProvider from 'src/components/CrudThemeProvider';
 import type { DashboardChartStates } from 'src/dashboard/types/chartState';
 
 import { nanoid } from 'nanoid';
+import type { ActiveFilters } from '../types';
 import { RootState } from '../types';
 import {
   chartContextMenuStyles,
@@ -175,14 +176,16 @@ export const DashboardPage: FC<PageProps> = ({ idOrSlug }: PageProps) => {
       let dataMask = nativeFilterKeyValue || {};
       // activeTabs is initialized with undefined so that it doesn't override
       // the currently stored value when hydrating
-      let activeTabs: string[] | undefined;
-      let chartStates: DashboardChartStates | undefined;
+      let activeTabs: string[] | null | undefined;
+      let chartStates: DashboardChartStates | null | undefined;
       let anchor: string | undefined;
       if (permalinkKey) {
         const permalinkValue = await getPermalinkValue(permalinkKey);
         if (permalinkValue?.state) {
-          ({ dataMask, activeTabs, chartStates, anchor } =
-            permalinkValue.state);
+          ({ dataMask, activeTabs, anchor } = permalinkValue.state);
+          chartStates = permalinkValue.state.chartStates as
+            | DashboardChartStates
+            | undefined;
         }
       } else if (nativeFilterKeyValue) {
         dataMask = await getFilterValue(id, nativeFilterKeyValue);
@@ -198,12 +201,12 @@ export const DashboardPage: FC<PageProps> = ({ idOrSlug }: PageProps) => {
         dispatch(
           hydrateDashboard({
             history,
-            dashboard,
-            charts,
-            activeTabs,
+            dashboard: dashboard!,
+            charts: charts!,
+            activeTabs: activeTabs ?? null,
             dataMask,
-            chartStates,
-          }),
+            chartStates: chartStates ?? null,
+          } as unknown as Parameters<typeof hydrateDashboard>[0]),
         );
 
         // Scroll to anchor element if specified in permalink state
@@ -298,7 +301,7 @@ export const DashboardPage: FC<PageProps> = ({ idOrSlug }: PageProps) => {
               }
             >
               <DashboardContainer
-                activeFilters={activeFilters}
+                activeFilters={activeFilters as ActiveFilters}
                 ownDataCharts={relevantDataMask}
               >
                 {DashboardBuilderComponent}
diff --git a/superset-frontend/src/dashboard/reducers/dashboardFilters.test.js b/superset-frontend/src/dashboard/reducers/dashboardFilters.test.ts
similarity index 77%
rename from superset-frontend/src/dashboard/reducers/dashboardFilters.test.js
rename to superset-frontend/src/dashboard/reducers/dashboardFilters.test.ts
index 4340b4c7c19..0a81c7e4166 100644
--- a/superset-frontend/src/dashboard/reducers/dashboardFilters.test.js
+++ b/superset-frontend/src/dashboard/reducers/dashboardFilters.test.ts
@@ -42,15 +42,20 @@ describe('dashboardFilters reducer', () => {
 
   test('should overwrite a filter if merge is false', () => {
     expect(
-      dashboardFiltersReducer(dashboardFilters, {
-        type: CHANGE_FILTER,
-        chartId: filterId,
-        newSelectedValues: {
-          region: ['c'],
-          gender: ['body', 'girl'],
+      dashboardFiltersReducer(
+        dashboardFilters as unknown as Parameters<
+          typeof dashboardFiltersReducer
+        >[0],
+        {
+          type: CHANGE_FILTER,
+          chartId: filterId,
+          newSelectedValues: {
+            region: ['c'],
+            gender: ['body', 'girl'],
+          },
+          merge: false,
         },
-        merge: false,
-      }),
+      ),
     ).toEqual({
       [filterId]: {
         chartId: filterId,
@@ -75,15 +80,20 @@ describe('dashboardFilters reducer', () => {
 
   test('should merge a filter if merge is true', () => {
     expect(
-      dashboardFiltersReducer(dashboardFilters, {
-        type: CHANGE_FILTER,
-        chartId: filterId,
-        newSelectedValues: {
-          region: ['c'],
-          gender: ['body', 'girl'],
+      dashboardFiltersReducer(
+        dashboardFilters as unknown as Parameters<
+          typeof dashboardFiltersReducer
+        >[0],
+        {
+          type: CHANGE_FILTER,
+          chartId: filterId,
+          newSelectedValues: {
+            region: ['c'],
+            gender: ['body', 'girl'],
+          },
+          merge: true,
         },
-        merge: true,
-      }),
+      ),
     ).toEqual({
       [filterId]: {
         chartId: filterId,
@@ -119,12 +129,18 @@ describe('dashboardFilters reducer', () => {
       [`${filterId}_region`]: regionScope,
       [`${filterId}_gender`]: genderScope,
     };
-    activeDashboardFilters.buildActiveFilters = jest.fn();
+    (activeDashboardFilters as Record<string, unknown>).buildActiveFilters =
+      jest.fn();
     expect(
-      dashboardFiltersReducer(dashboardFilters, {
-        type: UPDATE_DASHBOARD_FILTERS_SCOPE,
-        scopes,
-      })[filterId].scopes,
+      dashboardFiltersReducer(
+        dashboardFilters as unknown as Parameters<
+          typeof dashboardFiltersReducer
+        >[0],
+        {
+          type: UPDATE_DASHBOARD_FILTERS_SCOPE,
+          scopes,
+        },
+      )[filterId].scopes,
     ).toEqual({
       region: regionScope,
       gender: genderScope,
diff --git a/superset-frontend/src/dashboard/reducers/dashboardLayout.test.js b/superset-frontend/src/dashboard/reducers/dashboardLayout.test.ts
similarity index 92%
rename from superset-frontend/src/dashboard/reducers/dashboardLayout.test.js
rename to superset-frontend/src/dashboard/reducers/dashboardLayout.test.ts
index fe0a7142a8e..73b2610003f 100644
--- a/superset-frontend/src/dashboard/reducers/dashboardLayout.test.js
+++ b/superset-frontend/src/dashboard/reducers/dashboardLayout.test.ts
@@ -29,6 +29,8 @@ import {
   DELETE_TOP_LEVEL_TABS,
 } from 'src/dashboard/actions/dashboardLayout';
 
+import type { DashboardLayout } from 'src/dashboard/types';
+
 import {
   CHART_TYPE,
   DASHBOARD_GRID_TYPE,
@@ -46,15 +48,21 @@ import {
   NEW_ROW_ID,
 } from 'src/dashboard/util/constants';
 
+// Cast reducer to accept partial mock data in tests
+const testReducer = layoutReducer as (
+  state: any,
+  action: any,
+) => DashboardLayout;
+
 // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
 describe('dashboardLayout reducer', () => {
   test('should return initial state for unrecognized actions', () => {
-    expect(layoutReducer(undefined, {})).toEqual({});
+    expect(testReducer(undefined, {})).toEqual({});
   });
 
   test('should delete a component, remove its reference in its parent, and recursively all of its children', () => {
     expect(
-      layoutReducer(
+      testReducer(
         {
           toDelete: {
             id: 'toDelete',
@@ -90,7 +98,7 @@ describe('dashboardLayout reducer', () => {
 
   test('should delete a parent if the parent was a row and no longer has children', () => {
     expect(
-      layoutReducer(
+      testReducer(
         {
           grandparentId: {
             id: 'grandparentId',
@@ -125,7 +133,7 @@ describe('dashboardLayout reducer', () => {
 
   test('should update components', () => {
     expect(
-      layoutReducer(
+      testReducer(
         {
           update: {
             id: 'update',
@@ -200,7 +208,7 @@ describe('dashboardLayout reducer', () => {
     };
 
     expect(
-      layoutReducer(layout, {
+      testReducer(layout, {
         type: MOVE_COMPONENT,
         payload: { dropResult },
       }),
@@ -248,7 +256,7 @@ describe('dashboardLayout reducer', () => {
       dragging: { id: 'toMove', type: CHART_TYPE },
     };
 
-    const result = layoutReducer(layout, {
+    const result = testReducer(layout, {
       type: MOVE_COMPONENT,
       payload: { dropResult },
     });
@@ -256,7 +264,7 @@ describe('dashboardLayout reducer', () => {
     const newRow = Object.values(result).find(
       component =>
         ['source', 'destination', 'toMove'].indexOf(component.id) === -1,
-    );
+    )!;
 
     expect(newRow.children[0]).toBe('toMove');
     expect(result.destination.children[0]).toBe(newRow.id);
@@ -289,18 +297,18 @@ describe('dashboardLayout reducer', () => {
       dragging: { id: NEW_TABS_ID, type: TABS_TYPE },
     };
 
-    const result = layoutReducer(layout, {
+    const result = testReducer(layout, {
       type: CREATE_TOP_LEVEL_TABS,
       payload: { dropResult },
     });
 
     const tabComponent = Object.values(result).find(
       component => component.type === TAB_TYPE,
-    );
+    )!;
 
     const tabsComponent = Object.values(result).find(
       component => component.type === TABS_TYPE,
-    );
+    )!;
 
     expect(Object.keys(result)).toHaveLength(5); // initial + Tabs + Tab
     expect(result[DASHBOARD_ROOT_ID].children[0]).toBe(tabsComponent.id);
@@ -349,7 +357,7 @@ describe('dashboardLayout reducer', () => {
       dragging: { id: 'tabs', type: TABS_TYPE },
     };
 
-    const result = layoutReducer(layout, {
+    const result = testReducer(layout, {
       type: CREATE_TOP_LEVEL_TABS,
       payload: { dropResult },
     });
@@ -401,7 +409,7 @@ describe('dashboardLayout reducer', () => {
       dragging: { id: 'tabs', type: TABS_TYPE },
     };
 
-    const result = layoutReducer(layout, {
+    const result = testReducer(layout, {
       type: DELETE_TOP_LEVEL_TABS,
       payload: { dropResult },
     });
@@ -449,7 +457,7 @@ describe('dashboardLayout reducer', () => {
       dragging: { id: NEW_ROW_ID, type: ROW_TYPE },
     };
 
-    const result = layoutReducer(layout, {
+    const result = testReducer(layout, {
       type: CREATE_COMPONENT,
       payload: { dropResult },
     });
@@ -468,13 +476,21 @@ describe('dashboardLayout reducer', () => {
      */
     const componentId = '123';
     const componentParentId = '456';
-    const nextComponents = [];
+    // Testing fault tolerance with intentionally invalid input (array instead of object)
+    const nextComponents = [] as unknown as Parameters<
+      typeof recursivelyDeleteChildren
+    >[2];
     expect(() => {
       recursivelyDeleteChildren(componentId, componentParentId, nextComponents);
     }).not.toThrow();
 
     expect(() => {
-      recursivelyDeleteChildren(null, null, null);
+      // Testing fault tolerance with intentionally invalid inputs
+      recursivelyDeleteChildren(
+        null as unknown as string,
+        null as unknown as string,
+        null as unknown as Parameters<typeof recursivelyDeleteChildren>[2],
+      );
     }).not.toThrow();
   });
 });
diff --git a/superset-frontend/src/dashboard/reducers/dashboardState.test.js b/superset-frontend/src/dashboard/reducers/dashboardState.test.js
deleted file mode 100644
index 83fe01c8b6b..00000000000
--- a/superset-frontend/src/dashboard/reducers/dashboardState.test.js
+++ /dev/null
@@ -1,296 +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 {
-  ADD_SLICE,
-  ON_CHANGE,
-  ON_SAVE,
-  REMOVE_SLICE,
-  SET_EDIT_MODE,
-  SET_FOCUSED_FILTER_FIELD,
-  SET_MAX_UNDO_HISTORY_EXCEEDED,
-  SET_UNSAVED_CHANGES,
-  TOGGLE_EXPAND_SLICE,
-  TOGGLE_FAVE_STAR,
-  TOGGLE_NATIVE_FILTERS_BAR,
-  UNSET_FOCUSED_FILTER_FIELD,
-  UPDATE_CHART_STATE,
-  REMOVE_CHART_STATE,
-  RESTORE_CHART_STATES,
-  CLEAR_ALL_CHART_STATES,
-} from 'src/dashboard/actions/dashboardState';
-
-import dashboardStateReducer from 'src/dashboard/reducers/dashboardState';
-
-// eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
-describe('dashboardState reducer', () => {
-  test('should return initial state', () => {
-    expect(dashboardStateReducer(undefined, {})).toEqual({});
-  });
-
-  test('should add a slice', () => {
-    expect(
-      dashboardStateReducer(
-        { sliceIds: [1] },
-        { type: ADD_SLICE, slice: { slice_id: 2 } },
-      ),
-    ).toEqual({ sliceIds: [1, 2] });
-  });
-
-  test('should remove a slice', () => {
-    expect(
-      dashboardStateReducer(
-        { sliceIds: [1, 2], filters: {} },
-        { type: REMOVE_SLICE, sliceId: 2 },
-      ),
-    ).toEqual({ sliceIds: [1], filters: {} });
-  });
-
-  test('should toggle fav star', () => {
-    expect(
-      dashboardStateReducer(
-        { isStarred: false },
-        { type: TOGGLE_FAVE_STAR, isStarred: true },
-      ),
-    ).toEqual({ isStarred: true });
-  });
-
-  test('should toggle edit mode', () => {
-    expect(
-      dashboardStateReducer(
-        { editMode: false },
-        { type: SET_EDIT_MODE, editMode: true },
-      ),
-    ).toEqual({
-      editMode: true,
-    });
-  });
-
-  test('should toggle expanded slices', () => {
-    expect(
-      dashboardStateReducer(
-        { expandedSlices: { 1: true, 2: false } },
-        { type: TOGGLE_EXPAND_SLICE, sliceId: 1 },
-      ),
-    ).toEqual({ expandedSlices: { 2: false } });
-
-    expect(
-      dashboardStateReducer(
-        { expandedSlices: { 1: true, 2: false } },
-        { type: TOGGLE_EXPAND_SLICE, sliceId: 2 },
-      ),
-    ).toEqual({ expandedSlices: { 1: true, 2: true } });
-  });
-
-  test('should set hasUnsavedChanges', () => {
-    expect(dashboardStateReducer({}, { type: ON_CHANGE })).toEqual({
-      hasUnsavedChanges: true,
-    });
-
-    expect(
-      dashboardStateReducer(
-        {},
-        { type: SET_UNSAVED_CHANGES, payload: { hasUnsavedChanges: false } },
-      ),
-    ).toEqual({
-      hasUnsavedChanges: false,
-    });
-  });
-
-  test('should set maxUndoHistoryExceeded', () => {
-    expect(
-      dashboardStateReducer(
-        {},
-        {
-          type: SET_MAX_UNDO_HISTORY_EXCEEDED,
-          payload: { maxUndoHistoryExceeded: true },
-        },
-      ),
-    ).toEqual({
-      maxUndoHistoryExceeded: true,
-    });
-  });
-
-  test('should set unsaved changes, max undo history, and editMode to false on save', () => {
-    const result = dashboardStateReducer(
-      { hasUnsavedChanges: true },
-      { type: ON_SAVE },
-    );
-    expect(result.hasUnsavedChanges).toBe(false);
-    expect(result.maxUndoHistoryExceeded).toBe(false);
-    expect(result.editMode).toBe(false);
-    expect(result.updatedColorScheme).toBe(false);
-  });
-
-  test('should reset lastModifiedTime on save', () => {
-    const initTime = new Date().getTime() / 1000;
-    dashboardStateReducer(
-      {
-        lastModifiedTime: initTime,
-      },
-      {},
-    );
-
-    const lastModifiedTime = new Date().getTime() / 1000;
-    expect(
-      dashboardStateReducer(
-        { hasUnsavedChanges: true },
-        { type: ON_SAVE, lastModifiedTime },
-      ).lastModifiedTime,
-    ).toBeGreaterThanOrEqual(initTime);
-  });
-
-  test('should clear the focused filter field', () => {
-    const initState = {
-      focusedFilterField: {
-        chartId: 1,
-        column: 'column_1',
-      },
-    };
-
-    const cleared = dashboardStateReducer(initState, {
-      type: UNSET_FOCUSED_FILTER_FIELD,
-      chartId: 1,
-      column: 'column_1',
-    });
-
-    expect(cleared.focusedFilterField).toBeNull();
-  });
-
-  test('should only clear focused filter when the fields match', () => {
-    // dashboard only has 1 focused filter field at a time,
-    // but when user switch different filter boxes,
-    // browser didn't always fire onBlur and onFocus events in order.
-
-    // init state: has 1 focus field
-    const initState = {
-      focusedFilterField: {
-        chartId: 1,
-        column: 'column_1',
-      },
-    };
-    // when user switching filter,
-    // browser focus on new filter first,
-    // then blur current filter
-    const step1 = dashboardStateReducer(initState, {
-      type: SET_FOCUSED_FILTER_FIELD,
-      chartId: 2,
-      column: 'column_2',
-    });
-    const step2 = dashboardStateReducer(step1, {
-      type: UNSET_FOCUSED_FILTER_FIELD,
-      chartId: 1,
-      column: 'column_1',
-    });
-
-    expect(step2.focusedFilterField).toEqual({
-      chartId: 2,
-      column: 'column_2',
-    });
-  });
-
-  test('should toggle native filters bar', () => {
-    expect(
-      dashboardStateReducer(
-        { nativeFiltersBarOpen: false },
-        { type: TOGGLE_NATIVE_FILTERS_BAR, isOpen: true },
-      ),
-    ).toEqual({ nativeFiltersBarOpen: true });
-
-    expect(
-      dashboardStateReducer(
-        { nativeFiltersBarOpen: true },
-        { type: TOGGLE_NATIVE_FILTERS_BAR, isOpen: false },
-      ),
-    ).toEqual({ nativeFiltersBarOpen: false });
-  });
-
-  test('should update chart state', () => {
-    const chartState = { columnState: [], filterModel: {} };
-    const result = dashboardStateReducer(
-      { chartStates: {} },
-      {
-        type: UPDATE_CHART_STATE,
-        chartId: 123,
-        vizType: 'ag-grid-table',
-        chartState,
-        lastModified: 1234567890,
-      },
-    );
-    expect(result.chartStates[123]).toEqual({
-      chartId: 123,
-      vizType: 'ag-grid-table',
-      state: chartState,
-      lastModified: 1234567890,
-    });
-  });
-
-  test('should remove chart state', () => {
-    const initState = {
-      chartStates: {
-        123: { chartId: 123, vizType: 'ag-grid-table', state: {} },
-        456: { chartId: 456, vizType: 'ag-grid-table', state: {} },
-      },
-    };
-    const result = dashboardStateReducer(initState, {
-      type: REMOVE_CHART_STATE,
-      chartId: 123,
-    });
-    expect(result.chartStates[123]).toBeUndefined();
-    expect(result.chartStates[456]).toBeDefined();
-  });
-
-  test('should restore chart states', () => {
-    const chartStates = {
-      123: { chartId: 123, vizType: 'ag-grid-table', state: {} },
-    };
-    const result = dashboardStateReducer(
-      { chartStates: {} },
-      { type: RESTORE_CHART_STATES, chartStates },
-    );
-    expect(result.chartStates).toEqual(chartStates);
-  });
-
-  test('should restore chart states to empty when given null', () => {
-    const initState = {
-      chartStates: {
-        123: { chartId: 123, vizType: 'ag-grid-table', state: {} },
-      },
-    };
-    const result = dashboardStateReducer(initState, {
-      type: RESTORE_CHART_STATES,
-      chartStates: null,
-    });
-    expect(result.chartStates).toEqual({});
-  });
-
-  test('should clear all chart states', () => {
-    const initState = {
-      chartStates: {
-        123: { chartId: 123, vizType: 'ag-grid-table', state: {} },
-        456: { chartId: 456, vizType: 'ag-grid-table', state: {} },
-      },
-      otherState: 'preserved',
-    };
-    const result = dashboardStateReducer(initState, {
-      type: CLEAR_ALL_CHART_STATES,
-    });
-    expect(result.chartStates).toEqual({});
-    expect(result.otherState).toEqual('preserved');
-  });
-});
diff --git a/superset-frontend/src/dashboard/reducers/dashboardState.test.ts b/superset-frontend/src/dashboard/reducers/dashboardState.test.ts
index 6695a28808a..59b2c89cc4f 100644
--- a/superset-frontend/src/dashboard/reducers/dashboardState.test.ts
+++ b/superset-frontend/src/dashboard/reducers/dashboardState.test.ts
@@ -19,7 +19,26 @@
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import dashboardStateReducer from './dashboardState';
-import { setActiveTab, setActiveTabs } from '../actions/dashboardState';
+import {
+  ADD_SLICE,
+  ON_CHANGE,
+  ON_SAVE,
+  REMOVE_SLICE,
+  SET_EDIT_MODE,
+  SET_FOCUSED_FILTER_FIELD,
+  SET_MAX_UNDO_HISTORY_EXCEEDED,
+  SET_UNSAVED_CHANGES,
+  TOGGLE_EXPAND_SLICE,
+  TOGGLE_FAVE_STAR,
+  TOGGLE_NATIVE_FILTERS_BAR,
+  UNSET_FOCUSED_FILTER_FIELD,
+  UPDATE_CHART_STATE,
+  REMOVE_CHART_STATE,
+  RESTORE_CHART_STATES,
+  CLEAR_ALL_CHART_STATES,
+  setActiveTab,
+  setActiveTabs,
+} from '../actions/dashboardState';
 import { DashboardState } from '../types';
 
 // Type the reducer function properly since it's imported from JS
@@ -50,6 +69,7 @@ const createMockDashboardState = (
   sliceIds: [],
   directPathLastUpdated: 0,
   nativeFiltersBarOpen: false,
+  refreshFrequency: 0,
   ...overrides,
 });
 
@@ -63,7 +83,7 @@ describe('DashboardState reducer', () => {
         dashboardLayout: { present: { tab1: { parents: [] } } },
       });
       const request = setActiveTab('tab1');
... 1690 lines suppressed ...