Basic support for constraints

Each node can be right a constraint or a barrier to entry
LeadingEdgeForum · May 29, 2017 · 0974fb6 · 0974fb6
1 parent c4c1c9e
commit 0974fb6
Show file tree

Hide file tree

Showing 13 changed files with 98 additions and 41 deletions.
diff --git a/build-ui/js/canvas-wrapper.js b/build-ui/js/canvas-wrapper.js
diff --git a/build-ui/js/google-app.js b/build-ui/js/google-app.js
diff --git a/build-ui/js/l-p-app.js b/build-ui/js/l-p-app.js
diff --git a/src-server/workspace/image-renderer.js b/src-server/workspace/image-renderer.js
@@ -66,6 +66,7 @@ function safeStringify(obj) {
 var r = process.cwd();
 var script = fs.readFileSync(r + '/build-ui/js/canvas-wrapper.js');
 var css = fs.readFileSync(r + '/build-ui/css/bootstrap.min.css');
+var glyphs = fs.readFileSync(r + '/build-ui/fonts/glyphicons-halflings-regular.svg');
 
 function renderFullPage(opts) {
   return "<!doctype html><html><head><style>" + css + "</style></head><body><div id=\"root\" style=\"background:white\">"

diff --git a/src-server/workspace/model/map-schema.js b/src-server/workspace/model/map-schema.js
@@ -141,7 +141,7 @@ module.exports = function(conn) {
         return this.save();
     };
 
-    _MapSchema.methods.addNode = function(name, x, y, type, workspace, description, inertia, responsiblePerson) {
+    _MapSchema.methods.addNode = function(name, x, y, type, workspace, description, inertia, responsiblePerson, constraint) {
         var Node = require('./node-schema')(conn);
 
         var _this = this;
@@ -156,6 +156,7 @@ module.exports = function(conn) {
                 description: description,
                 inertia: inertia,
                 responsiblePerson: responsiblePerson,
+                constraint : constraint
             }).save()
             .then(function(node) {
                 _this.nodes.push(node._id);
@@ -169,7 +170,7 @@ module.exports = function(conn) {
             });
     };
 
-    _MapSchema.methods.changeNode = function(name, x, y, type, desiredNodeId, description, inertia, responsiblePerson) {
+    _MapSchema.methods.changeNode = function(name, x, y, type, desiredNodeId, description, inertia, responsiblePerson, constraint) {
         var _this = this;
         var Node = require('./node-schema')(conn);
         return Node.findOne({
@@ -197,6 +198,9 @@ module.exports = function(conn) {
                 if (responsiblePerson) {
                     node.responsiblePerson = responsiblePerson;
                 }
+                if (constraint !== null && constraint !== undefined) {
+                    node.constraint = constraint;
+                }
                 return q.allSettled([node.save(), _this.populate({
                     path: 'nodes',
                     model: 'Node'

diff --git a/src-server/workspace/model/node-schema.js b/src-server/workspace/model/node-schema.js
@@ -45,6 +45,7 @@ module.exports = function(conn){
         x: Schema.Types.Number,
         y: Schema.Types.Number,
         type: Schema.Types.String,
+        constraint: Schema.Types.Number, // 0 - none, 10 - constraint, 20 - barrier
         inboundDependencies: [{
             type: Schema.Types.ObjectId,
             ref: 'Node'

diff --git a/src-server/workspace/workspace-router.js b/src-server/workspace/workspace-router.js
@@ -476,6 +476,7 @@ module.exports = function(authGuardian, mongooseConnection) {
       var x = req.body.x;
       var y = req.body.y;
       var type = req.body.type;
+      var constraint = req.body.constraint;
       var parentMap = new ObjectId(mapID);
 
       WardleyMap.findOne({ //this is check that the person logged in can actually write to workspace
@@ -487,7 +488,7 @@ module.exports = function(authGuardian, mongooseConnection) {
               return map.verifyAccess(owner);
           })
           .then(function(map) {
-              return map.addNode(name, x, y, type, new ObjectId(workspaceID), description, inertia, responsiblePerson);
+              return map.addNode(name, x, y, type, new ObjectId(workspaceID), description, inertia, responsiblePerson, constraint);
           })
           .fail(function(e) {
               return defaultAccessDenied(res, e);
@@ -697,6 +698,7 @@ module.exports = function(authGuardian, mongooseConnection) {
       var desiredNodeId = new ObjectId(req.params.nodeID);
       var description = req.body.description;
       var inertia = req.body.inertia;
+      var constraint = req.body.constraint;
       var responsiblePerson = req.body.responsiblePerson;
 
       // find a map with a node
@@ -711,7 +713,7 @@ module.exports = function(authGuardian, mongooseConnection) {
               return map.verifyAccess(owner);
           })
           .then(function(map) {
-              return map.changeNode(name, x, y, type, desiredNodeId, description, inertia, responsiblePerson);
+              return map.changeNode(name, x, y, type, desiredNodeId, description, inertia, responsiblePerson, constraint);
           })
           .then(function(result) {
               return result[1].value.formJSON();

diff --git a/src-ui/map-editor/dialogs/create-new-node-dialog.js b/src-ui/map-editor/dialogs/create-new-node-dialog.js
@@ -68,6 +68,10 @@ var CreateNewNodeDialog = React.createClass({
   render: function() {
     var show = this.state.open;
     var inertia = this.internalState.inertia;
+    var constraint = this.internalState.constraint;
+    if(constraint === null || constraint === undefined){
+      constraint = 0;
+    }
     return (
       <div>
         <Modal show={show} onHide={this._close}>
@@ -105,6 +109,16 @@ var CreateNewNodeDialog = React.createClass({
                     <Radio inline value={1} checked={inertia==1} onChange={this._handleDialogChange.bind(this, 'inertia')}>Huge</Radio>
                 </Col>
               </FormGroup>
+              <FormGroup controlId="constraint">
+                <Col sm={2}>
+                  <ControlLabel>Limitation</ControlLabel>
+                </Col>
+                <Col sm={9}>
+                    <Radio inline checked={ constraint==0 || !constraint} value={0} onChange={this._handleDialogChange.bind(this, 'constraint')}>None</Radio>{' '}
+                    <Radio inline value={10} checked={constraint==10} onChange={this._handleDialogChange.bind(this, 'constraint')}>Constraint</Radio>{' '}
+                    <Radio inline value={20} checked={constraint==20} onChange={this._handleDialogChange.bind(this, 'constraint')}>Barrier to entry</Radio>{' '}
+                </Col>
+              </FormGroup>
               <FormGroup controlId="description">
                 <Col sm={2}>
                   <ControlLabel>Description</ControlLabel>

diff --git a/src-ui/map-editor/dialogs/edit-node-dialog.js b/src-ui/map-editor/dialogs/edit-node-dialog.js
@@ -55,7 +55,8 @@ var EditNodeDialog = React.createClass({
       this.internalState.type,
       this.internalState.responsiblePerson,
       this.internalState.inertia,
-      this.internalState.description
+      this.internalState.description,
+      this.internalState.constraint
     );
     this.internalState = {};
   },
@@ -83,7 +84,11 @@ var EditNodeDialog = React.createClass({
     var description = this.internalState.description;
     var responsiblePerson = this.internalState.responsiblePerson;
     var inertia = this.internalState.inertia;
-
+    var constraint = this.internalState.constraint;
+    if(constraint === null || constraint === undefined){
+      constraint = 0;
+    }
+    console.log('cons', constraint);
     var typeGroup = type != Constants.SUBMAP ? (<FormGroup controlId="type">
       <Col sm={2}>
         <ControlLabel>Type</ControlLabel>
@@ -133,6 +138,16 @@ var EditNodeDialog = React.createClass({
                     <Radio inline checked={inertia == 1} value={1} onChange={this._handleDialogChange.bind(this, 'inertia')}>Huge</Radio>
                 </Col>
               </FormGroup>
+              <FormGroup controlId="constraint">
+                <Col sm={2}>
+                  <ControlLabel>Limitation</ControlLabel>
+                </Col>
+                <Col sm={9}>
+                    <Radio inline checked={ constraint==0 || !constraint} value={0} onChange={this._handleDialogChange.bind(this, 'constraint')}>None</Radio>{' '}
+                    <Radio inline value={10} checked={constraint==10} onChange={this._handleDialogChange.bind(this, 'constraint')}>Constraint</Radio>{' '}
+                    <Radio inline value={20} checked={constraint==20} onChange={this._handleDialogChange.bind(this, 'constraint')}>Barrier to entry</Radio>{' '}
+                </Col>
+              </FormGroup>
               <FormGroup controlId="description">
                 <Col sm={2}>
                   <ControlLabel>Description</ControlLabel>

diff --git a/src-ui/map-editor/map-component.js b/src-ui/map-editor/map-component.js
@@ -353,6 +353,15 @@ var MapComponent = React.createClass({
     });
     return <div style={style}></div>;
   },
+  renderName(node){
+    if(node.constraint == 20){
+      return <span>{node.name}<Glyphicon glyph="minus-sign"/></span>;
+    }
+    if(node.constraint == 10){
+      return <span>{node.name}<Glyphicon glyph="exclamation-sign"/></span>;
+    }
+    return node.name;
+  },
   render: function() {
     var node = this.props.node;
 
@@ -365,7 +374,7 @@ var MapComponent = React.createClass({
       position: 'absolute',
       cursor: 'pointer'
     });
-    var name = node.name;
+    var name = this.renderName(node);
     var menu = this.renderMenu();
     var shouldBeDraggable = this.props.focused;
     var _this = this;

diff --git a/src-ui/map-editor/single-map-actions.js b/src-ui/map-editor/single-map-actions.js
@@ -317,7 +317,7 @@ var SingleMapActions = {
     },
 
     updateNode: function(workspaceId, mapId, nodeId, pos,
-      name, type, person, inertia, description){
+      name, type, person, inertia, description, constraint){
       if(!nodeId){
         console.error('missing node id');
         return;
@@ -329,11 +329,12 @@ var SingleMapActions = {
             mapId: mapId,
             nodeId :nodeId,
             pos : pos ? pos : null,
-            name,
-            type,
-            person,
-            inertia,
-            description
+            name : name,
+            type : type,
+            person : person,
+            inertia : inertia,
+            description: description,
+            constraint : constraint
           }
       });
     },

diff --git a/src-ui/map-editor/single-map-store.js b/src-ui/map-editor/single-map-store.js
@@ -473,6 +473,7 @@ export default class SingleWorkspaceStore extends Store {
         this.editNodeDialog.responsiblePerson = nodes[i].responsiblePerson;
         this.editNodeDialog.inertia = nodes[i].inertia;
         this.editNodeDialog.description = nodes[i].description;
+        this.editNodeDialog.constraint = nodes[i].constraint;
         this.editNodeDialog.workspaceId = this.getWorkspaceId();
         this.editNodeDialog.mapId = this.getMapId();
         this.editNodeDialog.nodeId = data.nodeID;
@@ -502,12 +503,13 @@ export default class SingleWorkspaceStore extends Store {
       payload.x = data.pos.x;
       payload.y = data.pos.y;
     }
-    if(data.name || data.type || data.person || data.inertia || data.description){
+    if(data.name || data.type || data.person || data.inertia || data.description || data.constraint !== undefined ){
       payload.name = data.name;
       payload.type = data.type;
       payload.responsiblePerson = data.person;
       payload.inertia = data.inertia;
       payload.description = data.description;
+      payload.constraint = data.constraint;
     }
     $.ajax({
       type: 'PUT',

diff --git a/src-ui/minimal-canvas/map-component.js b/src-ui/minimal-canvas/map-component.js
@@ -48,7 +48,15 @@ var MapComponent = React.createClass({
     });
     return <div style={style}></div>;
   },
-
+  renderName(node){
+    if(node.constraint == 20){
+      return <span>{node.name}<img alt="Minus" width="10" height="10" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA+5pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ1dWlkOjY1RTYzOTA2ODZDRjExREJBNkUyRDg4N0NFQUNCNDA3IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJBNDNBQjg5MDY5RjExRTI5OUZEQTZGODg4RDc1ODdCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJBNDNBQjg4MDY5RjExRTI5OUZEQTZGODg4RDc1ODdCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowMTgwMTE3NDA3MjA2ODExODA4M0ZFMkJBM0M1RUU2NSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDowNjgwMTE3NDA3MjA2ODExODA4M0U3NkRBMDNEMDVDMSIvPiA8ZGM6dGl0bGU+IDxyZGY6QWx0PiA8cmRmOmxpIHhtbDpsYW5nPSJ4LWRlZmF1bHQiPmdseXBoaWNvbnM8L3JkZjpsaT4gPC9yZGY6QWx0PiA8L2RjOnRpdGxlPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PjBen84AAADMSURBVHjavJaNDYQgDIXFCRiBERjBERnNETqCG/RoUgwSwd6dvCYvJqbtF7E/OGZeLOacC/kRmteU48mUQEA9aeIkCcW1I1KfMMzVAXgN5i8lMd4Eyhaz9h8gRRIbhyCFHH9Aio4W1h7X/gKk/jJ/B0ovQs5/dgFpdfEkhRqUJoJSDaKJICpDYeaxnccnoG3gEEfdftMavTzbEGSFVLAuaF0wFtaHiR2tmR58CVcMsPJGNyxmBMGGKnRNwBYfdJVDLyezrlsOdYH8CDAAn5YfwrN58ucAAAAASUVORK5CYII=" /></span>;
+    }
+    if(node.constraint == 10){
+      return <span>{node.name}<img alt="Exclamation" width="10" height="10" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA+5pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ1dWlkOjY1RTYzOTA2ODZDRjExREJBNkUyRDg4N0NFQUNCNDA3IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkEzRUY0MTREMDZBMDExRTI5OUZEQTZGODg4RDc1ODdCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkEzRUY0MTRDMDZBMDExRTI5OUZEQTZGODg4RDc1ODdCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowMTgwMTE3NDA3MjA2ODExODA4M0ZFMkJBM0M1RUU2NSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDowNjgwMTE3NDA3MjA2ODExODA4M0U3NkRBMDNEMDVDMSIvPiA8ZGM6dGl0bGU+IDxyZGY6QWx0PiA8cmRmOmxpIHhtbDpsYW5nPSJ4LWRlZmF1bHQiPmdseXBoaWNvbnM8L3JkZjpsaT4gPC9yZGY6QWx0PiA8L2RjOnRpdGxlPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PsWZdZ8AAAD8SURBVHjavFaBDcQgCFTzA3SDukH7m3WU7yYd5UdwhG7gS4JN368F/AjJpaQRDhFEG2M0HLHW+vTxxe+Q7APLARDVgI5f4BCWVhBwjb/1VSEY0DgKATYDiyjJnPBuIMkA2/mWCEn2P0gy9pKsTBe1k7kIitrZcEVEnslFmskz+yLC6oodiGKuRodVvph+shx9RPTJT3SSLGBTG4cdPzKj8xX9TkbgcAKDXGlXOhmgE+a7lchoEYl3NFV0SsIDK44t6WAXvGIkEqTl3YJwbtiNGdkzGVkA6Eyb7dywOlcQjuO1w/WzHqNefUyoDT7VUa76OOn13LJaD8iPAAMABaJvADxmgE8AAAAASUVORK5CYII=" /></span>;
+    }
+    return node.name;
+  },
   render: function() {
     var node = this.props.node;
 
@@ -61,7 +69,7 @@ var MapComponent = React.createClass({
       position: 'absolute',
       cursor: 'pointer'
     });
-    var name = node.name;
+    var name = this.renderName(node);
     var id = this.props.id;
     var inertia = this.renderInertia(this.props.inertia);
     return (