tmp

Author: javiercn

src/Components/Components/src/PersistentStateValueProvider.cs

@@ -400,7 +400,7 @@ internal class ComponentSubscription
         private object? _lastValue = _uninitializedValue;
         private bool _hasPendingInitialValue;
         private bool _ignoreUpdatedValues;
-        private string _storageKey;
+        private string? _storageKey;
         private readonly PersistentComponentState _state;
         private readonly ComponentState _subscriber;
         private readonly string _propertyName;

src/Components/test/testassets/Components.TestServer/RazorComponentEndpointsStartup.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
 using System.Globalization;
 using System.Reflection;
 using System.Security.Claims;
@@ -31,31 +32,39 @@ public RazorComponentEndpointsStartup(IConfiguration configuration)
     public void ConfigureServices(IServiceCollection services)
     {
         services.AddValidation();
+        if (Debugger.IsAttached)
+        {
+            services.AddSignalR(options =>
+            {
+                options.KeepAliveInterval = TimeSpan.FromMinutes(10); // default is 15 seconds
+                options.ClientTimeoutInterval = TimeSpan.FromMinutes(20); // must be longer than KeepAliveInterval
+            });
+        }
 
         services.AddRazorComponents(options =>
         {
             options.MaxFormMappingErrorCount = 10;
             options.MaxFormMappingRecursionDepth = 5;
             options.MaxFormMappingCollectionSize = 100;
         })
-            .RegisterPersistentService<InteractiveServerService>(RenderMode.InteractiveServer)
-            .RegisterPersistentService<InteractiveAutoService>(RenderMode.InteractiveAuto)
-            .RegisterPersistentService<InteractiveWebAssemblyService>(RenderMode.InteractiveWebAssembly)
-            .AddInteractiveWebAssemblyComponents()
-            .AddInteractiveServerComponents(options =>
-            {
-                if (Configuration.GetValue<bool>("DisableReconnectionCache"))
-                {
-                    // This disables the reconnection cache, which forces the server to persist the circuit state.
-                    options.DisconnectedCircuitMaxRetained = 0;
-                    options.DetailedErrors = true;
-                }
-            })
-            .AddAuthenticationStateSerialization(options =>
+        .RegisterPersistentService<InteractiveServerService>(RenderMode.InteractiveServer)
+        .RegisterPersistentService<InteractiveAutoService>(RenderMode.InteractiveAuto)
+        .RegisterPersistentService<InteractiveWebAssemblyService>(RenderMode.InteractiveWebAssembly)
+        .AddInteractiveWebAssemblyComponents()
+        .AddInteractiveServerComponents(options =>
+        {
+            if (Configuration.GetValue<bool>("DisableReconnectionCache"))
             {
-                bool.TryParse(Configuration["SerializeAllClaims"], out var serializeAllClaims);
-                options.SerializeAllClaims = serializeAllClaims;
-            });
+                // This disables the reconnection cache, which forces the server to persist the circuit state.
+                options.DisconnectedCircuitMaxRetained = 0;
+                options.DetailedErrors = true;
+            }
+        })
+        .AddAuthenticationStateSerialization(options =>
+        {
+            bool.TryParse(Configuration["SerializeAllClaims"], out var serializeAllClaims);
+            options.SerializeAllClaims = serializeAllClaims;
+        });
 
         if (Configuration.GetValue<bool>("UseHybridCache"))
         {

src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistentState/PageWithDeclarativeEnhancedNavigationPersistentComponents.razor

@@ -16,11 +16,11 @@
 {
     @if (!string.IsNullOrEmpty(StreamingId))
     {
-        <StreamingComponentWithDeclarativePersistentState @rendermode="@_renderMode" StreamingId="@StreamingId" ServerState="@ServerState" />
+        <StreamingComponentWithDeclarativePersistentState @key="@("PersistentComponent")" @rendermode="@_renderMode" StreamingId="@StreamingId" ServerState="@ServerState" />
     }
     else
     {
-        <NonStreamingComponentWithDeclarativePersistentState @rendermode="@_renderMode" ServerState="@ServerState" />
+        <NonStreamingComponentWithDeclarativePersistentState @key="@("NonStreamingComponent")" @rendermode="@_renderMode" ServerState="@ServerState" />
     }
 }
 @if (!string.IsNullOrEmpty(StreamingId))