Improve Form Layout

WebApp/Components/Features/Teams/Create.razor

@@ -15,7 +15,7 @@
     Title="Create"
     Subtitle="Team"
     ShowBackButton="true"
-    BackButtonUrl="/teams" />
+    BackButtonUrl="@(ReturnUrl ?? "/teams")" />
 
 <EditForm method="post" Model="Team" OnValidSubmit="AddTeam" FormName="create" Enhance>
     <FormChangeTracker @ref="_formChangeTracker" />
@@ -72,6 +72,9 @@
 </FormActions>
 
 @code {
+    [SupplyParameterFromQuery]
+    private string? ReturnUrl { get; set; }
+
     [SupplyParameterFromForm]
     private Team Team { get; set; } = new();
 
@@ -162,12 +165,12 @@
 
         await Context.SaveChangesAsync();
         _formChangeTracker?.AllowNavigation();
-        NavigationManager.NavigateTo("/teams");
+        NavigationManager.NavigateTo(ReturnUrl ?? "/teams");
     }
 
     private void HandleCancel()
     {
         _formChangeTracker?.AllowNavigation();
-        NavigationManager.NavigateTo("/teams");
+        NavigationManager.NavigateTo(ReturnUrl ?? "/teams");
     }
 }

WebApp/Components/Features/Teams/Details.razor

@@ -16,16 +16,16 @@
 <PageHeader
     Title="Team Details"
     ShowBackButton="true"
-    BackButtonUrl="/teams">
+    BackButtonUrl="@(ReturnUrl ?? "/teams")">
     <ActionButtons>
         <div class="no-print">
             <MudButton StartIcon="@Icons.Material.Filled.Print"
                        OnClick="PrintPage"
                        Variant="Variant.Outlined">Print</MudButton>
             <MudButton StartIcon="@Icons.Material.Filled.Edit"
-                       Href="@($"/teams/edit?id={Team.Id}")"
+                       Href="@($"/teams/edit?id={Team.Id}&returnUrl={ReturnUrl ?? "/teams"}")"
                        Variant="Variant.Outlined">Edit</MudButton>
-            <MudButton Href="/teams" Variant="Variant.Text">Back to List</MudButton>
+            <MudButton Href="@(ReturnUrl ?? "/teams")" Variant="Variant.Text">Back to List</MudButton>
         </div>
     </ActionButtons>
 </PageHeader>
@@ -60,6 +60,9 @@
     [SupplyParameterFromQuery]
     private int Id { get; set; }
 
+    [SupplyParameterFromQuery]
+    private string? ReturnUrl { get; set; }
+
     private Team? Team { get; set; }
 
     protected override async Task OnInitializedAsync()

WebApp/Components/Features/Teams/Edit.razor

@@ -14,7 +14,7 @@
 <PageHeader Title="Edit Team"
     Subtitle=@Team.ToString()
     ShowBackButton="true"
-    BackButtonUrl="/teams" />
+    BackButtonUrl="@(ReturnUrl ?? "/teams")" />
 
 <EditForm method="post" Model="Team" OnValidSubmit="UpdateTeam" FormName="edit" Enhance>
         <FormChangeTracker @ref="_formChangeTracker" />
@@ -46,6 +46,9 @@
     [SupplyParameterFromQuery]
     private int Id { get; set; }
 
+    [SupplyParameterFromQuery]
+    private string? ReturnUrl { get; set; }
+
     [SupplyParameterFromForm]
     private Team? Team { get; set; }
 
@@ -103,7 +106,7 @@
         {
             await Context.SaveChangesAsync();
             _formChangeTracker?.AllowNavigation();
-            NavigationManager.NavigateTo("/teams");
+            NavigationManager.NavigateTo(ReturnUrl ?? "/teams");
         }
         catch (DbUpdateConcurrencyException)
         {
@@ -127,7 +130,7 @@
         }
 
         _formChangeTracker?.AllowNavigation();
-        NavigationManager.NavigateTo("/teams");
+        NavigationManager.NavigateTo(ReturnUrl ?? "/teams");
     }
 
     private bool TeamExists(int id)