Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion src/legacy/core_plugins/data/public/legacy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,7 @@ export const setup = dataPlugin.setup(npSetup.core, {
__LEGACY: legacyPlugin.setup(),
});

export const start = dataPlugin.start(npStart.core);
export const start = dataPlugin.start(npStart.core, {
data: npStart.plugins.data,
__LEGACY: legacyPlugin.start(),
});
46 changes: 42 additions & 4 deletions src/legacy/core_plugins/data/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,16 @@
*/

import { CoreSetup, CoreStart, Plugin } from '../../../../core/public';
import { SearchService, SearchSetup } from './search';
import { SearchService, SearchSetup, createSearchBar, StatetfulSearchBarProps } from './search';
import { QueryService, QuerySetup } from './query';
import { FilterService, FilterSetup } from './filter';
import { TimefilterService, TimefilterSetup } from './timefilter';
import { IndexPatternsService, IndexPatternsSetup } from './index_patterns';
import { LegacyDependenciesPluginSetup } from './shim/legacy_dependencies_plugin';
import {
LegacyDependenciesPluginSetup,
LegacyDependenciesPluginStart,
} from './shim/legacy_dependencies_plugin';
import { DataPublicPluginStart } from '../../../../plugins/data/public';

/**
* Interface for any dependencies on other plugins' `setup` contracts.
Expand All @@ -34,6 +38,11 @@ export interface DataPluginSetupDependencies {
__LEGACY: LegacyDependenciesPluginSetup;
}

export interface DataPluginStartDependencies {
data: DataPublicPluginStart;
__LEGACY: LegacyDependenciesPluginStart;
}

/**
* Interface for this plugin's returned `setup` contract.
*
Expand All @@ -47,6 +56,22 @@ export interface DataSetup {
timefilter: TimefilterSetup;
}

/**
* Interface for this plugin's returned `start` contract.
*
* @public
*/
export interface DataStart {
indexPatterns: IndexPatternsSetup;
filter: FilterSetup;
query: QuerySetup;
search: SearchSetup;
timefilter: TimefilterSetup;
ui: {
SearchBar: React.ComponentType<StatetfulSearchBarProps>;
};
}

/**
* Data Plugin - public
*
Expand All @@ -58,7 +83,9 @@ export interface DataSetup {
* in the setup/start interfaces. The remaining items exported here are either types,
* or static code.
*/
export class DataPlugin implements Plugin<DataSetup, {}, DataPluginSetupDependencies> {
export class DataPlugin
implements
Plugin<DataSetup, DataStart, DataPluginSetupDependencies, DataPluginStartDependencies> {
// Exposed services, sorted alphabetically
private readonly filter: FilterService = new FilterService();
private readonly indexPatterns: IndexPatternsService = new IndexPatternsService();
Expand Down Expand Up @@ -96,9 +123,20 @@ export class DataPlugin implements Plugin<DataSetup, {}, DataPluginSetupDependen
return this.setupApi;
}

public start(core: CoreStart) {
public start(core: CoreStart, { __LEGACY, data }: DataPluginStartDependencies) {
const SearchBar = createSearchBar({
core,
store: __LEGACY.storage,
timefilter: this.setupApi.timefilter,
filterManager: this.setupApi.filter.filterManager,
autocomplete: data.autocomplete,
});

return {
...this.setupApi!,
ui: {
SearchBar,
},
};
}

Expand Down
Loading