Skip to content

Commit

Permalink
cleaning up and removing rootSearchSource and appSearchSource concepts
Browse files Browse the repository at this point in the history
  • Loading branch information
ppisljar committed May 21, 2018
1 parent fac3e08 commit 90e4013
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 80 deletions.
3 changes: 0 additions & 3 deletions src/core_plugins/kibana/public/dashboard/dashboard_app.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,6 @@ app.directive('dashboardApp', function ($injector) {

timefilter.enableAutoRefreshSelector();
timefilter.enableTimeRangeSelector();
dash.searchSource.highlightAll(true);
dash.searchSource.version(true);
courier.setRootSearchSource(dash.searchSource);

updateState();

Expand Down
4 changes: 0 additions & 4 deletions src/ui/public/courier/courier.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { SearchSourceProvider } from './data_source/search_source';
import { requestQueue } from './_request_queue';
import { FetchSoonProvider } from './fetch';
import { SearchLooperProvider } from './looper/search';
import { RootSearchSourceProvider } from './data_source/_root_search_source';
import { SavedObjectProvider } from './saved_object';
import { RedirectWhenMissingProvider } from './_redirect_when_missing';

Expand All @@ -23,9 +22,6 @@ uiModules.get('kibana/courier')
const fetchSoon = Private(FetchSoonProvider);
const searchLooper = self.searchLooper = Private(SearchLooperProvider);

// expose some internal modules
self.setRootSearchSource = Private(RootSearchSourceProvider).set;

self.SavedObject = Private(SavedObjectProvider);
self.indexPatterns = indexPatterns;
self.redirectWhenMissing = Private(RedirectWhenMissingProvider);
Expand Down
70 changes: 0 additions & 70 deletions src/ui/public/courier/data_source/_root_search_source.js

This file was deleted.

5 changes: 2 additions & 3 deletions src/ui/public/courier/data_source/search_source.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ import angular from 'angular';
import '../../promises';

import { NormalizeSortRequestProvider } from './_normalize_sort_request';
import { RootSearchSourceProvider } from './_root_search_source';
import { SearchRequestProvider } from '../fetch/request';
import { SegmentedRequestProvider } from '../fetch/request/segmented';

Expand Down Expand Up @@ -208,11 +207,11 @@ export function SearchSourceProvider(Promise, PromiseEmitter, Private, config) {
* Get the parent of this SearchSource
* @return {undefined|searchSource}
*/
getParent(onlyHardLinked) {
getParent() {
const self = this;
if (self._parent === false) return;
if (self._parent) return self._parent;
return onlyHardLinked ? undefined : Private(RootSearchSourceProvider).get();
return undefined;
}

/**
Expand Down

0 comments on commit 90e4013

Please sign in to comment.