Merge branch 'CactuseSecurity#2609--App-modelling--answering-interface-forgets-former-edits' of https://github.com/CactuseSecurity/firewall-orchestrator into CactuseSecurity#2692--Modelling---short-duplication-of-objects-when-saving

Author: SolidProgramming

roles/lib/files/FWO.Services/ModellingConnectionHandler.cs

@@ -83,6 +83,7 @@ public class ModellingConnectionHandler : ModellingHandlerBase
         public ModellingAppRole DummyAppRole = new();
         public int LastWidth = GlobalConst.kGlobLibraryWidth;
         public bool LastCollapsed = false;
+        public bool ActConnNeedsRefresh = true;
 
         private bool SrcFix = false;
         private bool DstFix = false;
@@ -156,7 +157,12 @@ public async Task ReInit()
         {
             try
             {
-                await RefreshActConn();
+                // exclude the cases where ActConn has to be held (e.g. if there is an ui binding)
+                if(ActConnNeedsRefresh)
+                {
+                    await RefreshActConn();
+                }
+                
                 await RefreshObjects();
                 await RefreshParent();
             }

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

@@ -206,13 +206,13 @@
         }
     </div>
 </Sidebar>
-<EditAppRole @bind-Display="ConnHandler.EditAppRoleMode" @bind-AppRoleHandler="ConnHandler.AppRoleHandler" RefreshParent="async () => await WrapAsync(ConnHandler.ReInit)"/>
+<EditAppRole @bind-Display="ConnHandler.EditAppRoleMode" @bind-AppRoleHandler="ConnHandler.AppRoleHandler" RefreshParent="RefreshParentWithoutRefreshingActConn"/>
 <ConfirmDelete @bind-Display="ConnHandler.DeleteAppRoleMode" PerformAction="async () => await WrapAsync(ConnHandler.DeleteAppRole)"
     Title="@userConfig.GetText("delete_app_role")" DeleteMessage="@ConnHandler.Message" AllowedRoles="@Roles.Modeller" DeleteAllowed="ConnHandler.DeleteAllowed" Enabled="ConnHandler.IsOwner"/>
 <EditServiceGroup @bind-Display="ConnHandler.EditSvcGrpMode" @bind-SvcGroupHandler="ConnHandler.SvcGrpHandler"/>
 <ConfirmDelete @bind-Display="ConnHandler.DeleteSvcGrpMode" PerformAction="async () => await WrapAsync(ConnHandler.DeleteServiceGroup)"
     Title="@userConfig.GetText("delete_service_group")" DeleteMessage="@ConnHandler.Message" AllowedRoles="@Roles.Modeller" DeleteAllowed="ConnHandler.DeleteAllowed" Enabled="ConnHandler.IsOwner"/>
-<EditService @bind-Display="ConnHandler.EditServiceMode" ServiceHandler="ConnHandler.ServiceHandler" RefreshParent="async () => await WrapAsync(ConnHandler.ReInit)"/>
+<EditService @bind-Display="ConnHandler.EditServiceMode" ServiceHandler="ConnHandler.ServiceHandler" RefreshParent="RefreshParentWithoutRefreshingActConn"/>
 <ConfirmDelete @bind-Display="ConnHandler.DeleteServiceMode" PerformAction="async () => await WrapAsync(ConnHandler.DeleteService)"
     Title="@userConfig.GetText("delete_service")" DeleteMessage="@ConnHandler.Message" AllowedRoles="@Roles.Modeller" DeleteAllowed="ConnHandler.DeleteAllowed" Enabled="ConnHandler.IsOwner"/>
 <SearchInterface @bind-Display="SearchInterfaceMode" @bind-PreselectedInterfaces="ConnHandler.PreselectedInterfaces" Application="ConnHandler.Application"/>
@@ -648,6 +648,16 @@
         await ConnHandlerChanged.InvokeAsync(ConnHandler);
     }
 
+    /// <summary>
+    /// Executes ReInit without dropping ActConn
+    /// </summary>
+    private async Task RefreshParentWithoutRefreshingActConn()
+    {
+        ConnHandler.ActConnNeedsRefresh = false;
+        await WrapAsync(ConnHandler.ReInit);
+        ConnHandler.ActConnNeedsRefresh = true;
+    }
+
     private string ColWidthClass()
     {
         return OverviewMode ? "col-sm-12" : "col-sm-10";