arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #64 in TEA/dafa-web-monorepo from bugfix/TV-410 to develop

Browse Source 
Squashed commit of the following:

commit 8ce45d3a600ae3577f1e0764a6d65f6f087446d1
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Wed Aug 25 09:59:34 2021 +0200

    TV-410 review fix

commit 175bbc005bd383880999472b28a7b1c373911e4a
Merge: a65ba47 50a83f7
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Tue Aug 24 13:50:50 2021 +0200

    Merge branch 'develop' into bugfix/TV-410

commit a65ba47364e5043feecf2634a143573ebb63ad0b
Merge: 6f574c8 59ce393
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Tue Aug 24 13:46:11 2021 +0200

    Merge branch 'develop' into bugfix/TV-410

commit 6f574c8264f0372147c32a6aa297bba2deb54775
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Mon Aug 23 16:12:18 2021 +0200

    TV-410 updated api request for invite employee
This commit is contained in:
Nicolas Fuentes Maturana
2021-08-25 10:01:07 +02:00
parent 50a83f784d
commit 7dd5599c29
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.component.ts
View File

@@ -45,6 +45,7 @@ export class EmployeeInviteComponent implements OnInit {
complete: () => { complete: () => {
post.unsubscribe(); post.unsubscribe();
}, },
error: (err) => console.log(err)
}); });
} }

3
apps/mina-sidor-fa/src/app/shared/models/employee-invite-mock-data.model.ts
View File

@@ -1,3 +0,0 @@
export interface EmployeeInviteMockaData {
id: number
}

4
apps/mina-sidor-fa/src/app/shared/models/employee.model.ts
View File

@@ -42,6 +42,10 @@ export interface EmployeeRequestData {
adressIds: number[]; adressIds: number[];
} }
export interface EmployeeInviteRequestData {
emails: string[];
}
export function mapEmployeeToRequestData(data: Employee): EmployeeRequestData { export function mapEmployeeToRequestData(data: Employee): EmployeeRequestData {
const { email, roles, tjanstCodes, allaUtforandeVerksamheter, utforandeVerksamhet, utforandeVerksamhetIds, utforandeAdressIds } = data; const { email, roles, tjanstCodes, allaUtforandeVerksamheter, utforandeVerksamhet, utforandeVerksamhetIds, utforandeAdressIds } = data;

18
apps/mina-sidor-fa/src/app/shared/services/api/employee.service.ts
View File

@@ -5,19 +5,15 @@ import { ErrorType } from '@msfa-enums/error-type.enum';
import { SortOrder } from '@msfa-enums/sort-order.enum'; import { SortOrder } from '@msfa-enums/sort-order.enum';
import { environment } from '@msfa-environment'; import { environment } from '@msfa-environment';
import { DeleteEmployeeMockApiResponse } from '@msfa-models/api/delete-employee.response.model'; import { DeleteEmployeeMockApiResponse } from '@msfa-models/api/delete-employee.response.model';
import { EmployeeInviteMockApiResponse } from '@msfa-models/api/employee-invite.response.model';
import { import {
EmployeeCompactResponse, EmployeeCompactResponse,
EmployeeResponse, EmployeeResponse,
EmployeesApiResponse, EmployeesApiResponse
} from '@msfa-models/api/employee.response.model'; } from '@msfa-models/api/employee.response.model';
import { EmployeeInviteMockaData } from '@msfa-models/employee-invite-mock-data.model';
import { import {
Employee, Employee, EmployeeInviteRequestData, EmployeesData, mapEmployeeToRequestData,
EmployeesData,
mapEmployeeToRequestData,
mapResponseToEmployee, mapResponseToEmployee,
mapResponseToEmployeeCompact, mapResponseToEmployeeCompact
} from '@msfa-models/employee.model'; } from '@msfa-models/employee.model';
import { errorToCustomError } from '@msfa-models/error/custom-error'; import { errorToCustomError } from '@msfa-models/error/custom-error';
import { Sort } from '@msfa-models/sort.model'; import { Sort } from '@msfa-models/sort.model';
@@ -176,12 +172,14 @@ export class EmployeeService extends UnsubscribeDirective {
); );
} }
public postEmployeeInvitation(email: string): Observable<EmployeeInviteMockaData> { public postEmployeeInvitation(email: string): Observable<string[]> {
return this.httpClient return this.httpClient
.post<{ data: EmployeeInviteMockApiResponse }>(`${this._apiBaseUrl}/invite`, { email }) .post<{ data: EmployeeInviteRequestData }>(`${this._apiBaseUrl}/invite`, {
emails: Object.values(email)
})
.pipe( .pipe(
take(1), take(1),
map(res => res.data), map(res => res.data.emails),
catchError(error => throwError({ message: error as string, type: ErrorType.API })) catchError(error => throwError({ message: error as string, type: ErrorType.API }))
); );
} }