Cleanups

Author: javiercn

src/Components/Components/src/PersistentState/PersistentValueProviderComponentSubscription.cs

@@ -113,7 +113,7 @@ private void RestoreProperty()
         }
 
         // The key needs to be computed here, do not move this outside of the lambda.
-        _storageKey ??= PersistentStateKeyResolver.ComputeKey(_subscriber, _propertyName);
+        _storageKey ??= PersistentStateValueProviderKeyResolver.ComputeKey(_subscriber, _propertyName);
 
         if (_customSerializer != null)
         {
@@ -159,7 +159,7 @@ private void RestoreProperty()
     private Task PersistProperty()
     {
         // The key needs to be computed here, do not move this outside of the lambda.
-        _storageKey ??= PersistentStateKeyResolver.ComputeKey(_subscriber, _propertyName);
+        _storageKey ??= PersistentStateValueProviderKeyResolver.ComputeKey(_subscriber, _propertyName);
 
         var property = _propertyGetter.GetValue(_subscriber.Component);
         if (property == null)

src/Components/Components/test/ComponentStatePersistenceManagerFilteringTests.cs

@@ -1,15 +1,11 @@
 // 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.Text;
 
 namespace Microsoft.AspNetCore.Components.Endpoints.Rendering;
 
 // Holds different types of outputs that can be written to BufferedTextWriter
-
-[DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
 internal readonly struct TextChunk
 {
     private readonly TextChunkType _type;
@@ -78,16 +74,4 @@ public Task WriteToAsync(TextWriter writer, string charArraySegments, ref String
     }
 
     private enum TextChunkType { Int, String, Char, CharArraySegment };
-
-    internal string GetDebuggerDisplay()
-    {
-        return _type switch
-        {
-            TextChunkType.String => _stringValue!,
-            TextChunkType.Char => $"{_charValue}",
-            TextChunkType.CharArraySegment => "<<Buffer>>",
-            TextChunkType.Int => _intValue.ToString(CultureInfo.InvariantCulture),
-            _ => throw new NotImplementedException(),
-        };
-    }
 }

src/Components/Endpoints/src/Rendering/Buffering/TextChunk.cs

@@ -1,13 +1,9 @@
 // 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.Text;
-
 namespace Microsoft.AspNetCore.Components.Endpoints.Rendering;
 
 // Used internally by TextChunkListBuilder
-[DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
 internal class TextChunkPage
 {
     private readonly TextChunk[] _buffer;
@@ -44,15 +40,4 @@ public void Clear()
     {
         _count = 0;
     }
-
-    private string GetDebuggerDisplay()
-    {
-        var sb = new StringBuilder();
-        for (var i = 0; i < _count; i++)
-        {
-            sb.Append(_buffer[i].GetDebuggerDisplay());
-        }
-
-        return sb.ToString();
-    }
 }

src/Components/Endpoints/src/Rendering/Buffering/TextChunkPage.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Concurrent;
-using System.Diagnostics;
 using System.Reflection;
 using System.Reflection.Metadata;
 using Microsoft.AspNetCore.Components.Endpoints;
@@ -20,7 +19,6 @@ internal sealed class EndpointComponentState : ComponentState
     public EndpointComponentState(Renderer renderer, int componentId, IComponent component, ComponentState? parentComponentState)
         : base(renderer, componentId, component, parentComponentState)
     {
-        Debug.Assert(renderer != null && renderer is EndpointHtmlRenderer);
         _renderer = (EndpointHtmlRenderer)renderer;
 
         var streamRenderingAttribute = _streamRenderingAttributeByComponentType.GetOrAdd(component.GetType(),

src/Components/Endpoints/src/Rendering/EndpointComponentState.cs

@@ -117,11 +117,11 @@ public void CanRenderComponentWithPersistedState(bool suppressEnhancedNavigation
     // For server we validate that the state is provided every time a circuit is initialized.
     [Theory]
     [InlineData(typeof(InteractiveServerRenderMode), (string)null)]
-    [InlineData(typeof(InteractiveServerRenderMode), "ServerStreaming")]
+    [InlineData(typeof(InteractiveServerRenderMode), "ServerStreaming", Skip = "https://github.com/dotnet/aspnetcore/issues/62828")]
     [InlineData(typeof(InteractiveWebAssemblyRenderMode), (string)null)]
-    [InlineData(typeof(InteractiveWebAssemblyRenderMode), "WebAssemblyStreaming", Skip = "Streaming not yet supported")]
+    [InlineData(typeof(InteractiveWebAssemblyRenderMode), "WebAssemblyStreaming", Skip = "https://github.com/dotnet/aspnetcore/issues/62828")]
     [InlineData(typeof(InteractiveAutoRenderMode), (string)null)]
-    [InlineData(typeof(InteractiveAutoRenderMode), "AutoStreaming", Skip = "Streaming not yet supported")]
+    [InlineData(typeof(InteractiveAutoRenderMode), "AutoStreaming", Skip = "https://github.com/dotnet/aspnetcore/issues/62828")]
     public void CanUpdateComponentsWithPersistedStateAndEnhancedNavUpdates(
         Type renderMode,
         string streaming)

src/Components/test/E2ETest/Tests/StatePersistenceTest.cs

@@ -1,7 +1,6 @@
 // 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;
@@ -32,39 +31,31 @@ 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"))
+            .RegisterPersistentService<InteractiveServerService>(RenderMode.InteractiveServer)
+            .RegisterPersistentService<InteractiveAutoService>(RenderMode.InteractiveAuto)
+            .RegisterPersistentService<InteractiveWebAssemblyService>(RenderMode.InteractiveWebAssembly)
+            .AddInteractiveWebAssemblyComponents()
+            .AddInteractiveServerComponents(options =>
             {
-                // 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>("DisableReconnectionCache"))
+                {
+                    // 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/RazorComponentEndpointsStartup.cs

@@ -13,7 +13,7 @@
     },
     "Console": {
       "LogLevel": {
-        "Default": "Debug"
+        "Default": "Warning"
       }
     }
   }

src/Components/test/testassets/Components.TestServer/appsettings.json

@@ -6,7 +6,6 @@
 <p id="interactive-runtime">Interactive runtime: @_interactiveRuntime</p>
 <p id="state-found">State found:@_stateFound</p>
 <p id="state-value">State value:@_stateValue</p>
-<p id="enhanced-nav-state">Enhanced nav state:@EnhancedNavState</p>
 
 @code {
 
@@ -16,14 +15,9 @@
 
     [Inject] public PersistentComponentState PersistentComponentState { get; set; }
 
-    [CascadingParameter(Name = nameof(RunningOnServer))]
-    public bool RunningOnServer { get; set; }
-
+    [CascadingParameter(Name = nameof(RunningOnServer))] public bool RunningOnServer { get; set; }
     [Parameter] public string ServerState { get; set; }
 
-    [PersistentState(AllowUpdates = true)]
-    public string EnhancedNavState { get; set; }
-
     protected override void OnInitialized()
     {
         PersistentComponentState.RegisterOnPersisting(PersistState);