diff options
Diffstat (limited to 'client/src/app/+admin/jobs/shared/job.service.ts')
-rw-r--r-- | client/src/app/+admin/jobs/shared/job.service.ts | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/client/src/app/+admin/jobs/shared/job.service.ts b/client/src/app/+admin/jobs/shared/job.service.ts index 61ee16077..a19d278c9 100644 --- a/client/src/app/+admin/jobs/shared/job.service.ts +++ b/client/src/app/+admin/jobs/shared/job.service.ts | |||
@@ -5,6 +5,7 @@ import 'rxjs/add/operator/catch' | |||
5 | import 'rxjs/add/operator/map' | 5 | import 'rxjs/add/operator/map' |
6 | import { Observable } from 'rxjs/Observable' | 6 | import { Observable } from 'rxjs/Observable' |
7 | import { ResultList } from '../../../../../../shared' | 7 | import { ResultList } from '../../../../../../shared' |
8 | import { JobState } from '../../../../../../shared/models' | ||
8 | import { Job } from '../../../../../../shared/models/job.model' | 9 | import { Job } from '../../../../../../shared/models/job.model' |
9 | import { environment } from '../../../../environments/environment' | 10 | import { environment } from '../../../../environments/environment' |
10 | import { RestExtractor, RestPagination, RestService } from '../../../shared' | 11 | import { RestExtractor, RestPagination, RestService } from '../../../shared' |
@@ -19,19 +20,19 @@ export class JobService { | |||
19 | private restExtractor: RestExtractor | 20 | private restExtractor: RestExtractor |
20 | ) {} | 21 | ) {} |
21 | 22 | ||
22 | getJobs (pagination: RestPagination, sort: SortMeta): Observable<ResultList<Job>> { | 23 | getJobs (state: JobState, pagination: RestPagination, sort: SortMeta): Observable<ResultList<Job>> { |
23 | let params = new HttpParams() | 24 | let params = new HttpParams() |
24 | params = this.restService.addRestGetParams(params, pagination, sort) | 25 | params = this.restService.addRestGetParams(params, pagination, sort) |
25 | 26 | ||
26 | return this.authHttp.get<ResultList<Job>>(JobService.BASE_JOB_URL, { params }) | 27 | return this.authHttp.get<ResultList<Job>>(JobService.BASE_JOB_URL + '/' + state, { params }) |
27 | .map(res => this.restExtractor.convertResultListDateToHuman(res)) | 28 | .map(res => this.restExtractor.convertResultListDateToHuman(res)) |
28 | .map(res => this.restExtractor.applyToResultListData(res, this.prettyPrintData)) | 29 | .map(res => this.restExtractor.applyToResultListData(res, this.prettyPrintData)) |
29 | .catch(err => this.restExtractor.handleError(err)) | 30 | .catch(err => this.restExtractor.handleError(err)) |
30 | } | 31 | } |
31 | 32 | ||
32 | private prettyPrintData (obj: Job) { | 33 | private prettyPrintData (obj: Job) { |
33 | const handlerInputData = JSON.stringify(obj.handlerInputData, null, 2) | 34 | const data = JSON.stringify(obj.data, null, 2) |
34 | 35 | ||
35 | return Object.assign(obj, { handlerInputData }) | 36 | return Object.assign(obj, { data }) |
36 | } | 37 | } |
37 | } | 38 | } |