mirror of
https://github.com/apache/superset.git
synced 2024-09-12 08:39:45 -04:00
Added controls for Table Viz (#1253)
* Added controls for Table Viz * Change control panel container to stateless * Changed specs * Resolved conflicts
This commit is contained in:
parent
659bf6d7e8
commit
66b498de25
@ -11,11 +11,11 @@ export const SET_GROUPBY_COLUMNS = 'SET_GROUPBY_COLUMNS';
|
|||||||
export const SET_GROUPBY_COLUMN_OPTS = 'SET_GROUPBY_COLUMN_OPTS';
|
export const SET_GROUPBY_COLUMN_OPTS = 'SET_GROUPBY_COLUMN_OPTS';
|
||||||
export const SET_METRICS = 'SET_METRICS';
|
export const SET_METRICS = 'SET_METRICS';
|
||||||
export const SET_METRICS_OPTS = 'SET_METRICS_OPTS';
|
export const SET_METRICS_OPTS = 'SET_METRICS_OPTS';
|
||||||
export const ADD_COLUMN = 'ADD_COLUMN';
|
export const SET_COLUMN_OPTS = 'SET_COLUMN_OPTS';
|
||||||
export const REMOVE_COLUMN = 'REMOVE_COLUMN';
|
export const SET_NOT_GROUPBY_COLUMNS = 'SET_NOT_GROUPBY_COLUMNS';
|
||||||
export const ADD_ORDERING = 'ADD_ORDERING';
|
export const SET_ORDERING_OPTS = 'SET_ORDERING_OPTS';
|
||||||
export const REMOVE_ORDERING = 'REMOVE_ORDERING';
|
export const SET_ORDERINGS = 'SET_ORDERINGS';
|
||||||
export const SET_TIME_STAMP = 'SET_TIME_STAMP';
|
export const SET_TIME_STAMP_FORMAT = 'SET_TIME_STAMP_FORMAT';
|
||||||
export const SET_ROW_LIMIT = 'SET_ROW_LIMIT';
|
export const SET_ROW_LIMIT = 'SET_ROW_LIMIT';
|
||||||
export const TOGGLE_SEARCHBOX = 'TOGGLE_SEARCHBOX';
|
export const TOGGLE_SEARCHBOX = 'TOGGLE_SEARCHBOX';
|
||||||
export const SET_FILTER_COLUMN_OPTS = 'SET_FILTER_COLUMN_OPTS';
|
export const SET_FILTER_COLUMN_OPTS = 'SET_FILTER_COLUMN_OPTS';
|
||||||
@ -47,6 +47,14 @@ export function setMetricsOpts(metricsOpts) {
|
|||||||
return { type: SET_METRICS_OPTS, metricsOpts };
|
return { type: SET_METRICS_OPTS, metricsOpts };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function setColumnOpts(columnOpts) {
|
||||||
|
return { type: SET_COLUMN_OPTS, columnOpts };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function setOrderingOpts(orderingOpts) {
|
||||||
|
return { type: SET_ORDERING_OPTS, orderingOpts };
|
||||||
|
}
|
||||||
|
|
||||||
export function setFilterColumnOpts(filterColumnOpts) {
|
export function setFilterColumnOpts(filterColumnOpts) {
|
||||||
return { type: SET_FILTER_COLUMN_OPTS, filterColumnOpts };
|
return { type: SET_FILTER_COLUMN_OPTS, filterColumnOpts };
|
||||||
}
|
}
|
||||||
@ -71,6 +79,8 @@ export function setFormOpts(datasourceId, datasourceType) {
|
|||||||
const metricsOpts = [];
|
const metricsOpts = [];
|
||||||
const filterColumnOpts = [];
|
const filterColumnOpts = [];
|
||||||
const timeGrainOpts = [];
|
const timeGrainOpts = [];
|
||||||
|
const columnOpts = [];
|
||||||
|
const orderingOpts = [];
|
||||||
|
|
||||||
if (datasourceId) {
|
if (datasourceId) {
|
||||||
const params = [`datasource_id=${datasourceId}`, `datasource_type=${datasourceType}`];
|
const params = [`datasource_id=${datasourceId}`, `datasource_type=${datasourceType}`];
|
||||||
@ -93,12 +103,21 @@ export function setFormOpts(datasourceId, datasourceType) {
|
|||||||
data.time_grains.forEach((d) => {
|
data.time_grains.forEach((d) => {
|
||||||
if (d) timeGrainOpts.push({ value: d, label: d });
|
if (d) timeGrainOpts.push({ value: d, label: d });
|
||||||
});
|
});
|
||||||
|
data.columns.forEach((d) => {
|
||||||
|
if (d) columnOpts.push({ value: d, label: d });
|
||||||
|
});
|
||||||
|
data.ordering_cols.forEach((d) => {
|
||||||
|
if (d) orderingOpts.push({ value: d, label: d });
|
||||||
|
});
|
||||||
|
|
||||||
// Repopulate options for controls
|
// Repopulate options for controls
|
||||||
dispatch(setTimeColumnOpts(timeColumnOpts));
|
dispatch(setTimeColumnOpts(timeColumnOpts));
|
||||||
dispatch(setTimeGrainOpts(timeGrainOpts));
|
dispatch(setTimeGrainOpts(timeGrainOpts));
|
||||||
dispatch(setGroupByColumnOpts(groupByColumnOpts));
|
dispatch(setGroupByColumnOpts(groupByColumnOpts));
|
||||||
dispatch(setMetricsOpts(metricsOpts));
|
dispatch(setMetricsOpts(metricsOpts));
|
||||||
dispatch(setFilterColumnOpts(filterColumnOpts));
|
dispatch(setFilterColumnOpts(filterColumnOpts));
|
||||||
|
dispatch(setColumnOpts(columnOpts));
|
||||||
|
dispatch(setOrderingOpts(orderingOpts));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
@ -140,24 +159,16 @@ export function setMetrics(metrics) {
|
|||||||
return { type: SET_METRICS, metrics };
|
return { type: SET_METRICS, metrics };
|
||||||
}
|
}
|
||||||
|
|
||||||
export function addColumn(column) {
|
export function setNotGroupByColumns(columns) {
|
||||||
return { type: ADD_COLUMN, column };
|
return { type: SET_NOT_GROUPBY_COLUMNS, columns };
|
||||||
}
|
}
|
||||||
|
|
||||||
export function removeColumn(column) {
|
export function setOrderings(orderings) {
|
||||||
return { type: REMOVE_COLUMN, column };
|
return { type: SET_ORDERINGS, orderings };
|
||||||
}
|
}
|
||||||
|
|
||||||
export function addOrdering(ordering) {
|
export function setTimeStampFormat(timeStampFormat) {
|
||||||
return { type: ADD_ORDERING, ordering };
|
return { type: SET_TIME_STAMP_FORMAT, timeStampFormat };
|
||||||
}
|
|
||||||
|
|
||||||
export function removeOrdering(ordering) {
|
|
||||||
return { type: REMOVE_ORDERING, ordering };
|
|
||||||
}
|
|
||||||
|
|
||||||
export function setTimeStamp(timeStampFormat) {
|
|
||||||
return { type: SET_TIME_STAMP, timeStampFormat };
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function setRowLimit(rowLimit) {
|
export function setRowLimit(rowLimit) {
|
||||||
|
@ -1,20 +1,36 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
import { connect } from 'react-redux';
|
||||||
import { Panel } from 'react-bootstrap';
|
import { Panel } from 'react-bootstrap';
|
||||||
import TimeFilter from './TimeFilter';
|
import { DefaultControls, VIZ_CONTROL_MAPPING } from '../constants';
|
||||||
import ChartControl from './ChartControl';
|
|
||||||
import GroupBy from './GroupBy';
|
|
||||||
import SqlClause from './SqlClause';
|
|
||||||
import Filters from './Filters';
|
|
||||||
|
|
||||||
const ControlPanelsContainer = function () {
|
const propTypes = {
|
||||||
|
vizType: React.PropTypes.string,
|
||||||
|
};
|
||||||
|
|
||||||
|
const defaultProps = {
|
||||||
|
vizType: null,
|
||||||
|
};
|
||||||
|
|
||||||
|
function ControlPanelsContainer(props) {
|
||||||
return (
|
return (
|
||||||
<Panel>
|
<Panel>
|
||||||
<ChartControl />
|
{DefaultControls}
|
||||||
<TimeFilter />
|
{VIZ_CONTROL_MAPPING[props.vizType]}
|
||||||
<GroupBy />
|
|
||||||
<SqlClause />
|
|
||||||
<Filters />
|
|
||||||
</Panel>
|
</Panel>
|
||||||
);
|
);
|
||||||
};
|
}
|
||||||
export default ControlPanelsContainer;
|
|
||||||
|
ControlPanelsContainer.propTypes = propTypes;
|
||||||
|
ControlPanelsContainer.defaultProps = defaultProps;
|
||||||
|
|
||||||
|
function mapStateToProps(state) {
|
||||||
|
return {
|
||||||
|
vizType: state.vizType,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function mapDispatchToProps() {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps, mapDispatchToProps)(ControlPanelsContainer);
|
||||||
|
@ -109,7 +109,6 @@ class Filters extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Filters.propTypes = propTypes;
|
Filters.propTypes = propTypes;
|
||||||
|
|
||||||
Filters.defaultProps = defaultProps;
|
Filters.defaultProps = defaultProps;
|
||||||
|
|
||||||
function mapStateToProps(state) {
|
function mapStateToProps(state) {
|
||||||
|
@ -20,11 +20,11 @@ const defaultProps = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
class GroupBy extends React.Component {
|
class GroupBy extends React.Component {
|
||||||
changeColumns(groupByColumnOpts) {
|
changeColumns(groupByColumns) {
|
||||||
this.props.actions.setGroupByColumns(groupByColumnOpts);
|
this.props.actions.setGroupByColumns(groupByColumns);
|
||||||
}
|
}
|
||||||
changeMetrics(metricsOpts) {
|
changeMetrics(metrics) {
|
||||||
this.props.actions.setMetrics(metricsOpts);
|
this.props.actions.setMetrics(metrics);
|
||||||
}
|
}
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
|
@ -0,0 +1,82 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import Select from 'react-select';
|
||||||
|
import { bindActionCreators } from 'redux';
|
||||||
|
import * as actions from '../actions/exploreActions';
|
||||||
|
import { connect } from 'react-redux';
|
||||||
|
|
||||||
|
const propTypes = {
|
||||||
|
actions: React.PropTypes.object,
|
||||||
|
columnOpts: React.PropTypes.array,
|
||||||
|
columns: React.PropTypes.array,
|
||||||
|
orderingOpts: React.PropTypes.array,
|
||||||
|
orderings: React.PropTypes.array,
|
||||||
|
};
|
||||||
|
|
||||||
|
const defaultProps = {
|
||||||
|
columnOpts: [],
|
||||||
|
columns: [],
|
||||||
|
orderingOpts: [],
|
||||||
|
orderings: [],
|
||||||
|
};
|
||||||
|
|
||||||
|
class NotGroupBy extends React.Component {
|
||||||
|
changeColumns(columns) {
|
||||||
|
this.props.actions.setNotGroupByColumns(columns);
|
||||||
|
}
|
||||||
|
changeOrderings(orderings) {
|
||||||
|
this.props.actions.setOrderings(orderings);
|
||||||
|
}
|
||||||
|
render() {
|
||||||
|
return (
|
||||||
|
<div className="panel space-1">
|
||||||
|
<div className="panel-header">Not GroupBy</div>
|
||||||
|
<div className="panel-body">
|
||||||
|
<div className="row">
|
||||||
|
<h5 className="section-heading">Columns</h5>
|
||||||
|
<Select
|
||||||
|
multi
|
||||||
|
name="select-column"
|
||||||
|
placeholder="Select columns"
|
||||||
|
options={this.props.columnOpts}
|
||||||
|
value={this.props.columns}
|
||||||
|
autosize={false}
|
||||||
|
onChange={this.changeColumns.bind(this)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="row">
|
||||||
|
<h5 className="section-heading">Orderings</h5>
|
||||||
|
<Select
|
||||||
|
multi
|
||||||
|
name="select-orderings"
|
||||||
|
placeholder="Select orderings"
|
||||||
|
options={this.props.orderingOpts}
|
||||||
|
value={this.props.orderings}
|
||||||
|
autosize={false}
|
||||||
|
onChange={this.changeOrderings.bind(this)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
NotGroupBy.propTypes = propTypes;
|
||||||
|
NotGroupBy.defaultProps = defaultProps;
|
||||||
|
|
||||||
|
function mapStateToProps(state) {
|
||||||
|
return {
|
||||||
|
columnOpts: state.columnOpts,
|
||||||
|
columns: state.columns,
|
||||||
|
orderingOpts: state.orderingOpts,
|
||||||
|
orderings: state.orderings,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function mapDispatchToProps(dispatch) {
|
||||||
|
return {
|
||||||
|
actions: bindActionCreators(actions, dispatch),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps, mapDispatchToProps)(NotGroupBy);
|
76
caravel/assets/javascripts/explorev2/components/Options.jsx
Normal file
76
caravel/assets/javascripts/explorev2/components/Options.jsx
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import Select from 'react-select';
|
||||||
|
import { bindActionCreators } from 'redux';
|
||||||
|
import * as actions from '../actions/exploreActions';
|
||||||
|
import { connect } from 'react-redux';
|
||||||
|
import { timestampOptions, rowLimitOptions } from '../constants';
|
||||||
|
|
||||||
|
const propTypes = {
|
||||||
|
actions: React.PropTypes.object,
|
||||||
|
timeStampFormat: React.PropTypes.string,
|
||||||
|
rowLimit: React.PropTypes.number,
|
||||||
|
};
|
||||||
|
|
||||||
|
const defaultProps = {
|
||||||
|
timeStampFormat: null,
|
||||||
|
rowLimit: null,
|
||||||
|
};
|
||||||
|
|
||||||
|
class Options extends React.Component {
|
||||||
|
changeTimeStampFormat(timeStampFormat) {
|
||||||
|
const val = (timeStampFormat) ? timeStampFormat.value : null;
|
||||||
|
this.props.actions.setTimeStampFormat(val);
|
||||||
|
}
|
||||||
|
changeRowLimit(rowLimit) {
|
||||||
|
this.props.actions.setRowLimit(rowLimit);
|
||||||
|
}
|
||||||
|
render() {
|
||||||
|
return (
|
||||||
|
<div className="panel space-1">
|
||||||
|
<div className="panel-header">Options</div>
|
||||||
|
<div className="panel-body">
|
||||||
|
<div className="row">
|
||||||
|
<h5 className="section-heading">Table Timestamp Format</h5>
|
||||||
|
<Select
|
||||||
|
name="select-timestamp-format"
|
||||||
|
placeholder="Select timestamp format"
|
||||||
|
options={timestampOptions.map((t) => ({ value: t[0], label: t[1] }))}
|
||||||
|
value={this.props.timeStampFormat}
|
||||||
|
autosize={false}
|
||||||
|
onChange={this.changeTimeStampFormat.bind(this)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="row">
|
||||||
|
<h5 className="section-heading">Row Limit</h5>
|
||||||
|
<Select
|
||||||
|
name="select-row-limit"
|
||||||
|
placeholder="Select row limit"
|
||||||
|
options={rowLimitOptions.map((r) => ({ value: r, label: r }))}
|
||||||
|
value={this.props.rowLimit}
|
||||||
|
autosize={false}
|
||||||
|
onChange={this.changeRowLimit.bind(this)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Options.propTypes = propTypes;
|
||||||
|
Options.defaultProps = defaultProps;
|
||||||
|
|
||||||
|
function mapStateToProps(state) {
|
||||||
|
return {
|
||||||
|
timeStampFormat: state.timeStampFormat,
|
||||||
|
rowLimit: state.rowLimit,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function mapDispatchToProps(dispatch) {
|
||||||
|
return {
|
||||||
|
actions: bindActionCreators(actions, dispatch),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps, mapDispatchToProps)(Options);
|
@ -1,3 +1,12 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import TimeFilter from './components/TimeFilter';
|
||||||
|
import ChartControl from './components/ChartControl';
|
||||||
|
import GroupBy from './components/GroupBy';
|
||||||
|
import SqlClause from './components/SqlClause';
|
||||||
|
import Filters from './components/Filters';
|
||||||
|
import NotGroupBy from './components/NotGroupBy';
|
||||||
|
import Options from './components/Options';
|
||||||
|
|
||||||
export const VIZ_TYPES = [
|
export const VIZ_TYPES = [
|
||||||
{ value: 'dist_bar', label: 'Distribution - Bar Chart', requiresTime: false },
|
{ value: 'dist_bar', label: 'Distribution - Bar Chart', requiresTime: false },
|
||||||
{ value: 'pie', label: 'Pie Chart', requiresTime: false },
|
{ value: 'pie', label: 'Pie Chart', requiresTime: false },
|
||||||
@ -33,3 +42,35 @@ export const sinceOptions = ['1 hour ago', '12 hours ago', '1 day ago',
|
|||||||
'7 days ago', '28 days ago', '90 days ago', '1 year ago'];
|
'7 days ago', '28 days ago', '90 days ago', '1 year ago'];
|
||||||
export const untilOptions = ['now', '1 day ago', '7 days ago',
|
export const untilOptions = ['now', '1 day ago', '7 days ago',
|
||||||
'28 days ago', '90 days ago', '1 year ago'];
|
'28 days ago', '90 days ago', '1 year ago'];
|
||||||
|
|
||||||
|
export const timestampOptions = [
|
||||||
|
['smart_date', 'Adaptative formating'],
|
||||||
|
['%m/%d/%Y', '"%m/%d/%Y" | 01/14/2019'],
|
||||||
|
['%Y-%m-%d', '"%Y-%m-%d" | 2019-01-14'],
|
||||||
|
['%Y-%m-%d %H:%M:%S',
|
||||||
|
'"%Y-%m-%d %H:%M:%S" | 2019-01-14 01:32:10'],
|
||||||
|
['%H:%M:%S', '"%H:%M:%S" | 01:32:10'],
|
||||||
|
];
|
||||||
|
|
||||||
|
export const rowLimitOptions = [10, 50, 100, 250, 500, 1000, 5000, 10000, 50000];
|
||||||
|
|
||||||
|
export const DefaultControls = (
|
||||||
|
<div>
|
||||||
|
<ChartControl />
|
||||||
|
<TimeFilter />
|
||||||
|
<GroupBy />
|
||||||
|
<SqlClause />
|
||||||
|
<Filters />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
|
||||||
|
export const TableVizControls = (
|
||||||
|
<div>
|
||||||
|
<NotGroupBy />
|
||||||
|
<Options />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
|
||||||
|
export const VIZ_CONTROL_MAPPING = {
|
||||||
|
table: TableVizControls,
|
||||||
|
};
|
||||||
|
@ -40,31 +40,19 @@ export const exploreReducer = function (state, action) {
|
|||||||
[actions.SET_METRICS]() {
|
[actions.SET_METRICS]() {
|
||||||
return Object.assign({}, state, { metrics: action.metrics });
|
return Object.assign({}, state, { metrics: action.metrics });
|
||||||
},
|
},
|
||||||
[actions.ADD_COLUMN]() {
|
[actions.SET_COLUMN_OPTS]() {
|
||||||
return Object.assign({}, state, { columns: [...state.columns, action.column] });
|
return Object.assign({}, state, { columnOpts: action.columnOpts });
|
||||||
},
|
},
|
||||||
[actions.REMOVE_COLUMN]() {
|
[actions.SET_NOT_GROUPBY_COLUMNS]() {
|
||||||
const newColumns = [];
|
return Object.assign({}, state, { columns: action.columns });
|
||||||
state.columns.forEach((c) => {
|
|
||||||
if (c !== action.column) {
|
|
||||||
newColumns.push(c);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return Object.assign({}, state, { columns: newColumns });
|
|
||||||
},
|
},
|
||||||
[actions.ADD_ORDERING]() {
|
[actions.SET_ORDERING_OPTS]() {
|
||||||
return Object.assign({}, state, { orderings: [...state.orderings, action.ordering] });
|
return Object.assign({}, state, { orderingOpts: action.orderingOpts });
|
||||||
},
|
},
|
||||||
[actions.REMOVE_ORDERING]() {
|
[actions.SET_ORDERINGS]() {
|
||||||
const newOrderings = [];
|
return Object.assign({}, state, { orderings: action.orderings });
|
||||||
state.orderings.forEach((o) => {
|
|
||||||
if (o !== action.ordering) {
|
|
||||||
newOrderings.push(o);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return Object.assign({}, state, { orderings: newOrderings });
|
|
||||||
},
|
},
|
||||||
[actions.SET_TIME_STAMP]() {
|
[actions.SET_TIME_STAMP_FORMAT]() {
|
||||||
return Object.assign({}, state, { timeStampFormat: action.timeStampFormat });
|
return Object.assign({}, state, { timeStampFormat: action.timeStampFormat });
|
||||||
},
|
},
|
||||||
[actions.SET_ROW_LIMIT]() {
|
[actions.SET_ROW_LIMIT]() {
|
||||||
|
@ -13,10 +13,12 @@ export const initialState = {
|
|||||||
groupByColumns: [],
|
groupByColumns: [],
|
||||||
metricsOpts: [],
|
metricsOpts: [],
|
||||||
metrics: [],
|
metrics: [],
|
||||||
|
columnOpts: [],
|
||||||
columns: [],
|
columns: [],
|
||||||
|
orderingOpts: [],
|
||||||
orderings: [],
|
orderings: [],
|
||||||
timeStampFormat: null,
|
timeStampFormat: 'smart_date',
|
||||||
rowLimit: null,
|
rowLimit: 50000,
|
||||||
searchBox: false,
|
searchBox: false,
|
||||||
whereClause: '',
|
whereClause: '',
|
||||||
havingClause: '',
|
havingClause: '',
|
||||||
@ -35,8 +37,8 @@ export const defaultFormData = {
|
|||||||
metrics: [],
|
metrics: [],
|
||||||
columns: [],
|
columns: [],
|
||||||
orderings: [],
|
orderings: [],
|
||||||
timeStampFormat: null,
|
timeStampFormat: 'smart_date',
|
||||||
rowLimit: null,
|
rowLimit: 50000,
|
||||||
searchBox: false,
|
searchBox: false,
|
||||||
whereClause: '',
|
whereClause: '',
|
||||||
havingClause: '',
|
havingClause: '',
|
||||||
@ -49,4 +51,6 @@ export const defaultOpts = {
|
|||||||
groupByColumnOpts: [],
|
groupByColumnOpts: [],
|
||||||
metricsOpts: [],
|
metricsOpts: [],
|
||||||
filterColumnOpts: [],
|
filterColumnOpts: [],
|
||||||
|
columnOpts: [],
|
||||||
|
orderingOpts: [],
|
||||||
};
|
};
|
||||||
|
@ -16,34 +16,20 @@ describe('reducers', () => {
|
|||||||
expect(newState.vizType).to.equal('bar');
|
expect(newState.vizType).to.equal('bar');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should return new state with added column', () => {
|
it('should return new state with not groupby columns', () => {
|
||||||
const newColumn = 'col';
|
const newColumn = ['col'];
|
||||||
const newState = exploreReducer(initialState, actions.addColumn(newColumn));
|
const newState = exploreReducer(initialState, actions.setNotGroupByColumns(newColumn));
|
||||||
expect(newState.columns).to.deep.equal([newColumn]);
|
expect(newState.columns).to.deep.equal(['col']);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should return new state with removed column', () => {
|
it('should return new state with orderings', () => {
|
||||||
const testState = { initialState, columns: ['col1', 'col2'] };
|
const newOrdering = ['ord'];
|
||||||
const remColumn = 'col1';
|
const newState = exploreReducer(initialState, actions.setOrderings(newOrdering));
|
||||||
const newState = exploreReducer(testState, actions.removeColumn(remColumn));
|
|
||||||
expect(newState.columns).to.deep.equal(['col2']);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should return new state with added ordering', () => {
|
|
||||||
const newOrdering = 'ord';
|
|
||||||
const newState = exploreReducer(initialState, actions.addOrdering(newOrdering));
|
|
||||||
expect(newState.orderings).to.deep.equal(['ord']);
|
expect(newState.orderings).to.deep.equal(['ord']);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should return new state with removed ordering', () => {
|
|
||||||
const testState = { initialState, orderings: ['ord1', 'ord2'] };
|
|
||||||
const remOrdering = 'ord1';
|
|
||||||
const newState = exploreReducer(testState, actions.removeOrdering(remOrdering));
|
|
||||||
expect(newState.orderings).to.deep.equal(['ord2']);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should return new state with time stamp', () => {
|
it('should return new state with time stamp', () => {
|
||||||
const newState = exploreReducer(initialState, actions.setTimeStamp(1));
|
const newState = exploreReducer(initialState, actions.setTimeStampFormat(1));
|
||||||
expect(newState.timeStampFormat).to.equal(1);
|
expect(newState.timeStampFormat).to.equal(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -1958,10 +1958,16 @@ class Caravel(BaseCaravelView):
|
|||||||
if not self.datasource_access(datasource):
|
if not self.datasource_access(datasource):
|
||||||
return json_error_response(DATASOURCE_ACCESS_ERR)
|
return json_error_response(DATASOURCE_ACCESS_ERR)
|
||||||
|
|
||||||
|
order_by_choices = []
|
||||||
|
for s in sorted(datasource.num_cols):
|
||||||
|
order_by_choices.append(s + ' [asc]')
|
||||||
|
order_by_choices.append(s + ' [desc]')
|
||||||
column_opts = {
|
column_opts = {
|
||||||
"groupby_cols": datasource.groupby_column_names,
|
"groupby_cols": datasource.groupby_column_names,
|
||||||
"metrics": datasource.metrics_combo,
|
"metrics": datasource.metrics_combo,
|
||||||
"filter_cols": datasource.filterable_column_names
|
"filter_cols": datasource.filterable_column_names,
|
||||||
|
"columns": datasource.column_names,
|
||||||
|
"ordering_cols": order_by_choices
|
||||||
}
|
}
|
||||||
form_data = dict(
|
form_data = dict(
|
||||||
column_opts.items() + datasource.time_column_grains.items()
|
column_opts.items() + datasource.time_column_grains.items()
|
||||||
|
Loading…
Reference in New Issue
Block a user