Changeset 16117 for trunk/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs

Timestamp:

08/30/18 11:32:56 (6 years ago)

Author:

jkarder

Message:

#2839: merged [15377-16116/branches/2839_HiveProjectManagement] into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.Administrator (modified) (1 prop)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs (copied) (copied from branches/HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs) (16 diffs)

trunk/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -37 +37 @@
     private const int slaveImageIndex = 0;
     private const int slaveGroupImageIndex = 1;
-    public const string ungroupedGroupName = "UNGROUPED";
-    public const string ungroupedGroupDescription = "Contains slaves that are not assigned to any group.";
+    public const string UNGROUPED_GROUP_NAME = "UNGROUPED";
+    public const string UNGROUPED_GROUP_DESCRIPTION = "Contains slaves that are not assigned to any group.";
+    public const string IMMUTABLE_TAG = " [assigned, immutable]";
+    public const string INCLUDED_TAG = " [included]";
+    public const string ADDED_ASSIGNMENT_TAG = " [added assignment]";
+    public const string REMOVED_ASSIGNMENT_TAG = " [removed assignment]";
+    public const string ADDED_INCLUDE_TAG = " [added include]";
+    public const string REMOVED_INCLUDE_TAG = " [removed include]";
 
     private readonly HashSet<Resource> assignedResources = new HashSet<Resource>();
     private readonly HashSet<Resource> newAssignedResources = new HashSet<Resource>();
-    private readonly HashSet<Resource> inheritedResources = new HashSet<Resource>();
-    private readonly HashSet<Resource> newInheritedResources = new HashSet<Resource>();
-
-    private readonly Dictionary<Guid, HashSet<Project>> projectAncestors = new Dictionary<Guid, HashSet<Project>>();
-    private readonly Dictionary<Guid, HashSet<Project>> projectDescendants = new Dictionary<Guid, HashSet<Project>>();
-    private readonly Dictionary<Guid, HashSet<Resource>> resourceAncestors = new Dictionary<Guid, HashSet<Resource>>();
-    private readonly Dictionary<Guid, HashSet<Resource>> resourceDescendants = new Dictionary<Guid, HashSet<Resource>>();
+    private readonly HashSet<Resource> includedResources = new HashSet<Resource>();
+    private readonly HashSet<Resource> newIncludedResources = new HashSet<Resource>();
 
     private readonly Color addedAssignmentColor = Color.FromArgb(255, 87, 191, 193); // #57bfc1
@@ -54 +55 @@
     private readonly Color addedIncludeColor = Color.FromArgb(25, 169, 221, 221); // #a9dddd
     private readonly Color removedIncludeColor = Color.FromArgb(25, 249, 210, 145); // #f9d291
+    private readonly Color selectedBackColor = Color.DodgerBlue;
+    private readonly Color selectedForeColor = Color.White;
+    private readonly Color grayTextColor = SystemColors.GrayText;
+
+    private HashSet<Resource> projectExclusiveResources = new HashSet<Resource>();
+    private TreeNode ungroupedGroupNode;
 
     public new Project Content {
@@ -73 +80 @@
         assignedResources.Clear();
         newAssignedResources.Clear();
-        inheritedResources.Clear();
-        resourceAncestors.Clear();
+        includedResources.Clear();
         treeView.Nodes.Clear();
         detailsViewHost.Content = null;
       } else {
-        UpdateProjectGenealogy();
         UpdateAssignedResources();
-        UpdateResourceGenealogy();
-        var top = BuildResourceTree(HiveAdminClient.Instance.Resources);
+        UpdateIncludedResources();
+        var top = BuildResourceTree();
         detailsViewHost.Content = top;
+        detailsViewHost.Locked = true;
       }
     }
@@ -102 +108 @@
 
     private void refreshButton_Click(object sender, EventArgs e) {
-      UpdateProjectGenealogy();
+      HiveAdminClient.Instance.Refresh();
       UpdateAssignedResources();
-      UpdateResourceGenealogy();
-      var top = BuildResourceTree(HiveAdminClient.Instance.Resources);
+      UpdateIncludedResources();
+      var top = BuildResourceTree();
       detailsViewHost.Content = top;
     }
@@ -114 +120 @@
           SetAssignedProjectResources(Content.Id, newAssignedResources.Select(x => x.Id), false, true, false);
         });
+      HiveAdminClient.Instance.Refresh();
       UpdateResourceTree();
     }
@@ -122 +129 @@
           SetAssignedProjectResources(Content.Id, newAssignedResources.Select(x => x.Id), false, false, false);
         });
+      HiveAdminClient.Instance.Refresh();
       UpdateResourceTree();
+    }
+
+    private void treeView_BeforeSelect(object sender, TreeViewCancelEventArgs e) {
+      if (e.Node == null || e.Node == ungroupedGroupNode)
+        e.Cancel = true;
+
+      var selectedResource = (Resource)e.Node.Tag;
+      if(HiveAdminClient.Instance.DisabledParentResources.Contains(selectedResource))
+        e.Cancel = true;
     }
 
@@ -131 +148 @@
 
     private void treeView_BeforeCheck(object sender, TreeViewCancelEventArgs e) {
+      if (e.Node == null || e.Node == ungroupedGroupNode) {
+        e.Cancel = true;
+        return;
+      }
+        
       var checkedResource = (Resource)e.Node.Tag;
-      if (newInheritedResources.Contains(checkedResource) || checkedResource.Id == Guid.Empty) {
+      if (checkedResource == null
+        || checkedResource.Id == Guid.Empty
+        || HiveAdminClient.Instance.DisabledParentResources.Contains(checkedResource) 
+        || newIncludedResources.Contains(checkedResource)) {
         e.Cancel = true;
-      } else if (!HiveRoles.CheckAdminUserPermissions()) {
-          if (!projectAncestors[Content.Id].Any()) {
+      } else if (!IsAdmin()) {
+          if (!HiveAdminClient.Instance.CheckOwnershipOfParentProject(Content, UserInformation.Instance.User.Id) 
+            || !HiveAdminClient.Instance.GetAvailableProjectAncestors(Content.Id).Any() 
+            || projectExclusiveResources.Contains(checkedResource)) {
             e.Cancel = true;
           }
@@ -157 +184 @@
     private void UpdateResourceTree() {
       UpdateAssignedResources();
-      UpdateResourceGenealogy();
-      var top = BuildResourceTree(HiveAdminClient.Instance.Resources);
+      UpdateIncludedResources();
+
+      var top = BuildResourceTree();
       detailsViewHost.Content = top;
     }
@@ -164 +192 @@
     private void UpdateNewResourceTree() {
       UpdateNewAssignedResources();
-      UpdateNewInheritedResources();
-      var top = BuildResourceTree(HiveAdminClient.Instance.Resources);
+      UpdateNewIncludedResources();
+      var top = BuildResourceTree();
       detailsViewHost.Content = top;
     }
 
-    private static IEnumerable<Resource> GetAssignedResourcesForProject(Guid projectId) {
-      var assignedProjectResources = HiveServiceLocator.Instance.CallHiveService(s => s.GetAssignedResourcesForProjectAdministration(projectId));
-      return HiveAdminClient.Instance.Resources.Where(x => assignedProjectResources.Select(y => y.ResourceId).Contains(x.Id));
+    private IEnumerable<Resource> GetAvailableResourcesForProjectAdministration(Guid projectId) {
+      projectExclusiveResources.Clear();
+      if (projectId == Guid.Empty) return Enumerable.Empty<Resource>();
+      var resources = HiveAdminClient.Instance.Resources.Where(x => x.Id != Guid.Empty);
+      if (!resources.Any()) return resources;
+      if (IsAdmin()) return resources;
+
+      // get project specific assigned resources
+      var projectResources = resources.Where(x => 
+        HiveAdminClient.Instance.ProjectResourceAssignments
+          .Where(a => a.ProjectId == projectId)
+          .Select(a => a.ResourceId)
+        .Contains(x.Id));
+
+      // look up for assignments of ancestor projects
+      var projectIds = new HashSet<Guid>();
+      HiveAdminClient.Instance.GetAvailableProjectAncestors(projectId).ToList().ForEach(x => projectIds.Add(x.Id));
+
+      var ancestorProjectResources = resources.Where(x => 
+        HiveAdminClient.Instance.ProjectResourceAssignments
+          .Where(a => projectIds.Contains(a.ProjectId))
+          .Select(a => a.ResourceId)
+        .Contains(x.Id));
+
+      // look down for included resources of ancestor projects
+      HashSet<Resource> availableResources = new HashSet<Resource>(ancestorProjectResources);
+      foreach (var r in ancestorProjectResources) {
+        foreach(var d in HiveAdminClient.Instance.GetAvailableResourceDescendants(r.Id)) {
+          availableResources.Add(d);
+        }
+      }
+
+      // determine resources, which are exclusively assigned to the currently selected project
+      projectResources
+        .Except(availableResources)
+        .ToList()
+        .ForEach(x => projectExclusiveResources.Add(x));
+
+      // look down for included resources of currently selected project
+      if (projectExclusiveResources.Any()) {
+        foreach (var r in projectExclusiveResources.ToArray()) {
+          foreach (var d in HiveAdminClient.Instance.GetAvailableResourceDescendants(r.Id)) {
+            projectExclusiveResources.Add(d);
+          }  
+        }
+      }
+
+      return availableResources.Union(projectExclusiveResources);
+    }
+
+    private IEnumerable<Resource> GetAssignedResourcesForProject(Guid projectId) {
+      if (projectId == Guid.Empty) return Enumerable.Empty<Resource>();
+      return HiveAdminClient.Instance.Resources.Where(x =>
+        HiveAdminClient.Instance.ProjectResourceAssignments
+          .Where(a => a.ProjectId == projectId)
+          .Select(a => a.ResourceId)
+        .Contains(x.Id));
     }
 
@@ -183 +265 @@
     private void UpdateNewAssignedResources() {
       for(int i = newAssignedResources.Count -1; i >= 0; i--) {
-        if(newAssignedResources.Intersect(resourceAncestors[newAssignedResources.ElementAt(i).Id]).Any()) {
+        if(newAssignedResources.Intersect(HiveAdminClient.Instance.GetAvailableResourceAncestors(newAssignedResources.ElementAt(i).Id)).Any()) {
           newAssignedResources.Remove(newAssignedResources.ElementAt(i));
         }
@@ -198 +280 @@
     }
 
-    private void UpdateNewInheritedResources() {
-      newInheritedResources.Clear();
+    private void UpdateIncludedResources() {
+      includedResources.Clear();
+      newIncludedResources.Clear();
+      foreach (var a in assignedResources) {
+        foreach (var r in HiveAdminClient.Instance.GetAvailableResourceDescendants(a.Id)) {
+          includedResources.Add(r);
+          newIncludedResources.Add(r);
+        }
+      }
+    }
+
+    private void UpdateNewIncludedResources() {
+      newIncludedResources.Clear();
       foreach (var a in newAssignedResources) {
-        if (resourceDescendants.ContainsKey(a.Id)) {
-          foreach (var r in resourceDescendants[a.Id]) {
-            newInheritedResources.Add(r);
-          }
-        }
-      }
-    }
-
-    private void UpdateResourceGenealogy() {
-      resourceAncestors.Clear();
-      resourceDescendants.Clear();
-      var resources = HiveAdminClient.Instance.Resources;
-
-      foreach(var r in resources.Where(x => x.Id != Guid.Empty)) {
-        resourceAncestors.Add(r.Id, new HashSet<Resource>());
-        resourceDescendants.Add(r.Id, new HashSet<Resource>());
-      }
-
-      foreach(var r in resources.Where(x => x.Id != Guid.Empty)) { 
-        var parentResourceId = r.ParentResourceId;
-        while(parentResourceId != null) {
-          var parent = resources.SingleOrDefault(x => x.Id == parentResourceId);
-          if(parent != null) {
-            resourceAncestors[r.Id].Add(parent);
-            resourceDescendants[parent.Id].Add(r);
-            parentResourceId = parent.ParentResourceId;
-          } else {
-            parentResourceId = null;
-          }
-        }
-      }
-
-      inheritedResources.Clear();
-      newInheritedResources.Clear();
-      foreach(var a in assignedResources) {
-        if (resourceDescendants.ContainsKey(a.Id)) {
-          foreach(var r in resourceDescendants[a.Id]) {
-            inheritedResources.Add(r);
-            newInheritedResources.Add(r);
-          }
-        }
-      }
-
-      //foreach(var r in resources) {
-      //  if (resourceAncestors.ContainsKey(r.Id)
-      //    && resourceAncestors[r.Id].Intersect(assignedResources.Select(x => x.Id)).Any()) {
-      //    inheritedResources.Add(r);
-      //  }
-      //}
-    }
-
-    private Resource BuildResourceTree(IEnumerable<Resource> resources) {
+        foreach (var r in HiveAdminClient.Instance.GetAvailableResourceDescendants(a.Id)) {
+          newIncludedResources.Add(r);
+        }
+      }
+    }
+
+    private Resource BuildResourceTree() {
       treeView.Nodes.Clear();
-      if (!resources.Any()) return null;
 
       treeView.BeforeCheck -= treeView_BeforeCheck;
       treeView.AfterCheck -= treeView_AfterCheck;
 
-      resources = resources.Where(x => x.Id != Guid.Empty);
+      var resources = GetAvailableResourcesForProjectAdministration(Content.Id);
+
+      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));
+      //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));
+      
       Resource top = null;
+      //bool nodeSelected = false;
+      if (detailsViewHost != null && detailsViewHost.Content != null && detailsViewHost.Content is Resource) {
+        var resourceId = ((Resource)detailsViewHost.Content).Id;
+        top = resources.Where(x => x.Id == resourceId).FirstOrDefault();
+      }
+      
 
       TreeNode currentNode = null;
       Resource currentResource = null;
 
-
       var addedAssignments = newAssignedResources.Except(assignedResources);
       var removedAssignments = assignedResources.Except(newAssignedResources);
-      var addedIncludes = newInheritedResources.Except(inheritedResources);
-      var removedIncludes = inheritedResources.Except(newInheritedResources);
-
-      //var assignmentDiff = new HashSet<Resource>(newAssignedResources);
-      //assignmentDiff.SymmetricExceptWith(assignedResources);
-      //var inheritanceDiff = new HashSet<Resource>(newInheritedResources);
-      //inheritanceDiff.SymmetricExceptWith(inheritedResources);
+      var addedIncludes = newIncludedResources.Except(includedResources);
+      var removedIncludes = includedResources.Except(newIncludedResources);
 
       while (stack.Any()) {
-        if(top == null)  top = stack.Peek();
         var newResource = stack.Pop();
         var newNode = new TreeNode(newResource.Name) { Tag = newResource };
+
+        if(top == null && !disabledParentResources.Contains(newResource)) {
+          top = newResource;
+        }
+
+        //if(!nodeSelected && top != null && newResource.Id == top.Id) {
+        //  newNode.BackColor = selectedBackColor;
+        //  newNode.ForeColor = selectedForeColor;
+        //  nodeSelected = true;
+        //}
 
         // search for parent node of newNode and save in currentNode
@@ -302 +363 @@
         }
 
-        if (newAssignedResources.Contains(newResource)) {
+        if (disabledParentResources.Contains(newResource)) {
+          newNode.Checked = false;
+          newNode.ForeColor = grayTextColor;
+        } else if (newAssignedResources.Contains(newResource)) {
           newNode.Checked = true;
           if(!HiveRoles.CheckAdminUserPermissions()) {
-            if(!projectAncestors[Content.Id].Any()) {
+            if (!HiveAdminClient.Instance.CheckOwnershipOfParentProject(Content, UserInformation.Instance.User.Id) 
+              || !HiveAdminClient.Instance.GetAvailableProjectAncestors(Content.Id).Any() 
+              || projectExclusiveResources.Contains(newResource)) {
               newNode.ForeColor = SystemColors.GrayText;
-              newNode.Text += " [immutable]";
+              newNode.Text += IMMUTABLE_TAG;
             }
           }
 
-        } else if (newInheritedResources.Contains(newResource)) {
+        } else if (newIncludedResources.Contains(newResource)) {
           newNode.Checked = true;
           newNode.ForeColor = SystemColors.GrayText;
         }
 
-          if (inheritedResources.Contains(newResource) && newInheritedResources.Contains(newResource)) {
-          newNode.Text += " [included]";
+          if (includedResources.Contains(newResource) && newIncludedResources.Contains(newResource)) {
+          newNode.Text += INCLUDED_TAG;
         } else if (addedIncludes.Contains(newResource)) {
           newNode.BackColor = addedIncludeColor;
           newNode.ForeColor = SystemColors.GrayText;
-          newNode.Text += " [added include]";
+          newNode.Text += ADDED_INCLUDE_TAG;
         } else if (removedIncludes.Contains(newResource)) {
           newNode.BackColor = removedIncludeColor;
-          newNode.Text += " [removed include]";
+          newNode.Text += REMOVED_INCLUDE_TAG;
         }
 
@@ -330 +396 @@
           newNode.BackColor = addedAssignmentColor;
           newNode.ForeColor = SystemColors.ControlText;
-          newNode.Text += " [added assignment]";
+          newNode.Text += ADDED_ASSIGNMENT_TAG;
         } else if (removedAssignments.Contains(newResource)) {
           newNode.BackColor = removedAssignmentColor;
           newNode.ForeColor = SystemColors.ControlText;
-          newNode.Text += " [removed assignment]";
+          newNode.Text += REMOVED_ASSIGNMENT_TAG;
         }
 
@@ -353 +419 @@
         }
         newNode.SelectedImageIndex = newNode.ImageIndex;
-        //if (newResource.OwnerUserId == UserInformation.Instance.User.Id)
-        //  newNode.BackColor = ownedResourceColor;
       }
 
       var ungroupedSlaves = subResources.OfType<Slave>().OrderBy(x => x.Name);
       if(ungroupedSlaves.Any()) {
-        var ungroupedNode = new TreeNode(ungroupedGroupName) {
+        ungroupedGroupNode = new TreeNode(UNGROUPED_GROUP_NAME) {
           ForeColor = SystemColors.GrayText,
           Tag = new SlaveGroup() {
-            Name = ungroupedGroupName,
-            Description = ungroupedGroupDescription
+            Name = UNGROUPED_GROUP_NAME,
+            Description = UNGROUPED_GROUP_DESCRIPTION
           }
         };
@@ -369 +433 @@
         foreach (var slave in ungroupedSlaves) {
           var slaveNode = new TreeNode(slave.Name) { Tag = slave };
-          ungroupedNode.Nodes.Add(slaveNode);
-        }
-        treeView.Nodes.Add(ungroupedNode);
+          ungroupedGroupNode.Nodes.Add(slaveNode);
+        }
+        treeView.Nodes.Add(ungroupedGroupNode);
+      } else if (ungroupedGroupNode != null) {
+        ungroupedGroupNode.Nodes.Clear();
       }
 
       treeView.BeforeCheck += treeView_BeforeCheck;
       treeView.AfterCheck += treeView_AfterCheck;
-      treeView.ExpandAll();
+      
+      ExpandResourceNodesOfInterest(treeView.Nodes);
 
       return top;
     }
 
-    private void UpdateProjectGenealogy() {
-      projectAncestors.Clear();
-      projectDescendants.Clear();
-      var projects = HiveAdminClient.Instance.Projects;
-
-      foreach(var p in projects.Where(x => x.Id != Guid.Empty)) {
-        projectAncestors.Add(p.Id, new HashSet<Project>());
-        projectDescendants.Add(p.Id, new HashSet<Project>());
-      }
-
-      foreach (var p in projects.Where(x => x.Id != Guid.Empty)) {
-        var parentProjectId = p.ParentProjectId;
-        while (parentProjectId != null) {
-          var parent = projects.SingleOrDefault(x => x.Id == parentProjectId);
-          if (parent != null) {
-            projectAncestors[p.Id].Add(parent);
-            projectDescendants[parent.Id].Add(p);
-            parentProjectId = parent.ParentProjectId;
+    private void ExpandResourceNodesOfInterest(TreeNodeCollection nodes) {
+      foreach (TreeNode n in nodes) {
+        Resource r = (Resource)n.Tag;
+        if (n.Nodes.Count > 0) {
+          if (HiveAdminClient.Instance.GetAvailableResourceDescendants(r.Id).OfType<SlaveGroup>().Any()) {
+            n.Expand();
+            ExpandResourceNodesOfInterest(n.Nodes);
           } else {
-            parentProjectId = null;
+            n.Collapse();
           }
-        }
-      }
+        } else {
+          n.Collapse();
+        }
+      }
+    }
+
+    private bool IsAdmin() {
+      return HiveRoles.CheckAdminUserPermissions();
     }