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.

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

fix(app): update new confirmation buttons on protocol setup #16132

Merged
merged 3 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions app/src/assets/localization/en/protocol_setup.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"additional_off_deck_labware": "Additional Off-Deck Labware",
"all_files_associated": "All files associated with the protocol run are available on the robot detail screen.",
"applied_labware_offsets": "applied labware offsets",
"applied_labware_offset_data": "Applied labware offset data",
"are_you_sure_you_want_to_proceed": "Are you sure you want to proceed to run?",
"attach_gripper_failure_reason": "Attach the required gripper to continue",
"attach_gripper": "attach gripper",
Expand Down
1 change: 1 addition & 0 deletions app/src/organisms/ProtocolSetupLabware/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ export function ProtocolSetupLabware({
setIsConfirmed(true)
setSetupScreen('prepare to run')
}}
buttonCategory="rounded"
/>
)}
</Flex>
Expand Down
1 change: 1 addition & 0 deletions app/src/organisms/ProtocolSetupLiquids/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ export function ProtocolSetupLiquids({
setIsConfirmed(true)
setSetupScreen('prepare to run')
}}
buttonCategory="rounded"
/>
)}
</Flex>
Expand Down
33 changes: 26 additions & 7 deletions app/src/organisms/ProtocolSetupOffsets/index.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import * as React from 'react'
import { useTranslation } from 'react-i18next'
import {
Flex,
Chip,
DIRECTION_COLUMN,
DIRECTION_ROW,
Flex,
InfoScreen,
JUSTIFY_SPACE_BETWEEN,
Chip,
SPACING,
StyledText,
} from '@opentrons/components'

import type { LabwareOffset } from '@opentrons/api-client'
Expand Down Expand Up @@ -92,19 +96,34 @@ export function ProtocolSetupOffsets({
/>
) : (
<SmallButton
buttonText={t('confirm_placements')}
buttonText={t('confirm_offsets')}
disabled={nonIdentityOffsets.length === 0}
onClick={() => {
setIsConfirmed(true)
setSetupScreen('prepare to run')
}}
buttonCategory="rounded"
/>
)}
</Flex>
<TerseOffsetTable
offsets={nonIdentityOffsets}
labwareDefinitions={labwareDefinitions}
/>
<Flex marginTop={SPACING.spacing32} flexDirection={DIRECTION_COLUMN}>
{nonIdentityOffsets.length > 0 ? (
<>
<StyledText
oddStyle="level4HeaderSemiBold"
marginBottom={SPACING.spacing8}
>
{t('applied_labware_offset_data')}
</StyledText>
<TerseOffsetTable
offsets={nonIdentityOffsets}
labwareDefinitions={labwareDefinitions}
/>
</>
) : (
<InfoScreen contentType="noLabwareOffsetDataYet" />
)}
</Flex>
<FloatingActionButton
buttonText={t('update_offsets')}
iconName="reticle"
Expand Down
59 changes: 42 additions & 17 deletions components/src/molecules/ParametersTable/InfoScreen.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import * as React from 'react'

import { BORDERS, COLORS } from '../../helix-design-system'
import { SPACING, TYPOGRAPHY } from '../../ui-style-constants/index'
import { LegacyStyledText } from '../../atoms/StyledText'
import { RESPONSIVENESS, SPACING } from '../../ui-style-constants/index'
import { StyledText } from '../../atoms/StyledText'
import { Icon } from '../../icons'
import { Flex } from '../../primitives'
import { ALIGN_CENTER, DIRECTION_COLUMN } from '../../styles'
import { ALIGN_CENTER, DIRECTION_COLUMN, JUSTIFY_CENTER } from '../../styles'
import { css } from 'styled-components'

interface InfoScreenProps {
contentType:
Expand All @@ -15,15 +16,14 @@ interface InfoScreenProps {
| 'labware'
| 'noFiles'
| 'noLabwareOffsetData'
| 'noLabwareOffsetDataYet'
t?: any
backgroundColor?: string
height?: string
}

export function InfoScreen({
contentType,
t,
backgroundColor,
}: InfoScreenProps): JSX.Element {
export function InfoScreen(props: InfoScreenProps): JSX.Element {
const { contentType, t, backgroundColor } = props
let bodyText: string = ''
switch (contentType) {
case 'parameters':
Expand Down Expand Up @@ -54,30 +54,55 @@ export function InfoScreen({
? t('no_offsets_available')
: 'No Labware Offset data available'
break
case 'noLabwareOffsetDataYet':
bodyText =
t != null ? t('no_labware_offset_data') : 'No labware offset data yet'
ncdiehl11 marked this conversation as resolved.
Show resolved Hide resolved
break
default:
bodyText = contentType
}

return (
<Flex
alignItems={ALIGN_CENTER}
width="100%"
flexDirection={DIRECTION_COLUMN}
gridGap={SPACING.spacing12}
backgroundColor={backgroundColor ?? COLORS.grey30}
borderRadius={BORDERS.borderRadius8}
padding={`${SPACING.spacing40} ${SPACING.spacing16}`}
data-testid={`InfoScreen_${contentType}`}
css={css`
width: 100%;
padding: ${SPACING.spacing40} ${SPACING.spacing16};
grid-gap: ${SPACING.spacing12};
flex-direction: ${DIRECTION_COLUMN};
background-color: ${backgroundColor ?? COLORS.grey30};
border-radius: ${BORDERS.borderRadius8};
align-items: ${ALIGN_CENTER};
justify-content: ${JUSTIFY_CENTER};
> svg {
height: 1.25rem;
width: 1.25rem;
}
@media ${RESPONSIVENESS.touchscreenMediaQuerySpecs} {
height: 27.25rem;
padding: 0;
grid-gap: ${SPACING.spacing32};
background-color: ${backgroundColor ?? COLORS.grey35};
border-radius: ${BORDERS.borderRadius12};
> svg {
height: 3rem;
width: 3rem;
}
}
`}
>
<Icon
name="ot-alert"
size="1.25rem"
color={COLORS.grey60}
aria-label="alert"
/>
<LegacyStyledText as="p" fontWeight={TYPOGRAPHY.fontWeightSemiBold}>
<StyledText
desktopStyle="bodyDefaultSemiBold"
oddStyle="level3HeaderSemiBold"
>
{bodyText}
</LegacyStyledText>
</StyledText>
</Flex>
)
}
Loading