jett.admin.npmpackage 1.0.99 → 1.0.100

package/dist/index.css

@@ -53,6 +53,7 @@
     --text-base--line-height: calc(1.5 / 1);
     --text-lg: 1.125rem;
     --text-lg--line-height: calc(1.75 / 1.125);
+    --font-weight-normal: 400;
     --font-weight-medium: 500;
     --font-weight-semibold: 600;
     --radius-sm: 0.25rem;
@@ -777,6 +778,15 @@
     font-size: var(--text-xs);
     line-height: var(--tw-leading, var(--text-xs--line-height));
   }
+  .\!text-\[14px\] {
+    font-size: 14px !important;
+  }
+  .\!text-\[15px\] {
+    font-size: 15px !important;
+  }
+  .\!text-\[16px\] {
+    font-size: 16px !important;
+  }
   .text-\[12px\] {
     font-size: 12px;
   }
@@ -794,6 +804,18 @@
     --tw-leading: calc(var(--spacing) * 6);
     line-height: calc(var(--spacing) * 6);
   }
+  .\!font-medium {
+    --tw-font-weight: var(--font-weight-medium) !important;
+    font-weight: var(--font-weight-medium) !important;
+  }
+  .\!font-normal {
+    --tw-font-weight: var(--font-weight-normal) !important;
+    font-weight: var(--font-weight-normal) !important;
+  }
+  .\!font-semibold {
+    --tw-font-weight: var(--font-weight-semibold) !important;
+    font-weight: var(--font-weight-semibold) !important;
+  }
   .font-\[500\] {
     --tw-font-weight: 500;
     font-weight: 500;
@@ -810,8 +832,11 @@
     --tw-font-weight: var(--font-weight-semibold);
     font-weight: var(--font-weight-semibold);
   }
-  .text-\[\#000\] {
-    color: #000;
+  .\!text-\[\#000\] {
+    color: #000 !important;
+  }
+  .\!text-\[\#3f3f46cc\] {
+    color: #3f3f46cc !important;
   }
   .text-\[\#3f3f46cc\] {
     color: #3f3f46cc;
@@ -1288,6 +1313,9 @@
     }
   }
 }
+body {
+  font-family: "Inter", sans-serif;
+}
 @layer utilities {
   .scrollbar-hide {
     scrollbar-width: none;

package/dist/index.js

@@ -455,33 +455,6 @@ var navItemsConstant = [
     },
     isDropDown: false
   },
-  {
-    Icon: import_lucide_react4.Globe,
-    label: "TMC Ecosystem",
-    onClick: () => {
-    },
-    isDropDown: true,
-    options: [
-      {
-        label: "Markets",
-        onClick: () => {
-          window.location.href = "/market/";
-        }
-      },
-      {
-        label: "Users",
-        onClick: () => {
-          window.location.href = `/users/users?role=admin&auth=${encodedAuthData}`;
-        }
-      },
-      {
-        label: "Supplier Ecosystem",
-        onClick: () => {
-          window.location.href = "/supplier/";
-        }
-      }
-    ]
-  },
   {
     Icon: import_lucide_react4.Building,
     label: "Consumer Ecosystem",
@@ -501,43 +474,51 @@ var navItemsConstant = [
         }
       },
       {
-        label: "Booking History",
+        label: "Users",
         onClick: () => {
-          window.location.href = "/finance/bookingHistory/";
+          window.location.href = "/users/users";
         }
       },
       {
-        label: "Reports",
+        label: "Tags (Consumer Variables)",
         onClick: () => {
-          window.open("https://viz.jett.travel", "_blank");
+          window.location.href = "/orgselector/?path=tag";
         }
       },
       {
-        label: "Users",
+        label: "Special Request",
         onClick: () => {
-          window.location.href = "/users/users";
+          window.location.href = "/orgselector/?path=special-requests";
         }
       },
       {
-        label: "Tags",
-        onClick: () => {
-          window.location.href = "/orgselector/?path=tag";
-        }
-      },
+        label: "Support Tickets (Coming Soon)",
+        isDisabled: true
+        // onClick: () => {},
+      }
+    ],
+    isDropDown: true
+  },
+  {
+    Icon: import_lucide_react4.Banknote,
+    label: "Finance",
+    onClick: () => {
+    },
+    isDropDown: true,
+    options: [
       {
-        label: "Payment Ledger",
+        label: "Credit Management",
         onClick: () => {
           window.location.href = "/finance/paymentsLedger/";
         }
       },
       {
-        label: "Special Request",
+        label: "Booking & Invoices",
         onClick: () => {
-          window.location.href = "/orgselector/?path=special-requests";
+          window.location.href = "/finance/bookingHistory/";
         }
       }
-    ],
-    isDropDown: true
+    ]
   },
   {
     Icon: import_lucide_react4.DollarSign,
@@ -547,7 +528,7 @@ var navItemsConstant = [
     isDropDown: true,
     options: [
       {
-        label: "Pricing Policy",
+        label: "Pricing Engine",
         onClick: () => {
           window.location.href = "/orgselector/?path=pricing-policy";
         }
@@ -563,21 +544,46 @@ var navItemsConstant = [
         onClick: () => {
           window.location.href = "/orgselector/?path=voucher";
         }
-      },
+      }
+    ]
+  },
+  {
+    Icon: import_lucide_react4.Handshake,
+    label: "Supplier Ecosystem",
+    onClick: () => {
+    },
+    isDropDown: true,
+    options: [
       {
-        label: "Supplier Deals",
+        label: "Suppliers List",
         onClick: () => {
-          window.location.href = "/supplierdeals/";
+          window.location.href = "/supplier/";
         }
       },
       {
-        label: "Invoices",
+        label: "Supplier Deals",
         onClick: () => {
-          window.location.href = "/finance/invoices/";
+          window.location.href = "/supplierdeals/";
         }
       }
     ]
   },
+  {
+    Icon: import_lucide_react4.BarChart3,
+    label: "Reports",
+    onClick: () => {
+    },
+    isDropDown: true,
+    options: [
+      {
+        label: "Reports (Coming Soon)",
+        isDisabled: true
+        // onClick: () => {
+        //   window.open("https://viz.jett.travel", "_blank");
+        // },
+      }
+    ]
+  },
   {
     Icon: import_lucide_react4.Cog,
     label: "Settings",
@@ -590,6 +596,23 @@ var navItemsConstant = [
         onClick: () => {
           window.location.href = "/whitelabel/";
         }
+      },
+      {
+        label: "Markets",
+        onClick: () => {
+          window.location.href = "/market/";
+        }
+      },
+      {
+        label: "Users",
+        onClick: () => {
+          window.location.href = `/users/users?role=admin&auth=${encodedAuthData}`;
+        }
+      },
+      {
+        label: "Reports Configurations (Coming Soon)",
+        isDisabled: true
+        // onClick: () => {},
       }
     ]
   }
@@ -795,31 +818,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 +938,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 +976,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);
   };
@@ -932,7 +1064,7 @@ var AppSideBar = ({
           onClick: (e) => handleMenuClick(item, index, e)
         },
         /* @__PURE__ */ import_react12.default.createElement("div", { className: "text-primary" }, /* @__PURE__ */ import_react12.default.createElement(item.Icon, { width: 20, height: 20 })),
-        /* @__PURE__ */ import_react12.default.createElement("span", { className: "font-medium text-base text-[#000] dark:text-[#f4f4f5cc]" }, item.label),
+        /* @__PURE__ */ import_react12.default.createElement("span", { className: "!font-medium !text-[16px] !text-[#000] dark:text-[#f4f4f5cc]" }, item.label),
         item.isDropDown && /* @__PURE__ */ import_react12.default.createElement("div", { className: `ml-auto transition-all delay-75 ${isOpen ? "rotate-180" : ""}` }, /* @__PURE__ */ import_react12.default.createElement(import_lucide_react6.ChevronDown, { width: 20, height: 20, className: "text-gray-500 dark:text-gray-400" }))
       ), item.options && item.options.length > 0 && /* @__PURE__ */ import_react12.default.createElement(
         "div",
@@ -950,7 +1082,7 @@ var AppSideBar = ({
               onClick: (e) => handleSubMenuClick(options, optionsIndex, index, e)
             },
             /* @__PURE__ */ import_react12.default.createElement("div", null),
-            /* @__PURE__ */ import_react12.default.createElement("span", { className: "font-medium text-base text-[#3f3f46cc] dark:text-[#a1a1aa]" }, options.label),
+            /* @__PURE__ */ import_react12.default.createElement("span", { className: "!font-medium !text-[15px] !text-[#3f3f46cc] dark:text-[#a1a1aa]" }, options.label),
             options.isDropDown && /* @__PURE__ */ import_react12.default.createElement(
               "div",
               {
@@ -987,7 +1119,7 @@ var AppSideBar = ({
           window.location.href = "/profile";
         }
       },
-      /* @__PURE__ */ import_react12.default.createElement("div", { className: "flex items-center gap-3" }, /* @__PURE__ */ import_react12.default.createElement("span", { className: "relative flex shrink-0 overflow-hidden dark:bg-[#27272a] rounded-full h-10 w-10" }, /* @__PURE__ */ import_react12.default.createElement("span", { className: "flex h-full w-full items-center justify-center rounded-full bg-muted dark:text-white" }, ((_a = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _a.UserName) ? authData.userInfo.UserName.split("")[0] : "A")), /* @__PURE__ */ import_react12.default.createElement("div", null, /* @__PURE__ */ import_react12.default.createElement("p", { className: "font-semibold dark:text-white" }, ((_b = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _b.UserName) ? authData.userInfo.UserName : "Admin User"), /* @__PURE__ */ import_react12.default.createElement("p", { className: "text-sm  dark:text-[#f4f4f5cc]" }, role)))
+      /* @__PURE__ */ import_react12.default.createElement("div", { className: "flex items-center gap-3" }, /* @__PURE__ */ import_react12.default.createElement("span", { className: "relative flex shrink-0 overflow-hidden dark:bg-[#27272a] rounded-full h-10 w-10" }, /* @__PURE__ */ import_react12.default.createElement("span", { className: "flex h-full w-full items-center justify-center !text-[16px] !font-normal border border-gray-200 dark:border-[#303036] rounded-full bg-muted dark:text-white" }, ((_a = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _a.UserName) ? authData.userInfo.UserName.split("")[0] : "A")), /* @__PURE__ */ import_react12.default.createElement("div", null, /* @__PURE__ */ import_react12.default.createElement("p", { className: "!font-semibold dark:text-white !text-[16px]" }, ((_b = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _b.UserName) ? authData.userInfo.UserName : "Admin"), /* @__PURE__ */ import_react12.default.createElement("p", { className: "!text-[14px] !font-normal dark:text-[#f4f4f5cc]" }, role)))
     ))
   ));
 };
@@ -1167,7 +1299,7 @@ var Pagination = ({
               tableHeader,
               isHideCheckbox
             },
-            paginatedData.map((item, index) => {
+            data.map((item, index) => {
               return /* @__PURE__ */ import_react15.default.createElement(
                 ComponentType,
                 {
@@ -1249,7 +1381,7 @@ var Pagination = ({
     {
       key: pageNum,
       onClick: () => handlePageChange(pageNum),
-      className: `flex items-center justify-center min-w-9 h-9 px-3 rounded-md border border-[#e5e5e5] dark:border-[#303036] text-sm transition-colors ${currentPage === pageNum ? "bg-primary text-white border-primary dark:bg-primary" : "bg-white text-black hover:bg-gray-50 dark:bg-[#18181b] dark:text-white dark:hover:bg-[#27272a]"}`
+      className: `flex items-center justify-center min-w-9 h-9 px-3 cursor-pointer rounded-md border border-[#e5e5e5] dark:border-[#303036] text-sm transition-colors ${currentPage === pageNum ? "bg-primary text-white border-primary dark:bg-primary" : "bg-white text-black hover:bg-gray-50 dark:bg-[#18181b] dark:text-white dark:hover:bg-[#27272a]"}`
     },
     pageNum
   )), /* @__PURE__ */ import_react15.default.createElement(

package/dist/index.mjs

@@ -393,7 +393,7 @@ var CustomUpload = ({
 // src/sideBar/SideBar.jsx
 import {
   ChevronDown as ChevronDown3,
-  Globe as Globe2,
+  Globe,
   LogOut,
   Menu,
   X
@@ -403,18 +403,13 @@ import React12, { useEffect, useState as useState3, useCallback } from "react";
 // ConstantUI.js
 import {
   Home,
-  BaggageClaim,
-  Users,
   Banknote,
-  Globe,
-  TrendingUp,
-  FileText,
-  FileKey2,
   LifeBuoy,
   Cog,
   Building,
   Handshake,
-  DollarSign
+  DollarSign,
+  BarChart3
 } from "lucide-react";
 var encodedAuthData = localStorage.getItem("encodedAuthData");
 var navItemsConstant = [
@@ -426,33 +421,6 @@ var navItemsConstant = [
     },
     isDropDown: false
   },
-  {
-    Icon: Globe,
-    label: "TMC Ecosystem",
-    onClick: () => {
-    },
-    isDropDown: true,
-    options: [
-      {
-        label: "Markets",
-        onClick: () => {
-          window.location.href = "/market/";
-        }
-      },
-      {
-        label: "Users",
-        onClick: () => {
-          window.location.href = `/users/users?role=admin&auth=${encodedAuthData}`;
-        }
-      },
-      {
-        label: "Supplier Ecosystem",
-        onClick: () => {
-          window.location.href = "/supplier/";
-        }
-      }
-    ]
-  },
   {
     Icon: Building,
     label: "Consumer Ecosystem",
@@ -472,43 +440,51 @@ var navItemsConstant = [
         }
       },
       {
-        label: "Booking History",
+        label: "Users",
         onClick: () => {
-          window.location.href = "/finance/bookingHistory/";
+          window.location.href = "/users/users";
         }
       },
       {
-        label: "Reports",
+        label: "Tags (Consumer Variables)",
         onClick: () => {
-          window.open("https://viz.jett.travel", "_blank");
+          window.location.href = "/orgselector/?path=tag";
         }
       },
       {
-        label: "Users",
+        label: "Special Request",
         onClick: () => {
-          window.location.href = "/users/users";
+          window.location.href = "/orgselector/?path=special-requests";
         }
       },
       {
-        label: "Tags",
-        onClick: () => {
-          window.location.href = "/orgselector/?path=tag";
-        }
-      },
+        label: "Support Tickets (Coming Soon)",
+        isDisabled: true
+        // onClick: () => {},
+      }
+    ],
+    isDropDown: true
+  },
+  {
+    Icon: Banknote,
+    label: "Finance",
+    onClick: () => {
+    },
+    isDropDown: true,
+    options: [
       {
-        label: "Payment Ledger",
+        label: "Credit Management",
         onClick: () => {
           window.location.href = "/finance/paymentsLedger/";
         }
       },
       {
-        label: "Special Request",
+        label: "Booking & Invoices",
         onClick: () => {
-          window.location.href = "/orgselector/?path=special-requests";
+          window.location.href = "/finance/bookingHistory/";
         }
       }
-    ],
-    isDropDown: true
+    ]
   },
   {
     Icon: DollarSign,
@@ -518,7 +494,7 @@ var navItemsConstant = [
     isDropDown: true,
     options: [
       {
-        label: "Pricing Policy",
+        label: "Pricing Engine",
         onClick: () => {
           window.location.href = "/orgselector/?path=pricing-policy";
         }
@@ -534,21 +510,46 @@ var navItemsConstant = [
         onClick: () => {
           window.location.href = "/orgselector/?path=voucher";
         }
-      },
+      }
+    ]
+  },
+  {
+    Icon: Handshake,
+    label: "Supplier Ecosystem",
+    onClick: () => {
+    },
+    isDropDown: true,
+    options: [
       {
-        label: "Supplier Deals",
+        label: "Suppliers List",
         onClick: () => {
-          window.location.href = "/supplierdeals/";
+          window.location.href = "/supplier/";
         }
       },
       {
-        label: "Invoices",
+        label: "Supplier Deals",
         onClick: () => {
-          window.location.href = "/finance/invoices/";
+          window.location.href = "/supplierdeals/";
         }
       }
     ]
   },
+  {
+    Icon: BarChart3,
+    label: "Reports",
+    onClick: () => {
+    },
+    isDropDown: true,
+    options: [
+      {
+        label: "Reports (Coming Soon)",
+        isDisabled: true
+        // onClick: () => {
+        //   window.open("https://viz.jett.travel", "_blank");
+        // },
+      }
+    ]
+  },
   {
     Icon: Cog,
     label: "Settings",
@@ -561,6 +562,23 @@ var navItemsConstant = [
         onClick: () => {
           window.location.href = "/whitelabel/";
         }
+      },
+      {
+        label: "Markets",
+        onClick: () => {
+          window.location.href = "/market/";
+        }
+      },
+      {
+        label: "Users",
+        onClick: () => {
+          window.location.href = `/users/users?role=admin&auth=${encodedAuthData}`;
+        }
+      },
+      {
+        label: "Reports Configurations (Coming Soon)",
+        isDisabled: true
+        // onClick: () => {},
       }
     ]
   }
@@ -766,31 +784,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 +904,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 +942,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);
   };
@@ -903,7 +1030,7 @@ var AppSideBar = ({
           onClick: (e) => handleMenuClick(item, index, e)
         },
         /* @__PURE__ */ React12.createElement("div", { className: "text-primary" }, /* @__PURE__ */ React12.createElement(item.Icon, { width: 20, height: 20 })),
-        /* @__PURE__ */ React12.createElement("span", { className: "font-medium text-base text-[#000] dark:text-[#f4f4f5cc]" }, item.label),
+        /* @__PURE__ */ React12.createElement("span", { className: "!font-medium !text-[16px] !text-[#000] dark:text-[#f4f4f5cc]" }, item.label),
         item.isDropDown && /* @__PURE__ */ React12.createElement("div", { className: `ml-auto transition-all delay-75 ${isOpen ? "rotate-180" : ""}` }, /* @__PURE__ */ React12.createElement(ChevronDown3, { width: 20, height: 20, className: "text-gray-500 dark:text-gray-400" }))
       ), item.options && item.options.length > 0 && /* @__PURE__ */ React12.createElement(
         "div",
@@ -921,7 +1048,7 @@ var AppSideBar = ({
               onClick: (e) => handleSubMenuClick(options, optionsIndex, index, e)
             },
             /* @__PURE__ */ React12.createElement("div", null),
-            /* @__PURE__ */ React12.createElement("span", { className: "font-medium text-base text-[#3f3f46cc] dark:text-[#a1a1aa]" }, options.label),
+            /* @__PURE__ */ React12.createElement("span", { className: "!font-medium !text-[15px] !text-[#3f3f46cc] dark:text-[#a1a1aa]" }, options.label),
             options.isDropDown && /* @__PURE__ */ React12.createElement(
               "div",
               {
@@ -958,7 +1085,7 @@ var AppSideBar = ({
           window.location.href = "/profile";
         }
       },
-      /* @__PURE__ */ React12.createElement("div", { className: "flex items-center gap-3" }, /* @__PURE__ */ React12.createElement("span", { className: "relative flex shrink-0 overflow-hidden dark:bg-[#27272a] rounded-full h-10 w-10" }, /* @__PURE__ */ React12.createElement("span", { className: "flex h-full w-full items-center justify-center rounded-full bg-muted dark:text-white" }, ((_a = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _a.UserName) ? authData.userInfo.UserName.split("")[0] : "A")), /* @__PURE__ */ React12.createElement("div", null, /* @__PURE__ */ React12.createElement("p", { className: "font-semibold dark:text-white" }, ((_b = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _b.UserName) ? authData.userInfo.UserName : "Admin User"), /* @__PURE__ */ React12.createElement("p", { className: "text-sm  dark:text-[#f4f4f5cc]" }, role)))
+      /* @__PURE__ */ React12.createElement("div", { className: "flex items-center gap-3" }, /* @__PURE__ */ React12.createElement("span", { className: "relative flex shrink-0 overflow-hidden dark:bg-[#27272a] rounded-full h-10 w-10" }, /* @__PURE__ */ React12.createElement("span", { className: "flex h-full w-full items-center justify-center !text-[16px] !font-normal border border-gray-200 dark:border-[#303036] rounded-full bg-muted dark:text-white" }, ((_a = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _a.UserName) ? authData.userInfo.UserName.split("")[0] : "A")), /* @__PURE__ */ React12.createElement("div", null, /* @__PURE__ */ React12.createElement("p", { className: "!font-semibold dark:text-white !text-[16px]" }, ((_b = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _b.UserName) ? authData.userInfo.UserName : "Admin"), /* @__PURE__ */ React12.createElement("p", { className: "!text-[14px] !font-normal dark:text-[#f4f4f5cc]" }, role)))
     ))
   ));
 };
@@ -1138,7 +1265,7 @@ var Pagination = ({
               tableHeader,
               isHideCheckbox
             },
-            paginatedData.map((item, index) => {
+            data.map((item, index) => {
               return /* @__PURE__ */ React15.createElement(
                 ComponentType,
                 {
@@ -1220,7 +1347,7 @@ var Pagination = ({
     {
       key: pageNum,
       onClick: () => handlePageChange(pageNum),
-      className: `flex items-center justify-center min-w-9 h-9 px-3 rounded-md border border-[#e5e5e5] dark:border-[#303036] text-sm transition-colors ${currentPage === pageNum ? "bg-primary text-white border-primary dark:bg-primary" : "bg-white text-black hover:bg-gray-50 dark:bg-[#18181b] dark:text-white dark:hover:bg-[#27272a]"}`
+      className: `flex items-center justify-center min-w-9 h-9 px-3 cursor-pointer rounded-md border border-[#e5e5e5] dark:border-[#303036] text-sm transition-colors ${currentPage === pageNum ? "bg-primary text-white border-primary dark:bg-primary" : "bg-white text-black hover:bg-gray-50 dark:bg-[#18181b] dark:text-white dark:hover:bg-[#27272a]"}`
     },
     pageNum
   )), /* @__PURE__ */ React15.createElement(

package/package.json

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