Add ability to search video channels

1 files changed, 19 insertions, 7 deletions

diff --git a/client/src/app/search/search.component.ts b/client/src/app/search/search.component.ts
index 8d615fd05..f88df6391 100644
--- a/client/src/app/search/search.component.ts
+++ b/client/src/app/search/search.component.ts
@@ -2,13 +2,15 @@ import { Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { RedirectService } from '@app/core'
 import { NotificationsService } from 'angular2-notifications'
-import { Subscription } from 'rxjs'
+import { forkJoin, Subscription } from 'rxjs'
 import { SearchService } from '@app/search/search.service'
 import { ComponentPagination } from '@app/shared/rest/component-pagination.model'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { Video } from '../../../../shared'
 import { MetaService } from '@ngx-meta/core'
 import { AdvancedSearch } from '@app/search/advanced-search.model'
+import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
+import { immutableAssign } from '@app/shared/misc/utils'
 
 @Component({
   selector: 'my-search',
@@ -17,18 +19,22 @@ import { AdvancedSearch } from '@app/search/advanced-search.model'
 })
 export class SearchComponent implements OnInit, OnDestroy {
   videos: Video[] = []
+  videoChannels: VideoChannel[] = []
+
   pagination: ComponentPagination = {
     currentPage: 1,
-    itemsPerPage: 10, // It's per object type (so 10 videos, 10 video channels etc)
+    itemsPerPage: 10, // Only for videos, use another variable for channels
     totalItems: null
   }
   advancedSearch: AdvancedSearch = new AdvancedSearch()
   isSearchFilterCollapsed = true
+  currentSearch: string
 
   private subActivatedRoute: Subscription
-  private currentSearch: string
   private isInitialLoad = true
 
+  private channelsPerPage = 2
+
   constructor (
     private i18n: I18n,
     private route: ActivatedRoute,
@@ -74,17 +80,23 @@ export class SearchComponent implements OnInit, OnDestroy {
   }
 
   search () {
-    return this.searchService.searchVideos(this.currentSearch, this.pagination, this.advancedSearch)
+    forkJoin([
+      this.searchService.searchVideos(this.currentSearch, this.pagination, this.advancedSearch),
+      this.searchService.searchVideoChannels(this.currentSearch, immutableAssign(this.pagination, { itemsPerPage: this.channelsPerPage }))
+    ])
       .subscribe(
-        ({ videos, totalVideos }) => {
-          this.videos = this.videos.concat(videos)
-          this.pagination.totalItems = totalVideos
+        ([ videosResult, videoChannelsResult ]) => {
+          this.videos = this.videos.concat(videosResult.videos)
+          this.pagination.totalItems = videosResult.totalVideos
+
+          this.videoChannels = videoChannelsResult.data
         },
 
         error => {
           this.notificationsService.error(this.i18n('Error'), error.message)
         }
       )
+
   }
 
   onNearOfBottom () {