added redirect to dashboard

elastic · Jun 10, 2021 · c8c07ce · c8c07ce
1 parent 761e896
commit c8c07ce
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 30 deletions.
diff --git a/x-pack/plugins/lens/public/app_plugin/app.tsx b/x-pack/plugins/lens/public/app_plugin/app.tsx
@@ -53,7 +53,6 @@ export function App({
   initialInput,
   incomingState,
   redirectToOrigin,
-  redirectToDashboard,
   setHeaderActionMenu,
   initialContext,
 }: LensAppProps) {
@@ -219,7 +218,6 @@ export function App({
         getIsByValueMode,
         savedObjectsTagging,
         initialInput,
-        redirectToDashboard,
         redirectToOrigin,
         persistedDoc: appState.persistedDoc,
         onAppLeave,
@@ -281,7 +279,6 @@ export function App({
         persistedDoc={appState.persistedDoc}
         initialInput={initialInput}
         redirectTo={redirectTo}
-        redirectToDashboard={redirectToDashboard}
         redirectToOrigin={redirectToOrigin}
         returnToOriginSwitchLabel={
           getIsByValueMode() && initialInput

diff --git a/x-pack/plugins/lens/public/app_plugin/mounter.tsx b/x-pack/plugins/lens/public/app_plugin/mounter.tsx
@@ -137,23 +137,6 @@ export async function mountApp(
     }
   };
 
-  const redirectToDashboard = (embeddableInput: LensEmbeddableInput, dashboardId: string) => {
-    if (!lensServices.dashboardFeatureFlag.allowByValueEmbeddables) {
-      throw new Error('redirectToDashboard called with by-value embeddables disabled');
-    }
-
-    const state = {
-      input: embeddableInput,
-      type: LENS_EMBEDDABLE_TYPE,
-    };
-
-    const path = dashboardId === 'new' ? '#/create' : `#/view/${dashboardId}`;
-    stateTransfer.navigateToWithEmbeddablePackage('dashboards', {
-      state,
-      path,
-    });
-  };
-
   const redirectToOrigin = (props?: RedirectToOriginProps) => {
     if (!embeddableEditorIncomingState?.originatingApp) {
       throw new Error('redirectToOrigin called without an originating app');
@@ -222,7 +205,6 @@ export async function mountApp(
             initialInput={initialInput}
             redirectTo={redirectCallback}
             redirectToOrigin={redirectToOrigin}
-            redirectToDashboard={redirectToDashboard}
             onAppLeave={params.onAppLeave}
             setHeaderActionMenu={params.setHeaderActionMenu}
             history={props.history}

diff --git a/x-pack/plugins/lens/public/app_plugin/save_modal_container.tsx b/x-pack/plugins/lens/public/app_plugin/save_modal_container.tsx
@@ -27,9 +27,7 @@ import { checkForDuplicateTitle } from '../../../../../src/plugins/saved_objects
 import { LensAppState } from '../state_management';
 
 type ExtraProps = Pick<LensAppProps, 'initialInput'> &
-  Partial<
-    Pick<LensAppProps, 'redirectToOrigin' | 'redirectTo' | 'redirectToDashboard' | 'onAppLeave'>
-  >;
+  Partial<Pick<LensAppProps, 'redirectToOrigin' | 'redirectTo' | 'onAppLeave'>>;
 
 export type SaveModalContainerProps = {
   isVisible: boolean;
@@ -55,7 +53,6 @@ export function SaveModalContainer({
   originatingApp,
   initialInput,
   redirectTo,
-  redirectToDashboard,
   redirectToOrigin,
   getAppNameFromId = () => undefined,
   isSaveable = true,
@@ -114,7 +111,6 @@ export function SaveModalContainer({
             initialInput,
             attributeService,
             redirectTo,
-            redirectToDashboard,
             redirectToOrigin,
             getIsByValueMode: () => false,
             onAppLeave: () => {},
@@ -150,6 +146,33 @@ export function SaveModalContainer({
   );
 }
 
+const redirectToDashboard = ({
+  embeddableInput,
+  dashboardFeatureFlag,
+  dashboardId,
+  stateTransfer,
+}: {
+  embeddableInput: LensEmbeddableInput;
+  dashboardId: string;
+  dashboardFeatureFlag: LensAppServices['dashboardFeatureFlag'];
+  stateTransfer: LensAppServices['stateTransfer'];
+}) => {
+  if (!dashboardFeatureFlag.allowByValueEmbeddables) {
+    throw new Error('redirectToDashboard called with by-value embeddables disabled');
+  }
+
+  const state = {
+    input: embeddableInput,
+    type: LENS_EMBEDDABLE_TYPE,
+  };
+
+  const path = dashboardId === 'new' ? '#/create' : `#/view/${dashboardId}`;
+  stateTransfer.navigateToWithEmbeddablePackage('dashboards', {
+    state,
+    path,
+  });
+};
+
 export const runSaveLensVisualization = async (
   props: {
     lastKnownDoc?: Document;
@@ -175,11 +198,11 @@ export const runSaveLensVisualization = async (
     stateTransfer,
     attributeService,
     savedObjectsTagging,
-    redirectToDashboard,
     getIsByValueMode,
     redirectToOrigin,
     onAppLeave,
     redirectTo,
+    dashboardFeatureFlag,
   } = props;
 
   const tagsIds =
@@ -254,12 +277,17 @@ export const runSaveLensVisualization = async (
       });
       redirectToOrigin({ input: newInput, isCopied: saveProps.newCopyOnSave });
       return;
-    } else if (saveProps.dashboardId && redirectToDashboard) {
+    } else if (saveProps.dashboardId) {
       // disabling the validation on app leave because the document has been saved.
       onAppLeave?.((actions) => {
         return actions.default();
       });
-      redirectToDashboard(newInput, saveProps.dashboardId);
+      redirectToDashboard({
+        embeddableInput: newInput,
+        dashboardId: saveProps.dashboardId,
+        stateTransfer,
+        dashboardFeatureFlag,
+      });
       return;
     }
 

diff --git a/x-pack/plugins/lens/public/app_plugin/types.ts b/x-pack/plugins/lens/public/app_plugin/types.ts
@@ -47,7 +47,6 @@ export interface LensAppProps {
   setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
   redirectTo: (savedObjectId?: string) => void;
   redirectToOrigin?: (props?: RedirectToOriginProps) => void;
-  redirectToDashboard?: (input: LensEmbeddableInput, dashboardId: string) => void;
 
   // The initial input passed in by the container when editing. Can be either by reference or by value.
   initialInput?: LensEmbeddableInput;