jett.admin.npmpackage 1.0.93 → 1.0.95

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,27 +474,41 @@ var navItemsConstant = [
         }
       },
       {
-        label: "Booking History",
+        label: "Users",
         onClick: () => {
-          window.location.href = "/finance/bookingHistory/";
+          window.location.href = "/orgselector/?path=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 = "/orgselector/?path=users";
+          window.location.href = "/orgselector/?path=special-requests";
         }
       },
       {
-        label: "Tags",
+        label: "Support Tickets (Coming Soon)"
+        // onClick: () => {},
+      }
+    ],
+    isDropDown: true
+  },
+  {
+    Icon: import_lucide_react4.Banknote,
+    label: "Finance",
+    onClick: () => {
+    },
+    isDropDown: true,
+    options: [
+      {
+        label: "Booking History",
         onClick: () => {
-          window.location.href = "/orgselector/?path=tag";
+          window.location.href = "/finance/bookingHistory/";
         }
       },
       {
@@ -529,15 +516,8 @@ var navItemsConstant = [
         onClick: () => {
           window.location.href = "/finance/paymentsLedger/";
         }
-      },
-      {
-        label: "Special Request",
-        onClick: () => {
-          window.location.href = "/orgselector/?path=special-requests";
-        }
       }
-    ],
-    isDropDown: true
+    ]
   },
   {
     Icon: import_lucide_react4.DollarSign,
@@ -547,7 +527,7 @@ var navItemsConstant = [
     isDropDown: true,
     options: [
       {
-        label: "Pricing Policy",
+        label: "Pricing Engine",
         onClick: () => {
           window.location.href = "/orgselector/?path=pricing-policy";
         }
@@ -563,21 +543,45 @@ 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)"
+        // onClick: () => {
+        //   window.open("https://viz.jett.travel", "_blank");
+        // },
+      }
+    ]
+  },
   {
     Icon: import_lucide_react4.Cog,
     label: "Settings",
@@ -590,6 +594,22 @@ 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)"
+        // onClick: () => {},
       }
     ]
   }
@@ -836,19 +856,6 @@ var AppSideBar = ({
     if (!menuUrlData || !currentPath) return false;
     const normalizedMenuPath = menuUrlData.pathname.replace(/\/$/, "") || "/";
     const normalizedCurrentPath = currentPath.replace(/\/$/, "") || "/";
-    if (normalizedMenuPath === "/orgselector" && normalizedCurrentPath === "/orgselector") {
-      const menuPathParam = new URLSearchParams(menuUrlData.search).get("path");
-      const currentPathParam = new URLSearchParams(currentSearch).get("path");
-      if (menuPathParam && currentPathParam) {
-        return menuPathParam === currentPathParam;
-      }
-      if (menuPathParam && !currentPathParam) {
-        return false;
-      }
-      if (!menuPathParam && currentPathParam) {
-        return false;
-      }
-    }
     if (normalizedMenuPath === "/users/users" && normalizedCurrentPath === "/users/users") {
       const menuParams = new URLSearchParams(menuUrlData.search);
       const currentParams = new URLSearchParams(currentSearch);
@@ -862,6 +869,46 @@ var AppSideBar = ({
       }
       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);

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,27 +440,41 @@ var navItemsConstant = [
         }
       },
       {
-        label: "Booking History",
+        label: "Users",
         onClick: () => {
-          window.location.href = "/finance/bookingHistory/";
+          window.location.href = "/orgselector/?path=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 = "/orgselector/?path=users";
+          window.location.href = "/orgselector/?path=special-requests";
         }
       },
       {
-        label: "Tags",
+        label: "Support Tickets (Coming Soon)"
+        // onClick: () => {},
+      }
+    ],
+    isDropDown: true
+  },
+  {
+    Icon: Banknote,
+    label: "Finance",
+    onClick: () => {
+    },
+    isDropDown: true,
+    options: [
+      {
+        label: "Booking History",
         onClick: () => {
-          window.location.href = "/orgselector/?path=tag";
+          window.location.href = "/finance/bookingHistory/";
         }
       },
       {
@@ -500,15 +482,8 @@ var navItemsConstant = [
         onClick: () => {
           window.location.href = "/finance/paymentsLedger/";
         }
-      },
-      {
-        label: "Special Request",
-        onClick: () => {
-          window.location.href = "/orgselector/?path=special-requests";
-        }
       }
-    ],
-    isDropDown: true
+    ]
   },
   {
     Icon: DollarSign,
@@ -518,7 +493,7 @@ var navItemsConstant = [
     isDropDown: true,
     options: [
       {
-        label: "Pricing Policy",
+        label: "Pricing Engine",
         onClick: () => {
           window.location.href = "/orgselector/?path=pricing-policy";
         }
@@ -534,21 +509,45 @@ 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)"
+        // onClick: () => {
+        //   window.open("https://viz.jett.travel", "_blank");
+        // },
+      }
+    ]
+  },
   {
     Icon: Cog,
     label: "Settings",
@@ -561,6 +560,22 @@ 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)"
+        // onClick: () => {},
       }
     ]
   }
@@ -807,19 +822,6 @@ var AppSideBar = ({
     if (!menuUrlData || !currentPath) return false;
     const normalizedMenuPath = menuUrlData.pathname.replace(/\/$/, "") || "/";
     const normalizedCurrentPath = currentPath.replace(/\/$/, "") || "/";
-    if (normalizedMenuPath === "/orgselector" && normalizedCurrentPath === "/orgselector") {
-      const menuPathParam = new URLSearchParams(menuUrlData.search).get("path");
-      const currentPathParam = new URLSearchParams(currentSearch).get("path");
-      if (menuPathParam && currentPathParam) {
-        return menuPathParam === currentPathParam;
-      }
-      if (menuPathParam && !currentPathParam) {
-        return false;
-      }
-      if (!menuPathParam && currentPathParam) {
-        return false;
-      }
-    }
     if (normalizedMenuPath === "/users/users" && normalizedCurrentPath === "/users/users") {
       const menuParams = new URLSearchParams(menuUrlData.search);
       const currentParams = new URLSearchParams(currentSearch);
@@ -833,6 +835,46 @@ var AppSideBar = ({
       }
       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);

package/package.json

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