From cda3432f7f5e6fc9f49945ea87e90eb0282f2ad5 Mon Sep 17 00:00:00 2001 From: Jethary Date: Thu, 19 Dec 2024 12:35:57 -0500 Subject: [PATCH] fix(protocol-designer): dropdown option text refinement closes RQA-3773 RQA-3774 RQA-3777 --- .../src/hardware-sim/DeckConfigurator/index.tsx | 2 -- .../__tests__/MaterialsListModal.test.tsx | 2 +- .../src/ui/labware/__tests__/selectors.test.ts | 8 +++----- protocol-designer/src/ui/labware/selectors.ts | 14 ++++++-------- protocol-designer/src/ui/labware/utils.ts | 3 +-- 5 files changed, 11 insertions(+), 18 deletions(-) diff --git a/components/src/hardware-sim/DeckConfigurator/index.tsx b/components/src/hardware-sim/DeckConfigurator/index.tsx index 65bb6968a45..4a03ff6c866 100644 --- a/components/src/hardware-sim/DeckConfigurator/index.tsx +++ b/components/src/hardware-sim/DeckConfigurator/index.tsx @@ -38,8 +38,6 @@ import { MagneticBlockFixture } from './MagneticBlockFixture' import { ThermocyclerFixture } from './ThermocyclerFixture' import { AbsorbanceReaderFixture } from './AbsorbanceReaderFixture' -export * from './constants' - interface DeckConfiguratorProps { deckConfig: DeckConfiguration handleClickAdd: (cutoutId: CutoutId) => void diff --git a/protocol-designer/src/organisms/MaterialsListModal/__tests__/MaterialsListModal.test.tsx b/protocol-designer/src/organisms/MaterialsListModal/__tests__/MaterialsListModal.test.tsx index d18fa1e52de..26e2d0fb098 100644 --- a/protocol-designer/src/organisms/MaterialsListModal/__tests__/MaterialsListModal.test.tsx +++ b/protocol-designer/src/organisms/MaterialsListModal/__tests__/MaterialsListModal.test.tsx @@ -137,7 +137,7 @@ describe('MaterialsListModal', () => { lidTargetTemp: null, lidOpen: false, }, - slot: 'span7_8_10_11', + slot: '7', type: 'thermocyclerModuleType', }, ] as ModuleOnDeck[] diff --git a/protocol-designer/src/ui/labware/__tests__/selectors.test.ts b/protocol-designer/src/ui/labware/__tests__/selectors.test.ts index e2d514ba787..e2c74b75508 100644 --- a/protocol-designer/src/ui/labware/__tests__/selectors.test.ts +++ b/protocol-designer/src/ui/labware/__tests__/selectors.test.ts @@ -9,7 +9,6 @@ import { THERMOCYCLER_MODULE_TYPE, THERMOCYCLER_MODULE_V1, } from '@opentrons/shared-data' -import { SPAN7_8_10_11_SLOT } from '../../../constants' import { getDisposalOptions, getLabwareOptions, @@ -23,7 +22,6 @@ import { } from '@opentrons/shared-data/labware/fixtures/2' import type { LabwareEntities } from '@opentrons/step-generation' -import type { InitialDeckSetup } from '../../../step-forms' describe('labware selectors', () => { let names: Record @@ -161,7 +159,7 @@ describe('labware selectors', () => { ...tipracks, ...otherLabware, } - const initialDeckSetup: InitialDeckSetup = { + const initialDeckSetup = { labware: labwareEntities, modules: {}, pipettes: {}, @@ -203,7 +201,7 @@ describe('labware selectors', () => { }, } const labwareEntities = { ...trash, ...labware } - const initialDeckSetup: InitialDeckSetup = { + const initialDeckSetup = { pipettes: {}, labware: { ...trash, @@ -275,7 +273,7 @@ describe('labware selectors', () => { }, } const labwareEntities = { ...trash, ...labware } - const initialDeckSetup: InitialDeckSetup = { + const initialDeckSetup = { pipettes: {}, labware: { ...labware, diff --git a/protocol-designer/src/ui/labware/selectors.ts b/protocol-designer/src/ui/labware/selectors.ts index 522b758ca30..d531b4b3d6d 100644 --- a/protocol-designer/src/ui/labware/selectors.ts +++ b/protocol-designer/src/ui/labware/selectors.ts @@ -1,10 +1,6 @@ import { createSelector } from 'reselect' import mapValues from 'lodash/mapValues' import reduce from 'lodash/reduce' -import { - WASTE_CHUTE_DISPLAY_NAME, - TRASH_BIN_DISPLAY_NAME, -} from '@opentrons/components' import { FLEX_ROBOT_TYPE, OT2_ROBOT_TYPE, @@ -27,6 +23,8 @@ import type { SavedStepFormState, } from '../../step-forms' +const TRASH_BIN = 'Trash bin' + export const getLabwareNicknamesById: Selector< Record > = createSelector( @@ -44,8 +42,8 @@ export const _sortLabwareDropdownOptions = ( ): DropdownOption[] => options.sort((a, b) => { // special case for trash (always at the bottom of the list) - if (a.name === TRASH_BIN_DISPLAY_NAME) return 1 - if (b.name === TRASH_BIN_DISPLAY_NAME) return -1 + if (a.name === TRASH_BIN) return 1 + if (b.name === TRASH_BIN) return -1 // sort by name everything else by name return a.name.localeCompare(b.name) }) @@ -228,7 +226,7 @@ export const getWasteChuteOption: Selector = createSelect const wasteChuteOption: DropdownOption | null = wasteChuteEntity != null ? { - name: WASTE_CHUTE_DISPLAY_NAME, + name: 'Waste chute', value: wasteChuteEntity.id, } : null @@ -252,7 +250,7 @@ export const getDisposalOptions = createSelector( ? [ ...acc, { - name: TRASH_BIN_DISPLAY_NAME, + name: TRASH_BIN, value: additionalEquipment.id ?? '', }, ] diff --git a/protocol-designer/src/ui/labware/utils.ts b/protocol-designer/src/ui/labware/utils.ts index cfa2922ea54..382a8677d15 100644 --- a/protocol-designer/src/ui/labware/utils.ts +++ b/protocol-designer/src/ui/labware/utils.ts @@ -4,7 +4,6 @@ import { RobotType, THERMOCYCLER_MODULE_TYPE, } from '@opentrons/shared-data' -import { WASTE_CHUTE_DISPLAY_NAME } from '@opentrons/components' import type { InitialDeckSetup, SavedStepFormState } from '../../step-forms' function resolveSlotLocation( @@ -58,7 +57,7 @@ export function getLabwareLatestSlot( hasWasteChute && (initialSlot === 'D3' || moveLabwareStep?.newLocation === 'D3') ) { - return WASTE_CHUTE_DISPLAY_NAME + return 'Waste chute' } if (moveLabwareStep?.newLocation != null) {