Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: bump superset-ui and implement queryFields in formData #9908

Merged
merged 2 commits into from May 26, 2020
Merged

feat: bump superset-ui and implement queryFields in formData #9908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9dffbb
feat: Bump superset-ui packages for queryFields
villebro May 26, 2020
18b5cad
feat: Implement queryField in formData
villebro May 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions superset-frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions superset-frontend/package.json
View file
Open in desktop
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions superset-frontend/spec/javascripts/explore/controlUtils_spec.jsx
View file
Open in desktop
Expand Up @@ -109,7 +109,7 @@ describe('controlUtils', () => {
name: 'all_columns',
config: {
type: 'SelectControl',
controlGroup: 'columns',
queryField: 'columns',
multi: true,
label: t('Columns'),
default: [],
Expand Down Expand Up @@ -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' });
});
});
});
6 changes: 3 additions & 3 deletions superset-frontend/src/explore/controlUtils.js
View file
Open in desktop
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions superset-frontend/src/explore/controls.jsx
View file
Open in desktop
Expand Up @@ -125,7 +125,7 @@ const timeColumnOption = {

const groupByControl = {
type: 'SelectControl',
controlGroup: 'groupby',
queryField: 'groupby',
multi: true,
freeForm: true,
label: t('Group by'),
Expand Down Expand Up @@ -157,7 +157,7 @@ const groupByControl = {

const metrics = {
type: 'MetricsControl',
controlGroup: 'metrics',
queryField: 'metrics',
multi: true,
label: t('Metrics'),
validators: [validateNonEmpty],
Expand Down