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

feat(protocol-designer, step-generation): support for selecting multi tipracks per pipette #14601

Merged
merged 16 commits into from
Mar 28, 2024
Merged

feat(protocol-designer, step-generation): support for selecting multi tipracks per pipette #14601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
420fb2b
add first bulk of stuff
jerader Feb 29, 2024
382317b
fix unit tests
jerader Mar 1, 2024
b83b178
fix most of the cypress migration tests
jerader Mar 1, 2024
5153b78
fix cypress test and bug in migration file
jerader Mar 1, 2024
d8d824d
fix yup validation schema type for tiprackDefUri
jerader Mar 5, 2024
f5170ab
feat(protocol-designer, step-generation): multi tiprack selection per…
jerader Mar 5, 2024
404e68e
add replace tip
jerader Mar 5, 2024
86c4efe
update tests to vitest
jerader Mar 8, 2024
d696b8c
fix css import
jerader Mar 8, 2024
07a1fb5
refactor a few things
jerader Mar 11, 2024
71eaa8b
address feedback
jerader Mar 25, 2024
cac303c
address more feedback
jerader Mar 25, 2024
d44ac87
fix lint error
jerader Mar 26, 2024
8a9548c
fix some utils
jerader Mar 26, 2024
27c12ee
tipRack instead of tiprack
jerader Mar 26, 2024
bbc0c95
fix prettier
jerader Mar 26, 2024
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
4 changes: 2 additions & 2 deletions components/src/instrument/InfoItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as React from 'react'
import styles from './instrument.module.css'

export interface InfoItemProps {
title: string
title: string | null
value: string
className?: string
}
Expand All @@ -17,7 +17,7 @@ export function InfoItem(props: InfoItemProps): JSX.Element {

return (
<div className={className}>
<h2 className={styles.title}>{title}</h2>
{title != null ? <h2 className={styles.title}>{title}</h2> : null}
<span className={styles.value}>{value}</span>
</div>
)
Expand Down
16 changes: 11 additions & 5 deletions components/src/instrument/InstrumentInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ export interface InstrumentInfoProps {
showMountLabel?: boolean | null
/** human-readable description, eg 'p300 Single-channel' */
description: string
/** paired tiprack model */
tiprackModel?: string
/** paired tiprack models */
tiprackModels?: string[]
/** if disabled, pipette & its info are grayed out */
isDisabled: boolean
/** specs of mounted pipette */
Expand Down Expand Up @@ -53,9 +53,15 @@ export function InstrumentInfo(props: InstrumentInfoProps): JSX.Element {
}
value={props.description}
/>
{props.tiprackModel && (
<InfoItem title="tip rack" value={props.tiprackModel} />
)}
{props.tiprackModels != null
? props.tiprackModels.map((model, index) => (
<InfoItem
key={`tiprackModel-${index}`}
title={index === 0 ? 'tip racks' : null}
value={model}
/>
))
: null}
</Flex>

{props.children}
Expand Down
14 changes: 8 additions & 6 deletions protocol-designer/cypress/integration/migrations.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@ describe('Protocol fixtures migrate and match snapshots', () => {

const testCases = [
{
title: 'example_1_1_0 (schema 1, PD version 1.1.1) -> PD 8.0.x, schema 8',
title: 'example_1_1_0 (schema 1, PD version 1.1.1) -> PD 8.1.x, schema 8',
importFixture: '../../fixtures/protocol/1/example_1_1_0.json',
expectedExportFixture:
'../../fixtures/protocol/8/example_1_1_0MigratedToV8.json',
unusedPipettes: true,
migrationModal: 'newLabwareDefs',
},
{
title: 'doItAllV3 (schema 3, PD version 4.0.0) -> PD 8.0.x, schema 8',
title: 'doItAllV3 (schema 3, PD version 4.0.0) -> PD 8.1.x, schema 8',
importFixture: '../../fixtures/protocol/4/doItAllV3.json',
expectedExportFixture:
'../../fixtures/protocol/8/doItAllV3MigratedToV8.json',
unusedPipettes: false,
migrationModal: 'v8',
},
{
title: 'doItAllV4 (schema 4, PD version 4.0.0) -> PD 8.0.x, schema 8',
title: 'doItAllV4 (schema 4, PD version 4.0.0) -> PD 8.1.x, schema 8',
importFixture: '../../fixtures/protocol/4/doItAllV4.json',
expectedExportFixture:
'../../fixtures/protocol/8/doItAllV4MigratedToV8.json',
Expand All @@ -38,15 +38,16 @@ describe('Protocol fixtures migrate and match snapshots', () => {
},
{
title:
'doItAll78MigratedToV8 (schema 7, PD version 8.0.0) -> should migrate to 8.0.x, schema 8',
'doItAll78MigratedToV8 (schema 7, PD version 8.0.0) -> should migrate to 8.1.x, schema 8',
importFixture: '../../fixtures/protocol/7/doItAllV7.json',
expectedExportFixture:
'../../fixtures/protocol/8/doItAllV7MigratedToV8.json',
unusedPipettes: false,
migrationModal: 'v8',
},
{
title: '96-channel full and column schema 8 -> reimported as schema 8',
title:
'96-channel full and column schema 8 -> should migrate to 8.1.x, schema 8',
importFixture:
'../../fixtures/protocol/8/ninetySixChannelFullAndColumn.json',
expectedExportFixture:
Expand All @@ -55,7 +56,8 @@ describe('Protocol fixtures migrate and match snapshots', () => {
unusedPipettes: false,
},
{
title: 'doItAllV8 flex robot -> reimported, should not migrate',
title:
'doItAllV8 flex robot -> reimported, should migrate to 8.1.x, schema 8',
importFixture: '../../fixtures/protocol/8/doItAllV8.json',
expectedExportFixture: '../../fixtures/protocol/8/doItAllV8.json',
migrationModal: null,
Expand Down
Loading
Loading