@burdenoff/microfe-movethewheels 2026.924.2 → 2026.925.1

package/src/movethewheels/pages/OrderDetailsPage.tsx

@@ -79,10 +79,13 @@ const STATUS_LABELS: Record<OrderStatus, string> = {
   in_transit: 'In Transit',
   out_for_delivery: 'Out for Delivery',
   delivered: 'Delivered',
+  returned: 'Returned',
   cancelled: 'Cancelled',
   failed: 'Failed',
 };
 
+const TERMINAL_STATUSES = new Set<OrderStatus>(['delivered', 'returned', 'cancelled', 'failed']);
+
 function nextStatus(current: OrderStatus): OrderStatus | null {
   const index = STATUS_FLOW.indexOf(current);
   if (index === -1 || index >= STATUS_FLOW.length - 1) return null;
@@ -149,18 +152,31 @@ export default function OrderDetailsPage() {
   }, [selectedVehicle, vehicles, vehiclesLoading]);
 
   const handleAssign = async () => {
-    if (!orderId || (!selectedVehicle && !selectedDriver)) {
-      setActionError('Pick a vehicle and/or a driver to assign.');
+    if (!orderId || !order) {
+      setActionError('This order is no longer available. Refresh and try again.');
       return;
     }
+
+    const vehicleId = selectedVehicle || order.vehicleId;
+    const driverId = selectedDriver || order.driverId;
+    if (!vehicleId || !driverId) {
+      setActionError('Select both a compatible vehicle and driver before dispatching.');
+      return;
+    }
+
+    const wasFullyAssigned = Boolean(order.vehicleId && order.driverId);
     setAssigning(true);
     setActionError(null);
     try {
-      await updateOrder(orderId, {
-        vehicleId: selectedVehicle || undefined,
-        driverId: selectedDriver || undefined,
-      });
-      notify('Assignment updated.');
+      await updateOrder(orderId, { vehicleId, driverId });
+      if (!wasFullyAssigned && order.status === 'confirmed') {
+        await updateOrderStatus(orderId, 'assigned');
+      }
+      notify(
+        !wasFullyAssigned && order.status === 'confirmed'
+          ? 'Fleet assigned and order advanced to Assigned.'
+          : 'Assignment updated.'
+      );
       setSelectedVehicle('');
       setSelectedDriver('');
       refetch();
@@ -172,7 +188,13 @@ export default function OrderDetailsPage() {
   };
 
   const handleStatusChange = async (status: OrderStatus, successMessage: string) => {
-    if (!orderId) return;
+    if (!orderId || !order) return;
+    if (status === 'assigned' && (!order.vehicleId || !order.driverId)) {
+      setActionError('Assign both a compatible vehicle and driver before advancing to Assigned.');
+      return;
+    }
+    if (TERMINAL_STATUSES.has(order.status)) return;
+
     setAdvancing(true);
     setActionError(null);
     try {
@@ -635,24 +657,34 @@ export default function OrderDetailsPage() {
                   {(() => {
                     const upcoming = nextStatus(order.status);
                     if (!upcoming) return null;
+                    const missingDispatchPair =
+                      upcoming === 'assigned' && (!order.vehicleId || !order.driverId);
                     return (
-                      <Button
-                        variant="outline"
-                        className="w-full"
-                        onClick={() =>
-                          handleStatusChange(
-                            upcoming,
-                            `Order advanced to ${STATUS_LABELS[upcoming]}.`
-                          )
-                        }
-                        disabled={advancing}
-                      >
-                        <ArrowRight size={16} />
-                        {advancing ? 'Updating…' : `Advance to ${STATUS_LABELS[upcoming]}`}
-                      </Button>
+                      <>
+                        <Button
+                          variant="outline"
+                          className="w-full"
+                          onClick={() =>
+                            handleStatusChange(
+                              upcoming,
+                              `Order advanced to ${STATUS_LABELS[upcoming]}.`
+                            )
+                          }
+                          disabled={advancing || missingDispatchPair}
+                        >
+                          <ArrowRight size={16} />
+                          {advancing ? 'Updating…' : `Advance to ${STATUS_LABELS[upcoming]}`}
+                        </Button>
+                        {missingDispatchPair && (
+                          <p className="text-xs text-text-secondary">
+                            Assign both a compatible vehicle and driver before dispatching this
+                            order.
+                          </p>
+                        )}
+                      </>
                     );
                   })()}
-                  {order.status !== 'cancelled' && order.status !== 'delivered' && (
+                  {order.status !== 'cancelled' && !TERMINAL_STATUSES.has(order.status) && (
                     <Button
                       variant="outline"
                       className="w-full text-status-error-text"

package/src/movethewheels/pages/OrdersListPage.tsx

@@ -195,6 +195,7 @@ export default function OrdersListPage() {
       label: t('movethewheels.orders.status.outForDelivery', 'Out for Delivery'),
     },
     { value: 'delivered', label: t('movethewheels.orders.status.delivered', 'Delivered') },
+    { value: 'returned', label: t('movethewheels.orders.status.returned', 'Returned') },
     { value: 'cancelled', label: t('movethewheels.orders.status.cancelled', 'Cancelled') },
     { value: 'failed', label: t('movethewheels.orders.status.failed', 'Failed') },
   ];

package/src/movethewheels/pages/TrackingPage.tsx

@@ -60,7 +60,20 @@ export default function TrackingPage() {
       ? { ...destCoord, label: `Delivery · ${order.deliveryAddress.city || 'Destination'}` }
       : null;
 
-    const trail: TrackPoint[] = order.timeline
+    const trackingTrail: TrackPoint[] = (tracking?.locationHistory ?? [])
+      .map((location): TrackPoint | null => {
+        const coord = firstRealLatLng(location);
+        return coord
+          ? {
+              lat: coord.lat,
+              lng: coord.lng,
+              timestamp: location.timestamp?.toISOString() ?? new Date().toISOString(),
+            }
+          : null;
+      })
+      .filter((point): point is TrackPoint => point !== null);
+
+    const statusTrail: TrackPoint[] = order.timeline
       .map((event): TrackPoint | null => {
         const coord = event.location ? firstRealLatLng(event.location) : null;
         return coord
@@ -69,6 +82,7 @@ export default function TrackingPage() {
       })
       .filter((point): point is TrackPoint => point !== null);
 
+    const trail = trackingTrail.length > 0 ? trackingTrail : statusTrail;
     const currentCoord = tracking ? firstRealLatLng(tracking.currentLocation) : null;
     const current: TrackEndpoint | null = currentCoord
       ? {
@@ -163,7 +177,7 @@ export default function TrackingPage() {
       )}
 
       {/* Tracking Results */}
-      {order && tracking && (
+      {order && (
         <div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
           {/* Main Tracking Info */}
           <div className="lg:col-span-2 space-y-6">
@@ -181,14 +195,14 @@ export default function TrackingPage() {
                   <p className="text-sm text-text-secondary">
                     {t('movethewheels.tracking.details.trackingNumber', 'Tracking Number')}
                   </p>
-                  <p className="font-mono font-medium">{order.trackingNumber}</p>
+                  <p className="font-mono font-medium">{order.trackingNumber || '—'}</p>
                 </div>
                 <div>
                   <p className="text-sm text-text-secondary">
                     {t('movethewheels.tracking.details.estimatedDelivery', 'Estimated Delivery')}
                   </p>
                   <p className="font-medium">
-                    {tracking.estimatedArrival
+                    {tracking?.estimatedArrival
                       ? formatDate(tracking.estimatedArrival, 'full')
                       : order.scheduledDelivery
                         ? formatDate(order.scheduledDelivery, 'full')
@@ -207,9 +221,21 @@ export default function TrackingPage() {
                   <p className="text-sm text-text-secondary">
                     {t('movethewheels.tracking.details.lastUpdated', 'Last Updated')}
                   </p>
-                  <p className="font-medium">{formatDate(tracking.lastUpdated, 'relative')}</p>
+                  <p className="font-medium">
+                    {tracking
+                      ? formatDate(tracking.lastUpdated, 'relative')
+                      : t('movethewheels.tracking.details.noUpdates', 'No tracking updates yet')}
+                  </p>
                 </div>
               </div>
+              {!tracking && (
+                <p className="mt-4 rounded-card border border-border-subtle bg-bg-sunken p-3 text-sm text-text-secondary">
+                  {t(
+                    'movethewheels.tracking.details.noUpdatesDescription',
+                    'The delivery was found, but no tracking updates have been recorded yet.'
+                  )}
+                </p>
+              )}
             </EmphasisPanel>
 
             {/* Route Map — real origin/destination + tracking trail + live position */}
@@ -356,7 +382,7 @@ export default function TrackingPage() {
             </Card>
 
             {/* Alerts */}
-            {tracking.alerts && tracking.alerts.length > 0 && (
+            {tracking?.alerts && tracking.alerts.length > 0 && (
               <Card>
                 <CardHeader>
                   <CardTitle className="flex items-center gap-2">
@@ -430,14 +456,18 @@ export default function TrackingPage() {
                     </p>
                   </div>
                 )}
-                <p className="text-sm">
-                  {tracking.currentLocation.address ||
-                    t('movethewheels.tracking.location.updating', 'Location updating...')}
-                </p>
-                <p className="text-xs text-text-secondary mt-1">
-                  {t('movethewheels.tracking.location.updated', 'Updated')}{' '}
-                  {formatDate(tracking.currentLocation.timestamp || new Date(), 'relative')}
-                </p>
+                {tracking && (
+                  <>
+                    <p className="text-sm">
+                      {tracking.currentLocation.address ||
+                        t('movethewheels.tracking.location.updating', 'Location updating...')}
+                    </p>
+                    <p className="text-xs text-text-secondary mt-1">
+                      {t('movethewheels.tracking.location.updated', 'Updated')}{' '}
+                      {formatDate(tracking.currentLocation.timestamp || new Date(), 'relative')}
+                    </p>
+                  </>
+                )}
               </CardContent>
             </Card>
 

package/src/movethewheels/types/index.ts

@@ -253,6 +253,7 @@ export type OrderStatus =
   | 'in_transit'
   | 'out_for_delivery'
   | 'delivered'
+  | 'returned'
   | 'cancelled'
   | 'failed';
 

package/src/movethewheels/utils/mapMarkers.ts

@@ -20,6 +20,7 @@ export function deliveryMarkerStatus(status: string | undefined): MapMarkerStatu
     case 'failed':
     case 'delayed':
     case 'cancelled':
+    case 'returned':
       return 'delayed';
     case 'assigned':
     case 'picked_up':

package/src/operations/wspace/movethewheels/queries/dashboard.graphql

@@ -13,10 +13,15 @@ query GetMovethewheelsDashboard {
   deliveryJobStats {
     total
     pending
+    confirmed
+    assigned
+    pickedUp
     inTransit
+    outForDelivery
     delivered
     cancelled
     failed
+    returned
   }
   fleetStats {
     totalVehicles

package/src/operations/wspace/movethewheels/queries/logistics.graphql

@@ -57,8 +57,8 @@ query GetShipment($id: ID!) {
   }
 }
 
-query GetDeliveryJobTracking($deliveryJobId: ID!) {
-  deliveryJobTracking(deliveryJobId: $deliveryJobId) {
+query GetDeliveryJobTracking($deliveryJobId: ID!, $pagination: PaginationInput) {
+  deliveryJobTracking(deliveryJobId: $deliveryJobId, pagination: $pagination) {
     id
     shipmentId
     eventType