Skip to content

feat(permissions): Add sorting feature for Users based on role #7654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
afsuyadi wants to merge 2 commits into
base: main
Choose a base branch
from
+149 −115
Open

feat(permissions): Add sorting feature for Users based on role #7654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8041ff
feat(permissions): add ability to sort users by role in permissions s…
afsuyadi Jun 1, 2026
2d63a4f
fix(permissions): add stable reference to prevent memoization break
afsuyadi Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
255 changes: 140 additions & 115 deletions frontend/web/components/EditPermissions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,19 @@ import Switch from './Switch'
import TabItem from './navigation/TabMenu/TabItem'
import Tabs from './navigation/TabMenu/Tabs'
import UserGroupList from './UserGroupList'
import { PermissionLevel, Req, PermissionRoleType } from 'common/types/requests'
import {
PermissionLevel,
Req,
PermissionRoleType,
SortOrder,
} from 'common/types/requests'
Comment thread
afsuyadi marked this conversation as resolved.
const USER_SORT_OPTIONS = [
{
label: 'Role',
order: SortOrder.ASC,
value: '_roleRank',
},
]
import { useGetAvailablePermissionsQuery } from 'common/services/useAvailablePermissions'
import ConfigProvider from 'common/providers/ConfigProvider'
import Icon from './icons/Icon'
Expand Down Expand Up @@ -1086,125 +1098,138 @@ const EditPermissions: FC<EditPermissionsType> = (props) => {
>
<TabItem tabLabel='Users'>
<OrganisationProvider>
{({ isLoading, users }) => (
<div className='mt-4'>
{isLoading && !users?.length && (
<div className='centered-container'>
<Loader />
</div>
)}
{!!users?.length && (
<div>
<FormGroup className='panel no-pad pl-2 pr-2 panel--nested'>
<div className={tabClassName}>
<PanelSearch
id='org-members-list'
title='Users'
className='panel--transparent'
items={users}
itemHeight={64}
header={
<Row className='table-header'>
<Flex className='table-column px-3'>User</Flex>
<Flex className='table-column'>Role</Flex>
<div
style={{ width: '80px' }}
className='table-column text-center'
>
Action
</div>
</Row>
}
renderRow={(user) => {
const { email, first_name, id, last_name, role } =
user
const onClick = () => {
if (role !== 'ADMIN') {
editUserPermissions(user)
}
}
const matchingPermissions = permissions?.find(
(v) => v.user.id === id,
)

return (
<Row
onClick={onClick}
space
className={`list-item${
role === 'ADMIN' ? '' : ' clickable'
}`}
key={id}
>
<Flex className='table-column px-3'>
<div className='mb-1 font-weight-medium'>
{`${first_name} ${last_name}`}{' '}
{String(id) ===
String(AccountStore.getUserId()) &&
'(You)'}
</div>
<div className='list-item-subtitle'>
{email}
</div>
</Flex>
{role === 'ADMIN' ? (
<Flex className='table-column fs-small lh-sm'>
<Tooltip
title={'Organisation Administrator'}
>
{
'Organisation administrators have all permissions enabled.<br/>To change the role of this user, visit Organisation Settings.'
}
</Tooltip>
</Flex>
) : (
<Flex
onClick={onClick}
className='table-column fs-small lh-sm'
>
{matchingPermissions &&
matchingPermissions.admin
? `${Format.camelCase(
level,
)} Administrator`
: 'Regular User'}
</Flex>
)}
{({ isLoading, users }) => {
const adminUserIds = new Set(
permissions
?.filter((p) => p.admin && p.user?.id)
.map((p) => p.user.id) || [],
)
const usersWithRoleRank = users?.map((user) => ({
...user,
_roleRank:
user.role === 'ADMIN' ? 0 : adminUserIds.has(user.id) ? 1 : 2,
}))
Comment thread
afsuyadi marked this conversation as resolved.
return (
<div className='mt-4'>
{isLoading && !users?.length && (
<div className='centered-container'>
<Loader />
</div>
)}
{!!users?.length && (
<div>
<FormGroup className='panel no-pad pl-2 pr-2 panel--nested'>
<div className={tabClassName}>
<PanelSearch
id='org-members-list'
title='Users'
className='panel--transparent'
items={usersWithRoleRank}
sorting={USER_SORT_OPTIONS}
itemHeight={64}
header={
<Row className='table-header'>
<Flex className='table-column px-3'>User</Flex>
<Flex className='table-column'>Role</Flex>
<div
style={{ width: '80px' }}
className='text-center'
className='table-column text-center'
>
{role !== 'ADMIN' && (
<Icon
name='setting'
width={20}
fill='#656D7B'
/>
)}
Action
</div>
</Row>
)
}}
renderNoResults={
<div>You have no users in this organisation.</div>
}
filterRow={(item: User, search: string) => {
const strToSearch = `${item.first_name} ${item.last_name} ${item.email}`
return (
strToSearch
.toLowerCase()
.indexOf(search.toLowerCase()) !== -1
)
}}
/>
</div>

<div id='select-portal' />
</FormGroup>
</div>
)}
</div>
)}
}
renderRow={(user) => {
const { email, first_name, id, last_name, role } =
user
const onClick = () => {
if (role !== 'ADMIN') {
editUserPermissions(user)
}
}
const matchingPermissions = permissions?.find(
(v) => v.user.id === id,
)

return (
<Row
onClick={onClick}
space
className={`list-item${
role === 'ADMIN' ? '' : ' clickable'
}`}
key={id}
>
<Flex className='table-column px-3'>
<div className='mb-1 font-weight-medium'>
{`${first_name} ${last_name}`}{' '}
{String(id) ===
String(AccountStore.getUserId()) &&
'(You)'}
</div>
<div className='list-item-subtitle'>
{email}
</div>
</Flex>
{role === 'ADMIN' ? (
<Flex className='table-column fs-small lh-sm'>
<Tooltip
title={'Organisation Administrator'}
>
{
'Organisation administrators have all permissions enabled.<br/>To change the role of this user, visit Organisation Settings.'
}
</Tooltip>
</Flex>
) : (
<Flex
onClick={onClick}
className='table-column fs-small lh-sm'
>
{matchingPermissions &&
matchingPermissions.admin
? `${Format.camelCase(
level,
)} Administrator`
: 'Regular User'}
</Flex>
)}
<div
style={{ width: '80px' }}
className='text-center'
>
{role !== 'ADMIN' && (
<Icon
name='setting'
width={20}
fill='#656D7B'
/>
)}
</div>
</Row>
)
}}
renderNoResults={
<div>You have no users in this organisation.</div>
}
filterRow={(item: User, search: string) => {
const strToSearch = `${item.first_name} ${item.last_name} ${item.email}`
return (
strToSearch
.toLowerCase()
.indexOf(search.toLowerCase()) !== -1
)
}}
/>
</div>

<div id='select-portal' />
</FormGroup>
</div>
)}
</div>
)
}}
</OrganisationProvider>
</TabItem>
<TabItem tabLabel='Groups'>
Expand Down
9 changes: 9 additions & 0 deletions frontend/web/components/users-permissions/OrganisationUsersTable/OrganisationUsersTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ import Format from 'common/utils/format'
import OrganisationUsersTableHeader from './components/OrganisationUsersTableHeader'
import OrganisationUsersTableRow from './components/OrganisationUsersTableRow'
import getUserDisplayName from 'common/utils/getUserDisplayName'
import { SortOrder } from 'common/types/requests'
const ROLE_SORT_OPTIONS = [
{
label: 'Role',
order: SortOrder.ASC,
value: 'role',
},
]
interface OrganisationUsersTableProps {
Comment thread
afsuyadi marked this conversation as resolved.
users: User[]
organisation: Organisation
Expand Down Expand Up @@ -95,6 +103,7 @@ const OrganisationUsersTable: React.FC<OrganisationUsersTableProps> = ({
header={<OrganisationUsersTableHeader widths={widths} />}
items={users}
itemHeight={65}
sorting={ROLE_SORT_OPTIONS}
renderRow={(user) => {
const { email, first_name, id, last_name } = user

Expand Down
Loading