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.

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

feat(protocol-designer, step-generation): support for selecting multi tipracks per pipette #14601

Merged
merged 16 commits into from
Mar 28, 2024

Conversation

jerader
Copy link
Collaborator

@jerader jerader commented Mar 5, 2024

closes AUTH-11, AUTH-13, AUTH-50

Overview

This PR adds multi tiprack support to PD for both OT-2 and Flex. Now, a user can select up to 3 tipracks per pipette. Only up to 2 tipracks will auto-generate on the deck but user should be allowed to select all selected tipracks from the labware dropdown.

sandbox https://sandbox.designer.opentrons.com/pd_multi-tiprack-support-in-pd/

Test Plan

Create a flex or Ot-2 protocol. check that the tiprack selection page in the wizard allows you to add up to 3 tipracks for both pipettes. See that the protocol is created correctly. Now, test editing the pipettes and tipracks. See that it works correctly. Then go to the deck map and ensure that every tiprack selected is selectable on the labware selection modal for the deckmap.

Add a labware and create a pipetting step (mix or transfer). Make sure all the tipracks for that pipette are selectable in the dropdown. Test switching between 2 tipracks and see that the tip tracking is accurate between the multiple tipracks.

Export the protocol and import it again and ensure that it imports correctly. Then, try importing a json fixture, like doItAllV8 and see that it migrates correctly.

Finally, test the 96-channel. Create a flex protocol with the 96-channel and test out a few transfer/mix steps alternating between the different tip racks.

Changelog

  • create 8_1_0 migration, changing the tiprackDefUri key from a string to an array
  • fix cypress tests
  • update types in PD and step-generation
  • create new tiprackSelect, tiprackOption files for selecting tipracks
  • fix createFileWizard and FilePipetteModal to accommodate multi tipracks
  • add the new fields to transfer and mix forms
  • add new tiprack fields to designerApplication and then pass it down to step-generation for the transfer, mix, consolidate, distribute
  • add to CreatePresavedStepForm for defaulting the tiprack dropdown based on the pipette and add error state to tipRack field
  • edit getNextTip logic to accommodate multiple tiprack def URIs
  • fix all unit tests

Review requests

see test plan

Risk assessment

low - adds lots of code but plenty of time to test before the next release

@jerader jerader added the DO NOT MERGE Indicates a PR should not be merged, even if there's a shiny green merge button available label Mar 5, 2024
Copy link

codecov bot commented Mar 5, 2024

Codecov Report

Attention: Patch coverage is 29.45736% with 91 lines in your changes are missing coverage. Please review.

Project coverage is 67.65%. Comparing base (1b28bab) to head (e592e73).
Report is 2 commits behind head on edge.

❗ Current head e592e73 differs from pull request most recent head bbc0c95. Consider uploading reports for the commit bbc0c95 to get more accurate results

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             edge   #14601      +/-   ##
==========================================
+ Coverage   67.20%   67.65%   +0.45%     
==========================================
  Files        2495     2514      +19     
  Lines       71549    72332     +783     
  Branches     9022     9308     +286     
==========================================
+ Hits        48085    48937     +852     
+ Misses      21342    21160     -182     
- Partials     2122     2235     +113     
Flag Coverage Δ
app 64.68% <ø> (+0.63%) ⬆️
components 48.94% <0.00%> (+0.65%) ⬆️
labware-library 41.11% <ø> (+0.10%) ⬆️
protocol-designer 37.75% <30.40%> (-0.14%) ⬇️
step-generation 86.91% <ø> (+0.07%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
...gner/src/components/StepEditForm/forms/MixForm.tsx 0.00% <ø> (ø)
...onents/StepEditForm/forms/MoveLiquidForm/index.tsx 0.00% <ø> (ø)
...r/src/components/modals/CreateFileWizard/index.tsx 71.00% <100.00%> (ø)
...ponents/modals/FilePipettesModal/TiprackOption.tsx 100.00% <100.00%> (ø)
...ol-designer/src/file-data/selectors/fileCreator.ts 66.66% <100.00%> (ø)
protocol-designer/src/file-types.ts 50.00% <ø> (ø)
protocol-designer/src/form-types.ts 42.85% <ø> (ø)
protocol-designer/src/load-file/migration/index.ts 50.00% <ø> (ø)
...load-file/migration/utils/getLoadLiquidCommands.ts 91.30% <ø> (ø)
protocol-designer/src/steplist/formLevel/errors.ts 38.70% <100.00%> (+0.49%) ⬆️
... and 32 more

... and 325 files with indirect coverage changes

@jerader jerader changed the title feat(protocol-designer, step-generation): multi tiprack selection per pipette support feat(protocol-designer, step-generation): support for selecting multi tipracks per pipette Mar 6, 2024
@jerader jerader force-pushed the pd_multi-tiprack-support-in-pd branch from e592e73 to f4884da Compare March 8, 2024 21:15
@jerader jerader marked this pull request as ready for review March 11, 2024 14:19
@jerader jerader requested a review from a team as a code owner March 11, 2024 14:19
@jerader jerader requested a review from a team March 11, 2024 14:19
@jerader jerader requested a review from a team as a code owner March 11, 2024 14:19
@jerader jerader requested review from mjhuff and a team and removed request for a team and mjhuff March 11, 2024 14:19
@jerader jerader removed the DO NOT MERGE Indicates a PR should not be merged, even if there's a shiny green merge button available label Mar 11, 2024
@koji koji requested a review from a team March 11, 2024 17:03
@koji koji requested a review from a team March 11, 2024 19:16
@jerader jerader force-pushed the pd_multi-tiprack-support-in-pd branch 2 times, most recently from 00468cc to 0cf0059 Compare March 12, 2024 20:58
@jerader jerader added the DO NOT MERGE Indicates a PR should not be merged, even if there's a shiny green merge button available label Mar 12, 2024
@jerader jerader removed the DO NOT MERGE Indicates a PR should not be merged, even if there's a shiny green merge button available label Mar 25, 2024
@jerader jerader force-pushed the pd_multi-tiprack-support-in-pd branch from 0cf0059 to c234f7d Compare March 25, 2024 16:13
@jerader jerader requested a review from koji March 25, 2024 16:16
@koji koji requested a review from a team March 25, 2024 19:51
@jerader jerader requested a review from koji March 25, 2024 20:42
@jerader jerader force-pushed the pd_multi-tiprack-support-in-pd branch from b00d24b to 0943263 Compare March 26, 2024 17:14
@jerader jerader force-pushed the pd_multi-tiprack-support-in-pd branch from f0e9068 to bbc0c95 Compare March 27, 2024 12:26
Copy link
Contributor

@koji koji left a comment

Choose a reason for hiding this comment

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

LGTM

@jerader jerader merged commit bae275d into edge Mar 28, 2024
48 checks passed
@jerader jerader deleted the pd_multi-tiprack-support-in-pd branch March 28, 2024 14:50
Carlos-fernandez pushed a commit that referenced this pull request May 20, 2024
Comment on lines +282 to +283
const maxAirGapVolume =
getPipetteCapacity(pipetteEntity, tipRack) - minPipetteVolume
Copy link
Contributor

Choose a reason for hiding this comment

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

It looks like getPipetteCapacity should be receiving labwareEntities as the second param. This appears to be a bug @jerader can you look into it?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants