Compare commits
24
Commits
4f9ca6e37f
...
701fefd286
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
701fefd286 | ||
|
|
f3c62d9225 | ||
|
|
17c32ecd04 | ||
|
|
5f1d7a6ed4 | ||
|
|
149704898d | ||
|
|
f3f3aec59f | ||
|
|
867b725262 | ||
|
|
fd7a55337f | ||
|
|
2a9d32d1d0 | ||
|
|
c4377fb705 | ||
|
|
275a1ef3e9 | ||
|
|
10f22b5cd5 | ||
|
|
1b84ed8625 | ||
|
|
550a61cedc | ||
|
|
de7fb298f7 | ||
|
|
51986b7ae5 | ||
|
|
cf5719883c | ||
|
|
98cc7c4ac9 | ||
|
|
29bdb39506 | ||
|
|
99eca7d242 | ||
|
|
e89ecdd5c4 | ||
|
|
7424fe4f9b | ||
|
|
0ca92182ff | ||
|
|
aac988010a |
@@ -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}
|
||||
/>
|
||||
</main>
|
||||
)
|
||||
|
||||
@@ -5,8 +5,8 @@ import Link from 'next/link'
|
||||
import { ArrowLeft } from 'lucide-react'
|
||||
import { asAdmin } from '@/lib/db/with-user'
|
||||
import { getSession } from '@/lib/auth/get-session'
|
||||
import { capaActions, incidents, users } from '@/lib/db/schema'
|
||||
import { eq } from 'drizzle-orm'
|
||||
import { capaActions, evidenceFiles, incidents, users } from '@/lib/db/schema'
|
||||
import { eq, and, asc } from 'drizzle-orm'
|
||||
import { aliasedTable } from 'drizzle-orm'
|
||||
import { VerifyForm } from '@/components/capa/verify-form'
|
||||
import { CloseCapaButton } from '@/components/capa/close-capa-button'
|
||||
@@ -60,6 +60,13 @@ export default async function CapaDetailPage({ params }: Props) {
|
||||
|
||||
if (!capa) notFound()
|
||||
|
||||
const photos = await asAdmin(db =>
|
||||
db.select({ id: evidenceFiles.id, fileUrl: evidenceFiles.fileUrl })
|
||||
.from(evidenceFiles)
|
||||
.where(and(eq(evidenceFiles.capaId, id), eq(evidenceFiles.deleted, false)))
|
||||
.orderBy(asc(evidenceFiles.uploadedAt))
|
||||
)
|
||||
|
||||
const isHse = session && ['hse', 'admin'].includes(session.role)
|
||||
const status = capa.status
|
||||
const today = new Date().toISOString().slice(0, 10)
|
||||
@@ -102,7 +109,7 @@ export default async function CapaDetailPage({ params }: Props) {
|
||||
{isHse && status === 'pending_verification' && <VerifyForm capaId={id} />}
|
||||
{isHse && status === 'verified' && <CloseCapaButton capaId={id} />}
|
||||
|
||||
{(capa.ownerNotes || capa.completedAt) && (
|
||||
{(capa.ownerNotes || capa.completedAt || photos.length > 0) && (
|
||||
<section className="space-y-2 rounded-xl bg-surface p-5 shadow-card">
|
||||
<h2 className="text-sm font-semibold">Completion report</h2>
|
||||
{capa.completedAt && (
|
||||
@@ -113,6 +120,18 @@ export default async function CapaDetailPage({ params }: Props) {
|
||||
{capa.ownerNotes && (
|
||||
<p className="whitespace-pre-wrap text-[13px] text-ink-3">{capa.ownerNotes}</p>
|
||||
)}
|
||||
{photos.length > 0 && (
|
||||
<ul className="grid grid-cols-2 gap-2 sm:grid-cols-3">
|
||||
{photos.map((p, i) => (
|
||||
<li key={p.id}>
|
||||
<a href={p.fileUrl} target="_blank" rel="noreferrer" className="block overflow-hidden rounded-md shadow-card">
|
||||
{/* eslint-disable-next-line @next/next/no-img-element */}
|
||||
<img src={p.fileUrl} alt={`CAPA completion evidence ${i + 1} of ${photos.length}`} className="aspect-square w-full object-cover" />
|
||||
</a>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
)}
|
||||
</section>
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -3,27 +3,43 @@ export const dynamic = 'force-dynamic'
|
||||
import { NextRequest, NextResponse } from 'next/server'
|
||||
import { requireAdmin } from '@/lib/auth/require-admin'
|
||||
import { asAdmin } from '@/lib/db/with-user'
|
||||
import { trucks, incidents } from '@/lib/db/schema'
|
||||
import { trucks, incidents, sites } from '@/lib/db/schema'
|
||||
import { parseSiteId } from '@/lib/admin/truck-input'
|
||||
import { writeAuditLog } from '@/lib/db/audit'
|
||||
import { eq, sql } from 'drizzle-orm'
|
||||
import { and, eq, sql } from 'drizzle-orm'
|
||||
|
||||
async function activeSiteExists(id: string): Promise<boolean> {
|
||||
const [row] = await asAdmin(db =>
|
||||
db.select({ id: sites.id }).from(sites).where(and(eq(sites.id, id), eq(sites.active, true))).limit(1)
|
||||
)
|
||||
return !!row
|
||||
}
|
||||
|
||||
export async function POST(request: NextRequest) {
|
||||
const { session } = await requireAdmin()
|
||||
if (!session) return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
|
||||
const body: { truck_no?: string; carrier?: string } = await request.json().catch(() => ({}))
|
||||
const body: { truck_no?: string; carrier?: string; site_id?: unknown } = await request.json().catch(() => ({}))
|
||||
const truck_no = (body.truck_no ?? '').trim()
|
||||
if (!truck_no) return NextResponse.json({ error: 'truck_no required' }, { status: 422 })
|
||||
|
||||
const parsedSite = parseSiteId(body.site_id)
|
||||
if (!parsedSite.ok) return NextResponse.json({ error: 'site_id invalid' }, { status: 422 })
|
||||
const siteId = parsedSite.value ?? null
|
||||
if (siteId && !(await activeSiteExists(siteId)))
|
||||
return NextResponse.json({ error: 'Site not found or inactive' }, { status: 422 })
|
||||
|
||||
const carrier = (body.carrier ?? '').trim() || null
|
||||
|
||||
try {
|
||||
let truckId: string | undefined
|
||||
await asAdmin(async db => {
|
||||
await db.transaction(async tx => {
|
||||
await tx.execute(sql`SELECT set_config('app.user_id', ${session.sub}, true)`)
|
||||
const [truck] = await tx.insert(trucks).values({ truckNo: truck_no, carrier: (body.carrier ?? '').trim() || null }).returning({ id: trucks.id })
|
||||
const [truck] = await tx.insert(trucks).values({ truckNo: truck_no, carrier, siteId }).returning({ id: trucks.id })
|
||||
if (!truck) throw new Error('Insert failed')
|
||||
truckId = truck.id
|
||||
await writeAuditLog(tx, 'trucks', truck.id, 'INSERT', { truck_no, carrier: (body.carrier ?? '').trim() || null })
|
||||
await writeAuditLog(tx, 'trucks', truck.id, 'INSERT', { truck_no, carrier, site_id: siteId })
|
||||
})
|
||||
})
|
||||
if (!truckId) return NextResponse.json({ error: 'Insert failed' }, { status: 400 })
|
||||
@@ -41,21 +57,46 @@ export async function PATCH(request: NextRequest) {
|
||||
const { session } = await requireAdmin()
|
||||
if (!session) return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
|
||||
const body: { id?: string; active?: boolean } = await request.json().catch(() => ({}))
|
||||
const body: {
|
||||
id?: string
|
||||
active?: boolean
|
||||
truck_no?: string
|
||||
carrier?: string | null
|
||||
site_id?: unknown
|
||||
} = await request.json().catch(() => ({}))
|
||||
if (!body.id) return NextResponse.json({ error: 'id required' }, { status: 422 })
|
||||
|
||||
const set: { active?: boolean; truckNo?: string; carrier?: string | null; siteId?: string | null } = {}
|
||||
if (typeof body.active === 'boolean') set.active = body.active
|
||||
if (body.truck_no !== undefined) {
|
||||
const no = String(body.truck_no).trim()
|
||||
if (!no) return NextResponse.json({ error: 'truck_no required' }, { status: 422 })
|
||||
set.truckNo = no
|
||||
}
|
||||
if (body.carrier !== undefined) set.carrier = (body.carrier ?? '').trim() || null
|
||||
const parsedSite = parseSiteId(body.site_id)
|
||||
if (!parsedSite.ok) return NextResponse.json({ error: 'site_id invalid' }, { status: 422 })
|
||||
if (parsedSite.value !== undefined) set.siteId = parsedSite.value
|
||||
if (Object.keys(set).length === 0)
|
||||
return NextResponse.json({ error: 'nothing to update' }, { status: 422 })
|
||||
|
||||
const [before] = await asAdmin(db =>
|
||||
db.select().from(trucks).where(eq(trucks.id, body.id!)).limit(1)
|
||||
)
|
||||
if (set.siteId && set.siteId !== before?.siteId && !(await activeSiteExists(set.siteId)))
|
||||
return NextResponse.json({ error: 'Site not found or inactive' }, { status: 422 })
|
||||
|
||||
try {
|
||||
await asAdmin(async db => {
|
||||
await db.transaction(async tx => {
|
||||
await tx.execute(sql`SELECT set_config('app.user_id', ${session.sub}, true)`)
|
||||
await tx.update(trucks).set({ active: body.active }).where(eq(trucks.id, body.id!))
|
||||
await writeAuditLog(tx, 'trucks', body.id!, 'admin_update', { active: body.active }, before ?? null)
|
||||
await tx.update(trucks).set(set).where(eq(trucks.id, body.id!))
|
||||
await writeAuditLog(tx, 'trucks', body.id!, 'admin_update', set, before ?? null)
|
||||
})
|
||||
})
|
||||
} catch {
|
||||
} catch (e) {
|
||||
const code = (e as { code?: string }).code
|
||||
if (code === '23505') return NextResponse.json({ error: 'Truck number already exists' }, { status: 409 })
|
||||
return NextResponse.json({ error: 'Update failed' }, { status: 500 })
|
||||
}
|
||||
return NextResponse.json({ ok: true })
|
||||
|
||||
@@ -105,6 +105,13 @@ export async function PATCH(
|
||||
|
||||
const body = await request.json()
|
||||
|
||||
if (body.status === 'pending_verification') {
|
||||
return NextResponse.json(
|
||||
{ error: 'Use POST /api/capa/[id]/submit to submit for verification' },
|
||||
{ status: 403 },
|
||||
)
|
||||
}
|
||||
|
||||
const privilegedStatuses = ['verified', 'reopened', 'closed']
|
||||
if (body.status && privilegedStatuses.includes(body.status) && !['hse', 'admin'].includes(role)) {
|
||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
@@ -122,14 +129,12 @@ export async function PATCH(
|
||||
if ('department' in body && allowed.includes('department')) updateSet.department = body.department
|
||||
if ('root_cause_ref' in body && allowed.includes('root_cause_ref')) updateSet.rootCauseRef = body.root_cause_ref
|
||||
if ('owner_notes' in body && allowed.includes('owner_notes')) updateSet.ownerNotes = body.owner_notes
|
||||
if (body.status === 'pending_verification') updateSet.completedAt = new Date()
|
||||
|
||||
// Build audit new/old value from original snake_case body keys for consistency
|
||||
const auditNew: Record<string, unknown> = {}
|
||||
for (const key of allowed) {
|
||||
if (key in body) auditNew[key] = body[key]
|
||||
}
|
||||
if (body.status === 'pending_verification') auditNew.completed_at = updateSet.completedAt?.toISOString()
|
||||
|
||||
await withUser(session.sub, async tx => {
|
||||
let oldNotes: string | null = null
|
||||
|
||||
@@ -0,0 +1,98 @@
|
||||
export const dynamic = 'force-dynamic'
|
||||
|
||||
import { NextRequest, NextResponse } from 'next/server'
|
||||
import { and, eq } from 'drizzle-orm'
|
||||
import { getSession } from '@/lib/auth/get-session'
|
||||
import { withUser } from '@/lib/db/with-user'
|
||||
import { writeAuditLog } from '@/lib/db/audit'
|
||||
import { capaActions, evidenceFiles } from '@/lib/db/schema'
|
||||
import { uploadEvidenceFile } from '@/lib/storage/evidence'
|
||||
import { validateCapaSubmission } from '@/lib/capa/submit-validation'
|
||||
|
||||
class StatusConflict extends Error {}
|
||||
|
||||
export async function POST(
|
||||
request: NextRequest,
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
const { id } = await params
|
||||
const session = await getSession()
|
||||
if (!session) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
|
||||
|
||||
const [capa] = await withUser(session.sub, async tx =>
|
||||
tx.select({
|
||||
incidentId: capaActions.incidentId,
|
||||
ownerUserId: capaActions.ownerUserId,
|
||||
status: capaActions.status,
|
||||
}).from(capaActions).where(eq(capaActions.id, id)).limit(1)
|
||||
)
|
||||
if (!capa) return NextResponse.json({ error: 'Not found' }, { status: 404 })
|
||||
|
||||
const isElevated = ['hse', 'admin'].includes(session.role)
|
||||
if (capa.ownerUserId !== session.sub && !isElevated)
|
||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
|
||||
if (capa.status !== 'in_progress')
|
||||
return NextResponse.json({ error: 'CAPA must be in_progress' }, { status: 409 })
|
||||
|
||||
const form = await request.formData()
|
||||
const files = form.getAll('files').filter((f): f is File => f instanceof File)
|
||||
const check = validateCapaSubmission(String(form.get('note') ?? ''), files)
|
||||
if (!check.ok)
|
||||
return NextResponse.json({ error: 'Validation failed', details: check.errors }, { status: 422 })
|
||||
|
||||
const uploaded: Array<{ publicUrl: string; hash: string; type: string }> = []
|
||||
try {
|
||||
for (const file of files) {
|
||||
const { publicUrl, hash } = await uploadEvidenceFile(file, capa.incidentId, 'capa', session.sub)
|
||||
uploaded.push({ publicUrl, hash, type: file.type })
|
||||
}
|
||||
} catch (err) {
|
||||
return NextResponse.json(
|
||||
{ error: 'Photo upload failed', details: [err instanceof Error ? err.message : 'unknown error'] },
|
||||
{ status: 422 },
|
||||
)
|
||||
}
|
||||
|
||||
const completedAt = new Date()
|
||||
try {
|
||||
await withUser(session.sub, async tx => {
|
||||
const updated = await tx.update(capaActions).set({
|
||||
status: 'pending_verification',
|
||||
ownerNotes: check.note,
|
||||
completedAt,
|
||||
}).where(and(eq(capaActions.id, id), eq(capaActions.status, 'in_progress')))
|
||||
.returning({ id: capaActions.id })
|
||||
if (updated.length === 0) throw new StatusConflict()
|
||||
|
||||
const rows = await tx.insert(evidenceFiles).values(
|
||||
uploaded.map(u => ({
|
||||
incidentId: capa.incidentId,
|
||||
capaId: id,
|
||||
stage: 'capa' as const,
|
||||
fileUrl: u.publicUrl,
|
||||
fileType: u.type,
|
||||
fileHash: u.hash,
|
||||
uploadedBy: session.sub,
|
||||
}))
|
||||
).returning({ id: evidenceFiles.id })
|
||||
|
||||
await writeAuditLog(
|
||||
tx, 'capa_actions', id, 'submitted_for_verification',
|
||||
{
|
||||
status: 'pending_verification',
|
||||
owner_notes: check.note,
|
||||
completed_at: completedAt.toISOString(),
|
||||
evidence_file_ids: rows.map(r => r.id),
|
||||
},
|
||||
{ status: 'in_progress' },
|
||||
)
|
||||
})
|
||||
} catch (err) {
|
||||
if (err instanceof StatusConflict)
|
||||
return NextResponse.json({ error: 'CAPA must be in_progress' }, { status: 409 })
|
||||
throw err
|
||||
}
|
||||
|
||||
return NextResponse.json({ ok: true })
|
||||
}
|
||||
@@ -107,7 +107,7 @@ export async function POST() {
|
||||
let res: Awaited<ReturnType<typeof client.chat.completions.create>>
|
||||
try {
|
||||
res = await client.chat.completions.create({
|
||||
model: 'qwen3:14b',
|
||||
model: 'qwen2.5-coder-32b-instruct-Q4_K_M',
|
||||
max_tokens: 2048,
|
||||
messages: [
|
||||
{
|
||||
@@ -166,7 +166,7 @@ Flag only zones with rising or elevated risk (at most 5 flags; do not flag healt
|
||||
|
||||
await withUser(session.sub, async tx =>
|
||||
writeAuditLog(tx, 'incidents', session.sub, 'ai_risk_flags',
|
||||
{ flags, summary: input.summary, model: 'qwen3:14b' })
|
||||
{ flags, summary: input.summary, model: 'qwen2.5-coder-32b-instruct-Q4_K_M' })
|
||||
)
|
||||
|
||||
return NextResponse.json({ flags, summary: input.summary })
|
||||
|
||||
@@ -57,7 +57,7 @@ export async function POST(
|
||||
let res: Awaited<ReturnType<typeof client.chat.completions.create>>
|
||||
try {
|
||||
res = await client.chat.completions.create({
|
||||
model: 'qwen3:14b',
|
||||
model: 'qwen2.5-coder-32b-instruct-Q4_K_M',
|
||||
max_tokens: 2048,
|
||||
messages: [
|
||||
{
|
||||
@@ -105,7 +105,7 @@ Provide 3–5 Why steps drilling from immediate cause to root cause. Frame CAPA
|
||||
await withUser(session.sub, async tx => {
|
||||
await writeAuditLog(tx, 'incidents', id, 'ai_rca_draft', {
|
||||
root_cause_summary: draft.root_cause_summary as string,
|
||||
model: 'qwen3:14b',
|
||||
model: 'qwen2.5-coder-32b-instruct-Q4_K_M',
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ export async function POST(
|
||||
let res: Awaited<ReturnType<typeof client.chat.completions.create>>
|
||||
try {
|
||||
res = await client.chat.completions.create({
|
||||
model: 'qwen3:14b',
|
||||
model: 'qwen2.5-coder-32b-instruct-Q4_K_M',
|
||||
max_tokens: 1024,
|
||||
messages: [
|
||||
{
|
||||
@@ -103,7 +103,7 @@ Output exactly this JSON structure:
|
||||
}
|
||||
|
||||
await withUser(session.sub, async tx => {
|
||||
await writeAuditLog(tx, 'incidents', id, 'ai_triage_suggest', { suggestion: input, model: 'qwen3:14b' })
|
||||
await writeAuditLog(tx, 'incidents', id, 'ai_triage_suggest', { suggestion: input, model: 'qwen2.5-coder-32b-instruct-Q4_K_M' })
|
||||
})
|
||||
|
||||
return NextResponse.json(input)
|
||||
|
||||
@@ -40,7 +40,7 @@ export async function POST(request: NextRequest) {
|
||||
let res: Awaited<ReturnType<typeof client.chat.completions.create>>
|
||||
try {
|
||||
res = await client.chat.completions.create({
|
||||
model: 'qwen3:14b',
|
||||
model: 'qwen2.5-coder-32b-instruct-Q4_K_M',
|
||||
max_tokens: 1024,
|
||||
messages: [
|
||||
{
|
||||
@@ -87,7 +87,7 @@ Scoring criteria: specificity (location, time, persons involved), completeness (
|
||||
|
||||
await withUser(session.sub, async tx => {
|
||||
await writeAuditLog(tx, 'incidents', session.sub, 'ai_quality_check', {
|
||||
score: input.score, passes: input.passes, model: 'qwen3:14b',
|
||||
score: input.score, passes: input.passes, model: 'qwen2.5-coder-32b-instruct-Q4_K_M',
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
@@ -212,8 +212,9 @@ async function handlePost(request: Request) {
|
||||
}
|
||||
})()
|
||||
|
||||
// Embed description asynchronously
|
||||
getApiKey('GOOGLE_AI_API_KEY').then(googleAiKey =>
|
||||
// Embed description asynchronously (disabled if no GOOGLE_AI_API_KEY)
|
||||
getApiKey('GOOGLE_AI_API_KEY')
|
||||
.then(googleAiKey =>
|
||||
import('@/lib/claude/embed').then(({ embedText }) =>
|
||||
embedText(input.description.trim(), googleAiKey).then(embeddingVec => {
|
||||
const embStr = `[${(embeddingVec as number[]).join(',')}]`
|
||||
@@ -222,7 +223,14 @@ async function handlePost(request: Request) {
|
||||
)
|
||||
})
|
||||
)
|
||||
).catch(err => console.error('embed error:', err))
|
||||
)
|
||||
.catch(err => {
|
||||
if (String(err).includes('GOOGLE_AI_API_KEY')) {
|
||||
console.debug('Embeddings disabled: GOOGLE_AI_API_KEY not configured')
|
||||
} else {
|
||||
console.error('Embed error:', err)
|
||||
}
|
||||
})
|
||||
|
||||
return NextResponse.json({ id: incidentId, reference_no: referenceNo }, { status: 201 })
|
||||
}
|
||||
|
||||
@@ -17,6 +17,9 @@ const geistMono = Geist_Mono({
|
||||
export const metadata: Metadata = {
|
||||
title: 'IMS — HSE Incident Management',
|
||||
description: 'Setia Corporation HSE Incident Management System',
|
||||
icons: {
|
||||
icon: '/favicon.ico',
|
||||
},
|
||||
}
|
||||
|
||||
export default async function RootLayout({
|
||||
|
||||
+29
-6
@@ -3,8 +3,9 @@ export const dynamic = 'force-dynamic'
|
||||
import { redirect } from 'next/navigation'
|
||||
import { asAdmin } from '@/lib/db/with-user'
|
||||
import { getSession } from '@/lib/auth/get-session'
|
||||
import { zones, sites, trucks } from '@/lib/db/schema'
|
||||
import { eq, asc } from 'drizzle-orm'
|
||||
import { zones, sites, trucks, users } from '@/lib/db/schema'
|
||||
import { eq, asc, and } from 'drizzle-orm'
|
||||
import { groupSites } from '@/lib/report/zones'
|
||||
import { ReportForm } from '@/components/incidents/report-form'
|
||||
import { LanguageSwitcher } from '@/components/language-switcher'
|
||||
import { OfflineSync } from '@/components/incidents/offline-sync'
|
||||
@@ -43,6 +44,7 @@ export default async function ReportPage({ searchParams }: Props) {
|
||||
id: trucks.id,
|
||||
truckNo: trucks.truckNo,
|
||||
carrier: trucks.carrier,
|
||||
siteId: trucks.siteId,
|
||||
})
|
||||
.from(trucks)
|
||||
.where(eq(trucks.active, true))
|
||||
@@ -53,8 +55,29 @@ export default async function ReportPage({ searchParams }: Props) {
|
||||
id: t.id,
|
||||
truck_no: t.truckNo,
|
||||
carrier: t.carrier ?? null,
|
||||
site_id: t.siteId ?? null,
|
||||
}))
|
||||
|
||||
const zoneRows = await asAdmin(db =>
|
||||
db.select({
|
||||
siteId: sites.id,
|
||||
siteName: sites.name,
|
||||
zoneId: zones.id,
|
||||
zoneName: zones.name,
|
||||
token: zones.qrCodeToken,
|
||||
})
|
||||
.from(zones)
|
||||
.innerJoin(sites, eq(zones.siteId, sites.id))
|
||||
.where(and(eq(zones.active, true), eq(sites.active, true)))
|
||||
.orderBy(asc(sites.name), asc(zones.name))
|
||||
)
|
||||
const siteOptions = groupSites(zoneRows)
|
||||
|
||||
const [me] = await asAdmin(db =>
|
||||
db.select({ siteId: users.siteId }).from(users).where(eq(users.id, session.sub)).limit(1)
|
||||
)
|
||||
const defaultSiteId = me?.siteId ?? ''
|
||||
|
||||
return (
|
||||
<main className="min-h-screen bg-gray-50 py-6 px-4 max-w-lg mx-auto">
|
||||
<div className="mb-6">
|
||||
@@ -62,18 +85,18 @@ export default async function ReportPage({ searchParams }: Props) {
|
||||
<h1 className="text-2xl font-bold text-gray-900">{/* will be translated via ReportForm */}Report an Incident</h1>
|
||||
<LanguageSwitcher />
|
||||
</div>
|
||||
{zoneName ? (
|
||||
{zoneName && (
|
||||
<p className="text-sm text-gray-600 mt-1">
|
||||
{siteName ?? 'Unknown Site'} — {zoneName}
|
||||
</p>
|
||||
) : (
|
||||
<p className="text-sm text-accent-700 mt-1">No zone detected — zone will not be recorded</p>
|
||||
)}
|
||||
</div>
|
||||
<ReportForm
|
||||
zoneToken={zone ?? null}
|
||||
zoneToken={zoneName ? (zone ?? null) : null}
|
||||
zoneName={zoneName}
|
||||
siteName={siteName}
|
||||
sites={siteOptions}
|
||||
defaultSiteId={defaultSiteId}
|
||||
trucks={truckList}
|
||||
initialTruckId={truck_id ?? null}
|
||||
/>
|
||||
|
||||
@@ -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<Tab>('users')
|
||||
|
||||
const tabs: { id: Tab; label: string; count: number }[] = [
|
||||
@@ -45,7 +46,7 @@ export function AdminPanel({ users, sites, siteOptions, trucks }: Props) {
|
||||
</div>
|
||||
{tab === 'users' && <UserManager users={users} sites={siteOptions} />}
|
||||
{tab === 'sites' && <SiteZoneManager sites={sites} />}
|
||||
{tab === 'trucks' && <TruckManager trucks={trucks} />}
|
||||
{tab === 'trucks' && <TruckManager trucks={trucks} sites={truckSites} />}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -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<string | null>(null)
|
||||
const [showAdd, setShowAdd] = useState(false)
|
||||
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 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 (
|
||||
<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">
|
||||
@@ -106,8 +140,15 @@ export function TruckManager({ trucks }: Props) {
|
||||
<div className="flex items-center gap-3">
|
||||
<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>}
|
||||
<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 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"
|
||||
className="text-xs text-accent-700 hover:underline cursor-pointer">
|
||||
Report link
|
||||
@@ -134,11 +175,11 @@ export function TruckManager({ trucks }: Props) {
|
||||
</div>
|
||||
|
||||
{/* 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"
|
||||
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">
|
||||
Cancel
|
||||
</button>
|
||||
@@ -165,6 +206,49 @@ export function TruckManager({ trucks }: Props) {
|
||||
onKeyDown={e => e.key === 'Enter' && handleAdd()}
|
||||
className={inp} />
|
||||
</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>
|
||||
</Modal>
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import { useState } from 'react'
|
||||
import { useRouter } from 'next/navigation'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { SubmitVerificationForm } from '@/components/capa/submit-verification-form'
|
||||
|
||||
interface Props {
|
||||
capaId: string
|
||||
@@ -41,11 +42,7 @@ export function CapaOwnerActions({ capaId, currentStatus }: Props) {
|
||||
}
|
||||
|
||||
if (currentStatus === 'in_progress') {
|
||||
return (
|
||||
<Button onClick={() => updateStatus('pending_verification')} disabled={loading}>
|
||||
{loading ? '…' : 'Submit for Verification'}
|
||||
</Button>
|
||||
)
|
||||
return <SubmitVerificationForm capaId={capaId} />
|
||||
}
|
||||
|
||||
return null
|
||||
|
||||
@@ -0,0 +1,108 @@
|
||||
'use client'
|
||||
|
||||
import { useState } from 'react'
|
||||
import { useRouter } from 'next/navigation'
|
||||
import { X } from 'lucide-react'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Field, Textarea } from '@/components/ui/field'
|
||||
import { MAX_CAPA_PHOTOS, validateCapaSubmission } from '@/lib/capa/submit-validation'
|
||||
|
||||
interface Props {
|
||||
capaId: string
|
||||
}
|
||||
|
||||
export function SubmitVerificationForm({ capaId }: Props) {
|
||||
const router = useRouter()
|
||||
const [note, setNote] = useState('')
|
||||
const [files, setFiles] = useState<File[]>([])
|
||||
const [loading, setLoading] = useState(false)
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
|
||||
const check = validateCapaSubmission(note, files)
|
||||
|
||||
function addFiles(list: FileList | null) {
|
||||
if (!list) return
|
||||
setFiles(prev => [...prev, ...Array.from(list)].slice(0, MAX_CAPA_PHOTOS))
|
||||
}
|
||||
|
||||
async function handleSubmit(e: React.FormEvent) {
|
||||
e.preventDefault()
|
||||
if (!check.ok) return
|
||||
setLoading(true)
|
||||
setError(null)
|
||||
try {
|
||||
const fd = new FormData()
|
||||
fd.append('note', check.note)
|
||||
files.forEach(f => fd.append('files', f))
|
||||
const res = await fetch(`/api/capa/${capaId}/submit`, { method: 'POST', body: fd })
|
||||
if (!res.ok) {
|
||||
const data = await res.json().catch(() => ({}))
|
||||
setError(Array.isArray(data.details) ? data.details.join('. ') : (data.error ?? 'Submit failed. Please try again.'))
|
||||
setLoading(false)
|
||||
return
|
||||
}
|
||||
router.refresh()
|
||||
return
|
||||
} catch {
|
||||
setError('Network error. Please try again.')
|
||||
}
|
||||
setLoading(false)
|
||||
}
|
||||
|
||||
return (
|
||||
<form onSubmit={handleSubmit} className="space-y-3 rounded-xl bg-surface p-5 shadow-card">
|
||||
<div>
|
||||
<h2 className="text-sm font-semibold">Proof of completion</h2>
|
||||
<p className="text-xs text-muted">Describe what was done and attach 1 to {MAX_CAPA_PHOTOS} photos as evidence.</p>
|
||||
</div>
|
||||
|
||||
<Field label="Completion note" htmlFor={`note-${capaId}`}>
|
||||
<Textarea
|
||||
id={`note-${capaId}`}
|
||||
value={note}
|
||||
onChange={e => setNote(e.target.value)}
|
||||
rows={3}
|
||||
placeholder="What action was carried out?"
|
||||
disabled={loading}
|
||||
/>
|
||||
</Field>
|
||||
|
||||
<Field label="Photos" htmlFor={`photos-${capaId}`}>
|
||||
<input
|
||||
id={`photos-${capaId}`}
|
||||
type="file"
|
||||
accept="image/*"
|
||||
multiple
|
||||
disabled={loading || files.length >= MAX_CAPA_PHOTOS}
|
||||
onChange={e => { addFiles(e.target.files); e.target.value = '' }}
|
||||
className="block w-full text-[13px] text-ink"
|
||||
/>
|
||||
</Field>
|
||||
|
||||
{files.length > 0 && (
|
||||
<ul className="space-y-1">
|
||||
{files.map((f, i) => (
|
||||
<li key={`${f.name}-${i}`} className="flex items-center justify-between gap-2 text-[13px]">
|
||||
<span className="truncate">{f.name}</span>
|
||||
<button
|
||||
type="button"
|
||||
aria-label={`Remove ${f.name}`}
|
||||
onClick={() => setFiles(prev => prev.filter((_, j) => j !== i))}
|
||||
disabled={loading}
|
||||
className="text-muted hover:text-ink"
|
||||
>
|
||||
<X size={14} strokeWidth={2} aria-hidden />
|
||||
</button>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
)}
|
||||
|
||||
{error && <p role="alert" className="text-xs text-danger">{error}</p>}
|
||||
|
||||
<Button type="submit" disabled={!check.ok || loading}>
|
||||
{loading ? 'Submitting…' : 'Submit for Verification'}
|
||||
</Button>
|
||||
</form>
|
||||
)
|
||||
}
|
||||
@@ -5,16 +5,20 @@ import { useRouter } from 'next/navigation'
|
||||
import { FileUpload } from '@/components/incidents/file-upload'
|
||||
import type { IncidentType, MedicalStatus } from '@/lib/incidents/validate'
|
||||
import { useTranslations } from '@/lib/i18n/context'
|
||||
import { zonesForSite, resolveZoneToken, type SiteOption } from '@/lib/report/zones'
|
||||
import { siteForTruck } from '@/lib/report/trucks'
|
||||
|
||||
interface Props {
|
||||
zoneToken: string | null
|
||||
zoneName: string | null
|
||||
siteName: string | null
|
||||
trucks: Array<{ id: string; truck_no: string; carrier: string | null }>
|
||||
sites: SiteOption[]
|
||||
defaultSiteId: string
|
||||
trucks: Array<{ id: string; truck_no: string; carrier: string | null; site_id: string | null }>
|
||||
initialTruckId?: string | null
|
||||
}
|
||||
|
||||
export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
||||
export function ReportForm({ zoneToken, sites, defaultSiteId, trucks, initialTruckId }: Props) {
|
||||
const router = useRouter()
|
||||
const t = useTranslations('ReportForm')
|
||||
const itLabels = useTranslations('IncidentType')
|
||||
@@ -52,6 +56,15 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
||||
} | null>(null)
|
||||
const [overrideQuality, setOverrideQuality] = useState(false)
|
||||
|
||||
const truckSite = !zoneToken ? siteForTruck(trucks, initialTruckId) : null
|
||||
const [siteId, setSiteId] = useState(
|
||||
truckSite && sites.some(s => s.id === truckSite)
|
||||
? truckSite
|
||||
: sites.some(s => s.id === defaultSiteId) ? defaultSiteId : (sites.length === 1 ? sites[0].id : '')
|
||||
)
|
||||
const [zoneId, setZoneId] = useState('')
|
||||
const effectiveZoneToken = resolveZoneToken({ zoneToken, sites, zoneId })
|
||||
|
||||
const [form, setForm] = useState({
|
||||
incident_type: (initialTruckId ? 'transport' : '') as IncidentType | '',
|
||||
description: '',
|
||||
@@ -113,7 +126,7 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
||||
try {
|
||||
const { addPendingReport } = await import('@/lib/offline/db')
|
||||
await addPendingReport({
|
||||
zone_token: zoneToken ?? '',
|
||||
zone_token: effectiveZoneToken ?? '',
|
||||
incident_type: form.incident_type as IncidentType,
|
||||
description: form.description,
|
||||
injury_involved: form.injury_involved,
|
||||
@@ -162,7 +175,7 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
||||
|
||||
try {
|
||||
const fd = new FormData()
|
||||
if (zoneToken) fd.append('zone_token', zoneToken)
|
||||
if (effectiveZoneToken) fd.append('zone_token', effectiveZoneToken)
|
||||
fd.append('incident_type', form.incident_type)
|
||||
fd.append('description', form.description)
|
||||
fd.append('injury_involved', String(form.injury_involved))
|
||||
@@ -225,6 +238,40 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
||||
</div>
|
||||
)}
|
||||
|
||||
{!zoneToken && (
|
||||
<div className="grid grid-cols-2 gap-3">
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 mb-1">
|
||||
{t.siteLabel} <span className="text-red-500">*</span>
|
||||
</label>
|
||||
<select
|
||||
required
|
||||
className="w-full border border-divider px-3 py-2.5 text-sm focus:outline-none focus:ring-2 focus:ring-accent"
|
||||
value={siteId}
|
||||
onChange={e => { setSiteId(e.target.value); setZoneId('') }}
|
||||
>
|
||||
<option value="">{t.sitePlaceholder}</option>
|
||||
{sites.map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 mb-1">
|
||||
{t.zoneLabel} <span className="text-red-500">*</span>
|
||||
</label>
|
||||
<select
|
||||
required
|
||||
disabled={!siteId}
|
||||
className="w-full border border-divider px-3 py-2.5 text-sm focus:outline-none focus:ring-2 focus:ring-accent disabled:opacity-50"
|
||||
value={zoneId}
|
||||
onChange={e => setZoneId(e.target.value)}
|
||||
>
|
||||
<option value="">{t.zonePlaceholder}</option>
|
||||
{zonesForSite(sites, siteId).map(z => <option key={z.id} value={z.id}>{z.name}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 mb-1">
|
||||
{t.incidentTypeLabel} <span className="text-red-500">*</span>
|
||||
@@ -382,7 +429,7 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
||||
|
||||
<button
|
||||
type="submit"
|
||||
disabled={submitting || !form.incident_type || (form.incident_type === 'transport' && !form.truck_id)}
|
||||
disabled={submitting || !effectiveZoneToken || !form.incident_type || (form.incident_type === 'transport' && !form.truck_id)}
|
||||
className="w-full bg-accent text-white py-3 font-medium text-sm
|
||||
hover:bg-accent-600 disabled:opacity-50 disabled:cursor-not-allowed transition-colors"
|
||||
>
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
-- Apply by hand on the server DB with the owner's go-ahead. Not run by deploy.
|
||||
BEGIN;
|
||||
ALTER TABLE evidence_files ADD COLUMN IF NOT EXISTS capa_id UUID REFERENCES capa_actions(id) ON DELETE RESTRICT;
|
||||
CREATE INDEX IF NOT EXISTS evidence_files_capa_id_idx ON evidence_files(capa_id);
|
||||
COMMIT;
|
||||
@@ -0,0 +1,5 @@
|
||||
-- Apply by hand on the server DB with the owner's go-ahead. Not run by deploy.
|
||||
BEGIN;
|
||||
ALTER TABLE trucks ADD COLUMN IF NOT EXISTS site_id UUID REFERENCES sites(id);
|
||||
CREATE INDEX IF NOT EXISTS trucks_site_id_idx ON trucks(site_id);
|
||||
COMMIT;
|
||||
@@ -0,0 +1,67 @@
|
||||
-- One-off: delete ALL incidents (and children) and every user with role <> 'admin'.
|
||||
-- Usage: psql -p 5433 -d ims -v mode=dryrun -f cleanup-test-data.sql (counts only)
|
||||
-- psql -p 5433 -d ims -v mode=run -f cleanup-test-data.sql (deletes, one transaction)
|
||||
-- Evidence files on disk are NOT touched (5-year retention).
|
||||
|
||||
\set ON_ERROR_STOP on
|
||||
|
||||
\if :{?mode}
|
||||
\else
|
||||
\echo 'Set -v mode=dryrun or -v mode=run'
|
||||
\quit
|
||||
\endif
|
||||
|
||||
BEGIN;
|
||||
|
||||
\echo '--- admins kept ---'
|
||||
SELECT id, name, email FROM users WHERE role = 'admin' ORDER BY email;
|
||||
|
||||
\echo '--- row counts to delete ---'
|
||||
SELECT 'incidents' AS tbl, count(*) FROM incidents
|
||||
UNION ALL SELECT 'evidence_files', count(*) FROM evidence_files
|
||||
UNION ALL SELECT 'investigations', count(*) FROM investigations
|
||||
UNION ALL SELECT 'capa_actions', count(*) FROM capa_actions
|
||||
UNION ALL SELECT 'dosh_reports', count(*) FROM dosh_reports
|
||||
UNION ALL SELECT 'incident_addenda', count(*) FROM incident_addenda
|
||||
UNION ALL SELECT 'notifications_log', count(*) FROM notifications_log
|
||||
UNION ALL SELECT 'audit_log (all)', count(*) FROM audit_log
|
||||
UNION ALL SELECT 'users (non-admin)', count(*) FROM users WHERE role <> 'admin';
|
||||
|
||||
SELECT (:'mode' = 'run') AS do_delete \gset
|
||||
\if :do_delete
|
||||
-- Closed incidents are locked by triggers; disable them for this transaction only.
|
||||
ALTER TABLE incidents DISABLE TRIGGER incidents_closed_lock_delete;
|
||||
ALTER TABLE incidents DISABLE TRIGGER incidents_closed_lock_update;
|
||||
|
||||
DELETE FROM notifications_log;
|
||||
DELETE FROM incident_addenda;
|
||||
DELETE FROM dosh_reports;
|
||||
DELETE FROM evidence_files;
|
||||
DELETE FROM capa_actions;
|
||||
DELETE FROM investigations;
|
||||
DELETE FROM incidents;
|
||||
|
||||
-- audit_log: remove rows about deleted incident-side tables and about non-admin users.
|
||||
DELETE FROM audit_log
|
||||
WHERE table_name IN ('incidents','evidence_files','investigations','capa_actions','dosh_reports','incident_addenda')
|
||||
OR changed_by IN (SELECT id FROM users WHERE role <> 'admin')
|
||||
OR (table_name = 'users' AND record_id IN (SELECT id FROM users WHERE role <> 'admin'));
|
||||
|
||||
UPDATE app_settings SET updated_by = NULL
|
||||
WHERE updated_by IN (SELECT id FROM users WHERE role <> 'admin');
|
||||
|
||||
DELETE FROM password_reset_tokens WHERE user_id IN (SELECT id FROM users WHERE role <> 'admin');
|
||||
DELETE FROM users WHERE role <> 'admin';
|
||||
|
||||
ALTER TABLE incidents ENABLE TRIGGER incidents_closed_lock_delete;
|
||||
ALTER TABLE incidents ENABLE TRIGGER incidents_closed_lock_update;
|
||||
|
||||
\echo '--- after ---'
|
||||
SELECT 'incidents' AS tbl, count(*) FROM incidents
|
||||
UNION ALL SELECT 'users', count(*) FROM users
|
||||
UNION ALL SELECT 'admins', count(*) FROM users WHERE role = 'admin';
|
||||
COMMIT;
|
||||
\else
|
||||
ROLLBACK;
|
||||
\echo 'dry run: nothing changed'
|
||||
\endif
|
||||
@@ -101,6 +101,9 @@ CREATE TABLE trucks (
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||
);
|
||||
|
||||
ALTER TABLE trucks ADD COLUMN IF NOT EXISTS site_id UUID REFERENCES sites(id);
|
||||
CREATE INDEX IF NOT EXISTS trucks_site_id_idx ON trucks(site_id);
|
||||
|
||||
-- incidents: final column set includes all columns added in later migrations
|
||||
CREATE TABLE incidents (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
@@ -197,6 +200,9 @@ CREATE INDEX capa_actions_owner_idx ON capa_actions(owner_user_id);
|
||||
CREATE INDEX capa_actions_status_idx ON capa_actions(status);
|
||||
CREATE INDEX capa_actions_due_date_idx ON capa_actions(due_date);
|
||||
|
||||
ALTER TABLE evidence_files ADD COLUMN capa_id UUID REFERENCES capa_actions(id) ON DELETE RESTRICT;
|
||||
CREATE INDEX evidence_files_capa_id_idx ON evidence_files(capa_id);
|
||||
|
||||
CREATE TABLE dosh_reports (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
incident_id UUID NOT NULL REFERENCES incidents(id) ON DELETE RESTRICT,
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
# Cleanup: delete test incidents and non-admin users
|
||||
|
||||
Owner go-ahead required before step 4. Never run during business hours without telling HSE.
|
||||
|
||||
1. **Backup** (on the server, `ssh -p 9321 setia@175.136.239.121`):
|
||||
```bash
|
||||
D=$(date +%Y%m%d-%H%M)
|
||||
pg_dump -p 5433 -Fc ims > /srv/apps/ims/backups/ims-pre-cleanup-$D.dump
|
||||
tar -czf /srv/apps/ims/backups/evidence-pre-cleanup-$D.tgz /var/lib/ims-evidence
|
||||
ls -lh /srv/apps/ims/backups/*pre-cleanup-$D*
|
||||
```
|
||||
Create `/srv/apps/ims/backups` first if missing. Both files must be non-empty.
|
||||
2. **Upload** `db/ops/cleanup-test-data.sql` to `/srv/apps/ims/backups/` (not into `app/`).
|
||||
3. **Dry run.** Use a DB role that owns the tables and bypasses RLS (superuser, or the owner role with BYPASSRLS). The tables have FORCE RLS and no DELETE policies, so as `app_user` or a plain owner the counts can read 0 and deletes silently remove nothing. Check first: `psql -p 5433 -d ims -Atc "select rolsuper or rolbypassrls from pg_roles where rolname = current_user"` must print `t`. Then:
|
||||
```bash
|
||||
psql -p 5433 -d ims -v mode=dryrun -f /srv/apps/ims/backups/cleanup-test-data.sql
|
||||
```
|
||||
Send the admins list and the row counts to the owner. If incidents or users show 0 when the app shows rows, you are on the wrong role: stop. Mention that audit_log rows written by non-admin users about other tables (zones, trucks, settings) are also removed. Stop here until they confirm.
|
||||
4. **Run** after explicit confirmation:
|
||||
```bash
|
||||
psql -p 5433 -d ims -v ON_ERROR_STOP=1 -v mode=run -f /srv/apps/ims/backups/cleanup-test-data.sql
|
||||
```
|
||||
5. **Verify**: `systemctl is-active ims` is `active`; log in as an admin at https://ims.setia.com.my/login; Incidents page is empty; Users page lists only admins.
|
||||
6. **Rollback** (only if wrong): `pg_restore -p 5433 -d ims --clean --if-exists <dump>`; evidence files were never touched.
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,886 @@
|
||||
# Truck to Site Link Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** Let admin link a truck to one site (with edit), and make the Report an Incident truck dropdown show only trucks for the selected site plus unassigned trucks.
|
||||
|
||||
**Architecture:** Nullable `trucks.site_id` column (hand-applied SQL). `/api/admin/trucks` POST and PATCH accept `site_id` and PATCH becomes a partial edit (truck_no, carrier, site_id, active). The Trucks admin tab gets a Site select on add, a site label per row and an Edit modal. The report form filters trucks with a pure helper `trucksForSite`.
|
||||
|
||||
**Tech Stack:** Next.js 16 App Router, Drizzle ORM + `pg`, vitest + Testing Library.
|
||||
|
||||
Spec: `docs/superpowers/specs/2026-10-15-truck-site-link-design.md`
|
||||
|
||||
## Global Constraints
|
||||
|
||||
- A truck links to **one** site, optional. Existing trucks stay unassigned.
|
||||
- A truck with no site shows for **every** site on the report form.
|
||||
- `POST /api/incidents` is NOT changed and does not reject a truck/site mismatch.
|
||||
- Schema change is hand-applied: write `db/ops/2026-10-15-trucks-site-id.sql`, edit `db/schema.sql` and `lib/db/schema.ts`. Do NOT run any SQL against any database. No RLS change.
|
||||
- Every DB mutation writes `audit_log` in the same transaction (existing pattern with `writeAuditLog`).
|
||||
- Admin routes use `requireAdmin()` and `asAdmin`.
|
||||
- UI uses existing tokens and classes (`bg-surface`, `border-divider`, `text-accent-700`, ...). No hard-coded hex, no `bg-white`, no 2px borders. `npm run check:design` must print `design gates: clean`.
|
||||
- Baseline: 7 pre-existing failing vitest tests. Do not fix or count them. After code changes run `graphify update .`.
|
||||
- Never commit `.env*`. Do not commit the unrelated dirty files (`design-system/ims-admin/MASTER.md` deletion, `*.zip`, `artifacts/`, `scripts/create-agent-*.js`, `.superpowers/sdd/progress.md`). Stage only the files named in each task.
|
||||
- Work on branch `feat/truck-site`.
|
||||
|
||||
---
|
||||
|
||||
### Task 1: Schema, SQL and site/truck helpers
|
||||
|
||||
**Files:**
|
||||
- Create: `db/ops/2026-10-15-trucks-site-id.sql`
|
||||
- Modify: `db/schema.sql` (after the `CREATE TABLE trucks (...)` block, line ~96-102)
|
||||
- Modify: `lib/db/schema.ts` (`trucks` table, line ~102)
|
||||
- Create: `lib/report/trucks.ts`
|
||||
- Create: `lib/admin/truck-input.ts`
|
||||
- Modify: `lib/report/zones.ts` (add `siteIdForToken`)
|
||||
- Test: `tests/lib/report/trucks.test.ts`, `tests/lib/admin/truck-input.test.ts`, `tests/lib/report/zones.test.ts` (append)
|
||||
|
||||
**Interfaces:**
|
||||
- Produces: `trucksForSite<T extends { site_id: string | null }>(trucks: T[], siteId: string): T[]`; `siteForTruck(trucks: { id: string; site_id: string | null }[], truckId: string | null | undefined): string | null`; `parseSiteId(raw: unknown): { ok: true; value: string | null | undefined } | { ok: false }`; `siteIdForToken(sites: SiteOption[], token: string | null): string` (returns `''` when none); `trucks.siteId` Drizzle column.
|
||||
|
||||
- [ ] **Step 1: Write the failing tests**
|
||||
|
||||
`tests/lib/report/trucks.test.ts`:
|
||||
```ts
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { trucksForSite, siteForTruck } from '@/lib/report/trucks'
|
||||
|
||||
const trucks = [
|
||||
{ id: 't1', site_id: 'A' },
|
||||
{ id: 't2', site_id: 'B' },
|
||||
{ id: 't3', site_id: null },
|
||||
]
|
||||
|
||||
describe('trucksForSite', () => {
|
||||
it('returns matching and unassigned trucks', () => {
|
||||
expect(trucksForSite(trucks, 'A').map(t => t.id)).toEqual(['t1', 't3'])
|
||||
expect(trucksForSite(trucks, 'B').map(t => t.id)).toEqual(['t2', 't3'])
|
||||
})
|
||||
it('returns all trucks when no site is selected', () => {
|
||||
expect(trucksForSite(trucks, '').map(t => t.id)).toEqual(['t1', 't2', 't3'])
|
||||
})
|
||||
it('returns only unassigned trucks for a site with none linked', () => {
|
||||
expect(trucksForSite(trucks, 'C').map(t => t.id)).toEqual(['t3'])
|
||||
})
|
||||
})
|
||||
|
||||
describe('siteForTruck', () => {
|
||||
it('returns the truck site', () => {
|
||||
expect(siteForTruck(trucks, 't2')).toBe('B')
|
||||
})
|
||||
it('returns null for unassigned, unknown or missing truck', () => {
|
||||
expect(siteForTruck(trucks, 't3')).toBeNull()
|
||||
expect(siteForTruck(trucks, 'nope')).toBeNull()
|
||||
expect(siteForTruck(trucks, null)).toBeNull()
|
||||
})
|
||||
})
|
||||
```
|
||||
|
||||
`tests/lib/admin/truck-input.test.ts`:
|
||||
```ts
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { parseSiteId } from '@/lib/admin/truck-input'
|
||||
|
||||
const UUID = '3f2b8c1e-9d4a-4e6f-8a1b-2c3d4e5f6a7b'
|
||||
|
||||
describe('parseSiteId', () => {
|
||||
it('treats undefined as not provided', () => {
|
||||
expect(parseSiteId(undefined)).toEqual({ ok: true, value: undefined })
|
||||
})
|
||||
it('treats null and empty string as clear', () => {
|
||||
expect(parseSiteId(null)).toEqual({ ok: true, value: null })
|
||||
expect(parseSiteId('')).toEqual({ ok: true, value: null })
|
||||
})
|
||||
it('accepts a uuid', () => {
|
||||
expect(parseSiteId(UUID)).toEqual({ ok: true, value: UUID })
|
||||
})
|
||||
it('rejects anything else', () => {
|
||||
expect(parseSiteId('abc')).toEqual({ ok: false })
|
||||
expect(parseSiteId(12)).toEqual({ ok: false })
|
||||
})
|
||||
})
|
||||
```
|
||||
|
||||
Append to `tests/lib/report/zones.test.ts` (add `siteIdForToken` to its existing import from `@/lib/report/zones`):
|
||||
```ts
|
||||
describe('siteIdForToken', () => {
|
||||
const sites = [
|
||||
{ id: 'A', name: 'Site A', zones: [{ id: 'z1', name: 'Dock', qr_code_token: 'tok-1' }] },
|
||||
{ id: 'B', name: 'Site B', zones: [{ id: 'z2', name: 'Yard', qr_code_token: 'tok-2' }] },
|
||||
]
|
||||
it('finds the site that owns the token', () => {
|
||||
expect(siteIdForToken(sites, 'tok-2')).toBe('B')
|
||||
})
|
||||
it('returns empty string for null or unknown token', () => {
|
||||
expect(siteIdForToken(sites, null)).toBe('')
|
||||
expect(siteIdForToken(sites, 'nope')).toBe('')
|
||||
})
|
||||
})
|
||||
```
|
||||
|
||||
- [ ] **Step 2: Run tests to verify they fail**
|
||||
|
||||
Run: `npx vitest run tests/lib/report/trucks.test.ts tests/lib/admin/truck-input.test.ts tests/lib/report/zones.test.ts`
|
||||
Expected: FAIL (modules / export not found).
|
||||
|
||||
- [ ] **Step 3: Write the helpers**
|
||||
|
||||
`lib/report/trucks.ts`:
|
||||
```ts
|
||||
export function trucksForSite<T extends { site_id: string | null }>(trucks: T[], siteId: string): T[] {
|
||||
if (!siteId) return trucks
|
||||
return trucks.filter(t => t.site_id === null || t.site_id === siteId)
|
||||
}
|
||||
|
||||
export function siteForTruck(
|
||||
trucks: { id: string; site_id: string | null }[],
|
||||
truckId: string | null | undefined,
|
||||
): string | null {
|
||||
if (!truckId) return null
|
||||
return trucks.find(t => t.id === truckId)?.site_id ?? null
|
||||
}
|
||||
```
|
||||
|
||||
`lib/admin/truck-input.ts`:
|
||||
```ts
|
||||
const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
|
||||
|
||||
export type SiteIdInput = { ok: true; value: string | null | undefined } | { ok: false }
|
||||
|
||||
// undefined = field not sent, null/'' = clear the link, uuid string = set it.
|
||||
export function parseSiteId(raw: unknown): SiteIdInput {
|
||||
if (raw === undefined) return { ok: true, value: undefined }
|
||||
if (raw === null || raw === '') return { ok: true, value: null }
|
||||
if (typeof raw === 'string' && UUID_RE.test(raw)) return { ok: true, value: raw }
|
||||
return { ok: false }
|
||||
}
|
||||
```
|
||||
|
||||
Append to `lib/report/zones.ts`:
|
||||
```ts
|
||||
export function siteIdForToken(sites: SiteOption[], token: string | null): string {
|
||||
if (!token) return ''
|
||||
return sites.find(s => s.zones.some(z => z.qr_code_token === token))?.id ?? ''
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 4: Schema and SQL**
|
||||
|
||||
`db/ops/2026-10-15-trucks-site-id.sql`:
|
||||
```sql
|
||||
-- Apply by hand on the server DB with the owner's go-ahead. Not run by deploy.
|
||||
BEGIN;
|
||||
ALTER TABLE trucks ADD COLUMN IF NOT EXISTS site_id UUID REFERENCES sites(id);
|
||||
CREATE INDEX IF NOT EXISTS trucks_site_id_idx ON trucks(site_id);
|
||||
COMMIT;
|
||||
```
|
||||
|
||||
`db/schema.sql`: immediately after the `CREATE TABLE trucks (...);` block add
|
||||
```sql
|
||||
ALTER TABLE trucks ADD COLUMN IF NOT EXISTS site_id UUID REFERENCES sites(id);
|
||||
CREATE INDEX IF NOT EXISTS trucks_site_id_idx ON trucks(site_id);
|
||||
```
|
||||
|
||||
`lib/db/schema.ts`: in `trucks` add after `carrier`:
|
||||
```ts
|
||||
siteId: uuid('site_id').references(() => sites.id),
|
||||
```
|
||||
(`sites` is declared above `trucks`, so no `AnyPgColumn` needed.)
|
||||
|
||||
- [ ] **Step 5: Run tests and typecheck**
|
||||
|
||||
Run: `npx vitest run tests/lib/report/trucks.test.ts tests/lib/admin/truck-input.test.ts tests/lib/report/zones.test.ts && npx tsc --noEmit`
|
||||
Expected: all PASS, tsc clean.
|
||||
|
||||
- [ ] **Step 6: Commit**
|
||||
|
||||
```bash
|
||||
git add db/ops/2026-10-15-trucks-site-id.sql db/schema.sql lib/db/schema.ts lib/report/trucks.ts lib/report/zones.ts lib/admin/truck-input.ts tests/lib/report/trucks.test.ts tests/lib/report/zones.test.ts tests/lib/admin/truck-input.test.ts
|
||||
git commit -m "feat(trucks): site_id column and site/truck helpers"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 2: Truck API accepts site_id and edits
|
||||
|
||||
**Files:**
|
||||
- Modify: `app/api/admin/trucks/route.ts` (POST and PATCH; DELETE unchanged)
|
||||
- Test: `tests/api/admin-trucks.test.ts` (create)
|
||||
|
||||
**Interfaces:**
|
||||
- Consumes: `parseSiteId` from `@/lib/admin/truck-input`; `trucks.siteId`.
|
||||
- Produces: `POST /api/admin/trucks {truck_no, carrier?, site_id?}`: 201 `{id}`, 422 invalid/unknown/inactive site, 400 duplicate. `PATCH /api/admin/trucks {id, active?, truck_no?, carrier?, site_id?}`: 200 `{ok:true}`, 422 for missing id, empty change set, empty `truck_no`, or bad/unknown/inactive site, 409 duplicate truck number, 500 other.
|
||||
|
||||
- [ ] **Step 1: Write the failing tests**
|
||||
|
||||
`tests/api/admin-trucks.test.ts`:
|
||||
```ts
|
||||
// @vitest-environment node
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
|
||||
const { selectQueue, setSpy, insertSpy, audit, txError } = vi.hoisted(() => ({
|
||||
selectQueue: [] as unknown[][],
|
||||
setSpy: vi.fn(),
|
||||
insertSpy: vi.fn(),
|
||||
audit: vi.fn(),
|
||||
txError: { code: null as string | null },
|
||||
}))
|
||||
|
||||
vi.mock('@/lib/auth/require-admin', () => ({
|
||||
requireAdmin: async () => ({ session: { sub: 'admin-1', role: 'admin' } }),
|
||||
}))
|
||||
vi.mock('@/lib/db/audit', () => ({ writeAuditLog: audit }))
|
||||
vi.mock('@/lib/db/with-user', () => {
|
||||
const tx = {
|
||||
execute: async () => undefined,
|
||||
insert: () => ({
|
||||
values: (v: unknown) => {
|
||||
insertSpy(v)
|
||||
return { returning: async () => [{ id: 'truck-new' }] }
|
||||
},
|
||||
}),
|
||||
update: () => ({
|
||||
set: (v: unknown) => {
|
||||
setSpy(v)
|
||||
return {
|
||||
where: async () => {
|
||||
if (txError.code) throw Object.assign(new Error('db'), { code: txError.code })
|
||||
},
|
||||
}
|
||||
},
|
||||
}),
|
||||
}
|
||||
const db = {
|
||||
select: () => ({ from: () => ({ where: () => ({ limit: async () => selectQueue.shift() ?? [] }) }) }),
|
||||
transaction: async (fn: (t: unknown) => unknown) => fn(tx),
|
||||
}
|
||||
return { asAdmin: async (fn: (d: unknown) => unknown) => fn(db) }
|
||||
})
|
||||
|
||||
import { POST, PATCH } from '@/app/api/admin/trucks/route'
|
||||
|
||||
const SITE = '3f2b8c1e-9d4a-4e6f-8a1b-2c3d4e5f6a7b'
|
||||
const req = (method: string, body: unknown) =>
|
||||
new Request('http://localhost/api/admin/trucks', {
|
||||
method,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(body),
|
||||
}) as never
|
||||
|
||||
beforeEach(() => {
|
||||
selectQueue.length = 0
|
||||
setSpy.mockClear()
|
||||
insertSpy.mockClear()
|
||||
audit.mockClear()
|
||||
txError.code = null
|
||||
})
|
||||
|
||||
describe('POST /api/admin/trucks', () => {
|
||||
it('creates a truck with no site', async () => {
|
||||
const res = await POST(req('POST', { truck_no: 'WXY 1' }))
|
||||
expect(res.status).toBe(201)
|
||||
expect(insertSpy).toHaveBeenCalledWith({ truckNo: 'WXY 1', carrier: null, siteId: null })
|
||||
})
|
||||
it('creates a truck linked to an active site and audits it', async () => {
|
||||
selectQueue.push([{ id: SITE }])
|
||||
const res = await POST(req('POST', { truck_no: 'WXY 2', site_id: SITE }))
|
||||
expect(res.status).toBe(201)
|
||||
expect(insertSpy).toHaveBeenCalledWith({ truckNo: 'WXY 2', carrier: null, siteId: SITE })
|
||||
expect(audit).toHaveBeenCalledTimes(1)
|
||||
expect(audit.mock.calls[0][4]).toMatchObject({ site_id: SITE })
|
||||
})
|
||||
it('422 for a malformed site_id', async () => {
|
||||
const res = await POST(req('POST', { truck_no: 'WXY 3', site_id: 'abc' }))
|
||||
expect(res.status).toBe(422)
|
||||
expect(insertSpy).not.toHaveBeenCalled()
|
||||
})
|
||||
it('422 for an unknown or inactive site', async () => {
|
||||
selectQueue.push([])
|
||||
const res = await POST(req('POST', { truck_no: 'WXY 4', site_id: SITE }))
|
||||
expect(res.status).toBe(422)
|
||||
expect(insertSpy).not.toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
describe('PATCH /api/admin/trucks', () => {
|
||||
it('sets site_id and audits with the previous row', async () => {
|
||||
selectQueue.push([{ id: 't1', siteId: null }], [{ id: SITE }])
|
||||
const res = await PATCH(req('PATCH', { id: 't1', site_id: SITE }))
|
||||
expect(res.status).toBe(200)
|
||||
expect(setSpy).toHaveBeenCalledWith({ siteId: SITE })
|
||||
expect(audit).toHaveBeenCalledTimes(1)
|
||||
expect(audit.mock.calls[0][4]).toEqual({ siteId: SITE })
|
||||
expect(audit.mock.calls[0][5]).toEqual({ id: 't1', siteId: null })
|
||||
})
|
||||
it('clears the site with null', async () => {
|
||||
selectQueue.push([{ id: 't1', siteId: SITE }])
|
||||
const res = await PATCH(req('PATCH', { id: 't1', site_id: null }))
|
||||
expect(res.status).toBe(200)
|
||||
expect(setSpy).toHaveBeenCalledWith({ siteId: null })
|
||||
})
|
||||
it('edits truck_no and carrier together', async () => {
|
||||
selectQueue.push([{ id: 't1' }])
|
||||
const res = await PATCH(req('PATCH', { id: 't1', truck_no: ' ABC 9 ', carrier: ' ' }))
|
||||
expect(res.status).toBe(200)
|
||||
expect(setSpy).toHaveBeenCalledWith({ truckNo: 'ABC 9', carrier: null })
|
||||
})
|
||||
it('still toggles active', async () => {
|
||||
selectQueue.push([{ id: 't1' }])
|
||||
const res = await PATCH(req('PATCH', { id: 't1', active: false }))
|
||||
expect(res.status).toBe(200)
|
||||
expect(setSpy).toHaveBeenCalledWith({ active: false })
|
||||
})
|
||||
it('422 when nothing to change', async () => {
|
||||
const res = await PATCH(req('PATCH', { id: 't1' }))
|
||||
expect(res.status).toBe(422)
|
||||
})
|
||||
it('422 for an empty truck_no', async () => {
|
||||
const res = await PATCH(req('PATCH', { id: 't1', truck_no: ' ' }))
|
||||
expect(res.status).toBe(422)
|
||||
expect(setSpy).not.toHaveBeenCalled()
|
||||
})
|
||||
it('422 for a malformed or unknown site', async () => {
|
||||
expect((await PATCH(req('PATCH', { id: 't1', site_id: 'abc' }))).status).toBe(422)
|
||||
selectQueue.push([{ id: 't1' }], [])
|
||||
expect((await PATCH(req('PATCH', { id: 't1', site_id: SITE }))).status).toBe(422)
|
||||
expect(setSpy).not.toHaveBeenCalled()
|
||||
})
|
||||
it('409 for a duplicate truck number', async () => {
|
||||
selectQueue.push([{ id: 't1' }])
|
||||
txError.code = '23505'
|
||||
const res = await PATCH(req('PATCH', { id: 't1', truck_no: 'DUP 1' }))
|
||||
expect(res.status).toBe(409)
|
||||
})
|
||||
})
|
||||
```
|
||||
|
||||
- [ ] **Step 2: Run to verify failure**
|
||||
|
||||
Run: `npx vitest run tests/api/admin-trucks.test.ts`
|
||||
Expected: FAIL (site_id ignored, PATCH only handles `active`).
|
||||
|
||||
- [ ] **Step 3: Implement**
|
||||
|
||||
In `app/api/admin/trucks/route.ts`:
|
||||
|
||||
Change imports to:
|
||||
```ts
|
||||
import { trucks, incidents, sites } from '@/lib/db/schema'
|
||||
import { parseSiteId } from '@/lib/admin/truck-input'
|
||||
import { and, eq, sql } from 'drizzle-orm'
|
||||
```
|
||||
|
||||
Add above `POST`:
|
||||
```ts
|
||||
async function activeSiteExists(id: string): Promise<boolean> {
|
||||
const [row] = await asAdmin(db =>
|
||||
db.select({ id: sites.id }).from(sites).where(and(eq(sites.id, id), eq(sites.active, true))).limit(1)
|
||||
)
|
||||
return !!row
|
||||
}
|
||||
```
|
||||
|
||||
Replace the whole `POST` function with:
|
||||
```ts
|
||||
export async function POST(request: NextRequest) {
|
||||
const { session } = await requireAdmin()
|
||||
if (!session) return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
|
||||
const body: { truck_no?: string; carrier?: string; site_id?: unknown } = await request.json().catch(() => ({}))
|
||||
const truck_no = (body.truck_no ?? '').trim()
|
||||
if (!truck_no) return NextResponse.json({ error: 'truck_no required' }, { status: 422 })
|
||||
|
||||
const parsedSite = parseSiteId(body.site_id)
|
||||
if (!parsedSite.ok) return NextResponse.json({ error: 'site_id invalid' }, { status: 422 })
|
||||
const siteId = parsedSite.value ?? null
|
||||
if (siteId && !(await activeSiteExists(siteId)))
|
||||
return NextResponse.json({ error: 'Site not found or inactive' }, { status: 422 })
|
||||
|
||||
const carrier = (body.carrier ?? '').trim() || null
|
||||
|
||||
try {
|
||||
let truckId: string | undefined
|
||||
await asAdmin(async db => {
|
||||
await db.transaction(async tx => {
|
||||
await tx.execute(sql`SELECT set_config('app.user_id', ${session.sub}, true)`)
|
||||
const [truck] = await tx.insert(trucks).values({ truckNo: truck_no, carrier, siteId }).returning({ id: trucks.id })
|
||||
if (!truck) throw new Error('Insert failed')
|
||||
truckId = truck.id
|
||||
await writeAuditLog(tx, 'trucks', truck.id, 'INSERT', { truck_no, carrier, site_id: siteId })
|
||||
})
|
||||
})
|
||||
if (!truckId) return NextResponse.json({ error: 'Insert failed' }, { status: 400 })
|
||||
return NextResponse.json({ id: truckId }, { status: 201 })
|
||||
} catch (e) {
|
||||
const code = (e as { code?: string }).code
|
||||
return NextResponse.json(
|
||||
{ error: code === '23505' ? 'Truck number already exists' : 'Insert failed' },
|
||||
{ status: 400 },
|
||||
)
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
Replace the whole `PATCH` function with:
|
||||
```ts
|
||||
export async function PATCH(request: NextRequest) {
|
||||
const { session } = await requireAdmin()
|
||||
if (!session) return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
|
||||
const body: {
|
||||
id?: string
|
||||
active?: boolean
|
||||
truck_no?: string
|
||||
carrier?: string | null
|
||||
site_id?: unknown
|
||||
} = await request.json().catch(() => ({}))
|
||||
if (!body.id) return NextResponse.json({ error: 'id required' }, { status: 422 })
|
||||
|
||||
const set: { active?: boolean; truckNo?: string; carrier?: string | null; siteId?: string | null } = {}
|
||||
if (typeof body.active === 'boolean') set.active = body.active
|
||||
if (body.truck_no !== undefined) {
|
||||
const no = String(body.truck_no).trim()
|
||||
if (!no) return NextResponse.json({ error: 'truck_no required' }, { status: 422 })
|
||||
set.truckNo = no
|
||||
}
|
||||
if (body.carrier !== undefined) set.carrier = (body.carrier ?? '').trim() || null
|
||||
const parsedSite = parseSiteId(body.site_id)
|
||||
if (!parsedSite.ok) return NextResponse.json({ error: 'site_id invalid' }, { status: 422 })
|
||||
if (parsedSite.value !== undefined) set.siteId = parsedSite.value
|
||||
if (Object.keys(set).length === 0)
|
||||
return NextResponse.json({ error: 'nothing to update' }, { status: 422 })
|
||||
|
||||
const [before] = await asAdmin(db =>
|
||||
db.select().from(trucks).where(eq(trucks.id, body.id!)).limit(1)
|
||||
)
|
||||
if (set.siteId && !(await activeSiteExists(set.siteId)))
|
||||
return NextResponse.json({ error: 'Site not found or inactive' }, { status: 422 })
|
||||
|
||||
try {
|
||||
await asAdmin(async db => {
|
||||
await db.transaction(async tx => {
|
||||
await tx.execute(sql`SELECT set_config('app.user_id', ${session.sub}, true)`)
|
||||
await tx.update(trucks).set(set).where(eq(trucks.id, body.id!))
|
||||
await writeAuditLog(tx, 'trucks', body.id!, 'admin_update', set, before ?? null)
|
||||
})
|
||||
})
|
||||
} catch (e) {
|
||||
const code = (e as { code?: string }).code
|
||||
if (code === '23505') return NextResponse.json({ error: 'Truck number already exists' }, { status: 409 })
|
||||
return NextResponse.json({ error: 'Update failed' }, { status: 500 })
|
||||
}
|
||||
return NextResponse.json({ ok: true })
|
||||
}
|
||||
```
|
||||
|
||||
Note the test for "422 for a malformed or unknown site" in PATCH: the malformed case returns before any select; the unknown case consumes `[before]` then the site check.
|
||||
|
||||
- [ ] **Step 4: Run tests and typecheck**
|
||||
|
||||
Run: `npx vitest run tests/api/admin-trucks.test.ts && npx tsc --noEmit`
|
||||
Expected: all PASS, tsc clean.
|
||||
|
||||
- [ ] **Step 5: Commit**
|
||||
|
||||
```bash
|
||||
git add app/api/admin/trucks/route.ts tests/api/admin-trucks.test.ts
|
||||
git commit -m "feat(trucks): admin API accepts site_id and partial edits"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 3: Admin Trucks tab UI (site select, label, edit modal)
|
||||
|
||||
**Files:**
|
||||
- Modify: `app/(protected)/admin/page.tsx` (truck query + props)
|
||||
- Modify: `components/admin/admin-panel.tsx`
|
||||
- Modify: `components/admin/truck-manager.tsx`
|
||||
- Test: `tests/components/admin/truck-manager.test.tsx` (create)
|
||||
|
||||
**Interfaces:**
|
||||
- Consumes: `PATCH /api/admin/trucks` and `POST /api/admin/trucks` from Task 2.
|
||||
- Produces: `Truck` gains `site_id: string | null`; new exported `TruckSite = { id: string; name: string; active: boolean }`; `TruckManager` props `{ trucks: Truck[]; sites: TruckSite[] }`; `AdminPanel` prop `truckSites: TruckSite[]`.
|
||||
|
||||
- [ ] **Step 1: Write the failing test**
|
||||
|
||||
`tests/components/admin/truck-manager.test.tsx`:
|
||||
```tsx
|
||||
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' })
|
||||
})
|
||||
})
|
||||
```
|
||||
|
||||
- [ ] **Step 2: Run to verify failure**
|
||||
|
||||
Run: `npx vitest run tests/components/admin/truck-manager.test.tsx`
|
||||
Expected: FAIL (no `sites` prop, no Edit button).
|
||||
|
||||
- [ ] **Step 3: Implement `components/admin/truck-manager.tsx`**
|
||||
|
||||
3a. Replace the type/props block at the top:
|
||||
```ts
|
||||
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[]
|
||||
}
|
||||
```
|
||||
and the signature `export function TruckManager({ trucks, sites }: Props) {`.
|
||||
|
||||
3b. After the existing `const [confirmDelete, ...]` state add:
|
||||
```ts
|
||||
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)
|
||||
}
|
||||
```
|
||||
|
||||
3c. In `handleAdd` change the body to `JSON.stringify({ truck_no: no, carrier: carrier.trim() || null, site_id: siteId || null })` and after `setCarrier('')` add `setSiteId('')`.
|
||||
|
||||
3d. After `handleDelete` add:
|
||||
```ts
|
||||
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)
|
||||
}
|
||||
```
|
||||
|
||||
3e. In the row, replace the left block
|
||||
```tsx
|
||||
<div className="flex items-center gap-3">
|
||||
<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>}
|
||||
</div>
|
||||
```
|
||||
with
|
||||
```tsx
|
||||
<div className="flex items-center gap-3">
|
||||
<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>}
|
||||
<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>
|
||||
```
|
||||
and, in the right-hand actions, add before the "Report link" anchor:
|
||||
```tsx
|
||||
<button disabled={busyId === tk.id} onClick={() => openEdit(tk)}
|
||||
className="text-xs text-accent-700 hover:underline cursor-pointer disabled:opacity-50">
|
||||
Edit
|
||||
</button>
|
||||
```
|
||||
|
||||
3f. In the Add modal, update both reset handlers (`onClose` and Cancel) to also call `setSiteId('')`, and add inside the `space-y-4` div after the carrier field:
|
||||
```tsx
|
||||
<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>
|
||||
```
|
||||
|
||||
3g. Add an Edit modal before the Delete Confirm modal:
|
||||
```tsx
|
||||
{/* 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>
|
||||
</Modal>
|
||||
```
|
||||
|
||||
Note: the delete-confirm modal and the row `Delete`/`Active` buttons stay unchanged. When only one modal is open at a time, `getByLabelText('Site')` is unambiguous.
|
||||
|
||||
3h. `components/admin/admin-panel.tsx`: import `TruckSite`, add prop `truckSites: TruckSite[]` to `Props`, destructure it, and render `<TruckManager trucks={trucks} sites={truckSites} />`.
|
||||
|
||||
3i. `app/(protected)/admin/page.tsx`: add `siteId: trucks.siteId` to the trucks select (the `id: trucks.id, truckNo: ...` object), map `site_id: t.siteId ?? null` in `truckList`, build
|
||||
```ts
|
||||
const truckSites = siteRows.map(s => ({ id: s.id, name: s.name, active: s.active }))
|
||||
```
|
||||
and pass `truckSites={truckSites}` to `<AdminPanel .../>` (find the existing `<AdminPanel` usage in that file and add the prop).
|
||||
|
||||
- [ ] **Step 4: Run tests, typecheck, design gate**
|
||||
|
||||
Run: `npx vitest run tests/components/admin/truck-manager.test.tsx && npx tsc --noEmit && npm run check:design`
|
||||
Expected: tests PASS, tsc clean, `design gates: clean`.
|
||||
|
||||
- [ ] **Step 5: Commit**
|
||||
|
||||
```bash
|
||||
git add components/admin/truck-manager.tsx components/admin/admin-panel.tsx "app/(protected)/admin/page.tsx" tests/components/admin/truck-manager.test.tsx
|
||||
git commit -m "feat(trucks): site select, site label and edit modal in admin"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 4: Report form filters trucks by site
|
||||
|
||||
**Files:**
|
||||
- Modify: `app/report/page.tsx` (truck query adds `siteId`, list adds `site_id`)
|
||||
- Modify: `components/incidents/report-form.tsx`
|
||||
- Test: `tests/components/incidents/report-form-trucks.test.tsx` (create)
|
||||
|
||||
**Interfaces:**
|
||||
- Consumes: `trucksForSite`, `siteForTruck` from `@/lib/report/trucks`; `siteIdForToken` from `@/lib/report/zones` (Task 1).
|
||||
- Produces: `ReportForm` prop `trucks: Array<{ id; truck_no; carrier; site_id: string | null }>`.
|
||||
|
||||
- [ ] **Step 1: Write the failing test**
|
||||
|
||||
`tests/components/incidents/report-form-trucks.test.tsx`:
|
||||
```tsx
|
||||
import { describe, it, expect, vi } from 'vitest'
|
||||
import { render, screen, fireEvent, within } from '@testing-library/react'
|
||||
import { ReportForm } from '@/components/incidents/report-form'
|
||||
import { I18nProvider } from '@/lib/i18n/context'
|
||||
import en from '@/messages/en.json'
|
||||
|
||||
vi.mock('next/navigation', () => ({ useRouter: () => ({ push: vi.fn(), refresh: vi.fn() }) }))
|
||||
|
||||
const sites = [
|
||||
{ id: 'site-a', name: 'Site A', zones: [{ id: 'z1', name: 'Dock', qr_code_token: 'tok-a' }] },
|
||||
{ id: 'site-b', name: 'Site B', zones: [{ id: 'z2', name: 'Yard', qr_code_token: 'tok-b' }] },
|
||||
]
|
||||
const trucks = [
|
||||
{ id: 't1', truck_no: 'AAA 1', carrier: null, site_id: 'site-a' },
|
||||
{ id: 't2', truck_no: 'BBB 2', carrier: null, site_id: 'site-b' },
|
||||
{ id: 't3', truck_no: 'FREE 3', carrier: null, site_id: null },
|
||||
]
|
||||
|
||||
function renderForm(props: Partial<React.ComponentProps<typeof ReportForm>> = {}) {
|
||||
return render(
|
||||
<I18nProvider messages={en}>
|
||||
<ReportForm
|
||||
zoneToken={null}
|
||||
zoneName={null}
|
||||
siteName={null}
|
||||
sites={sites}
|
||||
defaultSiteId=""
|
||||
trucks={trucks}
|
||||
initialTruckId="t1"
|
||||
{...props}
|
||||
/>
|
||||
</I18nProvider>,
|
||||
)
|
||||
}
|
||||
|
||||
const selectWith = (text: string) =>
|
||||
screen.getAllByRole('combobox').find(s => within(s).queryByText(text)) as HTMLSelectElement
|
||||
|
||||
const truckNos = () =>
|
||||
Array.from(selectWith(en.ReportForm.truckPlaceholder).options).map(o => o.textContent)
|
||||
|
||||
describe('ReportForm truck filter', () => {
|
||||
it('defaults the site to the preselected truck site and filters trucks', () => {
|
||||
renderForm()
|
||||
expect(selectWith(en.ReportForm.sitePlaceholder).value).toBe('site-a')
|
||||
expect(truckNos()).toEqual([en.ReportForm.truckPlaceholder, 'AAA 1', 'FREE 3'])
|
||||
})
|
||||
|
||||
it('changing the site refilters and clears a truck that no longer fits', () => {
|
||||
renderForm()
|
||||
expect(selectWith(en.ReportForm.truckPlaceholder).value).toBe('t1')
|
||||
fireEvent.change(selectWith(en.ReportForm.sitePlaceholder), { target: { value: 'site-b' } })
|
||||
expect(truckNos()).toEqual([en.ReportForm.truckPlaceholder, 'BBB 2', 'FREE 3'])
|
||||
expect(selectWith(en.ReportForm.truckPlaceholder).value).toBe('')
|
||||
})
|
||||
|
||||
it('uses the QR zone site when a zone token is present', () => {
|
||||
renderForm({ zoneToken: 'tok-b', zoneName: 'Yard', siteName: 'Site B', initialTruckId: null })
|
||||
// transport is not preselected without a truck, so pick it to reveal the truck select
|
||||
fireEvent.change(screen.getAllByRole('combobox').find(s => within(s).queryByText(en.IncidentType.transport))!, {
|
||||
target: { value: 'transport' },
|
||||
})
|
||||
expect(truckNos()).toEqual([en.ReportForm.truckPlaceholder, 'BBB 2', 'FREE 3'])
|
||||
})
|
||||
})
|
||||
```
|
||||
If the incident-type control is not a `<select>`, adapt only the third test's interaction (look at how the type picker renders in `report-form.tsx`) and keep its assertion; report the adaptation.
|
||||
|
||||
- [ ] **Step 2: Run to verify failure**
|
||||
|
||||
Run: `npx vitest run tests/components/incidents/report-form-trucks.test.tsx`
|
||||
Expected: FAIL (all trucks listed, site not defaulted from truck).
|
||||
|
||||
- [ ] **Step 3: Implement**
|
||||
|
||||
`app/report/page.tsx`: add `siteId: trucks.siteId,` to the truck select, and in `truckList` add `site_id: t.siteId ?? null,`.
|
||||
|
||||
`components/incidents/report-form.tsx`:
|
||||
|
||||
3a. Imports: change the React import to `import { useState, useEffect, useMemo } from 'react'`; change the zones import to
|
||||
```ts
|
||||
import { zonesForSite, resolveZoneToken, siteIdForToken, type SiteOption } from '@/lib/report/zones'
|
||||
import { trucksForSite, siteForTruck } from '@/lib/report/trucks'
|
||||
```
|
||||
|
||||
3b. In `Props` change the trucks type to
|
||||
`trucks: Array<{ id: string; truck_no: string; carrier: string | null; site_id: string | null }>`.
|
||||
|
||||
3c. Replace the `const [siteId, setSiteId] = useState(...)` block with:
|
||||
```ts
|
||||
const truckSite = !zoneToken ? siteForTruck(trucks, initialTruckId) : null
|
||||
const [siteId, setSiteId] = useState(
|
||||
truckSite && sites.some(s => s.id === truckSite)
|
||||
? truckSite
|
||||
: sites.some(s => s.id === defaultSiteId) ? defaultSiteId : (sites.length === 1 ? sites[0].id : '')
|
||||
)
|
||||
```
|
||||
|
||||
3d. After the `effectiveZoneToken` line add:
|
||||
```ts
|
||||
const effectiveSiteId = zoneToken ? siteIdForToken(sites, zoneToken) : siteId
|
||||
const truckOptions = useMemo(() => trucksForSite(trucks, effectiveSiteId), [trucks, effectiveSiteId])
|
||||
```
|
||||
|
||||
3e. After the `form` state declaration (it must come after `useState` for `form`) add:
|
||||
```ts
|
||||
useEffect(() => {
|
||||
setForm(f => (f.truck_id && !truckOptions.some(tk => tk.id === f.truck_id) ? { ...f, truck_id: '' } : f))
|
||||
}, [truckOptions])
|
||||
```
|
||||
(If the repo lint rule `react-hooks/set-state-in-effect` complains, add the same `// eslint-disable-next-line react-hooks/set-state-in-effect` comment used in this file above the `setForm` line.)
|
||||
|
||||
3f. In the Truck `<select>`, replace `{trucks.map(tk => (` with `{truckOptions.map(tk => (`.
|
||||
|
||||
- [ ] **Step 4: Run tests, typecheck, design gate, full suite**
|
||||
|
||||
Run: `npx vitest run tests/components/incidents/report-form-trucks.test.tsx && npx tsc --noEmit && npm run check:design && npx vitest run`
|
||||
Expected: new tests PASS, tsc clean, `design gates: clean`, full suite shows only the 7 pre-existing failures.
|
||||
|
||||
- [ ] **Step 5: graphify and commit**
|
||||
|
||||
```bash
|
||||
graphify update .
|
||||
git add app/report/page.tsx components/incidents/report-form.tsx tests/components/incidents/report-form-trucks.test.tsx
|
||||
git commit -m "feat(report): filter truck list by selected site"
|
||||
```
|
||||
@@ -0,0 +1,72 @@
|
||||
# Zone picker, CAPA completion proof, test-data cleanup
|
||||
|
||||
Date: 2026-10-14. Status: draft for review.
|
||||
|
||||
Three independent changes from the 2026-10-13 field feedback. Each can ship on its own.
|
||||
|
||||
## 1. Zone picker on `/report`
|
||||
|
||||
### Problem
|
||||
`/report` without `?zone=<qr_token>` shows "No zone detected — zone will not be recorded", but `POST /api/incidents` requires `zone_token` and returns 404 "Zone not found" without it. A user who opens Report from the Incidents page cannot submit.
|
||||
|
||||
### Design
|
||||
- `app/report/page.tsx` also loads active sites with their active zones (`asAdmin`, same pattern as `trucks`) and passes `sites: { id, name, zones: { id, name, qr_code_token }[] }[]` and `defaultSiteId` (`users.site_id` of the session user) to `ReportForm`.
|
||||
- With a valid QR token: unchanged ("Site — Zone" header, token sent as today).
|
||||
- Without a token (or an unknown token): the "No zone detected" banner is removed. `ReportForm` shows two required selects, **Site** (default `defaultSiteId`) then **Zone** (filtered to the site). The chosen zone's `qr_code_token` is sent as `zone_token`.
|
||||
- Submit button stays disabled until a zone is resolved (token or selection).
|
||||
- No API or schema change; the server still validates the token and the active flags.
|
||||
- New labels (Site, Zone, "Select zone…") added to the existing i18n message files.
|
||||
- Offline queue: the queued payload already carries `zone_token`, so it keeps working.
|
||||
|
||||
### Out of scope
|
||||
Making zone optional; a "General" zone per site.
|
||||
|
||||
## 2. CAPA completion proof
|
||||
|
||||
### Problem
|
||||
`CapaOwnerActions` sends `PATCH /api/capa/[id] {status:'pending_verification'}` directly. The PIC can submit with no evidence and no notes.
|
||||
|
||||
### Design
|
||||
- "Submit for Verification" opens a form: **completion note** (required) and **1 to 5 photos** (required, JPG/PNG/HEIC, same size limit as incident evidence). The submit button is disabled until both are present.
|
||||
- New `POST /api/capa/[id]/submit` (multipart):
|
||||
- Allowed: CAPA owner, or hse/admin. Status must be `in_progress`; otherwise 409.
|
||||
- Validates note non-empty and 1 to 5 image files; otherwise 422.
|
||||
- In one `withUser` transaction: store files via `lib/storage/evidence.ts`, insert `evidence_files` rows (`stage = 'capa'`, `capa_id` set, hash recorded), set `owner_notes`, `completed_at`, `status = 'pending_verification'`, and write `audit_log` (include file ids and the note).
|
||||
- `PATCH /api/capa/[id]` rejects `status: 'pending_verification'` with 403 for everyone (the new endpoint is the only path). Owner `in_progress` transition is unchanged.
|
||||
- CAPA detail page: "Completion report" section shows the note and a photo gallery (signed `/api/evidence/...` URLs) so HSE sees proof when verifying or reopening.
|
||||
- Evidence rows are never hard-deleted (5-year retention).
|
||||
|
||||
### Schema change (manual, needs owner go-ahead)
|
||||
```sql
|
||||
ALTER TABLE evidence_files ADD COLUMN IF NOT EXISTS capa_id UUID REFERENCES capa_actions(id) ON DELETE RESTRICT;
|
||||
CREATE INDEX IF NOT EXISTS evidence_files_capa_id_idx ON evidence_files(capa_id);
|
||||
```
|
||||
The `evidence_stage` enum already has `capa`; no enum change. Update `db/schema.sql`, `lib/db/schema.ts`, no RLS change: the PIC is the uploader and already reads own rows.
|
||||
|
||||
### Out of scope
|
||||
Photos on "Mark In Progress"; HSE-side evidence upload; video.
|
||||
|
||||
## 3. Test-data cleanup (ops, one-off)
|
||||
|
||||
### Scope
|
||||
Delete all incidents and every user with `role != 'admin'` from the production DB.
|
||||
|
||||
### Design
|
||||
- Script `db/ops/cleanup-test-data.sql` plus a short runbook in `docs/`.
|
||||
- Steps:
|
||||
1. `pg_dump` of `ims` and a tar of `/var/lib/ims-evidence` on the server, kept outside the deploy folders.
|
||||
2. Dry run: print row counts per table (incidents, children, users to delete, admins kept). Show the list of admins kept.
|
||||
3. Wait for explicit user confirmation of those counts.
|
||||
4. Run in one transaction, FK order: notifications (`notifications_log`, in-app), `capa_actions`, `investigations`, `dosh_reports`, addenda, `evidence_files`, `audit_log` rows for incidents, `incidents`, then `users` where `role != 'admin'`. Anything else referencing those users (audit_log `changed_by`, etc.) is nulled or removed per the real FK list found in the dry run.
|
||||
5. Verify counts and that admin login works.
|
||||
- Evidence files on disk are left in place (retention rule); orphaned files can be reviewed separately.
|
||||
- Nothing runs against production without step 3 confirmation. Run after the schema change in section 2, or independently.
|
||||
|
||||
## Testing
|
||||
- Zone picker: component test for site-to-zone filtering and submit gating; manual check with and without `?zone=`.
|
||||
- CAPA submit: API tests for 401/403/409/422, success path writes files, audit row and status; PATCH bypass returns 403.
|
||||
- Cleanup: dry-run counts match expectations on a restored dump before running on production.
|
||||
- `npm run check:design` must print `design gates: clean` for UI changes.
|
||||
|
||||
## Deploy
|
||||
Follow CLAUDE.md deploy steps (build locally, upload standalone build only, check `BUILD_ID`, restart, verify). Schema SQL applied by hand beforehand with the owner's go-ahead.
|
||||
@@ -0,0 +1,43 @@
|
||||
# Link trucks to a site
|
||||
|
||||
Date: 2026-10-15. Status: draft for review.
|
||||
|
||||
## Problem
|
||||
Trucks are a flat list. The Report an Incident form shows every active truck regardless of site. Admin cannot say which site a truck belongs to.
|
||||
|
||||
## Decisions
|
||||
- A truck links to **one** site (optional).
|
||||
- The report form **filters** the Truck dropdown by the selected site.
|
||||
- A truck with no site (all existing trucks) shows for **every** site until an admin assigns one.
|
||||
|
||||
## 1. Schema (manual, needs owner go-ahead)
|
||||
```sql
|
||||
ALTER TABLE trucks ADD COLUMN IF NOT EXISTS site_id UUID REFERENCES sites(id);
|
||||
CREATE INDEX IF NOT EXISTS trucks_site_id_idx ON trucks(site_id);
|
||||
```
|
||||
- Add `db/ops/2026-10-15-trucks-site-id.sql` (wrapped in BEGIN/COMMIT), update `db/schema.sql` and `lib/db/schema.ts` (`siteId: uuid('site_id').references(() => sites.id)`).
|
||||
- No RLS change: `trucks_read` (all) and `trucks_admin_all` already cover the column.
|
||||
|
||||
## 2. Admin, Trucks tab
|
||||
- `app/(protected)/admin/page.tsx` selects `trucks.siteId`; `TruckManager` receives `site_id` per truck and the list of active sites.
|
||||
- Add form: optional Site select. Each row shows the site name, or "Unassigned". Edit modal: Site select with a "No site" option.
|
||||
- `POST /api/admin/trucks` and `PATCH /api/admin/trucks` accept `site_id` (uuid or null). Non-null must reference an existing active site, otherwise 422. Audit log entry stays in the same transaction and records old and new `site_id`.
|
||||
|
||||
## 3. Report form
|
||||
- `app/report/page.tsx` passes `site_id` with each truck.
|
||||
- New pure helper `trucksForSite(trucks, siteId)` in `lib/report/trucks.ts`: returns trucks where `site_id` is null or equals `siteId`; with no `siteId`, returns all.
|
||||
- The site comes from the QR zone when present, otherwise from the Site select. When the site changes and the selected truck no longer fits, the selection clears.
|
||||
- `?truck_id=` still pre-selects the truck. If no zone is given, the truck's `site_id` (when set) becomes the default site.
|
||||
- `POST /api/incidents` is unchanged and does not reject a truck/site mismatch (UI filter only).
|
||||
|
||||
## Testing
|
||||
- `trucksForSite` unit tests (null site, matching, other site, no site selected).
|
||||
- API tests for `site_id` on create and edit: invalid site 422, valid site saved with audit row, null clears.
|
||||
- Component test: truck dropdown filters on site change and clears an invalid selection.
|
||||
- `npm run check:design` must print `design gates: clean`.
|
||||
|
||||
## Out of scope
|
||||
Several sites per truck, bulk assignment, filtering the Incidents list by truck site.
|
||||
|
||||
## Deploy
|
||||
Apply the SQL by hand first (additive, nullable, safe for the old build), then deploy per CLAUDE.md.
|
||||
@@ -0,0 +1,11 @@
|
||||
const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
|
||||
|
||||
export type SiteIdInput = { ok: true; value: string | null | undefined } | { ok: false }
|
||||
|
||||
// undefined = field not sent, null/'' = clear the link, uuid string = set it.
|
||||
export function parseSiteId(raw: unknown): SiteIdInput {
|
||||
if (raw === undefined) return { ok: true, value: undefined }
|
||||
if (raw === null || raw === '') return { ok: true, value: null }
|
||||
if (typeof raw === 'string' && UUID_RE.test(raw)) return { ok: true, value: raw }
|
||||
return { ok: false }
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
export const MAX_CAPA_PHOTOS = 5
|
||||
|
||||
export type CapaSubmissionResult =
|
||||
| { ok: true; note: string }
|
||||
| { ok: false; errors: string[] }
|
||||
|
||||
export function validateCapaSubmission(
|
||||
note: string,
|
||||
files: ReadonlyArray<{ type: string }>,
|
||||
): CapaSubmissionResult {
|
||||
const errors: string[] = []
|
||||
const trimmed = note.trim()
|
||||
if (!trimmed) errors.push('Completion note is required')
|
||||
if (files.length < 1) errors.push('At least 1 photo is required')
|
||||
if (files.length > MAX_CAPA_PHOTOS) errors.push(`At most ${MAX_CAPA_PHOTOS} photos are allowed`)
|
||||
if (files.some(f => !f.type.startsWith('image/'))) errors.push('Only image files are allowed')
|
||||
return errors.length ? { ok: false, errors } : { ok: true, note: trimmed }
|
||||
}
|
||||
@@ -5,5 +5,5 @@ export function createDeepSeekClient(apiKey: string): OpenAI {
|
||||
}
|
||||
|
||||
export function createLocalLLMClient(): OpenAI {
|
||||
return new OpenAI({ apiKey: 'local', baseURL: 'http://localhost:11434/v1' })
|
||||
return new OpenAI({ apiKey: 'local', baseURL: 'http://localhost:8081/v1' })
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@ import {
|
||||
date,
|
||||
jsonb,
|
||||
customType,
|
||||
type AnyPgColumn,
|
||||
} from 'drizzle-orm/pg-core'
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -102,6 +103,7 @@ export const trucks = pgTable('trucks', {
|
||||
id: uuid('id').primaryKey().defaultRandom(),
|
||||
truckNo: text('truck_no').notNull().unique(),
|
||||
carrier: text('carrier'),
|
||||
siteId: uuid('site_id').references(() => sites.id),
|
||||
active: boolean('active').notNull().default(true),
|
||||
createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(),
|
||||
})
|
||||
@@ -145,6 +147,7 @@ export const evidenceFiles = pgTable('evidence_files', {
|
||||
uploadedBy: uuid('uploaded_by').notNull().references(() => users.id),
|
||||
uploadedAt: timestamp('uploaded_at', { withTimezone: true }).notNull().defaultNow(),
|
||||
deleted: boolean('deleted').notNull().default(false),
|
||||
capaId: uuid('capa_id').references((): AnyPgColumn => capaActions.id),
|
||||
})
|
||||
|
||||
export const investigations = pgTable('investigations', {
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
export function trucksForSite<T extends { site_id: string | null }>(trucks: T[], siteId: string): T[] {
|
||||
if (!siteId) return trucks
|
||||
return trucks.filter(t => t.site_id === null || t.site_id === siteId)
|
||||
}
|
||||
|
||||
export function siteForTruck(
|
||||
trucks: { id: string; site_id: string | null }[],
|
||||
truckId: string | null | undefined,
|
||||
): string | null {
|
||||
if (!truckId) return null
|
||||
return trucks.find(t => t.id === truckId)?.site_id ?? null
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
export type ZoneOption = { id: string; name: string; qr_code_token: string }
|
||||
export type SiteOption = { id: string; name: string; zones: ZoneOption[] }
|
||||
export type ZoneRow = { siteId: string; siteName: string; zoneId: string; zoneName: string; token: string }
|
||||
|
||||
export function groupSites(rows: ZoneRow[]): SiteOption[] {
|
||||
const bySite = new Map<string, SiteOption>()
|
||||
for (const r of rows) {
|
||||
let site = bySite.get(r.siteId)
|
||||
if (!site) {
|
||||
site = { id: r.siteId, name: r.siteName, zones: [] }
|
||||
bySite.set(r.siteId, site)
|
||||
}
|
||||
site.zones.push({ id: r.zoneId, name: r.zoneName, qr_code_token: r.token })
|
||||
}
|
||||
return [...bySite.values()]
|
||||
}
|
||||
|
||||
export function zonesForSite(sites: SiteOption[], siteId: string): ZoneOption[] {
|
||||
return sites.find(s => s.id === siteId)?.zones ?? []
|
||||
}
|
||||
|
||||
export function resolveZoneToken(args: {
|
||||
zoneToken: string | null
|
||||
sites: SiteOption[]
|
||||
zoneId: string
|
||||
}): string | null {
|
||||
if (args.zoneToken) return args.zoneToken
|
||||
for (const site of args.sites) {
|
||||
const zone = site.zones.find(z => z.id === args.zoneId)
|
||||
if (zone) return zone.qr_code_token
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
export function siteIdForToken(sites: SiteOption[], token: string | null): string {
|
||||
if (!token) return ''
|
||||
return sites.find(s => s.zones.some(z => z.qr_code_token === token))?.id ?? ''
|
||||
}
|
||||
+5
-1
@@ -18,7 +18,11 @@
|
||||
"savedOffline": "Report saved. It will be submitted automatically when you're back online.",
|
||||
"offlineBanner": "You're offline. Your report will be saved and submitted when you reconnect.",
|
||||
"truckLabel": "Truck",
|
||||
"truckPlaceholder": "Select truck…"
|
||||
"truckPlaceholder": "Select truck…",
|
||||
"siteLabel": "Site",
|
||||
"sitePlaceholder": "Select site…",
|
||||
"zoneLabel": "Zone",
|
||||
"zonePlaceholder": "Select zone…"
|
||||
},
|
||||
"IncidentType": {
|
||||
"injury": "Injury / Medical",
|
||||
|
||||
+5
-1
@@ -18,7 +18,11 @@
|
||||
"savedOffline": "Laporan disimpan. Ia akan dihantar secara automatik apabila anda dalam talian semula.",
|
||||
"offlineBanner": "Anda tiada sambungan. Laporan anda akan disimpan dan dihantar apabila disambungkan semula.",
|
||||
"truckLabel": "Trak",
|
||||
"truckPlaceholder": "Pilih trak…"
|
||||
"truckPlaceholder": "Pilih trak…",
|
||||
"siteLabel": "Tapak",
|
||||
"sitePlaceholder": "Pilih tapak…",
|
||||
"zoneLabel": "Zon",
|
||||
"zonePlaceholder": "Pilih zon…"
|
||||
},
|
||||
"IncidentType": {
|
||||
"injury": "Kecederaan / Perubatan",
|
||||
|
||||
+5
-1
@@ -18,7 +18,11 @@
|
||||
"savedOffline": "报告已保存。当您重新联网时将自动提交。",
|
||||
"offlineBanner": "您处于离线状态。您的报告将在重新联网时自动提交。",
|
||||
"truckLabel": "货车",
|
||||
"truckPlaceholder": "选择货车…"
|
||||
"truckPlaceholder": "选择货车…",
|
||||
"siteLabel": "场地",
|
||||
"sitePlaceholder": "选择场地…",
|
||||
"zoneLabel": "区域",
|
||||
"zonePlaceholder": "选择区域…"
|
||||
},
|
||||
"IncidentType": {
|
||||
"injury": "受伤/医疗",
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
@@ -0,0 +1,149 @@
|
||||
// @vitest-environment node
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
|
||||
const { selectQueue, setSpy, insertSpy, audit, txError } = vi.hoisted(() => ({
|
||||
selectQueue: [] as unknown[][],
|
||||
setSpy: vi.fn(),
|
||||
insertSpy: vi.fn(),
|
||||
audit: vi.fn(),
|
||||
txError: { code: null as string | null },
|
||||
}))
|
||||
|
||||
vi.mock('@/lib/auth/require-admin', () => ({
|
||||
requireAdmin: async () => ({ session: { sub: 'admin-1', role: 'admin' } }),
|
||||
}))
|
||||
vi.mock('@/lib/db/audit', () => ({ writeAuditLog: audit }))
|
||||
vi.mock('@/lib/db/with-user', () => {
|
||||
const tx = {
|
||||
execute: async () => undefined,
|
||||
insert: () => ({
|
||||
values: (v: unknown) => {
|
||||
insertSpy(v)
|
||||
return { returning: async () => [{ id: 'truck-new' }] }
|
||||
},
|
||||
}),
|
||||
update: () => ({
|
||||
set: (v: unknown) => {
|
||||
setSpy(v)
|
||||
return {
|
||||
where: async () => {
|
||||
if (txError.code) throw Object.assign(new Error('db'), { code: txError.code })
|
||||
},
|
||||
}
|
||||
},
|
||||
}),
|
||||
}
|
||||
const db = {
|
||||
select: () => ({ from: () => ({ where: () => ({ limit: async () => selectQueue.shift() ?? [] }) }) }),
|
||||
transaction: async (fn: (t: unknown) => unknown) => fn(tx),
|
||||
}
|
||||
return { asAdmin: async (fn: (d: unknown) => unknown) => fn(db) }
|
||||
})
|
||||
|
||||
import { POST, PATCH } from '@/app/api/admin/trucks/route'
|
||||
|
||||
const SITE = '3f2b8c1e-9d4a-4e6f-8a1b-2c3d4e5f6a7b'
|
||||
const req = (method: string, body: unknown) =>
|
||||
new Request('http://localhost/api/admin/trucks', {
|
||||
method,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(body),
|
||||
}) as never
|
||||
|
||||
beforeEach(() => {
|
||||
selectQueue.length = 0
|
||||
setSpy.mockClear()
|
||||
insertSpy.mockClear()
|
||||
audit.mockClear()
|
||||
txError.code = null
|
||||
})
|
||||
|
||||
describe('POST /api/admin/trucks', () => {
|
||||
it('creates a truck with no site', async () => {
|
||||
const res = await POST(req('POST', { truck_no: 'WXY 1' }))
|
||||
expect(res.status).toBe(201)
|
||||
expect(insertSpy).toHaveBeenCalledWith({ truckNo: 'WXY 1', carrier: null, siteId: null })
|
||||
})
|
||||
it('creates a truck linked to an active site and audits it', async () => {
|
||||
selectQueue.push([{ id: SITE }])
|
||||
const res = await POST(req('POST', { truck_no: 'WXY 2', site_id: SITE }))
|
||||
expect(res.status).toBe(201)
|
||||
expect(insertSpy).toHaveBeenCalledWith({ truckNo: 'WXY 2', carrier: null, siteId: SITE })
|
||||
expect(audit).toHaveBeenCalledTimes(1)
|
||||
expect(audit.mock.calls[0][4]).toMatchObject({ site_id: SITE })
|
||||
})
|
||||
it('422 for a malformed site_id', async () => {
|
||||
const res = await POST(req('POST', { truck_no: 'WXY 3', site_id: 'abc' }))
|
||||
expect(res.status).toBe(422)
|
||||
expect(insertSpy).not.toHaveBeenCalled()
|
||||
})
|
||||
it('422 for an unknown or inactive site', async () => {
|
||||
selectQueue.push([])
|
||||
const res = await POST(req('POST', { truck_no: 'WXY 4', site_id: SITE }))
|
||||
expect(res.status).toBe(422)
|
||||
expect(insertSpy).not.toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
describe('PATCH /api/admin/trucks', () => {
|
||||
it('sets site_id and audits with the previous row', async () => {
|
||||
selectQueue.push([{ id: 't1', siteId: null }], [{ id: SITE }])
|
||||
const res = await PATCH(req('PATCH', { id: 't1', site_id: SITE }))
|
||||
expect(res.status).toBe(200)
|
||||
expect(setSpy).toHaveBeenCalledWith({ siteId: SITE })
|
||||
expect(audit).toHaveBeenCalledTimes(1)
|
||||
expect(audit.mock.calls[0][4]).toEqual({ siteId: SITE })
|
||||
expect(audit.mock.calls[0][5]).toEqual({ id: 't1', siteId: null })
|
||||
})
|
||||
it('clears the site with null', async () => {
|
||||
selectQueue.push([{ id: 't1', siteId: SITE }])
|
||||
const res = await PATCH(req('PATCH', { id: 't1', site_id: null }))
|
||||
expect(res.status).toBe(200)
|
||||
expect(setSpy).toHaveBeenCalledWith({ siteId: null })
|
||||
})
|
||||
it('edits truck_no and carrier together', async () => {
|
||||
selectQueue.push([{ id: 't1' }])
|
||||
const res = await PATCH(req('PATCH', { id: 't1', truck_no: ' ABC 9 ', carrier: ' ' }))
|
||||
expect(res.status).toBe(200)
|
||||
expect(setSpy).toHaveBeenCalledWith({ truckNo: 'ABC 9', carrier: null })
|
||||
})
|
||||
it('still toggles active', async () => {
|
||||
selectQueue.push([{ id: 't1' }])
|
||||
const res = await PATCH(req('PATCH', { id: 't1', active: false }))
|
||||
expect(res.status).toBe(200)
|
||||
expect(setSpy).toHaveBeenCalledWith({ active: false })
|
||||
})
|
||||
it('422 when nothing to change', async () => {
|
||||
const res = await PATCH(req('PATCH', { id: 't1' }))
|
||||
expect(res.status).toBe(422)
|
||||
})
|
||||
it('422 for an empty truck_no', async () => {
|
||||
const res = await PATCH(req('PATCH', { id: 't1', truck_no: ' ' }))
|
||||
expect(res.status).toBe(422)
|
||||
expect(setSpy).not.toHaveBeenCalled()
|
||||
})
|
||||
it('422 for a malformed or unknown site', async () => {
|
||||
expect((await PATCH(req('PATCH', { id: 't1', site_id: 'abc' }))).status).toBe(422)
|
||||
selectQueue.push([{ id: 't1' }], [])
|
||||
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'
|
||||
const res = await PATCH(req('PATCH', { id: 't1', truck_no: 'DUP 1' }))
|
||||
expect(res.status).toBe(409)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,35 @@
|
||||
// @vitest-environment node
|
||||
import { describe, it, expect, vi } from 'vitest'
|
||||
|
||||
vi.mock('@/lib/auth/get-session', () => ({
|
||||
getSession: async () => ({ sub: 'owner-1', role: 'capa_owner' }),
|
||||
}))
|
||||
vi.mock('@/lib/db/audit', () => ({ writeAuditLog: vi.fn() }))
|
||||
vi.mock('@/lib/db/with-user', () => ({
|
||||
withUser: async (_id: string, fn: (tx: unknown) => unknown) =>
|
||||
fn({
|
||||
select: () => ({ from: () => ({ where: () => ({ limit: async () => [{ ownerUserId: 'owner-1', status: 'in_progress' }] }) }) }),
|
||||
update: () => ({ set: () => ({ where: async () => undefined }) }),
|
||||
}),
|
||||
}))
|
||||
|
||||
import { PATCH } from '@/app/api/capa/[id]/route'
|
||||
|
||||
const ctx = { params: Promise.resolve({ id: 'capa-1' }) }
|
||||
const patch = (body: unknown) =>
|
||||
new Request('http://localhost/api/capa/capa-1', {
|
||||
method: 'PATCH',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(body),
|
||||
})
|
||||
|
||||
describe('PATCH /api/capa/[id]', () => {
|
||||
it('rejects pending_verification (must use /submit)', async () => {
|
||||
const res = await PATCH(patch({ status: 'pending_verification' }) as never, ctx)
|
||||
expect(res.status).toBe(403)
|
||||
})
|
||||
it('still allows in_progress', async () => {
|
||||
const res = await PATCH(patch({ status: 'in_progress' }) as never, ctx)
|
||||
expect(res.status).toBe(200)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,117 @@
|
||||
// @vitest-environment node
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
|
||||
const h = vi.hoisted(() => ({
|
||||
session: null as null | { sub: string; role: string },
|
||||
capa: null as null | { incidentId: string; ownerUserId: string; status: string },
|
||||
updates: [] as unknown[],
|
||||
inserts: [] as unknown[],
|
||||
updateRows: [{ id: 'capa-1' }] as unknown[],
|
||||
}))
|
||||
|
||||
vi.mock('@/lib/auth/get-session', () => ({ getSession: async () => h.session }))
|
||||
vi.mock('@/lib/db/audit', () => ({ writeAuditLog: vi.fn() }))
|
||||
vi.mock('@/lib/storage/evidence', () => ({
|
||||
uploadEvidenceFile: vi.fn(async () => ({ path: 'p', publicUrl: '/api/evidence/p?token=t', hash: 'h' })),
|
||||
}))
|
||||
vi.mock('@/lib/db/with-user', () => ({
|
||||
withUser: async (_id: string, fn: (tx: unknown) => unknown) => {
|
||||
const tx = {
|
||||
select: () => ({ from: () => ({ where: () => ({ limit: async () => (h.capa ? [h.capa] : []) }) }) }),
|
||||
insert: () => ({ values: (v: unknown) => { h.inserts.push(v); return { returning: async () => [{ id: 'ev-1' }] } } }),
|
||||
update: () => ({ set: (v: unknown) => { h.updates.push(v); return { where: () => ({ returning: async () => h.updateRows }) } } }),
|
||||
}
|
||||
return fn(tx)
|
||||
},
|
||||
}))
|
||||
|
||||
import { writeAuditLog } from '@/lib/db/audit'
|
||||
import { uploadEvidenceFile } from '@/lib/storage/evidence'
|
||||
import { POST } from '@/app/api/capa/[id]/submit/route'
|
||||
|
||||
function req(note: string | null, fileCount: number) {
|
||||
const fd = new FormData()
|
||||
if (note !== null) fd.append('note', note)
|
||||
for (let i = 0; i < fileCount; i++) fd.append('files', new File(['x'], `p${i}.jpg`, { type: 'image/jpeg' }))
|
||||
return new Request('http://localhost/api/capa/capa-1/submit', { method: 'POST', body: fd })
|
||||
}
|
||||
const ctx = { params: Promise.resolve({ id: 'capa-1' }) }
|
||||
|
||||
beforeEach(() => {
|
||||
h.session = { sub: 'owner-1', role: 'capa_owner' }
|
||||
h.capa = { incidentId: 'inc-1', ownerUserId: 'owner-1', status: 'in_progress' }
|
||||
h.updates = []
|
||||
h.inserts = []
|
||||
h.updateRows = [{ id: 'capa-1' }]
|
||||
vi.mocked(writeAuditLog).mockClear()
|
||||
})
|
||||
|
||||
describe('POST /api/capa/[id]/submit', () => {
|
||||
it('401 without a session', async () => {
|
||||
h.session = null
|
||||
expect((await POST(req('done', 1) as never, ctx)).status).toBe(401)
|
||||
})
|
||||
it('404 when the CAPA does not exist', async () => {
|
||||
h.capa = null
|
||||
expect((await POST(req('done', 1) as never, ctx)).status).toBe(404)
|
||||
})
|
||||
it('403 for a user who is neither owner nor hse/admin', async () => {
|
||||
h.session = { sub: 'other', role: 'reporter' }
|
||||
expect((await POST(req('done', 1) as never, ctx)).status).toBe(403)
|
||||
})
|
||||
it('409 when status is not in_progress', async () => {
|
||||
h.capa!.status = 'open'
|
||||
expect((await POST(req('done', 1) as never, ctx)).status).toBe(409)
|
||||
})
|
||||
it('422 when no photo is attached', async () => {
|
||||
const res = await POST(req('done', 0) as never, ctx)
|
||||
expect(res.status).toBe(422)
|
||||
expect((await res.json()).details).toContain('At least 1 photo is required')
|
||||
})
|
||||
it('422 when the note is empty', async () => {
|
||||
expect((await POST(req(' ', 1) as never, ctx)).status).toBe(422)
|
||||
})
|
||||
it('stores evidence, sets status and audits on success', async () => {
|
||||
const res = await POST(req(' fixed the rack ', 2) as never, ctx)
|
||||
expect(res.status).toBe(200)
|
||||
expect(h.inserts[0]).toEqual([
|
||||
expect.objectContaining({ incidentId: 'inc-1', capaId: 'capa-1', stage: 'capa', uploadedBy: 'owner-1' }),
|
||||
expect.objectContaining({ incidentId: 'inc-1', capaId: 'capa-1', stage: 'capa', uploadedBy: 'owner-1' }),
|
||||
])
|
||||
expect(h.updates[0]).toEqual(
|
||||
expect.objectContaining({ status: 'pending_verification', ownerNotes: 'fixed the rack', completedAt: expect.any(Date) }),
|
||||
)
|
||||
expect(writeAuditLog).toHaveBeenCalledWith(
|
||||
expect.anything(), 'capa_actions', 'capa-1', 'submitted_for_verification',
|
||||
expect.objectContaining({ status: 'pending_verification' }),
|
||||
expect.objectContaining({ status: 'in_progress' }),
|
||||
)
|
||||
})
|
||||
it('409 on a lost race: no evidence insert, no audit', async () => {
|
||||
h.updateRows = []
|
||||
const res = await POST(req('done', 1) as never, ctx)
|
||||
expect(res.status).toBe(409)
|
||||
expect(h.inserts).toHaveLength(0)
|
||||
expect(writeAuditLog).not.toHaveBeenCalled()
|
||||
})
|
||||
it('422 with details and no DB writes when upload fails', async () => {
|
||||
vi.mocked(uploadEvidenceFile).mockRejectedValueOnce(new Error('disk full'))
|
||||
const res = await POST(req('done', 1) as never, ctx)
|
||||
expect(res.status).toBe(422)
|
||||
expect((await res.json()).details).toContain('disk full')
|
||||
expect(h.inserts).toHaveLength(0)
|
||||
expect(h.updates).toHaveLength(0)
|
||||
expect(writeAuditLog).not.toHaveBeenCalled()
|
||||
})
|
||||
it('200 for an hse non-owner, evidence uploadedBy is the hse user', async () => {
|
||||
h.session = { sub: 'hse-1', role: 'hse' }
|
||||
const res = await POST(req('done', 1) as never, ctx)
|
||||
expect(res.status).toBe(200)
|
||||
expect(h.inserts[0]).toEqual([expect.objectContaining({ uploadedBy: 'hse-1' })])
|
||||
})
|
||||
it('422 for 6 files at route level', async () => {
|
||||
const res = await POST(req('done', 6) as never, ctx)
|
||||
expect(res.status).toBe(422)
|
||||
expect((await res.json()).details).toContain('At most 5 photos are allowed')
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,83 @@
|
||||
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('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(<TruckManager trucks={oldTrucks} 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', 'Old Site'])
|
||||
})
|
||||
|
||||
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' })
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,91 @@
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
import { render, screen, fireEvent, waitFor } from '@testing-library/react'
|
||||
import { SubmitVerificationForm } from '@/components/capa/submit-verification-form'
|
||||
|
||||
const { refresh } = vi.hoisted(() => ({ refresh: vi.fn() }))
|
||||
vi.mock('next/navigation', () => ({
|
||||
useRouter: () => ({ refresh }),
|
||||
}))
|
||||
|
||||
const fetchMock = vi.fn()
|
||||
beforeEach(() => {
|
||||
refresh.mockClear()
|
||||
fetchMock.mockReset()
|
||||
vi.stubGlobal('fetch', fetchMock)
|
||||
})
|
||||
|
||||
function fill(container: HTMLElement, names: string[] = ['proof.jpg']) {
|
||||
fireEvent.change(screen.getByLabelText('Completion note'), { target: { value: 'Rack fixed' } })
|
||||
const input = container.querySelector('input[type="file"]') as HTMLInputElement
|
||||
const files = names.map(n => new File(['x'], n, { type: 'image/jpeg' }))
|
||||
fireEvent.change(input, { target: { files } })
|
||||
}
|
||||
|
||||
function button() {
|
||||
return screen.getByRole('button', { name: 'Submit for Verification' }) as HTMLButtonElement
|
||||
}
|
||||
|
||||
describe('SubmitVerificationForm', () => {
|
||||
it('is disabled until a note and a photo are provided', () => {
|
||||
const { container } = render(<SubmitVerificationForm capaId="abc" />)
|
||||
expect(button().disabled).toBe(true)
|
||||
|
||||
fireEvent.change(screen.getByLabelText('Completion note'), { target: { value: 'Rack fixed' } })
|
||||
expect(button().disabled).toBe(true)
|
||||
|
||||
const input = container.querySelector('input[type="file"]') as HTMLInputElement
|
||||
const file = new File(['x'], 'proof.jpg', { type: 'image/jpeg' })
|
||||
fireEvent.change(input, { target: { files: [file] } })
|
||||
expect(button().disabled).toBe(false)
|
||||
expect(screen.getByText('proof.jpg')).toBeTruthy()
|
||||
})
|
||||
|
||||
it('posts FormData on success, refreshes and stays disabled', async () => {
|
||||
fetchMock.mockResolvedValue({ ok: true, json: async () => ({ ok: true }) })
|
||||
const { container } = render(<SubmitVerificationForm capaId="abc" />)
|
||||
fill(container)
|
||||
fireEvent.click(button())
|
||||
await waitFor(() => expect(refresh).toHaveBeenCalledTimes(1))
|
||||
const [url, init] = fetchMock.mock.calls[0]
|
||||
expect(url).toBe('/api/capa/abc/submit')
|
||||
expect(init.method).toBe('POST')
|
||||
const fd = init.body as FormData
|
||||
expect(fd.get('note')).toBe('Rack fixed')
|
||||
expect((fd.getAll('files') as File[]).map(f => f.name)).toEqual(['proof.jpg'])
|
||||
expect((screen.getByRole('button', { name: 'Submitting…' }) as HTMLButtonElement).disabled).toBe(true)
|
||||
})
|
||||
|
||||
it('shows server details and re-enables on 422', async () => {
|
||||
fetchMock.mockResolvedValue({ ok: false, json: async () => ({ error: 'bad', details: ['Note too short', 'Bad photo'] }) })
|
||||
const { container } = render(<SubmitVerificationForm capaId="abc" />)
|
||||
fill(container)
|
||||
fireEvent.click(button())
|
||||
expect((await screen.findByRole('alert')).textContent).toBe('Note too short. Bad photo')
|
||||
expect(button().disabled).toBe(false)
|
||||
expect(refresh).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('shows a network error and re-enables when fetch rejects', async () => {
|
||||
fetchMock.mockRejectedValue(new Error('offline'))
|
||||
const { container } = render(<SubmitVerificationForm capaId="abc" />)
|
||||
fill(container)
|
||||
fireEvent.click(button())
|
||||
expect((await screen.findByRole('alert')).textContent).toBe('Network error. Please try again.')
|
||||
expect(button().disabled).toBe(false)
|
||||
})
|
||||
|
||||
it('disables submit again after removing the only file', () => {
|
||||
const { container } = render(<SubmitVerificationForm capaId="abc" />)
|
||||
fill(container)
|
||||
expect(button().disabled).toBe(false)
|
||||
fireEvent.click(screen.getByLabelText('Remove proof.jpg'))
|
||||
expect(button().disabled).toBe(true)
|
||||
})
|
||||
|
||||
it('caps the list at 5 photos', () => {
|
||||
const { container } = render(<SubmitVerificationForm capaId="abc" />)
|
||||
fill(container, ['1.jpg', '2.jpg', '3.jpg', '4.jpg', '5.jpg', '6.jpg'])
|
||||
expect(screen.getAllByText(/^\d\.jpg$/)).toHaveLength(5)
|
||||
expect(screen.queryByText('6.jpg')).toBeNull()
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,64 @@
|
||||
import { describe, it, expect, vi } from 'vitest'
|
||||
import { render, screen, fireEvent, within } from '@testing-library/react'
|
||||
import { ReportForm } from '@/components/incidents/report-form'
|
||||
import { I18nProvider } from '@/lib/i18n/context'
|
||||
import en from '@/messages/en.json'
|
||||
|
||||
vi.mock('next/navigation', () => ({ useRouter: () => ({ push: vi.fn(), refresh: vi.fn() }) }))
|
||||
|
||||
const sites = [
|
||||
{ id: 'site-a', name: 'Site A', zones: [{ id: 'z1', name: 'Dock', qr_code_token: 'tok-a' }] },
|
||||
{ id: 'site-b', name: 'Site B', zones: [{ id: 'z2', name: 'Yard', qr_code_token: 'tok-b' }] },
|
||||
]
|
||||
const trucks = [
|
||||
{ id: 't1', truck_no: 'AAA 1', carrier: null, site_id: 'site-a' },
|
||||
{ id: 't2', truck_no: 'BBB 2', carrier: null, site_id: 'site-b' },
|
||||
{ id: 't3', truck_no: 'FREE 3', carrier: null, site_id: null },
|
||||
]
|
||||
|
||||
function renderForm(props: Partial<React.ComponentProps<typeof ReportForm>> = {}) {
|
||||
return render(
|
||||
<I18nProvider messages={en}>
|
||||
<ReportForm
|
||||
zoneToken={null}
|
||||
zoneName={null}
|
||||
siteName={null}
|
||||
sites={sites}
|
||||
defaultSiteId=""
|
||||
trucks={trucks}
|
||||
initialTruckId="t1"
|
||||
{...props}
|
||||
/>
|
||||
</I18nProvider>,
|
||||
)
|
||||
}
|
||||
|
||||
const selectWith = (text: string) =>
|
||||
screen.getAllByRole('combobox').find(s => within(s).queryByText(text)) as HTMLSelectElement
|
||||
|
||||
const truckNos = () =>
|
||||
Array.from(selectWith(en.ReportForm.truckPlaceholder).options).map(o => o.textContent)
|
||||
|
||||
describe('ReportForm truck list', () => {
|
||||
const all = [en.ReportForm.truckPlaceholder, 'AAA 1', 'BBB 2', 'FREE 3']
|
||||
|
||||
it('shows every truck regardless of site', () => {
|
||||
renderForm()
|
||||
expect(truckNos()).toEqual(all)
|
||||
})
|
||||
|
||||
it('keeps the chosen truck when the site changes', () => {
|
||||
renderForm()
|
||||
fireEvent.change(selectWith(en.ReportForm.sitePlaceholder), { target: { value: 'site-b' } })
|
||||
expect(truckNos()).toEqual(all)
|
||||
expect(selectWith(en.ReportForm.truckPlaceholder).value).toBe('t1')
|
||||
})
|
||||
|
||||
it('shows every truck with a QR zone token', () => {
|
||||
renderForm({ zoneToken: 'tok-b', zoneName: 'Yard', siteName: 'Site B', initialTruckId: null })
|
||||
fireEvent.change(screen.getAllByRole('combobox').find(s => within(s).queryByText(en.IncidentType.transport))!, {
|
||||
target: { value: 'transport' },
|
||||
})
|
||||
expect(truckNos()).toEqual(all)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,21 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { parseSiteId } from '@/lib/admin/truck-input'
|
||||
|
||||
const UUID = '3f2b8c1e-9d4a-4e6f-8a1b-2c3d4e5f6a7b'
|
||||
|
||||
describe('parseSiteId', () => {
|
||||
it('treats undefined as not provided', () => {
|
||||
expect(parseSiteId(undefined)).toEqual({ ok: true, value: undefined })
|
||||
})
|
||||
it('treats null and empty string as clear', () => {
|
||||
expect(parseSiteId(null)).toEqual({ ok: true, value: null })
|
||||
expect(parseSiteId('')).toEqual({ ok: true, value: null })
|
||||
})
|
||||
it('accepts a uuid', () => {
|
||||
expect(parseSiteId(UUID)).toEqual({ ok: true, value: UUID })
|
||||
})
|
||||
it('rejects anything else', () => {
|
||||
expect(parseSiteId('abc')).toEqual({ ok: false })
|
||||
expect(parseSiteId(12)).toEqual({ ok: false })
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,30 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { validateCapaSubmission, MAX_CAPA_PHOTOS } from '@/lib/capa/submit-validation'
|
||||
|
||||
const img = { type: 'image/jpeg' }
|
||||
|
||||
describe('validateCapaSubmission', () => {
|
||||
it('accepts a note with 1 image and trims the note', () => {
|
||||
expect(validateCapaSubmission(' done ', [img])).toEqual({ ok: true, note: 'done' })
|
||||
})
|
||||
it('rejects an empty or whitespace note', () => {
|
||||
const r = validateCapaSubmission(' ', [img])
|
||||
expect(r.ok).toBe(false)
|
||||
if (!r.ok) expect(r.errors).toContain('Completion note is required')
|
||||
})
|
||||
it('rejects zero files', () => {
|
||||
const r = validateCapaSubmission('done', [])
|
||||
expect(r.ok).toBe(false)
|
||||
if (!r.ok) expect(r.errors).toContain('At least 1 photo is required')
|
||||
})
|
||||
it('rejects more than the max', () => {
|
||||
const r = validateCapaSubmission('done', Array(MAX_CAPA_PHOTOS + 1).fill(img))
|
||||
expect(r.ok).toBe(false)
|
||||
if (!r.ok) expect(r.errors).toContain(`At most ${MAX_CAPA_PHOTOS} photos are allowed`)
|
||||
})
|
||||
it('rejects non-image files', () => {
|
||||
const r = validateCapaSubmission('done', [{ type: 'application/pdf' }])
|
||||
expect(r.ok).toBe(false)
|
||||
if (!r.ok) expect(r.errors).toContain('Only image files are allowed')
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,32 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { trucksForSite, siteForTruck } from '@/lib/report/trucks'
|
||||
|
||||
const trucks = [
|
||||
{ id: 't1', site_id: 'A' },
|
||||
{ id: 't2', site_id: 'B' },
|
||||
{ id: 't3', site_id: null },
|
||||
]
|
||||
|
||||
describe('trucksForSite', () => {
|
||||
it('returns matching and unassigned trucks', () => {
|
||||
expect(trucksForSite(trucks, 'A').map(t => t.id)).toEqual(['t1', 't3'])
|
||||
expect(trucksForSite(trucks, 'B').map(t => t.id)).toEqual(['t2', 't3'])
|
||||
})
|
||||
it('returns all trucks when no site is selected', () => {
|
||||
expect(trucksForSite(trucks, '').map(t => t.id)).toEqual(['t1', 't2', 't3'])
|
||||
})
|
||||
it('returns only unassigned trucks for a site with none linked', () => {
|
||||
expect(trucksForSite(trucks, 'C').map(t => t.id)).toEqual(['t3'])
|
||||
})
|
||||
})
|
||||
|
||||
describe('siteForTruck', () => {
|
||||
it('returns the truck site', () => {
|
||||
expect(siteForTruck(trucks, 't2')).toBe('B')
|
||||
})
|
||||
it('returns null for unassigned, unknown or missing truck', () => {
|
||||
expect(siteForTruck(trucks, 't3')).toBeNull()
|
||||
expect(siteForTruck(trucks, 'nope')).toBeNull()
|
||||
expect(siteForTruck(trucks, null)).toBeNull()
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,60 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { groupSites, zonesForSite, resolveZoneToken, siteIdForToken, type ZoneRow } from '@/lib/report/zones'
|
||||
|
||||
const rows: ZoneRow[] = [
|
||||
{ siteId: 's1', siteName: 'SC1', zoneId: 'z1', zoneName: 'Dock A', token: 'tok-a' },
|
||||
{ siteId: 's1', siteName: 'SC1', zoneId: 'z2', zoneName: 'Dock B', token: 'tok-b' },
|
||||
{ siteId: 's2', siteName: 'SC2', zoneId: 'z3', zoneName: 'Cold Room', token: 'tok-c' },
|
||||
]
|
||||
|
||||
describe('groupSites', () => {
|
||||
it('groups zone rows under their site, keeping order', () => {
|
||||
const sites = groupSites(rows)
|
||||
expect(sites.map(s => s.name)).toEqual(['SC1', 'SC2'])
|
||||
expect(sites[0].zones.map(z => z.name)).toEqual(['Dock A', 'Dock B'])
|
||||
expect(sites[1].zones[0]).toEqual({ id: 'z3', name: 'Cold Room', qr_code_token: 'tok-c' })
|
||||
})
|
||||
|
||||
it('returns [] for no rows', () => {
|
||||
expect(groupSites([])).toEqual([])
|
||||
})
|
||||
})
|
||||
|
||||
describe('zonesForSite', () => {
|
||||
const sites = groupSites(rows)
|
||||
it('returns the zones of the given site', () => {
|
||||
expect(zonesForSite(sites, 's2').map(z => z.id)).toEqual(['z3'])
|
||||
})
|
||||
it('returns [] for an unknown or empty site id', () => {
|
||||
expect(zonesForSite(sites, 'nope')).toEqual([])
|
||||
expect(zonesForSite(sites, '')).toEqual([])
|
||||
})
|
||||
})
|
||||
|
||||
describe('resolveZoneToken', () => {
|
||||
const sites = groupSites(rows)
|
||||
it('prefers the QR token', () => {
|
||||
expect(resolveZoneToken({ zoneToken: 'qr-1', sites, zoneId: 'z1' })).toBe('qr-1')
|
||||
})
|
||||
it('falls back to the selected zone token', () => {
|
||||
expect(resolveZoneToken({ zoneToken: null, sites, zoneId: 'z2' })).toBe('tok-b')
|
||||
})
|
||||
it('returns null when nothing is chosen or the zone is unknown', () => {
|
||||
expect(resolveZoneToken({ zoneToken: null, sites, zoneId: '' })).toBeNull()
|
||||
expect(resolveZoneToken({ zoneToken: null, sites, zoneId: 'zz' })).toBeNull()
|
||||
})
|
||||
})
|
||||
|
||||
describe('siteIdForToken', () => {
|
||||
const sites = [
|
||||
{ id: 'A', name: 'Site A', zones: [{ id: 'z1', name: 'Dock', qr_code_token: 'tok-1' }] },
|
||||
{ id: 'B', name: 'Site B', zones: [{ id: 'z2', name: 'Yard', qr_code_token: 'tok-2' }] },
|
||||
]
|
||||
it('finds the site that owns the token', () => {
|
||||
expect(siteIdForToken(sites, 'tok-2')).toBe('B')
|
||||
})
|
||||
it('returns empty string for null or unknown token', () => {
|
||||
expect(siteIdForToken(sites, null)).toBe('')
|
||||
expect(siteIdForToken(sites, 'nope')).toBe('')
|
||||
})
|
||||
})
|
||||
Reference in New Issue
Block a user