Merge branch 'master' of baltig.sandia.gov:scot/SCOT

Author: brymon68

demo/reset.js

@@ -20,8 +20,10 @@ db.user.drop();
 db.apikey.drop();
 db.signature.drop();
 db.sigbody.drop();
+db.getCollection('group').drop()
 
 print ("Creating indexes...");
+db.getCollection('group').ensureIndex({"name": 1},{unique: true, dropDups:true});
 db.alertgroup.ensureIndex(  { "id":          1}, {unique: true, dropDups:true} );
 db.alertgroup.ensureIndex(  { "message_id":  1} );
 db.alertgroup.ensureIndex(  { "updated":     1} );

docker-configs/mongodb/set_mongodb_config.sh

@@ -22,6 +22,7 @@ set='$set'
 
 if [ ! -f /var/lib/mongodb/mongodb_password_set ]; then
     mongo scot-prod --host mongodb /opt/scot/install/src/mongodb/admin_user.js
+    mongo scot-prod --host mongodb /opt/scot/install/src/mongodb/reset.js
     mongo scot-prod --host mongodb --eval "db.user.update({username:'admin'}, {$set:{pwhash:'$HASH'}}, {multi:true})"
     echo "Mapping set for Mongo" > /var/lib/mongodb/mongodb_password_set
 fi

install/install_scot.sh

@@ -333,6 +333,7 @@ function setup_scot_admin {
         HASH=`$SCOT_CONFIG_SRC/mongodb/passwd.pl`
 
         mongo scot-prod $SCOT_CONFIG_SRC/mongodb/admin_user.js
+        mongo scot-prod $SCOT_CONFIG_SRC/mongodb/defaultgroups.js
         mongo scot-prod --eval "db.user.update({username:'admin'}, {$set:{pwhash:'$HASH'}})"
     fi
 }

install/src/mongodb/admin_user.js

@@ -21,3 +21,4 @@ db.user.insert({
 	"last_activity_check" : 4
 })
 db.user.ensureIndex({username: 1});
+

install/src/mongodb/indexes.js

@@ -75,3 +75,6 @@ db.guide.ensureIndex    (   { "applies_to": 1} );
 
 db.user.ensureIndex ( {"id": 1},{unique: true, dropDups:true} );
 db.user.ensureIndex ( {"username": 1} );
+
+db.getCollection('group').ensureIndex({"name": 1},{unique: true, dropDups:true});
+

install/src/mongodb/reset.js

@@ -25,6 +25,7 @@ db.apikey.drop();
 db.handler.drop();
 db.stat.drop();
 db.entitytype.drop();
+db.getCollection('group').drop()
 
 print ("Creating indexes...");
 load("./src/mongodb/indexes.js");

pubdev/jsdev/react_components/modal/entity_detail.jsx

@@ -45,6 +45,9 @@ let EntityDetail = React.createClass( {
             entityobj: this.props.entityobj,
             height: null,
             isMounted: false,
+            width: 0, 
+            entityModalHeight:0
+
         };
     },
     componentWillMount: function () {
@@ -221,18 +224,21 @@ let EntityDetail = React.createClass( {
             });
         });
         this.props.watcher();
+        const varheight = document.getElementById('container').clientHeight;
+        this.setState({entityModalHeight:varheight})
+        this.updateWindowDimensions();
+        window.addEventListener('resize', this.updateWindowDimensions);
     },
 
+    updateWindowDimensions: function(){
+        this.setState({ width: window.innerWidth, height: window.innerHeight });
+    },
 
     componentWillUnmount: function() {
         this.setState( {isMounted: false} );
         //removes escHandler bind
         $( document ).off( 'keydown' );
-        //This makes the size that was last used hold for future entities 
-        /*let height = $('#dragme').height();
-        let width = $('#dragme').width();
-        entityPopUpHeight = height;
-        entityPopUpWidth = width;*/
+        window.removeEventListener('resize', this.updateWindowDimensions);
     },
     componentWillReceiveProps: function( nextProps ) {
         this.onLoad();
@@ -474,12 +480,17 @@ let EntityDetail = React.createClass( {
             }
         }
     },
+
+    
+
+
     render: function() {
         //This makes the size that was last used hold for future entities
         /*if (entityPopUpHeight && entityPopUpWidth) {
             entityHeight = entityPopUpHeight;
             entityWidth = entityPopUpWidth;
         }*/
+        let heightboundary = 200- this.state.defaultEntityOffset.top 
         let defaultOffsetY;
         let defaultOffsetX;
         let tabsArr = [];
@@ -530,7 +541,7 @@ let EntityDetail = React.createClass( {
             );
         } else {
             return (
-                <Draggable handle="#handle" onMouseDown={this.moveDivInit}>
+                <Draggable handle="#handle" bounds={{top: heightboundary}} onMouseDown={this.moveDivInit}>
                     <div id="dragme" className={DragmeClass} style={{width:this.state.entityWidth, left:defaultOffsetX, maxHeight:'90vh'}}>
                         <div id='popup-flex-container' style={{height: '100%', display:'flex', flexFlow:'row'}}>
                             <div id="entity_detail_container" style={{flexFlow: 'column', display: 'flex', width:'100%'}}>

public/admin/index.html

@@ -30,6 +30,7 @@
 						<div class="navbar-inner">
 							<div class="container">
 								<ul class="nav" id="admin_nav">
+									<li><a href=/>Home</li>
 									<li class="active"><a href="#info">Info</a></li>
 									<!--<li><a href="#backup">Backup</a></li>-->
 									<li><a href="#auth">Auth</a></li>