From cf8fe16b0975b1619421b8d4fa6ff9511d75da53 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Sun, 15 Mar 2015 23:31:38 +0000
Subject: [PATCH] Remove direct access to RED.nodes.nodes/links

 - Adds RED.nodes.filterNodes and RED.nodes.filterLinks for
   doing simply queries to find elements that match a criteria
---
 public/red/nodes.js         | 48 ++++++++++++++++++++++++++++++++++---
 public/red/ui/view.js       | 14 +++++------
 public/red/ui/workspaces.js |  5 +---
 3 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/public/red/nodes.js b/public/red/nodes.js
index 4759cd30a..158529687 100644
--- a/public/red/nodes.js
+++ b/public/red/nodes.js
@@ -779,6 +779,45 @@ RED.nodes = (function() {
         return [new_nodes,new_links,new_workspaces,new_subflows];
     }
     
+    // TODO: only supports filter.z
+    function filterNodes(filter) {
+        var result = [];
+        
+        for (var n=0;n<nodes.length;n++) {
+            var node = nodes[n];
+            if (filter.z && node.z !== filter.z) {
+                continue;
+            }
+            result.push(node);
+        }
+        return result;
+    }
+    function filterLinks(filter) {
+        var result = [];
+        
+        for (var n=0;n<links.length;n++) {
+            var link = links[n];
+            if (filter.source) {
+                if (filter.source.id && link.source.id !== filter.source.id) {
+                    continue;
+                }
+                if (filter.source.z && link.source.z !== filter.source.z) {
+                    continue;
+                }
+            }
+            if (filter.target) {
+                if (filter.target.id && link.target.id !== filter.target.id) {
+                    continue;
+                }
+                if (filter.target.z && link.target.z !== filter.target.z) {
+                    continue;
+                }
+            }
+            result.push(link);
+        }
+        return result;
+    }
+    
     // TODO: DRY
     var eventHandler = (function() {
         var handlers = {};
@@ -854,7 +893,12 @@ RED.nodes = (function() {
                 }
             }
         },
+        
         node: getNode,
+        
+        filterNodes: filterNodes,
+        filterLinks: filterLinks,
+        
         import: importNodes,
         refreshValidation: refreshValidation,
         getAllFlowNodes: getAllFlowNodes,
@@ -867,8 +911,6 @@ RED.nodes = (function() {
             } else {
                 setDirty(d);
             }
-        },
-        nodes: nodes, // TODO: exposed for d3 vis
-        links: links  // TODO: exposed for d3 vis
+        }
     };
 })();
diff --git a/public/red/ui/view.js b/public/red/ui/view.js
index 6d778cdab..f55f2003f 100644
--- a/public/red/ui/view.js
+++ b/public/red/ui/view.js
@@ -232,13 +232,14 @@ RED.view = (function() {
     var drag_line = vis.append("svg:path").attr("class", "drag_line");
 
     function updateActiveNodes() {
-        //TODO: remove direct access to RED.nodes.nodes
-        activeNodes = RED.nodes.nodes.filter(function(d) {
-            return d.z == RED.workspaces.active();
+        var activeWorkspace = RED.workspaces.active();
+        
+        activeNodes = RED.nodes.filterNodes({z:activeWorkspace});
+        
+        activeLinks = RED.nodes.filterLinks({
+            source:{z:activeWorkspace},
+            target:{z:activeWorkspace}
         });
-        activeLinks = RED.nodes.links.filter(function(d) {
-            return d.source.z == RED.workspaces.active() && d.target.z == RED.workspaces.active();
-        })
     }
 
     function init() {
@@ -1185,7 +1186,6 @@ RED.view = (function() {
                 vis.selectAll(".subflowinput").remove();
             }
             
-            //var node = vis.selectAll(".nodegroup").data(RED.nodes.nodes.filter(function(d) { return d.z == RED.workspaces.active() }),function(d){return d.id});
             var node = vis.selectAll(".nodegroup").data(activeNodes,function(d){return d.id});
             node.exit().remove();
 
diff --git a/public/red/ui/workspaces.js b/public/red/ui/workspaces.js
index e68e48355..4cdeb026b 100644
--- a/public/red/ui/workspaces.js
+++ b/public/red/ui/workspaces.js
@@ -44,10 +44,7 @@ RED.workspaces = (function() {
         }
         var nodes = [];
         if (!force) {
-            //TODO: remove direct access to RED.nodes.nodes
-            nodes = RED.nodes.nodes.filter(function(d) {
-                return d.z == ws.id;
-            });
+            nodes = RED.nodes.filterNodes({z:ws.id});
         }
         if (force || nodes.length === 0) {
             removeWorkspace(ws);