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 { AuthService, Notifier } from '@app/core'
+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'
-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'
+import { HooksService } from '@app/core/plugins/hooks.service'
@Component({
selector: 'my-search',
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 = true
+ 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 hooks: HooksService
) { }
+ get user () {
+ return this.authService.getUser()
+ }
+
ngOnInit () {
this.subActivatedRoute = this.route.queryParams.subscribe(
queryParams => {
const querySearch = queryParams['search']
- // New empty search
- if (this.currentSearch && !querySearch) return this.redirectService.redirectToHomepage()
-
// Search updated, reset filters
if (this.currentSearch !== querySearch) {
this.resetPagination()
this.advancedSearch.reset()
- this.currentSearch = querySearch
+ this.currentSearch = querySearch || undefined
this.updateTitle()
}
this.search()
},
- err => this.notificationsService.error('Error', err.text)
+ err => this.notifier.error(err.text)
)
+
+ this.hooks.runAction('action:search.init', 'search')
}
ngOnDestroy () {
if (this.subActivatedRoute) this.subActivatedRoute.unsubscribe()
}
+ 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, this.advancedSearch)
+ forkJoin([
+ this.getVideosObs(),
+ this.getVideoChannelObs()
+ ])
.subscribe(
- ({ videos, totalVideos }) => {
- this.videos = this.videos.concat(videos)
- this.pagination.totalItems = totalVideos
+ ([ videosResult, videoChannelsResult ]) => {
+ this.results = this.results
+ .concat(videoChannelsResult.data)
+ .concat(videosResult.data)
+ this.pagination.totalItems = videosResult.total + videoChannelsResult.total
+
+ // Focus on channels if there are no enough videos
+ if (this.firstSearch === true && videosResult.data.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)
)
}
this.updateUrlFromAdvancedSearch()
}
+ numberOfFilters () {
+ return this.advancedSearch.size()
+ }
+
+ // 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)
+ }
+
private resetPagination () {
this.pagination.currentPage = 1
this.pagination.totalItems = null
+ this.channelsPerPage = 2
- this.videos = []
+ 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: this.currentSearch })
+ queryParams: Object.assign({}, this.advancedSearch.toUrlObject(), { search })
})
}
+
+ private getVideosObs () {
+ const params = {
+ search: this.currentSearch,
+ componentPagination: this.pagination,
+ advancedSearch: this.advancedSearch
+ }
+
+ return this.hooks.wrapObsFun(
+ this.searchService.searchVideos.bind(this.searchService),
+ params,
+ '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 })
+ }
+
+ return this.hooks.wrapObsFun(
+ this.searchService.searchVideoChannels.bind(this.searchService),
+ params,
+ 'search',
+ 'filter:api.search.video-channels.list.params',
+ 'filter:api.search.video-channels.list.result'
+ )
+ }
}
projects / github / Chocobozzz / PeerTube.git / blobdiff