From d356e19115bae09ee519ada878bd6f33a7539e7c Mon Sep 17 00:00:00 2001
From: Zhongnan Su <szhongna@amazon.com>
Date: Mon, 26 Oct 2020 15:18:00 -0700
Subject: [PATCH 1/2] keep csv only

---
 .../components/context_menu/context_menu.js   |  2 +-
 .../context_menu/context_menu_ui.js           | 41 ++++++-----
 .../public/components/main/main_utils.tsx     |  1 +
 .../report_definition_details.tsx             |  4 +-
 .../main/report_details/report_details.tsx    |  4 +-
 .../report_definitions/delivery/delivery.tsx  |  2 +-
 .../report_settings/report_settings.tsx       | 73 ++++++++++---------
 .../report_settings_constants.tsx             | 16 ++--
 8 files changed, 76 insertions(+), 67 deletions(-)

diff --git a/kibana-reports/public/components/context_menu/context_menu.js b/kibana-reports/public/components/context_menu/context_menu.js
index 9a4b634e..9e5285cc 100644
--- a/kibana-reports/public/components/context_menu/context_menu.js
+++ b/kibana-reports/public/components/context_menu/context_menu.js
@@ -240,7 +240,7 @@ function locationHashChanged() {
           return;
         }
         const menuItem = document.createElement('div');
-        menuItem.innerHTML = getMenuItem('Reporting');
+        menuItem.innerHTML = getMenuItem('Reporting', !isDiscover());
         navMenu[0].appendChild(menuItem.children[0]);
       } catch (e) {
         console.log(e);
diff --git a/kibana-reports/public/components/context_menu/context_menu_ui.js b/kibana-reports/public/components/context_menu/context_menu_ui.js
index a7d90fb5..a113bb97 100644
--- a/kibana-reports/public/components/context_menu/context_menu_ui.js
+++ b/kibana-reports/public/components/context_menu/context_menu_ui.js
@@ -13,25 +13,26 @@
  * permissions and limitations under the License.
  */
 
-export const getMenuItem = (name) => {
+export const getMenuItem = (name, isHidden) => {
+  const hidden = isHidden ? `style="display: none"` : '';
   return `
-  <div class="euiFlexItem euiFlexItem--flexGrowZero">
+  <div ${hidden} class="euiFlexItem euiFlexItem--flexGrowZero">
     <button class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall" type="button" id="downloadReport">
       <span class="euiButtonEmpty__content"><span class="euiButtonEmpty__text">${name}</span>
       </span>
     </button>
   </div>
-  `
-}
+  `;
+};
 
 export const popoverMenu = () => {
-    return `
+  return `
     <div>
       <div data-focus-guard="true" tabindex="-1" style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;">
     </div>
       <div data-focus-guard="true" tabindex="-1" style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;">
     </div>
-    <div data-focus-lock-disabled="disabled">
+    <div data-focus-lock-disabled="disabled" hidden>
        <div class="euiPanel euiPopover__panel euiPopover__panel--bottom euiPopover__panel-isOpen euiPopover__panel-withTitle" aria-live="assertive" role="dialog" aria-modal="true" aria-describedby="i199c7fc0-f92e-11ea-a40d-395bfe9dc89a" style="top: 97px; left: 255.583px; z-index: 2000;" id="reportPopover">
           <div class="euiPopover__panelArrow euiPopover__panelArrow--bottom" style="left: 15.9417px; top: 0px;">
         </div>
@@ -95,16 +96,18 @@ export const popoverMenu = () => {
        </div>
     </div>
     <div data-focus-guard="true" tabindex="-1" style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"></div>
-    `
-   }
+    `;
+};
 
 export const popoverMenuDiscover = (savedSearchAvailable) => {
-  const buttonClass = savedSearchAvailable ? 'euiContextMenuItem' : 'euiContextMenuItem euiContextMenuItem-isDisabled';
+  const buttonClass = savedSearchAvailable
+    ? 'euiContextMenuItem'
+    : 'euiContextMenuItem euiContextMenuItem-isDisabled';
   const button = savedSearchAvailable ? 'button' : 'button disabled';
   const popoverHeight = savedSearchAvailable ? '354px' : '322px';
-  const message = savedSearchAvailable ?
-    `Files can take a minute or two to generate depending on the size of your source data.` :
-    `Save this search to enable CSV reports.`;
+  const message = savedSearchAvailable
+    ? `Files can take a minute or two to generate depending on the size of your source data.`
+    : `Save this search to enable CSV reports.`;
 
   return `
     <div>
@@ -176,7 +179,7 @@ export const popoverMenuDiscover = (savedSearchAvailable) => {
        </div>
     </div>
     <div data-focus-guard="true" tabindex="-1" style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"></div>
-    `
+    `;
 };
 
 export const reportGenerationSuccess = () => {
@@ -205,8 +208,8 @@ export const reportGenerationSuccess = () => {
         href="opendistro_kibana_reports#/" rel="noreferrer">Reports</a>.</p>
     </div>
   </div>
-  `
-}
+  `;
+};
 
 export const reportGenerationFailure = () => {
   return `
@@ -232,8 +235,8 @@ export const reportGenerationFailure = () => {
       <p>There was an error generating this report</p>
     </div>
   </div>
-  `
-}
+  `;
+};
 
 export const reportGenerationInProgressModal = () => {
   return `
@@ -274,5 +277,5 @@ export const reportGenerationInProgressModal = () => {
   </div>
   <div data-focus-guard="true" tabindex="0" style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"></div>
 </div>
-  `
-}
+  `;
+};
diff --git a/kibana-reports/public/components/main/main_utils.tsx b/kibana-reports/public/components/main/main_utils.tsx
index 55b90e87..43dde5d1 100644
--- a/kibana-reports/public/components/main/main_utils.tsx
+++ b/kibana-reports/public/components/main/main_utils.tsx
@@ -65,6 +65,7 @@ export const addReportsTableContent = (data) => {
       url: `${location.host}${report.query_url}`,
       format: reportParams.core_params.report_format,
     };
+    console.log(reportsTableEntry.url);
     reportsTableItems.push(reportsTableEntry);
   }
   return reportsTableItems;
diff --git a/kibana-reports/public/components/main/report_definition_details/report_definition_details.tsx b/kibana-reports/public/components/main/report_definition_details/report_definition_details.tsx
index 8cefe5a4..f46c4de3 100644
--- a/kibana-reports/public/components/main/report_definition_details/report_definition_details.tsx
+++ b/kibana-reports/public/components/main/report_definition_details/report_definition_details.tsx
@@ -572,7 +572,7 @@ export function ReportDefinitionDetails(props) {
           <EuiSpacer />
           {triggerSection}
           <EuiSpacer />
-          <EuiTitle>
+          {/* <EuiTitle>
             <h3>Notification settings</h3>
           </EuiTitle>
           <EuiSpacer />
@@ -596,7 +596,7 @@ export function ReportDefinitionDetails(props) {
               )}
             />
             <ReportDetailsComponent />
-          </EuiFlexGroup>
+          </EuiFlexGroup> */}
         </EuiPageContent>
         <EuiGlobalToastList
           toasts={toasts}
diff --git a/kibana-reports/public/components/main/report_details/report_details.tsx b/kibana-reports/public/components/main/report_details/report_details.tsx
index f6e1431b..db5b03ca 100644
--- a/kibana-reports/public/components/main/report_details/report_details.tsx
+++ b/kibana-reports/public/components/main/report_details/report_details.tsx
@@ -348,7 +348,7 @@ export function ReportDetails(props) {
             />
             <ReportDetailsComponent />
           </EuiFlexGroup>
-          <EuiSpacer />
+          {/* <EuiSpacer />
           <EuiTitle>
             <h3>Notification settings</h3>
           </EuiTitle>
@@ -371,7 +371,7 @@ export function ReportDetails(props) {
               )}
             />
             <ReportDetailsComponent />
-          </EuiFlexGroup>
+          </EuiFlexGroup> */}
         </EuiPageContent>
         <EuiGlobalToastList
           toasts={toasts}
diff --git a/kibana-reports/public/components/report_definitions/delivery/delivery.tsx b/kibana-reports/public/components/report_definitions/delivery/delivery.tsx
index e2286997..b1352c75 100644
--- a/kibana-reports/public/components/report_definitions/delivery/delivery.tsx
+++ b/kibana-reports/public/components/report_definitions/delivery/delivery.tsx
@@ -87,7 +87,7 @@ export function ReportDelivery(props: ReportDeliveryProps) {
   }, []);
 
   return (
-    <EuiPageContent panelPaddingSize={'l'}>
+    <EuiPageContent panelPaddingSize={'l'} hidden>
       <EuiPageHeader>
         <EuiTitle>
           <h2>Notification settings</h2>
diff --git a/kibana-reports/public/components/report_definitions/report_settings/report_settings.tsx b/kibana-reports/public/components/report_definitions/report_settings/report_settings.tsx
index 14f93360..c1b048bc 100644
--- a/kibana-reports/public/components/report_definitions/report_settings/report_settings.tsx
+++ b/kibana-reports/public/components/report_definitions/report_settings/report_settings.tsx
@@ -81,7 +81,9 @@ export function ReportSettings(props: ReportSettingProps) {
 
   const [reportName, setReportName] = useState('');
   const [reportDescription, setReportDescription] = useState('');
-  const [reportSourceId, setReportSourceId] = useState('dashboardReportSource');
+  const [reportSourceId, setReportSourceId] = useState(
+    REPORT_SOURCE_RADIOS[0].id
+  );
 
   const [dashboardSourceSelect, setDashboardSourceSelect] = useState('');
   const [dashboards, setDashboards] = useState([]);
@@ -94,7 +96,7 @@ export function ReportSettings(props: ReportSettingProps) {
   const [savedSearchSourceSelect, setSavedSearchSourceSelect] = useState('');
   const [savedSearches, setSavedSearches] = useState([]);
 
-  const [fileFormat, setFileFormat] = useState('pdf');
+  const [fileFormat, setFileFormat] = useState('csv');
 
   const handleDashboards = (e) => {
     setDashboards(e);
@@ -516,37 +518,31 @@ export function ReportSettings(props: ReportSettingProps) {
       savedSearch: [],
     };
     reportDefinitionRequest.report_params.core_params.report_format = fileFormat;
-    await httpClientProps
-      .get('../api/reporting/getReportSource/dashboard')
-      .then(async (response) => {
-        let dashboardOptions = getDashboardOptions(response['hits']['hits']);
-        reportSourceOptions.dashboard = dashboardOptions;
-        handleDashboards(dashboardOptions);
-        if (!edit) {
-          setDashboardSourceSelect(dashboardOptions[0].value);
-          reportDefinitionRequest.report_params.report_source = 'Dashboard';
-          reportDefinitionRequest['report_params']['core_params']['base_url'] =
-            getDashboardBaseUrlCreate(edit, editDefinitionId, false) +
-            response['hits']['hits'][0]['_id'].substring(10);
-        }
-      })
-      .catch((error) => {
-        console.log('error when fetching dashboards:', error);
-      });
-
-    await httpClientProps
-      .get('../api/reporting/getReportSource/visualization')
-      .then(async (response) => {
-        let visualizationOptions = getVisualizationOptions(
-          response['hits']['hits']
-        );
-        reportSourceOptions.visualizations = visualizationOptions;
-        await handleVisualizations(visualizationOptions);
-        await setVisualizationSourceSelect(visualizationOptions[0].value);
-      })
-      .catch((error) => {
-        console.log('error when fetching visualizations:', error);
-      });
+    // await httpClientProps
+    //   .get('../api/reporting/getReportSource/dashboard')
+    //   .then(async (response) => {
+    //     let dashboardOptions = getDashboardOptions(response['hits']['hits']);
+    //     reportSourceOptions.dashboard = dashboardOptions;
+    //     handleDashboards(dashboardOptions);
+
+    //   })
+    //   .catch((error) => {
+    //     console.log('error when fetching dashboards:', error);
+    //   });
+
+    // await httpClientProps
+    //   .get('../api/reporting/getReportSource/visualization')
+    //   .then(async (response) => {
+    //     let visualizationOptions = getVisualizationOptions(
+    //       response['hits']['hits']
+    //     );
+    //     reportSourceOptions.visualizations = visualizationOptions;
+    //     await handleVisualizations(visualizationOptions);
+    //     await setVisualizationSourceSelect(visualizationOptions[0].value);
+    //   })
+    //   .catch((error) => {
+    //     console.log('error when fetching visualizations:', error);
+    //   });
 
     await httpClientProps
       .get('../api/reporting/getReportSource/search')
@@ -556,7 +552,16 @@ export function ReportSettings(props: ReportSettingProps) {
         );
         reportSourceOptions.savedSearch = savedSearchOptions;
         await handleSavedSearches(savedSearchOptions);
-        await setSavedSearchSourceSelect(savedSearchOptions[0].value);
+
+        if (!edit) {
+          setSavedSearchSourceSelect(savedSearchOptions[0].value);
+          reportDefinitionRequest.report_params.core_params.saved_search_id =
+            savedSearchOptions[0].value;
+          reportDefinitionRequest.report_params.report_source = 'Saved search';
+          reportDefinitionRequest['report_params']['core_params']['base_url'] =
+            getSavedSearchBaseUrlCreate(edit, false) +
+            response['hits']['hits'][0]['_id'].substring(7);
+        }
       })
       .catch((error) => {
         console.log('error when fetching saved searches:', error);
diff --git a/kibana-reports/public/components/report_definitions/report_settings/report_settings_constants.tsx b/kibana-reports/public/components/report_definitions/report_settings/report_settings_constants.tsx
index f50c7d51..46d40f8a 100644
--- a/kibana-reports/public/components/report_definitions/report_settings/report_settings_constants.tsx
+++ b/kibana-reports/public/components/report_definitions/report_settings/report_settings_constants.tsx
@@ -14,14 +14,14 @@
  */
 
 export const REPORT_SOURCE_RADIOS = [
-  {
-    id: 'dashboardReportSource',
-    label: 'Dashboard',
-  },
-  {
-    id: 'visualizationReportSource',
-    label: 'Visualization',
-  },
+  // {
+  //   id: 'dashboardReportSource',
+  //   label: 'Dashboard',
+  // },
+  // {
+  //   id: 'visualizationReportSource',
+  //   label: 'Visualization',
+  // },
   {
     id: 'savedSearchReportSource',
     label: 'Saved search',

From bd10d8a6e29c26f4d5b3e85746d17512509d7f19 Mon Sep 17 00:00:00 2001
From: Zhongnan Su <szhongna@amazon.com>
Date: Mon, 26 Oct 2020 16:14:23 -0700
Subject: [PATCH 2/2] comment out header/footer in detail page display

---
 .../report_definition_details/report_definition_details.tsx   | 4 ++--
 .../public/components/main/report_details/report_details.tsx  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kibana-reports/public/components/main/report_definition_details/report_definition_details.tsx b/kibana-reports/public/components/main/report_definition_details/report_definition_details.tsx
index f46c4de3..b87175c5 100644
--- a/kibana-reports/public/components/main/report_definition_details/report_definition_details.tsx
+++ b/kibana-reports/public/components/main/report_definition_details/report_definition_details.tsx
@@ -548,7 +548,7 @@ export function ReportDefinitionDetails(props) {
             />
             <EuiFlexItem />
           </EuiFlexGroup>
-          <EuiSpacer />
+          {/* <EuiSpacer />
           <EuiFlexGroup>
             <ReportDetailsComponent
               reportDetailsComponentTitle={'Report header'}
@@ -564,7 +564,7 @@ export function ReportDefinitionDetails(props) {
             />
             <EuiFlexItem />
             <EuiFlexItem />
-          </EuiFlexGroup>
+          </EuiFlexGroup> */}
           <EuiSpacer />
           <EuiTitle>
             <h3>Report trigger</h3>
diff --git a/kibana-reports/public/components/main/report_details/report_details.tsx b/kibana-reports/public/components/main/report_details/report_details.tsx
index db5b03ca..6e8a77d2 100644
--- a/kibana-reports/public/components/main/report_details/report_details.tsx
+++ b/kibana-reports/public/components/main/report_details/report_details.tsx
@@ -311,7 +311,7 @@ export function ReportDetails(props) {
               reportDetailsComponentContent={reportDetails['state']}
             />
           </EuiFlexGroup>
-          <EuiSpacer />
+          {/* <EuiSpacer />
           <EuiFlexGroup>
             <ReportDetailsComponent
               reportDetailsComponentTitle={'Report header'}
@@ -327,7 +327,7 @@ export function ReportDetails(props) {
             />
             <ReportDetailsComponent />
             <ReportDetailsComponent />
-          </EuiFlexGroup>
+          </EuiFlexGroup> */}
           <EuiSpacer />
           <EuiTitle>
             <h3>Report trigger</h3>