Upgrade to rxjs 6

3 files changed, 92 insertions, 73 deletions

diff --git a/client/src/app/shared/video/abstract-video-list.ts b/client/src/app/shared/video/abstract-video-list.ts
index d8a4b03af..d47df4da4 100644
--- a/client/src/app/shared/video/abstract-video-list.ts
+++ b/client/src/app/shared/video/abstract-video-list.ts
@@ -1,13 +1,11 @@
+import { debounceTime } from 'rxjs/operators'
 import { ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { Location } from '@angular/common'
 import { isInMobileView } from '@app/shared/misc/utils'
 import { InfiniteScrollerDirective } from '@app/shared/video/infinite-scroller.directive'
 import { NotificationsService } from 'angular2-notifications'
-import 'rxjs/add/operator/debounceTime'
-import { Observable } from 'rxjs/Observable'
-import { fromEvent } from 'rxjs/observable/fromEvent'
-import { Subscription } from 'rxjs/Subscription'
+import { fromEvent, Observable, Subscription } from 'rxjs'
 import { AuthService } from '../../core/auth'
 import { ComponentPagination } from '../rest/component-pagination.model'
 import { VideoSortField } from './sort-field.type'
@@ -64,7 +62,7 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy {
     this.loadRouteParams(routeParams)
 
     this.resizeSubscription = fromEvent(window, 'resize')
-      .debounceTime(500)
+      .pipe(debounceTime(500))
       .subscribe(() => this.calcPageSizes())
 
     this.calcPageSizes()
diff --git a/client/src/app/shared/video/infinite-scroller.directive.ts b/client/src/app/shared/video/infinite-scroller.directive.ts
index e2730423f..0448e2c23 100644
--- a/client/src/app/shared/video/infinite-scroller.directive.ts
+++ b/client/src/app/shared/video/infinite-scroller.directive.ts
@@ -1,14 +1,6 @@
+import { distinct, distinctUntilChanged, filter, map, share, startWith, throttleTime } from 'rxjs/operators'
 import { Directive, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'
-import 'rxjs/add/operator/debounceTime'
-import 'rxjs/add/operator/distinct'
-import 'rxjs/add/operator/distinctUntilChanged'
-import 'rxjs/add/operator/filter'
-import 'rxjs/add/operator/map'
-import 'rxjs/add/operator/share'
-import 'rxjs/add/operator/startWith'
-import 'rxjs/add/operator/throttleTime'
-import { fromEvent } from 'rxjs/observable/fromEvent'
-import { Subscription } from 'rxjs/Subscription'
+import { fromEvent, Subscription } from 'rxjs'
 
 @Directive({
   selector: '[myInfiniteScroller]'
@@ -51,43 +43,51 @@ export class InfiniteScrollerDirective implements OnInit, OnDestroy {
     const throttleOptions = { leading: true, trailing: true }
 
     const scrollObservable = fromEvent(window, 'scroll')
-      .startWith(true)
-      .throttleTime(200, undefined, throttleOptions)
-      .map(() => ({ current: window.scrollY, maximumScroll: document.body.clientHeight - window.innerHeight }))
-      .distinctUntilChanged((o1, o2) => o1.current === o2.current)
-      .share()
+      .pipe(
+        startWith(null),
+        throttleTime(200, undefined, throttleOptions),
+        map(() => ({ current: window.scrollY, maximumScroll: document.body.clientHeight - window.innerHeight })),
+        distinctUntilChanged((o1, o2) => o1.current === o2.current),
+        share()
+      )
 
     // Scroll Down
     this.scrollDownSub = scrollObservable
-      // Check we scroll down
-      .filter(({ current }) => {
-        const res = this.lastCurrentBottom < current
+      .pipe(
+        // Check we scroll down
+        filter(({ current }) => {
+          const res = this.lastCurrentBottom < current
 
-        this.lastCurrentBottom = current
-        return res
-      })
-      .filter(({ current, maximumScroll }) => maximumScroll <= 0 || (current / maximumScroll) > this.decimalLimit)
+          this.lastCurrentBottom = current
+          return res
+        }),
+        filter(({ current, maximumScroll }) => maximumScroll <= 0 || (current / maximumScroll) > this.decimalLimit)
+      )
       .subscribe(() => this.nearOfBottom.emit())
 
     // Scroll up
     this.scrollUpSub = scrollObservable
-      // Check we scroll up
-      .filter(({ current }) => {
-        const res = this.lastCurrentTop > current
+      .pipe(
+        // Check we scroll up
+        filter(({ current }) => {
+          const res = this.lastCurrentTop > current
 
-        this.lastCurrentTop = current
-        return res
-      })
-      .filter(({ current, maximumScroll }) => {
-        return current !== 0 && (1 - (current / maximumScroll)) > this.decimalLimit
-      })
+          this.lastCurrentTop = current
+          return res
+        }),
+        filter(({ current, maximumScroll }) => {
+          return current !== 0 && (1 - (current / maximumScroll)) > this.decimalLimit
+        })
+      )
       .subscribe(() => this.nearOfTop.emit())
 
     // Page change
     this.pageChangeSub = scrollObservable
-      .distinct()
-      .map(({ current }) => this.calculateCurrentPage(current))
-      .distinctUntilChanged()
+      .pipe(
+        distinct(),
+        map(({ current }) => this.calculateCurrentPage(current)),
+        distinctUntilChanged()
+      )
       .subscribe(res => this.pageChanged.emit(res))
   }
 
diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts
index cd8539b41..f57cb6d6d 100644
--- a/client/src/app/shared/video/video.service.ts
+++ b/client/src/app/shared/video/video.service.ts
@@ -1,8 +1,7 @@
+import { catchError, map } from 'rxjs/operators'
 import { HttpClient, HttpParams, HttpRequest } from '@angular/common/http'
 import { Injectable } from '@angular/core'
-import 'rxjs/add/operator/catch'
-import 'rxjs/add/operator/map'
-import { Observable } from 'rxjs/Observable'
+import { Observable } from 'rxjs'
 import { Video as VideoServerModel, VideoDetails as VideoDetailsServerModel } from '../../../../../shared'
 import { ResultList } from '../../../../../shared/models/result-list.model'
 import { UserVideoRateUpdate } from '../../../../../shared/models/videos/user-video-rate-update.model'
@@ -43,14 +42,18 @@ export class VideoService {
 
   getVideo (uuid: string): Observable<VideoDetails> {
     return this.authHttp.get<VideoDetailsServerModel>(VideoService.BASE_VIDEO_URL + uuid)
-                        .map(videoHash => new VideoDetails(videoHash))
-                        .catch((res) => this.restExtractor.handleError(res))
+               .pipe(
+                 map(videoHash => new VideoDetails(videoHash)),
+                 catchError(res => this.restExtractor.handleError(res))
+               )
   }
 
   viewVideo (uuid: string): Observable<VideoDetails> {
     return this.authHttp.post(this.getVideoViewUrl(uuid), {})
-      .map(this.restExtractor.extractDataBool)
-      .catch(this.restExtractor.handleError)
+               .pipe(
+                 map(this.restExtractor.extractDataBool),
+                 catchError(this.restExtractor.handleError)
+               )
   }
 
   updateVideo (video: VideoEdit) {
@@ -79,16 +82,18 @@ export class VideoService {
     const data = objectToFormData(body)
 
     return this.authHttp.put(VideoService.BASE_VIDEO_URL + video.id, data)
-                        .map(this.restExtractor.extractDataBool)
-                        .catch(this.restExtractor.handleError)
+               .pipe(
+                 map(this.restExtractor.extractDataBool),
+                 catchError(this.restExtractor.handleError)
+               )
   }
 
   uploadVideo (video: FormData) {
     const req = new HttpRequest('POST', VideoService.BASE_VIDEO_URL + 'upload', video, { reportProgress: true })
 
     return this.authHttp
-      .request(req)
-      .catch(this.restExtractor.handleError)
+               .request(req)
+               .pipe(catchError(this.restExtractor.handleError))
   }
 
   getMyVideos (videoPagination: ComponentPagination, sort: VideoSortField): Observable<{ videos: Video[], totalVideos: number}> {
@@ -98,8 +103,10 @@ export class VideoService {
     params = this.restService.addRestGetParams(params, pagination, sort)
 
     return this.authHttp.get(UserService.BASE_USERS_URL + '/me/videos', { params })
-      .map(this.extractVideos)
-      .catch((res) => this.restExtractor.handleError(res))
+               .pipe(
+                 map(this.extractVideos),
+                 catchError(res => this.restExtractor.handleError(res))
+               )
   }
 
   getAccountVideos (
@@ -114,8 +121,10 @@ export class VideoService {
 
     return this.authHttp
                .get(AccountService.BASE_ACCOUNT_URL + account.id + '/videos', { params })
-               .map(this.extractVideos)
-               .catch((res) => this.restExtractor.handleError(res))
+               .pipe(
+                 map(this.extractVideos),
+                 catchError(res => this.restExtractor.handleError(res))
+               )
   }
 
   getVideoChannelVideos (
@@ -130,8 +139,10 @@ export class VideoService {
 
     return this.authHttp
                .get(VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannel.uuid + '/videos', { params })
-               .map(this.extractVideos)
-               .catch((res) => this.restExtractor.handleError(res))
+               .pipe(
+                 map(this.extractVideos),
+                 catchError(res => this.restExtractor.handleError(res))
+               )
   }
 
   getVideos (
@@ -149,9 +160,11 @@ export class VideoService {
     }
 
     return this.authHttp
-      .get(VideoService.BASE_VIDEO_URL, { params })
-      .map(this.extractVideos)
-      .catch((res) => this.restExtractor.handleError(res))
+               .get(VideoService.BASE_VIDEO_URL, { params })
+               .pipe(
+                 map(this.extractVideos),
+                 catchError(res => this.restExtractor.handleError(res))
+               )
   }
 
   buildBaseFeedUrls (params: HttpParams) {
@@ -215,23 +228,29 @@ export class VideoService {
     params = params.append('search', search)
 
     return this.authHttp
-      .get<ResultList<VideoServerModel>>(url, { params })
-      .map(this.extractVideos)
-      .catch((res) => this.restExtractor.handleError(res))
+               .get<ResultList<VideoServerModel>>(url, { params })
+               .pipe(
+                 map(this.extractVideos),
+                 catchError(res => this.restExtractor.handleError(res))
+               )
   }
 
   removeVideo (id: number) {
     return this.authHttp
-      .delete(VideoService.BASE_VIDEO_URL + id)
-      .map(this.restExtractor.extractDataBool)
-      .catch((res) => this.restExtractor.handleError(res))
+               .delete(VideoService.BASE_VIDEO_URL + id)
+               .pipe(
+                 map(this.restExtractor.extractDataBool),
+                 catchError(res => this.restExtractor.handleError(res))
+               )
   }
 
   loadCompleteDescription (descriptionPath: string) {
     return this.authHttp
-      .get(environment.apiUrl + descriptionPath)
-      .map(res => res['description'])
-      .catch((res) => this.restExtractor.handleError(res))
+               .get(environment.apiUrl + descriptionPath)
+               .pipe(
+                 map(res => res[ 'description' ]),
+                 catchError(res => this.restExtractor.handleError(res))
+               )
   }
 
   setVideoLike (id: number) {
@@ -250,8 +269,8 @@ export class VideoService {
     const url = UserService.BASE_USERS_URL + 'me/videos/' + id + '/rating'
 
     return this.authHttp
-      .get(url)
-      .catch(res => this.restExtractor.handleError(res))
+               .get(url)
+               .pipe(catchError(res => this.restExtractor.handleError(res)))
   }
 
   private setVideoRate (id: number, rateType: VideoRateType) {
@@ -261,9 +280,11 @@ export class VideoService {
     }
 
     return this.authHttp
-      .put(url, body)
-      .map(this.restExtractor.extractDataBool)
-      .catch(res => this.restExtractor.handleError(res))
+               .put(url, body)
+               .pipe(
+                 map(this.restExtractor.extractDataBool),
+                 catchError(res => this.restExtractor.handleError(res))
+               )
   }
 
   private extractVideos (result: ResultList<VideoServerModel>) {