Move saved queries service + language switcher ⇒ NP (#51812) (#51863)

* Move saved queries service + language switcher to NP

* test fixes

* test fix

* fix ts

* mock search service

Author: Liza Katz

src/legacy/core_plugins/data/index.ts

@@ -20,7 +20,7 @@
 import { resolve } from 'path';
 import { Legacy } from '../../../../kibana';
 import { mappings } from './mappings';
-import { SavedQuery } from './public';
+import { SavedQuery } from '../../../plugins/data/public';
 
 // eslint-disable-next-line import/no-default-export
 export default function DataPlugin(kibana: any) {

src/legacy/core_plugins/data/public/index.ts

@@ -38,7 +38,12 @@ export {
   StaticIndexPattern,
 } from './index_patterns';
 export { QueryStringInput } from './query';
-export { SearchBar, SearchBarProps, SavedQueryAttributes, SavedQuery } from './search';
+export { SearchBar, SearchBarProps } from './search';
+export {
+  SavedQueryAttributes,
+  SavedQuery,
+  SavedQueryTimeFilter,
+} from '../../../../plugins/data/public';
 
 /** @public static code */
 export * from '../common';

src/legacy/core_plugins/data/public/plugin.ts

@@ -18,7 +18,7 @@
  */
 
 import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { SearchService, SearchStart, createSearchBar, StatetfulSearchBarProps } from './search';
+import { createSearchBar, StatetfulSearchBarProps } from './search';
 import { IndexPatternsService, IndexPatternsSetup, IndexPatternsStart } from './index_patterns';
 import { Storage, IStorageWrapper } from '../../../../../src/plugins/kibana_utils/public';
 import { DataPublicPluginStart } from '../../../../plugins/data/public';
@@ -51,7 +51,6 @@ export interface DataSetup {
  */
 export interface DataStart {
   indexPatterns: IndexPatternsStart;
-  search: SearchStart;
   ui: {
     SearchBar: React.ComponentType<StatetfulSearchBarProps>;
   };
@@ -71,7 +70,6 @@ export interface DataStart {
 
 export class DataPlugin implements Plugin<DataSetup, DataStart, {}, DataPluginStartDependencies> {
   private readonly indexPatterns: IndexPatternsService = new IndexPatternsService();
-  private readonly search: SearchService = new SearchService();
 
   private setupApi!: DataSetup;
   private storage!: IStorageWrapper;
@@ -119,7 +117,6 @@ export class DataPlugin implements Plugin<DataSetup, DataStart, {}, DataPluginSt
     return {
       ...this.setupApi!,
       indexPatterns: indexPatternsService,
-      search: this.search.start(savedObjects.client),
       ui: {
         SearchBar,
       },
@@ -128,6 +125,5 @@ export class DataPlugin implements Plugin<DataSetup, DataStart, {}, DataPluginSt
 
   public stop() {
     this.indexPatterns.stop();
-    this.search.stop();
   }
 }

src/legacy/core_plugins/data/public/query/query_bar/components/query_string_input.test.tsx

@@ -25,7 +25,7 @@ import {
 
 import { EuiFieldText } from '@elastic/eui';
 import React from 'react';
-import { QueryLanguageSwitcher } from './language_switcher';
+import { QueryLanguageSwitcher } from '../../../../../../../plugins/data/public';
 import { QueryStringInput, QueryStringInputUI } from './query_string_input';
 import { coreMock } from '../../../../../../../core/public/mocks';
 const startMock = coreMock.createStart();

src/legacy/core_plugins/data/public/query/query_bar/components/query_string_input.tsx

@@ -46,13 +46,13 @@ import {
   matchPairs,
   getQueryLog,
   Query,
+  QueryLanguageSwitcher,
 } from '../../../../../../../plugins/data/public';
 import {
   withKibana,
   KibanaReactContextValue,
   toMountPoint,
 } from '../../../../../../../plugins/kibana_react/public';
-import { QueryLanguageSwitcher } from './language_switcher';
 import { fetchIndexPatterns } from './fetch_index_patterns';
 
 interface Props {

src/legacy/core_plugins/data/public/search/index.ts

@@ -17,5 +17,4 @@
  * under the License.
  */
 
-export * from './search_service';
 export * from './search_bar';

src/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/save_query_form.tsx

@@ -35,8 +35,11 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { sortBy, isEqual } from 'lodash';
-import { SavedQuery, SavedQueryAttributes } from '../../index';
-import { SavedQueryService } from '../../lib/saved_query_service';
+import {
+  SavedQuery,
+  SavedQueryAttributes,
+  SavedQueryService,
+} from '../../../../../../../../plugins/data/public';
 
 interface Props {
   savedQuery?: SavedQueryAttributes;

src/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/saved_query_list_item.tsx

@@ -22,7 +22,7 @@ import { EuiListGroupItem, EuiConfirmModal, EuiOverlayMask, EuiIconTip } from '@
 import React, { Fragment, useState } from 'react';
 import classNames from 'classnames';
 import { i18n } from '@kbn/i18n';
-import { SavedQuery } from '../../index';
+import { SavedQuery } from '../../../../../../../../plugins/data/public';
 
 interface Props {
   savedQuery: SavedQuery;

src/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/saved_query_management_component.tsx

@@ -35,8 +35,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import React, { FunctionComponent, useEffect, useState, Fragment } from 'react';
 import { sortBy } from 'lodash';
-import { SavedQuery } from '../../index';
-import { SavedQueryService } from '../../lib/saved_query_service';
+import { SavedQuery, SavedQueryService } from '../../../../../../../../plugins/data/public';
 import { SavedQueryListItem } from './saved_query_list_item';
 
 const perPage = 50;

src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx

@@ -38,6 +38,7 @@ const mockTimeHistory = {
 jest.mock('../../../../../../../plugins/data/public', () => {
   return {
     FilterBar: () => <div className="filterBar" />,
+    createSavedQueryService: () => {},
   };
 });