X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Fsystem%2Fjobs%2Fjob.service.ts;h=1ac50f050f9f3f39ef5cca0ed965f1d74a7e4f58;hb=66357162f8e1227495f09bd4f68446aad7071c6d;hp=120144dff5a4872fcaa6d339ba2ad36b9a8c7bcf;hpb=1061c73fde3005100ead8764eacb444f240440d6;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..1ac50f050 100644 --- a/client/src/app/+admin/system/jobs/job.service.ts +++ b/client/src/app/+admin/system/jobs/job.service.ts @@ -1,13 +1,12 @@ +import { SortMeta } from 'primeng/api' +import { Observable } from 'rxjs' import { catchError, map } from 'rxjs/operators' 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 { Job } from '../../../../../../shared/models/server/job.model' +import { RestExtractor, RestPagination, RestService } from '@app/core' +import { Job, ResultList } from '@shared/models' 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 +19,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' ])