Merge branch 'apache:master' into boilerplate_and_rename

apache · Oct 18, 2021 · 227f8ee · 227f8ee
2 parents a1c1ddb + 37944e1
commit 227f8ee
Show file tree

Hide file tree

Showing 56 changed files with 2,763 additions and 1,773 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -6,3 +6,6 @@
 .github/workflows/ecs-task-definition.json @robdiciuccio @craig-rueda @rusackas @eschutho @dpgaspar @nytai @mistercrunch
 .github/workflows/docker-ephemeral-env.yml @robdiciuccio @craig-rueda @rusackas @eschutho @dpgaspar @nytai @mistercrunch
 .github/workflows/ephemeral*.yml @robdiciuccio @craig-rueda @rusackas @eschutho @dpgaspar @nytai @mistercrunch
+
+# Notify some committers of changes in the Select component
+/superset-frontend/src/components/Select/ @michael-s-molina @geido
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
@@ -68,35 +68,35 @@
     "@emotion/cache": "^11.4.0",
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
-    "@superset-ui/chart-controls": "^0.18.12",
-    "@superset-ui/core": "^0.18.12",
-    "@superset-ui/legacy-plugin-chart-calendar": "^0.18.12",
-    "@superset-ui/legacy-plugin-chart-chord": "^0.18.12",
-    "@superset-ui/legacy-plugin-chart-country-map": "^0.18.12",
-    "@superset-ui/legacy-plugin-chart-event-flow": "^0.18.12",
-    "@superset-ui/legacy-plugin-chart-force-directed": "^0.18.12",
-    "@superset-ui/legacy-plugin-chart-heatmap": "^0.18.12",
-    "@superset-ui/legacy-plugin-chart-histogram": "^0.18.12",
-    "@superset-ui/legacy-plugin-chart-horizon": "^0.18.12",
-    "@superset-ui/legacy-plugin-chart-map-box": "^0.18.12",
-    "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.18.12",
-    "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.18.12",
-    "@superset-ui/legacy-plugin-chart-partition": "^0.18.12",
-    "@superset-ui/legacy-plugin-chart-pivot-table": "^0.18.12",
-    "@superset-ui/legacy-plugin-chart-rose": "^0.18.12",
-    "@superset-ui/legacy-plugin-chart-sankey": "^0.18.12",
-    "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.18.12",
-    "@superset-ui/legacy-plugin-chart-sunburst": "^0.18.12",
-    "@superset-ui/legacy-plugin-chart-treemap": "^0.18.12",
-    "@superset-ui/legacy-plugin-chart-world-map": "^0.18.12",
-    "@superset-ui/legacy-preset-chart-big-number": "^0.18.12",
+    "@superset-ui/chart-controls": "^0.18.13",
+    "@superset-ui/core": "^0.18.13",
+    "@superset-ui/legacy-plugin-chart-calendar": "^0.18.13",
+    "@superset-ui/legacy-plugin-chart-chord": "^0.18.13",
+    "@superset-ui/legacy-plugin-chart-country-map": "^0.18.13",
+    "@superset-ui/legacy-plugin-chart-event-flow": "^0.18.13",
+    "@superset-ui/legacy-plugin-chart-force-directed": "^0.18.13",
+    "@superset-ui/legacy-plugin-chart-heatmap": "^0.18.13",
+    "@superset-ui/legacy-plugin-chart-histogram": "^0.18.13",
+    "@superset-ui/legacy-plugin-chart-horizon": "^0.18.13",
+    "@superset-ui/legacy-plugin-chart-map-box": "^0.18.13",
+    "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.18.13",
+    "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.18.13",
+    "@superset-ui/legacy-plugin-chart-partition": "^0.18.13",
+    "@superset-ui/legacy-plugin-chart-pivot-table": "^0.18.13",
+    "@superset-ui/legacy-plugin-chart-rose": "^0.18.13",
+    "@superset-ui/legacy-plugin-chart-sankey": "^0.18.13",
+    "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.18.13",
+    "@superset-ui/legacy-plugin-chart-sunburst": "^0.18.13",
+    "@superset-ui/legacy-plugin-chart-treemap": "^0.18.13",
+    "@superset-ui/legacy-plugin-chart-world-map": "^0.18.13",
+    "@superset-ui/legacy-preset-chart-big-number": "^0.18.13",
     "@superset-ui/legacy-preset-chart-deckgl": "^0.4.12",
-    "@superset-ui/legacy-preset-chart-nvd3": "^0.18.12",
-    "@superset-ui/plugin-chart-echarts": "^0.18.12",
-    "@superset-ui/plugin-chart-pivot-table": "^0.18.12",
-    "@superset-ui/plugin-chart-table": "^0.18.12",
-    "@superset-ui/plugin-chart-word-cloud": "^0.18.12",
-    "@superset-ui/preset-chart-xy": "^0.18.12",
+    "@superset-ui/legacy-preset-chart-nvd3": "^0.18.13",
+    "@superset-ui/plugin-chart-echarts": "^0.18.13",
+    "@superset-ui/plugin-chart-pivot-table": "^0.18.13",
+    "@superset-ui/plugin-chart-table": "^0.18.13",
+    "@superset-ui/plugin-chart-word-cloud": "^0.18.13",
+    "@superset-ui/preset-chart-xy": "^0.18.13",
     "@vx/responsive": "^0.0.195",
     "abortcontroller-polyfill": "^1.1.9",
     "antd": "^4.9.4",
@@ -165,7 +165,7 @@
     "react-sortable-hoc": "^1.11.0",
     "react-split": "^2.0.9",
     "react-sticky": "^6.0.3",
-    "react-syntax-highlighter": "^15.3.0",
+    "react-syntax-highlighter": "^15.4.4",
     "react-table": "^7.6.3",
     "react-transition-group": "^2.5.3",
     "react-ultimate-pagination": "^1.2.0",
@@ -289,7 +289,6 @@
     "mini-css-extract-plugin": "^2.3.0",
     "mock-socket": "^9.0.3",
     "node-fetch": "^2.6.1",
-    "po2json": "^0.4.5",
     "prettier": "^2.2.1",
     "process": "^0.11.10",
     "react-test-renderer": "^16.9.0",

diff --git a/superset-frontend/spec/fixtures/mockNativeFilters.ts b/superset-frontend/spec/fixtures/mockNativeFilters.ts
@@ -448,3 +448,39 @@ export const mockQueryDataForCountries = [
   { country_name: 'Zambia', 'SUM(SP_POP_TOTL)': 438847085 },
   { country_name: 'Zimbabwe', 'SUM(SP_POP_TOTL)': 509866860 },
 ];
+
+export const buildNativeFilter = (
+  id: string,
+  name: string,
+  parents: string[],
+) => ({
+  id,
+  controlValues: {
+    multiSelect: true,
+    enableEmptyFilter: false,
+    defaultToFirstItem: false,
+    inverseSelection: false,
+    searchAllOptions: false,
+  },
+  name,
+  filterType: 'filter_select',
+  targets: [
+    {
+      datasetId: 1,
+      column: {
+        name,
+      },
+    },
+  ],
+  defaultDataMask: {
+    extraFormData: {},
+    filterState: {},
+    ownState: {},
+  },
+  cascadeParentIds: parents,
+  scope: {
+    rootPath: ['ROOT_ID'],
+    excluded: [],
+  },
+  type: 'NATIVE_FILTER',
+});
diff --git a/...-frontend/spec/javascripts/dashboard/components/nativeFilters/NativeFiltersModal_spec.tsx b/...-frontend/spec/javascripts/dashboard/components/nativeFilters/NativeFiltersModal_spec.tsx
@@ -16,14 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { ReactWrapper } from 'enzyme';
 import React from 'react';
-import { styledMount as mount } from 'spec/helpers/theming';
+import { DndProvider } from 'react-dnd';
+import { HTML5Backend } from 'react-dnd-html5-backend';
 import { act } from 'react-dom/test-utils';
-import { ReactWrapper } from 'enzyme';
 import { Provider } from 'react-redux';
-import Alert from 'src/components/Alert';
-import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint';
 import { mockStore } from 'spec/fixtures/mockStore';
+import { styledMount as mount } from 'spec/helpers/theming';
+import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint';
+import Alert from 'src/components/Alert';
 import { FiltersConfigModal } from 'src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal';
 
 Object.defineProperty(window, 'matchMedia', {
@@ -66,7 +68,9 @@ describe('FiltersConfigModal', () => {
   function setup(overridesProps?: any) {
     return mount(
       <Provider store={mockStore}>
-        <FiltersConfigModal {...mockedProps} {...overridesProps} />
+        <DndProvider backend={HTML5Backend}>
+          <FiltersConfigModal {...mockedProps} {...overridesProps} />
+        </DndProvider>
       </Provider>,
     );
   }

diff --git a/superset-frontend/spec/javascripts/dashboard/fixtures/mockNativeFilters.ts b/superset-frontend/spec/javascripts/dashboard/fixtures/mockNativeFilters.ts
@@ -32,8 +32,8 @@ export const mockDataMaskInfo: DataMaskStateWithId = {
 
 export const nativeFiltersInfo: NativeFiltersState = {
   filterSets: {
-    'set-id': {
-      id: 'DefaultsID',
+    '1': {
+      id: 1,
       name: 'Set name',
       nativeFilters: {},
       dataMask: mockDataMaskInfo,

diff --git a/superset-frontend/src/dashboard/actions/hydrate.js b/superset-frontend/src/dashboard/actions/hydrate.js
@@ -280,7 +280,6 @@ export const hydrateDashboard = (dashboardData, chartData) => (
 
   const nativeFilters = getInitialNativeFilterState({
     filterConfig: metadata?.native_filter_configuration || [],
-    filterSetsConfig: metadata?.filter_sets_configuration || [],
   });
 
   if (!metadata) {