fix circular and root nodes connections were possible in tree view.

When making a circular connection in interfaces view, other added products are randomly linked. Close #30
shuart · Jun 3, 2019 · 96b7c39 · 96b7c39
1 parent 452e54b
commit 96b7c39
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ephemeris",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "System Engineering and requirements management application",
   "main": "index.js",
   "scripts": {

diff --git a/src/js/views/view.relations.js b/src/js/views/view.relations.js
@@ -829,7 +829,7 @@ var createRelationsView = function () {
           }else {
             push(act.remove("metaLinks",{uuid:d.uuid}))
           }
-          
+
           update()
         }
       },
@@ -1045,13 +1045,29 @@ var createRelationsView = function () {
     }else if (nodeTypes[0] =="Functions" && nodeTypes[1] == "Pbs") {
       push(act.add("metaLinks",{type:"originFunction", source:previousSelectedNode.uuid, target:lastSelectedNode.uuid}))
     }else if (nodeTypes[0] =="Pbs" && nodeTypes[1] == "Pbs") {
+      //check for circular references
       if (addMode == "physical") {
-          push(act.add("interfaces",{type:"Physical connection", source:lastSelectedNode.uuid, target:previousSelectedNode.uuid}))
+          let isCircularRef = store.interfaces.items.find(i => (i.target == lastSelectedNode.uuid && i.source == previousSelectedNode.uuid)|| (i.source == lastSelectedNode.uuid && i.target == previousSelectedNode.uuid) )
+          if (!isCircularRef) {
+            push(act.add("interfaces",{type:"Physical connection", source:lastSelectedNode.uuid, target:previousSelectedNode.uuid}))
+          }else {
+            alert("Circular reference. Action not possible")
+          }
       }else if (addMode == "compose") {
-          push(movePbs({origin:lastSelectedNode.uuid, target:previousSelectedNode.uuid}))
-          push(removePbsLink({target:previousSelectedNode.uuid}))
+          let isCircularRef = store.currentPbs.links.find(i => (i.target == lastSelectedNode.uuid && i.source == previousSelectedNode.uuid)|| (i.source == lastSelectedNode.uuid && i.target == previousSelectedNode.uuid) )
+          let targetIsRoot = !store.currentPbs.links.find(i=> i.target == previousSelectedNode.uuid)
+
+          if (!isCircularRef && !targetIsRoot) {
+            push(movePbs({origin:lastSelectedNode.uuid, target:previousSelectedNode.uuid}))
+            push(removePbsLink({target:previousSelectedNode.uuid}))
+
+            push(act.addLink("currentPbs",{ source:lastSelectedNode.uuid, target:previousSelectedNode.uuid}))
+          }else if(isCircularRef){
+            alert("Circular reference. Action not possible")
+          }else if(targetIsRoot){
+            alert("Cannot target the root node")
+          }
 
-          push(act.addLink("currentPbs",{ source:lastSelectedNode.uuid, target:previousSelectedNode.uuid}))
       }
     }
   }

diff --git a/src/package.json b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Ephemeris",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "System Engineering and requirements management application",
   "main": "index.html",
   "window": {