From b63129984d0b394a4ba053c65b6f2b0e5b748ece Mon Sep 17 00:00:00 2001 From: Ville Brofeldt <33317356+villebro@users.noreply.github.com> Date: Wed, 27 May 2020 22:50:14 +0300 Subject: [PATCH] Revert "feat: bump superset-ui and implement queryFields in formData (#9908)" (#9931) This reverts commit 2c97e72959f7c79ab5ec686010e2ef7bfc118457. --- superset-frontend/package-lock.json | 18 +++++++++--------- superset-frontend/package.json | 6 +++--- .../javascripts/explore/controlUtils_spec.jsx | 6 +++--- superset-frontend/src/explore/controlUtils.js | 6 +++--- superset-frontend/src/explore/controls.jsx | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json index 7dd80f02e5d1..ce680a210c94 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -6603,9 +6603,9 @@ } }, "@superset-ui/control-utils": { - "version": "0.13.21", - "resolved": "https://registry.npmjs.org/@superset-ui/control-utils/-/control-utils-0.13.21.tgz", - "integrity": "sha512-KEDSkArY9/hTVW3wdmefbVxUdQNtOyjU3EJiJZ8zeGUZAn517MmEck9AWwKAL/UsOzccU5tq5HVwZ/eSSsmLqQ==", + "version": "0.13.12", + "resolved": "https://registry.npmjs.org/@superset-ui/control-utils/-/control-utils-0.13.12.tgz", + "integrity": "sha512-fxl9lWITCuvZjb2lTPE7X6WA01dM1BInnKktUForK7HP09K+oSaiInRdwZSVC5P9cH7xNlcbkPPh/AOC+Hk/Hg==", "requires": { "@types/react-bootstrap": "0.32.21", "lodash": "^4.17.15", @@ -7010,9 +7010,9 @@ } }, "@superset-ui/plugin-chart-word-cloud": { - "version": "0.13.21", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.13.21.tgz", - "integrity": "sha512-Y+n8jV4Nts0+qqo7qj4SjN+t4T4yAUAn8nHX1CqWnlYnVyBQfFTj3pflSQrT3Nv+jCEtbumdzFs+0tjY352gww==", + "version": "0.13.9", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.13.9.tgz", + "integrity": "sha512-2tUfQgXtzDETI7Gw4wSBDs+FnlrOkaKF4cpVqX2G/IuCc+h8UxuMbLKIp4NAMgeJ8mDbeEL+lKgnl+RDobks9w==", "requires": { "@types/d3-cloud": "^1.2.1", "@types/d3-scale": "^2.0.2", @@ -7178,9 +7178,9 @@ } }, "@superset-ui/query": { - "version": "0.13.21", - "resolved": "https://registry.npmjs.org/@superset-ui/query/-/query-0.13.21.tgz", - "integrity": "sha512-cD4o7ChFBS/9k2joYKdxqXBIyV2ZlrFVAmitNk1U4tAUE1zaipofNhZ2imV1Q3H8p8c3Fgk8QiqYOSbpyXiuQQ==" + "version": "0.13.6", + "resolved": "https://registry.npmjs.org/@superset-ui/query/-/query-0.13.6.tgz", + "integrity": "sha512-wJvqXuzv9vJNxDPKNAaHzCCly7LF8UP9AQ1zdoA88QcfYJqCzNvbt3j8XSR4nABrvNVZHnsn67wQNG4HS/IPpQ==" }, "@superset-ui/style": { "version": "0.13.11", diff --git a/superset-frontend/package.json b/superset-frontend/package.json index 3e3da9940d9e..1c16f56e2568 100644 --- 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.21", + "@superset-ui/control-utils": "^0.13.12", "@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.23", "@superset-ui/number-format": "^0.13.3", - "@superset-ui/plugin-chart-word-cloud": "^0.13.21", + "@superset-ui/plugin-chart-word-cloud": "^0.13.9", "@superset-ui/preset-chart-xy": "^0.13.11", - "@superset-ui/query": "^0.13.21", + "@superset-ui/query": "^0.13.6", "@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 index 00e252e106cc..be5dfcc3738f 100644 --- 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', - queryField: 'columns', + controlGroup: 'columns', multi: true, label: t('Columns'), default: [], @@ -250,11 +250,11 @@ describe('controlUtils', () => { }); }); - describe('queryFields', () => { + describe('controlGroup', () => { it('in formData', () => { const controlsState = getAllControlsState('table', 'table', {}, {}); const formData = getFormDataFromControls(controlsState); - expect(formData.queryFields).toEqual({ all_columns: 'columns' }); + expect(formData.controlGroups).toEqual({ all_columns: 'columns' }); }); }); }); diff --git a/superset-frontend/src/explore/controlUtils.js b/superset-frontend/src/explore/controlUtils.js index a5140bf5e747..0dd2090c86c4 100644 --- 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.queryFields = {}; + formData.controlGroups = {}; Object.keys(controlsState).forEach(controlName => { const control = controlsState[controlName]; formData[controlName] = control.value; - if (control.hasOwnProperty('queryField')) { - formData.queryFields[controlName] = control.queryField; + if (control.hasOwnProperty('controlGroup')) { + formData.controlGroups[controlName] = control.controlGroup; } }); return formData; diff --git a/superset-frontend/src/explore/controls.jsx b/superset-frontend/src/explore/controls.jsx index ce7a01dbf7c3..acdc66b2297d 100644 --- a/superset-frontend/src/explore/controls.jsx +++ b/superset-frontend/src/explore/controls.jsx @@ -125,7 +125,7 @@ const timeColumnOption = { const groupByControl = { type: 'SelectControl', - queryField: 'groupby', + controlGroup: 'groupby', multi: true, freeForm: true, label: t('Group by'), @@ -157,7 +157,7 @@ const groupByControl = { const metrics = { type: 'MetricsControl', - queryField: 'metrics', + controlGroup: 'metrics', multi: true, label: t('Metrics'), validators: [validateNonEmpty],