Double compose delivery task (#963)

* Hammer/demo tasks (#925) * Moved custom deliveries to separate file naively and import naively Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Moved patrol Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Moved custom-compose Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Added clean and delivery Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Added delivery, renamed to SimpleDelivery Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Clean task added Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Moved delivery-custom tests, added return type for forms Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Configurable supported tasks and name remapping Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Changed directory to types, since it doesn't just handle descriptions Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Fix test imports Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Using temporary task definition Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Refactoring new rename changes Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Clean up Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Removed problematic and unsused component and test Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Lint Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Updating pnpm version in github workflow Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Reverting update to pnpm version Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Fix build now that we use key value strings for labels Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Refactored last parts of hard coding categories and rendering forms Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Refactor callback names and error handling for misconfigs Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Display error as well Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Fixed more checks and failures Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Split configuration and definition, only handle configurations in resource manager level Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Lint Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Not using object as a type Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Address feedback Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Render using validTasks instead Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Use useMemo Signed-off-by: Aaron Chong <aaronchongth@gmail.com> --------- Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * First iteration of double compose delivery task Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Lint and fix dispatck task insert emergency lots workaround Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Fix favorite task confirmation text field, add more tests Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Revert addition of double compose delivery to resource manager Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Small UI tweaks to form field widths Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Fix tests, grid containers for warn time Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Address feedback Signed-off-by: Aaron Chong <aaronchongth@gmail.com> --------- Signed-off-by: Aaron Chong <aaronchongth@gmail.com> (cherry picked from commit 3649b5e) Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
open-rmf · Aug 6, 2024 · da13afc · da13afc
1 parent 10cc4bd
commit da13afc
Show file tree

Hide file tree

Showing 5 changed files with 1,283 additions and 421 deletions.
diff --git a/packages/react-components/lib/tasks/create-task.tsx b/packages/react-components/lib/tasks/create-task.tsx
@@ -73,8 +73,12 @@ import {
   DeliveryPickupTaskDescription,
   DeliveryPickupTaskForm,
   DeliverySequentialLotPickupTaskDefinition,
+  DoubleComposeDeliveryTaskDefinition,
+  DoubleComposeDeliveryTaskDescription,
+  DoubleComposeDeliveryTaskForm,
   makeDeliveryCustomTaskBookingLabel,
   makeDeliveryPickupTaskBookingLabel,
+  makeDoubleComposeDeliveryTaskBookingLabel,
 } from './types/delivery-custom';
 import {
   makePatrolTaskBookingLabel,
@@ -93,6 +97,7 @@ export interface TaskDefinition {
 export type TaskDescription =
   | DeliveryPickupTaskDescription
   | DeliveryCustomTaskDescription
+  | DoubleComposeDeliveryTaskDescription
   | PatrolTaskDescription
   | DeliveryTaskDescription
   | ComposeCleanTaskDescription;
@@ -584,6 +589,27 @@ export function CreateTaskForm({
             onValidate={onValidate}
           />
         );
+      case DoubleComposeDeliveryTaskDefinition.taskDefinitionId:
+        return (
+          <DoubleComposeDeliveryTaskForm
+            taskDesc={taskRequest.description as DoubleComposeDeliveryTaskDescription}
+            pickupPoints={pickupPoints}
+            cartIds={cartIds}
+            dropoffPoints={dropoffPoints}
+            onChange={(desc: DoubleComposeDeliveryTaskDescription) => {
+              desc.category = taskRequest.description.category;
+              desc.phases[0].activity.description.activities[1].description.category =
+                taskRequest.description.category;
+              desc.phases[3].activity.description.activities[1].description.category =
+                taskRequest.description.category;
+              handleTaskDescriptionChange(
+                DoubleComposeDeliveryTaskDefinition.requestCategory,
+                desc,
+              );
+            }}
+            onValidate={onValidate}
+          />
+        );
       case CustomComposeTaskDefinition.taskDefinitionId:
         return (
           <CustomComposeTaskForm
@@ -658,6 +684,9 @@ export function CreateTaskForm({
         case DeliveryAreaPickupTaskDefinition.taskDefinitionId:
           requestBookingLabel = makeDeliveryCustomTaskBookingLabel(request.description);
           break;
+        case DoubleComposeDeliveryTaskDefinition.taskDefinitionId:
+          requestBookingLabel = makeDoubleComposeDeliveryTaskBookingLabel(request.description);
+          break;
         case PatrolTaskDefinition.taskDefinitionId:
           requestBookingLabel = makePatrolTaskBookingLabel(request.description);
           break;
@@ -880,7 +909,12 @@ export function CreateTaskForm({
                       disabled
                     />
                   </Grid>
-                  <Grid item xs={1}>
+                  <Grid
+                    container
+                    xs={isScreenHeightLessThan800 ? 6 : 5}
+                    justifyContent="flex-end"
+                    alignItems="flex-end"
+                  >
                     <Checkbox
                       checked={warnTime !== null}
                       onChange={handleWarnTimeCheckboxChange}
@@ -889,8 +923,6 @@ export function CreateTaskForm({
                         '& .MuiSvgIcon-root': { fontSize: isScreenHeightLessThan800 ? 22 : 32 },
                       }}
                     />
-                  </Grid>
-                  <Grid item xs={isScreenHeightLessThan800 ? 5 : 4}>
                     <DateTimePicker
                       disabled={warnTime === null}
                       value={warnTime}
@@ -994,6 +1026,7 @@ export function CreateTaskForm({
               }
               helperText="Required"
               error={favoriteTaskTitleError}
+              fullWidth
             />
           )}
           {callToDeleteFavoriteTask && (