maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Discover] Move State to inner angular (#52369)

Browse source
This commit is contained in:
Matthias Wilhelm 2019-12-10 12:21:57 +01:00 committed by GitHub
parent 1cdbd600a9
commit c4e4da377d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/legacy/core_plugins/kibana/public/discover/angular/discover.js vendored
View file

@ -65,7 +65,6 @@ const {
data,
docTitle,
filterManager,
State,
share,
timefilter,
toastNotifications,
@ -121,7 +120,7 @@ app.config($routeProvider => {
template: indexTemplate,
reloadOnSearch: false,
resolve: {
savedObjects: function (redirectWhenMissing, $route, kbnUrl, Promise, $rootScope) {
savedObjects: function (redirectWhenMissing, $route, kbnUrl, Promise, $rootScope, State) {
const indexPatterns = getServices().indexPatterns;
const savedSearchId = $route.current.params.id;
return ensureDefaultIndexPattern(core, getServices().data, $rootScope, kbnUrl).then(() => {
@ -137,7 +136,6 @@ app.config($routeProvider => {
* @type {State}
*/
const state = new State('_a', {});
const id = getIndexPatternId(state.index, indexPatternList, uiSettings.get('defaultIndex'));
state.destroy();
return Promise.props({

5
src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
View file

@ -25,6 +25,8 @@ import 'ui/angular-bootstrap';
import { IPrivate } from 'ui/private';
import { EuiIcon } from '@elastic/eui';
// @ts-ignore
import { StateProvider } from 'ui/state_management/state';
// @ts-ignore
import { EventsProvider } from 'ui/events';
import { PersistedState } from 'ui/persisted_state';
// @ts-ignore
@ -277,6 +279,9 @@ function createLocalAppStateModule() {
})
.service('getAppState', function(Private: any) {
return Private(AppStateProvider).getAppState;
})
.service('State', function(Private: any) {
return Private(StateProvider);
});
}

5
src/legacy/core_plugins/kibana/public/discover/helpers/build_services.ts
View file

@ -29,8 +29,6 @@ import chromeLegacy from 'ui/chrome';
import { IPrivate } from 'ui/private';
import { FilterManager, TimefilterContract, IndexPatternsContract } from 'src/plugins/data/public';
// @ts-ignore
import { StateProvider } from 'ui/state_management/state';
// @ts-ignore
import { createSavedSearchesService } from '../saved_searches/saved_searches';
// @ts-ignore
import { createSavedSearchFactory } from '../saved_searches/_saved_search';
@ -57,7 +55,6 @@ export interface DiscoverServices {
// legacy
getSavedSearchById: (id: string) => Promise<SavedSearch>;
getSavedSearchUrlById: (id: string) => Promise<string>;
State: unknown;
uiSettings: IUiSettingsClient;
}
@ -65,13 +62,11 @@ export async function buildGlobalAngularServices() {
const injector = await chromeLegacy.dangerouslyGetActiveInjector();
const Private = injector.get<IPrivate>('Private');
const kbnUrl = injector.get<IPrivate>('kbnUrl');
const State = Private(StateProvider);
const SavedSearchFactory = createSavedSearchFactory(Private);
const service = createSavedSearchesService(Private, SavedSearchFactory, kbnUrl, chromeLegacy);
return {
getSavedSearchById: async (id: string) => service.get(id),
getSavedSearchUrlById: async (id: string) => service.urlFor(id),
State,
};
}