#288 - Refactor UserState init to base component.

neptuo · Sep 16, 2023 · 52a6ed5 · 52a6ed5
1 parent 90892c6
commit 52a6ed5
Show file tree

Hide file tree

Showing 31 changed files with 37 additions and 94 deletions.
diff --git a/src/Recollections.Blazor.UI/Accounts/Components/UserStateComponentBase.cs b/src/Recollections.Blazor.UI/Accounts/Components/UserStateComponentBase.cs
@@ -0,0 +1,16 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+
+namespace Neptuo.Recollections.Accounts.Components;
+
+public abstract class UserStateComponentBase : ComponentBase
+{
+ [CascadingParameter]
+ protected UserState UserState { get; set; }
+
+ protected async override Task OnInitializedAsync()
+ {
+ await base.OnInitializedAsync();
+ await UserState.EnsureInitializedAsync();
+ }
+}
diff --git a/src/Recollections.Blazor.UI/Accounts/Pages/Connections.razor b/src/Recollections.Blazor.UI/Accounts/Pages/Connections.razor
@@ -1,6 +1,7 @@
 @using Neptuo.Recollections.Accounts
 @page "/connections"
 @layout Commons.Layouts.MainLayout
+@inherits UserStateComponentBase
 
 <DocumentTitle Value="Connections" />
 

diff --git a/src/Recollections.Blazor.UI/Accounts/Pages/Connections.razor.cs b/src/Recollections.Blazor.UI/Accounts/Pages/Connections.razor.cs
@@ -15,9 +15,6 @@ public partial class Connections
  [Inject]
  protected Api Api { get; set; }
 
- [CascadingParameter]
- protected UserState UserState { get; set; }
-
  protected Modal ShareModal { get; set; }
  protected ConnectionModel ShareConnection { get; set; }
 
@@ -30,11 +27,7 @@ public partial class Connections
 
  protected async override Task OnInitializedAsync()
  {
- IsLoading = true;
-
  await base.OnInitializedAsync();
- await UserState.EnsureAuthenticatedAsync();
-
  await LoadDataAsync();
  }
 

diff --git a/src/Recollections.Blazor.UI/Accounts/Pages/Login.razor b/src/Recollections.Blazor.UI/Accounts/Pages/Login.razor
@@ -1,4 +1,5 @@
 @page "/login"
+@inherits UserStateComponentBase
 
 <DocumentTitle Value="Login" />
 

diff --git a/src/Recollections.Blazor.UI/Accounts/Pages/Login.razor.cs b/src/Recollections.Blazor.UI/Accounts/Pages/Login.razor.cs
@@ -19,9 +19,6 @@ public partial class Login
  [Inject]
  protected ILog<Login> Log { get; set; }
 
- [CascadingParameter]
- protected UserState UserState { get; set; }
-
  [Required]
  protected string UserName { get; set; }
 
@@ -34,8 +31,7 @@ public partial class Login
  protected async override Task OnInitializedAsync()
  {
  await base.OnInitializedAsync();
-
- await UserState.EnsureInitializedAsync();
+
  if (UserState.IsAuthenticated)
  Navigator.OpenTimeline();
  }

diff --git a/src/Recollections.Blazor.UI/Accounts/Pages/Profile.razor b/src/Recollections.Blazor.UI/Accounts/Pages/Profile.razor
@@ -1,5 +1,6 @@
 @page "/users/{UserId}"
 @layout Commons.Layouts.MainLayout
+@inherits UserStateComponentBase
 
 <DocumentTitle Value="@(Owner?.Name ?? UserId)" />
 

diff --git a/src/Recollections.Blazor.UI/Accounts/Pages/Profile.razor.cs b/src/Recollections.Blazor.UI/Accounts/Pages/Profile.razor.cs
@@ -19,22 +19,13 @@ public partial class Profile
  [Inject]
  protected UiOptions UiOptions { get; set; }
 
- [CascadingParameter]
- protected UserState UserState { get; set; }
-
  [Parameter]
  public string UserId { get; set; }
 
  protected ProfileModel Model { get; set; }
  protected OwnerModel Owner { get; set; }
  protected PermissionContainerState Permissions { get; } = new PermissionContainerState();
 
- protected async override Task OnInitializedAsync()
- {
- await base.OnInitializedAsync();
- await UserState.EnsureInitializedAsync();
- }
-
  public async override Task SetParametersAsync(ParameterView parameters)
  {
  var oldUserId = UserId;

diff --git a/src/Recollections.Blazor.UI/Accounts/Pages/Register.razor b/src/Recollections.Blazor.UI/Accounts/Pages/Register.razor
@@ -1,4 +1,5 @@
-@page "/register"
+@page "/register"
+@inherits UserStateComponentBase
 
 <DocumentTitle Value="Register" />
 

diff --git a/src/Recollections.Blazor.UI/Accounts/Pages/Register.razor.cs b/src/Recollections.Blazor.UI/Accounts/Pages/Register.razor.cs
@@ -17,9 +17,6 @@ public partial class Register
  [Inject]
  protected Navigator Navigator { get; set; }
 
- [CascadingParameter]
- protected UserState UserState { get; set; }
-
  public List<string> ErrorMessages { get; } = new List<string>();
 
  public string UserName { get; set; }
@@ -29,7 +26,6 @@ protected async override Task OnInitializedAsync()
  {
  await base.OnInitializedAsync();
 
- await UserState.EnsureInitializedAsync();
  if (UserState.IsAuthenticated)
  Navigator.OpenTimeline();
  }

diff --git a/src/Recollections.Blazor.UI/Entries/Components/EntryPicker.razor b/src/Recollections.Blazor.UI/Entries/Components/EntryPicker.razor
@@ -1,4 +1,6 @@
-<Modal @ref="Modal" Title="Select an Entry" CssClass="entry-picker">
+@inherits UserStateComponentBase
+
+<Modal @ref="Modal" Title="Select an Entry" CssClass="entry-picker">
  <ChildContent>
  <div class="timeline">
  <ListView Items="@Entries" EmptyMessage="You don't have any entry..." Context="entry">

diff --git a/src/Recollections.Blazor.UI/Entries/Components/EntryPicker.razor.cs b/src/Recollections.Blazor.UI/Entries/Components/EntryPicker.razor.cs
@@ -21,9 +21,6 @@ public partial class EntryPicker
  [Parameter]
  public Action<TimelineEntryModel> Selected { get; set; }
 
- [CascadingParameter]
- protected UserState UserState { get; set; }
-
  protected Modal Modal { get; set; }
 
  private int offset;

diff --git a/src/Recollections.Blazor.UI/Entries/Pages/BeingDetail.razor b/src/Recollections.Blazor.UI/Entries/Pages/BeingDetail.razor
@@ -1,4 +1,5 @@
 @page "/beings/{BeingId}"
+@inherits UserStateComponentBase
 
 @if (Model != null)
 {

diff --git a/src/Recollections.Blazor.UI/Entries/Pages/BeingDetail.razor.cs b/src/Recollections.Blazor.UI/Entries/Pages/BeingDetail.razor.cs
@@ -21,9 +21,6 @@ public partial class BeingDetail
  [Inject]
  protected Navigator Navigator { get; set; }
 
- [CascadingParameter]
- protected UserState UserState { get; set; }
-
  private string previousBeingId;
 
  [Parameter]
@@ -36,12 +33,6 @@ public partial class BeingDetail
 
  protected BeingIconPicker IconPicker { get; set; }
 
- protected async override Task OnInitializedAsync()
- {
- await base.OnInitializedAsync();
- await UserState.EnsureInitializedAsync();
- }
-
  public override Task SetParametersAsync(ParameterView parameters)
  {
  previousBeingId = BeingId;

diff --git a/src/Recollections.Blazor.UI/Entries/Pages/Beings.razor b/src/Recollections.Blazor.UI/Entries/Pages/Beings.razor
@@ -1,4 +1,5 @@
 @page "/beings"
+@inherits UserStateComponentBase
 
 <DocumentTitle Value="Beings" />
 

diff --git a/src/Recollections.Blazor.UI/Entries/Pages/Beings.razor.cs b/src/Recollections.Blazor.UI/Entries/Pages/Beings.razor.cs
@@ -21,9 +21,6 @@ public partial class Beings
  [Inject]
  protected Api Api { get; set; }
 
- [CascadingParameter]
- protected UserState UserState { get; set; }
-
  protected bool IsLoading { get; set; }
 
  public string Name { get; set; }
@@ -36,8 +33,6 @@ protected async override Task OnInitializedAsync()
  IsLoading = true;
 
  await base.OnInitializedAsync();
- await UserState.EnsureAuthenticatedAsync();
-
  await LoadDataAsync();
  }
 

diff --git a/src/Recollections.Blazor.UI/Entries/Pages/Calendar.razor b/src/Recollections.Blazor.UI/Entries/Pages/Calendar.razor
@@ -1,6 +1,7 @@
 @page "/calendar"
 @page "/calendar/{Year:int}"
 @page "/calendar/{Year:int}/{Month:int}"
+@inherits UserStateComponentBase
 
 
 <DocumentTitle Value="@Title" />

diff --git a/src/Recollections.Blazor.UI/Entries/Pages/Calendar.razor.cs b/src/Recollections.Blazor.UI/Entries/Pages/Calendar.razor.cs
@@ -23,9 +23,6 @@ public partial class Calendar
  [Inject]
  protected Navigator Navigator { get; set; }
 
- [CascadingParameter]
- protected UserState UserState { get; set; }
-
  [Parameter]
  public int? Year { get; set; }
 
@@ -44,12 +41,6 @@ public partial class Calendar
 
  protected List<CalendarEntryModel> Models { get; } = new List<CalendarEntryModel>();
 
- protected override async Task OnInitializedAsync()
- {
- await base.OnInitializedAsync();
- await UserState.EnsureAuthenticatedAsync();
- }
-
  public override async Task SetParametersAsync(ParameterView parameters)
  {
  int? prevYear = Year;

diff --git a/src/Recollections.Blazor.UI/Entries/Pages/EntryDetail.razor b/src/Recollections.Blazor.UI/Entries/Pages/EntryDetail.razor
@@ -1,4 +1,5 @@
 @page "/entries/{EntryId}"
+@inherits UserStateComponentBase
 
 <NavigationLock OnBeforeInternalNavigation="OnBeforeInternalNavigation" />
 

diff --git a/src/Recollections.Blazor.UI/Entries/Pages/EntryDetail.razor.cs b/src/Recollections.Blazor.UI/Entries/Pages/EntryDetail.razor.cs
@@ -43,9 +43,6 @@ public partial class EntryDetail
  [Inject]
  protected IExceptionHandler ExceptionHandler { get; set; }
 
- [CascadingParameter]
- protected UserState UserState { get; set; }
-
  private string previousEntryId;
 
  [Parameter]
@@ -90,7 +87,6 @@ protected async override Task OnInitializedAsync()
  Log.Debug("OnInitializedAsync");
 
  await base.OnInitializedAsync();
- await UserState.EnsureInitializedAsync();
 
  if (UserState.IsAuthenticated)
  PoiToggleButton = new PoiToggleButton(Navigator, Properties, UserState);

diff --git a/src/Recollections.Blazor.UI/Entries/Pages/ImageDetail.razor b/src/Recollections.Blazor.UI/Entries/Pages/ImageDetail.razor
@@ -1,4 +1,5 @@
 @page "/entries/{EntryId}/images/{ImageId}"
+@inherits UserStateComponentBase
 
 @if (Model != null)
 {

diff --git a/src/Recollections.Blazor.UI/Entries/Pages/ImageDetail.razor.cs b/src/Recollections.Blazor.UI/Entries/Pages/ImageDetail.razor.cs
@@ -37,22 +37,13 @@ public partial class ImageDetail
  [Parameter]
  public string ImageId { get; set; }
 
- [CascadingParameter]
- protected UserState UserState { get; set; }
-
  private ImageModel original;
  protected ImageModel Model { get; set; }
  protected OwnerModel Owner { get; set; }
  protected List<MapMarkerModel> Markers { get; } = new List<MapMarkerModel>();
 
  protected PermissionContainerState Permissions { get; } = new PermissionContainerState();
 
- protected async override Task OnInitializedAsync()
- {
- await base.OnInitializedAsync();
- await UserState.EnsureInitializedAsync();
- }
-
  public override Task SetParametersAsync(ParameterView parameters)
  {
  previousImageId = ImageId;

diff --git a/src/Recollections.Blazor.UI/Entries/Pages/Map.razor b/src/Recollections.Blazor.UI/Entries/Pages/Map.razor
@@ -1,5 +1,6 @@
-@layout Commons.Layouts.HeadLayout
-@page "/map"
+@page "/map"
+@layout Commons.Layouts.HeadLayout
+@inherits UserStateComponentBase
 
 <DocumentTitle Value="Map" />
 

diff --git a/src/Recollections.Blazor.UI/Entries/Pages/Map.razor.cs b/src/Recollections.Blazor.UI/Entries/Pages/Map.razor.cs
@@ -23,9 +23,6 @@ public partial class Map
  [Inject]
  protected PropertyCollection Properties { get; set; }
 
- [CascadingParameter]
- protected UserState UserState { get; set; }
-
  protected List<MapEntryModel> Entries { get; set; } = new List<MapEntryModel>();
  protected List<MapMarkerModel> Markers { get; } = new List<MapMarkerModel>();
 
@@ -37,7 +34,6 @@ protected async override Task OnInitializedAsync()
  PoiToggleButton = new PoiToggleButton(Navigator, Properties, UserState);
 
  await base.OnInitializedAsync();
- await UserState.EnsureAuthenticatedAsync();
 
  await LoadAsync();
  }

diff --git a/src/Recollections.Blazor.UI/Entries/Pages/Search.razor b/src/Recollections.Blazor.UI/Entries/Pages/Search.razor
@@ -1,4 +1,5 @@
 @page "/search"
+@inherits UserStateComponentBase
 
 <DocumentTitle Value="Search" />
 

diff --git a/src/Recollections.Blazor.UI/Entries/Pages/Search.razor.cs b/src/Recollections.Blazor.UI/Entries/Pages/Search.razor.cs
@@ -21,9 +21,6 @@ public partial class Search : IDisposable
  [Inject]
  protected ILog<Search> Log { get; set; }
 
- [CascadingParameter]
- protected UserState UserState { get; set; }
-
  [Inject]
  protected Api Api { get; set; }
 
@@ -49,7 +46,6 @@ public partial class Search : IDisposable
  protected override async Task OnInitializedAsync()
  {
  await base.OnInitializedAsync();
- await UserState.EnsureAuthenticatedAsync();
  Navigator.LocationChanged += OnLocationChanged;
  }
 

diff --git a/src/Recollections.Blazor.UI/Entries/Pages/Stories.razor b/src/Recollections.Blazor.UI/Entries/Pages/Stories.razor
@@ -1,4 +1,5 @@
 @page "/stories"
+@inherits UserStateComponentBase
 
 <DocumentTitle Value="Stories" />
 

diff --git a/src/Recollections.Blazor.UI/Entries/Pages/Stories.razor.cs b/src/Recollections.Blazor.UI/Entries/Pages/Stories.razor.cs
@@ -21,9 +21,6 @@ public partial class Stories
  [Inject]
  protected Api Api { get; set; }
 
- [CascadingParameter]
- protected UserState UserState { get; set; }
-
  protected bool IsLoading { get; set; }
 
  public string Title { get; set; }
@@ -36,8 +33,6 @@ protected async override Task OnInitializedAsync()
  IsLoading = true;
 
  await base.OnInitializedAsync();
- await UserState.EnsureAuthenticatedAsync();
-
  await LoadDataAsync();
  }
 

diff --git a/src/Recollections.Blazor.UI/Entries/Pages/StoryDetail.razor b/src/Recollections.Blazor.UI/Entries/Pages/StoryDetail.razor
@@ -1,4 +1,5 @@
 @page "/stories/{StoryId}"
+@inherits UserStateComponentBase
 
 @if (Model != null)
 {

diff --git a/src/Recollections.Blazor.UI/Entries/Pages/StoryDetail.razor.cs b/src/Recollections.Blazor.UI/Entries/Pages/StoryDetail.razor.cs
@@ -30,9 +30,6 @@ public partial class StoryDetail
  [Inject]
  protected IExceptionHandler ExceptionHandler { get; set; }
 
- [CascadingParameter]
- protected UserState UserState { get; set; }
-
  private string previousStoryId;
 
  [Parameter]
@@ -43,12 +40,6 @@ public partial class StoryDetail
  protected OwnerModel Owner { get; set; }
  protected PermissionContainerState Permissions { get; } = new PermissionContainerState();
 
- protected async override Task OnInitializedAsync()
- {
- await base.OnInitializedAsync();
- await UserState.EnsureInitializedAsync();
- }
-
  public override Task SetParametersAsync(ParameterView parameters)
  {
  previousStoryId = StoryId;

diff --git a/src/Recollections.Blazor.UI/Entries/Pages/Timeline.razor b/src/Recollections.Blazor.UI/Entries/Pages/Timeline.razor
@@ -1,4 +1,5 @@
 @page "/"
+@inherits UserStateComponentBase
 
 <DocumentTitle Value="Timeline" />