Changeset 15978 for branches/2839_HiveProjectManagement

Timestamp:

07/02/18 15:51:17 (6 years ago)

Author:

jzenisek

Message:

#2839: applied several fixes:

• show full project-path in project/resource selector
• handle lost of project-ownership by not withdrawing permissions
• update automatically after hand-down save
• lock jobs for which statistics/deletion is pending
• lock the disabled checkbox in ProjectResourcesView...

Location:

branches/2839_HiveProjectManagement

Files:

• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectJobsView.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectPermissionsView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.Designer.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/SlaveView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.Designer.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs (modified) (5 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveServiceClient.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Prepare Hive Database.sql (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (6 diffs)
• HeuristicLab.Services.Hive/3.3/ServiceContracts/IHiveService.cs (modified) (1 diff)

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

@@ -144 +144 @@
 
     private StringMatrix CreateValueMatrix() {
+      if (Content == null || Content.Id == Guid.Empty)
+        return new StringMatrix();
+
       var jobs = HiveAdminClient.Instance.Jobs[Content.Id];
       var resources = HiveAdminClient.Instance.Resources;
@@ -172 +175 @@
       if (InvokeRequired) Invoke((Action)UpdateJobs);
       else {
-        StringMatrix matrix = null;
-        if(Content != null) {
-          matrix = CreateValueMatrix();
+        if(Content != null && Content.Id != null && Content.Id != Guid.Empty) {
+          var matrix = CreateValueMatrix();
+          matrixView.Content = matrix;
+          if(matrix != null) {
+            foreach (DataGridViewRow row in matrixView.DataGridView.Rows) {
+              string val = ((string)row.Cells[0].Value);
+              if (val == JobState.Online.ToString()) {
+                row.DefaultCellStyle.BackColor = onlineStatusColor;
+              } else if (val == JobState.StatisticsPending.ToString()) {
+                row.DefaultCellStyle.BackColor = statisticsPendingStatusColor;
+              } else if (val == JobState.DeletionPending.ToString()) {
+                row.DefaultCellStyle.BackColor = deletionPendingStatusColor;
+              }
+            }
+
+            matrixView.DataGridView.AutoResizeColumns();
+            matrixView.DataGridView.Columns[0].MinimumWidth = 90;
+            matrixView.DataGridView.Columns[1].MinimumWidth = 108;
+          }
         } else {
           refreshButton.Enabled = false;
           removeButton.Enabled = false;
-        }
-        matrixView.Content = matrix;
-        
-        foreach(DataGridViewRow row in matrixView.DataGridView.Rows) {
-          string val = ((string)row.Cells[0].Value);
-          if (val == JobState.Online.ToString()) {
-            row.DefaultCellStyle.BackColor = onlineStatusColor;
-          } else if(val == JobState.StatisticsPending.ToString()) {
-            row.DefaultCellStyle.BackColor = statisticsPendingStatusColor;
-          } else if(val == JobState.DeletionPending.ToString()) {
-            row.DefaultCellStyle.BackColor = deletionPendingStatusColor;
-          }
-        }
-
-        matrixView.DataGridView.AutoResizeColumns();
-        matrixView.DataGridView.Columns[0].MinimumWidth = 90;
-        matrixView.DataGridView.Columns[1].MinimumWidth = 108;
+          matrixView.Content = null;
+        }
       }
     }

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

@@ -143 +143 @@
     #region Helpers
     private void UpdatePermissionList() {
+      AccessClient.Instance.Refresh();
+
       UpdateUserGroupGenealogy();
       UpdateAssignedPermissions();

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

@@ -117 +117 @@
           SetAssignedProjectResources(Content.Id, newAssignedResources.Select(x => x.Id), false, true, false);
         });
+      HiveAdminClient.Instance.Refresh();
       UpdateResourceTree();
     }

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

@@ -198 +198 @@
       this.viewHost.Caption = "View";
       this.viewHost.Content = null;
-      this.viewHost.Enabled = false;
+      this.viewHost.Enabled = true;
       this.viewHost.Location = new System.Drawing.Point(6, 6);
       this.viewHost.Name = "viewHost";

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

@@ -123 +123 @@
       btnRemoveGroup.Enabled = !locked;
       btnSave.Enabled = !locked;
-      viewHost.Locked = locked;
+      viewHost.Enabled = true;
+      //viewHost.Locked = locked;
+      viewHost.Locked = false;
+      viewHost.ReadOnly = false;
       scheduleView.Locked = locked;
-      scheduleView.SetEnabledStateOfSchedule(!scheduleLocked);
+      //scheduleView.SetEnabledStateOfSchedule(!scheduleLocked);
     }
     #endregion

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

@@ -234 +234 @@
     }
 
-    public virtual void SetEnabledStateOfSchedule(bool state) {
-      if (InvokeRequired) {
-        Invoke(new Action(() => SetEnabledStateOfSchedule(state)));
-      } else {
-        if (Content == null || Locked || ReadOnly) state = false;
-        //groupBox1.Enabled = state;
-        btnClearCal.Enabled = state;
-        btnSaveCal.Enabled = state;
-      }
-    }
+    //public virtual void SetEnabledStateOfSchedule(bool state) {
+    //  if (InvokeRequired) {
+    //    Invoke(new Action(() => SetEnabledStateOfSchedule(state)));
+    //  } else {
+    //    if (Content == null || Locked || ReadOnly) state = false;
+    //    //groupBox1.Enabled = state;
+    //    btnClearCal.Enabled = state;
+    //    btnSaveCal.Enabled = state;
+    //  }
+    //}
 
     private void btnClearCal_Click(object sender, System.EventArgs e) {

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

@@ -60 +60 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      disposableCheckBox.Enabled = Content != null;
+      bool enabled = Content != null && !Locked;
+      disposableCheckBox.Enabled = enabled;
     }
     #endregion

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.Designer.cs

@@ -147 +147 @@
       this.projectsTreeView.TabIndex = 3;
       this.projectsTreeView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.projectsTreeView_MouseDoubleClick);
+      this.projectsTreeView.BeforeSelect += new System.Windows.Forms.TreeViewCancelEventHandler(this.projectsTreeView_BeforeSelect);
       this.projectsTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.projectsTreeView_AfterSelect);
       // 

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs

@@ -227 +227 @@
     }
 
+    private void projectsTreeView_BeforeSelect(object sender, TreeViewCancelEventArgs e) {
+      var node = (Project)e.Node.Tag;
+      if (HiveClient.Instance.DisabledParentProjects.Contains(node)) {
+        e.Cancel = true;
+      }
+    }
+
     private void projectsTreeView_AfterSelect(object sender, TreeViewEventArgs e) {
       var node = (Project)e.Node.Tag;
-      
+
       if (node == null) {
         projectsTreeView.SelectedNode = null;
+      } else if (HiveClient.Instance.DisabledParentProjects.Contains(node)) {
+        return;
       } else {
         ResetTreeNodes(projectsTreeView.Nodes);
         e.Node.BackColor = selectedBackColor;
         e.Node.ForeColor = selectedForeColor;
-        
-        if(node.Id == projectId) {
+
+        if (node.Id == projectId) {
           e.Node.Text += CURRENT_SELECTION_TAG;
-        } else if(projectId == null || projectId == Guid.Empty) {
+        } else if (projectId == null || projectId == Guid.Empty) {
           e.Node.Text += NEW_SELECTION_TAG;
         } else {
@@ -245 +254 @@
         }
 
-        
+
       }
       SelectedProject = node;
@@ -313 +322 @@
       if (!projects.Any()) return;
 
+      var disabledParentProjects = HiveClient.Instance.DisabledParentProjects;
       // select all top level projects (withouth parent, or without any ancestor within current project collection)
       var mainProjects = new HashSet<Project>(projects.Where(x => x.ParentProjectId == null));
-      var parentedMainProjects = new HashSet<Project>(projects
-        .Where(x => x.ParentProjectId.HasValue
-        && !projects.Select(y => y.Id).Contains(x.ParentProjectId.Value)
-        && !projects.SelectMany(y => HiveClient.Instance.ProjectAncestors[y.Id]).Contains(x.ParentProjectId.Value)));
-      mainProjects.UnionWith(parentedMainProjects);
-      var subProbjects = new HashSet<Project>(projects.Except(mainProjects));
-      foreach(var p in subProbjects) {
-        p.ParentProjectId = HiveClient.Instance.ProjectAncestors[p.Id].Where(x => projects.Select(y => y.Id).Contains(x)).FirstOrDefault();
-      }
+      //var parentedMainProjects = new HashSet<Project>(projects
+      //  .Where(x => x.ParentProjectId.HasValue
+      //  && !projects.Select(y => y.Id).Contains(x.ParentProjectId.Value)
+      //  && !projects.SelectMany(y => HiveClient.Instance.ProjectAncestors[y.Id]).Contains(x.ParentProjectId.Value)));
+      //mainProjects.UnionWith(parentedMainProjects);
+      var mainDisabledParentProjects = new HashSet<Project>(disabledParentProjects.Where(x => x.ParentProjectId == null));
+      mainProjects.UnionWith(mainDisabledParentProjects);
+      var subProbjects = new HashSet<Project>(projects.Union(disabledParentProjects).Except(mainProjects));
+      //foreach (var p in subProbjects) {
+      //  p.ParentProjectId = HiveClient.Instance.ProjectAncestors[p.Id].Where(x => projects.Select(y => y.Id).Contains(x)).FirstOrDefault();
+      //}
 
       var stack = new Stack<Project>(mainProjects.OrderByDescending(x => x.Name));
@@ -349 +361 @@
         newNode.SelectedImageIndex = newNode.ImageIndex;
 
-        if (SelectedProject != null && SelectedProject.Id.Equals(newProject.Id)) {
+        if(disabledParentProjects.Contains(newProject)) {
+          newNode.Checked = false;
+          newNode.ForeColor = grayTextColor;
+        }
+        else if (SelectedProject != null && SelectedProject.Id.Equals(newProject.Id)) {
           newNode.BackColor = selectedBackColor;
           newNode.ForeColor = selectedForeColor;
@@ -673 +689 @@
       n.BackColor = Color.Transparent;
       n.ForeColor = Color.Black;
+
+      if(n.Tag is Project) {
+        var p = (Project)n.Tag;
+        if(HiveClient.Instance.DisabledParentProjects.Select(x => x.Id).Contains(p.Id)) {
+          n.ForeColor = grayTextColor;
+        }
+      }
     }
 

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -87 +87 @@
     }
 
+    private Dictionary<Guid, string> projectNames;
+    public Dictionary<Guid, string> ProjectNames {
+      get { return projectNames; }
+    }
+
+    private HashSet<Project> disabledParentProjects;
+    public HashSet<Project> DisabledParentProjects {
+      get { return disabledParentProjects; }
+    }
 
     private List<Plugin> onlinePlugins;
@@ -127 +136 @@
         resources = new ItemList<Resource>();
         jobs = new HiveItemCollection<RefreshableJob>();
+        projectNames = new Dictionary<Guid, string>();
 
         projectAncestors = new Dictionary<Guid, HashSet<Guid>>();
@@ -138 +148 @@
           service.GetSlaves().ForEach(s => resources.Add(s));
           service.GetJobs().ForEach(p => jobs.Add(new RefreshableJob(p)));
+          projectNames = service.GetProjectNames();
         });
 
         UpdateResourceGenealogy();
         UpdateProjectGenealogy();
+        UpdateDisabledParentProjects();
       }
       catch {
@@ -159 +171 @@
       try {
         projects = new ItemList<Project>();
+        projectNames = new Dictionary<Guid, string>();
         resources = new ItemList<Resource>();
 
@@ -170 +183 @@
           service.GetSlaveGroups().ForEach(g => resources.Add(g));
           service.GetSlaves().ForEach(s => resources.Add(s));
+          projectNames = service.GetProjectNames();
         });
 
         UpdateResourceGenealogy();
         UpdateProjectGenealogy();
+        UpdateDisabledParentProjects();
       } catch {
         projects = null;
@@ -236 +251 @@
           projectDescendants[ancestor].Add(pa.Key);
         }
+      }
+    }
+
+    private void UpdateDisabledParentProjects() {
+      disabledParentProjects = new HashSet<Project>();
+
+      foreach (var pid in projects
+        .Where(x => x.ParentProjectId.HasValue)
+        .SelectMany(x => projectAncestors[x.Id]).Distinct()
+        .Where(x => !projects.Select(y => y.Id).Contains(x))) {
+        var p = new Project();
+        p.Id = pid;
+        p.ParentProjectId = projectAncestors[pid].FirstOrDefault();
+        p.Name = projectNames[pid];
+        disabledParentProjects.Add(p);
       }
     }

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveServiceClient.cs

@@ -75 +75 @@
         
         public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-
     }
     
@@ -2461 +2460 @@
         System.Collections.Generic.Dictionary<System.Guid, System.Collections.Generic.List<System.Guid>> GetProjectGenealogy();
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetProjectNames", ReplyAction="http://tempuri.org/IHiveService/GetProjectNamesResponse")]
+        System.Collections.Generic.Dictionary<System.Guid, string> GetProjectNames();
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/SaveProjectPermissions", ReplyAction="http://tempuri.org/IHiveService/SaveProjectPermissionsResponse")]
         void SaveProjectPermissions(System.Guid projectId, System.Collections.Generic.List<System.Guid> grantedUserIds, bool reassign, bool cascading, bool reassignCascading);
@@ -2789 +2791 @@
         }
         
+        public System.Collections.Generic.Dictionary<System.Guid, string> GetProjectNames()
+        {
+            return base.Channel.GetProjectNames();
+        }
+        
         public void SaveProjectPermissions(System.Guid projectId, System.Collections.Generic.List<System.Guid> grantedUserIds, bool reassign, bool cascading, bool reassignCascading)
         {

branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Prepare Hive Database.sql

@@ -104 +104 @@
 REFERENCES [dbo].[Project] ([ProjectId])
 ON UPDATE CASCADE
-ON DELETE CASCADE
 GO
 

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

@@ -43 +43 @@
     private const string NOT_AUTHORIZED_PROJECTRESOURCE = "Selected project is not authorized to access the requested resource";
     private const string NOT_AUTHORIZED_USERPROJECT = "Current user is not authorized to access the requested project";
+    private const string NO_JOB_UPDATE_POSSIBLE = "This job has already been flagged for deletion, thus, it can not be updated anymore.";
 
     private static readonly DA.TaskState[] CompletedStates = { DA.TaskState.Finished, DA.TaskState.Aborted, DA.TaskState.Failed };
@@ -465 +466 @@
             exists = false;
             job = new DA.Job();
-          }
+          } else if(job.State != DA.JobState.Online) {
+            throw new InvalidOperationException(NO_JOB_UPDATE_POSSIBLE);
+          }
+
+
           jobDto.CopyToEntity(job);
 
@@ -539 +544 @@
 
       var pm = PersistenceManager;
-      using (new PerformanceLogger("UpdateJobsState")) {
+      using (new PerformanceLogger("UpdateJobStates")) {
         var jobDao = pm.JobDao;
         var projectDao = pm.ProjectDao;
@@ -802 +807 @@
         pm.UseTransaction(() => {
           var project = projectDao.GetById(projectDto.Id);
-          if (project != null) { // update existent
+          if (project != null) { // update existent project
             var formerOwnerId = project.OwnerUserId;
             projectDto.CopyToEntity(project);
@@ -808 +813 @@
             // 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 });
-                  }
-                }
+              // OBSOLETE: former owner looses permission and project-related jobs
+              //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 });
+              //    }
+              //  }
+              //}
+              // Add permission for new owner if not already done
+              if(!project.ProjectPermissions
+                .Select(pp => pp.GrantedUserId)
+                .Contains(projectDto.OwnerUserId)) {
+                project.ProjectPermissions.Add(new DA.ProjectPermission {
+                  GrantedUserId = projectDto.OwnerUserId,
+                  GrantedByUserId = UserManager.CurrentUserId
+                });
               }
-              project.ProjectPermissions.Add(new DA.ProjectPermission {
-                GrantedUserId = projectDto.OwnerUserId,
-                GrantedByUserId = UserManager.CurrentUserId
-              });
             }
 
-          } else { // save new
+          } else { // save new project
             var newProject = projectDao.Save(projectDto.ToEntity());
             newProject.ProjectPermissions.Clear();
@@ -953 +964 @@
           }
           return projectAncestors;
+        });
+      }
+    }
+
+    public IDictionary<Guid, string> GetProjectNames() {
+      RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      var pm = PersistenceManager;
+      using (new PerformanceLogger("GetProjectNames")) {
+        var projectDao = pm.ProjectDao;
+        var projectNames = new Dictionary<Guid, string>();
+        return pm.UseTransaction(() => {
+          projectDao
+            .GetAll().ToList()
+            .ForEach(p=> projectNames.Add(p.ProjectId, p.Name));
+          return projectNames;
         });
       }

branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive/3.3/ServiceContracts/IHiveService.cs

@@ -166 +166 @@
     [OperationContract]
     IDictionary<Guid, HashSet<Guid>> GetProjectGenealogy();
+
+    [OperationContract]
+    IDictionary<Guid, string> GetProjectNames();
     #endregion