From 149704898dc00d68a7348360feb3c84a5520d60c Mon Sep 17 00:00:00 2001 From: weeihan Date: Thu, 15 Oct 2026 11:48:15 +0800 Subject: [PATCH] feat(trucks): site select, site label and edit modal in admin Co-Authored-By: Claude Sonnet 5.5 --- app/(protected)/admin/page.tsx | 7 +- components/admin/admin-panel.tsx | 7 +- components/admin/truck-manager.tsx | 92 ++++++++++++++++++- tests/components/admin/truck-manager.test.tsx | 72 +++++++++++++++ 4 files changed, 169 insertions(+), 9 deletions(-) create mode 100644 tests/components/admin/truck-manager.test.tsx diff --git a/app/(protected)/admin/page.tsx b/app/(protected)/admin/page.tsx index b850db3..e4b3881 100644 --- a/app/(protected)/admin/page.tsx +++ b/app/(protected)/admin/page.tsx @@ -29,7 +29,7 @@ export default async function AdminHome() { qrCodeToken: zones.qrCodeToken, active: zones.active, }).from(zones)), asAdmin(db => db.select({ - id: trucks.id, truckNo: trucks.truckNo, carrier: trucks.carrier, active: trucks.active, + id: trucks.id, truckNo: trucks.truckNo, carrier: trucks.carrier, siteId: trucks.siteId, active: trucks.active, }).from(trucks).orderBy(asc(trucks.truckNo))), ]) @@ -46,8 +46,10 @@ export default async function AdminHome() { const siteOptions: SiteOption[] = siteRows.map(s => ({ id: s.id, name: s.name })) + const truckSites = siteRows.map(s => ({ id: s.id, name: s.name, active: s.active })) + const truckList: Truck[] = truckRows.map(t => ({ - id: t.id, truck_no: t.truckNo, carrier: t.carrier ?? null, active: t.active, + id: t.id, truck_no: t.truckNo, carrier: t.carrier ?? null, site_id: t.siteId ?? null, active: t.active, })) return ( @@ -66,6 +68,7 @@ export default async function AdminHome() { sites={sitesWithZones} siteOptions={siteOptions} trucks={truckList} + truckSites={truckSites} /> ) diff --git a/components/admin/admin-panel.tsx b/components/admin/admin-panel.tsx index 6aa4747..2b88df6 100644 --- a/components/admin/admin-panel.tsx +++ b/components/admin/admin-panel.tsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { UserManager, type AdminUser, type SiteOption } from './user-manager' import { SiteZoneManager, type SiteWithZones } from './site-zone-manager' -import { TruckManager, type Truck } from './truck-manager' +import { TruckManager, type Truck, type TruckSite } from './truck-manager' type Tab = 'users' | 'sites' | 'trucks' @@ -12,9 +12,10 @@ interface Props { sites: SiteWithZones[] siteOptions: SiteOption[] trucks: Truck[] + truckSites: TruckSite[] } -export function AdminPanel({ users, sites, siteOptions, trucks }: Props) { +export function AdminPanel({ users, sites, siteOptions, trucks, truckSites }: Props) { const [tab, setTab] = useState('users') const tabs: { id: Tab; label: string; count: number }[] = [ @@ -45,7 +46,7 @@ export function AdminPanel({ users, sites, siteOptions, trucks }: Props) { {tab === 'users' && } {tab === 'sites' && } - {tab === 'trucks' && } + {tab === 'trucks' && } ) } diff --git a/components/admin/truck-manager.tsx b/components/admin/truck-manager.tsx index 0c8ce3d..7112f13 100644 --- a/components/admin/truck-manager.tsx +++ b/components/admin/truck-manager.tsx @@ -9,16 +9,20 @@ export type Truck = { id: string truck_no: string carrier: string | null + site_id: string | null active: boolean } +export type TruckSite = { id: string; name: string; active: boolean } + interface Props { trucks: Truck[] + sites: TruckSite[] } const lbl = 'block text-xs font-medium text-gray-600 mb-1' -export function TruckManager({ trucks }: Props) { +export function TruckManager({ trucks, sites }: Props) { const router = useRouter() const [truckNo, setTruckNo] = useState('') const [carrier, setCarrier] = useState('') @@ -27,6 +31,22 @@ export function TruckManager({ trucks }: Props) { const [error, setError] = useState(null) const [showAdd, setShowAdd] = useState(false) const [confirmDelete, setConfirmDelete] = useState(null) + const [siteId, setSiteId] = useState('') + const [editing, setEditing] = useState(null) + const [editNo, setEditNo] = useState('') + const [editCarrier, setEditCarrier] = useState('') + const [editSiteId, setEditSiteId] = useState('') + + const siteName = (id: string | null) => sites.find(s => s.id === id)?.name ?? null + const siteChoices = (currentId: string) => sites.filter(s => s.active || s.id === currentId) + + const openEdit = (tk: Truck) => { + setEditing(tk) + setEditNo(tk.truck_no) + setEditCarrier(tk.carrier ?? '') + setEditSiteId(tk.site_id ?? '') + setError(null) + } const handleAdd = async () => { const no = truckNo.trim() @@ -37,12 +57,13 @@ export function TruckManager({ trucks }: Props) { const res = await fetch('/api/admin/trucks', { method: 'POST', headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ truck_no: no, carrier: carrier.trim() || null }), + body: JSON.stringify({ truck_no: no, carrier: carrier.trim() || null, site_id: siteId || null }), }) const data = await res.json() if (!res.ok) { setError(data.error ?? 'Failed to add truck'); return } setTruckNo('') setCarrier('') + setSiteId('') setShowAdd(false) router.refresh() } catch { @@ -82,6 +103,19 @@ export function TruckManager({ trucks }: Props) { setConfirmDelete(null) } + const handleSaveEdit = async () => { + if (!editing) return + const no = editNo.trim() + if (!no) return + const ok = await send('PATCH', { + id: editing.id, + truck_no: no, + carrier: editCarrier.trim() || null, + site_id: editSiteId || null, + }) + if (ok) setEditing(null) + } + return (
@@ -106,8 +140,15 @@ export function TruckManager({ trucks }: Props) {
{tk.truck_no} {tk.carrier && {tk.carrier}} + + {siteName(tk.site_id) ?? 'Unassigned'} +
+ Report link @@ -134,11 +175,11 @@ export function TruckManager({ trucks }: Props) {
{/* Add Truck Modal */} - { setShowAdd(false); setTruckNo(''); setCarrier(''); setError(null) }} + { setShowAdd(false); setTruckNo(''); setCarrier(''); setSiteId(''); setError(null) }} title="Add Truck" width="sm" footer={ <> - @@ -165,6 +206,49 @@ export function TruckManager({ trucks }: Props) { onKeyDown={e => e.key === 'Enter' && handleAdd()} className={inp} />
+
+ + +
+
+ + + {/* Edit Truck Modal */} + { setEditing(null); setError(null) }} + title="Edit Truck" width="sm" + footer={ + <> + + + + } + > + {error &&

{error}

} +
+
+ + setEditNo(e.target.value)} className={inp} /> +
+
+ + setEditCarrier(e.target.value)} className={inp} /> +
+
+ + +
diff --git a/tests/components/admin/truck-manager.test.tsx b/tests/components/admin/truck-manager.test.tsx new file mode 100644 index 0000000..b94f85f --- /dev/null +++ b/tests/components/admin/truck-manager.test.tsx @@ -0,0 +1,72 @@ +import { describe, it, expect, vi, beforeEach } from 'vitest' +import { render, screen, fireEvent, waitFor } from '@testing-library/react' +import { TruckManager, type Truck, type TruckSite } from '@/components/admin/truck-manager' + +const { refresh } = vi.hoisted(() => ({ refresh: vi.fn() })) +vi.mock('next/navigation', () => ({ useRouter: () => ({ refresh }) })) + +const fetchMock = vi.fn() +beforeEach(() => { + refresh.mockClear() + fetchMock.mockReset() + fetchMock.mockResolvedValue({ ok: true, json: async () => ({ ok: true }) }) + vi.stubGlobal('fetch', fetchMock) +}) + +const sites: TruckSite[] = [ + { id: 'site-a', name: 'Site A', active: true }, + { id: 'site-b', name: 'Site B', active: true }, + { id: 'site-old', name: 'Old Site', active: false }, +] +const trucks: Truck[] = [ + { id: 't1', truck_no: 'WXY 1', carrier: null, site_id: 'site-a', active: true }, + { id: 't2', truck_no: 'WXY 2', carrier: 'Setia', site_id: null, active: true }, +] + +describe('TruckManager site link', () => { + it('shows the site name or Unassigned on each row', () => { + render() + expect(screen.getByText('Site A')).toBeTruthy() + expect(screen.getByText('Unassigned')).toBeTruthy() + }) + + it('edits the site of a truck via PATCH', async () => { + render() + fireEvent.click(screen.getAllByRole('button', { name: 'Edit' })[1]) + fireEvent.change(screen.getByLabelText('Site'), { target: { value: 'site-b' } }) + fireEvent.click(screen.getByRole('button', { name: 'Save' })) + await waitFor(() => expect(fetchMock).toHaveBeenCalled()) + const [url, init] = fetchMock.mock.calls[0] + expect(url).toBe('/api/admin/trucks') + expect(init.method).toBe('PATCH') + expect(JSON.parse(init.body)).toEqual({ id: 't2', truck_no: 'WXY 2', carrier: 'Setia', site_id: 'site-b' }) + await waitFor(() => expect(refresh).toHaveBeenCalled()) + }) + + it('clears the site with the No site option', async () => { + render() + fireEvent.click(screen.getAllByRole('button', { name: 'Edit' })[0]) + fireEvent.change(screen.getByLabelText('Site'), { target: { value: '' } }) + fireEvent.click(screen.getByRole('button', { name: 'Save' })) + await waitFor(() => expect(fetchMock).toHaveBeenCalled()) + expect(JSON.parse(fetchMock.mock.calls[0][1].body).site_id).toBeNull() + }) + + it('does not offer inactive sites unless already linked', () => { + render() + fireEvent.click(screen.getAllByRole('button', { name: 'Edit' })[0]) + const select = screen.getByLabelText('Site') as HTMLSelectElement + const labels = Array.from(select.options).map(o => o.textContent) + expect(labels).toEqual(['No site', 'Site A', 'Site B']) + }) + + it('sends site_id when adding a truck', async () => { + render() + fireEvent.click(screen.getByRole('button', { name: /Add Truck/ })) + fireEvent.change(screen.getByLabelText(/Truck Number/), { target: { value: 'NEW 1' } }) + fireEvent.change(screen.getByLabelText('Site'), { target: { value: 'site-b' } }) + fireEvent.click(screen.getAllByRole('button', { name: 'Add Truck' }).pop()!) + await waitFor(() => expect(fetchMock).toHaveBeenCalled()) + expect(JSON.parse(fetchMock.mock.calls[0][1].body)).toEqual({ truck_no: 'NEW 1', carrier: null, site_id: 'site-b' }) + }) +})