feat: bump superset-ui and implement queryFields in formData (apache#…

…9908) * feat: Bump superset-ui packages for queryFields * feat: Implement queryField in formData
auxten · Nov 20, 2020 · a5d0517 · a5d0517
1 parent 6d29205
commit a5d0517
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 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
@@ -63,7 +63,7 @@
     "@superset-ui/chart-composition": "^0.13.5",
     "@superset-ui/color": "^0.13.3",
     "@superset-ui/connection": "^0.13.5",
-    "@superset-ui/control-utils": "^0.13.12",
+    "@superset-ui/control-utils": "^0.13.21",
     "@superset-ui/core": "^0.13.5",
     "@superset-ui/dimension": "^0.13.3",
     "@superset-ui/legacy-plugin-chart-calendar": "^0.13.6",
@@ -91,9 +91,9 @@
     "@superset-ui/legacy-preset-chart-deckgl": "^0.2.3",
     "@superset-ui/legacy-preset-chart-nvd3": "^0.13.13",
     "@superset-ui/number-format": "^0.13.3",
-    "@superset-ui/plugin-chart-word-cloud": "^0.13.9",
+    "@superset-ui/plugin-chart-word-cloud": "^0.13.21",
     "@superset-ui/preset-chart-xy": "^0.13.11",
-    "@superset-ui/query": "^0.13.6",
+    "@superset-ui/query": "^0.13.21",
     "@superset-ui/style": "^0.13.11",
     "@superset-ui/time-format": "^0.13.15",
     "@superset-ui/translation": "^0.13.3",

diff --git a/superset-frontend/spec/javascripts/explore/controlUtils_spec.jsx b/superset-frontend/spec/javascripts/explore/controlUtils_spec.jsx
@@ -109,7 +109,7 @@ describe('controlUtils', () => {
                   name: 'all_columns',
                   config: {
                     type: 'SelectControl',
-                    controlGroup: 'columns',
+                    queryField: 'columns',
                     multi: true,
                     label: t('Columns'),
                     default: [],
@@ -250,11 +250,11 @@ describe('controlUtils', () => {
     });
   });
 
-  describe('controlGroup', () => {
+  describe('queryFields', () => {
     it('in formData', () => {
       const controlsState = getAllControlsState('table', 'table', {}, {});
       const formData = getFormDataFromControls(controlsState);
-      expect(formData.controlGroups).toEqual({ all_columns: 'columns' });
+      expect(formData.queryFields).toEqual({ all_columns: 'columns' });
     });
   });
 });
diff --git a/superset-frontend/src/explore/controlUtils.js b/superset-frontend/src/explore/controlUtils.js
@@ -22,12 +22,12 @@ import * as SECTIONS from './controlPanels/sections';
 
 export function getFormDataFromControls(controlsState) {
   const formData = {};
-  formData.controlGroups = {};
+  formData.queryFields = {};
   Object.keys(controlsState).forEach(controlName => {
     const control = controlsState[controlName];
     formData[controlName] = control.value;
-    if (control.hasOwnProperty('controlGroup')) {
-      formData.controlGroups[controlName] = control.controlGroup;
+    if (control.hasOwnProperty('queryField')) {
+      formData.queryFields[controlName] = control.queryField;
     }
   });
   return formData;

diff --git a/superset-frontend/src/explore/controls.jsx b/superset-frontend/src/explore/controls.jsx
@@ -125,7 +125,7 @@ const timeColumnOption = {
 
 const groupByControl = {
   type: 'SelectControl',
-  controlGroup: 'groupby',
+  queryField: 'groupby',
   multi: true,
   freeForm: true,
   label: t('Group by'),
@@ -157,7 +157,7 @@ const groupByControl = {
 
 const metrics = {
   type: 'MetricsControl',
-  controlGroup: 'metrics',
+  queryField: 'metrics',
   multi: true,
   label: t('Metrics'),
   validators: [validateNonEmpty],