backport (#22949)

elastic · Sep 11, 2018 · eadf7e8 · eadf7e8
1 parent 2845048
commit eadf7e8
Show file tree

Hide file tree

Showing 53 changed files with 831 additions and 685 deletions.
diff --git a/src/core_plugins/kibana/public/dashboard/dashboard_app.js b/src/core_plugins/kibana/public/dashboard/dashboard_app.js
@@ -43,7 +43,7 @@ import { showCloneModal } from './top_nav/show_clone_modal';
 import { showSaveModal } from './top_nav/show_save_modal';
 import { showAddPanel } from './top_nav/show_add_panel';
 import { showOptionsPopover } from './top_nav/show_options_popover';
-import { showShareContextMenu } from 'ui/share';
+import { showShareContextMenu, ShareContextMenuExtensionsRegistryProvider } from 'ui/share';
 import { migrateLegacyQuery } from 'ui/utils/migrateLegacyQuery';
 import * as filterActions from 'ui/doc_table/actions/filter';
 import { FilterManagerProvider } from 'ui/filter_manager';
@@ -86,6 +86,7 @@ app.directive('dashboardApp', function ($injector) {
       const embeddableFactories = Private(EmbeddableFactoriesRegistryProvider);
       const panelActionsRegistry = Private(ContextMenuActionsRegistryProvider);
       const getUnhashableStates = Private(getUnhashableStatesProvider);
+      const shareContextMenuExtensions = Private(ShareContextMenuExtensionsRegistryProvider);
 
       panelActionsStore.initializeFromRegistry(panelActionsRegistry);
 
@@ -133,14 +134,6 @@ app.directive('dashboardApp', function ($injector) {
         dirty: !dash.id
       };
 
-      this.getSharingTitle = () => {
-        return dash.title;
-      };
-
-      this.getSharingType = () => {
-        return 'dashboard';
-      };
-
       dashboardStateManager.registerChangeListener(status => {
         this.appStatus.dirty = status.dirty || !dash.id;
         updateState();
@@ -409,6 +402,11 @@ app.directive('dashboardApp', function ($injector) {
           getUnhashableStates,
           objectId: dash.id,
           objectType: 'dashboard',
+          shareContextMenuExtensions,
+          sharingData: {
+            title: dash.title,
+          },
+          isDirty: dashboardStateManager.getIsDirty(),
         });
       };
 

diff --git a/src/core_plugins/kibana/public/dashboard/dashboard_state_manager.js b/src/core_plugins/kibana/public/dashboard/dashboard_state_manager.js
@@ -470,10 +470,10 @@ export class DashboardStateManager {
    * @returns {boolean} True if the dashboard has changed since the last save (or, is new).
    */
   getIsDirty(timeFilter) {
-    return this.isDirty ||
-      // Filter bar comparison is done manually (see cleanFiltersForComparison for the reason) and time picker
-      // changes are not tracked by the state monitor.
-      this.getFiltersChanged(timeFilter);
+    // Filter bar comparison is done manually (see cleanFiltersForComparison for the reason) and time picker
+    // changes are not tracked by the state monitor.
+    const hasTimeFilterChanged = timeFilter ? this.getFiltersChanged(timeFilter) : false;
+    return this.isDirty || hasTimeFilterChanged;
   }
 
   getPanels() {

diff --git a/src/core_plugins/kibana/public/discover/controllers/discover.js b/src/core_plugins/kibana/public/discover/controllers/discover.js
@@ -53,7 +53,7 @@ import { recentlyAccessed } from 'ui/persisted_log';
 import { getDocLink } from 'ui/documentation_links';
 import '../components/fetch_error';
 import { getPainlessError } from './get_painless_error';
-import { showShareContextMenu } from 'ui/share';
+import { showShareContextMenu, ShareContextMenuExtensionsRegistryProvider } from 'ui/share';
 import { getUnhashableStatesProvider } from 'ui/state_management/state_hashing';
 import { Inspector } from 'ui/inspector';
 import { RequestAdapter } from 'ui/inspector/adapters';
@@ -162,6 +162,7 @@ function discoverController(
     location: 'Discover'
   });
   const getUnhashableStates = Private(getUnhashableStatesProvider);
+  const shareContextMenuExtensions = Private(ShareContextMenuExtensionsRegistryProvider);
   const inspectorAdapters = {
     requests: new RequestAdapter()
   };
@@ -179,6 +180,10 @@ function discoverController(
   const savedSearch = $route.current.locals.savedSearch;
   $scope.$on('$destroy', savedSearch.destroy);
 
+  const $appStatus = $scope.appStatus = this.appStatus = {
+    dirty: !savedSearch.id
+  };
+
   $scope.topNavMenu = [{
     key: 'new',
     description: 'New Search',
@@ -198,13 +203,20 @@ function discoverController(
     key: 'share',
     description: 'Share Search',
     testId: 'shareTopNavButton',
-    run: (menuItem, navController, anchorElement) => {
+    run: async (menuItem, navController, anchorElement) => {
+      const sharingData = await this.getSharingData();
       showShareContextMenu({
         anchorElement,
         allowEmbed: false,
         getUnhashableStates,
         objectId: savedSearch.id,
         objectType: 'search',
+        shareContextMenuExtensions,
+        sharingData: {
+          ...sharingData,
+          title: savedSearch.title,
+        },
+        isDirty: $appStatus.dirty,
       });
     }
   }, {
@@ -239,9 +251,6 @@ function discoverController(
   docTitle.change(`Discover${pageTitleSuffix}`);
 
   let stateMonitor;
-  const $appStatus = $scope.appStatus = this.appStatus = {
-    dirty: !savedSearch.id
-  };
 
   const $state = $scope.state = new AppState(getStateDefaults());
 
@@ -306,14 +315,6 @@ function discoverController(
     };
   };
 
-  this.getSharingType = () => {
-    return 'search';
-  };
-
-  this.getSharingTitle = () => {
-    return savedSearch.title;
-  };
-
   $scope.uiState = $state.makeStateful('uiState');
 
   function getStateDefaults() {

diff --git a/src/core_plugins/kibana/public/kibana.js b/src/core_plugins/kibana/public/kibana.js
@@ -43,6 +43,7 @@ import 'uiExports/embeddableFactories';
 import 'uiExports/inspectorViews';
 import 'uiExports/search';
 import 'uiExports/autocompleteProviders';
+import 'uiExports/shareContextMenuExtensions';
 
 import 'ui/autoload/all';
 import './home';

diff --git a/src/core_plugins/kibana/public/visualize/editor/editor.js b/src/core_plugins/kibana/public/visualize/editor/editor.js
@@ -42,7 +42,7 @@ import { migrateLegacyQuery } from 'ui/utils/migrateLegacyQuery';
 import { recentlyAccessed } from 'ui/persisted_log';
 import { timefilter } from 'ui/timefilter';
 import { getVisualizeLoader } from '../../../../../ui/public/visualize/loader';
-import { showShareContextMenu } from 'ui/share';
+import { showShareContextMenu, ShareContextMenuExtensionsRegistryProvider } from 'ui/share';
 import { getUnhashableStatesProvider } from 'ui/state_management/state_hashing';
 
 uiRoutes
@@ -117,6 +117,7 @@ function VisEditor(
   const docTitle = Private(DocTitleProvider);
   const queryFilter = Private(FilterBarQueryFilterProvider);
   const getUnhashableStates = Private(getUnhashableStatesProvider);
+  const shareContextMenuExtensions = Private(ShareContextMenuExtensionsRegistryProvider);
 
   // Retrieve the resolved SavedVis instance.
   const savedVis = $route.current.locals.savedVis;
@@ -138,6 +139,10 @@ function VisEditor(
 
   $scope.vis = vis;
 
+  const $appStatus = this.appStatus = {
+    dirty: !savedVis.id
+  };
+
   $scope.topNavMenu = [{
     key: 'save',
     description: 'Save Visualization',
@@ -156,12 +161,19 @@ function VisEditor(
     description: 'Share Visualization',
     testId: 'shareTopNavButton',
     run: (menuItem, navController, anchorElement) => {
+      const hasUnappliedChanges = vis.dirty;
+      const hasUnsavedChanges = $appStatus.dirty;
       showShareContextMenu({
         anchorElement,
         allowEmbed: true,
         getUnhashableStates,
         objectId: savedVis.id,
         objectType: 'visualization',
+        shareContextMenuExtensions,
+        sharingData: {
+          title: savedVis.title,
+        },
+        isDirty: hasUnappliedChanges || hasUnsavedChanges,
       });
     }
   }, {
@@ -190,18 +202,6 @@ function VisEditor(
 
   let stateMonitor;
 
-  const $appStatus = this.appStatus = {
-    dirty: !savedVis.id
-  };
-
-  this.getSharingTitle = () => {
-    return savedVis.title;
-  };
-
-  this.getSharingType = () => {
-    return 'visualization';
-  };
-
   if (savedVis.id) {
     docTitle.change(savedVis.title);
   }

diff --git a/src/ui/public/chrome/index.d.ts b/src/ui/public/chrome/index.d.ts
@@ -27,6 +27,7 @@ declare class Chrome {
   public getBasePath(): string;
   public getXsrfToken(): string;
   public getKibanaVersion(): string;
+  public getUiSettingsClient(): any;
 }
 
 declare const chrome: Chrome;

diff --git a/src/ui/public/share/components/__snapshots__/share_context_menu.test.js.snap b/src/ui/public/share/components/__snapshots__/share_context_menu.test.js.snap
@@ -2,11 +2,12 @@
 
 exports[`should only render permalink panel when there are no other panels 1`] = `
 <EuiContextMenu
+  data-test-subj="shareContextMenu"
   initialPanelId={1}
   panels={
     Array [
       Object {
-        "content": <ShareUrlContent
+        "content": <UrlPanelContent
           getUnhashableStates={[Function]}
           objectType="dashboard"
         />,
@@ -20,19 +21,20 @@ exports[`should only render permalink panel when there are no other panels 1`] =
 
 exports[`should render context menu panel when there are more than one panel 1`] = `
 <EuiContextMenu
+  data-test-subj="shareContextMenu"
   initialPanelId={3}
   panels={
     Array [
       Object {
-        "content": <ShareUrlContent
+        "content": <UrlPanelContent
           getUnhashableStates={[Function]}
           objectType="dashboard"
         />,
         "id": 1,
         "title": "Permalink",
       },
       Object {
-        "content": <ShareUrlContent
+        "content": <UrlPanelContent
           getUnhashableStates={[Function]}
           isEmbedded={true}
           objectType="dashboard"
@@ -44,11 +46,13 @@ exports[`should render context menu panel when there are more than one panel 1`]
         "id": 3,
         "items": Array [
           Object {
+            "data-test-subj": "sharePanel-Embedcode",
             "icon": "console",
             "name": "Embed code",
             "panel": 2,
           },
           Object {
+            "data-test-subj": "sharePanel-Permalinks",
             "icon": "link",
             "name": "Permalinks",
             "panel": 1,

diff --git a/...napshots__/share_url_content.test.js.snap → ...napshots__/url_panel_content.test.js.snap b/...napshots__/share_url_content.test.js.snap → ...napshots__/url_panel_content.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`render 1`] = `
 <EuiForm
-  className="shareUrlContentForm"
+  className="sharePanelContent"
   data-test-subj="shareUrlForm"
 >
   <EuiFormRow
@@ -128,14 +128,15 @@ exports[`render 1`] = `
   </EuiFormRow>
   <EuiCopy
     afterMessage="Copied"
+    anchorClassName="sharePanel__copyAnchor"
     textToCopy="about:blank"
   />
 </EuiForm>
 `;
 
 exports[`should enable saved object export option when objectId is provided 1`] = `
 <EuiForm
-  className="shareUrlContentForm"
+  className="sharePanelContent"
   data-test-subj="shareUrlForm"
 >
   <EuiFormRow
@@ -260,6 +261,7 @@ exports[`should enable saved object export option when objectId is provided 1`]
   </EuiFormRow>
   <EuiCopy
     afterMessage="Copied"
+    anchorClassName="sharePanel__copyAnchor"
     textToCopy="about:blank"
   />
 </EuiForm>