Changeset 15642

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

Location:

branches/HiveProjectManagement

Files:

• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectPermissionsView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs (modified) (13 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (8 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (1 diff)

branches/HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectPermissionsView.cs

@@ -94 +94 @@
     private async void inheritButton_Click(object sender, EventArgs e) {
       await SecurityExceptionUtil.TryAsyncAndReportSecurityExceptions(
-        action: () => SetGrantedProjectPermissions(Content.Id, newAssignedPermissions.Select(x => x.Id), false, true, true));
+        action: () => SetGrantedProjectPermissions(Content.Id, newAssignedPermissions.Select(x => x.Id), false, true, false));
       UpdatePermissionList();
     }

branches/HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs

@@ -100 +100 @@
       await SecurityExceptionUtil.TryAsyncAndReportSecurityExceptions(
         action: () => {
-          SetAssignedProjectResources(Content.Id, newAssignedResources.Select(x => x.Id), false, true);
+          SetAssignedProjectResources(Content.Id, newAssignedResources.Select(x => x.Id), false, true, false);
         });
       UpdateResourceTree();
@@ -108 +108 @@
       await SecurityExceptionUtil.TryAsyncAndReportSecurityExceptions(
         action: () => {
-          SetAssignedProjectResources(Content.Id, newAssignedResources.Select(x => x.Id), false, false);
+          SetAssignedProjectResources(Content.Id, newAssignedResources.Select(x => x.Id), false, false, false);
         });
       UpdateResourceTree();
@@ -156 +156 @@
     }
 
-    private void SetAssignedProjectResources(Guid projectId, IEnumerable<Guid> resourceIds, bool reassign, bool cascading) {
+    private void SetAssignedProjectResources(Guid projectId, IEnumerable<Guid> resourceIds, bool reassign, bool cascading, bool reassignCascading) {
       if (projectId == null || resourceIds == null) return;
       HiveServiceLocator.Instance.CallHiveService(s => {
-       s.SaveProjectResourceAssignments(projectId, resourceIds.ToList(), reassign, cascading, true);
+       s.SaveProjectResourceAssignments(projectId, resourceIds.ToList(), reassign, cascading, reassignCascading);
       });
     }

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
 

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

@@ -55 +55 @@
     }
 
-    // currently selected projectId (initially persisted projectId)
+    // currently selected projectId (initially the persisted projectId)
     private Guid? selectedProjectId;
     public Guid? SelectedProjectId {
@@ -61 +61 @@
       set { selectedProjectId = value; }
     }
+
+    // currently selected resourceIds (if null, perform lookup in HiveResourceSelector)
+    private IEnumerable<Guid> selectedResourceIds;
+    public IEnumerable<Guid> SelectedResourceIds {
+      get { return selectedResourceIds; }
+      set { selectedResourceIds = value; }
+    }
+
 
 
@@ -135 +143 @@
     private void hiveResourceSelector_ProjectsTreeViewDoubleClicked(object sender, EventArgs e) {
       if (hiveResourceSelector.SelectedProject == null) return;
+      if (!hiveResourceSelector.AssignedResources.Any()) return;
 
       DialogResult = DialogResult.OK;
@@ -147 +156 @@
       hiveResourceSelector.ProjectId = projectId;
       hiveResourceSelector.SelectedProjectId = selectedProjectId;
+      hiveResourceSelector.SelectedResourceIds = selectedResourceIds;
       var projectList = new ItemList<Project>(HiveServiceLocator.Instance.CallHiveService(s => s.GetProjects()));
       hiveResourceSelector.Content = projectList;

branches/HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs

@@ -68 +68 @@
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       this.refreshButton = new System.Windows.Forms.Button();
+      this.updateButton = new System.Windows.Forms.Button();
       this.UnloadButton = new System.Windows.Forms.Button();
       this.refreshAutomaticallyCheckBox = new System.Windows.Forms.CheckBox();
@@ -337 +338 @@
       this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
       // 
+      // updateButton
+      // 
+      this.updateButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
+      this.updateButton.Location = new System.Drawing.Point(30, 0);
+      this.updateButton.Name = "updateButton";
+      this.updateButton.Size = new System.Drawing.Size(24, 24);
+      this.updateButton.TabIndex = 23;
+      this.toolTip.SetToolTip(this.updateButton, "Update Job (Name, Project, Resources)");
+      this.updateButton.UseVisualStyleBackColor = true;
+      this.updateButton.Click += new System.EventHandler(this.updateButton_Click);
+      // 
       // UnloadButton
       // 
       this.UnloadButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Disconnect;
-      this.UnloadButton.Location = new System.Drawing.Point(30, 0);
+      this.UnloadButton.Location = new System.Drawing.Point(57, 0);
       this.UnloadButton.Name = "UnloadButton";
       this.UnloadButton.Size = new System.Drawing.Size(24, 24);
@@ -351 +363 @@
       // 
       this.refreshAutomaticallyCheckBox.AutoSize = true;
-      this.refreshAutomaticallyCheckBox.Location = new System.Drawing.Point(70, 3);
+      this.refreshAutomaticallyCheckBox.Location = new System.Drawing.Point(100, 3);
       this.refreshAutomaticallyCheckBox.Name = "refreshAutomaticallyCheckBox";
       this.refreshAutomaticallyCheckBox.Size = new System.Drawing.Size(127, 17);
@@ -457 +469 @@
       // 
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-      this.Controls.Add(this.UnloadButton);
       this.Controls.Add(this.searchButton);
       this.Controls.Add(this.infoGroupBox);
       this.Controls.Add(this.refreshAutomaticallyCheckBox);
       this.Controls.Add(this.refreshButton);
+      this.Controls.Add(this.updateButton);
+      this.Controls.Add(this.UnloadButton);
       this.Controls.Add(this.nameTextBox);
       this.Controls.Add(this.nameLabel);
@@ -503 +516 @@
     private System.Windows.Forms.ToolTip toolTip;
     private System.Windows.Forms.Button refreshButton;
+    private System.Windows.Forms.Button updateButton;
+    private System.Windows.Forms.Button UnloadButton;
     private System.Windows.Forms.CheckBox refreshAutomaticallyCheckBox;
     private System.Windows.Forms.GroupBox infoGroupBox;
@@ -520 +535 @@
     private System.Windows.Forms.Button searchButton;
     private MainForm.WindowsForms.DragOverTabControl tabControl;
-    private System.Windows.Forms.Button UnloadButton;
-
   }
 }

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

@@ -46 +46 @@
     private object runCollectionViewLocker = new object();
     private Project selectedProject;
+    private Dictionary<Guid, Guid> originalJobProjectAssignment = new Dictionary<Guid, Guid>();
 
     public new RefreshableJob Content {
       get { return (RefreshableJob)base.Content; }
-      set { base.Content = value; }
+      set {
+        base.Content = value;
+      }
     }
 
@@ -129 +132 @@
           stateLogViewHost.Content = null;
         } else {
+          if(Content.Job != null 
+            && Content.Job.Id != Guid.Empty 
+            && !originalJobProjectAssignment.ContainsKey(Content.Job.Id)) {
+            originalJobProjectAssignment.Add(Content.Job.Id, Content.Job.ProjectId);
+          }
+
           nameTextBox.Text = Content.Job.Name;
           executionTimeTextBox.Text = Content.ExecutionTime.ToString();
@@ -135 +144 @@
           // project look up
           if(Content.Job.ProjectId != null && Content.Job.ProjectId != Guid.Empty) {
-            selectedProject = GetProject(Content.Job.ProjectId);
-            if(selectedProject != null) {
-              projectNameTextBox.Text = selectedProject.Name;
-            } else {
-              projectNameTextBox.Text = string.Empty;
+            if(selectedProject == null || selectedProject.Id != Content.Job.ProjectId) {
+              selectedProject = GetProject(Content.Job.ProjectId);
+              if (selectedProject != null) {
+                projectNameTextBox.Text = selectedProject.Name;
+              } else {
+                projectNameTextBox.Text = string.Empty;
+              }
             }
           } else {
             selectedProject = null;
             projectNameTextBox.Text = string.Empty;
+            Content.Job.ResourceIds = null;
           }
           
@@ -195 +207 @@
           tabControl.Enabled = !Content.IsProgressing;
 
-          this.nameTextBox.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded || Content.IsProgressing;
-          this.searchButton.Enabled = Content.IsControllable && Content.ExecutionState == ExecutionState.Prepared && !alreadyUploaded && !Content.IsProgressing;
+          this.nameTextBox.ReadOnly = Content.IsProgressing;
+          this.searchButton.Enabled = !Content.IsProgressing && Content.ExecutionState != ExecutionState.Stopped;
           this.jobsTreeView.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded || Content.IsProgressing;
 
           this.refreshAutomaticallyCheckBox.Enabled = Content.IsControllable && alreadyUploaded && jobsLoaded && (Content.ExecutionState == ExecutionState.Started || Content.ExecutionState == ExecutionState.Paused) && !Content.IsProgressing;
           this.refreshButton.Enabled = Content.IsDownloadable && alreadyUploaded && !Content.IsProgressing;
+          this.updateButton.Enabled = Content.ExecutionState != ExecutionState.Prepared && Content.ExecutionState != ExecutionState.Stopped && !Content.IsProgressing;
 
           this.UnloadButton.Enabled = Content.HiveTasks != null && Content.HiveTasks.Count > 0 && alreadyUploaded && !Content.IsProgressing;
@@ -347 +360 @@
       if (hiveResourceSelectorDialog == null) {
         hiveResourceSelectorDialog = new HiveResourceSelectorDialog(Content.Job.Id, Content.Job.ProjectId);
-      } else if(selectedProject != null) {
+      } else if(hiveResourceSelectorDialog.JobId != Content.Job.Id) {
+        hiveResourceSelectorDialog.JobId = Content.Job.Id;
         hiveResourceSelectorDialog.SelectedProjectId = Content.Job.ProjectId;
+        hiveResourceSelectorDialog.SelectedResourceIds = Content.Job.ResourceIds;
+
+        if (originalJobProjectAssignment.ContainsKey(Content.Job.Id)) {
+          hiveResourceSelectorDialog.ProjectId = originalJobProjectAssignment[Content.Job.Id];
+        } else {
+          hiveResourceSelectorDialog.ProjectId = Guid.Empty;
+        }
+      } else if(hiveResourceSelectorDialog.JobId == Guid.Empty && Content.Job.Id == Guid.Empty) {
+        hiveResourceSelectorDialog.JobId = Content.Job.Id;
+        hiveResourceSelectorDialog.ProjectId = Guid.Empty;
+        hiveResourceSelectorDialog.SelectedProjectId = Content.Job.ProjectId;
+        hiveResourceSelectorDialog.SelectedResourceIds = Content.Job.ResourceIds;
       } else {
-        hiveResourceSelectorDialog.SelectedProjectId = null;
+        hiveResourceSelectorDialog.SelectedProjectId = Content.Job.ProjectId;
+        hiveResourceSelectorDialog.SelectedResourceIds = Content.Job.ResourceIds;
       }
 
@@ -360 +387 @@
           Content.Job.ResourceIds = hiveResourceSelectorDialog.SelectedResources.Select(x => x.Id).ToList();
         } else {
+          selectedProject = null;
           projectNameTextBox.Text = string.Empty;
           Content.Job.ProjectId = Guid.Empty;
@@ -447 +475 @@
     }
 
+    private void updateButton_Click(object sender, EventArgs e) {
+      HiveClient.UpdateJob(
+        (Exception ex) => ErrorHandling.ShowErrorDialog(this, "Update failed.", ex), 
+        Content, 
+        new CancellationToken());
+    }
+
+    //private void updateButton_Click(object sender, EventArgs e) {
+    //  var task = System.Threading.Tasks.Task.Factory.StartNew(UpdateJobAsync, Content);
+    //  task.ContinueWith((t) => {
+    //    Content.Progress.Finish();
+    //    MessageBox.Show("An error occured updating the job. See the log for more information.", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Error);
+    //    Content.Log.LogException(t.Exception);
+    //  }, TaskContinuationOptions.OnlyOnFaulted);
+    //}
+
+    //private void UpdateJobAsync(object job) {
+    //  Content.Progress.Start("Updating job...");
+    //  HiveClient.UpdateJob((RefreshableJob)job);
+    //  Content.Progress.Finish();
+    //}
+
+    private void UnloadButton_Click(object sender, EventArgs e) {
+      Content.Unload();
+      runCollectionViewHost.Content = null;
+      stateLogViewHost.Content = null;
+      hiveExperimentPermissionListView.Content = null;
+      jobsTreeView.Content = null;
+
+      SetEnabledStateOfControls();
+    }
+
     private void refreshPermissionsButton_Click(object sender, EventArgs e) {
       if (this.Content.Job.Id == Guid.Empty) {
@@ -544 +604 @@
     }
 
-    private void UnloadButton_Click(object sender, EventArgs e) {
-      Content.Unload();
-      runCollectionViewHost.Content = null;
-      stateLogViewHost.Content = null;
-      hiveExperimentPermissionListView.Content = null;
-      jobsTreeView.Content = null;
-
-      SetEnabledStateOfControls();
-    }
   }
 }

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

@@ -249 +249 @@
     }
 
+    public static void UpdateJob(Action<Exception> exceptionCallback, RefreshableJob refreshableJob, CancellationToken cancellationToken) {
+      HiveServiceLocator.Instance.CallHiveService(service => {
+        HiveClient.StoreAsync(
+          new Action<Exception>((Exception ex) => {
+            //refreshableJob.ExecutionState = ExecutionState.Prepared;
+            exceptionCallback(ex);
+          }), refreshableJob.Job, cancellationToken);
+      });
+    }
+
     #region Upload Job
     private Semaphore taskUploadSemaphore = new Semaphore(Settings.Default.MaxParallelUploads, Settings.Default.MaxParallelUploads);