jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-04-25 07:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: stop autoselecting empty value in store

Browse Source 
We fix store autoselection, which selects an empty value when one
drive is selected and then ejected, leaving one drive that is
supposed to be autoselectable. Now it instead properly autoselects the
last drive.

Change-Type: patch
Changelog-Entry: Stop store autoselection from selecting empty values on
drive ejection.
This commit is contained in:
Benedict Aas 2018-03-09 13:45:10 +00:00
parent a83e397643
commit 69e85a7ac6
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/shared/store.js
View File

@ -175,6 +175,23 @@ const storeReducer = (state = DEFAULT_STATE, action) => {
}
const newState = state.set('availableDrives', Immutable.fromJS(drives))
const selectedDevices = newState.getIn([ 'selection', 'devices' ]).toJS()
// Remove selected drives that are stale, i.e. missing from availableDrives
const nonStaleNewState = _.reduce(selectedDevices, (accState, device) => {
// Check whether the drive still exists in availableDrives
if (device && !_.find(drives, {
device
})) {
// Deselect this drive gone from availableDrives
return storeReducer(accState, {
type: ACTIONS.DESELECT_DRIVE,
data: device
})
}
return accState
}, newState)
const AUTOSELECT_DRIVE_COUNT = 1
const numberOfDrives = drives.length
@ -198,36 +215,20 @@ const storeReducer = (state = DEFAULT_STATE, action) => {
])) {
// Auto-select this drive
return storeReducer(newState, {
return storeReducer(nonStaleNewState, {
type: ACTIONS.SELECT_DRIVE,
data: drive.device
})
}
// Deselect this drive in case it still is selected
return storeReducer(newState, {
return storeReducer(nonStaleNewState, {
type: ACTIONS.DESELECT_DRIVE,
data: drive.device
})
}
const selectedDevices = newState.getIn([ 'selection', 'devices' ]).toJS()
// Remove selected drives that are stale, i.e. missing from availableDrives
return _.reduce(selectedDevices, (accState, device) => {
// Check whether the drive still exists in availableDrives
if (device && !_.find(drives, {
device
})) {
// Deselect this drive gone from availableDrives
return storeReducer(accState, {
type: ACTIONS.DESELECT_DRIVE,
data: device
})
}
return accState
}, newState)
return nonStaleNewState
}
case ACTIONS.SET_FLASH_STATE: {