Remove deprecated es-query re-imports from data plugin (#134600)

elastic · Jun 21, 2022 · a8095ce · a8095ce
1 parent e0446da
commit a8095ce
Show file tree

Hide file tree

Showing 207 changed files with 296 additions and 959 deletions.
diff --git a/examples/search_examples/public/search_sessions/app.tsx b/examples/search_examples/public/search_sessions/app.tsx
@@ -34,6 +34,7 @@ import { lastValueFrom, of } from 'rxjs';
 
 import { CoreStart } from '@kbn/core/public';
 import { mountReactNode } from '@kbn/core/public/utils';
+import type { TimeRange } from '@kbn/es-query';
 import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
 
 import {
@@ -45,7 +46,6 @@ import {
   isErrorResponse,
   QueryState,
   SearchSessionState,
-  TimeRange,
 } from '@kbn/data-plugin/public';
 import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';

diff --git a/examples/search_examples/public/search_sessions/app_locator.ts b/examples/search_examples/public/search_sessions/app_locator.ts
@@ -7,8 +7,7 @@
  */
 
 import { SerializableRecord } from '@kbn/utility-types';
-import { Filter, Query, isFilterPinned } from '@kbn/es-query';
-import type { TimeRange } from '@kbn/data-plugin/public';
+import { Filter, Query, isFilterPinned, TimeRange } from '@kbn/es-query';
 import { getStatesFromKbnUrl, setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import { LocatorDefinition } from '@kbn/share-plugin/common';
 

diff --git a/examples/state_containers_examples/public/with_data_services/app.tsx b/examples/state_containers_examples/public/with_data_services/app.tsx
@@ -18,14 +18,13 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import { Filter, FilterStateStore } from '@kbn/es-query';
+import { Filter, FilterStateStore, Query } from '@kbn/es-query';
 import { CoreStart } from '@kbn/core/public';
 import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
 
 import {
   connectToQueryState,
   DataPublicPluginStart,
-  Query,
   QueryState,
   syncQueryStateWithUrl,
 } from '@kbn/data-plugin/public';

diff --git a/src/plugins/controls/common/control_types/options_list/types.ts b/src/plugins/controls/common/control_types/options_list/types.ts
@@ -6,8 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { TimeRange } from '@kbn/data-plugin/common';
-import { Filter, Query, BoolQuery } from '@kbn/es-query';
+import type { Filter, Query, BoolQuery, TimeRange } from '@kbn/es-query';
 import { FieldSpec, DataView, DataViewField } from '@kbn/data-views-plugin/common';
 
 import { DataControlInput } from '../../types';

diff --git a/src/plugins/controls/common/types.ts b/src/plugins/controls/common/types.ts
@@ -6,8 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Filter, Query } from '@kbn/es-query';
-import { TimeRange } from '@kbn/data-plugin/common';
+import type { Filter, Query, TimeRange } from '@kbn/es-query';
 import { EmbeddableInput } from '@kbn/embeddable-plugin/common/types';
 
 export type ControlWidth = 'small' | 'medium' | 'large';

diff --git a/src/plugins/controls/public/services/kibana/options_list.ts b/src/plugins/controls/public/services/kibana/options_list.ts
@@ -9,8 +9,7 @@
 import { memoize } from 'lodash';
 
 import dateMath from '@kbn/datemath';
-import { buildEsQuery } from '@kbn/es-query';
-import { TimeRange } from '@kbn/data-plugin/public';
+import { buildEsQuery, type TimeRange } from '@kbn/es-query';
 import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import {

diff --git a/src/plugins/dashboard/public/locator.ts b/src/plugins/dashboard/public/locator.ts
@@ -8,13 +8,8 @@
 
 import type { SerializableRecord } from '@kbn/utility-types';
 import { flow } from 'lodash';
-import { type Filter } from '@kbn/es-query';
-import type {
-  TimeRange,
-  Query,
-  GlobalQueryStateFromUrl,
-  RefreshInterval,
-} from '@kbn/data-plugin/public';
+import type { Filter, TimeRange, Query } from '@kbn/es-query';
+import type { GlobalQueryStateFromUrl, RefreshInterval } from '@kbn/data-plugin/public';
 import type { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/public';
 import { SerializableControlGroupInput } from '@kbn/controls-plugin/common';
 import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';

diff --git a/src/plugins/dashboard/public/services/data.ts b/src/plugins/dashboard/public/services/data.ts
@@ -6,4 +6,5 @@
  * Side Public License, v 1.
  */
 
+export type { Query, TimeRange, Filter } from '@kbn/es-query';
 export * from '@kbn/data-plugin/public';