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

chore(shared-data,app): Block evotips labware from PD, LL, and Quick Transfer #17460

Merged
merged 3 commits into from
Feb 7, 2025
Merged

chore(shared-data,app): Block evotips labware from PD, LL, and Quick Transfer #17460

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
2b2cc05
chore(shared-data): add evotips labware to labware library and PD blo…
smb2268 Feb 6, 2025
d75159f
Remove evotips from quick transfer
smb2268 Feb 6, 2025
b7390b7
remove console
smb2268 Feb 7, 2025
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
3 changes: 0 additions & 3 deletions app/src/organisms/ODD/QuickTransferFlow/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ export const SINGLE_CHANNEL_COMPATIBLE_LABWARE = [
'opentrons/thermoscientificnunc_96_wellplate_2000ul/1',
'opentrons/usascientific_12_reservoir_22ml/1',
'opentrons/usascientific_96_wellplate_2.4ml_deep/1',
'opentrons/evotips_opentrons_96_labware/1',
]

export const EIGHT_CHANNEL_COMPATIBLE_LABWARE = [
Expand Down Expand Up @@ -145,7 +144,6 @@ export const EIGHT_CHANNEL_COMPATIBLE_LABWARE = [
'opentrons/thermoscientificnunc_96_wellplate_2000ul/1',
'opentrons/usascientific_12_reservoir_22ml/1',
'opentrons/usascientific_96_wellplate_2.4ml_deep/1',
'opentrons/evotips_opentrons_96_labware/1',
]

export const NINETY_SIX_CHANNEL_COMPATIBLE_LABWARE = [
Expand Down Expand Up @@ -190,5 +188,4 @@ export const NINETY_SIX_CHANNEL_COMPATIBLE_LABWARE = [
'opentrons/thermoscientificnunc_96_wellplate_2000ul/1',
'opentrons/usascientific_12_reservoir_22ml/1',
'opentrons/usascientific_96_wellplate_2.4ml_deep/1',
'opentrons/evotips_opentrons_96_labware/1',
]
7 changes: 5 additions & 2 deletions app/src/organisms/ODD/QuickTransferFlow/utils/getCompatibleLabwareByCategory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { getAllDefinitions } from '@opentrons/shared-data'
import {
getAllDefinitions,
LABWAREV2_DO_NOT_LIST,
} from '@opentrons/shared-data'
import {
SINGLE_CHANNEL_COMPATIBLE_LABWARE,
EIGHT_CHANNEL_COMPATIBLE_LABWARE,
Expand All @@ -12,7 +15,7 @@ export function getCompatibleLabwareByCategory(
pipetteChannels: 1 | 8 | 96,
category: LabwareFilter
): LabwareDefinition2[] | undefined {
const allLabwareDefinitions = getAllDefinitions()
const allLabwareDefinitions = getAllDefinitions(LABWAREV2_DO_NOT_LIST)
let compatibleLabwareUris: string[] = SINGLE_CHANNEL_COMPATIBLE_LABWARE
if (pipetteChannels === 8) {
compatibleLabwareUris = EIGHT_CHANNEL_COMPATIBLE_LABWARE
Expand Down
6 changes: 6 additions & 0 deletions shared-data/js/getLabware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ export const LABWAREV2_DO_NOT_LIST = [
'opentrons_ot3_96_tiprack_1000ul',
'opentrons_ot3_96_tiprack_50ul',
'opentrons_flex_lid_absorbance_plate_reader_module',
// temporarily blocking evotips until it is out of beta
'evotips_flex_96_tiprack_adapter',
'evotips_opentrons_96_labware',
]
// NOTE(sa, 2020-7-14): in PD we do not want to list calibration blocks
// or the adapter/labware combos since we migrated to splitting them up
Expand All @@ -60,6 +63,9 @@ export const PD_DO_NOT_LIST = [
// temporarily blocking TC lid adapter and deck riser until it is supported in PD
'opentrons_tough_pcr_auto_sealing_lid',
'opentrons_flex_deck_riser',
// temporarily blocking evotips until it is supported in PD
'evotips_flex_96_tiprack_adapter',
'evotips_opentrons_96_labware',
]

export function getIsLabwareV1Tiprack(def: LabwareDefinition1): boolean {
Expand Down
Loading