MarimerLLC#2551 Update for latest CSLA prerelease; use updated Blazor…

… state management
rockfordlhotka · Mar 26, 2024 · dd0ee9b · dd0ee9b
1 parent 36ddf52
commit dd0ee9b
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 42 deletions.
diff --git a/Samples/ProjectTracker/ProjectTracker.AppServer/Controllers/CslaStateController.cs b/Samples/ProjectTracker/ProjectTracker.AppServer/Controllers/CslaStateController.cs
@@ -15,8 +15,5 @@ namespace ProjectTracker.AppServer.Controllers
   public class CslaStateController(ApplicationContext applicationContext, ISessionManager sessionManager) :
       Csla.AspNetCore.Blazor.State.StateController(applicationContext, sessionManager)
   {
-    public override byte[] Get() => base.Get();
-
-    public override void Put(byte[] updatedSessionData) => base.Put(updatedSessionData);
   }
 }
diff --git a/Samples/ProjectTracker/ProjectTracker.AppServer/ProjectTracker.AppServer.csproj b/Samples/ProjectTracker/ProjectTracker.AppServer/ProjectTracker.AppServer.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Csla.AspNetCore" Version="8.0.0-R24031302" />
+    <PackageReference Include="Csla.AspNetCore" Version="8.0.0-R24032502" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor.Client/Pages/EditProject.razor b/...ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor.Client/Pages/EditProject.razor
@@ -2,10 +2,10 @@
 @page "/editproject/{id:int}"
 @using Microsoft.AspNetCore.Components.Authorization
 @rendermode InteractiveAuto
-@implements IDisposable /* CSLA wasm pages must be IDisposable */
 
 @inject NavigationManager NavigationManager
 @inject Csla.Blazor.State.StateManager StateManager
+@inject ProjectTracker.Blazor.RenderModeProvider renderModeProvider
 @inject Csla.IDataPortal<ProjectEdit> projectEditPortal
 @inject Csla.Blazor.ViewModel<ProjectEdit> vm
 @inject Csla.ApplicationContext ApplicationContext
@@ -20,12 +20,12 @@
 @if (!IsInteractive)
 {
     <h1>Edit Project</h1>
-    <p>Loading Blazor wasm runtime...</p>
+    <p>Loading app...</p>
 }
 else if (vm.Model == null)
 {
     <h1>Edit Project</h1>
-    <p>Loading...</p>
+    <p>Loading data...</p>
 }
 else
 {
@@ -175,21 +175,18 @@ else
 
         vm.Saved += () => NavigationManager.NavigateTo("projects");
         vm.ModelPropertyChanged += async (s, e) => await InvokeAsync(() => StateHasChanged());
-    }
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-      if (firstRender)
-      {
-        IsInteractive = true;
-        if (Id.HasValue)
-            await vm.RefreshAsync(() => projectEditPortal.FetchAsync(Id));
-        else
-            await vm.RefreshAsync(() => projectEditPortal.CreateAsync());
-
-        RoleList = await roleListPortal.FetchAsync();
-        StateHasChanged();
-      }
+        var renderMode = renderModeProvider.GetRenderMode(this);
+        if (renderMode == RenderModes.WasmInteractive || renderMode == RenderModes.ServerInteractive)
+        {
+            IsInteractive = true;
+            if (Id.HasValue)
+                await vm.RefreshAsync(() => projectEditPortal.FetchAsync(Id));
+            else
+                await vm.RefreshAsync(() => projectEditPortal.CreateAsync());
+
+            RoleList = await roleListPortal.FetchAsync();
+        }
     }
 
     private async Task SelectResource()
@@ -241,10 +238,4 @@ else
     {
         vm.Model.Resources.Remove(resourceId);
     }
-
-    public void Dispose()
-    {
-        // wasm pages _must_ save state back to server
-        StateManager.SaveState();
-    }
 }
diff --git a/...es/ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor.Client/Pages/Projects.razor b/...es/ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor.Client/Pages/Projects.razor
@@ -1,5 +1,4 @@
 @page "/projects"
-@attribute [StreamRendering] /* server-static pages must be streaming */
 
 @using ProjectTracker.Library
 @inject Csla.Blazor.State.StateManager StateManager

diff --git a/...s/ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor.Client/Pages/Resources.razor b/...s/ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor.Client/Pages/Resources.razor
@@ -1,5 +1,4 @@
 @page "/resources"
-@attribute [StreamRendering] /* server-static pages must be streaming */
 
 @using ProjectTracker.Library
 @inject Csla.Blazor.State.StateManager StateManager

diff --git a/...er/ProjectTracker.Blazor/ProjectTracker.Blazor.Client/ProjectTracker.Blazor.Client.csproj b/...er/ProjectTracker.Blazor/ProjectTracker.Blazor.Client/ProjectTracker.Blazor.Client.csproj
@@ -11,8 +11,8 @@
   <ItemGroup>
     <ProjectReference Include="..\..\ProjectTracker.BusinessLibrary\ProjectTracker.BusinessLibrary.csproj" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
-    <PackageReference Include="Csla.Blazor" Version="8.0.0-R24031302" />
-    <PackageReference Include="Csla.Blazor.WebAssembly" Version="8.0.0-R24031302" />
+    <PackageReference Include="Csla.Blazor" Version="8.0.0-R24032502" />
+    <PackageReference Include="Csla.Blazor.WebAssembly" Version="8.0.0-R24032502" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />

diff --git a/...es/ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor/Components/Pages/Home.razor b/...es/ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor/Components/Pages/Home.razor
@@ -1,5 +1,4 @@
 @page "/"
-@attribute [StreamRendering] /* server-static pages must be streaming */
 @inject Csla.Blazor.State.StateManager StateManager
 
 <PageTitle>Project Tracker</PageTitle>

diff --git a/...ectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor/Controllers/CslaStateController.cs b/...ectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor/Controllers/CslaStateController.cs
@@ -14,9 +14,5 @@ namespace ProjectTracker.Blazor.Controllers
   [Route("[controller]")]
   public class CslaStateController(ApplicationContext applicationContext, ISessionManager sessionManager) :
       Csla.AspNetCore.Blazor.State.StateController(applicationContext, sessionManager)
-  {
-    public override byte[] Get() => base.Get();
-
-    public override void Put(byte[] updatedSessionData) => base.Put(updatedSessionData);
-  }
+  {  }
 }
diff --git a/...s/ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor/ProjectTracker.Blazor.csproj b/...s/ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor/ProjectTracker.Blazor.csproj
@@ -13,8 +13,8 @@
     <ProjectReference Include="..\..\ProjectTracker.Dal\ProjectTracker.Dal.csproj" />
     <ProjectReference Include="..\ProjectTracker.Blazor.Client\ProjectTracker.Blazor.Client.csproj" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.2" />
-    <PackageReference Include="Csla.AspNetCore" Version="8.0.0-R24031302" />
-    <PackageReference Include="Csla.Blazor" Version="8.0.0-R24031302" />
+    <PackageReference Include="Csla.AspNetCore" Version="8.0.0-R24032502" />
+    <PackageReference Include="Csla.Blazor" Version="8.0.0-R24032502" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/ProjectTracker/ProjectTracker.BusinessLibrary/ProjectTracker.BusinessLibrary.csproj b/Samples/ProjectTracker/ProjectTracker.BusinessLibrary/ProjectTracker.BusinessLibrary.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Csla" Version="8.0.0-R24031302" />
+    <PackageReference Include="Csla" Version="8.0.0-R24032502" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
   </ItemGroup>
 

diff --git a/Samples/ProjectTracker/ProjectTracker.Dal/ProjectTracker.Dal.csproj b/Samples/ProjectTracker/ProjectTracker.Dal/ProjectTracker.Dal.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Csla" Version="8.0.0-R24031302" />
+    <PackageReference Include="Csla" Version="8.0.0-R24032502" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
   </ItemGroup>
 

diff --git a/Samples/ProjectTracker/ProjectTracker.DalMock/ProjectTracker.DalMock.csproj b/Samples/ProjectTracker/ProjectTracker.DalMock/ProjectTracker.DalMock.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Csla" Version="8.0.0-R24031302" />
+    <PackageReference Include="Csla" Version="8.0.0-R24032502" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
   </ItemGroup>