Skip to content

Commit f0ec5e5

Browse files
authored
chore(shared-data,app): Block evotips labware from PD, LL, and Quick Transfer (#17460)
1 parent 163a297 commit f0ec5e5

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

app/src/organisms/ODD/QuickTransferFlow/constants.ts

-3
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ export const SINGLE_CHANNEL_COMPATIBLE_LABWARE = [
100100
'opentrons/thermoscientificnunc_96_wellplate_2000ul/1',
101101
'opentrons/usascientific_12_reservoir_22ml/1',
102102
'opentrons/usascientific_96_wellplate_2.4ml_deep/1',
103-
'opentrons/evotips_opentrons_96_labware/1',
104103
]
105104

106105
export const EIGHT_CHANNEL_COMPATIBLE_LABWARE = [
@@ -145,7 +144,6 @@ export const EIGHT_CHANNEL_COMPATIBLE_LABWARE = [
145144
'opentrons/thermoscientificnunc_96_wellplate_2000ul/1',
146145
'opentrons/usascientific_12_reservoir_22ml/1',
147146
'opentrons/usascientific_96_wellplate_2.4ml_deep/1',
148-
'opentrons/evotips_opentrons_96_labware/1',
149147
]
150148

151149
export const NINETY_SIX_CHANNEL_COMPATIBLE_LABWARE = [
@@ -190,5 +188,4 @@ export const NINETY_SIX_CHANNEL_COMPATIBLE_LABWARE = [
190188
'opentrons/thermoscientificnunc_96_wellplate_2000ul/1',
191189
'opentrons/usascientific_12_reservoir_22ml/1',
192190
'opentrons/usascientific_96_wellplate_2.4ml_deep/1',
193-
'opentrons/evotips_opentrons_96_labware/1',
194191
]

app/src/organisms/ODD/QuickTransferFlow/utils/getCompatibleLabwareByCategory.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import { getAllDefinitions } from '@opentrons/shared-data'
1+
import {
2+
getAllDefinitions,
3+
LABWAREV2_DO_NOT_LIST,
4+
} from '@opentrons/shared-data'
25
import {
36
SINGLE_CHANNEL_COMPATIBLE_LABWARE,
47
EIGHT_CHANNEL_COMPATIBLE_LABWARE,
@@ -12,7 +15,7 @@ export function getCompatibleLabwareByCategory(
1215
pipetteChannels: 1 | 8 | 96,
1316
category: LabwareFilter
1417
): LabwareDefinition2[] | undefined {
15-
const allLabwareDefinitions = getAllDefinitions()
18+
const allLabwareDefinitions = getAllDefinitions(LABWAREV2_DO_NOT_LIST)
1619
let compatibleLabwareUris: string[] = SINGLE_CHANNEL_COMPATIBLE_LABWARE
1720
if (pipetteChannels === 8) {
1821
compatibleLabwareUris = EIGHT_CHANNEL_COMPATIBLE_LABWARE

shared-data/js/getLabware.ts

+6
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ export const LABWAREV2_DO_NOT_LIST = [
4444
'opentrons_ot3_96_tiprack_1000ul',
4545
'opentrons_ot3_96_tiprack_50ul',
4646
'opentrons_flex_lid_absorbance_plate_reader_module',
47+
// temporarily blocking evotips until it is out of beta
48+
'evotips_flex_96_tiprack_adapter',
49+
'evotips_opentrons_96_labware',
4750
]
4851
// NOTE(sa, 2020-7-14): in PD we do not want to list calibration blocks
4952
// or the adapter/labware combos since we migrated to splitting them up
@@ -60,6 +63,9 @@ export const PD_DO_NOT_LIST = [
6063
// temporarily blocking TC lid adapter and deck riser until it is supported in PD
6164
'opentrons_tough_pcr_auto_sealing_lid',
6265
'opentrons_flex_deck_riser',
66+
// temporarily blocking evotips until it is supported in PD
67+
'evotips_flex_96_tiprack_adapter',
68+
'evotips_opentrons_96_labware',
6369
]
6470

6571
export function getIsLabwareV1Tiprack(def: LabwareDefinition1): boolean {

0 commit comments

Comments
 (0)