The trip files have been reorganized. Errors related to vehicle and driver editing have been resolved, archive display issues fixed, and model data display standardized across the project; order and trip-related issues have also been addressed.

app/dashboard/trips/[tripId]/page.tsx

@@ -1,9 +1,18 @@
 "use client";
 
+// app/dashboard/trips/[tripId]/page.tsx
+// CHANGE: TripFormModal now imported from the barrel (@/src/Components/Trip)
+// instead of a direct path — avoids the Tripformmodal.tsx case-sensitivity
+// mismatch that breaks on case-sensitive filesystems (Linux/Docker builds).
+// CHANGE: loadTrip's catch block now uses the same extractApiMessage helper
+// already defined in this file (and used by handleEditSubmit/handleConfirmDelete)
+// instead of `err instanceof Error ? err.message : ...` — so backend
+// validation messages surface correctly here too, not just on edit/delete.
+
 import { useCallback, useEffect, useRef, useState } from "react";
 import { useParams, useRouter } from "next/navigation";
 import { ConfirmDialog, Spinner } from "@/src/Components/UI";
-import { TripFormModal } from "@/src/Components/Trip/Tripformmodal";
+import { TripFormModal } from "@/src/Components/Trip";
 import { TripReportPanel } from "@/src/Components/Trip_Report/Tripreportpanel";
 import { tripService } from "@/src/services/trip.service";
 import { getStoredToken } from "@/src/lib/auth";
@@ -205,42 +214,42 @@ export default function TripDetailPage() {
 
   // ── Load trip ─────────────────────────────────────────────────────────────
   const loadTrip = useCallback(async () => {
-  if (!tripId) return;
-  setLoading(true);
-  setError(null);
-  try {
-    const token = getStoredToken();
-    const data = await tripService.getById(tripId, token);
-    setTrip(data);
-  } catch (err: unknown) {
-    setError(err instanceof Error ? err.message : "تعذّر تحميل بيانات الرحلة.");
-  } finally {
-    setLoading(false);
-  }
-}, [tripId]);
+    if (!tripId) return;
+    setLoading(true);
+    setError(null);
+    try {
+      const token = getStoredToken();
+      const data = await tripService.getById(tripId, token);
+      setTrip(data);
+    } catch (err: unknown) {
+      setError(extractApiMessage(err, "تعذّر تحميل بيانات الرحلة."));
+    } finally {
+      setLoading(false);
+    }
+  }, [tripId]);
   useEffect(() => {
     queueMicrotask(loadTrip);
   }, [loadTrip]);
 
   // ── Edit submit ───────────────────────────────────────────────────────────
   const handleEditSubmit = useCallback(
-  async (
-    payload: CreateTripPayload | UpdateTripPayload,
-  ): Promise<boolean> => {
-    if (!trip) return false;
-    try {
-      const token = getStoredToken();
-      const updated = await tripService.update(trip.id, payload as UpdateTripPayload, token);
-      setTrip(updated);
-      notify({ type: "success", message: "تم تحديث بيانات الرحلة بنجاح." });
-      return true;
-    } catch (err) {
-      notify({ type: "error", message: extractApiMessage(err, "تعذّر تحديث الرحلة.") });
-      return false;
-    }
-  },
-  [trip, notify],
-);
+    async (
+      payload: CreateTripPayload | UpdateTripPayload,
+    ): Promise<boolean> => {
+      if (!trip) return false;
+      try {
+        const token = getStoredToken();
+        const updated = await tripService.update(trip.id, payload as UpdateTripPayload, token);
+        setTrip(updated);
+        notify({ type: "success", message: "تم تحديث بيانات الرحلة بنجاح." });
+        return true;
+      } catch (err) {
+        notify({ type: "error", message: extractApiMessage(err, "تعذّر تحديث الرحلة.") });
+        return false;
+      }
+    },
+    [trip, notify],
+  );
 
   // ── Delete confirm ────────────────────────────────────────────────────────
   const handleConfirmDelete = useCallback(async () => {