@@ -5,7 +5,7 @@ import { AlertTriangle, Plus, Save } from "lucide-react"
|
||||
import { Button } from "@/shared/components/ui/button"
|
||||
import { Alert, AlertTitle } from "@/shared/components/ui/alert"
|
||||
import { FieldGroup } from "@/shared/components/ui/field"
|
||||
import { Rhform, RhfTextField } from "@/shared/components/form"
|
||||
import { Rhform, RhfDateField, RhfTextField, RhfTimeField, RhfTextareaField } from "@/shared/components/form"
|
||||
import { toast } from "sonner"
|
||||
import { useAuthApi } from "@/shared/useApi"
|
||||
import { useResourceForm } from "@/shared/hooks/use-resource-form"
|
||||
@@ -25,19 +25,31 @@ export type MileageFormProps = {
|
||||
// ── Default values ──
|
||||
|
||||
const DEFAULT_VALUES: MileageFormValues = {
|
||||
mileage: 0,
|
||||
miles: 0,
|
||||
fuel_level: undefined,
|
||||
date: "",
|
||||
time: "",
|
||||
note: "",
|
||||
}
|
||||
|
||||
// ── Mapping helpers ──
|
||||
|
||||
function mapToFormValues(data: unknown): MileageFormValues {
|
||||
const d = (data as any)?.data ?? data ?? {}
|
||||
|
||||
const date = d.date ? String(d.date).split("T")[0] : ""
|
||||
const time = d.time
|
||||
? String(d.time).includes("T")
|
||||
? String(d.time).split("T")[1]?.slice(0, 8) ?? ""
|
||||
: String(d.time).slice(0, 8)
|
||||
: ""
|
||||
|
||||
return {
|
||||
mileage: d.mileage ?? 0,
|
||||
date: d.date || "",
|
||||
time: d.time || "",
|
||||
miles: d.miles ?? d.mileage ?? 0,
|
||||
fuel_level: d.fuel_level ?? undefined,
|
||||
date,
|
||||
time,
|
||||
note: d.note || "",
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,7 +68,13 @@ export function MileageForm({ vehicleId, resourceId, initialData, onSuccess }: M
|
||||
|
||||
const { mutate, error, isPending } = useFormMutation(form, {
|
||||
mutationFn: (values: MileageFormValues) => {
|
||||
const payload = { mileage: values.mileage, date: values.date, time: values.time }
|
||||
const payload = {
|
||||
miles: values.miles,
|
||||
fuel_level: values.fuel_level,
|
||||
date: values.date,
|
||||
time: values.time,
|
||||
note: values.note || undefined,
|
||||
}
|
||||
const promise = isEditing && resourceId
|
||||
? api.vehicleDocuments.updateMileage(resourceId, payload as any)
|
||||
: api.vehicleDocuments.createMileage({ vehicle_id: Number(vehicleId), ...payload } as any)
|
||||
@@ -87,28 +105,39 @@ export function MileageForm({ vehicleId, resourceId, initialData, onSuccess }: M
|
||||
|
||||
<FieldGroup>
|
||||
<RhfTextField
|
||||
name="mileage"
|
||||
label="Mileage"
|
||||
name="miles"
|
||||
label="Miles"
|
||||
placeholder="e.g. 50000"
|
||||
type="number"
|
||||
required
|
||||
/>
|
||||
|
||||
<RhfTextField
|
||||
name="fuel_level"
|
||||
label="Fuel Level (%)"
|
||||
placeholder="e.g. 80"
|
||||
type="number"
|
||||
/>
|
||||
|
||||
<div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
|
||||
<RhfTextField
|
||||
<RhfDateField
|
||||
name="date"
|
||||
label="Date"
|
||||
type="date"
|
||||
required
|
||||
/>
|
||||
<RhfTextField
|
||||
<RhfTimeField
|
||||
name="time"
|
||||
label="Time"
|
||||
type="time"
|
||||
required
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
|
||||
<RhfTextareaField
|
||||
name="note"
|
||||
label="Note"
|
||||
placeholder="Optional note"
|
||||
/>
|
||||
|
||||
<Button type="submit" disabled={isPending} className="w-full">
|
||||
{isPending ? null : isEditing ? <Save /> : <Plus />}
|
||||
{isPending ? "Saving..." : isEditing ? "Update Mileage" : "Add Mileage"}
|
||||
|
||||
@@ -1,9 +1,14 @@
|
||||
import { z } from "zod"
|
||||
|
||||
export const mileageFormSchema = z.object({
|
||||
mileage: z.coerce.number({ message: "Mileage is required" }).min(0, "Mileage must be 0 or greater"),
|
||||
miles: z.coerce.number({ message: "Miles is required" }).min(0, "Miles must be 0 or greater"),
|
||||
fuel_level: z.preprocess(
|
||||
(value) => (value === "" || value == null ? undefined : Number(value)),
|
||||
z.number().min(0, "Fuel level must be 0 or greater").max(100, "Fuel level cannot exceed 100").optional(),
|
||||
),
|
||||
date: z.string().min(1, "Date is required"),
|
||||
time: z.string().min(1, "Time is required"),
|
||||
note: z.string().optional(),
|
||||
})
|
||||
|
||||
export type MileageFormValues = z.infer<typeof mileageFormSchema>
|
||||
|
||||
Reference in New Issue
Block a user