Open platform to collect and prioritize feedback
More user listing improvements
Matt Roberts41c83f248e95
diff --git a/app/handlers/admin.go b/app/handlers/admin.goindex 19824e254..73ae57a79 100644--- a/app/handlers/admin.go+++ b/app/handlers/admin.go@@ -31,7 +31,7 @@ func AdvancedSettingsPage() web.HandlerFunc {Page: "Administration/pages/AdvancedSettings.page",Title: "Advanced · Site Settings",Data: web.Map{- "customCSS": c.Tenant().CustomCSS,+ "customCSS": c.Tenant().CustomCSS,"allowedSchemes": c.Tenant().AllowedSchemes,},})@@ -84,7 +84,7 @@ func UpdateAdvancedSettings() web.HandlerFunc {}if err := bus.Dispatch(c, &cmd.UpdateTenantAdvancedSettings{- CustomCSS: action.CustomCSS,+ CustomCSS: action.CustomCSS,AllowedSchemes: action.AllowedSchemes,}); err != nil {return c.Failure(err)@@ -137,14 +137,22 @@ func UpdateEmailAuthAllowed() web.HandlerFunc {// ManageMembers is the page used by administrators to change member's rolefunc ManageMembers() web.HandlerFunc {return func(c *web.Context) error {- allUsers := &query.GetAllUsers{}- if err := bus.Dispatch(c, allUsers); err != nil {+ searchUsers := &query.SearchUsers{+ Query: c.QueryParam("query"),+ Roles: c.QueryParamAsArray("roles"),+ Limit: c.QueryParam("limit"),+ }+ if searchUsers.Limit == "" {+ searchUsers.Limit = "all"+ }++ if err := bus.Dispatch(c, searchUsers); err != nil {return c.Failure(err)}- // Create an array of UserWithEmail structs from the allUsers.Result- allUsersWithEmail := make([]entity.UserWithEmail, len(allUsers.Result))- for i, user := range allUsers.Result {+ // Create an array of UserWithEmail structs from the searchUsers.Result+ allUsersWithEmail := make([]entity.UserWithEmail, len(searchUsers.Result))+ for i, user := range searchUsers.Result {allUsersWithEmail[i] = entity.UserWithEmail{User: user,}diff --git a/app/handlers/apiv1/user.go b/app/handlers/apiv1/user.goindex 655d201aa..929cbc602 100644--- a/app/handlers/apiv1/user.go+++ b/app/handlers/apiv1/user.go@@ -15,11 +15,28 @@ import (// ListUsers returns all registered usersfunc ListUsers() web.HandlerFunc {return func(c *web.Context) error {- allUsers := &query.GetAllUsers{}- if err := bus.Dispatch(c, allUsers); err != nil {+ searchUsers := &query.SearchUsers{+ Query: c.QueryParam("query"),+ Roles: c.QueryParamAsArray("roles"),+ Limit: c.QueryParam("limit"),+ }+ if searchUsers.Limit == "" {+ searchUsers.Limit = "all"+ }++ if err := bus.Dispatch(c, searchUsers); err != nil {return c.Failure(err)}- return c.Ok(allUsers.Result)++ // Create an array of UserWithEmail structs to include email in JSON response+ allUsersWithEmail := make([]entity.UserWithEmail, len(searchUsers.Result))+ for i, user := range searchUsers.Result {+ allUsersWithEmail[i] = entity.UserWithEmail{+ User: user,+ }+ }++ return c.Ok(allUsersWithEmail)}}diff --git a/app/models/query/user.go b/app/models/query/user.goindex dc2c7f1e0..52f00be13 100644--- a/app/models/query/user.go+++ b/app/models/query/user.go@@ -51,3 +51,11 @@ type GetAllUsers struct {type GetAllUsersNames struct {Result []*dto.UserNames}++type SearchUsers struct {+ Query string+ Roles []string+ Limit string++ Result []*entity.User+}diff --git a/app/services/sqlstore/postgres/postgres.go b/app/services/sqlstore/postgres/postgres.goindex 382a10120..48348aa2a 100644--- a/app/services/sqlstore/postgres/postgres.go+++ b/app/services/sqlstore/postgres/postgres.go@@ -101,6 +101,7 @@ func (s Service) Init() {bus.AddHandler(getUserByProvider)bus.AddHandler(getAllUsers)bus.AddHandler(getAllUsersNames)+ bus.AddHandler(searchUsers)bus.AddHandler(createTenant)bus.AddHandler(getFirstTenant)diff --git a/app/services/sqlstore/postgres/user.go b/app/services/sqlstore/postgres/user.goindex 4e75e1cee..0fd98f123 100644--- a/app/services/sqlstore/postgres/user.go+++ b/app/services/sqlstore/postgres/user.go@@ -4,6 +4,7 @@ import ("context""database/sql""fmt"+ "strconv""strings""time"@@ -15,6 +16,7 @@ import ("github.com/getfider/fider/app/models/query""github.com/getfider/fider/app/pkg/dbx""github.com/getfider/fider/app/pkg/errors"+ "github.com/lib/pq")type dbUser struct {@@ -351,13 +353,13 @@ func getUserByProvider(ctx context.Context, q *query.GetUserByProvider) error {return using(ctx, func(trx *dbx.Trx, tenant *entity.Tenant, user *entity.User) error {var userID intif err := trx.Scalar(&userID, `- SELECT user_id- FROM user_providers up- INNER JOIN users u- ON u.id = up.user_id- AND u.tenant_id = up.tenant_id- WHERE up.provider = $1- AND up.provider_uid = $2+ SELECT user_id+ FROM user_providers up+ INNER JOIN users u+ ON u.id = up.user_id+ AND u.tenant_id = up.tenant_id+ WHERE up.provider = $1+ AND up.provider_uid = $2AND u.tenant_id = $3`, q.Provider, q.UID, tenant.ID); err != nil {return errors.Wrap(err, "failed to get user by provider '%s' and uid '%s'", q.Provider, q.UID)}@@ -374,8 +376,8 @@ func getAllUsers(ctx context.Context, q *query.GetAllUsers) error {var users []*dbUsererr := trx.Select(&users, `SELECT id, name, email, tenant_id, role, status, avatar_type, avatar_bkey- FROM users- WHERE tenant_id = $1+ FROM users+ WHERE tenant_id = $1AND status != $2ORDER BY id`, tenant.ID, enum.UserDeleted)if err != nil {@@ -395,8 +397,8 @@ func getAllUsersNames(ctx context.Context, q *query.GetAllUsersNames) error {var users []*dbUsererr := trx.Select(&users, `SELECT name- FROM users- WHERE tenant_id = $1+ FROM users+ WHERE tenant_id = $1AND status = $2ORDER BY id`, tenant.ID, enum.UserActive)if err != nil {@@ -428,3 +430,70 @@ func queryUser(ctx context.Context, trx *dbx.Trx, filter string, args ...any) (*return user.toModel(ctx), nil}++func searchUsers(ctx context.Context, q *query.SearchUsers) error {+ return using(ctx, func(trx *dbx.Trx, tenant *entity.Tenant, user *entity.User) error {+ if q.Roles == nil {+ q.Roles = []string{}+ }+ if q.Limit != "all" {+ if _, err := strconv.Atoi(q.Limit); err != nil {+ q.Limit = "30"+ }+ }++ baseQuery := `+ SELECT id, name, email, tenant_id, role, status, avatar_type, avatar_bkey, is_verified+ FROM users+ WHERE tenant_id = $1 AND status != $2+ `+ args := []interface{}{tenant.ID, enum.UserDeleted}+ argIndex := 3++ // Add search filter+ if q.Query != "" {+ baseQuery += fmt.Sprintf(" AND (name ILIKE $%d OR email ILIKE $%d)", argIndex, argIndex+1)+ searchTerm := "%" + q.Query + "%"+ args = append(args, searchTerm, searchTerm)+ argIndex += 2+ }++ // Add role filter+ 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+ }+ }+ baseQuery += fmt.Sprintf(" AND role = ANY($%d)", argIndex)+ args = append(args, pq.Array(roleValues))+ }++ baseQuery += " ORDER BY id"++ // Add limit+ if q.Limit != "all" {+ baseQuery += " LIMIT " + q.Limit+ }++ var users []*dbUser+ err := trx.Select(&users, baseQuery, args...)+ if err != nil {+ return errors.Wrap(err, "failed to search users")+ }++ q.Result = make([]*entity.User, len(users))+ for i, user := range users {+ q.Result[i] = user.toModel(ctx)+ }+ return nil+ })+}diff --git a/public/assets/styles/utility/display.scss b/public/assets/styles/utility/display.scssindex 1d439a456..08088b05c 100644--- a/public/assets/styles/utility/display.scss+++ b/public/assets/styles/utility/display.scss@@ -211,6 +211,10 @@border-top: 1px solid;}+.bb {+ border-bottom: 1px solid;+}+.bl {border-inline-start: 1px solid;}@@ -223,6 +227,10 @@overflow: auto;}+.overflow-hidden {+ overflow: hidden;+}+.border {border: 1px solid transparent;}diff --git a/public/pages/Administration/pages/ManageMembers.page.tsx b/public/pages/Administration/pages/ManageMembers.page.tsxindex 549585b97..ebcb3b79e 100644--- a/public/pages/Administration/pages/ManageMembers.page.tsx+++ b/public/pages/Administration/pages/ManageMembers.page.tsx@@ -1,18 +1,13 @@-import React from "react"+import React, { useState, useEffect, useCallback } from "react"import { Input, Avatar, Icon, Dropdown, Button } from "@fider/components"import { User, UserRole, UserStatus } from "@fider/models"-import { AdminBasePage } from "../components/AdminBasePage"import IconSearch from "@fider/assets/images/heroicons-search.svg"import IconX from "@fider/assets/images/heroicons-x.svg"import IconDotsHorizontal from "@fider/assets/images/heroicons-dots-horizontal.svg"+import HeroIconFilter from "@fider/assets/images/heroicons-filter.svg"import { actions, Fider } from "@fider/services"-import { HStack } from "@fider/components/layout"--interface ManageMembersPageState {- query: string- users: User[]- visibleUsers: User[]-}+import { AdminPageContainer } from "../components/AdminBasePage"+import { HStack, VStack } from "@fider/components/layout"interface ManageMembersPageProps {users: User[]@@ -21,7 +16,6 @@ interface ManageMembersPageProps {interface UserListItemProps {user: UseronAction: (actionName: string, user: User) => Promise<void>- isEven: boolean}const UserListItem = (props: UserListItemProps) => {@@ -36,7 +30,7 @@ const UserListItem = (props: UserListItemProps) => {return (<div- className={`grid gap-4 py-4 px-4 flex-items-center ${props.isEven ? "bg-gray-50" : "bg-white"} hover:bg-gray-100`}+ className={`bb border-gray-200 grid gap-4 py-4 px-4 flex-items-center bg-white hover:bg-gray-100`}style={{ gridTemplateColumns: "2fr 2fr 1fr 100px" }}><HStack>@@ -68,75 +62,28 @@ const UserListItem = (props: UserListItemProps) => {)}-export default class ManageMembersPage extends AdminBasePage<ManageMembersPageProps, ManageMembersPageState> {- public id = "p-admin-members"- public name = "members"- public title = "Members"- public subtitle = "Manage your site administrators and collaborators"-- constructor(props: ManageMembersPageProps) {- super(props)+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 [searchTimeoutId, setSearchTimeoutId] = useState<number | undefined>(undefined)- const users = this.props.users.sort(this.sortByStaff)+ // Initialize state from URL parameters and props+ useEffect(() => {+ const urlParams = new URLSearchParams(window.location.search)+ const initialQuery = urlParams.get("query") || ""+ const initialRoleFilter = (urlParams.get("roles") as UserRole) || "all"- this.state = {- query: "",- users,- visibleUsers: users.slice(0, 10),- }- }+ setQuery(initialQuery)+ setRoleFilter(initialRoleFilter)- private showMore = (): void => {- this.setState({- visibleUsers: this.state.users.slice(0, this.state.visibleUsers.length + 10),- })- }+ const sortedUsers = props.users.sort(sortByStaff)+ setUsers(sortedUsers)+ setVisibleUsers(sortedUsers.slice(0, 10))+ }, [props.users])- private clearSearch = () => {- this.handleSearchFilterChanged("")- }-- private memberFilter = (query: string, user: User): boolean => {- return user.name.toLowerCase().indexOf(query.toLowerCase()) >= 0 || (user.email && user.email.toLowerCase().indexOf(query.toLowerCase()) >= 0) || false- }-- private handleSearchFilterChanged = (query: string) => {- const users = this.props.users.filter((x) => this.memberFilter(query, x)).sort(this.sortByStaff)- this.setState({ query, users, visibleUsers: users.slice(0, 10) })- }-- private handleAction = async (actionName: string, user: User) => {- const changeRole = async (role: UserRole) => {- const result = await actions.changeUserRole(user.id, role)- if (result.ok) {- user.role = role- }- this.handleSearchFilterChanged(this.state.query)- }-- const changeStatus = async (status: UserStatus) => {- const action = status === UserStatus.Blocked ? actions.blockUser : actions.unblockUser- const result = await action(user.id)- if (result.ok) {- user.status = status- }- this.forceUpdate()- }-- if (actionName === "to-collaborator") {- await changeRole(UserRole.Collaborator)- } else if (actionName === "to-visitor") {- await changeRole(UserRole.Visitor)- } else if (actionName === "to-administrator") {- await changeRole(UserRole.Administrator)- } else if (actionName === "block") {- await changeStatus(UserStatus.Blocked)- } else if (actionName === "unblock") {- await changeStatus(UserStatus.Active)- }- }-- private sortByStaff = (left: User, right: User) => {+ const sortByStaff = (left: User, right: User) => {if (right.role === left.role) {if (left.name < right.name) {return -1@@ -152,59 +99,184 @@ export default class ManageMembersPage extends AdminBasePage<ManageMembersPagePrreturn -1}- public content() {- return (- <>- <Input- field="query"- icon={this.state.query ? IconX : IconSearch}- onIconClick={this.state.query ? this.clearSearch : undefined}- placeholder="Search for users by name / email ..."- value={this.state.query}- onChange={this.handleSearchFilterChanged}- />- <div className="shadow rounded border overflow-hidden">- <div className="grid gap-4 py-3 px-4 bg-gray-100 text-category border-b" style={{ gridTemplateColumns: "2fr 2fr 1fr 100px" }}>- <div>User</div>- <div>Email</div>- <div>Role</div>- <div className="text-center">Actions</div>- </div>- <div>- {this.state.visibleUsers.map((user, index) => (- <UserListItem key={user.id} user={user} onAction={this.handleAction} isEven={index % 2 === 0} />- ))}- </div>+ 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())+ }++ 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 handleSearchFilterChanged = useCallback(+ (newQuery: string) => {+ setQuery(newQuery)++ // Debounce the API call for search+ if (searchTimeoutId) {+ clearTimeout(searchTimeoutId)+ }++ const timeoutId = window.setTimeout(() => {+ reloadUsers(newQuery, roleFilter)+ }, 300)++ setSearchTimeoutId(timeoutId)+ },+ [roleFilter, reloadUsers, searchTimeoutId]+ )++ const handleRoleFilterChanged = useCallback(+ (newRoleFilter: UserRole | "all") => {+ setRoleFilter(newRoleFilter)+ reloadUsers(query, newRoleFilter)+ },+ [query, reloadUsers]+ )++ const clearSearch = useCallback(() => {+ if (searchTimeoutId) {+ clearTimeout(searchTimeoutId)+ }+ setQuery("")+ reloadUsers("", roleFilter)+ }, [roleFilter, reloadUsers, searchTimeoutId])++ const showMore = useCallback(() => {+ setVisibleUsers(users.slice(0, visibleUsers.length + 10))+ }, [users, visibleUsers.length])++ const handleAction = useCallback(+ async (actionName: string, user: User) => {+ const changeRole = async (role: UserRole) => {+ const result = await actions.changeUserRole(user.id, role)+ if (result.ok) {+ 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))+ }+ }++ const changeStatus = async (status: UserStatus) => {+ const action = status === UserStatus.Blocked ? actions.blockUser : actions.unblockUser+ const result = await action(user.id)+ if (result.ok) {+ user.status = status+ // 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))+ }+ }++ if (actionName === "to-collaborator") {+ await changeRole(UserRole.Collaborator)+ } else if (actionName === "to-visitor") {+ await changeRole(UserRole.Visitor)+ } else if (actionName === "to-administrator") {+ await changeRole(UserRole.Administrator)+ } else if (actionName === "block") {+ await changeStatus(UserStatus.Blocked)+ } else if (actionName === "unblock") {+ await changeStatus(UserStatus.Active)+ }+ },+ [users, visibleUsers.length]+ )++ return (+ <AdminPageContainer id="p-admin-members" name="members" title="Members" subtitle="Manage your site administrators and collaborators">+ <div className="flex gap-4 flex-items-center mb-4">+ <div className="flex-grow">+ <Input+ field="query"+ icon={query ? IconX : IconSearch}+ onIconClick={query ? clearSearch : undefined}+ placeholder="Search for users by name / email ..."+ value={query}+ onChange={handleSearchFilterChanged}+ /></div>- <p className="text-muted pt-4">- {!this.state.query && (- <>- Showing {this.state.visibleUsers.length} of {this.state.users.length} registered users.- </>- )}- {this.state.query && (- <>- Showing {this.state.visibleUsers.length} of {this.state.users.length} users matching '{this.state.query}'.- </>- )}- {this.state.visibleUsers.length < this.state.users.length && (- <Button variant="tertiary" onClick={this.showMore}>- view more- </Button>- )}- </p>- <ul className="text-muted">- <li>- <strong>Administrators</strong> have full access to edit and manage content, permissions and all site settings.- </li>- <li>- <strong>Collaborators</strong> can edit and manage content, but not permissions and settings.- </li>- <li>- <strong>Blocked</strong> users are unable to sign into this site.- </li>- </ul>- </>- )- }+ <Dropdown+ renderHandle={+ <div className="flex flex-items-center h-10 text-medium text-xs rounded-md uppercase border border-gray-400 text-gray-800 p-2 px-3 hover">+ <Icon sprite={HeroIconFilter} className="h-5 pr-1" />+ Role+ {roleFilter !== "all" && <div className="bg-gray-200 inline-block rounded-full px-2 py-1 w-min-4 text-2xs text-center ml-2">1</div>}+ </div>+ }+ >+ <Dropdown.ListItem onClick={() => handleRoleFilterChanged("all")}>+ <span className={roleFilter === "all" ? "text-semibold" : ""}>All Roles</span>+ </Dropdown.ListItem>+ <Dropdown.ListItem onClick={() => handleRoleFilterChanged(UserRole.Administrator)}>+ <span className={roleFilter === UserRole.Administrator ? "text-semibold" : ""}>Administrators</span>+ </Dropdown.ListItem>+ <Dropdown.ListItem onClick={() => handleRoleFilterChanged(UserRole.Collaborator)}>+ <span className={roleFilter === UserRole.Collaborator ? "text-semibold" : ""}>Collaborators</span>+ </Dropdown.ListItem>+ <Dropdown.ListItem onClick={() => handleRoleFilterChanged(UserRole.Visitor)}>+ <span className={roleFilter === UserRole.Visitor ? "text-semibold" : ""}>Visitors</span>+ </Dropdown.ListItem>+ </Dropdown>+ </div>++ <VStack className="rounded-md border border-gray-200 overflow-hidden">+ <div className="grid gap-4 py-3 px-4 bg-gray-100 text-category border-b" style={{ gridTemplateColumns: "2fr 2fr 1fr 100px" }}>+ <div>Name</div>+ <div>Email</div>+ <div>Role</div>+ </div>+ <div>+ {visibleUsers.map((user, index) => (+ <UserListItem key={user.id} user={user} onAction={handleAction} />+ ))}+ </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 '{query}'</>}+ {roleFilter !== "all" && <> with role '{roleFilter}'</>}.+ </>+ )}+ {visibleUsers.length < users.length && (+ <Button variant="tertiary" onClick={showMore}>+ view more+ </Button>+ )}+ </p>++ <ul className="text-muted">+ <li>+ <strong>Administrators</strong> have full access to edit and manage content, permissions and all site settings.+ </li>+ <li>+ <strong>Collaborators</strong> can edit and manage content, but not permissions and settings.+ </li>+ <li>+ <strong>Blocked</strong> users are unable to sign into this site.+ </li>+ </ul>+ </AdminPageContainer>+ )}