Merge branch 'issue_3145' of https://github.com/SolidProgramming/firewall-orchestrator into issue_2973

Author: SolidProgramming

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

@@ -6,7 +6,6 @@ namespace FWO.Services.EventMediator;
 public class EventMediator : IEventMediator
 {
     private readonly Dictionary<Type, List<Action<IEvent>>> _handlers = [];
-    private readonly Dictionary<object, List<Action<IEvent>>> ObjectHandlers = [];
 
     public void Subscribe<TEvent>(Action<TEvent> handler) where TEvent : class, IEvent
     {
@@ -18,7 +17,7 @@ public void Subscribe<TEvent>(Action<TEvent> handler) where TEvent : class, IEve
         _handlers[typeof(TEvent)].Add(e => handler((TEvent)e));
     }
 
-    public void Publish<TEvent>(TEvent @event) where TEvent : class, IEvent
+    public void Publish<TEvent>(TEvent @event)  where TEvent : class, IEvent
     {
         if(_handlers.TryGetValue(typeof(TEvent), out List<Action<IEvent>>? handlers))
         {
@@ -29,28 +28,6 @@ public void Publish<TEvent>(TEvent @event) where TEvent : class, IEvent
         }
     }
 
-    public void Subscribe<TEvent>(object sender, Action<TEvent> handler) where TEvent : class, IEvent
-    {
-        if(!ObjectHandlers.TryGetValue(sender, out List<Action<IEvent>>? value))
-        {
-            value = [];
-            ObjectHandlers[sender] = value;
-        }
-
-        value.Add(e => handler((TEvent)e));
-    }
-
-    public void Publish<TEvent>(object sender, TEvent @event) where TEvent : class, IEvent
-    {
-        if(ObjectHandlers.TryGetValue(sender, out List<Action<IEvent>>? handlers))
-        {
-            foreach(Action<IEvent> handler in handlers)
-            {
-                handler(@event);
-            }
-        }
-    }
-
     public void Unsubscribe<TEvent>(TEvent @event)
     {
 

roles/lib/files/FWO.Services/EventMediator/Events/CollectionChangedEvent.cs

@@ -2,7 +2,7 @@
 
 namespace FWO.Services.EventMediator.Events;
 
-public class CollectionChangedEvent() : IEvent
+public class CollectionChangedEvent(CollectionChangedEventArgs? eventArgs = default) : IEvent
 {
-    
+    public IEventArgs? EventArgs { get; set; } = eventArgs;
 }

roles/lib/files/FWO.Services/EventMediator/Events/CollectionChangedEventArgs.cs

@@ -1,7 +1,9 @@
-namespace FWO.Services.EventMediator.Events;
+using FWO.Services.EventMediator.Interfaces;
 
-public class CollectionChangedEventArgs(object? Sender, IEnumerable<dynamic>? Collection) : EventArgs
-{ 
+namespace FWO.Services.EventMediator.Events;
 
+public class CollectionChangedEventArgs(IEnumerable<dynamic> collection) : IEventArgs
+{
+    IEnumerable<dynamic> Collection { get; } = collection;
 }
 

roles/lib/files/FWO.Services/EventMediator/Interfaces/IEvent.cs

@@ -1,4 +1,7 @@
 namespace FWO.Services.EventMediator.Interfaces;
 
-public interface IEvent{ }
+public interface IEvent 
+{ 
+    public IEventArgs? EventArgs { get; set; }
+}
 

roles/lib/files/FWO.Services/EventMediator/Interfaces/IEventArgs.cs

@@ -0,0 +1,4 @@
+namespace FWO.Services.EventMediator.Interfaces;
+
+public interface IEventArgs { }
+

roles/lib/files/FWO.Services/EventMediator/Interfaces/IEventMediator.cs

@@ -4,7 +4,5 @@ public interface IEventMediator
 {
     void Subscribe<TEvent>(Action<TEvent> handler) where TEvent : class, IEvent;
     void Publish<TEvent>(TEvent @event) where TEvent : class, IEvent;
-    void Subscribe<TEvent>(object sender, Action<TEvent> handler) where TEvent : class, IEvent;
-    void Publish<TEvent>(object sender, TEvent @event) where TEvent : class, IEvent;
 }
 

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

@@ -112,8 +112,6 @@
     private bool workInProgress = false;
     private bool firstTry = true;
 
-    private readonly static CollectionChangedEvent OnCollectionChanged = new();
-
     protected override void OnInitialized()
     {
         try

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

@@ -118,7 +118,7 @@
                 CssClass = "";
             }
 
-            EventMediator.Subscribe<CollectionChangedEvent>(this, new Action<CollectionChangedEvent>(_ => ReorderCollection()));
+            EventMediator.Subscribe<CollectionChangedEvent>(new Action<CollectionChangedEvent>(_ => ReorderCollection()));
 
             initialized = true;
         }