support reporting for new discover

Signed-off-by: Joshua Li <[email protected]>
opensearch-project · Sep 15, 2023 · ce029eb · ce029eb
1 parent 7b1fe25
commit ce029eb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/public/components/context_menu/context_menu.js b/public/components/context_menu/context_menu.js
@@ -278,7 +278,7 @@ const isVisualizationNavMenu = (navMenu) => {
 function locationHashChanged() {
   const observer = new MutationObserver(function (mutations) {
     const navMenu = document.querySelectorAll(
-      'span.osdTopNavMenu__wrapper > nav.euiHeaderLinks > div.euiHeaderLinks__list'
+      'nav.euiHeaderLinks > div.euiHeaderLinks__list'
     );
     if (
       navMenu &&

diff --git a/server/utils/__tests__/validationHelper.test.ts b/server/utils/__tests__/validationHelper.test.ts
@@ -215,6 +215,14 @@ describe('test input validation', () => {
         '/_dashboards/app/visualize&security_tenant=/.%2e/.%2e/.%2e/.%2e/_dashboards?#/view/id',
         false,
       ],
+      [
+        '/app/data-explorer/discover/#/view/571aaf70-4c88-11e8-b3d7-01146121b73d',
+        true,
+      ],
+      [
+        '/app/discoverLegacy#/view/571aaf70-4c88-11e8-b3d7-01146121b73d',
+        true,
+      ],
     ];
     expect(urls.map((url) => isValidRelativeUrl(url[0]))).toEqual(
       urls.map((url) => url[1])

diff --git a/server/utils/validationHelper.ts b/server/utils/validationHelper.ts
@@ -37,7 +37,7 @@ export const isValidRelativeUrl = (relativeUrl: string) => {
 export const regexDuration = /^(-?)P(?=\d|T\d)(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)([DW]))?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+(?:\.\d+)?)S)?)?$/;
 export const regexEmailAddress = /\S+@\S+\.\S+/;
 export const regexReportName = /^[\w\-\s\(\)\[\]\,\_\-+]+$/;
-export const regexRelativeUrl = /^\/(_plugin\/kibana\/|_dashboards\/)?app\/(dashboards|visualize|discover|observability-dashboards|observability-notebooks|notebooks-dashboards\?view=output_only(&security_tenant=.+)?)(\?security_tenant=.+)?#\/(notebooks\/|view\/|edit\/)?[^\/]+$/;
+export const regexRelativeUrl = /^\/(_plugin\/kibana\/|_dashboards\/)?app\/(dashboards|visualize|discover|discoverLegacy|data-explorer\/discover\/|observability-dashboards|observability-notebooks|notebooks-dashboards\?view=output_only(&security_tenant=.+)?)(\?security_tenant=.+)?#\/(notebooks\/|view\/|edit\/)?[^\/]+$/;
 
 export const validateReport = async (
   client: ILegacyScopedClusterClient,