Changeset 15658 for branches/HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

Timestamp:

01/26/18 08:51:30 (3 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)

File:

• branches/HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (3 diffs)

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

@@ -57 +57 @@
     }
 
+    private IItemList<Project> projects;
+    public IItemList<Project> Projects {
+      get { return projects; }
+    }
+
+    private IItemList<Resource> resources;
+    public IItemList<Resource> Resources {
+      get { return resources; }
+    }
+
+
     private List<Plugin> onlinePlugins;
     public List<Plugin> OnlinePlugins {
@@ -93 +104 @@
 
       try {
+        projects = new ItemList<Project>();
+        resources = new ItemList<Resource>();
         jobs = new HiveItemCollection<RefreshableJob>();
-        var jobsLoaded = HiveServiceLocator.Instance.CallHiveService<IEnumerable<Job>>(s => s.GetJobs());
-
-        foreach (var j in jobsLoaded) {
-          jobs.Add(new RefreshableJob(j));
-        }
+
+        HiveServiceLocator.Instance.CallHiveService(service => {
+          service.GetProjects().ForEach(p => projects.Add(p));
+          service.GetSlaveGroups().ForEach(g => resources.Add(g));
+          service.GetSlaves().ForEach(s => resources.Add(s));
+          service.GetJobs().ForEach(p => jobs.Add(new RefreshableJob(p)));
+        });
       }
       catch {
         jobs = null;
+        projects = null;
+        resources = null;
         throw;
       }
       finally {
+        OnRefreshed();
+      }
+    }
+
+    public void RefreshProjectsAndResources() {
+      OnRefreshing();
+
+      try {
+        projects = new ItemList<Project>();
+        resources = new ItemList<Resource>();
+
+        HiveServiceLocator.Instance.CallHiveService(service => {
+          service.GetProjects().ForEach(p => projects.Add(p));
+          service.GetSlaveGroups().ForEach(g => resources.Add(g));
+          service.GetSlaves().ForEach(s => resources.Add(s));
+        });
+      } catch {
+        projects = null;
+        resources = null;
+        throw;
+      } finally {
         OnRefreshed();
       }
@@ -124 +162 @@
       }, null);
     }
+    
     #endregion