Move ui/courier into data shim plugin

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

@@ -30,9 +30,16 @@ export function plugin() {
 export { DataStart };
 
 export { Field, FieldType, IFieldList, IndexPattern } from './index_patterns';
-export { SavedQuery, SavedQueryTimeFilter } from '../../../../plugins/data/public';
+export { EsQuerySortValue, FetchOptions, ISearchSource, SortDirection } from './search/types';
+export { SearchSourceFields } from './search/types';
+export {
+  SavedQueryAttributes,
+  SavedQuery,
+  SavedQueryTimeFilter,
+} from '../../../../plugins/data/public';
 
 /** @public static code */
 export * from '../common';
 export { FilterStateManager } from './filter/filter_manager';
 export { getFromSavedObject, getRoutes, flattenHitWrapper } from './index_patterns';
+export { getRequestInspectorStats, getResponseInspectorStats } from './search';

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

@@ -18,6 +18,7 @@
  */
 
 import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
+import { SearchService, SearchStart } from './search';
 import { DataPublicPluginStart } from '../../../../plugins/data/public';
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -32,8 +33,9 @@ export interface DataPluginStartDependencies {
  *
  * @public
  */
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface DataStart {}
+export interface DataStart {
+  search: SearchStart;
+}
 
 /**
  * Data Plugin - public
@@ -48,13 +50,20 @@ export interface DataStart {}
  */
 
 export class DataPlugin implements Plugin<void, DataStart, {}, DataPluginStartDependencies> {
+  private readonly search = new SearchService();
+
   public setup(core: CoreSetup) {}
 
   public start(core: CoreStart, { data }: DataPluginStartDependencies): DataStart {
     // This is required for when Angular code uses Field and FieldList.
     setFieldFormats(data.fieldFormats);
-    return {};
+
+    return {
+      search: this.search.start(core),
+    };
   }
 
-  public stop() {}
+  public stop() {
+    this.search.stop();
+  }
 }

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

@@ -32,7 +32,7 @@ import {
 import { npStart } from 'ui/new_platform';
 import {
   SearchSource,
-  SearchSourceContract,
+  ISearchSource,
   getRequestInspectorStats,
   getResponseInspectorStats,
 } from '../../../../../ui/public/courier';
@@ -51,7 +51,7 @@ import { PersistedState } from '../../../../../ui/public/persisted_state';
 import { Adapters } from '../../../../../../plugins/inspector/public';
 
 export interface RequestHandlerParams {
-  searchSource: SearchSourceContract;
+  searchSource: ISearchSource;
   aggs: AggConfigs;
   timeRange?: TimeRange;
   query?: Query;

src/legacy/ui/public/courier/fetch/components/shard_failure_description.tsx → src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.tsx

@@ -19,7 +19,7 @@
 import React from 'react';
 import { EuiCodeBlock, EuiDescriptionList, EuiSpacer } from '@elastic/eui';
 import { ShardFailure } from './shard_failure_types';
-import { getFlattenedObject } from '../../../../../../legacy/utils/get_flattened_object';
+import { getFlattenedObject } from '../../../../../../../legacy/utils/get_flattened_object';
 import { ShardFailureDescriptionHeader } from './shard_failure_description_header';
 
 /**

src/legacy/ui/public/courier/fetch/components/shard_failure_description_header.tsx → src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description_header.tsx

@@ -35,7 +35,7 @@ export function getFailureSummaryText(failure: ShardFailure, failureDetails?: st
   const displayDetails =
     typeof failureDetails === 'string' ? failureDetails : getFailureSummaryDetailsText(failure);
 
-  return i18n.translate('common.ui.courier.fetch.shardsFailedModal.failureHeader', {
+  return i18n.translate('data.search.searchSource.fetch.shardsFailedModal.failureHeader', {
     defaultMessage: '{failureName} at {failureDetails}',
     values: { failureName, failureDetails: displayDetails },
     description: 'Summary of shard failures, e.g. "IllegalArgumentException at shard 0 node xyz"',

src/legacy/ui/public/courier/fetch/components/shard_failure_modal.tsx → src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.tsx

@@ -59,15 +59,18 @@ export function ShardFailureModal({ request, response, title, onClose }: Props)
   const tabs = [
     {
       id: 'table',
-      name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tabHeaderShardFailures', {
-        defaultMessage: 'Shard failures',
-        description: 'Name of the tab displaying shard failures',
-      }),
+      name: i18n.translate(
+        'data.search.searchSource.fetch.shardsFailedModal.tabHeaderShardFailures',
+        {
+          defaultMessage: 'Shard failures',
+          description: 'Name of the tab displaying shard failures',
+        }
+      ),
       content: <ShardFailureTable failures={failures} />,
     },
     {
       id: 'json-request',
-      name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tabHeaderRequest', {
+      name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tabHeaderRequest', {
         defaultMessage: 'Request',
         description: 'Name of the tab displaying the JSON request',
       }),
@@ -79,7 +82,7 @@ export function ShardFailureModal({ request, response, title, onClose }: Props)
     },
     {
       id: 'json-response',
-      name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tabHeaderResponse', {
+      name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tabHeaderResponse', {
         defaultMessage: 'Response',
         description: 'Name of the tab displaying the JSON response',
       }),
@@ -104,15 +107,15 @@ export function ShardFailureModal({ request, response, title, onClose }: Props)
           {copy => (
             <EuiButtonEmpty onClick={copy}>
               <FormattedMessage
-                id="common.ui.courier.fetch.shardsFailedModal.copyToClipboard"
+                id="data.search.searchSource.fetch.shardsFailedModal.copyToClipboard"
                 defaultMessage="Copy response to clipboard"
               />
             </EuiButtonEmpty>
           )}
         </EuiCopy>
         <EuiButton onClick={() => onClose()} fill data-test-sub="closeShardFailureModal">
           <FormattedMessage
-            id="common.ui.courier.fetch.shardsFailedModal.close"
+            id="data.search.searchSource.fetch.shardsFailedModal.close"
             defaultMessage="Close"
             description="Closing the Modal"
           />

src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.tsx → src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.tsx

@@ -22,7 +22,7 @@ import { npStart } from 'ui/new_platform';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiButton, EuiTextAlign } from '@elastic/eui';
 
-import { toMountPoint } from '../../../../../../plugins/kibana_react/public';
+import { toMountPoint } from '../../../../../../../plugins/kibana_react/public';
 import { ShardFailureModal } from './shard_failure_modal';
 import { ResponseWithShardFailure, Request } from './shard_failure_types';
 
@@ -57,7 +57,7 @@ export function ShardFailureOpenModalButton({ request, response, title }: Props)
         data-test-subj="openShardFailureModalBtn"
       >
         <FormattedMessage
-          id="common.ui.courier.fetch.shardsFailedModal.showDetails"
+          id="data.search.searchSource.fetch.shardsFailedModal.showDetails"
           defaultMessage="Show details"
           description="Open the modal to show details"
         />

src/legacy/ui/public/courier/fetch/components/shard_failure_table.tsx → src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_table.tsx

@@ -44,7 +44,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
       render: (item: ListItem) => {
         const failureSummeryText = getFailureSummaryText(item);
         const collapseLabel = i18n.translate(
-          'common.ui.courier.fetch.shardsFailedModal.tableRowCollapse',
+          'data.search.searchSource.fetch.shardsFailedModal.tableRowCollapse',
           {
             defaultMessage: 'Collapse {rowDescription}',
             description: 'Collapse a row of a table with failures',
@@ -53,7 +53,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
         );
 
         const expandLabel = i18n.translate(
-          'common.ui.courier.fetch.shardsFailedModal.tableRowExpand',
+          'data.search.searchSource.fetch.shardsFailedModal.tableRowExpand',
           {
             defaultMessage: 'Expand {rowDescription}',
             description: 'Expand a row of a table with failures',
@@ -81,7 +81,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
     },
     {
       field: 'shard',
-      name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tableColShard', {
+      name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tableColShard', {
         defaultMessage: 'Shard',
       }),
       sortable: true,
@@ -90,23 +90,23 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
     },
     {
       field: 'index',
-      name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tableColIndex', {
+      name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tableColIndex', {
         defaultMessage: 'Index',
       }),
       sortable: true,
       truncateText: true,
     },
     {
       field: 'node',
-      name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tableColNode', {
+      name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tableColNode', {
         defaultMessage: 'Node',
       }),
       sortable: true,
       truncateText: true,
     },
     {
       field: 'reason.type',
-      name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tableColReason', {
+      name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tableColReason', {
         defaultMessage: 'Reason',
       }),
       truncateText: true,

src/legacy/ui/public/courier/fetch/errors.ts → src/legacy/core_plugins/data/public/search/fetch/errors.ts

@@ -17,9 +17,10 @@
  * under the License.
  */
 
-import { SearchError } from '../../courier';
-import { KbnError } from '../../../../../plugins/kibana_utils/public';
+import { SearchError } from '../search_strategy';
+import { KbnError } from '../../../../../../plugins/kibana_utils/public';
 import { SearchResponse } from '../types';
+
 /**
  * Request Failure - When an entire multi request fails
  * @param {Error} err - the Error that came back

src/legacy/ui/public/courier/fetch/fetch_soon.test.ts → src/legacy/core_plugins/data/public/search/fetch/fetch_soon.test.ts

@@ -19,7 +19,7 @@
 
 import { fetchSoon } from './fetch_soon';
 import { callClient } from './call_client';
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '../../../../../../core/public';
 import { FetchHandlers, FetchOptions } from './types';
 import { SearchRequest, SearchResponse } from '../types';
 

src/legacy/ui/public/courier/fetch/get_search_params.test.ts → src/legacy/core_plugins/data/public/search/fetch/get_search_params.test.ts

@@ -18,7 +18,7 @@
  */
 
 import { getMSearchParams, getSearchParams } from './get_search_params';
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '../../../../../../core/public';
 
 function getConfigStub(config: any = {}) {
   return {

src/legacy/ui/public/courier/fetch/get_search_params.ts → src/legacy/core_plugins/data/public/search/fetch/get_search_params.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '../../../../../../core/public';
 
 const sessionId = Date.now();
 

src/legacy/ui/public/courier/fetch/handle_response.test.ts → src/legacy/core_plugins/data/public/search/fetch/handle_response.test.ts

@@ -18,9 +18,9 @@
  */
 
 import { handleResponse } from './handle_response';
-import { toastNotifications } from '../../notify/toasts';
+import { toastNotifications } from 'ui/notify/toasts';
 
-jest.mock('../../notify/toasts', () => {
+jest.mock('ui/notify/toasts', () => {
   return {
     toastNotifications: {
       addWarning: jest.fn(),

src/legacy/ui/public/courier/fetch/handle_response.tsx → src/legacy/core_plugins/data/public/search/fetch/handle_response.tsx

@@ -20,31 +20,31 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSpacer } from '@elastic/eui';
-import { toastNotifications } from '../../notify/toasts';
+import { toastNotifications } from 'ui/notify/toasts';
 import { ShardFailureOpenModalButton } from './components/shard_failure_open_modal_button';
 import { Request, ResponseWithShardFailure } from './components/shard_failure_types';
 import { SearchRequest, SearchResponse } from '../types';
-import { toMountPoint } from '../../../../../plugins/kibana_react/public';
+import { toMountPoint } from '../../../../../../plugins/kibana_react/public';
 
 export function handleResponse(request: SearchRequest, response: SearchResponse) {
   if (response.timed_out) {
     toastNotifications.addWarning({
-      title: i18n.translate('common.ui.courier.fetch.requestTimedOutNotificationMessage', {
+      title: i18n.translate('data.search.searchSource.fetch.requestTimedOutNotificationMessage', {
         defaultMessage: 'Data might be incomplete because your request timed out',
       }),
     });
   }
 
   if (response._shards && response._shards.failed) {
-    const title = i18n.translate('common.ui.courier.fetch.shardsFailedNotificationMessage', {
+    const title = i18n.translate('data.search.searchSource.fetch.shardsFailedNotificationMessage', {
       defaultMessage: '{shardsFailed} of {shardsTotal} shards failed',
       values: {
         shardsFailed: response._shards.failed,
         shardsTotal: response._shards.total,
       },
     });
     const description = i18n.translate(
-      'common.ui.courier.fetch.shardsFailedNotificationDescription',
+      'data.search.searchSource.fetch.shardsFailedNotificationDescription',
       {
         defaultMessage: 'The data you are seeing might be incomplete or wrong.',
       }

src/legacy/ui/public/courier/fetch/types.ts → src/legacy/core_plugins/data/public/search/fetch/types.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '../../../../../../core/public';
 import { SearchRequest, SearchResponse } from '../types';
 
 export interface ApiCaller {

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

@@ -16,3 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+export { SearchService, SearchSetup, SearchStart } from './search_service';
+
+export { getRequestInspectorStats, getResponseInspectorStats } from './utils';

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

@@ -0,0 +1,51 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Plugin, CoreSetup, CoreStart } from '../../../../../core/public';
+import { SearchSource } from './search_source';
+import { defaultSearchStrategy } from './search_strategy';
+import { SearchStrategyProvider } from './search_strategy/types';
+
+export interface SearchSetup {} // eslint-disable-line @typescript-eslint/no-empty-interface
+
+export interface SearchStart {
+  defaultSearchStrategy: SearchStrategyProvider;
+  SearchSource: typeof SearchSource;
+}
+
+/**
+ * The contract provided here is a new platform shim for ui/courier.
+ *
+ * Once it has been refactored to work with new platform services,
+ * it will move into the existing search service in src/plugins/data/public/search
+ */
+export class SearchService implements Plugin<SearchSetup, SearchStart> {
+  public setup(core: CoreSetup): SearchSetup {
+    return {};
+  }
+
+  public start(core: CoreStart): SearchStart {
+    return {
+      defaultSearchStrategy,
+      SearchSource,
+    };
+  }
+
+  public stop() {}
+}