X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Fjobs%2Fshared%2Fjob.service.ts;h=6441eaac1f380e65652c0f35030452e3f4c22d1c;hb=db400f447a9f7aae1c56fa25396e93069744483f;hp=98f29b7427c2b7c352447011235649b06a911608;hpb=09cababd79f9d445aa027c93cdfe823745fa041a;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/+admin/jobs/shared/job.service.ts b/client/src/app/+admin/jobs/shared/job.service.ts
index 98f29b742..6441eaac1 100644
--- a/client/src/app/+admin/jobs/shared/job.service.ts
+++ b/client/src/app/+admin/jobs/shared/job.service.ts
@@ -1,9 +1,8 @@
+import { catchError, map } from 'rxjs/operators'
 import { HttpClient, HttpParams } from '@angular/common/http'
 import { Injectable } from '@angular/core'
 import { SortMeta } from 'primeng/primeng'
-import 'rxjs/add/operator/catch'
-import 'rxjs/add/operator/map'
-import { Observable } from 'rxjs/Observable'
+import { Observable } from 'rxjs'
 import { ResultList } from '../../../../../../shared'
 import { JobState } from '../../../../../../shared/models'
 import { Job } from '../../../../../../shared/models/server/job.model'
@@ -25,9 +24,11 @@ export class JobService {
     params = this.restService.addRestGetParams(params, pagination, sort)
 
     return this.authHttp.get<ResultList<Job>>(JobService.BASE_JOB_URL + '/' + state, { params })
-      .map(res => this.restExtractor.convertResultListDateToHuman(res, [ 'createdAt', 'updatedAt' ]))
-      .map(res => this.restExtractor.applyToResultListData(res, this.prettyPrintData))
-      .catch(err => this.restExtractor.handleError(err))
+               .pipe(
+                 map(res => this.restExtractor.convertResultListDateToHuman(res, [ 'createdAt', 'updatedAt' ])),
+                 map(res => this.restExtractor.applyToResultListData(res, this.prettyPrintData)),
+                 catchError(err => this.restExtractor.handleError(err))
+               )
   }
 
   private prettyPrintData (obj: Job) {