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

Fixed issue with sorting

Browse Source
This commit is contained in:
Erik Tiekstra
2021-08-18 14:55:41 +02:00
parent 456f305f0e
commit aa55ee80f4
4 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,11 +4,14 @@ import { ErrorType } from '@msfa-enums/error-type.enum';
import { SortOrder } from '@msfa-enums/sort-order.enum';
import { environment } from '@msfa-environment';
import { EmployeeInviteMockApiResponse } from '@msfa-models/api/employee-invite.response.model';
import { EmployeeResponse, EmployeesApiResponse } from '@msfa-models/api/employee.response.model';
import {
EmployeeCompactResponse,
EmployeeResponse,
EmployeesApiResponse,
} from '@msfa-models/api/employee.response.model';
import { EmployeeInviteMockaData } from '@msfa-models/employee-invite-mock-data.model';
import {
Employee,
EmployeeCompact,
EmployeesData,
mapEmployeeToRequestData,
mapResponseToEmployee,
@@ -27,8 +30,8 @@ export class EmployeeService {
private _apiUrl = `${environment.api.url}/users`;
private _limit$ = new BehaviorSubject<number>(20);
private _page$ = new BehaviorSubject<number>(1);
private _sort$ = new BehaviorSubject<Sort<keyof EmployeeCompact>>({ key: 'fullName', order: SortOrder.ASC });
public sort$: Observable<Sort<keyof EmployeeCompact>> = this._sort$.asObservable();
private _sort$ = new BehaviorSubject<Sort<keyof EmployeeCompactResponse>>({ key: 'name', order: SortOrder.ASC });
public sort$: Observable<Sort<keyof EmployeeCompactResponse>> = this._sort$.asObservable();
private _searchFilter$ = new BehaviorSubject<string>('');
private _onlyEmployeesWithoutAuthorization$ = new BehaviorSubject<boolean>(false);
@@ -47,7 +50,7 @@ export class EmployeeService {
private _fetchEmployees$(
limit: number,
page: number,
sort: Sort<keyof EmployeeCompact>,
sort: Sort<keyof EmployeeCompactResponse>,
searchFilter: string,
onlyEmployeesWithoutAuthorization?: boolean
): Observable<EmployeesData> {
@@ -94,7 +97,7 @@ export class EmployeeService {
this._onlyEmployeesWithoutAuthorization$.next(value);
}
public setSort(newSortKey: keyof EmployeeCompact): void {
public setSort(newSortKey: keyof EmployeeCompactResponse): void {
const currentSort = this._sort$.getValue();
const order =
currentSort.key === newSortKey && currentSort.order === SortOrder.ASC ? SortOrder.DESC : SortOrder.ASC;