+import { forkJoin, of, Subscription } from 'rxjs'
import { Component, OnDestroy, OnInit } from '@angular/core'
import { ActivatedRoute, Router } from '@angular/router'
-import { AuthService, RedirectService } from '@app/core'
-import { NotificationsService } from 'angular2-notifications'
-import { forkJoin, Subscription } from 'rxjs'
+import { AuthService, Notifier, ServerService } from '@app/core'
+import { HooksService } from '@app/core/plugins/hooks.service'
+import { AdvancedSearch } from '@app/search/advanced-search.model'
import { SearchService } from '@app/search/search.service'
+import { immutableAssign } from '@app/shared/misc/utils'
import { ComponentPagination } from '@app/shared/rest/component-pagination.model'
-import { I18n } from '@ngx-translate/i18n-polyfill'
-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 { MetaService } from '@ngx-meta/core'
+import { I18n } from '@ngx-translate/i18n-polyfill'
+import { ServerConfig } from '@shared/models'
+import { UserService } from '@app/shared'
@Component({
selector: 'my-search',
isSearchFilterCollapsed = true
currentSearch: string
+ errorMessage: string
+ serverConfig: ServerConfig
+
private subActivatedRoute: Subscription
private isInitialLoad = false // set to false to show the search filters on first arrival
private firstSearch = true
private route: ActivatedRoute,
private router: Router,
private metaService: MetaService,
- private redirectService: RedirectService,
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
private searchService: SearchService,
- private authService: AuthService
+ private authService: AuthService,
+ private hooks: HooksService,
+ private serverService: ServerService
) { }
+ get user () {
+ return this.authService.getUser()
+ }
+
ngOnInit () {
+ this.serverService.getConfig()
+ .subscribe(config => this.serverConfig = config)
+
this.subActivatedRoute = this.route.queryParams.subscribe(
- queryParams => {
+ async 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.advancedSearch = new AdvancedSearch(queryParams)
+ if (!this.advancedSearch.searchTarget) {
+ this.advancedSearch.searchTarget = await this.serverService.getDefaultSearchTarget()
+ }
// 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.search()
},
- err => this.notificationsService.error('Error', err.text)
+ err => this.notifier.error(err.text)
)
+
+ this.hooks.runAction('action:search.init', 'search')
}
ngOnDestroy () {
search () {
forkJoin([
- this.searchService.searchVideos(this.currentSearch, this.pagination, this.advancedSearch),
- this.searchService.searchVideoChannels(this.currentSearch, immutableAssign(this.pagination, { itemsPerPage: this.channelsPerPage }))
- ])
- .subscribe(
- ([ 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.getVideosObs(),
+ this.getVideoChannelObs()
+ ]).subscribe(
+ ([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
- },
- error => {
- this.notificationsService.error(this.i18n('Error'), error.message)
+ this.channelsPerPage = 10
+ this.search()
}
- )
+ this.firstSearch = false
+ },
+
+ err => {
+ if (this.advancedSearch.searchTarget !== 'search-index') this.notifier.error(err.message)
+
+ this.notifier.error(
+ this.i18n('Search index is unavailable. Retrying with instance results instead.'),
+ this.i18n('Search error')
+ )
+ this.advancedSearch.searchTarget = 'local'
+ this.search()
+ }
+ )
}
onNearOfBottom () {
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)
+ }
+
+ getChannelUrl (channel: VideoChannel) {
+ if (this.advancedSearch.searchTarget === 'search-index' && channel.url) {
+ const remoteUriConfig = this.serverConfig.search.remoteUri
+
+ // Redirect on the external instance if not allowed to fetch remote data
+ const externalRedirect = (!this.authService.isLoggedIn() && !remoteUriConfig.anonymous) || !remoteUriConfig.users
+ const fromPath = window.location.pathname + window.location.search
+
+ return [ '/search/lazy-load-channel', { url: channel.url, externalRedirect, fromPath } ]
+ }
+
+ return [ '/video-channels', channel.nameWithHost ]
+ }
+
+ hideActions () {
+ return this.advancedSearch.searchTarget === 'search-index'
+ }
+
private resetPagination () {
this.pagination.currentPage = 1
this.pagination.totalItems = null
}
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 && this.currentSearch !== '') ? this.currentSearch : undefined
+ const search = this.currentSearch || undefined
this.router.navigate([], {
relativeTo: this.route,
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 }),
+ searchTarget: this.advancedSearch.searchTarget
+ }
+
+ 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