Changeset 15922 for branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views

Timestamp:

04/26/18 16:33:53 (7 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.JobManager/3.3/Views/HiveResourceSelector.cs (modified) (9 diffs)

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs

@@ -289 +289 @@
           if(project.Name.ToLower().Contains(currentSearchString.ToLower())) {
             filteredProjects.Add(project);
-            filteredProjects.UnionWith(Content.Where(p => HiveClient.Instance.ProjectAncestors[project.Id].Contains(p.Id)));
+            filteredProjects.UnionWith(Content.Where(p => HiveClient.Instance.GetAvailableProjectAncestors(project.Id).Select(x => x.Id).Contains(p.Id)));
           }
         }
@@ -448 +448 @@
     private void UpdateNewAssignedResources() {
       for(int i = newAssignedResources.Count-1; i>=0; i--) {
-        if(newAssignedResources.Intersect(HiveClient.Instance.GetAvailableParentResources(newAssignedResources.ElementAt(i).Id)).Any()) {
+        if(newAssignedResources.Intersect(HiveClient.Instance.GetAvailableResourceAncestors(newAssignedResources.ElementAt(i).Id)).Any()) {
           newAssignedResources.Remove(newAssignedResources.ElementAt(i));
         }
@@ -460 +460 @@
       if (JobId != Guid.Empty) {
         foreach (var item in assignedResources) {
-          foreach (var descendant in HiveClient.Instance.GetAvailableChildResources(item.Id)) {
+          foreach (var descendant in HiveClient.Instance.GetAvailableResourceDescendants(item.Id)) {
             includedResources.Add(descendant);
           }
@@ -467 +467 @@
 
       foreach (var item in newAssignedResources) {
-        foreach (var descendant in HiveClient.Instance.GetAvailableChildResources(item.Id)) {
+        foreach (var descendant in HiveClient.Instance.GetAvailableResourceDescendants(item.Id)) {
           newIncludedResources.Add(descendant);
         }
@@ -476 +476 @@
       newIncludedResources.Clear();
       foreach (var item in newAssignedResources) {
-        foreach (var descendant in HiveClient.Instance.GetAvailableChildResources(item.Id)) {
+        foreach (var descendant in HiveClient.Instance.GetAvailableResourceDescendants(item.Id)) {
           newIncludedResources.Add(descendant);
         }
@@ -598 +598 @@
         Resource r = (Resource)n.Tag;
         if(n.Nodes.Count > 0) {
-          if(HiveClient.Instance.GetAvailableChildResources(r.Id).OfType<SlaveGroup>().Any()
-            || HiveClient.Instance.GetAvailableChildResources(r.Id).OfType<Slave>().Intersect(assignedResources.Union(newAssignedResources)).Any()) {
+          if(HiveClient.Instance.GetAvailableResourceDescendants(r.Id).OfType<SlaveGroup>().Any()
+            || HiveClient.Instance.GetAvailableResourceDescendants(r.Id).OfType<Slave>().Intersect(assignedResources.Union(newAssignedResources)).Any()) {
             n.Expand();
             ExpandResourceNodesOfInterest(n.Nodes);
@@ -615 +615 @@
 
       Resource r = (Resource)tn.Tag;
-      if (HiveClient.Instance.ResourceDescendants.ContainsKey(r.Id)) {
-        if (HiveClient.Instance.GetAvailableChildResources(r.Id).OfType<SlaveGroup>().Any()) {
-          tn.Expand();
-          foreach (TreeNode n in tn.Nodes) CollapseSlaveOnlyNodes(n);
-        } else {
-          tn.Collapse();
-        }
+      if (HiveClient.Instance.GetAvailableResourceDescendants(r.Id).OfType<SlaveGroup>().Any()) {
+        tn.Expand();
+        foreach (TreeNode n in tn.Nodes) CollapseSlaveOnlyNodes(n);
+      } else {
+        tn.Collapse();
       }
     }
@@ -628 +626 @@
       HashSet<Slave> newAssignedSlaves = new HashSet<Slave>(newAssignedResources.OfType<Slave>());
       foreach (var slaveGroup in newAssignedResources.OfType<SlaveGroup>()) {
-        foreach (var slave in HiveClient.Instance.GetAvailableChildResources(slaveGroup.Id).OfType<Slave>()) {
+        foreach (var slave in HiveClient.Instance.GetAvailableResourceDescendants(slaveGroup.Id).OfType<Slave>()) {
           newAssignedSlaves.Add(slave);
         }
@@ -638 +636 @@
         var slaveGroup = resource as SlaveGroup;
         if (slaveGroup != null) {
-          selectedSlaves = new HashSet<Slave>(HiveClient.Instance.GetAvailableChildResources(slaveGroup.Id).OfType<Slave>());
+          selectedSlaves = new HashSet<Slave>(HiveClient.Instance.GetAvailableResourceDescendants(slaveGroup.Id).OfType<Slave>());
         } else {
           selectedSlaves = new HashSet<Slave>(new[] { resource as Slave });