Fix url validation for context menu (#134) (#135)

* Fix url validation for context menu Signed-off-by: Joshua Li <[email protected]> * Fix url validation Signed-off-by: Joshua Li <[email protected]>
opensearch-project · Jul 28, 2021 · 076e353 · 076e353
1 parent 0bfa7db
commit 076e353
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/dashboards-reports/public/components/context_menu/context_menu.js b/dashboards-reports/public/components/context_menu/context_menu.js
@@ -66,11 +66,11 @@ const generateInContextReport = async (
   }
 
   let reportSource = '';
-  if (baseUrl.includes('dashboard')) {
+  if (/\/app\/dashboards/.test(baseUrl)) {
     reportSource = 'Dashboard';
-  } else if (baseUrl.includes('visualize')) {
+  } else if (/\/app\/visualize/.test(baseUrl)) {
     reportSource = 'Visualization';
-  } else if (baseUrl.includes('discover')) {
+  } else if (/\/app\/discover/.test(baseUrl)) {
     reportSource = 'Saved search';
   }
 

diff --git a/dashboards-reports/public/components/context_menu/context_menu_helpers.js b/dashboards-reports/public/components/context_menu/context_menu_helpers.js
@@ -71,11 +71,11 @@ export const contextMenuCreateReportDefinition = (baseURI) => {
   const timeRanges = getTimeFieldsFromUrl();
 
   // check report source
-  if (baseURI.includes('dashboard')) {
+  if (/\/app\/dashboards/.test(baseURI)) {
     reportSource = 'dashboard:';
-  } else if (baseURI.includes('visualize')) {
+  } else if (/\/app\/visualize/.test(baseURI)) {
     reportSource = 'visualize:';
-  } else if (baseURI.includes('discover')) {
+  } else if (/\/app\/discover/.test(baseURI)) {
     reportSource = 'discover:';
   }
   reportSource += reportSourceId.toString();