Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

Re-work of member listing page.

Matt Roberts28e7361017ec
diff --git a/app/handlers/admin.go b/app/handlers/admin.go
index 73ae57a79..98e9865e2 100644
--- a/app/handlers/admin.go
+++ b/app/handlers/admin.go
@@ -137,13 +137,17 @@ func UpdateEmailAuthAllowed() web.HandlerFunc {
// ManageMembers is the page used by administrators to change member's role
func ManageMembers() web.HandlerFunc {
return func(c *web.Context) error {
+ // Only load first page for initial page load - subsequent pagination handled by API
+ page, _ := c.QueryParamAsInt("page")
+ if page <= 0 {
+ page = 1
+ }
+
searchUsers := &query.SearchUsers{
Query: c.QueryParam("query"),
Roles: c.QueryParamAsArray("roles"),
- Limit: c.QueryParam("limit"),
- }
- if searchUsers.Limit == "" {
- searchUsers.Limit = "all"
+ Page: page,
+ Limit: 10,
}
if err := bus.Dispatch(c, searchUsers); err != nil {
@@ -162,7 +166,8 @@ func ManageMembers() web.HandlerFunc {
Page: "Administration/pages/ManageMembers.page",
Title: "Manage Members · Site Settings",
Data: web.Map{
- "users": allUsersWithEmail,
+ "users": allUsersWithEmail,
+ "totalPages": (searchUsers.TotalCount + 10 - 1) / 10,
},
})
}
diff --git a/app/handlers/admin_test.go b/app/handlers/admin_test.go
index 63adfd274..2f8d864e7 100644
--- a/app/handlers/admin_test.go
+++ b/app/handlers/admin_test.go
@@ -8,6 +8,7 @@ import (
"testing"
"github.com/getfider/fider/app/models/cmd"
+ "github.com/getfider/fider/app/models/entity"
"github.com/getfider/fider/app/models/query"
. "github.com/getfider/fider/app/pkg/assert"
@@ -77,9 +78,9 @@ func TestUpdateSettingsHandler_NewLogo(t *testing.T) {
OnTenant(mock.DemoTenant).
AsUser(mock.JonSnow).
ExecutePost(
- handlers.UpdateSettings(), `{
- "title": "GoT",
- "invitation": "Join us!",
+ handlers.UpdateSettings(), `{
+ "title": "GoT",
+ "invitation": "Join us!",
"welcomeMessage": "Welcome to GoT Feedback Forum",
"locale": "pt-BR",
"logo": {
@@ -119,10 +120,10 @@ func TestUpdateSettingsHandler_RemoveLogo(t *testing.T) {
OnTenant(mock.DemoTenant).
AsUser(mock.JonSnow).
ExecutePost(
- handlers.UpdateSettings(), `{
- "title": "GoT",
- "invitation": "Join us!",
- "locale": "en",
+ handlers.UpdateSettings(), `{
+ "title": "GoT",
+ "invitation": "Join us!",
+ "locale": "en",
"welcomeMessage": "Welcome to GoT Feedback Forum",
"logo": {
"remove": true
@@ -200,7 +201,9 @@ func TestUpdatePrivacySettingsHandler(t *testing.T) {
func TestManageMembersHandler(t *testing.T) {
RegisterT(t)
- bus.AddHandler(func(ctx context.Context, q *query.GetAllUsers) error {
+ bus.AddHandler(func(ctx context.Context, q *query.SearchUsers) error {
+ q.Result = []*entity.User{}
+ q.TotalCount = 0
return nil
})
diff --git a/app/handlers/apiv1/user.go b/app/handlers/apiv1/user.go
index 929cbc602..cb99dc821 100644
--- a/app/handlers/apiv1/user.go
+++ b/app/handlers/apiv1/user.go
@@ -12,16 +12,24 @@ import (
"github.com/getfider/fider/app/pkg/web"
)
-// ListUsers returns all registered users
+// ListUsers returns paginated registered users
func ListUsers() web.HandlerFunc {
return func(c *web.Context) error {
+ page, _ := c.QueryParamAsInt("page")
+ if page <= 0 {
+ page = 1
+ }
+
+ limit, _ := c.QueryParamAsInt("limit")
+ if limit <= 0 {
+ limit = 10
+ }
+
searchUsers := &query.SearchUsers{
Query: c.QueryParam("query"),
Roles: c.QueryParamAsArray("roles"),
- Limit: c.QueryParam("limit"),
- }
- if searchUsers.Limit == "" {
- searchUsers.Limit = "all"
+ Page: page,
+ Limit: limit,
}
if err := bus.Dispatch(c, searchUsers); err != nil {
@@ -36,7 +44,15 @@ func ListUsers() web.HandlerFunc {
}
}
- return c.Ok(allUsersWithEmail)
+ totalPages := (searchUsers.TotalCount + limit - 1) / limit
+
+ return c.Ok(web.Map{
+ "users": allUsersWithEmail,
+ "totalCount": searchUsers.TotalCount,
+ "totalPages": totalPages,
+ "page": page,
+ "limit": limit,
+ })
}
}
diff --git a/app/handlers/apiv1/user_test.go b/app/handlers/apiv1/user_test.go
index 3a3510b22..1b6a2ec46 100644
--- a/app/handlers/apiv1/user_test.go
+++ b/app/handlers/apiv1/user_test.go
@@ -20,11 +20,12 @@ import (
func TestListUsersHandler(t *testing.T) {
RegisterT(t)
- bus.AddHandler(func(ctx context.Context, q *query.GetAllUsers) error {
+ bus.AddHandler(func(ctx context.Context, q *query.SearchUsers) error {
q.Result = []*entity.User{
{ID: 1, Name: "User 1"},
{ID: 2, Name: "User 2"},
}
+ q.TotalCount = 2
return nil
})
@@ -35,8 +36,9 @@ func TestListUsersHandler(t *testing.T) {
ExecuteAsJSON(apiv1.ListUsers())
Expect(status).Equals(http.StatusOK)
- Expect(query.IsArray()).IsTrue()
- Expect(query.ArrayLength()).Equals(2)
+ Expect(query.IsArray()).IsFalse() // Should be an object, not an array
+ Expect(query.Int32("totalCount")).Equals(2)
+ Expect(query.Contains("users")).IsTrue()
}
func TestCreateUser_ExistingEmail(t *testing.T) {
diff --git a/app/models/entity/user_test.go b/app/models/entity/user_test.go
index af391886b..dfbb48622 100644
--- a/app/models/entity/user_test.go
+++ b/app/models/entity/user_test.go
@@ -21,7 +21,7 @@ func TestUserWithEmail_MarshalJSON(t *testing.T) {
},
}
- expectedJSON := `{"id":1,"name":"John Doe","role":"visitor","status":"active","email":"[email protected]"}`
+ expectedJSON := `{"id":1,"name":"John Doe","role":"visitor","status":"active","isVerified":false,"email":"[email protected]"}`
jsonData, err := json.Marshal(user)
if err != nil {
@@ -43,7 +43,7 @@ func TestUser_MarshalJSON(t *testing.T) {
Status: 1,
}
- expectedJSON := `{"id":1,"name":"John Doe","role":"visitor","status":"active"}`
+ expectedJSON := `{"id":1,"name":"John Doe","role":"visitor","status":"active","isVerified":false}`
jsonData, err := json.Marshal(user)
if err != nil {
diff --git a/app/models/query/user.go b/app/models/query/user.go
index 52f00be13..ddcd3dce2 100644
--- a/app/models/query/user.go
+++ b/app/models/query/user.go
@@ -55,7 +55,9 @@ type GetAllUsersNames struct {
type SearchUsers struct {
Query string
Roles []string
- Limit string
+ Page int
+ Limit int
- Result []*entity.User
+ Result []*entity.User
+ TotalCount int
}
diff --git a/app/services/sqlstore/postgres/user.go b/app/services/sqlstore/postgres/user.go
index 0fd98f123..a8e3a90d1 100644
--- a/app/services/sqlstore/postgres/user.go
+++ b/app/services/sqlstore/postgres/user.go
@@ -4,7 +4,6 @@ import (
"context"
"database/sql"
"fmt"
- "strconv"
"strings"
"time"
@@ -436,10 +435,11 @@ func searchUsers(ctx context.Context, q *query.SearchUsers) error {
if q.Roles == nil {
q.Roles = []string{}
}
- if q.Limit != "all" {
- if _, err := strconv.Atoi(q.Limit); err != nil {
- q.Limit = "30"
- }
+ if q.Limit <= 0 {
+ q.Limit = 10
+ }
+ if q.Page <= 0 {
+ q.Page = 1
}
baseQuery := `
@@ -477,15 +477,50 @@ func searchUsers(ctx context.Context, q *query.SearchUsers) error {
args = append(args, pq.Array(roleValues))
}
- baseQuery += " ORDER BY id"
+ baseQuery += " ORDER BY role desc, name"
+
+ // First, get the total count for pagination
+ countQuery := `SELECT COUNT(*) FROM users WHERE tenant_id = $1 AND status != $2`
+ countArgs := []interface{}{tenant.ID, enum.UserDeleted}
+ countArgIndex := 3
+
+ // Add the same filters for counting
+ if q.Query != "" {
+ countQuery += fmt.Sprintf(" AND (name ILIKE $%d OR email ILIKE $%d)", countArgIndex, countArgIndex+1)
+ searchTerm := "%" + q.Query + "%"
+ countArgs = append(countArgs, searchTerm, searchTerm)
+ countArgIndex += 2
+ }
+
+ if len(q.Roles) > 0 {
+ roleValues := make([]interface{}, len(q.Roles))
+ for i, roleStr := range q.Roles {
+ switch roleStr {
+ case "administrator":
+ roleValues[i] = enum.RoleAdministrator
+ case "collaborator":
+ roleValues[i] = enum.RoleCollaborator
+ case "visitor":
+ roleValues[i] = enum.RoleVisitor
+ default:
+ roleValues[i] = enum.RoleVisitor
+ }
+ }
+ countQuery += fmt.Sprintf(" AND role = ANY($%d)", countArgIndex)
+ countArgs = append(countArgs, pq.Array(roleValues))
+ }
- // Add limit
- if q.Limit != "all" {
- baseQuery += " LIMIT " + q.Limit
+ err := trx.Get(&q.TotalCount, countQuery, countArgs...)
+ if err != nil {
+ return errors.Wrap(err, "failed to count users")
}
+ // Add pagination to main query
+ offset := (q.Page - 1) * q.Limit
+ baseQuery += fmt.Sprintf(" LIMIT %d OFFSET %d", q.Limit, offset)
+
var users []*dbUser
- err := trx.Select(&users, baseQuery, args...)
+ err = trx.Select(&users, baseQuery, args...)
if err != nil {
return errors.Wrap(err, "failed to search users")
}
diff --git a/public/components/common/Pagination.tsx b/public/components/common/Pagination.tsx
new file mode 100644
index 000000000..1a38d8827
--- /dev/null
+++ b/public/components/common/Pagination.tsx
@@ -0,0 +1,103 @@
+import { Trans } from "@lingui/react/macro"
+import React from "react"
+import { HStack } from "../layout"
+import { Button } from "./Button"
+
+interface PaginationProps {
+ currentPage: number
+ totalPages: number
+ onPageChange: (page: number) => void
+}
+
+export const Pagination = ({ currentPage, totalPages, onPageChange }: PaginationProps) => {
+ if (totalPages <= 1) {
+ return null
+ }
+
+ const getVisiblePages = () => {
+ const visiblePages: (number | string)[] = []
+
+ if (totalPages <= 7) {
+ // Show all pages if 7 or fewer
+ for (let i = 1; i <= totalPages; i++) {
+ visiblePages.push(i)
+ }
+ } else {
+ // Always show first page
+ visiblePages.push(1)
+
+ if (currentPage <= 4) {
+ // Show first 5 pages + ellipsis + last page
+ for (let i = 2; i <= 5; i++) {
+ visiblePages.push(i)
+ }
+ visiblePages.push("...")
+ visiblePages.push(totalPages)
+ } else if (currentPage >= totalPages - 3) {
+ // Show first page + ellipsis + last 5 pages
+ visiblePages.push("...")
+ for (let i = totalPages - 4; i <= totalPages; i++) {
+ visiblePages.push(i)
+ }
+ } else {
+ // Show first page + ellipsis + current-1, current, current+1 + ellipsis + last page
+ visiblePages.push("...")
+ for (let i = currentPage - 1; i <= currentPage + 1; i++) {
+ visiblePages.push(i)
+ }
+ visiblePages.push("...")
+ visiblePages.push(totalPages)
+ }
+ }
+
+ return visiblePages
+ }
+
+ const handlePageClick = (page: number | string) => {
+ if (typeof page === "number" && page !== currentPage) {
+ onPageChange(page)
+ }
+ }
+
+ const handlePrevClick = () => {
+ if (currentPage > 1) {
+ onPageChange(currentPage - 1)
+ }
+ }
+
+ const handleNextClick = () => {
+ if (currentPage < totalPages) {
+ onPageChange(currentPage + 1)
+ }
+ }
+
+ const visiblePages = getVisiblePages()
+
+ return (
+ <HStack justify="between">
+ <Button className="no-focus" size="small" variant="secondary" onClick={handlePrevClick} disabled={currentPage === 1}>
+ <Trans id="pagination.prev">Previous</Trans>
+ </Button>
+
+ {/* Page Numbers */}
+ <div className="flex gap-1">
+ {visiblePages.map((page, index) => (
+ <React.Fragment key={index}>
+ {page === "..." ? (
+ <span className="px-3 align-self-end text-sm text-gray-500">...</span>
+ ) : (
+ <Button className="no-focus" size="small" variant="secondary" onClick={() => handlePageClick(page)}>
+ {page}
+ </Button>
+ )}
+ </React.Fragment>
+ ))}
+ </div>
+
+ {/* Next Button */}
+ <Button className="no-focus" onClick={handleNextClick} disabled={currentPage === totalPages} variant="secondary" size="small">
+ <Trans id="pagination.next">Next</Trans>
+ </Button>
+ </HStack>
+ )
+}
diff --git a/public/components/common/index.tsx b/public/components/common/index.tsx
index 8426005a3..4bea87a2d 100644
--- a/public/components/common/index.tsx
+++ b/public/components/common/index.tsx
@@ -30,6 +30,7 @@ export * from "./PoweredByFider"
export * from "./PageTitle"
export * from "./Dropdown"
export * from "./Money"
+export * from "./Pagination"
import Textarea from "react-textarea-autosize"
export { Textarea }
diff --git a/public/pages/Administration/pages/ManageMembers.page.tsx b/public/pages/Administration/pages/ManageMembers.page.tsx
index aca70c00d..a4adb0c84 100644
--- a/public/pages/Administration/pages/ManageMembers.page.tsx
+++ b/public/pages/Administration/pages/ManageMembers.page.tsx
@@ -1,5 +1,5 @@
import React, { useState, useEffect, useCallback } from "react"
-import { Input, Avatar, Icon, Dropdown, Button } from "@fider/components"
+import { Input, Avatar, Icon, Dropdown, Pagination } from "@fider/components"
import { User, UserRole, UserStatus } from "@fider/models"
import IconSearch from "@fider/assets/images/heroicons-search.svg"
import IconX from "@fider/assets/images/heroicons-x.svg"
@@ -11,6 +11,7 @@ import { HStack, VStack } from "@fider/components/layout"
interface ManageMembersPageProps {
users: User[]
+ totalPages: number
}
interface UserListItemProps {
@@ -34,7 +35,7 @@ const UserListItem = (props: UserListItemExtendedProps) => {
return (
<div
- className={`border-b border-gray-200 grid gap-4 py-4 px-4 flex-items-center bg-white hover:bg-gray-100 ${props.isLast ? "rounded-md-b" : ""}`}
+ className={`border-b border-gray-200 grid gap-4 py-4 px-4 flex-items-center bg-white hover ${props.isLast ? "rounded-md-b" : ""}`}
style={{ gridTemplateColumns: "minmax(200px, 1fr) minmax(280px, 2fr) minmax(120px, 150px) 100px" }}
>
<HStack>
@@ -42,7 +43,7 @@ const UserListItem = (props: UserListItemExtendedProps) => {
<div className="text-subtitle">{props.user.name}</div>
</HStack>
- <div className="text-muted text-ellipsis" title={props.user.email}>
+ <div className="text-muted nowrap" title={props.user.email}>
{props.user.email || "No email"}
</div>
@@ -73,57 +74,46 @@ const UserListItem = (props: UserListItemExtendedProps) => {
export default function ManageMembersPage(props: ManageMembersPageProps) {
const [query, setQuery] = useState("")
const [roleFilter, setRoleFilter] = useState<UserRole | "all">("all")
- const [users, setUsers] = useState<User[]>([])
- const [visibleUsers, setVisibleUsers] = useState<User[]>([])
+ const [users, setUsers] = useState<User[]>(props.users)
+ const [currentPage, setCurrentPage] = useState(1)
+ const [totalPages, setTotalPages] = useState(props.totalPages)
const [searchTimeoutId, setSearchTimeoutId] = useState<number | undefined>(undefined)
+ const pageSize = 10
- // Initialize state from URL parameters and props
+ // Initialize state from URL parameters and load first page
useEffect(() => {
const urlParams = new URLSearchParams(window.location.search)
const initialQuery = urlParams.get("query") || ""
const initialRoleFilter = (urlParams.get("roles") as UserRole) || "all"
+ const initialPage = parseInt(urlParams.get("page") || "1")
setQuery(initialQuery)
setRoleFilter(initialRoleFilter)
+ setCurrentPage(initialPage)
+ }, [])
- const sortedUsers = props.users.sort(sortByStaff)
- setUsers(sortedUsers)
- setVisibleUsers(sortedUsers.slice(0, 10))
- }, [props.users])
-
- const sortByStaff = (left: User, right: User) => {
- if (right.role === left.role) {
- if (left.name < right.name) {
- return -1
- } else if (left.name > right.name) {
- return 1
+ const reloadUsers = useCallback(
+ async (searchQuery: string, roleFilterValue: UserRole | "all", page = 1) => {
+ const params = new URLSearchParams()
+ if (searchQuery) {
+ params.append("query", searchQuery)
}
- return 0
- }
-
- if (right.role !== UserRole.Visitor) {
- return 1
- }
- return -1
- }
-
- const reloadUsers = useCallback(async (searchQuery: string, roleFilterValue: UserRole | "all") => {
- const params = new URLSearchParams()
- if (searchQuery) {
- params.append("query", searchQuery)
- }
- if (roleFilterValue !== "all") {
- params.append("roles", roleFilterValue.toString())
- }
+ if (roleFilterValue !== "all") {
+ params.append("roles", roleFilterValue.toString())
+ }
+ params.append("page", page.toString())
+ params.append("limit", pageSize.toString())
- const response = await fetch(`/api/v1/users${params.toString() ? "?" + params.toString() : ""}`)
- if (response.ok) {
- const usersData = await response.json()
- const sortedUsers = usersData.sort(sortByStaff)
- setUsers(sortedUsers)
- setVisibleUsers(sortedUsers.slice(0, 10))
- }
- }, [])
+ const response = await fetch(`/api/v1/users?${params.toString()}`)
+ if (response.ok) {
+ const data = await response.json()
+ setUsers(data.users)
+ setTotalPages(data.totalPages)
+ setCurrentPage(page)
+ }
+ },
+ [pageSize]
+ )
const handleSearchFilterChanged = useCallback(
(newQuery: string) => {
@@ -135,7 +125,7 @@ export default function ManageMembersPage(props: ManageMembersPageProps) {
}
const timeoutId = window.setTimeout(() => {
- reloadUsers(newQuery, roleFilter)
+ reloadUsers(newQuery, roleFilter, 1) // Reset to page 1 when searching
}, 300)
setSearchTimeoutId(timeoutId)
@@ -146,7 +136,7 @@ export default function ManageMembersPage(props: ManageMembersPageProps) {
const handleRoleFilterChanged = useCallback(
(newRoleFilter: UserRole | "all") => {
setRoleFilter(newRoleFilter)
- reloadUsers(query, newRoleFilter)
+ reloadUsers(query, newRoleFilter, 1) // Reset to page 1 when changing filter
},
[query, reloadUsers]
)
@@ -156,12 +146,15 @@ export default function ManageMembersPage(props: ManageMembersPageProps) {
clearTimeout(searchTimeoutId)
}
setQuery("")
- reloadUsers("", roleFilter)
+ reloadUsers("", roleFilter, 1)
}, [roleFilter, reloadUsers, searchTimeoutId])
- const showMore = useCallback(() => {
- setVisibleUsers(users.slice(0, visibleUsers.length + 10))
- }, [users, visibleUsers.length])
+ const handlePageChange = useCallback(
+ (page: number) => {
+ reloadUsers(query, roleFilter, page)
+ },
+ [query, roleFilter, reloadUsers]
+ )
const handleAction = useCallback(
async (actionName: string, user: User) => {
@@ -171,9 +164,7 @@ export default function ManageMembersPage(props: ManageMembersPageProps) {
user.role = role
// Update the user in current state without full reload
const updatedUsers = users.map((u) => (u.id === user.id ? user : u))
- const sortedUsers = updatedUsers.sort(sortByStaff)
- setUsers(sortedUsers)
- setVisibleUsers(sortedUsers.slice(0, visibleUsers.length))
+ setUsers(updatedUsers)
}
}
@@ -185,7 +176,6 @@ export default function ManageMembersPage(props: ManageMembersPageProps) {
// Update the user in current state without full reload
const updatedUsers = users.map((u) => (u.id === user.id ? user : u))
setUsers(updatedUsers)
- setVisibleUsers(updatedUsers.slice(0, visibleUsers.length))
}
}
@@ -201,7 +191,7 @@ export default function ManageMembersPage(props: ManageMembersPageProps) {
await changeStatus(UserStatus.Active)
}
},
- [users, visibleUsers.length]
+ [users]
)
return (
@@ -251,31 +241,15 @@ export default function ManageMembersPage(props: ManageMembersPageProps) {
<div>Role</div>
</div>
<div>
- {visibleUsers.map((user, index) => (
- <UserListItem key={user.id} user={user} onAction={handleAction} isLast={index === visibleUsers.length - 1} />
+ {users.map((user, index) => (
+ <UserListItem key={user.id} user={user} onAction={handleAction} isLast={index === users.length - 1} />
))}
</div>
</VStack>
- <p className="text-muted pt-4">
- {!query && roleFilter === "all" && (
- <>
- Showing {visibleUsers.length} of {users.length} registered users.
- </>
- )}
- {(query || roleFilter !== "all") && (
- <>
- Showing {visibleUsers.length} of {users.length} users
- {query && <> matching &apos;{query}&apos;</>}
- {roleFilter !== "all" && <> with role &apos;{roleFilter}&apos;</>}.
- </>
- )}
- {visibleUsers.length < users.length && (
- <Button variant="tertiary" onClick={showMore}>
- view more
- </Button>
- )}
- </p>
+ <div className="pt-4">
+ <Pagination currentPage={currentPage} totalPages={totalPages} onPageChange={handlePageChange} />
+ </div>
<ul className="text-muted">
<li>