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] Add Multi terms support to Top Values #118600

Merged
merged 64 commits into from
Dec 8, 2021
Merged
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
35e326e
start working on multi field terms
flash1293 Nov 1, 2021
3aa0432
fix filter builder
flash1293 Nov 1, 2021
6ca8edb
Merge remote-tracking branch 'upstream/main' into multi-field-terms
flash1293 Nov 4, 2021
50df207
fix other buket
flash1293 Nov 4, 2021
e972710
Merge remote-tracking branch 'upstream/main' into multi-field-terms
flash1293 Nov 9, 2021
cce843f
add tests
flash1293 Nov 10, 2021
6a446ce
Merge remote-tracking branch 'upstream/main' into multi-field-terms
flash1293 Nov 10, 2021
c3fe218
Merge remote-tracking branch 'upstream/main' into multi-field-terms
flash1293 Nov 11, 2021
84ceb82
make other filter behave nice
flash1293 Nov 11, 2021
6c5cc1c
Merge remote-tracking branch 'upstream/main' into multi-field-terms
flash1293 Nov 15, 2021
9ef5e19
clean up
flash1293 Nov 15, 2021
05b8c71
:sparkles: first implemenetation draft
dej611 Nov 15, 2021
c962301
Merge branch 'pr/116928' into feature/95079
dej611 Nov 15, 2021
c910a43
Merge remote-tracking branch 'upstream/main' into feature/95079
dej611 Nov 15, 2021
4efab0a
Merge remote-tracking branch 'upstream/main' into feature/95079
dej611 Nov 16, 2021
3563915
:label: Fix type issue
dej611 Nov 16, 2021
3c491ed
:bug: Fix circular dependency issue
dej611 Nov 16, 2021
ccdb356
:bug: Fix test warnings
dej611 Nov 16, 2021
8dc453d
:pencil: fix label
dej611 Nov 16, 2021
2682142
:white_check_mark: Test plan
dej611 Nov 16, 2021
aebff1d
:bug: quick fixes
dej611 Nov 17, 2021
f42e89f
Merge remote-tracking branch 'upstream/main' into feature/95079
dej611 Nov 17, 2021
b26182a
Merge branch 'main' into multi-field-terms
kibanamachine Nov 17, 2021
7bc423b
Merge remote-tracking branch 'upstream/main' into multi-field-terms
flash1293 Nov 17, 2021
df92ab3
Merge branch 'multi-field-terms' of github.com:flash1293/kibana into …
flash1293 Nov 17, 2021
8ac1a5f
Merge remote-tracking branch 'upstream/main' into feature/95079
dej611 Nov 19, 2021
9bcbec2
:wrench: Extend canvas mock to all test files as for now
dej611 Nov 19, 2021
26a3886
Merge branch 'main' into multi-field-terms
kibanamachine Nov 22, 2021
7ef32a9
adjust tests
flash1293 Nov 22, 2021
2203e2e
Merge branch 'multi-field-terms' of github.com:flash1293/kibana into …
flash1293 Nov 22, 2021
d354694
:bug: + :white_check_mark: Add tests for multi terms and fix other bugs
dej611 Nov 22, 2021
c0fa7bd
Merge remote-tracking branch 'upstream/main' into feature/95079
dej611 Nov 22, 2021
247147d
:label: Fix type issue with latest main
dej611 Nov 22, 2021
9e5562a
:label: Fix test types
dej611 Nov 22, 2021
beb3aed
Merge branch 'pr/116928' into feature/95079
dej611 Nov 22, 2021
b4cd593
:label: Fix last type error
dej611 Nov 22, 2021
a867a94
Merge remote-tracking branch 'upstream/main' into feature/95079
dej611 Nov 23, 2021
5fd86a0
Merge branch 'main' into feature/95079
kibanamachine Nov 24, 2021
1252c21
:white_check_mark: Add field input tests
dej611 Nov 24, 2021
9ababd0
Merge branch 'feature/95079' of github.com:dej611/kibana into feature…
dej611 Nov 24, 2021
d003a26
:bug: + :white_check_mark: Improved time shift handling for edge case…
dej611 Nov 24, 2021
49f5b29
:white_check_mark: Complete test suites and fix multi terms filters
dej611 Nov 25, 2021
cbcaa93
:white_check_mark: Fix tests after some refactoring
dej611 Nov 25, 2021
80ef046
Merge branch 'main' into feature/95079
kibanamachine Nov 26, 2021
d8340e4
Merge branch 'main' into feature/95079
kibanamachine Nov 29, 2021
9ae6f68
Apply suggestions from code review
dej611 Nov 30, 2021
5123c2c
:ok_hand: Limit the number of terms allowed
dej611 Nov 30, 2021
7d0f002
:bug: Allow truncation to be disabled as default by operation
dej611 Nov 30, 2021
f45b305
Merge branch 'main' into feature/95079
kibanamachine Nov 30, 2021
db82f1c
:lipstick: Fix field select width alignment
dej611 Nov 30, 2021
42a8b2b
Merge branch 'feature/95079' of github.com:dej611/kibana into feature…
dej611 Nov 30, 2021
674750f
:label: Fix type issue
dej611 Nov 30, 2021
1fd6100
Merge remote-tracking branch 'upstream/main' into feature/95079
dej611 Dec 1, 2021
3e3582f
:bug: Fix filtering multi terms
dej611 Dec 1, 2021
cf6d1bc
:ok_hand: Fix issues based on feedback
dej611 Dec 2, 2021
c506802
:wrench: Change default separator for multi terms formatter
dej611 Dec 2, 2021
486a00a
Merge remote-tracking branch 'upstream/main' into feature/95079
dej611 Dec 2, 2021
99d2dda
:ok_hand: Integrated feedback
dej611 Dec 2, 2021
30f7fe6
:recycle: Refactor truncation logic
dej611 Dec 3, 2021
decdf29
:bug: Fix broken test
dej611 Dec 3, 2021
7332d9f
Merge branch 'main' into feature/95079
flash1293 Dec 7, 2021
fbffc53
Merge branch 'main' into feature/95079
kibanamachine Dec 7, 2021
a4ce3b7
Merge branch 'main' into feature/95079
flash1293 Dec 7, 2021
66dab0d
Merge branch 'main' into feature/95079
kibanamachine Dec 8, 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
Prev Previous commit
Next Next commit
🔧 Extend canvas mock to all test files as for now
dej611 committed Nov 19, 2021
commit 9bcbec28ca052cb28f6fa9f5d15fe702fa4238be
1 change: 1 addition & 0 deletions x-pack/plugins/lens/jest.config.js
Original file line number Diff line number Diff line change
@@ -12,4 +12,5 @@ module.exports = {
coverageDirectory: '<rootDir>/target/kibana-coverage/jest/x-pack/plugins/lens',
coverageReporters: ['text', 'html'],
collectCoverageFrom: ['<rootDir>/x-pack/plugins/lens/{common,public,server}/**/*.{ts,tsx}'],
setupFiles: ['jest-canvas-mock'],
};
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@
*/

import { ReactWrapper, ShallowWrapper } from 'enzyme';
import 'jest-canvas-mock';
import React from 'react';
import { act } from 'react-dom/test-utils';
import {
Original file line number Diff line number Diff line change
@@ -10,7 +10,6 @@ import { ReactWrapper, ShallowWrapper } from 'enzyme';
import { act } from 'react-dom/test-utils';
import { EuiComboBox } from '@elastic/eui';
import { mountWithIntl as mount } from '@kbn/test/jest';
import 'jest-canvas-mock';
import type { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
import type { DataPublicPluginStart } from 'src/plugins/data/public';
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@

import React from 'react';
import { mount } from 'enzyme';
import 'jest-canvas-mock';
import { TruncatedLabel } from './truncated_label';

describe('truncated_label', () => {
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@
*/

import React from 'react';
import 'jest-canvas-mock';
import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
import { getIndexPatternDatasource, IndexPatternColumn } from './indexpattern';
import { DatasourcePublicAPI, Operation, Datasource, FramePublicAPI } from '../types';
Original file line number Diff line number Diff line change
@@ -8,7 +8,6 @@
import { DatasourceSuggestion } from '../types';
import { generateId } from '../id_generator';
import type { IndexPatternPrivateState } from './types';
import 'jest-canvas-mock';
import {
getDatasourceSuggestionsForField,
getDatasourceSuggestionsFromCurrentState,