Stuff

jfrux · Feb 26, 2019 · fadf33f · fadf33f
1 parent 788993d
commit fadf33f
Show file tree

Hide file tree

Showing 86 changed files with 1,920 additions and 277 deletions.
diff --git a/app/actions/eon_detail_actions.js b/app/actions/eon_detail_actions.js
@@ -309,4 +309,44 @@ export function SHOW_EON_FAILED(e) {
     type: types.SHOW_EON_FAILED,
     payload: e
   }
-}
+}
+
+export function DOWNLOAD_ROUTE(eonId) {
+  return {
+    type: types.DOWNLOAD_ROUTE,
+    payload: eonId
+  }
+}
+
+export function DOWNLOAD_ROUTE_SUCCESS(eonId) {
+  return {
+    type: types.DOWNLOAD_ROUTE_SUCCESS,
+    payload: eonId
+  }
+}
+export function DOWNLOAD_ROUTE_FAILED(e) {
+  return {
+    type: types.DOWNLOAD_ROUTE_FAILED,
+    payload: e
+  }
+}
+
+export function DOWNLOAD_SEGMENT(eonId) {
+  return {
+    type: types.DOWNLOAD_SEGMENT,
+    payload: eonId
+  }
+}
+
+export function DOWNLOAD_SEGMENT_SUCCESS(eonId) {
+  return {
+    type: types.DOWNLOAD_SEGMENT_SUCCESS,
+    payload: eonId
+  }
+}
+export function DOWNLOAD_SEGMENT_FAILED(e) {
+  return {
+    type: types.DOWNLOAD_SEGMENT_FAILED,
+    payload: e
+  }
+}
diff --git a/app/actions/network_connection_actions.js b/app/actions/network_connection_actions.js
@@ -112,7 +112,7 @@ function getNeighborNetworks(ip) {
 
 export function getIpsForScan(ip) {
   const { afterNetwork, beforeNetwork } = getNeighborNetworks(ip);
-  const baseIpsToScan = [getBaseIp(ip,3).baseIp,beforeNetwork,afterNetwork]; 
+  const baseIpsToScan = [getBaseIp(ip,3).baseIp,beforeNetwork,afterNetwork];
   return baseIpsToScan;
 }
 
@@ -140,4 +140,4 @@ export function setupNetworkEvents() {
 
     alertOnlineStatus();
   };
-}
+}
diff --git a/app/actions/zmq_actions.js b/app/actions/zmq_actions.js
@@ -12,6 +12,7 @@ export function DISCONNECT(service) {
   };
 }
 export function MESSAGE(data) {
+  // console.log("MESSAGE ACTION:", data);
   return {
     type: types.MESSAGE,
     payload: data

diff --git a/app/app.global.scss b/app/app.global.scss
@@ -25,6 +25,7 @@ $file-name-color: lighten($light-color,40);
 $hidden-file-name-color: rgba($file-name-color,0.4);
 $state-toolbar-height: 40px;
 body {
+  color:$text-color;
   background-color:#212121;
 }
 #foldout-container {
@@ -62,7 +63,7 @@ body {
   @import "styles/state-list";
   @import "styles/command-bar";
   @import "styles/is-mac";
-  
+
   .container-fluid {
     position: relative;
     width:100%;
@@ -86,8 +87,8 @@ body {
       width:100%;
     }
   }
-  .term_fit::-webkit-scrollbar { 
-    display: none; 
+  .term_fit::-webkit-scrollbar {
+    display: none;
   }
   .tab-pane {
     position:relative;
@@ -101,39 +102,39 @@ body {
       padding:15px;
     }
   }
-  .tab-pane::-webkit-scrollbar { 
-    display: none; 
+  .tab-pane::-webkit-scrollbar {
+    display: none;
   }
   .terminal-container {
     padding:10px;
   }
-  .terminal-container::-webkit-scrollbar { 
-    display: none; 
+  .terminal-container::-webkit-scrollbar {
+    display: none;
   }
-  
+
 .console-tab {
   position:relative;
   height:100%;
 }
-.console-tab::-webkit-scrollbar { 
-  display: none; 
+.console-tab::-webkit-scrollbar {
+  display: none;
 }
 .smalltalk {
   display: flex;
   align-items: center;
   flex-direction: column;
   justify-content: center;
-  
+
   transition: 200ms opacity;
-  
+
   bottom: 0;
   left: 0;
   overflow: auto;
   padding: 20px;
   position: fixed;
   right: 0;
   top: 0;
-  
+
   z-index: 100;
 }
 
@@ -191,7 +192,7 @@ body {
   text-align:left;
   // width:100%!important;
   margin:0;
-  
+
   background:darken($base-color,5)!important;
   background:darken($base-color,5)!important;
   border-radius:0;
@@ -274,7 +275,7 @@ body {
   text-overflow: ellipsis;
   white-space: nowrap;
   max-width: 500px;
-  
+
   user-select: none;
   color: #333;
   font-size: 120%;
@@ -287,7 +288,7 @@ body {
 .smalltalk .page .content-area {
   overflow: hidden;
   text-overflow: ellipsis;
-  
+
   padding: 6px 17px;
   position: relative;
 }
@@ -309,7 +310,7 @@ button {
   appearance: none;
   user-select: none;
   background-image: linear-gradient(#ededed, #ededed 38%, #dedede);
-  
+
   border: 1px solid rgba(0, 0, 0, 0.25);
   border-radius: 2px;
   box-shadow: 0 1px 0 rgba(0, 0, 0, 0.08), inset 0 1px 2px rgba(255, 255, 255, 0.75);
@@ -331,7 +332,7 @@ button {
 
 .smalltalk .page .button-strip {
   display: flex;
-  
+
   flex-direction: row;
   justify-content: flex-end;
 }
@@ -447,7 +448,7 @@ body {
       height:25px;
       font-size:11px;
     }
-    
+
     .state-list {
       display:table;
       width:100%;
@@ -527,15 +528,15 @@ body {
       }
     }
   }
-  
+
   &.dashboard {
     .state-card-body {
       .list-group {
         display:flex;
         flex-flow: row;
         justify-content: flex-start;
         background-color:rgba(#000,0.3);
-       
+
         .list-group-item {
           border:0;
           // border-radius: 0 !important;
@@ -599,10 +600,10 @@ body {
                 border-color:#28a745;
                 opacity:1;
                 .state-value {
-                  
+
                 }
                 .state-label {
-                  
+
                 }
               }
             }
@@ -617,14 +618,14 @@ body {
               width: $bubble-width;
               height: $bubble-height;
               position:relative;
-             
+
               .state-value {
                 top: 8px;
                 position: absolute;
                 font-size: 24px;
                 left: 13px;
                 font-weight: bold;
-                
+
               }
               .state-label {
                 position:absolute;
@@ -681,9 +682,9 @@ body {
     &:first-child,&:last-child {
       border-radius:0;
     }
-  
+
   }
-  
+
   .card-body {
     padding:0!important;
     background-color:rgba(#000,0);
@@ -825,11 +826,11 @@ body {
 }
 .progress_overlay {
   margin-top:25px;
-  
+
 }
 
 .scanned_no_results {
-  
+
 }
 .manual_error {
   background-color:transparent!important;
@@ -864,4 +865,4 @@ body {
 }
 
 
-}
+}
diff --git a/app/components/EonList/index.js b/app/components/EonList/index.js
@@ -28,7 +28,7 @@ const propTypes = {
   unresolvedEonIds: PropTypes.array
 };
 
-function ValidateIPaddress(ipaddress) 
+function ValidateIPaddress(ipaddress)
 {
  if (/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(ipaddress))
   {
@@ -53,6 +53,7 @@ class EonList extends Component {
   }
   handleScanNetwork = () => {
     this.setState({showAddForm: false});
+
     this.props.BEGIN_scanNetwork();
   }
   toggleAddForm = () => {
@@ -115,7 +116,7 @@ class EonList extends Component {
     // console.log("eonList:",eonList);
     // if (selectedEon !== null) {
     //   // console.warn("SSH CONNECTION ERROR!",sshConnectionError);
-    //   return (<Redirect to={routes.EON_DETAIL} />); 
+    //   return (<Redirect to={routes.EON_DETAIL} />);
     // }
     if (network === 'disconnected') {
       return <NoConnection />;
@@ -166,7 +167,7 @@ class EonList extends Component {
               </CardBody>
             </Card>
           </Collapse>
-          
+
           <Collapse className={"message"} isOpen={error && error.length > 0}>
             <Card body inverse color="danger" className={"error_message"}>
               <CardBody className={"error_message_body"}>
@@ -197,4 +198,4 @@ class EonList extends Component {
 
 EonList.propTypes = propTypes;
 
-export default EonList;
+export default EonList;
diff --git a/...onents/EonDetail/Console/DataParamsTab.js → ...mponents/Session/Console/DataParamsTab.js b/...onents/EonDetail/Console/DataParamsTab.js → ...mponents/Session/Console/DataParamsTab.js
diff --git a/...ponents/EonDetail/Console/EndpointsTab.js → ...omponents/Session/Console/EndpointsTab.js b/...ponents/EonDetail/Console/EndpointsTab.js → ...omponents/Session/Console/EndpointsTab.js
diff --git a/...components/EonDetail/Console/EventsTab.js → app/components/Session/Console/EventsTab.js b/...components/EonDetail/Console/EventsTab.js → app/components/Session/Console/EventsTab.js
diff --git a/...omponents/EonDetail/Console/ProfileTab.js → app/components/Session/Console/ProfileTab.js b/...omponents/EonDetail/Console/ProfileTab.js → app/components/Session/Console/ProfileTab.js
diff --git a/...omponents/EonDetail/Console/RouteModal.js → app/components/Session/Console/RouteModal.js b/...omponents/EonDetail/Console/RouteModal.js → app/components/Session/Console/RouteModal.js
@@ -20,7 +20,7 @@ const propTypes = {
 class RouteModal extends React.Component {
   // constructor(props) {
   //   super(props);
-    
+
   //   this.state = {
   //     modal: false
   //   };
@@ -76,7 +76,7 @@ class RouteModal extends React.Component {
         <div className={"cabana-url"}>
           <FormGroup>
             <Label for={"cabana-link"}>Sharable Cabana Link</Label>
-            <Input type={"textarea"} value={route.sharable_cabana_url} />
+            <Input type={"textarea"} defaultValue={route.sharable_cabana_url} />
           </FormGroup>
           <FormGroup>
             <Label for={"segments"}>Segments</Label>
@@ -119,4 +119,4 @@ const mapStateToProps = ({ eonDetail }) => {
 export default connect(
   mapStateToProps,
   mapDispatchToProps
-)(RouteModal);
+)(RouteModal);
diff --git a/...components/EonDetail/Console/RoutesTab.js → app/components/Session/Console/RoutesTab.js b/...components/EonDetail/Console/RoutesTab.js → app/components/Session/Console/RoutesTab.js
diff --git a/...mponents/EonDetail/Console/SegmentsTab.js → ...components/Session/Console/SegmentsTab.js b/...mponents/EonDetail/Console/SegmentsTab.js → ...components/Session/Console/SegmentsTab.js
@@ -18,15 +18,14 @@ class SegmentsTab extends React.Component {
   componentDidMount() {
     const startTime = moment().subtract(14,'days');
     const endTime = moment();
-    
+
     this.props.FETCH_SEGMENTS(startTime.valueOf(),endTime.valueOf());
   }
   handleRouteClick = (evt,route) => {
     this.props.SHOW_ROUTE(route.id);
   }
   render() {
     const { activeRouteId, routes, routesSorted, loading } = this.props;
-    // console.log(this.props);
     if (loading) return (<LoadingOverlay message={"Loading drives..."} />);
     const drives = routesSorted.map((routeKey) => {
       const drive = routes[routeKey];
@@ -41,6 +40,12 @@ class SegmentsTab extends React.Component {
               <span>{drive.git_repo}</span><span>{drive.git_branch}</span><span>{drive.version}</span>
             </span>
           </div>
+          <div className="drive-download">
+            <span>{drive.label}</span>
+            <span className={"meta"}>
+              <span>{drive.git_repo}</span><span>{drive.git_branch}</span><span>{drive.version}</span>
+            </span>
+          </div>
         </div>
       );
     });
@@ -77,4 +82,4 @@ const mapStateToProps = ({ eonDetail }) => {
 export default connect(
   mapStateToProps,
   mapDispatchToProps
-)(SegmentsTab);
+)(SegmentsTab);