From 84565681672eb713074e50dd8775a7fca26584cb Mon Sep 17 00:00:00 2001 From: Luke Elmers Date: Tue, 18 Aug 2020 14:33:07 -0600 Subject: [PATCH] Switch all usages of uiSettings to use getConfig. --- .../ui/public/new_platform/set_services.ts | 2 - .../es_query/es_query/get_es_query_config.ts | 4 +- .../search/fetch/get_search_params.test.ts | 9 ++-- .../public/search/fetch/get_search_params.ts | 31 ++++++------ src/plugins/data/public/search/fetch/types.ts | 4 +- .../search/legacy/default_search_strategy.ts | 4 +- .../public/search/legacy/fetch_soon.test.ts | 39 +++++++-------- .../search/legacy/get_msearch_params.test.ts | 9 ++-- .../search/legacy/get_msearch_params.ts | 8 ++-- .../data/public/search/search_service.ts | 2 +- .../create_search_source.test.ts | 13 ++--- .../data/public/search/search_source/mocks.ts | 9 ++-- .../search_source/search_source.test.ts | 24 ++++------ .../search/search_source/search_source.ts | 47 ++++++++++++------- .../public/data_model/search_api.ts | 2 +- 15 files changed, 100 insertions(+), 107 deletions(-) diff --git a/src/legacy/ui/public/new_platform/set_services.ts b/src/legacy/ui/public/new_platform/set_services.ts index ee92eda064aa86c..036157a9f3fbc4e 100644 --- a/src/legacy/ui/public/new_platform/set_services.ts +++ b/src/legacy/ui/public/new_platform/set_services.ts @@ -41,7 +41,6 @@ interface NpStart { export function setSetupServices(npSetup: NpSetup) { // Services that need to be set in the legacy platform since the legacy data plugin // which previously provided them has been removed. - dataServices.setInjectedMetadata(npSetup.core.injectedMetadata); visualizationsServices.setUISettings(npSetup.core.uiSettings); visualizationsServices.setUsageCollector(npSetup.plugins.usageCollection); } @@ -49,7 +48,6 @@ export function setSetupServices(npSetup: NpSetup) { export function setStartServices(npStart: NpStart) { // Services that need to be set in the legacy platform since the legacy data plugin // which previously provided them has been removed. - dataServices.setHttp(npStart.core.http); dataServices.setNotifications(npStart.core.notifications); dataServices.setOverlays(npStart.core.overlays); dataServices.setUiSettings(npStart.core.uiSettings); diff --git a/src/plugins/data/common/es_query/es_query/get_es_query_config.ts b/src/plugins/data/common/es_query/es_query/get_es_query_config.ts index ff8fc5b11b26e8a..87dbbcee03b81f0 100644 --- a/src/plugins/data/common/es_query/es_query/get_es_query_config.ts +++ b/src/plugins/data/common/es_query/es_query/get_es_query_config.ts @@ -18,10 +18,10 @@ */ import { EsQueryConfig } from './build_es_query'; -import { UI_SETTINGS } from '../../'; +import { GetConfigFn, UI_SETTINGS } from '../../'; interface KibanaConfig { - get(key: string): T; + get: GetConfigFn; } export function getEsQueryConfig(config: KibanaConfig) { diff --git a/src/plugins/data/public/search/fetch/get_search_params.test.ts b/src/plugins/data/public/search/fetch/get_search_params.test.ts index f9b62fdd4fc6133..1ecb879b1602d94 100644 --- a/src/plugins/data/public/search/fetch/get_search_params.test.ts +++ b/src/plugins/data/public/search/fetch/get_search_params.test.ts @@ -18,13 +18,10 @@ */ import { getSearchParams } from './get_search_params'; -import { IUiSettingsClient } from 'kibana/public'; -import { UI_SETTINGS } from '../../../common'; +import { GetConfigFn, UI_SETTINGS } from '../../../common'; -function getConfigStub(config: any = {}) { - return { - get: (key) => config[key], - } as IUiSettingsClient; +function getConfigStub(config: any = {}): GetConfigFn { + return (key) => config[key]; } describe('getSearchParams', () => { diff --git a/src/plugins/data/public/search/fetch/get_search_params.ts b/src/plugins/data/public/search/fetch/get_search_params.ts index 8e21f30975d87fd..5e0395189f64720 100644 --- a/src/plugins/data/public/search/fetch/get_search_params.ts +++ b/src/plugins/data/public/search/fetch/get_search_params.ts @@ -17,37 +17,36 @@ * under the License. */ -import { IUiSettingsClient } from 'kibana/public'; -import { UI_SETTINGS, ISearchRequestParams } from '../../../common'; +import { UI_SETTINGS, ISearchRequestParams, GetConfigFn } from '../../../common'; import { SearchRequest } from './types'; const sessionId = Date.now(); -export function getSearchParams(config: IUiSettingsClient, esShardTimeout: number = 0) { +export function getSearchParams(getConfig: GetConfigFn, esShardTimeout: number = 0) { return { rest_total_hits_as_int: true, ignore_unavailable: true, - ignore_throttled: getIgnoreThrottled(config), - max_concurrent_shard_requests: getMaxConcurrentShardRequests(config), - preference: getPreference(config), + ignore_throttled: getIgnoreThrottled(getConfig), + max_concurrent_shard_requests: getMaxConcurrentShardRequests(getConfig), + preference: getPreference(getConfig), timeout: getTimeout(esShardTimeout), }; } -export function getIgnoreThrottled(config: IUiSettingsClient) { - return !config.get(UI_SETTINGS.SEARCH_INCLUDE_FROZEN); +export function getIgnoreThrottled(getConfig: GetConfigFn) { + return !getConfig(UI_SETTINGS.SEARCH_INCLUDE_FROZEN); } -export function getMaxConcurrentShardRequests(config: IUiSettingsClient) { - const maxConcurrentShardRequests = config.get(UI_SETTINGS.COURIER_MAX_CONCURRENT_SHARD_REQUESTS); +export function getMaxConcurrentShardRequests(getConfig: GetConfigFn) { + const maxConcurrentShardRequests = getConfig(UI_SETTINGS.COURIER_MAX_CONCURRENT_SHARD_REQUESTS); return maxConcurrentShardRequests > 0 ? maxConcurrentShardRequests : undefined; } -export function getPreference(config: IUiSettingsClient) { - const setRequestPreference = config.get(UI_SETTINGS.COURIER_SET_REQUEST_PREFERENCE); +export function getPreference(getConfig: GetConfigFn) { + const setRequestPreference = getConfig(UI_SETTINGS.COURIER_SET_REQUEST_PREFERENCE); if (setRequestPreference === 'sessionId') return sessionId; return setRequestPreference === 'custom' - ? config.get(UI_SETTINGS.COURIER_CUSTOM_REQUEST_PREFERENCE) + ? getConfig(UI_SETTINGS.COURIER_CUSTOM_REQUEST_PREFERENCE) : undefined; } @@ -60,10 +59,10 @@ export function getTimeout(esShardTimeout: number) { // already wired up. export function getSearchParamsFromRequest( searchRequest: SearchRequest, - dependencies: { esShardTimeout: number; uiSettings: IUiSettingsClient } + dependencies: { esShardTimeout: number; getConfig: GetConfigFn } ): ISearchRequestParams { - const { esShardTimeout, uiSettings } = dependencies; - const searchParams = getSearchParams(uiSettings, esShardTimeout); + const { esShardTimeout, getConfig } = dependencies; + const searchParams = getSearchParams(getConfig, esShardTimeout); return { index: searchRequest.index.title || searchRequest.index, diff --git a/src/plugins/data/public/search/fetch/types.ts b/src/plugins/data/public/search/fetch/types.ts index dda66d6b5238d25..18d277204815ba6 100644 --- a/src/plugins/data/public/search/fetch/types.ts +++ b/src/plugins/data/public/search/fetch/types.ts @@ -17,7 +17,7 @@ * under the License. */ -import { IUiSettingsClient } from '../../../../../core/public'; +import { GetConfigFn } from '../../../common'; import { ISearchStartLegacy } from '../types'; export type SearchRequest = any; @@ -30,7 +30,7 @@ export interface FetchOptions { export interface FetchHandlers { legacySearchService: ISearchStartLegacy; - config: IUiSettingsClient; + config: { get: GetConfigFn }; esShardTimeout: number; } diff --git a/src/plugins/data/public/search/legacy/default_search_strategy.ts b/src/plugins/data/public/search/legacy/default_search_strategy.ts index 284768bc5a1cc3f..6ccb0a01cf898be 100644 --- a/src/plugins/data/public/search/legacy/default_search_strategy.ts +++ b/src/plugins/data/public/search/legacy/default_search_strategy.ts @@ -42,7 +42,7 @@ function msearch({ index: index.title || index, search_type: searchType, ignore_unavailable: true, - preference: getPreference(config), + preference: getPreference(config.get), }; const inlineBody = { ...body, @@ -52,7 +52,7 @@ function msearch({ }); const searching = es.msearch({ - ...getMSearchParams(config), + ...getMSearchParams(config.get), body: `${inlineRequests.join('\n')}\n`, }); diff --git a/src/plugins/data/public/search/legacy/fetch_soon.test.ts b/src/plugins/data/public/search/legacy/fetch_soon.test.ts index 61d3568350b6b1f..d375398af1addaf 100644 --- a/src/plugins/data/public/search/legacy/fetch_soon.test.ts +++ b/src/plugins/data/public/search/legacy/fetch_soon.test.ts @@ -19,15 +19,12 @@ 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 { UI_SETTINGS } from '../../../common'; +import { GetConfigFn, UI_SETTINGS } from '../../../common'; -function getConfigStub(config: any = {}) { - return { - get: (key) => config[key], - } as IUiSettingsClient; +function getConfigStub(config: any = {}): GetConfigFn { + return (key) => config[key]; } const mockResponses: Record = { @@ -60,9 +57,9 @@ describe('fetchSoon', () => { }); test('should execute asap if config is set to not batch searches', () => { - const config = getConfigStub({ - [UI_SETTINGS.COURIER_BATCH_SEARCHES]: false, - }); + const config = { + get: getConfigStub({ [UI_SETTINGS.COURIER_BATCH_SEARCHES]: false }), + }; const request = {}; const options = {}; @@ -72,9 +69,9 @@ describe('fetchSoon', () => { }); test('should delay by 50ms if config is set to batch searches', () => { - const config = getConfigStub({ - [UI_SETTINGS.COURIER_BATCH_SEARCHES]: true, - }); + const config = { + get: getConfigStub({ [UI_SETTINGS.COURIER_BATCH_SEARCHES]: true }), + }; const request = {}; const options = {}; @@ -88,9 +85,9 @@ describe('fetchSoon', () => { }); test('should send a batch of requests to callClient', () => { - const config = getConfigStub({ - [UI_SETTINGS.COURIER_BATCH_SEARCHES]: true, - }); + const config = { + get: getConfigStub({ [UI_SETTINGS.COURIER_BATCH_SEARCHES]: true }), + }; const requests = [{ foo: 1 }, { foo: 2 }]; const options = [{ bar: 1 }, { bar: 2 }]; @@ -105,9 +102,9 @@ describe('fetchSoon', () => { }); test('should return the response to the corresponding call for multiple batched requests', async () => { - const config = getConfigStub({ - [UI_SETTINGS.COURIER_BATCH_SEARCHES]: true, - }); + const config = { + get: getConfigStub({ [UI_SETTINGS.COURIER_BATCH_SEARCHES]: true }), + }; const requests = [{ _mockResponseId: 'foo' }, { _mockResponseId: 'bar' }]; const promises = requests.map((request) => { @@ -120,9 +117,9 @@ describe('fetchSoon', () => { }); test('should wait for the previous batch to start before starting a new batch', () => { - const config = getConfigStub({ - [UI_SETTINGS.COURIER_BATCH_SEARCHES]: true, - }); + const config = { + get: getConfigStub({ [UI_SETTINGS.COURIER_BATCH_SEARCHES]: true }), + }; const firstBatch = [{ foo: 1 }, { foo: 2 }]; const secondBatch = [{ bar: 1 }, { bar: 2 }]; diff --git a/src/plugins/data/public/search/legacy/get_msearch_params.test.ts b/src/plugins/data/public/search/legacy/get_msearch_params.test.ts index dc61e1940663146..d3206950174c899 100644 --- a/src/plugins/data/public/search/legacy/get_msearch_params.test.ts +++ b/src/plugins/data/public/search/legacy/get_msearch_params.test.ts @@ -18,13 +18,10 @@ */ import { getMSearchParams } from './get_msearch_params'; -import { IUiSettingsClient } from '../../../../../core/public'; -import { UI_SETTINGS } from '../../../common'; +import { GetConfigFn, UI_SETTINGS } from '../../../common'; -function getConfigStub(config: any = {}) { - return { - get: (key) => config[key], - } as IUiSettingsClient; +function getConfigStub(config: any = {}): GetConfigFn { + return (key) => config[key]; } describe('getMSearchParams', () => { diff --git a/src/plugins/data/public/search/legacy/get_msearch_params.ts b/src/plugins/data/public/search/legacy/get_msearch_params.ts index 48d13903c972fe7..c4f77b25078cd06 100644 --- a/src/plugins/data/public/search/legacy/get_msearch_params.ts +++ b/src/plugins/data/public/search/legacy/get_msearch_params.ts @@ -17,13 +17,13 @@ * under the License. */ -import { IUiSettingsClient } from 'kibana/public'; +import { GetConfigFn } from '../../../common'; import { getIgnoreThrottled, getMaxConcurrentShardRequests } from '../fetch'; -export function getMSearchParams(config: IUiSettingsClient) { +export function getMSearchParams(getConfig: GetConfigFn) { return { rest_total_hits_as_int: true, - ignore_throttled: getIgnoreThrottled(config), - max_concurrent_shard_requests: getMaxConcurrentShardRequests(config), + ignore_throttled: getIgnoreThrottled(getConfig), + max_concurrent_shard_requests: getMaxConcurrentShardRequests(getConfig), }; } diff --git a/src/plugins/data/public/search/search_service.ts b/src/plugins/data/public/search/search_service.ts index 1e7e81fc20502ce..a65b2b4b71f2009 100644 --- a/src/plugins/data/public/search/search_service.ts +++ b/src/plugins/data/public/search/search_service.ts @@ -112,7 +112,7 @@ export class SearchService implements Plugin { }; const searchSourceDependencies: SearchSourceDependencies = { - uiSettings, + getConfig: uiSettings.get.bind(uiSettings), esShardTimeout: injectedMetadata.getInjectedVar('esShardTimeout') as number, search, legacySearch, diff --git a/src/plugins/data/public/search/search_source/create_search_source.test.ts b/src/plugins/data/public/search/search_source/create_search_source.test.ts index 23ab5979595af3b..56f6ca6c56270ef 100644 --- a/src/plugins/data/public/search/search_source/create_search_source.test.ts +++ b/src/plugins/data/public/search/search_source/create_search_source.test.ts @@ -16,27 +16,28 @@ * specific language governing permissions and limitations * under the License. */ + import { createSearchSource as createSearchSourceFactory } from './create_search_source'; +import { SearchSourceDependencies } from './search_source'; import { IIndexPattern } from '../../../common/index_patterns'; import { IndexPatternsContract } from '../../index_patterns/index_patterns'; import { Filter } from '../../../common/es_query/filters'; -import { coreMock } from '../../../../../core/public/mocks'; import { dataPluginMock } from '../../mocks'; describe('createSearchSource', () => { const indexPatternMock: IIndexPattern = {} as IIndexPattern; let indexPatternContractMock: jest.Mocked; - let dependencies: any; + let dependencies: SearchSourceDependencies; let createSearchSource: ReturnType; beforeEach(() => { - const core = coreMock.createStart(); const data = dataPluginMock.createStartContract(); dependencies = { - searchService: data.search, - uiSettings: core.uiSettings, - injectedMetadata: core.injectedMetadata, + getConfig: jest.fn(), + search: jest.fn(), + legacySearch: data.search.__LEGACY, + esShardTimeout: 30000, }; indexPatternContractMock = ({ diff --git a/src/plugins/data/public/search/search_source/mocks.ts b/src/plugins/data/public/search/search_source/mocks.ts index cf2d009e41b5499..4e1c35557ffa6cc 100644 --- a/src/plugins/data/public/search/search_source/mocks.ts +++ b/src/plugins/data/public/search/search_source/mocks.ts @@ -17,10 +17,7 @@ * under the License. */ -import { - injectedMetadataServiceMock, - uiSettingsServiceMock, -} from '../../../../../core/public/mocks'; +import { uiSettingsServiceMock } from '../../../../../core/public/mocks'; import { ISearchSource, SearchSource } from './search_source'; import { SearchSourceFields } from './types'; @@ -54,6 +51,8 @@ export const searchSourceMock = { export const createSearchSourceMock = (fields?: SearchSourceFields) => new SearchSource(fields, { + getConfig: uiSettingsServiceMock.createStartContract().get, + esShardTimeout: 30000, search: jest.fn(), legacySearch: { esClient: { @@ -61,6 +60,4 @@ export const createSearchSourceMock = (fields?: SearchSourceFields) => msearch: jest.fn(), }, }, - uiSettings: uiSettingsServiceMock.createStartContract(), - injectedMetadata: injectedMetadataServiceMock.createStartContract(), }); diff --git a/src/plugins/data/public/search/search_source/search_source.test.ts b/src/plugins/data/public/search/search_source/search_source.test.ts index 6d53b8dfc4b4e9f..2f0fa0765e25a5c 100644 --- a/src/plugins/data/public/search/search_source/search_source.test.ts +++ b/src/plugins/data/public/search/search_source/search_source.test.ts @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ + import { Observable } from 'rxjs'; -import { SearchSource } from './search_source'; +import { GetConfigFn } from 'src/plugins/data/common'; +import { SearchSource, SearchSourceDependencies } from './search_source'; import { IndexPattern, SortDirection } from '../..'; import { fetchSoon } from '../legacy'; -import { IUiSettingsClient } from '../../../../../core/public'; import { dataPluginMock } from '../../../../data/public/mocks'; -import { coreMock } from '../../../../../core/public/mocks'; jest.mock('../legacy', () => ({ fetchSoon: jest.fn().mockResolvedValue({}), @@ -51,10 +51,9 @@ const indexPattern2 = ({ describe('SearchSource', () => { let mockSearchMethod: any; - let searchSourceDependencies: any; + let searchSourceDependencies: SearchSourceDependencies; beforeEach(() => { - const core = coreMock.createStart(); const data = dataPluginMock.createStartContract(); mockSearchMethod = jest.fn(() => { @@ -69,10 +68,10 @@ describe('SearchSource', () => { }); searchSourceDependencies = { + getConfig: jest.fn(), search: mockSearchMethod, legacySearch: data.search.__LEGACY, - injectedMetadata: core.injectedMetadata, - uiSettings: core.uiSettings, + esShardTimeout: 30000, }; }); @@ -184,16 +183,11 @@ describe('SearchSource', () => { describe('#legacy fetch()', () => { beforeEach(() => { - const core = coreMock.createStart(); - searchSourceDependencies = { ...searchSourceDependencies, - uiSettings: { - ...core.uiSettings, - get: jest.fn(() => { - return true; // batchSearches = true - }), - } as IUiSettingsClient, + getConfig: jest.fn(() => { + return true; // batchSearches = true + }) as GetConfigFn, }; }); diff --git a/src/plugins/data/public/search/search_source/search_source.ts b/src/plugins/data/public/search/search_source/search_source.ts index cf47fa9aa092b5f..06ad13bfcfdf5ad 100644 --- a/src/plugins/data/public/search/search_source/search_source.ts +++ b/src/plugins/data/public/search/search_source/search_source.ts @@ -72,7 +72,6 @@ import { setWith } from '@elastic/safer-lodash-set'; import { uniqueId, uniq, extend, pick, difference, omit, isObject, keys, isFunction } from 'lodash'; import { map } from 'rxjs/operators'; -import { CoreStart } from 'kibana/public'; import { normalizeSortRequest } from './normalize_sort_request'; import { filterDocvalueFields } from './filter_docvalue_fields'; import { fieldWildcardFilter } from '../../../../kibana_utils/common'; @@ -82,12 +81,29 @@ import { FetchOptions, RequestFailure, handleResponse, getSearchParamsFromReques import { getEsQueryConfig, buildEsQuery, Filter, UI_SETTINGS } from '../../../common'; import { getHighlightRequest } from '../../../common/field_formats'; +import { GetConfigFn } from '../../../common/types'; import { fetchSoon } from '../legacy'; import { extractReferences } from './extract_references'; import { ISearchStartLegacy } from '../types'; +/** @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, + UI_SETTINGS.COURIER_SET_REQUEST_PREFERENCE, + UI_SETTINGS.DOC_HIGHLIGHT, + UI_SETTINGS.META_FIELDS, + UI_SETTINGS.QUERY_ALLOW_LEADING_WILDCARDS, + UI_SETTINGS.QUERY_STRING_OPTIONS, + UI_SETTINGS.SEARCH_INCLUDE_FROZEN, + UI_SETTINGS.SORT_OPTIONS, +]; + export interface SearchSourceDependencies { - uiSettings: CoreStart['uiSettings']; + getConfig: GetConfigFn; search: ISearchGeneric; legacySearch: ISearchStartLegacy; esShardTimeout: number; @@ -204,11 +220,11 @@ export class SearchSource { * @return {Observable>} */ private fetch$(searchRequest: SearchRequest, signal?: AbortSignal) { - const { search, esShardTimeout, uiSettings } = this.dependencies; + const { search, esShardTimeout, getConfig } = this.dependencies; const params = getSearchParamsFromRequest(searchRequest, { esShardTimeout, - uiSettings, + getConfig, }); return search({ params, indexType: searchRequest.indexType }, { signal }).pipe( @@ -221,7 +237,7 @@ export class SearchSource { * @return {Promise>} */ private async legacyFetch(searchRequest: SearchRequest, options: FetchOptions) { - const { esShardTimeout, legacySearch, uiSettings } = this.dependencies; + const { esShardTimeout, legacySearch, getConfig } = this.dependencies; return await fetchSoon( searchRequest, @@ -231,7 +247,7 @@ export class SearchSource { }, { legacySearchService: legacySearch, - config: uiSettings, + config: { get: getConfig }, esShardTimeout, } ); @@ -242,14 +258,14 @@ export class SearchSource { * @async */ async fetch(options: FetchOptions = {}) { - const { uiSettings } = this.dependencies; + const { getConfig } = this.dependencies; await this.requestIsStarting(options); const searchRequest = await this.flatten(); this.history = [searchRequest]; let response; - if (uiSettings.get(UI_SETTINGS.COURIER_BATCH_SEARCHES)) { + if (getConfig(UI_SETTINGS.COURIER_BATCH_SEARCHES)) { response = await this.legacyFetch(searchRequest, options); } else { response = this.fetch$(searchRequest, options.abortSignal).toPromise(); @@ -341,7 +357,7 @@ export class SearchSource { } }; - const { uiSettings } = this.dependencies; + const { getConfig } = this.dependencies; switch (key) { case 'filter': @@ -363,7 +379,7 @@ export class SearchSource { const sort = normalizeSortRequest( val, this.getField('index'), - uiSettings.get(UI_SETTINGS.SORT_OPTIONS) + getConfig(UI_SETTINGS.SORT_OPTIONS) ); return addToBody(key, sort); default: @@ -417,14 +433,11 @@ export class SearchSource { body._source = index.getSourceFiltering(); } - const { uiSettings } = this.dependencies; + const { getConfig } = this.dependencies; if (body._source) { // exclude source fields for this index pattern specified by the user - const filter = fieldWildcardFilter( - body._source.excludes, - uiSettings.get(UI_SETTINGS.META_FIELDS) - ); + const filter = fieldWildcardFilter(body._source.excludes, getConfig(UI_SETTINGS.META_FIELDS)); body.docvalue_fields = body.docvalue_fields.filter((docvalueField: any) => filter(docvalueField.field) ); @@ -444,11 +457,11 @@ export class SearchSource { ); } - const esQueryConfigs = getEsQueryConfig(uiSettings); + const esQueryConfigs = getEsQueryConfig({ get: getConfig }); body.query = buildEsQuery(index, query, filters, esQueryConfigs); if (highlightAll && body.query) { - body.highlight = getHighlightRequest(body.query, uiSettings.get(UI_SETTINGS.DOC_HIGHLIGHT)); + body.highlight = getHighlightRequest(body.query, getConfig(UI_SETTINGS.DOC_HIGHLIGHT)); delete searchRequest.highlightAll; } diff --git a/src/plugins/vis_type_vega/public/data_model/search_api.ts b/src/plugins/vis_type_vega/public/data_model/search_api.ts index edb55dbca98cbd4..8bcc11aa6fbcc2f 100644 --- a/src/plugins/vis_type_vega/public/data_model/search_api.ts +++ b/src/plugins/vis_type_vega/public/data_model/search_api.ts @@ -54,7 +54,7 @@ export class SearchAPI { esShardTimeout: this.dependencies.injectedMetadata.getInjectedVar( 'esShardTimeout' ) as number, - uiSettings: this.dependencies.uiSettings, + getConfig: this.dependencies.uiSettings.get, }); if (this.inspectorAdapters) {