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

Timestamp:

07/19/18 13:37:32 (6 years ago)

Author:

jzenisek

Message:

#2839: adapted illustration of project and resource ancestry in HiveAdministrator and HiveJobAdministrator

File:

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

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

@@ -51 +51 @@
     private readonly Color calculatingColor = Color.FromArgb(255, 58, 114, 35); // #3a7223
     private readonly Color offlineColor = Color.FromArgb(255, 187, 36, 36); // #bb2424
+    private readonly Color grayTextColor = SystemColors.GrayText;
 
 
@@ -301 +302 @@
     private void treeSlaveGroup_MouseDown(object sender, MouseEventArgs e) {
       var node = treeView.GetNodeAt(e.Location);
-      if(node != null && node != ungroupedGroupNode) ChangeSelectedResourceNode(node);
+      if (node == null || node == ungroupedGroupNode) return;
+      var r = (Resource)node.Tag;
+      if(!HiveAdminClient.Instance.DisabledParentResources.Contains(r)) ChangeSelectedResourceNode(node);
     }
 
@@ -311 +314 @@
       if(e.Node == ungroupedGroupNode) {
         e.Cancel = true;
+      } else {
+        var r = (Resource)e.Node.Tag;
+        if(HiveAdminClient.Instance.DisabledParentResources.Contains(r)) {
+          e.Cancel = true;
+        }
       }
     }
@@ -395 +403 @@
       if (!resources.Any()) return;
 
+      var disabledParentResources = HiveAdminClient.Instance.DisabledParentResources;
       var mainResources = new HashSet<Resource>(resources.OfType<SlaveGroup>()
         .Where(x => x.ParentResourceId == null));
-      var parentedMainResources = new HashSet<Resource>(resources.OfType<SlaveGroup>()
-        .Where(x => x.ParentResourceId.HasValue && !resources.Select(y => y.Id).Contains(x.ParentResourceId.Value)));
-      mainResources.UnionWith(parentedMainResources);
-      var subResources = new HashSet<Resource>(resources.Except(mainResources).OrderByDescending(x => x.Name));
+      //var parentedMainResources = new HashSet<Resource>(resources.OfType<SlaveGroup>()
+      //  .Where(x => x.ParentResourceId.HasValue && !resources.Select(y => y.Id).Contains(x.ParentResourceId.Value)));
+      //mainResources.UnionWith(parentedMainResources);
+      var mainDisabledParentResources = new HashSet<Resource>(disabledParentResources.Where(x => x.ParentResourceId == null || x.ParentResourceId == Guid.Empty));
+      mainResources.UnionWith(mainDisabledParentResources);
+      var subResources = new HashSet<Resource>(resources.Union(disabledParentResources).Except(mainResources).OrderByDescending(x => x.Name));
 
       var stack = new Stack<Resource>(mainResources.OrderByDescending(x => x.Name));
@@ -414 +425 @@
         StyleTreeNode(newNode, newResource, resources);
 
-        if (selectedResource == null) {
+        if (selectedResource == null && !disabledParentResources.Contains(newResource)) {
           SelectedResource = newResource;
         }
-        if (newResource.Id == selectedResource.Id && !nodeSelected) {
+        if (!nodeSelected && selectedResource != null && newResource.Id == selectedResource.Id) {
           newNode.BackColor = selectedBackColor;
           newNode.ForeColor = selectedForeColor;
           newNode.Text += SELECTED_TAG;
           nodeSelected = true;
+        }
+
+        if(disabledParentResources.Contains(newResource)) {
+          newNode.Checked = false;
+          newNode.ForeColor = grayTextColor;
         }
 
@@ -505 +521 @@
         Resource r = (Resource)n.Tag;
         if (n.Nodes.Count > 0) {
-          if (HiveClient.Instance.GetAvailableResourceDescendants(r.Id).OfType<SlaveGroup>().Any()) {
+          if (HiveAdminClient.Instance.GetAvailableResourceDescendants(r.Id).OfType<SlaveGroup>().Any()) {
             n.Expand();
             ExpandResourceNodesOfInterest(n.Nodes);
@@ -570 +586 @@
       n.ForeColor = Color.Black;
 
-      // not stored (i.e. new), changed
-      if (r.Id == Guid.Empty && n != ungroupedGroupNode /*!r.Name.StartsWith(UNGROUPED_GROUP_NAME)*/) {
+      if(HiveAdminClient.Instance.DisabledParentResources.Select(x => x.Id).Contains(r.Id)) {
+        n.ForeColor = grayTextColor;
+      } else if (r.Id == Guid.Empty && n != ungroupedGroupNode /*!r.Name.StartsWith(UNGROUPED_GROUP_NAME)*/) {
+        // not stored (i.e. new)
         n.Text += NOT_STORED_TAG;
       } else if (r.Modified && n != ungroupedGroupNode /*!r.Name.StartsWith(UNGROUPED_GROUP_NAME)*/) {
+        // changed
         n.Text += CHANGES_NOT_STORED_TAG;
       }
@@ -682 +701 @@
     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 resources = Content.Union(HiveAdminClient.Instance.DisabledParentResources).ToList();
+
+      foreach (var r in resources) resourceDescendants.Add(r.Id, new HashSet<Resource>());
+      foreach(var r in resources) {
         var parentResourceId = r.ParentResourceId;
         while(parentResourceId != null) {
-          var parent = Content.SingleOrDefault(x => x.Id == parentResourceId);
+          var parent = resources.SingleOrDefault(x => x.Id == parentResourceId);
           if(parent != null) {
             resourceDescendants[parent.Id].Add(r);