-
Notifications
You must be signed in to change notification settings - Fork 180
feature(app): get command text for flex stacker commands #18045
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: edge
Are you sure you want to change the base?
feature(app): get command text for flex stacker commands #18045
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## edge #18045 +/- ##
==========================================
+ Coverage 25.47% 26.47% +0.99%
==========================================
Files 3008 2966 -42
Lines 233870 231261 -2609
Branches 20072 19883 -189
==========================================
+ Hits 59584 61221 +1637
+ Misses 174271 170018 -4253
- Partials 15 22 +7
Flags with carried forward coverage won't be shown. Click here to find out more.
🚀 New features to boost your workflow:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lookin good. A couple clean up comments.
...mandText/useCommandTextString/utils/commandText/__tests__/getFlexStackerCommandText.test.tsx
Outdated
Show resolved
Hide resolved
...rc/organisms/CommandText/useCommandTextString/utils/commandText/getFlexStackerCommandText.ts
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm with passing CI!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just nitpicking some prepositions. Can you tell I used to teach freshman composition? 😇
Co-authored-by: Ed Cormany <edward.cormany@opentrons.com>
Co-authored-by: Ed Cormany <edward.cormany@opentrons.com>
@TamarZanzouri |
command: FlexStackerCommand | ||
): string | null => { | ||
if (command.result !== undefined && 'primaryLabwareURI' in command?.result) { | ||
const currentLabwareDef = getAllLabwareDefs()[ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be refactored to grab the definitions from getLabwareDefinitionsByURIForProtocol
which I added because we aren't able to get definitions for custom labware in this way. You'll might need to grab this definition map at the top level of command text and drill it down here!
"flex_stacker_fill": "Fill Flex Stacker", | ||
"flex_stacker_fill_with_quantity_and_labware": "Fill Flex Stacker with {{quantity}} {{primaryDefinitionDisplayName}}", | ||
"flex_stacker_retrieve": "Retrieve from Flex Stacker", | ||
"flex_stacker_set_stored_labware": "Set stored labware in Flex Stacker", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These strings don't match the ones Nick and I came up with that are listed in the ticket. Can you update them to ensure they're all written properly? I also don't think we should need a version with + without all of these variables. Only setStoredLabware
and fill
should have optional fields.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
these are the strings from the ticket, I just made sure + default in case there is no command found
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's a few small differences! Added a few more comments. Is it possible for there to be no command found here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@smb2268 probably not.. I just followed the other module commands. if there are small diffs that might be bc Ed gave me feedback?
return '' | ||
const primaryDefinitionDisplayName = getPrimaryLabwareUriIfExsists(command) | ||
if (command.commandType === 'flexStacker/retrieve') { | ||
const slotName = getLabwareDisplayLocation({ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We'll need to adjust this getLabwareDisplayLocation
function for stacker. If we're trying to get the location of the stacker itself, we want to represent that as "Column A". For labware in the hopper it would be "Flex Stacker in Column A" and for the location shuttle location, we'll say "A4".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good so far, but there's a little more work to do to get these strings and display locations in line with the product requirements - see above comments!
...rc/organisms/CommandText/useCommandTextString/utils/commandText/getFlexStackerCommandText.ts
Outdated
Show resolved
Hide resolved
@@ -74,6 +82,7 @@ | |||
"prepare_to_aspirate": "Preparing {{pipette}} to aspirate", | |||
"pressurizing_to_dispense": "Pressurize pipette to dispense {{volume}} µL from resin tip at {{flow_rate}} µL/sec", | |||
"reloading_labware": "Reloading {{labware}}", | |||
"retrieve_labware_from_stacker_to": "Retrieve {{primaryDefinitionDisplayName}} from {{slotName}}", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should have two locations -- from Flex Stacker in {{stackerColumn}} to {{slotName}}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is no "to" when retrieving. it stays on the shuttle
"flex_stacker_empty": "Manually empty all labware from Robot Stacker", | ||
"flex_stacker_empty_from_location": "Manually empty all labware from Robot {{stackerColumn}}", | ||
"flex_stacker_fill": "Fill Robot Stacker", | ||
"flex_stacker_fill_with_quantity_and_labware": "Fill Robot {{stackerColumn}} with {{quantity}} {{labwareAndLidDisplayNames}}", | ||
"flex_stacker_retrieve": "Retrieve from Robot Stacker", | ||
"flex_stacker_set_stored_labware": "Set stored labware in Robot Stacker", | ||
"flex_stacker_set_stored_labware_with_quantity_and_location": "Configure Robot {{stackerColumn}} with {{quantity}} {{labwareAndLidDisplayNames}}", | ||
"flex_stacker_store": "Store into Robot Stacker", | ||
"store_labware_from_slot_to_stacker": "Store {{primaryDefinitionDisplayName}} from {{slotName}} to Robot Stacker", | ||
"retrieve_labware_from_stacker_to": "Retrieve {{primaryDefinitionDisplayName}} from Robot Stacker to {{slotName}}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it intentional to treat "Robot Stacker" as a proper noun?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nick asked to switch Flex Stacker with Robot Stacker :-) let me know what you think it should be instead
Overview
closes https://opentrons.atlassian.net/browse/EXEC-1135.
add flex stacker commands to command text
Test Plan and Hands on Testing
upload the following protocol and make sure all commands appear with the correct text:
Changelog
added command text logic for flex stacker commands and added tests.

Review requests
changes make sesense? am I missing something?
Risk assessment
Medium. affects command text rendering, need to smoke test