.

Author: SolidProgramming

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

@@ -1,10 +1,12 @@
+using FWO.Data;
 using FWO.Services.EventMediator.Interfaces;
 
 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,13 +20,40 @@ public void Subscribe<TEvent>(Action<TEvent> handler) where TEvent : class, IEve
 
     public void Publish<TEvent>(TEvent @event) where TEvent : class, IEvent
     {
-        if(_handlers.TryGetValue(typeof(TEvent), out var handlers))
+        if(_handlers.TryGetValue(typeof(TEvent), out List<Action<IEvent>>? handlers))
         {
-            foreach(var handler in handlers)
+            foreach(Action<IEvent> handler in handlers)
             {
                 handler(@event);
             }
         }
     }
+
+    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,4 +2,7 @@
 
 namespace FWO.Services.EventMediator.Events;
 
-public class CollectionChangedEvent : IEvent { }
+public class CollectionChangedEvent() : IEvent
+{
+    
+}

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

@@ -0,0 +1,7 @@
+namespace FWO.Services.EventMediator.Events;
+
+public class CollectionChangedEventArgs(object? Sender, IEnumerable<dynamic>? Collection) : EventArgs
+{ 
+
+}
+

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

@@ -4,5 +4,7 @@ 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/Shared/OrderByDropdown.razor

@@ -118,7 +118,7 @@
                 CssClass = "";
             }
 
-            EventMediator.Subscribe<CollectionChangedEvent>(new Action<CollectionChangedEvent>(_ => ReorderCollection()));
+            EventMediator.Subscribe<CollectionChangedEvent>(this, new Action<CollectionChangedEvent>(_ => ReorderCollection()));
 
             initialized = true;
         }
@@ -149,7 +149,6 @@
             if (initialized)
             {
                 InvokeAsync(StateHasChanged);
-                              
             }
 
             CollectionReordered.InvokeAsync(Collection);