From d3b9dfd3b69693f16c60edac438863fab00d2f2e Mon Sep 17 00:00:00 2001
From: Moritz Wicenec <mwicenec@Andreas-MacBook-Pro.local>
Date: Tue, 22 Feb 2022 12:40:59 +0800
Subject: [PATCH] partition filtered out

---
 daliuge-translator/dlg/dropmake/web/main.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/daliuge-translator/dlg/dropmake/web/main.js b/daliuge-translator/dlg/dropmake/web/main.js
index 2833c3f01..2978a989b 100644
--- a/daliuge-translator/dlg/dropmake/web/main.js
+++ b/daliuge-translator/dlg/dropmake/web/main.js
@@ -75,9 +75,13 @@ function drawGraphForDrops(g, drawGraph, data) {
   var nodes = data['nodeDataArray'];
   var links = data['linkDataArray']
   console.log(nodes)
+  var nodes_dict = {};
 	for(var idx of nodes.keys()) {
 		var node = nodes[idx];
-		modified |= _addNode(g, node);
+    if (node.oid){
+      modified |= _addNode(g, node);
+      nodes_dict[node.key] = {node}
+    }
 	}
 
 	var time1 = new Date().getTime();
@@ -85,20 +89,21 @@ function drawGraphForDrops(g, drawGraph, data) {
 
 	// #2: establish missing relationships
 	for(var idx of links.keys()) {
-    g.setEdge(nodes[links[idx]['from']]['oid'], nodes[links[idx]['to']]['oid'], {width: 40});
+    var findex = links[idx]['from']
+    var tindex = links[idx]['to']
+    g.setEdge(nodes_dict[findex].node.oid, nodes_dict[tindex].node.oid, {width: 40});
 	}
   console.log(g)
 
 	if( modified ) {
 		drawGraph();
 	}
-
     zoomFit()
 }
 
 function _addNode(g, node) {
 
-  console.log("adding node")
+
   var TYPE_SHAPES= {Component:'rect', Data:'parallelogram'}
 
 	if( g.hasNode(g) ) {
@@ -114,6 +119,7 @@ function _addNode(g, node) {
 	html += '<span class="notes">' + notes + '</span>';
 	html += '<span style="font-size: 13px;">' + oid + '</span>';
 	html += "</div>";
+  console.log("setting")
 	g.setNode(oid, {
 		labelType: "html",
 		label: html,