@burdenoff/microfe-movethewheels 2026.925.1 → 2026.925.3

package/src/movethewheels/hooks/useFleet.ts

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useMoveTheWheels } from '../providers/MoveTheWheelsProvider';
-import type { Driver, DriverStatus, FleetFilter, Vehicle, VehicleStatus } from '../types';
+import type { Driver, DriverStatus, FleetFilter, Location, Vehicle, VehicleStatus } from '../types';
 import { executeGraphQL } from '../utils/graphqlClient';
 
 interface UseFleetOptions {
@@ -15,6 +15,14 @@ export interface CreateVehicleInput {
   make?: string;
   model?: string;
   licensePlate?: string;
+  /** Free-text, e.g. "owned", "leased". */
+  ownershipType?: string;
+  year?: number;
+  /** VehicleStatus enum value, e.g. `ACTIVE`, `MAINTENANCE`. */
+  status?: string;
+  fuelType?: string;
+  fuelEfficiencyLPer100Km?: number;
+  capacity?: { weight?: number; volume?: number; pallets?: number };
 }
 
 export interface CreateDriverInput {
@@ -24,6 +32,24 @@ export interface CreateDriverInput {
   email?: string;
   phone?: string;
   licenseNumber?: string;
+  licenseClass?: string;
+  licenseExpiry?: string;
+  /** DriverStatus enum value, e.g. `AVAILABLE`, `OFF_DUTY`. */
+  status?: string;
+  vehicleId?: string;
+  rating?: number;
+  notes?: string;
+  hireDate?: string;
+  baseSalary?: number;
+  bonusYtd?: number;
+  payCurrency?: string;
+}
+
+/** Superset of `CreateDriverInput` with fields that only make sense on an existing driver. */
+export interface UpdateDriverInput extends CreateDriverInput {
+  onLeaveUntil?: string | null;
+  terminatedAt?: string;
+  terminationReason?: string;
 }
 
 interface UseFleetResult {
@@ -37,7 +63,8 @@ interface UseFleetResult {
   createVehicle: (input: CreateVehicleInput) => Promise<Vehicle>;
   createDriver: (input: CreateDriverInput) => Promise<Driver>;
   updateVehicle: (id: string, input: CreateVehicleInput) => Promise<Vehicle>;
-  updateDriver: (id: string, input: CreateDriverInput) => Promise<Driver>;
+  updateDriver: (id: string, input: UpdateDriverInput) => Promise<Driver>;
+  deleteVehicle: (id: string) => Promise<void>;
 }
 
 export interface ApiVehicle {
@@ -52,6 +79,8 @@ export interface ApiVehicle {
   capacity?: Record<string, unknown> | null;
   status: string;
   currentLocation?: Record<string, unknown> | null;
+  fuelType?: string | null;
+  fuelEfficiencyLPer100Km?: number | null;
   fuelLevel?: number | null;
   mileage?: number | null;
   lastServiceDate?: string | null;
@@ -76,6 +105,14 @@ export interface ApiDriver {
   currentLocation?: Record<string, unknown> | null;
   rating?: number | null;
   vehicleId?: string | null;
+  notes?: string | null;
+  hireDate?: string | null;
+  baseSalary?: number | null;
+  bonusYtd?: number | null;
+  payCurrency?: string | null;
+  onLeaveUntil?: string | null;
+  terminatedAt?: string | null;
+  terminationReason?: string | null;
   createdAt: string;
 }
 
@@ -93,6 +130,8 @@ const LIST_VEHICLES_QUERY = `
       capacity
       status
       currentLocation
+      fuelType
+      fuelEfficiencyLPer100Km
       fuelLevel
       mileage
       lastServiceDate
@@ -122,6 +161,14 @@ const LIST_DRIVERS_QUERY = `
       currentLocation
       rating
       vehicleId
+      notes
+      hireDate
+      baseSalary
+      bonusYtd
+      payCurrency
+      onLeaveUntil
+      terminatedAt
+      terminationReason
       createdAt
     }
     driversCount(filter: $filter)
@@ -142,6 +189,8 @@ const GET_VEHICLE_QUERY = `
       capacity
       status
       currentLocation
+      fuelType
+      fuelEfficiencyLPer100Km
       fuelLevel
       mileage
       lastServiceDate
@@ -170,11 +219,25 @@ const GET_DRIVER_QUERY = `
       currentLocation
       rating
       vehicleId
+      notes
+      hireDate
+      baseSalary
+      bonusYtd
+      payCurrency
+      onLeaveUntil
+      terminatedAt
+      terminationReason
       createdAt
     }
   }
 `;
 
+const DELETE_VEHICLE_MUTATION = `
+  mutation DeleteVehicle($id: ID!) {
+    deleteVehicle(id: $id)
+  }
+`;
+
 const UPDATE_VEHICLE_STATUS_MUTATION = `
   mutation UpdateVehicleStatus($id: ID!, $status: VehicleStatus!) {
     updateVehicleStatus(id: $id, status: $status) {
@@ -189,6 +252,8 @@ const UPDATE_VEHICLE_STATUS_MUTATION = `
       capacity
       status
       currentLocation
+      fuelType
+      fuelEfficiencyLPer100Km
       fuelLevel
       mileage
       createdAt
@@ -214,6 +279,14 @@ const ASSIGN_DRIVER_VEHICLE_MUTATION = `
       currentLocation
       rating
       vehicleId
+      notes
+      hireDate
+      baseSalary
+      bonusYtd
+      payCurrency
+      onLeaveUntil
+      terminatedAt
+      terminationReason
       createdAt
     }
   }
@@ -236,6 +309,14 @@ const UPDATE_DRIVER_STATUS_MUTATION = `
       currentLocation
       rating
       vehicleId
+      notes
+      hireDate
+      baseSalary
+      bonusYtd
+      payCurrency
+      onLeaveUntil
+      terminatedAt
+      terminationReason
       createdAt
     }
   }
@@ -255,6 +336,8 @@ const CREATE_VEHICLE_MUTATION = `
       capacity
       status
       currentLocation
+      fuelType
+      fuelEfficiencyLPer100Km
       fuelLevel
       mileage
       createdAt
@@ -280,6 +363,14 @@ const CREATE_DRIVER_MUTATION = `
       currentLocation
       rating
       vehicleId
+      notes
+      hireDate
+      baseSalary
+      bonusYtd
+      payCurrency
+      onLeaveUntil
+      terminatedAt
+      terminationReason
       createdAt
     }
   }
@@ -299,6 +390,8 @@ const UPDATE_VEHICLE_MUTATION = `
       capacity
       status
       currentLocation
+      fuelType
+      fuelEfficiencyLPer100Km
       fuelLevel
       mileage
       createdAt
@@ -324,6 +417,14 @@ const UPDATE_DRIVER_MUTATION = `
       currentLocation
       rating
       vehicleId
+      notes
+      hireDate
+      baseSalary
+      bonusYtd
+      payCurrency
+      onLeaveUntil
+      terminatedAt
+      terminationReason
       createdAt
     }
   }
@@ -367,12 +468,20 @@ function mapVehicleStatus(status: string): VehicleStatus {
       return 'assigned';
     case 'MAINTENANCE':
       return 'maintenance';
+    case 'DECOMMISSIONED':
+      return 'decommissioned';
     default:
       return 'out_of_service';
   }
 }
 
-function toApiVehicleStatus(status: VehicleStatus): string {
+/**
+ * Exported so the vehicle edit form's status field can round-trip (BOFF-7909).
+ * `decommissioned` must stay distinct from `out_of_service` — collapsing them
+ * used to silently rewrite a DECOMMISSIONED vehicle to INACTIVE on any save
+ * that touched status, even without the user changing it.
+ */
+export function toApiVehicleStatus(status: VehicleStatus): string {
   switch (status) {
     case 'available':
       return 'ACTIVE';
@@ -380,6 +489,8 @@ function toApiVehicleStatus(status: VehicleStatus): string {
       return 'IN_TRANSIT';
     case 'maintenance':
       return 'MAINTENANCE';
+    case 'decommissioned':
+      return 'DECOMMISSIONED';
     default:
       return 'INACTIVE';
   }
@@ -393,12 +504,15 @@ function mapDriverStatus(status: string): DriverStatus {
       return 'busy';
     case 'ON_BREAK':
       return 'on_break';
+    case 'INACTIVE':
+      return 'inactive';
     default:
       return 'offline';
   }
 }
 
-function toApiDriverStatus(status: DriverStatus): string {
+/** Exported so the driver edit form's status field can round-trip losslessly (BOFF-7909). */
+export function toApiDriverStatus(status: DriverStatus): string {
   switch (status) {
     case 'available':
       return 'AVAILABLE';
@@ -406,11 +520,40 @@ function toApiDriverStatus(status: DriverStatus): string {
       return 'ON_DELIVERY';
     case 'on_break':
       return 'ON_BREAK';
+    case 'inactive':
+      return 'INACTIVE';
     default:
       return 'OFF_DUTY';
   }
 }
 
+/**
+ * `currentLocation` is an untyped JSON blob; every real writer (the IoT
+ * telemetry consumer — `toVehicleLocation()` in
+ * wspace-movethewheels-svc/src/events/iot-location-consumer.ts — and the
+ * `updateVehicleLocation`/`updateDriverLocation`-style manual mutations)
+ * stores `lat`/`lng`/`recordedAt`, never `latitude`/`longitude`. Reading the
+ * latter (as this used to) silently produced (0, 0) for every real fix and
+ * fabricated the "last updated" timestamp as "now" on every render. Parse
+ * the actual shape instead.
+ */
+function parseCurrentLocation(
+  raw: Record<string, unknown> | null | undefined
+): Location | undefined {
+  if (!raw) return undefined;
+  const lat = raw.lat as number | undefined;
+  const lng = raw.lng as number | undefined;
+  if (typeof lat !== 'number' || typeof lng !== 'number') return undefined;
+  const recordedAt = raw.recordedAt as string | undefined;
+  return {
+    latitude: lat,
+    longitude: lng,
+    address: (raw.address as string | undefined) ?? undefined,
+    accuracy: typeof raw.accuracy === 'number' ? raw.accuracy : undefined,
+    timestamp: recordedAt ? new Date(recordedAt) : undefined,
+  };
+}
+
 export function mapVehicle(vehicle: ApiVehicle): Vehicle {
   return {
     id: vehicle.id,
@@ -420,7 +563,7 @@ export function mapVehicle(vehicle: ApiVehicle): Vehicle {
     model: vehicle.model ?? '',
     licensePlate: vehicle.licensePlate ?? '',
     ownershipType: vehicle.ownershipType ?? undefined,
-    year: vehicle.year ?? new Date().getFullYear(),
+    year: vehicle.year ?? undefined,
     capacity: {
       weight: 0,
       volume: 0,
@@ -428,17 +571,12 @@ export function mapVehicle(vehicle: ApiVehicle): Vehicle {
     },
     status: mapVehicleStatus(vehicle.status),
     driverId: undefined,
-    currentLocation: vehicle.currentLocation
-      ? {
-          latitude: Number((vehicle.currentLocation.latitude as number | undefined) ?? 0),
-          longitude: Number((vehicle.currentLocation.longitude as number | undefined) ?? 0),
-          address: (vehicle.currentLocation.address as string | undefined) ?? undefined,
-          timestamp: new Date(),
-        }
-      : undefined,
+    currentLocation: parseCurrentLocation(vehicle.currentLocation),
     lastMaintenance: vehicle.lastServiceDate ? new Date(vehicle.lastServiceDate) : undefined,
     nextMaintenance: vehicle.nextServiceDueDate ? new Date(vehicle.nextServiceDueDate) : undefined,
     nextMaintenanceMileage: vehicle.nextServiceDueMileage ?? undefined,
+    fuelType: vehicle.fuelType ?? undefined,
+    fuelEfficiencyLPer100Km: vehicle.fuelEfficiencyLPer100Km ?? undefined,
     fuelLevel: vehicle.fuelLevel ?? undefined,
     mileage: vehicle.mileage ?? undefined,
     documents: [],
@@ -460,52 +598,17 @@ export function mapDriver(driver: ApiDriver): Driver {
     vehicleIds: driver.vehicleId ? [driver.vehicleId] : [],
     assignedVehicle: driver.vehicleId ?? undefined,
     status: mapDriverStatus(driver.status),
-    currentLocation: driver.currentLocation
-      ? {
-          latitude: Number((driver.currentLocation.latitude as number | undefined) ?? 0),
-          longitude: Number((driver.currentLocation.longitude as number | undefined) ?? 0),
-          address: (driver.currentLocation.address as string | undefined) ?? undefined,
-          timestamp: new Date(),
-        }
-      : undefined,
-    joinDate: new Date(driver.createdAt),
-    baseSalary: 0,
-    completedOrders: 0,
-    todayOrders: 0,
-    specializations: [],
-    workingHours: {
-      startTime: '09:00',
-      endTime: '18:00',
-      workingDays: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri'],
-      maxHoursPerDay: 8,
-      maxHoursPerWeek: 40,
-      currentHoursToday: 0,
-      currentHoursThisWeek: 0,
-    },
-    ratings: {
-      overall: driver.rating ?? 0,
-      punctuality: driver.rating ?? 0,
-      communication: driver.rating ?? 0,
-      carefulHandling: driver.rating ?? 0,
-      professionalism: driver.rating ?? 0,
-      onTimeDelivery: driver.rating ?? 0,
-      totalRatings: 0,
-    },
+    currentLocation: parseCurrentLocation(driver.currentLocation),
+    rating: driver.rating ?? 0,
+    notes: driver.notes ?? undefined,
+    hireDate: driver.hireDate ? new Date(driver.hireDate) : undefined,
+    baseSalary: driver.baseSalary ?? undefined,
+    bonusYtd: driver.bonusYtd ?? undefined,
+    payCurrency: driver.payCurrency ?? undefined,
+    onLeaveUntil: driver.onLeaveUntil ? new Date(driver.onLeaveUntil) : undefined,
+    terminatedAt: driver.terminatedAt ? new Date(driver.terminatedAt) : undefined,
+    terminationReason: driver.terminationReason ?? undefined,
     documents: [],
-    earnings: {
-      totalEarnings: 0,
-      weeklyEarnings: 0,
-      monthlyEarnings: 0,
-      pendingPayments: 0,
-      completedDeliveries: 0,
-      bonuses: 0,
-    },
-    compliance: {
-      hoursOfService: true,
-      documentation: true,
-      vehicleInspection: true,
-      lastUpdate: new Date(),
-    },
     createdAt: new Date(driver.createdAt),
   };
 }
@@ -599,6 +702,12 @@ export function useFleet(options: UseFleetOptions = {}): UseFleetResult {
             make: input.make,
             model: input.model,
             licensePlate: input.licensePlate,
+            ownershipType: input.ownershipType,
+            year: input.year,
+            status: input.status,
+            fuelType: input.fuelType,
+            fuelEfficiencyLPer100Km: input.fuelEfficiencyLPer100Km,
+            capacity: input.capacity,
           },
         }
       );
@@ -622,6 +731,16 @@ export function useFleet(options: UseFleetOptions = {}): UseFleetResult {
             email: input.email,
             phone: input.phone,
             licenseNumber: input.licenseNumber,
+            licenseClass: input.licenseClass,
+            licenseExpiry: input.licenseExpiry,
+            status: input.status,
+            vehicleId: input.vehicleId,
+            rating: input.rating,
+            notes: input.notes,
+            hireDate: input.hireDate,
+            baseSalary: input.baseSalary,
+            bonusYtd: input.bonusYtd,
+            payCurrency: input.payCurrency,
           },
         }
       );
@@ -645,6 +764,12 @@ export function useFleet(options: UseFleetOptions = {}): UseFleetResult {
             make: input.make,
             model: input.model,
             licensePlate: input.licensePlate,
+            ownershipType: input.ownershipType,
+            year: input.year,
+            status: input.status,
+            fuelType: input.fuelType,
+            fuelEfficiencyLPer100Km: input.fuelEfficiencyLPer100Km,
+            capacity: input.capacity,
           },
         }
       );
@@ -656,7 +781,7 @@ export function useFleet(options: UseFleetOptions = {}): UseFleetResult {
   );
 
   const updateDriver = useCallback(
-    async (id: string, input: CreateDriverInput): Promise<Driver> => {
+    async (id: string, input: UpdateDriverInput): Promise<Driver> => {
       const data = await executeGraphQL<{ updateDriver: ApiDriver }>(
         graphQLOptions,
         UPDATE_DRIVER_MUTATION,
@@ -668,6 +793,19 @@ export function useFleet(options: UseFleetOptions = {}): UseFleetResult {
             email: input.email,
             phone: input.phone,
             licenseNumber: input.licenseNumber,
+            licenseClass: input.licenseClass,
+            licenseExpiry: input.licenseExpiry,
+            status: input.status,
+            vehicleId: input.vehicleId,
+            rating: input.rating,
+            notes: input.notes,
+            hireDate: input.hireDate,
+            baseSalary: input.baseSalary,
+            bonusYtd: input.bonusYtd,
+            payCurrency: input.payCurrency,
+            onLeaveUntil: input.onLeaveUntil,
+            terminatedAt: input.terminatedAt,
+            terminationReason: input.terminationReason,
           },
         }
       );
@@ -678,6 +816,16 @@ export function useFleet(options: UseFleetOptions = {}): UseFleetResult {
     [graphQLOptions]
   );
 
+  const deleteVehicle = useCallback(
+    async (id: string): Promise<void> => {
+      await executeGraphQL<{ deleteVehicle: boolean }>(graphQLOptions, DELETE_VEHICLE_MUTATION, {
+        id,
+      });
+      setVehicles((previous) => previous.filter((item) => item.id !== id));
+    },
+    [graphQLOptions]
+  );
+
   return {
     vehicles,
     drivers,
@@ -690,6 +838,7 @@ export function useFleet(options: UseFleetOptions = {}): UseFleetResult {
     createDriver,
     updateVehicle,
     updateDriver,
+    deleteVehicle,
   };
 }
 
@@ -704,6 +853,8 @@ interface UseVehiclesOptions extends UseListOptions {
   vehicleType?: Vehicle['type'];
   /** Narrows to vehicles linked to this driver server-side (VehicleFilterInput.driverId). */
   driverId?: string;
+  /** Fetch exactly these vehicles by id, regardless of how many there are. */
+  ids?: readonly string[];
 }
 
 interface UseVehiclesResult {
@@ -716,18 +867,29 @@ interface UseVehiclesResult {
   refetch: () => void;
   updateVehicleStatus: (id: string, status: VehicleStatus) => Promise<Vehicle>;
   assignDriver: (vehicleId: string, driverId: string) => Promise<Vehicle>;
+  deleteVehicle: (id: string) => Promise<void>;
 }
 
 export function useVehicles(options: UseVehiclesOptions = {}): UseVehiclesResult {
-  const { limit = 20, offset = 0, search, status, vehicleType, driverId } = options;
+  const { limit = 20, offset = 0, search, status, vehicleType, driverId, ids } = options;
   const graphQLOptions = useGraphqlOptions();
   const [vehicles, setVehicles] = useState<Vehicle[]>([]);
   const [totalVehicles, setTotalVehicles] = useState(0);
   const [hasMore, setHasMore] = useState(false);
   const [isLoading, setIsLoading] = 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 load = useCallback(async () => {
+    if (ids && ids.length === 0) {
+      // Nothing to look up — skip the request and clear stale results.
+      setVehicles([]);
+      setTotalVehicles(0);
+      setHasMore(false);
+      return;
+    }
     setIsLoading(true);
     setError(null);
     try {
@@ -740,8 +902,9 @@ export function useVehicles(options: UseVehiclesOptions = {}): UseVehiclesResult
           status: status ? toApiVehicleStatus(status) : undefined,
           type: vehicleType?.toUpperCase(),
           driverId: driverId || undefined,
+          ids: ids && ids.length > 0 ? [...ids] : undefined,
         },
-        pagination: { limit, offset },
+        pagination: { limit: ids && ids.length > 0 ? ids.length : limit, offset: ids ? 0 : offset },
       });
       setHasMore(offset + data.vehicles.length < data.vehiclesCount);
       setTotalVehicles(data.vehiclesCount);
@@ -751,7 +914,7 @@ export function useVehicles(options: UseVehiclesOptions = {}): UseVehiclesResult
     } finally {
       setIsLoading(false);
     }
-  }, [graphQLOptions, limit, offset, search, status, vehicleType, driverId]);
+  }, [graphQLOptions, limit, offset, search, status, vehicleType, driverId, idsKey]);
 
   useEffect(() => {
     void load();
@@ -799,6 +962,16 @@ export function useVehicles(options: UseVehiclesOptions = {}): UseVehiclesResult
     [graphQLOptions, vehicles]
   );
 
+  const deleteVehicle = useCallback(
+    async (id: string): Promise<void> => {
+      await executeGraphQL<{ deleteVehicle: boolean }>(graphQLOptions, DELETE_VEHICLE_MUTATION, {
+        id,
+      });
+      setVehicles((previous) => previous.filter((item) => item.id !== id));
+    },
+    [graphQLOptions]
+  );
+
   return {
     vehicles,
     totalVehicles,
@@ -808,6 +981,7 @@ export function useVehicles(options: UseVehiclesOptions = {}): UseVehiclesResult
     refetch,
     updateVehicleStatus,
     assignDriver,
+    deleteVehicle,
   };
 }