-import { debounceTime } from 'rxjs/operators'
+import { debounceTime, first, tap } from 'rxjs/operators'
import { OnDestroy, OnInit } from '@angular/core'
import { ActivatedRoute, Router } from '@angular/router'
-import { fromEvent, Observable, Subscription } from 'rxjs'
+import { fromEvent, Observable, of, Subject, Subscription } from 'rxjs'
import { AuthService } from '../../core/auth'
import { ComponentPagination } from '../rest/component-pagination.model'
import { VideoSortField } from './sort-field.type'
import { Notifier, ServerService } from '@app/core'
import { DisableForReuseHook } from '@app/core/routing/disable-for-reuse-hook'
import { I18n } from '@ngx-translate/i18n-polyfill'
-import { isThisMonth, isThisWeek, isToday, isYesterday } from '@shared/core-utils/miscs/date'
+import { isLastMonth, isLastWeek, isToday, isYesterday } from '@shared/core-utils/miscs/date'
+import { ResultList } from '@shared/models'
enum GroupDate {
UNKNOWN = 0,
TODAY = 1,
YESTERDAY = 2,
- THIS_WEEK = 3,
- THIS_MONTH = 4,
+ LAST_WEEK = 3,
+ LAST_MONTH = 4,
OLDER = 5
}
sort: VideoSortField = '-publishedAt'
categoryOneOf?: number
+ languageOneOf?: string[]
defaultSort: VideoSortField = '-publishedAt'
syndicationItems: Syndication[] = []
loadOnInit = true
- videos: Video[] = []
+ useUserVideoLanguagePreferences = false
ownerDisplayType: OwnerDisplayType = 'account'
displayModerationBlock = false
titleTooltip: string
displayVideoActions = true
groupByDate = false
+ videos: Video[] = []
disabled = false
displayOptions: MiniatureDisplayOptions = {
blacklistInfo: false
}
+ onDataSubject = new Subject<any[]>()
+
protected abstract notifier: Notifier
protected abstract authService: AuthService
protected abstract route: ActivatedRoute
private groupedDateLabels: { [id in GroupDate]: string }
private groupedDates: { [id: number]: GroupDate } = {}
- abstract getVideosObservable (page: number): Observable<{ videos: Video[], totalVideos: number }>
+ abstract getVideosObservable (page: number): Observable<ResultList<Video>>
abstract generateSyndicationList (): void
[GroupDate.UNKNOWN]: null,
[GroupDate.TODAY]: this.i18n('Today'),
[GroupDate.YESTERDAY]: this.i18n('Yesterday'),
- [GroupDate.THIS_WEEK]: this.i18n('This week'),
- [GroupDate.THIS_MONTH]: this.i18n('This month'),
+ [GroupDate.LAST_WEEK]: this.i18n('Last week'),
+ [GroupDate.LAST_MONTH]: this.i18n('Last month'),
[GroupDate.OLDER]: this.i18n('Older')
}
.subscribe(() => this.calcPageSizes())
this.calcPageSizes()
- if (this.loadOnInit === true) this.loadMoreVideos()
+
+ const loadUserObservable = this.loadUserVideoLanguagesIfNeeded()
+
+ if (this.loadOnInit === true) {
+ loadUserObservable.subscribe(() => this.loadMoreVideos())
+ }
}
ngOnDestroy () {
}
loadMoreVideos () {
- const observable = this.getVideosObservable(this.pagination.currentPage)
-
- observable.subscribe(
- ({ videos, totalVideos }) => {
- this.pagination.totalItems = totalVideos
- this.videos = this.videos.concat(videos)
+ this.getVideosObservable(this.pagination.currentPage).subscribe(
+ ({ data, total }) => {
+ this.pagination.totalItems = total
+ this.videos = this.videos.concat(data)
if (this.groupByDate) this.buildGroupedDateLabels()
this.onMoreVideos()
+
+ this.onDataSubject.next(data)
},
error => this.notifier.error(error.message)
for (const video of this.videos) {
const publishedDate = video.publishedAt
- if (currentGroupedDate < GroupDate.TODAY && isToday(publishedDate)) {
+ if (currentGroupedDate <= GroupDate.TODAY && isToday(publishedDate)) {
+ if (currentGroupedDate === GroupDate.TODAY) continue
+
currentGroupedDate = GroupDate.TODAY
this.groupedDates[ video.id ] = currentGroupedDate
continue
}
- if (currentGroupedDate < GroupDate.YESTERDAY && isYesterday(publishedDate)) {
+ if (currentGroupedDate <= GroupDate.YESTERDAY && isYesterday(publishedDate)) {
+ if (currentGroupedDate === GroupDate.YESTERDAY) continue
+
currentGroupedDate = GroupDate.YESTERDAY
this.groupedDates[ video.id ] = currentGroupedDate
continue
}
- if (currentGroupedDate < GroupDate.THIS_WEEK && isThisWeek(publishedDate)) {
- currentGroupedDate = GroupDate.THIS_WEEK
+ if (currentGroupedDate <= GroupDate.LAST_WEEK && isLastWeek(publishedDate)) {
+ if (currentGroupedDate === GroupDate.LAST_WEEK) continue
+
+ currentGroupedDate = GroupDate.LAST_WEEK
this.groupedDates[ video.id ] = currentGroupedDate
continue
}
- if (currentGroupedDate < GroupDate.THIS_MONTH && isThisMonth(publishedDate)) {
- currentGroupedDate = GroupDate.THIS_MONTH
+ if (currentGroupedDate <= GroupDate.LAST_MONTH && isLastMonth(publishedDate)) {
+ if (currentGroupedDate === GroupDate.LAST_MONTH) continue
+
+ currentGroupedDate = GroupDate.LAST_MONTH
this.groupedDates[ video.id ] = currentGroupedDate
continue
}
- if (currentGroupedDate < GroupDate.OLDER) {
+ if (currentGroupedDate <= GroupDate.OLDER) {
+ if (currentGroupedDate === GroupDate.OLDER) continue
+
currentGroupedDate = GroupDate.OLDER
this.groupedDates[ video.id ] = currentGroupedDate
}
this.router.navigate([ path ], { queryParams, replaceUrl: true, queryParamsHandling: 'merge' })
}
+
+ private loadUserVideoLanguagesIfNeeded () {
+ if (!this.authService.isLoggedIn() || !this.useUserVideoLanguagePreferences) {
+ return of(true)
+ }
+
+ return this.authService.userInformationLoaded
+ .pipe(
+ first(),
+ tap(() => this.languageOneOf = this.user.videoLanguages)
+ )
+ }
}