Move search service code to NP (#55430)

* Move get search params into search strategy

* Move search strategy to NP and clean up courier exports

* Move fetch to NP

* Moved search source to NP

* Move shard failure to data/ui folder

* move getflattenedobject to core/utils

* fix discover

* eslint

* fix scss

* fix ts

Co-authored-by: Elastic Machine <[email protected]>

src/core/server/legacy/config/get_unused_config_keys.ts

@@ -20,7 +20,8 @@
 import { difference, get, set } from 'lodash';
 // @ts-ignore
 import { getTransform } from '../../../../legacy/deprecation/index';
-import { unset, getFlattenedObject } from '../../../../legacy/utils';
+import { unset } from '../../../../legacy/utils';
+import { getFlattenedObject } from '../../../utils';
 import { hasConfigPathIntersection } from '../../config';
 import { LegacyPluginSpec, LegacyConfig, LegacyVars } from '../types';
 

src/core/utils/index.ts

@@ -28,4 +28,5 @@ export * from './pick';
 export * from './promise';
 export * from './url';
 export * from './unset';
+export * from './get_flattened_object';
 export * from './default_app_categories';

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

@@ -28,8 +28,6 @@ export function plugin() {
 
 /** @public types */
 export { DataStart };
-export { EsQuerySortValue, FetchOptions, ISearchSource, SortDirection } from './search/types';
-export { SearchSourceFields } from './search/types';
 export {
   SavedQueryAttributes,
   SavedQuery,

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

@@ -18,19 +18,20 @@
  */
 
 import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { SearchService, SearchStart } from './search';
-import { DataPublicPluginStart } from '../../../../plugins/data/public';
+import {
+  DataPublicPluginStart,
+  addSearchStrategy,
+  defaultSearchStrategy,
+} from '../../../../plugins/data/public';
 import { ExpressionsSetup } from '../../../../plugins/expressions/public';
 
 import {
-  setFieldFormats,
-  setNotifications,
   setIndexPatterns,
   setQueryService,
-  setSearchService,
   setUiSettings,
   setInjectedMetadata,
-  setHttp,
+  setFieldFormats,
+  setSearchService,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 } from '../../../../plugins/data/public/services';
 
@@ -47,9 +48,7 @@ export interface DataPluginStartDependencies {
  *
  * @public
  */
-export interface DataStart {
-  search: SearchStart;
-}
+export interface DataStart {} // eslint-disable-line @typescript-eslint/no-empty-interface
 
 /**
  * Data Plugin - public
@@ -65,29 +64,22 @@ export interface DataStart {
 
 export class DataPlugin
   implements Plugin<void, DataStart, DataPluginSetupDependencies, DataPluginStartDependencies> {
-  private readonly search = new SearchService();
-
   public setup(core: CoreSetup) {
     setInjectedMetadata(core.injectedMetadata);
+
+    // This is to be deprecated once we switch to the new search service fully
+    addSearchStrategy(defaultSearchStrategy);
   }
 
   public start(core: CoreStart, { data }: DataPluginStartDependencies): DataStart {
-    // This is required for when Angular code uses Field and FieldList.
-    setFieldFormats(data.fieldFormats);
+    setUiSettings(core.uiSettings);
     setQueryService(data.query);
-    setSearchService(data.search);
     setIndexPatterns(data.indexPatterns);
     setFieldFormats(data.fieldFormats);
-    setNotifications(core.notifications);
-    setUiSettings(core.uiSettings);
-    setHttp(core.http);
+    setSearchService(data.search);
 
-    return {
-      search: this.search.start(core),
-    };
+    return {};
   }
 
-  public stop() {
-    this.search.stop();
-  }
+  public stop() {}
 }

src/legacy/core_plugins/data/public/search/expressions/esaggs.ts

@@ -28,6 +28,8 @@ import {
   KibanaDatatableColumn,
 } from 'src/plugins/expressions/public';
 import {
+  ISearchSource,
+  SearchSource,
   Query,
   TimeRange,
   esFilters,
@@ -43,8 +45,7 @@ import { PersistedState } from '../../../../../ui/public/persisted_state';
 import { Adapters } from '../../../../../../plugins/inspector/public';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { getQueryService, getIndexPatterns } from '../../../../../../plugins/data/public/services';
-import { ISearchSource, getRequestInspectorStats, getResponseInspectorStats } from '../..';
-import { SearchSource } from '../search_source';
+import { getRequestInspectorStats, getResponseInspectorStats } from '../..';
 
 export interface RequestHandlerParams {
   searchSource: ISearchSource;

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

@@ -17,6 +17,4 @@
  * under the License.
  */
 
-export { SearchService, SearchSetup, SearchStart } from './search_service';
-
 export { getRequestInspectorStats, getResponseInspectorStats } from './utils';

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

@@ -17,7 +17,4 @@
  * under the License.
  */
 
-export * from './fetch/types';
-export * from './search_source/types';
-export * from './search_strategy/types';
 export * from './utils/types';

src/legacy/core_plugins/data/public/search/utils/courier_inspector_utils.ts

@@ -26,7 +26,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { SearchResponse } from 'elasticsearch';
-import { ISearchSource, RequestInspectorStats } from '../types';
+import { RequestInspectorStats } from '../types';
+import { ISearchSource } from '../../../../../../plugins/data/public';
 
 export function getRequestInspectorStats(searchSource: ISearchSource) {
   const stats: RequestInspectorStats = {};

src/legacy/core_plugins/input_control_vis/public/legacy_imports.ts

@@ -17,13 +17,14 @@
  * under the License.
  */
 
-import { SearchSource as SearchSourceClass, ISearchSource } from 'ui/courier';
 import { Class } from '@kbn/utility-types';
+import { SearchSource as SearchSourceClass, ISearchSource } from '../../../../plugins/data/public';
+
+export { SearchSourceFields } from '../../../../plugins/data/public';
 
 export { Vis, VisParams } from 'ui/vis';
 export { VisOptionsProps } from 'ui/vis/editors/default';
 export { ValidatedDualRange } from 'ui/validated_range';
-export { SearchSourceFields } from '../../data/public';
 
 export type SearchSource = Class<ISearchSource>;
 export const SearchSource = SearchSourceClass;

src/legacy/core_plugins/kibana/public/dashboard/__tests__/get_saved_dashboard_mock.ts

@@ -17,7 +17,8 @@
  * under the License.
  */
 
-import { searchSourceMock } from 'ui/courier/search_source/mocks';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { searchSourceMock } from '../../../../../../plugins/data/public/search/search_source/mocks';
 import { SavedObjectDashboard } from '../saved_dashboard/saved_dashboard';
 
 export function getSavedDashboardMock(

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

@@ -16,12 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ISearchSource } from 'ui/courier';
 import { SavedObject, SavedObjectKibanaServices } from 'ui/saved_objects/types';
 import { createSavedObjectClass } from 'ui/saved_objects/saved_object';
 import { extractReferences, injectReferences } from './saved_dashboard_references';
 
-import { esFilters, Query, RefreshInterval } from '../../../../../../plugins/data/public';
+import {
+  esFilters,
+  ISearchSource,
+  Query,
+  RefreshInterval,
+} from '../../../../../../plugins/data/public';
 import { createDashboardEditUrl } from '..';
 
 export interface SavedObjectDashboard extends SavedObject {

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

@@ -57,16 +57,7 @@ export { wrapInI18nContext } from 'ui/i18n';
 export { buildVislibDimensions } from '../../../visualizations/public';
 // @ts-ignore
 export { callAfterBindingsWorkaround } from 'ui/compat';
-export {
-  getRequestInspectorStats,
-  getResponseInspectorStats,
-  hasSearchStategyForIndexPattern,
-  isDefaultTypeIndexPattern,
-  SearchSource,
-  EsQuerySortValue,
-  SortDirection,
-  ISearchSource,
-} from 'ui/courier';
+export { getRequestInspectorStats, getResponseInspectorStats } from '../../../data/public';
 // @ts-ignore
 export { intervalOptions } from 'ui/agg_types/buckets/_interval_options';
 // @ts-ignore
@@ -93,7 +84,12 @@ export {
   IIndexPattern,
   IndexPattern,
   indexPatterns,
+  hasSearchStategyForIndexPattern,
   IFieldType,
+  SearchSource,
+  ISearchSource,
+  EsQuerySortValue,
+  SortDirection,
 } from '../../../../../plugins/data/public';
 export { ElasticSearchHit } from './np_ready/doc_views/doc_views_types';
 export { Adapters } from 'ui/inspector/types';

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

@@ -45,7 +45,6 @@ import {
   getServices,
   hasSearchStategyForIndexPattern,
   intervalOptions,
-  isDefaultTypeIndexPattern,
   migrateLegacyQuery,
   RequestAdapter,
   showSaveModal,
@@ -73,7 +72,10 @@ const {
 } = getServices();
 
 import { getRootBreadcrumbs, getSavedSearchBreadcrumbs } from '../helpers/breadcrumbs';
-import { generateFilters } from '../../../../../../../plugins/data/public';
+import {
+  generateFilters,
+  indexPatterns as indexPatternsUtils,
+} from '../../../../../../../plugins/data/public';
 import { getIndexPatternId } from '../helpers/get_index_pattern_id';
 import { FilterStateManager } from '../../../../../data/public';
 
@@ -400,7 +402,8 @@ function discoverController(
 
   // searchSource which applies time range
   const timeRangeSearchSource = savedSearch.searchSource.create();
-  if (isDefaultTypeIndexPattern($scope.indexPattern)) {
+
+  if (indexPatternsUtils.isDefault($scope.indexPattern)) {
     timeRangeSearchSource.setField('filter', () => {
       return timefilter.createFilter($scope.indexPattern);
     });
@@ -561,7 +564,8 @@ function discoverController(
   $scope.opts = {
     // number of records to fetch, then paginate through
     sampleSize: config.get('discover:sampleSize'),
-    timefield: isDefaultTypeIndexPattern($scope.indexPattern) && $scope.indexPattern.timeFieldName,
+    timefield:
+      indexPatternsUtils.isDefault($scope.indexPattern) && $scope.indexPattern.timeFieldName,
     savedSearch: savedSearch,
     indexPatternList: $route.current.locals.savedObjects.ip.list,
   };
@@ -1162,7 +1166,7 @@ function discoverController(
   // Block the UI from loading if the user has loaded a rollup index pattern but it isn't
   // supported.
   $scope.isUnsupportedIndexPattern =
-    !isDefaultTypeIndexPattern($route.current.locals.savedObjects.ip.loaded) &&
+    !indexPatternsUtils.isDefault($route.current.locals.savedObjects.ip.loaded) &&
     !hasSearchStategyForIndexPattern($route.current.locals.savedObjects.ip.loaded);
 
   if ($scope.isUnsupportedIndexPattern) {

src/legacy/core_plugins/visualizations/public/embeddable/visualize_embeddable.ts

@@ -29,7 +29,6 @@ import { getTableAggs } from 'ui/visualize/loader/pipeline_helpers/utilities';
 import { AppState } from 'ui/state_management/app_state';
 import { npStart } from 'ui/new_platform';
 import { IExpressionLoaderParams } from 'src/plugins/expressions/public';
-import { ISearchSource } from 'ui/courier';
 import { VISUALIZE_EMBEDDABLE_TYPE } from './constants';
 import {
   IIndexPattern,
@@ -38,6 +37,7 @@ import {
   onlyDisabledFiltersChanged,
   esFilters,
   mapAndFlattenFilters,
+  ISearchSource,
 } from '../../../../../plugins/data/public';
 import {
   EmbeddableInput,

src/legacy/core_plugins/visualizations/public/legacy_mocks.ts

@@ -17,4 +17,5 @@
  * under the License.
  */
 
-export { searchSourceMock } from '../../../ui/public/courier/search_source/mocks';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+export { searchSourceMock } from '../../../../plugins/data/public/search/search_source/mocks';

src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_requesterror.tsx

@@ -19,7 +19,7 @@
 
 import { EuiIcon, EuiSpacer, EuiText } from '@elastic/eui';
 import React from 'react';
-import { SearchError } from '../../../../../data/public/search/search_strategy';
+import { SearchError } from '../../../../../../../plugins/data/public';
 
 interface VisualizationRequestErrorProps {
   onInit?: () => void;

src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts

@@ -21,14 +21,13 @@ import { cloneDeep, get } from 'lodash';
 // @ts-ignore
 import moment from 'moment';
 import { SerializedFieldFormat } from 'src/plugins/expressions/public';
+import { ISearchSource } from 'src/plugins/data/public';
 import {
   AggConfig,
   setBounds,
   isDateHistogramBucketAggConfig,
   createFormat,
 } from '../../../legacy_imports';
-// eslint-disable-next-line
-import { ISearchSource } from '../../../../../../ui/public/courier/search_source/search_source';
 import { Vis, VisParams, VisState } from '..';
 
 interface SchemaConfigParams {

src/legacy/server/config/override.js

@@ -19,7 +19,7 @@
 
 import _ from 'lodash';
 import explodeBy from './explode_by';
-import { getFlattenedObject } from '../../utils';
+import { getFlattenedObject } from '../../../core/utils';
 
 export default function(target, source) {
   const _target = getFlattenedObject(target);

src/legacy/ui/public/_index.scss

@@ -10,7 +10,6 @@
 
 @import './accessibility/index';
 @import './chrome/index';
-@import './courier/index';
 @import './collapsible_sidebar/index';
 @import './directives/index';
 @import './error_auto_create_index/index';