github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Unified Observability] Replace deprecated imports from the data plugin (#122316)

Browse source
This commit is contained in:
Alejandro Fernández Gómez 2022-01-05 12:43:27 +01:00 • committed by GitHub
parent 50163e74f9
commit eb9001d184
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts
View file

@ -5,15 +5,17 @@
* 2.0.
*/
import rison, { RisonValue } from 'rison-node';
import { buildQueryFilter } from '@kbn/es-query';
import {
buildQueryFilter,
PhraseFilter,
ExistsFilter,
buildPhraseFilter as esBuildPhraseFilter,
buildPhrasesFilter as esBuildPhrasesFilter,
buildExistsFilter as esBuildExistsFilter,
} from '@kbn/es-query';
import type { ReportViewType, SeriesUrl, UrlFilter } from '../types';
import type { AllSeries, AllShortSeries } from '../hooks/use_series_storage';
import { IndexPattern } from '../../../../../../../../src/plugins/data/common';
import {
esFilters,
ExistsFilter,
PhraseFilter,
} from '../../../../../../../../src/plugins/data/public';
import { URL_KEYS } from './constants/url_constants';
import { PersistableFilter } from '../../../../../../lens/common';
@ -64,7 +66,7 @@ export function createExploratoryViewUrl(
export function buildPhraseFilter(field: string, value: string, indexPattern: IndexPattern) {
const fieldMeta = indexPattern?.fields.find((fieldT) => fieldT.name === field);
if (fieldMeta) {
return [esFilters.buildPhraseFilter(fieldMeta, value, indexPattern)];
return [esBuildPhraseFilter(fieldMeta, value, indexPattern)];
}
return [];
}
@ -93,9 +95,9 @@ export function buildPhrasesFilter(field: string, value: string[], indexPattern:
const fieldMeta = indexPattern?.fields.find((fieldT) => fieldT.name === field);
if (fieldMeta) {
if (value.length === 1) {
return [esFilters.buildPhraseFilter(fieldMeta, value[0], indexPattern)];
return [esBuildPhraseFilter(fieldMeta, value[0], indexPattern)];
}
return [esFilters.buildPhrasesFilter(fieldMeta, value, indexPattern)];
return [esBuildPhrasesFilter(fieldMeta, value, indexPattern)];
}
return [];
}
@ -103,7 +105,7 @@ export function buildPhrasesFilter(field: string, value: string[], indexPattern:
export function buildExistsFilter(field: string, indexPattern: IndexPattern) {
const fieldMeta = indexPattern?.fields.find((fieldT) => fieldT.name === field);
if (fieldMeta) {
return [esFilters.buildExistsFilter(fieldMeta, indexPattern)];
return [esBuildExistsFilter(fieldMeta, indexPattern)];
}
return [];
}

11
x-pack/plugins/observability/public/components/shared/filter_value_label/filter_value_label.tsx
View file

@ -7,7 +7,8 @@
import React from 'react';
import { injectI18n } from '@kbn/i18n-react';
import { esFilters, Filter, IndexPattern } from '../../../../../../../src/plugins/data/public';
import { Filter, buildPhrasesFilter, buildPhraseFilter } from '@kbn/es-query';
import { FilterItem, IndexPattern } from '../../../../../../../src/plugins/data/public';
import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
export function buildFilterLabel({
@ -27,8 +28,8 @@ export function buildFilterLabel({
const filter =
value instanceof Array && value.length > 1
? esFilters.buildPhrasesFilter(indexField, value, indexPattern)
: esFilters.buildPhraseFilter(indexField, value as string, indexPattern);
? buildPhrasesFilter(indexField, value, indexPattern)
: buildPhraseFilter(indexField, value as string, indexPattern);
filter.meta.type = value instanceof Array && value.length > 1 ? 'phrases' : 'phrase';
@ -61,7 +62,7 @@ export function FilterValueLabel({
removeFilter,
allowExclusion = true,
}: FilterValueLabelProps) {
const FilterItem = injectI18n(esFilters.FilterItem);
const FilterItemI18n = injectI18n(FilterItem);
const filter = buildFilterLabel({ field, value, label, indexPattern, negate });
@ -70,7 +71,7 @@ export function FilterValueLabel({
} = useKibana();
return indexPattern ? (
<FilterItem
<FilterItemI18n
indexPatterns={[indexPattern]}
id={`${field}-${value}-${negate}`}
filter={filter}