-
+
{is96Channel ? (
) : null}
diff --git a/protocol-designer/src/components/StepEditForm/forms/MoveLiquidForm/index.tsx b/protocol-designer/src/components/StepEditForm/forms/MoveLiquidForm/index.tsx
index 67bd45ec663..66b8f1e34c2 100644
--- a/protocol-designer/src/components/StepEditForm/forms/MoveLiquidForm/index.tsx
+++ b/protocol-designer/src/components/StepEditForm/forms/MoveLiquidForm/index.tsx
@@ -42,7 +42,10 @@ export const MoveLiquidForm = (props: StepFormProps): JSX.Element => {
-
+
{is96Channel ? (
) : null}
diff --git a/protocol-designer/src/components/modals/CreateFileWizard/index.tsx b/protocol-designer/src/components/modals/CreateFileWizard/index.tsx
index eea2264199a..b19ab426f65 100644
--- a/protocol-designer/src/components/modals/CreateFileWizard/index.tsx
+++ b/protocol-designer/src/components/modals/CreateFileWizard/index.tsx
@@ -240,15 +240,15 @@ export function CreateFileWizard(): JSX.Element | null {
const newTiprackModels: string[] = uniq(
pipettes.flatMap(pipette => pipette.tiprackDefURI)
)
+ const FLEX_MIDDLE_SLOTS = ['C2', 'B2', 'A2']
+ const OT2_MIDDLE_SLOTS = ['2', '5', '8', '11']
newTiprackModels.forEach((tiprackDefURI, index) => {
- const ot2Slots = index === 0 ? '2' : '5'
- const flexSlots = index === 0 ? 'C2' : 'B2'
dispatch(
labwareIngredActions.createContainer({
slot:
values.fields.robotType === FLEX_ROBOT_TYPE
- ? flexSlots
- : ot2Slots,
+ ? FLEX_MIDDLE_SLOTS[index]
+ : OT2_MIDDLE_SLOTS[index],
labwareDefURI: tiprackDefURI,
adapterUnderLabwareDefURI:
values.pipettesByMount.left.pipetteName === 'p1000_96'
diff --git a/protocol-designer/src/localization/en/tooltip.json b/protocol-designer/src/localization/en/tooltip.json
index 7ef580d81ce..8e293d8efdd 100644
--- a/protocol-designer/src/localization/en/tooltip.json
+++ b/protocol-designer/src/localization/en/tooltip.json
@@ -8,6 +8,7 @@
"disabled_you_can_add_one_type": "Only one module of each type is allowed on the deck at a time",
"not_enough_space_for_temp": "There is not enough space on the deck to add more temperature modules",
"not_in_beta": "ⓘ Coming Soon",
+ "missing_tiprack": "Missing a tiprack? Make sure it is added to the deck",
"step_description": {
"heaterShaker": "Set heat, shake, or labware latch commands for the Heater-Shaker module",
diff --git a/protocol-designer/src/ui/labware/selectors.ts b/protocol-designer/src/ui/labware/selectors.ts
index dd4be8f0c62..27b3ea9f3ae 100644
--- a/protocol-designer/src/ui/labware/selectors.ts
+++ b/protocol-designer/src/ui/labware/selectors.ts
@@ -241,17 +241,22 @@ export const getDisposalOptions = createSelector(
}
)
-export const getTiprackOptions: Selector
= createSelector(
+export interface TiprackOption {
+ name: string
+ value: string
+ defURI: string
+}
+export const getTiprackOptions: Selector = createSelector(
stepFormSelectors.getLabwareEntities,
getLabwareNicknamesById,
(labwareEntities, nicknamesById) => {
const options = reduce(
labwareEntities,
(
- acc: Options,
+ acc: TiprackOption[],
labwareEntity: LabwareEntity,
labwareId: string
- ): Options => {
+ ): TiprackOption[] => {
const labwareDefURI = labwareEntity.labwareDefURI
const optionValues = acc.map(option => option.value)
@@ -266,12 +271,13 @@ export const getTiprackOptions: Selector = createSelector(
{
name: nicknamesById[labwareId],
value: labwareId,
+ defURI: labwareDefURI,
},
]
}
},
[]
)
- return _sortLabwareDropdownOptions(options)
+ return options
}
)