Remove SavedObjectRegistryProvider from codebase

src/legacy/core_plugins/kibana/public/dashboard/application.ts

@@ -57,7 +57,6 @@ export interface RenderDeps {
   npDataStart: NpDataStart;
   navigation: NavigationStart;
   savedObjectsClient: SavedObjectsClientContract;
-  savedObjectRegistry: any;
   dashboardConfig: any;
   savedDashboards: any;
   dashboardCapabilities: any;

src/legacy/core_plugins/kibana/public/dashboard/index.ts

@@ -17,13 +17,7 @@
  * under the License.
  */
 
-import {
-  npSetup,
-  npStart,
-  SavedObjectRegistryProvider,
-  legacyChrome,
-  IPrivate,
-} from './legacy_imports';
+import { npSetup, npStart, legacyChrome } from './legacy_imports';
 import { DashboardPlugin, LegacyAngularInjectedDependencies } from './plugin';
 import { start as data } from '../../../data/public/legacy';
 import { start as embeddables } from '../../../embeddable_api/public/np_ready/public/legacy';
@@ -37,13 +31,8 @@ import './dashboard_config';
 async function getAngularDependencies(): Promise<LegacyAngularInjectedDependencies> {
   const injector = await legacyChrome.dangerouslyGetActiveInjector();
 
-  const Private = injector.get<IPrivate>('Private');
-
-  const savedObjectRegistry = Private(SavedObjectRegistryProvider);
-
   return {
     dashboardConfig: injector.get('dashboardConfig'),
-    savedObjectRegistry,
     savedDashboards: injector.get('savedDashboards'),
   };
 }

src/legacy/core_plugins/kibana/public/dashboard/legacy_app.js

@@ -33,6 +33,7 @@ import { DashboardListing, EMPTY_FILTER } from './listing/dashboard_listing';
 import { addHelpMenuToAppChrome } from './help_menu/help_menu_util';
 import { registerTimefilterWithGlobalStateFactory } from '../../../../ui/public/timefilter/setup_router';
 import { syncOnMount } from './global_state_sync';
+import { savedObjectLoaderDashboard } from './saved_dashboard/saved_dashboards';
 
 export function initDashboardApp(app, deps) {
   initDashboardAppDirective(app, deps);
@@ -86,7 +87,8 @@ export function initDashboardApp(app, deps) {
         ...defaults,
         template: dashboardListingTemplate,
         controller($injector, $location, $scope) {
-          const services = deps.savedObjectRegistry.byLoaderPropertiesName;
+          const service = savedObjectLoaderDashboard;
+
           const kbnUrl = $injector.get('kbnUrl');
           const dashboardConfig = deps.dashboardConfig;
 
@@ -95,7 +97,7 @@ export function initDashboardApp(app, deps) {
             kbnUrl.redirect(DashboardConstants.CREATE_NEW_DASHBOARD_URL);
           };
           $scope.find = search => {
-            return services.dashboards.find(search, $scope.listingLimit);
+            return service.find(search, $scope.listingLimit);
           };
           $scope.editItem = ({ id }) => {
             kbnUrl.redirect(`${createDashboardEditUrl(id)}?_a=(viewMode:edit)`);
@@ -104,7 +106,7 @@ export function initDashboardApp(app, deps) {
             return deps.addBasePath(`#${createDashboardEditUrl(id)}`);
           };
           $scope.delete = dashboards => {
-            return services.dashboards.delete(dashboards.map(d => d.id));
+            return service.delete(dashboards.map(d => d.id));
           };
           $scope.hideWriteControls = dashboardConfig.getHideWriteControls();
           $scope.initialFilter = $location.search().filter || EMPTY_FILTER;

src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts

@@ -32,7 +32,6 @@ export { AppState } from 'ui/state_management/app_state';
 export { AppStateClass } from 'ui/state_management/app_state';
 export { SavedObjectSaveOpts } from 'ui/saved_objects/types';
 export { npSetup, npStart } from 'ui/new_platform';
-export { SavedObjectRegistryProvider } from 'ui/saved_objects';
 export { IPrivate } from 'ui/private';
 export { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
 export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';

src/legacy/core_plugins/kibana/public/dashboard/plugin.ts

@@ -42,7 +42,6 @@ import { KibanaLegacySetup } from '../../../../../plugins/kibana_legacy/public';
 
 export interface LegacyAngularInjectedDependencies {
   dashboardConfig: any;
-  savedObjectRegistry: any;
   savedDashboards: any;
 }
 

src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_register.ts

@@ -16,10 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
 import './saved_dashboards';
-
-SavedObjectRegistryProvider.register((savedDashboards: any) => {
-  return savedDashboards;
-});

src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.ts

@@ -36,17 +36,20 @@ savedObjectManagementRegistry.register({
     defaultMessage: 'dashboards',
   }),
 });
+const savedObjectsClient = npStart.core.savedObjects.client;
+const services = {
+  savedObjectsClient,
+  indexPatterns: npStart.plugins.data.indexPatterns,
+  chrome: npStart.core.chrome,
+  overlays: npStart.core.overlays,
+};
 
-// This is the only thing that gets injected into controllers
-module.service('savedDashboards', function() {
-  const savedObjectsClient = npStart.core.savedObjects.client;
-  const services = {
-    savedObjectsClient,
-    indexPatterns: npStart.plugins.data.indexPatterns,
-    chrome: npStart.core.chrome,
-    overlays: npStart.core.overlays,
-  };
+const SavedDashboard = createSavedDashboardClass(services);
+export const savedObjectLoaderDashboard = new SavedObjectLoader(
+  SavedDashboard,
+  savedObjectsClient,
+  npStart.core.chrome
+);
 
-  const SavedDashboard = createSavedDashboardClass(services);
-  return new SavedObjectLoader(SavedDashboard, savedObjectsClient, npStart.core.chrome);
-});
+// This is the only thing that gets injected into controllers
+module.service('savedDashboards', () => savedObjectLoaderDashboard);

src/legacy/core_plugins/kibana/public/discover/index.ts

@@ -18,7 +18,6 @@
  */
 import { PluginInitializer, PluginInitializerContext } from 'kibana/public';
 import { npSetup, npStart } from 'ui/new_platform';
-import { SavedObjectRegistryProvider } from 'ui/saved_objects';
 import { DiscoverPlugin, DiscoverSetup, DiscoverStart } from './plugin';
 
 // Core will be looking for this when loading our plugin in the new platform
@@ -33,8 +32,4 @@ export const pluginInstance = plugin({} as PluginInitializerContext);
   pluginInstance.start(npStart.core, npStart.plugins);
 })();
 
-SavedObjectRegistryProvider.register((savedSearches: any) => {
-  return savedSearches;
-});
-
 export { createSavedSearchesService } from './saved_searches/saved_searches';

src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_searches_register.ts

@@ -31,13 +31,13 @@ savedObjectManagementRegistry.register({
   service: 'savedSearches',
   title: 'searches',
 });
+const services = {
+  savedObjectsClient: npStart.core.savedObjects.client,
+  indexPatterns: npStart.plugins.data.indexPatterns,
+  chrome: npStart.core.chrome,
+  overlays: npStart.core.overlays,
+};
+const savedSearches = createSavedSearchesService(services);
+
 const module = uiModules.get('discover/saved_searches');
-module.service('savedSearches', () => {
-  const services = {
-    savedObjectsClient: npStart.core.savedObjects.client,
-    indexPatterns: npStart.plugins.data.indexPatterns,
-    chrome: npStart.core.chrome,
-    overlays: npStart.core.overlays,
-  };
-  return createSavedSearchesService(services);
-});
+module.service('savedSearches', () => savedSearches);

src/legacy/core_plugins/kibana/public/visualize/index.ts

@@ -25,7 +25,6 @@ import {
   legacyChrome,
   npSetup,
   npStart,
-  SavedObjectRegistryProvider,
   VisEditorTypesRegistryProvider,
 } from './legacy_imports';
 import { VisualizePlugin, LegacyAngularInjectedDependencies } from './plugin';
@@ -42,12 +41,10 @@ async function getAngularDependencies(): Promise<LegacyAngularInjectedDependenci
   const Private = injector.get<IPrivate>('Private');
 
   const editorTypes = Private(VisEditorTypesRegistryProvider);
-  const savedObjectRegistry = Private(SavedObjectRegistryProvider);
 
   return {
     legacyChrome,
     editorTypes,
-    savedObjectRegistry,
     savedVisualizations: injector.get('savedVisualizations'),
   };
 }
@@ -66,3 +63,5 @@ async function getAngularDependencies(): Promise<LegacyAngularInjectedDependenci
     visualizations,
   });
 })();
+
+export { createSavedVisLoader } from './saved_visualizations/saved_visualizations';

src/legacy/core_plugins/kibana/public/visualize/kibana_services.ts

@@ -47,7 +47,6 @@ export interface VisualizeKibanaServices {
   navigation: NavigationStart;
   toastNotifications: ToastsStart;
   savedObjectsClient: SavedObjectsClientContract;
-  savedObjectRegistry: any;
   savedQueryService: DataPublicPluginStart['query']['savedQueries'];
   savedVisualizations: SavedVisualizations;
   share: SharePluginStart;

src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts

@@ -43,7 +43,6 @@ export { IPrivate } from 'ui/private';
 // @ts-ignore
 export { PrivateProvider } from 'ui/private/private';
 
-export { SavedObjectRegistryProvider } from 'ui/saved_objects';
 export { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
 export { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
 

src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js

@@ -25,6 +25,7 @@ import { i18n } from '@kbn/i18n';
 
 import { getServices } from '../kibana_services';
 import { wrapInI18nContext } from '../legacy_imports';
+import { savedObjectLoaderVisualize } from '../saved_visualizations/saved_visualization_register';
 
 export function initListingDirective(app) {
   app.directive('visualizeListingTable', reactDirective =>
@@ -47,7 +48,6 @@ export function VisualizeListingController($injector, createNewVis) {
     addBasePath,
     chrome,
     legacyChrome,
-    savedObjectRegistry,
     savedObjectsClient,
     data: {
       query: {
@@ -94,10 +94,7 @@ export function VisualizeListingController($injector, createNewVis) {
     // In case the user navigated to the page via the /visualize/new URL we start the dialog immediately
     this.createNewVis();
   }
-
-  // TODO: Extract this into an external service.
-  const services = savedObjectRegistry.byLoaderPropertiesName;
-  const visualizationService = services.visualizations;
+  const visualizationService = savedObjectLoaderVisualize;
   this.visTypeRegistry = visualizations.types;
 
   this.fetchItems = filter => {

src/legacy/core_plugins/kibana/public/visualize/plugin.ts

@@ -48,7 +48,6 @@ import { SavedVisualizations } from './types';
 export interface LegacyAngularInjectedDependencies {
   legacyChrome: any;
   editorTypes: any;
-  savedObjectRegistry: any;
   savedVisualizations: SavedVisualizations;
 }
 

src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_register.ts

@@ -16,19 +16,28 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
+import { npStart } from 'ui/new_platform';
+// @ts-ignore
+import { uiModules } from 'ui/modules';
 // @ts-ignore
 import { savedObjectManagementRegistry } from '../../management/saved_object_registry';
 import './saved_visualizations';
+import { createSavedVisLoader } from './saved_visualizations';
 
-SavedObjectRegistryProvider.register((savedVisualizations: any) => {
-  return savedVisualizations;
-});
+const services = {
+  savedObjectsClient: npStart.core.savedObjects.client,
+  indexPatterns: npStart.plugins.data.indexPatterns,
+  chrome: npStart.core.chrome,
+  overlays: npStart.core.overlays,
+};
+
+export const savedObjectLoaderVisualize = createSavedVisLoader(services);
 
 // Register this service with the saved object registry so it can be
 // edited by the object editor.
 savedObjectManagementRegistry.register({
   service: 'savedVisualizations',
   title: 'visualizations',
 });
+
+uiModules.get('app/visualize').service('savedVisualizations', () => savedObjectLoaderVisualize);

src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.ts

@@ -16,26 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { npStart } from 'ui/new_platform';
-// @ts-ignore
-import { uiModules } from 'ui/modules';
 import { SavedObjectLoader } from 'ui/saved_objects';
+import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
 
 import { start as visualizations } from '../../../../visualizations/public/np_ready/public/legacy';
 import { createVisualizeEditUrl } from '../visualize_constants';
 // @ts-ignore
 import { findListItems } from './find_list_items';
 import { createSavedVisClass } from './_saved_vis';
-const app = uiModules.get('app/visualize');
 
-app.service('savedVisualizations', function() {
-  const savedObjectsClient = npStart.core.savedObjects.client;
-  const services = {
-    savedObjectsClient,
-    indexPatterns: npStart.plugins.data.indexPatterns,
-    chrome: npStart.core.chrome,
-    overlays: npStart.core.overlays,
-  };
+export function createSavedVisLoader(services: SavedObjectKibanaServices) {
+  const { savedObjectsClient } = services;
+
   class SavedObjectLoaderVisualize extends SavedObjectLoader {
     mapHitSource = (source: Record<string, any>, id: string) => {
       const visTypes = visualizations.types;
@@ -81,6 +73,5 @@ app.service('savedVisualizations', function() {
     }
   }
   const SavedVis = createSavedVisClass(services);
-
-  return new SavedObjectLoaderVisualize(SavedVis, savedObjectsClient, npStart.core.chrome);
-});
+  return new SavedObjectLoaderVisualize(SavedVis, savedObjectsClient, services.chrome);
+}

src/legacy/core_plugins/timelion/public/app.js

@@ -23,7 +23,6 @@ import { i18n } from '@kbn/i18n';
 
 import { capabilities } from 'ui/capabilities';
 import { docTitle } from 'ui/doc_title';
-import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
 import { fatalError, toastNotifications } from 'ui/notify';
 import { timezoneProvider } from 'ui/vis/lib/timezone';
 import { timefilter } from 'ui/timefilter';
@@ -36,15 +35,14 @@ require('ui/autoload/all');
 
 // TODO: remove ui imports completely (move to plugins)
 import 'ui/directives/input_focus';
-import 'ui/directives/saved_object_finder';
+import './directives/saved_object_finder';
 import 'ui/directives/listen';
 import 'ui/kbn_top_nav';
 import 'ui/saved_objects/ui/saved_object_save_as_checkbox';
-import './services/saved_sheets';
-import './services/_saved_sheet';
 import './services/saved_sheet_register';
 
 import rootTemplate from 'plugins/timelion/index.html';
+import { createSavedVisLoader } from '../../kibana/public/visualize';
 
 require('plugins/timelion/directives/cells/cells');
 require('plugins/timelion/directives/fixed_element');
@@ -129,8 +127,12 @@ app.controller('timelion', function(
   timefilter.enableAutoRefreshSelector();
   timefilter.enableTimeRangeSelector();
 
-  const savedVisualizations = Private(SavedObjectRegistryProvider).byLoaderPropertiesName
-    .visualizations;
+  const savedVisualizations = createSavedVisLoader({
+    savedObjectsClient: npStart.core.savedObjects.client,
+    indexPatterns: npStart.plugins.data.indexPatterns,
+    chrome: npStart.core.chrome,
+    overlays: npStart.core.overlays,
+  });
   const timezone = Private(timezoneProvider)();
 
   const defaultExpression = '.es(*)';