Skip to content

Commit 0ca12aa

Browse files
authored
fix(protocol-designer): candidate-C bug addressing and don't unnecess… (#15258)
…arily migrate closes RQA-2772 RQA-2773 RQA-2776 RQA-2777
1 parent 39dee3a commit 0ca12aa

File tree

5 files changed

+20
-10
lines changed

5 files changed

+20
-10
lines changed

protocol-designer/src/components/FilePage.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ export const FilePage = (): JSX.Element => {
8282

8383
const saveFileMetadata = (nextFormValues: FileMetadataFields): void => {
8484
dispatch(actions.saveFileMetadata(nextFormValues))
85+
setManualDirty(false)
8586
}
8687
const [isManualDirty, setManualDirty] = React.useState<boolean>(false)
8788
const {
@@ -114,7 +115,6 @@ export const FilePage = (): JSX.Element => {
114115
'author',
115116
'description',
116117
])
117-
118118
return (
119119
<div className={styles.file_page}>
120120
<Card title={t('application:information')}>
@@ -201,7 +201,6 @@ export const FilePage = (): JSX.Element => {
201201
type="submit"
202202
className={styles.update_button}
203203
disabled={!isDirty || !isManualDirty}
204-
onClick={() => setManualDirty(false)}
205204
>
206205
{isManualDirty
207206
? t('application:update')

protocol-designer/src/components/FileSidebar/utils/getUnusedTrash.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,17 @@ export const getUnusedTrash = (
3838
wasteChute != null
3939
? commands?.some(
4040
command =>
41-
command.commandType === 'moveToAddressableArea' &&
42-
WASTE_CHUTE_ADDRESSABLE_AREAS.includes(
43-
command.params.addressableAreaName as AddressableAreaName
44-
)
41+
(command.commandType === 'moveToAddressableArea' &&
42+
WASTE_CHUTE_ADDRESSABLE_AREAS.includes(
43+
command.params.addressableAreaName as AddressableAreaName
44+
)) ||
45+
(command.commandType === 'moveLabware' &&
46+
command.params.newLocation !== 'offDeck' &&
47+
'addressableAreaName' in command.params.newLocation &&
48+
command.params.newLocation.addressableAreaName ===
49+
'gripperWasteChute')
4550
)
4651
: null
47-
4852
return {
4953
trashBinUnused: trashBin != null && !hasTrashBinCommands,
5054
wasteChuteUnused: wasteChute != null && !hasWasteChuteCommands,

protocol-designer/src/components/modals/CreateFileWizard/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ export function CreateFileWizard(): JSX.Element | null {
121121
values.pipettesByMount,
122122
(acc, formPipette: FormPipette, mount): PipetteFieldsData[] => {
123123
return formPipette?.pipetteName != null &&
124+
formPipette?.pipetteName !== '' &&
124125
formPipette.tiprackDefURI != null &&
125126
(mount === 'left' || mount === 'right')
126127
? [

protocol-designer/src/load-file/migration/index.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@ export const getMigrationVersionsToRunFromVersion = (
2727
const allSortedVersions = Object.keys(migrationsByVersion).sort(
2828
semver.compare
2929
)
30-
return takeRightWhile(allSortedVersions, v => semver.gt(v, version))
30+
31+
return takeRightWhile(
32+
allSortedVersions,
33+
v => semver.gt(v, version) && !version.includes(v)
34+
)
3135
}
3236

3337
const allMigrationsByVersion: MigrationsByVersion = {

protocol-designer/src/step-forms/reducers/index.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,10 +1355,9 @@ export const additionalEquipmentInvariantProperties = handleActions<NormalizedAd
13551355
command.params.newLocation !== 'offDeck' &&
13561356
'addressableAreaName' in command.params.newLocation &&
13571357
WASTE_CHUTE_ADDRESSABLE_AREAS.includes(
1358-
command.params.addressableAreaName
1358+
command.params.newLocation.addressableAreaName
13591359
))
13601360
)
1361-
13621361
const getStagingAreaSlotNames = (
13631362
commandType: 'moveLabware' | 'loadLabware',
13641363
locationKey: 'newLocation' | 'location'
@@ -1519,6 +1518,9 @@ export const additionalEquipmentInvariantProperties = handleActions<NormalizedAd
15191518
) {
15201519
wasteChuteId = moveLiquidStepWasteChute.blowOut_location
15211520
}
1521+
// new wasteChuteId generated for if there are only moveLabware commands
1522+
} else if (hasWasteChuteCommands && moveLiquidStepWasteChute == null) {
1523+
wasteChuteId = `${uuid()}:wasteChute`
15221524
}
15231525

15241526
const wasteChute =

0 commit comments

Comments
 (0)