Undo sample changes

javiercn · javiercn · commit da31a8d85396 · 2025-06-06T12:48:18.000+02:00
diff --git a/src/Components/Samples/BlazorUnitedApp/App.razor b/src/Components/Samples/BlazorUnitedApp/App.razor
@@ -14,33 +14,7 @@
     <HeadOutlet />
 </head>
 <body>
-    <Routes @rendermode="InteractiveServer" />
-    <script src="@Assets["_framework/blazor.web.js"]" autostart="false"></script>
-    <script>
-        Blazor.start();
-        // Blazor.start({
-        //    circuit: {
-        //      reconnectionHandler: {
-        //        onConnectionDown: () =>  (),
-        //        onConnectionUp: () => {
-        //            // revertState();
-        //        }
-        //      },
-        //      detailedErrors: true
-        //    }
-        //  });
-
-         function disconnect() {
-            console.log("Disconnecting")
-            Blazor._internal.forceCloseConnection();
-            document.getElementById("reconnect-button").style.visibility = "visible";
-            document.getElementById("close-connection").style.visibility = "hidden";
-         }
-         function revertState() {
-            console.log("Restoring connection")
-            document.getElementById("reconnect-button").style.visibility = "hidden";
-            document.getElementById("close-connection").style.visibility = "visible";
-         }
-    </script>
+    <Routes />
+    <script src="@Assets["_framework/blazor.web.js"]"></script>
 </body>
 </html>
diff --git a/src/Components/Samples/BlazorUnitedApp/Data/WeatherForecast.cs b/src/Components/Samples/BlazorUnitedApp/Data/WeatherForecast.cs
@@ -1,11 +1,8 @@
 // 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;
-
 namespace BlazorUnitedApp.Data;
 
-[DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
 public class WeatherForecast
 {
     public DateOnly Date { get; set; }
@@ -15,7 +12,4 @@ public class WeatherForecast
     public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
 
     public string? Summary { get; set; }
-
-    private string GetDebuggerDisplay() =>
-        $"{Date:yyyy-MM-dd}: {TemperatureC}°C ({TemperatureF}°F) - {Summary ?? "No summary"}";
 }
diff --git a/src/Components/Samples/BlazorUnitedApp/Data/WeatherForecastService.cs b/src/Components/Samples/BlazorUnitedApp/Data/WeatherForecastService.cs
@@ -10,14 +10,13 @@ public class WeatherForecastService
         "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
     };
 
-    public async Task<WeatherForecast[]> GetForecastAsync(DateOnly startDate)
+    public Task<WeatherForecast[]> GetForecastAsync(DateOnly startDate)
     {
-        await Task.Delay(1000);
-        return [.. Enumerable.Range(1, 5).Select(index => new WeatherForecast
+        return Task.FromResult(Enumerable.Range(1, 5).Select(index => new WeatherForecast
         {
             Date = startDate.AddDays(index),
             TemperatureC = Random.Shared.Next(-20, 55),
             Summary = Summaries[Random.Shared.Next(Summaries.Length)]
-        })];
+        }).ToArray());
     }
 }
diff --git a/src/Components/Samples/BlazorUnitedApp/Pages/FetchData.razor b/src/Components/Samples/BlazorUnitedApp/Pages/FetchData.razor
@@ -6,11 +6,9 @@
 
 <h1>Weather forecast</h1>
 
-@_guid
-
 <p>This component demonstrates fetching data from a service.</p>
 
-@if (Forecasts == null)
+@if (forecasts == null)
 {
     <p><em>Loading...</em></p>
 }
@@ -26,7 +24,7 @@ else
             </tr>
         </thead>
         <tbody>
-            @foreach (var forecast in Forecasts)
+            @foreach (var forecast in forecasts)
             {
                 <tr>
                     <td>@forecast.Date.ToShortDateString()</td>
@@ -40,14 +38,10 @@ else
 }
 
 @code {
-
-    [SupplyParameterFromPersistentComponentState] public WeatherForecast[]? Forecasts { get; set; }
-
-    private string _guid;
+    private WeatherForecast[]? forecasts;
 
     protected override async Task OnInitializedAsync()
     {
-        _guid = Guid.NewGuid().ToString();
-        Forecasts ??= await ForecastService.GetForecastAsync(DateOnly.FromDateTime(DateTime.Now));
+        forecasts = await ForecastService.GetForecastAsync(DateOnly.FromDateTime(DateTime.Now));
     }
 }
diff --git a/src/Components/Samples/BlazorUnitedApp/Program.cs b/src/Components/Samples/BlazorUnitedApp/Program.cs
@@ -9,11 +9,7 @@
 // Add services to the container.
 builder.Services.AddRazorComponents()
     .AddInteractiveWebAssemblyComponents()
-    .AddInteractiveServerComponents(o =>
-    {
-        o.DisconnectedCircuitMaxRetained = 0;
-        o.DisconnectedCircuitRetentionPeriod = TimeSpan.FromSeconds(0);
-    });
+    .AddInteractiveServerComponents();
 
 builder.Services.AddSingleton<WeatherForecastService>();
 
diff --git a/src/Components/Samples/BlazorUnitedApp/Properties/launchSettings.json b/src/Components/Samples/BlazorUnitedApp/Properties/launchSettings.json
@@ -22,8 +22,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "launchUrl": "fetchdata",
-      "applicationUrl": "http://localhost:5265",
+      "applicationUrl": "https://localhost:7247;http://localhost:5265",
       //"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/src/Components/Samples/BlazorUnitedApp/Shared/NavMenu.razor b/src/Components/Samples/BlazorUnitedApp/Shared/NavMenu.razor
@@ -29,16 +29,6 @@
                 <span class="bi bi-list-nested" aria-hidden="true"></span> Web assembly
             </NavLink>
         </div>
-        <div class="nav-item px-3 mt-3">
-            <button id="reconnect-button" style="visibility:hidden" onclick="Blazor.reconnect();" class="btn btn-sm btn-outline-success">
-                <span class="bi bi-arrow-repeat" aria-hidden="true"></span> Reconnect manually
-            </button>
-        </div>
-        <div class="nav-item px-3 mt-2">
-            <button id="close-connection" onclick="disconnect();" class="btn btn-sm btn-primary">
-                <span class="bi bi-x-circle" aria-hidden="true"></span> Close Connection
-            </button>
-        </div>
     </nav>
 </div>
 

Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,13 @@ public class WeatherForecastService`
`10`	`10`	`"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"`
`11`	`11`	`};`
`12`	`12`
`13`		`- public async Task<WeatherForecast[]> GetForecastAsync(DateOnly startDate)`
	`13`	`+ public Task<WeatherForecast[]> GetForecastAsync(DateOnly startDate)`
`14`	`14`	`{`
`15`		`- await Task.Delay(1000);`
`16`		`- return [.. Enumerable.Range(1, 5).Select(index => new WeatherForecast`
	`15`	`+ return Task.FromResult(Enumerable.Range(1, 5).Select(index => new WeatherForecast`
`17`	`16`	`{`
`18`	`17`	`Date = startDate.AddDays(index),`
`19`	`18`	`TemperatureC = Random.Shared.Next(-20, 55),`
`20`	`19`	`Summary = Summaries[Random.Shared.Next(Summaries.Length)]`
`21`		`- })];`
	`20`	`+ }).ToArray());`
`22`	`21`	`}`
`23`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,9 @@`
`6`	`6`
`7`	`7`	`<h1>Weather forecast</h1>`
`8`	`8`
`9`		`-@_guid`
`10`		`-`
`11`	`9`	`<p>This component demonstrates fetching data from a service.</p>`
`12`	`10`
`13`		`-@if (Forecasts == null)`
	`11`	`+@if (forecasts == null)`
`14`	`12`	`{`
`15`	`13`	`<p><em>Loading...</em></p>`
`16`	`14`	`}`
`@@ -26,7 +24,7 @@ else`
`26`	`24`	`</tr>`
`27`	`25`	`</thead>`
`28`	`26`	`<tbody>`
`29`		`- @foreach (var forecast in Forecasts)`
	`27`	`+ @foreach (var forecast in forecasts)`
`30`	`28`	`{`
`31`	`29`	`<tr>`
`32`	`30`	`<td>@forecast.Date.ToShortDateString()</td>`
`@@ -40,14 +38,10 @@ else`
`40`	`38`	`}`
`41`	`39`
`42`	`40`	`@code {`
`43`		`-`
`44`		`- [SupplyParameterFromPersistentComponentState] public WeatherForecast[]? Forecasts { get; set; }`
`45`		`-`
`46`		`- private string _guid;`
	`41`	`+ private WeatherForecast[]? forecasts;`
`47`	`42`
`48`	`43`	`protected override async Task OnInitializedAsync()`
`49`	`44`	`{`
`50`		`- _guid = Guid.NewGuid().ToString();`
`51`		`- Forecasts ??= await ForecastService.GetForecastAsync(DateOnly.FromDateTime(DateTime.Now));`
	`45`	`+ forecasts = await ForecastService.GetForecastAsync(DateOnly.FromDateTime(DateTime.Now));`
`52`	`46`	`}`
`53`	`47`	`}`