Undo samples

Author: javiercn

src/Components/Components/test/ComponentStatePersistenceManagerFilteringTests.cs

@@ -1,12 +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 BlazorUnitedApp.Client.Data;
-using BlazorUnitedApp.Client.Pages;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 
-builder.Services.AddSingleton<ClientWeatherForecastService>();
-
 await builder.Build().RunAsync();

src/Components/Samples/BlazorUnitedApp.Client/Program.cs

@@ -10,10 +10,9 @@ 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.Yield();
-        return await Task.FromResult(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),

src/Components/Samples/BlazorUnitedApp/Data/WeatherForecastService.cs

@@ -1,16 +1,14 @@
-@page "/fetchdata/"
+@page "/fetchdata"
 @using BlazorUnitedApp.Data
 @inject WeatherForecastService ForecastService
-@inject NavigationManager NavigationManager
-@rendermode InteractiveServer
 
 <PageTitle>Weather forecast</PageTitle>
 
 <h1>Weather forecast</h1>
 
 <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>
@@ -39,41 +37,11 @@ else
     </table>
 }
 
-<p>Current Url = @Page</p>
-
-<ul>
-    <li>
-        <a href="fetchdata/?page=0">Page 0</a>
-    </li>
-    <li>
-        <a href="fetchdata/?page=1">Page 1</a>
-    </li>
-    <li>
-        <a href="fetchdata/?page=2">Page 2</a>
-    </li>
-</ul>
-
 @code {
-    [PersistentState]
-    [UpdateStateOnEnhancedNavigation(true)]
-    public WeatherForecast[]? Forecasts { get; set; }
-
-    public string Page { get; set; } = "";
+    private WeatherForecast[]? forecasts;
 
     protected override async Task OnInitializedAsync()
     {
-        // Extract the page from the query string
-        var uri = NavigationManager.ToAbsoluteUri(NavigationManager.Uri);
-        var query = System.Web.HttpUtility.ParseQueryString(uri.Query);
-        var pageParam = query["page"];
-        int pageIndex = 1 + (int.TryParse(pageParam, out int parsedPage) ? parsedPage : 0);
-        pageIndex *= 7;
-
-        Forecasts ??= await ForecastService.GetForecastAsync(DateOnly.FromDateTime(DateTime.Now).AddDays(pageIndex));
-    }
-
-    protected override void OnParametersSet()
-    {
-        Page = NavigationManager.Uri;
+        forecasts = await ForecastService.GetForecastAsync(DateOnly.FromDateTime(DateTime.Now));
     }
 }

src/Components/Samples/BlazorUnitedApp/Pages/FetchData.razor

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using BlazorUnitedApp;
-using BlazorUnitedApp.Client.Data;
 using BlazorUnitedApp.Data;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -13,7 +12,6 @@
     .AddInteractiveServerComponents();
 
 builder.Services.AddSingleton<WeatherForecastService>();
-builder.Services.AddSingleton<ClientWeatherForecastService>();
 
 var app = builder.Build();
 
@@ -32,7 +30,6 @@
 
 app.MapStaticAssets();
 app.MapRazorComponents<App>()
-    .AddAdditionalAssemblies(typeof(BlazorUnitedApp.Client.Pages.ClientFetchData).Assembly)
     .AddInteractiveServerRenderMode()
     .AddInteractiveWebAssemblyRenderMode();
 

src/Components/Samples/BlazorUnitedApp/Program.cs

@@ -1,4 +1,4 @@
-<Router AppAssembly="@typeof(App).Assembly" AdditionalAssemblies="[typeof(BlazorUnitedApp.Client.Pages.ClientFetchData).Assembly]">
+<Router AppAssembly="@typeof(App).Assembly">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
         <FocusOnNavigate RouteData="@routeData" Selector="h1" />

src/Components/Samples/BlazorUnitedApp/Routes.razor

@@ -29,11 +29,6 @@
                 <span class="bi bi-list-nested" aria-hidden="true"></span> Web assembly
             </NavLink>
         </div>
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="clientfetchdata">
-                <span class="bi bi-list-nested" aria-hidden="true"></span> Client Fetch Data
-            </NavLink>
-        </div>
     </nav>
 </div>