Changeset 15954 for branches/2839_HiveProjectManagement

Timestamp:

06/07/18 17:20:08 (7 years ago)

Author:

jzenisek

Message:

#2839: updated behavior of permission assignment for project owners (client and server side)

Location:

branches/2839_HiveProjectManagement

Files:

• HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightUserInformationView.Designer.cs (added)
• HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightUserInformationView.cs (added)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectPermissionsView.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (4 diffs)

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

@@ -123 +123 @@
     private void treeView_BeforeCheck(object sender, TreeViewCancelEventArgs e) {
       var checkedPermission = (UserGroupBase)e.Node.Tag;
-      if (e.Node.Parent == null || newInheritedPermissions.Contains(checkedPermission) || checkedPermission.Id == Guid.Empty) e.Cancel = true;
+      if (e.Node.Parent == null 
+        || newInheritedPermissions.Contains(checkedPermission) 
+        || checkedPermission.Id == Guid.Empty
+        || Content.OwnerUserId == checkedPermission.Id)
+          e.Cancel = true;
     }
 

branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -675 +675 @@
     #region Project Methods
     public Guid AddProject(DT.Project projectDto) {
-      if (projectDto == null) return Guid.Empty;
+      if (projectDto == null || projectDto.Id != Guid.Empty) return Guid.Empty;
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       // check if current (non-admin) user is owner of one of projectDto's-parents
@@ -689 +689 @@
       using (new PerformanceLogger("AddProject")) {
         var projectDao = pm.ProjectDao;
+
         return pm.UseTransaction(() => {
           var project = projectDao.Save(projectDto.ToEntity());
+          project.ProjectPermissions.Clear();
+          project.ProjectPermissions.Add(new DA.ProjectPermission {
+            GrantedUserId = project.OwnerUserId,
+            GrantedByUserId = UserManager.CurrentUserId
+          });
+
           pm.SubmitChanges();
           return project.ProjectId;
@@ -707 +714 @@
       using (new PerformanceLogger("UpdateProject")) {
         var projectDao = pm.ProjectDao;
+        var assignedJobResourceDao = pm.AssignedJobResourceDao;
         pm.UseTransaction(() => {
           var project = projectDao.GetById(projectDto.Id);
-          if (project != null) {
+          if (project != null) { // update existent
+            var formerOwnerId = project.OwnerUserId;
             projectDto.CopyToEntity(project);
-          } else {
-            projectDao.Save(projectDto.ToEntity());
+
+            // if owner has changed...
+            if(formerOwnerId != projectDto.OwnerUserId) {
+              var formerPermissionItem = project.ProjectPermissions.Where(x => x.GrantedUserId == formerOwnerId).FirstOrDefault();
+              if (formerPermissionItem != null) {
+                // remove permissions
+                project.ProjectPermissions.Remove(formerPermissionItem);
+                // remove jobs if former owner is no member of a still permitted group
+                var ugt = GetUserGroupTree();
+                var permittedGuids = new HashSet<Guid>(); // User- and Group-Guids
+                // get all member-Guids of all still permitted groups
+                foreach (var item in project.ProjectPermissions) {
+                  permittedGuids.Add(item.GrantedUserId);
+                  if(ugt.ContainsKey(item.GrantedUserId)) {
+                    ugt[item.GrantedUserId].ToList().ForEach(x => permittedGuids.Add(x));
+                  }
+
+                  // check if former owner Guid is in Member-Guids
+                  // if yes: do nothing, if not do: 
+                  if (!permittedGuids.Contains(formerOwnerId)) {
+                    assignedJobResourceDao.DeleteByProjectIdAndUserIds(project.ProjectId, new List<Guid> { formerOwnerId });
+                  }
+                }
+              }
+              project.ProjectPermissions.Add(new DA.ProjectPermission {
+                GrantedUserId = projectDto.OwnerUserId,
+                GrantedByUserId = UserManager.CurrentUserId
+              });
+            }
+
+          } else { // save new
+            var newProject = projectDao.Save(projectDto.ToEntity());
+            newProject.ProjectPermissions.Clear();
+            newProject.ProjectPermissions.Add(new DA.ProjectPermission {
+              GrantedUserId = projectDto.OwnerUserId,
+              GrantedByUserId = UserManager.CurrentUserId
+            });
           }
           pm.SubmitChanges();
@@ -841 +885 @@
             project.ProjectPermissions.Clear();
           } else {
-            assignedJobResourceDao.DeleteByProjectIdAndUserIds(project.ProjectId, removedPermissions);
-            foreach(var item in project.ProjectPermissions
+
+            var ugt = GetUserGroupTree();
+            var permittedGuids = new HashSet<Guid>(); // User- and Group-Guids
+            var notpermittedGuids = new HashSet<Guid>();
+
+            // remove job assignments:
+            // (1) get all member-Guids of all still or fresh permitted user/groups
+            foreach (var item in grantedUserIds) {
+              permittedGuids.Add(item);
+              if (ugt.ContainsKey(item)) {
+                ugt[item].ToList().ForEach(x => permittedGuids.Add(x));
+              }
+            }
+
+            // (2) get all member-Guids of users and groups in removedPermissions
+            foreach (var item in removedPermissions) {
+              notpermittedGuids.Add(item);
+              if (ugt.ContainsKey(item)) {
+                ugt[item].ToList().ForEach(x => notpermittedGuids.Add(x));
+              }
+            }
+
+            // (3) get all Guids which are in removedPermissions but not in grantedUserIds
+            var definatelyNotPermittedGuids = notpermittedGuids.Except(permittedGuids);
+
+            // (4) delete jobs of those
+            assignedJobResourceDao.DeleteByProjectIdAndUserIds(project.ProjectId, definatelyNotPermittedGuids);
+
+
+            // remove project permissions
+            foreach (var item in project.ProjectPermissions
               .Where(x => removedPermissions.Contains(x.GrantedUserId))
               .ToList()) {