Skip to content

feat: sort/inspect users across permissions tables #7611

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
kyle-ssg wants to merge 6 commits into
base: main
Choose a base branch
from
Open

feat: sort/inspect users across permissions tables #7611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc96cc4
feat: sort users permissions table by name and role
kyle-ssg May 27, 2026
4f71144
perf: O(1) permission lookup when decorating users for sort
kyle-ssg May 27, 2026
da08140
feat: inspect a user's permissions from the project/environment settings
kyle-ssg May 27, 2026
6dc8468
feat: sort organisation members table; share user sort helper
kyle-ssg May 27, 2026
132ed54
feat: use UserAction ellipsis dropdown in project/environment permiss…
kyle-ssg May 27, 2026
0059e76
fix(UserAction): show dropdown when only edit + inspect are available
kyle-ssg May 27, 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
2 changes: 1 addition & 1 deletion frontend/common/types/requests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ export type Req = {
userId: number
}
getUserPermissions: {
id?: number
id?: number | string
userId: number | undefined
level: PermissionLevel
}
Expand Down
268 changes: 153 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 @@ -25,7 +25,6 @@ import UserGroupList from './UserGroupList'
import { PermissionLevel, Req, PermissionRoleType } from 'common/types/requests'
import { useGetAvailablePermissionsQuery } from 'common/services/useAvailablePermissions'
import ConfigProvider from 'common/providers/ConfigProvider'
import Icon from './icons/Icon'
import {
useCreateRolePermissionsMutation,
useGetRoleEnvironmentPermissionsQuery,
Expand Down Expand Up @@ -66,6 +65,12 @@ import Utils from 'common/utils/utils'
import RemoveViewPermissionModal from './RemoveViewPermissionModal'
import { useHistory } from 'react-router-dom'
import getUserDisplayName from 'common/utils/getUserDisplayName'
import Permissions from './inspect-permissions/Permissions'
import UserAction from './UserAction'
import {
decorateUsersForSort,
userTableSorting,
} from './users-permissions/sortUsers'

import Project from 'common/project'

Expand Down Expand Up @@ -1013,6 +1018,21 @@ const EditPermissions: FC<EditPermissionsType> = (props) => {
} = props

const [tab, setTab] = useState()
const hasRbac = !!Utils.getPlansPermission('RBAC')
const inspectUserPermissions = (user: User) => {
openModal(
getUserDisplayName(user),
<div className='p-4'>
<Permissions
level={level}
levelId={id}
userId={user.id}
projectId={level === 'environment' ? Number(parentId) : Number(id)}
/>
</div>,
'p-0 side-modal',
)
}
const editUserPermissions = (user: User) => {
openModal(
`Edit ${Format.camelCase(level)} Permissions`,
Expand Down Expand Up @@ -1086,125 +1106,143 @@ 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 permissionsByUserId = new Map(
permissions?.map((p) => [p.user.id, p]),
)
const sortableUsers = decorateUsersForSort(users, (user) => {
if (user.role === 'ADMIN') return 'Organisation Administrator'
if (permissionsByUserId.get(user.id)?.admin) {
return `${Format.camelCase(level)} Administrator`
}
return 'Regular User'
})
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={sortableUsers}
itemHeight={64}
sorting={userTableSorting}
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='table-column d-flex justify-content-end'
>
{role !== 'ADMIN' && (
<UserAction
canEdit
canRemove={false}
canInspectPermissions={hasRbac}
onEdit={() => editUserPermissions(user)}
onRemove={() => {}}
onInspectPermissions={() =>
inspectUserPermissions(user)
}
/>
)}
</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
2 changes: 1 addition & 1 deletion frontend/web/components/PanelSearch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import Panel from './base/grid/Panel'
import Utils from 'common/utils/utils'
import { SortOrder } from 'common/types/requests'

type SortOption = {
export type SortOption = {
value: string
order: SortOrder
default?: boolean
Expand Down
6 changes: 3 additions & 3 deletions frontend/web/components/UserAction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,15 @@ const UserAction: FC<UserActionProps> = ({
[close, onRemove, onEdit, onInspectPermissions],
)

if (!canEdit && !!canRemove) {
if (!canEdit && !!canRemove && !canInspectPermissions) {
return (
<Button onClick={onRemove} size='small' className='btn-with-icon'>
<Icon name='trash-2' width={16} fill='#656D7B' />
</Button>
)
}

if (!!canEdit && !canRemove) {
if (!!canEdit && !canRemove && !canInspectPermissions) {
return (
<Button
onClick={() => handleActionClick('edit')}
Expand All @@ -162,7 +162,7 @@ const UserAction: FC<UserActionProps> = ({
)
}

if (!canEdit && !canRemove) {
if (!canEdit && !canRemove && !canInspectPermissions) {
return null
}

Expand Down
2 changes: 1 addition & 1 deletion frontend/web/components/inspect-permissions/Permissions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const Permissions = ({
userId,
}: {
level: PermissionLevel
levelId: number
levelId: number | string
userId?: number
projectId?: number
className?: string
Expand Down
20 changes: 18 additions & 2 deletions frontend/web/components/users-permissions/OrganisationUsersTable/OrganisationUsersTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import React from 'react'
import React, { useMemo } from 'react'
import AppActions from 'common/dispatcher/app-actions'
import Constants from 'common/constants'
import {
decorateUsersForSort,
userTableSorting,
} from 'components/users-permissions/sortUsers'
import Tabs from 'components/navigation/TabMenu/Tabs'
import TabItem from 'components/navigation/TabMenu/TabItem'
import { Organisation, User } from 'common/types/responses'
Expand Down Expand Up @@ -87,14 +92,25 @@ const OrganisationUsersTable: React.FC<OrganisationUsersTableProps> = ({
})
}

const sortableUsers = useMemo(
() =>
decorateUsersForSort(
users,
(user) =>
Constants.roles[user.role as keyof typeof Constants.roles] || '',
),
[users],
)

return (
<PanelSearch
id='org-members-list'
title='Members'
className='no-pad'
header={<OrganisationUsersTableHeader widths={widths} />}
items={users}
items={sortableUsers}
itemHeight={65}
sorting={userTableSorting}
renderRow={(user) => {
const { email, first_name, id, last_name } = user

Expand Down
Loading
Loading