Merge branch 'main' into doc-update

Author: jamesmontemagno

workshop/7-database.md

@@ -89,59 +89,11 @@ For development environments, we use `EnsureCreatedAsync()` to automatically cre
 
 Now we'll update the web application to support favoriting weather zones and filtering them. Let's make these changes step by step:
 
-1. First, add a checkbox to filter the zones list. In `Home.razor`, add this code just before the `<QuickGrid>` element:
-
-```csharp
-<div class="form-check mb-3">
-    <input class="form-check-input" type="checkbox" @bind="ShowOnlyFavorites" id="showFavorites">
-    <label class="form-check-label" for="showFavorites">
-        Show only favorites
-    </label>
-</div>
-```
-
-1. Next, add a new column to show the favorite status. Add this column definition inside the `<QuickGrid>` element, after the existing State column:
+1. Make sure to add these Entity Framework using statements at the top of `Home.razor` if they're not already present:
 
 ```csharp
-<TemplateColumn Title="Favorite">
-    <ChildContent>
-        <button @onclick="@(() => ToggleFavorite(context))">
-            @if (FavoriteZones.Contains(context))
-            {
-                <span>&#9733;</span> <!-- Starred -->
-            }
-            else
-            {
-                <span>&#9734;</span> <!-- Unstarred -->
-            }
-        </button>
-    </ChildContent>
-</TemplateColumn>
-```
-
-1. In the `@code` block of `Home.razor`, locate the `zones` property and replace it with this updated version that includes the favorites filter:
-
-```csharp
-IQueryable<Zone> zones
-{
-    get
-    {
-        var results = AllZones.AsQueryable();
-
-        if (ShowOnlyFavorites)
-        {
-            results = results.Where(z => FavoriteZones.Contains(z));
-        }
-
-        results = string.IsNullOrEmpty(StateFilter) ? results
-                : results.Where(z => z.State == StateFilter.ToUpper());
-
-        results = string.IsNullOrEmpty(NameFilter) ? results
-                : results.Where(z => z.Name.Contains(NameFilter, StringComparison.InvariantCultureIgnoreCase));
-
-        return results.OrderBy(z => z.Name);
-    }
-}
+@using Microsoft.EntityFrameworkCore
+@inject MyWeatherContext DbContext
 ```
 
 1. Add these new properties to the `@code` block to support the favorites functionality:
@@ -157,7 +109,7 @@ List<Zone> FavoriteZones { get; set; } = new List<Zone>();
 protected override async Task OnInitializedAsync()
 {
     AllZones = (await NwsManager.GetZonesAsync()).ToArray();
-    FavoriteZones = await DbContext.FavoriteZones.ToListAsync();
+    FavoriteZones = await MyWeatherContext.FavoriteZones.ToListAsync();
 }
 ```
 
@@ -169,22 +121,70 @@ private async Task ToggleFavorite(Zone zone)
     if (FavoriteZones.Contains(zone))
     {
         FavoriteZones.Remove(zone);
-        DbContext.FavoriteZones.Remove(zone);
+        MyWeatherContext.FavoriteZones.Remove(zone);
     }
     else
     {
         FavoriteZones.Add(zone);
-        DbContext.FavoriteZones.Add(zone);
+        MyWeatherContext.FavoriteZones.Add(zone);
     }
     await DbContext.SaveChangesAsync();
 }
 ```
 
-Make sure to add these Entity Framework using statements at the top of `Home.razor` if they're not already present:
+1. In the `@code` block of `Home.razor`, locate the `zones` property and replace it with this updated version that includes the favorites filter:
 
 ```csharp
-@using Microsoft.EntityFrameworkCore
-@inject MyWeatherContext DbContext
+IQueryable<Zone> zones
+{
+    get
+    {
+        var results = AllZones.AsQueryable();
+
+        if (ShowOnlyFavorites)
+        {
+            results = results.Where(z => FavoriteZones.Contains(z));
+        }
+
+        results = string.IsNullOrEmpty(StateFilter) ? results
+                : results.Where(z => z.State == StateFilter.ToUpper());
+
+        results = string.IsNullOrEmpty(NameFilter) ? results
+                : results.Where(z => z.Name.Contains(NameFilter, StringComparison.InvariantCultureIgnoreCase));
+
+        return results.OrderBy(z => z.Name);
+    }
+}
+```
+
+1. First, add a checkbox to filter the zones list. In `Home.razor`, add this code just before the `<QuickGrid>` element:
+
+```csharp
+<div class="form-check mb-3">
+    <input class="form-check-input" type="checkbox" @bind="ShowOnlyFavorites" id="showFavorites">
+    <label class="form-check-label" for="showFavorites">
+        Show only favorites
+    </label>
+</div>
+```
+
+1. Next, add a new column to show the favorite status. Add this column definition inside the `<QuickGrid>` element, after the existing State column:
+
+```csharp
+<TemplateColumn Title="Favorite">
+    <ChildContent>
+        <button @onclick="@(() => ToggleFavorite(context))">
+            @if (FavoriteZones.Contains(context))
+            {
+                <span>&#9733;</span> <!-- Starred -->
+            }
+            else
+            {
+                <span>&#9734;</span> <!-- Unstarred -->
+            }
+        </button>
+    </ChildContent>
+</TemplateColumn>
 ```
 
 ## Testing Your Changes