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): cannot move trash into slot with a module #14650

Merged
merged 4 commits into from
Mar 13, 2024
Merged

fix(protocol-designer): cannot move trash into slot with a module #14650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac37c83
fix(protocol-designer): cannot move trash into slot with a module
jerader Mar 13, 2024
5195a60
account for ot-2
jerader Mar 13, 2024
02c19dd
fix test
jerader Mar 13, 2024
8cb492c
address comments
jerader Mar 13, 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
4 changes: 1 addition & 3 deletions protocol-designer/src/components/modals/EditModulesModal/__tests__/EditModulesModal.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,7 @@ describe('Edit Modules Modal', () => {
render(props)
screen.getByText('Thermocycler module')
screen.getByText('warning')
screen.getByText(
'Slot 10 is occupied by a Heater-Shaker. Other modules cannot be placed in front of or behind a Heater-Shaker.'
)
screen.getByText('Cannot place module')
screen.getByText('mock SlotMap')
})
it('renders a heater-shaker for flex and can select different slots', () => {
Expand Down
6 changes: 5 additions & 1 deletion protocol-designer/src/components/modals/EditModulesModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,11 @@ const EditModulesModalComponent = (
{slotIssue ? (
<PDAlert
alertType="warning"
title={validation.selectedSlot}
title={
robotType === OT2_ROBOT_TYPE
? t('alert:module_placement.SLOT_OCCUPIED.title')
: validation.selectedSlot
Copy link
Collaborator Author

@jerader jerader Mar 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

the validation.selectedSlot text is too long to fit on the ot-2 modal (the validation text was fixing a bug when i migrated to react hook form). so i changed it to just cannot place module text which is what we had before.

}
description={''}
/>
) : null}
Expand Down
19 changes: 16 additions & 3 deletions protocol-designer/src/step-forms/utils/index.ts
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you add type to L14?

Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { SPAN7_8_10_11_SLOT, TC_SPAN_SLOTS } from '../../constants'
import { hydrateField } from '../../steplist/fieldLevel'
import { LabwareDefByDefURI } from '../../labware-defs'
import type { DeckSlotId, ModuleType } from '@opentrons/shared-data'
import {
import type {
AdditionalEquipmentOnDeck,
InitialDeckSetup,
ModuleOnDeck,
Expand Down Expand Up @@ -120,14 +120,23 @@ export const getSlotIdsBlockedBySpanning = (

return []
}
// TODO(jr, 3/13/24): refactor this util it is messy and confusing
export const getSlotIsEmpty = (
initialDeckSetup: InitialDeckSetup,
slot: string,
/* we don't always want to count the slot as full if there is a staging area present
since labware/wasteChute can still go on top of staging areas **/
includeStagingAreas?: boolean
): boolean => {
// special-casing the TC's slot A1 for the Flex
if (
slot === 'cutoutA1' &&
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

this is special casing for the thermocycler A1 slot

Object.values(initialDeckSetup.modules).find(
module => module.type === THERMOCYCLER_MODULE_TYPE
)
) {
return false
} else if (
slot === SPAN7_8_10_11_SLOT &&
TC_SPAN_SLOTS.some(slot => !getSlotIsEmpty(initialDeckSetup, slot))
) {
Expand Down Expand Up @@ -157,11 +166,15 @@ export const getSlotIsEmpty = (
return additionalEquipment.location?.includes(slot) && includeStaging
}
})

return (
[
...values(initialDeckSetup.modules).filter(
(moduleOnDeck: ModuleOnDeck) => moduleOnDeck.slot === slot
(moduleOnDeck: ModuleOnDeck) => {
const cutoutForSlotOt2 = slotToCutoutOt2Map[slot]
return cutoutForSlotOt2 != null
? moduleOnDeck.slot === slot
: slot.includes(moduleOnDeck.slot)
}
),
...values(initialDeckSetup.labware).filter(
(labware: LabwareOnDeckType) => labware.slot === slot
Expand Down
Loading