From 6527831bdd008513e3da776db66eaf43b35a8af7 Mon Sep 17 00:00:00 2001 From: iFixKart Dev Date: Mon, 16 Nov 2026 17:34:38 +0530 Subject: [PATCH] fix(admin): resolve repair tickets crash, fix Unknown Unknown user labels, and add dashboard timeout guard --- app/(admin)/repair-tickets/page.tsx | 39 +++++++++++----- app/(admin)/staff-directory/page.tsx | 10 ++--- app/(admin)/users/page.tsx | 57 +++++++++++++++++++----- components/dashboard/useDashboardData.ts | 19 +++++--- services/api/repairService.ts | 21 +++++---- services/api/userService.ts | 11 +++++ 6 files changed, 115 insertions(+), 42 deletions(-) diff --git a/app/(admin)/repair-tickets/page.tsx b/app/(admin)/repair-tickets/page.tsx index 27f7b41..4e1319e 100644 --- a/app/(admin)/repair-tickets/page.tsx +++ b/app/(admin)/repair-tickets/page.tsx @@ -79,12 +79,17 @@ export default function RepairTicketsPage() { } }; - const filteredTickets = tickets.filter( - (t) => - t.imei_serial.includes(searchImei) || - t.ticket_number.toLowerCase().includes(searchImei.toLowerCase()) || - t.customer_name.toLowerCase().includes(searchImei.toLowerCase()) - ); + const filteredTickets = (tickets || []).filter((t) => { + const q = (searchImei || '').toLowerCase().trim(); + if (!q) return true; + const imei = (t.imei_serial || '').toLowerCase(); + const num = (t.ticket_number || '').toLowerCase(); + const cust = (t.customer_name || '').toLowerCase(); + const brand = (t.brand_name || '').toLowerCase(); + const model = (t.model_name || '').toLowerCase(); + const desc = (t.problem_description || t.issue_description || '').toLowerCase(); + return imei.includes(q) || num.includes(q) || cust.includes(q) || brand.includes(q) || model.includes(q) || desc.includes(q); + }); return (
@@ -125,7 +130,13 @@ export default function RepairTicketsPage() { ) : (
{STAGES.map((stage) => { - const stageTickets = filteredTickets.filter((t) => t.status === stage); + const stageTickets = filteredTickets.filter((t) => { + const currentStage = (t.stage || t.status || '').toUpperCase(); + return currentStage === stage.toUpperCase() || + (stage === 'INTAKE' && (currentStage === 'RECEIVED' || currentStage === 'INTAKE')) || + (stage === 'REPAIRING' && (currentStage === 'UNDER_REPAIR' || currentStage === 'PART_PENDING')) || + (stage === 'COMPLETED' && (currentStage === 'READY_FOR_DELIVERY' || currentStage === 'QC_TESTING')); + }); return (
@@ -145,7 +156,7 @@ export default function RepairTicketsPage() { className="p-3 bg-background border border-border crm-radius-control hover:border-primary transition-colors cursor-pointer" >
- {t.ticket_number} + {t.ticket_number || 'TKT-PENDING'} - {t.priority} + {t.priority || 'NORMAL'}
- {t.brand_name} {t.model_name} + {(t.brand_name || t.model_name) + ? `${t.brand_name || ''} ${t.model_name || ''}`.trim() + : (t.device_id ? `Device #${t.device_id.slice(-6)}` : 'Customer Device')}

- {t.problem_description} + {t.problem_description || t.issue_description || 'No description provided'}

- {t.imei_serial.slice(-6)} + + {t.imei_serial ? t.imei_serial.slice(-6) : (t.device_id ? t.device_id.slice(-6) : (t.ticket_number || 'N/A').slice(-6))} +
{t.sla_due_at && (
diff --git a/app/(admin)/staff-directory/page.tsx b/app/(admin)/staff-directory/page.tsx index 084f3eb..4d9ee1c 100644 --- a/app/(admin)/staff-directory/page.tsx +++ b/app/(admin)/staff-directory/page.tsx @@ -91,9 +91,9 @@ export default function StaffDirectoryPage() { return () => document.removeEventListener('mousedown', onPointerDown); }, [openMenuId]); - const getRoleName = (roleId: string) => ROLES.find((r) => r.id === roleId)?.name || 'Staff Member'; - const getDeptName = (deptId: string) => DEPARTMENTS.find((d) => d.id === deptId)?.name || 'Operations'; - const getDesigName = (desigId: string) => DESIGNATIONS.find((d) => d.id === desigId)?.name || ''; + const getRoleName = (roleId: string, user?: UserResponse) => user?.role_name || ROLES.find((r) => r.id === roleId)?.name || 'Staff Member'; + const getDeptName = (deptId: string, user?: UserResponse) => user?.department_name || DEPARTMENTS.find((d) => d.id === deptId)?.name || 'General'; + const getDesigName = (desigId: string, user?: UserResponse) => user?.designation_name || DESIGNATIONS.find((d) => d.id === desigId)?.name || ''; const sortedUsers = useMemo(() => { const q = search.trim().toLowerCase(); @@ -360,7 +360,7 @@ export default function StaffDirectoryPage() {

- {getDeptName(user.department_id)} + {getDeptName(user.department_id, user)}

@@ -436,7 +436,7 @@ export default function StaffDirectoryPage() {
{getRoleName(user.role_id)} - {getDeptName(user.department_id)} + {getDeptName(user.department_id, user)} {user.email} {user.last_activity || 'No recent activity'} diff --git a/app/(admin)/users/page.tsx b/app/(admin)/users/page.tsx index 3ca0ff6..ccb286b 100644 --- a/app/(admin)/users/page.tsx +++ b/app/(admin)/users/page.tsx @@ -161,6 +161,8 @@ export default function UsersPage() { const [formErrors, setFormErrors] = useState>({}); const [availableRoles, setAvailableRoles] = useState<{ id: string; name: string }[]>(ROLES); + const [availableDepartments, setAvailableDepartments] = useState<{ id: string; name: string }[]>(DEPARTMENTS); + const [availableDesignations, setAvailableDesignations] = useState<{ id: string; name: string }[]>(DESIGNATIONS); const [availableLocations, setAvailableLocations] = useState<{ location_id: string; name: string }[]>([]); const fetchUsers = async () => { @@ -180,6 +182,20 @@ export default function UsersPage() { } } catch { } + try { + const dynDepts = await userService.getDepartments(); + if (dynDepts && dynDepts.length > 0) { + setAvailableDepartments(dynDepts); + } + } catch { } + + try { + const dynDesigs = await userService.getDesignations(); + if (dynDesigs && dynDesigs.length > 0) { + setAvailableDesignations(dynDesigs); + } + } catch { } + try { const locs = await systemConfigService.getLocations(); if (locs) setAvailableLocations(locs); @@ -203,9 +219,20 @@ export default function UsersPage() { return () => document.removeEventListener('mousedown', onPointerDown); }, [showFilters]); - const getRoleName = (id: string) => availableRoles.find(r => r.id === id || r.name.toLowerCase() === id.toLowerCase())?.name || id || 'Unknown'; - const getDeptName = (id: string) => DEPARTMENTS.find(d => d.id === id)?.name || 'Unknown'; - const getDesigName = (id: string) => DESIGNATIONS.find(d => d.id === id)?.name || 'Unknown'; + const getRoleName = (id: string, user?: UserResponse) => { + if (user?.role_name) return user.role_name; + return availableRoles.find(r => r.id === id || r.name.toLowerCase() === id?.toLowerCase())?.name || id || 'Staff'; + }; + const getDeptName = (id?: string, user?: UserResponse) => { + if (user?.department_name) return user.department_name; + if (!id) return ''; + return availableDepartments.find(d => d.id === id || d.name.toLowerCase() === id?.toLowerCase())?.name || ''; + }; + const getDesigName = (id?: string, user?: UserResponse) => { + if (user?.designation_name) return user.designation_name; + if (!id) return ''; + return availableDesignations.find(d => d.id === id || d.name.toLowerCase() === id?.toLowerCase())?.name || ''; + }; // Validation Form Checks const validateForm = (data: Partial, isEdit = false): boolean => { @@ -921,7 +948,7 @@ export default function UsersPage() {

{user.first_name} {user.last_name}

-

{getRoleName(user.role_id)}

+

{getRoleName(user.role_id, user)}

{renderStatusBadge(user.is_active)} @@ -929,7 +956,17 @@ export default function UsersPage() {

{user.email}

{user.phone || '—'}

-

{getDeptName(user.department_id)} · {getDesigName(user.designation_id)}

+ {(() => { + const dept = getDeptName(user.department_id, user); + const desig = getDesigName(user.designation_id, user); + if (dept && desig) { + return

{dept} · {desig}

; + } else if (dept || desig) { + return

{dept || desig}

; + } else { + return

{getRoleName(user.role_id, user)}

; + } + })()}