Improvement: Add message for autoupdate

Snapmaker · Nov 12, 2020 · 5ca0ede · 5ca0ede
1 parent 6a5fa2e
commit 5ca0ede
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 14 deletions.
diff --git a/src/app/containers/App.jsx b/src/app/containers/App.jsx
@@ -66,6 +66,7 @@ class App extends PureComponent {
         saveAsFile: PropTypes.func.isRequired,
         openProject: PropTypes.func.isRequired,
         updateIsDownloading: PropTypes.func.isRequired,
+        updateAutoupdateMessage: PropTypes.func.isRequired,
         shouldCheckForUpdate: PropTypes.bool.isRequired
     };
 
@@ -140,6 +141,10 @@ class App extends PureComponent {
             UniApi.File.openProjectFile();
         },
         initUniEvent: () => {
+            UniApi.Event.on('message', (event, message) => {
+                console.log('message', message);
+                this.props.updateAutoupdateMessage(message);
+            });
             UniApi.Event.on('download-has-started', () => {
                 this.props.updateIsDownloading(true);
             });
@@ -373,6 +378,7 @@ const mapStateToProps = (state) => {
 const mapDispatchToProps = (dispatch) => {
     return {
         machineInit: () => dispatch(machineActions.init()),
+        updateAutoupdateMessage: (message) => dispatch(machineActions.updateAutoupdateMessage(message)),
         updateIsDownloading: (isDownloading) => dispatch(machineActions.updateIsDownloading(isDownloading)),
         developToolsInit: () => dispatch(developToolsActions.init()),
         keyboardShortcutInit: () => dispatch(keyboardShortcutActions.init()),

diff --git a/src/app/containers/Settings/General/General.jsx b/src/app/containers/Settings/General/General.jsx
@@ -48,6 +48,7 @@ class General extends PureComponent {
         stateChanged: PropTypes.bool,
         shouldCheckForUpdate: PropTypes.bool,
         isDownloading: PropTypes.bool,
+        autoupdateMessage: PropTypes.string,
         updateShouldCheckForUpdate: PropTypes.func.isRequired,
         actions: PropTypes.object
     };
@@ -84,7 +85,8 @@ class General extends PureComponent {
     }
 
     render() {
-        const { state, stateChanged, shouldCheckForUpdate } = this.props;
+        const { state, stateChanged, shouldCheckForUpdate, autoupdateMessage } = this.props;
+        console.log('general autoupdateMessage', autoupdateMessage);
         const lang = get(state, 'lang', 'en');
 
         if (state.api.loading) {
@@ -129,8 +131,12 @@ class General extends PureComponent {
                             <div className={styles['autoupdate-wrapper']}>
                                 <p className={styles['update-title']}>{i18n._('Software Update')}</p>
                                 <button
+                                    className={classNames(
+                                        'btn',
+                                        'btn-outline-secondary',
+                                        styles['autoupdate-button'],
+                                    )}
                                     type="button"
-                                    className="btn btn-outline-secondary"
                                     onClick={this.actions.handleCheckForUpdate}
                                 >
                                     {i18n._('Check for update')}
@@ -146,6 +152,9 @@ class General extends PureComponent {
                                         {i18n._('Automatically check for update')}
                                     </span>
                                 </div>
+                                <div className={styles['autoupdate-message']}>
+                                    {autoupdateMessage}
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -183,10 +192,11 @@ class General extends PureComponent {
 const mapStateToProps = (state) => {
     const machine = state.machine;
 
-    const { shouldCheckForUpdate, isDownloading } = machine;
+    const { shouldCheckForUpdate, isDownloading, autoupdateMessage } = machine;
 
     return {
         shouldCheckForUpdate,
+        autoupdateMessage,
         isDownloading
     };
 };

diff --git a/src/app/containers/Settings/General/index.styl b/src/app/containers/Settings/General/index.styl
@@ -1,5 +1,7 @@
 @import '../form';
-
+.form-control {
+    margin-top: 5px;
+}
 .learn-more {
     color: #0060AC;
     font-size: 14px;
@@ -33,16 +35,25 @@
 .autoupdate-wrapper {
     margin-top: 10px;
     .update-title{
-      margin: 0;
+        margin: 0 0 5px 0;
     }
     .autoupdate-auto {
         height: 15px;
         line-height: 15px;
+        vertical-align: middle;
         display: inline-block;
+        .autoupdate-checkbox {
+            margin-left: 10px;
+            margin-right: 5px;
+            vertical-align: middle;
+        }
+    }
+    .autoupdate-button{
+        color: #282828;
+        vertical-align: middle;
     }
-    .autoupdate-checkbox {
-      margin-left: 10px;
-      margin-right: 5px;
-      vertical-align: middle;
+    .autoupdate-message{
+        color: #808080;
+        margin: 5px 0 0;
     }
 }
diff --git a/src/app/flux/machine/index.js b/src/app/flux/machine/index.js
@@ -118,6 +118,7 @@ const INITIAL_STATE = {
     connectionTimeout: 3000,
 
     // autoUpdate
+    autoupdateMessage: '',
     // Whether to check for available updates when the software is opened
     shouldCheckForUpdate: true,
     // Whether an update is being downloaded
@@ -331,6 +332,9 @@ export const actions = {
             });
     },
 
+    updateAutoupdateMessage: (autoupdateMessage) => (dispatch) => {
+        dispatch(actions.updateState({ autoupdateMessage: autoupdateMessage }));
+    },
     updateIsDownloading: (isDownloading) => (dispatch) => {
         dispatch(actions.updateState({ isDownloading: isDownloading }));
     },

diff --git a/src/main.js b/src/main.js
@@ -84,18 +84,18 @@ function sendUpdateMessage(text) {
 // handle update issue
 function updateHandle() {
     const message = {
-        error: 'update error',
-        checking: 'updating...',
-        updateAva: 'fetch new version and downloading...',
-        updateNotAva: 'do not to update'
+        error: 'An error occurred while checking for updates.',
+        checking: 'Checking for updates.',
+        updateAva: 'Updates are available.',
+        updateNotAva: 'Snapmaker Luban is up to date.'
     };
     // Official document: https://www.electron.build/auto-update.html
     autoUpdater.autoDownload = false;
     // Whether to automatically install a downloaded update on app quit. Applicable only on Windows and Linux.
     autoUpdater.autoInstallOnAppQuit = false;
 
     autoUpdater.on('error', (err) => {
-        sendUpdateMessage(message.error, err);
+        sendUpdateMessage(message.error + err.message);
     });
     // Emitted when checking if an update has started.
     autoUpdater.on('checking-for-update', () => {