diff --git a/app/api/admin/trucks/route.ts b/app/api/admin/trucks/route.ts
index a8d3129..74d9280 100644
--- a/app/api/admin/trucks/route.ts
+++ b/app/api/admin/trucks/route.ts
@@ -83,7 +83,7 @@ export async function PATCH(request: NextRequest) {
const [before] = await asAdmin(db =>
db.select().from(trucks).where(eq(trucks.id, body.id!)).limit(1)
)
- if (set.siteId && !(await activeSiteExists(set.siteId)))
+ if (set.siteId && set.siteId !== before?.siteId && !(await activeSiteExists(set.siteId)))
return NextResponse.json({ error: 'Site not found or inactive' }, { status: 422 })
try {
diff --git a/tests/api/admin-trucks.test.ts b/tests/api/admin-trucks.test.ts
index b063801..2a976b8 100644
--- a/tests/api/admin-trucks.test.ts
+++ b/tests/api/admin-trucks.test.ts
@@ -128,6 +128,18 @@ describe('PATCH /api/admin/trucks', () => {
expect((await PATCH(req('PATCH', { id: 't1', site_id: SITE }))).status).toBe(422)
expect(setSpy).not.toHaveBeenCalled()
})
+ it('skips the active-site check when the site is unchanged', async () => {
+ selectQueue.push([{ id: 't1', siteId: SITE }])
+ const res = await PATCH(req('PATCH', { id: 't1', truck_no: 'NEW 1', site_id: SITE }))
+ expect(res.status).toBe(200)
+ expect(setSpy).toHaveBeenCalledWith({ truckNo: 'NEW 1', siteId: SITE })
+ })
+ it('422 when moving a site-less truck to an inactive site', async () => {
+ selectQueue.push([{ id: 't1', siteId: null }], [])
+ const res = await PATCH(req('PATCH', { id: 't1', site_id: SITE }))
+ expect(res.status).toBe(422)
+ expect(setSpy).not.toHaveBeenCalled()
+ })
it('409 for a duplicate truck number', async () => {
selectQueue.push([{ id: 't1' }])
txError.code = '23505'
diff --git a/tests/components/admin/truck-manager.test.tsx b/tests/components/admin/truck-manager.test.tsx
index b94f85f..b843f3e 100644
--- a/tests/components/admin/truck-manager.test.tsx
+++ b/tests/components/admin/truck-manager.test.tsx
@@ -60,6 +60,17 @@ describe('TruckManager site link', () => {
expect(labels).toEqual(['No site', 'Site A', 'Site B'])
})
+ it('keeps the inactive site selectable for a truck already linked to it', () => {
+ const oldTrucks: Truck[] = [
+ { id: 't9', truck_no: 'OLD 9', carrier: null, site_id: 'site-old', active: true },
+ ]
+ 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', 'Old Site'])
+ })
+
it('sends site_id when adding a truck', async () => {
render()
fireEvent.click(screen.getByRole('button', { name: /Add Truck/ }))