recreating visAugmenterLoader instead of required plugin

Signed-off-by: Amit Galitzky <amgalitz@amazon.com>
opensearch-project · Mar 21, 2023 · 2be90dc · 2be90dc
1 parent 22b11eb
commit 2be90dc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/plugins/visualizations/opensearch_dashboards.json b/src/plugins/visualizations/opensearch_dashboards.json
@@ -3,7 +3,7 @@
   "version": "opensearchDashboards",
   "server": true,
   "ui": true,
-  "requiredPlugins": ["data", "expressions", "uiActions", "embeddable", "inspector", "dashboard", "visAugmenter"],
+  "requiredPlugins": ["data", "expressions", "uiActions", "embeddable", "inspector", "dashboard"],
   "optionalPlugins": ["usageCollection"],
   "requiredBundles": ["opensearchDashboardsUtils", "discover", "savedObjects", "visAugmenter"]
 }
diff --git a/src/plugins/visualizations/public/plugin.ts b/src/plugins/visualizations/public/plugin.ts
@@ -30,7 +30,6 @@
 
 import './index.scss';
 
-import { VisAugmenterStart } from 'src/plugins/vis_augmenter/public';
 import {
   PluginInitializerContext,
   CoreSetup,
@@ -94,6 +93,7 @@ import {
 } from './saved_visualizations/_saved_vis';
 import { createSavedSearchesLoader } from '../../discover/public';
 import { DashboardStart } from '../../dashboard/public';
+import { createSavedAugmentVisLoader } from '../../vis_augmenter/public';
 
 /**
  * Interface for this plugin's returned setup/start contracts.
@@ -130,7 +130,6 @@ export interface VisualizationsStartDeps {
   dashboard: DashboardStart;
   getAttributeService: DashboardStart['getAttributeService'];
   savedObjectsClient: SavedObjectsClientContract;
-  visAugmenter: VisAugmenterStart;
 }
 
 /**
@@ -177,7 +176,7 @@ export class VisualizationsPlugin
 
   public start(
     core: CoreStart,
-    { data, expressions, uiActions, embeddable, dashboard, visAugmenter }: VisualizationsStartDeps
+    { data, expressions, uiActions, embeddable, dashboard }: VisualizationsStartDeps
   ): VisualizationsStart {
     const types = this.types.start();
     setI18n(core.i18n);
@@ -196,7 +195,14 @@ export class VisualizationsPlugin
     setAggs(data.search.aggs);
     setOverlays(core.overlays);
     setChrome(core.chrome);
-    setSavedAugmentVisLoader(visAugmenter.savedAugmentVisLoader);
+    const savedAugmentVisLoader = createSavedAugmentVisLoader({
+      savedObjectsClient: core.savedObjects.client,
+      indexPatterns: data.indexPatterns,
+      search: data.search,
+      chrome: core.chrome,
+      overlays: core.overlays,
+    });
+    setSavedAugmentVisLoader(savedAugmentVisLoader);
     const savedVisualizationsLoader = createSavedVisLoader({
       savedObjectsClient: core.savedObjects.client,
       indexPatterns: data.indexPatterns,