Changeset 15978 for branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive/3.3

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/HeuristicLab.Clients.Hive/3.3

Files:

• HiveClient.cs (modified) (6 diffs)
• ServiceClients/HiveServiceClient.cs (modified) (3 diffs)

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)
         {