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.

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] Lens Filter Ratio #40196

Merged
merged 13 commits into from
Jul 12, 2019
Original file line number Diff line number Diff line change
Expand Up @@ -381,5 +381,4 @@ export class QueryBarUI extends Component<Props, State> {
}
}

// @ts-ignore
export const QueryBar = injectI18n(QueryBarUI);
2 changes: 1 addition & 1 deletion src/legacy/ui/public/agg_types/buckets/filters.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export const filtersBucketAgg = new BucketAggType({
const outFilters = _.transform(inFilters, function (filters, filter) {
let input = _.cloneDeep(filter.input);

if (!input || !input.query) {
if (!input || typeof input.query !== 'string') {
console.log('malformed filter agg params, missing "input" query'); // eslint-disable-line no-console
return;
}
Expand Down
1 change: 1 addition & 0 deletions src/plugins/data/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@
*/

export * from './expressions';
export * from './query';
20 changes: 20 additions & 0 deletions src/plugins/data/common/query/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* Licensed to Elasticsearch B.V. under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch B.V. licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

export * from './types';
1 change: 1 addition & 0 deletions x-pack/dev-tools/jest/create_jest_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export function createJestConfig({
],
transform: {
'^.+\\.(js|tsx?)$': `${kibanaDirectory}/src/dev/jest/babel_transform.js`,
'^.+\\.html?$': 'jest-raw-loader',
},
transformIgnorePatterns: [
// ignore all node_modules except @elastic/eui which requires babel transforms to handle dynamic import()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { datatableVisualization } from './visualization';
import {
renderersRegistry,
functionsRegistry,
// @ts-ignore untyped dependency
} from '../../../../../../src/legacy/core_plugins/interpreter/public/registries';
import { InterpreterSetup, RenderFunction } from '../interpreter_types';
import { datatable, datatableColumns, datatableRenderer } from './expression';
Expand Down
2 changes: 2 additions & 0 deletions x-pack/legacy/plugins/lens/public/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
export * from './types';

import 'ui/autoload/all';
// Used for kuery autocomplete
import 'uiExports/autocompleteProviders';
// Used to run esaggs queries
import 'uiExports/fieldFormats';
import 'uiExports/search';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@

import { ReactWrapper, ShallowWrapper } from 'enzyme';
import React from 'react';
import { act } from 'react-dom/test-utils';
import { EuiComboBox, EuiSideNav, EuiPopover } from '@elastic/eui';
import { data } from '../../../../../../../src/legacy/core_plugins/data/public/setup';
import { localStorage } from 'ui/storage/storage_service';
import { IndexPatternPrivateState } from '../indexpattern';
import { changeColumn } from '../state_helpers';
import { getPotentialColumns } from '../operations';
Expand All @@ -15,9 +18,17 @@ import { DropHandler, DragContextState } from '../../drag_drop';
import { createMockedDragDropContext } from '../mocks';
import { mountWithIntl as mount, shallowWithIntl as shallow } from 'test_utils/enzyme_helpers';

jest.mock('../loader');
jest.mock('../state_helpers');
jest.mock('../operations');

// Used by indexpattern plugin, which is a dependency of a dependency
jest.mock('ui/chrome');
jest.mock('ui/storage/storage_service');
// Contains old and new platform data plugins, used for interpreter and filter ratio
jest.mock('ui/new_platform');
jest.mock('plugins/data/setup', () => ({ data: { query: { ui: {} } } }));

const expectedIndexPatterns = {
1: {
id: '1',
Expand Down Expand Up @@ -98,6 +109,8 @@ describe('IndexPatternDimensionPanel', () => {
setState,
columnId: 'col1',
filterOperations: () => true,
dataPlugin: data,
storage: localStorage,
};

jest.clearAllMocks();
Expand Down Expand Up @@ -164,6 +177,8 @@ describe('IndexPatternDimensionPanel', () => {

const options = wrapper.find(EuiComboBox).prop('options');

expect(options).toHaveLength(2);

expect(options![0].label).toEqual('Document');

expect(options![1].options!.map(({ label }) => label)).toEqual([
Expand Down Expand Up @@ -273,7 +288,9 @@ describe('IndexPatternDimensionPanel', () => {
const comboBox = wrapper.find(EuiComboBox)!;
const option = comboBox.prop('options')![1].options!.find(({ label }) => label === 'memory')!;

comboBox.prop('onChange')!([option]);
act(() => {
comboBox.prop('onChange')!([option]);
});

expect(setState).toHaveBeenCalledWith({
...initialState,
Expand All @@ -296,7 +313,9 @@ describe('IndexPatternDimensionPanel', () => {
const comboBox = wrapper.find(EuiComboBox)!;
const option = comboBox.prop('options')![1].options!.find(({ label }) => label === 'source')!;

comboBox.prop('onChange')!([option]);
act(() => {
comboBox.prop('onChange')!([option]);
});

expect(setState).toHaveBeenCalledWith({
...state,
Expand Down Expand Up @@ -336,7 +355,9 @@ describe('IndexPatternDimensionPanel', () => {

openPopover();

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

expect(setState).toHaveBeenCalledWith({
...state,
Expand All @@ -356,9 +377,11 @@ describe('IndexPatternDimensionPanel', () => {

openPopover();

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

expect(setState).not.toHaveBeenCalled();
});
Expand All @@ -368,9 +391,11 @@ describe('IndexPatternDimensionPanel', () => {

openPopover();

wrapper
.find('input[data-test-subj="indexPattern-label-edit"]')
.simulate('change', { target: { value: 'New Label' } });
act(() => {
wrapper
.find('input[data-test-subj="indexPattern-label-edit"]')
.simulate('change', { target: { value: 'New Label' } });
});

expect(setState).toHaveBeenCalledWith({
...state,
Expand All @@ -390,7 +415,9 @@ describe('IndexPatternDimensionPanel', () => {

openPopover();

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

expect(setState).not.toHaveBeenCalled();
});
Expand Down Expand Up @@ -428,7 +455,9 @@ describe('IndexPatternDimensionPanel', () => {

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

wrapper.find(EuiPopover).prop('closePopover')!();
act(() => {
wrapper.find(EuiPopover).prop('closePopover')!();
});

openPopover();

Expand Down Expand Up @@ -459,12 +488,16 @@ describe('IndexPatternDimensionPanel', () => {

openPopover();

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

const comboBox = wrapper.find(EuiComboBox)!;
const option = comboBox.prop('options')![1].options!.find(({ label }) => label === 'source')!;

comboBox.prop('onChange')!([option]);
act(() => {
comboBox.prop('onChange')!([option]);
});

expect(setState).toHaveBeenCalledWith({
...state,
Expand All @@ -488,7 +521,9 @@ describe('IndexPatternDimensionPanel', () => {
const comboBox = wrapper.find(EuiComboBox);
const options = comboBox.prop('options');

comboBox.prop('onChange')!([options![1].options![0]]);
act(() => {
comboBox.prop('onChange')!([options![1].options![0]]);
});

expect(setState).toHaveBeenCalledWith({
...state,
Expand Down Expand Up @@ -541,7 +576,7 @@ describe('IndexPatternDimensionPanel', () => {
.find(EuiSideNav)
.prop('items')[0]
.items.map(({ name }) => name)
).toEqual(['Count', 'Maximum', 'Average', 'Sum', 'Minimum']);
).toEqual(['Maximum', 'Average', 'Sum', 'Minimum', 'Count', 'Filter Ratio']);
});

it('should add a column on selection of a field', () => {
Expand All @@ -552,7 +587,9 @@ describe('IndexPatternDimensionPanel', () => {
const comboBox = wrapper.find(EuiComboBox)!;
const option = comboBox.prop('options')![1].options![0];

comboBox.prop('onChange')!([option]);
act(() => {
comboBox.prop('onChange')!([option]);
});

expect(setState).toHaveBeenCalledWith({
...state,
Expand Down Expand Up @@ -588,10 +625,12 @@ describe('IndexPatternDimensionPanel', () => {

openPopover();

wrapper
.find('[data-test-subj="lns-indexPatternDimension-min"]')
.first()
.prop('onClick')!({} as React.MouseEvent<{}, MouseEvent>);
act(() => {
wrapper
.find('[data-test-subj="lns-indexPatternDimension-min"]')
.first()
.prop('onClick')!({} as React.MouseEvent<{}, MouseEvent>);
});

expect(changeColumn).toHaveBeenCalledWith(
initialState,
Expand All @@ -610,7 +649,9 @@ describe('IndexPatternDimensionPanel', () => {
'EuiButtonIcon[data-test-subj="indexPattern-dimensionPopover-remove"]'
);

clearButton.simulate('click');
act(() => {
clearButton.simulate('click');
});

expect(setState).toHaveBeenCalledWith({
...state,
Expand All @@ -624,7 +665,9 @@ describe('IndexPatternDimensionPanel', () => {

openPopover();

wrapper.find(EuiComboBox).prop('onChange')!([]);
act(() => {
wrapper.find(EuiComboBox).prop('onChange')!([]);
});

expect(setState).toHaveBeenCalledWith({
...state,
Expand All @@ -642,7 +685,14 @@ describe('IndexPatternDimensionPanel', () => {
foo: {
id: 'foo',
title: 'Foo pattern',
fields: [{ aggregatable: true, name: 'bar', searchable: true, type: 'number' }],
fields: [
{
aggregatable: true,
name: 'bar',
searchable: true,
type: 'number',
},
],
},
},
};
Expand Down Expand Up @@ -737,12 +787,14 @@ describe('IndexPatternDimensionPanel', () => {
/>
);

const onDrop = wrapper
.find('[data-test-subj="indexPattern-dropTarget"]')
.first()
.prop('onDrop') as DropHandler;
act(() => {
const onDrop = wrapper
.find('[data-test-subj="indexPattern-dropTarget"]')
.first()
.prop('onDrop') as DropHandler;

onDrop(dragging);
onDrop(dragging);
});

expect(setState).toBeCalledTimes(1);
expect(setState).toHaveBeenCalledWith(
Expand Down Expand Up @@ -773,12 +825,14 @@ describe('IndexPatternDimensionPanel', () => {
/>
);

const onDrop = wrapper
.find('[data-test-subj="indexPattern-dropTarget"]')
.first()
.prop('onDrop') as DropHandler;
act(() => {
const onDrop = wrapper
.find('[data-test-subj="indexPattern-dropTarget"]')
.first()
.prop('onDrop') as DropHandler;

onDrop(dragging);
onDrop(dragging);
});

expect(setState).toBeCalledTimes(1);
expect(setState).toHaveBeenCalledWith(
Expand Down Expand Up @@ -808,12 +862,14 @@ describe('IndexPatternDimensionPanel', () => {
/>
);

const onDrop = wrapper
.find('[data-test-subj="indexPattern-dropTarget"]')
.first()
.prop('onDrop') as DropHandler;
act(() => {
const onDrop = wrapper
.find('[data-test-subj="indexPattern-dropTarget"]')
.first()
.prop('onDrop') as DropHandler;

onDrop(dragging);
onDrop(dragging);
});

expect(setState).not.toBeCalled();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
import _ from 'lodash';
import React from 'react';
import { EuiFlexItem, EuiFlexGroup, EuiButtonIcon } from '@elastic/eui';
import { Storage } from 'ui/storage';
import { i18n } from '@kbn/i18n';
import { DataSetup } from '../../../../../../../src/legacy/core_plugins/data/public';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we should have a single types file in our project that imports from wonky paths like this, and then we can simply reference that, rather than have lots of external references in various files in our project?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is excessively confusing because this is only importing the type definition. I'll see what I can do but don't expect to make a big change in this PR. There's some active discussion of relative imports like this in #40446

import { DatasourceDimensionPanelProps } from '../../types';
import {
IndexPatternColumn,
Expand All @@ -25,6 +27,8 @@ export type IndexPatternDimensionPanelProps = DatasourceDimensionPanelProps & {
state: IndexPatternPrivateState;
setState: (newState: IndexPatternPrivateState) => void;
dragDropContext: DragContextState;
dataPlugin: DataSetup;
storage: Storage;
};

export function IndexPatternDimensionPanel(props: IndexPatternDimensionPanelProps) {
Expand Down
Loading