Changeset 15742 for branches/HiveProjectManagement/HeuristicLab.Clients.Hive/3.3

Timestamp:

02/09/18 07:56:01 (6 years ago)

Author:

jzenisek

Message:

#2839 worked on HiveAdministrator:

• corrected and modified CRUD operations
• improved usability by providing detailed state information, adding dialogs etc.

Location:

branches/HiveProjectManagement/HeuristicLab.Clients.Hive/3.3

Files:

• HiveAdminClient.cs (modified) (7 diffs)
• HiveClient.cs (modified) (4 diffs)

branches/HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/HiveAdminClient.cs

@@ -25 +25 @@
 using HeuristicLab.Core;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace HeuristicLab.Clients.Hive {
@@ -64 +65 @@
     }
 
+    private Dictionary<Guid, HashSet<Project>> projectAncestors;
+    public Dictionary<Guid, HashSet<Project>> ProjectAncestors {
+      get { return projectAncestors; }
+    }
+
+    private Dictionary<Guid, HashSet<Project>> projectDescendants;
+    public Dictionary<Guid, HashSet<Project>> ProjectDescendants {
+      get { return projectDescendants; }
+    }
+
+    private Dictionary<Guid, HashSet<Resource>> resourceAncestors;
+    public Dictionary<Guid, HashSet<Resource>> ResourceAncestors {
+      get { return ResourceAncestors; }
+    }
+
+    private Dictionary<Guid, HashSet<Resource>> resourceDescendants;
+    public Dictionary<Guid, HashSet<Resource>> ResourceDescendants {
+      get { return ResourceDescendants; }
+    }
+
+
     #endregion
 
@@ -89 +111 @@
         projects = new ItemList<Project>();
 
+        projectAncestors = new Dictionary<Guid, HashSet<Project>>();
+        projectDescendants = new Dictionary<Guid, HashSet<Project>>();
+        resourceAncestors = new Dictionary<Guid, HashSet<Resource>>();
+        resourceDescendants = new Dictionary<Guid, HashSet<Resource>>();
+
         HiveServiceLocator.Instance.CallHiveService(service => {
           service.GetSlaveGroupsForAdministration().ForEach(g => resources.Add(g));
@@ -94 +121 @@
           service.GetProjectsForAdministration().ForEach(p => projects.Add(p));
         });
+
+        UpdateResourceGenealogy();
+        UpdateProjectGenealogy();
       }
       catch {
@@ -100 +130 @@
       finally {
         OnRefreshed();
+      }
+    }
+
+    private void UpdateResourceGenealogy() {
+      resourceAncestors.Clear();
+      resourceDescendants.Clear();
+
+      foreach (var r in resources) {
+        resourceAncestors.Add(r.Id, new HashSet<Resource>());
+        resourceDescendants.Add(r.Id, new HashSet<Resource>());
+      }
+
+      foreach (var r in resources) {
+        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;
+          }
+        }
+      }
+    }
+
+    private void UpdateProjectGenealogy() {
+      projectAncestors.Clear();
+      projectDescendants.Clear();
+
+      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;
+          }
+        }
       }
     }
@@ -179 +257 @@
     }
 
-    #region
+    #region Helper
     public bool CheckAccessToAdminAreaGranted() {
       if(projects != null) {
@@ -191 +269 @@
       }
     }
+
+    public bool CheckOwnershipOfResource(Resource res, Guid userId) {
+      if (res == null || userId == Guid.Empty) return false;
+
+      if (res.OwnerUserId == userId) {
+        return true;
+      } else if(resourceAncestors.ContainsKey(res.Id)) {
+        return resourceAncestors[res.Id].Where(x => x.OwnerUserId == userId).Any();
+      }
+
+      return false;
+    }
+
+    public bool CheckOwnershipOfProject(Project pro, Guid userId) {
+      if (pro == null || userId == Guid.Empty) return false;
+
+      if (pro.OwnerUserId == userId) {
+        return true;
+      } else if (projectAncestors.ContainsKey(pro.Id)) {
+        return projectAncestors[pro.Id].Where(x => x.OwnerUserId == userId).Any();
+      }
+
+      return false;
+    }
+
+    public bool CheckOwnershipOfParentProject(Project pro, Guid userId) {
+      if (pro == null || userId == Guid.Empty) return false;
+
+      if(projectAncestors.ContainsKey(pro.Id)) {
+        return projectAncestors[pro.Id].Where(x => x.OwnerUserId == userId).Any();
+      }
+
+      return false;
+    }
     #endregion
   }

branches/HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -169 +169 @@
       if (item.Id == Guid.Empty) {
         if (item is RefreshableJob) {
-          HiveClient.Instance.UploadJob((RefreshableJob)item, cancellationToken);
+          item.Id = HiveClient.Instance.UploadJob((RefreshableJob)item, cancellationToken);
         }
         if (item is JobPermission) {
@@ -180 +180 @@
         }
         if (item is Project) {
-          HiveServiceLocator.Instance.CallHiveService(s => s.AddProject((Project)item));
+          item.Id = HiveServiceLocator.Instance.CallHiveService(s => s.AddProject((Project)item));
         }
       } else {
@@ -302 +302 @@
     private static object jobCountLocker = new object();
     private static object pluginLocker = new object();
-    private void UploadJob(RefreshableJob refreshableJob, CancellationToken cancellationToken) {
+    private Guid UploadJob(RefreshableJob refreshableJob, CancellationToken cancellationToken) {
       try {
         refreshableJob.IsProgressing = true;
@@ -347 +347 @@
         refreshableJob.Progress.Finish();
       }
+      return (refreshableJob.Job != null) ? refreshableJob.Job.Id : Guid.Empty;
     }