From b7fedb97e54da13bb88a9c0b12695fac6a80ae02 Mon Sep 17 00:00:00 2001 From: Aaron Chong Date: Fri, 15 Sep 2023 03:43:24 +0000 Subject: [PATCH 1/3] Renamed frontend for categories Signed-off-by: Aaron Chong --- .../lib/tasks/create-task.tsx | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/packages/react-components/lib/tasks/create-task.tsx b/packages/react-components/lib/tasks/create-task.tsx index 346273344..d31876284 100644 --- a/packages/react-components/lib/tasks/create-task.tsx +++ b/packages/react-components/lib/tasks/create-task.tsx @@ -74,11 +74,11 @@ interface DropoffActivity { }; } -interface DeliveryHuntingTaskDescription { +interface DeliveryCustomTaskDescription { activities: [pickup_cart: PickupActivity, dropoff_cart: DropoffActivity]; } -type TaskDescription = DeliveryTaskDescription | DeliveryHuntingTaskDescription; +type TaskDescription = DeliveryTaskDescription | DeliveryCustomTaskDescription; const classes = { title: 'dialogue-info-value', @@ -111,13 +111,13 @@ const StyledDialog = styled((props: DialogProps) => )(({ th function getShortDescription(taskRequest: TaskRequest): string { switch (taskRequest.category) { case 'delivery': { - return `[Delivery] from [${taskRequest.description.pickup.place}] to [${taskRequest.description.dropoff.place}]`; + return `[Delivery - 1:1] from [${taskRequest.description.pickup.place}] to [${taskRequest.description.dropoff.place}]`; } case 'delivery_sequential_hunting': { - return `[Delivery - Sequential Hunting] payload [${taskRequest.description.activities[0].cart_rfid}] from [${taskRequest.description.activities[0].pickup_zone}] to [${taskRequest.description.activities[1].dropoff_point}]`; + return `[Delivery - Sequential lot pick up] payload [${taskRequest.description.activities[0].cart_rfid}] from [${taskRequest.description.activities[0].pickup_zone}] to [${taskRequest.description.activities[1].dropoff_point}]`; } case 'delivery_area_hunting': { - return `[Delivery - Area Hunting] payload [${taskRequest.description.activities[0].cart_rfid}] from [${taskRequest.description.activities[0].pickup_zone}] to [${taskRequest.description.activities[1].dropoff_point}]`; + return `[Delivery - Area pick up] payload [${taskRequest.description.activities[0].cart_rfid}] from [${taskRequest.description.activities[0].pickup_zone}] to [${taskRequest.description.activities[1].dropoff_point}]`; } default: return `[Unknown] type "${taskRequest.category}"`; @@ -260,19 +260,19 @@ function DeliveryTaskForm({ ); } -interface DeliveryHuntingProps { - taskDesc: DeliveryHuntingTaskDescription; +interface DeliveryCustomProps { + taskDesc: DeliveryCustomTaskDescription; pickupZones: string[]; dropoffPoints: string[]; onChange(taskDesc: TaskDescription): void; } -function DeliveryHuntingTaskForm({ +function DeliveryCustomTaskForm({ taskDesc, pickupZones = [], dropoffPoints = [], onChange, -}: DeliveryHuntingProps) { +}: DeliveryCustomProps) { const theme = useTheme(); const pickup_activity: PickupActivity = { category: 'perform_action', @@ -322,7 +322,6 @@ function DeliveryHuntingTaskForm({ id="cart_rfid" fullWidth label="Cart RFID" - defaultValue={pickup_activity.description.cart_rfid} value={taskDesc.activities[0].description.cart_rfid} inputProps={{ min: 0 }} onChange={(ev) => { @@ -448,7 +447,7 @@ function defaultDeliveryTask(): DeliveryTaskDescription { }; } -function defaultDeliveryHuntingTask(): DeliveryHuntingTaskDescription { +function defaultDeliveryCustomTask(): DeliveryCustomTaskDescription { return { activities: [ { @@ -474,7 +473,7 @@ function defaultTaskDescription(taskCategory: string): TaskDescription | undefin return defaultDeliveryTask(); case 'delivery_sequential_hunting': case 'delivery_area_hunting': - return defaultDeliveryHuntingTask(); + return defaultDeliveryCustomTask(); default: return undefined; } @@ -690,8 +689,8 @@ export function CreateTaskForm({ ); case 'delivery_sequential_hunting': return ( - handleTaskDescriptionChange('delivery_sequential_hunting', desc)} @@ -699,8 +698,8 @@ export function CreateTaskForm({ ); case 'delivery_area_hunting': return ( - handleTaskDescriptionChange('delivery_area_hunting', desc)} @@ -881,8 +880,8 @@ export function CreateTaskForm({ description: favoriteTask.description, unix_millis_earliest_start_time: Date.now(), priority: favoriteTask.priority, - }] - ); + }, + ]); }} /> ); @@ -915,19 +914,19 @@ export function CreateTaskForm({ Object.keys(dropoffPoints).length === 0 } > - Delivery + Delivery - 1:1 - Delivery - Sequential hunting + Delivery - Sequential lot pick up - Delivery - Area hunting + Delivery - Area pick up From 0230cd664756362f67a9bb8f7a8032c218c77824 Mon Sep 17 00:00:00 2001 From: Aaron Chong Date: Fri, 15 Sep 2023 04:06:10 +0000 Subject: [PATCH 2/3] Renamed category Signed-off-by: Aaron Chong --- .../lib/tasks/create-task.tsx | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/packages/react-components/lib/tasks/create-task.tsx b/packages/react-components/lib/tasks/create-task.tsx index d31876284..db369c634 100644 --- a/packages/react-components/lib/tasks/create-task.tsx +++ b/packages/react-components/lib/tasks/create-task.tsx @@ -113,10 +113,10 @@ function getShortDescription(taskRequest: TaskRequest): string { case 'delivery': { return `[Delivery - 1:1] from [${taskRequest.description.pickup.place}] to [${taskRequest.description.dropoff.place}]`; } - case 'delivery_sequential_hunting': { + case 'delivery_sequential_lot_pick_up': { return `[Delivery - Sequential lot pick up] payload [${taskRequest.description.activities[0].cart_rfid}] from [${taskRequest.description.activities[0].pickup_zone}] to [${taskRequest.description.activities[1].dropoff_point}]`; } - case 'delivery_area_hunting': { + case 'delivery_area_pick_up': { return `[Delivery - Area pick up] payload [${taskRequest.description.activities[0].cart_rfid}] from [${taskRequest.description.activities[0].pickup_zone}] to [${taskRequest.description.activities[1].dropoff_point}]`; } default: @@ -471,8 +471,8 @@ function defaultTaskDescription(taskCategory: string): TaskDescription | undefin switch (taskCategory) { case 'delivery': return defaultDeliveryTask(); - case 'delivery_sequential_hunting': - case 'delivery_area_hunting': + case 'delivery_sequential_lot_pick_up': + case 'delivery_area_pick_up': return defaultDeliveryCustomTask(); default: return undefined; @@ -687,22 +687,14 @@ export function CreateTaskForm({ onChange={(desc) => handleTaskDescriptionChange('delivery', desc)} /> ); - case 'delivery_sequential_hunting': + case 'delivery_sequential_lot_pick_up': + case 'delivery_area_pick_up': return ( handleTaskDescriptionChange('delivery_sequential_hunting', desc)} - /> - ); - case 'delivery_area_hunting': - return ( - handleTaskDescriptionChange('delivery_area_hunting', desc)} + onChange={(desc) => handleTaskDescriptionChange(taskRequest.category, desc)} /> ); default: @@ -917,13 +909,13 @@ export function CreateTaskForm({ Delivery - 1:1 Delivery - Sequential lot pick up Delivery - Area pick up From 18df4fe57ccbbda6102c5b8422ca18768fdb8f34 Mon Sep 17 00:00:00 2001 From: Aaron Chong Date: Fri, 15 Sep 2023 04:07:04 +0000 Subject: [PATCH 3/3] Fix e2e to check for correct task name Signed-off-by: Aaron Chong --- .../dashboard-e2e/tests/ui-interactions/submit-task.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dashboard-e2e/tests/ui-interactions/submit-task.test.ts b/packages/dashboard-e2e/tests/ui-interactions/submit-task.test.ts index 85a99f791..aa4bc3ff1 100644 --- a/packages/dashboard-e2e/tests/ui-interactions/submit-task.test.ts +++ b/packages/dashboard-e2e/tests/ui-interactions/submit-task.test.ts @@ -10,7 +10,7 @@ describe('submit task', () => { const options = await $$('[role=option]'); for (const opt of options) { const text = await opt.getText(); - if (text === 'Delivery') { + if (text === 'Delivery - 1:1') { return opt; } }