[7.x] Move saved queries service + language switcher ⇒ NP (#51812)

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: () => {},
   };
 });
 

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

@@ -26,11 +26,9 @@ import { get, isEqual } from 'lodash';
 
 import { IndexPattern } from '../../../../../data/public';
 import { QueryBarTopRow } from '../../../query';
-import { SavedQuery, SavedQueryAttributes } from '../index';
 import { SavedQueryMeta, SaveQueryForm } from './saved_query_management/save_query_form';
 import { SavedQueryManagementComponent } from './saved_query_management/saved_query_management_component';
-import { SavedQueryService } from '../lib/saved_query_service';
-import { createSavedQueryService } from '../lib/saved_query_service';
+
 import {
   withKibana,
   KibanaReactContextValue,
@@ -42,6 +40,10 @@ import {
   esFilters,
   TimeHistoryContract,
   FilterBar,
+  SavedQueryService,
+  createSavedQueryService,
+  SavedQuery,
+  SavedQueryAttributes,
 } from '../../../../../../../plugins/data/public';
 
 interface SearchBarInjectedDeps {

src/legacy/core_plugins/data/public/search/search_bar/index.tsx

@@ -17,23 +17,4 @@
  * under the License.
  */
 
-import { RefreshInterval, TimeRange, Query, esFilters } from 'src/plugins/data/public';
-
 export * from './components';
-
-export type SavedQueryTimeFilter = TimeRange & {
-  refreshInterval: RefreshInterval;
-};
-
-export interface SavedQuery {
-  id: string;
-  attributes: SavedQueryAttributes;
-}
-
-export interface SavedQueryAttributes {
-  title: string;
-  description: string;
-  query: Query;
-  filters?: esFilters.Filter[];
-  timefilter?: SavedQueryTimeFilter;
-}

src/legacy/core_plugins/kibana/public/dashboard/application.ts

@@ -67,7 +67,7 @@ export interface RenderDeps {
   uiSettings: UiSettingsClientContract;
   chrome: ChromeStart;
   addBasePath: (path: string) => string;
-  savedQueryService: DataStart['search']['services']['savedQueryService'];
+  savedQueryService: NpDataStart['query']['savedQueries'];
   embeddables: IEmbeddableStart;
   localStorage: Storage;
   share: SharePluginStart;

src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.tsx

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { StaticIndexPattern, SavedQuery } from 'plugins/data';
+import { StaticIndexPattern } from 'plugins/data';
 import moment from 'moment';
 import { Subscription } from 'rxjs';
 
@@ -31,7 +31,7 @@ import {
 import { ViewMode } from '../../../embeddable_api/public/np_ready/public';
 import { SavedObjectDashboard } from './saved_dashboard/saved_dashboard';
 import { DashboardAppState, SavedDashboardPanel, ConfirmModalFn } from './types';
-import { TimeRange, Query, esFilters } from '../../../../../../src/plugins/data/public';
+import { TimeRange, Query, esFilters, SavedQuery } from '../../../../../../src/plugins/data/public';
 
 import { DashboardAppController } from './dashboard_app_controller';
 import { RenderDeps } from './application';

src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx

@@ -38,8 +38,8 @@ import {
   SavedObjectFinder,
   unhashUrl,
 } from './legacy_imports';
-import { FilterStateManager, IndexPattern, SavedQuery } from '../../../data/public';
-import { Query } from '../../../../../plugins/data/public';
+import { FilterStateManager, IndexPattern } from '../../../data/public';
+import { Query, SavedQuery } from '../../../../../plugins/data/public';
 
 import './dashboard_empty_screen_directive';
 

src/legacy/core_plugins/kibana/public/dashboard/plugin.ts

@@ -104,7 +104,7 @@ export class DashboardPlugin implements Plugin {
           chrome: contextCore.chrome,
           addBasePath: contextCore.http.basePath.prepend,
           uiSettings: contextCore.uiSettings,
-          savedQueryService: dataStart.search.services.savedQueryService,
+          savedQueryService: npDataStart.query.savedQueries,
           embeddables,
           dashboardCapabilities: contextCore.application.capabilities.dashboard,
           localStorage: new Storage(localStorage),

src/legacy/core_plugins/kibana/public/discover/angular/discover.js

@@ -68,16 +68,17 @@ const {
   share,
   StateProvider,
   timefilter,
+  npData,
   toastNotifications,
   uiModules,
   uiRoutes,
 }  = getServices();
 
 import { getRootBreadcrumbs, getSavedSearchBreadcrumbs } from '../breadcrumbs';
-import { start as data } from '../../../../data/public/legacy';
 import { generateFilters } from '../../../../../../plugins/data/public';
+import { start as data } from '../../../../data/public/legacy';
 
-const { savedQueryService } = data.search.services;
+const savedQueryService = npData.query.savedQueries;
 
 const fetchStatuses = {
   UNINITIALIZED: 'uninitialized',

src/legacy/core_plugins/kibana/public/discover/kibana_services.ts

@@ -34,7 +34,6 @@ import { StateProvider } from 'ui/state_management/state';
 import { SavedObjectProvider } from 'ui/saved_objects/saved_object';
 import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
 import { FilterBarQueryFilterProvider } from 'ui/filter_manager/query_filter';
-import { timefilter } from 'ui/timefilter';
 // @ts-ignore
 import { IndexPattern, IndexPatterns } from 'ui/index_patterns';
 import { wrapInI18nContext } from 'ui/i18n';
@@ -58,7 +57,9 @@ const services = {
   uiSettings: npStart.core.uiSettings,
   uiActions: npStart.plugins.uiActions,
   embeddable: npStart.plugins.embeddable,
+  npData: npStart.plugins.data,
   share: npStart.plugins.share,
+  timefilter: npStart.plugins.data.query.timefilter.timefilter,
   // legacy
   docTitle,
   docViewsRegistry,
@@ -70,7 +71,6 @@ const services = {
   SavedObjectProvider,
   SearchSource,
   StateProvider,
-  timefilter,
   uiModules,
   uiRoutes,
   wrapInI18nContext,

src/legacy/core_plugins/kibana/public/visualize/editor/editor.js

@@ -54,19 +54,20 @@ const {
   capabilities,
   chrome,
   chromeLegacy,
+  npData,
   data,
   docTitle,
   FilterBarQueryFilterProvider,
   getBasePath,
   toastNotifications,
-  timefilter,
   uiModules,
   uiRoutes,
   visualizations,
   share,
 } = getServices();
 
-const { savedQueryService } = data.search.services;
+const savedQueryService = npData.query.savedQueries;
+const { timefilter } = npData.query.timefilter;
 
 uiRoutes
   .when(VisualizeConstants.CREATE_PATH, {

src/legacy/core_plugins/kibana/public/visualize/kibana_services.ts

@@ -36,7 +36,6 @@ import { wrapInI18nContext } from 'ui/i18n';
 // @ts-ignore
 import { uiModules } from 'ui/modules';
 import { FeatureCatalogueRegistryProvider } from 'ui/registry/feature_catalogue';
-import { timefilter } from 'ui/timefilter';
 
 // Saved objects
 import { SavedObjectsClientProvider } from 'ui/saved_objects';
@@ -46,8 +45,8 @@ import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_regis
 
 import { createUiStatsReporter, METRIC_TYPE } from '../../../ui_metric/public';
 import { start as visualizations } from '../../../visualizations/public/np_ready/public/legacy';
-import { start as data } from '../../../data/public/legacy';
 import { start as embeddables } from '../../../../core_plugins/embeddable_api/public/np_ready/public/legacy';
+import { start as data } from '../../../data/public/legacy';
 
 const services = {
   // new platform
@@ -63,6 +62,7 @@ const services = {
   core: npStart.core,
 
   share: npStart.plugins.share,
+  npData: npStart.plugins.data,
   data,
   embeddables,
   visualizations,
@@ -78,7 +78,7 @@ const services = {
   SavedObjectProvider,
   SavedObjectRegistryProvider,
   SavedObjectsClientProvider,
-  timefilter,
+  timefilter: npStart.plugins.data.query.timefilter.timefilter,
   uiModules,
   uiRoutes,
   wrapInI18nContext,

src/legacy/ui/public/new_platform/new_platform.karma_mock.js

@@ -80,6 +80,14 @@ export const npSetup = {
           timefilter: sinon.fake(),
           history: sinon.fake(),
         },
+        savedQueries: {
+          saveQuery: sinon.fake(),
+          getAllSavedQueries: sinon.fake(),
+          findSavedQueries: sinon.fake(),
+          getSavedQuery: sinon.fake(),
+          deleteSavedQuery: sinon.fake(),
+          getSavedQueryCount: sinon.fake(),
+        }
       },
       fieldFormats: getFieldFormatsRegistry(mockUiSettings),
     },

src/plugins/data/public/plugin.ts

@@ -59,7 +59,7 @@ export class DataPublicPlugin implements Plugin<DataPublicPluginSetup, DataPubli
       getSuggestions: getSuggestionsProvider(core.uiSettings, core.http),
       search: this.searchService.start(core),
       fieldFormats: this.fieldFormatsService.start(),
-      query: this.queryService.start(),
+      query: this.queryService.start(core.savedObjects),
       ui: {
         IndexPatternSelect: createIndexPatternSelect(core.savedObjects.client),
       },

src/plugins/data/public/query/index.tsx

@@ -21,7 +21,6 @@ export * from './lib';
 
 export * from './query_service';
 export * from './filter_manager';
-
 export * from './timefilter';
-
+export * from './saved_query';
 export * from './persisted_log';

src/plugins/data/public/query/mocks.ts

@@ -35,6 +35,7 @@ const createStartContractMock = () => {
   const startContract = {
     filterManager: jest.fn() as any,
     timefilter: timefilterServiceMock.createStartContract(),
+    savedQueries: jest.fn() as any,
   };
 
   return startContract;