feat(report): show all trucks regardless of site

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-10-15 13:52:46 +08:00
co-authored by Claude Sonnet 5.5
parent f3c62d9225
commit 701fefd286
2 changed files with 14 additions and 20 deletions
+4 -10
View File
@@ -1,12 +1,12 @@
'use client'
import { useState, useEffect, useMemo } from 'react'
import { useState, useEffect } from 'react'
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, siteIdForToken, type SiteOption } from '@/lib/report/zones'
import { trucksForSite, siteForTruck } from '@/lib/report/trucks'
import { zonesForSite, resolveZoneToken, type SiteOption } from '@/lib/report/zones'
import { siteForTruck } from '@/lib/report/trucks'
interface Props {
zoneToken: string | null
@@ -64,8 +64,6 @@ export function ReportForm({ zoneToken, sites, defaultSiteId, trucks, initialTru
)
const [zoneId, setZoneId] = useState('')
const effectiveZoneToken = resolveZoneToken({ zoneToken, sites, zoneId })
const effectiveSiteId = zoneToken ? siteIdForToken(sites, zoneToken) : siteId
const truckOptions = useMemo(() => trucksForSite(trucks, effectiveSiteId), [trucks, effectiveSiteId])
const [form, setForm] = useState({
incident_type: (initialTruckId ? 'transport' : '') as IncidentType | '',
@@ -75,10 +73,6 @@ export function ReportForm({ zoneToken, sites, defaultSiteId, trucks, initialTru
asset_involved: false,
truck_id: initialTruckId ?? '',
})
useEffect(() => {
// eslint-disable-next-line react-hooks/set-state-in-effect
setForm(f => (f.truck_id && !truckOptions.some(tk => tk.id === f.truck_id) ? { ...f, truck_id: '' } : f))
}, [truckOptions])
const [typeDetails, setTypeDetails] = useState<Record<string, string | boolean>>({})
const setDetail = (key: string, value: string | boolean) =>
@@ -336,7 +330,7 @@ export function ReportForm({ zoneToken, sites, defaultSiteId, trucks, initialTru
onChange={e => setForm(f => ({ ...f, truck_id: e.target.value }))}
>
<option value="">{t.truckPlaceholder}</option>
{truckOptions.map(tk => (
{trucks.map(tk => (
<option key={tk.id} value={tk.id}>
{tk.truck_no}{tk.carrier ? ` — ${tk.carrier}` : ''}
</option>