botnick
diff --git a/‎CHANGELOG
Lines changed: 4 additions & 0 deletions b/‎CHANGELOG
Lines changed: 4 additions & 0 deletions
diff --git a/‎js/apps/system/_admin/aardvark/APP/frontend/js/views/graphViewer.js
Lines changed: 18 additions & 11 deletions b/‎js/apps/system/_admin/aardvark/APP/frontend/js/views/graphViewer.js
Lines changed: 18 additions & 11 deletions
diff --git a/‎js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js
Lines changed: 12 additions & 3 deletions b/‎js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js
Lines changed: 12 additions & 3 deletions
@@ -1,6 +1,10 @@
 devel
 -----
 
+
+* fixes some graph data parsing issues in the ui, e.g. cleaning up duplicate
+  edges inside the graph viewer.
+
 * in a cluster environment, the arangod process now exits if wrong credentials
   are used during the startup process
 
 
@@ -149,7 +149,6 @@
           self.renderGraph(data);
         },
         error: function (e) {
-          console.log(e);
           arangoHelper.arangoError('Graph', 'Could not load full graph.');
         }
       });
@@ -534,17 +533,22 @@
           */
         });
       } else if (type === 'array') {
+        var edgeObj = {};
+
         _.each(data, function (edge) {
-          vertices[edge._from] = null;
-          vertices[edge._to] = null;
-
-          returnObj.edges.push({
-            id: edge._id,
-            source: edge._from,
-            // label: edge._key,
-            color: '#cccccc',
-            target: edge._to
-          });
+          if (edge) {
+            vertices[edge._from] = null;
+            vertices[edge._to] = null;
+
+            if (edge._id) {
+              edgeObj[edge._id] = {
+                id: edge._id,
+                source: edge._from,
+                color: '#cccccc',
+                target: edge._to
+              };
+            }
+          }
         });
 
         _.each(vertices, function (val, key) {
@@ -557,6 +561,9 @@
             y: Math.random()
           });
         });
+        _.each(edgeObj, function (edge) {
+          returnObj.edges.push(edge);
+        });
       }
 
       return returnObj;
 
@@ -2495,8 +2495,17 @@
 
       // check if result could be displayed as graph
       // case a) result has keys named vertices and edges
-      if (result[0]) {
-        if (result[0].vertices && result[0].edges) {
+
+      var index = 0;
+      for (var i = 0; i < result.length; i++) {
+        if (result[i]) {
+          index = i;
+          break;
+        }
+      }
+
+      if (result[index]) {
+        if (result[index].vertices && result[index].edges) {
           var hitsa = 0;
           var totala = 0;
 
@@ -2739,7 +2748,7 @@
       var headers = {}; // quick lookup cache
       var pos = 0;
       _.each(data.original, function (obj) {
-        if (first === true) {
+        if (first === true && obj) {
           tableDescription.titles = Object.keys(obj);
           tableDescription.titles.forEach(function (t) {
             headers[String(t)] = pos++;