File tree Expand file tree Collapse file tree 5 files changed +20
-10
lines changed Expand file tree Collapse file tree 5 files changed +20
-10
lines changed Original file line number Diff line number Diff line change @@ -82,6 +82,7 @@ export const FilePage = (): JSX.Element => {
82
82
83
83
const saveFileMetadata = ( nextFormValues : FileMetadataFields ) : void => {
84
84
dispatch ( actions . saveFileMetadata ( nextFormValues ) )
85
+ setManualDirty ( false )
85
86
}
86
87
const [ isManualDirty , setManualDirty ] = React . useState < boolean > ( false )
87
88
const {
@@ -114,7 +115,6 @@ export const FilePage = (): JSX.Element => {
114
115
'author' ,
115
116
'description' ,
116
117
] )
117
-
118
118
return (
119
119
< div className = { styles . file_page } >
120
120
< Card title = { t ( 'application:information' ) } >
@@ -201,7 +201,6 @@ export const FilePage = (): JSX.Element => {
201
201
type = "submit"
202
202
className = { styles . update_button }
203
203
disabled = { ! isDirty || ! isManualDirty }
204
- onClick = { ( ) => setManualDirty ( false ) }
205
204
>
206
205
{ isManualDirty
207
206
? t ( 'application:update' )
Original file line number Diff line number Diff line change @@ -38,13 +38,17 @@ export const getUnusedTrash = (
38
38
wasteChute != null
39
39
? commands ?. some (
40
40
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' )
45
50
)
46
51
: null
47
-
48
52
return {
49
53
trashBinUnused : trashBin != null && ! hasTrashBinCommands ,
50
54
wasteChuteUnused : wasteChute != null && ! hasWasteChuteCommands ,
Original file line number Diff line number Diff line change @@ -121,6 +121,7 @@ export function CreateFileWizard(): JSX.Element | null {
121
121
values . pipettesByMount ,
122
122
( acc , formPipette : FormPipette , mount ) : PipetteFieldsData [ ] => {
123
123
return formPipette ?. pipetteName != null &&
124
+ formPipette ?. pipetteName !== '' &&
124
125
formPipette . tiprackDefURI != null &&
125
126
( mount === 'left' || mount === 'right' )
126
127
? [
Original file line number Diff line number Diff line change @@ -27,7 +27,11 @@ export const getMigrationVersionsToRunFromVersion = (
27
27
const allSortedVersions = Object . keys ( migrationsByVersion ) . sort (
28
28
semver . compare
29
29
)
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
+ )
31
35
}
32
36
33
37
const allMigrationsByVersion : MigrationsByVersion = {
Original file line number Diff line number Diff line change @@ -1355,10 +1355,9 @@ export const additionalEquipmentInvariantProperties = handleActions<NormalizedAd
1355
1355
command . params . newLocation !== 'offDeck' &&
1356
1356
'addressableAreaName' in command . params . newLocation &&
1357
1357
WASTE_CHUTE_ADDRESSABLE_AREAS . includes (
1358
- command . params . addressableAreaName
1358
+ command . params . newLocation . addressableAreaName
1359
1359
) )
1360
1360
)
1361
-
1362
1361
const getStagingAreaSlotNames = (
1363
1362
commandType : 'moveLabware' | 'loadLabware' ,
1364
1363
locationKey : 'newLocation' | 'location'
@@ -1519,6 +1518,9 @@ export const additionalEquipmentInvariantProperties = handleActions<NormalizedAd
1519
1518
) {
1520
1519
wasteChuteId = moveLiquidStepWasteChute . blowOut_location
1521
1520
}
1521
+ // new wasteChuteId generated for if there are only moveLabware commands
1522
+ } else if ( hasWasteChuteCommands && moveLiquidStepWasteChute == null ) {
1523
+ wasteChuteId = `${ uuid ( ) } :wasteChute`
1522
1524
}
1523
1525
1524
1526
const wasteChute =
You can’t perform that action at this time.
0 commit comments