From ef5762864f1340e069f456fb070274d1e94caadf Mon Sep 17 00:00:00 2001 From: Alexis Svinartchouk Date: Tue, 12 May 2020 14:18:02 +0200 Subject: [PATCH] Update redux 3 -> 4 Changelog-entry: Update redux 3 -> 4 Change-type: patch --- lib/gui/app/components/finish/finish.tsx | 4 ++-- lib/gui/app/models/flash-state.ts | 2 ++ lib/gui/app/models/selection-state.ts | 1 + npm-shrinkwrap.json | 17 +++++------------ package.json | 2 +- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/lib/gui/app/components/finish/finish.tsx b/lib/gui/app/components/finish/finish.tsx index eb0f719c..f1d02487 100644 --- a/lib/gui/app/components/finish/finish.tsx +++ b/lib/gui/app/components/finish/finish.tsx @@ -20,7 +20,7 @@ import { v4 as uuidV4 } from 'uuid'; import * as flashState from '../../models/flash-state'; import * as selectionState from '../../models/selection-state'; -import { store } from '../../models/store'; +import { Actions, store } from '../../models/store'; import * as analytics from '../../modules/analytics'; import { open as openExternal } from '../../os/open-external/services/open-external'; import { FlashAnother } from '../flash-another/flash-another'; @@ -33,7 +33,7 @@ function restart(goToMain: () => void) { // Reset the flashing workflow uuid store.dispatch({ - type: 'SET_FLASHING_WORKFLOW_UUID', + type: Actions.SET_FLASHING_WORKFLOW_UUID, data: uuidV4(), }); diff --git a/lib/gui/app/models/flash-state.ts b/lib/gui/app/models/flash-state.ts index 3894ce6d..50de3932 100644 --- a/lib/gui/app/models/flash-state.ts +++ b/lib/gui/app/models/flash-state.ts @@ -26,6 +26,7 @@ import { Actions, store } from './store'; export function resetState() { store.dispatch({ type: Actions.RESET_FLASH_STATE, + data: {}, }); } @@ -46,6 +47,7 @@ export function isFlashing(): boolean { export function setFlashingFlag() { store.dispatch({ type: Actions.SET_FLASHING_FLAG, + data: {}, }); } diff --git a/lib/gui/app/models/selection-state.ts b/lib/gui/app/models/selection-state.ts index 6a19f73a..232c3de3 100644 --- a/lib/gui/app/models/selection-state.ts +++ b/lib/gui/app/models/selection-state.ts @@ -130,6 +130,7 @@ export function deselectDrive(driveDevice: string) { export function deselectImage() { store.dispatch({ type: Actions.DESELECT_IMAGE, + data: {}, }); } diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index f8c1ea38..ae26c604 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -8305,11 +8305,6 @@ "lodash": ">=3.7.0" } }, - "lodash-es": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz", - "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==" - }, "lodash.capitalize": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz", @@ -11093,14 +11088,12 @@ } }, "redux": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz", - "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/redux/-/redux-4.0.5.tgz", + "integrity": "sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w==", "requires": { - "lodash": "^4.2.1", - "lodash-es": "^4.2.1", - "loose-envify": "^1.1.0", - "symbol-observable": "^1.0.3" + "loose-envify": "^1.4.0", + "symbol-observable": "^1.2.0" } }, "regenerator-runtime": { diff --git a/package.json b/package.json index 255654d1..6d436361 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "pretty-bytes": "^5.3.0", "react": "^16.8.5", "react-dom": "^16.8.5", - "redux": "^3.5.2", + "redux": "^4.0.5", "rendition": "^11.24.2", "request": "^2.81.0", "resin-corvus": "^2.0.5",