Revert "[7.x] [SEARCH] Cleanup fetch soon (elastic#63320) (elastic#63929

)"

This reverts commit 6ee7111.

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md

@@ -88,6 +88,7 @@
 |  [SavedQuery](./kibana-plugin-plugins-data-public.savedquery.md) |  |
 |  [SavedQueryService](./kibana-plugin-plugins-data-public.savedqueryservice.md) |  |
 |  [SearchSourceFields](./kibana-plugin-plugins-data-public.searchsourcefields.md) |  |
+|  [SearchStrategyProvider](./kibana-plugin-plugins-data-public.searchstrategyprovider.md) |  |
 |  [TabbedAggColumn](./kibana-plugin-plugins-data-public.tabbedaggcolumn.md) | \* |
 |  [TabbedTable](./kibana-plugin-plugins-data-public.tabbedtable.md) | \* |
 |  [TimeRange](./kibana-plugin-plugins-data-public.timerange.md) |  |

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchstrategyprovider.id.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SearchStrategyProvider](./kibana-plugin-plugins-data-public.searchstrategyprovider.md) &gt; [id](./kibana-plugin-plugins-data-public.searchstrategyprovider.id.md)
+
+## SearchStrategyProvider.id property
+
+<b>Signature:</b>
+
+```typescript
+id: string;
+```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchstrategyprovider.isviable.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SearchStrategyProvider](./kibana-plugin-plugins-data-public.searchstrategyprovider.md) &gt; [isViable](./kibana-plugin-plugins-data-public.searchstrategyprovider.isviable.md)
+
+## SearchStrategyProvider.isViable property
+
+<b>Signature:</b>
+
+```typescript
+isViable: (indexPattern: IndexPattern) => boolean;
+```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchstrategyprovider.md

@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SearchStrategyProvider](./kibana-plugin-plugins-data-public.searchstrategyprovider.md)
+
+## SearchStrategyProvider interface
+
+<b>Signature:</b>
+
+```typescript
+export interface SearchStrategyProvider 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [id](./kibana-plugin-plugins-data-public.searchstrategyprovider.id.md) | <code>string</code> |  |
+|  [isViable](./kibana-plugin-plugins-data-public.searchstrategyprovider.isviable.md) | <code>(indexPattern: IndexPattern) =&gt; boolean</code> |  |
+|  [search](./kibana-plugin-plugins-data-public.searchstrategyprovider.search.md) | <code>(params: SearchStrategySearchParams) =&gt; SearchStrategyResponse</code> |  |
+

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchstrategyprovider.search.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SearchStrategyProvider](./kibana-plugin-plugins-data-public.searchstrategyprovider.md) &gt; [search](./kibana-plugin-plugins-data-public.searchstrategyprovider.search.md)
+
+## SearchStrategyProvider.search property
+
+<b>Signature:</b>
+
+```typescript
+search: (params: SearchStrategySearchParams) => SearchStrategyResponse;
+```

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/get_indices.test.ts

@@ -20,7 +20,7 @@
 import { getIndices } from './get_indices';
 import { IndexPatternCreationConfig } from '../../../../../../../../../plugins/index_pattern_management/public';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { LegacyApiCaller } from '../../../../../../../../../plugins/data/public/search/legacy';
+import { LegacyApiCaller } from '../../../../../../../../../plugins/data/public/search';
 
 export const successfulResponse = {
   hits: {

src/plugins/data/public/index.ts

@@ -363,6 +363,7 @@ export {
   SearchRequest,
   SearchResponse,
   SearchError,
+  SearchStrategyProvider,
   ISearchSource,
   SearchSource,
   createSearchSource,

src/plugins/data/public/public.api.md

@@ -1736,6 +1736,21 @@ export interface SearchSourceFields {
     version?: boolean;
 }
 
+// Warning: (ae-missing-release-tag) "SearchStrategyProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface SearchStrategyProvider {
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    isViable: (indexPattern: IndexPattern) => boolean;
+    // Warning: (ae-forgotten-export) The symbol "SearchStrategySearchParams" needs to be exported by the entry point index.d.ts
+    // Warning: (ae-forgotten-export) The symbol "SearchStrategyResponse" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    search: (params: SearchStrategySearchParams) => SearchStrategyResponse;
+}
+
 // Warning: (ae-missing-release-tag) "SortDirection" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -1886,21 +1901,21 @@ export type TSearchStrategyProvider<T extends TStrategyTypes> = (context: ISearc
 // src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "flattenHitWrapper" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "getRoutes" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/index.ts:234:27 - (ae-forgotten-export) The symbol "formatHitProvider" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:382:20 - (ae-forgotten-export) The symbol "getRequestInspectorStats" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:382:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:382:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:382:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:387:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:388:1 - (ae-forgotten-export) The symbol "convertDateRangeToString" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:390:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:399:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:400:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:401:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:404:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:405:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:408:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:409:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:412:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:383:20 - (ae-forgotten-export) The symbol "getRequestInspectorStats" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:383:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:383:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:383:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:388:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:389:1 - (ae-forgotten-export) The symbol "convertDateRangeToString" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:391:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:400:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:401:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:402:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:405:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:406:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:409:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:410:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:413:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/query/state_sync/connect_to_query_state.ts:33:33 - (ae-forgotten-export) The symbol "FilterStateStore" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/query/state_sync/connect_to_query_state.ts:37:1 - (ae-forgotten-export) The symbol "QueryStateChange" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/types.ts:52:5 - (ae-forgotten-export) The symbol "createFiltersFromEvent" needs to be exported by the entry point index.d.ts

src/plugins/data/public/search/aggs/test_helpers/mock_data_services.ts

@@ -18,8 +18,8 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { coreMock } from '../../../../../../core/public/mocks';
-import { dataPluginMock } from '../../../mocks';
+import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { dataPluginMock } from '../../../../public/mocks';
 import {
   setFieldFormats,
   setIndexPatterns,
@@ -29,7 +29,7 @@ import {
   setQueryService,
   setSearchService,
   setUiSettings,
-} from '../../../services';
+} from '../../../../public/services';
 
 /**
  * Testing helper which calls all of the service setters used in the
@@ -49,9 +49,4 @@ export function mockDataServices() {
   setQueryService(data.query);
   setSearchService(data.search);
   setUiSettings(core.uiSettings);
-
-  return {
-    core,
-    data,
-  };
 }

src/plugins/data/public/search/legacy/es_client/index.ts → src/plugins/data/public/search/es_client/index.ts

@@ -18,4 +18,4 @@
  */
 
 export { getEsClient } from './get_es_client';
-export { LegacyApiCaller } from './types';
+export { SearchRequest, SearchResponse, LegacyApiCaller } from './types';

src/plugins/data/public/search/legacy/es_client/types.ts → src/plugins/data/public/search/es_client/types.ts

@@ -17,7 +17,8 @@
  * under the License.
  */
 
-import { SearchRequest, SearchResponse } from '../../fetch';
+export type SearchRequest = any;
+export type SearchResponse = any;
 
 export interface LegacyApiCaller {
   search: (searchRequest: SearchRequest) => LegacyApiCallerResponse;

src/plugins/data/public/search/legacy/call_client.test.ts → src/plugins/data/public/search/fetch/call_client.test.ts

@@ -18,17 +18,16 @@
  */
 
 import { callClient } from './call_client';
-import { SearchStrategySearchParams } from './types';
-import { defaultSearchStrategy } from './default_search_strategy';
-import { FetchHandlers } from '../fetch';
-import { handleResponse } from '../fetch/handle_response';
+import { handleResponse } from './handle_response';
+import { FetchHandlers } from './types';
+import { SearchStrategySearchParams, defaultSearchStrategy } from '../search_strategy';
 
 const mockAbortFn = jest.fn();
-jest.mock('../fetch/handle_response', () => ({
+jest.mock('./handle_response', () => ({
   handleResponse: jest.fn((request, response) => response),
 }));
 
-jest.mock('./default_search_strategy', () => {
+jest.mock('../search_strategy', () => {
   return {
     defaultSearchStrategy: {
       search: jest.fn(({ searchRequests }: SearchStrategySearchParams) => {

src/plugins/data/public/search/legacy/call_client.ts → src/plugins/data/public/search/fetch/call_client.ts

@@ -17,9 +17,10 @@
  * under the License.
  */
 
-import { FetchOptions, FetchHandlers, handleResponse } from '../fetch';
-import { defaultSearchStrategy } from './default_search_strategy';
-import { SearchRequest } from '../index';
+import { handleResponse } from './handle_response';
+import { FetchOptions, FetchHandlers } from './types';
+import { defaultSearchStrategy } from '../search_strategy';
+import { SearchRequest } from '..';
 
 export function callClient(
   searchRequests: SearchRequest[],

src/plugins/data/public/search/legacy/fetch_soon.test.ts → src/plugins/data/public/search/fetch/fetch_soon.test.ts

@@ -19,9 +19,9 @@
 
 import { fetchSoon } from './fetch_soon';
 import { callClient } from './call_client';
-import { IUiSettingsClient } from 'kibana/public';
-import { FetchHandlers, FetchOptions } from '../fetch/types';
-import { SearchRequest, SearchResponse } from '../index';
+import { IUiSettingsClient } from '../../../../../core/public';
+import { FetchHandlers, FetchOptions } from './types';
+import { SearchRequest, SearchResponse } from '..';
 
 function getConfigStub(config: any = {}) {
   return {

src/plugins/data/public/search/legacy/fetch_soon.ts → src/plugins/data/public/search/fetch/fetch_soon.ts

@@ -18,8 +18,8 @@
  */
 
 import { callClient } from './call_client';
-import { FetchHandlers, FetchOptions } from '../fetch/types';
-import { SearchRequest, SearchResponse } from '../index';
+import { FetchHandlers, FetchOptions } from './types';
+import { SearchRequest, SearchResponse } from '..';
 
 /**
  * This function introduces a slight delay in the request process to allow multiple requests to queue

src/plugins/data/public/search/fetch/index.ts

@@ -18,14 +18,5 @@
  */
 
 export * from './types';
-export {
-  getSearchParams,
-  getPreference,
-  getTimeout,
-  getIgnoreThrottled,
-  getMaxConcurrentShardRequests,
-} from './get_search_params';
-
-export { SearchError, getSearchErrorType } from './search_error';
-export { RequestFailure } from './request_error';
-export { handleResponse } from './handle_response';
+export { fetchSoon } from './fetch_soon';
+export { RequestFailure } from './errors';

src/plugins/data/public/search/fetch/types.ts

@@ -20,9 +20,6 @@
 import { IUiSettingsClient } from '../../../../../core/public';
 import { ISearchStart } from '../types';
 
-export type SearchRequest = any;
-export type SearchResponse = any;
-
 export interface FetchOptions {
   abortSignal?: AbortSignal;
   searchStrategyId?: string;

src/plugins/data/public/search/index.ts

@@ -44,13 +44,9 @@ export { esSearchStrategyProvider, getEsPreference } from './es_search';
 
 export { IKibanaSearchResponse, IKibanaSearchRequest } from '../../common/search';
 
-export {
-  SearchError,
-  FetchOptions,
-  SearchRequest,
-  SearchResponse,
-  getSearchErrorType,
-} from './fetch';
+export { LegacyApiCaller, SearchRequest, SearchResponse } from './es_client';
+
+export { SearchError, SearchStrategyProvider, getSearchErrorType } from './search_strategy';
 
 export {
   ISearchSource,
@@ -63,3 +59,5 @@ export {
 
 export { SearchInterceptor } from './search_interceptor';
 export { RequestTimeoutError } from './request_timeout_error';
+
+export { FetchOptions } from './fetch';