QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-05-12 19:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allowing to integrate time as a groupby value (#3229)

Browse Source
This commit is contained in:
Maxime Beauchemin
2017-08-02 21:33:27 -07:00
committed by GitHub
parent 91bd38a851
commit 4ea770068b
5 changed files with 47 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
superset/assets/javascripts/explore/stores/controls.jsx
View File

@@ -28,6 +28,36 @@ export const D3_TIME_FORMAT_OPTIONS = [
['%H:%M:%S', '%H:%M:%S | 01:32:10'],
];
const timeColumnOption = {
verbose_name: 'Time',
column_name: '__timestamp',
description: (
'A reference to the [Time] configuration, taking granularity into ' +
'account'),
};
const groupByControl = {
type: 'SelectControl',
multi: true,
label: 'Group by',
default: [],
includeTime: false,
description: 'One or many controls to group by',
optionRenderer: c => <ColumnOption column={c} />,
valueRenderer: c => <ColumnOption column={c} />,
valueKey: 'column_name',
mapStateToProps: (state, control) => {
const newState = {};
if (state.datasource) {
newState.options = state.datasource.columns.filter(c => c.groupby);
if (control && control.includeTime) {
newState.options.push(timeColumnOption);
}
}
return newState;
},
};
export const controls = {
datasource: {
type: 'DatasourceControl',
@@ -323,33 +353,12 @@ export const controls = {
'to find in the [country] column',
},
groupby: {
type: 'SelectControl',
multi: true,
label: 'Group by',
default: [],
description: 'One or many controls to group by',
optionRenderer: c => <ColumnOption column={c} />,
valueRenderer: c => <ColumnOption column={c} />,
valueKey: 'column_name',
mapStateToProps: state => ({
options: (state.datasource) ? state.datasource.columns.filter(c => c.groupby) : [],
}),
},
groupby: groupByControl,
columns: {
type: 'SelectControl',
multi: true,
columns: Object.assign({}, groupByControl, {
label: 'Columns',
default: [],
description: 'One or many controls to pivot as columns',
optionRenderer: c => <ColumnOption column={c} />,
valueRenderer: c => <ColumnOption column={c} />,
valueKey: 'column_name',
mapStateToProps: state => ({
options: (state.datasource) ? state.datasource.columns : [],
}),
},
}),
all_columns: {
type: 'SelectControl',