From cc7dc1bd1724b301c516eeb1acb90a212c5230f4 Mon Sep 17 00:00:00 2001
From: "Najjar\\NajjarV02" <mglnaj6>
Date: Tue, 12 May 2026 16:22:26 +0400
Subject: [PATCH] fix: align frontend zod schemas with backend validation rules

Tightened frontend zod schemas where backend required fields the frontend marked optional, and matched enum/format constraints.

Schemas:
- vehicle-document: document_type required
- parts: shop_type, category, unit_type, department, sku required
- inspections: customer, vehicle, department, inspection_category, employee, order_number, date, time required
- appointments: service_writer required, cross-field to_time > from_time
- vendor-credits: vendor + vendor_credit_date required
- job-cards: documents[].document_type_id required
- expense-items: category, unit_type, department, sku required
- inventory-adjustments: reference_number, date required
- tasks: task_type, task_section required
- shop-timings: in_time, out_time enforce HH:MM:SS regex
- vendor-credit: subject + vendor + vendor_credit_date required

Settings:
- shop-type: shop_type + note required
- insurance-types: description field added, required
- make-and-models: shop_type required, year 1900..2100
- departments: assignment_type required enum (AssignmentType)
- company: website URL validation, latitude/longitude range, first_day_of_work enum, string max lengths
- configurations: 4 fields enum-typed (was raw strings)

Inline forms:
- job-card service/part/expense-item: relations required (part/service/expense_item/department)
- job-card recommendation: max 255
- vehicles/inline-forms/shop-type: shop_type + note required
- vehicles/inline-forms/body-type: shop_type_id pulled from parent form context, guard on submit
- vehicles/inline-forms/color: code field added, required
- services/inline-forms/department: assignment_type required enum
- tasks/task-section: arrangement required integer
- invoices/invoice-edit: status + discount enum-typed

Auth:
- login: password min 6 (was 8; backend allows 6)

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../appointments/appointment.schema.ts        | 38 +++++++++-----
 .../modules/auth/login-form.schema.ts         |  2 +-
 .../expense-items/expense-item.schema.ts      | 12 ++---
 .../modules/inspections/inspection.schema.ts  | 18 +++----
 .../inventory-adjustment.schema.ts            |  4 +-
 .../modules/invoices/invoice-edit-form.tsx    | 12 ++---
 .../job-cards/job-card-expense-item-form.tsx  |  2 +-
 .../modules/job-cards/job-card-part-form.tsx  |  4 +-
 .../job-card-recommendation-form.tsx          |  2 +-
 .../job-cards/job-card-service-form.tsx       |  4 +-
 .../modules/job-cards/job-card.schema.ts      |  2 +-
 apps/dashboard/modules/parts/part.schema.ts   | 10 ++--
 .../inline-forms/department-inline-form.tsx   |  5 +-
 .../settings/company/settings.schema.ts       | 52 ++++++++++++++-----
 .../configurations/configurations.schema.ts   | 22 +++++---
 .../general-preferences-form.tsx              |  8 +--
 .../configurations/purchase-config-form.tsx   |  4 +-
 .../configurations/sales-config-form.tsx      |  4 +-
 .../settings/departments/department.schema.ts |  5 +-
 .../insurance-types/insurance-type-form.tsx   | 10 ++++
 .../insurance-types/insurance-type.schema.ts  |  3 +-
 .../make-and-models/make-and-model.schema.ts  | 14 +++--
 .../settings/shop-type/shop-type.schema.ts    |  6 +--
 .../shop-timings/shop-timing.schema.ts        | 24 +++++----
 .../modules/tasks/task-section-form.tsx       |  7 ++-
 apps/dashboard/modules/tasks/task.schema.ts   |  6 +--
 .../inline-forms/body-type-inline-form.tsx    | 15 ++++--
 .../inline-forms/color-inline-form.tsx        | 13 +++--
 .../inline-forms/shop-type-inline-form.tsx    | 10 ++--
 .../vehicles/vehicle-document.schema.ts       |  2 +-
 .../vendor-credits/vendor-credit.schema.ts    |  4 +-
 31 files changed, 205 insertions(+), 119 deletions(-)

diff --git a/apps/dashboard/modules/appointments/appointment.schema.ts b/apps/dashboard/modules/appointments/appointment.schema.ts
index 1cf6dc5..d3b8888 100644
--- a/apps/dashboard/modules/appointments/appointment.schema.ts
+++ b/apps/dashboard/modules/appointments/appointment.schema.ts
@@ -10,20 +10,30 @@ const APPOINTMENT_STATUS_OPTIONS = AppointmentStatus.map((v) => ({
     label: v.replace(/_/g, " ").replace(/\b\w/g, (c) => c.toUpperCase()),
 }))
 
-const appointmentFormSchema = z.object({
-    title: z.string().min(1, "Title is required"),
-    date: z.string().min(1, "Date is required"),
-    from_time: z.string().min(1, "Start time is required"),
-    to_time: z.string().min(1, "End time is required"),
-    customer: relationFieldSchema,
-    vehicle: relationFieldSchema,
-    service_writer: relationFieldSchema,
-    technician: relationFieldSchema,
-    department: relationFieldSchema,
-    job_card: relationFieldSchema,
-    notes: z.string().optional(),
-    status: z.string().optional(),
-})
+const appointmentFormSchema = z
+    .object({
+        title: z.string().min(1, "Title is required").max(255, "Title cannot exceed 255 characters"),
+        date: z.string().min(1, "Date is required"),
+        from_time: z.string().min(1, "Start time is required"),
+        to_time: z.string().min(1, "End time is required"),
+        customer: relationFieldSchema,
+        vehicle: relationFieldSchema,
+        service_writer: relationFieldSchema.refine((val) => !!val?.value, "Service writer is required"),
+        technician: relationFieldSchema,
+        department: relationFieldSchema,
+        job_card: relationFieldSchema,
+        notes: z.string().optional(),
+        status: z.string().optional(),
+    })
+    .superRefine((val, ctx) => {
+        if (val.from_time && val.to_time && val.to_time <= val.from_time) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                path: ["to_time"],
+                message: "End time must be after start time",
+            })
+        }
+    })
 
 type AppointmentFormValues = z.infer<typeof appointmentFormSchema>
 
diff --git a/apps/dashboard/modules/auth/login-form.schema.ts b/apps/dashboard/modules/auth/login-form.schema.ts
index dbe2b80..9a7061c 100644
--- a/apps/dashboard/modules/auth/login-form.schema.ts
+++ b/apps/dashboard/modules/auth/login-form.schema.ts
@@ -2,7 +2,7 @@ import { z } from "zod"
 
 const loginFormSchema = z.object({
   email: z.string().trim().email("Enter a valid email address"),
-  password: z.string().min(8, "Password must be at least 8 characters"),
+  password: z.string().min(6, "Password must be at least 6 characters"),
 })
 
 type LoginFormValues = z.infer<typeof loginFormSchema>
diff --git a/apps/dashboard/modules/expense-items/expense-item.schema.ts b/apps/dashboard/modules/expense-items/expense-item.schema.ts
index d7f88b4..35ea9cd 100644
--- a/apps/dashboard/modules/expense-items/expense-item.schema.ts
+++ b/apps/dashboard/modules/expense-items/expense-item.schema.ts
@@ -5,14 +5,14 @@ export const relationFieldSchema = z
     .nullable()
 
 export const expenseItemFormSchema = z.object({
-    item_type: z.string().min(1, "Item type is required"),
-    item_name: z.string().min(1, "Item name is required"),
-    sku: z.string().optional(),
+    item_type: z.string().min(1, "Item type is required").max(255, "Item type cannot exceed 255 characters"),
+    item_name: z.string().min(1, "Item name is required").max(255, "Item name cannot exceed 255 characters"),
+    sku: z.string().min(1, "SKU is required").max(255, "SKU cannot exceed 255 characters"),
     item_code: z.string().optional(),
     description: z.string().optional(),
-    category: relationFieldSchema,
-    unit_type: relationFieldSchema,
-    department: relationFieldSchema,
+    category: relationFieldSchema.refine((val) => !!val?.value, "Category is required"),
+    unit_type: relationFieldSchema.refine((val) => !!val?.value, "Unit type is required"),
+    department: relationFieldSchema.refine((val) => !!val?.value, "Department is required"),
     // Purchase
     purchase_information: z.boolean().default(true),
     purchase_price: z.coerce.number().min(0).optional(),
diff --git a/apps/dashboard/modules/inspections/inspection.schema.ts b/apps/dashboard/modules/inspections/inspection.schema.ts
index da2de0d..a2a6c6e 100644
--- a/apps/dashboard/modules/inspections/inspection.schema.ts
+++ b/apps/dashboard/modules/inspections/inspection.schema.ts
@@ -5,17 +5,17 @@ const relationFieldSchema = z
     .nullable()
 
 const inspectionFormSchema = z.object({
-    customer: relationFieldSchema,
-    vehicle: relationFieldSchema,
-    department: relationFieldSchema,
-    inspection_category: relationFieldSchema,
-    employee: relationFieldSchema,
+    customer: relationFieldSchema.refine((val) => !!val?.value, "Customer is required"),
+    vehicle: relationFieldSchema.refine((val) => !!val?.value, "Vehicle is required"),
+    department: relationFieldSchema.refine((val) => !!val?.value, "Department is required"),
+    inspection_category: relationFieldSchema.refine((val) => !!val?.value, "Inspection category is required"),
+    employee: relationFieldSchema.refine((val) => !!val?.value, "Employee is required"),
     job_card: relationFieldSchema.optional(),
     labor_rate: relationFieldSchema.optional(),
-    title: z.string().min(1, "Title is required"),
-    order_number: z.string().optional(),
-    date: z.string().optional(),
-    time: z.string().optional(),
+    title: z.string().min(1, "Title is required").max(100, "Title cannot exceed 100 characters"),
+    order_number: z.string().min(1, "Order number is required").max(100, "Order number cannot exceed 100 characters"),
+    date: z.string().min(1, "Date is required"),
+    time: z.string().min(1, "Time is required"),
     status: z.string().optional(),
     note: z.string().optional(),
     description: z.string().optional(),
diff --git a/apps/dashboard/modules/inventory-adjustments/inventory-adjustment.schema.ts b/apps/dashboard/modules/inventory-adjustments/inventory-adjustment.schema.ts
index cee3a7b..632a17f 100644
--- a/apps/dashboard/modules/inventory-adjustments/inventory-adjustment.schema.ts
+++ b/apps/dashboard/modules/inventory-adjustments/inventory-adjustment.schema.ts
@@ -11,8 +11,8 @@ const partLineSchema = z.object({
 })
 
 export const inventoryAdjustmentFormSchema = z.object({
-    reference_number: z.string().optional(),
-    date: z.string().optional(),
+    reference_number: z.string().min(1, "Reference number is required").max(255, "Reference number cannot exceed 255 characters"),
+    date: z.string().min(1, "Date is required"),
     chart_of_account: z.string().optional(),
     reason: relationFieldSchema,
     notes: z.string().optional(),
diff --git a/apps/dashboard/modules/invoices/invoice-edit-form.tsx b/apps/dashboard/modules/invoices/invoice-edit-form.tsx
index 70d00e4..338e1a2 100644
--- a/apps/dashboard/modules/invoices/invoice-edit-form.tsx
+++ b/apps/dashboard/modules/invoices/invoice-edit-form.tsx
@@ -22,13 +22,13 @@ import { z } from "zod"
 // ── Schema for edit form (simplified, edit only) ──
 
 const invoiceEditFormSchema = z.object({
-    subject: z.string().min(1, "Subject is required"),
+    subject: z.string().min(1, "Subject is required").max(255, "Subject cannot exceed 255 characters"),
     due_date: z.string().optional(),
-    invoice_title: z.string().optional(),
+    invoice_title: z.string().max(255, "Invoice title cannot exceed 255 characters").optional(),
     notes: z.string().optional(),
     terms_and_conditions: z.string().optional(),
-    status: z.string().optional(),
-    discount: z.string().optional(),
+    status: z.enum(InvoiceStatus).optional(),
+    discount: z.enum(InvoiceDiscount).optional(),
 })
 
 type InvoiceEditFormValues = z.infer<typeof invoiceEditFormSchema>
@@ -53,7 +53,7 @@ const DEFAULT_VALUES: InvoiceEditFormValues = {
     invoice_title: "",
     notes: "",
     terms_and_conditions: "",
-    status: "",
+    status: undefined,
     discount: "no",
 }
 
@@ -67,7 +67,7 @@ function mapToFormValues(data: unknown): InvoiceEditFormValues {
         invoice_title: d.invoice_title || "",
         notes: d.notes || "",
         terms_and_conditions: d.terms_and_conditions || "",
-        status: d.status || "",
+        status: d.status || undefined,
         discount: d.discount || "no",
     }
 }
diff --git a/apps/dashboard/modules/job-cards/job-card-expense-item-form.tsx b/apps/dashboard/modules/job-cards/job-card-expense-item-form.tsx
index c2bd0b7..ace8056 100644
--- a/apps/dashboard/modules/job-cards/job-card-expense-item-form.tsx
+++ b/apps/dashboard/modules/job-cards/job-card-expense-item-form.tsx
@@ -36,7 +36,7 @@ const requiredRelationFieldSchema = relationFieldSchema.superRefine((value, ctx)
 })
 
 const jobCardExpenseItemFormSchema = z.object({
-    expense_item: relationFieldSchema,
+    expense_item: requiredRelationFieldSchema,
     department: requiredRelationFieldSchema,
     tax: relationFieldSchema.optional(),
     quantity: z.coerce.number().min(1, "Quantity is required"),
diff --git a/apps/dashboard/modules/job-cards/job-card-part-form.tsx b/apps/dashboard/modules/job-cards/job-card-part-form.tsx
index 0ade8b7..c065a35 100644
--- a/apps/dashboard/modules/job-cards/job-card-part-form.tsx
+++ b/apps/dashboard/modules/job-cards/job-card-part-form.tsx
@@ -27,8 +27,8 @@ import { useJobCard } from "./job-card-context"
 const relationFieldSchema = z.object({ value: z.string(), label: z.string() }).nullable()
 
 const jobCardPartFormSchema = z.object({
-    part: relationFieldSchema,
-    department: relationFieldSchema.optional(),
+    part: relationFieldSchema.refine((val) => !!val?.value, "Part is required"),
+    department: relationFieldSchema.refine((val) => !!val?.value, "Department is required"),
     tax: relationFieldSchema.optional(),
     quantity: z.coerce.number().min(1, "Quantity is required"),
     rate: z.coerce.number().min(0, "Rate is required"),
diff --git a/apps/dashboard/modules/job-cards/job-card-recommendation-form.tsx b/apps/dashboard/modules/job-cards/job-card-recommendation-form.tsx
index 3083c2a..ff30231 100644
--- a/apps/dashboard/modules/job-cards/job-card-recommendation-form.tsx
+++ b/apps/dashboard/modules/job-cards/job-card-recommendation-form.tsx
@@ -11,7 +11,7 @@ import { toast } from "sonner"
 import { useAuthApi } from "@/shared/useApi"
 
 const schema = z.object({
-    recommendation: z.string().min(1, "Recommendation is required"),
+    recommendation: z.string().min(1, "Recommendation is required").max(255, "Recommendation cannot exceed 255 characters"),
 })
 
 type FormValues = z.infer<typeof schema>
diff --git a/apps/dashboard/modules/job-cards/job-card-service-form.tsx b/apps/dashboard/modules/job-cards/job-card-service-form.tsx
index e23bb9f..1796063 100644
--- a/apps/dashboard/modules/job-cards/job-card-service-form.tsx
+++ b/apps/dashboard/modules/job-cards/job-card-service-form.tsx
@@ -28,8 +28,8 @@ import { useJobCard } from "./job-card-context"
 const relationFieldSchema = z.object({ value: z.string(), label: z.string() }).nullable()
 
 const jobCardServiceFormSchema = z.object({
-    service: relationFieldSchema,
-    department: z.object({ value: z.string(), label: z.string() }),
+    service: relationFieldSchema.refine((val) => !!val?.value, "Service is required"),
+    department: z.object({ value: z.string(), label: z.string() }, { error: "Department is required" }),
     tax: relationFieldSchema.optional(),
     rate_type: z.string().optional(),
     labor_rate: relationFieldSchema.optional(),
diff --git a/apps/dashboard/modules/job-cards/job-card.schema.ts b/apps/dashboard/modules/job-cards/job-card.schema.ts
index 9efd0f9..6c599e9 100644
--- a/apps/dashboard/modules/job-cards/job-card.schema.ts
+++ b/apps/dashboard/modules/job-cards/job-card.schema.ts
@@ -16,7 +16,7 @@ const optionalStringMax255 = z.string().max(255).optional()
 const optionalTimeString = z.string().max(50).optional()
 
 const documentSchema = z.object({
-    document_type_id: z.coerce.number().int().optional(),
+    document_type_id: z.coerce.number({ error: "Document type is required" }).int(),
     customer_id: z.coerce.number().int().optional(),
     vehicle_id: z.coerce.number().int().optional(),
     document_number: z.string().optional(),
diff --git a/apps/dashboard/modules/parts/part.schema.ts b/apps/dashboard/modules/parts/part.schema.ts
index d0261bc..79d140b 100644
--- a/apps/dashboard/modules/parts/part.schema.ts
+++ b/apps/dashboard/modules/parts/part.schema.ts
@@ -5,12 +5,12 @@ export const relationFieldSchema = z
     .nullable()
 
 export const partFormSchema = z.object({
-    shop_type: relationFieldSchema,
-    category: relationFieldSchema,
-    unit_type: relationFieldSchema,
-    department: relationFieldSchema,
+    shop_type: relationFieldSchema.refine((val) => !!val?.value, "Shop type is required"),
+    category: relationFieldSchema.refine((val) => !!val?.value, "Category is required"),
+    unit_type: relationFieldSchema.refine((val) => !!val?.value, "Unit type is required"),
+    department: relationFieldSchema.refine((val) => !!val?.value, "Department is required"),
     title: z.string().min(1, "Title is required"),
-    sku: z.string().optional(),
+    sku: z.string().min(1, "SKU is required"),
     description: z.string().optional(),
     selling_price: z.coerce.number().min(0).optional(),
     purchase_price: z.coerce.number().min(0).optional(),
diff --git a/apps/dashboard/modules/services/inline-forms/department-inline-form.tsx b/apps/dashboard/modules/services/inline-forms/department-inline-form.tsx
index 2bfff41..5bf689f 100644
--- a/apps/dashboard/modules/services/inline-forms/department-inline-form.tsx
+++ b/apps/dashboard/modules/services/inline-forms/department-inline-form.tsx
@@ -10,10 +10,11 @@ import { Rhform, RhfTextField, RhfSelectField, type InlineCreateFormProps } from
 import { toast } from "sonner"
 import { useAuthApi } from "@/shared/useApi"
 import { DEPARTMENT_ASSIGNMENT_TYPE_OPTIONS } from "../department-assignment-types"
+import { AssignmentType } from "@garage/api"
 
 const schema = z.object({
-    name: z.string().min(1, "Name is required"),
-    assignment_type: z.string().optional(),
+    name: z.string().min(1, "Name is required").max(50, "Name cannot exceed 50 characters"),
+    assignment_type: z.enum(AssignmentType, { error: "Assignment type is required" }),
 })
 
 type FormValues = z.infer<typeof schema>
diff --git a/apps/dashboard/modules/settings/company/settings.schema.ts b/apps/dashboard/modules/settings/company/settings.schema.ts
index 6d6e19a..7133000 100644
--- a/apps/dashboard/modules/settings/company/settings.schema.ts
+++ b/apps/dashboard/modules/settings/company/settings.schema.ts
@@ -1,27 +1,53 @@
 import { z } from "zod"
+import { FirstDayOfWork } from "@garage/api"
 
 export const relationFieldSchema = z
     .object({ value: z.string(), label: z.string() })
     .nullable()
 
+const optionalLatitude = z
+    .string()
+    .optional()
+    .refine(
+        (v) => v == null || v === "" || (!Number.isNaN(Number(v)) && Number(v) >= -90 && Number(v) <= 90),
+        "Latitude must be between -90 and 90",
+    )
+
+const optionalLongitude = z
+    .string()
+    .optional()
+    .refine(
+        (v) => v == null || v === "" || (!Number.isNaN(Number(v)) && Number(v) >= -180 && Number(v) <= 180),
+        "Longitude must be between -180 and 180",
+    )
+
+const optionalUrl = z
+    .string()
+    .max(255, "Website cannot exceed 255 characters")
+    .optional()
+    .refine(
+        (v) => v == null || v === "" || z.string().url().safeParse(v).success,
+        "Enter a valid website URL",
+    )
+
 export const settingsFormSchema = z.object({
-    name: z.string().min(1, "Name is required"),
+    name: z.string().min(1, "Name is required").max(100, "Name cannot exceed 100 characters"),
     email: z.union([z.string().email("Invalid email address"), z.literal("")]).optional(),
-    phone: z.string().optional(),
-    alternative_phone: z.string().optional(),
-    website: z.string().optional(),
-    time_zone: z.string().optional(),
-    upi_id: z.string().optional(),
-    first_day_of_work: z.string().optional(),
-    latitude: z.string().optional(),
-    longitude: z.string().optional(),
+    phone: z.string().max(30, "Phone cannot exceed 30 characters").optional(),
+    alternative_phone: z.string().max(30, "Phone cannot exceed 30 characters").optional(),
+    website: optionalUrl,
+    time_zone: z.string().max(100, "Time zone cannot exceed 100 characters").optional(),
+    upi_id: z.string().max(100, "UPI cannot exceed 100 characters").optional(),
+    first_day_of_work: z.union([z.enum(FirstDayOfWork), z.literal("")]).optional(),
+    latitude: optionalLatitude,
+    longitude: optionalLongitude,
     bank_details: z.string().optional(),
-    first_address_line: z.string().optional(),
-    second_address_line: z.string().optional(),
+    first_address_line: z.string().max(255, "Address cannot exceed 255 characters").optional(),
+    second_address_line: z.string().max(255, "Address cannot exceed 255 characters").optional(),
     country: relationFieldSchema,
     state: relationFieldSchema,
-    city: z.string().optional(),
-    zip_code: z.string().optional(),
+    city: z.string().max(100, "City cannot exceed 100 characters").optional(),
+    zip_code: z.string().max(20, "Zip code cannot exceed 20 characters").optional(),
     description: z.string().optional(),
     security: z.string().optional(),
     privacy_policy: z.string().optional(),
diff --git a/apps/dashboard/modules/settings/configurations/configurations.schema.ts b/apps/dashboard/modules/settings/configurations/configurations.schema.ts
index 5269b3f..3219ae5 100644
--- a/apps/dashboard/modules/settings/configurations/configurations.schema.ts
+++ b/apps/dashboard/modules/settings/configurations/configurations.schema.ts
@@ -1,24 +1,30 @@
 import { z } from "zod"
+import {
+    SellRatesTaxInclusive,
+    GiveDiscounts,
+    PurchaseRatesTaxInclusive,
+    ReceiveDiscounts,
+} from "@garage/api"
 
 export const salesConfigFormSchema = z.object({
-    sell_rates_tax_inclusive: z.string().optional(),
-    give_discounts: z.string().optional(),
+    sell_rates_tax_inclusive: z.enum(SellRatesTaxInclusive).optional(),
+    give_discounts: z.enum(GiveDiscounts).optional(),
 })
 
 export type SalesConfigFormValues = z.infer<typeof salesConfigFormSchema>
 
 export const purchaseConfigFormSchema = z.object({
-    purchase_rates_tax_inclusive: z.string().optional(),
-    receive_discounts: z.string().optional(),
+    purchase_rates_tax_inclusive: z.enum(PurchaseRatesTaxInclusive).optional(),
+    receive_discounts: z.enum(ReceiveDiscounts).optional(),
 })
 
 export type PurchaseConfigFormValues = z.infer<typeof purchaseConfigFormSchema>
 
 export const generalPreferencesFormSchema = z.object({
-    sell_rates_tax_inclusive: z.string().optional(),
-    give_discounts: z.string().optional(),
-    purchase_rates_tax_inclusive: z.string().optional(),
-    receive_discounts: z.string().optional(),
+    sell_rates_tax_inclusive: z.enum(SellRatesTaxInclusive).optional(),
+    give_discounts: z.enum(GiveDiscounts).optional(),
+    purchase_rates_tax_inclusive: z.enum(PurchaseRatesTaxInclusive).optional(),
+    receive_discounts: z.enum(ReceiveDiscounts).optional(),
 })
 
 export type GeneralPreferencesFormValues = z.infer<typeof generalPreferencesFormSchema>
diff --git a/apps/dashboard/modules/settings/configurations/general-preferences-form.tsx b/apps/dashboard/modules/settings/configurations/general-preferences-form.tsx
index b6fd18c..9ffb294 100644
--- a/apps/dashboard/modules/settings/configurations/general-preferences-form.tsx
+++ b/apps/dashboard/modules/settings/configurations/general-preferences-form.tsx
@@ -23,10 +23,10 @@ const DISCOUNT_OPTIONS = DiscountType.map((v) => ({
 }))
 
 const DEFAULT_VALUES: GeneralPreferencesFormValues = {
-    sell_rates_tax_inclusive: "",
-    give_discounts: "",
-    purchase_rates_tax_inclusive: "",
-    receive_discounts: "",
+    sell_rates_tax_inclusive: undefined,
+    give_discounts: undefined,
+    purchase_rates_tax_inclusive: undefined,
+    receive_discounts: undefined,
 }
 
 export function GeneralPreferencesForm() {
diff --git a/apps/dashboard/modules/settings/configurations/purchase-config-form.tsx b/apps/dashboard/modules/settings/configurations/purchase-config-form.tsx
index db1c457..c678574 100644
--- a/apps/dashboard/modules/settings/configurations/purchase-config-form.tsx
+++ b/apps/dashboard/modules/settings/configurations/purchase-config-form.tsx
@@ -23,8 +23,8 @@ const DISCOUNT_OPTIONS = DiscountType.map((v) => ({
 }))
 
 const DEFAULT_VALUES: PurchaseConfigFormValues = {
-    purchase_rates_tax_inclusive: "",
-    receive_discounts: "",
+    purchase_rates_tax_inclusive: undefined,
+    receive_discounts: undefined,
 }
 
 export function PurchaseConfigForm() {
diff --git a/apps/dashboard/modules/settings/configurations/sales-config-form.tsx b/apps/dashboard/modules/settings/configurations/sales-config-form.tsx
index 3569320..b55e157 100644
--- a/apps/dashboard/modules/settings/configurations/sales-config-form.tsx
+++ b/apps/dashboard/modules/settings/configurations/sales-config-form.tsx
@@ -23,8 +23,8 @@ const DISCOUNT_OPTIONS = DiscountType.map((v) => ({
 }))
 
 const DEFAULT_VALUES: SalesConfigFormValues = {
-    sell_rates_tax_inclusive: "",
-    give_discounts: "",
+    sell_rates_tax_inclusive: undefined,
+    give_discounts: undefined,
 }
 
 export function SalesConfigForm() {
diff --git a/apps/dashboard/modules/settings/departments/department.schema.ts b/apps/dashboard/modules/settings/departments/department.schema.ts
index 67a9827..6a42c1d 100644
--- a/apps/dashboard/modules/settings/departments/department.schema.ts
+++ b/apps/dashboard/modules/settings/departments/department.schema.ts
@@ -1,8 +1,9 @@
 import { z } from "zod"
+import { AssignmentType } from "@garage/api"
 
 export const departmentFormSchema = z.object({
-    name: z.string().min(1, "Name is required"),
-    assignment_type: z.string().optional(),
+    name: z.string().min(1, "Name is required").max(50, "Name cannot exceed 50 characters"),
+    assignment_type: z.enum(AssignmentType, { error: "Assignment type is required" }),
 })
 
 export type DepartmentFormValues = z.infer<typeof departmentFormSchema>
\ No newline at end of file
diff --git a/apps/dashboard/modules/settings/insurance-types/insurance-type-form.tsx b/apps/dashboard/modules/settings/insurance-types/insurance-type-form.tsx
index 1839ba8..5629fc5 100644
--- a/apps/dashboard/modules/settings/insurance-types/insurance-type-form.tsx
+++ b/apps/dashboard/modules/settings/insurance-types/insurance-type-form.tsx
@@ -22,18 +22,21 @@ export type InsuranceTypeFormProps = {
 
 const DEFAULT_VALUES: InsuranceTypeFormValues = {
     title: "",
+    description: "",
 }
 
 function mapToFormValues(data: unknown): InsuranceTypeFormValues {
     const d = (data as any)?.data ?? data ?? {}
     return {
         title: d.title ?? d.name ?? "",
+        description: d.description ?? "",
     }
 }
 
 function mapFormToPayload(values: InsuranceTypeFormValues) {
     return {
         title: values.title,
+        description: values.description,
     }
 }
 
@@ -90,6 +93,13 @@ export function InsuranceTypeForm({ resourceId, initialData, onSuccess }: Insura
                     required
                 />
 
+                <RhfTextField
+                    name="description"
+                    label="Description"
+                    placeholder="Short description"
+                    required
+                />
+
                 <Button type="submit" variant="default" disabled={isPending}>
                     {isEditing ? <Save /> : <Plus />}
                     {isPending
diff --git a/apps/dashboard/modules/settings/insurance-types/insurance-type.schema.ts b/apps/dashboard/modules/settings/insurance-types/insurance-type.schema.ts
index 6ceec71..c38c385 100644
--- a/apps/dashboard/modules/settings/insurance-types/insurance-type.schema.ts
+++ b/apps/dashboard/modules/settings/insurance-types/insurance-type.schema.ts
@@ -1,7 +1,8 @@
 import { z } from "zod"
 
 export const insuranceTypeFormSchema = z.object({
-    title: z.string().min(1, "Title is required"),
+    title: z.string().min(1, "Title is required").max(255, "Title cannot exceed 255 characters"),
+    description: z.string().min(1, "Description is required").max(255, "Description cannot exceed 255 characters"),
 })
 
 export type InsuranceTypeFormValues = z.infer<typeof insuranceTypeFormSchema>
\ No newline at end of file
diff --git a/apps/dashboard/modules/settings/make-and-models/make-and-model.schema.ts b/apps/dashboard/modules/settings/make-and-models/make-and-model.schema.ts
index 11b9f74..e2bdb0c 100644
--- a/apps/dashboard/modules/settings/make-and-models/make-and-model.schema.ts
+++ b/apps/dashboard/modules/settings/make-and-models/make-and-model.schema.ts
@@ -3,13 +3,19 @@ import { z } from "zod"
 const relationFieldSchema = z.object({ value: z.string(), label: z.string() }).nullable()
 
 export const makeAndModelFormSchema = z.object({
-    make: z.string().min(1, "Make is required"),
-    model: z.string().min(1, "Model is required"),
-    year: z.string().optional(),
+    make: z.string().min(1, "Make is required").max(255, "Make cannot exceed 255 characters"),
+    model: z.string().min(1, "Model is required").max(255, "Model cannot exceed 255 characters"),
+    year: z
+        .string()
+        .min(1, "Year is required")
+        .refine((v) => {
+            const n = Number(v)
+            return Number.isInteger(n) && n >= 1900 && n <= 2100
+        }, "Year must be a whole number between 1900 and 2100"),
     sub_model: z.string().optional(),
     engine_size: z.string().optional(),
     drivetrain: z.string().optional(),
-    shop_type: relationFieldSchema,
+    shop_type: relationFieldSchema.refine((val) => !!val?.value, "Shop type is required"),
     body_type: relationFieldSchema,
     fuel_type: relationFieldSchema,
     transmission: relationFieldSchema,
diff --git a/apps/dashboard/modules/settings/shop-type/shop-type.schema.ts b/apps/dashboard/modules/settings/shop-type/shop-type.schema.ts
index 19c5690..19374e5 100644
--- a/apps/dashboard/modules/settings/shop-type/shop-type.schema.ts
+++ b/apps/dashboard/modules/settings/shop-type/shop-type.schema.ts
@@ -1,9 +1,9 @@
 import { z } from "zod"
 
 export const shopTypeFormSchema = z.object({
-    title: z.string().min(1, "Title is required"),
-    shop_type: z.string().optional(),
-    note: z.string().optional(),
+    title: z.string().min(1, "Title is required").max(50, "Title cannot exceed 50 characters"),
+    shop_type: z.string().min(1, "Shop type is required"),
+    note: z.string().min(1, "Note is required").max(255, "Note cannot exceed 255 characters"),
     is_default: z.boolean().optional(),
     inspection: z.any().optional(),
     image: z.any().optional(),
diff --git a/apps/dashboard/modules/shop-timings/shop-timing.schema.ts b/apps/dashboard/modules/shop-timings/shop-timing.schema.ts
index 7d66abe..4f35103 100644
--- a/apps/dashboard/modules/shop-timings/shop-timing.schema.ts
+++ b/apps/dashboard/modules/shop-timings/shop-timing.schema.ts
@@ -1,15 +1,21 @@
 import { z } from "zod"
 
+const timeRegex = /^([01]\d|2[0-3]):([0-5]\d):([0-5]\d)$/
+const optionalTimeFormat = z
+    .string()
+    .optional()
+    .refine((v) => !v || timeRegex.test(v), "Time must be in HH:MM:SS format")
+
 const shopTimingFormSchema = z.object({
-    title: z.string().min(1, "Title is required"),
-    in_time: z.string().min(1, "In time is required"),
-    out_time: z.string().min(1, "Out time is required"),
-    full_day_hours: z.string().optional(),
-    half_day_hours: z.string().optional(),
-    punch_in: z.string().optional(),
-    punch_out: z.string().optional(),
-    before_time: z.string().optional(),
-    after_time: z.string().optional(),
+    title: z.string().min(1, "Title is required").max(255, "Title cannot exceed 255 characters"),
+    in_time: z.string().min(1, "In time is required").regex(timeRegex, "In time must be in HH:MM:SS format"),
+    out_time: z.string().min(1, "Out time is required").regex(timeRegex, "Out time must be in HH:MM:SS format"),
+    full_day_hours: optionalTimeFormat,
+    half_day_hours: optionalTimeFormat,
+    punch_in: optionalTimeFormat,
+    punch_out: optionalTimeFormat,
+    before_time: optionalTimeFormat,
+    after_time: optionalTimeFormat,
     is_default: z.boolean().default(false),
 })
 
diff --git a/apps/dashboard/modules/tasks/task-section-form.tsx b/apps/dashboard/modules/tasks/task-section-form.tsx
index 16fbd5b..db30106 100644
--- a/apps/dashboard/modules/tasks/task-section-form.tsx
+++ b/apps/dashboard/modules/tasks/task-section-form.tsx
@@ -14,8 +14,11 @@ import { useEffect } from "react"
 // ── Schema ──
 
 const taskSectionSchema = z.object({
-    title: z.string().min(1, "Title is required"),
-    arrangement: z.string().optional(),
+    title: z.string().min(1, "Title is required").max(255, "Title cannot exceed 255 characters"),
+    arrangement: z
+        .string()
+        .min(1, "Arrangement is required")
+        .refine((v) => /^-?\d+$/.test(v), "Arrangement must be an integer"),
     is_default: z.boolean().optional(),
 })
 
diff --git a/apps/dashboard/modules/tasks/task.schema.ts b/apps/dashboard/modules/tasks/task.schema.ts
index 6d97eda..90cd3be 100644
--- a/apps/dashboard/modules/tasks/task.schema.ts
+++ b/apps/dashboard/modules/tasks/task.schema.ts
@@ -5,10 +5,10 @@ export const relationFieldSchema = z
     .nullable()
 
 export const taskFormSchema = z.object({
-    subject: z.string().min(1, "Subject is required"),
+    subject: z.string().min(1, "Subject is required").max(255, "Subject cannot exceed 255 characters"),
     description: z.string().optional(),
-    task_type: relationFieldSchema,
-    task_section: relationFieldSchema,
+    task_type: relationFieldSchema.refine((val) => !!val?.value, "Task type is required"),
+    task_section: relationFieldSchema.refine((val) => !!val?.value, "Task section is required"),
     owner: relationFieldSchema,
     department: relationFieldSchema,
     priority: z.string().optional(),
diff --git a/apps/dashboard/modules/vehicles/inline-forms/body-type-inline-form.tsx b/apps/dashboard/modules/vehicles/inline-forms/body-type-inline-form.tsx
index 4d0507c..0b388df 100644
--- a/apps/dashboard/modules/vehicles/inline-forms/body-type-inline-form.tsx
+++ b/apps/dashboard/modules/vehicles/inline-forms/body-type-inline-form.tsx
@@ -1,7 +1,7 @@
 "use client"
 
 import { z } from "zod"
-import { useForm } from "react-hook-form"
+import { useForm, useFormContext } from "react-hook-form"
 import { zodResolver } from "@hookform/resolvers/zod"
 import { Plus } from "lucide-react"
 import { Button } from "@/shared/components/ui/button"
@@ -11,13 +11,14 @@ import { toast } from "sonner"
 import { useAuthApi } from "@/shared/useApi"
 
 const schema = z.object({
-    title: z.string().min(1, "Title is required"),
+    title: z.string().min(1, "Title is required").max(50, "Title cannot exceed 50 characters"),
 })
 
 type FormValues = z.infer<typeof schema>
 
 export function BodyTypeInlineForm({ onSuccess }: InlineCreateFormProps) {
     const api = useAuthApi()
+    const parentForm = useFormContext()
 
     const form = useForm<FormValues>({
         resolver: zodResolver(schema),
@@ -25,8 +26,16 @@ export function BodyTypeInlineForm({ onSuccess }: InlineCreateFormProps) {
     })
 
     const handleSubmit = async (values: FormValues) => {
+        const parentShopType = parentForm?.getValues("shop_type_id") as { value?: string } | null | undefined
+        const shopTypeId = parentShopType?.value ? Number(parentShopType.value) : undefined
+
+        if (!shopTypeId) {
+            toast.error("Select a shop type before creating a body type")
+            return
+        }
+
         try {
-            const result = await api.vehicleAttributes.createBodyType({ title: values.title })
+            const result = await api.vehicleAttributes.createBodyType({ title: values.title, shop_type_id: shopTypeId } as any)
             toast.success("Body type created")
             form.reset()
             const item = (result as any)?.data ?? result
diff --git a/apps/dashboard/modules/vehicles/inline-forms/color-inline-form.tsx b/apps/dashboard/modules/vehicles/inline-forms/color-inline-form.tsx
index 1e97e71..0b118b7 100644
--- a/apps/dashboard/modules/vehicles/inline-forms/color-inline-form.tsx
+++ b/apps/dashboard/modules/vehicles/inline-forms/color-inline-form.tsx
@@ -11,7 +11,8 @@ import { toast } from "sonner"
 import { useAuthApi } from "@/shared/useApi"
 
 const schema = z.object({
-    title: z.string().min(1, "Title is required"),
+    title: z.string().min(1, "Title is required").max(50, "Title cannot exceed 50 characters"),
+    code: z.string().min(1, "Code is required").max(50, "Code cannot exceed 50 characters"),
 })
 
 type FormValues = z.infer<typeof schema>
@@ -21,12 +22,12 @@ export function ColorInlineForm({ onSuccess }: InlineCreateFormProps) {
 
     const form = useForm<FormValues>({
         resolver: zodResolver(schema),
-        defaultValues: { title: "" },
+        defaultValues: { title: "", code: "" },
     })
 
     const handleSubmit = async (values: FormValues) => {
         try {
-            const result = await api.vehicleAttributes.createColor({ title: values.title })
+            const result = await api.vehicleAttributes.createColor({ title: values.title, code: values.code } as any)
             toast.success("Color created")
             form.reset()
             const item = (result as any)?.data ?? result
@@ -45,6 +46,12 @@ export function ColorInlineForm({ onSuccess }: InlineCreateFormProps) {
                     placeholder="e.g. Black"
                     required
                 />
+                <RhfTextField
+                    name="code"
+                    label="Code"
+                    placeholder="e.g. #000000"
+                    required
+                />
                 <Button type="submit" disabled={form.formState.isSubmitting}>
                     <Plus />
                     {form.formState.isSubmitting ? "Creating..." : "Create Color"}
diff --git a/apps/dashboard/modules/vehicles/inline-forms/shop-type-inline-form.tsx b/apps/dashboard/modules/vehicles/inline-forms/shop-type-inline-form.tsx
index 6cdbac4..82ff008 100644
--- a/apps/dashboard/modules/vehicles/inline-forms/shop-type-inline-form.tsx
+++ b/apps/dashboard/modules/vehicles/inline-forms/shop-type-inline-form.tsx
@@ -18,9 +18,9 @@ import { toast } from "sonner"
 import { useAuthApi } from "@/shared/useApi"
 
 const schema = z.object({
-    title: z.string().min(1, "Title is required"),
-    shop_type: z.string().optional(),
-    note: z.string().optional(),
+    title: z.string().min(1, "Title is required").max(50, "Title cannot exceed 50 characters"),
+    shop_type: z.string().min(1, "Shop type is required"),
+    note: z.string().min(1, "Note is required").max(255, "Note cannot exceed 255 characters"),
     is_default: z.boolean().optional(),
     inspection: z.any().optional(),
     image: z.any().optional(),
@@ -28,8 +28,8 @@ const schema = z.object({
 
 type FormValues = {
     title: string
-    shop_type?: string
-    note?: string
+    shop_type: string
+    note: string
     is_default?: boolean
     inspection?: File | null
     image?: File | null
diff --git a/apps/dashboard/modules/vehicles/vehicle-document.schema.ts b/apps/dashboard/modules/vehicles/vehicle-document.schema.ts
index 05ad341..87f9647 100644
--- a/apps/dashboard/modules/vehicles/vehicle-document.schema.ts
+++ b/apps/dashboard/modules/vehicles/vehicle-document.schema.ts
@@ -3,7 +3,7 @@ import { z } from "zod"
 const relationFieldSchema = z.object({ value: z.string(), label: z.string() }).nullable()
 
 export const vehicleDocumentFormSchema = z.object({
-    document_type: relationFieldSchema,
+    document_type: relationFieldSchema.refine((val) => !!val?.value, "Document type is required"),
     customer: relationFieldSchema,
     document_number: z.string().optional(),
     document_expire: z.string().optional(),
diff --git a/apps/dashboard/modules/vendor-credits/vendor-credit.schema.ts b/apps/dashboard/modules/vendor-credits/vendor-credit.schema.ts
index 969b660..8650984 100644
--- a/apps/dashboard/modules/vendor-credits/vendor-credit.schema.ts
+++ b/apps/dashboard/modules/vendor-credits/vendor-credit.schema.ts
@@ -5,11 +5,11 @@ const relationFieldSchema = z
     .nullable()
 
 const vendorCreditFormSchema = z.object({
-    vendor: relationFieldSchema,
+    vendor: relationFieldSchema.refine((val) => !!val?.value, "Vendor is required"),
     bill: relationFieldSchema,
     department: relationFieldSchema,
     subject: z.string().min(1, "Subject is required"),
-    vendor_credit_date: z.string().optional(),
+    vendor_credit_date: z.string().min(1, "Vendor credit date is required"),
     status: z.string().optional(),
     discount: z.string().optional(),
     notes: z.string().optional(),