X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fsearch%2Fsearch.component.ts;h=dfd8d882332ef5e47af21d1bb3fcbb396ffd23aa;hb=41eb700fceee1085dd0e1a9ce78ecbd0e111eb6e;hp=b1d732d68d3b361e1da5d587188cc71ca610ce2e;hpb=93cae47925e4dd68b7d34a41927b2740b4fab1b4;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/search/search.component.ts b/client/src/app/search/search.component.ts index b1d732d68..dfd8d8823 100644 --- 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 () { @@ -175,13 +177,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 +194,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' )