Fix download modal bug

Author: alexanderwe

app/lib/Events.ts

@@ -3,6 +3,7 @@ export enum Events {
   UPDATE_CHECK = 'update:check',
   UPDATE_DOWNLOADING = 'update:downloading',
   UPDATE_DOWNLOADED = 'update:downloaded',
+  UPDATE_QUIT_AND_INSTALL = 'update;:quit-and-install',
   CHECKSUM = 'checksum',
   CHECKSUM_RESULT = 'checksum:result',
   DATABASE_CHECKS_RELOAD = 'database:checks-reload',

app/main/src/AppUpdater.ts

@@ -88,6 +88,10 @@ export default class AppUpdater {
     autoUpdater.downloadUpdate();
   };
 
+  public quitAndInstall = () => {
+    autoUpdater.quitAndInstall();
+  }
+
   public checkForUpdate = () => {
     this.ipcHandler.sendToRenderer('update:check', {});
     autoUpdater.checkForUpdates();

app/main/src/IPCHandler.ts

@@ -86,6 +86,9 @@ export default class IPCHandler {
       .on(Events.UPDATE_CHECK, async (event: any, arg: any) => {
         this.updater.checkForUpdate();
       })
+      .on(Events.UPDATE_QUIT_AND_INSTALL, async (event: any, arg: any) => {
+        this.updater.quitAndInstall();
+      })
       .on(Events.DATABASE_CHECKS_RELOAD, async (event: any, arg: any) => {
         this.database.refreshDB();
       })

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "checksum-validator",
-  "version": "1.1.0",
+  "version": "1.0.1",
   "description": "Small Electron application to validate checksums.",
   "main": "build/main.js",
   "author": "Alexander Weiss",

app/renderer/src/Notifications.tsx

@@ -33,6 +33,7 @@ export const showUpdateAvailableNotification = msg => {
       size="small"
       onClick={() => {
         store.dispatch(updateApp());
+        notification.destroy();
       }}
     >
       {i18n.translate('update application')}

app/renderer/src/actions/ipc.ts

@@ -62,7 +62,9 @@ export const ipc = createIpc({
         error: data.error,
         updateAvailable: data.updateAvailable,
         msg: data.msg,
-        downloading: false,
+        downloading: data.downloading,
+        updating: data.updating,
+        downloadPercentage: data.downloadPercentage,
       },
     };
   },

app/renderer/src/actions/update/index.ts

@@ -13,3 +13,7 @@ export const checkForUpdate = () => {
 export const updateApp = () => {
   return send(Events.UPDATE);
 };
+
+export const quitAndInstall = () => {
+  return send(Events.UPDATE_QUIT_AND_INSTALL);
+}

app/renderer/src/components/DownloadModal.component.tsx

@@ -1,9 +1,10 @@
+import { remote } from 'electron';
 import * as React from 'react';
 import { connect } from 'react-redux';
 
 import { Button, Modal, Progress } from 'antd';
 
-import { updateApp } from '../actions/update';
+import { quitAndInstall } from '../actions/update';
 
 import I18n from '../../../lib/i18n/I18n';
 const i18n: I18n = new I18n();
@@ -14,14 +15,14 @@ const mapStateToProps = state => ({
 
 const mapDispatchToProps = dispatch => {
   return {
-    updateApp: () => dispatch(updateApp()),
+    quitAndInstall: () => dispatch(quitAndInstall()),
   };
 };
 
 @connect(mapStateToProps, mapDispatchToProps)
 class DownloadModal extends React.Component<any, any> {
   handleExit = () => {
-    this.props.updateApp();
+    this.props.quitAndInstall();
   };
 
   render() {
@@ -34,8 +35,7 @@ class DownloadModal extends React.Component<any, any> {
         footer={[
           <Button
             disabled={
-              this.props.update.downloading ||
-              this.props.update.downloadPercentage !== 100
+              this.props.update.downloading || this.props.update.downloadPercentage != 100
             }
             key="enter"
             onClick={this.handleExit}

app/renderer/src/reducers/update.tsx

@@ -1,6 +1,6 @@
 {
   "name": "checksum-validator",
-  "version": "1.1.0",
+  "version": "1.0.1",
   "description": "Small Electron application to validate checksums.",
   "scripts": {
     "babel:watch": "babel ./app/main/src/ -w -d ./app/main/build",