From 1061c73fde3005100ead8764eacb444f240440d6 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 4 Dec 2019 14:49:59 +0100 Subject: Add ability to filter per job type --- client/src/app/+admin/system/jobs/job.service.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'client/src/app/+admin/system/jobs/job.service.ts') diff --git a/client/src/app/+admin/system/jobs/job.service.ts b/client/src/app/+admin/system/jobs/job.service.ts index 1daae8f03..120144dff 100644 --- a/client/src/app/+admin/system/jobs/job.service.ts +++ b/client/src/app/+admin/system/jobs/job.service.ts @@ -3,11 +3,12 @@ import { HttpClient, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' import { SortMeta } from 'primeng/api' import { Observable } from 'rxjs' -import { ResultList } from '../../../../../../shared' +import { JobType, ResultList } from '../../../../../../shared' import { JobState } from '../../../../../../shared/models' import { Job } from '../../../../../../shared/models/server/job.model' import { environment } from '../../../../environments/environment' import { RestExtractor, RestPagination, RestService } from '../../../shared' +import { JobTypeClient } from '../../../../types/job-type-client.type' @Injectable() export class JobService { @@ -19,10 +20,12 @@ export class JobService { private restExtractor: RestExtractor ) {} - getJobs (state: JobState, pagination: RestPagination, sort: SortMeta): Observable> { + getJobs (state: JobState, jobType: JobTypeClient, pagination: RestPagination, sort: SortMeta): Observable> { let params = new HttpParams() params = this.restService.addRestGetParams(params, pagination, sort) + if (jobType !== 'all') params = params.append('jobType', jobType) + return this.authHttp.get>(JobService.BASE_JOB_URL + '/' + state, { params }) .pipe( map(res => { -- cgit v1.2.3