Only update action based on task state update when the cancel button …

…was clicked Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
open-rmf · Sep 26, 2023 · c506c49 · c506c49
1 parent f8ad29e
commit c506c49
Showing 1 changed file with 26 additions and 0 deletions.
diff --git a/packages/dashboard/src/components/delivery-alert-store.tsx b/packages/dashboard/src/components/delivery-alert-store.tsx
@@ -55,6 +55,32 @@ const DeliveryWarningDialog = React.memo((props: DeliveryWarningDialogProps) =>
     }
     const sub = rmf.getTaskStateObs(taskState.booking.id).subscribe((taskStateUpdate) => {
       setNewTaskState(taskStateUpdate);
+      setCancelling((prev) => {
+        if (
+          prev &&
+          deliveryAlert.action === 'waiting' &&
+          taskStateUpdate.status &&
+          taskStateUpdate.status === 'canceled'
+        ) {
+          setCancelling(false);
+          (async () => {
+            try {
+              await rmf.deliveryAlertsApi.updateDeliveryAlertActionDeliveryAlertsDeliveryAlertIdActionPost(
+                deliveryAlert.id,
+                'cancelled',
+              );
+            } catch (e) {
+              appController.showAlert(
+                'error',
+                `Failed to cancel delivery alert ${deliveryAlert.id}: ${(e as Error).message}`,
+              );
+            }
+            setActionTaken(true);
+          })();
+        }
+        return prev;
+      });
+
       if (
         deliveryAlert.action === 'waiting' &&
         taskStateUpdate.status &&