Persitent services E2E tests

Author: javiercn

src/Components/test/E2ETest/ServerRenderingTests/InteractivityTest.cs

@@ -1111,6 +1111,41 @@ public void CanPersistPrerenderedState_Auto_PersistsOnServer()
         Browser.Equal("Server", () => Browser.FindElement(By.Id("render-mode-auto")).Text);
     }
 
+    [Theory]
+    [InlineData("server", "Server state", "Auto state", "not restored")]
+    [InlineData("auto", "Server state", "Auto state", "not restored")]
+    public void CanPersistPrerenderedState_ServicesState_PersistsOnServer(string mode, string expectedServerState, string expectedAutoState, string expectedWebAssemblyState)
+    {
+        Navigate(ServerPathBase);
+        Browser.Equal("Hello", () => Browser.Exists(By.TagName("h1")).Text);
+        if (mode == "auto")
+        {
+            BlockWebAssemblyResourceLoad();
+        }
+
+        Navigate($"{ServerPathBase}/persist-services-state?mode={mode}");
+        Browser.Equal("Server", () => Browser.FindElement(By.Id("render-mode")).Text);
+        Browser.Equal(expectedServerState, () => Browser.FindElement(By.Id("server-state")).Text);
+        Browser.Equal(expectedAutoState, () => Browser.FindElement(By.Id("auto-state")).Text);
+        Browser.Equal(expectedWebAssemblyState, () => Browser.FindElement(By.Id("wasm-state")).Text);
+    }
+
+    [Theory]
+    [InlineData("auto", "not restored", "Auto state", "WebAssembly state")]
+    [InlineData("wasm", "not restored", "Auto state", "WebAssembly state")]
+    public void CanPersistPrerenderedState_ServicesState_PersistsOnWasm(string mode, string expectedServerState, string expectedAutoState, string expectedWebAssemblyState)
+    {
+        Navigate(ServerPathBase);
+        Browser.Equal("Hello", () => Browser.Exists(By.TagName("h1")).Text);
+
+        Navigate($"{ServerPathBase}/persist-services-state?mode={mode}");
+
+        Browser.Equal("WebAssembly", () => Browser.FindElement(By.Id("render-mode")).Text);
+        Browser.Equal(expectedServerState, () => Browser.FindElement(By.Id("server-state")).Text);
+        Browser.Equal(expectedAutoState, () => Browser.FindElement(By.Id("auto-state")).Text);
+        Browser.Equal(expectedWebAssemblyState, () => Browser.FindElement(By.Id("wasm-state")).Text);
+    }
+
     [Fact]
     public void CanPersistPrerenderedStateDeclaratively_Auto_PersistsOnServer()
     {

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

@@ -8,9 +8,12 @@
 using Components.TestServer.RazorComponents;
 using Components.TestServer.RazorComponents.Pages.Forms;
 using Components.TestServer.Services;
+using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Server.Circuits;
+using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Server;
 using Microsoft.AspNetCore.Mvc;
+using TestContentPackage.Services;
 
 namespace TestServer;
 
@@ -40,6 +43,14 @@ public void ConfigureServices(IServiceCollection services)
                 options.SerializeAllClaims = serializeAllClaims;
             });
 
+        services.AddScoped<InteractiveWebAssemblyService>();
+        services.AddScoped<InteractiveServerService>();
+        services.AddScoped<InteractiveAutoService>();
+
+        services.AddPersistentService<InteractiveServerService>(RenderMode.InteractiveServer);
+        services.AddPersistentService<InteractiveAutoService>(RenderMode.InteractiveAuto);
+        services.AddPersistentService<InteractiveWebAssemblyService>(RenderMode.InteractiveWebAssembly);
+
         services.AddHttpContextAccessor();
         services.AddSingleton<AsyncOperationService>();
         services.AddCascadingAuthenticationState();

src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistServicesStateComponents.razor

@@ -0,0 +1,24 @@
+@page "/persist-services-state"
+@using Microsoft.AspNetCore.Components.Web
+
+<h1>Persist Services State Components</h1>
+
+<TestContentPackage.PersistServicesState @rendermode="@_renderMode" />
+
+@code {
+    private IComponentRenderMode _renderMode;
+
+    [Parameter, SupplyParameterFromQuery(Name = "mode")]
+    public string Mode { get; set; }
+
+    protected override void OnInitialized()
+    {
+        _renderMode = Mode switch
+        {
+            "server" => RenderMode.InteractiveServer,
+            "wasm" => RenderMode.InteractiveWebAssembly,
+            "auto" => RenderMode.InteractiveAuto,
+            _ => throw new InvalidOperationException($"Invalid mode: {Mode}")
+        };
+    }
+}

src/Components/test/testassets/Components.WasmMinimal/Program.cs

@@ -4,10 +4,20 @@
 using System.Runtime.InteropServices.JavaScript;
 using System.Security.Claims;
 using Components.TestServer.Services;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using TestContentPackage.Services;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.Services.AddSingleton<AsyncOperationService>();
+builder.Services.AddSingleton<InteractiveWebAssemblyService>();
+builder.Services.AddSingleton<InteractiveAutoService>();
+builder.Services.AddSingleton<InteractiveServerService>();
+builder.Services.AddPersistentService<InteractiveAutoService>(RenderMode.InteractiveWebAssembly);
+builder.Services.AddPersistentService<InteractiveServerService>(RenderMode.InteractiveWebAssembly);
+builder.Services.AddPersistentService<InteractiveWebAssemblyService>(RenderMode.InteractiveWebAssembly);
+
 builder.Services.AddCascadingAuthenticationState();
 
 builder.Services.AddAuthenticationStateDeserialization(options =>

src/Components/test/testassets/TestContentPackage/PersistServicesState.razor

@@ -0,0 +1,32 @@
+@using TestContentPackage.Services
+
+@inject InteractiveServerService InteractiveServerState
+@inject InteractiveWebAssemblyService InteractiveWebAssemblyState
+@inject InteractiveAutoService InteractiveAutoState
+
+<p>Interactive server state is <span id="server-state">@InteractiveServerState.State</span></p>
+<p>Interactive webassembly state is <span id="wasm-state">@InteractiveWebAssemblyState.State</span></p>
+<p>Interactive auto state is <span id="auto-state">@InteractiveAutoState.State</span></p>
+
+<p>Render mode: <span id="render-mode">@_renderMode</span></p>
+
+@code {
+
+    private string _renderMode = "";
+
+    protected override void OnInitialized()
+    {
+        _renderMode = RendererInfo.Name;
+        if (!RendererInfo.IsInteractive)
+        {
+            InteractiveServerState.State = "Server state";
+            InteractiveWebAssemblyState.State = "WebAssembly state";
+            InteractiveAutoState.State = "Auto state";
+        }else
+        {
+            InteractiveServerState.State ??= "not restored";
+            InteractiveWebAssemblyState.State ??= "not restored";
+            InteractiveAutoState.State ??= "not restored";
+        }
+    }
+}

src/Components/test/testassets/TestContentPackage/Services/InteractiveAutoService.cs

@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Components;
+
+namespace TestContentPackage.Services;
+
+public class InteractiveAutoService
+{
+    [SupplyParameterFromPersistentComponentState]
+    public string State { get; set; }
+}

src/Components/test/testassets/TestContentPackage/Services/InteractiveServerService.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Components;
+
+namespace TestContentPackage.Services;
+public class InteractiveServerService
+{
+    [SupplyParameterFromPersistentComponentState]
+    public string State { get; set; }
+}

src/Components/test/testassets/TestContentPackage/Services/InteractiveWebAssemblyService.cs

@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Components;
+
+namespace TestContentPackage.Services;
+
+public class InteractiveWebAssemblyService
+{
+    [SupplyParameterFromPersistentComponentState]
+    public string State { get; set; }
+}