Visualize Save with Dashboard Picker

elastic · Jan 15, 2021 · 676f971 · 676f971
1 parent f041bad
commit 676f971
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 7 deletions.
diff --git a/src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard.tsx b/src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard.tsx
@@ -99,11 +99,11 @@ export function SavedObjectSaveModalDashboard(props: DashboardSaveModalProps) {
           }
           hasChildLabel={false}
         >
-          <EuiPanel color="subdued" hasShadow={false}>
+          <EuiPanel color="subdued" hasShadow={false} data-test-subj="add-to-dashboard-options">
             <div>
               <EuiRadio
                 checked={dashboardOption === 'existing'}
-                id="existing"
+                id="existing-dashboard-option"
                 name="dashboard-option"
                 label={i18n.translate(
                   'presentationUtil.saveModalDashboard.existingDashboardOptionLabel',
@@ -129,7 +129,7 @@ export function SavedObjectSaveModalDashboard(props: DashboardSaveModalProps) {
 
               <EuiRadio
                 checked={dashboardOption === 'new'}
-                id="new"
+                id="new-dashboard-option"
                 name="dashboard-option"
                 label={i18n.translate(
                   'presentationUtil.saveModalDashboard.newDashboardOptionLabel',
@@ -145,7 +145,7 @@ export function SavedObjectSaveModalDashboard(props: DashboardSaveModalProps) {
 
               <EuiRadio
                 checked={dashboardOption === null}
-                id="library"
+                id="add-to-library-option"
                 name="dashboard-option"
                 label={i18n.translate('presentationUtil.saveModalDashboard.libraryOptionLabel', {
                   defaultMessage: 'No dashboard, but add to library',

diff --git a/test/functional/page_objects/visualize_page.ts b/test/functional/page_objects/visualize_page.ts
@@ -20,6 +20,13 @@
 import { FtrProviderContext } from '../ftr_provider_context';
 import { VisualizeConstants } from '../../../src/plugins/visualize/public/application/visualize_constants';
 
+interface VisualizeSaveModalArgs {
+  saveAsNew?: boolean;
+  redirectToOrigin?: boolean;
+  addToDashboard?: boolean;
+  dashboardId?: string;
+}
+
 export function VisualizePageProvider({ getService, getPageObjects }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const retry = getService('retry');
@@ -348,7 +355,7 @@ export function VisualizePageProvider({ getService, getPageObjects }: FtrProvide
 
     public async saveVisualization(
       vizName: string,
-      { saveAsNew = false, redirectToOrigin = false } = {}
+      { saveAsNew, redirectToOrigin, addToDashboard, dashboardId }: VisualizeSaveModalArgs = {}
     ) {
       await this.ensureSavePanelOpen();
       await testSubjects.setValue('savedObjectTitle', vizName);
@@ -366,6 +373,22 @@ export function VisualizePageProvider({ getService, getPageObjects }: FtrProvide
         log.debug('redirect to origin checkbox exists. Setting its state to', state);
         await testSubjects.setEuiSwitch('returnToOriginModeSwitch', state);
       }
+
+      const dashboardSelectorExists = await testSubjects.exists('add-to-dashboard-options');
+      if (dashboardSelectorExists) {
+        const dashboardSelector = await testSubjects.find('add-to-dashboard-options');
+        let optionSelector = 'add-to-library-option';
+        if (addToDashboard) {
+          optionSelector = dashboardId ? 'existing-dashboard-option' : 'new-dashboard-option';
+        }
+        log.debug('dashboard selector exists, choosing option:', optionSelector);
+        const label = await dashboardSelector.findByCssSelector(`label[for="${optionSelector}"]`);
+        await label.click();
+
+        if (dashboardId) {
+          // TODO - selecting an existing dashboard
+        }
+      }
       log.debug('Click Save Visualization button');
 
       await testSubjects.click('confirmSaveSavedObjectButton');
@@ -381,9 +404,14 @@ export function VisualizePageProvider({ getService, getPageObjects }: FtrProvide
 
     public async saveVisualizationExpectSuccess(
       vizName: string,
-      { saveAsNew = false, redirectToOrigin = false } = {}
+      { saveAsNew, redirectToOrigin, addToDashboard, dashboardId }: VisualizeSaveModalArgs = {}
     ) {
-      const saveMessage = await this.saveVisualization(vizName, { saveAsNew, redirectToOrigin });
+      const saveMessage = await this.saveVisualization(vizName, {
+        saveAsNew,
+        redirectToOrigin,
+        addToDashboard,
+        dashboardId,
+      });
       if (!saveMessage) {
         throw new Error(
           `Expected saveVisualization to respond with the saveMessage from the toast, got ${saveMessage}`