Skip to content

Commit 0512aa4

Browse files
authored
fix(protocol-designer): wire up disposal volume required error (#18898)
This PR enforces that a user enter a valid disposal volume in a transfer form with 1) "distribute" path, and 2) disposal volume checked. Closes RQA-4355
1 parent 5722a1f commit 0512aa4

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

protocol-designer/src/steplist/formLevel/errors.ts

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,14 @@ const DISPENSE_RETRACT_SPEED_REQUIRED: FormError = {
619619
showOnReopen: true,
620620
tab: 'dispense',
621621
}
622+
const DISPOSAL_VOLUME_REQUIRED: FormError = {
623+
title: 'Disposal volume required',
624+
dependentFields: ['disposalVolume_checkbox', 'disposalVolume_volume'],
625+
location: 'field',
626+
page: 2,
627+
showOnReopen: true,
628+
tab: 'dispense',
629+
}
622630

623631
export type FormErrorChecker = (
624632
arg: HydratedFormData,
@@ -1575,7 +1583,14 @@ export const dispenseRetractSpeedRequired = (
15751583
? DISPENSE_RETRACT_SPEED_REQUIRED
15761584
: null
15771585
}
1578-
1586+
export const disposalVolumeRequired = (
1587+
fields: HydratedMoveLiquidFormData
1588+
): FormError | null => {
1589+
const { disposalVolume_checkbox, disposalVolume_volume } = fields
1590+
return disposalVolume_checkbox && !disposalVolume_volume
1591+
? DISPOSAL_VOLUME_REQUIRED
1592+
: null
1593+
}
15791594
/*******************
15801595
** Helpers **
15811596
********************/

protocol-designer/src/steplist/formLevel/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import {
3131
dispenseTouchTipMmFromEdgeRequired,
3232
dispenseTouchTipSpeedRequired,
3333
dispenseWellsRequired,
34+
disposalVolumeRequired,
3435
engageHeightRangeExceeded,
3536
engageHeightRequired,
3637
fileNameRequired,
@@ -238,7 +239,8 @@ const stepFormHelperMap: {
238239
aspirateSubmergeSpeedRequired,
239240
aspirateRetractSpeedRequired,
240241
dispenseSubmergeSpeedRequired,
241-
dispenseRetractSpeedRequired
242+
dispenseRetractSpeedRequired,
243+
disposalVolumeRequired
242244
),
243245
getWarnings: composeWarnings(
244246
belowPipetteMinimumVolume,

0 commit comments

Comments
 (0)