Fix reporting discover (#190)

* Fix reporting discover Signed-off-by: Derek Ho <dxho@amazon.com> * Get it to work Signed-off-by: Derek Ho <dxho@amazon.com> * Revert api file and add extra quote for regex matching Signed-off-by: Derek Ho <dxho@amazon.com> * Add extra condition if coming from dashboards management Signed-off-by: Derek Ho <dxho@amazon.com> --------- Signed-off-by: Derek Ho <dxho@amazon.com>
opensearch-project · Sep 19, 2023 · 2d643cc · 2d643cc
1 parent 379adef
commit 2d643cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/public/components/context_menu/context_menu.js b/public/components/context_menu/context_menu.js
@@ -336,6 +336,7 @@ window.onpopstate = history.onpushstate = () => {
 };
 
 const getApiPath = () => {
+  if (window.location.href.includes('/data-explorer/discover/')) return '../../../api'
   if (window.location.href.includes('/data-explorer/discover')) return '../../api'
   return '../api'
 }

diff --git a/public/components/context_menu/context_menu_helpers.js b/public/components/context_menu/context_menu_helpers.js
@@ -26,7 +26,7 @@ export const contextMenuViewReports = () =>
 export const getTimeFieldsFromUrl = () => {
   const url = unhashUrl(window.location.href);
 
-  let [, fromDateString, toDateString] = url.match(timeRangeMatcher);
+  let [, fromDateString, toDateString] = url.match(timeRangeMatcher) ?? ["", "now-15m", "now"];
   fromDateString = decodeURIComponent(fromDateString.replace(/[']+/g, ''));
   // convert time range to from date format in case time range is relative
   const fromDateFormat = dateMath.parse(fromDateString);