Move session nav back to page

Author: RossDScott

PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Home/Components/EventData.razor

@@ -3,6 +3,7 @@
 @using PocketDDD.BlazorClient.Features.Session.Store;
 @inherits FluxorComponent
 
+@inject NavigationManager NavigationManager
 @inject IState<HomeState> State
 @inject IDispatcher Dispatcher
 
@@ -23,8 +24,7 @@
         }
         @foreach(var sessionItem in timeSlot.Sessions.Select((session, index) => (session, index)))
         {
-            <MudListItem 
-                OnClick="() => ViewSession(sessionItem.session.Id)">
+            <MudListItem OnClick="() => HandleViewSession(sessionItem.session.Id)">
                 <MudPaper Class="pa-4">
                     <MudText Typo="Typo.subtitle1">
                         @WhenBookmarkedShowIcon(sessionItem.session) 
@@ -52,5 +52,5 @@
 }
 
 @code {
-    void ViewSession(int sessionId) => Dispatcher.Dispatch(new ViewSessionAction(sessionId));
+    void HandleViewSession(int sessionId) => NavigationManager.NavigateTo($"session/{sessionId}");
 }

PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Session/Components/Session.razor

@@ -48,15 +48,19 @@
 
     protected override void OnInitialized()
     {
-        if (State.Value.Session?.Id != Id)
-            Dispatcher.Dispatch(new ViewSessionAction(Id));
-
         SubscribeToAction<NavigateBackAction>(_ => HandleNavigateHome());
         SubscribeToAction<ViewFeedbackAction>(_ => HandleShowSessionFeedback());
 
         base.OnInitialized();
     }
 
+    protected override void OnParametersSet()
+    {
+        Dispatcher.Dispatch(new FetchSessionAction(Id));
+
+        base.OnParametersSet();
+    }
+
     void HandleNavigateHome() => Navigation.NavigateTo("/", false, true);
 
     void HandleToggleSessionBookmarked()

PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Session/Store/SessionActions.cs

@@ -2,7 +2,7 @@
 
 namespace PocketDDD.BlazorClient.Features.Session.Store;
 
-public record ViewSessionAction(int SessionId);
+public record FetchSessionAction(int SessionId);
 public record SetSessionAction(
     PocketDDD.Shared.API.ResponseDTOs.SessionDTO Session,
     PocketDDD.Shared.API.ResponseDTOs.TrackDTO Track,

PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Session/Store/SessionEffects.cs

@@ -11,18 +11,16 @@ public class SessionEffects
     private readonly IState<SessionState> _state;
     private readonly LocalStorageContext _localStorage;
     private readonly IPocketDDDApiService _pocketDDDAPI;
-    private readonly NavigationManager _navigation;
 
-    public SessionEffects(IState<SessionState> state, LocalStorageContext localStorage, IPocketDDDApiService pocketDDDAPI, NavigationManager navigation)
+    public SessionEffects(IState<SessionState> state, LocalStorageContext localStorage, IPocketDDDApiService pocketDDDAPI)
     {
         _state = state;
         _localStorage = localStorage;
         _pocketDDDAPI = pocketDDDAPI;
-        _navigation = navigation;
     }
 
     [EffectMethod]
-    public async Task OnViewSession(ViewSessionAction action, IDispatcher dispatcher)
+    public async Task OnFetchSessionAction(FetchSessionAction action, IDispatcher dispatcher)
     {
         var eventData = await _localStorage.EventData.GetAsync();
         if (eventData is null)
@@ -39,7 +37,6 @@ public async Task OnViewSession(ViewSessionAction action, IDispatcher dispatcher
         dispatcher.Dispatch(new SetHeaderBarTitleAction(title));
         dispatcher.Dispatch(new SetBackButtonVisabilityAction(true));
         dispatcher.Dispatch(new SetSessionAction(session, track, timeSlot, isBookmarked));
-        _navigation.NavigateTo($"session/{action.SessionId}");
     }
 
     [EffectMethod]