Skip to content

[data.search.searchSource] Add generic type params to search dependency. #79608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 6, 2020
Merged

[data.search.searchSource] Add generic type params to search dependency. #79608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/plugins/data/common/search/search_source/search_source.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ import { filterDocvalueFields } from './filter_docvalue_fields';
import { fieldWildcardFilter } from '../../../../kibana_utils/common';
import { IIndexPattern } from '../../index_patterns';
import { IEsSearchRequest, IEsSearchResponse, ISearchOptions } from '../..';
import { IKibanaSearchRequest, IKibanaSearchResponse } from '../types';
import { ISearchSource, SearchSourceOptions, SearchSourceFields } from './types';
import { FetchHandlers, RequestFailure, getSearchParamsFromRequest, SearchRequest } from './fetch';

Expand All @@ -101,7 +102,15 @@ export const searchSourceRequiredUiSettings = [
];

export interface SearchSourceDependencies extends FetchHandlers {
search: (request: IEsSearchRequest, options: ISearchOptions) => Promise<IEsSearchResponse>;
// Types are nearly identical to ISearchGeneric, except we are making
// search options required here and returning a promise instead of observable.
search: <
SearchStrategyRequest extends IKibanaSearchRequest = IEsSearchRequest,
SearchStrategyResponse extends IKibanaSearchResponse = IEsSearchResponse
>(
request: SearchStrategyRequest,
options: ISearchOptions
) => Promise<SearchStrategyResponse>;
}

/** @public **/
Expand Down
13 changes: 11 additions & 2 deletions src/plugins/data/public/search/search_service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ import { ISearchSetup, ISearchStart, SearchEnhancements } from './types';
import { handleResponse } from './fetch';
import {
IEsSearchRequest,
IEsSearchResponse,
IKibanaSearchRequest,
IKibanaSearchResponse,
ISearchGeneric,
ISearchOptions,
SearchSourceService,
Expand Down Expand Up @@ -117,8 +120,14 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {

const searchSourceDependencies: SearchSourceDependencies = {
getConfig: uiSettings.get.bind(uiSettings),
search: (request: IEsSearchRequest, options: ISearchOptions) => {
return search(request, options).toPromise();
search: <
SearchStrategyRequest extends IKibanaSearchRequest = IEsSearchRequest,
SearchStrategyResponse extends IKibanaSearchResponse = IEsSearchResponse
>(
request: SearchStrategyRequest,
options: ISearchOptions
) => {
return search(request, options).toPromise() as Promise<SearchStrategyResponse>;
},
onResponse: handleResponse,
legacy: {
Expand Down