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',
})
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,
private route: ActivatedRoute,
}
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 () {
private resetPagination () {
this.pagination.currentPage = 1
this.pagination.totalItems = null
+ this.channelsPerPage = 2
this.videos = []
+ this.videoChannels = []
}
private updateTitle () {