From 2b2cc05b6601bc61c61a6aa4147904e20e21691a Mon Sep 17 00:00:00 2001 From: smb2268 Date: Thu, 6 Feb 2025 17:58:17 -0500 Subject: [PATCH 1/3] chore(shared-data): add evotips labware to labware library and PD blocklists --- shared-data/js/getLabware.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/shared-data/js/getLabware.ts b/shared-data/js/getLabware.ts index 41949e01d9a..a6a42801639 100644 --- a/shared-data/js/getLabware.ts +++ b/shared-data/js/getLabware.ts @@ -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 @@ -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 { From d75159fe06cebbebe09f7f06cd7d62efb1f5295d Mon Sep 17 00:00:00 2001 From: smb2268 Date: Thu, 6 Feb 2025 18:27:16 -0500 Subject: [PATCH 2/3] Remove evotips from quick transfer --- app/src/organisms/ODD/QuickTransferFlow/constants.ts | 3 --- .../utils/getCompatibleLabwareByCategory.ts | 9 ++++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/organisms/ODD/QuickTransferFlow/constants.ts b/app/src/organisms/ODD/QuickTransferFlow/constants.ts index 5aa6aa3b60d..dd1b18cda43 100644 --- a/app/src/organisms/ODD/QuickTransferFlow/constants.ts +++ b/app/src/organisms/ODD/QuickTransferFlow/constants.ts @@ -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 = [ @@ -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 = [ @@ -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', ] diff --git a/app/src/organisms/ODD/QuickTransferFlow/utils/getCompatibleLabwareByCategory.ts b/app/src/organisms/ODD/QuickTransferFlow/utils/getCompatibleLabwareByCategory.ts index cb52a095a33..5c091ba5b35 100644 --- a/app/src/organisms/ODD/QuickTransferFlow/utils/getCompatibleLabwareByCategory.ts +++ b/app/src/organisms/ODD/QuickTransferFlow/utils/getCompatibleLabwareByCategory.ts @@ -1,10 +1,12 @@ -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, NINETY_SIX_CHANNEL_COMPATIBLE_LABWARE, } from '../constants' - import type { LabwareDefinition2 } from '@opentrons/shared-data' import type { LabwareFilter } from '/app/local-resources/labware' @@ -12,7 +14,8 @@ export function getCompatibleLabwareByCategory( pipetteChannels: 1 | 8 | 96, category: LabwareFilter ): LabwareDefinition2[] | undefined { - const allLabwareDefinitions = getAllDefinitions() + const allLabwareDefinitions = getAllDefinitions(LABWAREV2_DO_NOT_LIST) + console.log(allLabwareDefinitions) let compatibleLabwareUris: string[] = SINGLE_CHANNEL_COMPATIBLE_LABWARE if (pipetteChannels === 8) { compatibleLabwareUris = EIGHT_CHANNEL_COMPATIBLE_LABWARE From b7390b738088de1b70f69016af15ce09e3bf3bf6 Mon Sep 17 00:00:00 2001 From: smb2268 Date: Thu, 6 Feb 2025 22:25:52 -0500 Subject: [PATCH 3/3] remove console --- .../QuickTransferFlow/utils/getCompatibleLabwareByCategory.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/organisms/ODD/QuickTransferFlow/utils/getCompatibleLabwareByCategory.ts b/app/src/organisms/ODD/QuickTransferFlow/utils/getCompatibleLabwareByCategory.ts index 5c091ba5b35..dd0c0ff7182 100644 --- a/app/src/organisms/ODD/QuickTransferFlow/utils/getCompatibleLabwareByCategory.ts +++ b/app/src/organisms/ODD/QuickTransferFlow/utils/getCompatibleLabwareByCategory.ts @@ -7,6 +7,7 @@ import { EIGHT_CHANNEL_COMPATIBLE_LABWARE, NINETY_SIX_CHANNEL_COMPATIBLE_LABWARE, } from '../constants' + import type { LabwareDefinition2 } from '@opentrons/shared-data' import type { LabwareFilter } from '/app/local-resources/labware' @@ -15,7 +16,6 @@ export function getCompatibleLabwareByCategory( category: LabwareFilter ): LabwareDefinition2[] | undefined { const allLabwareDefinitions = getAllDefinitions(LABWAREV2_DO_NOT_LIST) - console.log(allLabwareDefinitions) let compatibleLabwareUris: string[] = SINGLE_CHANNEL_COMPATIBLE_LABWARE if (pipetteChannels === 8) { compatibleLabwareUris = EIGHT_CHANNEL_COMPATIBLE_LABWARE