Eui sharing top nav

src/core_plugins/kibana/public/dashboard/dashboard_app.js

@@ -43,13 +43,15 @@ 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 { migrateLegacyQuery } from 'ui/utils/migrateLegacyQuery';
 import * as filterActions from 'ui/doc_table/actions/filter';
 import { FilterManagerProvider } from 'ui/filter_manager';
 import { EmbeddableFactoriesRegistryProvider } from 'ui/embeddable/embeddable_factories_registry';
 import { DashboardPanelActionsRegistryProvider } from 'ui/dashboard_panel_actions/dashboard_panel_actions_registry';
 import { VisTypesRegistryProvider } from 'ui/registry/vis_types';
 import { timefilter } from 'ui/timefilter';
+import { getUnhashableStatesProvider } from 'ui/state_management/state_hashing';
 
 import { DashboardViewportProvider } from './viewport/dashboard_viewport_provider';
 
@@ -83,6 +85,7 @@ app.directive('dashboardApp', function ($injector) {
  const docTitle = Private(DocTitleProvider);
  const embeddableFactories = Private(EmbeddableFactoriesRegistryProvider);
  const panelActionsRegistry = Private(DashboardPanelActionsRegistryProvider);
+ const getUnhashableStates = Private(getUnhashableStatesProvider);
 
  panelActionsStore.initializeFromRegistry(panelActionsRegistry);
 
@@ -399,6 +402,16 @@ app.directive('dashboardApp', function ($injector) {
  },
  });
  };
+ navActions[TopNavIds.SHARE] = (menuItem, navController, anchorElement) => {
+ showShareContextMenu({
+ anchorElement,
+ allowEmbed: true,
+ getUnhashableStates,
+ objectId: dash.id,
+ objectType: 'dashboard',
+ });
+ };
+
  updateViewMode(dashboardStateManager.getViewMode());
 
  // update root source when filters update
@@ -438,11 +451,6 @@ app.directive('dashboardApp', function ($injector) {
  kbnUrl.removeParam(DashboardConstants.ADD_VISUALIZATION_TO_DASHBOARD_MODE_PARAM);
  kbnUrl.removeParam(DashboardConstants.NEW_VISUALIZATION_ID_PARAM);
  }
-
- // TODO remove opts once share has been converted to react
- $scope.opts = {
- dashboard: dash, // used in share.html
- };
  }
  };
 });

src/core_plugins/kibana/public/dashboard/top_nav/get_top_nav_config.js

@@ -38,7 +38,7 @@ export function getTopNavConfig(dashboardMode, actions, hideWriteControls) {
  ]
  : [
  getFullScreenConfig(actions[TopNavIds.FULL_SCREEN]),
- getShareConfig(),
+ getShareConfig(actions[TopNavIds.SHARE]),
  getCloneConfig(actions[TopNavIds.CLONE]),
  getEditConfig(actions[TopNavIds.ENTER_EDIT_MODE])
  ]
@@ -49,7 +49,7 @@ export function getTopNavConfig(dashboardMode, actions, hideWriteControls) {
  getViewConfig(actions[TopNavIds.EXIT_EDIT_MODE]),
  getAddConfig(actions[TopNavIds.ADD]),
  getOptionsConfig(actions[TopNavIds.OPTIONS]),
- getShareConfig()];
+ getShareConfig(actions[TopNavIds.SHARE])];
  default:
  return [];
  }
@@ -127,12 +127,12 @@ function getAddConfig(action) {
 /**
  * @returns {kbnTopNavConfig}
  */
-function getShareConfig() {
+function getShareConfig(action) {
  return {
  key: TopNavIds.SHARE,
  description: 'Share Dashboard',
- testId: 'dashboardShareButton',
- template: require('plugins/kibana/dashboard/top_nav/share.html')
+ testId: 'shareTopNavButton',
+ run: action,
  };
 }
 

src/core_plugins/kibana/public/dashboard/top_nav/show_options_popover.js

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import './options_popover.less';
 import React from 'react';
 import ReactDOM from 'react-dom';
 
@@ -55,7 +54,7 @@ export function showOptionsPopover({
  document.body.appendChild(container);
  const element = (
  <EuiWrappingPopover
- className="dashOptionsPopover"
+ className="navbar__popover"
  id="popover"
  button={anchorElement}
  isOpen={true}

src/core_plugins/kibana/public/discover/controllers/discover.js

@@ -31,7 +31,6 @@ import 'ui/filters/moment';
 import 'ui/index_patterns';
 import 'ui/state_management/app_state';
 import { timefilter } from 'ui/timefilter';
-import 'ui/share';
 import 'ui/query_bar';
 import { hasSearchStategyForIndexPattern, isDefaultTypeIndexPattern } from 'ui/courier';
 import { toastNotifications } from 'ui/notify';
@@ -54,6 +53,8 @@ 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 { getUnhashableStatesProvider } from 'ui/state_management/state_hashing';
 
 const app = uiModules.get('apps/discover', [
  'kibana/notify',
@@ -157,6 +158,7 @@ function discoverController(
  const notify = new Notifier({
  location: 'Discover'
  });
+ const getUnhashableStates = Private(getUnhashableStatesProvider);
 
  $scope.getDocLink = getDocLink;
  $scope.intervalOptions = intervalOptions;
@@ -167,6 +169,10 @@ function discoverController(
  return interval.val !== 'custom';
  };
 
+ // the saved savedSearch
+ const savedSearch = $route.current.locals.savedSearch;
+ $scope.$on('$destroy', savedSearch.destroy);
+
  $scope.topNavMenu = [{
  key: 'new',
  description: 'New Search',
@@ -185,14 +191,18 @@ function discoverController(
  }, {
  key: 'share',
  description: 'Share Search',
- template: require('plugins/kibana/discover/partials/share_search.html'),
- testId: 'discoverShareButton',
+ testId: 'shareTopNavButton',
+ run: (menuItem, navController, anchorElement) => {
+ showShareContextMenu({
+ anchorElement,
+ allowEmbed: false,
+ getUnhashableStates,
+ objectId: savedSearch.id,
+ objectType: 'search',
+ });
+ }
  }];
 
- // the saved savedSearch
- const savedSearch = $route.current.locals.savedSearch;
- $scope.$on('$destroy', savedSearch.destroy);
-
  // the actual courier.SearchSource
  $scope.searchSource = savedSearch.searchSource;
  $scope.indexPattern = resolveIndexPatternLoading();

src/core_plugins/kibana/public/visualize/editor/editor.js

@@ -23,7 +23,6 @@ import './visualization_editor';
 import 'ui/vis/editors/default/sidebar';
 import 'ui/visualize';
 import 'ui/collapsible_sidebar';
-import 'ui/share';
 import 'ui/query_bar';
 import chrome from 'ui/chrome';
 import angular from 'angular';
@@ -43,6 +42,8 @@ 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 { getUnhashableStatesProvider } from 'ui/state_management/state_hashing';
 
 uiRoutes
  .when(VisualizeConstants.CREATE_PATH, {
@@ -115,6 +116,7 @@ function VisEditor(
 ) {
  const docTitle = Private(DocTitleProvider);
  const queryFilter = Private(FilterBarQueryFilterProvider);
+ const getUnhashableStates = Private(getUnhashableStatesProvider);
 
  const notify = new Notifier({
  location: 'Visualization Editor'
@@ -156,8 +158,16 @@ function VisEditor(
  }, {
  key: 'share',
  description: 'Share Visualization',
- template: require('plugins/kibana/visualize/editor/panels/share.html'),
- testId: 'visualizeShareButton',
+ testId: 'shareTopNavButton',
+ run: (menuItem, navController, anchorElement) => {
+ showShareContextMenu({
+ anchorElement,
+ allowEmbed: true,
+ getUnhashableStates,
+ objectId: savedVis.id,
+ objectType: 'visualization',
+ });
+ }
  }, {
  key: 'inspect',
  description: 'Open Inspector for visualization',
@@ -251,7 +261,7 @@ function VisEditor(
  $scope.isAddToDashMode = () => addToDashMode;
 
  $scope.timeRange = timefilter.getTime();
- $scope.opts = _.pick($scope, 'doSave', 'savedVis', 'shareData', 'isAddToDashMode');
+ $scope.opts = _.pick($scope, 'doSave', 'savedVis', 'isAddToDashMode');
 
  stateMonitor = stateMonitorFactory.create($state, stateDefaults);
  stateMonitor.ignoreProps([ 'vis.listeners' ]).onChange((status) => {

src/ui/public/share/components/__snapshots__/share_context_menu.test.js.snap

@@ -0,0 +1,65 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`should only render permalink panel when there are no other panels 1`] = `
+<EuiContextMenu
+ initialPanelId={1}
+ panels={
+ Array [
+ Object {
+ "content": <ShareUrlContent
+ getUnhashableStates={[Function]}
+ objectId={undefined}
+ objectType="dashboard"
+ />,
+ "id": 1,
+ "title": "Permalink",
+ },
+ ]
+ }
+/>
+`;
+
+exports[`should render context menu panel when there are more than one panel 1`] = `
+<EuiContextMenu
+ initialPanelId={3}
+ panels={
+ Array [
+ Object {
+ "content": <ShareUrlContent
+ getUnhashableStates={[Function]}
+ objectId={undefined}
+ objectType="dashboard"
+ />,
+ "id": 1,
+ "title": "Permalink",
+ },
+ Object {
+ "content": <ShareUrlContent
+ getUnhashableStates={[Function]}
+ isEmbedded={true}
+ objectId={undefined}
+ objectType="dashboard"
+ />,
+ "id": 2,
+ "title": "Embed Code",
+ },
+ Object {
+ "id": 3,
+ "items": Array [
+ Object {
+ "icon": "console",
+ "name": "Embed code",
+ "panel": 2,
+ },
+ Object {
+ "icon": "link",
+ "name": "Permalinks",
+ "panel": 1,
+ },
+ ],
+ "title": "Share this dashboard",
+ },
+ ]
+ }
+/>
+`;