From 3c7912a5e452518b0eea9e657a44d1682156c6b3 Mon Sep 17 00:00:00 2001 From: iso9000t <119494473+iso9000t@users.noreply.github.com> Date: Wed, 8 Jan 2025 19:05:31 +0400 Subject: [PATCH] EPMRPP-98419 || Add ability to filter users by SCIM type (#4145) --- app/localization/translated/be.json | 1 + app/localization/translated/es.json | 1 + app/localization/translated/ru.json | 1 + app/localization/translated/uk.json | 1 + app/localization/translated/zh.json | 1 + app/src/common/constants/accountType.js | 1 + .../admin/allUsersPage/usersToolbar/usersEntities.jsx | 10 +++++++++- 7 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/localization/translated/be.json b/app/localization/translated/be.json index 2f19f06c8f..2728555916 100644 --- a/app/localization/translated/be.json +++ b/app/localization/translated/be.json @@ -2241,6 +2241,7 @@ "usersGrid.accountTypeInternal": "Унутраны", "usersGrid.accountTypeLdap": "Ldap", "usersGrid.accountTypeSaml": "Saml", + "usersGrid.accountTypeScim": "SCIM", "usersGrid.accountTypeUpsa": "UPSA", "usersGrid.contains": "Змяшчае", "usersGrid.email": "Эл. пошта", diff --git a/app/localization/translated/es.json b/app/localization/translated/es.json index c802a1dd1f..fe06bb06da 100644 --- a/app/localization/translated/es.json +++ b/app/localization/translated/es.json @@ -2241,6 +2241,7 @@ "usersGrid.accountTypeInternal": "Interno", "usersGrid.accountTypeLdap": "Ldap", "usersGrid.accountTypeSaml": "Saml", + "usersGrid.accountTypeScim": "SCIM", "usersGrid.accountTypeUpsa": "UPSA", "usersGrid.contains": "Contiene", "usersGrid.email": "Correo electrónico", diff --git a/app/localization/translated/ru.json b/app/localization/translated/ru.json index 79e0b450ba..2aeb73127b 100644 --- a/app/localization/translated/ru.json +++ b/app/localization/translated/ru.json @@ -2241,6 +2241,7 @@ "usersGrid.accountTypeInternal": "Внутренний", "usersGrid.accountTypeLdap": "Ldap", "usersGrid.accountTypeSaml": "Saml", + "usersGrid.accountTypeScim": "SCIM", "usersGrid.accountTypeUpsa": "UPSA", "usersGrid.contains": "Содержит", "usersGrid.email": "Эл. почта", diff --git a/app/localization/translated/uk.json b/app/localization/translated/uk.json index 252dc7d193..e14bce910f 100644 --- a/app/localization/translated/uk.json +++ b/app/localization/translated/uk.json @@ -2241,6 +2241,7 @@ "usersGrid.accountTypeInternal": "Внутрішній", "usersGrid.accountTypeLdap": "У LDAP", "usersGrid.accountTypeSaml": "Saml", + "usersGrid.accountTypeScim": "SCIM", "usersGrid.accountTypeUpsa": "УПСА", "usersGrid.contains": "Містить", "usersGrid.email": "Ел. пошта", diff --git a/app/localization/translated/zh.json b/app/localization/translated/zh.json index a098a91e53..780b5958d6 100644 --- a/app/localization/translated/zh.json +++ b/app/localization/translated/zh.json @@ -2241,6 +2241,7 @@ "usersGrid.accountTypeInternal": "内部", "usersGrid.accountTypeLdap": "Ldap", "usersGrid.accountTypeSaml": "Saml", + "usersGrid.accountTypeScim": "SCIM", "usersGrid.accountTypeUpsa": "UPSA", "usersGrid.contains": "包含", "usersGrid.email": "电子邮箱", diff --git a/app/src/common/constants/accountType.js b/app/src/common/constants/accountType.js index 8a0205869a..5e1b497a59 100644 --- a/app/src/common/constants/accountType.js +++ b/app/src/common/constants/accountType.js @@ -19,3 +19,4 @@ export const LDAP = 'LDAP'; export const UPSA = 'UPSA'; export const GITHUB = 'GITHUB'; export const SAML = 'SAML'; +export const SCIM = 'SCIM'; diff --git a/app/src/pages/admin/allUsersPage/usersToolbar/usersEntities.jsx b/app/src/pages/admin/allUsersPage/usersToolbar/usersEntities.jsx index 90cf486bd7..a0d3a13080 100644 --- a/app/src/pages/admin/allUsersPage/usersToolbar/usersEntities.jsx +++ b/app/src/pages/admin/allUsersPage/usersToolbar/usersEntities.jsx @@ -32,7 +32,7 @@ import { } from 'components/filterEntities/constants'; import { bindDefaultValue } from 'components/filterEntities/utils'; import { USER, ADMINISTRATOR } from 'common/constants/accountRoles'; -import { INTERNAL, LDAP, UPSA, GITHUB, SAML } from 'common/constants/accountType'; +import { INTERNAL, LDAP, UPSA, GITHUB, SAML, SCIM } from 'common/constants/accountType'; import { EMAIL, FULL_NAME, @@ -84,6 +84,10 @@ const messages = defineMessages({ id: 'usersGrid.accountTypeSaml', defaultMessage: 'Saml', }, + accountTypeScim: { + id: 'usersGrid.accountTypeScim', + defaultMessage: 'SCIM', + }, }); @injectIntl @@ -178,6 +182,10 @@ export class UsersEntities extends Component { label: formatMessage(messages.accountTypeSaml), value: SAML, }, + { + label: formatMessage(messages.accountTypeScim), + value: SCIM, + }, ], multiple: true, selectAll: true,