From 770c76127c73d3101922a1051e6c2ab4d30d5329 Mon Sep 17 00:00:00 2001 From: pray4skylark Date: Tue, 2 Jun 2026 14:35:17 +0900 Subject: [PATCH] fix: equipment summary counts field access --- src/app/(main)/itam/page.tsx | 2 +- src/app/(main)/page.tsx | 2 +- src/services/equipmentService.ts | 4 ++-- src/types/index.ts | 4 ++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/app/(main)/itam/page.tsx b/src/app/(main)/itam/page.tsx index 2ad76a6..56d58f5 100644 --- a/src/app/(main)/itam/page.tsx +++ b/src/app/(main)/itam/page.tsx @@ -30,7 +30,7 @@ export default function ITAMDashboard() { ]).then(([eqRes, sumRes]) => { setEquipment(eqRes.data.content); setTotalPages(eqRes.data.totalPages); - const counts = sumRes.data || {}; + const counts: Record = sumRes.data?.counts || {}; counts.ALL = Object.values(counts).reduce((a: number, b: any) => a + (typeof b === 'number' ? b : 0), 0); setSummary(counts); }).catch(console.error).finally(() => setLoading(false)); diff --git a/src/app/(main)/page.tsx b/src/app/(main)/page.tsx index 11c0306..259d663 100644 --- a/src/app/(main)/page.tsx +++ b/src/app/(main)/page.tsx @@ -46,7 +46,7 @@ export default function DashboardPage() { ]).then(([openRes, recentRes, equipRes]) => { if (openRes) setOpenCount(openRes.data.totalElements); if (recentRes) setRecentTickets(recentRes.data.content || []); - if (equipRes?.data) setInUseCount(equipRes.data.IN_USE || 0); + if (equipRes?.data?.counts) setInUseCount(equipRes.data.counts.IN_USE || 0); }); }, []); diff --git a/src/services/equipmentService.ts b/src/services/equipmentService.ts index 2bf7dfe..26c32c8 100644 --- a/src/services/equipmentService.ts +++ b/src/services/equipmentService.ts @@ -1,5 +1,5 @@ import apiClient from './apiClient'; -import type { ApiResponse, Page, Equipment, EquipmentAssignment, EquipmentMaintenance } from '@/types'; +import type { ApiResponse, Page, Equipment, EquipmentAssignment, EquipmentMaintenance, EquipmentSummary } from '@/types'; const equipmentService = { getAll(params?: { type?: string; status?: string; manufacturer?: string; page?: number; size?: number }) { @@ -45,7 +45,7 @@ const equipmentService = { }, getSummary() { - return apiClient.get>>('/equipment/summary'); + return apiClient.get>('/equipment/summary'); }, }; diff --git a/src/types/index.ts b/src/types/index.ts index 5ba4180..33b5b24 100644 --- a/src/types/index.ts +++ b/src/types/index.ts @@ -188,6 +188,10 @@ export interface Equipment { images?: EquipmentImage[] | string; } +export interface EquipmentSummary { + counts: Record; +} + export interface EquipmentAssignment { assignmentId: number; equipmentId: number;