VisTypesRegistryProvider => VisualizationsPlugin interface - Draft

src/legacy/core_plugins/input_control_vis/public/register_vis.js

@@ -17,20 +17,19 @@
  * under the License.
  */
 
-import { VisFactoryProvider } from 'ui/vis/vis_factory';
+import { visFactory } from 'ui/vis/vis_factory';
 import { VisTypesRegistryProvider } from 'ui/registry/vis_types';
 import { VisController } from './vis_controller';
 import { ControlsTab } from './components/editor/controls_tab';
 import { OptionsTab } from './components/editor/options_tab';
 import { defaultFeedbackMessage } from 'ui/vis/default_feedback_message';
 import { Status } from 'ui/vis/update_status';
 import { i18n } from '@kbn/i18n';
+// import { visualizations } from '../../visualizations';
 
-function InputControlVisProvider(Private) {
-  const VisFactory = Private(VisFactoryProvider);
-
+const InputControlVisProvider =
   // return the visType object, which kibana will use to display and configure new Vis object of this type.
-  return VisFactory.createBaseVisualization({
+  visFactory.createBaseVisualization({
     name: 'input_control_vis',
     title: i18n.translate('inputControl.register.controlsTitle', {
       defaultMessage: 'Controls'
@@ -73,7 +72,6 @@ function InputControlVisProvider(Private) {
     requestHandler: 'none',
     responseHandler: 'none',
   });
-}
 
 // register the provider with the visTypes registry
 VisTypesRegistryProvider.register(InputControlVisProvider);

src/legacy/core_plugins/interpreter/public/functions/visualization.js

@@ -82,13 +82,13 @@ export const visualization = () => ({
     const Private = $injector.get('Private');
     const requestHandlers = Private(RequestHandlersProvider);
     const responseHandlers = Private(ResponseHandlerProvider);
-    const visTypes = Private(VisTypesRegistryProvider);
+    const visTypes = VisTypesRegistryProvider;
     const indexPatterns = Private(IndexPatternsProvider);
     const queryFilter = Private(FilterBarQueryFilterProvider);
 
     const visConfigParams = JSON.parse(args.visConfig);
     const schemas = JSON.parse(args.schemas);
-    const visType = visTypes.byName[args.type || 'histogram'];
+    const visType = visTypes.get(args.type || 'histogram');
     const requestHandler = getHandler(requestHandlers, visType.requestHandler);
     const responseHandler = getHandler(responseHandlers, visType.responseHandler);
     const indexPattern = args.index ? await indexPatterns.get(args.index) : null;

src/legacy/core_plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js

@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import chrome from 'ui/chrome';
 import { VisTypesRegistryProvider } from 'ui/registry/vis_types';
 
 import histogramVisTypeProvider from './histogram';
@@ -28,11 +29,18 @@ import horizontalBarVisTypeProvider from './horizontal_bar';
 import gaugeVisTypeProvider from './gauge';
 import goalVisTypeProvider from './goal';
 
-VisTypesRegistryProvider.register(histogramVisTypeProvider);
-VisTypesRegistryProvider.register(lineVisTypeProvider);
-VisTypesRegistryProvider.register(pieVisTypeProvider);
-VisTypesRegistryProvider.register(areaVisTypeProvider);
-VisTypesRegistryProvider.register(heatmapVisTypeProvider);
-VisTypesRegistryProvider.register(horizontalBarVisTypeProvider);
-VisTypesRegistryProvider.register(gaugeVisTypeProvider);
-VisTypesRegistryProvider.register(goalVisTypeProvider);
+async function registerItems() {
+  const $injector = await chrome.dangerouslyGetActiveInjector();
+  const Private = $injector.get('Private');
+
+  VisTypesRegistryProvider.register(histogramVisTypeProvider(Private));
+  VisTypesRegistryProvider.register(lineVisTypeProvider(Private));
+  VisTypesRegistryProvider.register(pieVisTypeProvider(Private));
+  VisTypesRegistryProvider.register(areaVisTypeProvider(Private));
+  VisTypesRegistryProvider.register(heatmapVisTypeProvider(Private));
+  VisTypesRegistryProvider.register(horizontalBarVisTypeProvider(Private));
+  VisTypesRegistryProvider.register(gaugeVisTypeProvider(Private));
+  VisTypesRegistryProvider.register(goalVisTypeProvider(Private));
+}
+
+registerItems();

src/legacy/core_plugins/kibana/public/visualize/editor/editor.js

@@ -62,9 +62,9 @@ uiRoutes
     template: editorTemplate,
     k7Breadcrumbs: getCreateBreadcrumbs,
     resolve: {
-      savedVis: function (savedVisualizations, redirectWhenMissing, $route, Private) {
-        const visTypes = Private(VisTypesRegistryProvider);
-        const visType = _.find(visTypes, { name: $route.current.params.type });
+      savedVis: function (savedVisualizations, redirectWhenMissing, $route) {
+        const visTypes = VisTypesRegistryProvider;
+        const visType = visTypes.get($route.current.params.type);
         const shouldHaveIndex = visType.requiresSearch && visType.options.showIndexSelection;
         const hasIndex = $route.current.params.indexPattern || $route.current.params.savedSearchId;
         if (shouldHaveIndex && !hasIndex) {

src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_factory.tsx

@@ -52,7 +52,6 @@ import { getVisualizeLoader } from 'ui/visualize/loader';
 import { Legacy } from 'kibana';
 import { VisTypesRegistry, VisTypesRegistryProvider } from 'ui/registry/vis_types';
 
-import { IPrivate } from 'ui/private';
 import { SavedObjectAttributes } from 'kibana/server';
 import {
   EmbeddableFactory,
@@ -79,41 +78,41 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
   VisualizationAttributes
 > {
   public readonly type = VISUALIZE_EMBEDDABLE_TYPE;
-  private readonly visTypes: VisTypesRegistry;
 
   static async createVisualizeEmbeddableFactory(): Promise<VisualizeEmbeddableFactory> {
-    const $injector = await chrome.dangerouslyGetActiveInjector();
-    const Private = $injector.get<IPrivate>('Private');
-    const visTypes = Private(VisTypesRegistryProvider);
-
-    return new VisualizeEmbeddableFactory(visTypes);
+    return new VisualizeEmbeddableFactory(() => VisTypesRegistryProvider.getAll());
   }
 
-  constructor(visTypes: VisTypesRegistry) {
+  constructor(private readonly getVisTypesRegistry: () => VisTypesRegistry) {
     super({
       savedObjectMetaData: {
         name: i18n.translate('kbn.visualize.savedObjectName', { defaultMessage: 'Visualization' }),
         type: 'visualization',
         getIconForSavedObject: savedObject => {
+          const visTypes = getVisTypesRegistry();
           if (!visTypes) {
             return 'visualizeApp';
+          } else {
+            const visStateType = visTypes.get(JSON.parse(savedObject.attributes.visState).type);
+            return visStateType ? visStateType.icon : 'visualizeApp';
           }
-          return (
-            visTypes.byName[JSON.parse(savedObject.attributes.visState).type].icon || 'visualizeApp'
-          );
         },
         getTooltipForSavedObject: savedObject => {
+          const visTypes = getVisTypesRegistry();
           if (!visTypes) {
             return '';
           }
-          return `${savedObject.attributes.title} (${visTypes.byName[JSON.parse(savedObject.attributes.visState).type].title})`;
+          const visStateType = visTypes.get(JSON.parse(savedObject.attributes.visState).type);
+          return `${savedObject.attributes.title} (
+            ${visStateType ? visStateType.title : ''})`;
         },
         showSavedObject: savedObject => {
+          const visTypes = getVisTypesRegistry();
           if (!visTypes) {
             return false;
           }
           const typeName: string = JSON.parse(savedObject.attributes.visState).type;
-          const visType = visTypes.byName[typeName];
+          const visType = visTypes.get(typeName);
           if (!visType) {
             return false;
           }
@@ -124,8 +123,6 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
         },
       },
     });
-
-    this.visTypes = visTypes;
   }
 
   public isEditable() {
@@ -179,10 +176,13 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
   }
 
   public async create() {
+    const visTypes = getVisTypesRegistry();
     // TODO: This is a bit of a hack to preserve the original functionality. Ideally we will clean this up
     // to allow for in place creation of visualizations without having to navigate away to a new URL.
-    if (this.visTypes) {
-      showNewVisModal(this.visTypes, {
+
+    // TODO: This now seems redundant as `visTypes` will always be truthy.
+    if (visTypes) {
+      showNewVisModal(visTypes, {
         editorParams: ['addToDashboard'],
       });
     }

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

@@ -43,7 +43,7 @@ export function VisualizeListingController($injector, createNewVis) {
   const config = $injector.get('config');
   const kbnUrl = $injector.get('kbnUrl');
 
-  this.visTypeRegistry = Private(VisTypesRegistryProvider);
+  this.visTypeRegistry = VisTypesRegistryProvider.getAll();
   this.visTypeAliases = visualizations.types.visTypeAliasRegistry.get();
 
   timefilter.disableAutoRefreshSelector();

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

@@ -33,7 +33,7 @@ savedObjectManagementRegistry.register({
 });
 
 app.service('savedVisualizations', function (SavedVis, Private, kbnUrl, chrome) {
-  const visTypes = Private(VisTypesRegistryProvider);
+  const visTypes = VisTypesRegistryProvider;
 
   const savedObjectClient = Private(SavedObjectsClientProvider);
   const saveVisualizationLoader = new SavedObjectLoader(SavedVis, kbnUrl, chrome, savedObjectClient);
@@ -48,12 +48,12 @@ app.service('savedVisualizations', function (SavedVis, Private, kbnUrl, chrome)
       catch (e) { /* missing typename handled below */ } // eslint-disable-line no-empty
     }
 
-    if (!typeName || !visTypes.byName[typeName]) {
+    if (!typeName || !visTypes.get(typeName)) {
       source.error = 'Unknown visualization type';
       return source;
     }
 
-    source.type = visTypes.byName[typeName];
+    source.type = visTypes.get(typeName);
     source.icon = source.type.icon;
     return source;
   };