Skip to content

Commit dcbadbd

Browse files
committed
Refactor UserGroups code and set isPreProcessed to false to enable sorting in tables
Signed-off-by: Oksana Bazylieva <obazylie@redhat.com>
1 parent e7f552a commit dcbadbd

6 files changed

Lines changed: 7 additions & 13 deletions

File tree

frontend/src/routes/UserManagement/Identities/Groups/GroupUsers.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ const GroupUsers = () => {
9393
items: [],
9494
emptyResult: false,
9595
processedItemCount: 0,
96-
isPreProcessed: true,
96+
isPreProcessed: false,
9797
}}
9898
emptyState={
9999
<AcmEmptyState

frontend/src/routes/UserManagement/Identities/Groups/GroupsTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const GroupsTable = () => {
3737
items: [],
3838
emptyResult: false,
3939
processedItemCount: 0,
40-
isPreProcessed: true,
40+
isPreProcessed: false,
4141
}}
4242
emptyState={
4343
<AcmEmptyState

frontend/src/routes/UserManagement/Identities/Users/UserGroups.tsx

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,6 @@ const renderGroupCreatedCell = (group: Group) => {
3232
)
3333
}
3434

35-
const findGroupsContainingUser = (groups: Group[], username: string): Group[] => {
36-
return groups
37-
.filter((group) => group.users.includes(username))
38-
.sort((a, b) => (a.metadata.name || '').localeCompare(b.metadata.name || ''))
39-
}
40-
4135
const UserGroups = () => {
4236
const { t } = useTranslation()
4337
const { user, groups } = useUserDetailsContext()
@@ -46,7 +40,7 @@ const UserGroups = () => {
4640
const userGroups = useMemo(() => {
4741
if (!user || !groups) return []
4842

49-
return findGroupsContainingUser(groups, user.metadata.name || '')
43+
return groups.filter((group) => group.users.includes(user.metadata.name || ''))
5044
}, [user, groups])
5145

5246
const columns: IAcmTableColumn<Group>[] = [
@@ -86,7 +80,7 @@ const UserGroups = () => {
8680
items: [],
8781
emptyResult: false,
8882
processedItemCount: 0,
89-
isPreProcessed: true,
83+
isPreProcessed: false,
9084
}}
9185
emptyState={
9286
<AcmEmptyState

frontend/src/routes/UserManagement/Identities/Users/UsersTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const UsersTable = () => {
3737
items: [],
3838
emptyResult: false,
3939
processedItemCount: 0,
40-
isPreProcessed: true,
40+
isPreProcessed: false,
4141
}}
4242
emptyState={
4343
<AcmEmptyState

frontend/src/routes/UserManagement/RoleAssignment/RoleAssignments.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ const RoleAssignments = ({
391391
items: [],
392392
emptyResult: false,
393393
processedItemCount: 0,
394-
isPreProcessed: true,
394+
isPreProcessed: false,
395395
}}
396396
emptyState={
397397
<AcmEmptyState

frontend/src/routes/UserManagement/Roles/RolesTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const RolesTable = () => {
5050
items: [],
5151
emptyResult: false,
5252
processedItemCount: 0,
53-
isPreProcessed: true,
53+
isPreProcessed: false,
5454
}}
5555
emptyState={<AcmEmptyState key="rolesEmptyState" title={t('No roles')} />}
5656
/>

0 commit comments

Comments
 (0)