visualize embeddable to visualizations plugin

src/legacy/core_plugins/kibana/index.js

@@ -61,10 +61,7 @@ export default function(kibana) {
 
     uiExports: {
       hacks: ['plugins/kibana/discover', 'plugins/kibana/dev_tools', 'plugins/kibana/visualize'],
-      savedObjectTypes: [
-        'plugins/kibana/visualize/saved_visualizations/saved_visualization_register',
-        'plugins/kibana/dashboard/saved_dashboard/saved_dashboard_register',
-      ],
+      savedObjectTypes: ['plugins/kibana/dashboard/saved_dashboard/saved_dashboard_register'],
       app: {
         id: 'kibana',
         title: 'Kibana',

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

@@ -65,6 +65,6 @@ export { ensureDefaultIndexPattern } from 'ui/legacy_compat';
 export { unhashUrl } from '../../../../../plugins/kibana_utils/public';
 export { IInjector } from 'ui/chrome';
 export { SavedObjectLoader } from 'ui/saved_objects';
-export { VISUALIZE_EMBEDDABLE_TYPE } from '../visualize_embeddable';
+export { VISUALIZE_EMBEDDABLE_TYPE } from '../../../visualizations/public/embeddable';
 export { registerTimefilterWithGlobalStateFactory } from 'ui/timefilter/setup_router';
 export { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url';

src/legacy/core_plugins/kibana/public/index.scss

@@ -18,7 +18,6 @@
 
 // Visualize styles
 @import './visualize/index';
-@import './visualize_embeddable/index';
 // Has to come after visualize because of some
 // bad cascading in the Editor layout
 @import 'src/legacy/ui/public/vis/index';

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

@@ -72,6 +72,5 @@ export { VisType } from 'ui/vis';
 export { wrapInI18nContext } from 'ui/i18n';
 
 export { DashboardConstants } from '../dashboard/np_ready/dashboard_constants';
-export { VisSavedObject } from '../visualize_embeddable/visualize_embeddable';
-export { VISUALIZE_EMBEDDABLE_TYPE } from '../visualize_embeddable';
-export { VisualizeEmbeddableFactory } from '../visualize_embeddable/visualize_embeddable_factory';
+export { VisSavedObject } from '../../../visualizations/public/embeddable/visualize_embeddable';
+export { VISUALIZE_EMBEDDABLE_TYPE } from '../../../visualizations/public/embeddable';

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

@@ -27,6 +27,9 @@ import {
   SavedObjectsClientContract,
 } from 'kibana/public';
 
+// @ts-ignore
+import { uiModules } from 'ui/modules';
+
 import { Storage } from '../../../../../plugins/kibana_utils/public';
 import { DataPublicPluginStart } from '../../../../../plugins/data/public';
 import { IEmbeddableStart } from '../../../../../plugins/embeddable/public';
@@ -40,14 +43,11 @@ import {
   FeatureCatalogueCategory,
   HomePublicPluginSetup,
 } from '../../../../../plugins/home/public';
-import {
-  defaultEditor,
-  VisEditorTypesRegistryProvider,
-  VisualizeEmbeddableFactory,
-  VISUALIZE_EMBEDDABLE_TYPE,
-} from './legacy_imports';
+import { defaultEditor, VisEditorTypesRegistryProvider } from './legacy_imports';
 import { UsageCollectionSetup } from '../../../../../plugins/usage_collection/public';
 import { createSavedVisLoader } from './saved_visualizations/saved_visualizations';
+// @ts-ignore
+import { savedObjectManagementRegistry } from '../management/saved_object_registry';
 
 export interface LegacyAngularInjectedDependencies {
   legacyChrome: any;
@@ -113,6 +113,7 @@ export class VisualizePlugin implements Plugin {
           indexPatterns: data.indexPatterns,
           chrome: contextCore.chrome,
           overlays: contextCore.overlays,
+          visualizations,
         });
         const deps: VisualizeKibanaServices = {
           ...angularDependencies,
@@ -159,19 +160,32 @@ export class VisualizePlugin implements Plugin {
   }
 
   public start(
-    { savedObjects: { client: savedObjectsClient } }: CoreStart,
+    core: CoreStart,
     { embeddables, navigation, data, share, visualizations }: VisualizePluginStartDependencies
   ) {
     this.startDependencies = {
       data,
       embeddables,
       navigation,
-      savedObjectsClient,
+      savedObjectsClient: core.savedObjects.client,
       share,
       visualizations,
     };
 
-    const embeddableFactory = new VisualizeEmbeddableFactory(visualizations.types);
-    embeddables.registerEmbeddableFactory(VISUALIZE_EMBEDDABLE_TYPE, embeddableFactory);
+    const savedVisualizations = createSavedVisLoader({
+      savedObjectsClient: core.savedObjects.client,
+      indexPatterns: data.indexPatterns,
+      chrome: core.chrome,
+      overlays: core.overlays,
+      visualizations,
+    });
+
+    // TODO: remove once savedobjectregistry is refactored
+    savedObjectManagementRegistry.register({
+      service: 'savedVisualizations',
+      title: 'visualizations',
+    });
+
+    uiModules.get('app/visualize').service('savedVisualizations', () => savedVisualizations);
   }
 }

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

@@ -34,7 +34,7 @@ import { IIndexPattern } from '../../../../../../plugins/data/public';
 import { VisSavedObject } from '../legacy_imports';
 
 import { createSavedSearchesService } from '../../discover';
-import { VisualizeConstants } from '..';
+import { VisualizeConstants } from '../np_ready/visualize_constants';
 
 async function _afterEsResp(savedVis: VisSavedObject, services: any) {
   await _getLinkedSavedSearch(savedVis, services);

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

@@ -18,7 +18,7 @@
  */
 
 import { extractReferences, injectReferences } from './saved_visualization_references';
-import { VisSavedObject } from '../../visualize_embeddable/visualize_embeddable';
+import { VisSavedObject } from '../../../../visualizations/public/embeddable/visualize_embeddable';
 
 describe('extractReferences', () => {
   test('extracts nothing if savedSearchId is empty', () => {

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

@@ -17,7 +17,7 @@
  * under the License.
  */
 import { SavedObjectAttributes, SavedObjectReference } from 'kibana/server';
-import { VisSavedObject } from '../../visualize_embeddable/visualize_embeddable';
+import { VisSavedObject } from '../../../../visualizations/public/embeddable/visualize_embeddable';
 
 export function extractReferences({
   attributes,

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

@@ -19,14 +19,18 @@
 import { SavedObjectLoader } from 'ui/saved_objects';
 import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
 
-import { start as visualizations } from '../../../../visualizations/public/np_ready/public/legacy';
 // @ts-ignore
 import { findListItems } from './find_list_items';
 import { createSavedVisClass } from './_saved_vis';
-import { createVisualizeEditUrl } from '..';
+import { createVisualizeEditUrl } from '../np_ready/visualize_constants';
+import { VisualizationsStart } from '../../../../visualizations/public/np_ready/public';
 
-export function createSavedVisLoader(services: SavedObjectKibanaServices) {
-  const { savedObjectsClient } = services;
+interface SavedObjectKibanaServicesWithVisualizations extends SavedObjectKibanaServices {
+  visualizations: VisualizationsStart;
+}
+
+export function createSavedVisLoader(services: SavedObjectKibanaServicesWithVisualizations) {
+  const { savedObjectsClient, visualizations } = services;
 
   class SavedObjectLoaderVisualize extends SavedObjectLoader {
     mapHitSource = (source: Record<string, any>, id: string) => {

src/legacy/core_plugins/visualizations/index.ts

@@ -26,7 +26,7 @@ export const visualizations: LegacyPluginInitializer = kibana =>
     publicDir: resolve(__dirname, 'public'),
     require: [],
     uiExports: {
-      interpreter: ['plugins/visualizations/expressions/boot'],
+      styleSheetPaths: resolve(__dirname, 'public/index.scss'),
     },
   });
 

src/legacy/core_plugins/kibana/public/visualize_embeddable/disabled_lab_visualization.tsx → src/legacy/core_plugins/visualizations/public/embeddable/disabled_lab_visualization.tsx

@@ -29,14 +29,14 @@ export function DisabledLabVisualization({ title }: { title: string }) {
       />
       <div className="kuiVerticalRhythm">
         <FormattedMessage
-          id="kbn.visualize.disabledLabVisualizationTitle"
+          id="visualizations.disabledLabVisualizationTitle"
           defaultMessage="{title} is a lab visualization."
           values={{ title: <em className="visDisabledLabVisualization__title">{title}</em> }}
         />
       </div>
       <div className="kuiVerticalRhythm">
         <FormattedMessage
-          id="kbn.visualize.disabledLabVisualizationMessage"
+          id="visualizations.disabledLabVisualizationMessage"
           defaultMessage="Please turn on lab-mode in the advanced settings to see lab visualizations."
         />
       </div>

src/legacy/core_plugins/kibana/public/visualize_embeddable/get_index_pattern.ts → src/legacy/core_plugins/visualizations/public/embeddable/get_index_pattern.ts

@@ -17,10 +17,9 @@
  * under the License.
  */
 
-import { npStart } from 'ui/new_platform';
-
 import { VisSavedObject } from './visualize_embeddable';
 import { indexPatterns, IIndexPattern } from '../../../../../plugins/data/public';
+import { getUISettings, getSavedObjects } from '../np_ready/public/services';
 
 export async function getIndexPattern(
   savedVis: VisSavedObject
@@ -29,8 +28,8 @@ export async function getIndexPattern(
     return savedVis.vis.indexPattern;
   }
 
-  const savedObjectsClient = npStart.core.savedObjects.client;
-  const defaultIndex = npStart.core.uiSettings.get('defaultIndex');
+  const savedObjectsClient = getSavedObjects().client;
+  const defaultIndex = getUISettings().get('defaultIndex');
 
   if (savedVis.vis.params.index_pattern) {
     const indexPatternObjects = await savedObjectsClient.find({

src/legacy/core_plugins/kibana/public/visualize_embeddable/visualize_embeddable.ts → src/legacy/core_plugins/visualizations/public/embeddable/visualize_embeddable.ts

@@ -47,7 +47,7 @@ import {
   APPLY_FILTER_TRIGGER,
 } from '../../../../../plugins/embeddable/public';
 import { dispatchRenderComplete } from '../../../../../plugins/kibana_utils/public';
-import { SavedSearch } from '../discover/np_ready/types';
+import { SavedSearch } from '../../../kibana/public/discover/np_ready/types';
 
 const getKeys = <T extends {}>(o: T): Array<keyof T> => Object.keys(o) as Array<keyof T>;