[maps] implement save and return from dashboard (#74303) (#74852)

* pass originatingApp into App * save and return top nav option * clean up * navigate to originating app * functional test * tslint * cutOriginatingAppConnection * add functional test for cutting originating app flow * one more fix for cutting originator app and another functional test to verify * typo * review feedback Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Elastic Machine <[email protected]>
elastic · Aug 12, 2020 · e476ba1 · e476ba1
1 parent 05735a2
commit e476ba1
Show file tree

Hide file tree

Showing 15 changed files with 349 additions and 161 deletions.
diff --git a/test/functional/services/dashboard/panel_actions.ts b/test/functional/services/dashboard/panel_actions.ts
@@ -70,6 +70,17 @@ export function DashboardPanelActionsProvider({ getService, getPageObjects }: Ft
       await PageObjects.common.waitForTopNavToBeVisible();
     }
 
+    async editPanelByTitle(title?: string) {
+      log.debug(`editPanelByTitle(${title})`);
+      if (title) {
+        const panelOptions = await this.getPanelHeading(title);
+        await this.openContextMenu(panelOptions);
+      } else {
+        await this.openContextMenu();
+      }
+      await testSubjects.clickWhenNotDisabled(EDIT_PANEL_DATA_TEST_SUBJ);
+    }
+
     async clickExpandPanelToggle() {
       await testSubjects.click(TOGGLE_EXPAND_PANEL_DATA_TEST_SUBJ);
     }

diff --git a/x-pack/plugins/maps/public/kibana_services.d.ts b/x-pack/plugins/maps/public/kibana_services.d.ts
@@ -6,8 +6,10 @@
 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';
 
 export function getLicenseId(): any;
 export function getInspector(): any;
@@ -77,3 +79,12 @@ export function setKibanaCommonConfig(config: MapsLegacyConfigType): void;
 export function setMapAppConfig(config: MapsConfigType): void;
 export function setKibanaVersion(version: string): void;
 export function setIsGoldPlus(isGoldPlus: boolean): void;
+export function setEmbeddableService(embeddableService: EmbeddableStart): void;
+export function getEmbeddableService(): EmbeddableStart;
+export function setNavigateToApp(
+  navigateToApp: (appId: string, options?: NavigateToAppOptions | undefined) => Promise<void>
+): void;
+export const navigateToApp: (
+  appId: string,
+  options?: NavigateToAppOptions | undefined
+) => Promise<void>;
diff --git a/x-pack/plugins/maps/public/kibana_services.js b/x-pack/plugins/maps/public/kibana_services.js
@@ -177,3 +177,16 @@ export const setIsGoldPlus = (igp) => {
 export const getIsGoldPlus = () => {
   return isGoldPlus;
 };
+
+let embeddableService;
+export const setEmbeddableService = (_embeddableService) => {
+  embeddableService = _embeddableService;
+};
+export const getEmbeddableService = () => {
+  return embeddableService;
+};
+
+export let navigateToApp;
+export function setNavigateToApp(_navigateToApp) {
+  navigateToApp = _navigateToApp;
+}
diff --git a/x-pack/plugins/maps/public/plugin.ts b/x-pack/plugins/maps/public/plugin.ts
@@ -41,6 +41,8 @@ import {
   setUiActions,
   setUiSettings,
   setVisualizations,
+  setEmbeddableService,
+  setNavigateToApp,
 } from './kibana_services';
 import { featureCatalogueEntry } from './feature_catalogue_entry';
 // @ts-ignore
@@ -113,6 +115,8 @@ export const bindStartCoreAndPlugins = (core: CoreStart, plugins: any) => {
   setUiActions(plugins.uiActions);
   setNavigation(plugins.navigation);
   setCoreI18n(core.i18n);
+  setEmbeddableService(plugins.embeddable);
+  setNavigateToApp(core.application.navigateToApp);
 };
 
 /**

diff --git a/x-pack/plugins/maps/public/routing/bootstrap/services/saved_gis_map.ts b/x-pack/plugins/maps/public/routing/bootstrap/services/saved_gis_map.ts
@@ -36,6 +36,7 @@ export interface ISavedGisMap extends SavedObject {
   layerListJSON?: string;
   mapStateJSON?: string;
   uiStateJSON?: string;
+  description?: string;
   getLayerList(): LayerDescriptor[];
   syncWithStore(): void;
 }

diff --git a/x-pack/plugins/maps/public/routing/maps_router.js b/x-pack/plugins/maps/public/routing/maps_router.js
@@ -7,7 +7,7 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Router, Switch, Route, Redirect } from 'react-router-dom';
-import { getCoreI18n, getToasts } from '../kibana_services';
+import { getCoreI18n, getToasts, getEmbeddableService } from '../kibana_services';
 import {
   createKbnUrlStateStorage,
   withNotifyOnErrors,
@@ -39,6 +39,11 @@ const App = ({ history, appBasePath, onAppLeave }) => {
   const store = getStore();
   const I18nContext = getCoreI18n().Context;
 
+  const stateTransfer = getEmbeddableService()?.getStateTransfer(history);
+
+  const { originatingApp } =
+    stateTransfer?.getIncomingEditorState({ keysToRemoveAfterFetch: ['originatingApp'] }) || {};
+
   return (
     <I18nContext>
       <Provider store={store}>
@@ -50,13 +55,21 @@ const App = ({ history, appBasePath, onAppLeave }) => {
                 <LoadMapAndRender
                   savedMapId={props.match.params.savedMapId}
                   onAppLeave={onAppLeave}
+                  stateTransfer={stateTransfer}
+                  originatingApp={originatingApp}
                 />
               )}
             />
             <Route
               exact
               path={`/map`}
-              render={() => <LoadMapAndRender onAppLeave={onAppLeave} />}
+              render={() => (
+                <LoadMapAndRender
+                  onAppLeave={onAppLeave}
+                  stateTransfer={stateTransfer}
+                  originatingApp={originatingApp}
+                />
+              )}
             />
             // Redirect other routes to list, or if hash-containing, their non-hash equivalents
             <Route

diff --git a/x-pack/plugins/maps/public/routing/routes/maps_app/index.js b/x-pack/plugins/maps/public/routing/routes/maps_app/index.js
@@ -29,7 +29,6 @@ import {
   updateFlyout,
   enableFullScreen,
   openMapSettings,
-  removePreviewLayers,
 } from '../../../actions';
 import { FLYOUT_STATE } from '../../../reducers/ui';
 import { getMapsCapabilities } from '../../../kibana_services';
@@ -74,11 +73,6 @@ function mapDispatchToProps(dispatch) {
       dispatch(updateFlyout(FLYOUT_STATE.NONE));
       dispatch(setReadOnly(!getMapsCapabilities().save));
     },
-    closeFlyout: () => {
-      dispatch(setSelectedLayer(null));
-      dispatch(updateFlyout(FLYOUT_STATE.NONE));
-      dispatch(removePreviewLayers());
-    },
     enableFullScreen: () => dispatch(enableFullScreen()),
     openMapSettings: () => dispatch(openMapSettings()),
   };

diff --git a/x-pack/plugins/maps/public/routing/routes/maps_app/load_map_and_render.js b/x-pack/plugins/maps/public/routing/routes/maps_app/load_map_and_render.js
@@ -56,6 +56,13 @@ export const LoadMapAndRender = class extends React.Component {
       return <Redirect to="/" />;
     }
 
-    return savedMap ? <MapsAppView savedMap={savedMap} onAppLeave={this.props.onAppLeave} /> : null;
+    return savedMap ? (
+      <MapsAppView
+        savedMap={savedMap}
+        onAppLeave={this.props.onAppLeave}
+        stateTransfer={this.props.stateTransfer}
+        originatingApp={this.props.originatingApp}
+      />
+    ) : null;
   }
 };
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,
     };
   }
 
@@ -311,11 +313,15 @@ export class MapsAppView extends React.Component {
       savedMap: this.props.savedMap,
       isOpenSettingsDisabled: this.props.isOpenSettingsDisabled,
       isSaveDisabled: this.props.isSaveDisabled,
-      closeFlyout: this.props.closeFlyout,
       enableFullScreen: this.props.enableFullScreen,
       openMapSettings: this.props.openMapSettings,
       inspectorAdapters: this.props.inspectorAdapters,
       setBreadcrumbs: this._setBreadcrumbs,
+      stateTransfer: this.props.stateTransfer,
+      originatingApp: this.state.originatingApp,
+      cutOriginatingAppConnection: () => {
+        this.setState({ originatingApp: undefined });
+      },
     });
 
     const { TopNavMenu } = getNavigation().ui;