QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-18 07:35:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Explore] Adding custom expressions to adhoc metrics (#4736)

Browse Source 
* adding custom expressions to adhoc metrics

* adjusted transitions and made the box expandable
This commit is contained in:
Gabe Lyons
2018-04-13 11:20:53 -07:00
committed by Chris Williams
parent 4c268ec678
commit 8669874ec6
15 changed files with 430 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
superset/assets/spec/javascripts/explore/components/MetricsControl_spec.jsx
View File

@@ -8,7 +8,7 @@ import { shallow } from 'enzyme';
import MetricsControl from '../../../../javascripts/explore/components/controls/MetricsControl';
import { AGGREGATES } from '../../../../javascripts/explore/constants';
import OnPasteSelect from '../../../../javascripts/components/OnPasteSelect';
import AdhocMetric from '../../../../javascripts/explore/AdhocMetric';
import AdhocMetric, { EXPRESSION_TYPES } from '../../../../javascripts/explore/AdhocMetric';
const defaultProps = {
name: 'metrics',
@@ -73,6 +73,7 @@ describe('MetricsControl', () => {
const { wrapper } = setup({
value: [
{
expressionType: EXPRESSION_TYPES.SIMPLE,
column: { type: 'double', column_name: 'value' },
aggregate: AGGREGATES.SUM,
label: 'SUM(value)',
@@ -87,12 +88,14 @@ describe('MetricsControl', () => {
expect(adhocMetric.optionName.length).to.be.above(10);
expect(wrapper.state('value')).to.deep.equal([
{
expressionType: EXPRESSION_TYPES.SIMPLE,
column: { type: 'double', column_name: 'value' },
aggregate: AGGREGATES.SUM,
fromFormData: true,
label: 'SUM(value)',
hasCustomLabel: false,
optionName: 'blahblahblah',
sqlExpression: null,
},
'avg__value',
]);
@@ -117,12 +120,14 @@ describe('MetricsControl', () => {
const adhocMetric = onChange.lastCall.args[0][0];
expect(adhocMetric instanceof AdhocMetric).to.be.true;
expect(onChange.lastCall.args).to.deep.equal([[{
expressionType: EXPRESSION_TYPES.SIMPLE,
column: valueColumn,
aggregate: AGGREGATES.SUM,
label: 'SUM(value)',
fromFormData: false,
hasCustomLabel: false,
optionName: adhocMetric.optionName,
sqlExpression: null,
}]]);
});