feat(trucks): site select, site label and edit modal in admin

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-10-15 11:48:15 +08:00
co-authored by Claude Sonnet 5.5
parent f3f3aec59f
commit 149704898d
4 changed files with 169 additions and 9 deletions
+5 -2
View File
@@ -29,7 +29,7 @@ export default async function AdminHome() {
qrCodeToken: zones.qrCodeToken, active: zones.active, qrCodeToken: zones.qrCodeToken, active: zones.active,
}).from(zones)), }).from(zones)),
asAdmin(db => db.select({ 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))), }).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 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 => ({ 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 ( return (
@@ -66,6 +68,7 @@ export default async function AdminHome() {
sites={sitesWithZones} sites={sitesWithZones}
siteOptions={siteOptions} siteOptions={siteOptions}
trucks={truckList} trucks={truckList}
truckSites={truckSites}
/> />
</main> </main>
) )
+4 -3
View File
@@ -3,7 +3,7 @@
import { useState } from 'react' import { useState } from 'react'
import { UserManager, type AdminUser, type SiteOption } from './user-manager' import { UserManager, type AdminUser, type SiteOption } from './user-manager'
import { SiteZoneManager, type SiteWithZones } from './site-zone-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' type Tab = 'users' | 'sites' | 'trucks'
@@ -12,9 +12,10 @@ interface Props {
sites: SiteWithZones[] sites: SiteWithZones[]
siteOptions: SiteOption[] siteOptions: SiteOption[]
trucks: Truck[] 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<Tab>('users') const [tab, setTab] = useState<Tab>('users')
const tabs: { id: Tab; label: string; count: number }[] = [ const tabs: { id: Tab; label: string; count: number }[] = [
@@ -45,7 +46,7 @@ export function AdminPanel({ users, sites, siteOptions, trucks }: Props) {
</div> </div>
{tab === 'users' && <UserManager users={users} sites={siteOptions} />} {tab === 'users' && <UserManager users={users} sites={siteOptions} />}
{tab === 'sites' && <SiteZoneManager sites={sites} />} {tab === 'sites' && <SiteZoneManager sites={sites} />}
{tab === 'trucks' && <TruckManager trucks={trucks} />} {tab === 'trucks' && <TruckManager trucks={trucks} sites={truckSites} />}
</div> </div>
) )
} }
+88 -4
View File
@@ -9,16 +9,20 @@ export type Truck = {
id: string id: string
truck_no: string truck_no: string
carrier: string | null carrier: string | null
site_id: string | null
active: boolean active: boolean
} }
export type TruckSite = { id: string; name: string; active: boolean }
interface Props { interface Props {
trucks: Truck[] trucks: Truck[]
sites: TruckSite[]
} }
const lbl = 'block text-xs font-medium text-gray-600 mb-1' 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 router = useRouter()
const [truckNo, setTruckNo] = useState('') const [truckNo, setTruckNo] = useState('')
const [carrier, setCarrier] = useState('') const [carrier, setCarrier] = useState('')
@@ -27,6 +31,22 @@ export function TruckManager({ trucks }: Props) {
const [error, setError] = useState<string | null>(null) const [error, setError] = useState<string | null>(null)
const [showAdd, setShowAdd] = useState(false) const [showAdd, setShowAdd] = useState(false)
const [confirmDelete, setConfirmDelete] = useState<Truck | null>(null) const [confirmDelete, setConfirmDelete] = useState<Truck | null>(null)
const [siteId, setSiteId] = useState('')
const [editing, setEditing] = useState<Truck | null>(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 handleAdd = async () => {
const no = truckNo.trim() const no = truckNo.trim()
@@ -37,12 +57,13 @@ export function TruckManager({ trucks }: Props) {
const res = await fetch('/api/admin/trucks', { const res = await fetch('/api/admin/trucks', {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' }, 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() const data = await res.json()
if (!res.ok) { setError(data.error ?? 'Failed to add truck'); return } if (!res.ok) { setError(data.error ?? 'Failed to add truck'); return }
setTruckNo('') setTruckNo('')
setCarrier('') setCarrier('')
setSiteId('')
setShowAdd(false) setShowAdd(false)
router.refresh() router.refresh()
} catch { } catch {
@@ -82,6 +103,19 @@ export function TruckManager({ trucks }: Props) {
setConfirmDelete(null) 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 ( return (
<div className="bg-surface border border-divider shadow-sm overflow-hidden"> <div className="bg-surface border border-divider shadow-sm overflow-hidden">
<div className="flex items-center justify-between px-5 py-4 border-b border-divider"> <div className="flex items-center justify-between px-5 py-4 border-b border-divider">
@@ -106,8 +140,15 @@ export function TruckManager({ trucks }: Props) {
<div className="flex items-center gap-3"> <div className="flex items-center gap-3">
<span className="text-sm font-semibold text-gray-900">{tk.truck_no}</span> <span className="text-sm font-semibold text-gray-900">{tk.truck_no}</span>
{tk.carrier && <span className="text-xs text-gray-400">{tk.carrier}</span>} {tk.carrier && <span className="text-xs text-gray-400">{tk.carrier}</span>}
<span className={`text-xs px-2 py-0.5 ${tk.site_id ? 'bg-neutral-100 text-ink' : 'bg-gray-100 text-gray-500'}`}>
{siteName(tk.site_id) ?? 'Unassigned'}
</span>
</div> </div>
<div className="flex items-center gap-3"> <div className="flex items-center gap-3">
<button disabled={busyId === tk.id} onClick={() => openEdit(tk)}
className="text-xs text-accent-700 hover:underline cursor-pointer disabled:opacity-50">
Edit
</button>
<a href={`/report?truck_id=${tk.id}`} target="_blank" <a href={`/report?truck_id=${tk.id}`} target="_blank"
className="text-xs text-accent-700 hover:underline cursor-pointer"> className="text-xs text-accent-700 hover:underline cursor-pointer">
Report link Report link
@@ -134,11 +175,11 @@ export function TruckManager({ trucks }: Props) {
</div> </div>
{/* Add Truck Modal */} {/* Add Truck Modal */}
<Modal open={showAdd} onClose={() => { setShowAdd(false); setTruckNo(''); setCarrier(''); setError(null) }} <Modal open={showAdd} onClose={() => { setShowAdd(false); setTruckNo(''); setCarrier(''); setSiteId(''); setError(null) }}
title="Add Truck" width="sm" title="Add Truck" width="sm"
footer={ footer={
<> <>
<button onClick={() => { setShowAdd(false); setTruckNo(''); setCarrier(''); setError(null) }} <button onClick={() => { setShowAdd(false); setTruckNo(''); setCarrier(''); setSiteId(''); setError(null) }}
className="px-4 py-2 text-sm font-medium border border-divider text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors"> className="px-4 py-2 text-sm font-medium border border-divider text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
Cancel Cancel
</button> </button>
@@ -165,6 +206,49 @@ export function TruckManager({ trucks }: Props) {
onKeyDown={e => e.key === 'Enter' && handleAdd()} onKeyDown={e => e.key === 'Enter' && handleAdd()}
className={inp} /> className={inp} />
</div> </div>
<div>
<label className={lbl} htmlFor="add-truck-site">Site</label>
<select id="add-truck-site" value={siteId} onChange={e => setSiteId(e.target.value)} className={inp}>
<option value="">No site</option>
{siteChoices('').map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
</select>
</div>
</div>
</Modal>
{/* Edit Truck Modal */}
<Modal open={!!editing} onClose={() => { setEditing(null); setError(null) }}
title="Edit Truck" width="sm"
footer={
<>
<button onClick={() => { setEditing(null); setError(null) }}
className="px-4 py-2 text-sm font-medium border border-divider text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
Cancel
</button>
<button disabled={busyId === editing?.id || !editNo.trim()} onClick={handleSaveEdit}
className="px-4 py-2 bg-accent text-white text-sm font-semibold hover:bg-accent-600 disabled:opacity-50 cursor-pointer transition-colors">
{busyId === editing?.id ? 'Saving…' : 'Save'}
</button>
</>
}
>
{error && <p className="text-xs text-red-600 bg-red-50 px-3 py-2 mb-3">{error}</p>}
<div className="space-y-4">
<div>
<label className={lbl} htmlFor="edit-truck-no">Truck Number *</label>
<input id="edit-truck-no" type="text" value={editNo} onChange={e => setEditNo(e.target.value)} className={inp} />
</div>
<div>
<label className={lbl} htmlFor="edit-truck-carrier">Carrier (optional)</label>
<input id="edit-truck-carrier" type="text" value={editCarrier} onChange={e => setEditCarrier(e.target.value)} className={inp} />
</div>
<div>
<label className={lbl} htmlFor="edit-truck-site">Site</label>
<select id="edit-truck-site" value={editSiteId} onChange={e => setEditSiteId(e.target.value)} className={inp}>
<option value="">No site</option>
{siteChoices(editing?.site_id ?? '').map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
</select>
</div>
</div> </div>
</Modal> </Modal>
@@ -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(<TruckManager trucks={trucks} sites={sites} />)
expect(screen.getByText('Site A')).toBeTruthy()
expect(screen.getByText('Unassigned')).toBeTruthy()
})
it('edits the site of a truck via PATCH', async () => {
render(<TruckManager trucks={trucks} sites={sites} />)
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(<TruckManager trucks={trucks} sites={sites} />)
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(<TruckManager trucks={trucks} sites={sites} />)
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(<TruckManager trucks={trucks} sites={sites} />)
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' })
})
})