Merge pull request #170 from daniil-saraev/fix/role-users-pagination

fix: role users pagination
skoruba · Feb 7, 2024 · 1cb3a90 · 1cb3a90
2 parents 6f88f3d + 67bb1fe
commit 1cb3a90
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 14 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>    
-    <Version>2.0.0</Version>
+    <Version>2.1.0</Version>
     <Authors>Jan Škoruba</Authors>
     <PackageTags>Duende IdentityServer Admin OpenIDConnect OAuth2 Identity</PackageTags>
     <PackageLicenseUrl>https://github.com/skoruba/Duende.IdentityServer.Admin/blob/main/LICENSE</PackageLicenseUrl>

diff --git a/src/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Shared/Dtos/Common/Pager.cs b/src/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Shared/Dtos/Common/Pager.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Jan Škoruba. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0.
 
+using System.Collections.Generic;
+
 namespace Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Shared.Dtos.Common
 {
 	public class Pager
@@ -16,5 +18,7 @@ public class Pager
 	    public bool EnableSearch { get; set; } = false;
 
 	    public int MaxPages { get; set; } = 10;
+
+	    public Dictionary<string, string> AdditionalParameters { get; } = new();
 	}
 }
diff --git a/src/Skoruba.Duende.IdentityServer.Admin.UI/Areas/AdminUI/Views/Identity/RoleUsers.cshtml b/src/Skoruba.Duende.IdentityServer.Admin.UI/Areas/AdminUI/Views/Identity/RoleUsers.cshtml
@@ -81,6 +81,14 @@
 
 <div class="row">
     <div class="col-12">
-        @await Html.PartialAsync("Common/Pager", new Pager { Action = "RoleUsers", PageSize = Model.PageSize, TotalCount = Model.TotalCount, EnableSearch = true, Search = ViewBag.Search })
+        @await Html.PartialAsync("Common/Pager", new Pager
+               {
+                   Action = "RoleUsers", 
+                   PageSize = Model.PageSize, 
+                   TotalCount = Model.TotalCount, 
+                   EnableSearch = true, 
+                   Search = ViewBag.Search,
+                   AdditionalParameters = { { "roleId", roleId } }
+               })
     </div>
 </div>
diff --git a/src/Skoruba.Duende.IdentityServer.Admin.UI/Areas/AdminUI/Views/Shared/Common/Pager.cshtml b/src/Skoruba.Duende.IdentityServer.Admin.UI/Areas/AdminUI/Views/Shared/Common/Pager.cshtml
@@ -1,4 +1,5 @@
 @using Microsoft.AspNetCore.Mvc.Localization
+@using Microsoft.AspNetCore.Mvc.TagHelpers
 @using Skoruba.Duende.IdentityServer.Admin.UI.Configuration.Constants
 @using Skoruba.Duende.IdentityServer.Admin.UI.Helpers
 @model Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Shared.Dtos.Common.Pager
@@ -17,22 +18,22 @@
 
 			@if (Model.EnableSearch)
 			{
-				<li class="page-item"><a class="page-link" asp-area="@CommonConsts.AdminUIArea" asp-action="@Model.Action" asp-route-page="1" asp-route-search="@Model.Search">@Localizer["FirstButtonText"]</a></li>
+				<li class="page-item"><a class="page-link" asp-area="@CommonConsts.AdminUIArea" asp-action="@Model.Action" asp-all-route-data="@Model.AdditionalParameters" asp-route-page="1" asp-route-search="@Model.Search">@Localizer["FirstButtonText"]</a></li>
 			}
 			else
 			{
-				<li class="page-item"><a class="page-link" asp-area="@CommonConsts.AdminUIArea" asp-action="@Model.Action" asp-route-page="1">@Localizer["FirstButtonText"]</a></li>
+				<li class="page-item"><a class="page-link" asp-area="@CommonConsts.AdminUIArea" asp-action="@Model.Action" asp-all-route-data="@Model.AdditionalParameters" asp-route-page="1">@Localizer["FirstButtonText"]</a></li>
 			}
 
 			@if (PagerHelpers.ShowLeftPagerButton(Model.MaxPages, totalCount, currentPage))
 			{
 				if (Model.EnableSearch)
 				{
-					<li class="page-item"><a class="page-link" asp-area="@CommonConsts.AdminUIArea" asp-action="@Model.Action" asp-route-page="@(minPage - 1)" asp-route-search="@Model.Search">...</a></li>
+					<li class="page-item"><a class="page-link" asp-area="@CommonConsts.AdminUIArea" asp-action="@Model.Action" asp-all-route-data="@Model.AdditionalParameters" asp-route-page="@(minPage - 1)" asp-route-search="@Model.Search">...</a></li>
 				}
 				else
 				{
-					<li class="page-item"><a class="page-link" asp-area="@CommonConsts.AdminUIArea" asp-action="@Model.Action" asp-route-page="@(minPage - 1)">...</a></li>
+					<li class="page-item"><a class="page-link" asp-area="@CommonConsts.AdminUIArea" asp-action="@Model.Action" asp-all-route-data="@Model.AdditionalParameters" asp-route-page="@(minPage - 1)">...</a></li>
 				}
 			}
 
@@ -42,22 +43,22 @@
 				{
 					if (PagerHelpers.IsActivePage(currentPage, i))
 					{
-						<li class="page-item active"><a class="page-link" asp-action="@Model.Action" asp-route-page="@i" asp-route-search="@Model.Search">@i</a></li>
+						<li class="page-item active"><a class="page-link" asp-action="@Model.Action" asp-all-route-data="@Model.AdditionalParameters" asp-route-page="@i" asp-route-search="@Model.Search">@i</a></li>
 					}
 					else
 					{
-						<li class="page-item"><a class="page-link" asp-action="@Model.Action" asp-route-page="@i" asp-route-search="@Model.Search">@i</a></li>
+						<li class="page-item"><a class="page-link" asp-action="@Model.Action" asp-all-route-data="@Model.AdditionalParameters" asp-route-page="@i" asp-route-search="@Model.Search">@i</a></li>
 					}
 				}
 				else
 				{
 					if (PagerHelpers.IsActivePage(currentPage, i))
 					{
-						<li class="page-item active"><a class="page-link" asp-area="@CommonConsts.AdminUIArea" asp-action="@Model.Action" asp-route-page="@i">@i</a></li>
+						<li class="page-item active"><a class="page-link" asp-area="@CommonConsts.AdminUIArea" asp-action="@Model.Action" asp-all-route-data="@Model.AdditionalParameters" asp-route-page="@i">@i</a></li>
 					}
 					else
 					{
-						<li class="page-item"><a class="page-link" asp-area="@CommonConsts.AdminUIArea" asp-action="@Model.Action" asp-route-page="@i">@i</a></li>
+						<li class="page-item"><a class="page-link" asp-area="@CommonConsts.AdminUIArea" asp-action="@Model.Action" asp-all-route-data="@Model.AdditionalParameters" asp-route-page="@i">@i</a></li>
 					}
 				}
 			}
@@ -66,21 +67,21 @@
 			{
 				if (Model.EnableSearch)
 				{
-					<li class="page-item"><a class="page-link" asp-area="@CommonConsts.AdminUIArea" asp-action="@Model.Action" asp-route-page="@(maxPage + 1)" asp-route-search="@Model.Search">...</a></li>
+					<li class="page-item"><a class="page-link" asp-area="@CommonConsts.AdminUIArea" asp-action="@Model.Action" asp-all-route-data="@Model.AdditionalParameters" asp-route-page="@(maxPage + 1)" asp-route-search="@Model.Search">...</a></li>
 				}
 				else
 				{
-					<li class="page-item"><a class="page-link" asp-area="@CommonConsts.AdminUIArea" asp-action="@Model.Action" asp-route-page="@(maxPage + 1)">...</a></li>
+					<li class="page-item"><a class="page-link" asp-area="@CommonConsts.AdminUIArea" asp-action="@Model.Action" asp-all-route-data="@Model.AdditionalParameters" asp-route-page="@(maxPage + 1)">...</a></li>
 				}
 			}
 
 			@if (Model.EnableSearch)
 			{
-				<li class="page-item"><a class="page-link" asp-area="@CommonConsts.AdminUIArea" asp-action="@Model.Action" asp-route-page="@totalCount" asp-route-search="@Model.Search">@Localizer["LastButtonText"]</a></li>
+				<li class="page-item"><a class="page-link" asp-area="@CommonConsts.AdminUIArea" asp-action="@Model.Action" asp-all-route-data="@Model.AdditionalParameters" asp-route-page="@totalCount" asp-route-search="@Model.Search">@Localizer["LastButtonText"]</a></li>
 			}
 			else
 			{
-				<li class="page-item"><a class="page-link" asp-area="@CommonConsts.AdminUIArea" asp-action="@Model.Action" asp-route-page="@totalCount">@Localizer["LastButtonText"]</a></li>
+				<li class="page-item"><a class="page-link" asp-area="@CommonConsts.AdminUIArea" asp-action="@Model.Action" asp-all-route-data="@Model.AdditionalParameters" asp-route-page="@totalCount">@Localizer["LastButtonText"]</a></li>
 			}
 		</ul>
 	</nav>