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(app): add value key to RTP type #14692

Merged
merged 5 commits into from
Mar 19, 2024
Merged

feat(app): add value key to RTP type #14692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2db5007
feat(app): add value key to RTP type
jerader Mar 19, 2024
735988f
save the type file lmao
jerader Mar 19, 2024
5704db1
fix rebase issue
jerader Mar 19, 2024
e8c83ed
fix mock in test
jerader Mar 19, 2024
c599644
whoops fix another test fixture
jerader Mar 19, 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
11 changes: 11 additions & 0 deletions app/src/organisms/Devices/ProtocolRun/ProtocolRunRunTimeParameters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,23 @@ import type { RunTimeParameter } from '@opentrons/shared-data'

const mockData: RunTimeParameter[] = [
{
value: false,
displayName: 'Dry Run',
variableName: 'DRYRUN',
description: 'Is this a dry or wet run? Wet is true, dry is false',
type: 'boolean',
default: false,
},
{
value: true,
displayName: 'Use Gripper',
variableName: 'USE_GRIPPER',
description: 'For using the gripper.',
type: 'boolean',
default: true,
},
{
value: true,
displayName: 'Trash Tips',
variableName: 'TIP_TRASH',
description:
Expand All @@ -46,13 +49,15 @@ const mockData: RunTimeParameter[] = [
default: true,
},
{
value: true,
displayName: 'Deactivate Temperatures',
variableName: 'DEACTIVATE_TEMP',
description: 'deactivate temperature on the module',
type: 'boolean',
default: true,
},
{
value: 4,
displayName: 'Columns of Samples',
variableName: 'COLUMNS',
description: 'How many columns do you want?',
Expand All @@ -62,6 +67,7 @@ const mockData: RunTimeParameter[] = [
default: 4,
},
{
value: 6,
displayName: 'PCR Cycles',
variableName: 'PCR_CYCLES',
description: 'number of PCR cycles on a thermocycler',
Expand All @@ -71,6 +77,7 @@ const mockData: RunTimeParameter[] = [
default: 6,
},
{
value: 6.5,
displayName: 'EtoH Volume',
variableName: 'ETOH_VOLUME',
description: '70% ethanol volume',
Expand All @@ -81,6 +88,7 @@ const mockData: RunTimeParameter[] = [
default: 6.5,
},
{
value: 'none',
displayName: 'Default Module Offsets',
variableName: 'DEFAULT_OFFSETS',
description: 'default module offsets for temp, H-S, and none',
Expand All @@ -102,6 +110,7 @@ const mockData: RunTimeParameter[] = [
default: 'none',
},
{
value: 'left',
displayName: 'pipette mount',
variableName: 'mont',
description: 'pipette mount',
Expand All @@ -119,6 +128,7 @@ const mockData: RunTimeParameter[] = [
default: 'left',
},
{
value: 'flex',
displayName: 'short test case',
variableName: 'short 2 options',
description: 'this play 2 short options',
Expand All @@ -136,6 +146,7 @@ const mockData: RunTimeParameter[] = [
default: 'flex',
},
{
value: 'flex',
displayName: 'long test case',
variableName: 'long 2 options',
description: 'this play 2 long options',
Expand Down
4 changes: 4 additions & 0 deletions app/src/organisms/Devices/ProtocolRun/__tests__/ProtocolRunRuntimeParameters.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const mockRunTimeParameterData: RunTimeParameter[] = [
description: 'Is this a dry or wet run? Wet is true, dry is false',
type: 'boolean',
default: false,
value: false,
},
{
displayName: 'Columns of Samples',
Expand All @@ -36,6 +37,7 @@ const mockRunTimeParameterData: RunTimeParameter[] = [
min: 1,
max: 14,
default: 4,
value: 4,
},
{
displayName: 'EtoH Volume',
Expand All @@ -46,12 +48,14 @@ const mockRunTimeParameterData: RunTimeParameter[] = [
min: 1.5,
max: 10.0,
default: 6.5,
value: 6.5,
},
{
displayName: 'Default Module Offsets',
variableName: 'DEFAULT_OFFSETS',
description: 'default module offsets for temp, H-S, and none',
type: 'str',
value: 'none',
choices: [
{
displayName: 'No offsets',
Expand Down
4 changes: 4 additions & 0 deletions app/src/organisms/ProtocolDetails/ProtocolParameters/__tests__/ProtocolParameters.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const mockRunTimeParameter: RunTimeParameter[] = [
'to throw tip into the trash or to not throw tip into the trash',
type: 'boolean',
default: true,
value: true,
},
{
displayName: 'EtoH Volume',
Expand All @@ -29,12 +30,14 @@ const mockRunTimeParameter: RunTimeParameter[] = [
min: 1.5,
max: 10.0,
default: 6.5,
value: 6.5,
},
{
displayName: 'Default Module Offsets',
variableName: 'DEFAULT_OFFSETS',
description: 'default module offsets for temp, H-S, and none',
type: 'str',
value: 'none',
choices: [
{
displayName: 'No offsets',
Expand All @@ -56,6 +59,7 @@ const mockRunTimeParameter: RunTimeParameter[] = [
variableName: 'mont',
description: 'pipette mount',
type: 'str',
value: 'left',
choices: [
{
displayName: 'Left',
Expand Down
11 changes: 11 additions & 0 deletions app/src/organisms/ProtocolSetupParameters/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,23 @@ import type { RunTimeParameter } from '@opentrons/shared-data'

const mockData: RunTimeParameter[] = [
{
value: false,
displayName: 'Dry Run',
variableName: 'DRYRUN',
description: 'Is this a dry or wet run? Wet is true, dry is false',
type: 'boolean',
default: false,
},
{
value: true,
displayName: 'Use Gripper',
variableName: 'USE_GRIPPER',
description: 'For using the gripper.',
type: 'boolean',
default: true,
},
{
value: true,
displayName: 'Trash Tips',
variableName: 'TIP_TRASH',
description:
Expand All @@ -38,13 +41,15 @@ const mockData: RunTimeParameter[] = [
default: true,
},
{
value: true,
displayName: 'Deactivate Temperatures',
variableName: 'DEACTIVATE_TEMP',
description: 'deactivate temperature on the module',
type: 'boolean',
default: true,
},
{
value: 4,
displayName: 'Columns of Samples',
variableName: 'COLUMNS',
description: 'How many columns do you want?',
Expand All @@ -54,6 +59,7 @@ const mockData: RunTimeParameter[] = [
default: 4,
},
{
value: 6,
displayName: 'PCR Cycles',
variableName: 'PCR_CYCLES',
description: 'number of PCR cycles on a thermocycler',
Expand All @@ -63,6 +69,7 @@ const mockData: RunTimeParameter[] = [
default: 6,
},
{
value: 6.5,
displayName: 'EtoH Volume',
variableName: 'ETOH_VOLUME',
description: '70% ethanol volume',
Expand All @@ -73,6 +80,7 @@ const mockData: RunTimeParameter[] = [
default: 6.5,
},
{
value: 'none',
displayName: 'Default Module Offsets',
variableName: 'DEFAULT_OFFSETS',
description: 'default module offsets for temp, H-S, and none',
Expand All @@ -94,6 +102,7 @@ const mockData: RunTimeParameter[] = [
default: 'none',
},
{
value: 'left',
displayName: 'pipette mount',
variableName: 'mont',
description: 'pipette mount',
Expand All @@ -111,6 +120,7 @@ const mockData: RunTimeParameter[] = [
default: 'left',
},
{
value: 'flex',
displayName: 'short test case',
variableName: 'short 2 options',
description: 'this play 2 short options',
Expand All @@ -128,6 +138,7 @@ const mockData: RunTimeParameter[] = [
default: 'flex',
},
{
value: 'flex',
displayName: 'long test case',
variableName: 'long 2 options',
description: 'this play 2 long options',
Expand Down
9 changes: 9 additions & 0 deletions app/src/pages/ProtocolDetails/fixtures.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,31 @@ export const mockRunTimeParameterData: RunTimeParameter[] = [
description: 'a dry run description',
type: 'boolean',
default: false,
value: false,
},
{
displayName: 'Use Gripper',
variableName: 'USE_GRIPPER',
description: '',
type: 'boolean',
default: true,
value: true,
},
{
displayName: 'Trash Tips',
variableName: 'TIP_TRASH',
description: 'throw tip in trash',
type: 'boolean',
default: true,
value: true,
},
{
displayName: 'Deactivate Temperatures',
variableName: 'DEACTIVATE_TEMP',
description: 'deactivate temperature?',
type: 'boolean',
default: true,
value: true,
},
{
displayName: 'Columns of Samples',
Expand All @@ -38,6 +42,7 @@ export const mockRunTimeParameterData: RunTimeParameter[] = [
min: 1,
max: 14,
default: 4,
value: 4,
},
{
displayName: 'PCR Cycles',
Expand All @@ -47,6 +52,7 @@ export const mockRunTimeParameterData: RunTimeParameter[] = [
min: 1,
max: 10,
default: 6,
value: 6,
},
{
displayName: 'EtoH Volume',
Expand All @@ -56,10 +62,12 @@ export const mockRunTimeParameterData: RunTimeParameter[] = [
min: 1.5,
max: 10.0,
default: 6.5,
value: 6.5,
},
{
displayName: 'Default Module Offsets',
variableName: 'DEFAULT_OFFSETS',
value: 'none',
description: '',
type: 'str',
choices: [
Expand Down Expand Up @@ -94,5 +102,6 @@ export const mockRunTimeParameterData: RunTimeParameter[] = [
},
],
default: '2',
value: '2',
},
]
11 changes: 11 additions & 0 deletions app/src/pages/Protocols/hooks/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,20 +202,23 @@ export const useRunTimeParameters = (

const mockData: RunTimeParameter[] = [
{
value: false,
displayName: 'Dry Run',
variableName: 'DRYRUN',
description: 'Is this a dry or wet run? Wet is true, dry is false',
type: 'boolean',
default: false,
},
{
value: true,
displayName: 'Use Gripper',
variableName: 'USE_GRIPPER',
description: 'For using the gripper.',
type: 'boolean',
default: true,
},
{
value: true,
displayName: 'Trash Tips',
variableName: 'TIP_TRASH',
description:
Expand All @@ -224,13 +227,15 @@ export const useRunTimeParameters = (
default: true,
},
{
value: true,
displayName: 'Deactivate Temperatures',
variableName: 'DEACTIVATE_TEMP',
description: 'deactivate temperature on the module',
type: 'boolean',
default: true,
},
{
value: 4,
displayName: 'Columns of Samples',
variableName: 'COLUMNS',
description: 'How many columns do you want?',
Expand All @@ -240,6 +245,7 @@ export const useRunTimeParameters = (
default: 4,
},
{
value: 6,
displayName: 'PCR Cycles',
variableName: 'PCR_CYCLES',
description: 'number of PCR cycles on a thermocycler',
Expand All @@ -249,6 +255,7 @@ export const useRunTimeParameters = (
default: 6,
},
{
value: 6.5,
displayName: 'EtoH Volume',
variableName: 'ETOH_VOLUME',
description: '70% ethanol volume',
Expand All @@ -259,6 +266,7 @@ export const useRunTimeParameters = (
default: 6.5,
},
{
value: 'none',
displayName: 'Default Module Offsets',
variableName: 'DEFAULT_OFFSETS',
description: 'default module offsets for temp, H-S, and none',
Expand All @@ -280,6 +288,7 @@ export const useRunTimeParameters = (
default: 'none',
},
{
value: 'left',
displayName: 'pipette mount',
variableName: 'mont',
description: 'pipette mount',
Expand All @@ -297,6 +306,7 @@ export const useRunTimeParameters = (
default: 'left',
},
{
value: 'flex',
displayName: 'short test case',
variableName: 'short 2 options',
description: 'this play 2 short options',
Expand All @@ -314,6 +324,7 @@ export const useRunTimeParameters = (
default: 'flex',
},
{
value: 'flex',
displayName: 'long test case',
variableName: 'long 2 options',
description: 'this play 2 long options',
Expand Down
Loading
Loading