Translated using Weblate (Spanish)

[github/Chocobozzz/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 b1d732d68d3b361e1da5d587188cc71ca610ce2e..075994dd3e5d5239f76c70544b84c6b209b87783 100644 (file)
--- a/client/src/app/search/search.component.ts
+++ b/client/src/app/search/search.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { AuthService, Notifier } from '@app/core'
-import { forkJoin, Subscription } from 'rxjs'
+import { forkJoin, of, 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'
@@ -75,6 +75,8 @@ export class SearchComponent implements OnInit, OnDestroy {
 
       err => this.notifier.error(err.text)
     )
+
+    this.hooks.runAction('action:search.init', 'search')
   }
 
   ngOnDestroy () {
@@ -139,7 +141,8 @@ export class SearchComponent implements OnInit, OnDestroy {
     return this.advancedSearch.size()
   }
 
-  removeVideoFromArray (video: Video) {
+  // Add VideoChannel for typings, but the template already checks "video" argument is a video
+  removeVideoFromArray (video: Video | VideoChannel) {
     this.results = this.results.filter(r => !this.isVideo(r) || r.id !== video.id)
   }
 
@@ -175,13 +178,15 @@ export class SearchComponent implements OnInit, OnDestroy {
     return this.hooks.wrapObsFun(
       this.searchService.searchVideos.bind(this.searchService),
       params,
-      'common',
+      'search',
       'filter:api.search.videos.list.params',
       'filter:api.search.videos.list.result'
     )
   }
 
   private getVideoChannelObs () {
+    if (!this.currentSearch) return of({ data: [], total: 0 })
+
     const params = {
       search: this.currentSearch,
       componentPagination: immutableAssign(this.pagination, { itemsPerPage: this.channelsPerPage })
@@ -190,7 +195,7 @@ export class SearchComponent implements OnInit, OnDestroy {
     return this.hooks.wrapObsFun(
       this.searchService.searchVideoChannels.bind(this.searchService),
       params,
-      'common',
+      'search',
       'filter:api.search.video-channels.list.params',
       'filter:api.search.video-channels.list.result'
     )