Merge branch 'master' of github.com:apache/superset into build_query_…

…mask
apache · Mar 2, 2021 · 9a525a3 · 9a525a3
2 parents fee2308 + b04aebf
commit 9a525a3
Show file tree

Hide file tree

Showing 74 changed files with 6,316 additions and 3,292 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -6,13 +6,13 @@ ignore:
 coverage:
   status:
     project:
-      informational: true
       default:
+        informational: true
         # Commits pushed to master should not make the overall
         # project coverage decrease:
         target: auto
         threshold: 0%
     patch:
-      informational: true
       default:
+        informational: true
         threshold: 0%
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
@@ -65,34 +65,34 @@
     "@babel/runtime-corejs3": "^7.12.5",
     "@data-ui/sparkline": "^0.0.84",
     "@emotion/core": "^10.0.35",
-    "@superset-ui/chart-controls": "^0.17.12",
-    "@superset-ui/core": "^0.17.11",
-    "@superset-ui/legacy-plugin-chart-calendar": "^0.17.12",
-    "@superset-ui/legacy-plugin-chart-chord": "^0.17.12",
-    "@superset-ui/legacy-plugin-chart-country-map": "^0.17.12",
-    "@superset-ui/legacy-plugin-chart-event-flow": "^0.17.12",
-    "@superset-ui/legacy-plugin-chart-force-directed": "^0.17.12",
-    "@superset-ui/legacy-plugin-chart-heatmap": "^0.17.12",
-    "@superset-ui/legacy-plugin-chart-histogram": "^0.17.12",
-    "@superset-ui/legacy-plugin-chart-horizon": "^0.17.12",
-    "@superset-ui/legacy-plugin-chart-map-box": "^0.17.12",
-    "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.17.12",
-    "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.17.12",
-    "@superset-ui/legacy-plugin-chart-partition": "^0.17.12",
-    "@superset-ui/legacy-plugin-chart-pivot-table": "^0.17.12",
-    "@superset-ui/legacy-plugin-chart-rose": "^0.17.12",
-    "@superset-ui/legacy-plugin-chart-sankey": "^0.17.12",
-    "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.17.12",
-    "@superset-ui/legacy-plugin-chart-sunburst": "^0.17.12",
-    "@superset-ui/legacy-plugin-chart-treemap": "^0.17.12",
-    "@superset-ui/legacy-plugin-chart-world-map": "^0.17.12",
-    "@superset-ui/legacy-preset-chart-big-number": "^0.17.12",
+    "@superset-ui/chart-controls": "^0.17.13",
+    "@superset-ui/core": "^0.17.13",
+    "@superset-ui/legacy-plugin-chart-calendar": "^0.17.13",
+    "@superset-ui/legacy-plugin-chart-chord": "^0.17.13",
+    "@superset-ui/legacy-plugin-chart-country-map": "^0.17.13",
+    "@superset-ui/legacy-plugin-chart-event-flow": "^0.17.13",
+    "@superset-ui/legacy-plugin-chart-force-directed": "^0.17.13",
+    "@superset-ui/legacy-plugin-chart-heatmap": "^0.17.13",
+    "@superset-ui/legacy-plugin-chart-histogram": "^0.17.13",
+    "@superset-ui/legacy-plugin-chart-horizon": "^0.17.13",
+    "@superset-ui/legacy-plugin-chart-map-box": "^0.17.13",
+    "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.17.13",
+    "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.17.13",
+    "@superset-ui/legacy-plugin-chart-partition": "^0.17.13",
+    "@superset-ui/legacy-plugin-chart-pivot-table": "^0.17.13",
+    "@superset-ui/legacy-plugin-chart-rose": "^0.17.13",
+    "@superset-ui/legacy-plugin-chart-sankey": "^0.17.13",
+    "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.17.13",
+    "@superset-ui/legacy-plugin-chart-sunburst": "^0.17.13",
+    "@superset-ui/legacy-plugin-chart-treemap": "^0.17.13",
+    "@superset-ui/legacy-plugin-chart-world-map": "^0.17.13",
+    "@superset-ui/legacy-preset-chart-big-number": "^0.17.13",
     "@superset-ui/legacy-preset-chart-deckgl": "^0.4.6",
-    "@superset-ui/legacy-preset-chart-nvd3": "^0.17.12",
-    "@superset-ui/plugin-chart-echarts": "^0.17.12",
-    "@superset-ui/plugin-chart-table": "^0.17.12",
-    "@superset-ui/plugin-chart-word-cloud": "^0.17.12",
-    "@superset-ui/preset-chart-xy": "^0.17.12",
+    "@superset-ui/legacy-preset-chart-nvd3": "^0.17.13",
+    "@superset-ui/plugin-chart-echarts": "^0.17.13",
+    "@superset-ui/plugin-chart-table": "^0.17.13",
+    "@superset-ui/plugin-chart-word-cloud": "^0.17.13",
+    "@superset-ui/preset-chart-xy": "^0.17.13",
     "@vx/responsive": "^0.0.195",
     "abortcontroller-polyfill": "^1.1.9",
     "antd": "^4.9.4",
@@ -190,13 +190,13 @@
     "@hot-loader/react-dom": "^16.13.0",
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
     "@storybook/addon-actions": "^6.1.17",
-    "@storybook/addon-essentials": "^6.1.17",
+    "@storybook/addon-essentials": "^6.1.20",
     "@storybook/addon-knobs": "^6.1.17",
     "@storybook/addon-links": "^6.1.17",
     "@storybook/addons": "^6.1.17",
     "@storybook/client-api": "^6.1.17",
     "@storybook/preset-typescript": "^3.0.0",
-    "@storybook/react": "^6.1.17",
+    "@storybook/react": "^6.1.20",
     "@svgr/webpack": "^5.4.0",
     "@testing-library/dom": "^7.29.4",
     "@testing-library/jest-dom": "^5.11.6",

diff --git a/superset-frontend/spec/fixtures/mockNativeFilters.ts b/superset-frontend/spec/fixtures/mockNativeFilters.ts
@@ -73,27 +73,31 @@ export const nativeFilters: NativeFiltersState = {
     },
   },
   filtersState: {
-    'NATIVE_FILTER-e7Q8zKixx': {
-      id: 'NATIVE_FILTER-e7Q8zKixx',
-      currentState: {
-        value: ['East Asia & Pacific'],
-      },
-      extraFormData: {
-        append_form_data: {
-          filters: [
-            {
-              col: 'region',
-              op: 'IN',
-              val: ['East Asia & Pacific'],
-            },
-          ],
+    crossFilters: {},
+    ownFilters: {},
+    nativeFilters: {
+      'NATIVE_FILTER-e7Q8zKixx': {
+        id: 'NATIVE_FILTER-e7Q8zKixx',
+        extraFormData: {
+          append_form_data: {
+            filters: [
+              {
+                col: 'region',
+                op: 'IN',
+                val: ['East Asia & Pacific'],
+              },
+            ],
+          },
+        },
+        currentState: {
+          value: ['East Asia & Pacific'],
         },
       },
-    },
-    'NATIVE_FILTER-x9QPw0so1': {
-      id: 'NATIVE_FILTER-x9QPw0so1',
-      extraFormData: {},
-      currentState: {},
+      'NATIVE_FILTER-x9QPw0so1': {
+        id: 'NATIVE_FILTER-x9QPw0so1',
+        extraFormData: {},
+        currentState: {},
+      },
     },
   },
 };
@@ -129,11 +133,13 @@ export const singleNativeFiltersState = {
     },
   },
   filtersState: {
-    [NATIVE_FILTER_ID]: {
-      id: NATIVE_FILTER_ID,
-      extraFormData,
-      currentState: {
-        value: ['No, not an ethnic minority'],
+    nativeFilters: {
+      [NATIVE_FILTER_ID]: {
+        id: NATIVE_FILTER_ID,
+        extraFormData,
+        currentState: {
+          value: ['No, not an ethnic minority'],
+        },
       },
     },
   },

diff --git a/superset-frontend/spec/javascripts/dashboard/components/Dashboard_spec.jsx b/superset-frontend/spec/javascripts/dashboard/components/Dashboard_spec.jsx
@@ -53,6 +53,7 @@ describe('Dashboard', () => {
     dashboardInfo,
     charts: chartQueries,
     activeFilters: {},
+    ownDataCharts: {},
     slices: sliceEntities.slices,
     datasources,
     layout: dashboardLayout.present,

diff --git a/superset-frontend/spec/javascripts/dashboard/fixtures/mockNativeFilters.js b/superset-frontend/spec/javascripts/dashboard/fixtures/mockNativeFilters.js
@@ -42,9 +42,13 @@ export const nativeFiltersInfo = {
     },
   },
   filtersState: {
-    DefaultsID: {
-      id: 'DefaultId',
-      selectedValues: [],
+    nativeFilters: {
+      DefaultsID: {
+        id: 'DefaultId',
+        currentState: {
+          value: [],
+        },
+      },
     },
   },
 };
diff --git a/superset-frontend/spec/javascripts/dashboard/util/getFormDataWithExtraFilters_spec.ts b/superset-frontend/spec/javascripts/dashboard/util/getFormDataWithExtraFilters_spec.ts
@@ -62,10 +62,14 @@ describe('getFormDataWithExtraFilters', () => {
         } as unknown) as Filter,
       },
       filtersState: {
-        [filterId]: {
-          id: filterId,
-          extraFormData: {},
-          currentState: {},
+        crossFilters: {},
+        ownFilters: {},
+        nativeFilters: {
+          [filterId]: {
+            id: filterId,
+            extraFormData: {},
+            currentState: {},
+          },
         },
       },
     },

diff --git a/superset-frontend/spec/javascripts/explore/components/DateFilterControl_spec.jsx b/superset-frontend/spec/javascripts/explore/components/DateFilterControl_spec.jsx