Merge branch 'krystophv/electron' into dorianscholz/electron-fslibre

jweismann · Aug 8, 2017 · 2f758b0 · 2f758b0
2 parents 8799839 + 683fe93
commit 2f758b0
Show file tree

Hide file tree

Showing 72 changed files with 303 additions and 644 deletions.
diff --git a/app/actions/async.js b/app/actions/async.js
@@ -250,28 +250,14 @@ export function doDeviceUpload(driverId, opts = {}, utc) {
 
     device.detect(driverId, opts, (err, dev) => {
       if (err) {
-        if ((os === 'mac' && _.get(targetDevice, ['showDriverLink', os], false) === true) ||
-          (os === 'win' && _.get(targetDevice, ['showDriverLink', os], false) === true)) {
-          let displayErr = new Error();
-          let driverLinkErrProps = {
-            details: err.message,
-            utc: actionUtils.getUtc(utc),
-            code: 'E_DRIVER',
-            version: version
-          };
-          displayErr.driverLink = urls.DRIVER_DOWNLOAD;
-          return dispatch(syncActions.uploadFailure(displayErr, driverLinkErrProps, targetDevice));
-        }
-        else {
-          let displayErr = new Error(errorText.E_SERIAL_CONNECTION);
-          let deviceDetectErrProps = {
-            details: err.message,
-            utc: actionUtils.getUtc(utc),
-            code: 'E_SERIAL_CONNECTION',
-            version: version
-          };
-          return dispatch(syncActions.uploadFailure(displayErr, deviceDetectErrProps, targetDevice));
-        }
+        let displayErr = new Error(errorText.E_SERIAL_CONNECTION);
+        let deviceDetectErrProps = {
+          details: err.message,
+          utc: actionUtils.getUtc(utc),
+          code: 'E_SERIAL_CONNECTION',
+          version: version
+        };
+        return dispatch(syncActions.uploadFailure(displayErr, deviceDetectErrProps, targetDevice));
       }
 
       if (!dev && opts.filename == null) {

diff --git a/app/actions/utils.js b/app/actions/utils.js
@@ -71,6 +71,8 @@ export function makeUploadCb(dispatch, getState, errCode, utc) {
         step: err.step || null,
         datasetId: err.datasetId || null,
         requestTrace: err.requestTrace || null,
+        sessionTrace: err.sessionTrace || null,
+        sessionToken: err.sessionToken || null,
         code: err.code || errCode,
         version: version,
         data: recs

diff --git a/app/components/Header.js b/app/components/Header.js
@@ -30,7 +30,7 @@ import * as actionSources from '../constants/actionSources';
 import { pages, pagesMap } from '../constants/otherConstants';
 
 import styles from '../../styles/components/Header.module.less';
-import logo from '../../images/Tidepool_Logo_light x2.png';
+import logo from '../../images/Tidepool_Logo_Light x2.png';
 
 export class Header extends Component {
   static propTypes = {

diff --git a/app/components/UpdateModal.js b/app/components/UpdateModal.js
@@ -48,40 +48,57 @@ export class UpdateModal extends Component {
       sync
     } = this.props;
 
-    if ( checkingElectronUpdate ||
-      (
-        !(electronUpdateDownloaded && !electronUpdateAvailableDismissed) &&
-        !(electronUpdateManualChecked && (
-            !electronUpdateAvailableDismissed ||
-            electronUpdateDownloaded
-          )
-        )
-      )
-    ) {
+    let title, text, actions;
+
+    if(electronUpdateAvailableDismissed){
       return null;
     }
 
-    let title, text, actions;
-
-    if(electronUpdateAvailable) {
-      title = 'Update Available!';
-      text = 'After clicking Install, the uploader will restart to complete the installation.';
-      actions = [
-        <button key='dismiss' className={styles.buttonSecondary} onClick={sync.dismissUpdateAvailable}>
-          Dismiss
-        </button>,
-        <button key='install' className={styles.button} onClick={this.handleInstall}>
-          Install
-        </button>
-      ];
-    } else {
-      title = 'Uploader is up-to-date!';
-      text = `You are running version ${config.version}, the most recent one.`;
-      actions = (
-        <button className={styles.button} onClick={sync.dismissUpdateNotAvailable}>
-          Okay!
-        </button>
-      );
+    if (electronUpdateManualChecked) {
+      if (checkingElectronUpdate){
+        title = 'Checking for update...';
+      } else {
+        if (electronUpdateAvailable) {
+          title = 'Update Available!';
+          if (!electronUpdateDownloaded) {
+            text = 'Downloading update';
+          } else { // available and downloaded
+            text = 'After clicking Install, the uploader will restart to complete the installation.';
+            actions = [
+              <button key='dismiss' className={styles.buttonSecondary} onClick={sync.dismissUpdateAvailable}>
+                Dismiss
+              </button>,
+              <button key='install' className={styles.button} onClick={this.handleInstall}>
+                Install
+              </button>
+            ];
+          }
+        } else { // no update available
+          title = 'Uploader is up-to-date!';
+          text = `You are running version ${config.version}, the most recent one.`;
+          actions = (
+            <button className={styles.button} onClick={sync.dismissUpdateNotAvailable}>
+              Okay!
+            </button>
+          );
+        }
+      }
+    }
+    else { // automatic background check
+      if(electronUpdateAvailable && electronUpdateDownloaded){
+        title = 'Update Available!';
+        text = 'After clicking Install, the uploader will restart to complete the installation.';
+        actions = [
+          <button key='dismiss' className={styles.buttonSecondary} onClick={sync.dismissUpdateAvailable}>
+            Dismiss
+          </button>,
+          <button key='install' className={styles.button} onClick={this.handleInstall}>
+            Install
+          </button>
+        ];
+      } else {
+        return null;
+      }
     }
 
     return (

diff --git a/app/components/UploadList.js b/app/components/UploadList.js
@@ -106,20 +106,12 @@ export default class UploadList extends Component {
     }
     const errorDetails = upload.showErrorDetails ?
       (<div>{upload.error.debug}</div>) : null;
-    const errorMessage = upload.error.driverLink ?
-      (
-        <div className={styles.errorMessageWrapper}>
-          <span className={styles.errorMessage}>{this.props.text.UPLOAD_FAILED}</span>
-          <span className={styles.errorMessageFriendly}>{'It\'s possible you need to install the '}</span>
-          <span className={styles.errorMessageLinkWrap}><a className={styles.errorMessageLink} href={upload.error.driverLink} target="_blank">Tidepool USB driver</a></span>
-        </div>
-      ) :
-      (
-        <div className={styles.errorMessageWrapper}>
-          <span className={styles.errorMessage}>{this.props.text.UPLOAD_FAILED}</span>
-          <span className={styles.errorMessageFriendly}>{upload.error.message}</span>
-        </div>
-      );
+    const errorMessage = (
+      <div className={styles.errorMessageWrapper}>
+        <span className={styles.errorMessage}>{this.props.text.UPLOAD_FAILED}</span>
+        <span className={styles.errorMessageFriendly}>{upload.error.message}</span>
+      </div>
+    );
     const showErrorsText = upload.showErrorDetails ? this.props.text.HIDE_ERROR : this.props.text.SHOW_ERROR;
 
     function makeToggleDetailsFn() {

diff --git a/app/constants/otherConstants.js b/app/constants/otherConstants.js
@@ -57,7 +57,6 @@ export const steps = {
 };
 
 export const urls = {
-  DRIVER_DOWNLOAD: 'http://tidepool.org/downloads/',
   HOW_TO_UPDATE_KB_ARTICLE: 'http://support.tidepool.org/article/6-how-to-install-or-upgrade-the-tidepool-uploader-gen',
   HOW_TO_SHARE_DATA_KB_ARTICLE: 'http://support.tidepool.org/article/16-share-your-data'
 };
diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tidepool-uploader",
   "productName":  "tidepool-uploader",
-  "version": "0.310.0-alpha.11",
+  "version": "0.310.0-alpha.17",
   "description": "Tidepool Project Universal Uploader",
   "main": "./main.js",
   "author": {

diff --git a/app/reducers/devices.js b/app/reducers/devices.js
@@ -7,7 +7,6 @@ const devices = {
     name: 'Medtronic',
     // for the device selection list
     selectName: 'Medtronic (from CareLink)',
-    showDriverLink: {mac: false, win: false},
     source: {type: 'carelink'},
     enabled: {mac: true, win: true}
   },
@@ -22,55 +21,48 @@ const devices = {
     key: 'medtronic',
     name: 'Medtronic - 523, 723 or 530G',
     selectName: 'Medtronic direct from Bayer Contour Next Link',
-    showDriverLink: {mac: false, win: false},
     source: {type: 'device', driverId: 'Medtronic'},
     enabled: {mac: true, win: true}
   },
   omnipod: {
     instructions: 'Plug in PDM with mini-USB and choose .ibf file from PDM',
     key: 'omnipod',
     name: 'Insulet OmniPod',
-    showDriverLink: {mac: false, win: false},
     source: {type: 'block', driverId: 'InsuletOmniPod', extension: '.ibf'},
     enabled: {mac: true, win: true}
   },
   dexcom: {
     instructions: 'Plug in receiver with micro-USB',
     key: 'dexcom',
     name: 'Dexcom',
-    showDriverLink: {mac: true, win: true},
     source: {type: 'device', driverId: 'Dexcom'},
     enabled: {mac: true, win: true}
   },
   precisionxtra: {
     instructions: 'Plug in meter with cable',
     key: 'precisionxtra',
     name: 'Abbott Precision Xtra',
-    showDriverLink: {mac: false, win: true},
     source: {type: 'device', driverId: 'AbbottPrecisionXtra'},
     enabled: {mac: false, win: true}
   },
   tandem: {
     instructions: 'Plug in pump with micro-USB',
     key: 'tandem',
     name: 'Tandem',
-    showDriverLink: {mac: false, win: true},
     source: {type: 'device', driverId: 'Tandem'},
     enabled: {mac: true, win: true}
   },
   abbottfreestylelite: {
     instructions: 'Plug in meter with cable',
     key: 'abbottfreestylelite',
     name: 'Abbott FreeStyle Lite',
-    showDriverLink: {mac: false, win: true},
     source: {type: 'device', driverId: 'AbbottFreeStyleLite'},
     enabled: {mac: false, win: true}
   },
   abbottfreestylefreedomlite: {
     instructions: 'Plug in meter with cable',
     key: 'abbottfreestylefreedomlite',
     name: 'Abbott FreeStyle Freedom Lite',
-    showDriverLink: {mac: false, win: true},
     source: {type: 'device', driverId: 'AbbottFreeStyleFreedomLite'},
     enabled: {mac: false, win: true}
   },
@@ -86,47 +78,41 @@ const devices = {
     instructions: 'Plug in meter with micro-USB',
     key: 'bayercontournext',
     name: 'Bayer Contour Next',
-    showDriverLink: {mac: false, win: false},
     source: {type: 'device', driverId: 'BayerContourNext'},
     enabled: {mac: true, win: true}
   },
   bayercontournextusb: {
     instructions: 'Plug meter into USB port',
     key: 'bayercontournextusb',
     name: 'Bayer Contour Next USB',
-    showDriverLink: {mac: false, win: false},
     source: {type: 'device', driverId: 'BayerContourNextUsb'},
     enabled: {mac: true, win: true}
   },
   bayercontourusb: {
     instructions: 'Plug meter into USB port',
     key: 'bayercontourusb',
     name: 'Bayer Contour USB',
-    showDriverLink: {mac: false, win: false},
     source: {type: 'device', driverId: 'BayerContourUsb'},
     enabled: {mac: true, win: true}
   },
   bayercontournextlink: {
     instructions: 'Plug meter into USB port',
     key: 'bayercontournextlink',
     name: 'Bayer Contour Next Link',
-    showDriverLink: {mac: false, win: false},
     source: {type: 'device', driverId: 'BayerContourNextLink'},
     enabled: {mac: true, win: true}
   },
   animas: {
     instructions: 'Suspend and align back of pump with IR dongle front',
     key: 'animas',
     name: 'Animas',
-    showDriverLink: {mac: true, win: true},
     source: {type: 'device', driverId: 'Animas'},
     enabled: {mac: true, win: true}
   },
   onetouchverioiq: {
     instructions: 'Plug in meter with mini-USB',
     name: 'OneTouch VerioIQ',
     key: 'onetouchverioiq',
-    showDriverLink: {mac: true, win: true},
     source: {type: 'device', driverId: 'OneTouchVerioIQ'},
     enabled: {mac: true, win: true}
   }

diff --git a/app/reducers/misc.js b/app/reducers/misc.js
@@ -155,6 +155,8 @@ function uploading(state = false, action) {
 function checkingElectronUpdate(state = false, action) {
   switch (action.type) {
     case actionTypes.CHECKING_FOR_UPDATES:
+    case actionTypes.AUTO_UPDATE_CHECKING_FOR_UPDATES:
+    case actionTypes.MANUAL_UPDATE_CHECKING_FOR_UPDATES:
       return true;
     case actionTypes.UPDATE_AVAILABLE:
     case actionTypes.UPDATE_NOT_AVAILABLE:

diff --git a/app/utils/errors.js b/app/utils/errors.js
@@ -26,6 +26,8 @@ const errorProps = {
   step: 'Driver Step',
   datasetId: 'Dataset ID',
   requestTrace: 'Request Trace',
+  sessionToken: 'Session Token',
+  sessionTrace: 'Session Trace',
   stringifiedStack: 'Stack Trace',
   utc: 'UTC Time',
   version: 'Version'