jett.admin.npmpackage 2.0.2 → 2.0.5

package/dist/index.css

@@ -23,6 +23,7 @@
       monospace;
     --color-red-50: oklch(97.1% 0.013 17.38);
     --color-red-100: oklch(93.6% 0.032 17.717);
+    --color-red-400: oklch(70.4% 0.191 22.216);
     --color-red-500: oklch(63.7% 0.237 25.331);
     --color-red-800: oklch(44.4% 0.177 26.899);
     --color-red-900: oklch(39.6% 0.141 25.723);
@@ -877,6 +878,9 @@
   .text-yellow-800 {
     color: var(--color-yellow-800);
   }
+  .opacity-70 {
+    opacity: 70%;
+  }
   .shadow {
     --tw-shadow: 0 1px 3px 0 var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 1px 2px -1px var(--tw-shadow-color, rgb(0 0 0 / 0.1));
     box-shadow:
@@ -1230,6 +1234,11 @@
       background-color: var(--color-yellow-900);
     }
   }
+  .dark\:\!text-\[\#a1a1aa\] {
+    &:where(.dark, .dark *) {
+      color: #a1a1aa !important;
+    }
+  }
   .dark\:text-\[\#71717a\] {
     &:where(.dark, .dark *) {
       color: #71717a;

package/dist/index.js

@@ -627,9 +627,6 @@ var additionalItemsConstant = [
   }
 ];
 
-// src/assests/logo/logo-white.svg
-var logo_white_default = "./logo-white-RYMEJOWI.svg";
-
 // src/sideBar/SideBar.jsx
 var import_js_cookie = __toESM(require("js-cookie"));
 
@@ -720,6 +717,54 @@ var CustomSelect = ({
   );
 };
 
+// src/utils/cookieHelpers.js
+var JETT_ID_COOKIE_NAME = "jett-id";
+function getCookie(name) {
+  if (typeof document === "undefined" || !document.cookie) return null;
+  const match = document.cookie.match(
+    new RegExp("(^|\\s)" + name + "=([^;]+)")
+  );
+  return match ? decodeURIComponent(match[2].trim()) : null;
+}
+function decodeBase64(value) {
+  try {
+    let base64 = value.replace(/-/g, "+").replace(/_/g, "/");
+    const pad = base64.length % 4;
+    if (pad) base64 += "=".repeat(4 - pad);
+    return atob(base64);
+  } catch {
+    return "";
+  }
+}
+function getJettIdCookieData() {
+  const raw = getCookie(JETT_ID_COOKIE_NAME);
+  if (!raw) return null;
+  try {
+    const decoded = decodeBase64(raw);
+    if (!decoded) return null;
+    const data = JSON.parse(decoded);
+    return data && typeof data === "object" ? data : null;
+  } catch {
+    return null;
+  }
+}
+function getLogoFromJettIdCookie() {
+  const data = getJettIdCookieData();
+  if (!(data == null ? void 0 : data.CDNBasePath)) return null;
+  const logoPath = (data.OrgLogo || data.TmcLogo || "").trim();
+  if (!logoPath) return null;
+  return {
+    logoPath,
+    CDNBasePath: data.CDNBasePath
+  };
+}
+function buildLogoUrl(CDNBasePath, logoPath) {
+  const base = (CDNBasePath || "").replace(/\/$/, "");
+  const path = (logoPath || "").replace(/^\//, "");
+  if (!base || !path) return "";
+  return `${base}/${path}`;
+}
+
 // src/sideBar/SideBar.jsx
 var AppSideBar = ({
   username,
@@ -728,7 +773,7 @@ var AppSideBar = ({
   additionalItems,
   sideBarLogo
 }) => {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const [authData, setAuthData] = (0, import_react12.useState)(null);
   const [selectedCountry, setSelectedCountry] = (0, import_react12.useState)("dubai");
   const [isMobileMenuOpen, setIsMobileMenuOpen] = (0, import_react12.useState)(false);
@@ -881,6 +926,12 @@ var AppSideBar = ({
         return true;
       }
     }
+    if (normalizedMenuPath === "/supplierdeals" && normalizedCurrentPath === "/orgselector") {
+      const currentPathParam = new URLSearchParams(currentSearch).get("path");
+      if (currentPathParam === "supplier-deals") {
+        return true;
+      }
+    }
     if (normalizedMenuPath === "/trips") {
       if (normalizedCurrentPath.startsWith("/tripdetails") || normalizedCurrentPath.startsWith("/offline")) {
         return true;
@@ -941,7 +992,13 @@ var AppSideBar = ({
   };
   const navItemsLocal = navItems ?? navItemsConstant;
   const additionalItemsLocal = additionalItems ?? additionalItemsConstant;
-  const sideBarLogoLocal = sideBarLogo ?? logo_white_default;
+  const logoFromCookie = getLogoFromJettIdCookie();
+  const logoUrlFromCookie = logoFromCookie ? buildLogoUrl(logoFromCookie.CDNBasePath, logoFromCookie.logoPath) : null;
+  const logoUrlFromUserInfo = ((_a = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _a.CDNBasePath) && ((_b = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _b.OrgLogo) ? buildLogoUrl(
+    authData.userInfo.CDNBasePath,
+    authData.userInfo.OrgLogo
+  ) : null;
+  const sideBarLogoLocal = sideBarLogo ?? logoUrlFromCookie ?? logoUrlFromUserInfo ?? null;
   const detectAndSetActiveMenu = (0, import_react12.useCallback)(() => {
     const currentPath = window.location.pathname;
     const currentSearch = window.location.search;
@@ -1028,10 +1085,10 @@ var AppSideBar = ({
       "aria-label": "Toggle menu"
     },
     isMobileMenuOpen ? /* @__PURE__ */ import_react12.default.createElement(import_lucide_react6.X, { className: "w-6 h-6 text-gray-700 dark:text-[#f4f4f5cc]" }) : /* @__PURE__ */ import_react12.default.createElement(import_lucide_react6.Menu, { className: "w-6 h-6 text-gray-700 dark:text-[#f4f4f5cc]" })
-  ), /* @__PURE__ */ import_react12.default.createElement("div", { className: "flex-1 flex justify-center" }, sideBarLogo && /* @__PURE__ */ import_react12.default.createElement(
+  ), /* @__PURE__ */ import_react12.default.createElement("div", { className: "flex-1 flex justify-center" }, sideBarLogoLocal && /* @__PURE__ */ import_react12.default.createElement(
     "img",
     {
-      src: sideBarLogo,
+      src: sideBarLogoLocal,
       alt: "sidebarLogo",
       width: 108,
       height: 40,
@@ -1048,10 +1105,10 @@ var AppSideBar = ({
     {
       className: `fixed top-0 left-0 md:relative w-[320px] transition-all ease-in-out delay-100 bg-white dark:bg-[#18181b] border-r border-gray-200 dark:border-[#303036] flex flex-col p-4 pt-20 md:pt-4 h-full max-h-[100vh] xs:max-md:z-40 md:max-lg:w-[280px] ${isMobileMenuOpen ? "translate-x-0" : "-translate-x-full md:translate-x-0"}`
     },
-    /* @__PURE__ */ import_react12.default.createElement("div", { className: "p-2 mb-2 hidden md:block" }, /* @__PURE__ */ import_react12.default.createElement("div", { className: "flex items-center justify-center w-full h-[60px] mb-2" }, sideBarLogo && /* @__PURE__ */ import_react12.default.createElement(
+    /* @__PURE__ */ import_react12.default.createElement("div", { className: "p-2 mb-2 hidden md:block" }, /* @__PURE__ */ import_react12.default.createElement("div", { className: "flex items-center justify-center w-full h-[60px] mb-2" }, sideBarLogoLocal && /* @__PURE__ */ import_react12.default.createElement(
       "img",
       {
-        src: sideBarLogo,
+        src: sideBarLogoLocal,
         alt: "sidebarLogo",
         width: 108,
         height: 40,
@@ -1081,14 +1138,21 @@ var AppSideBar = ({
           const subMenuKey = `menu-${index}-option-${optionsIndex}`;
           const isSubMenuOpen = isMenuOpen(subMenuKey);
           const isSubActive = activeMenuPath === subMenuKey || (activeMenuPath == null ? void 0 : activeMenuPath.startsWith(`${subMenuKey}-`));
+          const isDisabled = options.isDisabled;
           return /* @__PURE__ */ import_react12.default.createElement("div", { key: optionsIndex, className: "" }, /* @__PURE__ */ import_react12.default.createElement(
             "div",
             {
-              className: `flex items-center gap-3 py-2 px-3 ml-4 mr-2 hover:bg-[#f4f4f5] dark:hover:bg-[#27272a] text-gray-600 dark:text-[#a1a1aa] cursor-pointer rounded-md transition-colors duration-200 ${isSubActive ? "bg-[#f4f4f5] dark:bg-[#27272a]" : ""}`,
-              onClick: (e) => handleSubMenuClick(options, optionsIndex, index, e)
+              className: `group flex items-center gap-3 py-2 px-3 ml-4 mr-2 rounded-md transition-colors duration-200 ${isDisabled ? "cursor-not-allowed opacity-70 text-gray-400 dark:text-gray-500" : `hover:bg-[#f4f4f5] dark:hover:bg-[#27272a] text-gray-600 dark:text-[#a1a1aa] cursor-pointer ${isSubActive ? "bg-[#f4f4f5] dark:bg-[#27272a]" : ""}`}`,
+              onClick: (e) => {
+                if (isDisabled) {
+                  e.preventDefault();
+                  return;
+                }
+                handleSubMenuClick(options, optionsIndex, index, e);
+              }
             },
             /* @__PURE__ */ import_react12.default.createElement("div", null),
-            /* @__PURE__ */ import_react12.default.createElement("span", { className: "!font-medium !text-[15px] !text-[#3f3f46cc] dark:text-[#a1a1aa]" }, options.label),
+            /* @__PURE__ */ import_react12.default.createElement("span", { className: `!font-medium !text-[15px] ${isDisabled ? "!text-[#3f3f46cc] dark:!text-[#a1a1aa]" : "!text-[#3f3f46cc] dark:!text-[#a1a1aa]"}` }, options.label),
             options.isDropDown && /* @__PURE__ */ import_react12.default.createElement(
               "div",
               {
@@ -1125,7 +1189,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 !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)))
+      /* @__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" }, ((_c = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _c.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]" }, ((_d = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _d.UserName) ? authData.userInfo.UserName : "Admin"), /* @__PURE__ */ import_react12.default.createElement("p", { className: "!text-[14px] !font-normal dark:text-[#f4f4f5cc]" }, role)))
     ))
   ));
 };

package/dist/index.mjs

@@ -393,6 +393,7 @@ var CustomUpload = ({
 // src/sideBar/SideBar.jsx
 import {
   ChevronDown as ChevronDown3,
+  CircleSlash,
   Globe,
   LogOut,
   Menu,
@@ -593,9 +594,6 @@ var additionalItemsConstant = [
   }
 ];
 
-// src/assests/logo/logo-white.svg
-var logo_white_default = "./logo-white-RYMEJOWI.svg";
-
 // src/sideBar/SideBar.jsx
 import Cookies from "js-cookie";
 
@@ -686,6 +684,54 @@ var CustomSelect = ({
   );
 };
 
+// src/utils/cookieHelpers.js
+var JETT_ID_COOKIE_NAME = "jett-id";
+function getCookie(name) {
+  if (typeof document === "undefined" || !document.cookie) return null;
+  const match = document.cookie.match(
+    new RegExp("(^|\\s)" + name + "=([^;]+)")
+  );
+  return match ? decodeURIComponent(match[2].trim()) : null;
+}
+function decodeBase64(value) {
+  try {
+    let base64 = value.replace(/-/g, "+").replace(/_/g, "/");
+    const pad = base64.length % 4;
+    if (pad) base64 += "=".repeat(4 - pad);
+    return atob(base64);
+  } catch {
+    return "";
+  }
+}
+function getJettIdCookieData() {
+  const raw = getCookie(JETT_ID_COOKIE_NAME);
+  if (!raw) return null;
+  try {
+    const decoded = decodeBase64(raw);
+    if (!decoded) return null;
+    const data = JSON.parse(decoded);
+    return data && typeof data === "object" ? data : null;
+  } catch {
+    return null;
+  }
+}
+function getLogoFromJettIdCookie() {
+  const data = getJettIdCookieData();
+  if (!(data == null ? void 0 : data.CDNBasePath)) return null;
+  const logoPath = (data.OrgLogo || data.TmcLogo || "").trim();
+  if (!logoPath) return null;
+  return {
+    logoPath,
+    CDNBasePath: data.CDNBasePath
+  };
+}
+function buildLogoUrl(CDNBasePath, logoPath) {
+  const base = (CDNBasePath || "").replace(/\/$/, "");
+  const path = (logoPath || "").replace(/^\//, "");
+  if (!base || !path) return "";
+  return `${base}/${path}`;
+}
+
 // src/sideBar/SideBar.jsx
 var AppSideBar = ({
   username,
@@ -694,7 +740,7 @@ var AppSideBar = ({
   additionalItems,
   sideBarLogo
 }) => {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const [authData, setAuthData] = useState3(null);
   const [selectedCountry, setSelectedCountry] = useState3("dubai");
   const [isMobileMenuOpen, setIsMobileMenuOpen] = useState3(false);
@@ -847,6 +893,12 @@ var AppSideBar = ({
         return true;
       }
     }
+    if (normalizedMenuPath === "/supplierdeals" && normalizedCurrentPath === "/orgselector") {
+      const currentPathParam = new URLSearchParams(currentSearch).get("path");
+      if (currentPathParam === "supplier-deals") {
+        return true;
+      }
+    }
     if (normalizedMenuPath === "/trips") {
       if (normalizedCurrentPath.startsWith("/tripdetails") || normalizedCurrentPath.startsWith("/offline")) {
         return true;
@@ -907,7 +959,13 @@ var AppSideBar = ({
   };
   const navItemsLocal = navItems ?? navItemsConstant;
   const additionalItemsLocal = additionalItems ?? additionalItemsConstant;
-  const sideBarLogoLocal = sideBarLogo ?? logo_white_default;
+  const logoFromCookie = getLogoFromJettIdCookie();
+  const logoUrlFromCookie = logoFromCookie ? buildLogoUrl(logoFromCookie.CDNBasePath, logoFromCookie.logoPath) : null;
+  const logoUrlFromUserInfo = ((_a = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _a.CDNBasePath) && ((_b = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _b.OrgLogo) ? buildLogoUrl(
+    authData.userInfo.CDNBasePath,
+    authData.userInfo.OrgLogo
+  ) : null;
+  const sideBarLogoLocal = sideBarLogo ?? logoUrlFromCookie ?? logoUrlFromUserInfo ?? null;
   const detectAndSetActiveMenu = useCallback(() => {
     const currentPath = window.location.pathname;
     const currentSearch = window.location.search;
@@ -994,10 +1052,10 @@ var AppSideBar = ({
       "aria-label": "Toggle menu"
     },
     isMobileMenuOpen ? /* @__PURE__ */ React12.createElement(X, { className: "w-6 h-6 text-gray-700 dark:text-[#f4f4f5cc]" }) : /* @__PURE__ */ React12.createElement(Menu, { className: "w-6 h-6 text-gray-700 dark:text-[#f4f4f5cc]" })
-  ), /* @__PURE__ */ React12.createElement("div", { className: "flex-1 flex justify-center" }, sideBarLogo && /* @__PURE__ */ React12.createElement(
+  ), /* @__PURE__ */ React12.createElement("div", { className: "flex-1 flex justify-center" }, sideBarLogoLocal && /* @__PURE__ */ React12.createElement(
     "img",
     {
-      src: sideBarLogo,
+      src: sideBarLogoLocal,
       alt: "sidebarLogo",
       width: 108,
       height: 40,
@@ -1014,10 +1072,10 @@ var AppSideBar = ({
     {
       className: `fixed top-0 left-0 md:relative w-[320px] transition-all ease-in-out delay-100 bg-white dark:bg-[#18181b] border-r border-gray-200 dark:border-[#303036] flex flex-col p-4 pt-20 md:pt-4 h-full max-h-[100vh] xs:max-md:z-40 md:max-lg:w-[280px] ${isMobileMenuOpen ? "translate-x-0" : "-translate-x-full md:translate-x-0"}`
     },
-    /* @__PURE__ */ React12.createElement("div", { className: "p-2 mb-2 hidden md:block" }, /* @__PURE__ */ React12.createElement("div", { className: "flex items-center justify-center w-full h-[60px] mb-2" }, sideBarLogo && /* @__PURE__ */ React12.createElement(
+    /* @__PURE__ */ React12.createElement("div", { className: "p-2 mb-2 hidden md:block" }, /* @__PURE__ */ React12.createElement("div", { className: "flex items-center justify-center w-full h-[60px] mb-2" }, sideBarLogoLocal && /* @__PURE__ */ React12.createElement(
       "img",
       {
-        src: sideBarLogo,
+        src: sideBarLogoLocal,
         alt: "sidebarLogo",
         width: 108,
         height: 40,
@@ -1047,14 +1105,21 @@ var AppSideBar = ({
           const subMenuKey = `menu-${index}-option-${optionsIndex}`;
           const isSubMenuOpen = isMenuOpen(subMenuKey);
           const isSubActive = activeMenuPath === subMenuKey || (activeMenuPath == null ? void 0 : activeMenuPath.startsWith(`${subMenuKey}-`));
+          const isDisabled = options.isDisabled;
           return /* @__PURE__ */ React12.createElement("div", { key: optionsIndex, className: "" }, /* @__PURE__ */ React12.createElement(
             "div",
             {
-              className: `flex items-center gap-3 py-2 px-3 ml-4 mr-2 hover:bg-[#f4f4f5] dark:hover:bg-[#27272a] text-gray-600 dark:text-[#a1a1aa] cursor-pointer rounded-md transition-colors duration-200 ${isSubActive ? "bg-[#f4f4f5] dark:bg-[#27272a]" : ""}`,
-              onClick: (e) => handleSubMenuClick(options, optionsIndex, index, e)
+              className: `group flex items-center gap-3 py-2 px-3 ml-4 mr-2 rounded-md transition-colors duration-200 ${isDisabled ? "cursor-not-allowed opacity-70 text-gray-400 dark:text-gray-500" : `hover:bg-[#f4f4f5] dark:hover:bg-[#27272a] text-gray-600 dark:text-[#a1a1aa] cursor-pointer ${isSubActive ? "bg-[#f4f4f5] dark:bg-[#27272a]" : ""}`}`,
+              onClick: (e) => {
+                if (isDisabled) {
+                  e.preventDefault();
+                  return;
+                }
+                handleSubMenuClick(options, optionsIndex, index, e);
+              }
             },
             /* @__PURE__ */ React12.createElement("div", null),
-            /* @__PURE__ */ React12.createElement("span", { className: "!font-medium !text-[15px] !text-[#3f3f46cc] dark:text-[#a1a1aa]" }, options.label),
+            /* @__PURE__ */ React12.createElement("span", { className: `!font-medium !text-[15px] ${isDisabled ? "!text-[#3f3f46cc] dark:!text-[#a1a1aa]" : "!text-[#3f3f46cc] dark:!text-[#a1a1aa]"}` }, options.label),
             options.isDropDown && /* @__PURE__ */ React12.createElement(
               "div",
               {
@@ -1091,7 +1156,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 !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)))
+      /* @__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" }, ((_c = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _c.UserName) ? authData.userInfo.UserName.split("")[0] : "A")), /* @__PURE__ */ React12.createElement("div", null, /* @__PURE__ */ React12.createElement("p", { className: "!font-semibold dark:text-white !text-[16px]" }, ((_d = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _d.UserName) ? authData.userInfo.UserName : "Admin"), /* @__PURE__ */ React12.createElement("p", { className: "!text-[14px] !font-normal dark:text-[#f4f4f5cc]" }, role)))
     ))
   ));
 };

package/package.json

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