Changeset 15658 for branches/HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3

Timestamp:

01/26/18 08:51:30 (7 years ago)

Author:

jzenisek

Message:

#2839

• worked on (restricted) accessibility of hive's administration area for non-admin roles
• adapted HiveClient & HiveAdminClient entity loading (client- & service-side)

Location:

branches/HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3

Files:

• MenuItems/AdministratorMenuItem.cs (modified) (1 diff)
• Views/ProjectResourcesView.cs (modified) (7 diffs)
• Views/ProjectsView.cs (modified) (2 diffs)
• Views/ResourcesView.cs (modified) (2 diffs)

branches/HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/MenuItems/AdministratorMenuItem.cs

@@ -38 +38 @@
 
     public override void Execute() {
-      if (HiveRoles.CheckAdminUserPermissions()) {
+
+      if (HiveRoles.CheckAdminUserPermissions() || HiveAdminClient.Instance.CheckAccessToAdminAreaGranted()) {
         MainFormManager.MainForm.ShowContent(HiveAdminClient.Instance);
       } else if (!UserInformation.Instance.UserExists) {

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

@@ -44 +44 @@
     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 Color addedAssignmentColor = Color.FromArgb(255, 0, 174, 179); // #00aeb3
     private readonly Color addedAssignmentColor = Color.FromArgb(255, 87, 191, 193); // #57bfc1
@@ -75 +79 @@
         detailsViewHost.Content = null;
       } else {
+        UpdateProjectGenealogy();
         UpdateAssignedResources();
         UpdateResourceGenealogy();
@@ -91 +96 @@
 
     private void refreshButton_Click(object sender, EventArgs e) {
+      UpdateProjectGenealogy();
       UpdateAssignedResources();
       UpdateResourceGenealogy();
@@ -120 +126 @@
     private void treeView_BeforeCheck(object sender, TreeViewCancelEventArgs e) {
       var checkedResource = (Resource)e.Node.Tag;
-      if (newInheritedResources.Contains(checkedResource) || checkedResource.Id == Guid.Empty) e.Cancel = true;
+      if (newInheritedResources.Contains(checkedResource) || checkedResource.Id == Guid.Empty) {
+        e.Cancel = true;
+      } else if (!HiveRoles.CheckAdminUserPermissions()) {
+          if (!projectAncestors[Content.Id].Any()) {
+            e.Cancel = true;
+          }
+      }
     }
 
@@ -285 +297 @@
         if (newAssignedResources.Contains(newResource)) {
           newNode.Checked = true;
+          if(!HiveRoles.CheckAdminUserPermissions()) {
+            if(!projectAncestors[Content.Id].Any()) {
+              newNode.ForeColor = SystemColors.GrayText;
+              newNode.Text += " [immutable]";
+            }
+          }
+
         } else if (newInheritedResources.Contains(newResource)) {
           newNode.Checked = true;
@@ -331 +350 @@
       }
 
-      var ungroupedNode = new TreeNode(ungroupedGroupName) {
-        ForeColor = SystemColors.GrayText,
-        Tag = new SlaveGroup() {
-          Name = ungroupedGroupName,
-          Description = ungroupedGroupDescription
-        }
-      };
-
-      foreach (var slave in subResources.OfType<Slave>().OrderBy(x => x.Name)) {
-        var slaveNode = new TreeNode(slave.Name) { Tag = slave };
-        ungroupedNode.Nodes.Add(slaveNode);
-      }
-
-      treeView.Nodes.Add(ungroupedNode);
+      var ungroupedSlaves = subResources.OfType<Slave>().OrderBy(x => x.Name);
+      if(ungroupedSlaves.Any()) {
+        var ungroupedNode = new TreeNode(ungroupedGroupName) {
+          ForeColor = SystemColors.GrayText,
+          Tag = new SlaveGroup() {
+            Name = ungroupedGroupName,
+            Description = ungroupedGroupDescription
+          }
+        };
+
+        foreach (var slave in ungroupedSlaves) {
+          var slaveNode = new TreeNode(slave.Name) { Tag = slave };
+          ungroupedNode.Nodes.Add(slaveNode);
+        }
+        treeView.Nodes.Add(ungroupedNode);
+      }
+
       treeView.BeforeCheck += treeView_BeforeCheck;
       treeView.AfterCheck += treeView_AfterCheck;
@@ -352 +374 @@
     }
 
+    private void UpdateProjectGenealogy() {
+      projectAncestors.Clear();
+      projectDescendants.Clear();
+      var projects = HiveAdminClient.Instance.Projects;
+
+      foreach(var p in projects) {
+        projectAncestors.Add(p.Id, new HashSet<Project>());
+        projectDescendants.Add(p.Id, new HashSet<Project>());
+      }
+
+      foreach (var p in projects) {
+        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;
+          } else {
+            parentProjectId = null;
+          }
+        }
+      }
+    }
+
     #endregion
   }

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

@@ -270 +270 @@
       //  selectedProject.PropertyChanged += ProjectViewContent_PropertyChanged;
 
-      if (IsAuthorized(selectedProject)) {
-        if (!tabControl.TabPages.Contains(permissionsTabPage))
-          tabControl.TabPages.Add(permissionsTabPage);
-        if (!tabControl.TabPages.Contains(resourcesTabPage))
-          tabControl.TabPages.Add(resourcesTabPage);
-      } else {
-        if (tabControl.TabPages.Contains(permissionsTabPage))
-          tabControl.TabPages.Remove(permissionsTabPage);
-        if (tabControl.TabPages.Contains(resourcesTabPage))
-          tabControl.TabPages.Remove(resourcesTabPage);
-      }
+      //if (IsAuthorized(selectedProject)) {
+      //  if (!tabControl.TabPages.Contains(permissionsTabPage))
+      //    tabControl.TabPages.Add(permissionsTabPage);
+      //  if (!tabControl.TabPages.Contains(resourcesTabPage))
+      //    tabControl.TabPages.Add(resourcesTabPage);
+      //} else {
+      //  if (tabControl.TabPages.Contains(permissionsTabPage))
+      //    tabControl.TabPages.Remove(permissionsTabPage);
+      //  if (tabControl.TabPages.Contains(resourcesTabPage))
+      //    tabControl.TabPages.Remove(resourcesTabPage);
+      //}
     }
 
@@ -416 +416 @@
 
     private bool IsAuthorized(Project project) {
-      return project != null
-          && UserInformation.Instance.UserExists
-          && (project.OwnerUserId == UserInformation.Instance.User.Id || HiveRoles.CheckAdminUserPermissions());
+      return project != null && UserInformation.Instance.UserExists;
+          //&& (project.OwnerUserId == UserInformation.Instance.User.Id || HiveRoles.CheckAdminUserPermissions());
     }
 

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

@@ -302 +302 @@
 
       var mainResources = new HashSet<Resource>(resources.OfType<SlaveGroup>().Where(x => x.ParentResourceId == null));
-      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 subResources = new HashSet<Resource>(resources.Except(mainResources).OrderByDescending(x => x.Name));
 
       var stack = new Stack<Resource>(mainResources.OrderByDescending(x => x.Name));
-      var top = stack.Peek();
+      Resource top = null;
 
       TreeNode currentNode = null;
@@ -311 +314 @@
 
       while(stack.Any()) {
+        if (top == null) top = stack.Peek();
         var newResource = stack.Pop();
         var newNode = new TreeNode(newResource.Name) { Tag = newResource };