Changeset 15922 for branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

Timestamp:

04/26/18 16:33:53 (6 years ago)

Author:

jzenisek

Message:

#2839:

• replaced use of TreeView with NoDoubleClickTreeView everywhere allegedly reasonable for Hive
• updated genealogy computation for HiveAdminClient and corresponding views (ResourcesView & ProjectResourcesView)

File:

• branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs (modified) (6 diffs)

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

@@ -231 +231 @@
       };
 
-      HiveAdminClient.Instance.UpdateResourceGenealogy(Content);
+      //HiveAdminClient.Instance.UpdateResourceGenealogy(Content);
       SelectedResource = group;
       Content.Add(group);
@@ -322 +322 @@
       }
 
-      HiveAdminClient.Instance.UpdateResourceGenealogy(Content);
+      // TODO
+      //HiveAdminClient.Instance.UpdateResourceGenealogy(Content);
       OnContentChanged();
     }
@@ -486 +487 @@
     private void CollapseSlaveOnlyNodes(TreeNode tn) {
       Resource r = (Resource)tn.Tag;
-      var descendants = HiveAdminClient.Instance.ResourceDescendants;
+      var descendants = GetResourceDescendants();
       if(descendants.ContainsKey(r.Id)) {
         if(descendants[r.Id].OfType<SlaveGroup>().Any()) {
@@ -493 +494 @@
         } else {
           tn.Collapse();
+        }
+      }
+    }
+
+    private void ExpandResourceNodesOfInterest(TreeNodeCollection nodes) {
+      foreach (TreeNode n in nodes) {
+        Resource r = (Resource)n.Tag;
+        if (n.Nodes.Count > 0) {
+          if (HiveClient.Instance.GetAvailableResourceDescendants(r.Id).OfType<SlaveGroup>().Any()) {
+            n.Expand();
+            ExpandResourceNodesOfInterest(n.Nodes);
+          } else {
+            n.Collapse();
+          }
+        } else {
+          n.Collapse();
         }
       }
@@ -560 +577 @@
       int childSlavesCount = 0;
       if (r.Id != Guid.Empty && r is SlaveGroup) {
-        var descendants = HiveAdminClient.Instance.ResourceDescendants;
+        var descendants = GetResourceDescendants();
         if (descendants.ContainsKey(r.Id)) {
           childSlavesCount = resources
             .OfType<Slave>()
             .Where(x => descendants[r.Id].Select(y => y.Id)
-            .Contains(x.Id))
+              .Contains(x.Id))
             .Count();
         }
@@ -659 +676 @@
     }
 
+
+    private Dictionary<Guid, HashSet<Resource>> GetResourceDescendants() {
+      var resourceDescendants = new Dictionary<Guid, HashSet<Resource>>();
+
+      foreach (var r in Content) resourceDescendants.Add(r.Id, new HashSet<Resource>());
+      foreach(var r in Content) {
+        var parentResourceId = r.ParentResourceId;
+        while(parentResourceId != null) {
+          var parent = Content.SingleOrDefault(x => x.Id == parentResourceId);
+          if(parent != null) {
+            resourceDescendants[parent.Id].Add(r);
+            parentResourceId = parent.ParentResourceId;
+          } else {
+            parentResourceId = null;
+          }
+        }
+      }
+      return resourceDescendants;
+    }
+    
     #endregion
   }