@burdenoff/microfe-movethewheels 2026.924.2 → 2026.925.2

package/src/movethewheels/hooks/useFleet.ts

@@ -15,6 +15,13 @@ 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;
 }
 
 export interface CreateDriverInput {
@@ -24,6 +31,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 +62,7 @@ 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>;
 }
 
 export interface ApiVehicle {
@@ -52,6 +77,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 +103,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 +128,8 @@ const LIST_VEHICLES_QUERY = `
       capacity
       status
       currentLocation
+      fuelType
+      fuelEfficiencyLPer100Km
       fuelLevel
       mileage
       lastServiceDate
@@ -122,6 +159,14 @@ const LIST_DRIVERS_QUERY = `
       currentLocation
       rating
       vehicleId
+      notes
+      hireDate
+      baseSalary
+      bonusYtd
+      payCurrency
+      onLeaveUntil
+      terminatedAt
+      terminationReason
       createdAt
     }
     driversCount(filter: $filter)
@@ -142,6 +187,8 @@ const GET_VEHICLE_QUERY = `
       capacity
       status
       currentLocation
+      fuelType
+      fuelEfficiencyLPer100Km
       fuelLevel
       mileage
       lastServiceDate
@@ -170,6 +217,14 @@ const GET_DRIVER_QUERY = `
       currentLocation
       rating
       vehicleId
+      notes
+      hireDate
+      baseSalary
+      bonusYtd
+      payCurrency
+      onLeaveUntil
+      terminatedAt
+      terminationReason
       createdAt
     }
   }
@@ -189,6 +244,8 @@ const UPDATE_VEHICLE_STATUS_MUTATION = `
       capacity
       status
       currentLocation
+      fuelType
+      fuelEfficiencyLPer100Km
       fuelLevel
       mileage
       createdAt
@@ -214,6 +271,14 @@ const ASSIGN_DRIVER_VEHICLE_MUTATION = `
       currentLocation
       rating
       vehicleId
+      notes
+      hireDate
+      baseSalary
+      bonusYtd
+      payCurrency
+      onLeaveUntil
+      terminatedAt
+      terminationReason
       createdAt
     }
   }
@@ -236,6 +301,14 @@ const UPDATE_DRIVER_STATUS_MUTATION = `
       currentLocation
       rating
       vehicleId
+      notes
+      hireDate
+      baseSalary
+      bonusYtd
+      payCurrency
+      onLeaveUntil
+      terminatedAt
+      terminationReason
       createdAt
     }
   }
@@ -255,6 +328,8 @@ const CREATE_VEHICLE_MUTATION = `
       capacity
       status
       currentLocation
+      fuelType
+      fuelEfficiencyLPer100Km
       fuelLevel
       mileage
       createdAt
@@ -280,6 +355,14 @@ const CREATE_DRIVER_MUTATION = `
       currentLocation
       rating
       vehicleId
+      notes
+      hireDate
+      baseSalary
+      bonusYtd
+      payCurrency
+      onLeaveUntil
+      terminatedAt
+      terminationReason
       createdAt
     }
   }
@@ -299,6 +382,8 @@ const UPDATE_VEHICLE_MUTATION = `
       capacity
       status
       currentLocation
+      fuelType
+      fuelEfficiencyLPer100Km
       fuelLevel
       mileage
       createdAt
@@ -324,6 +409,14 @@ const UPDATE_DRIVER_MUTATION = `
       currentLocation
       rating
       vehicleId
+      notes
+      hireDate
+      baseSalary
+      bonusYtd
+      payCurrency
+      onLeaveUntil
+      terminatedAt
+      terminationReason
       createdAt
     }
   }
@@ -372,7 +465,8 @@ function mapVehicleStatus(status: string): VehicleStatus {
   }
 }
 
-function toApiVehicleStatus(status: VehicleStatus): string {
+/** Exported so the vehicle edit form's status field can round-trip (BOFF-7909). */
+export function toApiVehicleStatus(status: VehicleStatus): string {
   switch (status) {
     case 'available':
       return 'ACTIVE';
@@ -393,12 +487,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,6 +503,8 @@ function toApiDriverStatus(status: DriverStatus): string {
       return 'ON_DELIVERY';
     case 'on_break':
       return 'ON_BREAK';
+    case 'inactive':
+      return 'INACTIVE';
     default:
       return 'OFF_DUTY';
   }
@@ -439,6 +538,8 @@ export function mapVehicle(vehicle: ApiVehicle): Vehicle {
     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: [],
@@ -468,44 +569,16 @@ export function mapDriver(driver: ApiDriver): Driver {
           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,
-    },
+    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 +672,11 @@ 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,
           },
         }
       );
@@ -622,6 +700,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 +733,11 @@ 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,
           },
         }
       );
@@ -656,7 +749,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 +761,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,
           },
         }
       );
@@ -704,6 +810,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 {
@@ -719,15 +827,25 @@ interface UseVehiclesResult {
 }
 
 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 +858,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 +870,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();

package/src/movethewheels/hooks/useOrders.ts

@@ -155,10 +155,14 @@ const ORDER_STATS_QUERY = `
     deliveryJobStats {
       total
       pending
+      confirmed
+      assigned
       inTransit
+      outForDelivery
       delivered
       cancelled
       failed
+      returned
     }
     financeMetrics {
       revenue {
@@ -221,6 +225,8 @@ export function mapOrderStatus(status: string): OrderStatus {
       return 'out_for_delivery';
     case 'DELIVERED':
       return 'delivered';
+    case 'RETURNED':
+      return 'returned';
     case 'CANCELLED':
       return 'cancelled';
     default:
@@ -263,6 +269,8 @@ function toApiStatus(status: OrderStatus): string {
       return 'OUT_FOR_DELIVERY';
     case 'delivered':
       return 'DELIVERED';
+    case 'returned':
+      return 'RETURNED';
     case 'cancelled':
       return 'CANCELLED';
     default:
@@ -593,6 +601,7 @@ export function useOrderStats() {
       in_transit: 0,
       out_for_delivery: 0,
       delivered: 0,
+      returned: 0,
       cancelled: 0,
       failed: 0,
     },
@@ -621,10 +630,14 @@ export function useOrderStats() {
         deliveryJobStats: {
           total: number;
           pending: number;
+          confirmed: number;
+          assigned: number;
           inTransit: number;
+          outForDelivery: number;
           delivered: number;
           cancelled: number;
           failed: number;
+          returned: number;
         };
         financeMetrics: {
           revenue: {
@@ -638,12 +651,13 @@ export function useOrderStats() {
         total: data.deliveryJobStats.total,
         byStatus: {
           pending: data.deliveryJobStats.pending,
-          confirmed: 0,
-          assigned: 0,
+          confirmed: data.deliveryJobStats.confirmed,
+          assigned: data.deliveryJobStats.assigned,
           picked_up: 0,
           in_transit: data.deliveryJobStats.inTransit,
-          out_for_delivery: 0,
+          out_for_delivery: data.deliveryJobStats.outForDelivery,
           delivered: data.deliveryJobStats.delivered,
+          returned: data.deliveryJobStats.returned,
           cancelled: data.deliveryJobStats.cancelled,
           failed: data.deliveryJobStats.failed,
         },