Skip to content

Commit e443fa0

Browse files
mikecotemikecote
committed
Merge branch 'actions/license-checks' of github.com:elastic/kibana into actions/ensure-action-type-function
2 parents d5292e6 + 9181f5a commit e443fa0

24 files changed

Lines changed: 606 additions & 322 deletions

File tree

‎src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts‎

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,9 @@
2222
// They can stay even after NP cutover
2323
import angular from 'angular';
2424
import { EuiIcon } from '@elastic/eui';
25-
// @ts-ignore
26-
import { StateProvider } from 'ui/state_management/state';
2725
import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
2826
import { CoreStart, LegacyCoreStart, IUiSettingsClient } from 'kibana/public';
2927
// @ts-ignore
30-
import { AppStateProvider } from 'ui/state_management/app_state';
31-
// @ts-ignore
32-
import { GlobalStateProvider } from 'ui/state_management/global_state';
33-
// @ts-ignore
3428
import { StateManagementConfigProvider } from 'ui/state_management/config_provider';
3529
// @ts-ignore
3630
import { KbnUrlProvider, RedirectWhenMissingProvider } from 'ui/url';
@@ -117,8 +111,6 @@ export function initializeInnerAngularModule(
117111
createLocalConfigModule(core.uiSettings);
118112
createLocalKbnUrlModule();
119113
createLocalTopNavModule(navigation);
120-
createLocalGlobalStateModule();
121-
createLocalAppStateModule();
122114
createLocalStorageModule();
123115
createElasticSearchModule(data);
124116
createPagerFactoryModule();
@@ -136,6 +128,7 @@ export function initializeInnerAngularModule(
136128
'discoverPrivate',
137129
'discoverDocTable',
138130
'discoverPagerFactory',
131+
'discoverPromise',
139132
])
140133
.config(watchMultiDecorator)
141134
.directive('icon', reactDirective => reactDirective(EuiIcon))
@@ -153,9 +146,8 @@ export function initializeInnerAngularModule(
153146
'discoverConfig',
154147
'discoverI18n',
155148
'discoverPrivate',
149+
'discoverPromise',
156150
'discoverTopNav',
157-
'discoverGlobalState',
158-
'discoverAppState',
159151
'discoverLocalStorageProvider',
160152
'discoverEs',
161153
'discoverDocTable',
@@ -178,19 +170,6 @@ export function initializeInnerAngularModule(
178170
.service('debounce', ['$timeout', DebounceProviderTimeout]);
179171
}
180172

181-
export function createLocalGlobalStateModule() {
182-
angular
183-
.module('discoverGlobalState', [
184-
'discoverPrivate',
185-
'discoverConfig',
186-
'discoverKbnUrl',
187-
'discoverPromise',
188-
])
189-
.service('globalState', function(Private: IPrivate) {
190-
return Private(GlobalStateProvider);
191-
});
192-
}
193-
194173
function createLocalKbnUrlModule() {
195174
angular
196175
.module('discoverKbnUrl', ['discoverPrivate', 'ngRoute'])
@@ -236,26 +215,6 @@ function createLocalI18nModule() {
236215
.directive('i18nId', i18nDirective);
237216
}
238217

239-
function createLocalAppStateModule() {
240-
angular
241-
.module('discoverAppState', [
242-
'discoverGlobalState',
243-
'discoverPrivate',
244-
'discoverConfig',
245-
'discoverKbnUrl',
246-
'discoverPromise',
247-
])
248-
.service('AppState', function(Private: IPrivate) {
249-
return Private(AppStateProvider);
250-
})
251-
.service('getAppState', function(Private: any) {
252-
return Private(AppStateProvider).getAppState;
253-
})
254-
.service('State', function(Private: any) {
255-
return Private(StateProvider);
256-
});
257-
}
258-
259218
function createLocalStorageModule() {
260219
angular
261220
.module('discoverLocalStorageProvider', ['discoverPrivate'])
@@ -287,7 +246,6 @@ function createDocTableModule() {
287246
.module('discoverDocTable', [
288247
'discoverKbnUrl',
289248
'discoverConfig',
290-
'discoverAppState',
291249
'discoverPagerFactory',
292250
'react',
293251
])

‎src/legacy/core_plugins/kibana/public/discover/kibana_services.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,12 @@ export { wrapInI18nContext } from 'ui/i18n';
5353
export { getRequestInspectorStats, getResponseInspectorStats } from '../../../data/public';
5454
// @ts-ignore
5555
export { intervalOptions } from 'ui/agg_types';
56-
export { stateMonitorFactory } from 'ui/state_management/state_monitor_factory';
5756
export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
5857
// @ts-ignore
5958
export { timezoneProvider } from 'ui/vis/lib/timezone';
6059
export { tabifyAggResponse } from '../../../data/public';
6160
export { unhashUrl } from '../../../../../plugins/kibana_utils/public';
6261
export {
63-
migrateLegacyQuery,
6462
ensureDefaultIndexPattern,
6563
formatMsg,
6664
formatStack,
@@ -80,7 +78,6 @@ export {
8078
SortDirection,
8179
} from '../../../../../plugins/data/public';
8280
export { ElasticSearchHit } from './np_ready/doc_views/doc_views_types';
83-
export { registerTimefilterWithGlobalStateFactory } from 'ui/timefilter/setup_router';
8481
export { getFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
8582
// @ts-ignore
8683
export { buildPointSeriesData } from 'ui/agg_response/point_series/point_series';

‎src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,15 @@ <h1 class="euiScreenReaderOnly">{{screenTitle}}</h1>
55
<kbn-top-nav
66
app-name="'discover'"
77
config="topNavMenu"
8-
screen-title="screenTitle"
9-
show-search-bar="true"
10-
show-date-picker="enableTimeRangeSelector"
118
index-patterns="[indexPattern]"
12-
13-
query="state.query"
149
on-query-submit="updateQuery"
15-
16-
show-save-query="showSaveQuery"
17-
saved-query-id="state.savedQuery"
1810
on-saved-query-id-change="updateSavedQueryId"
19-
11+
query="state.query"
12+
saved-query-id="state.savedQuery"
13+
screen-title="screenTitle"
14+
show-date-picker="enableTimeRangeSelector"
15+
show-save-query="showSaveQuery"
16+
show-search-bar="true"
2017
use-default-behaviors="true"
2118
>
2219
</kbn-top-nav>
@@ -186,7 +183,6 @@ <h1 class="euiScreenReaderOnly">{{screenTitle}}</h1>
186183
columns="state.columns"
187184
infinite-scroll="true"
188185
filter="filterQuery"
189-
filters="state.filters"
190186
data-shared-item
191187
data-title="{{opts.savedSearch.lastSavedTitle}}"
192188
data-description="{{opts.savedSearch.description}}"

0 commit comments

Comments
 (0)