[Visualization] Get rid of saved object loader and use savedObjectClient resolve

src/plugins/visualizations/kibana.json

@@ -11,7 +11,7 @@
     "inspector",
     "savedObjects"
   ],
-  "optionalPlugins": ["usageCollection"],
+  "optionalPlugins": ["usageCollection", "spaces", "savedObjectsTaggingOss"],
   "requiredBundles": ["kibanaUtils", "discover"],
   "extraPublicDirs": ["common/constants", "common/prepare_log_table", "common/expression_functions"],
   "owner": {

src/plugins/visualizations/public/embeddable/create_vis_embeddable_from_object.ts

@@ -20,16 +20,10 @@ import {
   AttributeService,
 } from '../../../../plugins/embeddable/public';
 import { DisabledLabEmbeddable } from './disabled_lab_embeddable';
-import {
-  getSavedVisualizationsLoader,
-  getUISettings,
-  getHttp,
-  getTimeFilter,
-  getCapabilities,
-} from '../services';
+import { getUISettings, getHttp, getTimeFilter, getCapabilities } from '../services';
+import { urlFor } from '../utils/saved_visualize_utils';
 import { VisualizeEmbeddableFactoryDeps } from './visualize_embeddable_factory';
 import { VISUALIZE_ENABLE_LABS_SETTING } from '../../common/constants';
-import { SavedVisualizationsLoader } from '../saved_visualizations';
 import { IndexPattern } from '../../../data/public';
 import { createVisualizeEmbeddableAsync } from './visualize_embeddable_async';
 
@@ -38,24 +32,19 @@ export const createVisEmbeddableFromObject =
   async (
     vis: Vis,
     input: Partial<VisualizeInput> & { id: string },
-    savedVisualizationsLoader?: SavedVisualizationsLoader,
     attributeService?: AttributeService<
       VisualizeSavedObjectAttributes,
       VisualizeByValueInput,
       VisualizeByReferenceInput
     >,
     parent?: IContainer
   ): Promise<VisualizeEmbeddable | ErrorEmbeddable | DisabledLabEmbeddable> => {
-    const savedVisualizations = getSavedVisualizationsLoader();
-
     try {
       const visId = vis.id as string;
 
-      const editPath = visId ? savedVisualizations.urlFor(visId) : '#/edit_by_value';
+      const editPath = visId ? urlFor(visId) : '#/edit_by_value';
 
-      const editUrl = visId
-        ? getHttp().basePath.prepend(`/app/visualize${savedVisualizations.urlFor(visId)}`)
-        : '';
+      const editUrl = visId ? getHttp().basePath.prepend(`/app/visualize${urlFor(visId)}`) : '';
       const isLabsEnabled = getUISettings().get<boolean>(VISUALIZE_ENABLE_LABS_SETTING);
 
       if (!isLabsEnabled && vis.type.stage === 'experimental') {
@@ -87,7 +76,6 @@ export const createVisEmbeddableFromObject =
         },
         input,
         attributeService,
-        savedVisualizationsLoader,
         parent
       );
     } catch (e) {

src/plugins/visualizations/public/embeddable/visualize_embeddable.ts

@@ -39,7 +39,7 @@ import { getExpressions, getUiActions } from '../services';
 import { VIS_EVENT_TO_TRIGGER } from './events';
 import { VisualizeEmbeddableFactoryDeps } from './visualize_embeddable_factory';
 import { SavedObjectAttributes } from '../../../../core/types';
-import { SavedVisualizationsLoader } from '../saved_visualizations';
+import { getSavedVisualization } from '../utils/saved_visualize_utils';
 import { VisSavedObject } from '../types';
 import { toExpressionAst } from './to_ast';
 
@@ -108,7 +108,6 @@ export class VisualizeEmbeddable
     VisualizeByValueInput,
     VisualizeByReferenceInput
   >;
-  private savedVisualizationsLoader?: SavedVisualizationsLoader;
 
   constructor(
     timefilter: TimefilterContract,
@@ -119,7 +118,6 @@ export class VisualizeEmbeddable
       VisualizeByValueInput,
       VisualizeByReferenceInput
     >,
-    savedVisualizationsLoader?: SavedVisualizationsLoader,
     parent?: IContainer
   ) {
     super(
@@ -144,7 +142,6 @@ export class VisualizeEmbeddable
     this.vis.uiState.on('change', this.uiStateChangeHandler);
     this.vis.uiState.on('reload', this.reload);
     this.attributeService = attributeService;
-    this.savedVisualizationsLoader = savedVisualizationsLoader;
 
     if (this.attributeService) {
       const isByValue = !this.inputIsRefType(initialInput);
@@ -455,7 +452,18 @@ export class VisualizeEmbeddable
   };
 
   getInputAsRefType = async (): Promise<VisualizeByReferenceInput> => {
-    const savedVis = await this.savedVisualizationsLoader?.get({});
+    const { savedObjectsClient, data, spaces, savedObjectsTaggingOss } = await this.deps.start()
+      .plugins;
+    const savedVis = await getSavedVisualization(
+      {
+        savedObjectsClient,
+        search: data.search,
+        dataViews: data.dataViews,
+        spaces,
+        savedObjectsTagging: savedObjectsTaggingOss.getTaggingApi(),
+      },
+      {}
+    );
     if (!savedVis) {
       throw new Error('Error creating a saved vis object');
     }

src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx

@@ -33,20 +33,19 @@ import type {
 import { VISUALIZE_EMBEDDABLE_TYPE } from './constants';
 import type { SerializedVis, Vis } from '../vis';
 import { createVisAsync } from '../vis_async';
-import {
-  getCapabilities,
-  getTypes,
-  getUISettings,
-  getSavedVisualizationsLoader,
-} from '../services';
+import { getCapabilities, getTypes, getUISettings } from '../services';
 import { showNewVisModal } from '../wizard';
-import { convertToSerializedVis } from '../saved_visualizations/_saved_vis';
+import {
+  convertToSerializedVis,
+  getSavedVisualization,
+  saveVisualization,
+} from '../utils/saved_visualize_utils';
 import {
   extractControlsReferences,
   extractTimeSeriesReferences,
   injectTimeSeriesReferences,
   injectControlsReferences,
-} from '../saved_visualizations/saved_visualization_references';
+} from '../utils/saved_visualization_references';
 import { createVisEmbeddableFromObject } from './create_vis_embeddable_from_object';
 import { VISUALIZE_ENABLE_LABS_SETTING } from '../../common/constants';
 import { checkForDuplicateTitle } from '../../../saved_objects/public';
@@ -59,7 +58,15 @@ interface VisualizationAttributes extends SavedObjectAttributes {
 
 export interface VisualizeEmbeddableFactoryDeps {
   start: StartServicesGetter<
-    Pick<VisualizationsStartDeps, 'inspector' | 'embeddable' | 'savedObjectsClient'>
+    Pick<
+      VisualizationsStartDeps,
+      | 'inspector'
+      | 'embeddable'
+      | 'savedObjectsClient'
+      | 'data'
+      | 'savedObjectsTaggingOss'
+      | 'spaces'
+    >
   >;
 }
 
@@ -147,17 +154,36 @@ export class VisualizeEmbeddableFactory
     input: Partial<VisualizeInput> & { id: string },
     parent?: IContainer
   ): Promise<VisualizeEmbeddable | ErrorEmbeddable | DisabledLabEmbeddable> {
-    const savedVisualizations = getSavedVisualizationsLoader();
+    const startDeps = await this.deps.start();
 
     try {
-      const savedObject = await savedVisualizations.get(savedObjectId);
+      const savedObject = await getSavedVisualization(
+        {
+          savedObjectsClient: startDeps.core.savedObjects.client,
+          search: startDeps.plugins.data.search,
+          dataViews: startDeps.plugins.data.dataViews,
+          spaces: startDeps.plugins.spaces,
+          savedObjectsTagging: startDeps.plugins.savedObjectsTaggingOss.getTaggingApi(),
+        },
+        savedObjectId
+      );
+
+      if (savedObject.sharingSavedObjectProps?.outcome === 'conflict') {
+        return new ErrorEmbeddable(
+          i18n.translate('visualizations.embeddable.legacyURLConflict.errorMessage', {
+            defaultMessage: `This object has the same URL as a legacy alias. Disable the alias to resolve this error : {json}`,
+            values: { json: savedObject.sharingSavedObjectProps?.errorJSON },
+          }),
+          input,
+          parent
+        );
+      }
       const visState = convertToSerializedVis(savedObject);
       const vis = await createVisAsync(savedObject.visState.type, visState);
 
       return createVisEmbeddableFromObject(this.deps)(
         vis,
         input,
-        savedVisualizations,
         await this.getAttributeService(),
         parent
       );
@@ -173,11 +199,9 @@ export class VisualizeEmbeddableFactory
     if (input.savedVis) {
       const visState = input.savedVis;
       const vis = await createVisAsync(visState.type, visState);
-      const savedVisualizations = getSavedVisualizationsLoader();
       return createVisEmbeddableFromObject(this.deps)(
         vis,
         input,
-        savedVisualizations,
         await this.getAttributeService(),
         parent
       );
@@ -217,7 +241,13 @@ export class VisualizeEmbeddableFactory
       if (visObj) {
         savedVis.uiStateJSON = visObj?.uiState.toString();
       }
-      const id = await savedVis.save(saveOptions);
+      const { core, plugins } = await this.deps.start();
+      const id = await saveVisualization(savedVis, saveOptions, {
+        savedObjectsClient: core.savedObjects.client,
+        chrome: core.chrome,
+        overlays: core.overlays,
+        savedObjectsTagging: plugins.savedObjectsTaggingOss.getTaggingApi(),
+      });
       if (!id || id === '') {
         throw new Error(
           i18n.translate('visualizations.savingVisualizationFailed.errorMsg', {

src/plugins/visualizations/public/index.ts

@@ -49,3 +49,12 @@ export {
   FakeParams,
   HistogramParams,
 } from '../common/expression_functions/xy_dimension';
+export {
+  convertToSerializedVis,
+  convertFromSerializedVis,
+  getSavedVisualization,
+  saveVisualization,
+  findListItems,
+  urlFor,
+  getFullPath,
+} from './utils/saved_visualize_utils';

src/plugins/visualizations/public/mocks.ts

@@ -10,6 +10,7 @@ import { PluginInitializerContext } from '../../../core/public';
 import { Schema, VisualizationsSetup, VisualizationsStart } from './';
 import { Schemas } from './vis_types';
 import { VisualizationsPlugin } from './plugin';
+import { spacesPluginMock } from '../../../../x-pack/plugins/spaces/public/mocks';
 import { coreMock, applicationServiceMock } from '../../../core/public/mocks';
 import { embeddablePluginMock } from '../../../plugins/embeddable/public/mocks';
 import { expressionsPluginMock } from '../../../plugins/expressions/public/mocks';
@@ -18,6 +19,7 @@ import { usageCollectionPluginMock } from '../../../plugins/usage_collection/pub
 import { uiActionsPluginMock } from '../../../plugins/ui_actions/public/mocks';
 import { inspectorPluginMock } from '../../../plugins/inspector/public/mocks';
 import { savedObjectsPluginMock } from '../../../plugins/saved_objects/public/mocks';
+import { savedObjectTaggingOssPluginMock } from '../../saved_objects_tagging_oss/public/mocks';
 
 const createSetupContract = (): VisualizationsSetup => ({
   createBaseVisualization: jest.fn(),
@@ -61,9 +63,11 @@ const createInstance = async () => {
       uiActions: uiActionsPluginMock.createStartContract(),
       application: applicationServiceMock.createStartContract(),
       embeddable: embeddablePluginMock.createStartContract(),
+      spaces: spacesPluginMock.createStartContract(),
       getAttributeService: jest.fn(),
       savedObjectsClient: coreMock.createStart().savedObjects.client,
       savedObjects: savedObjectsPluginMock.createStartContract(),
+      savedObjectsTaggingOss: savedObjectTaggingOssPluginMock.createStart(),
     });
 
   return {

src/plugins/visualizations/public/plugin.ts

@@ -24,12 +24,14 @@ import {
   setSavedSearchLoader,
   setEmbeddable,
   setDocLinks,
+  setSpaces,
 } from './services';
 import {
   VISUALIZE_EMBEDDABLE_TYPE,
   VisualizeEmbeddableFactory,
   createVisEmbeddableFromObject,
 } from './embeddable';
+import type { SpacesPluginStart } from '../../../../x-pack/plugins/spaces/public';
 import { TypesService } from './vis_types/types_service';
 import { range as rangeExpressionFunction } from '../common/expression_functions/range';
 import { visDimension as visDimensionExpressionFunction } from '../common/expression_functions/vis_dimension';
@@ -40,10 +42,7 @@ import { createSavedVisLoader, SavedVisualizationsLoader } from './saved_visuali
 import type { SerializedVis, Vis } from './vis';
 import { showNewVisModal } from './wizard';
 
-import {
-  convertFromSerializedVis,
-  convertToSerializedVis,
-} from './saved_visualizations/_saved_vis';
+import { convertFromSerializedVis, convertToSerializedVis } from './utils/saved_visualize_utils';
 
 import { createSavedSearchesLoader } from '../../discover/public';
 
@@ -66,6 +65,7 @@ import type {
 import type { DataPublicPluginSetup, DataPublicPluginStart } from '../../../plugins/data/public';
 import type { ExpressionsSetup, ExpressionsStart } from '../../expressions/public';
 import type { EmbeddableSetup, EmbeddableStart } from '../../embeddable/public';
+import type { SavedObjectTaggingOssPluginStart } from '../../saved_objects_tagging_oss/public';
 import { createVisAsync } from './vis_async';
 
 /**
@@ -103,6 +103,8 @@ export interface VisualizationsStartDeps {
   getAttributeService: EmbeddableStart['getAttributeService'];
   savedObjects: SavedObjectsStart;
   savedObjectsClient: SavedObjectsClientContract;
+  spaces: SpacesPluginStart;
+  savedObjectsTaggingOss: SavedObjectTaggingOssPluginStart;
 }
 
 /**
@@ -149,7 +151,7 @@ export class VisualizationsPlugin
 
   public start(
     core: CoreStart,
-    { data, expressions, uiActions, embeddable, savedObjects }: VisualizationsStartDeps
+    { data, expressions, uiActions, embeddable, savedObjects, spaces }: VisualizationsStartDeps
   ): VisualizationsStart {
     const types = this.types.start();
     setTypes(types);
@@ -166,6 +168,7 @@ export class VisualizationsPlugin
     setAggs(data.search.aggs);
     setOverlays(core.overlays);
     setChrome(core.chrome);
+    setSpaces(spaces);
     const savedVisualizationsLoader = createSavedVisLoader({
       savedObjectsClient: core.savedObjects.client,
       indexPatterns: data.indexPatterns,

src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts

@@ -16,55 +16,19 @@
 import type { SavedObjectsStart, SavedObject } from '../../../../plugins/saved_objects/public';
 // @ts-ignore
 import { updateOldState } from '../legacy/vis_update_state';
-import { extractReferences, injectReferences } from './saved_visualization_references';
+import { extractReferences, injectReferences } from '../utils/saved_visualization_references';
 import { createSavedSearchesLoader } from '../../../discover/public';
 import type { SavedObjectsClientContract } from '../../../../core/public';
 import type { IndexPatternsContract } from '../../../../plugins/data/public';
-import type { ISavedVis, SerializedVis } from '../types';
+import type { ISavedVis } from '../types';
 
 export interface SavedVisServices {
   savedObjectsClient: SavedObjectsClientContract;
   savedObjects: SavedObjectsStart;
   indexPatterns: IndexPatternsContract;
 }
 
-export const convertToSerializedVis = (savedVis: ISavedVis): SerializedVis => {
-  const { id, title, description, visState, uiStateJSON, searchSourceFields } = savedVis;
-
-  const aggs = searchSourceFields && searchSourceFields.index ? visState.aggs || [] : visState.aggs;
-
-  return {
-    id,
-    title,
-    type: visState.type,
-    description,
-    params: visState.params,
-    uiState: JSON.parse(uiStateJSON || '{}'),
-    data: {
-      aggs,
-      searchSource: searchSourceFields!,
-      savedSearchId: savedVis.savedSearchId,
-    },
-  };
-};
-
-export const convertFromSerializedVis = (vis: SerializedVis): ISavedVis => {
-  return {
-    id: vis.id,
-    title: vis.title,
-    description: vis.description,
-    visState: {
-      title: vis.title,
-      type: vis.type,
-      aggs: vis.data.aggs,
-      params: vis.params,
-    },
-    uiStateJSON: JSON.stringify(vis.uiState),
-    searchSourceFields: vis.data.searchSource,
-    savedSearchId: vis.data.savedSearchId,
-  };
-};
-
+/** @deprecated **/
 export function createSavedVisClass(services: SavedVisServices) {
   const savedSearch = createSavedSearchesLoader(services);
 

src/plugins/visualizations/public/saved_visualizations/saved_visualizations.ts

@@ -22,6 +22,7 @@ export interface FindListItemsOptions {
   references?: SavedObjectsFindOptionsReference[];
 }
 
+/** @deprecated **/
 export function createSavedVisLoader(services: SavedVisServicesWithVisualizations) {
   const { savedObjectsClient, visualizationTypes } = services;