cutOriginatingAppConnection

elastic · Aug 5, 2020 · f34ae2f · f34ae2f
1 parent 2b2c9f9
commit f34ae2f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/x-pack/plugins/maps/public/kibana_services.d.ts b/x-pack/plugins/maps/public/kibana_services.d.ts
@@ -6,6 +6,7 @@
 import { DataPublicPluginStart } from 'src/plugins/data/public';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { IndexPatternsService } from 'src/plugins/data/public/index_patterns';
+import { NavigateToAppOptions } from 'kibana/public';
 import { MapsConfigType } from '../config';
 import { MapsLegacyConfigType } from '../../../../src/plugins/maps_legacy/public';
 import { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
@@ -81,6 +82,9 @@ export function setIsGoldPlus(isGoldPlus: boolean): void;
 export function setEmbeddableService(embeddableService: EmbeddableStart): void;
 export function getEmbeddableService(): EmbeddableStart;
 export function setNavigateToApp(
-  navigateToApp: (appId: string, options?: unknown | undefined) => Promise<void>
+  navigateToApp: (appId: string, options?: NavigateToAppOptions | undefined) => Promise<void>
 ): void;
-// export navigateToApp: (appId: string, options?: unknown | undefined) => Promise<void>;
+export const navigateToApp: (
+  appId: string,
+  options?: NavigateToAppOptions | undefined
+) => Promise<void>;
diff --git a/x-pack/plugins/maps/public/routing/routes/maps_app/maps_app_view.js b/x-pack/plugins/maps/public/routing/routes/maps_app/maps_app_view.js
@@ -51,6 +51,8 @@ export class MapsAppView extends React.Component {
       initialized: false,
       savedQuery: '',
       initialLayerListConfig: null,
+      // tracking originatingApp in state so the connection can be broken by users
+      originatingApp: props.originatingApp,
     };
   }
 
@@ -308,7 +310,10 @@ export class MapsAppView extends React.Component {
       inspectorAdapters: this.props.inspectorAdapters,
       setBreadcrumbs: this._setBreadcrumbs,
       stateTransfer: this.props.stateTransfer,
-      originatingApp: this.props.originatingApp,
+      originatingApp: this.state.originatingApp,
+      cutOriginatingAppConnection: () => {
+        this.setState({ originatingApp: undefined });
+      },
     });
 
     const { TopNavMenu } = getNavigation().ui;

diff --git a/x-pack/plugins/maps/public/routing/routes/maps_app/top_nav_config.tsx b/x-pack/plugins/maps/public/routing/routes/maps_app/top_nav_config.tsx
@@ -36,6 +36,7 @@ export function getTopNavConfig({
   setBreadcrumbs,
   stateTransfer,
   originatingApp,
+  cutOriginatingAppConnection,
 }: {
   savedMap: ISavedGisMap;
   isOpenSettingsDisabled: boolean;
@@ -46,6 +47,7 @@ export function getTopNavConfig({
   setBreadcrumbs: () => void;
   stateTransfer?: EmbeddableStateTransfer;
   originatingApp?: string;
+  cutOriginatingAppConnection: () => void;
 }) {
   const topNavConfigs = [];
   const isNewMap = !savedMap.id;
@@ -106,6 +108,10 @@ export function getTopNavConfig({
     setBreadcrumbs();
     goToSpecifiedPath(`/map/${id}${window.location.hash}`);
 
+    if (newCopyOnSave && !returnToOrigin) {
+      cutOriginatingAppConnection();
+    }
+
     if (!!originatingApp && returnToOrigin) {
       const newlyCreated = newCopyOnSave || isNewMap;
       if (newlyCreated && stateTransfer) {
@@ -130,11 +136,12 @@ export function getTopNavConfig({
       iconType: 'check',
       run: () => {
         onSave({
-          newTitle: savedMap.title,
+          newTitle: savedMap.title ? savedMap.title : '',
           newDescription: savedMap.description ? savedMap.description : '',
           newCopyOnSave: false,
           isTitleDuplicateConfirmed: false,
           returnToOrigin: true,
+          onTitleDuplicate: () => {},
         });
       },
       testId: 'mapSaveAndReturnButton',