allow use of . in node names for traffic on edges

package.json

@@ -1,5 +1,5 @@
 {
-	"scripts": {
+    "scripts": {
         "start": "cd packages/website && npm run start",
         "precommit": "lint-staged"
     },
@@ -15,5 +15,8 @@
         "lint-staged": "^3.4.0",
         "prettier": "^1.7.0"
     },
-    "dependencies": {}
+    "dependencies": {
+        "d3-hierarchy": "^1.1.9",
+        "react-select": "^3.0.4"
+    }
 }

packages/react-network-diagrams/.storybook/addons.js

@@ -0,0 +1,2 @@
+import '@storybook/addon-actions/register';
+import '@storybook/addon-links/register';

packages/react-network-diagrams/.storybook/config.js

@@ -0,0 +1,4 @@
+import { configure } from '@storybook/react';
+
+// automatically import all files ending in *.stories.js
+configure(require.context('../src/stories', true, /\.stories\.js$/), module);

packages/react-network-diagrams/lib/components/ArcEdge.js

@@ -242,7 +242,8 @@ var ArcEdge = exports.ArcEdge = function (_React$Component) {
                             className: classed,
                             onClick: function onClick(e) {
                                 return _this2.handleClick(e);
-                            }
+                            },
+                            strokeDasharray: this.props.dashed ? '5,5' : false
                         }),
                         _react2.default.createElement("path", {
                             d: arrow,
@@ -267,7 +268,8 @@ var ArcEdge = exports.ArcEdge = function (_React$Component) {
                             className: classed,
                             onClick: function onClick(e) {
                                 return _this2.handleClick(e);
-                            }
+                            },
+                            strokeDasharray: this.props.dashed ? '5,5' : false
                         })
                     ),
                     labelElement
@@ -288,6 +290,8 @@ ArcEdge.propTypes = {
 
     color: _propTypes2.default.string,
 
+    dashed: _propTypes2.default.bool,
+
     curveDirection: _propTypes2.default.string,
 
     /**
@@ -314,6 +318,7 @@ ArcEdge.defaultProps = {
     offset: 20,
     width: 1,
     color: "#ddd",
+    dashed: false,
     curveDirection: "left",
     arrow: false,
     position: 0,

packages/react-network-diagrams/lib/components/BaseMap.js

@@ -236,7 +236,7 @@ var BaseMap = exports.BaseMap = function (_React$Component) {
                 props.selected = nodeSelected || edgeSelected;
                 props.muted = hasSelectedNode && !props.selected || hasSelectedEdge && !props.selected;
 
-                nodeCoordinates[node.name] = { x: props.x, y: props.y };
+                nodeCoordinates[props.id] = { x: props.x, y: props.y };
 
                 return _react2.default.createElement(_Node.Node, _extends({
                     key: props.id
@@ -394,7 +394,14 @@ var BaseMap = exports.BaseMap = function (_React$Component) {
                         muted: muted,
                         onSelectionChange: function onSelectionChange(type, id) {
                             return _this2.handleSelectionChange(type, id);
-                        }
+                        },
+                        dashed: edge.dashed,
+                        maintenance: edge.maintenance,
+                        down: edge.down,
+                        nodata: edge.nodata,
+                        sourceTargetLabel: edge.sourceTargetLabel,
+                        targetSourceLabel: edge.targetSourceLabel,
+                        labelStyle: edge.labelStyle
                     });
                 } else if (edgeDrawingMethod === "pathBidirectionalArrow") {
                     if (_underscore2.default.has(edgePathMap, edge.name)) {

packages/react-network-diagrams/lib/components/BidirectionalEdge.js

@@ -51,6 +51,9 @@ var BidirectionalEdge = exports.BidirectionalEdge = function (_React$Component)
             var sourceToTargetName = this.props.source + "--" + this.props.target;
             var targetToSourceName = this.props.target + "--" + this.props.source;
 
+            var cx = (this.props.x1 + this.props.x2) / 2;
+            var cy = (this.props.y1 + this.props.y2) / 2;
+
             // Position of the bidirectional lines relative to the center line
             var position = this.props.width * 0.75;
 
@@ -74,7 +77,8 @@ var BidirectionalEdge = exports.BidirectionalEdge = function (_React$Component)
                         offset: this.props.offset,
                         selected: this.props.selected,
                         onSelectionChange: this.props.onSelectionChange,
-                        muted: this.props.muted
+                        muted: this.props.muted,
+                        dashed: this.props.dashed
                     }),
                     _react2.default.createElement(_ArcEdge.ArcEdge, {
                         name: this.props.name,
@@ -92,7 +96,8 @@ var BidirectionalEdge = exports.BidirectionalEdge = function (_React$Component)
                         offset: this.props.offset,
                         selected: this.props.selected,
                         onSelectionChange: this.props.onSelectionChange,
-                        muted: this.props.muted
+                        muted: this.props.muted,
+                        dashed: this.props.dashed
                     }),
                     _react2.default.createElement(_ArcEdge.ArcEdge, {
                         name: this.props.name,
@@ -128,7 +133,12 @@ var BidirectionalEdge = exports.BidirectionalEdge = function (_React$Component)
                         key: sourceToTargetName,
                         selected: this.props.selected,
                         muted: this.props.muted,
-                        onSelectionChange: this.props.onSelectionChange
+                        onSelectionChange: this.props.onSelectionChange,
+                        dashed: this.props.dashed,
+                        label: this.props.sourceTargetLabel,
+                        labelStyle: this.props.labelStyle,
+                        labelPosition: "center",
+                        labelOffsetY: this.props.x1 - this.props.x2 > 0 ? this.props.width + 6 : -(this.props.width + 4)
                     }),
                     _react2.default.createElement(_LinearEdge.LinearEdge, {
                         name: this.props.name,
@@ -144,7 +154,12 @@ var BidirectionalEdge = exports.BidirectionalEdge = function (_React$Component)
                         key: targetToSourceName,
                         selected: this.props.selected,
                         muted: this.props.muted,
-                        onSelectionChange: this.props.onSelectionChange
+                        onSelectionChange: this.props.onSelectionChange,
+                        dashed: this.props.dashed,
+                        label: this.props.targetSourceLabel,
+                        labelStyle: this.props.labelStyle,
+                        labelPosition: "center",
+                        labelOffsetY: this.props.x1 - this.props.x2 > 0 ? -(this.props.width + 2) : this.props.width + 6
                     }),
                     _react2.default.createElement(_LinearEdge.LinearEdge, {
                         name: this.props.name,
@@ -158,6 +173,20 @@ var BidirectionalEdge = exports.BidirectionalEdge = function (_React$Component)
                         key: targetToSourceName + "-event-region",
                         onSelectionChange: this.props.onSelectionChange,
                         invisible: true
+                    }),
+                    this.props.maintenance && _react2.default.createElement("path", {
+                        d: "M" + (cx - 8) + "," + (cy - 12) + "l3.771 3.771c.409 1.889-2.33 4.66-4.242 4.242l-3.771-3.77c-.172.584-.258 1.188-.258 1.792 0 1.602.607 3.202 1.83 4.426 1.351 1.351 3.164 1.958 4.931 1.821.933-.072 1.852.269 2.514.931l9.662 9.662c.578.578 1.337.868 2.097.868 1.661 0 3.001-1.364 2.966-3.03-.016-.737-.306-1.47-.868-2.033l-9.662-9.663c-.662-.661-1.002-1.581-.931-2.514.137-1.767-.471-3.58-1.82-4.93-1.225-1.224-2.825-1.83-4.428-1.83-.603 0-1.207.086-1.791.257zm17.5 20.743c0 .553-.447 1-1 1-.553 0-1-.448-1-1s.447-1 1-1 1 .447 1 1z",
+                        fill: "#39444e",
+                        style: { stroke: '#ffffff' }
+                    }),
+                    this.props.down && _react2.default.createElement("path", {
+                        d: "M " + (cx + 10) + "," + (cy + 4) + "l-7.062,-11.828c-0.536,-0.899,-1.477,-1.438,-2.524,-1.438c-1.047,0,-1.988,0.539,-2.523,1.438l-7.059,11.828c-0.547,0.918,-0.559,2.02,-0.031,2.945c0.531,0.93,1.484,1.485,2.551,1.485l14.125,0c1.066,0,2.019,-0.555,2.55,-1.485c0.528,-0.925,0.516,-2.027,-0.027,-2.945zm-9.586,-9.648c0.649,0,1.172,0.523,1.172,1.171l0,4.696c0,0.644,-0.523,1.172,-1.172,1.172c-0.648,0,-1.172,-0.528,-1.172,-1.172l0,-4.696c0,-0.648,0.524,-1.171,1.172,-1.171zm0,11.73c-0.969,0,-1.758,-0.789,-1.758,-1.757c0,-0.973,0.789,-1.762,1.758,-1.762c0.969,0,1.758,0.789,1.758,1.762c0,0.968,-0.789,1.757,-1.758,1.757zm0,0",
+                        fill: "#ff0001",
+                        style: { stroke: '#ffffff' }
+                    }),
+                    this.props.nodata && _react2.default.createElement("path", {
+                        d: "M" + (cx + 6) + "," + (cy - 4) + "c-0.672,-1.148,-1.578,-2.055,-2.727,-2.727c-1.148,-0.668,-2.402,-1.003,-3.761,-1.003c-1.36,0,-2.614,0.335,-3.762,1.003c-1.148,0.672,-2.055,1.579,-2.727,2.727c-0.668,1.148,-1.003,2.402,-1.003,3.762c0,1.359,0.335,2.613,1.003,3.761c0.672,1.149,1.579,2.055,2.727,2.727c1.148,0.668,2.402,1.004,3.762,1.004c1.359,0,2.613,-0.336,3.761,-1.004c1.149,-0.672,2.055,-1.578,2.727,-2.727c0.668,-1.148,1.004,-2.402,1.004,-3.761c0,-1.36,-0.336,-2.614,-1.004,-3.762zm-5.238,8.445c0,0.09,-0.032,0.164,-0.09,0.223c-0.059,0.059,-0.133,0.09,-0.223,0.09l-1.875,0c-0.09,0,-0.164,-0.031,-0.222,-0.09c-0.059,-0.059,-0.09,-0.133,-0.09,-0.223l0,-1.875c0,-0.09,0.031,-0.164,0.09,-0.222c0.058,-0.059,0.132,-0.09,0.222,-0.09l1.875,0c0.09,0,0.164,0.031,0.223,0.09c0.058,0.058,0.09,0.132,0.09,0.222zm2.375,-5.766c-0.082,0.239,-0.172,0.438,-0.273,0.59c-0.102,0.153,-0.247,0.309,-0.434,0.469c-0.191,0.156,-0.34,0.273,-0.449,0.34c-0.11,0.07,-0.27,0.16,-0.481,0.277c-0.211,0.125,-0.39,0.285,-0.531,0.485c-0.137,0.199,-0.207,0.359,-0.207,0.484c0,0.09,-0.031,0.164,-0.09,0.223c-0.058,0.058,-0.133,0.085,-0.223,0.085l-1.875,0c-0.089,0,-0.164,-0.027,-0.222,-0.085c-0.059,-0.059,-0.09,-0.133,-0.09,-0.223l0,-0.352c0,-0.437,0.172,-0.843,0.516,-1.226c0.339,-0.379,0.714,-0.66,1.125,-0.844c0.312,-0.141,0.531,-0.289,0.664,-0.437c0.129,-0.153,0.195,-0.348,0.195,-0.598c0,-0.215,-0.121,-0.406,-0.367,-0.574c-0.242,-0.168,-0.524,-0.254,-0.832,-0.254c-0.34,0,-0.621,0.078,-0.84,0.234c-0.215,0.156,-0.496,0.457,-0.84,0.899c-0.059,0.078,-0.141,0.117,-0.242,0.117c-0.078,0,-0.141,-0.02,-0.188,-0.059l-1.289,-0.976c-0.148,-0.118,-0.172,-0.254,-0.078,-0.411c0.836,-1.382,2.039,-2.078,3.621,-2.078c0.567,0,1.117,0.133,1.66,0.403c0.54,0.265,0.989,0.644,1.348,1.129c0.363,0.488,0.543,1.019,0.543,1.589c0,0.289,-0.039,0.551,-0.121,0.793zm0,0",
+                        fill: "#808080"
                     })
                 );
             }
@@ -192,7 +221,15 @@ BidirectionalEdge.propTypes = {
     selected: _propTypes2.default.bool,
 
     /** Display the endpoint muted */
-    muted: _propTypes2.default.bool
+    muted: _propTypes2.default.bool,
+
+    dashed: _propTypes2.default.bool,
+
+    maintenance: _propTypes2.default.bool,
+
+    down: _propTypes2.default.bool,
+    nodata: _propTypes2.default.bool
+
 };
 
 BidirectionalEdge.defaultProps = {
@@ -202,5 +239,9 @@ BidirectionalEdge.defaultProps = {
     sourceTargetColor: "#C9CACC",
     targetSourceColor: "#C9CACC",
     selected: false,
-    muted: false
+    muted: false,
+    dashed: false,
+    maintenance: false,
+    down: false,
+    nodata: false
 };

packages/react-network-diagrams/lib/components/ConcatenatedCircuit.js

@@ -150,6 +150,7 @@ var ConcatenatedCircuit = exports.ConcatenatedCircuit = function (_React$Compone
 
             var memberCount = memberList.length;
             var squareMemberCount = 0;
+            var somethingSelected = false;
 
             var totalWidth = this.props.width - this.props.margin * 2;
             var totalSquareWidth = 0;
@@ -159,20 +160,25 @@ var ConcatenatedCircuit = exports.ConcatenatedCircuit = function (_React$Compone
                     totalSquareWidth += member.styleProperties.squareWidth;
                     squareMemberCount += 1;
                 }
+                if (member.selected === true) {
+                    somethingSelected = true;
+                }
             });
 
             var lineWidth = (totalWidth - totalSquareWidth) / (memberCount - squareMemberCount);
 
             // Draw the first endpoint
-            elements.push(_react2.default.createElement(_Endpoint.Endpoint, {
-                x: x1,
-                y: y1,
-                key: "endpoint-0",
-                style: memberList[0].endpointStyle,
-                labelPosition: this.props.endpointLabelPosition,
-                offset: this.props.endpointLabelOffset,
-                label: memberList[0].endpointLabelA
-            }));
+            if (memberList[0].endpointLabelA !== undefined) {
+                elements.push(_react2.default.createElement(_Endpoint.Endpoint, {
+                    x: x1,
+                    y: y1,
+                    key: "endpoint-0",
+                    style: memberList[0].endpointStyle,
+                    labelPosition: this.props.endpointLabelPosition,
+                    offset: this.props.endpointLabelOffset,
+                    label: memberList[0].endpointLabelA
+                }));
+            }
 
             /* since the Z of each member is shared with the A of the next member, render only
              * the Z for each member starting with the first member
@@ -184,15 +190,25 @@ var ConcatenatedCircuit = exports.ConcatenatedCircuit = function (_React$Compone
                 } else {
                     x2 = x1 + lineWidth;
                 }
-                elements.push(_react2.default.createElement(_Endpoint.Endpoint, {
-                    x: x2,
-                    y: y2,
-                    key: "endpoint-" + (memberIndex + 1),
-                    style: member.endpointStyle,
-                    labelPosition: _this2.props.endpointLabelPosition,
-                    offset: _this2.props.endpointLabelOffset,
-                    label: member.endpointLabelZ
-                }));
+                var label = undefined;
+                if (member.endpointLabelZ !== undefined) {
+                    label = member.endpointLabelZ;
+                } else {
+                    if (memberList[memberIndex + 1] !== undefined && memberList[memberIndex + 1].endpointLabelA !== undefined) {
+                        label = memberList[memberIndex + 1].endpointLabelA;
+                    }
+                }
+                if (label) {
+                    elements.push(_react2.default.createElement(_Endpoint.Endpoint, {
+                        x: x2,
+                        y: y2,
+                        key: "endpoint-" + (memberIndex + 1),
+                        style: member.endpointStyle,
+                        labelPosition: _this2.props.endpointLabelPosition,
+                        offset: _this2.props.endpointLabelOffset,
+                        label: label
+                    }));
+                }
                 x1 = x2;
             });
 
@@ -210,6 +226,15 @@ var ConcatenatedCircuit = exports.ConcatenatedCircuit = function (_React$Compone
                 } else {
                     x2 = x1 + lineWidth;
                 }
+                var muted = false;
+                var selected = false;
+                if (member.selected === true) {
+                    selected = true;
+                } else {
+                    if (somethingSelected === true) {
+                        muted = true;
+                    }
+                }
                 elements.push(_react2.default.createElement(_Connection.Connection, {
                     x1: x1,
                     x2: x2,
@@ -227,7 +252,10 @@ var ConcatenatedCircuit = exports.ConcatenatedCircuit = function (_React$Compone
                     navTo: member.navTo,
                     size: member.styleProperties.size,
                     centerLine: member.styleProperties.centerLine,
-                    onSelectionChange: _this2.props.onSelectionChange
+                    onSelectionChange: _this2.props.onSelectionChange,
+                    radius: member.endpointRadius,
+                    muted: muted,
+                    selected: selected
                 }));
                 x1 = x2;
             });
@@ -268,7 +296,7 @@ var ConcatenatedCircuit = exports.ConcatenatedCircuit = function (_React$Compone
 
             return _react2.default.createElement(
                 "svg",
-                { className: className, style: svgStyle, onClick: this._deselect },
+                { className: className, style: svgStyle, onClick: this.props.deselect },
                 this.renderCircuitTitle(this.props.title),
                 this.renderCircuitElements(),
                 this.renderParentNavigation(this.props.parentId),

packages/react-network-diagrams/lib/components/Equipment.js

@@ -105,7 +105,7 @@ var Equipment = exports.Equipment = function (_React$Component) {
             var stroke = void 0;
             var fill = void 0;
             var backFill = this.props.backStyle.fill;
-            var overlapFill = this.props.overlapStyle.fill;
+            var overlapFill = this.props.overlapStyle ? this.props.overlapStyle.fill : null;
 
             if (this.state.highlighted && !this.props.selected) {
                 width = this.props.style.line.highlighted.strokeWidth;

packages/react-network-diagrams/lib/components/EquipmentBase.js

@@ -229,7 +229,6 @@ var EquipmentBase = exports.EquipmentBase = function (_React$Component) {
             if (this.props.overlapping) {
                 eqStyle = overlapStyle;
             }
-
             if (this.props.rackFacing === "Front" && this.props.facing === "Back") {
                 eqStyle = backStyle;
                 heightLabel = _react2.default.createElement("g", null);
@@ -240,8 +239,6 @@ var EquipmentBase = exports.EquipmentBase = function (_React$Component) {
                 heightPath = _react2.default.createElement("g", null);
             }
 
-            // const eqStyle = this.props.facing === "Front" && ? frontStyle : backStyle;);
-
             if (!this.props.showHeight) {
                 return _react2.default.createElement(
                     "g",

packages/react-network-diagrams/lib/components/LinearEdge.js

@@ -212,7 +212,8 @@ var LinearEdge = exports.LinearEdge = function (_React$Component) {
                             fill: "none",
                             onClick: function onClick(e) {
                                 return _this2.handleClick(e);
-                            }
+                            },
+                            strokeDasharray: this.props.dashed ? '5,5' : false
                         }),
                         _react2.default.createElement("path", {
                             className: classed,
@@ -236,7 +237,8 @@ var LinearEdge = exports.LinearEdge = function (_React$Component) {
                             fill: "none",
                             onClick: function onClick(e) {
                                 return _this2.handleClick(e);
-                            }
+                            },
+                            strokeDasharray: this.props.dashed ? '5,5' : false
                         })
                     ),
                     labelElement
@@ -254,6 +256,8 @@ LinearEdge.propTypes = {
 
     color: _propTypes2.default.string,
 
+    dashed: _propTypes2.default.bool,
+
     /**
      * Controls the angle of the offset from the center of the line.
      */
@@ -277,6 +281,7 @@ LinearEdge.propTypes = {
 LinearEdge.defaultProps = {
     width: 1,
     color: "#ddd",
+    dashed: false,
     position: 0,
     arrow: false,
     selected: false,