jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-27 21:26:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2112 from resin-io/store-fix-autoselect-stale

Browse Source 
fix: stop autoselecting empty value in store
This commit is contained in:
Jonas Hermsmeier 2018-03-21 22:52:20 +01:00 committed by GitHub
commit 98dcb13201
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -177,6 +177,23 @@ const storeReducer = (state = DEFAULT_STATE, action) => {
} }
const newState = state.set('availableDrives', Immutable.fromJS(drives)) 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 AUTOSELECT_DRIVE_COUNT = 1
const numberOfDrives = drives.length const numberOfDrives = drives.length
@ -200,36 +217,20 @@ const storeReducer = (state = DEFAULT_STATE, action) => {
])) { ])) {
// Auto-select this drive // Auto-select this drive
return storeReducer(newState, { return storeReducer(nonStaleNewState, {
type: ACTIONS.SELECT_DRIVE, type: ACTIONS.SELECT_DRIVE,
data: drive.device data: drive.device
}) })
} }
// Deselect this drive in case it still is selected // Deselect this drive in case it still is selected
return storeReducer(newState, { return storeReducer(nonStaleNewState, {
type: ACTIONS.DESELECT_DRIVE, type: ACTIONS.DESELECT_DRIVE,
data: drive.device data: drive.device
}) })
} }
const selectedDevices = newState.getIn([ 'selection', 'devices' ]).toJS() return nonStaleNewState
// 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)
} }
case ACTIONS.SET_FLASH_STATE: { case ACTIONS.SET_FLASH_STATE: {