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

Jump to bottom

refactor(app): heater-shaker in app design changes #10366

Merged
merged 5 commits into from
May 24, 2022
Merged

refactor(app): heater-shaker in app design changes #10366

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b2659a
refactor(app): heater-shaker in app design changes
jerader May 19, 2022
3ae9be8
refactor and address comments
jerader May 20, 2022
78492ea
fix rebase error
jerader May 23, 2022
2c06611
address design feedback
jerader May 23, 2022
86b3de4
update snap
jerader May 23, 2022
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
Prev Previous commit
Next Next commit
address design feedback
  • Loading branch information
@jerader
jerader committed May 23, 2022
commit 2c06611d55b136e293d5a5bab1a7fd6228d42f03
Binary file modified app/src/assets/images/heater-shaker-key-parts.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions app/src/assets/localization/en/heater_shaker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
"1a": "1a",
"1b": "1b",
"1c": "1c",
"attach_module_anchor_not_extended": "<block>Before placing the module on the deck, make sure the anchors are <bold>not extended</bold>.</block>",
"attach_module_anchor_not_extended": "<block>Before placing the module on the deck, make sure the <bold>anchors are not extended and are level</bold> with the module’s base.</block>",
"attach_module_turn_screws": "<block>Turn screws <icon></icon> counterclockwise to retract the anchors. The screws should <bold>not</bold> come out of the module.</block>",
"orient_heater_shaker_module": "<block>Orient your module such that the plugs for power and USB connection are <bold>outward</bold>.</block>",
"orient_heater_shaker_module": "<block>Orient your module such that the <bold>power and USB ports are facing outward</bold>.</block>",
"place_the_module_slot": "<block>Place the module in a Slot.</block>",
"place_the_module_slot_number": "<block>Place the module in <bold>Slot {{slot}}</bold>.</block>",
"attach_module_extend_anchors": "<block>Hold the module flat against the deck and turn screws <icon></icon> clockwise to <bold>extend the anchors</bold>.",
Expand All @@ -53,7 +53,7 @@
"heater_shaker_key_parts": "Key Heater-Shaker parts and terminology",
"heater_shaker_orient_module": "Orient the module so its power ports face <bold>away</bold> from you.",
"heater_shaker_latch_description": "<block>The <strong>Labware Latch</strong> keeps labware secure while the module is shaking.</block> <block>It can be opened or closed manually and with software but is closed and locked while the module is shaking.</block>",
"heater_shaker_anchor_description": "<block>The 2 <strong>Anchors</strong> keep the module attached to the deck while it is shaking.</block> <block>The screw above each anchor is used to extend and retract them. See animation below.</block> <block>Extending the bolts slightly increases the module’s footprint, which allows it to be more firmly attached to the edges of a slot.</block>",
"heater_shaker_anchor_description": "<block>The 2 <strong>Anchors</strong> keep the module attached to the deck while it is shaking.</block> <block>To extend and retract each anchor, turn the screw above it. See animation below.</block> <block>Extending the anchors increases the module’s footprint, which more firmly attaches it to the slot.</block>",
"step_4_of_4": "Step 4 of 4: Test shake",
"test_shake_banner_information": "If you want to add labware to the module before doing a test shake, you can use the labware latch controls to hold the latches open.",
"test_shake_banner_labware_information": "If you want to add the <strong>{{labware}}</strong> to the module before doing a test shake, you can use the labware latch controls.",
Expand Down
2 changes: 1 addition & 1 deletion app/src/organisms/Devices/HeaterShakerWizard/AttachModule.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ export function AttachModule(props: AttachModuleProps): JSX.Element {
marginBottom={SPACING.spacing5}
/>
),
icon: <Icon name="counter-clockwise-arrow" size={'1.313rem'} />,
icon: <Icon name="clockwise-arrow" size={'1.313rem'} />,
}}
/>
</Flex>
Expand Down
7 changes: 6 additions & 1 deletion app/src/organisms/Devices/HeaterShakerWizard/KeyParts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,12 @@ export function KeyParts(): JSX.Element {
marginY={SPACING.spacing6}
alignItems={ALIGN_FLEX_START}
>
<img src={HeaterShakerKeyParts} alt="Heater Shaker Key Parts" />
<img
width="427px"
height="357px"
src={HeaterShakerKeyParts}
alt="Heater Shaker Key Parts"
/>

<Flex
flexDirection={DIRECTION_COLUMN}
Expand Down
7 changes: 1 addition & 6 deletions app/src/organisms/Devices/HeaterShakerWizard/TestShake.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,15 +149,10 @@ export function TestShake(props: TestShakeProps): JSX.Element {
marginTop={SPACING.spacing4}
onClick={toggleLatch}
disabled={isShaking}
{...targetProps}
>
{isLatchClosed ? t('open_labware_latch') : t('close_labware_latch')}
</TertiaryButton>
{isShaking ? (
<Tooltip tooltipProps={tooltipProps}>
{t('cannot_open_latch', { ns: 'heater_shaker' })}
</Tooltip>
) : null}

<Flex
flexDirection={DIRECTION_ROW}
marginY={SPACING.spacingL}
Expand Down
2 changes: 1 addition & 1 deletion app/src/organisms/Devices/HeaterShakerWizard/__tests__/AttachModule.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ describe('AttachModule', () => {
)
getByText(
nestedTextMatcher(
'Orient your module such that the plugs for power and USB connection are outward.'
'Orient your module such that the power and USB ports are facing outward.'
)
)
getByText(
Expand Down
4 changes: 2 additions & 2 deletions app/src/organisms/Devices/HeaterShakerWizard/__tests__/KeyParts.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ describe('KeyParts', () => {
)
)
getByText(
'The screw above each anchor is used to extend and retract them. See animation below.'
'To extend and retract each anchor, turn the screw above it. See animation below.'
)
getByText(
'Extending the bolts slightly increases the module’s footprint, which allows it to be more firmly attached to the edges of a slot.'
'Extending the anchors increases the module’s footprint, which more firmly attaches it to the slot.'
)
getByAltText('Heater Shaker Key Parts')

Expand Down
13 changes: 12 additions & 1 deletion app/src/organisms/Devices/ModuleCard/HeaterShakerModuleData.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@ const MODULE_STATUS_STYLING = css`
}
`

const HS_MODULE_CARD_STYLING = css`
display: grid;
grid-template-columns: repeat(1, 1fr);

@media (min-width: 800px) {
grid-template-columns: repeat(2, 1fr);
}
`

export const HeaterShakerModuleData = (
props: HeaterShakerModuleDataProps
): JSX.Element | null => {
Expand Down Expand Up @@ -120,7 +129,9 @@ export const HeaterShakerModuleData = (
}

return (
<Flex css={MODULE_STATUS_STYLING}>
<Flex
css={showTemperatureData ? MODULE_STATUS_STYLING : HS_MODULE_CARD_STYLING}
>
{showTemperatureData && (
<Flex
flexDirection={DIRECTION_COLUMN}
Expand Down
5 changes: 5 additions & 0 deletions components/src/icons/icon-data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,11 @@ export const ICON_DATA_BY_NAME = {
path:
'M12 0C9.61305 0 7.32387 0.948211 5.63604 2.63604C3.94821 4.32387 3 6.61305 3 9H0L3.89 12.89L3.96 13.03L8 9H5C5 7.14348 5.7375 5.36301 7.05025 4.05025C8.36301 2.7375 10.1435 2 12 2C13.8565 2 15.637 2.7375 16.9497 4.05025C18.2625 5.36301 19 7.14348 19 9C19 10.8565 18.2625 12.637 16.9497 13.9497C15.637 15.2625 13.8565 16 12 16C10.07 16 8.32 15.21 7.06 13.94L5.64 15.36C7.27 17 9.5 18 12 18C14.3869 18 16.6761 17.0518 18.364 15.364C20.0518 13.6761 21 11.3869 21 9C21 6.61305 20.0518 4.32387 18.364 2.63604C16.6761 0.948211 14.3869 0 12 0Z',
},
'clockwise-arrow': {
viewBox: '0 0 21 18',
path:
'M9 0C11.3869 0 13.6761 0.948211 15.364 2.63604C17.0518 4.32387 18 6.61305 18 9H21L17.11 12.89L17.04 13.03L13 9H16C16 7.14348 15.2625 5.36301 13.9497 4.05025C12.637 2.7375 10.8565 2 9 2C7.14348 2 5.36301 2.7375 4.05025 4.05025C2.7375 5.36301 2 7.14348 2 9C2 10.8565 2.7375 12.637 4.05025 13.9497C5.36301 15.2625 7.14348 16 9 16C10.93 16 12.68 15.21 13.94 13.94L15.36 15.36C13.73 17 11.5 18 9 18C6.61305 18 4.32387 17.0518 2.63604 15.364C0.948212 13.6761 0 11.3869 0 9C0 6.61305 0.948212 4.32387 2.63604 2.63604C4.32387 0.948211 6.61305 0 9 0Z',
},
'ot-hot-to-touch': {
viewBox: '0 0 16 16',
path:
Expand Down