Overhauled the way EONs are searched out. Also beginnings of two separate lists

Author: jfrux

.travis.yml

@@ -77,7 +77,7 @@ script:
   - yarn package
   - yarn lint
   - |
-    if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+    if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
       docker run --rm \
         --env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_') \
         -v ${PWD}:/project \

app/actions/eon_detail_actions.js

@@ -1,10 +1,12 @@
 import settings from 'electron-settings';
 const app = require('electron').remote.app;
-const path = require("path");
+const RSAKey = require('rsa-key');
+const mkdirp = require("mkdirp");
+import path from 'path';
+import fs from 'fs';
 import * as types from '../constants/eon_detail_action_types';
-import * as eonListActions from './eon_list_actions';
 import * as commands from '../constants/commands.json';
-import * as regex from '../constants/tmux_regex';
+
 const SSH = require('node-ssh');
 import * as vehicle_connection_statuses from '../constants/vehicle_connection_statuses.json';
 // ACTION CREATORS
@@ -113,7 +115,7 @@ export function RESPONSE_GET_FINGERPRINT(fingerprint, state) {
   return {
     type: types.GET_FINGERPRINT_RESPONSE,
     payload: {
-      fingerprint: fingerprint,
+      // fingerprint: fingerprint,
       fingerprintString: "[{\n" + Object.keys(fingerprint).sort((a, b) => { return parseInt(a)-parseInt(b);}).map((key) => { let fgpiece = fingerprint[key]; return `${key}: ${fgpiece}`;}).join(", ") + "\n}]"
     }
   };
@@ -214,6 +216,12 @@ export function RESPONSE_sshCommand(stdout,stderr) {
   };
 }
 
+export function STOP_POLLING() {
+  return {
+    type: types.STOP_POLLING
+  };
+}
+
 export function FAIL_sshCommand(err) {
   return {
     type: types.SSH_COMMAND_FAIL,
@@ -282,8 +290,8 @@ export function sendCommand(eon, command, commandArgs = [], stdOut = () => {}, s
 }
 // export function pipeTmux() {
 //   return (dispatch, getState) => {
-//     const { selectedEon, scanResults } = getState().eonList;
-//     const eon = scanResults[selectedEon];
+//     const { selectedEon, eons } = getState().eonList;
+//     const eon = eons[selectedEon];
 //     console.warn("pipeTmux to:",eon);
 //     if (eon) {
 //       dispatch(OPEN_REQUEST_EON_STATE());
@@ -298,8 +306,8 @@ export function sendCommand(eon, command, commandArgs = [], stdOut = () => {}, s
 
 // export function pipeState() {
 //   return (dispatch, getState) => {
-//     const { selectedEon, scanResults } = getState().eonList;
-//     const eon = scanResults[selectedEon];
+//     const { selectedEon, eons } = getState().eonList;
+//     const eon = eons[selectedEon];
 //     console.warn("pipeState to:",eon);
 //     if (eon) {
 //       dispatch(OPEN_REQUEST_EON_STATE());
@@ -342,8 +350,8 @@ export function sendCommand(eon, command, commandArgs = [], stdOut = () => {}, s
 
 export function fetchFingerprint() {
   return (dispatch, getState) => {
-    const { selectedEon, scanResults } = getState().eonList;
-    const eon = scanResults[selectedEon];
+    const { selectedEon, eons } = getState().eonList;
+    const eon = eons[selectedEon];
     const { polling } = getState().eonDetail;
     setTimeout(() => {
       fetch(`http://${eon.ip}:8080/fingerprint.json`)
@@ -364,11 +372,13 @@ export function fetchFingerprint() {
     },2000);
   };
 }
-
+export function stopPolling() {
+  dispatch(STOP_POLLING);
+}
 export function fetchEonState() {
   return (dispatch, getState) => {
-    const { selectedEon, scanResults } = getState().eonList;
-    const eon = scanResults[selectedEon];
+    const { selectedEon, eons } = getState().eonList;
+    const eon = eons[selectedEon];
     const { polling } = getState().eonDetail;
     setTimeout(() => {
       fetch(`http://${eon.ip}:8080/state.json`)
@@ -391,12 +401,12 @@ export function fetchEonState() {
 }
 export function install() {
   return (dispatch, getState) => {
-    const { selectedEon, scanResults } = getState().eonList;
+    const { selectedEon, eons } = getState().eonList;
 
-    const eon = scanResults[selectedEon];
+    const eon = eons[selectedEon];
     console.warn("Starting Api install...");
     dispatch(BEGIN_install());
-    dispatch(eonListActions.sendCommand(eon, commands.INSTALL_API, [], (resp) => {
+    dispatch(sendCommand(eon, commands.INSTALL_API, [], (resp) => {
       console.info("Installing...", resp);
 
       app.sshClient.dispose();
@@ -415,13 +425,11 @@ export function install() {
 
 export function uninstall() {
   return (dispatch, getState) => {
-    const { selectedEon, scanResults } = getState().eonList;
-    console.warn("scanResults:",scanResults);
-    console.warn("selectedEon:",selectedEon);
-    const eon = scanResults[selectedEon];
+    const { selectedEon, eons } = getState().eonList;
+    const eon = eons[selectedEon];
     console.warn("Starting Api UNINSTALL...");
     dispatch(BEGIN_uninstall());
-    dispatch(eonListActions.sendCommand(eon, commands.UNINSTALL_API, [], (resp) => {
+    dispatch(sendCommand(eon, commands.UNINSTALL_API, [], (resp) => {
       console.info("UNINSTALLING...", resp);
       app.sshClient.dispose();
       dispatch(SUCCESS_uninstall());

app/actions/eon_list_actions.js

@@ -1,9 +1,5 @@
-import path from 'path';
-import fs from 'fs';
-import settings from 'electron-settings';
-import routes from '../constants/routes.json';
+
 import * as types from '../constants/eon_list_action_types';
-import * as networkActions from './network_connection_actions';
 
 const app = require('electron').remote.app;
 const SSH = require('node-ssh');
@@ -16,21 +12,23 @@ function revisedRandId() {
 
 export function ADD_EON(eon) {
   let randomId = revisedRandId();
-  let newEon = {
-  }
+  let newEon = {};
+
   newEon[randomId] = {
     ...eon,
     id: randomId
-  }
+  };
+  
   return {
     type: types.ADD_EON,
     payload: {
       eon: newEon
     }
-  }
+  };
 }
 
 export function SELECT_EON(index) {
+  console.warn("SELECT_EON:",index);
   return {
     type: types.SELECT_EON,
     payload: {
@@ -47,7 +45,8 @@ export function DESELECT_EON(index) {
 
 export function selectEon(eon) {
   return (dispatch, getState) => {
-    dispatch(SELECT_EON(eon.id));
+    console.log("Selecting eon",eon);
+    dispatch(SELECT_EON(eon));
   };
 }
 export function checkExistingEONStatuses() {

app/actions/network_scanner_actions.js

@@ -1,62 +1,72 @@
 import * as types from '../constants/network_scanner_action_types';
 
-// STARTS THE SEARCH
+function revisedRandId() {
+  return Math.random().toString(36).replace(/[^a-z]+/g, '').substr(2, 10);
+}
 export function BEGIN_scanNetwork() {
-  // console.log("dispatched BEGIN_scanNetwork");
-
   return {
     type: types.SCAN_NETWORK
   };
 }
 
-export function RESULT_scanNetwork(result,state) {
-  // console.log(result);
-  if (result.status !== 'open') {
-    result = null;
-  } else {
-    result = {
-      ip: "",
-      mac: ""
+export function RESULT_scanNetwork(result) {
+  let randomId = revisedRandId();
+  let newEon = {
+  }
+  if (result.status !== "open") {
+    return {
+      type: types.SCAN_RESULT_ERROR
     }
   }
+  newEon[randomId] = {
+    ...result,
+    id: randomId
+  }
   return {
     type: types.SCAN_NETWORK_RESULT,
     payload: {
-      ...result
+      eon: newEon
     }
   };
 }
 
-export function PROGRESS_scanNetwork() {
+export function MAC_ADDRESS_REQUEST() {
   return {
-    type: types.SCAN_NETWORK_PROGRESS,
+    type: types.MAC_ADDRESS_REQUEST
   };
 }
 
-// SUCCESSFUL SCAN
-export function SUCCESS_scanNetwork(results,state) {
+export function MAC_ADDRESS_SUCCESS(data) {
   return {
-    type: types.SCAN_NETWORK_SUCCESS,
+    type: types.MAC_ADDRESS_SUCCESS,
     payload: {
-      results
+      eon: data
     }
   };
 }
 
-export function FOUND_scanNetwork(foundResults,state) {
+export function MAC_ADDRESS_ERROR(error) {
   return {
-    type: types.SCAN_NETWORK_FOUND,
+    type: types.MAC_ADDRESS_ERROR,
     payload: {
-      found: foundResults
+      error
     }
   };
 }
 
-export function NOT_FOUND_scanNetwork() {
-  // settings.set("scanResults",results);
-  console.warn("DISPATCHING");
+export function PROGRESS_scanNetwork() {
+  return {
+    type: types.SCAN_NETWORK_PROGRESS,
+  };
+}
+
+// SUCCESSFUL SCAN
+export function SUCCESS_scanNetwork(results,state) {
   return {
-    type: types.SCAN_NETWORK_NOT_FOUND,
+    type: types.SCAN_NETWORK_SUCCESS,
+    payload: {
+      results
+    }
   };
 }
 
@@ -81,3 +91,12 @@ export function resetScanNetwork() {
     type: types.SCAN_NETWORK_RESET
   };
 }
+
+export function REMOVE_SCANNED_RESULT(id) {
+  return {
+    type: types.REMOVE_SCANNED_RESULT,
+    payload: {
+      id
+    }
+  };
+}

app/components/EonDetail/Styles.scss

@@ -57,6 +57,7 @@
 }
 .state_card_header {
   border-radius:0!important;
+  text-transform:capitalize;
   background-color:darken(#03111C,1)!important;
 }
 .state_card_list_group {

app/components/EonDetail/index.js

@@ -30,6 +30,8 @@ const propTypes = {
   thermal: PropTypes.object,
   gpsLocation: PropTypes.object,
   network: PropTypes.string,
+  tmuxError: PropTypes.any,
+  sshStatus: PropTypes.any,
   fingerprint: PropTypes.any,
   currentStateKeys: PropTypes.array,
   fingerprintString: PropTypes.string
@@ -82,6 +84,7 @@ class EonDetail extends Component {
     // }, 3000);
   }
   componentWillUnmount() {
+    this.props.STOP_POLLING();
     // this.props.uninstall();
   }
 
@@ -91,11 +94,11 @@ class EonDetail extends Component {
   // }
 
   render() {
-    const { network, fingerprint, fingerprintString, currentStateKeys, tmuxStartedAt, thermal, serviceState, eon, selectedEon, healthState, sshConnectionError, sshConnectionStatus, gpsState, vehicleConnection, tmuxAttached } = this.props;
+    const { network, fingerprint, tmuxError, fingerprintString, currentStateKeys, tmuxStartedAt, thermal, serviceState, eon, selectedEon, healthState, sshConnectionError, sshStatus, sshConnectionStatus, gpsState, vehicleConnection, tmuxAttached } = this.props;
     const vehicleConnectionInfo = vehicleConnectionStatuses[vehicleConnection];
     // const { usbOnline } = thermal;
+    console.warn("sshConnectionError:",sshConnectionError);
     if (network === 'disconnected' || eon == null) {
-      // console.warn("SSH CONNECTION ERROR!",sshConnectionError);
       return (<Redirect to={routes.EON_LIST} />);
     }
     if (fingerprint) {
@@ -125,7 +128,7 @@ class EonDetail extends Component {
           <Card className={styles.state_card}>
             <CardBody className={styles.state_card_body}>
               <CardHeader className={styles.state_card_header}>Fingerprint</CardHeader>
-              <Textarea autoFocus className={styles.fingerprint_input + " form-control text-light"} rows="4">{fingerprintString}</Textarea>
+              <Textarea autoFocus className={styles.fingerprint_input + " form-control text-light"} rows="4" defaultValue={fingerprintString} />
             </CardBody>
           </Card>
           }

app/components/EonList/Styles.scss

@@ -9,6 +9,15 @@
   color:#FFF;
 
 }
+
+.list_group_header {
+  font-size:11px;
+  text-transform:uppercase;
+  margin-top:10px;
+  line-height:20px;
+  display:block;
+  color:rgba(#FFF,0.5);
+}
 .react_ip_input {
   display: inline-block;
   border: 1px solid #c2c3c9;
@@ -168,6 +177,7 @@
   right:15px;
   top:50%;
   transform: translateY(-50%);
+  color:#FFF!important;
 }
 
 .ssh_message {
@@ -189,13 +199,20 @@
 
 .results_button {
   display:block;
+  min-height:68px;
   border-radius:0!important;
   background-color:rgba(#FFF,0.05)!important;
   &:hover {
     background-color:rgba(#FFF,0.1)!important;
   }
+
+  .fa {
+    color:#FFF!important;
+  }
 }
 
+.results_button_selected 
+
 /* .results_button:hover .eon_icon {
   opacity: 0.5;
 } */