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

refactor: flatten "flash" data structure property (#521)

Browse Source 
Currently, the "flash" property of the application state containing both
the actual flashing state, and the flashing flag.

To simplify things, the following changes have been introduced:

- Move `flash.flashing` to `isFlashing`.
- Move `flash.state` to `flashState`.
- Rename `SET_FLASHING` to `SET_FLASHING_FLAG`.
- Extract `UNSET_FLASHING_FLAG` from `SET_FLASHING_FLAG`.

Signed-off-by: Juan Cruz Viotti <jviottidc@gmail.com>
This commit is contained in:
Juan Cruz Viotti 2016-06-23 17:12:25 -04:00 committed by GitHub
parent 78da500816
commit 4d89b1b1f7
2 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/gui/models/store.js
View File

@ -29,12 +29,10 @@ const redux = require('redux');
const DEFAULT_STATE = Immutable.fromJS({
availableDrives: [],
selection: {},
flash: {
flashing: false,
state: {
progress: 0,
speed: 0
}
isFlashing: false,
flashState: {
progress: 0,
speed: 0
}
});
@ -47,7 +45,8 @@ const ACTIONS = _.fromPairs(_.map([
'SET_AVAILABLE_DRIVES',
'SET_FLASH_STATE',
'RESET_FLASH_STATE',
'SET_FLASHING',
'SET_FLASHING_FLAG',
'UNSET_FLASHING_FLAG',
'SELECT_DRIVE',
'SELECT_IMAGE',
'REMOVE_DRIVE',
@ -104,28 +103,25 @@ const storeReducer = function(state, action) {
}
case ACTIONS.SET_FLASH_STATE: {
if (!state.getIn([ 'flash', 'flashing' ])) {
if (!state.get('isFlashing')) {
throw new Error('Can\'t set the flashing state when not flashing');
}
return state.setIn([ 'flash', 'state' ], Immutable.fromJS(action.data));
return state.set('flashState', Immutable.fromJS(action.data));
}
case ACTIONS.RESET_FLASH_STATE: {
return state.setIn([ 'flash', 'state' ], DEFAULT_STATE.getIn([ 'flash', 'state' ]));
return state.set('flashState', DEFAULT_STATE.get('flashState'));
}
case ACTIONS.SET_FLASHING: {
const value = Boolean(action.data);
const newState = state.setIn([ 'flash', 'flashing' ], value);
case ACTIONS.SET_FLASHING_FLAG: {
return state.set('isFlashing', true);
}
if (!value) {
return storeReducer(newState, {
type: ACTIONS.RESET_FLASH_STATE
});
}
return newState;
case ACTIONS.UNSET_FLASHING_FLAG: {
return storeReducer(state.set('isFlashing', false), {
type: ACTIONS.RESET_FLASH_STATE
});
}
case ACTIONS.SELECT_DRIVE: {

17
lib/gui/modules/image-writer.js
View File

@ -61,7 +61,7 @@ imageWriter.service('ImageWriterService', function($q, $timeout, SettingsModel,
// Safely bring the state to the world of Angular
$timeout(function() {
self.state = Store.getState().toJS().flash.state;
self.state = Store.getState().toJS().flashState;
});
});
@ -79,7 +79,7 @@ imageWriter.service('ImageWriterService', function($q, $timeout, SettingsModel,
* }
*/
this.isFlashing = function() {
return Store.getState().toJS().flash.flashing;
return Store.getState().toJS().isFlashing;
};
/**
@ -96,10 +96,15 @@ imageWriter.service('ImageWriterService', function($q, $timeout, SettingsModel,
* ImageWriterService.setFlashing(true);
*/
this.setFlashing = function(status) {
Store.dispatch({
type: Store.Actions.SET_FLASHING,
data: status
});
if (Boolean(status)) {
Store.dispatch({
type: Store.Actions.SET_FLASHING_FLAG
});
} else {
Store.dispatch({
type: Store.Actions.UNSET_FLASHING_FLAG
});
}
};
/**