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

[Lens] Rename operations to map exposed names for Formula #94710

Merged
merged 19 commits into from
Mar 26, 2021
Merged

[Lens] Rename operations to map exposed names for Formula #94710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
339e002
:truck: Rename operations to map exposed names
dej611 Mar 16, 2021
f1bc7c0
:sparkles: Add migration for ops renaming
dej611 Mar 16, 2021
afca41d
:white_mark_check: Add migration for savedObjects
dej611 Mar 16, 2021
2097bde
:bug: Fix more tests for the rename
dej611 Mar 16, 2021
6c62415
:bug: Fix for operation rename
dej611 Mar 16, 2021
cc43138
:white_check_mark: Fix functional tests for rename
dej611 Mar 16, 2021
caf55e3
:white_check_mark: Fixing last tests
dej611 Mar 17, 2021
4277703
:bug: Missing test fixed
dej611 Mar 17, 2021
c4fb048
Merge branch 'master' into fix/94150
kibanamachine Mar 17, 2021
94d8fd2
Merge branch 'master' into fix/94150
kibanamachine Mar 18, 2021
f6ae901
Merge remote-tracking branch 'upstream/master' into fix/94150
dej611 Mar 24, 2021
2fbde05
:ok_hand: Reuse constant name
dej611 Mar 24, 2021
1e1fc4b
:bug: Map aggregation names to new ones for restrictions
dej611 Mar 24, 2021
f0e1aa3
Merge branch 'fix/94150' of github.com:dej611/kibana into fix/94150
dej611 Mar 24, 2021
0ceec81
:bug: Fix expression issue
dej611 Mar 24, 2021
dd4d5fa
:ok_hand: remove derivative mapping
dej611 Mar 24, 2021
5c51dd4
Merge remote-tracking branch 'upstream/master' into fix/94150
dej611 Mar 24, 2021
29332a1
:label: Fix test type issue
dej611 Mar 24, 2021
b298e4d
Merge branch 'master' into fix/94150
kibanamachine Mar 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ const initialState: IndexPatternPrivateState = {
label: 'My Op',
dataType: 'number',
isBucketed: false,
operationType: 'avg',
operationType: 'average',
sourceField: 'memory',
},
},
Expand All @@ -200,7 +200,7 @@ const initialState: IndexPatternPrivateState = {
label: 'My Op',
dataType: 'number',
isBucketed: false,
operationType: 'avg',
operationType: 'average',
sourceField: 'bytes',
},
},
Expand Down
2 changes: 1 addition & 1 deletion ...lugins/lens/public/indexpattern_datasource/dimension_panel/bucket_nesting_editor.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ describe('BucketNestingEditor', () => {
layer={{
columnOrder: ['a', 'b', 'c'],
columns: {
a: mockCol({ operationType: 'avg', isBucketed: false }),
a: mockCol({ operationType: 'average', isBucketed: false }),
b: mockCol({ operationType: 'max', isBucketed: false }),
c: mockCol({ operationType: 'min', isBucketed: false }),
},
Expand Down
58 changes: 30 additions & 28 deletions x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
label: 'Unique count of source',
dataType: 'number',
isBucketed: false,
operationType: 'cardinality',
operationType: 'unique_count',
sourceField: 'source,',
},
})}
Expand Down Expand Up @@ -414,7 +414,7 @@ describe('IndexPatternDimensionEditorPanel', () => {

const items: EuiListGroupItemProps[] = wrapper.find(EuiListGroup).prop('listItems') || [];

expect(items.find(({ id }) => id === 'derivative')!['data-test-subj']).toContain(
expect(items.find(({ id }) => id === 'differences')!['data-test-subj']).toContain(
'incompatible'
);
expect(items.find(({ id }) => id === 'cumulative_sum')!['data-test-subj']).toContain(
Expand Down Expand Up @@ -462,7 +462,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
'incompatible'
);

expect(items.find(({ id }) => id === 'derivative')!['data-test-subj']).not.toContain(
expect(items.find(({ id }) => id === 'differences')!['data-test-subj']).not.toContain(
'incompatible'
);
expect(items.find(({ id }) => id === 'moving_average')!['data-test-subj']).not.toContain(
Expand Down Expand Up @@ -817,15 +817,15 @@ describe('IndexPatternDimensionEditorPanel', () => {
it('should select compatible operation if field not compatible with selected operation', () => {
wrapper = mount(<IndexPatternDimensionEditorComponent {...defaultProps} columnId={'col2'} />);

wrapper.find('button[data-test-subj="lns-indexPatternDimension-avg"]').simulate('click');
wrapper.find('button[data-test-subj="lns-indexPatternDimension-average"]').simulate('click');
expect(setState).toHaveBeenCalledWith(
{
...state,
layers: {
first: {
...state.layers.first,
incompleteColumns: {
col2: { operationType: 'avg' },
col2: { operationType: 'average' },
},
},
},
Expand All @@ -838,7 +838,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
.filter('[data-test-subj="indexPattern-dimension-field"]');
const options = comboBox.prop('options');

// options[1][2] is a `source` field of type `string` which doesn't support `avg` operation
// options[1][2] is a `source` field of type `string` which doesn't support `average` operation
act(() => {
comboBox.prop('onChange')!([options![1].options![2]]);
});
Expand Down Expand Up @@ -885,7 +885,7 @@ describe('IndexPatternDimensionEditorPanel', () => {

// Transition to a field operation (incompatible)
wrapper
.find('button[data-test-subj="lns-indexPatternDimension-avg incompatible"]')
.find('button[data-test-subj="lns-indexPatternDimension-average incompatible"]')
.simulate('click');

// Now check that the dimension gets cleaned up on state update
Expand All @@ -896,7 +896,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
first: {
...state.layers.first,
incompleteColumns: {
col2: { operationType: 'avg' },
col2: { operationType: 'average' },
},
},
},
Expand All @@ -914,7 +914,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
dataType: 'number',
isBucketed: false,
label: '',
operationType: 'avg',
operationType: 'average',
sourceField: 'bytes',
},
})}
Expand Down Expand Up @@ -1037,7 +1037,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
wrapper = shallow(
<IndexPatternDimensionEditorComponent
{...getProps({
operationType: 'avg',
operationType: 'average',
sourceField: 'bytes',
})}
/>
Expand Down Expand Up @@ -1143,7 +1143,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
label: 'Sum of bytes per hour',
});
wrapper = mount(<IndexPatternDimensionEditorComponent {...props} />);
wrapper.find('button[data-test-subj="lns-indexPatternDimension-avg"]').simulate('click');
wrapper.find('button[data-test-subj="lns-indexPatternDimension-average"]').simulate('click');
expect(props.setState).toHaveBeenCalledWith(
{
...props.state,
Expand Down Expand Up @@ -1478,7 +1478,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
it('should support selecting the operation before the field', () => {
wrapper = mount(<IndexPatternDimensionEditorComponent {...defaultProps} columnId={'col2'} />);

wrapper.find('button[data-test-subj="lns-indexPatternDimension-avg"]').simulate('click');
wrapper.find('button[data-test-subj="lns-indexPatternDimension-average"]').simulate('click');

expect(setState).toHaveBeenCalledWith(
{
Expand All @@ -1488,7 +1488,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
...state.layers.first,
incompleteColumns: {
col2: {
operationType: 'avg',
operationType: 'average',
},
},
},
Expand Down Expand Up @@ -1516,7 +1516,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
columns: {
...state.layers.first.columns,
col2: expect.objectContaining({
operationType: 'avg',
operationType: 'average',
sourceField: 'bytes',
}),
},
Expand Down Expand Up @@ -1547,7 +1547,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
/>
);

wrapper.find('button[data-test-subj="lns-indexPatternDimension-avg"]').simulate('click');
wrapper.find('button[data-test-subj="lns-indexPatternDimension-average"]').simulate('click');

expect(setState).toHaveBeenCalledWith(
{
Expand All @@ -1559,7 +1559,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
...initialState.layers.first.columns,
col2: expect.objectContaining({
sourceField: 'bytes',
operationType: 'avg',
operationType: 'average',
// Other parts of this don't matter for this test
}),
},
Expand Down Expand Up @@ -1601,7 +1601,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
wrapper = mount(<IndexPatternDimensionEditorComponent {...defaultProps} columnId={'col2'} />);

act(() => {
wrapper.find('button[data-test-subj="lns-indexPatternDimension-avg"]').simulate('click');
wrapper.find('button[data-test-subj="lns-indexPatternDimension-average"]').simulate('click');
});

const options = wrapper
Expand Down Expand Up @@ -1790,7 +1790,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
dataType: 'number',
isBucketed: false,
// Private
operationType: 'avg',
operationType: 'average',
sourceField: 'memory',
},
});
Expand Down Expand Up @@ -1831,7 +1831,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
dataType: 'number',
isBucketed: false,
// Private
operationType: 'avg',
operationType: 'average',
sourceField: 'memory',
params: {
format: { id: 'bytes', params: { decimals: 0 } },
Expand Down Expand Up @@ -1871,7 +1871,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
dataType: 'number',
isBucketed: false,
// Private
operationType: 'avg',
operationType: 'average',
sourceField: 'memory',
params: {
format: { id: 'bytes', params: { decimals: 2 } },
Expand Down Expand Up @@ -1914,7 +1914,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
expect(wrapper.find('ReferenceEditor')).toHaveLength(0);

wrapper
.find('button[data-test-subj="lns-indexPatternDimension-derivative incompatible"]')
.find('button[data-test-subj="lns-indexPatternDimension-differences incompatible"]')
.simulate('click');

expect(wrapper.find('ReferenceEditor')).toHaveLength(1);
Expand All @@ -1926,7 +1926,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
label: 'Differences of (incomplete)',
dataType: 'number',
isBucketed: false,
operationType: 'derivative',
operationType: 'differences',
references: ['col2'],
params: {},
},
Expand All @@ -1939,7 +1939,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
expect(wrapper.find('ReferenceEditor')).toHaveLength(1);

wrapper
.find('button[data-test-subj="lns-indexPatternDimension-avg incompatible"]')
.find('button[data-test-subj="lns-indexPatternDimension-average incompatible"]')
.simulate('click');

expect(wrapper.find('ReferenceEditor')).toHaveLength(0);
Expand All @@ -1948,10 +1948,10 @@ describe('IndexPatternDimensionEditorPanel', () => {
it('should show a warning when the current dimension is no longer configurable', () => {
const stateWithInvalidCol: IndexPatternPrivateState = getStateWithColumns({
col1: {
label: 'Invalid derivative',
label: 'Invalid differences',
dataType: 'number',
isBucketed: false,
operationType: 'derivative',
operationType: 'differences',
references: ['ref1'],
},
});
Expand All @@ -1962,7 +1962,7 @@ describe('IndexPatternDimensionEditorPanel', () => {

expect(
wrapper
.find('[data-test-subj="lns-indexPatternDimension-derivative incompatible"]')
.find('[data-test-subj="lns-indexPatternDimension-differences incompatible"]')
.find('EuiText[color="danger"]')
.first()
).toBeTruthy();
Expand All @@ -1975,7 +1975,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
label: 'Avg',
dataType: 'number',
isBucketed: false,
operationType: 'avg',
operationType: 'average',
sourceField: 'bytes',
},
}),
Expand Down Expand Up @@ -2010,6 +2010,8 @@ describe('IndexPatternDimensionEditorPanel', () => {
<IndexPatternDimensionEditorComponent {...defaultProps} state={stateWithoutTime} />
);

expect(wrapper.find('[data-test-subj="lns-indexPatternDimension-derivative"]')).toHaveLength(0);
expect(wrapper.find('[data-test-subj="lns-indexPatternDimension-differences"]')).toHaveLength(
0
);
});
});
2 changes: 1 addition & 1 deletion x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/droppable.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,7 +1035,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
},
},
col3: {
operationType: 'avg',
operationType: 'average',
sourceField: 'memory',
label: 'average of memory',
dataType: 'number',
Expand Down
24 changes: 12 additions & 12 deletions x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ describe('reference editor', () => {
label: 'Average of bytes',
dataType: 'number',
isBucketed: false,
operationType: 'avg',
operationType: 'average',
sourceField: 'bytes',
},
},
Expand Down Expand Up @@ -192,7 +192,7 @@ describe('reference editor', () => {
label: 'Average of bytes',
dataType: 'number',
isBucketed: false,
operationType: 'avg',
operationType: 'average',
sourceField: 'bytes',
},
},
Expand Down Expand Up @@ -233,7 +233,7 @@ describe('reference editor', () => {
label: 'Average of bytes',
dataType: 'number',
isBucketed: false,
operationType: 'avg',
operationType: 'average',
sourceField: 'bytes',
},
},
Expand Down Expand Up @@ -276,7 +276,7 @@ describe('reference editor', () => {
label: 'Average of bytes',
dataType: 'number',
isBucketed: false,
operationType: 'avg',
operationType: 'average',
sourceField: 'bytes',
},
},
Expand All @@ -296,9 +296,9 @@ describe('reference editor', () => {
expect(subFunctionSelect.prop('selectedOptions')).toEqual(
expect.arrayContaining([
expect.objectContaining({
'data-test-subj': 'lns-indexPatternDimension-avg incompatible',
'data-test-subj': 'lns-indexPatternDimension-average incompatible',
label: 'Average',
value: 'avg',
value: 'average',
}),
])
);
Expand Down Expand Up @@ -334,7 +334,7 @@ describe('reference editor', () => {
label: 'Average of bytes',
dataType: 'number',
isBucketed: false,
operationType: 'avg',
operationType: 'average',
sourceField: 'bytes',
},
},
Expand All @@ -352,7 +352,7 @@ describe('reference editor', () => {
const fieldSelect = wrapper.find(FieldSelect);
expect(fieldSelect.prop('fieldIsInvalid')).toEqual(true);
expect(fieldSelect.prop('selectedField')).toEqual('bytes');
expect(fieldSelect.prop('selectedOperationType')).toEqual('avg');
expect(fieldSelect.prop('selectedOperationType')).toEqual('average');
expect(fieldSelect.prop('incompleteOperation')).toEqual('max');
expect(fieldSelect.prop('markAllFieldsCompatible')).toEqual(false);
});
Expand All @@ -369,7 +369,7 @@ describe('reference editor', () => {
label: 'Average of bytes',
dataType: 'number',
isBucketed: false,
operationType: 'avg',
operationType: 'average',
sourceField: 'bytes',
},
},
Expand All @@ -387,7 +387,7 @@ describe('reference editor', () => {
const fieldSelect = wrapper.find(FieldSelect);
expect(fieldSelect.prop('fieldIsInvalid')).toEqual(false);
expect(fieldSelect.prop('selectedField')).toEqual('timestamp');
expect(fieldSelect.prop('selectedOperationType')).toEqual('avg');
expect(fieldSelect.prop('selectedOperationType')).toEqual('average');
expect(fieldSelect.prop('incompleteOperation')).toBeUndefined();
});

Expand Down Expand Up @@ -423,7 +423,7 @@ describe('reference editor', () => {
label: 'Average of missing',
dataType: 'number',
isBucketed: false,
operationType: 'avg',
operationType: 'average',
sourceField: 'missing',
},
},
Expand All @@ -438,7 +438,7 @@ describe('reference editor', () => {
const fieldSelect = wrapper.find(FieldSelect);
expect(fieldSelect.prop('fieldIsInvalid')).toEqual(true);
expect(fieldSelect.prop('selectedField')).toEqual('missing');
expect(fieldSelect.prop('selectedOperationType')).toEqual('avg');
expect(fieldSelect.prop('selectedOperationType')).toEqual('average');
expect(fieldSelect.prop('incompleteOperation')).toBeUndefined();
expect(fieldSelect.prop('markAllFieldsCompatible')).toEqual(false);
});
Expand Down
Loading