Merge branch '753-divtree-role' into 'master'

Resolve "DivTree: Role?"

Closes #753

See merge request genesys-pgr/genesys-ui!732

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',
 }

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"
       },

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"
     },