refactor(native-filters): update dataMask and ExtraFormData schema (#…

…13983) * refactor: updates usage of `ownFilters` to `ownState` * refactor: update dataMask (final) * lint: fix lint * refactor: revert feat * fix: fix missed chart configuration * add filter set migration * apply new changes * fix migration revision * update migration * fix jest mock * js lint * fix test types * update tests and types * remove append_form_data from tests * fix findExistingFilterSet tests * add migration test Co-authored-by: Ville Brofeldt <[email protected]>
apache · Apr 15, 2021 · 8ef572a · 8ef572a
1 parent 68e11cd
commit 8ef572a
Show file tree

Hide file tree

Showing 78 changed files with 1,534 additions and 956 deletions.
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.30",
-    "@superset-ui/core": "^0.17.30",
-    "@superset-ui/legacy-plugin-chart-calendar": "^0.17.30",
-    "@superset-ui/legacy-plugin-chart-chord": "^0.17.30",
-    "@superset-ui/legacy-plugin-chart-country-map": "^0.17.31",
-    "@superset-ui/legacy-plugin-chart-event-flow": "^0.17.30",
-    "@superset-ui/legacy-plugin-chart-force-directed": "^0.17.30",
-    "@superset-ui/legacy-plugin-chart-heatmap": "^0.17.30",
-    "@superset-ui/legacy-plugin-chart-histogram": "^0.17.30",
-    "@superset-ui/legacy-plugin-chart-horizon": "^0.17.30",
-    "@superset-ui/legacy-plugin-chart-map-box": "^0.17.30",
-    "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.17.30",
-    "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.17.30",
-    "@superset-ui/legacy-plugin-chart-partition": "^0.17.30",
-    "@superset-ui/legacy-plugin-chart-pivot-table": "^0.17.30",
-    "@superset-ui/legacy-plugin-chart-rose": "^0.17.30",
-    "@superset-ui/legacy-plugin-chart-sankey": "^0.17.30",
-    "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.17.30",
-    "@superset-ui/legacy-plugin-chart-sunburst": "^0.17.30",
-    "@superset-ui/legacy-plugin-chart-treemap": "^0.17.30",
-    "@superset-ui/legacy-plugin-chart-world-map": "^0.17.30",
-    "@superset-ui/legacy-preset-chart-big-number": "^0.17.30",
+    "@superset-ui/chart-controls": "^0.17.32",
+    "@superset-ui/core": "^0.17.32",
+    "@superset-ui/legacy-plugin-chart-calendar": "^0.17.32",
+    "@superset-ui/legacy-plugin-chart-chord": "^0.17.32",
+    "@superset-ui/legacy-plugin-chart-country-map": "^0.17.32",
+    "@superset-ui/legacy-plugin-chart-event-flow": "^0.17.32",
+    "@superset-ui/legacy-plugin-chart-force-directed": "^0.17.32",
+    "@superset-ui/legacy-plugin-chart-heatmap": "^0.17.32",
+    "@superset-ui/legacy-plugin-chart-histogram": "^0.17.32",
+    "@superset-ui/legacy-plugin-chart-horizon": "^0.17.32",
+    "@superset-ui/legacy-plugin-chart-map-box": "^0.17.32",
+    "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.17.32",
+    "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.17.32",
+    "@superset-ui/legacy-plugin-chart-partition": "^0.17.32",
+    "@superset-ui/legacy-plugin-chart-pivot-table": "^0.17.32",
+    "@superset-ui/legacy-plugin-chart-rose": "^0.17.32",
+    "@superset-ui/legacy-plugin-chart-sankey": "^0.17.32",
+    "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.17.32",
+    "@superset-ui/legacy-plugin-chart-sunburst": "^0.17.32",
+    "@superset-ui/legacy-plugin-chart-treemap": "^0.17.32",
+    "@superset-ui/legacy-plugin-chart-world-map": "^0.17.32",
+    "@superset-ui/legacy-preset-chart-big-number": "^0.17.32",
     "@superset-ui/legacy-preset-chart-deckgl": "^0.4.6",
-    "@superset-ui/legacy-preset-chart-nvd3": "^0.17.30",
-    "@superset-ui/plugin-chart-echarts": "^0.17.30",
-    "@superset-ui/plugin-chart-table": "^0.17.30",
-    "@superset-ui/plugin-chart-word-cloud": "^0.17.30",
-    "@superset-ui/preset-chart-xy": "^0.17.30",
+    "@superset-ui/legacy-preset-chart-nvd3": "^0.17.32",
+    "@superset-ui/plugin-chart-echarts": "^0.17.32",
+    "@superset-ui/plugin-chart-table": "^0.17.32",
+    "@superset-ui/plugin-chart-word-cloud": "^0.17.32",
+    "@superset-ui/preset-chart-xy": "^0.17.32",
     "@vx/responsive": "^0.0.195",
     "abortcontroller-polyfill": "^1.1.9",
     "antd": "^4.9.4",

diff --git a/superset-frontend/spec/fixtures/mockNativeFilters.ts b/superset-frontend/spec/fixtures/mockNativeFilters.ts
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { ExtraFormData } from '@superset-ui/core';
 import { NativeFiltersState } from 'src/dashboard/reducers/types';
 import { DataMaskStateWithId } from '../../src/dataMask/types';
 
@@ -76,44 +77,38 @@ export const nativeFilters: NativeFiltersState = {
 };
 
 export const dataMaskWith2Filters: DataMaskStateWithId = {
-  crossFilters: {},
-  ownFilters: {},
-  nativeFilters: {
-    'NATIVE_FILTER-e7Q8zKixx': {
-      id: 'NATIVE_FILTER-e7Q8zKixx',
-      extraFormData: {
-        append_form_data: {
-          filters: [
-            {
-              col: 'region',
-              op: 'IN',
-              val: ['East Asia & Pacific'],
-            },
-          ],
+  'NATIVE_FILTER-e7Q8zKixx': {
+    id: 'NATIVE_FILTER-e7Q8zKixx',
+    ownState: {},
+    extraFormData: {
+      filters: [
+        {
+          col: 'region',
+          op: 'IN',
+          val: ['East Asia & Pacific'],
         },
-      },
-      currentState: {
-        value: ['East Asia & Pacific'],
-      },
+      ],
     },
-    'NATIVE_FILTER-x9QPw0so1': {
-      id: 'NATIVE_FILTER-x9QPw0so1',
-      extraFormData: {},
-      currentState: {},
+    filterState: {
+      value: ['East Asia & Pacific'],
     },
   },
+  'NATIVE_FILTER-x9QPw0so1': {
+    id: 'NATIVE_FILTER-x9QPw0so1',
+    ownState: {},
+    extraFormData: {},
+    filterState: {},
+  },
 };
 
-export const extraFormData = {
-  append_form_data: {
-    filters: [
-      {
-        col: 'ethnic_minority',
-        op: 'IN',
-        val: 'No, not an ethnic minority',
-      },
-    ],
-  },
+export const extraFormData: ExtraFormData = {
+  filters: [
+    {
+      col: 'ethnic_minority',
+      op: 'IN',
+      val: ['No, not an ethnic minority'],
+    },
+  ],
 };
 
 export const NATIVE_FILTER_ID = 'NATIVE_FILTER-p4LImrSgA';
@@ -136,14 +131,12 @@ export const singleNativeFiltersState = {
   },
 };
 
-export const dataMaskWith1Filter = {
-  nativeFilters: {
-    [NATIVE_FILTER_ID]: {
-      id: NATIVE_FILTER_ID,
-      extraFormData,
-      currentState: {
-        value: ['No, not an ethnic minority'],
-      },
+export const dataMaskWith1Filter: DataMaskStateWithId = {
+  [NATIVE_FILTER_ID]: {
+    id: NATIVE_FILTER_ID,
+    extraFormData,
+    filterState: {
+      value: ['No, not an ethnic minority'],
     },
   },
 };

diff --git a/superset-frontend/spec/javascripts/dashboard/fixtures/mockNativeFilters.ts b/superset-frontend/spec/javascripts/dashboard/fixtures/mockNativeFilters.ts
@@ -16,18 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { DataMaskStateWithId, DataMaskType } from 'src/dataMask/types';
+import { DataMaskStateWithId } from 'src/dataMask/types';
 import { NativeFiltersState } from 'src/dashboard/reducers/types';
 
 export const mockDataMaskInfo: DataMaskStateWithId = {
-  [DataMaskType.CrossFilters]: {},
-  [DataMaskType.OwnFilters]: {},
-  [DataMaskType.NativeFilters]: {
-    DefaultsID: {
-      id: 'DefaultId',
-      currentState: {
-        value: [],
-      },
+  DefaultsID: {
+    id: 'DefaultId',
+    ownState: {},
+    filterState: {
+      value: [],
     },
   },
 };

diff --git a/superset-frontend/spec/javascripts/dashboard/util/getFormDataWithExtraFilters_spec.ts b/superset-frontend/spec/javascripts/dashboard/util/getFormDataWithExtraFilters_spec.ts
@@ -64,14 +64,11 @@ describe('getFormDataWithExtraFilters', () => {
       },
     },
     dataMask: {
-      crossFilters: {},
-      ownFilters: {},
-      nativeFilters: {
-        [filterId]: {
-          id: filterId,
-          extraFormData: {},
-          currentState: {},
-        },
+      [filterId]: {
+        id: filterId,
+        extraFormData: {},
+        filterState: {},
+        ownState: {},
       },
     },
     layout: (dashboardLayout.present as unknown) as {