Changeset 15658 for branches/HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager

Timestamp:

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

Location:

branches/HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views

Files:

• HiveResourceSelector.cs (modified) (2 diffs)
• HiveResourceSelectorDialog.cs (modified) (5 diffs)

branches/HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs

@@ -468 +468 @@
     private static IEnumerable<Resource> GetAssignedResourcesForProject(Guid projectId) {
       var assignedProjectResources = HiveServiceLocator.Instance.CallHiveService(s => s.GetAssignedResourcesForProject(projectId));
-      return HiveAdminClient.Instance.Resources.Where(x => assignedProjectResources.Select(y => y.ResourceId).Contains(x.Id));
+      return HiveClient.Instance.Resources.Where(x => assignedProjectResources.Select(y => y.ResourceId).Contains(x.Id));
     }
 
     private static IEnumerable<Resource> GetAssignedResourcesForJob(Guid jobId) {
       var assignedJobResources = HiveServiceLocator.Instance.CallHiveService(s => s.GetAssignedResourcesForJob(jobId));
-      return HiveAdminClient.Instance.Resources.Where(x => assignedJobResources.Select(y => y.ResourceId).Contains(x.Id));
+      return HiveClient.Instance.Resources.Where(x => assignedJobResources.Select(y => y.ResourceId).Contains(x.Id));
     }
 
@@ -581 +581 @@
       resourceAncestors.Clear();
       resourceDescendants.Clear();
-      var resources = HiveAdminClient.Instance.Resources;
+      var resources = HiveClient.Instance.Resources;
 
       foreach (var r in resources) {

branches/HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.cs

@@ -80 +80 @@
     #region Overrides
     protected override void OnLoad(EventArgs e) {
-      HiveAdminClient.Instance.Refreshing += HiveAdminClient_Instance_Refreshing;
-      HiveAdminClient.Instance.Refreshed += HiveAdminClient_Instance_Refreshed;
+      HiveClient.Instance.Refreshing += HiveClient_Instance_Refreshing;
+      HiveClient.Instance.Refreshed += HiveClient_Instance_Refreshed;
       base.OnLoad(e);
     }
 
     protected override void OnClosing(CancelEventArgs e) {
-      HiveAdminClient.Instance.Refreshed -= HiveAdminClient_Instance_Refreshed;
-      HiveAdminClient.Instance.Refreshing -= HiveAdminClient_Instance_Refreshing;
+      HiveClient.Instance.Refreshed -= HiveClient_Instance_Refreshed;
+      HiveClient.Instance.Refreshing -= HiveClient_Instance_Refreshing;
       base.OnClosing(e);
     }
@@ -93 +93 @@
 
     #region Event Handlers
-    private void HiveAdminClient_Instance_Refreshing(object sender, EventArgs e) {
-      if (InvokeRequired) Invoke((Action<object, EventArgs>)HiveAdminClient_Instance_Refreshing, sender, e);
+    private void HiveClient_Instance_Refreshing(object sender, EventArgs e) {
+      if (InvokeRequired) Invoke((Action<object, EventArgs>)HiveClient_Instance_Refreshing, sender, e);
       else {
         var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
@@ -102 +102 @@
     }
 
-    private void HiveAdminClient_Instance_Refreshed(object sender, EventArgs e) {
-      if (InvokeRequired) Invoke((Action<object, EventArgs>)HiveAdminClient_Instance_Refreshed, sender, e);
+    private void HiveClient_Instance_Refreshed(object sender, EventArgs e) {
+      if (InvokeRequired) Invoke((Action<object, EventArgs>)HiveClient_Instance_Refreshed, sender, e);
       else {
         var mainForm = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>();
@@ -129 +129 @@
 
       await SecurityExceptionUtil.TryAsyncAndReportSecurityExceptions(
-        action: () => UpdateProjects(),
+        action: () => UpdateInstance(),
         finallyCallback: () => updatingProjects = false);
     }
@@ -151 +151 @@
 
     #region Helpers
+    private void UpdateInstance() {
+      HiveClient.Instance.Refresh();
+    }
+
     private void UpdateProjects() {
-      HiveAdminClient.Instance.Refresh();
+      HiveClient.Instance.RefreshProjectsAndResources();
       hiveResourceSelector.JobId = jobId;
       hiveResourceSelector.ProjectId = projectId;