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

fix(protocol-designer): switching pipettes when source and/or dest labware fields are unselected #16894

Merged
merged 4 commits into from
Nov 20, 2024
Merged

fix(protocol-designer): switching pipettes when source and/or dest labware fields are unselected #16894

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e668882
fix(protocol-designer): switching pipettes when source and/or dest la…
Nov 19, 2024
26560e1
check if labware id is not null before update
Nov 19, 2024
bae1d02
Merge branch 'edge' into pd-switch-pipette
Nov 19, 2024
da61c78
Merge branch 'edge' into pd-switch-pipette
Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions protocol-designer/src/steplist/formLevel/handleFormChange/dependentFieldsUpdateMoveLiquid.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,29 +543,30 @@ const updatePatchOnPipetteChannelChange = (
const sourceLabwareId: string = appliedPatch.aspirate_labware as string
const destLabwareId: string = appliedPatch.dispense_labware as string
const sourceLabware = labwareEntities[sourceLabwareId]
const sourceLabwareDef = sourceLabware.def
const destLabware = labwareEntities[destLabwareId]

update = {
aspirate_wells: getAllWellsFromPrimaryWells(
appliedPatch.aspirate_wells as string[],
sourceLabwareDef,
channels as 8 | 96
),
dispense_wells:
destLabwareId.includes('trashBin') ||
destLabwareId.includes('wasteChute')
? getDefaultWells({
labwareId: destLabwareId,
pipetteId,
labwareEntities,
pipetteEntities,
})
: getAllWellsFromPrimaryWells(
appliedPatch.dispense_wells as string[],
destLabware.def,
channels as 8 | 96
),
if (sourceLabwareId != null && destLabwareId != null) {
update = {
aspirate_wells: getAllWellsFromPrimaryWells(
appliedPatch.aspirate_wells as string[],
sourceLabware.def,
channels as 8 | 96
),
dispense_wells:
destLabwareId.includes('trashBin') ||
destLabwareId.includes('wasteChute')
? getDefaultWells({
labwareId: destLabwareId,
pipetteId,
labwareEntities,
pipetteEntities,
})
: getAllWellsFromPrimaryWells(
appliedPatch.dispense_wells as string[],
destLabware.def,
channels as 8 | 96
),
}
}
}

Expand Down
Loading