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): fix slotOverflowMenu for tipracks on adapters and update path selection for trash bin #16908

Merged
merged 3 commits into from
Nov 20, 2024
Merged

fix(protocol-designer): fix slotOverflowMenu for tipracks on adapters and update path selection for trash bin #16908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a3c6d9
fix(protocol-designer): disallowing add liquid and rename labware for…
Nov 20, 2024
797d72f
search for quirk tiprackAdapterFor96Channel
Nov 20, 2024
1e5dc3d
expand check for movableTrash and fixedTrash
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
10 changes: 9 additions & 1 deletion protocol-designer/src/pages/Designer/DeckSetup/SlotOverflowMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,16 @@ export function SlotOverflowMenu(
const isLabwareTiprack = labwareOnSlot?.def.parameters.isTiprack ?? false
const isLabwareAnAdapter =
labwareOnSlot?.def.allowedRoles?.includes('adapter') ?? false

const isTiprackAdapter =
labwareOnSlot?.def.parameters.quirks?.includes(
'tiprackAdapterFor96Channel'
) ?? false

const nestedLabwareOnSlot = Object.values(deckSetupLabware).find(
lw => lw.slot === labwareOnSlot?.id
)

const fixturesOnSlot = Object.values(additionalEquipmentOnDeck).filter(
ae => ae.location?.split('cutout')[1] === location
)
Expand Down Expand Up @@ -170,8 +177,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
Expand Down
4 changes: 3 additions & 1 deletion 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 @@ -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[],
Expand Down
Loading