Users list: format user roles (#494)

Author: danielrus

src/app/_constants/enums.ts

@@ -696,33 +696,32 @@ export enum ContactCountMethod {
 }
 
 export enum UserRole {
-  ADMIN = 'enum.UserRole.ADMIN',
-  NATIONAL_USER = 'enum.UserRole.NATIONAL_USER',
-  SURVEILLANCE_SUPERVISOR = 'enum.UserRole.SURVEILLANCE_SUPERVISOR',
-  ADMIN_SUPERVISOR = 'enum.UserRole.ADMIN_SUPERVISOR',
-  SURVEILLANCE_OFFICER = 'enum.UserRole.SURVEILLANCE_OFFICER',
-  HOSPITAL_INFORMANT = 'enum.UserRole.HOSPITAL_INFORMANT',
-  COMMUNITY_OFFICER = 'enum.UserRole.COMMUNITY_OFFICER',
-  COMMUNITY_INFORMANT = 'enum.UserRole.COMMUNITY_INFORMANT',
-  CASE_SUPERVISOR = 'enum.UserRole.CASE_SUPERVISOR',
-  CASE_OFFICER = 'enum.UserRole.CASE_OFFICER',
-  CONTACT_SUPERVISOR = 'enum.UserRole.CONTACT_SUPERVISOR',
-  CONTACT_OFFICER = 'enum.UserRole.CONTACT_OFFICER',
-  EVENT_OFFICER = 'enum.UserRole.EVENT_OFFICER',
-  LAB_USER = 'enum.UserRole.LAB_USER',
-  EXTERNAL_LAB_USER = 'enum.UserRole.EXTERNAL_LAB_USER',
-  NATIONAL_OBSERVER = 'enum.UserRole.NATIONAL_OBSERVER',
-  STATE_OBSERVER = 'enum.UserRole.STATE_OBSERVER',
-  DISTRICT_OBSERVER = 'enum.UserRole.DISTRICT_OBSERVER',
-  NATIONAL_CLINICIAN = 'enum.UserRole.NATIONAL_CLINICIAN',
-  POE_INFORMANT = 'enum.UserRole.POE_INFORMANT',
-  POE_SUPERVISOR = 'enum.UserRole.POE_SUPERVISOR',
-  POE_NATIONAL_USER = 'enum.UserRole.POE_NATIONAL_USER',
-  IMPORT_USER = 'enum.UserRole.IMPORT_USER',
-  REST_EXTERNAL_VISITS_USER = 'enum.UserRole.REST_EXTERNAL_VISITS_USER',
-  REST_USER = 'enum.UserRole.REST_USER',
-  SORMAS_TO_SORMAS_CLIENT = 'enum.UserRole.SORMAS_TO_SORMAS_CLIENT',
-  BAG_USER = 'enum.UserRole.BAG_USER',
+  ADMIN = 'enum.DefaultUserRole.ADMIN',
+  NATIONAL_USER = 'enum.DefaultUserRole.NATIONAL_USER',
+  SURVEILLANCE_SUPERVISOR = 'enum.DefaultUserRole.SURVEILLANCE_SUPERVISOR',
+  ADMIN_SUPERVISOR = 'enum.DefaultUserRole.ADMIN_SUPERVISOR',
+  SURVEILLANCE_OFFICER = 'enum.DefaultUserRole.SURVEILLANCE_OFFICER',
+  HOSPITAL_INFORMANT = 'enum.DefaultUserRole.HOSPITAL_INFORMANT',
+  COMMUNITY_OFFICER = 'enum.DefaultUserRole.COMMUNITY_OFFICER',
+  COMMUNITY_INFORMANT = 'enum.DefaultUserRole.COMMUNITY_INFORMANT',
+  CASE_SUPERVISOR = 'enum.DefaultUserRole.CASE_SUPERVISOR',
+  CASE_OFFICER = 'enum.DefaultUserRole.CASE_OFFICER',
+  CONTACT_SUPERVISOR = 'enum.DefaultUserRole.CONTACT_SUPERVISOR',
+  CONTACT_OFFICER = 'enum.DefaultUserRole.CONTACT_OFFICER',
+  EVENT_OFFICER = 'enum.DefaultUserRole.EVENT_OFFICER',
+  LAB_USER = 'enum.DefaultUserRole.LAB_USER',
+  EXTERNAL_LAB_USER = 'enum.DefaultUserRole.EXTERNAL_LAB_USER',
+  NATIONAL_OBSERVER = 'enum.DefaultUserRole.NATIONAL_OBSERVER',
+  STATE_OBSERVER = 'enum.DefaultUserRole.STATE_OBSERVER',
+  DISTRICT_OBSERVER = 'enum.DefaultUserRole.DISTRICT_OBSERVER',
+  NATIONAL_CLINICIAN = 'enum.DefaultUserRole.NATIONAL_CLINICIAN',
+  POE_INFORMANT = 'enum.DefaultUserRole.POE_INFORMANT',
+  POE_SUPERVISOR = 'enum.DefaultUserRole.POE_SUPERVISOR',
+  POE_NATIONAL_USER = 'enum.DefaultUserRole.POE_NATIONAL_USER',
+  IMPORT_USER = 'enum.DefaultUserRole.IMPORT_USER',
+  REST_EXTERNAL_VISITS_USER = 'enum.DefaultUserRole.REST_EXTERNAL_VISITS_USER',
+  SORMAS_TO_SORMAS_CLIENT = 'enum.DefaultUserRole.SORMAS_TO_SORMAS_CLIENT',
+  BAG_USER = 'enum.DefaultUserRole.BAG_USER',
 }
 
 export enum PointOfEntryType {

src/app/_models/common.ts

@@ -24,13 +24,14 @@ export interface Filter {
 }
 
 // table
-export type TableDataFormatType = 'DISPLAY' | 'LINK' | 'NUMBER' | 'DATE' | 'LOADING';
+export type TableDataFormatType = 'DISPLAY' | 'LINK' | 'NUMBER' | 'DATE' | 'LIST' | 'LOADING';
 
 export const TableDataFormatOptions = {
   DISPLAY: 'DISPLAY' as TableDataFormatType,
   LINK: 'LINK' as TableDataFormatType,
   NUMBER: 'NUMBER' as TableDataFormatType,
   DATE: 'DATE' as TableDataFormatType,
+  LIST: 'LIST' as TableDataFormatType,
   LOADING: 'LOADING' as TableDataFormatType,
 };
 
@@ -41,6 +42,7 @@ export interface TableDataFormat {
   match?: { [key: string]: number[] };
   truncate?: number;
   breakSpaces?: boolean;
+  separator?: string;
 }
 
 export interface TableDataAction {

src/app/shared/table/table-data/table-data.component.ts

@@ -74,6 +74,9 @@ export class TableDataComponent implements OnChanges {
       case this.formats.DISPLAY:
         this.formatDisplay();
         break;
+      case this.formats.LIST:
+        this.formatList();
+        break;
       default: {
         const data = this.getData(this.config.dataKey);
         this.dataDisplay = this.config.translationName ? this.translateData(data) : data;
@@ -112,6 +115,14 @@ export class TableDataComponent implements OnChanges {
     this.dataDisplay = this.interpolate();
   }
 
+  formatList(): void {
+    const data = this.getRawData(this.config.dataKey) || [];
+    const key = this.config?.format?.params ? this.config.format.params[0] : null;
+    this.dataDisplay = data
+      .map((item: any) => (key ? item[key] : item))
+      .join(this.config.format?.separator || ' ');
+  }
+
   getRawData(key: string): any {
     return key.split('.').reduce((o, i) => {
       if (!o) {

src/app/users/user/user-form-data.ts

@@ -63,14 +63,14 @@ export const FORM_DATA_USER = [
       {
         ...FORM_DATA_SELECT,
         key: 'address.country.uuid',
-        label: 'captions.country',
+        label: 'captions.Location.country',
         options: [],
         service: 'countryService',
       },
       {
         ...FORM_DATA_SELECT,
         key: 'address.region.uuid',
-        label: 'captions.region',
+        label: 'captions.Location.region',
         service: 'regionService',
         determinedBy: [
           {
@@ -82,7 +82,7 @@ export const FORM_DATA_USER = [
       {
         ...FORM_DATA_SELECT,
         key: 'address.district.uuid',
-        label: 'captions.district',
+        label: 'captions.Location.district',
         service: 'districtService',
         determinedBy: [
           {
@@ -94,7 +94,7 @@ export const FORM_DATA_USER = [
       {
         ...FORM_DATA_SELECT,
         key: 'address.community.uuid',
-        label: 'captions.community',
+        label: 'captions.Location.community',
         service: 'communityService',
         determinedBy: [
           {

src/app/users/users-list/users-list-table-data.ts

@@ -33,6 +33,12 @@ export const defaultColumnDefs: TableColumn[] = [
     dataKey: 'userRoles',
     translationName: 'UserRole',
     isSortable: true,
+    maxWidth: 300,
+    format: {
+      type: TableDataFormatOptions.LIST,
+      separator: ', ',
+      params: ['caption'],
+    },
   },
   {
     name: 'captions.User.userName',