From 9448a7721ecdcd1a8686517ce13457cbe59f6714 Mon Sep 17 00:00:00 2001
From: Kevin Joy <mrkevinjoy@outlook.com>
Date: Mon, 6 Nov 2023 13:30:47 +0000
Subject: [PATCH] Fix for bottom paging next/previous buttons from losing
 usersearch querystring

---
 .../Pages/Admin/Users.cshtml                           | 10 +++++-----
 .../Pages/Admin/Users.cshtml.cs                        |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dotnet-authserver/src/TeacherIdentity.AuthServer/Pages/Admin/Users.cshtml b/dotnet-authserver/src/TeacherIdentity.AuthServer/Pages/Admin/Users.cshtml
index 1c5897637..238b71053 100644
--- a/dotnet-authserver/src/TeacherIdentity.AuthServer/Pages/Admin/Users.cshtml
+++ b/dotnet-authserver/src/TeacherIdentity.AuthServer/Pages/Admin/Users.cshtml
@@ -65,7 +65,7 @@
                     <govuk-pagination>
                         @if (Model.PreviousPage.HasValue)
                         {
-                            <govuk-pagination-previous asp-page="Users" asp-all-route-data="@Model.GetPage((int)Model.PreviousPage!)" asp-route-usersearch="@Model.UserSearch" />
+                            <govuk-pagination-previous asp-page="Users" asp-all-route-data="@Model.GetPage((int)Model.PreviousPage!)" />
                         }
 
                         @for (int i = 0; i < Model.PaginationPages!.Length; i++)
@@ -77,12 +77,12 @@
                                 <govuk-pagination-ellipsis/>
                             }
 
-                            <govuk-pagination-item asp-page="Users" asp-all-route-data=@Model.GetPage(item) is-current="@(item == Model.PageNumber)" asp-route-usersearch="@Model.UserSearch">@item</govuk-pagination-item>
+                            <govuk-pagination-item asp-page="Users" asp-all-route-data=@Model.GetPage(item) is-current="@(item == Model.PageNumber)">@item</govuk-pagination-item>
                         }
 
                         @if (Model.NextPage.HasValue)
                         {
-                            <govuk-pagination-next asp-page="Users" asp-all-route-data=@Model.GetPage((int)Model.NextPage!) asp-route-usersearch="@Model.UserSearch" />
+                            <govuk-pagination-next asp-page="Users" asp-all-route-data=@Model.GetPage((int)Model.NextPage!) />
                         }
                     </govuk-pagination>
                 }
@@ -124,12 +124,12 @@
                     <govuk-pagination>
                         @if (Model.PreviousPage.HasValue)
                         {
-                            <govuk-pagination-previous asp-page="Users" asp-all-route-data=@Model.GetPage((int)Model.PreviousPage!)/>
+                            <govuk-pagination-previous asp-page="Users" asp-all-route-data=@Model.GetPage((int)Model.PreviousPage!) />
                         }
 
                         @if (Model.NextPage.HasValue)
                         {
-                            <govuk-pagination-next asp-page="Users" asp-all-route-data=@Model.GetPage((int)Model.NextPage!)/>
+                            <govuk-pagination-next asp-page="Users" asp-all-route-data=@Model.GetPage((int)Model.NextPage!) />
                         }
                     </govuk-pagination>
                 }
diff --git a/dotnet-authserver/src/TeacherIdentity.AuthServer/Pages/Admin/Users.cshtml.cs b/dotnet-authserver/src/TeacherIdentity.AuthServer/Pages/Admin/Users.cshtml.cs
index 7f6b9819d..cd5e8fe28 100644
--- a/dotnet-authserver/src/TeacherIdentity.AuthServer/Pages/Admin/Users.cshtml.cs
+++ b/dotnet-authserver/src/TeacherIdentity.AuthServer/Pages/Admin/Users.cshtml.cs
@@ -108,13 +108,13 @@ public Dictionary<string, string> GetPage(int pageNumber)
         var pageData = new Dictionary<string, string>
         {
             { "PageNumber", pageNumber.ToString() },
+            { "UserSearch", UserSearch ?? "" }
         };
 
         for (var i = 0; i < LookupStatus!.Length; i++)
         {
             pageData.Add($"LookupStatus[{i}]", LookupStatus[i].ToString()!);
         }
-
         return pageData;
     }