diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.ts b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.ts index b5aa3b6..a55e264 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.ts @@ -11,6 +11,7 @@ import { SimpleChanges, } from '@angular/core'; import { AbstractControl, FormControl, FormGroup } from '@angular/forms'; +import { RoleEnum } from '@msfa-enums/role.enum'; import { EmployeeEditRequest } from '@msfa-models/api/employee-edit.request.model'; import { Employee } from '@msfa-models/employee.model'; import { CustomError } from '@msfa-models/error/custom-error'; @@ -183,7 +184,12 @@ export class EditEmployeeFormComponent implements OnInit, OnChanges { tjanstIds: this.employeeFormService .getSelectedTjanster(this.availableTjanster, +this.tjansterFormControl?.value) .map(tjanst => tjanst.tjanstId), - roles: this.employeeFormService.getRolesFromFormGroup(this.rolesFormGroup, this.availableRoles), + roles: [ + ...new Set([ + ...this.employeeFormService.getRolesFromFormGroup(this.rolesFormGroup, this.availableRoles), + RoleEnum.MSFA_Standard, + ]), + ], adressIds: this.toggleAllUtforandeVerksamhetFormControl.value ? [] : this.utforandeVerksamheterService.getSelectedAdressIdsFromTreeNode( diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employees/employees.component.html b/apps/mina-sidor-fa/src/app/pages/administration/pages/employees/employees.component.html index 92ae324..72aa113 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employees/employees.component.html +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employees/employees.component.html @@ -27,7 +27,7 @@ > --> diff --git a/apps/mina-sidor-fa/src/app/shared/models/role.model.ts b/apps/mina-sidor-fa/src/app/shared/models/role.model.ts index f5a6f53..751f203 100644 --- a/apps/mina-sidor-fa/src/app/shared/models/role.model.ts +++ b/apps/mina-sidor-fa/src/app/shared/models/role.model.ts @@ -6,30 +6,32 @@ export interface Role { } export function mapResponseToRoles(types: RoleEnum[] = []): Role[] { - return types.map(type => { - switch (type) { - case 'MSFA_Standard': - return { - name: 'Basanvändare', - type: RoleEnum[type], - }; - case 'MSFA_ReportAndPlanning': - return { - name: 'Rapportering, planering och information om deltagare', - type: RoleEnum[type], - }; - case 'MSFA_ReceiveDeltagare': - return { - name: 'Ta emot deltagare', - type: RoleEnum[RoleEnum[type]], - }; - case 'MSFA_AuthAdmin': - return { - name: 'Administrera behörigheter', - type: RoleEnum[RoleEnum[type]], - }; - default: - return; - } - }); + return types + .filter(type => type !== RoleEnum.MSFA_Standard) + .map(type => { + switch (type) { + case 'MSFA_Standard': + return { + name: 'Basanvändare', + type: RoleEnum[type], + }; + case 'MSFA_ReportAndPlanning': + return { + name: 'Rapportering, planering och information om deltagare', + type: RoleEnum[type], + }; + case 'MSFA_ReceiveDeltagare': + return { + name: 'Ta emot deltagare', + type: RoleEnum[RoleEnum[type]], + }; + case 'MSFA_AuthAdmin': + return { + name: 'Administrera behörigheter', + type: RoleEnum[RoleEnum[type]], + }; + default: + return; + } + }); }