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

Explicit namespaces for esFilters #57177

Merged
merged 15 commits into from
Feb 12, 2020
Merged

Explicit namespaces for esFilters #57177

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7c5636b
Explicit namespaces for esQuery and esQuery
Feb 9, 2020
bc01a5b
Remove unnecessary file from siem
Feb 9, 2020
fe08d7a
Merge branch 'master' into newplatform/data/kuery-query-namespace
elasticmachine Feb 9, 2020
c1c5193
remove jsonvalue definition from siem
Feb 9, 2020
3dee295
Merge branch 'newplatform/data/kuery-query-namespace' of github.com:l…
Feb 9, 2020
f9743b2
esFilters refactor O_O
Feb 9, 2020
392ec66
Delete IFilterType
Feb 9, 2020
1ee974b
import fixes
Feb 10, 2020
01be6d4
Merge remote-tracking branch 'upstream/master' into newplatform/data/…
Feb 10, 2020
e9b90d2
Merge remote-tracking branch 'upstream/master' into newplatform/data/…
Feb 10, 2020
ea19f8f
Merge branch 'master' of github.com:elastic/kibana into newplatform/d…
Feb 11, 2020
a916827
Fix merge
Feb 11, 2020
e1685ec
Merge branch 'master' into newplatform/data/filters-namespace-O_O
elasticmachine Feb 11, 2020
03f5a90
Merge branch 'master' of github.com:elastic/kibana into newplatform/d…
Feb 12, 2020
d1a3d25
Merge fixes
Feb 12, 2020
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
16 changes: 7 additions & 9 deletions src/legacy/core_plugins/data/public/actions/select_range_action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,10 @@ import {
// @ts-ignore
import { onBrushEvent } from './filters/brush_event';
import {
esFilters,
Filter,
FilterManager,
TimefilterContract,
changeTimeFilter,
extractTimeFilter,
mapAndFlattenFilters,
esFilters,
} from '../../../../../plugins/data/public';
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { getIndexPatterns } from '../../../../../plugins/data/public/services';
Expand All @@ -45,7 +43,7 @@ interface ActionContext {

async function isCompatible(context: ActionContext) {
try {
const filters: esFilters.Filter[] = (await onBrushEvent(context.data, getIndexPatterns)) || [];
const filters: Filter[] = (await onBrushEvent(context.data, getIndexPatterns)) || [];
return filters.length > 0;
} catch {
return false;
Expand All @@ -70,18 +68,18 @@ export function selectRangeAction(
throw new IncompatibleActionError();
}

const filters: esFilters.Filter[] = (await onBrushEvent(data, getIndexPatterns)) || [];
const filters: Filter[] = (await onBrushEvent(data, getIndexPatterns)) || [];

const selectedFilters: esFilters.Filter[] = mapAndFlattenFilters(filters);
const selectedFilters: Filter[] = esFilters.mapAndFlattenFilters(filters);

if (timeFieldName) {
const { timeRangeFilter, restOfFilters } = extractTimeFilter(
const { timeRangeFilter, restOfFilters } = esFilters.extractTimeFilter(
timeFieldName,
selectedFilters
);
filterManager.addFilters(restOfFilters);
if (timeRangeFilter) {
changeTimeFilter(timeFilter, timeRangeFilter);
esFilters.changeTimeFilter(timeFilter, timeRangeFilter);
}
} else {
filterManager.addFilters(selectedFilters);
Expand Down
20 changes: 9 additions & 11 deletions src/legacy/core_plugins/data/public/actions/value_click_action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,10 @@ import { applyFiltersPopover } from '../../../../../plugins/data/public/ui/apply
// @ts-ignore
import { createFiltersFromEvent } from './filters/create_filters_from_event';
import {
esFilters,
Filter,
FilterManager,
TimefilterContract,
changeTimeFilter,
extractTimeFilter,
mapAndFlattenFilters,
esFilters,
} from '../../../../../plugins/data/public';

export const VALUE_CLICK_ACTION = 'VALUE_CLICK_ACTION';
Expand All @@ -48,7 +46,7 @@ interface ActionContext {

async function isCompatible(context: ActionContext) {
try {
const filters: esFilters.Filter[] = (await createFiltersFromEvent(context.data)) || [];
const filters: Filter[] = (await createFiltersFromEvent(context.data)) || [];
return filters.length > 0;
} catch {
return false;
Expand All @@ -73,9 +71,9 @@ export function valueClickAction(
throw new IncompatibleActionError();
}

const filters: esFilters.Filter[] = (await createFiltersFromEvent(data)) || [];
const filters: Filter[] = (await createFiltersFromEvent(data)) || [];

let selectedFilters: esFilters.Filter[] = mapAndFlattenFilters(filters);
let selectedFilters: Filter[] = esFilters.mapAndFlattenFilters(filters);

if (selectedFilters.length > 1) {
const indexPatterns = await Promise.all(
Expand All @@ -84,7 +82,7 @@ export function valueClickAction(
})
);

const filterSelectionPromise: Promise<esFilters.Filter[]> = new Promise(resolve => {
const filterSelectionPromise: Promise<Filter[]> = new Promise(resolve => {
const overlay = getOverlays().openModal(
toMountPoint(
applyFiltersPopover(
Expand All @@ -94,7 +92,7 @@ export function valueClickAction(
overlay.close();
resolve([]);
},
(filterSelection: esFilters.Filter[]) => {
(filterSelection: Filter[]) => {
overlay.close();
resolve(filterSelection);
}
Expand All @@ -110,13 +108,13 @@ export function valueClickAction(
}

if (timeFieldName) {
const { timeRangeFilter, restOfFilters } = extractTimeFilter(
const { timeRangeFilter, restOfFilters } = esFilters.extractTimeFilter(
timeFieldName,
selectedFilters
);
filterManager.addFilters(restOfFilters);
if (timeRangeFilter) {
changeTimeFilter(timeFilter, timeRangeFilter);
esFilters.changeTimeFilter(timeFilter, timeRangeFilter);
}
} else {
filterManager.addFilters(selectedFilters);
Expand Down
13 changes: 6 additions & 7 deletions src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@
import _ from 'lodash';
import { Subscription } from 'rxjs';
import { State } from 'ui/state_management/state';
import { FilterManager, esFilters } from '../../../../../../plugins/data/public';
import { compareFilters, COMPARE_ALL_OPTIONS } from '../../../../../../plugins/data/public';
import { FilterManager, esFilters, Filter } from '../../../../../../plugins/data/public';

type GetAppStateFunc = () => { filters?: esFilters.Filter[]; save?: () => void } | undefined | null;
type GetAppStateFunc = () => { filters?: Filter[]; save?: () => void } | undefined | null;

/**
* FilterStateManager is responsible for watching for filter changes
Expand Down Expand Up @@ -68,15 +67,15 @@ export class FilterStateManager {
const globalFilters = this.globalState.filters || [];
const appFilters = (appState && appState.filters) || [];

const globalFilterChanged = !compareFilters(
const globalFilterChanged = !esFilters.compareFilters(
this.filterManager.getGlobalFilters(),
globalFilters,
COMPARE_ALL_OPTIONS
esFilters.COMPARE_ALL_OPTIONS
);
const appFilterChanged = !compareFilters(
const appFilterChanged = !esFilters.compareFilters(
this.filterManager.getAppFilters(),
appFilters,
COMPARE_ALL_OPTIONS
esFilters.COMPARE_ALL_OPTIONS
);
const filterStateChanged = globalFilterChanged || appFilterChanged;

Expand Down
6 changes: 3 additions & 3 deletions src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/get_stub_filter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
* under the License.
*/

import { esFilters } from '../../../../../../../plugins/data/public';
import { Filter } from '../../../../../../../plugins/data/public';

export function getFilter(
store: esFilters.FilterStateStore,
store: any, // I don't want to export only for this, as it should move to data plugin
Copy link
Member

Choose a reason for hiding this comment

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

Do you want to make a follow-up PR or issue for this so we don't forget?

Copy link
Contributor Author

@lizozom lizozom Feb 12, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Specifically, this piece of code should actually go away as soon as state management migration is done.
But I created an issue for other follow ups needed.

#57434

disabled: boolean,
negated: boolean,
queryKey: string,
queryValue: any
): esFilters.Filter {
): Filter {
return {
$state: {
store,
Expand Down
4 changes: 2 additions & 2 deletions src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/stub_state.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
import sinon from 'sinon';

import { State } from 'ui/state_management/state';
import { esFilters } from '../../../../../../../plugins/data/public';
import { Filter } from '../../../../../../../plugins/data/public';

export class StubState implements State {
filters: esFilters.Filter[];
filters: Filter[];
save: sinon.SinonSpy<any[], any>;

constructor() {
Expand Down
4 changes: 2 additions & 2 deletions src/legacy/core_plugins/data/public/search/aggs/buckets/create_filter/date_histogram.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ import { intervalOptions } from '../_interval_options';
import { AggConfigs } from '../../agg_configs';
import { IBucketDateHistogramAggConfig } from '../date_histogram';
import { BUCKET_TYPES } from '../bucket_agg_types';
import { esFilters } from '../../../../../../../../plugins/data/public';
import { RangeFilter } from '../../../../../../../../plugins/data/public';

jest.mock('ui/new_platform');

describe('AggConfig Filters', () => {
describe('date_histogram', () => {
let agg: IBucketDateHistogramAggConfig;
let filter: esFilters.RangeFilter;
let filter: RangeFilter;
let bucketStart: any;
let field: any;

Expand Down
4 changes: 2 additions & 2 deletions src/legacy/core_plugins/data/public/search/aggs/buckets/create_filter/date_range.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
import moment from 'moment';
import { IBucketAggConfig } from '../_bucket_agg_type';
import { DateRangeKey } from '../date_range';
import { esFilters } from '../../../../../../../../plugins/data/public';
import { esFilters, RangeFilterParams } from '../../../../../../../../plugins/data/public';

export const createFilterDateRange = (agg: IBucketAggConfig, { from, to }: DateRangeKey) => {
const filter: esFilters.RangeFilterParams = {};
const filter: RangeFilterParams = {};
if (from) filter.gte = moment(from).toISOString();
if (to) filter.lt = moment(to).toISOString();
if (to && from) filter.format = 'strict_date_optional_time';
Expand Down
4 changes: 2 additions & 2 deletions src/legacy/core_plugins/data/public/search/aggs/buckets/create_filter/histogram.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
*/

import { IBucketAggConfig } from '../_bucket_agg_type';
import { esFilters } from '../../../../../../../../plugins/data/public';
import { esFilters, RangeFilterParams } from '../../../../../../../../plugins/data/public';

export const createFilterHistogram = (aggConfig: IBucketAggConfig, key: string) => {
const value = parseInt(key, 10);
const params: esFilters.RangeFilterParams = { gte: value, lt: value + aggConfig.params.interval };
const params: RangeFilterParams = { gte: value, lt: value + aggConfig.params.interval };

return esFilters.buildRangeFilter(
aggConfig.params.field,
Expand Down
4 changes: 2 additions & 2 deletions src/legacy/core_plugins/data/public/search/aggs/buckets/create_filter/ip_range.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
import { CidrMask } from '../lib/cidr_mask';
import { IBucketAggConfig } from '../_bucket_agg_type';
import { IpRangeKey } from '../ip_range';
import { esFilters } from '../../../../../../../../plugins/data/public';
import { esFilters, RangeFilterParams } from '../../../../../../../../plugins/data/public';

export const createFilterIpRange = (aggConfig: IBucketAggConfig, key: IpRangeKey) => {
let range: esFilters.RangeFilterParams;
let range: RangeFilterParams;

if (key.type === 'mask') {
range = new CidrMask(key.mask).getRange();
Expand Down
12 changes: 6 additions & 6 deletions src/legacy/core_plugins/data/public/search/aggs/buckets/create_filter/terms.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { createFilterTerms } from './terms';
import { AggConfigs } from '../../agg_configs';
import { BUCKET_TYPES } from '../bucket_agg_types';
import { IBucketAggConfig } from '../_bucket_agg_type';
import { esFilters } from '../../../../../../../../plugins/data/public';
import { Filter, ExistsFilter } from '../../../../../../../../plugins/data/public';

jest.mock('ui/new_platform');

Expand Down Expand Up @@ -54,7 +54,7 @@ describe('AggConfig Filters', () => {
aggConfigs.aggs[0] as IBucketAggConfig,
'apache',
{}
) as esFilters.Filter;
) as Filter;

expect(filter).toHaveProperty('query');
expect(filter.query).toHaveProperty('match_phrase');
Expand All @@ -73,7 +73,7 @@ describe('AggConfig Filters', () => {
aggConfigs.aggs[0] as IBucketAggConfig,
'',
{}
) as esFilters.Filter;
) as Filter;

expect(filterFalse).toHaveProperty('query');
expect(filterFalse.query).toHaveProperty('match_phrase');
Expand All @@ -84,7 +84,7 @@ describe('AggConfig Filters', () => {
aggConfigs.aggs[0] as IBucketAggConfig,
'1',
{}
) as esFilters.Filter;
) as Filter;

expect(filterTrue).toHaveProperty('query');
expect(filterTrue.query).toHaveProperty('match_phrase');
Expand All @@ -100,7 +100,7 @@ describe('AggConfig Filters', () => {
aggConfigs.aggs[0] as IBucketAggConfig,
'__missing__',
{}
) as esFilters.ExistsFilter;
) as ExistsFilter;

expect(filter).toHaveProperty('exists');
expect(filter.exists).toHaveProperty('field', 'field');
Expand All @@ -116,7 +116,7 @@ describe('AggConfig Filters', () => {

const [filter] = createFilterTerms(aggConfigs.aggs[0] as IBucketAggConfig, '__other__', {
terms: ['apache'],
}) as esFilters.Filter[];
}) as Filter[];

expect(filter).toHaveProperty('query');
expect(filter.query).toHaveProperty('bool');
Expand Down
4 changes: 2 additions & 2 deletions src/legacy/core_plugins/data/public/search/aggs/buckets/create_filter/terms.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

import { IBucketAggConfig } from '../_bucket_agg_type';
import { esFilters } from '../../../../../../../../plugins/data/public';
import { esFilters, Filter } from '../../../../../../../../plugins/data/public';

export const createFilterTerms = (aggConfig: IBucketAggConfig, key: string, params: any) => {
const field = aggConfig.params.field;
Expand All @@ -30,7 +30,7 @@ export const createFilterTerms = (aggConfig: IBucketAggConfig, key: string, para
const phraseFilter = esFilters.buildPhrasesFilter(field, terms, indexPattern);
phraseFilter.meta.negate = true;

const filters: esFilters.Filter[] = [phraseFilter];
const filters: Filter[] = [phraseFilter];

if (terms.some((term: string) => term === '__missing__')) {
filters.push(esFilters.buildExistsFilter(field, indexPattern));
Expand Down
4 changes: 2 additions & 2 deletions src/legacy/core_plugins/data/public/search/expressions/esaggs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {
SearchSource,
Query,
TimeRange,
esFilters,
Filter,
getTime,
FilterManager,
} from '../../../../../../plugins/data/public';
Expand All @@ -53,7 +53,7 @@ export interface RequestHandlerParams {
aggs: IAggConfigs;
timeRange?: TimeRange;
query?: Query;
filters?: esFilters.Filter[];
filters?: Filter[];
forceFetch: boolean;
filterManager: FilterManager;
uiState?: PersistedState;
Expand Down
4 changes: 2 additions & 2 deletions src/legacy/core_plugins/input_control_vis/public/control/control.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import _ from 'lodash';
import { i18n } from '@kbn/i18n';

import { esFilters } from '../../../../../plugins/data/public';
import { Filter } from '../../../../../plugins/data/public';
import { SearchSource as SearchSourceClass } from '../legacy_imports';
import { ControlParams, ControlParamsOptions, CONTROL_TYPES } from '../editor_utils';
import { RangeFilterManager } from './filter_manager/range_filter_manager';
Expand All @@ -46,7 +46,7 @@ export function noIndexPatternMsg(indexPatternId: string) {
}

export abstract class Control<FilterManager extends BaseFilterManager> {
private kbnFilter: esFilters.Filter | null = null;
private kbnFilter: Filter | null = null;

enable: boolean = false;
disabledReason: string = '';
Expand Down
4 changes: 2 additions & 2 deletions src/legacy/core_plugins/input_control_vis/public/control/create_search_source.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

import { esFilters, IndexPattern, TimefilterSetup } from '../../../../../plugins/data/public';
import { PhraseFilter, IndexPattern, TimefilterSetup } from '../../../../../plugins/data/public';
import { SearchSource as SearchSourceClass, SearchSourceFields } from '../legacy_imports';

export function createSearchSource(
Expand All @@ -26,7 +26,7 @@ export function createSearchSource(
indexPattern: IndexPattern,
aggs: any,
useTimeFilter: boolean,
filters: esFilters.PhraseFilter[] = [],
filters: PhraseFilter[] = [],
timefilter: TimefilterSetup['timefilter']
) {
const searchSource = initialState ? new SearchSource(initialState) : new SearchSource();
Expand Down
Loading