Skip to content

Commit

Permalink
EPMRPP-98419 || Add ability to filter users by SCIM type (#4145)
Browse files Browse the repository at this point in the history
  • Loading branch information
iso9000t authored Jan 8, 2025
1 parent 3a3e1b5 commit 3c7912a
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 1 deletion.
1 change: 1 addition & 0 deletions app/localization/translated/be.json
Original file line number Diff line number Diff line change
Expand Up @@ -2241,6 +2241,7 @@
"usersGrid.accountTypeInternal": "Унутраны",
"usersGrid.accountTypeLdap": "Ldap",
"usersGrid.accountTypeSaml": "Saml",
"usersGrid.accountTypeScim": "SCIM",
"usersGrid.accountTypeUpsa": "UPSA",
"usersGrid.contains": "Змяшчае",
"usersGrid.email": "Эл. пошта",
Expand Down
1 change: 1 addition & 0 deletions app/localization/translated/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions app/localization/translated/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -2241,6 +2241,7 @@
"usersGrid.accountTypeInternal": "Внутренний",
"usersGrid.accountTypeLdap": "Ldap",
"usersGrid.accountTypeSaml": "Saml",
"usersGrid.accountTypeScim": "SCIM",
"usersGrid.accountTypeUpsa": "UPSA",
"usersGrid.contains": "Содержит",
"usersGrid.email": "Эл. почта",
Expand Down
1 change: 1 addition & 0 deletions app/localization/translated/uk.json
Original file line number Diff line number Diff line change
Expand Up @@ -2241,6 +2241,7 @@
"usersGrid.accountTypeInternal": "Внутрішній",
"usersGrid.accountTypeLdap": "У LDAP",
"usersGrid.accountTypeSaml": "Saml",
"usersGrid.accountTypeScim": "SCIM",
"usersGrid.accountTypeUpsa": "УПСА",
"usersGrid.contains": "Містить",
"usersGrid.email": "Ел. пошта",
Expand Down
1 change: 1 addition & 0 deletions app/localization/translated/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -2241,6 +2241,7 @@
"usersGrid.accountTypeInternal": "内部",
"usersGrid.accountTypeLdap": "Ldap",
"usersGrid.accountTypeSaml": "Saml",
"usersGrid.accountTypeScim": "SCIM",
"usersGrid.accountTypeUpsa": "UPSA",
"usersGrid.contains": "包含",
"usersGrid.email": "电子邮箱",
Expand Down
1 change: 1 addition & 0 deletions app/src/common/constants/accountType.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ export const LDAP = 'LDAP';
export const UPSA = 'UPSA';
export const GITHUB = 'GITHUB';
export const SAML = 'SAML';
export const SCIM = 'SCIM';
10 changes: 9 additions & 1 deletion app/src/pages/admin/allUsersPage/usersToolbar/usersEntities.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -84,6 +84,10 @@ const messages = defineMessages({
id: 'usersGrid.accountTypeSaml',
defaultMessage: 'Saml',
},
accountTypeScim: {
id: 'usersGrid.accountTypeScim',
defaultMessage: 'SCIM',
},
});

@injectIntl
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 3c7912a

Please sign in to comment.