jett.admin.npmpackage 1.0.92 → 1.0.94

package/dist/index.js

@@ -795,31 +795,119 @@ var AppSideBar = ({
   const extractUrlFromOnClick = (onClick) => {
     if (!onClick || typeof onClick !== "function") return null;
     const funcString = onClick.toString();
-    const match = funcString.match(/window\.location\.href\s*=\s*["']([^"']+)["']/);
+    let match = funcString.match(/window\.location\.href\s*=\s*`([^`]+)`/);
+    if (!match) {
+      match = funcString.match(/window\.location\.href\s*=\s*["']([^"']+)["']/);
+    }
     if (match && match[1]) {
       try {
         if (match[1].startsWith("http://") || match[1].startsWith("https://")) {
           const url = new URL(match[1]);
-          return url.pathname;
+          return {
+            pathname: url.pathname,
+            search: url.search,
+            fullPath: url.pathname + url.search
+          };
         }
         if (match[1].startsWith("/")) {
           const url = new URL(match[1], window.location.origin);
-          return url.pathname;
+          return {
+            pathname: url.pathname,
+            search: url.search,
+            fullPath: url.pathname + url.search
+          };
         }
         return null;
       } catch {
-        const pathMatch = match[1].match(/^([^?]+)/);
-        return pathMatch ? pathMatch[1] : null;
+        const pathMatch = match[1].match(/^([^?]+)(\?.*)?$/);
+        if (pathMatch) {
+          return {
+            pathname: pathMatch[1],
+            search: pathMatch[2] || "",
+            fullPath: match[1]
+          };
+        }
+        return null;
       }
     }
     return null;
   };
-  const currentPathMatches = (menuUrl, currentPath) => {
-    if (!menuUrl || !currentPath) return false;
-    const normalizedMenuUrl = menuUrl.replace(/\/$/, "") || "/";
+  const currentUrlMatches = (menuUrlData, currentPath, currentSearch) => {
+    if (!menuUrlData || !currentPath) return false;
+    const normalizedMenuPath = menuUrlData.pathname.replace(/\/$/, "") || "/";
     const normalizedCurrentPath = currentPath.replace(/\/$/, "") || "/";
-    if (normalizedMenuUrl === normalizedCurrentPath) return true;
-    if (normalizedCurrentPath.startsWith(normalizedMenuUrl + "/")) return true;
+    if (normalizedMenuPath === "/users/users" && normalizedCurrentPath === "/users/users") {
+      const menuParams = new URLSearchParams(menuUrlData.search);
+      const currentParams = new URLSearchParams(currentSearch);
+      const menuRole = menuParams.get("role");
+      const currentRole = currentParams.get("role");
+      if (menuRole && currentRole) {
+        return menuRole === currentRole;
+      }
+      if (menuRole && !currentRole || !menuRole && currentRole) {
+        return false;
+      }
+      return true;
+    }
+    if (normalizedMenuPath === "/corporate" && normalizedCurrentPath.startsWith("/org/organizations")) {
+      return true;
+    }
+    if (normalizedMenuPath === "/trips") {
+      if (normalizedCurrentPath.startsWith("/tripdetails") || normalizedCurrentPath.startsWith("/offline")) {
+        return true;
+      }
+    }
+    if (normalizedMenuPath === "/orgselector" && menuUrlData.search) {
+      const menuPathParam = new URLSearchParams(menuUrlData.search).get("path");
+      if (menuPathParam) {
+        const pathRouteMap = {
+          "offer": "/offer/offer",
+          "voucher": "/voucher/voucher",
+          "tag": "/tags/tags",
+          "special-requests": "/corporate/special-requests",
+          "pricing-policy": "/policies/pricing-policy",
+          "users": "/users/users"
+          // Consumer Ecosystem Users (no role param)
+        };
+        const expectedRoute = pathRouteMap[menuPathParam];
+        if (expectedRoute) {
+          if (normalizedCurrentPath === expectedRoute || normalizedCurrentPath.startsWith(expectedRoute + "/")) {
+            if (menuPathParam === "users") {
+              const currentParams = new URLSearchParams(currentSearch);
+              const currentRole = currentParams.get("role");
+              return currentRole !== "admin";
+            }
+            return true;
+          }
+        }
+      }
+      if (normalizedCurrentPath === "/orgselector") {
+        const menuPathParam2 = new URLSearchParams(menuUrlData.search).get("path");
+        const currentPathParam = new URLSearchParams(currentSearch).get("path");
+        if (menuPathParam2 && currentPathParam) {
+          return menuPathParam2 === currentPathParam;
+        }
+      }
+    }
+    if (normalizedMenuPath === normalizedCurrentPath) {
+      if (menuUrlData.search) {
+        const menuParams = new URLSearchParams(menuUrlData.search);
+        const currentParams = new URLSearchParams(currentSearch);
+        for (const [key, value] of menuParams.entries()) {
+          if (key === "auth") {
+            continue;
+          }
+          if (currentParams.get(key) !== value) {
+            return false;
+          }
+        }
+        return true;
+      }
+      return true;
+    }
+    if (normalizedCurrentPath.startsWith(normalizedMenuPath + "/")) {
+      return true;
+    }
     return false;
   };
   const navItemsLocal = navItems ?? navItemsConstant;
@@ -827,27 +915,28 @@ var AppSideBar = ({
   const sideBarLogoLocal = sideBarLogo ?? logo_white_default;
   const detectAndSetActiveMenu = (0, import_react12.useCallback)(() => {
     const currentPath = window.location.pathname;
+    const currentSearch = window.location.search;
     const newOpenMenus = /* @__PURE__ */ new Set();
     let foundActivePath = null;
     navItemsLocal.forEach((item, index) => {
       if (!item.isDropDown && item.onClick && typeof item.onClick === "function") {
-        const itemUrl = extractUrlFromOnClick(item.onClick);
-        if (itemUrl && currentPathMatches(itemUrl, currentPath)) {
+        const itemUrlData = extractUrlFromOnClick(item.onClick);
+        if (itemUrlData && currentUrlMatches(itemUrlData, currentPath, currentSearch)) {
           foundActivePath = `menu-${index}`;
         }
       }
       if (item.options && item.options.length > 0) {
         item.options.forEach((option, optionsIndex) => {
           if (option.onClick && typeof option.onClick === "function") {
-            const optionUrl = extractUrlFromOnClick(option.onClick);
-            if (optionUrl && currentPathMatches(optionUrl, currentPath)) {
+            const optionUrlData = extractUrlFromOnClick(option.onClick);
+            if (optionUrlData && currentUrlMatches(optionUrlData, currentPath, currentSearch)) {
               const menuKey = `menu-${index}`;
               newOpenMenus.add(menuKey);
               foundActivePath = `menu-${index}-option-${optionsIndex}`;
               if (option.options && option.options.length > 0) {
                 option.options.forEach((subOption, subIndex) => {
-                  const subOptionUrl = extractUrlFromOnClick(subOption.onClick);
-                  if (subOptionUrl && currentPathMatches(subOptionUrl, currentPath)) {
+                  const subOptionUrlData = extractUrlFromOnClick(subOption.onClick);
+                  if (subOptionUrlData && currentUrlMatches(subOptionUrlData, currentPath, currentSearch)) {
                     const subMenuKey = `menu-${index}-option-${optionsIndex}`;
                     newOpenMenus.add(subMenuKey);
                     foundActivePath = `menu-${index}-option-${optionsIndex}-sub-${subOption.label}`;
@@ -864,18 +953,38 @@ var AppSideBar = ({
       setActiveMenuPath(foundActivePath);
     }
   }, [navItemsLocal]);
+  const [currentUrl, setCurrentUrl] = (0, import_react12.useState)(
+    () => window.location.pathname + window.location.search
+  );
   (0, import_react12.useEffect)(() => {
     detectAndSetActiveMenu();
+    setCurrentUrl(window.location.pathname + window.location.search);
   }, [detectAndSetActiveMenu]);
   (0, import_react12.useEffect)(() => {
+    let lastUrl = window.location.pathname + window.location.search;
     const handleLocationChange = () => {
-      detectAndSetActiveMenu();
+      const newUrl = window.location.pathname + window.location.search;
+      if (newUrl !== lastUrl) {
+        lastUrl = newUrl;
+        setCurrentUrl(newUrl);
+        detectAndSetActiveMenu();
+      }
     };
     window.addEventListener("popstate", handleLocationChange);
+    const checkInterval = setInterval(() => {
+      const newUrl = window.location.pathname + window.location.search;
+      if (newUrl !== lastUrl) {
+        handleLocationChange();
+      }
+    }, 250);
     return () => {
       window.removeEventListener("popstate", handleLocationChange);
+      clearInterval(checkInterval);
     };
   }, [detectAndSetActiveMenu]);
+  (0, import_react12.useEffect)(() => {
+    detectAndSetActiveMenu();
+  }, [currentUrl, detectAndSetActiveMenu]);
   const toggleMobileMenu = () => {
     setIsMobileMenuOpen(!isMobileMenuOpen);
   };

package/dist/index.mjs

@@ -766,31 +766,119 @@ var AppSideBar = ({
   const extractUrlFromOnClick = (onClick) => {
     if (!onClick || typeof onClick !== "function") return null;
     const funcString = onClick.toString();
-    const match = funcString.match(/window\.location\.href\s*=\s*["']([^"']+)["']/);
+    let match = funcString.match(/window\.location\.href\s*=\s*`([^`]+)`/);
+    if (!match) {
+      match = funcString.match(/window\.location\.href\s*=\s*["']([^"']+)["']/);
+    }
     if (match && match[1]) {
       try {
         if (match[1].startsWith("http://") || match[1].startsWith("https://")) {
           const url = new URL(match[1]);
-          return url.pathname;
+          return {
+            pathname: url.pathname,
+            search: url.search,
+            fullPath: url.pathname + url.search
+          };
         }
         if (match[1].startsWith("/")) {
           const url = new URL(match[1], window.location.origin);
-          return url.pathname;
+          return {
+            pathname: url.pathname,
+            search: url.search,
+            fullPath: url.pathname + url.search
+          };
         }
         return null;
       } catch {
-        const pathMatch = match[1].match(/^([^?]+)/);
-        return pathMatch ? pathMatch[1] : null;
+        const pathMatch = match[1].match(/^([^?]+)(\?.*)?$/);
+        if (pathMatch) {
+          return {
+            pathname: pathMatch[1],
+            search: pathMatch[2] || "",
+            fullPath: match[1]
+          };
+        }
+        return null;
       }
     }
     return null;
   };
-  const currentPathMatches = (menuUrl, currentPath) => {
-    if (!menuUrl || !currentPath) return false;
-    const normalizedMenuUrl = menuUrl.replace(/\/$/, "") || "/";
+  const currentUrlMatches = (menuUrlData, currentPath, currentSearch) => {
+    if (!menuUrlData || !currentPath) return false;
+    const normalizedMenuPath = menuUrlData.pathname.replace(/\/$/, "") || "/";
     const normalizedCurrentPath = currentPath.replace(/\/$/, "") || "/";
-    if (normalizedMenuUrl === normalizedCurrentPath) return true;
-    if (normalizedCurrentPath.startsWith(normalizedMenuUrl + "/")) return true;
+    if (normalizedMenuPath === "/users/users" && normalizedCurrentPath === "/users/users") {
+      const menuParams = new URLSearchParams(menuUrlData.search);
+      const currentParams = new URLSearchParams(currentSearch);
+      const menuRole = menuParams.get("role");
+      const currentRole = currentParams.get("role");
+      if (menuRole && currentRole) {
+        return menuRole === currentRole;
+      }
+      if (menuRole && !currentRole || !menuRole && currentRole) {
+        return false;
+      }
+      return true;
+    }
+    if (normalizedMenuPath === "/corporate" && normalizedCurrentPath.startsWith("/org/organizations")) {
+      return true;
+    }
+    if (normalizedMenuPath === "/trips") {
+      if (normalizedCurrentPath.startsWith("/tripdetails") || normalizedCurrentPath.startsWith("/offline")) {
+        return true;
+      }
+    }
+    if (normalizedMenuPath === "/orgselector" && menuUrlData.search) {
+      const menuPathParam = new URLSearchParams(menuUrlData.search).get("path");
+      if (menuPathParam) {
+        const pathRouteMap = {
+          "offer": "/offer/offer",
+          "voucher": "/voucher/voucher",
+          "tag": "/tags/tags",
+          "special-requests": "/corporate/special-requests",
+          "pricing-policy": "/policies/pricing-policy",
+          "users": "/users/users"
+          // Consumer Ecosystem Users (no role param)
+        };
+        const expectedRoute = pathRouteMap[menuPathParam];
+        if (expectedRoute) {
+          if (normalizedCurrentPath === expectedRoute || normalizedCurrentPath.startsWith(expectedRoute + "/")) {
+            if (menuPathParam === "users") {
+              const currentParams = new URLSearchParams(currentSearch);
+              const currentRole = currentParams.get("role");
+              return currentRole !== "admin";
+            }
+            return true;
+          }
+        }
+      }
+      if (normalizedCurrentPath === "/orgselector") {
+        const menuPathParam2 = new URLSearchParams(menuUrlData.search).get("path");
+        const currentPathParam = new URLSearchParams(currentSearch).get("path");
+        if (menuPathParam2 && currentPathParam) {
+          return menuPathParam2 === currentPathParam;
+        }
+      }
+    }
+    if (normalizedMenuPath === normalizedCurrentPath) {
+      if (menuUrlData.search) {
+        const menuParams = new URLSearchParams(menuUrlData.search);
+        const currentParams = new URLSearchParams(currentSearch);
+        for (const [key, value] of menuParams.entries()) {
+          if (key === "auth") {
+            continue;
+          }
+          if (currentParams.get(key) !== value) {
+            return false;
+          }
+        }
+        return true;
+      }
+      return true;
+    }
+    if (normalizedCurrentPath.startsWith(normalizedMenuPath + "/")) {
+      return true;
+    }
     return false;
   };
   const navItemsLocal = navItems ?? navItemsConstant;
@@ -798,27 +886,28 @@ var AppSideBar = ({
   const sideBarLogoLocal = sideBarLogo ?? logo_white_default;
   const detectAndSetActiveMenu = useCallback(() => {
     const currentPath = window.location.pathname;
+    const currentSearch = window.location.search;
     const newOpenMenus = /* @__PURE__ */ new Set();
     let foundActivePath = null;
     navItemsLocal.forEach((item, index) => {
       if (!item.isDropDown && item.onClick && typeof item.onClick === "function") {
-        const itemUrl = extractUrlFromOnClick(item.onClick);
-        if (itemUrl && currentPathMatches(itemUrl, currentPath)) {
+        const itemUrlData = extractUrlFromOnClick(item.onClick);
+        if (itemUrlData && currentUrlMatches(itemUrlData, currentPath, currentSearch)) {
           foundActivePath = `menu-${index}`;
         }
       }
       if (item.options && item.options.length > 0) {
         item.options.forEach((option, optionsIndex) => {
           if (option.onClick && typeof option.onClick === "function") {
-            const optionUrl = extractUrlFromOnClick(option.onClick);
-            if (optionUrl && currentPathMatches(optionUrl, currentPath)) {
+            const optionUrlData = extractUrlFromOnClick(option.onClick);
+            if (optionUrlData && currentUrlMatches(optionUrlData, currentPath, currentSearch)) {
               const menuKey = `menu-${index}`;
               newOpenMenus.add(menuKey);
               foundActivePath = `menu-${index}-option-${optionsIndex}`;
               if (option.options && option.options.length > 0) {
                 option.options.forEach((subOption, subIndex) => {
-                  const subOptionUrl = extractUrlFromOnClick(subOption.onClick);
-                  if (subOptionUrl && currentPathMatches(subOptionUrl, currentPath)) {
+                  const subOptionUrlData = extractUrlFromOnClick(subOption.onClick);
+                  if (subOptionUrlData && currentUrlMatches(subOptionUrlData, currentPath, currentSearch)) {
                     const subMenuKey = `menu-${index}-option-${optionsIndex}`;
                     newOpenMenus.add(subMenuKey);
                     foundActivePath = `menu-${index}-option-${optionsIndex}-sub-${subOption.label}`;
@@ -835,18 +924,38 @@ var AppSideBar = ({
       setActiveMenuPath(foundActivePath);
     }
   }, [navItemsLocal]);
+  const [currentUrl, setCurrentUrl] = useState3(
+    () => window.location.pathname + window.location.search
+  );
   useEffect(() => {
     detectAndSetActiveMenu();
+    setCurrentUrl(window.location.pathname + window.location.search);
   }, [detectAndSetActiveMenu]);
   useEffect(() => {
+    let lastUrl = window.location.pathname + window.location.search;
     const handleLocationChange = () => {
-      detectAndSetActiveMenu();
+      const newUrl = window.location.pathname + window.location.search;
+      if (newUrl !== lastUrl) {
+        lastUrl = newUrl;
+        setCurrentUrl(newUrl);
+        detectAndSetActiveMenu();
+      }
     };
     window.addEventListener("popstate", handleLocationChange);
+    const checkInterval = setInterval(() => {
+      const newUrl = window.location.pathname + window.location.search;
+      if (newUrl !== lastUrl) {
+        handleLocationChange();
+      }
+    }, 250);
     return () => {
       window.removeEventListener("popstate", handleLocationChange);
+      clearInterval(checkInterval);
     };
   }, [detectAndSetActiveMenu]);
+  useEffect(() => {
+    detectAndSetActiveMenu();
+  }, [currentUrl, detectAndSetActiveMenu]);
   const toggleMobileMenu = () => {
     setIsMobileMenuOpen(!isMobileMenuOpen);
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jett.admin.npmpackage",
-  "version": "1.0.92",
+  "version": "1.0.94",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "exports": {