private subActivatedRoute: Subscription
private currentSearch: string
+ private isInitialLoad = true
constructor (
private i18n: I18n,
) { }
ngOnInit () {
- this.advancedSearch = new AdvancedSearch(this.route.snapshot.queryParams)
- if (this.advancedSearch.containsValues()) this.isSearchFilterCollapsed = false
-
this.subActivatedRoute = this.route.queryParams.subscribe(
queryParams => {
const querySearch = queryParams['search']
- if (!querySearch) return this.redirectService.redirectToHomepage()
- if (querySearch === this.currentSearch) return
+ // New empty search
+ if (this.currentSearch && !querySearch) return this.redirectService.redirectToHomepage()
// Search updated, reset filters
- if (this.currentSearch) this.advancedSearch.reset()
+ if (this.currentSearch !== querySearch) {
+ this.resetPagination()
+ this.advancedSearch.reset()
+
+ this.currentSearch = querySearch
+ this.updateTitle()
+ }
+
+ this.advancedSearch = new AdvancedSearch(queryParams)
- this.currentSearch = querySearch
- this.updateTitle()
+ // 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.isInitialLoad = false
- this.reload()
+ this.search()
},
err => this.notificationsService.error('Error', err.text)
}
onFiltered () {
- this.updateUrlFromAdvancedSearch()
- // Hide the filters
- this.isSearchFilterCollapsed = true
+ this.resetPagination()
- this.reload()
+ this.updateUrlFromAdvancedSearch()
}
- private reload () {
+ private resetPagination () {
this.pagination.currentPage = 1
this.pagination.totalItems = null
this.videos = []
-
- this.search()
}
private updateTitle () {