refactor: Update navigation configuration and improve order dialog hub handling
This commit is contained in:
3
apps/web/pnpm-lock.yaml
generated
3
apps/web/pnpm-lock.yaml
generated
@@ -4,9 +4,6 @@ settings:
|
|||||||
autoInstallPeers: true
|
autoInstallPeers: true
|
||||||
excludeLinksFromLockfile: false
|
excludeLinksFromLockfile: false
|
||||||
|
|
||||||
overrides:
|
|
||||||
'@dataconnect/generated': link:src/dataconnect-generated
|
|
||||||
|
|
||||||
importers:
|
importers:
|
||||||
|
|
||||||
.:
|
.:
|
||||||
|
|||||||
@@ -1,2 +1,5 @@
|
|||||||
|
packages:
|
||||||
|
- '.'
|
||||||
|
|
||||||
overrides:
|
overrides:
|
||||||
'@dataconnect/generated': link:src/dataconnect-generated
|
'@dataconnect/generated': link:src/dataconnect-generated
|
||||||
|
|||||||
@@ -62,12 +62,6 @@ export const NAV_CONFIG: NavGroup[] = [
|
|||||||
icon: LayoutDashboard,
|
icon: LayoutDashboard,
|
||||||
allowedRoles: ['Vendor'],
|
allowedRoles: ['Vendor'],
|
||||||
},
|
},
|
||||||
{
|
|
||||||
label: 'Savings Engine',
|
|
||||||
path: '/savings',
|
|
||||||
icon: PiggyBank,
|
|
||||||
allowedRoles: ALL_ROLES,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
label: 'Vendor Performance',
|
label: 'Vendor Performance',
|
||||||
path: '/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',
|
title: 'Workforce',
|
||||||
items: [
|
items: [
|
||||||
@@ -143,18 +120,6 @@ export const NAV_CONFIG: NavGroup[] = [
|
|||||||
icon: Users,
|
icon: Users,
|
||||||
allowedRoles: ALL_ROLES,
|
allowedRoles: ALL_ROLES,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
label: 'Onboarding',
|
|
||||||
path: '/onboarding',
|
|
||||||
icon: UserPlus,
|
|
||||||
allowedRoles: ALL_ROLES,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'Teams',
|
|
||||||
path: '/teams',
|
|
||||||
icon: Users2,
|
|
||||||
allowedRoles: ALL_ROLES,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
label: 'Compliance',
|
label: 'Compliance',
|
||||||
path: '/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'],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import {
|
|||||||
DialogTitle,
|
DialogTitle,
|
||||||
} from "@/common/components/ui/dialog";
|
} from "@/common/components/ui/dialog";
|
||||||
import EventFormWizard from "./EventFormWizard";
|
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 { OrderType, OrderStatus } from "@/dataconnect-generated";
|
||||||
import { dataConnect } from "@/features/auth/firebase";
|
import { dataConnect } from "@/features/auth/firebase";
|
||||||
import { useToast } from "@/common/components/ui/use-toast";
|
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 [selectedHubId, setSelectedHubId] = React.useState<string>("");
|
||||||
|
|
||||||
const { data: businessesData } = useListBusinesses(dataConnect);
|
const { data: businessesData } = useListBusinesses(dataConnect);
|
||||||
const { data: hubsData } = useListHubs(dataConnect);
|
const { data: hubsData } = useListTeamHubs(dataConnect);
|
||||||
|
|
||||||
const createOrderMutation = useCreateOrder(dataConnect, {
|
const createOrderMutation = useCreateOrder(dataConnect, {
|
||||||
onSuccess: () => {
|
onSuccess: () => {
|
||||||
@@ -109,9 +109,9 @@ export default function CreateOrderDialog({ open, onOpenChange }: CreateOrderDia
|
|||||||
<SelectValue placeholder="Select Hub" />
|
<SelectValue placeholder="Select Hub" />
|
||||||
</SelectTrigger>
|
</SelectTrigger>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
{hubsData?.hubs.map((h) => (
|
{hubsData?.teamHubs.map((h) => (
|
||||||
<SelectItem key={h.id} value={h.id}>
|
<SelectItem key={h.id} value={h.id}>
|
||||||
{h.name}
|
{h.hubName}
|
||||||
</SelectItem>
|
</SelectItem>
|
||||||
))}
|
))}
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
|
|||||||
Reference in New Issue
Block a user