diff --git a/workspaces/client/src/model/user/User.ts b/workspaces/client/src/model/user/User.ts index 8c5e7123bb0df5c0560d1d43124e6fcf96ae86b9..ddc782c5bbc3388c376e39bfcda540671fe349ca 100644 --- a/workspaces/client/src/model/user/User.ts +++ b/workspaces/client/src/model/user/User.ts @@ -2,15 +2,6 @@ import { UuidModel } from '@genesys/client/model/common.model'; import { SortDirection } from '@genesys/client/model/Page'; class User extends UuidModel { - public static USERROLES: { [key: string]: any } = { - USER: 'user.common.role.USER', - ADMINISTRATOR: 'user.common.role.ADMINISTRATOR', - EVERYONE: 'user.common.role.EVERYONE', - VALIDATEDUSER: 'user.common.role.VALIDATEDUSER', - VETTEDUSER: 'user.common.role.VETTEDUSER', - CONTENTMANAGER: 'user.common.role.CONTENTMANAGER', - }; - public clazz: string = 'org.genesys2.server.model.impl.User'; public accountExpired: boolean; public accountLocked: boolean; @@ -44,6 +35,16 @@ class User extends UuidModel { createdDate: { property: 'createdDate', label: 'user.sort.createdDateAsc', direction: 'ASC' }, createdDateDesc: { property: 'createdDate', label: 'user.sort.createdDateDesc', direction: 'DESC' }, }; + + public static USERROLES: { [key: string]: any } = { + USER: 'user.common.role.USER', + ADMINISTRATOR: 'user.common.role.ADMINISTRATOR', + EVERYONE: 'user.common.role.EVERYONE', + DIVTREE: 'user.common.role.DIVTREE', + VALIDATEDUSER: 'user.common.role.VALIDATEDUSER', + VETTEDUSER: 'user.common.role.VETTEDUSER', + CONTENTMANAGER: 'user.common.role.CONTENTMANAGER', + }; } enum UserRole { @@ -51,6 +52,7 @@ enum UserRole { ADMINISTRATOR = 'ADMINISTRATOR', EVERYONE = 'EVERYONE', VALIDATEDUSER = 'VALIDATEDUSER', + DIVTREE = 'DIVTREE', VETTEDUSER = 'VETTEDUSER', CONTENTMANAGER = 'CONTENTMANAGER', } diff --git a/workspaces/ui-express/locales/en/translations.json b/workspaces/ui-express/locales/en/translations.json index 68db87b2d7c89012f44669cbc056c5c5581eb747..50166427fe9e3a322e123b5856df2701b7d8edb0 100644 --- a/workspaces/ui-express/locales/en/translations.json +++ b/workspaces/ui-express/locales/en/translations.json @@ -2999,6 +2999,7 @@ "ADMINISTRATOR": "Administrator", "EVERYONE": "Everyone", "VALIDATEDUSER": "Validated user", + "DIVTREE": "DiversityTree user", "VETTEDUSER": "Vetted user", "CONTENTMANAGER": "Content manager" }, diff --git a/workspaces/ui-express/src/user/translations.json b/workspaces/ui-express/src/user/translations.json index 51e07fa3426370cc4bf38751c6efa82cd61ba833..b06c60fc997aee8c51b3f8114b71c9df9b64c833 100644 --- a/workspaces/ui-express/src/user/translations.json +++ b/workspaces/ui-express/src/user/translations.json @@ -218,6 +218,7 @@ "ADMINISTRATOR": "Administrator", "EVERYONE": "Everyone", "VALIDATEDUSER": "Validated user", + "DIVTREE": "DiversityTree user", "VETTEDUSER": "Vetted user", "CONTENTMANAGER": "Content manager" },