diff --git a/projects/organization-management/src/app/components/user-roles-selection/user-roles-selection.component.html b/projects/organization-management/src/app/components/user-roles-selection/user-roles-selection.component.html index 900f00e8c8..4963134630 100644 --- a/projects/organization-management/src/app/components/user-roles-selection/user-roles-selection.component.html +++ b/projects/organization-management/src/app/components/user-roles-selection/user-roles-selection.component.html @@ -11,7 +11,9 @@
diff --git a/projects/organization-management/src/app/models/b2b-role/b2b-role.interface.ts b/projects/organization-management/src/app/models/b2b-role/b2b-role.interface.ts index c521fa60f2..30bbc5225e 100644 --- a/projects/organization-management/src/app/models/b2b-role/b2b-role.interface.ts +++ b/projects/organization-management/src/app/models/b2b-role/b2b-role.interface.ts @@ -2,5 +2,6 @@ export interface B2bRoleData { roleID: string; fixed: boolean; roleDisplayName: string; + roleDescription?: string; permissions: { permissionDisplayName: string }[]; } diff --git a/projects/organization-management/src/app/models/b2b-role/b2b-role.mapper.spec.ts b/projects/organization-management/src/app/models/b2b-role/b2b-role.mapper.spec.ts index e5ee65f71f..dccff0f468 100644 --- a/projects/organization-management/src/app/models/b2b-role/b2b-role.mapper.spec.ts +++ b/projects/organization-management/src/app/models/b2b-role/b2b-role.mapper.spec.ts @@ -24,51 +24,43 @@ describe('B2b Role Mapper', () => { const data = [ { roleID: 'APP_B2B_BUYER', - roleDisplayName: 'Einkäufer', + roleDisplayName: 'Buyer', + roleDescription: 'The buyer manages own requisitions, order templates, quotes, orders and subscriptions.', fixed: true, permissions: [ - { permissionDisplayName: 'Kostenobjekt zu Warenkorb zuordnen' }, - { permissionDisplayName: 'Kostenobjekt zu Warenkorbposition zuordnen' }, - { permissionDisplayName: 'Preisangebote erstellen' }, - { permissionDisplayName: 'Einkäufe tätigen' }, - { permissionDisplayName: 'Kostenobjekte anzeigen' }, + { permissionDisplayName: 'Assign a cost object to a basket' }, + { permissionDisplayName: 'Assign a cost object to a basket line item' }, + { permissionDisplayName: 'Create Quotes' }, ], }, { roleID: 'APP_B2B_APPROVER', - roleDisplayName: 'Genehmiger', + roleDisplayName: 'Approver', fixed: false, - permissions: [ - { permissionDisplayName: 'Kostenobjekt zu Warenkorb zuordnen' }, - { permissionDisplayName: 'Kostenobjekt zu Warenkorbposition zuordnen' }, - { permissionDisplayName: 'Preisangebote erstellen' }, - { permissionDisplayName: 'Offene Bestellungen genehmigen' }, - { permissionDisplayName: 'Einkäufe tätigen' }, - { permissionDisplayName: 'Kostenobjekte anzeigen' }, - ], + permissions: [{ permissionDisplayName: 'Approve Pending Orders' }], }, ] as B2bRoleData[]; const mapped = b2bRoleMapper.fromData(data); expect(mapped).toMatchInlineSnapshot(` Array [ Object { - "displayName": "Einkäufer", + "description": "The buyer manages own requisitions, order templates, quotes, orders and subscriptions.", + "displayName": "Buyer", "fixed": true, "id": "APP_B2B_BUYER", "permissionDisplayNames": Array [ - "Kostenobjekt zu Warenkorb zuordnen", - "Kostenobjekt zu Warenkorbposition zuordnen", - "Preisangebote erstellen", - "Einkäufe tätigen", - "Kostenobjekte anzeigen", + "Assign a cost object to a basket", + "Assign a cost object to a basket line item", + "Create Quotes", ], }, Object { - "displayName": "Genehmiger", + "description": undefined, + "displayName": "Approver", "fixed": false, "id": "APP_B2B_APPROVER", "permissionDisplayNames": Array [ - "Offene Bestellungen genehmigen", + "Approve Pending Orders", ], }, ] diff --git a/projects/organization-management/src/app/models/b2b-role/b2b-role.mapper.ts b/projects/organization-management/src/app/models/b2b-role/b2b-role.mapper.ts index 70e8966f3d..14d25d878b 100644 --- a/projects/organization-management/src/app/models/b2b-role/b2b-role.mapper.ts +++ b/projects/organization-management/src/app/models/b2b-role/b2b-role.mapper.ts @@ -12,6 +12,7 @@ export class B2bRoleMapper { id: role.roleID, fixed: role.fixed, displayName: role.roleDisplayName, + description: role.roleDescription, permissionDisplayNames: role.permissions.map(p => p.permissionDisplayName), })) ); diff --git a/projects/organization-management/src/app/models/b2b-role/b2b-role.model.ts b/projects/organization-management/src/app/models/b2b-role/b2b-role.model.ts index bd07b36bc5..66d4e1bd61 100644 --- a/projects/organization-management/src/app/models/b2b-role/b2b-role.model.ts +++ b/projects/organization-management/src/app/models/b2b-role/b2b-role.model.ts @@ -2,5 +2,6 @@ export interface B2bRole { id: string; fixed: boolean; displayName: string; + description?: string; permissionDisplayNames: string[]; }