Incorporating new state transfer logic

elastic · Jun 25, 2020 · 5aeb2b2 · 5aeb2b2
1 parent 7a6a891
commit 5aeb2b2
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 28 deletions.
diff --git a/src/plugins/dashboard/public/application/dashboard_app_controller.tsx b/src/plugins/dashboard/public/application/dashboard_app_controller.tsx
@@ -150,7 +150,6 @@ export class DashboardAppController {
     kbnUrlStateStorage,
     usageCollection,
     navigation,
-    dashboard,
   }: DashboardAppControllerDependencies) {
     const filterManager = queryService.filterManager;
     const queryFilter = filterManager;
@@ -431,9 +430,16 @@ export class DashboardAppController {
               .getStateTransfer(scopedHistory())
               .getIncomingEmbeddablePackage();
             if (incomingState) {
-              container.addNewEmbeddable<SavedObjectEmbeddableInput>(incomingState.type, {
-                savedObjectId: incomingState.id,
-              });
+              if ('id' in incomingState) {
+                container.addNewEmbeddable<SavedObjectEmbeddableInput>(incomingState.type, {
+                  savedObjectId: incomingState.id,
+                });
+              } else if ('input' in incomingState) {
+                container.addNewEmbeddable<SavedObjectEmbeddableInput>(
+                  incomingState.type,
+                  incomingState.input
+                );
+              }
             }
           }
 
@@ -1112,7 +1118,6 @@ export class DashboardAppController {
         outputSubscription.unsubscribe();
       }
       if (dashboardContainer) {
-        dashboard.setLastLoadedDashboardAppDashboardInput(dashboardContainer.getInput());
         dashboardContainer.destroy();
       }
     });

diff --git a/src/plugins/embeddable/public/lib/state_transfer/types.ts b/src/plugins/embeddable/public/lib/state_transfer/types.ts
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import { EmbeddableInput } from '../embeddables';
+
 /**
  * Represents a state package that contains the last active app id.
  * @public
@@ -31,19 +33,26 @@ export function isEmbeddableOriginatingAppState(
   return ensureFieldOfTypeExists('originatingApp', state, 'string');
 }
 
+export interface EmbeddableByReference {
+  type: string;
+  id: string;
+}
+
+export interface EmbeddableByValue {
+  type: string;
+  input: EmbeddableInput;
+}
+
 /**
  * Represents a state package that contains all fields necessary to create an embeddable in a container.
  * @public
  */
-export interface EmbeddablePackageState {
-  type: string;
-  id: string;
-}
+export type EmbeddablePackageState = EmbeddableByValue | EmbeddableByReference;
 
 export function isEmbeddablePackageState(state: unknown): state is EmbeddablePackageState {
   return (
     ensureFieldOfTypeExists('type', state, 'string') &&
-    ensureFieldOfTypeExists('id', state, 'string')
+    (ensureFieldOfTypeExists('id', state, 'string') || ensureFieldOfTypeExists('input', state))
   );
 }
 

diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx b/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx
@@ -127,7 +127,6 @@ export class VisualizeEmbeddableFactory
   public async create(input: VisualizeInput & { savedVis?: SerializedVis }, parent?: IContainer) {
     // 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.
-    const originatingAppParam = await this.getCurrentAppId();
     if (input.savedVis) {
       const visState = input.savedVis;
       const vis = new Vis(visState.type, visState);

diff --git a/src/plugins/visualize/public/application/editor/editor.js b/src/plugins/visualize/public/application/editor/editor.js
@@ -76,7 +76,6 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
     I18nContext,
     setActiveUrl,
     visualizations,
-    dashboard,
     embeddable,
     featureFlagConfig,
     scopedHistory,
@@ -254,20 +253,13 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
               };
 
               const createVisReference = () => {
-                const currentDashboardInput = dashboard.getLastLoadedDashboardAppDashboardInput();
+                const input = {
+                  savedVis: { ...vis.serialize() },
+                };
                 embeddable
-                  .getEmbeddableFactory('dashboard')
-                  .create(currentDashboardInput)
-                  .then((currentDashboard) => {
-                    if (currentDashboard) {
-                      const input = {
-                        savedVis: { ...vis.serialize() },
-                      };
-                      currentDashboard.addNewEmbeddable('visualization', input).then(() => {
-                        const dashInput = currentDashboard.getInput();
-                        dashboard.navigateToDashboard(dashInput);
-                      });
-                    }
+                  .getStateTransfer()
+                  .navigateToWithEmbeddablePackage($scope.getOriginatingApp(), {
+                    state: { input, type: VISUALIZE_EMBEDDABLE_TYPE },
                   });
               };
 

diff --git a/src/plugins/visualize/public/kibana_services.ts b/src/plugins/visualize/public/kibana_services.ts
@@ -53,7 +53,6 @@ export interface VisualizeKibanaServices {
   kibanaLegacy: KibanaLegacyStart;
   visualizeCapabilities: any;
   visualizations: VisualizationsStart;
-  embeddable: EmbeddableStart;
   I18nContext: I18nStart['Context'];
   setActiveUrl: (newUrl: string) => void;
   restorePreviousUrl: () => void;

diff --git a/src/plugins/visualize/public/plugin.ts b/src/plugins/visualize/public/plugin.ts
@@ -52,7 +52,6 @@ export interface VisualizePluginStartDependencies {
   embeddable: EmbeddableStart;
   kibanaLegacy: KibanaLegacyStart;
   savedObjects: SavedObjectsStart;
-  embeddable: EmbeddableStart;
 }
 
 export interface VisualizePluginSetupDependencies {
@@ -146,7 +145,6 @@ export class VisualizePlugin
             pluginsStart.visualizations.__LEGACY.createVisEmbeddableFromObject,
           scopedHistory: () => this.currentHistory!,
           savedObjects: pluginsStart.savedObjects,
-          embeddable: pluginsStart.embeddable,
           featureFlagConfig: this.initializerContext.config.get<FeatureFlagConfig>(),
           restorePreviousUrl,
         };