diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/url_params.test.js b/superset-frontend/cypress-base/cypress/integration/dashboard/url_params.test.js
index ae98be1f5..4300a26a9 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard/url_params.test.js
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard/url_params.test.js
@@ -36,7 +36,7 @@ describe('Dashboard form data', () => {
     });
   });
 
-  it('should apply url params and queryFields to slice requests', () => {
+  it('should apply url params to slice requests', () => {
     const aliases = getChartAliases(dashboard.slices);
     // wait and verify one-by-one
     cy.wait(aliases).then(requests => {
@@ -48,7 +48,6 @@ describe('Dashboard form data', () => {
           if (isLegacyResponse(responseBody)) {
             const requestFormData = xhr.request.body;
             const requestParams = JSON.parse(requestFormData.get('form_data'));
-            expect(requestParams).to.have.property('queryFields');
             expect(requestParams.url_params).deep.eq(urlParams);
           } else {
             xhr.request.body.queries.forEach(query => {
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
index 1933fb1b3..323a81e91 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -16510,101 +16510,19 @@
       }
     },
     "@superset-ui/chart-controls": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/chart-controls/-/chart-controls-0.15.18.tgz",
-      "integrity": "sha512-Q3HoxDZTPO4p7qZV1NJeLxC3Tco+Q77OwKAZK7F2G2j+Q+9j82GaGtQWn/gXbIq+Iev6gPFRA+Oyzn5JHV93JA==",
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/@superset-ui/chart-controls/-/chart-controls-0.16.1.tgz",
+      "integrity": "sha512-r6HsOFeOHMstu2C70sXQphYiMZfXSTEsZrfXJ+TMaqbEovX+FWJ4KysPGY7ttGeYmYuiLG+ETfPAMuPAmQxR7g==",
       "requires": {
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/core": "0.16.1",
         "lodash": "^4.17.15",
         "prop-types": "^15.7.2"
-      },
-      "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
-        "d3-array": {
-          "version": "2.9.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-          "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
       }
     },
     "@superset-ui/core": {
-      "version": "0.15.19",
-      "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.19.tgz",
-      "integrity": "sha512-g27Y6WJYYeUpNz6/gbILvbxzACGjI+3bgN/4ao+XhZKKwpa5MdjjWwcrc6K2AbNRS/zAM45DO7ATy4bWPII8PA==",
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.16.1.tgz",
+      "integrity": "sha512-5sZ7xtZrQ3tx2gXACvRNy3AhXUzrcuzq0D94W5J24LGmSULhNOCtQZyq0grXeyQNxcPiRp9UwHRhn8zyZ2Bdzw==",
       "requires": {
         "@babel/runtime": "^7.1.2",
         "@emotion/core": "^10.0.28",
@@ -16684,654 +16602,106 @@
       }
     },
     "@superset-ui/legacy-plugin-chart-calendar": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.15.18.tgz",
-      "integrity": "sha512-0kkEosqn8rTIaBC/5XO9tZ5mTPCdl+SzP07jNa9giE33yslkC6G2UH9h6vWCytwqRouD5eIZfvk1BDNxNTFhww==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.16.2.tgz",
+      "integrity": "sha512-CRS1polZazqh/kSNjwCo7uObmynoaJ+k5BCh2YBS1M5FJgYRKytexxVQ5S41xu/J7A6LkPL5iwisoIf1iUKYDw==",
       "requires": {
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "d3-array": "^2.0.3",
         "d3-selection": "^1.4.0",
         "d3-tip": "^0.9.1",
         "prop-types": "^15.6.2"
       },
       "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
         "d3-array": {
           "version": "2.9.1",
           "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
           "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
         }
       }
     },
     "@superset-ui/legacy-plugin-chart-chord": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-chord/-/legacy-plugin-chart-chord-0.15.18.tgz",
-      "integrity": "sha512-8T944NGsbEY92gslj8eZf6Wos/EryNdACHTAGU1wySbqQ0PLexu0JPAl8BatErwDaleEChK1FoCYbxkwZ8H3YA==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-chord/-/legacy-plugin-chart-chord-0.16.2.tgz",
+      "integrity": "sha512-QJ7LpqoWl1kbKDRh3LoLyuwBRt2yuLiMAZq3zCbI9At2wtcS+kSKhm6w99y51k3FEJtKsR+fuOe8TggZCTe+Tw==",
       "requires": {
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "d3": "^3.5.17",
         "prop-types": "^15.6.2",
         "react": "^16.13.1"
-      },
-      "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
-        "d3-array": {
-          "version": "2.9.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-          "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
       }
     },
     "@superset-ui/legacy-plugin-chart-country-map": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-country-map/-/legacy-plugin-chart-country-map-0.15.18.tgz",
-      "integrity": "sha512-YkACX3xGh9AdLDVu7//tgKLxYoolAefqPJCQo8Mk4HXy5xVAO7LJZoz5115lHcazObHPkgXZ1SGKvGcRt1DsqA==",
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-country-map/-/legacy-plugin-chart-country-map-0.16.1.tgz",
+      "integrity": "sha512-raEYpEhpiqU4QPDkLNxPdYBCqB0jeLsJnOhKue9T8edEUe9qXdmylT0tSrC5D/DxdRH7MHTxyxjBcSOWOIHIGQ==",
       "requires": {
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "d3": "^3.5.17",
         "d3-array": "^2.0.3",
         "prop-types": "^15.6.2"
       },
       "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
         "d3-array": {
           "version": "2.9.1",
           "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
           "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
         }
       }
     },
     "@superset-ui/legacy-plugin-chart-event-flow": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-event-flow/-/legacy-plugin-chart-event-flow-0.15.18.tgz",
-      "integrity": "sha512-YU4z/rPUS94jAufDDt2N9SnJQymWfrJJOMPUb4icS+8rSbytqM10O5/0o+zKpqeVvnXgLPcK4u/yP5rufgeSPQ==",
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-event-flow/-/legacy-plugin-chart-event-flow-0.16.1.tgz",
+      "integrity": "sha512-X9JhtXlMj0hLN6sSclBQTmk0ldLLkLaMnZVgyAQs+mJdnQaet7MdptYqF5TjZ+0x8aHKYPU8KB9WqYXT7fPOOg==",
       "requires": {
         "@data-ui/event-flow": "^0.0.84",
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "prop-types": "^15.6.2"
-      },
-      "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
-        "d3-array": {
-          "version": "2.9.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-          "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
       }
     },
     "@superset-ui/legacy-plugin-chart-force-directed": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-force-directed/-/legacy-plugin-chart-force-directed-0.15.18.tgz",
-      "integrity": "sha512-x3gP4LD9lS8tE1umFFW+c59wWMRJ0dq151f70s7rLmsqrVqWuWbXklq48IyZeaplcnUgcxidAf7P5qVZcrrZLw==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-force-directed/-/legacy-plugin-chart-force-directed-0.16.2.tgz",
+      "integrity": "sha512-Miy7Z9h96bPPMkXVwOLSikObaTT+3hiFp6aFDEWv7EPnrTTpXP6i1Ow4KeiEeiNOkVJfbHRPJAKy2EPEeCr/xg==",
       "requires": {
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "d3": "^3.5.17",
         "prop-types": "^15.7.2"
-      },
-      "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
-        "d3-array": {
-          "version": "2.9.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-          "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
       }
     },
     "@superset-ui/legacy-plugin-chart-heatmap": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-heatmap/-/legacy-plugin-chart-heatmap-0.15.18.tgz",
-      "integrity": "sha512-QZzLn1VMpPLpxOy75OsyNe/7KU0CEM5/q+1CYQDidTL8u8pyeG9tKkuk+t5rx49S9Jj6zyqG0ZzTJZeK58WAIw==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-heatmap/-/legacy-plugin-chart-heatmap-0.16.2.tgz",
+      "integrity": "sha512-F0movoXIDofav+OUXH5LZ1t74qxe6E6h+sPqVKnd1JSC+72SrUjkP4dSkWYmfaZYfmga4yYnzwS1QL77qcDBdw==",
       "requires": {
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "d3": "^3.5.17",
         "d3-svg-legend": "^1.x",
         "d3-tip": "^0.9.1",
         "prop-types": "^15.6.2"
-      },
-      "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
-        "d3-array": {
-          "version": "2.9.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-          "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
       }
     },
     "@superset-ui/legacy-plugin-chart-histogram": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-histogram/-/legacy-plugin-chart-histogram-0.15.18.tgz",
-      "integrity": "sha512-yfuFnXqCv1LbvNcBhm2/eUXcyfh1m7haeNoKVH9GgqcfuV26vozRXFuFtHYXlPkCepuz3pichhiM8yodsBneow==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-histogram/-/legacy-plugin-chart-histogram-0.16.2.tgz",
+      "integrity": "sha512-l1t5BuqIveIO47WOx5y86BKeRxT8s4x5gFrhQwpqhD60DscvwxwNYcCgtwyJKAbngSXzOM9+XaB6wo9J/qDCjQ==",
       "requires": {
         "@data-ui/histogram": "^0.0.84",
         "@data-ui/theme": "^0.0.84",
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "@vx/legend": "^0.0.198",
         "@vx/responsive": "^0.0.197",
         "@vx/scale": "^0.0.197",
         "prop-types": "^15.6.2"
       },
       "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          },
-          "dependencies": {
-            "d3-array": {
-              "version": "2.9.1",
-              "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-              "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-            },
-            "d3-interpolate": {
-              "version": "1.4.0",
-              "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-              "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-              "requires": {
-                "d3-color": "1"
-              }
-            },
-            "d3-scale": {
-              "version": "3.2.3",
-              "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-              "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-              "requires": {
-                "d3-array": "^2.3.0",
-                "d3-format": "1 - 2",
-                "d3-interpolate": "1.2.0 - 2",
-                "d3-time": "1 - 2",
-                "d3-time-format": "2 - 3"
-              }
-            },
-            "d3-time-format": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-              "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-              "requires": {
-                "d3-time": "1"
-              }
-            }
-          }
-        },
         "@vx/group": {
           "version": "0.0.198",
           "resolved": "https://registry.npmjs.org/@vx/group/-/group-0.0.198.tgz",
@@ -17393,82 +16763,17 @@
       }
     },
     "@superset-ui/legacy-plugin-chart-horizon": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-horizon/-/legacy-plugin-chart-horizon-0.15.18.tgz",
-      "integrity": "sha512-ZMEl4/n4Owota+/umSfK2EUqofF8ylJoDjjrrkrwskFKdkKU4En7eFrcJsV9MoO6AyaIeOeW2cfUsXDYllgtbw==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-horizon/-/legacy-plugin-chart-horizon-0.16.2.tgz",
+      "integrity": "sha512-mawaXBesOu4Le7Gp4+kxaJ5Q9DG2Rj6kXXTu+CuuQ8BgaIihIYFlW9ytoMbV1RYXz6L3bqIHXs2gIYgacF5k2g==",
       "requires": {
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "d3-array": "^2.0.3",
         "d3-scale": "^3.0.1",
         "prop-types": "^15.6.2"
       },
       "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          },
-          "dependencies": {
-            "d3-interpolate": {
-              "version": "1.4.0",
-              "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-              "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-              "requires": {
-                "d3-color": "1"
-              }
-            },
-            "d3-time-format": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-              "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-              "requires": {
-                "d3-time": "1"
-              }
-            }
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
         "d3-array": {
           "version": "2.9.1",
           "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
@@ -17489,12 +16794,12 @@
       }
     },
     "@superset-ui/legacy-plugin-chart-map-box": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-map-box/-/legacy-plugin-chart-map-box-0.15.18.tgz",
-      "integrity": "sha512-SrwkiBLl+CN6KDleZyhZPdkKXh5c7ZjJ5kB9rCi+lOya1sE4bjUzPFzIB65SeGVHTvGTRy1m8X9xj9k0Lxx7bA==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-map-box/-/legacy-plugin-chart-map-box-0.16.2.tgz",
+      "integrity": "sha512-2wxE1pUqfcsswdt/plf+TdLSz/DP430egE95NDbE4Pr6BW+BWB6rJjnVxcprS8xsKP7femn1wxa4B0+WJN5G6g==",
       "requires": {
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "immutable": "^3.8.2",
         "mapbox-gl": "^0.53.0",
         "prop-types": "^15.6.2",
@@ -17503,86 +16808,6 @@
         "viewport-mercator-project": "^6.1.1"
       },
       "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
-        "d3-array": {
-          "version": "2.9.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-          "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        },
         "immutable": {
           "version": "3.8.2",
           "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz",
@@ -17591,856 +16816,118 @@
       }
     },
     "@superset-ui/legacy-plugin-chart-paired-t-test": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-paired-t-test/-/legacy-plugin-chart-paired-t-test-0.15.18.tgz",
-      "integrity": "sha512-d0j4bvJZ+PZeqSDmlOxxV4ul2ZMawUesMCkJKxAfo7oQ+bVhHhsDVMDWn2XDZU9HlBgwo/u0F63PG8L4thgZIQ==",
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-paired-t-test/-/legacy-plugin-chart-paired-t-test-0.16.1.tgz",
+      "integrity": "sha512-UnsBhYYX8s0W6+iWra2Yyv8mybevuitl5jobyPcMziwIwvXRnjPPTgJOnrwvDIoEBk+Zjn89yXc12sALEOTexg==",
       "requires": {
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "distributions": "^1.0.0",
         "prop-types": "^15.6.2",
         "reactable-arc": "0.15.0"
-      },
-      "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
-        "d3-array": {
-          "version": "2.9.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-          "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
       }
     },
     "@superset-ui/legacy-plugin-chart-parallel-coordinates": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-parallel-coordinates/-/legacy-plugin-chart-parallel-coordinates-0.15.18.tgz",
-      "integrity": "sha512-1Cx9H1pHJrzPjRLHmSTjb31E3Gquc7KFd6lqndd0IgPPP4mxwDXGc4xUIrfhD/e5OI2WGQ+dBq9muQ3XFEwyEA==",
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-parallel-coordinates/-/legacy-plugin-chart-parallel-coordinates-0.16.1.tgz",
+      "integrity": "sha512-Iq7+EHYuci0nT9yJW4scNJwU1x/B9TIyH9+zqmPGuKwuePfn2VtPxMDTZJeC60+o3/ypAYoOXcEJnER9NxgDwA==",
       "requires": {
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "d3": "^3.5.17",
         "prop-types": "^15.7.2"
-      },
-      "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
-        "d3-array": {
-          "version": "2.9.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-          "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
       }
     },
     "@superset-ui/legacy-plugin-chart-partition": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-partition/-/legacy-plugin-chart-partition-0.15.18.tgz",
-      "integrity": "sha512-KV0RirKcGHZWT3w/PVUehYe1tWleeSN7xgAAAGq+veSPo7/MVp7QUX+WBsmv0tToIT5+e+2IIQ3W6gL+7dMn3Q==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-partition/-/legacy-plugin-chart-partition-0.16.2.tgz",
+      "integrity": "sha512-Z395l8GVO5YbXyhDMU/DXUGO8Wa2eS2k09RS402323ny3Q5eCKl/OQ6E9RiJji5a44r7ZmgdJwqSYy2eBh4VDg==",
       "requires": {
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "d3": "^3.5.17",
         "d3-hierarchy": "^1.1.8",
         "prop-types": "^15.6.2"
-      },
-      "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
-        "d3-array": {
-          "version": "2.9.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-          "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
       }
     },
     "@superset-ui/legacy-plugin-chart-pivot-table": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-pivot-table/-/legacy-plugin-chart-pivot-table-0.15.18.tgz",
-      "integrity": "sha512-0Z3EmrXGxwB+7/WmIVTNaAxyEbP8//J+dWtSNKnbfynZ8xyBZi/ww7iFuSqKID2TVORhke9uVNMi/YKT7GRhkw==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-pivot-table/-/legacy-plugin-chart-pivot-table-0.16.2.tgz",
+      "integrity": "sha512-P+p/CRG+IRFdzGI37DdW9UJ08BM71gqHlBhsz4b/5OEG2/KvRgbhxTGQM7ZsYH5v7YO+Btnc3JeiriRN/ZJBLw==",
       "requires": {
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "d3": "^3.5.17",
         "datatables.net-bs": "^1.10.15",
         "prop-types": "^15.6.2"
-      },
-      "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
-        "d3-array": {
-          "version": "2.9.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-          "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
       }
     },
     "@superset-ui/legacy-plugin-chart-rose": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-rose/-/legacy-plugin-chart-rose-0.15.18.tgz",
-      "integrity": "sha512-kcXEk/dDZuXgYZQmisiOfM5VrNGvDem4QT0IQGCZzLF1g7vFrrS9SNzhD74Tl3Rxr0KRfya+s1jAu7TdVhK1HQ==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-rose/-/legacy-plugin-chart-rose-0.16.2.tgz",
+      "integrity": "sha512-nX7VHJlI5KJKomcQOTt5G2CFgTfzZuBXiWqRDfGFceRitjjpNpQtUBE5L2BX6fCiMXExs6SOXVGt9gUnmSZ95g==",
       "requires": {
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "d3": "^3.5.17",
         "nvd3": "1.8.6",
         "prop-types": "^15.6.2"
-      },
-      "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
-        "d3-array": {
-          "version": "2.9.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-          "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
       }
     },
     "@superset-ui/legacy-plugin-chart-sankey": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey/-/legacy-plugin-chart-sankey-0.15.18.tgz",
-      "integrity": "sha512-b0bOCc2qpftA8StbarZKViQHN2iGk1ANVoprtVf32yDhUpsQCdjs14Xbt8SAbAc3QjU3/JSAqp3Wtx7f5dpAMA==",
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey/-/legacy-plugin-chart-sankey-0.16.1.tgz",
+      "integrity": "sha512-Z+5/pBVO30huWBlUFTjvlNgVzwjDScJ2bk9D59sFf204jMGjwtg0Mt+Rht/AcDo3lI3umPFzseKCBCTa8ZrMGQ==",
       "requires": {
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "d3": "^3.5.17",
         "d3-sankey": "^0.4.2",
         "prop-types": "^15.6.2"
-      },
-      "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
-        "d3-array": {
-          "version": "2.9.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-          "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
       }
     },
     "@superset-ui/legacy-plugin-chart-sankey-loop": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey-loop/-/legacy-plugin-chart-sankey-loop-0.15.18.tgz",
-      "integrity": "sha512-BbEMG8wvknTcn3OGeepMGcVFYd7yS1hGD5CBOXInOWVLvgEDeWTeJ/KnCndyc/VDzA4XAoJ5BjtiTRTjJ3+eCw==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey-loop/-/legacy-plugin-chart-sankey-loop-0.16.2.tgz",
+      "integrity": "sha512-W++rtUqWgvepFw00+b3lqo17Ndr/j8XoZ/IMuWFlcTrv/XGUOh6E5khQ+EJHof7dG5jnnldMRA2p663n6TmGLA==",
       "requires": {
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "d3-sankey-diagram": "^0.7.3",
         "d3-selection": "^1.4.0",
         "prop-types": "^15.6.2"
-      },
-      "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
-        "d3-array": {
-          "version": "2.9.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-          "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
       }
     },
     "@superset-ui/legacy-plugin-chart-sunburst": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sunburst/-/legacy-plugin-chart-sunburst-0.15.18.tgz",
-      "integrity": "sha512-R+BS+9fZOkA+WSMfCAAN8rUsJPEJbbN0n4Tn1PFfMro4+hA8b7AYOToaf0B+8ThdAysh+70Gx2oOsDBzF7P+SA==",
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sunburst/-/legacy-plugin-chart-sunburst-0.16.1.tgz",
+      "integrity": "sha512-fdDrt9zBPfdsN9X1eTrhMrYB/w6n14azJWYF/RhigFKazzO9pPn8GdphN1kU9KHf78zcdcUFuRu1qnYxf5c3Jg==",
       "requires": {
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "d3": "^3.5.17",
         "prop-types": "^15.6.2"
-      },
-      "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
-        "d3-array": {
-          "version": "2.9.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-          "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
       }
     },
     "@superset-ui/legacy-plugin-chart-treemap": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-treemap/-/legacy-plugin-chart-treemap-0.15.18.tgz",
-      "integrity": "sha512-XqoSBmEm6n8OLitgToX2l9XyTCMvPl6oNtv6wcoZHWyP50/QoeU3QLCHyJeuytD/a/WNk5iJI5fn+KjFT/D0FA==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-treemap/-/legacy-plugin-chart-treemap-0.16.2.tgz",
+      "integrity": "sha512-ShSbmeeBCZ6ANWjDXr4apAr5IYu+VEnNQhkTa3sfHg9G6X9FxZ8eUvfLVxRiJX0Wo/CfY7Ij49UnbK6/FhdHZA==",
       "requires": {
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "d3-hierarchy": "^1.1.8",
         "d3-selection": "^1.4.0",
         "prop-types": "^15.6.2"
-      },
-      "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
-        "d3-array": {
-          "version": "2.9.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-          "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
       }
     },
     "@superset-ui/legacy-plugin-chart-world-map": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-world-map/-/legacy-plugin-chart-world-map-0.15.18.tgz",
-      "integrity": "sha512-cwqQ32jsICGGs9YP4WbzcM1WsYPmZu7/yuwRngu8wYMEjAJkxXY7yKzT+qDkaG8vt+rzUBlev/ADZ/WgrJOd1g==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-world-map/-/legacy-plugin-chart-world-map-0.16.2.tgz",
+      "integrity": "sha512-KWqJP56Bn0isTdvYLYjpm5YohC14hrTgQvYpgLoQKSlh/m70T2ijwJSb5hx4exToN4hPkztaVuJn2/QucZlwYg==",
       "requires": {
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "d3": "^3.5.17",
         "d3-array": "^2.4.0",
         "d3-color": "^1.4.1",
@@ -18448,53 +16935,6 @@
         "prop-types": "^15.6.2"
       },
       "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
         "d3-array": {
           "version": "2.9.1",
           "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
@@ -18504,131 +16944,21 @@
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz",
           "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
         }
       }
     },
     "@superset-ui/legacy-preset-chart-big-number": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-big-number/-/legacy-preset-chart-big-number-0.15.18.tgz",
-      "integrity": "sha512-Ojvrt12ps9pdPihGPlwaC+CToGnRJHNdzRwUDnid1nPCQi1mzdOOEpsdcRYEq3gMwRSUZ9IOmvKJ1yTywn6Xow==",
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-big-number/-/legacy-preset-chart-big-number-0.16.1.tgz",
+      "integrity": "sha512-ud4n4dlfZSNOxcoITllzELo8MtXJgzCOLTHan04fomJWELRxoraEh4tb0RpE8JdtaYsoKmxZdjs+JKcQWFQQTA==",
       "requires": {
         "@data-ui/xy-chart": "^0.0.84",
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "@types/d3-color": "^1.2.2",
         "@types/shortid": "^0.0.29",
         "d3-color": "^1.2.3",
         "shortid": "^2.2.14"
-      },
-      "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
-        "d3-array": {
-          "version": "2.9.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-          "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
       }
     },
     "@superset-ui/legacy-preset-chart-deckgl": {
@@ -18657,13 +16987,13 @@
       }
     },
     "@superset-ui/legacy-preset-chart-nvd3": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-nvd3/-/legacy-preset-chart-nvd3-0.15.18.tgz",
-      "integrity": "sha512-4j/69ItIwuvP/UOrWBC4k8hiJp+GxB+qJ7BLqZtO5wAoMbBcAJ0yX/Y6A1qZsAjWW9zjEB87GqKVp2Bz3xachw==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-nvd3/-/legacy-preset-chart-nvd3-0.16.2.tgz",
+      "integrity": "sha512-bC/YPTH+r7rrX9gOboHyR8uY6iw7Jbtp9msjuEtYuDEUvjOy+5etKhQeji1LdPwC7KiFhpR8J1MXit1RMrrygw==",
       "requires": {
         "@data-ui/xy-chart": "^0.0.84",
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "d3": "^3.5.17",
         "d3-tip": "^0.9.1",
         "dompurify": "^2.0.6",
@@ -18674,193 +17004,29 @@
         "nvd3-fork": "2.0.3",
         "prop-types": "^15.6.2",
         "urijs": "^1.18.10"
-      },
-      "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
-        "d3-array": {
-          "version": "2.9.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-          "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
       }
     },
     "@superset-ui/plugin-chart-echarts": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-echarts/-/plugin-chart-echarts-0.15.18.tgz",
-      "integrity": "sha512-4PiVQVtx4w8zULGHDeA7cxLEQeo0WjwIOhlYJRRoWsFp+zz3I+eL8shwd4s7LkfQxeUYhQA2krPrb1aMail2Sw==",
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-echarts/-/plugin-chart-echarts-0.16.1.tgz",
+      "integrity": "sha512-w2qu0tDHpsQVPgxLQ/e1blyAsgaazYXYlUGig6+6cJUfnBDvC+f7Ps7f4q+6qG6jWNpb949N9jRf5mtpjr5dCA==",
       "requires": {
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "@types/echarts": "^4.6.3",
         "@types/mathjs": "^6.0.7",
         "echarts": "^5.0.0",
         "mathjs": "^8.0.1"
-      },
-      "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
-        "d3-array": {
-          "version": "2.9.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-          "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
       }
     },
     "@superset-ui/plugin-chart-table": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-table/-/plugin-chart-table-0.15.18.tgz",
-      "integrity": "sha512-8o/oVqqsG0u2j+4Ad96WYZasocijmvmPocujf7MIlbnd6PdD5MEkesmN5cspcDDwagIwymvuztD5COZb2nXElw==",
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-table/-/plugin-chart-table-0.16.1.tgz",
+      "integrity": "sha512-GsGvBFlQPiF6zmsb+pZu/WXAWo2HDb8UdA6IjbK6pxoANgXrNL29bdAhM07flbGQKslOFYFkIDWUsxvy4ytEWQ==",
       "requires": {
         "@emotion/core": "^10.0.28",
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "@types/d3-array": "^2.0.0",
         "@types/match-sorter": "^4.0.0",
         "@types/react-table": "^7.0.19",
@@ -18873,95 +17039,20 @@
         "xss": "^1.0.6"
       },
       "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
         "d3-array": {
           "version": "2.9.1",
           "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
           "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
         }
       }
     },
     "@superset-ui/plugin-chart-word-cloud": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.15.18.tgz",
-      "integrity": "sha512-JIjVV1Wa1+aqM7GNVOKgKY78nEBtW+FCdrQqjBzIrO0BAKUix0gtiFX4mNoIveCpN8fR7sriTezGgHe8Ok0xyw==",
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.16.1.tgz",
+      "integrity": "sha512-p8aNFvs42OJzsjo+FMj1Yto+dxrEvCTWdncHyWFrV1NwuSn716l81uqdU6LgN7BfG+gkCOGM6JI9plzYAxU9eg==",
       "requires": {
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "@types/d3-cloud": "^1.2.1",
         "@types/d3-scale": "^2.0.2",
         "d3-cloud": "^1.2.5",
@@ -18970,71 +17061,6 @@
         "encodable": "^0.7.6"
       },
       "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          },
-          "dependencies": {
-            "d3-interpolate": {
-              "version": "1.4.0",
-              "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-              "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-              "requires": {
-                "d3-color": "1"
-              }
-            },
-            "d3-time-format": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-              "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-              "requires": {
-                "d3-time": "1"
-              }
-            }
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
         "d3-array": {
           "version": "2.9.1",
           "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
@@ -19055,106 +17081,24 @@
       }
     },
     "@superset-ui/plugin-filter-antd": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-filter-antd/-/plugin-filter-antd-0.15.18.tgz",
-      "integrity": "sha512-VNQw6tUNej7GjXY+/qSz7Dj0rnfP1zpwNn24Bcn40okeMPq3jWnSEez5ThO1Mag+VFTpjUCnu0RULar5G6V2EA==",
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-filter-antd/-/plugin-filter-antd-0.16.1.tgz",
+      "integrity": "sha512-SvDZiHFKZ5gfJFQsZIjFnikpSg+o/wGrWBAXwfpakJ7IgIYQsSsWrcOPVQCQnkRQqfXka6Osnn+fcbCDrIiwIw==",
       "requires": {
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "antd": "^4.9.1"
-      },
-      "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          }
-        },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
-        "d3-array": {
-          "version": "2.9.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-          "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-        },
-        "d3-interpolate": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-          "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-scale": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-          "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "1 - 2",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-          "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
       }
     },
     "@superset-ui/preset-chart-xy": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@superset-ui/preset-chart-xy/-/preset-chart-xy-0.15.18.tgz",
-      "integrity": "sha512-kFeCzFkqhrGAmvcvR4dQ/wjQnx/NScq9NCBv5SfR2GGvq/BFHmGmuItlMxRlwc854QIymeQfU1W5H+zDvR0qdA==",
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/@superset-ui/preset-chart-xy/-/preset-chart-xy-0.16.1.tgz",
+      "integrity": "sha512-6QizqOVkYYTNdw65ztKFrHsZv/mBu4ikBYHwe2/Xg4lzjVNGdeIHo0tyVbBK/xB3ZkRKCKBTMBK3O2Z5jxsyeA==",
       "requires": {
         "@data-ui/theme": "^0.0.84",
         "@data-ui/xy-chart": "^0.0.84",
-        "@superset-ui/chart-controls": "0.15.18",
-        "@superset-ui/core": "0.15.18",
+        "@superset-ui/chart-controls": "0.16.1",
+        "@superset-ui/core": "0.16.1",
         "@vx/axis": "^0.0.198",
         "@vx/legend": "^0.0.198",
         "@vx/scale": "^0.0.197",
@@ -19164,76 +17108,6 @@
         "reselect": "^4.0.0"
       },
       "dependencies": {
-        "@superset-ui/core": {
-          "version": "0.15.18",
-          "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.18.tgz",
-          "integrity": "sha512-9iqhjazgg6ssNF9Ox1RJnXeYkzYYX3SX+7Jsvt8Z/3l19JfSa/wkIZDD1FGISF8DoaUTqXFH7Kp+TtWQblCOLQ==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@emotion/core": "^10.0.28",
-            "@emotion/styled": "^10.0.27",
-            "@types/d3-format": "^1.3.0",
-            "@types/d3-interpolate": "^1.3.1",
-            "@types/d3-scale": "^2.1.1",
-            "@types/d3-time": "^1.0.9",
-            "@types/d3-time-format": "^2.1.0",
-            "@types/lodash": "^4.14.149",
-            "@types/rison": "0.0.6",
-            "@types/seedrandom": "^2.4.28",
-            "@vx/responsive": "^0.0.197",
-            "csstype": "^2.6.4",
-            "d3-format": "^1.3.2",
-            "d3-interpolate": "^1.4.0",
-            "d3-scale": "^3.0.0",
-            "d3-time": "^1.0.10",
-            "d3-time-format": "^2.2.0",
-            "emotion-theming": "^10.0.27",
-            "fetch-retry": "^4.0.1",
-            "jed": "^1.1.1",
-            "lodash": "^4.17.11",
-            "pretty-ms": "^7.0.0",
-            "react-error-boundary": "^1.2.5",
-            "reselect": "^4.0.0",
-            "rison": "^0.1.1",
-            "seedrandom": "^3.0.5",
-            "whatwg-fetch": "^3.0.0"
-          },
-          "dependencies": {
-            "d3-array": {
-              "version": "2.9.1",
-              "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.9.1.tgz",
-              "integrity": "sha512-Ob7RdOtkqsjx1NWyQHMFLtCSk6/aKTxDdC4ZIolX+O+mDD2RzrsYgAyc0WGAlfYFVELLSilS7w8BtE3PKM8bHg=="
-            },
-            "d3-interpolate": {
-              "version": "1.4.0",
-              "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-              "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
-              "requires": {
-                "d3-color": "1"
-              }
-            },
-            "d3-scale": {
-              "version": "3.2.3",
-              "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz",
-              "integrity": "sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==",
-              "requires": {
-                "d3-array": "^2.3.0",
-                "d3-format": "1 - 2",
-                "d3-interpolate": "1.2.0 - 2",
-                "d3-time": "1 - 2",
-                "d3-time-format": "2 - 3"
-              }
-            },
-            "d3-time-format": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-              "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-              "requires": {
-                "d3-time": "1"
-              }
-            }
-          }
-        },
         "@vx/axis": {
           "version": "0.0.198",
           "resolved": "https://registry.npmjs.org/@vx/axis/-/axis-0.0.198.tgz",
@@ -19287,18 +17161,6 @@
           "resolved": "https://registry.npmjs.org/@vx/point/-/point-0.0.198.tgz",
           "integrity": "sha512-oFlw8uBLf4JDX7OJc+7eQXcnlLszdQgEs531u0t6HNpARQY/jTeeMLVUlp8sNF0XBOC+iVHU8Qe8TJdz/ONBAA=="
         },
-        "@vx/responsive": {
-          "version": "0.0.197",
-          "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz",
-          "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==",
-          "requires": {
-            "@types/lodash": "^4.14.146",
-            "@types/react": "*",
-            "lodash": "^4.17.10",
-            "prop-types": "^15.6.1",
-            "resize-observer-polyfill": "1.5.1"
-          }
-        },
         "@vx/scale": {
           "version": "0.0.197",
           "resolved": "https://registry.npmjs.org/@vx/scale/-/scale-0.0.197.tgz",
@@ -27542,19 +25404,19 @@
       }
     },
     "datatables.net": {
-      "version": "1.10.22",
-      "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.10.22.tgz",
-      "integrity": "sha512-ujn8GvkQIBYzYH54XY7OrI0Zb35TKRd9ABYfbnXgBfwTGIFT6UsmXrfHU5Yk+MSDoF0sDu2TB+31V6c+zUZ0Pw==",
+      "version": "1.10.23",
+      "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.10.23.tgz",
+      "integrity": "sha512-we3tlNkzpxvgkKKlTxTMXPCt35untVXNg8zUYWpQyC1U5vJc+lT0+Zdc1ztK8d3lh5CfdnuFde2p8n3XwaGl3Q==",
       "requires": {
         "jquery": ">=1.7"
       }
     },
     "datatables.net-bs": {
-      "version": "1.10.22",
-      "resolved": "https://registry.npmjs.org/datatables.net-bs/-/datatables.net-bs-1.10.22.tgz",
-      "integrity": "sha512-sFEM/7vIMNsFjgYGpnTdIggZvVXzdPbVRRN98zp6jOf4VH7ei+MC3N39w6jnHiTDNu/2c3wRCMz077UpleXJOQ==",
+      "version": "1.10.23",
+      "resolved": "https://registry.npmjs.org/datatables.net-bs/-/datatables.net-bs-1.10.23.tgz",
+      "integrity": "sha512-O/kJxT93i9hIq8trdbHuIcHhrTodkVPfPqvxOqKK8lJ03XUUrT6V8ZoGyxROFjQGcgbye5CoRLVf7MY+5biOIQ==",
       "requires": {
-        "datatables.net": "1.10.22",
+        "datatables.net": "1.10.23",
         "jquery": ">=1.7"
       }
     },
@@ -28072,9 +25934,9 @@
       }
     },
     "dompurify": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.4.tgz",
-      "integrity": "sha512-jE21SelIgWrGKoXGfGPA524Zt1IJFBnktwfFMHDlEYRx5FZOdc+4eEH9mkA6PuhExrq3HVpJnY8hMYUzAMl0OA=="
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.6.tgz",
+      "integrity": "sha512-7b7ZArhhH0SP6W2R9cqK6RjaU82FZ2UPM7RO8qN1b1wyvC/NY1FNWcX1Pu00fFOAnzEORtwXe4bPaClg6pUybQ=="
     },
     "domutils": {
       "version": "1.5.1",
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
index 5f3ca7d82..7cdd70701 100644
--- a/superset-frontend/package.json
+++ b/superset-frontend/package.json
@@ -65,35 +65,35 @@
     "@babel/runtime-corejs3": "^7.8.4",
     "@data-ui/sparkline": "^0.0.84",
     "@emotion/core": "^10.0.35",
-    "@superset-ui/chart-controls": "^0.15.18",
-    "@superset-ui/core": "^0.15.19",
-    "@superset-ui/legacy-plugin-chart-calendar": "^0.15.18",
-    "@superset-ui/legacy-plugin-chart-chord": "^0.15.18",
-    "@superset-ui/legacy-plugin-chart-country-map": "^0.15.18",
-    "@superset-ui/legacy-plugin-chart-event-flow": "^0.15.18",
-    "@superset-ui/legacy-plugin-chart-force-directed": "^0.15.18",
-    "@superset-ui/legacy-plugin-chart-heatmap": "^0.15.18",
-    "@superset-ui/legacy-plugin-chart-histogram": "^0.15.18",
-    "@superset-ui/legacy-plugin-chart-horizon": "^0.15.18",
-    "@superset-ui/legacy-plugin-chart-map-box": "^0.15.18",
-    "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.15.18",
-    "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.15.18",
-    "@superset-ui/legacy-plugin-chart-partition": "^0.15.18",
-    "@superset-ui/legacy-plugin-chart-pivot-table": "^0.15.18",
-    "@superset-ui/legacy-plugin-chart-rose": "^0.15.18",
-    "@superset-ui/legacy-plugin-chart-sankey": "^0.15.18",
-    "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.15.18",
-    "@superset-ui/legacy-plugin-chart-sunburst": "^0.15.18",
-    "@superset-ui/legacy-plugin-chart-treemap": "^0.15.18",
-    "@superset-ui/legacy-plugin-chart-world-map": "^0.15.18",
-    "@superset-ui/legacy-preset-chart-big-number": "^0.15.18",
+    "@superset-ui/chart-controls": "^0.16.1",
+    "@superset-ui/core": "^0.16.1",
+    "@superset-ui/legacy-plugin-chart-calendar": "^0.16.2",
+    "@superset-ui/legacy-plugin-chart-chord": "^0.16.2",
+    "@superset-ui/legacy-plugin-chart-country-map": "^0.16.1",
+    "@superset-ui/legacy-plugin-chart-event-flow": "^0.16.1",
+    "@superset-ui/legacy-plugin-chart-force-directed": "^0.16.2",
+    "@superset-ui/legacy-plugin-chart-heatmap": "^0.16.2",
+    "@superset-ui/legacy-plugin-chart-histogram": "^0.16.2",
+    "@superset-ui/legacy-plugin-chart-horizon": "^0.16.2",
+    "@superset-ui/legacy-plugin-chart-map-box": "^0.16.2",
+    "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.16.1",
+    "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.16.1",
+    "@superset-ui/legacy-plugin-chart-partition": "^0.16.2",
+    "@superset-ui/legacy-plugin-chart-pivot-table": "^0.16.2",
+    "@superset-ui/legacy-plugin-chart-rose": "^0.16.2",
+    "@superset-ui/legacy-plugin-chart-sankey": "^0.16.1",
+    "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.16.2",
+    "@superset-ui/legacy-plugin-chart-sunburst": "^0.16.1",
+    "@superset-ui/legacy-plugin-chart-treemap": "^0.16.2",
+    "@superset-ui/legacy-plugin-chart-world-map": "^0.16.2",
+    "@superset-ui/legacy-preset-chart-big-number": "^0.16.1",
     "@superset-ui/legacy-preset-chart-deckgl": "^0.3.2",
-    "@superset-ui/legacy-preset-chart-nvd3": "^0.15.18",
-    "@superset-ui/plugin-chart-echarts": "^0.15.18",
-    "@superset-ui/plugin-chart-table": "^0.15.18",
-    "@superset-ui/plugin-chart-word-cloud": "^0.15.18",
-    "@superset-ui/plugin-filter-antd": "^0.15.18",
-    "@superset-ui/preset-chart-xy": "^0.15.18",
+    "@superset-ui/legacy-preset-chart-nvd3": "^0.16.1",
+    "@superset-ui/plugin-chart-echarts": "^0.16.1",
+    "@superset-ui/plugin-chart-table": "^0.16.1",
+    "@superset-ui/plugin-chart-word-cloud": "^0.16.1",
+    "@superset-ui/plugin-filter-antd": "^0.16.1",
+    "@superset-ui/preset-chart-xy": "^0.16.1",
     "@vx/responsive": "^0.0.195",
     "abortcontroller-polyfill": "^1.1.9",
     "antd": "^4.9.4",
diff --git a/superset-frontend/spec/javascripts/explore/components/ControlPanelsContainer_spec.jsx b/superset-frontend/spec/javascripts/explore/components/ControlPanelsContainer_spec.jsx
index c39ea94a0..7063e64fd 100644
--- a/superset-frontend/spec/javascripts/explore/components/ControlPanelsContainer_spec.jsx
+++ b/superset-frontend/spec/javascripts/explore/components/ControlPanelsContainer_spec.jsx
@@ -91,6 +91,6 @@ describe('ControlPanelsContainer', () => {
 
   it('renders ControlPanelSections', () => {
     wrapper = shallow(<ControlPanelsContainer {...getDefaultProps()} />);
-    expect(wrapper.find(ControlPanelSection)).toHaveLength(6);
+    expect(wrapper.find(ControlPanelSection)).toHaveLength(5);
   });
 });
diff --git a/superset-frontend/spec/javascripts/explore/controlUtils_spec.jsx b/superset-frontend/spec/javascripts/explore/controlUtils_spec.jsx
index e52f70dd0..a85d40394 100644
--- a/superset-frontend/spec/javascripts/explore/controlUtils_spec.jsx
+++ b/superset-frontend/spec/javascripts/explore/controlUtils_spec.jsx
@@ -21,9 +21,7 @@ import { getChartControlPanelRegistry, t } from '@superset-ui/core';
 import {
   getControlConfig,
   getControlState,
-  getFormDataFromControls,
   applyMapStateToPropsToControl,
-  getAllControlsState,
   findControlItem,
 } from 'src/explore/controlUtils';
 import {
@@ -198,18 +196,6 @@ describe('controlUtils', () => {
     });
   });
 
-  describe('queryFields', () => {
-    it('in formData', () => {
-      const controlsState = getAllControlsState('table', 'table', {}, {});
-      const formData = getFormDataFromControls(controlsState);
-      expect(formData.queryFields).toEqual({
-        all_columns: 'columns',
-        metric: 'metrics',
-        metrics: 'metrics',
-      });
-    });
-  });
-
   describe('findControlItem', () => {
     it('find control as a string', () => {
       const controlItem = findControlItem(
diff --git a/superset-frontend/spec/javascripts/explore/fixtures.jsx b/superset-frontend/spec/javascripts/explore/fixtures.jsx
index 420b73f8b..798389290 100644
--- a/superset-frontend/spec/javascripts/explore/fixtures.jsx
+++ b/superset-frontend/spec/javascripts/explore/fixtures.jsx
@@ -83,7 +83,6 @@ export const controlPanelSectionsChartOptionsTable = [
           name: 'all_columns',
           config: {
             type: 'SelectControl',
-            queryField: 'columns',
             multi: true,
             label: t('Columns'),
             default: [],
diff --git a/superset-frontend/src/explore/controlUtils.js b/superset-frontend/src/explore/controlUtils.js
index 3943128e3..ae6dcc771 100644
--- a/superset-frontend/src/explore/controlUtils.js
+++ b/superset-frontend/src/explore/controlUtils.js
@@ -22,13 +22,10 @@ import { expandControlConfig } from '@superset-ui/chart-controls';
 import * as SECTIONS from './controlPanels/sections';
 
 export function getFormDataFromControls(controlsState) {
-  const formData = { queryFields: {} };
+  const formData = {};
   Object.keys(controlsState).forEach(controlName => {
     const control = controlsState[controlName];
     formData[controlName] = control.value;
-    if (control.hasOwnProperty('queryField')) {
-      formData.queryFields[controlName] = control.queryField;
-    }
   });
   return formData;
 }
@@ -193,12 +190,15 @@ const getMemoizedSectionsToRender = memoizeOne(
       }
     });
 
-    const { datasourceAndVizType, sqlaTimeSeries, druidTimeSeries } = sections;
-    const timeSection =
-      datasourceType === 'table' ? sqlaTimeSeries : druidTimeSeries;
+    const { datasourceAndVizType } = sections;
+    // list of datasource-specific controls that should be removed
+    const invalidControls =
+      datasourceType === 'table'
+        ? ['granularity', 'druid_time_origin']
+        : ['granularity_sqla', 'time_grain_sqla'];
 
     return []
-      .concat(datasourceAndVizType, timeSection, controlPanelSections)
+      .concat(datasourceAndVizType, controlPanelSections)
       .filter(section => !!section)
       .map(section => {
         const { controlSetRows } = section;
@@ -206,7 +206,9 @@ const getMemoizedSectionsToRender = memoizeOne(
           ...section,
           controlSetRows:
             controlSetRows?.map(row =>
-              row.map(item => expandControlConfig(item, controlOverrides)),
+              row
+                .filter(control => !invalidControls.includes(control))
+                .map(item => expandControlConfig(item, controlOverrides)),
             ) || [],
         };
       });
diff --git a/superset-frontend/src/explore/controls.jsx b/superset-frontend/src/explore/controls.jsx
index 2b7b9a57a..c94f9d050 100644
--- a/superset-frontend/src/explore/controls.jsx
+++ b/superset-frontend/src/explore/controls.jsx
@@ -118,7 +118,6 @@ const timeColumnOption = {
 
 const groupByControl = {
   type: 'SelectControl',
-  queryField: 'groupby',
   multi: true,
   freeForm: true,
   label: t('Group by'),
@@ -150,7 +149,6 @@ const groupByControl = {
 
 const metrics = {
   type: 'MetricsControl',
-  queryField: 'metrics',
   multi: true,
   label: t('Metrics'),
   validators: [validateNonEmpty],
diff --git a/superset-frontend/src/explore/store.js b/superset-frontend/src/explore/store.js
index 5408099c7..9b33aaa49 100644
--- a/superset-frontend/src/explore/store.js
+++ b/superset-frontend/src/explore/store.js
@@ -79,8 +79,6 @@ export function applyDefaultFormData(inputFormData) {
       }
     });
 
-  // always use dynamically generated queryFields
-  formData.queryFields = controlFormData.queryFields;
   return formData;
 }
 
diff --git a/superset-frontend/webpack.config.js b/superset-frontend/webpack.config.js
index cd843fbf1..209c627c6 100644
--- a/superset-frontend/webpack.config.js
+++ b/superset-frontend/webpack.config.js
@@ -109,6 +109,7 @@ const plugins = [
   new ForkTsCheckerWebpackPlugin({
     eslint: true,
     checkSyntacticErrors: true,
+    memoryLimit: 4096,
   }),
 
   new CopyPlugin({
diff --git a/superset/common/query_object.py b/superset/common/query_object.py
index edcc325fe..7aa7ef77e 100644
--- a/superset/common/query_object.py
+++ b/superset/common/query_object.py
@@ -27,7 +27,13 @@ from pandas import DataFrame
 from superset import app, is_feature_enabled
 from superset.exceptions import QueryObjectValidationError
 from superset.typing import Metric
-from superset.utils import core as utils, pandas_postprocessing
+from superset.utils import pandas_postprocessing
+from superset.utils.core import (
+    DTTM_ALIAS,
+    get_since_until,
+    json_int_dttm_ser,
+    parse_human_timedelta,
+)
 from superset.views.utils import get_time_range_endpoints
 
 config = app.config
@@ -90,7 +96,7 @@ class QueryObject:
         filters: Optional[List[Dict[str, Any]]] = None,
         time_range: Optional[str] = None,
         time_shift: Optional[str] = None,
-        is_timeseries: bool = False,
+        is_timeseries: Optional[bool] = None,
         timeseries_limit: int = 0,
         row_limit: Optional[int] = None,
         row_offset: Optional[int] = None,
@@ -114,7 +120,7 @@ class QueryObject:
         ]
         self.applied_time_extras = applied_time_extras or {}
         self.granularity = granularity
-        self.from_dttm, self.to_dttm = utils.get_since_until(
+        self.from_dttm, self.to_dttm = get_since_until(
             relative_start=extras.get(
                 "relative_start", config["DEFAULT_RELATIVE_START_TIME"]
             ),
@@ -124,20 +130,28 @@ class QueryObject:
             time_range=time_range,
             time_shift=time_shift,
         )
-        self.is_timeseries = is_timeseries
+        # is_timeseries is True if time column is in groupby
+        self.is_timeseries = (
+            is_timeseries
+            if is_timeseries is not None
+            else (DTTM_ALIAS in groupby if groupby else False)
+        )
         self.time_range = time_range
-        self.time_shift = utils.parse_human_timedelta(time_shift)
+        self.time_shift = parse_human_timedelta(time_shift)
         self.post_processing = [
             post_proc for post_proc in post_processing or [] if post_proc
         ]
         if not is_sip_38:
             self.groupby = groupby or []
 
-        # Temporary solution for backward compatibility issue due the new format of
-        # non-ad-hoc metric which needs to adhere to superset-ui per
-        # https://git.io/Jvm7P.
+        # Support metric reference/definition in the format of
+        #   1. 'metric_name'   - name of predefined metric
+        #   2. { label: 'label_name' }  - legacy format for a predefined metric
+        #   3. { expressionType: 'SIMPLE' | 'SQL', ... } - adhoc metric
         self.metrics = [
-            metric if "expressionType" in metric else metric["label"]  # type: ignore
+            metric
+            if isinstance(metric, str) or "expressionType" in metric
+            else metric["label"]  # type: ignore
             for metric in metrics
         ]
 
@@ -267,7 +281,7 @@ class QueryObject:
     @staticmethod
     def json_dumps(obj: Any, sort_keys: bool = False) -> str:
         return json.dumps(
-            obj, default=utils.json_int_dttm_ser, ignore_nan=True, sort_keys=sort_keys
+            obj, default=json_int_dttm_ser, ignore_nan=True, sort_keys=sort_keys
         )
 
     def exec_post_processing(self, df: DataFrame) -> DataFrame:
diff --git a/tests/base_tests.py b/tests/base_tests.py
index 6f3819996..e494c8917 100644
--- a/tests/base_tests.py
+++ b/tests/base_tests.py
@@ -95,6 +95,10 @@ def post_assert_metric(
     return rv
 
 
+def get_table_by_name(name: str) -> SqlaTable:
+    return db.session.query(SqlaTable).filter_by(table_name=name).one()
+
+
 @pytest.fixture
 def logged_in_admin():
     """Fixture with app context and logged in admin user."""
@@ -228,7 +232,7 @@ class SupersetTestCase(TestCase):
 
     @staticmethod
     def get_table_by_name(name: str) -> SqlaTable:
-        return db.session.query(SqlaTable).filter_by(table_name=name).one()
+        return get_table_by_name(name)
 
     @staticmethod
     def get_database_by_id(db_id: int) -> Database:
diff --git a/tests/charts/api_tests.py b/tests/charts/api_tests.py
index 9028806a9..b8a46cf0b 100644
--- a/tests/charts/api_tests.py
+++ b/tests/charts/api_tests.py
@@ -1033,8 +1033,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         Chart data API: Test chart data query
         """
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        request_payload = get_query_context(table.name, table.id, table.type)
+        request_payload = get_query_context("birth_names")
         rv = self.post_assert_metric(CHART_DATA_URI, request_payload, "data")
         self.assertEqual(rv.status_code, 200)
         data = json.loads(rv.data.decode("utf-8"))
@@ -1045,8 +1044,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         Chart data API: Test chart data query with applied time extras
         """
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        request_payload = get_query_context(table.name, table.id, table.type)
+        request_payload = get_query_context("birth_names")
         request_payload["queries"][0]["applied_time_extras"] = {
             "__time_range": "100 years ago : now",
             "__time_origin": "now",
@@ -1069,8 +1067,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         Chart data API: Test chart data query with limit and offset
         """
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        request_payload = get_query_context(table.name, table.id, table.type)
+        request_payload = get_query_context("birth_names")
         request_payload["queries"][0]["row_limit"] = 5
         request_payload["queries"][0]["row_offset"] = 0
         request_payload["queries"][0]["orderby"] = [["name", True]]
@@ -1101,8 +1098,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         Chart data API: Ensure row count doesn't exceed default limit
         """
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        request_payload = get_query_context(table.name, table.id, table.type)
+        request_payload = get_query_context("birth_names")
         del request_payload["queries"][0]["row_limit"]
         rv = self.post_assert_metric(CHART_DATA_URI, request_payload, "data")
         response_payload = json.loads(rv.data.decode("utf-8"))
@@ -1117,8 +1113,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         Chart data API: Ensure sample response row count doesn't exceed default limit
         """
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        request_payload = get_query_context(table.name, table.id, table.type)
+        request_payload = get_query_context("birth_names")
         request_payload["result_type"] = utils.ChartDataResultType.SAMPLES
         request_payload["queries"][0]["row_limit"] = 10
         rv = self.post_assert_metric(CHART_DATA_URI, request_payload, "data")
@@ -1131,8 +1126,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         Chart data API: Test chart data with unsupported result type
         """
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        request_payload = get_query_context(table.name, table.id, table.type)
+        request_payload = get_query_context("birth_names")
         request_payload["result_type"] = "qwerty"
         rv = self.post_assert_metric(CHART_DATA_URI, request_payload, "data")
         self.assertEqual(rv.status_code, 400)
@@ -1142,8 +1136,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         Chart data API: Test chart data with unsupported result format
         """
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        request_payload = get_query_context(table.name, table.id, table.type)
+        request_payload = get_query_context("birth_names")
         request_payload["result_format"] = "qwerty"
         rv = self.post_assert_metric(CHART_DATA_URI, request_payload, "data")
         self.assertEqual(rv.status_code, 400)
@@ -1153,8 +1146,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         Chart data API: Test chart data with query result format
         """
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        request_payload = get_query_context(table.name, table.id, table.type)
+        request_payload = get_query_context("birth_names")
         request_payload["result_type"] = utils.ChartDataResultType.QUERY
         rv = self.post_assert_metric(CHART_DATA_URI, request_payload, "data")
         self.assertEqual(rv.status_code, 200)
@@ -1164,8 +1156,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         Chart data API: Test chart data with CSV result format
         """
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        request_payload = get_query_context(table.name, table.id, table.type)
+        request_payload = get_query_context("birth_names")
         request_payload["result_format"] = "csv"
         rv = self.post_assert_metric(CHART_DATA_URI, request_payload, "data")
         self.assertEqual(rv.status_code, 200)
@@ -1175,8 +1166,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         Chart data API: Ensure mixed case filter operator generates valid result
         """
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        request_payload = get_query_context(table.name, table.id, table.type)
+        request_payload = get_query_context("birth_names")
         request_payload["queries"][0]["filters"][0]["op"] = "In"
         request_payload["queries"][0]["row_limit"] = 10
         rv = self.post_assert_metric(CHART_DATA_URI, request_payload, "data")
@@ -1190,8 +1180,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         """
         pytest.importorskip("fbprophet")
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        request_payload = get_query_context(table.name, table.id, table.type)
+        request_payload = get_query_context("birth_names")
         time_grain = "P1Y"
         request_payload["queries"][0]["is_timeseries"] = True
         request_payload["queries"][0]["groupby"] = []
@@ -1224,8 +1213,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         Chart data API: Ensure filter referencing missing column is ignored
         """
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        request_payload = get_query_context(table.name, table.id, table.type)
+        request_payload = get_query_context("birth_names")
         request_payload["queries"][0]["filters"] = [
             {"col": "non_existent_filter", "op": "==", "val": "foo"},
         ]
@@ -1240,8 +1228,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         Chart data API: Test chart data with empty result
         """
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        request_payload = get_query_context(table.name, table.id, table.type)
+        request_payload = get_query_context("birth_names")
         request_payload["queries"][0]["filters"] = [
             {"col": "gender", "op": "==", "val": "foo"}
         ]
@@ -1257,8 +1244,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         Chart data API: Test chart data with invalid SQL
         """
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        request_payload = get_query_context(table.name, table.id, table.type)
+        request_payload = get_query_context("birth_names")
         request_payload["queries"][0]["filters"] = []
         # erroneus WHERE-clause
         request_payload["queries"][0]["extras"]["where"] = "(gender abc def)"
@@ -1270,8 +1256,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         Chart data API: Test chart data query with invalid schema
         """
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        payload = get_query_context(table.name, table.id, table.type)
+        payload = get_query_context("birth_names")
         payload["datasource"] = "abc"
         rv = self.post_assert_metric(CHART_DATA_URI, payload, "data")
         self.assertEqual(rv.status_code, 400)
@@ -1281,8 +1266,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         Chart data API: Test chart data query with invalid enum value
         """
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        payload = get_query_context(table.name, table.id, table.type)
+        payload = get_query_context("birth_names")
         payload["queries"][0]["extras"]["time_range_endpoints"] = [
             "abc",
             "EXCLUSIVE",
@@ -1295,8 +1279,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         Chart data API: Test chart data query not allowed
         """
         self.login(username="gamma")
-        table = self.get_table_by_name("birth_names")
-        payload = get_query_context(table.name, table.id, table.type)
+        payload = get_query_context("birth_names")
         rv = self.post_assert_metric(CHART_DATA_URI, payload, "data")
         self.assertEqual(rv.status_code, 401)
 
@@ -1305,8 +1288,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         Chart data API: Ensure request referencing filters via jinja renders a correct query
         """
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        request_payload = get_query_context(table.name, table.id, table.type)
+        request_payload = get_query_context("birth_names")
         request_payload["result_type"] = utils.ChartDataResultType.QUERY
         request_payload["queries"][0]["filters"] = [
             {"col": "gender", "op": "==", "val": "boy"}
@@ -1330,8 +1312,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         """
         async_query_manager.init_app(app)
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        request_payload = get_query_context(table.name, table.id, table.type)
+        request_payload = get_query_context("birth_names")
         rv = self.post_assert_metric(CHART_DATA_URI, request_payload, "data")
         self.assertEqual(rv.status_code, 202)
         data = json.loads(rv.data.decode("utf-8"))
@@ -1350,8 +1331,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         """
         async_query_manager.init_app(app)
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        request_payload = get_query_context(table.name, table.id, table.type)
+        request_payload = get_query_context("birth_names")
         request_payload["result_type"] = "results"
         rv = self.post_assert_metric(CHART_DATA_URI, request_payload, "data")
         self.assertEqual(rv.status_code, 200)
@@ -1366,8 +1346,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         """
         async_query_manager.init_app(app)
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        request_payload = get_query_context(table.name, table.id, table.type)
+        request_payload = get_query_context("birth_names")
         test_client.set_cookie(
             "localhost", app.config["GLOBAL_ASYNC_QUERIES_JWT_COOKIE_NAME"], "foo"
         )
@@ -1385,8 +1364,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         """
         async_query_manager.init_app(app)
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        query_context = get_query_context(table.name, table.id, table.type)
+        query_context = get_query_context("birth_names")
         load_qc_mock.return_value = query_context
         orig_run = ChartDataCommand.run
 
@@ -1415,8 +1393,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         """
         async_query_manager.init_app(app)
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        query_context = get_query_context(table.name, table.id, table.type)
+        query_context = get_query_context("birth_names")
         load_qc_mock.return_value = query_context
         rv = self.get_assert_metric(
             f"{CHART_DATA_URI}/test-cache-key", "data_from_cache"
@@ -1436,8 +1413,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         Chart data cache API: Test chart data async cache request (no login)
         """
         async_query_manager.init_app(app)
-        table = self.get_table_by_name("birth_names")
-        query_context = get_query_context(table.name, table.id, table.type)
+        query_context = get_query_context("birth_names")
         load_qc_mock.return_value = query_context
         orig_run = ChartDataCommand.run
 
@@ -1639,8 +1615,7 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin):
         Chart data API: Test chart data query
         """
         self.login(username="admin")
-        table = self.get_table_by_name("birth_names")
-        request_payload = get_query_context(table.name, table.id, table.type)
+        request_payload = get_query_context("birth_names")
 
         annotation_layers = []
         request_payload["queries"][0]["annotation_layers"] = annotation_layers
diff --git a/tests/charts/schema_tests.py b/tests/charts/schema_tests.py
index f3a5a6f43..b8d436384 100644
--- a/tests/charts/schema_tests.py
+++ b/tests/charts/schema_tests.py
@@ -29,9 +29,7 @@ from tests.fixtures.query_context import get_query_context
 class TestSchema(SupersetTestCase):
     def test_query_context_limit_and_offset(self):
         self.login(username="admin")
-        table_name = "birth_names"
-        table = self.get_table_by_name(table_name)
-        payload = get_query_context(table.name, table.id, table.type)
+        payload = get_query_context("birth_names")
 
         # Use defaults
         payload["queries"][0].pop("row_limit", None)
@@ -59,17 +57,13 @@ class TestSchema(SupersetTestCase):
 
     def test_query_context_null_timegrain(self):
         self.login(username="admin")
-        table_name = "birth_names"
-        table = self.get_table_by_name(table_name)
-        payload = get_query_context(table.name, table.id, table.type)
+        payload = get_query_context("birth_names")
         payload["queries"][0]["extras"]["time_grain_sqla"] = None
         _ = ChartDataQueryContextSchema().load(payload)
 
     def test_query_context_series_limit(self):
         self.login(username="admin")
-        table_name = "birth_names"
-        table = self.get_table_by_name(table_name)
-        payload = get_query_context(table.name, table.id, table.type)
+        payload = get_query_context("birth_names")
 
         payload["queries"][0]["timeseries_limit"] = 2
         payload["queries"][0]["timeseries_limit_metric"] = {
@@ -90,9 +84,7 @@ class TestSchema(SupersetTestCase):
 
     def test_query_context_null_post_processing_op(self):
         self.login(username="admin")
-        table_name = "birth_names"
-        table = self.get_table_by_name(table_name)
-        payload = get_query_context(table.name, table.id, table.type)
+        payload = get_query_context("birth_names")
 
         payload["queries"][0]["post_processing"] = [None]
         query_context = ChartDataQueryContextSchema().load(payload)
diff --git a/tests/core_tests.py b/tests/core_tests.py
index e011fd69e..97ae5eb2a 100644
--- a/tests/core_tests.py
+++ b/tests/core_tests.py
@@ -848,11 +848,6 @@ class TestCore(SupersetTestCase):
     def test_explore_json(self):
         tbl_id = self.table_ids.get("birth_names")
         form_data = {
-            "queryFields": {
-                "metrics": "metrics",
-                "groupby": "groupby",
-                "columns": "groupby",
-            },
             "datasource": f"{tbl_id}__table",
             "viz_type": "dist_bar",
             "time_range_endpoints": ["inclusive", "exclusive"],
@@ -879,11 +874,6 @@ class TestCore(SupersetTestCase):
     def test_explore_json_async(self):
         tbl_id = self.table_ids.get("birth_names")
         form_data = {
-            "queryFields": {
-                "metrics": "metrics",
-                "groupby": "groupby",
-                "columns": "groupby",
-            },
             "datasource": f"{tbl_id}__table",
             "viz_type": "dist_bar",
             "time_range_endpoints": ["inclusive", "exclusive"],
@@ -914,11 +904,6 @@ class TestCore(SupersetTestCase):
     def test_explore_json_async_results_format(self):
         tbl_id = self.table_ids.get("birth_names")
         form_data = {
-            "queryFields": {
-                "metrics": "metrics",
-                "groupby": "groupby",
-                "columns": "groupby",
-            },
             "datasource": f"{tbl_id}__table",
             "viz_type": "dist_bar",
             "time_range_endpoints": ["inclusive", "exclusive"],
@@ -947,11 +932,6 @@ class TestCore(SupersetTestCase):
         form_data = dict(
             {
                 "form_data": {
-                    "queryFields": {
-                        "metrics": "metrics",
-                        "groupby": "groupby",
-                        "columns": "groupby",
-                    },
                     "datasource": f"{tbl_id}__table",
                     "viz_type": "dist_bar",
                     "time_range_endpoints": ["inclusive", "exclusive"],
@@ -991,11 +971,6 @@ class TestCore(SupersetTestCase):
         form_data = dict(
             {
                 "form_data": {
-                    "queryFields": {
-                        "metrics": "metrics",
-                        "groupby": "groupby",
-                        "columns": "groupby",
-                    },
                     "datasource": f"{tbl_id}__table",
                     "viz_type": "dist_bar",
                     "time_range_endpoints": ["inclusive", "exclusive"],
diff --git a/tests/fixtures/importexport.py b/tests/fixtures/importexport.py
index e56676a53..b561442c8 100644
--- a/tests/fixtures/importexport.py
+++ b/tests/fixtures/importexport.py
@@ -77,7 +77,7 @@ dashboard_export: Dict[str, Any] = {
                             "datasource_name": "birth_names_2",
                             "datasource_type": "table",
                             "id": 83,
-                            "params": '{"adhoc_filters": [], "datasource": "3__table", "granularity_sqla": "ds", "header_font_size": 0.4, "metric": {"aggregate": "SUM", "column": {"column_name": "num_california", "expression": "CASE WHEN state = \'CA\' THEN num ELSE 0 END"}, "expressionType": "SIMPLE", "label": "SUM(num_california)"}, "queryFields": {"metric": "metrics"}, "slice_id": 83, "subheader_font_size": 0.15, "time_range": "100 years ago : now", "time_range_endpoints": ["unknown", "inclusive"], "url_params": {}, "viz_type": "big_number_total", "y_axis_format": "SMART_NUMBER", "remote_id": 83, "datasource_name": "birth_names_2", "schema": null, "database_name": "examples"}',
+                            "params": '{"adhoc_filters": [], "datasource": "3__table", "granularity_sqla": "ds", "header_font_size": 0.4, "metric": {"aggregate": "SUM", "column": {"column_name": "num_california", "expression": "CASE WHEN state = \'CA\' THEN num ELSE 0 END"}, "expressionType": "SIMPLE", "label": "SUM(num_california)"}, "slice_id": 83, "subheader_font_size": 0.15, "time_range": "100 years ago : now", "time_range_endpoints": ["unknown", "inclusive"], "url_params": {}, "viz_type": "big_number_total", "y_axis_format": "SMART_NUMBER", "remote_id": 83, "datasource_name": "birth_names_2", "schema": null, "database_name": "examples"}',
                             "slice_name": "Number of California Births",
                             "viz_type": "big_number_total",
                         }
diff --git a/tests/fixtures/query_context.py b/tests/fixtures/query_context.py
index 21bf2b587..30384ec20 100644
--- a/tests/fixtures/query_context.py
+++ b/tests/fixtures/query_context.py
@@ -17,26 +17,29 @@
 import copy
 from typing import Any, Dict, List
 
-from superset.utils.core import AnnotationType
+from superset.utils.core import AnnotationType, DTTM_ALIAS
+from tests.base_tests import get_table_by_name
 
-QUERY_OBJECTS = {
-    "birth_names": {
-        "extras": {"where": "", "time_range_endpoints": ["inclusive", "exclusive"]},
-        "granularity": "ds",
-        "groupby": ["name"],
-        "is_timeseries": False,
-        "metrics": [{"label": "sum__num"}],
-        "order_desc": True,
-        "orderby": [["sum__num", False]],
-        "row_limit": 100,
-        "time_range": "100 years ago : now",
-        "timeseries_limit": 0,
-        "timeseries_limit_metric": None,
-        "filters": [{"col": "gender", "op": "==", "val": "boy"}],
-        "having": "",
-        "having_filters": [],
-        "where": "",
-    }
+query_birth_names = {
+    "extras": {"where": "", "time_range_endpoints": ["inclusive", "exclusive"]},
+    "granularity": "ds",
+    "groupby": ["name"],
+    "metrics": [{"label": "sum__num"}],
+    "order_desc": True,
+    "orderby": [["sum__num", False]],
+    "row_limit": 100,
+    "time_range": "100 years ago : now",
+    "timeseries_limit": 0,
+    "timeseries_limit_metric": None,
+    "filters": [{"col": "gender", "op": "==", "val": "boy"}],
+    "having": "",
+    "having_filters": [],
+    "where": "",
+}
+
+QUERY_OBJECTS: Dict[str, Dict[str, object]] = {
+    "birth_names": {**query_birth_names, "is_timeseries": False,},
+    "birth_names:include_time": {**query_birth_names, "groupby": [DTTM_ALIAS, "name"],},
 }
 
 ANNOTATION_LAYERS = {
@@ -131,46 +134,43 @@ POSTPROCESSING_OPERATIONS = {
 }
 
 
-def _get_query_object(
-    datasource_name: str, add_postprocessing_operations: bool
+def get_query_object(
+    query_name: str, add_postprocessing_operations: bool
 ) -> Dict[str, Any]:
-    if datasource_name not in QUERY_OBJECTS:
-        raise Exception(
-            f"QueryObject fixture not defined for datasource: {datasource_name}"
-        )
-    query_object = copy.deepcopy(QUERY_OBJECTS[datasource_name])
+    if query_name not in QUERY_OBJECTS:
+        raise Exception(f"QueryObject fixture not defined for datasource: {query_name}")
+    query_object = copy.deepcopy(QUERY_OBJECTS[query_name])
     if add_postprocessing_operations:
-        query_object["post_processing"] = _get_postprocessing_operation(datasource_name)
+        query_object["post_processing"] = _get_postprocessing_operation(query_name)
     return query_object
 
 
-def _get_postprocessing_operation(datasource_name: str) -> List[Dict[str, Any]]:
-    if datasource_name not in QUERY_OBJECTS:
+def _get_postprocessing_operation(query_name: str) -> List[Dict[str, Any]]:
+    if query_name not in QUERY_OBJECTS:
         raise Exception(
-            f"Post-processing fixture not defined for datasource: {datasource_name}"
+            f"Post-processing fixture not defined for datasource: {query_name}"
         )
-    return copy.deepcopy(POSTPROCESSING_OPERATIONS[datasource_name])
+    return copy.deepcopy(POSTPROCESSING_OPERATIONS[query_name])
 
 
 def get_query_context(
-    datasource_name: str = "birth_names",
-    datasource_id: int = 0,
-    datasource_type: str = "table",
-    add_postprocessing_operations: bool = False,
+    query_name: str, add_postprocessing_operations: bool = False,
 ) -> Dict[str, Any]:
     """
     Create a request payload for retrieving a QueryContext object via the
     `api/v1/chart/data` endpoint. By default returns a payload corresponding to one
     generated by the "Boy Name Cloud" chart in the examples.
 
-    :param datasource_name: name of datasource to query. Different datasources require
-           different parameters in the QueryContext.
+    :param query_name: name of an example query, which is always in the format
+           of `datasource_name[:test_case_name]`, where `:test_case_name` is optional.
     :param datasource_id: id of datasource to query.
     :param datasource_type: type of datasource to query.
     :param add_postprocessing_operations: Add post-processing operations to QueryObject
     :return: Request payload
     """
+    table_name = query_name.split(":")[0]
+    table = get_table_by_name(table_name)
     return {
-        "datasource": {"id": datasource_id, "type": datasource_type},
-        "queries": [_get_query_object(datasource_name, add_postprocessing_operations)],
+        "datasource": {"id": table.id, "type": table.type},
+        "queries": [get_query_object(query_name, add_postprocessing_operations)],
     }
diff --git a/tests/query_context_tests.py b/tests/query_context_tests.py
index a376fa280..43bdccd33 100644
--- a/tests/query_context_tests.py
+++ b/tests/query_context_tests.py
@@ -14,13 +14,9 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-import pytest
-
-import tests.test_app
 from superset import db
 from superset.charts.schemas import ChartDataQueryContextSchema
 from superset.connectors.connector_registry import ConnectorRegistry
-from superset.models.cache import CacheKey
 from superset.utils.core import (
     AdhocMetricExpressionType,
     ChartDataResultFormat,
@@ -29,7 +25,6 @@ from superset.utils.core import (
     TimeRangeEndpoint,
 )
 from tests.base_tests import SupersetTestCase
-from tests.fixtures.energy_dashboard import load_energy_table_with_slice
 from tests.fixtures.query_context import get_query_context
 
 
@@ -39,13 +34,10 @@ class TestQueryContext(SupersetTestCase):
         Ensure that the deserialized QueryContext contains all required fields.
         """
 
-        table_name = "birth_names"
-        table = self.get_table_by_name(table_name)
-        payload = get_query_context(
-            table.name, table.id, table.type, add_postprocessing_operations=True
-        )
+        payload = get_query_context("birth_names", add_postprocessing_operations=True)
         query_context = ChartDataQueryContextSchema().load(payload)
         self.assertEqual(len(query_context.queries), len(payload["queries"]))
+
         for query_idx, query in enumerate(query_context.queries):
             payload_query = payload["queries"][query_idx]
 
@@ -75,9 +67,7 @@ class TestQueryContext(SupersetTestCase):
 
     def test_cache_key_changes_when_datasource_is_updated(self):
         self.login(username="admin")
-        table_name = "birth_names"
-        table = self.get_table_by_name(table_name)
-        payload = get_query_context(table.name, table.id, table.type)
+        payload = get_query_context("birth_names")
 
         # construct baseline cache_key
         query_context = ChartDataQueryContextSchema().load(payload)
@@ -106,11 +96,7 @@ class TestQueryContext(SupersetTestCase):
 
     def test_cache_key_changes_when_post_processing_is_updated(self):
         self.login(username="admin")
-        table_name = "birth_names"
-        table = self.get_table_by_name(table_name)
-        payload = get_query_context(
-            table.name, table.id, table.type, add_postprocessing_operations=True
-        )
+        payload = get_query_context("birth_names", add_postprocessing_operations=True)
 
         # construct baseline cache_key from query_context with post processing operation
         query_context = ChartDataQueryContextSchema().load(payload)
@@ -121,43 +107,57 @@ class TestQueryContext(SupersetTestCase):
         payload["queries"][0]["post_processing"].append(None)
         query_context = ChartDataQueryContextSchema().load(payload)
         query_object = query_context.queries[0]
-        cache_key_with_null = query_context.query_cache_key(query_object)
-        self.assertEqual(cache_key_original, cache_key_with_null)
+        cache_key = query_context.query_cache_key(query_object)
+        self.assertEqual(cache_key_original, cache_key)
 
         # ensure query without post processing operation is different
         payload["queries"][0].pop("post_processing")
         query_context = ChartDataQueryContextSchema().load(payload)
         query_object = query_context.queries[0]
-        cache_key_without_post_processing = query_context.query_cache_key(query_object)
-        self.assertNotEqual(cache_key_original, cache_key_without_post_processing)
+        cache_key = query_context.query_cache_key(query_object)
+        self.assertNotEqual(cache_key_original, cache_key)
 
     def test_query_context_time_range_endpoints(self):
         """
         Ensure that time_range_endpoints are populated automatically when missing
-        from the payload
+        from the payload.
         """
         self.login(username="admin")
-        table_name = "birth_names"
-        table = self.get_table_by_name(table_name)
-        payload = get_query_context(table.name, table.id, table.type)
+        payload = get_query_context("birth_names")
         del payload["queries"][0]["extras"]["time_range_endpoints"]
         query_context = ChartDataQueryContextSchema().load(payload)
         query_object = query_context.queries[0]
         extras = query_object.to_dict()["extras"]
-        self.assertTrue("time_range_endpoints" in extras)
+        assert "time_range_endpoints" in extras
         self.assertEqual(
             extras["time_range_endpoints"],
             (TimeRangeEndpoint.INCLUSIVE, TimeRangeEndpoint.EXCLUSIVE),
         )
 
+    def test_handle_metrics_field(self):
+        """
+        Should support both predefined and adhoc metrics.
+        """
+        self.login(username="admin")
+        adhoc_metric = {
+            "expressionType": "SIMPLE",
+            "column": {"column_name": "sum_boys", "type": "BIGINT(20)"},
+            "aggregate": "SUM",
+            "label": "Boys",
+            "optionName": "metric_11",
+        }
+        payload = get_query_context("birth_names")
+        payload["queries"][0]["metrics"] = ["sum__num", {"label": "abc"}, adhoc_metric]
+        query_context = ChartDataQueryContextSchema().load(payload)
+        query_object = query_context.queries[0]
+        self.assertEqual(query_object.metrics, ["sum__num", "abc", adhoc_metric])
+
     def test_convert_deprecated_fields(self):
         """
         Ensure that deprecated fields are converted correctly
         """
         self.login(username="admin")
-        table_name = "birth_names"
-        table = self.get_table_by_name(table_name)
-        payload = get_query_context(table.name, table.id, table.type)
+        payload = get_query_context("birth_names")
         payload["queries"][0]["granularity_sqla"] = "timecol"
         payload["queries"][0]["having_filters"] = [{"col": "a", "op": "==", "val": "b"}]
         query_context = ChartDataQueryContextSchema().load(payload)
@@ -171,9 +171,7 @@ class TestQueryContext(SupersetTestCase):
         Ensure that CSV result format works
         """
         self.login(username="admin")
-        table_name = "birth_names"
-        table = self.get_table_by_name(table_name)
-        payload = get_query_context(table.name, table.id, table.type)
+        payload = get_query_context("birth_names")
         payload["result_format"] = ChartDataResultFormat.CSV.value
         payload["queries"][0]["row_limit"] = 10
         query_context = ChartDataQueryContextSchema().load(payload)
@@ -188,9 +186,7 @@ class TestQueryContext(SupersetTestCase):
         Ensure that calling invalid columns names in groupby are caught
         """
         self.login(username="admin")
-        table_name = "birth_names"
-        table = self.get_table_by_name(table_name)
-        payload = get_query_context(table.name, table.id, table.type)
+        payload = get_query_context("birth_names")
         payload["queries"][0]["groupby"] = ["currentDatabase()"]
         query_context = ChartDataQueryContextSchema().load(payload)
         query_payload = query_context.get_payload()
@@ -201,9 +197,7 @@ class TestQueryContext(SupersetTestCase):
         Ensure that calling invalid column names in columns are caught
         """
         self.login(username="admin")
-        table_name = "birth_names"
-        table = self.get_table_by_name(table_name)
-        payload = get_query_context(table.name, table.id, table.type)
+        payload = get_query_context("birth_names")
         payload["queries"][0]["groupby"] = []
         payload["queries"][0]["metrics"] = []
         payload["queries"][0]["columns"] = ["*, 'extra'"]
@@ -216,9 +210,7 @@ class TestQueryContext(SupersetTestCase):
         Ensure that calling invalid column names in filters are caught
         """
         self.login(username="admin")
-        table_name = "birth_names"
-        table = self.get_table_by_name(table_name)
-        payload = get_query_context(table.name, table.id, table.type)
+        payload = get_query_context("birth_names")
         payload["queries"][0]["groupby"] = ["name"]
         payload["queries"][0]["metrics"] = [
             {
@@ -237,9 +229,7 @@ class TestQueryContext(SupersetTestCase):
         Ensure that samples result type works
         """
         self.login(username="admin")
-        table_name = "birth_names"
-        table = self.get_table_by_name(table_name)
-        payload = get_query_context(table.name, table.id, table.type)
+        payload = get_query_context("birth_names")
         payload["result_type"] = ChartDataResultType.SAMPLES.value
         payload["queries"][0]["row_limit"] = 5
         query_context = ChartDataQueryContextSchema().load(payload)
@@ -255,9 +245,7 @@ class TestQueryContext(SupersetTestCase):
         Ensure that query result type works
         """
         self.login(username="admin")
-        table_name = "birth_names"
-        table = self.get_table_by_name(table_name)
-        payload = get_query_context(table.name, table.id, table.type)
+        payload = get_query_context("birth_names")
         payload["result_type"] = ChartDataResultType.QUERY.value
         query_context = ChartDataQueryContextSchema().load(payload)
         responses = query_context.get_payload()
@@ -274,9 +262,7 @@ class TestQueryContext(SupersetTestCase):
         """
         self.maxDiff = None
         self.login(username="admin")
-        table_name = "birth_names"
-        table = self.get_table_by_name(table_name)
-        payload = get_query_context(table.name, table.id, table.type)
+        payload = get_query_context("birth_names")
         query_context = ChartDataQueryContextSchema().load(payload)
         responses = query_context.get_payload()
         orig_cache_key = responses["queries"][0]["cache_key"]
diff --git a/tests/tasks/async_queries_tests.py b/tests/tasks/async_queries_tests.py
index 6fe2e7c31..f816e0bb6 100644
--- a/tests/tasks/async_queries_tests.py
+++ b/tests/tasks/async_queries_tests.py
@@ -45,8 +45,7 @@ class TestAsyncQueries(SupersetTestCase):
     @mock.patch.object(async_query_manager, "update_job")
     def test_load_chart_data_into_cache(self, mock_update_job):
         async_query_manager.init_app(app)
-        table = get_table_by_name("birth_names")
-        form_data = get_query_context(table.name, table.id, table.type)
+        query_context = get_query_context("birth_names")
         job_metadata = {
             "channel_id": str(uuid4()),
             "job_id": str(uuid4()),
@@ -55,7 +54,7 @@ class TestAsyncQueries(SupersetTestCase):
             "errors": [],
         }
 
-        load_chart_data_into_cache(job_metadata, form_data)
+        load_chart_data_into_cache(job_metadata, query_context)
 
         mock_update_job.assert_called_with(job_metadata, "done", result_url=mock.ANY)
 
@@ -65,8 +64,7 @@ class TestAsyncQueries(SupersetTestCase):
     @mock.patch.object(async_query_manager, "update_job")
     def test_load_chart_data_into_cache_error(self, mock_update_job, mock_run_command):
         async_query_manager.init_app(app)
-        table = get_table_by_name("birth_names")
-        form_data = get_query_context(table.name, table.id, table.type)
+        query_context = get_query_context("birth_names")
         job_metadata = {
             "channel_id": str(uuid4()),
             "job_id": str(uuid4()),
@@ -75,7 +73,7 @@ class TestAsyncQueries(SupersetTestCase):
             "errors": [],
         }
         with pytest.raises(ChartDataQueryFailedError):
-            load_chart_data_into_cache(job_metadata, form_data)
+            load_chart_data_into_cache(job_metadata, query_context)
 
         mock_run_command.assert_called_with(cache=True)
         errors = [{"message": "Error: foo"}]
@@ -86,11 +84,6 @@ class TestAsyncQueries(SupersetTestCase):
         async_query_manager.init_app(app)
         table = get_table_by_name("birth_names")
         form_data = {
-            "queryFields": {
-                "metrics": "metrics",
-                "groupby": "groupby",
-                "columns": "groupby",
-            },
             "datasource": f"{table.id}__table",
             "viz_type": "dist_bar",
             "time_range_endpoints": ["inclusive", "exclusive"],