Changeset 16122 for trunk/HeuristicLab.Clients.Hive.Administrator

Timestamp:

09/04/18 11:16:36 (6 years ago)

Author:

jkarder

Message:

#2839: worked on hive project management

• fixed handling of enabled states in ResourcesView

File:

• trunk/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs (modified) (10 diffs)

trunk/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

@@ -112 +112 @@
         BuildResourceTree(Content);
       }
+      SetEnabledStateOfControls();
     }
 
@@ -117 +118 @@
       base.SetEnabledStateOfControls();
 
-      bool locked = Content == null || selectedResource == null || Locked || ReadOnly;
-      bool adminLocked = locked || !IsAdmin();
-      bool addLocked = adminLocked || selectedResource.Id == Guid.Empty || selectedResource is Slave;
-      bool deleteLocked = adminLocked || HiveAdminClient.Instance.ResourceDescendants[selectedResource.Id].Any();
+      bool locked = Content == null || Locked || ReadOnly;
+      bool addLocked = locked
+                    || !IsAdmin()
+                    || (selectedResource is Slave && selectedResource.ParentResourceId != null)
+                    || (selectedResource != null && selectedResource.Id == Guid.Empty);
+
+      HashSet<Guid> descendantResources = null;
+
+      bool deleteLocked = locked
+                       || !IsAdmin()
+                       || !Content.Any()
+                       || selectedResource == null
+                       || (selectedResource.Id != Guid.Empty && (!HiveAdminClient.Instance.ResourceDescendants.TryGetValue(selectedResource.Id, out descendantResources) || descendantResources.Any()));
+
+      bool saveLocked = locked
+                       || !IsAdmin()
+                       || !Content.Any()
+                       || selectedResource == null;
 
       btnAddGroup.Enabled = !addLocked;
       btnRemoveGroup.Enabled = !deleteLocked;
-      btnSave.Enabled = !locked;
-      scheduleView.Locked = adminLocked;
+      btnSave.Enabled = !saveLocked;
+      viewHost.Locked = locked || !IsAdmin();
+      scheduleView.Locked = locked || !IsAdmin();
     }
     #endregion
@@ -207 +223 @@
 
     private void btnAddGroup_Click(object sender, EventArgs e) {
-      Guid? parentResourceId = null;
-      if (!IsAdmin()) {
-        MessageBox.Show(
-          "You have no permission to add a resource group.",
-          "HeuristicLab Hive Administrator",
-          MessageBoxButtons.OK,
-          MessageBoxIcon.Information);
-        return;
-      } else if (selectedResource != null && selectedResource.Id == Guid.Empty) {
-        MessageBox.Show(
-          "You cannot add a resource group to a not yet stored group.",
-          "HeuristicLab Hive Administrator",
-          MessageBoxButtons.OK,
-          MessageBoxIcon.Information);
-        return;
-      }
-
-      if (selectedResource != null && selectedResource is SlaveGroup) {
-        parentResourceId = selectedResource.Id;
-      } else {
-        MessageBox.Show(
-          "You cannot add a resource group to a slave.",
-          "HeuristicLab Hive Administrator",
-          MessageBoxButtons.OK,
-          MessageBoxIcon.Information);
-        return;
-      }
+      var parentResourceId = selectedResource is SlaveGroup ? selectedResource.Id : (Guid?)null;
 
       var group = new SlaveGroup {
@@ -241 +231 @@
       };
 
-      //HiveAdminClient.Instance.UpdateResourceGenealogy(Content);
       SelectedResource = group;
       Content.Add(group);
@@ -252 +241 @@
         if (!btnRemoveGroup.Enabled) return;
         btnRemoveGroup.Enabled = false;
-      }
-
-      if (!IsAdmin()) {
-        MessageBox.Show(
-          "You have no permission to delete resource groups.",
-          "HeuristicLab Hive Administrator",
-          MessageBoxButtons.OK,
-          MessageBoxIcon.Information);
-        return;
-      }
-
-      if (Content.Any(x => x.ParentResourceId == selectedResource.Id)) {
-        MessageBox.Show(
-          "Only empty resource groups can be deleted.",
-          "HeuristicLab Hive Administrator",
-          MessageBoxButtons.OK,
-          MessageBoxIcon.Error);
-        return;
       }
 
@@ -281 +252 @@
           action: () => {
             RemoveResource(selectedResource);
-          },
-          finallyCallback: () => {
-            btnRemoveGroup.Enabled = true;
           });
-      } else {
-        btnRemoveGroup.Enabled = true;
+
+        OnContentChanged();
+        SetEnabledStateOfControls();
       }
     }
@@ -302 +271 @@
             resource.Store();
           UpdateResources();
-        },
-        finallyCallback: () => btnSave.Enabled = true);
+        });
 
       OnContentChanged();
+      SetEnabledStateOfControls();
     }
 
@@ -483 +452 @@
       ungroupedGroupNode = new TreeNode(UNGROUPED_GROUP_NAME) {
         ForeColor = SystemColors.GrayText,
+        ImageIndex = slaveGroupImageIndex,
         Tag = new SlaveGroup() {
           Name = UNGROUPED_GROUP_NAME,
@@ -508 +478 @@
         ungroupedGroupNode.Text += " [" + ungroupedGroupNode.Nodes.Count.ToString() + "]";
         ungroupedGroupNode.Expand();
-      }
-      treeView.Nodes.Add(ungroupedGroupNode);
+        treeView.Nodes.Add(ungroupedGroupNode);
+      }
     }
 
@@ -564 +534 @@
       try {
         if (resource.Id != Guid.Empty) {
-          var resourcesToSave = Content.Where(x => x.Id == Guid.Empty || x.Modified);
-          foreach (var r in resourcesToSave)
-            r.Store();
-
           SelectedResource = HiveAdminClient.Instance.GetAvailableResourceAncestors(resource.Id).LastOrDefault();
           HiveAdminClient.Delete(resource);
           UpdateResources();
         } else {
-          Content.Remove(selectedResource);
+          SelectedResource = null;
+          Content.Remove(resource);
         }
       } catch (AnonymousUserException) {