Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

Author: SolidProgramming

roles/ui/files/FWO.UI/Pages/NetworkModelling/EditAppRole.razor

@@ -96,7 +96,7 @@
                                      ondragover="event.preventDefault();"
                                      ondragstart="event.dataTransfer.setData('', event.target.id);"
                                      @ondrop="HandleServerDrop">
-                                    <EditList ElementType="ModellingAppServer" Elements="ModellingAppServerWrapper.Resolve(AppRoleHandler.ActAppRole.AppServers)" ElementsToAdd="AppRoleHandler.AppServerToAdd" ElementsToDelete="AppRoleHandler.AppServerToDelete" StdLayout="false">
+                                    <EditList ElementType="ModellingAppServer" Elements="ModellingAppServerWrapper.Resolve(AppRoleHandler.ActAppRole.AppServers)" ElementsToAdd="AppRoleHandler.AppServerToAdd" ElementsToDelete="AppRoleHandler.AppServerToDelete" StdLayout="false" ElementsRemoved="OnAppServerRemovedFromEditList">
                                         <Display>
                                             <div class="row">
                                                 <div class="col-sm-12 ms-2 bg-transparent">@((MarkupString)context.DisplayWithIcon())</div>
@@ -296,4 +296,12 @@
     {
         areas.Sort((ModellingNetworkArea a, ModellingNetworkArea b) => a?.CompareTo(b) ?? -1);
     }
+
+    /// <summary>
+    /// Updates the view after removing an app server from the list of app role's app servers.
+    /// </summary>
+    private void OnAppServerRemovedFromEditList()
+    {
+        InvokeAsync(StateHasChanged);
+    }
 }

roles/ui/files/FWO.UI/Pages/NetworkModelling/EditAppRoleLeftSide.razor

@@ -14,7 +14,7 @@
     {
         <div class="form-group row">
             <div class="col-sm-10">
-                <DraggableList AllElements="AppRoleHandler.AppServersInArea" @bind-SelectedElements="selectedAppServers" 
+                <DraggableList AllElements="selectableAppServers" @bind-SelectedElements="selectedAppServers" 
                     HandleDragStart="HandleDragStart" Display="@(x => x.DisplayWithIcon())" MaxHeight="50"/>
             </div>
             @if(selectedAppServers.Count > 0)
@@ -56,6 +56,11 @@
     private List<ModellingAppServer> selectedAppServers = [];
     private int sidebarLeftWidth { get { return Width; } set { Width = value; WidthChanged.InvokeAsync(Width);}}
 
+    /// <summary>
+    /// The app servers which are available for adding (i.e. which are not already in the AppServerToAdd collection).
+    /// </summary>
+    private List<ModellingAppServer> selectableAppServers => AppRoleHandler.AppServersInArea.Except(AppRoleHandler.AppServerToAdd).ToList();
+
 
     private bool HandleDragStart(DragEventArgs e, ModellingAppServer appServer)
     {

roles/ui/files/FWO.UI/Shared/EditList.razor

@@ -10,7 +10,7 @@
 		int j = i;
 		<li class="@(StdLayout ? StdClass : AltClass) d-flex justify-content-between">
 			<div class="@(StdLayout ? "" : AltElemClass)">@(Display(ElementsToAdd[i]))</div>
-			<span @onclick="() => {ElementsToAdd.Remove(ElementsToAdd[j]);AfterRemoveAction();}" class="@(StdLayout ? "" : AltButtonClass) badge bg-danger">
+			<span @onclick="() => OnRemoveElementButtonClick(j)" class="@(StdLayout ? "" : AltButtonClass) badge bg-danger">
 				<i class="@(Icons.Close) text-light"></i>
 			</span>
 		</li>
@@ -53,6 +53,12 @@
     [Parameter]
     public Func<bool> AfterRemoveAction { get; set; } = DefaultInit.DoNothingSync;
 
+	/// <summary>
+	/// Gets invoked after user removes element from the ElementsToAdd collection via button.
+	/// </summary>
+	[Parameter]
+    public EventCallback ElementsRemoved { get; set; }
+
 	private string StdClass = "bg-success-subtle list-group-item pb-2 pt-2";
 	private string AltClass = "draggable-selected pb-0 pt-0";
 	private string AltElemClass = "col-sm-11";
@@ -69,4 +75,14 @@
 			ElementsToDelete.Add(Elements[index]);
 		}
 	}
-}
+
+	/// <summary>
+	/// Handles the click on an 'x' button of a server that is in the list of configured servers.
+	/// </summary>
+	private void OnRemoveElementButtonClick(int index)
+	{
+		ElementsToAdd.Remove(ElementsToAdd[index]);
+		AfterRemoveAction();
+		ElementsRemoved.InvokeAsync();
+	}
+}