Double compose delivery task #963

aaronchongth · 2024-07-02T05:57:36Z

What's new

double-compose-delivery task, which just doubles the phases of delivery_pickup
Refactored task description insertion helper functions
small UI tweaks

Self-checks

I have prototyped this new feature (if necessary) on Figma
I'm familiar with and follow this Typescript guideline
I added unit-tests for new components
I tried testing edge cases
I tested the behavior of the components that interact with the backend, with an e2e test

* 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>

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

koonpeng

We should put a freeze on any new features until after the grand migration, if this is for prod, please re-target to deploy/hammer-humble.

packages/api-server/api_server/routes/tasks/tasks.py

koonpeng · 2024-07-03T04:36:20Z

packages/api-server/api_server/routes/tasks/tasks.py

+            if len(cancellation_lots) != 0:
+                # Populate them in the correct form
+                go_to_one_of_the_places_activity = {
+                    "category": "go_to_place",
+                    "description": {
+                        "one_of": [{"waypoint": name} for name in cancellation_lots],
+                        "constraints": [
+                            {"category": "prefer_same_map", "description": ""}
+                        ],
+                    },
+                }
+                delivery_dropoff_activity = {
+                    "category": "perform_action",
+                    "description": {
+                        "unix_millis_action_duration_estimate": 60000,
+                        "category": "delivery_dropoff",
+                        "description": {},
+                    },
+                }
+                on_cancel_dropoff = {
+                    "category": "sequence",
+                    "description": [
+                        go_to_one_of_the_places_activity,
+                        delivery_dropoff_activity,
+                    ],
+                }
+                request.request.description["phases"][i]["on_cancel"] = [
+                    on_cancel_dropoff
+                ]


These are very specific behaviors that shouldn't be in the server, they should be filled by the client instead.

this is a workaround for now, this will prevent any need for database migrations for scheduled tasks when emergency lots are added or removed

We will ideally need a parameter from traffic-editor or site-editor to tag a waypoint as an emergency lot, which can be parsed from the building map server topic. Added as a enhancement to our internal board

edit: there is already a big FIXME on this now

That's ok since this is going to deploy/hammer-humble but just fyi this will be removed in main.

packages/react-components/lib/tasks/types/delivery-custom.spec.tsx

packages/react-components/lib/tasks/types/delivery-custom.tsx

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* 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>

aaronchongth added 5 commits June 26, 2024 14:57

First iteration of double compose delivery task

f921e1a

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

Lint and fix dispatck task insert emergency lots workaround

1229865

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

Fix favorite task confirmation text field, add more tests

c1269f7

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

Revert addition of double compose delivery to resource manager

ea30a21

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

aaronchongth requested review from xiyuoh and koonpeng July 2, 2024 06:46

aaronchongth added 2 commits July 2, 2024 15:01

Small UI tweaks to form field widths

d33c6cc

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

Fix tests, grid containers for warn time

30d72ed

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

aaronchongth changed the title ~~First iteration of double compose delivery task~~ Double compose delivery task Jul 2, 2024

koonpeng requested changes Jul 3, 2024

View reviewed changes

Address feedback

c6d3dda

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

aaronchongth changed the base branch from deploy/hammer to deploy/hammer-humble July 3, 2024 09:09

Merge branch 'deploy/hammer-humble' into hammer/double-compose-delivery

cd95cc9

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

aaronchongth requested a review from koonpeng July 3, 2024 09:23

koonpeng approved these changes Jul 4, 2024

View reviewed changes

aaronchongth merged commit 3649b5e into deploy/hammer-humble Jul 4, 2024
4 checks passed

aaronchongth deleted the hammer/double-compose-delivery branch July 4, 2024 02:21

aaronchongth mentioned this pull request Aug 6, 2024

Port/double compose delivery #990

Closed

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Double compose delivery task #963

Double compose delivery task #963

aaronchongth commented Jul 2, 2024 •

edited

Loading

koonpeng left a comment

koonpeng Jul 3, 2024

aaronchongth Jul 3, 2024

aaronchongth Jul 3, 2024 •

edited

Loading

koonpeng Jul 4, 2024

Double compose delivery task #963

Double compose delivery task #963

Conversation

aaronchongth commented Jul 2, 2024 • edited Loading

What's new

Self-checks

koonpeng left a comment

Choose a reason for hiding this comment

koonpeng Jul 3, 2024

Choose a reason for hiding this comment

aaronchongth Jul 3, 2024

Choose a reason for hiding this comment

aaronchongth Jul 3, 2024 • edited Loading

Choose a reason for hiding this comment

koonpeng Jul 4, 2024

Choose a reason for hiding this comment

aaronchongth commented Jul 2, 2024 •

edited

Loading

aaronchongth Jul 3, 2024 •

edited

Loading