Merge branch 'develop' into pr/1285

[oweals/peertube.git] / client / src / app / search / search.component.ts

diff --git a/client/src/app/search/search.component.ts b/client/src/app/search/search.component.ts
index be1cb3689d02c30db5579b6575eccb47f78e6bf2..c4a4b1fdebf7a472916c81bc22f1c86e10e8cd27 100644 (file)
--- a/client/src/app/search/search.component.ts
+++ b/client/src/app/search/search.component.ts
@@ -1,13 +1,15 @@
 import { Component, OnDestroy, OnInit } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
-import { RedirectService } from '@app/core'
-import { NotificationsService } from 'angular2-notifications'
-import { Subscription } from 'rxjs'
+import { ActivatedRoute, Router } from '@angular/router'
+import { AuthService, Notifier, ServerService } from '@app/core'
+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'
+import { Video } from '@app/shared/video/video.model'
 
 @Component({
   selector: 'my-search',
@@ -15,23 +17,32 @@ import { MetaService } from '@ngx-meta/core'
   templateUrl: './search.component.html'
 })
 export class SearchComponent implements OnInit, OnDestroy {
-  videos: Video[] = []
+  results: (Video | 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 = false // set to false to show the search filters on first arrival
+  private firstSearch = true
+
+  private channelsPerPage = 2
 
   constructor (
     private i18n: I18n,
     private route: ActivatedRoute,
+    private router: Router,
     private metaService: MetaService,
-    private redirectService: RedirectService,
-    private notificationsService: NotificationsService,
-    private searchService: SearchService
+    private notifier: Notifier,
+    private searchService: SearchService,
+    private authService: AuthService,
+    private serverService: ServerService
   ) { }
 
   ngOnInit () {
@@ -39,16 +50,25 @@ export class SearchComponent implements OnInit, OnDestroy {
       queryParams => {
         const querySearch = queryParams['search']
 
-        if (!querySearch) return this.redirectService.redirectToHomepage()
-        if (querySearch === this.currentSearch) return
+        // Search updated, reset filters
+        if (this.currentSearch !== querySearch) {
+          this.resetPagination()
+          this.advancedSearch.reset()
+
+          this.currentSearch = querySearch || undefined
+          this.updateTitle()
+        }
 
-        this.currentSearch = querySearch
-        this.updateTitle()
+        this.advancedSearch = new AdvancedSearch(queryParams)
 
-        this.reload()
+        // 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)
+      err => this.notifier.error(err.text)
     )
   }
 
@@ -56,18 +76,49 @@ export class SearchComponent implements OnInit, OnDestroy {
     if (this.subActivatedRoute) this.subActivatedRoute.unsubscribe()
   }
 
+  isVideoBlur (video: Video) {
+    return video.isVideoNSFWForUser(this.authService.getUser(), this.serverService.getConfig())
+  }
+
+  isVideoChannel (d: VideoChannel | Video): d is VideoChannel {
+    return d instanceof VideoChannel
+  }
+
+  isVideo (v: VideoChannel | Video): v is Video {
+    return v instanceof Video
+  }
+
+  isUserLoggedIn () {
+    return this.authService.isLoggedIn()
+  }
+
   search () {
-    return this.searchService.searchVideos(this.currentSearch, this.pagination)
+    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.results = this.results
+                             .concat(videoChannelsResult.data)
+                             .concat(videosResult.videos)
+          this.pagination.totalItems = videosResult.totalVideos + videoChannelsResult.total
+
+          // Focus on channels if there are no enough videos
+          if (this.firstSearch === true && videosResult.videos.length < this.pagination.itemsPerPage) {
+            this.resetPagination()
+            this.firstSearch = false
+
+            this.channelsPerPage = 10
+            this.search()
+          }
+
+          this.firstSearch = false
         },
 
-        error => {
-          this.notificationsService.error(this.i18n('Error'), error.message)
-        }
+        err => this.notifier.error(err.message)
       )
+
   }
 
   onNearOfBottom () {
@@ -78,16 +129,35 @@ export class SearchComponent implements OnInit, OnDestroy {
     this.search()
   }
 
-  private reload () {
+  onFiltered () {
+    this.resetPagination()
+
+    this.updateUrlFromAdvancedSearch()
+  }
+
+  numberOfFilters () {
+    return this.advancedSearch.size()
+  }
+
+  private resetPagination () {
     this.pagination.currentPage = 1
     this.pagination.totalItems = null
+    this.channelsPerPage = 2
 
-    this.videos = []
-
-    this.search()
+    this.results = []
   }
 
   private updateTitle () {
-    this.metaService.setTitle(this.i18n('Search') + ' ' + this.currentSearch)
+    const suffix = this.currentSearch ? ' ' + this.currentSearch : ''
+    this.metaService.setTitle(this.i18n('Search') + suffix)
+  }
+
+  private updateUrlFromAdvancedSearch () {
+    const search = this.currentSearch || undefined
+
+    this.router.navigate([], {
+      relativeTo: this.route,
+      queryParams: Object.assign({}, this.advancedSearch.toUrlObject(), { search })
+    })
   }
 }