Skip to content

Commit d124e85

Browse files
committed
fix(components,-protocol-designer): fix design bugs from PD 8.4.0 alpha.1
Fix several bugs including 1) properly displaying labware on absorbance reader in absorbance reader step form module options, and 2) removing the 'delete' button from wavelengths if selected insitialization mode is 'single' Closes RQA-3942, Closes RQA-3945
1 parent c53613e commit d124e85

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

components/src/molecules/DropdownMenu/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ export function DropdownMenu(props: DropdownMenuProps): JSX.Element {
332332
</StyledText>
333333
<StyledText
334334
desktopStyle="captionRegular"
335-
color={COLORS.black70}
335+
color={COLORS.grey60}
336336
>
337337
{option.subtext}
338338
</StyledText>

protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/AbsorbanceReaderTools/Initialization.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ function WavelengthItem(props: WavelengthItemProps): JSX.Element {
284284
handleDeleteWavelength,
285285
index,
286286
error,
287+
mode,
287288
} = props
288289
const { t } = useTranslation('form')
289290
const showCustom = !DEFINED_OPTIONS.some(({ value }) => value === wavelength)
@@ -334,7 +335,7 @@ function WavelengthItem(props: WavelengthItemProps): JSX.Element {
334335
error={!isFocused ? error : null}
335336
/>
336337
) : null}
337-
{wavelengths.length > 1 ? (
338+
{wavelengths.length > 1 && mode === 'multi' ? (
338339
<Btn
339340
onClick={() => {
340341
handleDeleteWavelength(index)

protocol-designer/src/ui/modules/selectors.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import {
1919
import type { DropdownOption } from '@opentrons/components'
2020
import type { Selector } from '../../types'
2121
import type { LabwareNamesByModuleId } from '../../steplist/types'
22+
import { getDeckSetupForActiveItem } from '../../top-selectors/labware-locations'
2223

2324
export const getLabwareNamesByModuleId: Selector<LabwareNamesByModuleId> = createSelector(
2425
getInitialDeckSetup,
@@ -86,11 +87,11 @@ export const getHeaterShakerLabwareOptions: Selector<
8687
export const getAbsorbanceReaderLabwareOptions: Selector<
8788
DropdownOption[]
8889
> = createSelector(
89-
getInitialDeckSetup,
90+
getDeckSetupForActiveItem,
9091
getLabwareNicknamesById,
91-
(initialDeckSetup, nicknamesById) => {
92+
(deckSetup, nicknamesById) => {
9293
const absorbanceReaderModuleOptions = getModuleLabwareOptions(
93-
initialDeckSetup,
94+
deckSetup,
9495
nicknamesById,
9596
ABSORBANCE_READER_TYPE
9697
)

0 commit comments

Comments
 (0)