Fix issue with Blazor state (#4786)

rockfordlhotka · Copilot · web-flow · commit 34b31277895c · 2026-01-08T15:28:44.000-06:00
* Update beta version * Update BlazorExample to net10.0 and csla 10 * #4774 Update state handling * #4774 Diagnosing and fixing blazor context issue * Update sample * Update Samples/BlazorExample/BlazorExample/BlazorExample.Client/Components/Pages/Counter.razor Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Samples/BlazorExample/BlazorExample/BlazorExample/Components/Layout/NavMenu.razor Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
diff --git a/Samples/BlazorExample/BlazorExample/BlazorExample.Client/BlazorExample.Client.csproj b/Samples/BlazorExample/BlazorExample/BlazorExample.Client/BlazorExample.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
diff --git a/Samples/BlazorExample/BlazorExample/BlazorExample.Client/Components/Pages/Counter.razor b/Samples/BlazorExample/BlazorExample/BlazorExample.Client/Components/Pages/Counter.razor
@@ -8,9 +8,11 @@
 
 <h1>Counter</h1>
 
+<p>RenderMode: @RendererInfo.Name, Interactive: @RendererInfo.IsInteractive</p>
+
 <p role="status">Current count: @currentCount</p>
 
-@if (IsInteractive)
+@if (RendererInfo.IsInteractive)
 {
     <button class="btn btn-primary" @onclick="IncrementCount">Click me</button>
 }
@@ -19,7 +21,6 @@
     [CascadingParameter]
     private Task<AuthenticationState>? authenticationState { get; set; }
     private int currentCount = 0;
-    private bool IsInteractive;
 
     protected override async Task OnInitializedAsync()
     {
@@ -32,19 +33,10 @@
         }
     }
 
-    protected override void OnAfterRender(bool firstRender)
-    {
-        base.OnAfterRender(firstRender);
-        if (firstRender)
-        {
-            IsInteractive = true;
-            StateHasChanged();
-        }
-    }
-
     private void IncrementCount()
     {
         currentCount++;
         applicationContext.LocalContext["counter"] = currentCount;
+        StateManager.SaveState();
     }
 }
diff --git a/Samples/BlazorExample/BlazorExample/BlazorExample/BlazorExample.csproj b/Samples/BlazorExample/BlazorExample/BlazorExample/BlazorExample.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/Samples/BlazorExample/BlazorExample/BlazorExample/Components/App.razor b/Samples/BlazorExample/BlazorExample/BlazorExample/Components/App.razor
@@ -5,10 +5,10 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <base href="/" />
-    <link rel="stylesheet" href="bootstrap/bootstrap.min.css" />
-    <link rel="stylesheet" href="app.css" />
-    <link rel="stylesheet" href="BlazorExample.styles.css" />
-    <link rel="icon" type="image/png" href="favicon.png" />
+    <link rel="stylesheet" href="@Assets["bootstrap/bootstrap.min.css"]" />
+    <link rel="stylesheet" href="@Assets["app.css"]" />
+    <link rel="stylesheet" href="@Assets["BlazorExample.styles.css"]" />
+    <link rel="icon" type="image/png" href="@Assets["favicon.png"]" />
     <HeadOutlet />
 </head>
 
diff --git a/Samples/BlazorExample/BlazorExample/BlazorExample/Controllers/CslaStateController.cs b/Samples/BlazorExample/BlazorExample/BlazorExample/Controllers/CslaStateController.cs
@@ -1,6 +1,7 @@
 ﻿using Microsoft.AspNetCore.Mvc;
 using Csla;
 using Csla.State;
+using Csla.Blazor.State.Messages;
 
 namespace BlazorExample.Controllers
 {
diff --git a/Samples/BlazorExample/BlazorExample/BlazorExample/Program.cs b/Samples/BlazorExample/BlazorExample/BlazorExample/Program.cs
@@ -18,7 +18,8 @@
 // Add CSLA
 builder.Services.AddCsla(o => o
   .AddAspNetCore()
-  .AddServerSideBlazor(o => o.UseInMemoryApplicationContextManager = false));
+  .AddServerSideBlazor(o => o.UseInMemoryApplicationContextManager = false)
+  .DataPortal(o => o.AddServerSideDataPortal()));
 
 // configure DAL services for EF or Mock:
 
@@ -46,7 +47,7 @@
 
 app.UseHttpsRedirection();
 
-app.UseStaticFiles();
+app.MapStaticAssets();
 app.UseAntiforgery();
 
 app.MapControllers();
diff --git a/Samples/BlazorExample/BlazorExample/BusinessLibrary/BusinessLibrary.csproj b/Samples/BlazorExample/BlazorExample/BusinessLibrary/BusinessLibrary.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
diff --git a/Samples/BlazorExample/BlazorExample/DataAccess.EF/DataAccess.EF.csproj b/Samples/BlazorExample/BlazorExample/DataAccess.EF/DataAccess.EF.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/Samples/BlazorExample/BlazorExample/DataAccess.Mock/DataAccess.Mock.csproj b/Samples/BlazorExample/BlazorExample/DataAccess.Mock/DataAccess.Mock.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <AssemblyName>DataAccess.Mock</AssemblyName>
diff --git a/Samples/BlazorExample/BlazorExample/DataAccess/DataAccess.csproj b/Samples/BlazorExample/BlazorExample/DataAccess/DataAccess.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/Samples/BlazorExample/Directory.Packages.props b/Samples/BlazorExample/Directory.Packages.props
@@ -1,17 +1,17 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <CslaVersion>10.0.0-alpha-0009-g2abd6121c5</CslaVersion>
+    <CslaVersion>10.0.0-beta-0021-g8302410d05</CslaVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Csla" Version="$(CslaVersion)" />
     <PackageVersion Include="Csla.AspNetCore" Version="$(CslaVersion)" />
     <PackageVersion Include="Csla.Blazor" Version="$(CslaVersion)" />
     <PackageVersion Include="Csla.Blazor.WebAssembly" Version="$(CslaVersion)" />
     <PackageVersion Include="Csla.Generator.AutoImplementProperties.CSharp" Version="$(CslaVersion)" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0" />
   </ItemGroup>
 </Project>
diff --git a/Source/Csla.AspNetCore/Blazor/ApplicationContextManagerBlazor.cs b/Source/Csla.AspNetCore/Blazor/ApplicationContextManagerBlazor.cs
@@ -184,6 +184,7 @@ public void SetLocalContext(IContextDictionary? localContext)
       var sessionManager = ApplicationContext.GetRequiredService<ISessionManager>();
       var session = sessionManager.GetSession();
       session[_localContextName] = localContext;
+      session.Touch();
     }
 
     /// <summary>
@@ -222,6 +223,7 @@ public void SetClientContext(IContextDictionary? clientContext, ApplicationConte
       var sessionManager = ApplicationContext.GetRequiredService<ISessionManager>();
       var session = sessionManager.GetSession();
       session[_clientContextName] = clientContext;
+      session.Touch();
     }
 
     /// <summary>
diff --git a/Source/Csla.Blazor.WebAssembly/ApplicationContextManager.cs b/Source/Csla.Blazor.WebAssembly/ApplicationContextManager.cs
@@ -97,6 +97,9 @@ public virtual void SetUser(IPrincipal principal)
     throw new NotSupportedException(nameof(SetUser));
   }
 
+  private const string _localContextName = "Csla.LocalContext";
+  private const string _clientContextName = "Csla.ClientContext";
+
   /// <summary>
   /// Gets the local context.
   /// </summary>
@@ -106,7 +109,7 @@ public IContextDictionary GetLocalContext()
 
     var session = GetSession();
     IContextDictionary localContext;
-    if (session.TryGetValue("localContext", out var result) && result is IContextDictionary context)
+    if (session.TryGetValue(_localContextName, out var result) && result is IContextDictionary context)
     {
       localContext = context;
     }
@@ -127,7 +130,7 @@ public void SetLocalContext(IContextDictionary? localContext)
     ThrowIoeIfApplicationContextIsNull();
 
     var session = GetSession();
-    session["localContext"] = localContext;
+    session[_localContextName] = localContext;
   }
 
   /// <summary>
@@ -140,7 +143,7 @@ public IContextDictionary GetClientContext(ApplicationContext.ExecutionLocations
 
     IContextDictionary clientContext;
     var session = GetSession();
-    if (session.TryGetValue("clientContext", out var result) && result is IContextDictionary context)
+    if (session.TryGetValue(_clientContextName, out var result) && result is IContextDictionary context)
     {
       clientContext = context;
     }
@@ -160,7 +163,7 @@ public IContextDictionary GetClientContext(ApplicationContext.ExecutionLocations
   public void SetClientContext(IContextDictionary? clientContext, ApplicationContext.ExecutionLocations executionLocation)
   {
     var session = GetSession();
-    session["clientContext"] = clientContext;
+    session[_clientContextName] = clientContext;
   }
 
   private Session GetSession()
diff --git a/Source/Csla.Blazor/State/StateManager.cs b/Source/Csla.Blazor/State/StateManager.cs
@@ -92,9 +92,9 @@ private async Task GetState(CancellationToken ct)
     /// at which you know the user is navigating to another
     /// page.
     /// </remarks>
-    public async Task SaveState()
+    public Task SaveState()
     {
-      await SaveState(TimeSpan.FromSeconds(10));
+      return SaveState(TimeSpan.FromSeconds(10));
     }
 
     /// <summary>
@@ -113,6 +113,8 @@ public async Task SaveState(TimeSpan timeout)
       var isBrowser = OperatingSystem.IsBrowser();
       if (isBrowser)
         await _sessionManager.SendSession(timeout);
+      else
+        _sessionManager.GetSession().Touch();
     }
 
     /// <summary>
@@ -131,6 +133,8 @@ public async Task SaveState(CancellationToken ct)
       var isBrowser = OperatingSystem.IsBrowser();
       if (isBrowser)
         await _sessionManager.SendSession(ct);
+      else
+        _sessionManager.GetSession().Touch();
     }
   }
 }
diff --git a/Source/version.json b/Source/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "10.0.0-beta.12",
+  "version": "10.0.0-beta.0021",
   "publicReleaseRefSpec": [
     "^refs/heads/main$",
     "^refs/heads/release$",

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,11 @@`
`8`	`8`
`9`	`9`	`<h1>Counter</h1>`
`10`	`10`
	`11`	`+<p>RenderMode: @RendererInfo.Name, Interactive: @RendererInfo.IsInteractive</p>`
	`12`	`+`
`11`	`13`	`<p role="status">Current count: @currentCount</p>`
`12`	`14`
`13`		`-@if (IsInteractive)`
	`15`	`+@if (RendererInfo.IsInteractive)`
`14`	`16`	`{`
`15`	`17`	`<button class="btn btn-primary" @onclick="IncrementCount">Click me</button>`
`16`	`18`	`}`
`@@ -19,7 +21,6 @@`
`19`	`21`	`[CascadingParameter]`
`20`	`22`	`private Task<AuthenticationState>? authenticationState { get; set; }`
`21`	`23`	`private int currentCount = 0;`
`22`		`- private bool IsInteractive;`
`23`	`24`
`24`	`25`	`protected override async Task OnInitializedAsync()`
`25`	`26`	`{`
`@@ -32,19 +33,10 @@`
`32`	`33`	`}`
`33`	`34`	`}`
`34`	`35`
`35`		`- protected override void OnAfterRender(bool firstRender)`
`36`		`- {`
`37`		`- base.OnAfterRender(firstRender);`
`38`		`- if (firstRender)`
`39`		`- {`
`40`		`- IsInteractive = true;`
`41`		`- StateHasChanged();`
`42`		`- }`
`43`		`- }`
`44`		`-`
`45`	`36`	`private void IncrementCount()`
`46`	`37`	`{`
`47`	`38`	`currentCount++;`
`48`	`39`	`applicationContext.LocalContext["counter"] = currentCount;`
	`40`	`+ StateManager.SaveState();`
`49`	`41`	`}`
`50`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using Microsoft.AspNetCore.Mvc;`
`2`	`2`	`using Csla;`
`3`	`3`	`using Csla.State;`
	`4`	`+using Csla.Blazor.State.Messages;`
`4`	`5`
`5`	`6`	`namespace BlazorExample.Controllers`
`6`	`7`	`{`