Refactor mentor/grower filters to use query strings

markdav-is · markdav-is · commit e65a9f7ee97d · 2026-06-01T19:18:45.000-07:00
- Update Mentor and Grower modules to v2.4.0
- Refactor Mentor Index.razor: filters, sort, and navigation now use query strings for state persistence; Edit links preserve filter context; improved responsive layout
- Update Mentor Edit.razor: Back/Cancel links and post-save navigation retain filter/sort state
- Add name filter to Grower Index.razor; remove ClearFilters/ApplyFilters; all filter state managed via query strings for consistency
diff --git a/Client/Modules/Grower/Index.razor b/Client/Modules/Grower/Index.razor
@@ -49,9 +49,9 @@
                     }
                 </select>
             </div>
-            <div class="d-flex align-items-end gap-2">
-                <button class="btn btn-primary" @onclick="ApplyFilters">Filter</button>
-                <button class="btn btn-secondary" @onclick="ClearFilters">@Localizer["Action.ClearFilters"]</button>
+            <div>
+                <label for="nameFilter" class="form-label">Name</label>
+                <input id="nameFilter" type="text" class="form-control" @bind="_nameFilter" @bind:event="oninput" @bind:after="NavigateWithFilters" placeholder="Search…" />
             </div>
         </div>
         <!-- Sort (right) -->
@@ -180,6 +180,7 @@
     private string _statusFilter = "";
     private string _villageFilter = "";
     private string _cohortFilter = "";
+    private string _nameFilter = "";
     private bool _isLoading = false;
     private string _sortBy = "lastname";
     private bool _sortAsc = true;
@@ -206,6 +207,7 @@
         {
             _statusFilter = PageState.QueryString.GetValueOrDefault("status", "");
             _villageFilter = PageState.QueryString.GetValueOrDefault("villageId", "");
+            _nameFilter = PageState.QueryString.GetValueOrDefault("name", "");
             _sortBy = PageState.QueryString.GetValueOrDefault("sortBy", "lastname");
             _sortAsc = !PageState.QueryString.ContainsKey("sortDesc");
             await LoadVillagesAsync();
@@ -306,6 +308,13 @@
             _growers = _growers.Where(g => _cohortGrowerIds.Contains(g.GrowerId)).ToList();
         }
 
+        // Apply name filter
+        if (!string.IsNullOrWhiteSpace(_nameFilter))
+        {
+            var f = _nameFilter.Trim().ToLowerInvariant();
+            _growers = _growers.Where(g => g.GrowerName?.ToLowerInvariant().Contains(f) ?? false).ToList();
+        }
+
         await LoadSummaryAsync();
         StateHasChanged();
     }
@@ -331,16 +340,6 @@
         return _sortAsc ? sorted : sorted.Reverse();
     }
 
-    private void ClearFilters()
-    {
-        NavigationManager.NavigateTo(NavigateUrl());
-    }
-
-    private void ApplyFilters()
-    {
-        NavigateWithFilters();
-    }
-
     private void ApplyStatusFilter(string status)
     {
         _statusFilter = status;
@@ -352,6 +351,7 @@
         var parts = new List<string>();
         if (!string.IsNullOrEmpty(_statusFilter))  parts.Add($"status={Uri.EscapeDataString(_statusFilter)}");
         if (!string.IsNullOrEmpty(_villageFilter)) parts.Add($"villageId={Uri.EscapeDataString(_villageFilter)}");
+        if (!string.IsNullOrEmpty(_nameFilter))    parts.Add($"name={Uri.EscapeDataString(_nameFilter)}");
         if (_sortBy != "lastname")                 parts.Add($"sortBy={Uri.EscapeDataString(_sortBy)}");
         if (!_sortAsc)                             parts.Add("sortDesc=1");
         return string.Join("&", parts);
@@ -360,7 +360,7 @@
     private void NavigateWithFilters()
     {
         var queryString = BuildFilterQueryString();
-        NavigationManager.NavigateTo(EditUrl("", queryString));
+        NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, queryString));
     }
 
     private string GetVillageName(int villageId)
diff --git a/Client/Modules/Grower/ModuleInfo.cs b/Client/Modules/Grower/ModuleInfo.cs
@@ -10,9 +10,9 @@ public class ModuleInfo : IModule
         {
             Name = "Grower",
             Description = "Grower management for 10 Trees program - track active status and program exits",
-            Version = "2.3.0",
+            Version = "2.4.0",
             ServerManagerType = "",
-            ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,1.0.5,2.1.0,2.2.0,2.3.0",
+            ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,1.0.5,2.1.0,2.2.0,2.3.0,2.4.0",
             Dependencies = "OpenEug.TenTrees.Module.Village.1.0.0",
             PackageName = "OpenEug.TenTrees.Module.Grower"
         };
diff --git a/Client/Modules/Mentor/Edit.razor b/Client/Modules/Mentor/Edit.razor
@@ -18,10 +18,15 @@ else
 {
     <div class="container">
         <div class="d-flex justify-content-between align-items-center mb-3">
-            <h4>
-                <span class="oi oi-person me-2" aria-hidden="true"></span>
-                @(_isCreate ? "Add Mentor" : $"Edit Mentor — {_model.DisplayName}")
-            </h4>
+            <div class="d-flex align-items-center gap-2">
+                <NavLink href="@NavigateUrl(PageState.Page.Path, PageState.QueryString)" class="btn btn-outline-secondary btn-sm">
+                    <span class="oi oi-arrow-left me-1" aria-hidden="true"></span> Back
+                </NavLink>
+                <h4 class="mb-0">
+                    <span class="oi oi-person me-2" aria-hidden="true"></span>
+                    @(_isCreate ? "Add Mentor" : $"Edit Mentor — {_model.DisplayName}")
+                </h4>
+            </div>
             <div class="d-flex gap-2">
                 @if (!_isCreate)
                 {
@@ -38,9 +43,6 @@ else
                         </button>
                     }
                 }
-                <NavLink href="@NavigateUrl()" class="btn btn-outline-secondary btn-sm">
-                    <span class="oi oi-arrow-left me-1" aria-hidden="true"></span> Back to Mentors
-                </NavLink>
             </div>
         </div>
 
@@ -123,7 +125,7 @@ else
                             <span>Save</span>
                         }
                     </button>
-                    <NavLink href="@NavigateUrl()" class="btn btn-outline-secondary">Cancel</NavLink>
+                    <NavLink href="@NavigateUrl(PageState.Page.Path, PageState.QueryString)" class="btn btn-outline-secondary">Cancel</NavLink>
                 </div>
             </div>
         </div>
@@ -284,7 +286,7 @@ else
                     await ScrollToPageTop();
                     return;
                 }
-                NavigationManager.NavigateTo(NavigateUrl());
+                NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, PageState.QueryString));
             }
             else
             {
diff --git a/Client/Modules/Mentor/Index.razor b/Client/Modules/Mentor/Index.razor
@@ -7,6 +7,7 @@
 @inherits ModuleBase
 @inject IMentorService MentorService
 @inject IVillageService VillageService
+@inject NavigationManager NavigationManager
 
 @if (!_isLoaded)
 {
@@ -26,7 +27,7 @@ else
             <div class="d-flex flex-wrap gap-2">
                 <div>
                     <label class="form-label" for="filterVillage">Village</label>
-                    <select id="filterVillage" class="form-select" @bind="_villageFilter" @bind:after="@(() => _page = 1)">
+                    <select id="filterVillage" class="form-select" @bind="_villageFilter" @bind:after="NavigateWithFilters">
                         <option value="0">All Villages</option>
                         @foreach (var v in _villages)
                         {
@@ -36,11 +37,11 @@ else
                 </div>
                 <div>
                     <label class="form-label" for="filterName">Name / Username</label>
-                    <input id="filterName" type="text" class="form-control" @bind="_nameFilter" @bind:event="oninput" @bind:after="@(() => _page = 1)" placeholder="Search…" />
+                    <input id="filterName" type="text" class="form-control" @bind="_nameFilter" @bind:event="oninput" @bind:after="NavigateWithFilters" placeholder="Search…" />
                 </div>
                 <div class="d-flex align-items-end">
                     <div class="form-check">
-                        <input id="showInactive" type="checkbox" class="form-check-input" @bind="_showInactive" @bind:after="@(() => _page = 1)" />
+                        <input id="showInactive" type="checkbox" class="form-check-input" @bind="_showInactive" @bind:after="NavigateWithFilters" />
                         <label class="form-check-label" for="showInactive">Show inactive</label>
                     </div>
                 </div>
@@ -49,7 +50,7 @@ else
             <div class="d-flex align-items-end gap-2">
                 <div>
                     <label class="form-label" for="sortBy">Sort by</label>
-                    <select id="sortBy" class="form-select" @bind="_sortBy">
+                    <select id="sortBy" class="form-select" @bind="_sortBy" @bind:after="NavigateWithFilters">
                         <option value="lastname">Last Name</option>
                         <option value="firstname">First Name</option>
                         <option value="username">Username</option>
@@ -59,7 +60,7 @@ else
                         <option value="status">Status</option>
                     </select>
                 </div>
-                <button class="btn btn-outline-secondary" @onclick="ToggleSortDir" title="@(_sortAsc ? "Ascending" : "Descending")" aria-label="Toggle sort direction">
+                <button class="btn btn-outline-secondary" @onclick="ToggleSortDirAndNavigate" title="@(_sortAsc ? "Ascending" : "Descending")" aria-label="Toggle sort direction">
                     <span class="oi @(_sortAsc ? "oi-sort-ascending" : "oi-sort-descending")" aria-hidden="true"></span>
                 </button>
             </div>
@@ -126,26 +127,31 @@ else
                                     @mentor.GrowerCount<span class="d-md-none"> grower@(mentor.GrowerCount == 1 ? "" : "s")</span>
                                 </div>
 
-                                <!-- Status badge -->
-                                <div class="mentor-col-status mb-2 mb-md-0">
-                                    @if (mentor.IsDeleted)
-                                    {
-                                        <span class="badge bg-secondary">Inactive</span>
-                                    }
-                                    else
-                                    {
-                                        <span class="badge bg-success">Active</span>
-                                    }
-                                </div>
+                                <!-- Status + Actions (same row on mobile, separate columns on md+) -->
+                                <div class="d-flex d-md-contents align-items-center justify-content-between mt-1 mt-md-0">
+
+                                    <!-- Status badge -->
+                                    <div class="mentor-col-status mb-0 mb-md-0">
+                                        @if (mentor.IsDeleted)
+                                        {
+                                            <span class="badge bg-secondary">Inactive</span>
+                                        }
+                                        else
+                                        {
+                                            <span class="badge bg-success">Active</span>
+                                        }
+                                    </div>
+
+                                    <!-- Actions -->
+                                    <div class="mentor-col-actions gap-2 flex-shrink-0">
+                                        <a href="@EditUrl("Edit",$"username={Uri.EscapeDataString(mentor.Username)}&{BuildFilterQueryString()}")"
+                                           class="btn btn-sm btn-outline-primary"
+                                           aria-label="@($"Edit {mentor.DisplayName}")">
+                                            <span class="oi oi-pencil" aria-hidden="true"></span>
+                                            <span class="d-none d-lg-inline ms-1">Edit</span>
+                                        </a>
+                                    </div>
 
-                                <!-- Actions -->
-                                <div class="mentor-col-actions d-flex gap-2 flex-shrink-0">
-                                    <a href="@EditUrl("Edit",$"username={Uri.EscapeDataString(mentor.Username)}")"
-                                       class="btn btn-sm btn-outline-primary"
-                                       aria-label="@($"Edit {mentor.DisplayName}")">
-                                        <span class="oi oi-pencil" aria-hidden="true"></span>
-                                        <span class="d-none d-md-inline ms-1">Edit</span>
-                                    </a>
                                 </div>
 
                             </div>
@@ -196,9 +202,39 @@ else
 
     private void ToggleSortDir() => _sortAsc = !_sortAsc;
 
+    private void ToggleSortDirAndNavigate()
+    {
+        _sortAsc = !_sortAsc;
+        NavigateWithFilters();
+    }
+
+    private string BuildFilterQueryString()
+    {
+        var parts = new List<string>();
+        if (_villageFilter > 0)            parts.Add($"villageId={_villageFilter}");
+        if (!string.IsNullOrEmpty(_nameFilter)) parts.Add($"name={Uri.EscapeDataString(_nameFilter)}");
+        if (_showInactive)                 parts.Add("showInactive=1");
+        if (_sortBy != "lastname")         parts.Add($"sortBy={Uri.EscapeDataString(_sortBy)}");
+        if (!_sortAsc)                     parts.Add("sortDesc=1");
+        return string.Join("&", parts);
+    }
+
+    private void NavigateWithFilters()
+    {
+        _page = 1;
+        NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, BuildFilterQueryString()));
+    }
+
     protected override async Task OnParametersSetAsync()
     {
-        _mentors = await MentorService.GetMentorsAsync(ModuleState.ModuleId) ?? new List<MentorViewModel>();
+        if (PageState.QueryString.TryGetValue("villageId", out var vid) && int.TryParse(vid, out var villageId))
+            _villageFilter = villageId;
+        _nameFilter   = PageState.QueryString.GetValueOrDefault("name", "");
+        _showInactive = PageState.QueryString.ContainsKey("showInactive");
+        _sortBy       = PageState.QueryString.GetValueOrDefault("sortBy", "lastname");
+        _sortAsc      = !PageState.QueryString.ContainsKey("sortDesc");
+
+        _mentors  = await MentorService.GetMentorsAsync(ModuleState.ModuleId) ?? new List<MentorViewModel>();
         _villages = await VillageService.GetVillagesAsync() ?? new List<Village>();
         _isLoaded = true;
     }
@@ -241,7 +277,6 @@ else
         var idx = trimmed.LastIndexOf(' ');
         return idx < 0 ? (trimmed, string.Empty) : (trimmed[(idx + 1)..], trimmed[..idx]);
     }
-    }
 }
 
 <style>
@@ -252,5 +287,5 @@ else
     .mentor-col-village  { flex: 0 0 16%; min-width: 0; padding-right: .75rem; }
     .mentor-col-growers  { flex: 0 0 9%;  min-width: 0; padding-right: .75rem; }
     .mentor-col-status   { flex: 0 0 5%;  min-width: 0; padding-right: .75rem; }
-    .mentor-col-actions  { flex: 0 0 8%;  min-width: 0; white-space: nowrap; }
+    .mentor-col-actions  { flex: 1 1 auto; min-width: 0; white-space: nowrap; display: flex; justify-content: flex-end; }
 </style>
diff --git a/Client/Modules/Mentor/ModuleInfo.cs b/Client/Modules/Mentor/ModuleInfo.cs
@@ -9,9 +9,9 @@ public class ModuleInfo : IModule
         {
             Name = "Mentor",
             Description = "Mentor user management — create, edit, activate/deactivate mentors and assign growers",
-            Version = "2.3.0",
+            Version = "2.4.0",
             ServerManagerType = "",
-            ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,1.0.5,2.1.0,2.2.0,2.3.0",
+            ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,1.0.5,2.1.0,2.2.0,2.3.0,2.4.0",
             Dependencies = "OpenEug.TenTrees.Module.Village.1.0.0",
             PackageName = "OpenEug.TenTrees.Module.Mentor"
         };

Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,15 @@ else`
`18`	`18`	`{`
`19`	`19`	`<div class="container">`
`20`	`20`	`<div class="d-flex justify-content-between align-items-center mb-3">`
`21`		`- <h4>`
`22`		`- <span class="oi oi-person me-2" aria-hidden="true"></span>`
`23`		`- @(_isCreate ? "Add Mentor" : $"Edit Mentor — {_model.DisplayName}")`
`24`		`- </h4>`
	`21`	`+ <div class="d-flex align-items-center gap-2">`
	`22`	`+ <NavLink href="@NavigateUrl(PageState.Page.Path, PageState.QueryString)" class="btn btn-outline-secondary btn-sm">`
	`23`	`+ <span class="oi oi-arrow-left me-1" aria-hidden="true"></span> Back`
	`24`	`+ </NavLink>`
	`25`	`+ <h4 class="mb-0">`
	`26`	`+ <span class="oi oi-person me-2" aria-hidden="true"></span>`
	`27`	`+ @(_isCreate ? "Add Mentor" : $"Edit Mentor — {_model.DisplayName}")`
	`28`	`+ </h4>`
	`29`	`+ </div>`
`25`	`30`	`<div class="d-flex gap-2">`
`26`	`31`	`@if (!_isCreate)`
`27`	`32`	`{`
`@@ -38,9 +43,6 @@ else`
`38`	`43`	`</button>`
`39`	`44`	`}`
`40`	`45`	`}`
`41`		`- <NavLink href="@NavigateUrl()" class="btn btn-outline-secondary btn-sm">`
`42`		`- <span class="oi oi-arrow-left me-1" aria-hidden="true"></span> Back to Mentors`
`43`		`- </NavLink>`
`44`	`46`	`</div>`
`45`	`47`	`</div>`
`46`	`48`
`@@ -123,7 +125,7 @@ else`
`123`	`125`	`<span>Save</span>`
`124`	`126`	`}`
`125`	`127`	`</button>`
`126`		`- <NavLink href="@NavigateUrl()" class="btn btn-outline-secondary">Cancel</NavLink>`
	`128`	`+ <NavLink href="@NavigateUrl(PageState.Page.Path, PageState.QueryString)" class="btn btn-outline-secondary">Cancel</NavLink>`
`127`	`129`	`</div>`
`128`	`130`	`</div>`
`129`	`131`	`</div>`
`@@ -284,7 +286,7 @@ else`
`284`	`286`	`await ScrollToPageTop();`
`285`	`287`	`return;`
`286`	`288`	`}`
`287`		`- NavigationManager.NavigateTo(NavigateUrl());`
	`289`	`+ NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, PageState.QueryString));`
`288`	`290`	`}`
`289`	`291`	`else`
`290`	`292`	`{`