From f5f6bc17c19069121cef50c2b7ea53c86db8d71b Mon Sep 17 00:00:00 2001
From: Catherine Liu <catherine.liu@elastic.co>
Date: Thu, 11 Feb 2021 15:02:11 -0800
Subject: [PATCH] =?UTF-8?q?[7.x]=20[Dashboard]=20Adds=C2=A0Save=20as=20but?=
 =?UTF-8?q?ton=20to=20top=20menu=20(#90320)=20(#91208)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../application/top_nav/dashboard_top_nav.tsx |  43 ++++++--
 .../application/top_nav/get_top_nav_config.ts | 104 +++++++++---------
 .../panel_toolbar.stories.storyshot           |   3 +-
 .../top_nav/panel_toolbar/panel_toolbar.tsx   |   3 +-
 .../public/application/top_nav/top_nav_ids.ts |   3 +-
 .../apps/dashboard/dashboard_save.ts          |  20 ++++
 .../apps/dashboard/empty_dashboard.ts         |   4 +-
 .../functional/page_objects/dashboard_page.ts |  12 ++
 .../services/dashboard/visualizations.ts      |   2 +-
 .../new_visualize_flow/dashboard_embedding.ts |   4 +-
 .../translations/translations/ja-JP.json      |   4 -
 .../translations/translations/zh-CN.json      |   4 -
 .../dashboard_mode/dashboard_empty_screen.js  |   4 +-
 13 files changed, 129 insertions(+), 81 deletions(-)

diff --git a/src/plugins/dashboard/public/application/top_nav/dashboard_top_nav.tsx b/src/plugins/dashboard/public/application/top_nav/dashboard_top_nav.tsx
index 0caaac6764bb..786afc81c400 100644
--- a/src/plugins/dashboard/public/application/top_nav/dashboard_top_nav.tsx
+++ b/src/plugins/dashboard/public/application/top_nav/dashboard_top_nav.tsx
@@ -321,6 +321,33 @@ export function DashboardTopNav({
     dashboardStateManager,
   ]);
 
+  const runQuickSave = useCallback(async () => {
+    const currentTitle = dashboardStateManager.getTitle();
+    const currentDescription = dashboardStateManager.getDescription();
+    const currentTimeRestore = dashboardStateManager.getTimeRestore();
+
+    let currentTags: string[] = [];
+    if (savedObjectsTagging) {
+      const dashboard = dashboardStateManager.savedDashboard;
+      if (savedObjectsTagging.ui.hasTagDecoration(dashboard)) {
+        currentTags = dashboard.getTags();
+      }
+    }
+
+    save({}).then((response: SaveResult) => {
+      // If the save wasn't successful, put the original values back.
+      if (!(response as { id: string }).id) {
+        dashboardStateManager.setTitle(currentTitle);
+        dashboardStateManager.setDescription(currentDescription);
+        dashboardStateManager.setTimeRestore(currentTimeRestore);
+        if (savedObjectsTagging) {
+          dashboardStateManager.setTags(currentTags);
+        }
+      }
+      return response;
+    });
+  }, [save, savedObjectsTagging, dashboardStateManager]);
+
   const runClone = useCallback(() => {
     const currentTitle = dashboardStateManager.getTitle();
     const onClone = async (
@@ -356,9 +383,8 @@ export function DashboardTopNav({
       [TopNavIds.ENTER_EDIT_MODE]: () => onChangeViewMode(ViewMode.EDIT),
       [TopNavIds.DISCARD_CHANGES]: onDiscardChanges,
       [TopNavIds.SAVE]: runSave,
+      [TopNavIds.QUICK_SAVE]: runQuickSave,
       [TopNavIds.CLONE]: runClone,
-      [TopNavIds.ADD_EXISTING]: addFromLibrary,
-      [TopNavIds.VISUALIZE]: createNew,
       [TopNavIds.OPTIONS]: (anchorElement) => {
         showOptionsPopover({
           anchorElement,
@@ -394,10 +420,9 @@ export function DashboardTopNav({
     onDiscardChanges,
     onChangeViewMode,
     savedDashboard,
-    addFromLibrary,
-    createNew,
     runClone,
     runSave,
+    runQuickSave,
     share,
   ]);
 
@@ -419,11 +444,11 @@ export function DashboardTopNav({
     const showFilterBar = shouldShowFilterBar(Boolean(embedSettings?.forceHideFilterBar));
     const showSearchBar = showQueryBar || showFilterBar;
 
-    const topNav = getTopNavConfig(
-      viewMode,
-      dashboardTopNavActions,
-      dashboardCapabilities.hideWriteControls
-    );
+    const topNav = getTopNavConfig(viewMode, dashboardTopNavActions, {
+      hideWriteControls: dashboardCapabilities.hideWriteControls,
+      isNewDashboard: !savedDashboard.id,
+      isDirty: dashboardStateManager.isDirty,
+    });
 
     return {
       appName: 'dashboard',
diff --git a/src/plugins/dashboard/public/application/top_nav/get_top_nav_config.ts b/src/plugins/dashboard/public/application/top_nav/get_top_nav_config.ts
index 37414cb948d5..abc128369017 100644
--- a/src/plugins/dashboard/public/application/top_nav/get_top_nav_config.ts
+++ b/src/plugins/dashboard/public/application/top_nav/get_top_nav_config.ts
@@ -20,11 +20,11 @@ import { NavAction } from '../../types';
 export function getTopNavConfig(
   dashboardMode: ViewMode,
   actions: { [key: string]: NavAction },
-  hideWriteControls: boolean
+  options: { hideWriteControls: boolean; isNewDashboard: boolean; isDirty: boolean }
 ) {
   switch (dashboardMode) {
     case ViewMode.VIEW:
-      return hideWriteControls
+      return options.hideWriteControls
         ? [
             getFullScreenConfig(actions[TopNavIds.FULL_SCREEN]),
             getShareConfig(actions[TopNavIds.SHARE]),
@@ -36,20 +36,39 @@ export function getTopNavConfig(
             getEditConfig(actions[TopNavIds.ENTER_EDIT_MODE]),
           ];
     case ViewMode.EDIT:
-      return [
-        getOptionsConfig(actions[TopNavIds.OPTIONS]),
-        getShareConfig(actions[TopNavIds.SHARE]),
-        getAddConfig(actions[TopNavIds.ADD_EXISTING]),
-        getViewConfig(actions[TopNavIds.EXIT_EDIT_MODE]),
-        getDiscardConfig(actions[TopNavIds.DISCARD_CHANGES]),
-        getSaveConfig(actions[TopNavIds.SAVE]),
-        getCreateNewConfig(actions[TopNavIds.VISUALIZE]),
-      ];
+      return options.isNewDashboard
+        ? [
+            getOptionsConfig(actions[TopNavIds.OPTIONS]),
+            getShareConfig(actions[TopNavIds.SHARE]),
+            getViewConfig(actions[TopNavIds.EXIT_EDIT_MODE]),
+            getDiscardConfig(actions[TopNavIds.DISCARD_CHANGES]),
+            getSaveConfig(actions[TopNavIds.SAVE], options.isNewDashboard),
+          ]
+        : [
+            getOptionsConfig(actions[TopNavIds.OPTIONS]),
+            getShareConfig(actions[TopNavIds.SHARE]),
+            getViewConfig(actions[TopNavIds.EXIT_EDIT_MODE]),
+            getDiscardConfig(actions[TopNavIds.DISCARD_CHANGES]),
+            getSaveConfig(actions[TopNavIds.SAVE]),
+            getQuickSave(actions[TopNavIds.QUICK_SAVE]),
+          ];
     default:
       return [];
   }
 }
 
+function getSaveButtonLabel() {
+  return i18n.translate('dashboard.topNave.saveButtonAriaLabel', {
+    defaultMessage: 'save',
+  });
+}
+
+function getSaveAsButtonLabel() {
+  return i18n.translate('dashboard.topNave.saveAsButtonAriaLabel', {
+    defaultMessage: 'save as',
+  });
+}
+
 function getFullScreenConfig(action: NavAction) {
   return {
     id: 'full-screen',
@@ -89,17 +108,32 @@ function getEditConfig(action: NavAction) {
 /**
  * @returns {kbnTopNavConfig}
  */
-function getSaveConfig(action: NavAction) {
+function getQuickSave(action: NavAction) {
+  return {
+    id: 'quick-save',
+    emphasize: true,
+    label: getSaveButtonLabel(),
+    description: i18n.translate('dashboard.topNave.saveConfigDescription', {
+      defaultMessage: 'Quick save your dashboard without any prompts',
+    }),
+    testId: 'dashboardQuickSaveMenuItem',
+    run: action,
+  };
+}
+
+/**
+ * @returns {kbnTopNavConfig}
+ */
+function getSaveConfig(action: NavAction, isNewDashboard = false) {
   return {
     id: 'save',
-    label: i18n.translate('dashboard.topNave.saveButtonAriaLabel', {
-      defaultMessage: 'save',
-    }),
-    description: i18n.translate('dashboard.topNave.saveConfigDescription', {
-      defaultMessage: 'Save your dashboard',
+    label: isNewDashboard ? getSaveButtonLabel() : getSaveAsButtonLabel(),
+    description: i18n.translate('dashboard.topNave.saveAsConfigDescription', {
+      defaultMessage: 'Save as a new dashboard',
     }),
     testId: 'dashboardSaveMenuItem',
     run: action,
+    emphasize: isNewDashboard,
   };
 }
 
@@ -157,42 +191,6 @@ function getCloneConfig(action: NavAction) {
 /**
  * @returns {kbnTopNavConfig}
  */
-function getAddConfig(action: NavAction) {
-  return {
-    id: 'add',
-    label: i18n.translate('dashboard.topNave.addButtonAriaLabel', {
-      defaultMessage: 'Library',
-    }),
-    description: i18n.translate('dashboard.topNave.addConfigDescription', {
-      defaultMessage: 'Add an existing visualization to the dashboard',
-    }),
-    testId: 'dashboardAddPanelButton',
-    run: action,
-  };
-}
-
-/**
- * @returns {kbnTopNavConfig}
- */
-function getCreateNewConfig(action: NavAction) {
-  return {
-    emphasize: true,
-    iconType: 'plusInCircleFilled',
-    id: 'addNew',
-    label: i18n.translate('dashboard.topNave.addNewButtonAriaLabel', {
-      defaultMessage: 'Create panel',
-    }),
-    description: i18n.translate('dashboard.topNave.addNewConfigDescription', {
-      defaultMessage: 'Create a new panel on this dashboard',
-    }),
-    testId: 'dashboardAddNewPanelButton',
-    run: action,
-  };
-}
-
-// /**
-//  * @returns {kbnTopNavConfig}
-//  */
 function getShareConfig(action: NavAction | undefined) {
   return {
     id: 'share',
diff --git a/src/plugins/dashboard/public/application/top_nav/panel_toolbar/__snapshots__/panel_toolbar.stories.storyshot b/src/plugins/dashboard/public/application/top_nav/panel_toolbar/__snapshots__/panel_toolbar.stories.storyshot
index f822a7e70d52..afbbecb3935e 100644
--- a/src/plugins/dashboard/public/application/top_nav/panel_toolbar/__snapshots__/panel_toolbar.stories.storyshot
+++ b/src/plugins/dashboard/public/application/top_nav/panel_toolbar/__snapshots__/panel_toolbar.stories.storyshot
@@ -10,7 +10,7 @@ exports[`Storyshots components/PanelToolbar default 1`] = `
   >
     <button
       className="euiButton euiButton--primary euiButton--small euiButton--fill"
-      data-test-subj="addVisualizationButton"
+      data-test-subj="dashboardAddNewPanelButton"
       disabled={false}
       onClick={[Function]}
       style={
@@ -41,6 +41,7 @@ exports[`Storyshots components/PanelToolbar default 1`] = `
   >
     <button
       className="euiButton euiButton--text euiButton--small panelToolbarButton"
+      data-test-subj="dashboardAddPanelButton"
       disabled={false}
       onClick={[Function]}
       style={
diff --git a/src/plugins/dashboard/public/application/top_nav/panel_toolbar/panel_toolbar.tsx b/src/plugins/dashboard/public/application/top_nav/panel_toolbar/panel_toolbar.tsx
index 28f941ff1e1b..0449fae80186 100644
--- a/src/plugins/dashboard/public/application/top_nav/panel_toolbar/panel_toolbar.tsx
+++ b/src/plugins/dashboard/public/application/top_nav/panel_toolbar/panel_toolbar.tsx
@@ -26,7 +26,7 @@ export const PanelToolbar: FC<Props> = ({ onAddPanelClick, onLibraryClick }) =>
         size="s"
         iconType="plusInCircleFilled"
         onClick={onAddPanelClick}
-        data-test-subj="addVisualizationButton"
+        data-test-subj="dashboardAddNewPanelButton"
       >
         {i18n.translate('dashboard.panelToolbar.addPanelButtonLabel', {
           defaultMessage: 'Create panel',
@@ -40,6 +40,7 @@ export const PanelToolbar: FC<Props> = ({ onAddPanelClick, onLibraryClick }) =>
         className="panelToolbarButton"
         iconType="folderOpen"
         onClick={onLibraryClick}
+        data-test-subj="dashboardAddPanelButton"
       >
         {i18n.translate('dashboard.panelToolbar.libraryButtonLabel', {
           defaultMessage: 'Add from library',
diff --git a/src/plugins/dashboard/public/application/top_nav/top_nav_ids.ts b/src/plugins/dashboard/public/application/top_nav/top_nav_ids.ts
index 30ed8b602717..92a0db6bd0ba 100644
--- a/src/plugins/dashboard/public/application/top_nav/top_nav_ids.ts
+++ b/src/plugins/dashboard/public/application/top_nav/top_nav_ids.ts
@@ -9,12 +9,11 @@
 export const TopNavIds = {
   SHARE: 'share',
   OPTIONS: 'options',
+  QUICK_SAVE: 'quickSave',
   SAVE: 'save',
   EXIT_EDIT_MODE: 'exitEditMode',
   ENTER_EDIT_MODE: 'enterEditMode',
   DISCARD_CHANGES: 'discard',
   CLONE: 'clone',
   FULL_SCREEN: 'fullScreenMode',
-  VISUALIZE: 'visualize',
-  ADD_EXISTING: 'addExisting',
 };
diff --git a/test/functional/apps/dashboard/dashboard_save.ts b/test/functional/apps/dashboard/dashboard_save.ts
index 0295efc17aae..d1320b064b6d 100644
--- a/test/functional/apps/dashboard/dashboard_save.ts
+++ b/test/functional/apps/dashboard/dashboard_save.ts
@@ -11,6 +11,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['dashboard', 'header']);
   const listingTable = getService('listingTable');
+  const testSubjects = getService('testSubjects');
 
   // FLAKY: https://github.com/elastic/kibana/issues/89476
   describe.skip('dashboard save', function describeIndexTests() {
@@ -112,5 +113,24 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
       await listingTable.searchAndExpectItemsCount('dashboard', dashboardNameEnterKey, 1);
     });
+
+    it('Does not show quick save menu item on a new dashboard', async function () {
+      await PageObjects.dashboard.gotoDashboardLandingPage();
+      await PageObjects.dashboard.clickNewDashboard();
+      await PageObjects.dashboard.expectMissingQuickSaveOption();
+    });
+
+    it('Does not show dashboard save modal when on quick save', async function () {
+      await PageObjects.dashboard.gotoDashboardLandingPage();
+      await PageObjects.dashboard.clickNewDashboard();
+      await PageObjects.dashboard.saveDashboard('test quick save');
+
+      await PageObjects.dashboard.switchToEditMode();
+      await PageObjects.dashboard.expectExistsQuickSaveOption();
+      await PageObjects.dashboard.clickQuickSave();
+
+      await testSubjects.existOrFail('saveDashboardSuccess');
+      await testSubjects.existOrFail('dashboardEditMode');
+    });
   });
 }
diff --git a/test/functional/apps/dashboard/empty_dashboard.ts b/test/functional/apps/dashboard/empty_dashboard.ts
index a372b274b2d5..c096d90aa359 100644
--- a/test/functional/apps/dashboard/empty_dashboard.ts
+++ b/test/functional/apps/dashboard/empty_dashboard.ts
@@ -48,8 +48,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     it('should add new visualization from dashboard', async () => {
-      await testSubjects.exists('addVisualizationButton');
-      await testSubjects.click('addVisualizationButton');
+      await testSubjects.exists('dashboardAddNewPanelButton');
+      await testSubjects.click('dashboardAddNewPanelButton');
       await dashboardVisualizations.createAndAddMarkdown({
         name: 'Dashboard Test Markdown',
         markdown: 'Markdown text',
diff --git a/test/functional/page_objects/dashboard_page.ts b/test/functional/page_objects/dashboard_page.ts
index b369d1cec459..a6053507c2a7 100644
--- a/test/functional/page_objects/dashboard_page.ts
+++ b/test/functional/page_objects/dashboard_page.ts
@@ -248,6 +248,11 @@ export function DashboardPageProvider({ getService, getPageObjects }: FtrProvide
       await testSubjects.click('dashboardDiscardChanges');
     }
 
+    public async clickQuickSave() {
+      log.debug('clickQuickSave');
+      await testSubjects.click('dashboardQuickSaveMenuItem');
+    }
+
     public async clickNewDashboard(continueEditing = false) {
       await listingTable.clickNewButton('createDashboardPromptButton');
       if (await testSubjects.exists('dashboardCreateConfirm')) {
@@ -583,6 +588,13 @@ export function DashboardPageProvider({ getService, getPageObjects }: FtrProvide
       await testSubjects.missingOrFail('dashboardSaveMenuItem');
     }
 
+    public async expectMissingQuickSaveOption() {
+      await testSubjects.missingOrFail('dashboardQuickSaveMenuItem');
+    }
+    public async expectExistsQuickSaveOption() {
+      await testSubjects.existOrFail('dashboardQuickSaveMenuItem');
+    }
+
     public async getNotLoadedVisualizations(vizList: string[]) {
       const checkList = [];
       for (const name of vizList) {
diff --git a/test/functional/services/dashboard/visualizations.ts b/test/functional/services/dashboard/visualizations.ts
index ee9247bdd04c..d1aaa6aa1bd7 100644
--- a/test/functional/services/dashboard/visualizations.ts
+++ b/test/functional/services/dashboard/visualizations.ts
@@ -89,7 +89,7 @@ export function DashboardVisualizationProvider({ getService, getPageObjects }: F
 
     async clickAddVisualizationButton() {
       log.debug('DashboardVisualizations.clickAddVisualizationButton');
-      await testSubjects.click('addVisualizationButton');
+      await testSubjects.click('dashboardAddNewPanelButton');
     }
 
     async isNewVisDialogShowing() {
diff --git a/test/new_visualize_flow/dashboard_embedding.ts b/test/new_visualize_flow/dashboard_embedding.ts
index 95989a5e701c..6a1315dbfc91 100644
--- a/test/new_visualize_flow/dashboard_embedding.ts
+++ b/test/new_visualize_flow/dashboard_embedding.ts
@@ -47,8 +47,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     it('adding a metric visualization', async function () {
       const originalPanelCount = await PageObjects.dashboard.getPanelCount();
       expect(originalPanelCount).to.eql(0);
-      await testSubjects.exists('addVisualizationButton');
-      await testSubjects.click('addVisualizationButton');
+      await testSubjects.exists('dashboardAddNewPanelButton');
+      await testSubjects.click('dashboardAddNewPanelButton');
       await dashboardVisualizations.createAndEmbedMetric('Embedding Vis Test');
       await PageObjects.dashboard.waitForRenderComplete();
       await dashboardExpect.metricValuesExist(['0']);
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 11ad4ca4c1d3..98248587ead3 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -660,10 +660,6 @@
     "dashboard.topNav.saveModal.storeTimeWithDashboardFormRowHelpText": "有効化すると、ダッシュボードが読み込まれるごとに現在選択された時刻の時間フィルターが変更されます。",
     "dashboard.topNav.saveModal.storeTimeWithDashboardFormRowLabel": "ダッシュボードに時刻を保存",
     "dashboard.topNav.showCloneModal.dashboardCopyTitle": "{title}のコピー",
-    "dashboard.topNave.addButtonAriaLabel": "ライブラリ",
-    "dashboard.topNave.addConfigDescription": "既存のビジュアライゼーションをダッシュボードに追加",
-    "dashboard.topNave.addNewButtonAriaLabel": "パネルの作成",
-    "dashboard.topNave.addNewConfigDescription": "このダッシュボードに新規パネルを作成",
     "dashboard.topNave.cancelButtonAriaLabel": "キャンセル",
     "dashboard.topNave.cloneButtonAriaLabel": "クローンを作成",
     "dashboard.topNave.cloneConfigDescription": "ダッシュボードのコピーを作成します",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 8a2a930f619f..c17703c54650 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -660,11 +660,7 @@
     "dashboard.topNav.saveModal.storeTimeWithDashboardFormRowHelpText": "每次加载此仪表板时，都会将时间筛选更改为当前选定的时间。",
     "dashboard.topNav.saveModal.storeTimeWithDashboardFormRowLabel": "将时间随仪表板保存",
     "dashboard.topNav.showCloneModal.dashboardCopyTitle": "{title} 副本",
-    "dashboard.topNave.addButtonAriaLabel": "库",
-    "dashboard.topNave.addConfigDescription": "将现有可视化添加到仪表板",
     "dashboard.topNave.cancelButtonAriaLabel": "取消",
-    "dashboard.topNave.addNewButtonAriaLabel": "创建面板",
-    "dashboard.topNave.addNewConfigDescription": "在此仪表板上创建新的面板",
     "dashboard.topNave.cloneButtonAriaLabel": "克隆",
     "dashboard.topNave.cloneConfigDescription": "创建仪表板的副本",
     "dashboard.topNave.editButtonAriaLabel": "编辑",
diff --git a/x-pack/test/functional/apps/dashboard_mode/dashboard_empty_screen.js b/x-pack/test/functional/apps/dashboard_mode/dashboard_empty_screen.js
index c4cd87a5c337..57925ad50d15 100644
--- a/x-pack/test/functional/apps/dashboard_mode/dashboard_empty_screen.js
+++ b/x-pack/test/functional/apps/dashboard_mode/dashboard_empty_screen.js
@@ -29,8 +29,8 @@ export default function ({ getPageObjects, getService }) {
 
     it('adds Lens visualization to empty dashboard', async () => {
       const title = 'Dashboard Test Lens';
-      await testSubjects.exists('addVisualizationButton');
-      await testSubjects.click('addVisualizationButton');
+      await testSubjects.exists('dashboardAddNewPanelButton');
+      await testSubjects.click('dashboardAddNewPanelButton');
       await dashboardVisualizations.ensureNewVisualizationDialogIsShowing();
       await PageObjects.lens.createAndAddLensFromDashboard({ title, redirectToOrigin: true });
       await PageObjects.dashboard.waitForRenderComplete();