Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat(protocol-designer): add submerge for aspirate and dispense #17368

Merged
merged 16 commits into from
Feb 3, 2025
Merged

feat(protocol-designer): add submerge for aspirate and dispense #17368

merged 16 commits into from
Feb 3, 2025

Conversation

syao1226
Copy link
Collaborator

@syao1226 syao1226 commented Jan 28, 2025 •
edited
Loading

re AUTH-904, AUTH-905

Overview

In this PR, I added a Submerge section for aspirating and dispensing in the transfer step, but only when the liquid classes feature flag is enabled.

Test Plan and Hands on Testing

-Enable the liquid classes feature flag in the settings
-Add a transfer step and verify that the submerge field appears for both aspirating and dispensing

Changelog

-Added submerge criteria: Submerge speed and Submerge delay duration
-Added new submerge fields to 8_5_0 migration and updated fixture files

Review requests

Risk assessment

@syao1226 syao1226 changed the title feat(protocol-designer): add submerge for aspirate feat(protocol-designer): add submerge for aspirate and dispense Jan 28, 2025
@jerader
Copy link
Collaborator

jerader commented Jan 28, 2025 •
edited
Loading

Hey Shiyao! Don't forget to put the work in the move liquid tools behind the liquid classes feature flag: getEnableLiquidClasses is the reducer.

Additionally, the cypress migrations test will fail because we need to migrate the new submerge form fields. I am planning to create a 8.5.0 migration file after @ncdiehl11 cuts the 8.4.0 release branch. But you can add the new fields to that migration file once it is created.

@syao1226 syao1226 marked this pull request as ready for review January 28, 2025 20:43
@syao1226 syao1226 requested a review from a team as a code owner January 28, 2025 20:43
@ncdiehl11
Copy link
Collaborator

Hey Shiyao! Don't forget to put the work in the move liquid tools behind the liquid classes feature flag: getEnableLiquidClasses is the reducer.

Additionally, the cypress migrations test will fail because we need to migrate the new submerge form fields. I am planning to create a 8.5.0 migration file after @ncdiehl11 cuts the 8.4.0 release branch. But you can add the new fields to that migration file once it is created.

Hey @jerader, just confirming that 8.4.0 has been cut so you can safely merge the migration file to edge. No rush but ping us when you do.

@jerader
Copy link
Collaborator

jerader commented Jan 29, 2025

Hey Shiyao! Don't forget to put the work in the move liquid tools behind the liquid classes feature flag: getEnableLiquidClasses is the reducer.
Additionally, the cypress migrations test will fail because we need to migrate the new submerge form fields. I am planning to create a 8.5.0 migration file after @ncdiehl11 cuts the 8.4.0 release branch. But you can add the new fields to that migration file once it is created.

Hey @jerader, just confirming that 8.4.0 has been cut so you can safely merge the migration file to edge. No rush but ping us when you do.

@ncdiehl11, since Shiyao added a few new fields to the formData, we need to add those to a migration file. I have a Pr up that adds the 8_5_0 migration file that Shiyao can use once it is merged in. Hopefully i can get my Pr merged in today.

@ncdiehl11
Copy link
Collaborator

Generally looking good! I'm going to mark as "do not merge" because in addition to addressing these comments, we need to make sure we add the migration as commented above once this merges

@ncdiehl11 ncdiehl11 added blocked Ticket or PR is blocked by other work DO NOT MERGE Indicates a PR should not be merged, even if there's a shiny green merge button available labels Jan 29, 2025
@jerader
Copy link
Collaborator

jerader commented Jan 30, 2025

Just merged in my touch tip refactor PR, so you should be able to add to the 8_5_0 migration now @syao1226 !

@syao1226 syao1226 requested a review from ncdiehl11 February 3, 2025 15:12
@ncdiehl11 ncdiehl11 removed blocked Ticket or PR is blocked by other work DO NOT MERGE Indicates a PR should not be merged, even if there's a shiny green merge button available labels Feb 3, 2025
ncdiehl11
ncdiehl11 approved these changes Feb 3, 2025
View reviewed changes
Copy link
Collaborator

@ncdiehl11 ncdiehl11 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks great Shiyao! I left a comment on a small UI fix for the size of the info icon, but you can merge after that 👍

jerader
jerader approved these changes Feb 3, 2025
View reviewed changes
Copy link
Collaborator

@jerader jerader left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀 nice! i'll wait for this to merge in before I merge in my pr to avoid merge conflicts with the 8_5_0 migration 😄

@syao1226 syao1226 merged commit 82995e7 into edge Feb 3, 2025
14 checks passed
@syao1226
Copy link
Collaborator Author

syao1226 commented Feb 3, 2025 •
edited
Loading

@jerader merged😺

caila-marashaj pushed a commit that referenced this pull request Feb 11, 2025
@syao1226 @caila-marashaj
feat(protocol-designer): add submerge for aspirate and dispense (#17368)
dd86958 
re AUTH-904, AUTH-905

<!--
Thanks for taking the time to open a Pull Request (PR)! Please make sure
you've read the "Opening Pull Requests" section of our Contributing
Guide:


https://github.com/Opentrons/opentrons/blob/edge/CONTRIBUTING.md#opening-pull-requests

GitHub provides robust markdown to format your PR. Links, diagrams,
pictures, and videos along with text formatting make it possible to
create a rich and informative PR. For more information on GitHub
markdown, see:


https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax

To ensure your code is reviewed quickly and thoroughly, please fill out
the sections below to the best of your ability!
-->

# Overview

<!--
Describe your PR at a high level. State acceptance criteria and how this
PR fits into other work. Link issues, PRs, and other relevant resources.
-->

In this PR, I added a Submerge section for aspirating and dispensing in
the transfer step, but only when the liquid classes feature flag is
enabled.


## Test Plan and Hands on Testing

<!--
Describe your testing of the PR. Emphasize testing not reflected in the
code. Attach protocols, logs, screenshots and any other assets that
support your testing.
-->
-Enable the liquid classes feature flag in the settings
-Add a transfer step and verify that the submerge field appears for both
aspirating and dispensing

## Changelog

<!--
List changes introduced by this PR considering future developers and the
end user. Give careful thought and clear documentation to breaking
changes.
-->
-Added submerge criteria: Submerge speed and Submerge delay duration
-Added new submerge fields to 8_5_0 migration and updated fixture files


## Review requests

<!--
- What do you need from reviewers to feel confident this PR is ready to
merge?
- Ask questions.
-->


## Risk assessment

<!--
- Indicate the level of attention this PR needs.
- Provide context to guide reviewers.
- Discuss trade-offs, coupling, and side effects.
- Look for the possibility, even if you think it's small, that your
change may affect some other part of the system.
- For instance, changing return tip behavior may also change the
behavior of labware calibration.
- How do your unit tests and on hands on testing mitigate this PR's
risks and the risk of future regressions?
- Especially in high risk PRs, explain how you know your testing is
enough.
-->

---------

Co-authored-by: shiyaochen <[email protected]>
Co-authored-by: shiyaochen <[email protected]>
@syao1226 syao1226 deleted the pd-submerge-aspirate branch February 26, 2025 21:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ncdiehl11 ncdiehl11 ncdiehl11 approved these changes

@jerader jerader jerader approved these changes

@koji koji Awaiting requested review from koji

Assignees
No one assigned
Labels
authorship
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@syao1226 @jerader @ncdiehl11