From 10254f118a19d0439463663d05af66244f0c416e Mon Sep 17 00:00:00 2001 From: iso9000t <119494473+iso9000t@users.noreply.github.com> Date: Thu, 16 Jan 2025 02:44:11 +0400 Subject: [PATCH] =?UTF-8?q?EPMRPP-98470=20||=20Fix=20incorrect=20User=20Ty?= =?UTF-8?q?pe=20values=20on=20"All=20Users"=20page=20at=E2=80=A6=20(#4161)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * EPMRPP-98470 || Fix incorrect User Type values on "All Users" page at instance level * EPMRPP-98470 || Code review fixes - 1 --- app/src/common/constants/accountType.js | 6 ++++++ .../allUsersPage/allUsersListTable/allUsersListTable.jsx | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/src/common/constants/accountType.js b/app/src/common/constants/accountType.js index 5e1b497a59..5466bc3c7e 100644 --- a/app/src/common/constants/accountType.js +++ b/app/src/common/constants/accountType.js @@ -20,3 +20,9 @@ export const UPSA = 'UPSA'; export const GITHUB = 'GITHUB'; export const SAML = 'SAML'; export const SCIM = 'SCIM'; + +export const ACCOUNT_TYPE_DISPLAY_MAP = { + [UPSA]: 'Synched', + [INTERNAL]: 'Internal', + [GITHUB]: 'GitHub', +}; diff --git a/app/src/pages/instance/allUsersPage/allUsersListTable/allUsersListTable.jsx b/app/src/pages/instance/allUsersPage/allUsersListTable/allUsersListTable.jsx index d879ef2251..288e849736 100644 --- a/app/src/pages/instance/allUsersPage/allUsersListTable/allUsersListTable.jsx +++ b/app/src/pages/instance/allUsersPage/allUsersListTable/allUsersListTable.jsx @@ -25,7 +25,7 @@ import { userInfoSelector } from 'controllers/user'; import { getRoleBadgesData } from 'common/utils/permissions/getRoleTitle'; import { NAMESPACE } from 'controllers/instance/allUsers/constants'; import { UserNameCell } from 'pages/common/membersPage/userNameCell/userNameCell'; - +import { ACCOUNT_TYPE_DISPLAY_MAP } from 'common/constants/accountType'; import { DEFAULT_PAGE_SIZE, DEFAULT_PAGINATION, @@ -43,6 +43,9 @@ import { messages } from 'pages/common/users/membersListTable/messages'; import styles from './allUsersListTable.scss'; const cx = classNames.bind(styles); + +const getDisplayAccountType = (accountType) => ACCOUNT_TYPE_DISPLAY_MAP[accountType] || accountType; + const AllUsersListTableComponent = ({ users, onChangeSorting, @@ -95,7 +98,7 @@ const AllUsersListTableComponent = ({ n/a ), }, - accountType: user.accountType.toLowerCase(), + accountType: getDisplayAccountType(user.accountType), organizations: organizationsCount, }; }),