jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-20 09:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2448 from resin-io/fix-flash-cancel

Browse Source 
fix(GUI): Remove results data from cancel event
This commit is contained in:
Lorenzo Alberto Maria Ambrosi 2018-08-14 23:35:34 +02:00 committed by GitHub
commit b24c4ea030
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/gui/app/modules/image-writer.js
View File

@ -327,17 +327,18 @@ exports.flash = (image, drives) => {
return exports.performWrite(image, drives, (state) => { return exports.performWrite(image, drives, (state) => {
flashState.setProgressState(state) flashState.setProgressState(state)
}).then(flashState.unsetFlashingFlag).then(() => { }).then(flashState.unsetFlashingFlag).then(() => {
if (flashState.wasLastFlashCancelled()) {
const eventData = _.assign({ status: 'cancel' }, analyticsData)
analytics.logEvent('Elevation cancelled', eventData)
} else {
const { results } = flashState.getFlashResults() const { results } = flashState.getFlashResults()
const event = _.assign({ const eventData = _.assign({
errors: results.errors, errors: results.errors,
devices: results.devices, devices: results.devices,
status: 'finished' status: 'finished'
}, },
analyticsData) analyticsData)
if (flashState.wasLastFlashCancelled()) { analytics.logEvent('Done', eventData)
analytics.logEvent('Elevation cancelled', event)
} else {
analytics.logEvent('Done', event)
} }
}).catch((error) => { }).catch((error) => {
flashState.unsetFlashingFlag({ flashState.unsetFlashingFlag({
@ -347,13 +348,13 @@ exports.flash = (image, drives) => {
// eslint-disable-next-line no-magic-numbers // eslint-disable-next-line no-magic-numbers
if (drives.length > 1) { if (drives.length > 1) {
const { results } = flashState.getFlashResults() const { results } = flashState.getFlashResults()
const event = _.assign({ const eventData = _.assign({
errors: results.errors, errors: results.errors,
devices: results.devices, devices: results.devices,
status: 'failed' status: 'failed'
}, },
analyticsData) analyticsData)
analytics.logEvent('Write failed', event) analytics.logEvent('Write failed', eventData)
} }
return Bluebird.reject(error) return Bluebird.reject(error)
@ -372,7 +373,6 @@ exports.flash = (image, drives) => {
*/ */
exports.cancel = () => { exports.cancel = () => {
const drives = selectionState.getSelectedDevices() const drives = selectionState.getSelectedDevices()
const { results } = flashState.getFlashResults()
const analyticsData = { const analyticsData = {
image: selectionState.getImagePath(), image: selectionState.getImagePath(),
drives, drives,
@ -382,15 +382,10 @@ exports.cancel = () => {
unmountOnSuccess: settings.get('unmountOnSuccess'), unmountOnSuccess: settings.get('unmountOnSuccess'),
validateWriteOnSuccess: settings.get('validateWriteOnSuccess'), validateWriteOnSuccess: settings.get('validateWriteOnSuccess'),
applicationSessionUuid: store.getState().toJS().applicationSessionUuid, applicationSessionUuid: store.getState().toJS().applicationSessionUuid,
flashingWorkflowUuid: store.getState().toJS().flashingWorkflowUuid flashingWorkflowUuid: store.getState().toJS().flashingWorkflowUuid,
status: 'cancel'
} }
const event = _.assign({ analytics.logEvent('Cancel', analyticsData)
errors: results.errors,
devices: results.devices,
status: 'finished'
},
analyticsData)
analytics.logEvent('Cancel', event)
// Re-enable lock release on inactivity // Re-enable lock release on inactivity
updateLock.resume() updateLock.resume()