PMM-13180 Fix menu variables link generation

percona · Jun 19, 2024 · 787ecf1 · 787ecf1
1 parent e589465
commit 787ecf1
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/public/app/percona/shared/helpers/navigation.ts b/public/app/percona/shared/helpers/navigation.ts
@@ -1,7 +1,7 @@
 import { getLinkSrv } from 'app/features/panel/panellinks/link_srv';
 
 export const useLinkWithVariables = (url?: string) => {
-  if (url?.match('/d/')) {
+  if (url && isDashboardUrl(url) && isDashboardUrl(window.location.pathname)) {
     return getLinkSrv().getLinkUrl({
       url: url,
       keepTime: true,
@@ -13,9 +13,11 @@ export const useLinkWithVariables = (url?: string) => {
   }
 };
 
+const isDashboardUrl = (url?: string) => url?.match('/d/');
+
 const checkDbType = (url: string): boolean => {
-  const currentDB = window.location.pathname.split('/')[3].split('-')[0];
-  const urlDB = url.split('/')[3].split('-')[0];
+  const currentDB = window.location.pathname?.split('/')[3]?.split('-')[0];
+  const urlDB = url?.split('/')[3]?.split('-')[0];
 
-  return currentDB === urlDB;
+  return currentDB !== undefined && currentDB === urlDB;
 };