Changeset 15557

Timestamp:

12/21/17 10:09:40 (7 years ago)

Author:

jzenisek

Message:

#2839 fixed tree building routine in ResourcesView

File:

• branches/HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs (modified) (5 diffs)

branches/HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

@@ -301 +301 @@
       if (!resources.Any()) return null;
 
-      var slaveGroups = new HashSet<SlaveGroup>(resources.OfType<SlaveGroup>());
-      var slaves = new HashSet<Slave>(resources.OfType<Slave>());
-
-      var stack = new Stack<Resource>(slaveGroups.OrderByDescending(x => x.Name));
+      var mainResources = new HashSet<Resource>(resources.OfType<SlaveGroup>().Where(x => x.ParentResourceId == null));
+      var subResources = new HashSet<Resource>(resources.Except(mainResources));
+
+      var stack = new Stack<Resource>(mainResources.OrderByDescending(x => x.Name));
       var top = stack.Peek();
 
@@ -310 +310 @@
       Resource currentResource = null;
 
-      while (stack.Any()) {
+      while(stack.Any()) {
         var newResource = stack.Pop();
         var newNode = new TreeNode(newResource.Name) { Tag = newResource };
 
-        while (currentNode != null && newResource.ParentResourceId != currentResource.Id) {
+        // search for parent node of newNode and save in currentNode
+        // necessary since newNodes (stack top items) might be siblings
+        // or grand..grandparents of previous node (currentNode)
+        while(currentNode != null && newResource.ParentResourceId != currentResource.Id) {
           currentNode = currentNode.Parent;
           currentResource = currentNode == null ? null : (Resource)currentNode.Tag;
         }
 
-        if (currentNode == null) {
+        if(currentNode == null) {
           treeView.Nodes.Add(newNode);
         } else {
@@ -325 +328 @@
         }
 
-        if (newResource is Slave) {
+        if(newResource is Slave) {
           newNode.ImageIndex = slaveImageIndex;
         } else {
           newNode.ImageIndex = slaveGroupImageIndex;
 
-          var childSlaves = slaves.Where(x => x.ParentResourceId == newResource.Id);
-          foreach (var slave in childSlaves.OrderBy(x => x.Name)) {
-            slaves.Remove(slave);
-            var slaveNode = new TreeNode(slave.Name) { Tag = slave };
-
-            slaveNode.SelectedImageIndex = slaveNode.ImageIndex = slaveImageIndex;
-            if (slave.OwnerUserId == UserInformation.Instance.User.Id)
-              slaveNode.BackColor = ownedResourceColor;
-
-            newNode.Nodes.Add(slaveNode);
-          }
-
-          var childSlaveGroups = slaveGroups.Where(x => x.ParentResourceId == newResource.Id);
-          if (childSlaveGroups.Any()) {
-            foreach (var slaveGroup in childSlaveGroups.OrderByDescending(x => x.Name)) {
-              slaveGroups.Remove(slaveGroup);
-              stack.Push(slaveGroup);
+          var childResources = subResources.Where(x => x.ParentResourceId == newResource.Id);
+          if(childResources.Any()) {
+            foreach(var resource in childResources.OrderByDescending(x => x.Name)) {
+              subResources.Remove(resource);
+              stack.Push(resource);
             }
             currentNode = newNode;
@@ -352 +343 @@
           }
         }
-
         newNode.SelectedImageIndex = newNode.ImageIndex;
         if (newResource.OwnerUserId == UserInformation.Instance.User.Id)
@@ -366 +356 @@
       };
 
-      foreach (var slave in slaves.OrderBy(x => x.Name)) {
+      foreach (var slave in subResources.OfType<Slave>().OrderBy(x => x.Name)) {
         var slaveNode = new TreeNode(slave.Name) { Tag = slave };
         ungroupedNode.Nodes.Add(slaveNode);