X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Fsystem%2Fjobs%2Fjob.service.ts;fp=client%2Fsrc%2Fapp%2F%2Badmin%2Fsystem%2Fjobs%2Fjob.service.ts;h=1e2291ad194f151051db59902fe6c8de6394f597;hb=4271212172ebd3ff5b4196ecb4064f79f7d5e0de;hp=120144dff5a4872fcaa6d339ba2ad36b9a8c7bcf;hpb=51b34a11b298b466faef9c8d24beec4442d7add3;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/+admin/system/jobs/job.service.ts b/client/src/app/+admin/system/jobs/job.service.ts index 120144dff..1e2291ad1 100644 --- a/client/src/app/+admin/system/jobs/job.service.ts +++ b/client/src/app/+admin/system/jobs/job.service.ts @@ -3,11 +3,11 @@ import { HttpClient, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' import { SortMeta } from 'primeng/api' import { Observable } from 'rxjs' -import { JobType, ResultList } from '../../../../../../shared' -import { JobState } from '../../../../../../shared/models' +import { ResultList } from '../../../../../../shared' import { Job } from '../../../../../../shared/models/server/job.model' import { environment } from '../../../../environments/environment' import { RestExtractor, RestPagination, RestService } from '../../../shared' +import { JobStateClient } from '../../../../types/job-state-client.type' import { JobTypeClient } from '../../../../types/job-type-client.type' @Injectable() @@ -20,13 +20,13 @@ export class JobService { private restExtractor: RestExtractor ) {} - getJobs (state: JobState, jobType: JobTypeClient, pagination: RestPagination, sort: SortMeta): Observable> { + getJobs (jobState: JobStateClient, 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 }) + return this.authHttp.get>(JobService.BASE_JOB_URL + '/' + jobState, { params }) .pipe( map(res => { return this.restExtractor.convertResultListDateToHuman(res, [ 'createdAt', 'processedOn', 'finishedOn' ])