Merge pull request CactuseSecurity#2857 from CactuseSecurity/CactuseSecurity#2692--Modelling---short-duplication-of-objects-when-saving

PR for CactuseSecurity#2692--Modelling---short-duplication-of-objects-when-saving

Author: tpurschke

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();
             }
@@ -1085,18 +1091,6 @@ public async Task<bool> Save(bool noCheck = false)
                 }
                 if(noCheck || CheckConn())
                 {
-                    if(!SrcReadOnly)
-                    {
-                        SyncSrcChanges();
-                    }
-                    if(!DstReadOnly)
-                    {
-                        SyncDstChanges();
-                    }
-                    if(!SvcReadOnly)
-                    {
-                        SyncSvcChanges();
-                    }
                     ActConn.SyncState(DummyAppRole.Id);
                     if(AddMode)
                     {
@@ -1292,24 +1286,23 @@ await LogChange(ModellingTypes.ChangeType.Insert, ModellingTypes.ModObjectType.C
                         $"New {(ActConn.IsInterface? "Interface" : "Connection")}: {ActConn.Name}", AppId);
                     if(ActConn.UsedInterfaceId == null || ActConn.DstFromInterface)
                     {
-                        await AddNwObjects(ModellingAppServerWrapper.Resolve(ActConn.SourceAppServers).ToList(), 
-                            ModellingAppRoleWrapper.Resolve(ActConn.SourceAppRoles).ToList(),
-                            ModellingNetworkAreaWrapper.Resolve(ActConn.SourceAreas).ToList(),
-                            ModellingNwGroupWrapper.Resolve(ActConn.SourceOtherGroups).ToList(),
-                            ModellingTypes.ConnectionField.Source);
+                        await AddNwObjects(SrcAppServerToAdd,
+                                            SrcAppRolesToAdd,
+                                            SrcAreasToAdd,
+                                            SrcNwGroupsToAdd,
+                                            ModellingTypes.ConnectionField.Source);
                     }
                     if(ActConn.UsedInterfaceId == null || ActConn.SrcFromInterface)
                     {
-                        await AddNwObjects(ModellingAppServerWrapper.Resolve(ActConn.DestinationAppServers).ToList(),
-                            ModellingAppRoleWrapper.Resolve(ActConn.DestinationAppRoles).ToList(),
-                            ModellingNetworkAreaWrapper.Resolve(ActConn.DestinationAreas).ToList(),
-                            ModellingNwGroupWrapper.Resolve(ActConn.DestinationOtherGroups).ToList(),
-                            ModellingTypes.ConnectionField.Destination); 
+                        await AddNwObjects(DstAppServerToAdd,
+                                            DstAppRolesToAdd,
+                                            DstAreasToAdd,
+                                            DstNwGroupsToAdd,
+                                            ModellingTypes.ConnectionField.Destination);
                     }
                     if(ActConn.UsedInterfaceId == null)
                     {
-                        await AddSvcObjects(ModellingServiceWrapper.Resolve(ActConn.Services).ToList(),
-                            ModellingServiceGroupWrapper.Resolve(ActConn.ServiceGroups).ToList());          
+                        await AddSvcObjects(SvcToAdd, SvcGrpToAdd);         
                     }
                     ActConn.Creator = userConfig.User.Name;
                     ActConn.CreationDate = DateTime.Now;

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";