@burdenoff/microfe-movethewheels 2026.929.3 → 2026.930.1

package/src/movethewheels/hooks/useFleet.ts

@@ -45,7 +45,8 @@ export interface CreateDriverInput {
   licenseExpiry?: string;
   /** DriverStatus enum value, e.g. `AVAILABLE`, `OFF_DUTY`. */
   status?: string;
-  vehicleId?: string;
+  vehicleId?: string | null;
+  vehicleIds?: string[];
   rating?: number;
   notes?: string;
   hireDate?: string;
@@ -97,6 +98,7 @@ export interface ApiVehicle {
   nextServiceDueMileage?: number | null;
   createdAt: string;
   updatedAt?: string;
+  drivers?: Array<{ id: string }>;
 }
 
 export interface ApiDriver {
@@ -114,6 +116,7 @@ export interface ApiDriver {
   currentLocation?: Record<string, unknown> | null;
   rating?: number | null;
   vehicleId?: string | null;
+  vehicles?: Array<{ id: string }>;
   notes?: string | null;
   hireDate?: string | null;
   baseSalary?: number | null;
@@ -148,6 +151,9 @@ const LIST_VEHICLES_QUERY = `
       nextServiceDueMileage
       createdAt
       updatedAt
+      drivers {
+        id
+      }
     }
     vehiclesCount(filter: $filter)
   }
@@ -179,6 +185,9 @@ const LIST_DRIVERS_QUERY = `
       terminatedAt
       terminationReason
       createdAt
+      vehicles {
+        id
+      }
     }
     driversCount(filter: $filter)
   }
@@ -207,6 +216,9 @@ const GET_VEHICLE_QUERY = `
       nextServiceDueMileage
       createdAt
       updatedAt
+      drivers {
+        id
+      }
     }
   }
 `;
@@ -237,6 +249,9 @@ const GET_DRIVER_QUERY = `
       terminatedAt
       terminationReason
       createdAt
+      vehicles {
+        id
+      }
     }
   }
 `;
@@ -267,6 +282,9 @@ const UPDATE_VEHICLE_STATUS_MUTATION = `
       mileage
       createdAt
       updatedAt
+      drivers {
+        id
+      }
     }
   }
 `;
@@ -297,6 +315,9 @@ const ASSIGN_DRIVER_VEHICLE_MUTATION = `
       terminatedAt
       terminationReason
       createdAt
+      vehicles {
+        id
+      }
     }
   }
 `;
@@ -327,6 +348,9 @@ const UPDATE_DRIVER_STATUS_MUTATION = `
       terminatedAt
       terminationReason
       createdAt
+      vehicles {
+        id
+      }
     }
   }
 `;
@@ -351,6 +375,9 @@ const CREATE_VEHICLE_MUTATION = `
       mileage
       createdAt
       updatedAt
+      drivers {
+        id
+      }
     }
   }
 `;
@@ -381,6 +408,9 @@ const CREATE_DRIVER_MUTATION = `
       terminatedAt
       terminationReason
       createdAt
+      vehicles {
+        id
+      }
     }
   }
 `;
@@ -405,6 +435,9 @@ const UPDATE_VEHICLE_MUTATION = `
       mileage
       createdAt
       updatedAt
+      drivers {
+        id
+      }
     }
   }
 `;
@@ -435,6 +468,9 @@ const UPDATE_DRIVER_MUTATION = `
       terminatedAt
       terminationReason
       createdAt
+      vehicles {
+        id
+      }
     }
   }
 `;
@@ -579,7 +615,8 @@ export function mapVehicle(vehicle: ApiVehicle): Vehicle {
       pallets: typeof vehicle.capacity?.pallets === 'number' ? vehicle.capacity.pallets : undefined,
     },
     status: mapVehicleStatus(vehicle.status),
-    driverId: undefined,
+    driverIds: (vehicle.drivers ?? []).map((driver) => driver.id),
+    driverId: vehicle.drivers?.[0]?.id,
     currentLocation: parseCurrentLocation(vehicle.currentLocation),
     lastMaintenance: vehicle.lastServiceDate ? new Date(vehicle.lastServiceDate) : undefined,
     nextMaintenance: vehicle.nextServiceDueDate ? new Date(vehicle.nextServiceDueDate) : undefined,
@@ -604,11 +641,16 @@ export function mapDriver(driver: ApiDriver): Driver {
     licenseNumber: driver.licenseNumber ?? '',
     licenseType: driver.licenseClass ?? '',
     licenseExpiry: driver.licenseExpiry ? new Date(driver.licenseExpiry) : undefined,
-    vehicleIds: driver.vehicleId ? [driver.vehicleId] : [],
-    assignedVehicle: driver.vehicleId ?? undefined,
+    vehicleIds:
+      driver.vehicles && driver.vehicles.length > 0
+        ? driver.vehicles.map((vehicle) => vehicle.id)
+        : driver.vehicleId
+          ? [driver.vehicleId]
+          : [],
+    assignedVehicle: driver.vehicles?.[0]?.id ?? driver.vehicleId ?? undefined,
     status: mapDriverStatus(driver.status),
     currentLocation: parseCurrentLocation(driver.currentLocation),
-    rating: driver.rating ?? 0,
+    rating: driver.rating ?? undefined,
     notes: driver.notes ?? undefined,
     hireDate: driver.hireDate ? new Date(driver.hireDate) : undefined,
     baseSalary: driver.baseSalary ?? undefined,
@@ -656,6 +698,8 @@ export function useFleet(options: UseFleetOptions = {}): UseFleetResult {
   const graphQLOptions = useGraphqlOptions();
   const [vehicles, setVehicles] = useState<Vehicle[]>([]);
   const [drivers, setDrivers] = useState<Driver[]>([]);
+  const [totalVehicles, setTotalVehicles] = useState(0);
+  const [totalDrivers, setTotalDrivers] = useState(0);
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState<Error | null>(null);
 
@@ -664,26 +708,36 @@ export function useFleet(options: UseFleetOptions = {}): UseFleetResult {
     setError(null);
     try {
       const [vehicleData, driverData] = await Promise.all([
-        executeGraphQL<{ vehicles: ApiVehicle[] }>(graphQLOptions, LIST_VEHICLES_QUERY, {
-          filter: {
-            search: filters?.search,
-            type: filters?.vehicleType?.toUpperCase(),
-            status: filters?.status ? toApiVehicleStatus(filters.status) : undefined,
-            driverId: filters?.driverId,
-          },
-          pagination: { limit, offset: 0 },
-        }),
-        executeGraphQL<{ drivers: ApiDriver[] }>(graphQLOptions, LIST_DRIVERS_QUERY, {
-          filter: {
-            search: filters?.search,
-            vehicleId: filters?.vehicleId,
-          },
-          pagination: { limit, offset: 0 },
-        }),
+        executeGraphQL<{ vehicles: ApiVehicle[]; vehiclesCount: number }>(
+          graphQLOptions,
+          LIST_VEHICLES_QUERY,
+          {
+            filter: {
+              search: filters?.search,
+              type: filters?.vehicleType?.toUpperCase(),
+              status: filters?.status ? toApiVehicleStatus(filters.status) : undefined,
+              driverId: filters?.driverId,
+            },
+            pagination: { limit, offset: 0 },
+          }
+        ),
+        executeGraphQL<{ drivers: ApiDriver[]; driversCount: number }>(
+          graphQLOptions,
+          LIST_DRIVERS_QUERY,
+          {
+            filter: {
+              search: filters?.search,
+              vehicleId: filters?.vehicleId,
+            },
+            pagination: { limit, offset: 0 },
+          }
+        ),
       ]);
 
       setVehicles(vehicleData.vehicles.map(mapVehicle));
       setDrivers(driverData.drivers.map(mapDriver));
+      setTotalVehicles(vehicleData.vehiclesCount);
+      setTotalDrivers(driverData.driversCount);
     } catch (fetchError) {
       setError(fetchError instanceof Error ? fetchError : new Error('Failed to load fleet data'));
     } finally {
@@ -744,6 +798,7 @@ export function useFleet(options: UseFleetOptions = {}): UseFleetResult {
             licenseExpiry: input.licenseExpiry,
             status: input.status,
             vehicleId: input.vehicleId,
+            vehicleIds: input.vehicleIds,
             rating: input.rating,
             notes: input.notes,
             hireDate: input.hireDate,
@@ -806,6 +861,7 @@ export function useFleet(options: UseFleetOptions = {}): UseFleetResult {
             licenseExpiry: input.licenseExpiry,
             status: input.status,
             vehicleId: input.vehicleId,
+            vehicleIds: input.vehicleIds,
             rating: input.rating,
             notes: input.notes,
             hireDate: input.hireDate,
@@ -838,8 +894,8 @@ export function useFleet(options: UseFleetOptions = {}): UseFleetResult {
   return {
     vehicles,
     drivers,
-    totalVehicles: vehicles.length,
-    totalDrivers: drivers.length,
+    totalVehicles,
+    totalDrivers,
     isLoading,
     error,
     refetch,
@@ -872,8 +928,11 @@ interface UseVehiclesResult {
   /** True when the last fetch returned a full page (rawCount === limit). */
   hasMore: boolean;
   isLoading: boolean;
+  /** True while an additional server page is appended. */
+  isLoadingMore: boolean;
   error: Error | null;
   refetch: () => void;
+  loadMore: () => Promise<void>;
   updateVehicleStatus: (id: string, status: VehicleStatus) => Promise<Vehicle>;
   assignDriver: (vehicleId: string, driverId: string) => Promise<Vehicle>;
   deleteVehicle: (id: string) => Promise<void>;
@@ -886,13 +945,16 @@ export function useVehicles(options: UseVehiclesOptions = {}): UseVehiclesResult
   const [totalVehicles, setTotalVehicles] = useState(0);
   const [hasMore, setHasMore] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
+  const [isLoadingMore, setIsLoadingMore] = useState(false);
   const [error, setError] = useState<Error | null>(null);
   // Stable dependency key for the `ids` array — a caller passing a fresh array
   // literal each render must not defeat the callback's memoization.
   const idsKey = ids ? [...ids].sort().join(',') : '';
+  const idsFilterMode = ids === undefined ? 'none' : 'exact';
+  const exactIds = useMemo(() => (idsKey ? idsKey.split(',') : []), [idsKey]);
 
   const load = useCallback(async () => {
-    if (ids && ids.length === 0) {
+    if (idsFilterMode === 'exact' && exactIds.length === 0) {
       // Nothing to look up — skip the request and clear stale results.
       setVehicles([]);
       setTotalVehicles(0);
@@ -911,11 +973,14 @@ export function useVehicles(options: UseVehiclesOptions = {}): UseVehiclesResult
           status: status ? toApiVehicleStatus(status) : undefined,
           type: vehicleType?.toUpperCase(),
           driverId: driverId || undefined,
-          ids: ids && ids.length > 0 ? [...ids] : undefined,
+          ids: exactIds.length > 0 ? exactIds : undefined,
+        },
+        pagination: {
+          limit: idsFilterMode === 'exact' ? exactIds.length : limit,
+          offset: idsFilterMode === 'exact' ? 0 : offset,
         },
-        pagination: { limit: ids && ids.length > 0 ? ids.length : limit, offset: ids ? 0 : offset },
       });
-      setHasMore(offset + data.vehicles.length < data.vehiclesCount);
+      setHasMore(idsFilterMode === 'none' && offset + data.vehicles.length < data.vehiclesCount);
       setTotalVehicles(data.vehiclesCount);
       setVehicles(data.vehicles.map(mapVehicle));
     } catch (fetchError) {
@@ -923,7 +988,65 @@ export function useVehicles(options: UseVehiclesOptions = {}): UseVehiclesResult
     } finally {
       setIsLoading(false);
     }
-  }, [graphQLOptions, limit, offset, search, status, vehicleType, driverId, idsKey]);
+  }, [
+    graphQLOptions,
+    limit,
+    offset,
+    search,
+    status,
+    vehicleType,
+    driverId,
+    idsFilterMode,
+    exactIds,
+  ]);
+
+  const loadMore = useCallback(async () => {
+    if (idsFilterMode === 'exact' || !hasMore || isLoading || isLoadingMore) return;
+    const nextOffset = offset + vehicles.length;
+    setIsLoadingMore(true);
+    setError(null);
+    try {
+      const data = await executeGraphQL<{ vehicles: ApiVehicle[]; vehiclesCount: number }>(
+        graphQLOptions,
+        LIST_VEHICLES_QUERY,
+        {
+          filter: {
+            search: search || undefined,
+            status: status ? toApiVehicleStatus(status) : undefined,
+            type: vehicleType?.toUpperCase(),
+            driverId: driverId || undefined,
+          },
+          pagination: { limit, offset: nextOffset },
+        }
+      );
+      const mapped = data.vehicles.map(mapVehicle);
+      setTotalVehicles(data.vehiclesCount);
+      setHasMore(nextOffset + mapped.length < data.vehiclesCount);
+      setVehicles((previous) => {
+        const existingIds = new Set(previous.map((vehicle) => vehicle.id));
+        return [...previous, ...mapped.filter((vehicle) => !existingIds.has(vehicle.id))];
+      });
+    } catch (fetchError) {
+      setError(
+        fetchError instanceof Error ? fetchError : new Error('Failed to load more vehicles')
+      );
+    } finally {
+      setIsLoadingMore(false);
+    }
+  }, [
+    driverId,
+    graphQLOptions,
+    hasMore,
+    idsFilterMode,
+    isLoading,
+    isLoadingMore,
+    limit,
+    offset,
+    search,
+    status,
+    vehicleType,
+    vehicles.length,
+  ]);
 
   useEffect(() => {
     void load();
@@ -960,15 +1083,17 @@ export function useVehicles(options: UseVehiclesOptions = {}): UseVehiclesResult
           vehicleId,
         }
       );
-      const next = vehicles.find((item) => item.id === vehicleId);
-      if (!next) {
-        throw new Error('Vehicle not found');
-      }
-      const updated = { ...next, driverId, status: 'assigned' as VehicleStatus };
+      const data = await executeGraphQL<{ vehicle: ApiVehicle | null }>(
+        graphQLOptions,
+        GET_VEHICLE_QUERY,
+        { id: vehicleId }
+      );
+      if (!data.vehicle) throw new Error('Vehicle not found');
+      const updated = mapVehicle(data.vehicle);
       setVehicles((previous) => previous.map((item) => (item.id === vehicleId ? updated : item)));
       return updated;
     },
-    [graphQLOptions, vehicles]
+    [graphQLOptions]
   );
 
   const deleteVehicle = useCallback(
@@ -986,8 +1111,10 @@ export function useVehicles(options: UseVehiclesOptions = {}): UseVehiclesResult
     totalVehicles,
     hasMore,
     isLoading,
+    isLoadingMore,
     error,
     refetch,
+    loadMore,
     updateVehicleStatus,
     assignDriver,
     deleteVehicle,
@@ -1041,10 +1168,13 @@ interface UseDriversResult {
   /** True when the last fetch returned a full page (rawCount === limit). */
   hasMore: boolean;
   isLoading: boolean;
+  /** True while an additional server page is appended. */
+  isLoadingMore: boolean;
   error: Error | null;
   refetch: () => void;
+  loadMore: () => Promise<void>;
   updateDriverStatus: (id: string, status: DriverStatus) => Promise<Driver>;
-  assignVehicle: (driverId: string, vehicleId: string) => Promise<Driver>;
+  assignVehicle: (driverId: string, vehicleId: string | null) => Promise<Driver>;
 }
 
 interface UseDriversOptions extends UseListOptions {
@@ -1063,6 +1193,7 @@ export function useDrivers(options: UseDriversOptions = {}): UseDriversResult {
   const [totalDrivers, setTotalDrivers] = useState(0);
   const [hasMore, setHasMore] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
+  const [isLoadingMore, setIsLoadingMore] = useState(false);
   const [error, setError] = useState<Error | null>(null);
 
   const load = useCallback(async () => {
@@ -1091,6 +1222,51 @@ export function useDrivers(options: UseDriversOptions = {}): UseDriversResult {
     }
   }, [graphQLOptions, limit, offset, status, search, licenseClass, vehicleId]);
 
+  const loadMore = useCallback(async () => {
+    if (!hasMore || isLoading || isLoadingMore) return;
+    const nextOffset = offset + drivers.length;
+    setIsLoadingMore(true);
+    setError(null);
+    try {
+      const data = await executeGraphQL<{ drivers: ApiDriver[]; driversCount: number }>(
+        graphQLOptions,
+        LIST_DRIVERS_QUERY,
+        {
+          filter: {
+            status: status ? toApiDriverStatus(status) : undefined,
+            search: search || undefined,
+            licenseClass: licenseClass || undefined,
+            vehicleId: vehicleId || undefined,
+          },
+          pagination: { limit, offset: nextOffset },
+        }
+      );
+      const mapped = data.drivers.map(mapDriver);
+      setTotalDrivers(data.driversCount);
+      setHasMore(nextOffset + mapped.length < data.driversCount);
+      setDrivers((previous) => {
+        const existingIds = new Set(previous.map((driver) => driver.id));
+        return [...previous, ...mapped.filter((driver) => !existingIds.has(driver.id))];
+      });
+    } catch (fetchError) {
+      setError(fetchError instanceof Error ? fetchError : new Error('Failed to load more drivers'));
+    } finally {
+      setIsLoadingMore(false);
+    }
+  }, [
+    drivers.length,
+    graphQLOptions,
+    hasMore,
+    isLoading,
+    isLoadingMore,
+    limit,
+    licenseClass,
+    offset,
+    search,
+    status,
+    vehicleId,
+  ]);
+
   useEffect(() => {
     void load();
   }, [load]);
@@ -1117,7 +1293,7 @@ export function useDrivers(options: UseDriversOptions = {}): UseDriversResult {
   );
 
   const assignVehicle = useCallback(
-    async (driverId: string, vehicleId: string): Promise<Driver> => {
+    async (driverId: string, vehicleId: string | null): Promise<Driver> => {
       const data = await executeGraphQL<{ assignDriverVehicle: ApiDriver }>(
         graphQLOptions,
         ASSIGN_DRIVER_VEHICLE_MUTATION,
@@ -1138,8 +1314,10 @@ export function useDrivers(options: UseDriversOptions = {}): UseDriversResult {
     totalDrivers,
     hasMore,
     isLoading,
+    isLoadingMore,
     error,
     refetch,
+    loadMore,
     updateDriverStatus,
     assignVehicle,
   };