.

Author: SolidProgramming

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

@@ -11,6 +11,7 @@
 using System.Data;
 using Microsoft.AspNetCore.Components;
 using static FWO.Data.Modelling.ModellingTypes;
+using System.Collections.Generic;
 
 
 namespace FWO.Services
@@ -1020,12 +1021,37 @@ public bool CalcVisibility()
             return true;
         }
 
-        public bool IsAreaForbiddenInDirection(Direction direction)
+        private List<ModellingNetworkArea> GetAreasInDirection(List<ModellingNetworkArea> networkAreas, Direction direction)
+        {
+            List<ModellingNetworkArea> directionNetworkAreas = [];
+
+            foreach (ModellingNetworkArea area in networkAreas)
+            {
+                if (direction == Direction.Source)
+                {                    
+                    if (ActConn.SourceAreas.FirstOrDefault(w => w.Content.Id == area.Id) == null && !SrcAreasToAdd.Contains(area))
+                    {
+                        directionNetworkAreas.Add(area);
+                    }
+                }
+                else if (direction == Direction.Destination)
+                {
+                    if (ActConn.DestinationAreas.FirstOrDefault(w => w.Content.Id == area.Id) == null && !DstAreasToAdd.Contains(area))
+                    {
+                        directionNetworkAreas.Add(area);
+                    }
+                }                
+            }
+
+            return directionNetworkAreas;
+        }
+
+        public bool IsAreaForbiddenInDirection(List<ModellingNetworkArea> networkAreas, Direction direction)
         {
             return direction switch
             {
-                Direction.Source => ActConn.DestinationAreas.Count > 0 || DstAreasToAdd.Count > 0,
-                Direction.Destination => ActConn.SourceAreas.Count > 0 || SrcAreasToAdd.Count > 0,
+                Direction.Source => ActConn.DestinationAreas.Count > 0 || GetAreasInDirection(networkAreas, Direction.Destination).Count > 0,
+                Direction.Destination => ActConn.SourceAreas.Count > 0 || GetAreasInDirection(networkAreas, Direction.Source).Count > 0,
                 _ => false,
             };
         }
@@ -1053,7 +1079,7 @@ public bool NetworkAreaUseAllowed(List<ModellingNetworkArea> networkAreas, Direc
                 reason.Title = userConfig.GetText("edit_connection");
             }
 
-            if (IsAreaForbiddenInDirection(direction))
+            if (IsAreaForbiddenInDirection(networkAreas, direction))
             {
                 reason.Text = userConfig.GetText("direction_contain_nwarea");
                 return false;