ui and bug fixers 29/09

Frontend/erp-system/components/Layouts/AppSidebar.tsx

@@ -43,7 +43,6 @@ import {
   PieChart,
   Receipt,
   ReceiptText,
-  Ruler,
   Scale,
   ScrollText,
   Settings,
@@ -98,8 +97,9 @@ const navItems: {
     children: [
       { title: "Item", code: "products.item", href: "/dashboard/products", icon: Boxes },
       { title: "Category", code: "products.category", href: "/dashboard/products/categories", icon: ListTree },
-      { title: "Brand", code: "products.brand", href: "/dashboard/products/brands", icon: Tag },
-      { title: "UOM", code: "products.uom", href: "/dashboard/products/uoms", icon: Ruler },
+      // One entry for the merged Brand/UOM tab page (the old /uoms route just redirects to
+      // its UOM tab) — still shown to a role that only holds the UOM permission.
+      { title: "Brand/UOM", code: "products.brand", href: "/dashboard/products/brands", icon: Tag, altCodes: ["products.uom"] },
       { title: "Tax Rates", code: "products.tax-rates", href: "/dashboard/products/tax-rates", icon: Percent },
     ],
   },
@@ -437,7 +437,9 @@ export function AppSidebar() {
   const pathname = usePathname() || "/"
   const [collapsed, setCollapsed] = useState(false)
   const [mobileOpen, setMobileOpen] = useState(false)
-  const { navCodes, loading } = useAuth()
+  const { navCodes, loading, branchingEnabled } = useAuth()
+  // Entries that only make sense while "Require branches" is on — hidden entirely when off.
+  const branchOnlyCodes = new Set(["settings.branches"])
 
   // While /auth/me hasn't resolved yet, show nothing rather than briefly
   // flashing the full menu to a restricted role. Once resolved, a nav item
@@ -463,9 +465,10 @@ export function AppSidebar() {
         )
         .map((item) => ({
           ...item,
-          children: bypassCodes.has(item.code)
+          children: (bypassCodes.has(item.code)
             ? item.children
-            : item.children?.filter((c) => navCodes.includes(c.code) || c.altCodes?.some((ac) => navCodes.includes(ac))),
+            : item.children?.filter((c) => navCodes.includes(c.code) || c.altCodes?.some((ac) => navCodes.includes(ac)))
+          )?.filter((c) => branchingEnabled || !branchOnlyCodes.has(c.code)),
         }))
 
   // Close mobile menu on route change