Merge pull request #246 from parallaxinc/search-messages

Added search status bar

Author: phated

package.json

@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@phated/redux-create-store": "^0.3.0",
-    "bs2-serial": "^0.11.0",
+    "bs2-serial": "^0.12.0",
     "codemirror": "^4.13.0",
     "frylord": "^0.7.1",
     "holovisor": "^0.2.0",

src/plugins/handlers.js

@@ -524,7 +524,8 @@ function handlers(app, opts, done){
   function selectDevice(device) {
     const { content } = workspace.getState();
 
-    if(!device.match) {
+    // need to make sure we have all the information before rewriting the source
+    if(!device.match && device.name && device.program) {
       const { name } = device;
       // TODO: handle unnamed device
       const { TargetStart } = device.program.raw;

src/views/download-overlay.js

@@ -13,12 +13,17 @@ const ProgressBar = require('../components/progress-bar');
 
 const styles = {
   overlay: {
-    paddingBottom: 40
+    paddingBottom: 40,
+    width: 600
   },
   overlayFooter: {
     marginLeft: 0,
     display: 'flex'
   },
+  errorSpan: {
+    color: '#FF0000',
+    display: 'inline-block'
+  },
   deviceTable: {
     width: '100%',
     maxWidth: '100%',
@@ -39,6 +44,25 @@ const styles = {
     verticalAlign: 'top',
     borderTop: '1px solid #ddd'
   },
+  statusTh: {
+    padding: '8px 8px 8px 0',
+    textAlign: 'left',
+    borderTop: 0,
+    borderBottom: '2px solid #ddd',
+    verticalAlign: 'bottom',
+    fontWeight: 'bold',
+    maxWidth: 160
+  },
+  statusTd: {
+    padding: '8px 8px 8px 0',
+    borderSpacing: 'collapse',
+    verticalAlign: 'top',
+    borderTop: '1px solid #ddd',
+    maxWidth: 160,
+    overflow: 'auto',
+    whiteSpace: 'nowrap',
+    color: '#333333'
+  },
   scrollingContainer: {
     height: 325,
     overflow: 'auto',
@@ -94,6 +118,7 @@ class DownloadOverlay extends React.Component {
         <td style={styles.deviceTd}>{device.name}</td>
         <td style={styles.deviceTd}>{device.version}</td>
         <td style={styles.deviceTd}>{device.path}</td>
+        <td style={styles.statusTd}>{device.displayError}</td>
       </tr>
     );
   }
@@ -136,6 +161,7 @@ class DownloadOverlay extends React.Component {
                   <th style={styles.deviceTh}>Device</th>
                   <th style={styles.deviceTh}>Version</th>
                   <th style={styles.deviceTh}>Port</th>
+                  <th style={styles.statusTh}>Status</th>
                 </tr>
               </thead>
               <tbody>