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

Timestamp:

01/23/18 14:00:03 (6 years ago)

Author:

jzenisek

Message:

#2839

• adapted handling of cascading revocations of project-user permissions and project-resource assignments: from deleting all AssignedJobResource (formerly) to deleting only entries which are effected by the previously mentioned revocations (now)
• implemented job update (client side)
• corrected & improved stateful project/resource selection dialog
• corrected resource statistic calculation in project/resource selection dialog

File:

• branches/HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs (modified) (13 diffs)

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

@@ -72 +72 @@
     private string currentSearchString;
 
+    private void resetHiveResourceSelector() {
+      lastSelectedProject = null;
+      selectedProject = null;
+      projectId = null;
+    }
+
     private Guid jobId;
     public Guid JobId {
@@ -78 +84 @@
         if (jobId == value) return;
         jobId = value;
+        resetHiveResourceSelector();
       }
     }
@@ -99 +106 @@
     }
 
-    public bool ChangedProject {
-      get {
-        return (selectedProject == null || selectedProject.Id == projectId) ? false : true;
+    private IEnumerable<Guid> selectedResourceIds;
+    public IEnumerable<Guid> SelectedResourceIds {
+      get { return selectedResourceIds; }
+      set {
+        if (selectedResourceIds == value) return;
+        selectedResourceIds = value;
       }
     }
@@ -128 +138 @@
         selectedProject = value;
         UpdateResourceTree();
+        ExtractStatistics();
         OnSelectedProjectChanged();
       }
     }
+
     public IEnumerable<Resource> AssignedResources {
       get { return newAssignedResources; }
@@ -142 +154 @@
     }
 
+
     public new IItemList<Project> Content {
       get { return (IItemList<Project>)base.Content; }
@@ -164 +177 @@
         UpdateResourceGenealogy();
         
-        if (SelectedProjectId.HasValue) {
+        if (SelectedProjectId.HasValue && SelectedProjectId.Value != Guid.Empty) {
           SelectedProject = GetSelectedProjectById(SelectedProjectId.Value);
         } else {
           SelectedProject = null;
         }
+        //ExtractStatistics();
         UpdateProjectTree();
 
       } else {
+        lastSelectedProject = null;
+        selectedProject = null;
+        selectedProjectId = null;
         projectsTreeView.Nodes.Clear();
         resourcesTreeView.Nodes.Clear();
@@ -183 +200 @@
       projectsTreeView.Nodes.Clear();
       resourcesTreeView.Nodes.Clear();
-      //SelectedProject = null;
     }
 
@@ -213 +229 @@
         }
 
-        SelectedProject = node;
-      }
-
-      ExtractStatistics();
+        
+      }
+      SelectedProject = node;
+      //ExtractStatistics();
     }
 
@@ -243 +259 @@
 
       UpdateNewResourceTree();
+      ExtractStatistics();
       //ExtractStatistics((Resource)resourcesTreeView.SelectedNode?.Tag);
       OnAssignedResourcesChanged();
@@ -483 +500 @@
         }
       }
-      ExtractStatistics();
+      //ExtractStatistics();
       //OnAssignedResourcesChanged();
     }
 
     private void UpdateAssignedResources() {
-
-      if (JobId == Guid.Empty && ChangedProjectSelection) { // new, unchanged jobs get all avaialable resources
+      assignedResources.Clear();
+      newAssignedResources.Clear();
+
+      if (JobId == Guid.Empty || JobId == null) { // new, unchanged jobs get all avaialable resources
         // update new assigned resources
-        assignedResources.Clear();
-        newAssignedResources.Clear();
-        foreach (var resource in availableResources
-          .Where(x => !x.ParentResourceId.HasValue
-          || !availableResources.Select(y => y.Id).Contains(x.ParentResourceId.Value))) {
-          newAssignedResources.Add(resource);
-        }
-
-      } else if(JobId != Guid.Empty) { // existent, unchanged jobs get all assigned resources
+        if(selectedResourceIds == null) {
+          foreach (var resource in availableResources
+            .Where(x => !x.ParentResourceId.HasValue
+            || !availableResources.Select(y => y.Id).Contains(x.ParentResourceId.Value))) {
+            newAssignedResources.Add(resource);
+          }
+        } else {
+          foreach(var resource in availableResources.Where(x => selectedResourceIds.Contains(x.Id))) {
+            newAssignedResources.Add(resource);
+          }
+        }
+      } else { // existent, unchanged jobs get all assigned resources
         // update assigned resources
         var assignedJobResources = GetAssignedResourcesForJob(JobId);
         foreach (var resource in assignedJobResources) {
           assignedResources.Add(resource);
-        }
-
-        if(ChangedProjectSelection) {
-          newAssignedResources.Clear();
-          foreach (var resource in assignedJobResources) {
+          if (selectedResourceIds == null) {
             newAssignedResources.Add(resource);
           }
         }
-      } else {
-        var newAssignedResourceIds = newAssignedResources.Select(x => x.Id).ToList();
-        newAssignedResources.Clear();
-        foreach(var r in availableResources.Where(x => newAssignedResourceIds.Contains(x.Id))) {
-          newAssignedResources.Add(r);
-        }
-      }
-
-      ExtractStatistics();
+
+        if(selectedResourceIds != null) {
+          foreach (var resource in availableResources.Where(x => selectedResourceIds.Contains(x.Id))) {
+            newAssignedResources.Add(resource);
+          }
+        }
+      }
+
+      //ExtractStatistics();
       OnAssignedResourcesChanged();
     }
@@ -535 +553 @@
       includedResources.Clear();
       newIncludedResources.Clear();
+
       if (JobId != Guid.Empty) {
         foreach (var item in assignedResources) {
           foreach (var descendant in resourceDescendants[item.Id]) {
             includedResources.Add(descendant);
-            newIncludedResources.Add(descendant);
-          }
-        }
-      } else {
-        foreach (var item in newAssignedResources) {
-          foreach (var descendant in resourceDescendants[item.Id]) {
-            newIncludedResources.Add(descendant);
-          }
+          }
+        }
+      }
+
+      foreach (var item in newAssignedResources) {
+        foreach (var descendant in resourceDescendants[item.Id]) {
+          newIncludedResources.Add(descendant);
         }
       }
@@ -722 +740 @@
     }
 
-    private void ExtractStatistics(Resource resource = null) {
-      ISet<Slave> selectedSlaves = null;
+    private void ExtractStatistics(Resource resource = null) { 
+      HashSet<Slave> newAssignedSlaves = new HashSet<Slave>(newAssignedResources.OfType<Slave>());
+      foreach (var slaveGroup in newAssignedResources.OfType<SlaveGroup>()) {
+        foreach(var slave in resourceDescendants[slaveGroup.Id].OfType<Slave>()) {
+          newAssignedSlaves.Add(slave);
+        }
+      }
+
+      HashSet<Slave> selectedSlaves = null;
 
       if (resource != null) {
-
-
         var slaveGroup = resource as SlaveGroup;
         if (slaveGroup != null) {
           selectedSlaves = new HashSet<Slave>(resourceDescendants[slaveGroup.Id].OfType<Slave>());
-          selectedSlaves.IntersectWith(newAssignedResources.OfType<Slave>());
+          //selectedSlaves.IntersectWith(newAssignedSlaves);
         } else {
           selectedSlaves = new HashSet<Slave>(new[] { resource as Slave });
         }
       } else {
-        selectedSlaves = new HashSet<Slave>(newAssignedResources.OfType<Slave>());
-      }
-
-      int sumCores = selectedSlaves.OfType<Slave>().Sum(x => x.Cores.GetValueOrDefault());
-      int sumFreeCores = selectedSlaves.OfType<Slave>().Sum(x => x.FreeCores.GetValueOrDefault());
-      double sumMemory = selectedSlaves.OfType<Slave>().Sum(x => x.Memory.GetValueOrDefault()) / 1024.0;
-      double sumFreeMemory = selectedSlaves.OfType<Slave>().Sum(x => x.FreeMemory.GetValueOrDefault()) / 1024.0;
+        selectedSlaves = newAssignedSlaves;
+      }
+
+      int sumCores = selectedSlaves.Sum(x => x.Cores.GetValueOrDefault());
+      int sumFreeCores = selectedSlaves.Sum(x => x.FreeCores.GetValueOrDefault());
+      double sumMemory = selectedSlaves.Sum(x => x.Memory.GetValueOrDefault()) / 1024.0;
+      double sumFreeMemory = selectedSlaves.Sum(x => x.FreeMemory.GetValueOrDefault()) / 1024.0;
 
       coresSummaryLabel.Text = $"{sumCores} Total ({sumFreeCores} Free / {sumCores - sumFreeCores} Used)";
@@ -760 +783 @@
     }
 
-    private void ExtractStatistics_Old(Resource resource = null) {
-      ISet<Slave> selectedSlaves = null;
-
-      if (resource != null) {
-        var slaveGroup = resource as SlaveGroup;
-        if (slaveGroup != null) {
-          var children = new HashSet<Resource>(availableResources.Where(x => x.ParentResourceId == slaveGroup.Id));
-          int nrOfChildren = children.Count;
-          do {
-            var newChildren = availableResources.Where(x => children.Any(y => y.Id == x.ParentResourceId));
-            foreach (var newChild in newChildren)
-              children.Add(newChild);
-          } while (children.Count > nrOfChildren);
-          selectedSlaves = new HashSet<Slave>(children.OfType<Slave>());
-          selectedSlaves.IntersectWith(assignedResources.OfType<Slave>());
-        } else {
-          selectedSlaves = new HashSet<Slave>(new[] { resource as Slave });
-        }
-      } else {
-        selectedSlaves = new HashSet<Slave>(assignedResources.OfType<Slave>());
-      }
-
-      int sumCores = selectedSlaves.OfType<Slave>().Sum(x => x.Cores.GetValueOrDefault());
-      int sumFreeCores = selectedSlaves.OfType<Slave>().Sum(x => x.FreeCores.GetValueOrDefault());
-      double sumMemory = selectedSlaves.OfType<Slave>().Sum(x => x.Memory.GetValueOrDefault()) / 1024.0;
-      double sumFreeMemory = selectedSlaves.OfType<Slave>().Sum(x => x.FreeMemory.GetValueOrDefault()) / 1024.0;
-
-      coresSummaryLabel.Text = $"{sumCores} Total ({sumFreeCores} Free / {sumCores - sumFreeCores} Used)";
-      memorySummaryLabel.Text = $"{sumMemory:0.00} GB Total ({sumFreeMemory:0.00} GB Free / {(sumMemory - sumFreeMemory):0.00} GB Used)";
-    }
-
-    private Resource BuildResourceTree_Old(IEnumerable<Resource> resources) {
-      resourcesTreeView.Nodes.Clear();
-      if (!resources.Any()) return null;
-
-      var mainResources = new HashSet<Resource>(resources.Where(x => x.ParentResourceId == null));
-      var subResources = new HashSet<Resource>(resources.Except(mainResources));
-
-      var stack = new Stack<Resource>(mainResources.OrderByDescending(x => x.Name));
-      var top = stack.Peek();
-
-      TreeNode currentNode = null;
-      Resource currentResource = null;
-
-      while (stack.Any()) {
-        var newResource = stack.Pop();
-        var newNode = new TreeNode(newResource.Name) {
-          Checked = true,
-          ImageIndex = newResource is Slave ? slaveImageIndex : slaveGroupImageIndex,
-          Tag = newResource
-        };
-
-        while (currentNode != null && newResource.ParentResourceId != currentResource.Id) {
-          currentNode = currentNode.Parent;
-          currentResource = currentNode == null ? null : (Resource)currentNode.Tag;
-        }
-
-        if (currentNode == null) {
-          resourcesTreeView.Nodes.Add(newNode);
-        } else {
-          currentNode.Nodes.Add(newNode);
-        }
-
-        newNode.SelectedImageIndex = newNode.ImageIndex;
-
-        var childResources = subResources.Where(x => x.ParentResourceId == newResource.Id);
-        if (childResources.Any()) {
-          foreach (var resource in childResources.OrderByDescending(x => x.Name)) {
-            subResources.Remove(resource);
-            stack.Push(resource);
-          }
-          currentNode = newNode;
-          currentResource = newResource;
-        }
-      }
-
-      resourcesTreeView.ExpandAll();
-
-      return top;
-    }
-
     #endregion