X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fsearch%2Fsearch.component.ts;h=ed84e24d9fbb8cf3d512d636552066b0304b7eee;hb=aa55a4da422330fe2816f1764b64f6607a0ca4aa;hp=09028fec5e0f75c8cdbc1835b0d367bdfe7c7081;hpb=0b18f4aa80df8868bf34605423c7a298dffbb2aa;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/search/search.component.ts b/client/src/app/search/search.component.ts
index 09028fec5..ed84e24d9 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,16 +19,21 @@ 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,
@@ -39,23 +46,29 @@ export class SearchComponent implements OnInit, OnDestroy {
   ) { }
 
   ngOnInit () {
-    this.advancedSearch = new AdvancedSearch(this.route.snapshot.queryParams)
-    if (this.advancedSearch.containsValues()) this.isSearchFilterCollapsed = false
-
     this.subActivatedRoute = this.route.queryParams.subscribe(
       queryParams => {
         const querySearch = queryParams['search']
 
-        if (!querySearch) return this.redirectService.redirectToHomepage()
-        if (querySearch === this.currentSearch) return
+        // New empty search
+        if (this.currentSearch && !querySearch) return this.redirectService.redirectToHomepage()
 
         // Search updated, reset filters
-        if (this.currentSearch) this.advancedSearch.reset()
+        if (this.currentSearch !== querySearch) {
+          this.resetPagination()
+          this.advancedSearch.reset()
 
-        this.currentSearch = querySearch
-        this.updateTitle()
+          this.currentSearch = querySearch
+          this.updateTitle()
+        }
 
-        this.reload()
+        this.advancedSearch = new AdvancedSearch(queryParams)
+
+        // Don't hide filters if we have some of them AND the user just came on the webpage
+        this.isSearchFilterCollapsed = this.isInitialLoad === false || !this.advancedSearch.containsValues()
+        this.isInitialLoad = false
+
+        this.search()
       },
 
       err => this.notificationsService.error('Error', err.text)
@@ -67,17 +80,31 @@ 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 + videoChannelsResult.total
+
+          this.videoChannels = this.videoChannels.concat(videoChannelsResult.data)
+
+          // Focus on channels
+          if (this.channelsPerPage !== 10 && this.videos.length < this.pagination.itemsPerPage) {
+            this.resetPagination()
+
+            this.channelsPerPage = 10
+            this.search()
+          }
         },
 
         error => {
           this.notificationsService.error(this.i18n('Error'), error.message)
         }
       )
+
   }
 
   onNearOfBottom () {
@@ -89,20 +116,18 @@ export class SearchComponent implements OnInit, OnDestroy {
   }
 
   onFiltered () {
-    this.updateUrlFromAdvancedSearch()
-    // Hide the filters
-    this.isSearchFilterCollapsed = true
+    this.resetPagination()
 
-    this.reload()
+    this.updateUrlFromAdvancedSearch()
   }
 
-  private reload () {
+  private resetPagination () {
     this.pagination.currentPage = 1
     this.pagination.totalItems = null
+    this.channelsPerPage = 2
 
     this.videos = []
-
-    this.search()
+    this.videoChannels = []
   }
 
   private updateTitle () {