Fix quoting and url-encoding (opensearch-project#153)

* Replace '%2F' with '/' in relative dates Signed-off-by: Konstantin Roussou <konstantin.roussou@syncier.com> * Ensure proper quoting of converted dates in URL Signed-off-by: Konstantin Roussou <konstantin.roussou@syncier.com> * Use generic URL decoding Co-authored-by: Zhongnan Su <szhongna@amazon.com> * Use roundUp for toDate Co-authored-by: Zhongnan Su <szhongna@amazon.com> * Make date transformation same as in context_menu_helpers.js Co-authored-by: Zhongnan Su <szhongna@amazon.com>
zhongnansu · Oct 28, 2021 · 5a4673d · 5a4673d
1 parent 076e353
commit 5a4673d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/dashboards-reports/public/components/context_menu/context_menu_helpers.js b/dashboards-reports/public/components/context_menu/context_menu_helpers.js
@@ -48,15 +48,13 @@ export const getTimeFieldsFromUrl = () => {
   const url = unhashUrl(window.location.href);
 
   let [, fromDateString, toDateString] = url.match(timeRangeMatcher);
-  fromDateString = fromDateString.replace(/[']+/g, '');
+  fromDateString = decodeURIComponent(fromDateString.replace(/[']+/g, ''));
   // convert time range to from date format in case time range is relative
   const fromDateFormat = dateMath.parse(fromDateString);
-  toDateString = toDateString.replace(/[']+/g, '');
-  const toDateFormat = dateMath.parse(toDateString);
+  toDateString = decodeURIComponent(toDateString.replace(/[']+/g, ''));
+  const toDateFormat = dateMath.parse(toDateString, { roundUp: true });
 
-  const timeDuration = moment.duration(
-    dateMath.parse(toDateString).diff(dateMath.parse(fromDateString))
-  );
+  const timeDuration = moment.duration(toDateFormat.diff(fromDateFormat));
 
   return {
     time_from: fromDateFormat,
@@ -141,22 +139,23 @@ export const replaceQueryURL = (pageUrl) => {
   // we unhash the url in case OpenSearch Dashboards advanced UI setting 'state:storeInSessionStorage' is turned on
   const unhashedUrl = new URL(unhashUrl(pageUrl));
   let queryUrl = unhashedUrl.pathname + unhashedUrl.hash;
-  let [, fromDateString, toDateString] = queryUrl.match(timeRangeMatcher);
-  fromDateString = fromDateString.replace(/[']+/g, '');
+  let [, fromDateStringMatch, toDateStringMatch] =
+    queryUrl.match(timeRangeMatcher);
+  fromDateString = decodeURIComponent(fromDateStringMatch.replace(/[']+/g, ''));
 
   // convert time range to from date format in case time range is relative
   const fromDateFormat = dateMath.parse(fromDateString);
-  toDateString = toDateString.replace(/[']+/g, '');
-  const toDateFormat = dateMath.parse(toDateString);
+  toDateString = decodeURIComponent(toDateStringMatch.replace(/[']+/g, ''));
+  const toDateFormat = dateMath.parse(toDateString, { roundUp: true });
 
   // replace to and from dates with absolute date
   queryUrl = queryUrl.replace(
-    fromDateString,
+    fromDateStringMatch,
     "'" + fromDateFormat.toISOString() + "'"
   );
   queryUrl = queryUrl.replace(
-    toDateString + '))',
-    "'" + toDateFormat.toISOString() + "'))"
+    toDateStringMatch,
+    "'" + toDateFormat.toISOString() + "'"
   );
   return queryUrl;
 };
diff --git a/dashboards-reports/public/components/main/report_details/report_details.tsx b/dashboards-reports/public/components/main/report_details/report_details.tsx
@@ -171,11 +171,11 @@ export function ReportDetails(props) {
       timeRangeMatcher
     );
 
-    fromDateString = fromDateString.replace(/[']+/g, '');
-    toDateString = toDateString.replace(/[']+/g, '');
+    fromDateString = decodeURIComponent(fromDateString.replace(/[']+/g, ''));
+    toDateString = decodeURIComponent(toDateString.replace(/[']+/g, ''));
 
     let fromDateParsed = dateMath.parse(fromDateString);
-    let toDateParsed = dateMath.parse(toDateString);
+    let toDateParsed = dateMath.parse(toDateString, { roundUp: true });
 
     const fromTimePeriod = fromDateParsed?.toDate();
     const toTimePeriod = toDateParsed?.toDate();