[Infra UI] Replace usage of deprecated filter types (#120762)

* Replace usage of deprecated filter types
elastic · Dec 9, 2021 · 6d732a1 · 6d732a1
1 parent 443ad8e
commit 6d732a1
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
diff --git a/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable.tsx b/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable.tsx
@@ -5,11 +5,12 @@
  * 2.0.
  */
 
+import { Query, Filter } from '@kbn/es-query';
 import { CoreStart } from 'kibana/public';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Subscription } from 'rxjs';
-import { Filter, Query, TimeRange } from '../../../../../../src/plugins/data/public';
+import { TimeRange } from '../../../../../../src/plugins/data/public';
 import {
   Embeddable,
   EmbeddableInput,

diff --git a/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_fields_table.tsx b/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_fields_table.tsx
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { Query } from '@kbn/es-query';
 import { EuiBasicTableColumn, EuiInMemoryTable } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import * as rt from 'io-ts';
 import React, { useMemo } from 'react';
-import { Query } from '../../../../../../../src/plugins/data/public';
 import { LogEntryField } from '../../../../common/log_entry';
 import { LogEntry } from '../../../../common/search_strategies/log_entries/log_entry';
 import { TimeKey } from '../../../../common/time';

diff --git a/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_flyout.tsx b/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_flyout.tsx
@@ -18,7 +18,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useEffect } from 'react';
-import type { Query } from '../../../../../../../src/plugins/data/public';
+import type { Query } from '@kbn/es-query';
 import { TimeKey } from '../../../../common/time';
 import { useLogEntry } from '../../../containers/logs/log_entry';
 import { CenteredEuiFlyoutBody } from '../../centered_flyout_body';

diff --git a/x-pack/plugins/infra/public/containers/logs/log_filter/with_log_filter_url_state.tsx b/x-pack/plugins/infra/public/containers/logs/log_filter/with_log_filter_url_state.tsx
@@ -7,7 +7,7 @@
 
 import * as rt from 'io-ts';
 import React, { useContext } from 'react';
-import { Query } from '../../../../../../../src/plugins/data/public';
+import { Query } from '@kbn/es-query';
 import { replaceStateKeyInQueryString, UrlStateContainer } from '../../../utils/url_state';
 import { LogFilterState } from './log_filter_state';
 

diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx
@@ -10,7 +10,7 @@ import moment from 'moment';
 import { stringify } from 'query-string';
 import React, { useCallback, useMemo } from 'react';
 import { encode, RisonValue } from 'rison-node';
-import type { Query } from '../../../../../../../src/plugins/data/public';
+import type { Query } from '@kbn/es-query';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { useTrackPageview } from '../../../../../observability/public';
 import { TimeKey } from '../../../../common/time';

diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_dataset_filtering.ts b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_dataset_filtering.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { Filter } from '@kbn/es-query';
 import { useEffect, useReducer, useCallback } from 'react';
 import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
-import { Filter } from '../../../../../../../src/plugins/data/common';
 import { CONTROLLED_BY_SWIM_LANE_FILTER } from '../../../../../ml/public';
 
 interface ReducerState {

diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_logs_content.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
@@ -8,7 +8,7 @@
 import { EuiSpacer } from '@elastic/eui';
 import React, { useContext, useCallback, useMemo, useEffect } from 'react';
 import usePrevious from 'react-use/lib/usePrevious';
-import type { Query } from '../../../../../../../src/plugins/data/public';
+import type { Query } from '@kbn/es-query';
 import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 import { LogEntry } from '../../../../common/log_entry';
 import { TimeKey } from '../../../../common/time';

diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_toolbar.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_toolbar.tsx
@@ -8,7 +8,8 @@
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useContext } from 'react';
-import { Query, QueryStringInput } from '../../../../../../../src/plugins/data/public';
+import { Query } from '@kbn/es-query';
+import { QueryStringInput } from '../../../../../../../src/plugins/data/public';
 import { LogCustomizationMenu } from '../../../components/logging/log_customization_menu';
 import { LogDatepicker } from '../../../components/logging/log_datepicker';
 import { LogHighlightsMenu } from '../../../components/logging/log_highlights_menu';

diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_filters.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_filters.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { fromKueryExpression } from '@kbn/es-query';
 import { useState, useMemo, useCallback, useEffect } from 'react';
 import * as rt from 'io-ts';
 import { pipe } from 'fp-ts/lib/pipeable';
@@ -15,11 +16,10 @@ import { useAlertPrefillContext } from '../../../../alerting/use_alert_prefill';
 import { useUrlState } from '../../../../utils/use_url_state';
 import { useSourceContext } from '../../../../containers/metrics_source';
 import { convertKueryToElasticSearchQuery } from '../../../../utils/kuery';
-import { esKuery } from '../../../../../../../../src/plugins/data/public';
 
 const validateKuery = (expression: string) => {
   try {
-    esKuery.fromKueryExpression(expression);
+    fromKueryExpression(expression);
   } catch (err) {
     return false;
   }

diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx
@@ -6,12 +6,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
-
+import { fromKueryExpression } from '@kbn/es-query';
 import React, { useEffect, useState } from 'react';
 import { DataViewBase } from '@kbn/es-query';
 import { WithKueryAutocompletion } from '../../../../containers/with_kuery_autocompletion';
 import { AutocompleteField } from '../../../../components/autocomplete_field';
-import { esKuery, QuerySuggestion } from '../../../../../../../../src/plugins/data/public';
+import { QuerySuggestion } from '../../../../../../../../src/plugins/data/public';
 
 type LoadSuggestionsFn = (
   e: string,
@@ -32,7 +32,7 @@ interface Props {
 
 function validateQuery(query: string) {
   try {
-    esKuery.fromKueryExpression(query);
+    fromKueryExpression(query);
   } catch (err) {
     return false;
   }

diff --git a/x-pack/plugins/infra/public/utils/kuery.ts b/x-pack/plugins/infra/public/utils/kuery.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
 import { DataViewBase } from '@kbn/es-query';
-import { esKuery } from '../../../../../src/plugins/data/public';
 
 export const convertKueryToElasticSearchQuery = (
   kueryExpression: string,
@@ -15,9 +15,7 @@ export const convertKueryToElasticSearchQuery = (
 ) => {
   try {
     return kueryExpression
-      ? JSON.stringify(
-          esKuery.toElasticsearchQuery(esKuery.fromKueryExpression(kueryExpression), indexPattern)
-        )
+      ? JSON.stringify(toElasticsearchQuery(fromKueryExpression(kueryExpression), indexPattern))
       : '';
   } catch (err) {
     if (swallowErrors) {