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,components): fix add a new case to info screen for labware #15041

Merged
merged 1 commit into from
Apr 30, 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
67 changes: 37 additions & 30 deletions app/src/organisms/ProtocolDetails/ProtocolLabwareDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
DIRECTION_ROW,
Flex,
Icon,
InfoScreen,
POSITION_ABSOLUTE,
POSITION_RELATIVE,
SPACING,
Expand Down Expand Up @@ -55,36 +56,42 @@ export const ProtocolLabwareDetails = (
: []

return (
<Flex flexDirection={DIRECTION_COLUMN} width="100%">
<Flex flexDirection={DIRECTION_ROW}>
<StyledText
as="label"
fontWeight={TYPOGRAPHY.fontWeightSemiBold}
marginBottom={SPACING.spacing8}
data-testid="ProtocolLabwareDetails_labware_name"
width="66%"
>
{t('labware_name')}
</StyledText>
<StyledText
as="label"
fontWeight={TYPOGRAPHY.fontWeightSemiBold}
data-testid="ProtocolLabwareDetails_quantity"
>
{t('quantity')}
</StyledText>
</Flex>
{labwareDetails?.map((labware, index) => (
<ProtocolLabwareDetailItem
key={index}
namespace={labware.params.namespace}
displayName={labware.result?.definition?.metadata?.displayName}
quantity={labware.quantity}
labware={{ definition: labware.result?.definition }}
data-testid={`ProtocolLabwareDetails_item_${index}`}
/>
))}
</Flex>
<>
{labwareDetails.length > 0 ? (
<Flex flexDirection={DIRECTION_COLUMN} width="100%">
<Flex flexDirection={DIRECTION_ROW}>
<StyledText
as="label"
fontWeight={TYPOGRAPHY.fontWeightSemiBold}
marginBottom={SPACING.spacing8}
data-testid="ProtocolLabwareDetails_labware_name"
width="66%"
>
{t('labware_name')}
</StyledText>
<StyledText
as="label"
fontWeight={TYPOGRAPHY.fontWeightSemiBold}
data-testid="ProtocolLabwareDetails_quantity"
>
{t('quantity')}
</StyledText>
</Flex>
{labwareDetails?.map((labware, index) => (
<ProtocolLabwareDetailItem
key={index}
namespace={labware.params.namespace}
displayName={labware.result?.definition?.metadata?.displayName}
quantity={labware.quantity}
labware={{ definition: labware.result?.definition }}
data-testid={`ProtocolLabwareDetails_item_${index}`}
/>
))}
</Flex>
) : (
<InfoScreen contentType="labware" />
)}
</>
)
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
import * as React from 'react'
import { screen } from '@testing-library/react'
import { describe, it, beforeEach } from 'vitest'
import { describe, it, beforeEach, vi } from 'vitest'
import { InfoScreen } from '@opentrons/components'
import { renderWithProviders } from '../../../__testing-utils__'
import { i18n } from '../../../i18n'
import { ProtocolLabwareDetails } from '../ProtocolLabwareDetails'

import type { LoadLabwareRunTimeCommand } from '@opentrons/shared-data'

vi.mock('@opentrons/components', async importOriginal => {
const actual = await importOriginal<typeof InfoScreen>()
return {
...actual,
InfoScreen: vi.fn(),
}
})

const mockRequiredLabwareDetails = [
{
id: '568fd127-5554-4e19-b303-a8aeb6d8547d',
Expand Down Expand Up @@ -70,6 +79,7 @@ describe('ProtocolLabwareDetails', () => {
props = {
requiredLabwareDetails: mockRequiredLabwareDetails,
}
vi.mocked(InfoScreen).mockReturnValue(<div>mock InfoScreen</div>)
})

it('should render an opentrons labware', () => {
Expand Down Expand Up @@ -136,4 +146,12 @@ describe('ProtocolLabwareDetails', () => {
screen.getByText('Quantity')
screen.getByText('2')
})

it('should render mock infoscreen when no labware', () => {
props = {
requiredLabwareDetails: [],
}
render(props)
screen.getByText('mock InfoScreen')
})
})
5 changes: 4 additions & 1 deletion components/src/molecules/ParametersTable/InfoScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Flex } from '../../primitives'
import { ALIGN_CENTER, DIRECTION_COLUMN } from '../../styles'

interface InfoScreenProps {
contentType: 'parameters' | 'moduleControls' | 'runNotStarted'
contentType: 'parameters' | 'moduleControls' | 'runNotStarted' | 'labware'
t?: any
}

Expand All @@ -30,6 +30,9 @@ export function InfoScreen({ contentType, t }: InfoScreenProps): JSX.Element {
case 'runNotStarted':
bodyText = t != null ? t('run_never_started') : 'Run was never started'
break
case 'labware':
bodyText = 'No labware specified in this protocol'
break
default:
bodyText = contentType
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,24 @@ describe('InfoScreen', () => {
screen.getByText('Connect modules to see controls')
})

it('should render text and icon with proper color - run not started', () => {
props = {
contentType: 'runNotStarted',
}
render(props)
screen.getByLabelText('alert')
screen.getByText('Run was never started')
})

it('should render text and icon with proper color - labware', () => {
props = {
contentType: 'labware',
}
render(props)
screen.getByLabelText('alert')
screen.getByText('No labware specified in this protocol')
})

it('should have proper styles', () => {
render(props)
expect(screen.getByTestId('InfoScreen_parameters')).toHaveStyle(
Expand Down
Loading