From 3a3c6d974fed24017a6090c08e6d869f87639d94 Mon Sep 17 00:00:00 2001 From: shiyaochen Date: Wed, 20 Nov 2024 11:54:02 -0500 Subject: [PATCH 1/3] fix(protocol-designer): disallowing add liquid and rename labware for tiprack on adapter fix RQA-3607 --- .../src/pages/Designer/DeckSetup/SlotOverflowMenu.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/protocol-designer/src/pages/Designer/DeckSetup/SlotOverflowMenu.tsx b/protocol-designer/src/pages/Designer/DeckSetup/SlotOverflowMenu.tsx index b45f314f689..d2d28637e57 100644 --- a/protocol-designer/src/pages/Designer/DeckSetup/SlotOverflowMenu.tsx +++ b/protocol-designer/src/pages/Designer/DeckSetup/SlotOverflowMenu.tsx @@ -113,9 +113,14 @@ export function SlotOverflowMenu( const isLabwareTiprack = labwareOnSlot?.def.parameters.isTiprack ?? false const isLabwareAnAdapter = labwareOnSlot?.def.allowedRoles?.includes('adapter') ?? false + + const isTiprackAdapter = + labwareOnSlot?.id.includes('tiprack') && isLabwareAnAdapter + const nestedLabwareOnSlot = Object.values(deckSetupLabware).find( lw => lw.slot === labwareOnSlot?.id ) + const fixturesOnSlot = Object.values(additionalEquipmentOnDeck).filter( ae => ae.location?.split('cutout')[1] === location ) @@ -170,8 +175,9 @@ export function SlotOverflowMenu( (labwareOnSlot != null && !isLabwareAnAdapter && !isLabwareTiprack && + !isTiprackAdapter && nestedLabwareOnSlot == null) || - nestedLabwareOnSlot != null + (nestedLabwareOnSlot != null && !isTiprackAdapter) let position = ROBOT_BOTTOM_HALF_SLOTS.includes(location) ? BOTTOM_SLOT_Y_POSITION From 797d72f17600993ad307e8e155f1bbb4291a79bd Mon Sep 17 00:00:00 2001 From: shiyaochen Date: Wed, 20 Nov 2024 13:55:04 -0500 Subject: [PATCH 2/3] search for quirk tiprackAdapterFor96Channel --- .../src/pages/Designer/DeckSetup/SlotOverflowMenu.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/protocol-designer/src/pages/Designer/DeckSetup/SlotOverflowMenu.tsx b/protocol-designer/src/pages/Designer/DeckSetup/SlotOverflowMenu.tsx index d2d28637e57..c949fc3ab90 100644 --- a/protocol-designer/src/pages/Designer/DeckSetup/SlotOverflowMenu.tsx +++ b/protocol-designer/src/pages/Designer/DeckSetup/SlotOverflowMenu.tsx @@ -115,7 +115,9 @@ export function SlotOverflowMenu( labwareOnSlot?.def.allowedRoles?.includes('adapter') ?? false const isTiprackAdapter = - labwareOnSlot?.id.includes('tiprack') && isLabwareAnAdapter + labwareOnSlot?.def.parameters.quirks?.includes( + 'tiprackAdapterFor96Channel' + ) ?? false const nestedLabwareOnSlot = Object.values(deckSetupLabware).find( lw => lw.slot === labwareOnSlot?.id From 1e5dc3dfb6047710c7a1e4973fa44ef5a15d4ae7 Mon Sep 17 00:00:00 2001 From: shiyaochen Date: Wed, 20 Nov 2024 15:51:26 -0500 Subject: [PATCH 3/3] expand check for movableTrash and fixedTrash --- .../handleFormChange/dependentFieldsUpdateMoveLiquid.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/protocol-designer/src/steplist/formLevel/handleFormChange/dependentFieldsUpdateMoveLiquid.ts b/protocol-designer/src/steplist/formLevel/handleFormChange/dependentFieldsUpdateMoveLiquid.ts index c473af451ea..ffcc93fb89c 100644 --- a/protocol-designer/src/steplist/formLevel/handleFormChange/dependentFieldsUpdateMoveLiquid.ts +++ b/protocol-designer/src/steplist/formLevel/handleFormChange/dependentFieldsUpdateMoveLiquid.ts @@ -579,7 +579,9 @@ function updatePatchOnWellRatioChange( const appliedPatch = { ...rawForm, ...patch } const isDisposalLocation = rawForm.dispense_labware?.includes('wasteChute') || - rawForm.dispense_labware?.includes('trashBin') + rawForm.dispense_labware?.includes('trashBin') || + rawForm.dispense_labware?.includes('movableTrash') || + rawForm.dispense_labware?.includes('fixedTrash') const prevWellRatio = getWellRatio( rawForm.aspirate_wells as string[],