Skip to content

Commit 0d9e835

Browse files
authored
refactor(protocol-designer): dQA for deck setup and protocol overview (#18525)
closes RQA-2122, RQA-4212, RQA-4213, RQA-4214, RQA-4215, RQA-4217, RQA-4218, RQA-4231,
1 parent 9f9d268 commit 0d9e835

File tree

12 files changed

+23
-16
lines changed

12 files changed

+23
-16
lines changed

protocol-designer/src/assets/localization/en/protocol_steps.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
},
2727
"change_tips": "Change tips",
2828
"column": "Column",
29-
"configurations": "Configurations",
29+
"configuration": "Configuration",
3030
"consolidate": "Conslidate",
3131
"of": "of",
3232
"comfirm_reset_settings": {

protocol-designer/src/assets/localization/en/shared.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"copyright": "Copyright © {{year}} Opentrons",
2020
"create_a_protocol": "Create a protocol",
2121
"create_new": "Create new",
22+
"deck_hardware": "Deck Hardware",
2223
"destination_well": "Destination Well",
2324
"developer_ff": "Developer Feature Flags",
2425
"done": "Done",

protocol-designer/src/assets/localization/en/starting_deck_state.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"convert_gen1_to_gen2": "To convert engage heights from GEN1 to GEN2, divide your engage height by 2.",
2323
"convert_gen2_to_gen1": "To convert engage heights from GEN2 to GEN1, multiply your engage height by 2.",
2424
"custom": "Custom labware definitions",
25-
"customize_slot": "Customize slot",
2625
"deck_hardware": "Deck hardware",
2726
"deck_slots_full": "Deck slots are full",
2827
"define_liquid": "Define a liquid",

protocol-designer/src/components/molecules/LiquidButton/index.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,13 @@ export function LiquidButton({
3838
name="water-drop"
3939
data-testid="water-drop"
4040
/>
41-
<StyledText desktopStyle="bodyDefaultSemiBold">{t('liquids')}</StyledText>
41+
<StyledText
42+
desktopStyle={
43+
isInToolbox ? 'bodyDefaultRegular' : 'bodyDefaultSemiBold'
44+
}
45+
>
46+
{t('liquids')}
47+
</StyledText>
4248
</Btn>
4349
)
4450
}

protocol-designer/src/pages/Designer/DeckSetup/DeckSetupToolbox.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ export function DeckSetupToolbox(
249249
}
250250
/>
251251
<StyledText desktopStyle="bodyLargeSemiBold">
252-
{t('customize_slot')}
252+
{t('edit_labware')}
253253
</StyledText>
254254
</Flex>
255255
}

protocol-designer/src/pages/Designer/DeckSetup/__tests__/DeckSetupToolbox.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ describe('DeckSetupToolbox', () => {
107107
})
108108
it('should render empty labware and add labware CTA opens modal ', () => {
109109
render(props)
110-
screen.getByText('Customize slot')
110+
screen.getByText('Edit labware')
111111
screen.getByText('Add labware')
112112
screen.getByText('No labware added')
113113
screen.getByText('Select labware to add to slot')

protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/Configurations.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ export function Configurations({
3636
desktopStyle="bodyDefaultSemiBold"
3737
css={LINE_CLAMP_TEXT_STYLE(1)}
3838
>
39-
{t('configurations')}
39+
{t('configuration')}
4040
</StyledText>
41-
<Flex flexDirection={DIRECTION_COLUMN} gridGap={SPACING.spacing8}>
41+
<Flex flexDirection={DIRECTION_COLUMN} gridGap={SPACING.spacing4}>
4242
<HardwareStep sidebarWidth={sidebarWidth} />
4343
<LiquidButton
4444
showLiquidOverflowMenu={showLiquidOverflowMenu}

protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/TimelineToolbox.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ export function TimelineToolbox({
131131
maxHeight={`calc(100vh - ${NAV_BAR_HEIGHT_REM}rem - 2 * ${SPACING.spacing12})`}
132132
width={`${sidebarWidth / 16}rem`}
133133
title={
134-
<Flex flexDirection={DIRECTION_COLUMN}>
134+
<Flex flexDirection={DIRECTION_COLUMN} gridGap={SPACING.spacing8}>
135135
<StyledText
136-
desktopStyle="bodyDefaultSemiBold"
136+
desktopStyle="bodyLargeSemiBold"
137137
overflowWrap={OVERFLOW_WRAP_ANYWHERE}
138138
css={LINE_CLAMP_TEXT_STYLE(1)}
139139
>

protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/__tests__/Configurations.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ describe('Configurations', () => {
3434

3535
it('should render test and mock components', () => {
3636
render(props)
37-
screen.getByText('Configurations')
37+
screen.getByText('Configuration')
3838
screen.getByText('mock LiquidButton')
3939
screen.getByText('mock HardwareStep')
4040
})

protocol-designer/src/pages/ProtocolOverview/HardwareInfo.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ export function HardwareInfo({
4141
const { t } = useTranslation(['protocol_overview', 'shared'])
4242
const navigate = useNavigate()
4343
const isFlex = robotType === FLEX_ROBOT_TYPE
44-
const tCSlot = isFlex ? 'A1, B1' : '7,8,10,11'
44+
const tCSlot = isFlex ? 'A1+B1' : '7,8,10,11'
4545
const additionalEquipmentLength = Object.keys(additionalEquipment).length
4646

4747
return (
4848
<Flex flexDirection={DIRECTION_COLUMN} gridGap={SPACING.spacing12}>
4949
<Flex justifyContent={JUSTIFY_SPACE_BETWEEN} alignItems={ALIGN_CENTER}>
5050
<StyledText desktopStyle="headingSmallBold">
51-
{isFlex ? t('deck_hardware') : t('modules')}
51+
{isFlex ? t('shared:deck_hardware') : t('modules')}
5252
</StyledText>
5353
<Flex padding={SPACING.spacing4}>
5454
<Btn

0 commit comments

Comments
 (0)