[Bug fix] in-context menu download UI (opendistro-for-elasticsearch#219)

zhongnansu · Dec 7, 2020 · 45d42c9 · 45d42c9
1 parent 9572199
commit 45d42c9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 50 deletions.
diff --git a/kibana-reports/public/components/context_menu/context_menu.js b/kibana-reports/public/components/context_menu/context_menu.js
@@ -32,36 +32,18 @@ import {
 
 const replaceQueryURL = () => {
   let url = location.pathname + location.hash;
-  let timeString = url.substring(
-    url.lastIndexOf('time:'),
-    url.lastIndexOf('))')
+  let [, fromDateString, toDateString] = url.match(
+    /time:\(from:(.+),to:(.+?)\)/
   );
-  if (url.includes('visualize') || url.includes('discover')) {
-    timeString = url.substring(url.lastIndexOf('time:'), url.indexOf('))'));
-  }
-
-  let fromDateString = timeString.substring(
-    timeString.lastIndexOf('from:') + 5,
-    timeString.lastIndexOf(',')
-  );
-
   fromDateString = fromDateString.replace(/[']+/g, '');
-  let fromDateFormat = dateMath.parse(fromDateString);
 
-  let toDateString = timeString.substring(
-    timeString.lastIndexOf('to:') + 3,
-    timeString.length
-  );
+  // convert time range to from date format in case time range is relative
+  const fromDateFormat = dateMath.parse(fromDateString);
   toDateString = toDateString.replace(/[']+/g, '');
   let toDateFormat = dateMath.parse(toDateString);
 
   // replace to and from dates with absolute date
-
-  url = url.replace(
-    fromDateString + '))',
-    "'" + fromDateFormat.toISOString() + "'"
-  );
-
+  url = url.replace(fromDateString, "'" + fromDateFormat.toISOString() + "'");
   url = url.replace(
     toDateString + '))',
     "'" + toDateFormat.toISOString() + "'))"
@@ -139,8 +121,7 @@ const generateInContextReport = (
       } else {
         if (response.status === 403) {
           addSuccessOrFailureToast('permissionsFailure');
-        }
-        else {
+        } else {
           addSuccessOrFailureToast('failure');
         }
       }

diff --git a/kibana-reports/public/components/context_menu/context_menu_helpers.js b/kibana-reports/public/components/context_menu/context_menu_helpers.js
@@ -19,7 +19,7 @@ import {
   reportGenerationInProgressModal,
   reportGenerationSuccess,
   reportGenerationFailure,
-  permissionsMissingOnGeneration
+  permissionsMissingOnGeneration,
 } from './context_menu_ui';
 
 const getReportSourceURL = (baseURI) => {
@@ -51,31 +51,14 @@ export const contextMenuViewReports = () =>
   window.location.assign('opendistro_kibana_reports#/');
 
 export const getTimeFieldsFromUrl = () => {
-  let url = window.location.href;
-  let timeString = url.substring(
-    url.lastIndexOf('time:'),
-    url.lastIndexOf('))')
-  );
-  if (url.includes('visualize') || url.includes('discover')) {
-    timeString = url.substring(url.lastIndexOf('time:'), url.indexOf('))'));
-  }
+  const url = window.location.href;
 
-  let fromDateString = timeString.substring(
-    timeString.lastIndexOf('from:') + 5,
-    timeString.lastIndexOf(',')
+  let [, fromDateString, toDateString] = url.match(
+    /time:\(from:(.+),to:(.+?)\)/
   );
-
-  // remove extra quotes if the 'from' date is absolute time
   fromDateString = fromDateString.replace(/[']+/g, '');
-
   // convert time range to from date format in case time range is relative
-  let fromDateFormat = dateMath.parse(fromDateString);
-
-  let toDateString = timeString.substring(
-    timeString.lastIndexOf('to:') + 3,
-    timeString.length
-  );
-
+  const fromDateFormat = dateMath.parse(fromDateString);
   toDateString = toDateString.replace(/[']+/g, '');
   let toDateFormat = dateMath.parse(toDateString);
 
@@ -121,7 +104,9 @@ export const addSuccessOrFailureToast = (status) => {
       } else if (status === 'permissionsFailure') {
         generateInProgressToast.innerHTML = permissionsMissingOnGeneration();
         setTimeout(function () {
-          document.getElementById('permissionsMissingErrorToast').style.display = 'none';
+          document.getElementById(
+            'permissionsMissingErrorToast'
+          ).style.display = 'none';
         }, 6000);
       }
       generateToast[0].appendChild(generateInProgressToast.children[0]);

diff --git a/kibana-reports/server/routes/utils/constants.ts b/kibana-reports/server/routes/utils/constants.ts
@@ -65,7 +65,7 @@ export enum DELIVERY_TYPE {
 
 export enum SELECTOR {
   dashboard = '#dashboardViewport',
-  visualization = '.visEditor__visualization',
+  visualization = '.visEditor__content',
   topNavBar = '#globalHeaderBars',
 }
 

diff --git a/kibana-reports/server/routes/utils/visual_report/visualReportHelper.ts b/kibana-reports/server/routes/utils/visual_report/visualReportHelper.ts
@@ -155,7 +155,7 @@ export const createVisualReport = async (
   return { timeCreated, dataUrl: buffer.toString('base64'), fileName };
 };
 
-export const composeReportHtml = (
+const composeReportHtml = (
   header: string,
   footer: string,
   screenshot: string