Skip to content
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.

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

[Search] Refactor service to register search strategies, not providers #60342

Merged
merged 158 commits into from
Jun 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
158 commits
Select commit Hold shift + click to select a range
02c57f3
Add async search strategy
lukasolson Dec 9, 2019
41b7c6a
Add async search
lukasolson Dec 9, 2019
cf5ceb9
Fix async strategy and add tests
lukasolson Dec 13, 2019
5ad5b36
Merge branch 'master' into asyncSearch
lukasolson Dec 13, 2019
2009343
Move types to separate file
lukasolson Dec 14, 2019
ebebdaf
Revert changes to demo search
lukasolson Dec 14, 2019
65c39b6
Merge branch 'master' into asyncSearch
lukasolson Dec 17, 2019
5dd876f
Update demo search strategy to use async
lukasolson Dec 18, 2019
d487812
Add async es search strategy
lukasolson Dec 18, 2019
7433aa6
Return response as rawResponse
lukasolson Dec 19, 2019
93ea93e
Poll after initial request
lukasolson Dec 19, 2019
8e8eb7b
Merge branch 'master' into asyncSearch
lukasolson Jan 15, 2020
f15c4af
Merge branch 'master' into enhancedEsSearch
lukasolson Jan 15, 2020
50b4b69
Merge branch 'master' into asyncSearch
lukasolson Jan 23, 2020
2bed4a6
Merge branch 'master' into asyncSearch
lukasolson Jan 23, 2020
b6d9c25
Merge branch 'asyncSearch' into enhancedEsSearch
lukasolson Jan 23, 2020
7260761
Add cancellation to search strategies
lukasolson Jan 24, 2020
be300db
Add tests
lukasolson Jan 27, 2020
fa02de6
Merge branch 'master' into asyncSearch
lukasolson Jan 27, 2020
4e524d1
Merge branch 'asyncSearch' into enhancedEsSearch
lukasolson Jan 27, 2020
7ad5755
Merge branch 'master' into asyncSearch
lukasolson Jan 28, 2020
e4eb651
Simplify async search strategy
lukasolson Jan 28, 2020
b6a7f5e
Merge branch 'asyncSearch' into enhancedEsSearch
lukasolson Jan 28, 2020
6188c74
Move loadingCount to search strategy
lukasolson Jan 29, 2020
765ec61
Merge branch 'loadingCount' into asyncSearch
lukasolson Jan 30, 2020
b35ca0f
Merge branch 'asyncSearch' into enhancedEsSearch
lukasolson Jan 30, 2020
f15f138
Update abort controller library
lukasolson Feb 3, 2020
4d36124
Bootstrap
lukasolson Feb 3, 2020
1943855
Merge branch 'master' into abortController
elasticmachine Feb 3, 2020
c7e328c
Merge branch 'master' into asyncSearch
elasticmachine Feb 4, 2020
491e8bb
Abort when the request is aborted
lukasolson Feb 4, 2020
d5d995c
Merge branch 'master' into abortController
lukasolson Feb 4, 2020
8afc936
Merge branch 'abortController' of github.com:lukasolson/kibana into a…
lukasolson Feb 4, 2020
48238d8
Merge branch 'abortController' into abortSearch
lukasolson Feb 4, 2020
0db7257
Add utility and update value suggestions route
lukasolson Feb 4, 2020
2f00b41
Merge branch 'master' into asyncSearch
lukasolson Feb 4, 2020
b8711ca
Merge branch 'abortController' into asyncSearch
lukasolson Feb 4, 2020
f02792f
Fix bad merge conflict
lukasolson Feb 4, 2020
30886d1
Merge branch 'abortController' into asyncSearch
lukasolson Feb 4, 2020
2cb8dd4
Update tests
lukasolson Feb 4, 2020
229af5a
Merge remote-tracking branch 'origin/asyncSearch' into asyncSearch
lukasolson Feb 4, 2020
2a53834
Move to data_enhanced plugin
lukasolson Feb 5, 2020
3a6dd41
Merge branch 'asyncSearch' into enhancedEsSearch
lukasolson Feb 5, 2020
f376da7
Merge branch 'master' into abortSearch
lukasolson Feb 5, 2020
ad5f188
Remove bad merge
lukasolson Feb 6, 2020
48b88c0
Revert switching abort controller libraries
lukasolson Feb 10, 2020
21dd1c8
Revert package.json in lib
lukasolson Feb 10, 2020
16064ff
Merge branch 'revertAbortController' into abortSearch
lukasolson Feb 10, 2020
a079c15
Merge branch 'master' into revertAbortController
elasticmachine Feb 10, 2020
0b87a0b
Move to previous abort controller
lukasolson Feb 10, 2020
55d76f3
Merge branch 'master' into abortSearch
lukasolson Feb 10, 2020
1aa401d
Merge branch 'master' into asyncSearch
lukasolson Feb 10, 2020
7cd1092
Merge branch 'asyncSearch' into enhancedEsSearch
lukasolson Feb 10, 2020
8292c1e
Merge branch 'master' into revertAbortController
lukasolson Feb 10, 2020
e45bdd6
Merge remote-tracking branch 'origin/revertAbortController' into reve…
lukasolson Feb 10, 2020
d3291a8
Merge branch 'master' into revertAbortController
elasticmachine Feb 12, 2020
599c564
Merge branch 'master' into enhancedEsSearch
elasticmachine Feb 12, 2020
c25d3a9
Merge branch 'master' into asyncSearch
elasticmachine Feb 12, 2020
f996a65
Merge branch 'master' into abortSearch
lukasolson Feb 12, 2020
91655f2
Merge branch 'abortSearch' into asyncSearch
lukasolson Feb 12, 2020
8447981
Merge branch 'asyncSearch' of github.com:lukasolson/kibana into async…
lukasolson Feb 12, 2020
4badc14
Merge branch 'master' into revertAbortController
lukasolson Feb 12, 2020
6df7a41
Merge branch 'asyncSearch' into enhancedEsSearch
lukasolson Feb 12, 2020
7dc053e
Merge branch 'enhancedEsSearch' of github.com:lukasolson/kibana into …
lukasolson Feb 12, 2020
e959aad
Add support for frozen indices
lukasolson Feb 14, 2020
c9352e3
Merge branch 'master' into revertAbortController
lukasolson Feb 14, 2020
100a728
Merge branch 'revertAbortController' into abortSearch
lukasolson Feb 14, 2020
35b1abb
Fix test to use fake timers to run debounced handlers
lukasolson Feb 14, 2020
84bda2e
Merge branch 'abortSearch' into asyncSearch
lukasolson Feb 14, 2020
8822ec8
Merge branch 'asyncSearch' into enhancedEsSearch
lukasolson Feb 14, 2020
0db590e
Merge branch 'master' into abortSearch
lukasolson Feb 18, 2020
b2ebe1e
Merge branch 'master' into asyncSearch
lukasolson Feb 18, 2020
5ec9c30
Merge branch 'master' into enhancedEsSearch
lukasolson Feb 18, 2020
6cff829
Merge branch 'master' into abortSearch
lukasolson Feb 18, 2020
831cb9f
Merge branch 'master' into asyncSearch
lukasolson Feb 18, 2020
d71d900
Revert changes to example plugin
lukasolson Feb 18, 2020
914d330
Fix loading bar not going away when cancelling
lukasolson Feb 18, 2020
fb5ef63
Merge branch 'master' into abortSearch
lukasolson Feb 18, 2020
df1fa5e
Merge branch 'abortSearch' into asyncSearch
lukasolson Feb 18, 2020
07b6903
Merge branch 'asyncSearch' into enhancedEsSearch
lukasolson Feb 18, 2020
c8c1a95
Merge branch 'master' into abortSearch
lukasolson Feb 19, 2020
6a6df45
Merge branch 'master' into asyncSearch
lukasolson Feb 19, 2020
d8fd759
Call getSearchStrategy instead of passing directly
lukasolson Feb 19, 2020
b7407ea
Merge branch 'master' into asyncSearch
lukasolson Feb 20, 2020
e6f11db
Add async demo search strategy
lukasolson Feb 20, 2020
9337dea
Fix error with setting state
lukasolson Feb 20, 2020
365ace1
Merge branch 'master' into abortSearch
elasticmachine Feb 20, 2020
f0c2c9c
Merge branch 'master' into abortSearch
elasticmachine Feb 24, 2020
a6921d7
Merge branch 'master' into asyncSearch
lukasolson Feb 24, 2020
4267bf2
Update how aborting works
lukasolson Feb 24, 2020
418e4a1
Fix type checks
lukasolson Feb 24, 2020
159f5f0
Add test for loading count
lukasolson Feb 24, 2020
5bbae56
Merge remote-tracking branch 'origin/abortSearch' into abortSearch
lukasolson Feb 24, 2020
71ca887
Merge branch 'master' into asyncSearch
lukasolson Feb 24, 2020
dae93b1
Attempt to fix broken example test
lukasolson Feb 25, 2020
7f55c43
Merge branch 'master' into abortSearch
lukasolson Feb 25, 2020
248e094
Merge branch 'master' into asyncSearch
lukasolson Feb 25, 2020
1da1ce0
Revert changes to test
lukasolson Feb 25, 2020
ae16a51
Merge branch 'master' into asyncSearch
elasticmachine Feb 25, 2020
efa6cf6
Fix test
lukasolson Feb 25, 2020
cdb5417
Update name to camelCase
lukasolson Feb 25, 2020
b38d45d
Merge branch 'asyncSearch' of github.com:lukasolson/kibana into async…
lukasolson Feb 25, 2020
2ec0d0b
Fix failing test
lukasolson Feb 25, 2020
168ccc7
Merge branch 'abortSearch' into asyncSearch
lukasolson Feb 25, 2020
4325fec
Don't require data_enhanced in example plugin
lukasolson Feb 25, 2020
df2c99d
Merge branch 'asyncSearch' into enhancedEsSearch
lukasolson Feb 25, 2020
1f99f21
Actually send DELETE request
lukasolson Feb 26, 2020
74b3718
Use waitForCompletion parameter
lukasolson Feb 27, 2020
e30e047
Use default search params
lukasolson Feb 29, 2020
e45021c
Add support for rollups
lukasolson Mar 2, 2020
b71c661
Merge branch 'master' into enhancedEsSearch
lukasolson Mar 3, 2020
20ce66a
Only make changes needed for frozen indices/rollups
lukasolson Mar 3, 2020
3341881
Only make changes needed for frozen indices/rollups
lukasolson Mar 3, 2020
ce642c7
Add back in async functionality
lukasolson Mar 3, 2020
eaffdb5
Merge branch 'master' into enhancedEs
lukasolson Mar 3, 2020
7b5687b
Merge branch 'master' into enhancedEsSearch
lukasolson Mar 3, 2020
e0ce774
Fix tests/types
lukasolson Mar 5, 2020
7f6ed11
Merge branch 'master' into enhancedEs
lukasolson Mar 5, 2020
7070388
Merge branch 'enhancedEs' into enhancedEsSearch
lukasolson Mar 5, 2020
7d94b6d
Fix issue with sending empty body in GET
lukasolson Mar 5, 2020
9842cff
Don't include skipped in loaded/total
lukasolson Mar 5, 2020
d6bbb77
Merge branch 'enhancedEs' into enhancedEsSearch
lukasolson Mar 5, 2020
8805775
Don't wait before polling the next time
lukasolson Mar 5, 2020
171c7ff
Add search interceptor for bulk managing searches
lukasolson Mar 9, 2020
ebf1239
Simplify search logic
lukasolson Mar 9, 2020
5023a5e
Merge branch 'master' into enhancedEsSearch
lukasolson Mar 10, 2020
bc96081
Merge branch 'master' into enhancedEsSearch
lukasolson Mar 11, 2020
7331a1f
Merge branch 'enhancedEsSearch' into searchInterceptor
lukasolson Mar 11, 2020
3976cdb
Fix merge error
lukasolson Mar 11, 2020
71a6674
Merge branch 'pr/53538' into newplatform/ui-search-cancel
Mar 12, 2020
df058c2
Review feedback
lukasolson Mar 12, 2020
d191ee4
Merge branch 'enhancedEsSearch' into searchInterceptor
lukasolson Mar 12, 2020
b9fd156
UI to stop async searches
Mar 12, 2020
e095cd5
Add service for running beyond timeout
lukasolson Mar 12, 2020
f4dbd29
Refactor abort utils
lukasolson Mar 12, 2020
e61cbe5
Remove unneeded changes
lukasolson Mar 12, 2020
1b54481
Add tests
lukasolson Mar 13, 2020
b3ee069
Merge branch 'master' of github.com:elastic/kibana into newplatform/u…
Mar 16, 2020
19c1284
Merge remote-tracking branch 'lukasolson/searchInterceptor' into newp…
Mar 16, 2020
1175b8e
Refactor search service to register strategies directly
lukasolson Mar 17, 2020
4f9c090
Merge branch 'master' into getStrategy
lukasolson Mar 19, 2020
ce1ff89
Remove accidental change
lukasolson Mar 19, 2020
b8df231
Merge branch 'master' into getStrategy
lukasolson Mar 24, 2020
d82a91f
Merge branch 'master' into getStrategy
lukasolson Apr 15, 2020
f07d2bc
Merge branch 'master' of github.com:elastic/kibana into pr/60342
Jun 1, 2020
fe4801e
re-generate docs
Jun 1, 2020
5b1f336
Fix merge
Jun 1, 2020
b990679
types
Jun 1, 2020
0ad9df9
doc
Jun 1, 2020
a005d01
eslint
Jun 1, 2020
7bb25b9
Fix async strategy jest test
Jun 1, 2020
1f79aa6
type fix
Jun 2, 2020
a7c6742
Merge branch 'master' of github.com:elastic/kibana into pr/60342
Jun 2, 2020
6a223fd
Use getStartServices in search strategies
Jun 4, 2020
7288cbf
Code review + snapshot
Jun 7, 2020
5fab740
Merge branch 'master' of github.com:elastic/kibana into pr/60342
Jun 7, 2020
628fce8
eslint
Jun 7, 2020
9ef6836
Type script
Jun 8, 2020
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

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
| [IndexPatternTypeMeta](./kibana-plugin-plugins-data-public.indexpatterntypemeta.md) | |
| [IRequestTypesMap](./kibana-plugin-plugins-data-public.irequesttypesmap.md) | |
| [IResponseTypesMap](./kibana-plugin-plugins-data-public.iresponsetypesmap.md) | |
| [ISearchContext](./kibana-plugin-plugins-data-public.isearchcontext.md) | |
| [ISearchOptions](./kibana-plugin-plugins-data-public.isearchoptions.md) | |
| [ISearchStrategy](./kibana-plugin-plugins-data-public.isearchstrategy.md) | Search strategy interface contains a search method that takes in a request and returns a promise that resolves to a response. |
| [ISyncSearchRequest](./kibana-plugin-plugins-data-public.isyncsearchrequest.md) | |
Expand Down Expand Up @@ -157,5 +156,4 @@
| [TabbedAggRow](./kibana-plugin-plugins-data-public.tabbedaggrow.md) | \* |
| [TimefilterContract](./kibana-plugin-plugins-data-public.timefiltercontract.md) | |
| [TimeHistoryContract](./kibana-plugin-plugins-data-public.timehistorycontract.md) | |
| [TSearchStrategyProvider](./kibana-plugin-plugins-data-public.tsearchstrategyprovider.md) | Search strategy provider creates an instance of a search strategy with the request handler context bound to it. This way every search strategy can use whatever information they require from the request context. |

This file was deleted.

68 changes: 21 additions & 47 deletions examples/demo_search/public/async_demo_search_strategy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,53 +17,27 @@
* under the License.
*/

import { Observable } from 'rxjs';
import {
ISearchContext,
TSearchStrategyProvider,
ISearchStrategy,
} from '../../../src/plugins/data/public';

import { ASYNC_DEMO_SEARCH_STRATEGY, IAsyncDemoResponse } from '../common';
import { Observable, from } from 'rxjs';
import { CoreSetup } from 'kibana/public';
import { flatMap } from 'rxjs/operators';
import { ISearch } from '../../../src/plugins/data/public';
import { ASYNC_SEARCH_STRATEGY } from '../../../x-pack/plugins/data_enhanced/public';
import { ASYNC_DEMO_SEARCH_STRATEGY, IAsyncDemoResponse } from '../common';
import { DemoDataSearchStartDependencies } from './types';

/**
* This demo search strategy provider simply provides a shortcut for calling the DEMO_ASYNC_SEARCH_STRATEGY
* on the server side, without users having to pass it in explicitly, and it takes advantage of the
* already registered ASYNC_SEARCH_STRATEGY that exists on the client.
*
* so instead of callers having to do:
*
* ```
* search(
* { ...request, serverStrategy: DEMO_ASYNC_SEARCH_STRATEGY },
* options,
* ASYNC_SEARCH_STRATEGY
* ) as Observable<IDemoResponse>,
*```

* They can instead just do
*
* ```
* search(request, options, DEMO_ASYNC_SEARCH_STRATEGY);
* ```
*
* and are ensured type safety in regard to the request and response objects.
*
* @param context - context supplied by other plugins.
* @param search - a search function to access other strategies that have already been registered.
*/
export const asyncDemoClientSearchStrategyProvider: TSearchStrategyProvider<typeof ASYNC_DEMO_SEARCH_STRATEGY> = (
context: ISearchContext
): ISearchStrategy<typeof ASYNC_DEMO_SEARCH_STRATEGY> => {
const asyncStrategyProvider = context.getSearchStrategy(ASYNC_SEARCH_STRATEGY);
const { search } = asyncStrategyProvider(context);
return {
search: (request, options) => {
return search(
{ ...request, serverStrategy: ASYNC_DEMO_SEARCH_STRATEGY },
options
) as Observable<IAsyncDemoResponse>;
},
export function asyncDemoClientSearchStrategyProvider(core: CoreSetup) {
const search: ISearch<typeof ASYNC_DEMO_SEARCH_STRATEGY> = (request, options) => {
return from(core.getStartServices()).pipe(
flatMap((startServices) => {
const asyncStrategy = (startServices[1] as DemoDataSearchStartDependencies).data.search.getSearchStrategy(
ASYNC_SEARCH_STRATEGY
);
return asyncStrategy.search(
{ ...request, serverStrategy: ASYNC_DEMO_SEARCH_STRATEGY },
options
) as Observable<IAsyncDemoResponse>;
})
);
};
};
return { search };
}
43 changes: 22 additions & 21 deletions examples/demo_search/public/demo_search_strategy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@
* under the License.
*/

import { Observable } from 'rxjs';
import { ISearchContext, SYNC_SEARCH_STRATEGY } from '../../../src/plugins/data/public';
import { TSearchStrategyProvider, ISearchStrategy } from '../../../src/plugins/data/public';

import { Observable, from } from 'rxjs';
import { flatMap } from 'rxjs/operators';
import { CoreSetup } from 'kibana/public';
import { ISearch, SYNC_SEARCH_STRATEGY } from '../../../src/plugins/data/public';
import { DEMO_SEARCH_STRATEGY, IDemoResponse } from '../common';
import { DemoDataSearchStartDependencies } from './types';

/**
* This demo search strategy provider simply provides a shortcut for calling the DEMO_SEARCH_STRATEGY
Expand All @@ -31,7 +32,7 @@ import { DEMO_SEARCH_STRATEGY, IDemoResponse } from '../common';
* so instead of callers having to do:
*
* ```
* context.search(
* data.search.search(
* { ...request, serverStrategy: DEMO_SEARCH_STRATEGY },
* options,
* SYNC_SEARCH_STRATEGY
Expand All @@ -41,24 +42,24 @@ import { DEMO_SEARCH_STRATEGY, IDemoResponse } from '../common';
* They can instead just do
*
* ```
* context.search(request, options, DEMO_SEARCH_STRATEGY);
* data.search.search(request, options, DEMO_SEARCH_STRATEGY);
* ```
*
* and are ensured type safety in regard to the request and response objects.
*
* @param context - context supplied by other plugins.
* @param search - a search function to access other strategies that have already been registered.
*/
export const demoClientSearchStrategyProvider: TSearchStrategyProvider<typeof DEMO_SEARCH_STRATEGY> = (
context: ISearchContext
): ISearchStrategy<typeof DEMO_SEARCH_STRATEGY> => {
const syncStrategyProvider = context.getSearchStrategy(SYNC_SEARCH_STRATEGY);
const { search } = syncStrategyProvider(context);
return {
search: (request, options) => {
return search({ ...request, serverStrategy: DEMO_SEARCH_STRATEGY }, options) as Observable<
IDemoResponse
>;
},
export function demoClientSearchStrategyProvider(core: CoreSetup) {
const search: ISearch<typeof DEMO_SEARCH_STRATEGY> = (request, options) => {
return from(core.getStartServices()).pipe(
flatMap((startServices) => {
const syncStrategy = (startServices[1] as DemoDataSearchStartDependencies).data.search.getSearchStrategy(
SYNC_SEARCH_STRATEGY
);
return syncStrategy.search(
{ ...request, serverStrategy: DEMO_SEARCH_STRATEGY },
options
) as Observable<IDemoResponse>;
})
);
};
};
return { search };
}
23 changes: 8 additions & 15 deletions examples/demo_search/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
* under the License.
*/

import { DataPublicPluginSetup } from '../../../src/plugins/data/public';
import { Plugin, CoreSetup } from '../../../src/core/public';
import {
DEMO_SEARCH_STRATEGY,
Expand All @@ -29,10 +28,7 @@ import {
} from '../common';
import { demoClientSearchStrategyProvider } from './demo_search_strategy';
import { asyncDemoClientSearchStrategyProvider } from './async_demo_search_strategy';

interface DemoDataSearchSetupDependencies {
data: DataPublicPluginSetup;
}
import { DemoDataSearchSetupDependencies, DemoDataSearchStartDependencies } from './types';

/**
* Add the typescript mappings for our search strategy to the request and
Expand All @@ -55,16 +51,13 @@ declare module '../../../src/plugins/data/public' {
}
}

export class DemoDataPlugin implements Plugin {
public setup(core: CoreSetup, deps: DemoDataSearchSetupDependencies) {
deps.data.search.registerSearchStrategyProvider(
DEMO_SEARCH_STRATEGY,
demoClientSearchStrategyProvider
);
deps.data.search.registerSearchStrategyProvider(
ASYNC_DEMO_SEARCH_STRATEGY,
asyncDemoClientSearchStrategyProvider
);
export class DemoDataPlugin
implements Plugin<void, void, DemoDataSearchSetupDependencies, DemoDataSearchStartDependencies> {
public setup(core: CoreSetup, { data }: DemoDataSearchSetupDependencies) {
const demoClientSearchStrategy = demoClientSearchStrategyProvider(core);
const asyncDemoClientSearchStrategy = asyncDemoClientSearchStrategyProvider(core);
data.search.registerSearchStrategy(DEMO_SEARCH_STRATEGY, demoClientSearchStrategy);
data.search.registerSearchStrategy(ASYNC_DEMO_SEARCH_STRATEGY, asyncDemoClientSearchStrategy);
}

public start() {}
Expand Down
28 changes: 28 additions & 0 deletions examples/demo_search/public/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*
* 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 { DataPublicPluginStart, DataPublicPluginSetup } from '../../../src/plugins/data/public';

export interface DemoDataSearchSetupDependencies {
data: DataPublicPluginSetup;
}

export interface DemoDataSearchStartDependencies {
data: DataPublicPluginStart;
}
2 changes: 0 additions & 2 deletions src/plugins/data/public/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,6 @@ export {
SYNC_SEARCH_STRATEGY,
getEsPreference,
getSearchErrorType,
ISearchContext,
TSearchStrategyProvider,
ISearchStrategy,
ISearch,
ISearchOptions,
Expand Down
12 changes: 9 additions & 3 deletions src/plugins/data/public/mocks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,17 @@ import { Plugin, IndexPatternsContract } from '.';
import { fieldFormatsServiceMock } from './field_formats/mocks';
import { searchSetupMock, searchStartMock } from './search/mocks';
import { queryServiceMock } from './query/mocks';
import { AutocompleteStart, AutocompleteSetup } from './autocomplete';

export type Setup = jest.Mocked<ReturnType<Plugin['setup']>>;
export type Start = jest.Mocked<ReturnType<Plugin['start']>>;

const autocompleteMock: any = {
const automcompleteSetupMock: jest.Mocked<AutocompleteSetup> = {
addQuerySuggestionProvider: jest.fn(),
getQuerySuggestions: jest.fn(),
};

const autocompleteStartMock: jest.Mocked<AutocompleteStart> = {
getValueSuggestions: jest.fn(),
getQuerySuggestions: jest.fn(),
hasQuerySuggestions: jest.fn(),
Expand All @@ -34,7 +40,7 @@ const autocompleteMock: any = {
const createSetupContract = (): Setup => {
const querySetupMock = queryServiceMock.createSetupContract();
return {
autocomplete: autocompleteMock,
autocomplete: automcompleteSetupMock,
search: searchSetupMock,
fieldFormats: fieldFormatsServiceMock.createSetupContract(),
query: querySetupMock,
Expand All @@ -48,7 +54,7 @@ const createStartContract = (): Start => {
createFiltersFromValueClickAction: jest.fn().mockResolvedValue(['yes']),
createFiltersFromRangeSelectAction: jest.fn(),
},
autocomplete: autocompleteMock,
autocomplete: autocompleteStartMock,
search: searchStartMock,
fieldFormats: fieldFormatsServiceMock.createStartContract(),
query: queryStartMock,
Expand Down
Loading