From d6604a191d697a03d0483409ef5218cca837f95f Mon Sep 17 00:00:00 2001 From: Matthias Wilhelm Date: Thu, 6 Feb 2020 07:43:25 +0100 Subject: [PATCH] Migrate IPrivate --- .../core_plugins/kibana/public/dashboard/legacy_imports.ts | 6 +++--- .../kibana/public/discover/get_inner_angular.ts | 2 +- src/legacy/core_plugins/kibana/public/home/index.ts | 2 +- .../core_plugins/kibana/public/visualize/legacy_imports.ts | 6 +++--- src/legacy/ui/public/private/index.d.ts | 2 +- src/plugins/kibana_legacy/public/utils/index.ts | 2 +- .../kibana_legacy/public/utils}/private.d.ts | 0 7 files changed, 10 insertions(+), 10 deletions(-) rename src/{legacy/ui/public/private => plugins/kibana_legacy/public/utils}/private.d.ts (100%) diff --git a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts index 5d6220f4cff46..a5b44994e24e5 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts +++ b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts @@ -29,7 +29,6 @@ import chrome from 'ui/chrome'; export const legacyChrome = chrome; export { SavedObjectSaveOpts } from 'ui/saved_objects/types'; export { npSetup, npStart } from 'ui/new_platform'; -export { IPrivate } from 'ui/private'; export { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal'; export { subscribeWithScope } from 'ui/utils/subscribe_with_scope'; // @ts-ignore @@ -48,9 +47,10 @@ export { VISUALIZE_EMBEDDABLE_TYPE } from '../../../visualizations/public/embedd export { registerTimefilterWithGlobalStateFactory } from 'ui/timefilter/setup_router'; export { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url'; export { + configureAppAngularModule, + ensureDefaultIndexPattern, + IPrivate, migrateLegacyQuery, PrivateProvider, PromiseServiceCreator, - configureAppAngularModule, - ensureDefaultIndexPattern, } from '../../../../../plugins/kibana_legacy/public'; diff --git a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts index 5f3ea07df6325..cc4dabd123ff4 100644 --- a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts +++ b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts @@ -22,7 +22,6 @@ // They can stay even after NP cutover import angular from 'angular'; import 'ui/angular-bootstrap'; -import { IPrivate } from 'ui/private'; import { EuiIcon } from '@elastic/eui'; // @ts-ignore import { StateProvider } from 'ui/state_management/state'; @@ -73,6 +72,7 @@ import { DebounceProviderTimeout } from './np_ready/angular/directives/debounce/ import { createRenderCompleteDirective } from './np_ready/angular/directives/render_complete'; import { configureAppAngularModule, + IPrivate, KbnAccessibleClickProvider, PrivateProvider, PromiseServiceCreator, diff --git a/src/legacy/core_plugins/kibana/public/home/index.ts b/src/legacy/core_plugins/kibana/public/home/index.ts index 27d09a53ba20d..f02ec234e0a83 100644 --- a/src/legacy/core_plugins/kibana/public/home/index.ts +++ b/src/legacy/core_plugins/kibana/public/home/index.ts @@ -20,9 +20,9 @@ import { FeatureCatalogueRegistryProvider } from 'ui/registry/feature_catalogue'; import { npSetup, npStart } from 'ui/new_platform'; import chrome from 'ui/chrome'; -import { IPrivate } from 'ui/private'; import { HomePlugin, LegacyAngularInjectedDependencies } from './plugin'; import { TelemetryOptInProvider } from '../../../telemetry/public/services'; +import { IPrivate } from '../../../../../plugins/kibana_legacy/public'; /** * Get dependencies relying on the global angular context. diff --git a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts index 4488c66ee3e85..14a3b2ea29356 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts +++ b/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts @@ -40,7 +40,6 @@ export { stateMonitorFactory } from 'ui/state_management/state_monitor_factory'; export { PersistedState } from 'ui/persisted_state'; export { npSetup, npStart } from 'ui/new_platform'; -export { IPrivate } from 'ui/private'; export { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal'; export { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal'; @@ -63,9 +62,10 @@ export { VisSavedObject } from '../../../visualizations/public/embeddable/visual export { VISUALIZE_EMBEDDABLE_TYPE } from '../../../visualizations/public/embeddable'; export { VisType } from '../../../visualizations/public'; export { + configureAppAngularModule, + ensureDefaultIndexPattern, + IPrivate, migrateLegacyQuery, PrivateProvider, PromiseServiceCreator, - configureAppAngularModule, - ensureDefaultIndexPattern, } from '../../../../../plugins/kibana_legacy/public'; diff --git a/src/legacy/ui/public/private/index.d.ts b/src/legacy/ui/public/private/index.d.ts index d814b31102d59..895dc63939311 100644 --- a/src/legacy/ui/public/private/index.d.ts +++ b/src/legacy/ui/public/private/index.d.ts @@ -17,4 +17,4 @@ * under the License. */ -export { IPrivate } from './private'; +export { IPrivate } from '../../../../plugins/kibana_legacy/public/utils/private'; diff --git a/src/plugins/kibana_legacy/public/utils/index.ts b/src/plugins/kibana_legacy/public/utils/index.ts index 7ebe9b1c9bc97..886ae0e877c38 100644 --- a/src/plugins/kibana_legacy/public/utils/index.ts +++ b/src/plugins/kibana_legacy/public/utils/index.ts @@ -23,6 +23,6 @@ export * from './url_overflow_service'; // @ts-ignore export { KbnAccessibleClickProvider } from './kbn_accessible_click'; // @ts-ignore -export { PrivateProvider } from './private'; +export { PrivateProvider, IPrivate } from './private'; // @ts-ignore export { registerListenEventListener } from './register_listen_event_listener'; diff --git a/src/legacy/ui/public/private/private.d.ts b/src/plugins/kibana_legacy/public/utils/private.d.ts similarity index 100% rename from src/legacy/ui/public/private/private.d.ts rename to src/plugins/kibana_legacy/public/utils/private.d.ts