From e8f902c05cb35f6d5e9b75a23ddabd51c220a976 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 22 Jul 2019 16:04:44 +0200
Subject: Use search client scope

---
 .../src/app/videos/+video-watch/comment/video-comment.service.ts | 9 ++++-----
 .../app/videos/+video-watch/comment/video-comments.component.ts  | 4 ++--
 client/src/app/videos/+video-watch/video-watch.component.ts      | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'client/src/app/videos/+video-watch')

diff --git a/client/src/app/videos/+video-watch/comment/video-comment.service.ts b/client/src/app/videos/+video-watch/comment/video-comment.service.ts
index eb608a1a3..550d42fa8 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.service.ts
+++ b/client/src/app/videos/+video-watch/comment/video-comment.service.ts
@@ -52,7 +52,7 @@ export class VideoCommentService {
     videoId: number | string,
     componentPagination: ComponentPagination,
     sort: VideoSortField
-  }): Observable<{ comments: VideoComment[], totalComments: number}> {
+  }): Observable<ResultList<VideoComment>> {
     const { videoId, componentPagination, sort } = parameters
 
     const pagination = this.restService.componentPaginationToRestPagination(componentPagination)
@@ -61,10 +61,9 @@ export class VideoCommentService {
     params = this.restService.addRestGetParams(params, pagination, sort)
 
     const url = VideoCommentService.BASE_VIDEO_URL + videoId + '/comment-threads'
-    return this.authHttp
-               .get(url, { params })
+    return this.authHttp.get<ResultList<VideoComment>>(url, { params })
                .pipe(
-                 map(this.extractVideoComments),
+                 map(result => this.extractVideoComments(result)),
                  catchError(err => this.restExtractor.handleError(err))
                )
   }
@@ -136,7 +135,7 @@ export class VideoCommentService {
       comments.push(new VideoComment(videoCommentJson))
     }
 
-    return { comments, totalComments }
+    return { data: comments, total: totalComments }
   }
 
   private extractVideoCommentTree (tree: VideoCommentThreadTree) {
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.ts b/client/src/app/videos/+video-watch/comment/video-comments.component.ts
index 3c1a0986c..5bafc55e5 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.ts
+++ b/client/src/app/videos/+video-watch/comment/video-comments.component.ts
@@ -122,8 +122,8 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
 
     obs.subscribe(
       res => {
-        this.comments = this.comments.concat(res.comments)
-        this.componentPagination.totalItems = res.totalComments
+        this.comments = this.comments.concat(res.data)
+        this.componentPagination.totalItems = res.total
       },
 
       err => this.notifier.error(err.message)
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index eed2ec048..0d9b6d680 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -103,7 +103,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
   }
 
   async ngOnInit () {
-    await this.pluginService.loadPluginsByScope('video-watch')
+    this.pluginService.loadPluginsByScope('video-watch')
 
     this.configSub = this.serverService.configLoaded
         .subscribe(() => {
-- 
cgit v1.2.3