@burdenoff/microfe-movethewheels 2026.929.2 → 2026.929.4

package/src/movethewheels/hooks/useRoutes.ts

@@ -21,7 +21,13 @@ interface UseRoutesResult {
   error: Error | null;
   refetch: () => void;
   createRoute: (route: Partial<Route>) => Promise<Route>;
-  updateRoute: (id: string, updates: Partial<Route>) => Promise<Route>;
+  updateRoute: (
+    id: string,
+    updates: Omit<Partial<Route>, 'vehicleId' | 'driverId'> & {
+      vehicleId?: string | null;
+      driverId?: string | null;
+    }
+  ) => Promise<Route>;
   deleteRoute: (id: string) => Promise<void>;
   optimizeRoute: (routeId: string) => Promise<Route>;
   updateStopStatus: (
@@ -205,13 +211,19 @@ function mapWaypoints(waypoints: unknown): RouteStop[] {
         state: String(addrObj.state ?? item.state ?? ''),
         postalCode: String(addrObj.postalCode ?? item.postalCode ?? ''),
         country: String(addrObj.country ?? item.country ?? ''),
-        latitude: Number(addrObj.latitude ?? item.latitude ?? item.lat ?? 0),
-        longitude: Number(addrObj.longitude ?? item.longitude ?? item.lng ?? 0),
+        latitude:
+          typeof (addrObj.latitude ?? item.latitude ?? item.lat) === 'number'
+            ? ((addrObj.latitude ?? item.latitude ?? item.lat) as number)
+            : undefined,
+        longitude:
+          typeof (addrObj.longitude ?? item.longitude ?? item.lng) === 'number'
+            ? ((addrObj.longitude ?? item.longitude ?? item.lng) as number)
+            : undefined,
       },
       type: item.type === 'pickup' ? 'pickup' : 'delivery',
-      scheduledTime: item.scheduledTime ? new Date(String(item.scheduledTime)) : new Date(),
+      scheduledTime: item.scheduledTime ? new Date(String(item.scheduledTime)) : undefined,
       actualTime: item.actualTime ? new Date(String(item.actualTime)) : undefined,
-      duration: Number(item.duration ?? 0),
+      duration: typeof item.duration === 'number' ? item.duration : undefined,
       status: (item.status as RouteStop['status']) ?? 'pending',
       notes: item.notes ? String(item.notes) : undefined,
     };
@@ -222,8 +234,8 @@ export function mapRoute(route: ApiRoute): Route {
   return {
     id: route.id,
     name: route.name,
-    driverId: route.driverId ?? '',
-    vehicleId: route.vehicleId ?? '',
+    driverId: route.driverId ?? undefined,
+    vehicleId: route.vehicleId ?? undefined,
     status: mapRouteStatus(route.status),
     stops: mapWaypoints(route.waypoints),
     // Prefer the real post-drive distance once it exists; the backend fetches
@@ -232,12 +244,10 @@ export function mapRoute(route: ApiRoute): Route {
     estimatedDuration: route.estimatedDuration ?? 0,
     fuelCost: route.fuelCost ?? undefined,
     actualDuration: route.actualDuration ?? undefined,
-    // No `optimized` flag exists on the backend — `optimizeRoute` is the only
-    // path that computes a real `estimatedDistance` (create/update never
-    // collect one), so a positive value is a reasonably honest proxy. This
-    // used to be hardcoded `false` and reset on every reload even for a
-    // route that really had been optimized (BOFF-7909 follow-up).
-    optimized: (route.estimatedDistance ?? 0) > 0,
+    // The route object has no optimization marker. `estimatedDistance` is a
+    // measurement, not proof that the optimize mutation ran, so leave this
+    // unknown rather than presenting an inferred Yes/No.
+    optimized: undefined,
     createdAt: new Date(route.createdAt),
   };
 }
@@ -334,7 +344,13 @@ export function useRoutes(options: UseRoutesOptions = {}): UseRoutesResult {
   );
 
   const updateRoute = useCallback(
-    async (id: string, updates: Partial<Route>): Promise<Route> => {
+    async (
+      id: string,
+      updates: Omit<Partial<Route>, 'vehicleId' | 'driverId'> & {
+        vehicleId?: string | null;
+        driverId?: string | null;
+      }
+    ): Promise<Route> => {
       const data = await executeGraphQL<{ updateRoute: ApiRoute }>(
         graphQLOptions,
         UPDATE_ROUTE_MUTATION,
@@ -344,8 +360,12 @@ export function useRoutes(options: UseRoutesOptions = {}): UseRoutesResult {
             name: updates.name,
             status: toApiRouteStatus(updates.status),
             shipmentId: undefined,
-            vehicleId: updates.vehicleId,
-            driverId: updates.driverId,
+            vehicleId: Object.prototype.hasOwnProperty.call(updates, 'vehicleId')
+              ? (updates.vehicleId ?? null)
+              : undefined,
+            driverId: Object.prototype.hasOwnProperty.call(updates, 'driverId')
+              ? (updates.driverId ?? null)
+              : undefined,
             waypoints: updates.stops,
             // See createRoute — the edit form doesn't collect a distance
             // either, and `distance` must never masquerade as `actualDistance`.

package/src/movethewheels/hooks/useTracking.ts

@@ -209,11 +209,23 @@ const TRACKING_ALERTS_QUERY = `
   }
 `;
 
-function mapTrackingEventToLocation(event: ApiTrackingEvent): Location {
+function mapTrackingEventToLocation(event: ApiTrackingEvent): Location | null {
+  const raw = event.location;
+  if (!raw) return null;
+  const latitude = raw.latitude ?? raw.lat;
+  const longitude = raw.longitude ?? raw.lng;
+  if (
+    typeof latitude !== 'number' ||
+    !Number.isFinite(latitude) ||
+    typeof longitude !== 'number' ||
+    !Number.isFinite(longitude)
+  ) {
+    return null;
+  }
   return {
-    latitude: Number((event.location?.latitude as number | undefined) ?? 0),
-    longitude: Number((event.location?.longitude as number | undefined) ?? 0),
-    address: (event.location?.address as string | undefined) ?? undefined,
+    latitude,
+    longitude,
+    address: typeof raw.address === 'string' ? raw.address : undefined,
     timestamp: new Date(event.timestamp),
   };
 }
@@ -225,9 +237,10 @@ function mapTrackingEventsToTracking(
   const latest = events[0];
   if (!latest) return null;
 
-  const locationHistory = events.map(mapTrackingEventToLocation);
+  const locationHistory = events
+    .map(mapTrackingEventToLocation)
+    .filter((location): location is Location => location !== null);
   const currentLocation = locationHistory[0];
-  if (!currentLocation) return null;
 
   return {
     id: latest.id,
@@ -307,11 +320,7 @@ export function useTracking(options: UseTrackingOptions = {}): UseTrackingResult
         id: shipment.id,
         entityId: entityId ?? shipment.deliveryJobId ?? shipment.id,
         entityType: entityType ?? 'order',
-        currentLocation: {
-          latitude: 0,
-          longitude: 0,
-          timestamp: new Date(),
-        },
+        currentLocation: undefined,
         locationHistory: [],
         status: shipment.status.toLowerCase(),
         estimatedArrival: shipment.estimatedDelivery
@@ -319,7 +328,7 @@ export function useTracking(options: UseTrackingOptions = {}): UseTrackingResult
           : undefined,
         nextCheckpoint: shipment.shipmentNumber,
         alerts: [],
-        lastUpdated: new Date(),
+        lastUpdated: undefined,
       }));
 
       setTracking(mapped);
@@ -518,7 +527,7 @@ export function useVehicleTracking(vehicleId: string | undefined) {
       currentLocation: vehicle.currentLocation,
       locationHistory: [vehicle.currentLocation],
       status: vehicle.status,
-      lastUpdated: vehicle.currentLocation.timestamp ?? new Date(),
+      lastUpdated: vehicle.currentLocation.timestamp,
       alerts: [],
     };
   }, [vehicle]);
@@ -538,7 +547,7 @@ export function useDriverTracking(driverId: string | undefined) {
       currentLocation: driver.currentLocation,
       locationHistory: [driver.currentLocation],
       status: driver.status,
-      lastUpdated: driver.currentLocation.timestamp ?? new Date(),
+      lastUpdated: driver.currentLocation.timestamp,
       alerts: [],
     };
   }, [driver]);
@@ -622,7 +631,6 @@ export function useTrackingAlerts() {
           type: 'delay',
           severity: 'medium',
           message: `${alert.shipmentNumber}: ${alert.message}`,
-          timestamp: new Date(),
           acknowledged: false,
         }))
       );

package/src/movethewheels/pages/CustomerDetailsPage.tsx

@@ -333,10 +333,16 @@ function customerToForm(customer: {
   phone: string;
   company?: string;
   type: 'b2b' | 'b2c';
-  address: { street: string; city: string; state: string; postalCode: string; country: string };
+  address: Partial<{
+    street: string;
+    city: string;
+    state: string;
+    postalCode: string;
+    country: string;
+  }>;
   businessLicense?: string;
   taxId?: string;
-  rating: number;
+  rating?: number;
 }): CustomerFormState {
   return {
     name: customer.name,
@@ -344,11 +350,11 @@ function customerToForm(customer: {
     phone: customer.phone,
     company: customer.company ?? '',
     type: customer.type,
-    street: customer.address.street,
-    city: customer.address.city,
-    state: customer.address.state,
-    postalCode: customer.address.postalCode,
-    country: customer.address.country,
+    street: customer.address.street ?? '',
+    city: customer.address.city ?? '',
+    state: customer.address.state ?? '',
+    postalCode: customer.address.postalCode ?? '',
+    country: customer.address.country ?? '',
     businessLicense: customer.businessLicense ?? '',
     taxId: customer.taxId ?? '',
     rating: customer.rating ? String(customer.rating) : '',
@@ -480,7 +486,7 @@ export default function CustomerDetailsPage() {
       headerContent={
         <div className="flex items-center gap-4">
           <TypeBadge type={customer.type} />
-          {customer.rating > 0 && (
+          {customer.rating !== undefined && (
             <div className="flex items-center gap-1">
               <Star size={16} className="text-status-warning-text fill-current" />
               <span className="font-medium">{customer.rating.toFixed(1)}</span>

package/src/movethewheels/pages/CustomersPage.tsx

@@ -65,7 +65,10 @@ export default function CustomersPage() {
     {
       id: 'location',
       header: 'Location',
-      cell: (row) => `${row.address.city}, ${row.address.state}`,
+      cell: (row) => {
+        const location = [row.address.city, row.address.state].filter(Boolean).join(', ');
+        return location || 'Not provided';
+      },
     },
     {
       id: 'rating',
@@ -73,7 +76,7 @@ export default function CustomersPage() {
       cell: (row) => (
         <div className="flex items-center gap-1">
           <Star size={14} className="text-status-warning-text fill-current" />
-          <span>{row.rating.toFixed(1)}</span>
+          <span>{row.rating !== undefined ? row.rating.toFixed(1) : 'Not provided'}</span>
         </div>
       ),
     },

package/src/movethewheels/pages/DashboardPage.tsx

@@ -277,7 +277,9 @@ export default function DashboardPage() {
                     >
                       <p className="font-medium">{alert.message}</p>
                       <p className="mt-1 text-xs text-text-secondary">
-                        {formatDate(alert.timestamp, 'relative')}
+                        {alert.timestamp
+                          ? formatDate(alert.timestamp, 'relative')
+                          : 'Time not recorded'}
                       </p>
                     </div>
                   ))}

package/src/movethewheels/pages/DriverDetailsPage.tsx

@@ -53,6 +53,7 @@ import {
   useVehicle,
   useVehicles,
   toApiDriverStatus,
+  type CreateDriverInput,
   type UpdateDriverInput,
 } from '../hooks/useFleet';
 import { useDebouncedValue } from '../hooks/useDebouncedValue';
@@ -85,6 +86,7 @@ interface DriverFormState {
   licenseExpiry: string;
   status: DriverStatus;
   vehicleId: string;
+  vehicleIds: string[];
   rating: string;
   notes: string;
   hireDate: string;
@@ -105,6 +107,7 @@ const emptyForm: DriverFormState = {
   licenseExpiry: '',
   status: 'available',
   vehicleId: '',
+  vehicleIds: [],
   rating: '',
   notes: '',
   hireDate: '',
@@ -151,6 +154,7 @@ function NewDriverForm({ editId }: { editId?: string }) {
       licenseExpiry: toDateInput(driver.licenseExpiry),
       status: driver.status,
       vehicleId: driver.assignedVehicle || '',
+      vehicleIds: driver.vehicleIds,
       rating: driver.rating ? String(driver.rating) : '',
       notes: driver.notes || '',
       hireDate: toDateInput(driver.hireDate),
@@ -163,8 +167,7 @@ function NewDriverForm({ editId }: { editId?: string }) {
 
   const goBack = () => navigate?.(joinPath(basePath, 'fleet/drivers'));
 
-  const buildPayload = (): UpdateDriverInput => ({
-    employeeId: form.employeeId.trim(),
+  const buildPayload = (includeLeaveFields = true): UpdateDriverInput => ({
     firstName: form.firstName.trim(),
     lastName: form.lastName.trim(),
     email: form.email.trim() || undefined,
@@ -173,13 +176,20 @@ function NewDriverForm({ editId }: { editId?: string }) {
     licenseClass: form.licenseClass.trim() || undefined,
     licenseExpiry: fromDateInput(form.licenseExpiry),
     status: toApiDriverStatus(form.status),
-    vehicleId: form.vehicleId || undefined,
-    rating: form.rating ? Number(form.rating) : undefined,
+    vehicleId: form.vehicleId || null,
+    vehicleIds: form.vehicleIds,
+    rating: form.rating.trim() ? Number(form.rating) : undefined,
     notes: form.notes.trim() || undefined,
     hireDate: fromDateInput(form.hireDate),
-    baseSalary: form.baseSalary ? Number(form.baseSalary) : undefined,
-    bonusYtd: form.bonusYtd ? Number(form.bonusYtd) : undefined,
+    baseSalary: form.baseSalary.trim() ? Number(form.baseSalary) : undefined,
+    bonusYtd: form.bonusYtd.trim() ? Number(form.bonusYtd) : undefined,
     payCurrency: form.payCurrency.trim() || undefined,
+    ...(includeLeaveFields ? { onLeaveUntil: fromDateInput(form.onLeaveUntil) ?? null } : {}),
+  });
+
+  const buildCreatePayload = (): CreateDriverInput => ({
+    employeeId: form.employeeId.trim(),
+    ...buildPayload(false),
   });
 
   const handleSubmit = async (e: React.FormEvent) => {
@@ -199,7 +209,7 @@ function NewDriverForm({ editId }: { editId?: string }) {
         const updated = await updateDriver(editId, buildPayload());
         navigate?.(joinPath(basePath, `fleet/drivers/${updated.id}`));
       } else {
-        const created = await createDriver(buildPayload());
+        const created = await createDriver(buildCreatePayload());
         navigate?.(joinPath(basePath, `fleet/drivers/${created.id}`));
       }
     } catch (err) {
@@ -280,7 +290,8 @@ function NewDriverForm({ editId }: { editId?: string }) {
             <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
               <div className="space-y-2">
                 <Label htmlFor="employeeId">
-                  Employee ID <span className="text-status-error-text">*</span>
+                  Employee ID {isEditing ? '(immutable)' : ''}{' '}
+                  <span className="text-status-error-text">{!isEditing && '*'}</span>
                 </Label>
                 <Input
                   id="employeeId"
@@ -288,6 +299,7 @@ function NewDriverForm({ editId }: { editId?: string }) {
                   onChange={(e) => setForm((prev) => ({ ...prev, employeeId: e.target.value }))}
                   placeholder="EMP-001"
                   required
+                  disabled={isEditing}
                 />
               </div>
               <div className="space-y-2">
@@ -403,7 +415,13 @@ function NewDriverForm({ editId }: { editId?: string }) {
                 <EntityCombobox
                   id="vehicle"
                   value={form.vehicleId}
-                  onChange={(value) => setForm((prev) => ({ ...prev, vehicleId: value }))}
+                  onChange={(value) =>
+                    setForm((prev) => ({
+                      ...prev,
+                      vehicleId: value,
+                      vehicleIds: value ? [value] : [],
+                    }))
+                  }
                   options={vehicles}
                   loading={vehiclesLoading}
                   getId={(vehicle) => vehicle.id}
@@ -445,7 +463,19 @@ function NewDriverForm({ editId }: { editId?: string }) {
                 />
               </div>
               <div className="space-y-2">
-                <Label htmlFor="onLeaveUntil">On Leave Until</Label>
+                <div className="flex items-center justify-between gap-2">
+                  <Label htmlFor="onLeaveUntil">On Leave Until</Label>
+                  {form.onLeaveUntil && (
+                    <Button
+                      type="button"
+                      variant="ghost"
+                      size="sm"
+                      onClick={() => setForm((prev) => ({ ...prev, onLeaveUntil: '' }))}
+                    >
+                      Clear
+                    </Button>
+                  )}
+                </div>
                 <Input
                   id="onLeaveUntil"
                   type="date"
@@ -641,7 +671,7 @@ export default function DriverDetailsPage() {
               customColors={{ bg: 'bg-status-warning-bg-subtle', text: 'text-status-warning-text' }}
             />
           )}
-          {driver.rating > 0 && (
+          {driver.rating !== undefined && (
             <div className="flex items-center gap-1">
               <Star size={16} className="text-status-warning-text fill-current" />
               <span className="font-medium">{driver.rating.toFixed(1)}</span>
@@ -823,7 +853,9 @@ export default function DriverDetailsPage() {
                   {driver.currentLocation.address || 'Location updating...'}
                 </p>
                 <p className="text-xs text-text-secondary mt-1">
-                  Updated {formatDate(driver.currentLocation.timestamp || new Date(), 'relative')}
+                  {driver.currentLocation.timestamp
+                    ? `Updated ${formatDate(driver.currentLocation.timestamp, 'relative')}`
+                    : 'Update time not recorded'}
                 </p>
               </CardContent>
             </Card>

package/src/movethewheels/pages/DriversPage.tsx

@@ -170,7 +170,7 @@ export default function DriversPage() {
       id: 'rating',
       header: 'Rating',
       cell: (row) =>
-        row.rating > 0 ? (
+        row.rating !== undefined ? (
           <div className="flex items-center gap-1">
             <Star size={14} className="text-status-warning-text fill-current" />
             <span className="font-medium">{row.rating.toFixed(1)}</span>

package/src/movethewheels/pages/FleetPage.tsx

@@ -308,7 +308,7 @@ export default function FleetPage() {
                       </div>
                       <div className="text-right">
                         <StatusBadge status={driver.status} type="driver" size="sm" />
-                        {driver.rating > 0 && (
+                        {driver.rating !== undefined && (
                           <div className="mt-1 flex items-center gap-1 justify-end">
                             <Star size={12} className="text-status-warning-text fill-current" />
                             <span className="text-sm font-medium">{driver.rating.toFixed(1)}</span>

package/src/movethewheels/pages/InventoryPage.tsx

@@ -502,32 +502,32 @@ export default function InventoryPage() {
                       <div>
                         <p className="font-medium">{warehouse.name}</p>
                         <p className="text-sm text-text-secondary">
-                          {warehouse.address.city}, {warehouse.address.state}
+                          {[warehouse.address.city, warehouse.address.state]
+                            .filter(Boolean)
+                            .join(', ') || 'Not provided'}
                         </p>
                       </div>
                       <div className="text-right">
                         <Badge
                           variant={
-                            warehouse.status.toUpperCase() === 'ACTIVE' ? 'default' : 'secondary'
+                            warehouse.status?.toUpperCase() === 'ACTIVE' ? 'default' : 'secondary'
                           }
                         >
-                          {warehouse.status.toUpperCase() === 'ACTIVE'
-                            ? t('movethewheels.inventory.warehouses.active', 'Active')
-                            : t('movethewheels.inventory.warehouses.inactive', 'Inactive')}
+                          {warehouse.status
+                            ? warehouse.status.toUpperCase() === 'ACTIVE'
+                              ? t('movethewheels.inventory.warehouses.active', 'Active')
+                              : t('movethewheels.inventory.warehouses.inactive', 'Inactive')
+                            : 'Not provided'}
                         </Badge>
                         <div className="mt-2">
                           <p className="text-xs text-text-secondary">
                             {t('movethewheels.inventory.warehouses.utilization', 'Utilization')}
                           </p>
-                          <Progress
-                            value={
-                              warehouse.capacity.totalSpace > 0
-                                ? (warehouse.capacity.usedSpace / warehouse.capacity.totalSpace) *
-                                  100
-                                : 0
-                            }
-                            className="w-24 h-2"
-                          />
+                          {warehouse.utilization !== undefined ? (
+                            <Progress value={warehouse.utilization} className="w-24 h-2" />
+                          ) : (
+                            <p className="text-xs text-text-tertiary">Not provided</p>
+                          )}
                         </div>
                       </div>
                     </div>
@@ -567,8 +567,12 @@ export default function InventoryPage() {
                         <p className="text-sm text-text-secondary">{product.sku}</p>
                       </div>
                       <div className="text-right">
-                        <p className="font-medium">{formatCurrency(product.value)}</p>
-                        <Badge variant="outline">{product.category}</Badge>
+                        <p className="font-medium">
+                          {product.value !== undefined
+                            ? formatCurrency(product.value)
+                            : 'Not provided'}
+                        </p>
+                        <Badge variant="outline">{product.category ?? 'Not provided'}</Badge>
                       </div>
                     </div>
                   </div>

package/src/movethewheels/pages/LiveTrackingPage.tsx

@@ -83,7 +83,7 @@ export default function LiveTrackingPage() {
           sublabel:
             d.driver?.fullName ||
             d.vehicle?.vehicleNumber ||
-            d.tracking?.currentLocation.address ||
+            d.tracking?.currentLocation?.address ||
             undefined,
         },
       ];
@@ -292,7 +292,7 @@ export default function LiveTrackingPage() {
                                   : 'N/A'}
                               </p>
                               <p className="text-xs text-text-secondary">
-                                {delivery.tracking?.currentLocation.address ||
+                                {delivery.tracking?.currentLocation?.address ||
                                   'Location updating...'}
                               </p>
                             </div>
@@ -352,7 +352,7 @@ export default function LiveTrackingPage() {
                 <div>
                   <p className="text-sm text-text-secondary">Current Location</p>
                   <p className="text-sm">
-                    {selected.tracking?.currentLocation.address || 'Updating...'}
+                    {selected.tracking?.currentLocation?.address || 'Updating...'}
                   </p>
                   {(() => {
                     const coord = firstRealLatLng(
@@ -440,7 +440,9 @@ export default function LiveTrackingPage() {
                     >
                       <p className="font-medium">{alert.message}</p>
                       <p className="text-xs text-text-secondary mt-1">
-                        {formatDate(alert.timestamp, 'relative')}
+                        {alert.timestamp
+                          ? formatDate(alert.timestamp, 'relative')
+                          : 'Time not recorded'}
                       </p>
                     </div>
                   ))}