From 138cb9a82e8d6fffdd79677148fcb86ec53a7db5 Mon Sep 17 00:00:00 2001
From: Achintha Isuru <achinthaisuru444@gmail.com>
Date: Wed, 4 Mar 2026 12:09:08 -0500
Subject: [PATCH] refactor: Update navigation configuration and improve order
 dialog hub handling

---
 apps/web/pnpm-lock.yaml                       |  3 -
 apps/web/pnpm-workspace.yaml                  |  3 +
 apps/web/src/common/config/navigation.ts      | 75 -------------------
 .../orders/components/CreateOrderDialog.tsx   |  8 +-
 4 files changed, 7 insertions(+), 82 deletions(-)

diff --git a/apps/web/pnpm-lock.yaml b/apps/web/pnpm-lock.yaml
index 6f3eca62..bd577ae8 100644
--- a/apps/web/pnpm-lock.yaml
+++ b/apps/web/pnpm-lock.yaml
@@ -4,9 +4,6 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
-overrides:
-  '@dataconnect/generated': link:src/dataconnect-generated
-
 importers:
 
   .:
diff --git a/apps/web/pnpm-workspace.yaml b/apps/web/pnpm-workspace.yaml
index 117a15bd..9410b45d 100644
--- a/apps/web/pnpm-workspace.yaml
+++ b/apps/web/pnpm-workspace.yaml
@@ -1,2 +1,5 @@
+packages:
+  - '.'
+
 overrides:
   '@dataconnect/generated': link:src/dataconnect-generated
diff --git a/apps/web/src/common/config/navigation.ts b/apps/web/src/common/config/navigation.ts
index ede3d92a..7de926c6 100644
--- a/apps/web/src/common/config/navigation.ts
+++ b/apps/web/src/common/config/navigation.ts
@@ -62,12 +62,6 @@ export const NAV_CONFIG: NavGroup[] = [
                 icon: LayoutDashboard,
                 allowedRoles: ['Vendor'],
             },
-            {
-                label: 'Savings Engine',
-                path: '/savings',
-                icon: PiggyBank,
-                allowedRoles: ALL_ROLES,
-            },
             {
                 label: 'Vendor Performance',
                 path: '/performance',
@@ -117,23 +111,6 @@ export const NAV_CONFIG: NavGroup[] = [
             },
         ],
     },
-    {
-        title: 'Marketplace',
-        items: [
-            {
-                label: 'Discovery',
-                path: '/marketplace',
-                icon: ShoppingBag,
-                allowedRoles: ['Client', 'Admin'],
-            },
-            {
-                label: 'Compare Rates',
-                path: '/marketplace/compare',
-                icon: Scale,
-                allowedRoles: ['Client', 'Admin'],
-            },
-        ],
-    },
     {
         title: 'Workforce',
         items: [
@@ -143,18 +120,6 @@ export const NAV_CONFIG: NavGroup[] = [
                 icon: Users,
                 allowedRoles: ALL_ROLES,
             },
-            {
-                label: 'Onboarding',
-                path: '/onboarding',
-                icon: UserPlus,
-                allowedRoles: ALL_ROLES,
-            },
-            {
-                label: 'Teams',
-                path: '/teams',
-                icon: Users2,
-                allowedRoles: ALL_ROLES,
-            },
             {
                 label: 'Compliance',
                 path: '/compliance',
@@ -197,44 +162,4 @@ export const NAV_CONFIG: NavGroup[] = [
             },
         ],
     },
-    {
-        title: 'Analytics & Comm',
-        items: [
-            {
-                label: 'Reports',
-                path: '/reports',
-                icon: PieChart,
-                allowedRoles: ALL_ROLES,
-            },
-            {
-                label: 'Activity Log',
-                path: '/activity',
-                icon: History,
-                allowedRoles: ['Vendor', 'Admin'],
-            },
-            {
-                label: 'Messages',
-                path: '/messages',
-                icon: MessageSquare,
-                allowedRoles: ALL_ROLES,
-            },
-            {
-                label: 'Tutorials',
-                path: '/tutorials',
-                icon: BookOpen,
-                allowedRoles: ['Client', 'Admin'],
-            },
-        ],
-    },
-    {
-        title: 'Support',
-        items: [
-            {
-                label: 'Help Center',
-                path: '/support',
-                icon: HelpCircle,
-                allowedRoles: ['Client', 'Admin'],
-            },
-        ],
-    },
 ];
diff --git a/apps/web/src/features/operations/orders/components/CreateOrderDialog.tsx b/apps/web/src/features/operations/orders/components/CreateOrderDialog.tsx
index 718e6e82..763e1f81 100644
--- a/apps/web/src/features/operations/orders/components/CreateOrderDialog.tsx
+++ b/apps/web/src/features/operations/orders/components/CreateOrderDialog.tsx
@@ -6,7 +6,7 @@ import {
   DialogTitle,
 } from "@/common/components/ui/dialog";
 import EventFormWizard from "./EventFormWizard";
-import { useCreateOrder, useListBusinesses, useListHubs } from "@/dataconnect-generated/react";
+import { useCreateOrder, useListBusinesses, useListTeamHubs } from "@/dataconnect-generated/react";
 import { OrderType, OrderStatus } from "@/dataconnect-generated";
 import { dataConnect } from "@/features/auth/firebase";
 import { useToast } from "@/common/components/ui/use-toast";
@@ -26,7 +26,7 @@ export default function CreateOrderDialog({ open, onOpenChange }: CreateOrderDia
   const [selectedHubId, setSelectedHubId] = React.useState<string>("");
 
   const { data: businessesData } = useListBusinesses(dataConnect);
-  const { data: hubsData } = useListHubs(dataConnect);
+  const { data: hubsData } = useListTeamHubs(dataConnect);
 
   const createOrderMutation = useCreateOrder(dataConnect, {
     onSuccess: () => {
@@ -109,9 +109,9 @@ export default function CreateOrderDialog({ open, onOpenChange }: CreateOrderDia
                 <SelectValue placeholder="Select Hub" />
               </SelectTrigger>
               <SelectContent>
-                {hubsData?.hubs.map((h) => (
+                {hubsData?.teamHubs.map((h) => (
                   <SelectItem key={h.id} value={h.id}>
-                    {h.name}
+                    {h.hubName}
                   </SelectItem>
                 ))}
               </SelectContent>