[data.search] Remove deprecated courier:batchSearches advanced setting

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

@@ -18,7 +18,6 @@ UI_SETTINGS: {
     readonly COURIER_SET_REQUEST_PREFERENCE: "courier:setRequestPreference";
     readonly COURIER_CUSTOM_REQUEST_PREFERENCE: "courier:customRequestPreference";
     readonly COURIER_MAX_CONCURRENT_SHARD_REQUESTS: "courier:maxConcurrentShardRequests";
-    readonly COURIER_BATCH_SEARCHES: "courier:batchSearches";
     readonly SEARCH_INCLUDE_FROZEN: "search:includeFrozen";
     readonly SEARCH_TIMEOUT: "search:timeout";
     readonly HISTOGRAM_BAR_TARGET: "histogram:barTarget";

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ui_settings.md

@@ -18,7 +18,6 @@ UI_SETTINGS: {
     readonly COURIER_SET_REQUEST_PREFERENCE: "courier:setRequestPreference";
     readonly COURIER_CUSTOM_REQUEST_PREFERENCE: "courier:customRequestPreference";
     readonly COURIER_MAX_CONCURRENT_SHARD_REQUESTS: "courier:maxConcurrentShardRequests";
-    readonly COURIER_BATCH_SEARCHES: "courier:batchSearches";
     readonly SEARCH_INCLUDE_FROZEN: "search:includeFrozen";
     readonly SEARCH_TIMEOUT: "search:timeout";
     readonly HISTOGRAM_BAR_TARGET: "histogram:barTarget";

docs/management/advanced-options.asciidoc

@@ -398,14 +398,6 @@ changes.
 [[kibana-search-settings]]
 ==== Search
 
-[horizontal]
-[[courier-batchsearches]]`courier:batchSearches`::
-**Deprecated in 7.6. Starting in 8.0, this setting will be optimized internally.**
-When disabled, dashboard panels will load individually, and search requests will
-terminate when users navigate away or update the query. When enabled, dashboard
-panels will load together when all of the data is loaded, and searches will not
-terminate.
-
 [[courier-customrequestpreference]]`courier:customRequestPreference`::
 {ref}/search-request-body.html#request-body-search-preference[Request preference]
 to use when `courier:setRequestPreference` is set to "custom".

src/plugins/data/common/constants.ts

@@ -25,7 +25,6 @@ export const UI_SETTINGS = {
   COURIER_SET_REQUEST_PREFERENCE: 'courier:setRequestPreference',
   COURIER_CUSTOM_REQUEST_PREFERENCE: 'courier:customRequestPreference',
   COURIER_MAX_CONCURRENT_SHARD_REQUESTS: 'courier:maxConcurrentShardRequests',
-  COURIER_BATCH_SEARCHES: 'courier:batchSearches',
   SEARCH_INCLUDE_FROZEN: 'search:includeFrozen',
   SEARCH_TIMEOUT: 'search:timeout',
   HISTOGRAM_BAR_TARGET: 'histogram:barTarget',

src/plugins/data/common/search/search_source/index.ts

@@ -12,7 +12,6 @@ export { extractReferences } from './extract_references';
 export { parseSearchSourceJSON } from './parse_json';
 export { getResponseInspectorStats } from './inspect';
 export * from './fetch';
-export * from './legacy';
 export * from './search_source';
 export * from './search_source_service';
 export * from './types';

src/plugins/data/common/search/search_source/search_source.test.ts

@@ -8,9 +8,8 @@
 
 import { of } from 'rxjs';
 import { IndexPattern } from '../../index_patterns';
-import { GetConfigFn } from '../../types';
 import { SearchSource, SearchSourceDependencies, SortDirection } from './';
-import { AggConfigs, AggTypesRegistryStart, ES_SEARCH_STRATEGY } from '../../';
+import { AggConfigs, AggTypesRegistryStart } from '../../';
 import { mockAggTypesRegistry } from '../aggs/test_helpers';
 import { RequestResponder } from 'src/plugins/inspector/common';
 import { switchMap } from 'rxjs/operators';
@@ -953,45 +952,6 @@ describe('SearchSource', () => {
   });
 
   describe('fetch$', () => {
-    describe('#legacy COURIER_BATCH_SEARCHES', () => {
-      beforeEach(() => {
-        searchSourceDependencies = {
-          ...searchSourceDependencies,
-          getConfig: jest.fn(() => {
-            return true; // batchSearches = true
-          }) as GetConfigFn,
-        };
-      });
-
-      test('should override to use sync search if not set', async () => {
-        searchSource = new SearchSource({ index: indexPattern }, searchSourceDependencies);
-        const options = {};
-        await searchSource.fetch$(options).toPromise();
-
-        const [, callOptions] = mockSearchMethod.mock.calls[0];
-        expect(callOptions.strategy).toBe(ES_SEARCH_STRATEGY);
-      });
-
-      test('should remove searchSessionId when forcing ES_SEARCH_STRATEGY', async () => {
-        searchSource = new SearchSource({ index: indexPattern }, searchSourceDependencies);
-        const options = { sessionId: 'test' };
-        await searchSource.fetch$(options).toPromise();
-
-        const [, callOptions] = mockSearchMethod.mock.calls[0];
-        expect(callOptions.strategy).toBe(ES_SEARCH_STRATEGY);
-        expect(callOptions.sessionId).toBeUndefined();
-      });
-
-      test('should not override strategy if set ', async () => {
-        searchSource = new SearchSource({ index: indexPattern }, searchSourceDependencies);
-        const options = { strategy: 'banana' };
-        await searchSource.fetch$(options).toPromise();
-
-        const [, callOptions] = mockSearchMethod.mock.calls[0];
-        expect(callOptions.strategy).toBe('banana');
-      });
-    });
-
     describe('responses', () => {
       test('should return partial results', async () => {
         searchSource = new SearchSource({ index: indexPattern }, searchSourceDependencies);

src/plugins/data/common/search/search_source/search_source.ts

@@ -59,7 +59,7 @@
  */
 
 import { setWith } from '@elastic/safer-lodash-set';
-import { uniqueId, keyBy, pick, difference, isFunction, isEqual, uniqWith, isObject } from 'lodash';
+import { difference, isEqual, isFunction, isObject, keyBy, pick, uniqueId, uniqWith } from 'lodash';
 import {
   catchError,
   finalize,
@@ -78,7 +78,6 @@ import { fieldWildcardFilter } from '../../../../kibana_utils/common';
 import { IIndexPattern, IndexPattern, IndexPatternField } from '../../index_patterns';
 import {
   AggConfigs,
-  ES_SEARCH_STRATEGY,
   EsQuerySortValue,
   IEsSearchResponse,
   ISearchGeneric,
@@ -87,26 +86,25 @@ import {
 import type {
   ISearchSource,
   SearchFieldValue,
-  SearchSourceOptions,
   SearchSourceFields,
+  SearchSourceOptions,
 } from './types';
-import { FetchHandlers, RequestFailure, getSearchParamsFromRequest, SearchRequest } from './fetch';
+import { FetchHandlers, getSearchParamsFromRequest, RequestFailure, SearchRequest } from './fetch';
 import { getRequestInspectorStats, getResponseInspectorStats } from './inspect';
 
 import {
   getEsQueryConfig,
-  UI_SETTINGS,
+  IKibanaSearchResponse,
   isErrorResponse,
   isPartialResponse,
-  IKibanaSearchResponse,
+  UI_SETTINGS,
 } from '../../../common';
 import { getHighlightRequest } from '../../../../field_formats/common';
 import { extractReferences } from './extract_references';
 
 /** @internal */
 export const searchSourceRequiredUiSettings = [
   'dateFormat:tz',
-  UI_SETTINGS.COURIER_BATCH_SEARCHES,
   UI_SETTINGS.COURIER_CUSTOM_REQUEST_PREFERENCE,
   UI_SETTINGS.COURIER_IGNORE_FILTER_IF_FIELD_NOT_IN_INDEX,
   UI_SETTINGS.COURIER_MAX_CONCURRENT_SHARD_REQUESTS,
@@ -280,17 +278,6 @@ export class SearchSource {
   fetch$(
     options: ISearchOptions = {}
   ): Observable<IKibanaSearchResponse<estypes.SearchResponse<any>>> {
-    const { getConfig } = this.dependencies;
-    const syncSearchByDefault = getConfig(UI_SETTINGS.COURIER_BATCH_SEARCHES);
-
-    // Use the sync search strategy if legacy search is enabled.
-    // This still uses bfetch for batching.
-    if (!options?.strategy && syncSearchByDefault) {
-      options.strategy = ES_SEARCH_STRATEGY;
-      // `ES_SEARCH_STRATEGY` doesn't support search sessions, hence remove sessionId
-      options.sessionId = undefined;
-    }
-
     const s$ = defer(() => this.requestIsStarting(options)).pipe(
       switchMap(() => {
         const searchRequest = this.flatten();

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

@@ -2310,7 +2310,6 @@ export const UI_SETTINGS: {
     readonly COURIER_SET_REQUEST_PREFERENCE: "courier:setRequestPreference";
     readonly COURIER_CUSTOM_REQUEST_PREFERENCE: "courier:customRequestPreference";
     readonly COURIER_MAX_CONCURRENT_SHARD_REQUESTS: "courier:maxConcurrentShardRequests";
-    readonly COURIER_BATCH_SEARCHES: "courier:batchSearches";
     readonly SEARCH_INCLUDE_FROZEN: "search:includeFrozen";
     readonly SEARCH_TIMEOUT: "search:timeout";
     readonly HISTOGRAM_BAR_TARGET: "histogram:barTarget";