Use getStartServices for start plugin deps

elastic · Apr 2, 2020 · d1c9446 · d1c9446
1 parent 3bd0afd
commit d1c9446
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 31 deletions.
diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
@@ -78,7 +78,6 @@ import {
 } from './url_generator';
 import { createSavedDashboardLoader } from './saved_dashboards';
 import { DashboardConstants } from './dashboard_constants';
-import { getSavedDashboardLoader, setSavedDashboardLoader } from './services';
 
 declare module '../../share/public' {
   export interface UrlGeneratorStateMapping {
@@ -127,7 +126,7 @@ export class DashboardEmbeddableContainerPublicPlugin
   private stopUrlTracking: (() => void) | undefined = undefined;
 
   public setup(
-    core: CoreSetup<StartDependencies>,
+    core: CoreSetup<StartDependencies, DashboardStart>,
     { share, uiActions, embeddable, home, kibanaLegacy, data, usageCollection }: SetupDependencies
   ): Setup {
     const expandPanelAction = new ExpandPanelAction();
@@ -211,15 +210,15 @@ export class DashboardEmbeddableContainerPublicPlugin
       id: '',
       title: 'Dashboards',
       mount: async (params: AppMountParameters) => {
-        const [coreStart, startDependencies] = await core.getStartServices();
+        const [coreStart, pluginsStart, dashboardStart] = await core.getStartServices();
         appMounted();
         const {
           embeddable: embeddableStart,
           navigation,
           share: shareStart,
           data: dataStart,
           kibanaLegacy: { dashboardConfig },
-        } = startDependencies;
+        } = pluginsStart;
 
         const deps: RenderDeps = {
           pluginInitializerContext: this.initializerContext,
@@ -229,7 +228,7 @@ export class DashboardEmbeddableContainerPublicPlugin
           share: shareStart,
           data: dataStart,
           savedObjectsClient: coreStart.savedObjects.client,
-          savedDashboards: getSavedDashboardLoader(),
+          savedDashboards: dashboardStart.getSavedDashboardLoader(),
           chrome: coreStart.chrome,
           addBasePath: coreStart.http.basePath.prepend,
           uiSettings: coreStart.uiSettings,
@@ -304,7 +303,6 @@ export class DashboardEmbeddableContainerPublicPlugin
       chrome: core.chrome,
       overlays: core.overlays,
     });
-    setSavedDashboardLoader(savedDashboardLoader);
     return {
       getSavedDashboardLoader: () => savedDashboardLoader,
     };

diff --git a/src/plugins/dashboard/public/services.ts b/src/plugins/dashboard/public/services.ts