diff --git a/client/src/app/+accounts/account-videos/account-videos.component.html b/client/src/app/+accounts/account-videos/account-videos.component.html
new file mode 100644
index 000000000..5b4b0937f
--- /dev/null
+++ b/client/src/app/+accounts/account-videos/account-videos.component.html
@@ -0,0 +1,20 @@
+
+
diff --git a/client/src/app/+accounts/account-videos/account-videos.component.ts b/client/src/app/+accounts/account-videos/account-videos.component.ts
index 4ab6d2147..13d1f857d 100644
--- a/client/src/app/+accounts/account-videos/account-videos.component.ts
+++ b/client/src/app/+accounts/account-videos/account-videos.component.ts
@@ -1,96 +1,69 @@
-import { forkJoin, Subscription } from 'rxjs'
+import { Subscription } from 'rxjs'
import { first } from 'rxjs/operators'
-import { Component, ComponentFactoryResolver, OnDestroy, OnInit } from '@angular/core'
-import { ActivatedRoute, Router } from '@angular/router'
-import { AuthService, ConfirmService, LocalStorageService, Notifier, ScreenService, ServerService, UserService } from '@app/core'
-import { immutableAssign } from '@app/helpers'
+import { Component, OnDestroy, OnInit } from '@angular/core'
+import { ComponentPaginationLight, DisableForReuseHook, ScreenService } from '@app/core'
import { Account, AccountService, VideoService } from '@app/shared/shared-main'
-import { AbstractVideoList } from '@app/shared/shared-video-miniature'
-import { VideoFilter } from '@shared/models'
+import { VideoFilters } from '@app/shared/shared-video-miniature'
+import { VideoSortField } from '@shared/models'
@Component({
selector: 'my-account-videos',
- templateUrl: '../../shared/shared-video-miniature/abstract-video-list.html',
- styleUrls: [
- '../../shared/shared-video-miniature/abstract-video-list.scss'
- ]
+ templateUrl: './account-videos.component.html'
})
-export class AccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy {
- // No value because we don't want a page title
- titlePage: string
- loadOnInit = false
- loadUserVideoPreferences = true
+export class AccountVideosComponent implements OnInit, OnDestroy, DisableForReuseHook {
+ getVideosObservableFunction = this.getVideosObservable.bind(this)
+ getSyndicationItemsFunction = this.getSyndicationItems.bind(this)
- filter: VideoFilter = null
+ title = $localize`Videos`
+ defaultSort = '-publishedAt' as VideoSortField
+
+ account: Account
+ disabled = false
- private account: Account
private accountSub: Subscription
constructor (
- protected router: Router,
- protected serverService: ServerService,
- protected route: ActivatedRoute,
- protected authService: AuthService,
- protected userService: UserService,
- protected notifier: Notifier,
- protected confirmService: ConfirmService,
- protected screenService: ScreenService,
- protected storageService: LocalStorageService,
+ private screenService: ScreenService,
private accountService: AccountService,
- private videoService: VideoService,
- protected cfr: ComponentFactoryResolver
+ private videoService: VideoService
) {
- super()
}
ngOnInit () {
- super.ngOnInit()
-
- this.enableAllFilterIfPossible()
-
// Parent get the account for us
- this.accountSub = forkJoin([
- this.accountService.accountLoaded.pipe(first()),
- this.onUserLoadedSubject.pipe(first())
- ]).subscribe(([ account ]) => {
- this.account = account
-
- this.reloadVideos()
- this.generateSyndicationList()
- })
+ this.accountService.accountLoaded.pipe(first())
+ .subscribe(account => this.account = account)
}
ngOnDestroy () {
if (this.accountSub) this.accountSub.unsubscribe()
-
- super.ngOnDestroy()
}
- getVideosObservable (page: number) {
- const newPagination = immutableAssign(this.pagination, { currentPage: page })
+ getVideosObservable (pagination: ComponentPaginationLight, filters: VideoFilters) {
const options = {
+ ...filters.toVideosAPIObject(),
+
+ videoPagination: pagination,
account: this.account,
- videoPagination: newPagination,
- sort: this.sort,
- nsfwPolicy: this.nsfwPolicy,
- videoFilter: this.filter
+ skipCount: true
}
- return this.videoService
- .getAccountVideos(options)
+ return this.videoService.getAccountVideos(options)
}
- toggleModerationDisplay () {
- this.filter = this.buildLocalFilter(this.filter, null)
-
- this.reloadVideos()
- }
-
- generateSyndicationList () {
- this.syndicationItems = this.videoService.getAccountFeedUrls(this.account.id)
+ getSyndicationItems () {
+ return this.videoService.getAccountFeedUrls(this.account.id)
}
displayAsRow () {
return this.screenService.isInMobileView()
}
+
+ disableForReuse () {
+ this.disabled = true
+ }
+
+ enabledForReuse () {
+ this.disabled = false
+ }
}
diff --git a/client/src/app/+accounts/accounts-routing.module.ts b/client/src/app/+accounts/accounts-routing.module.ts
index 2f3792a8d..d80df2293 100644
--- a/client/src/app/+accounts/accounts-routing.module.ts
+++ b/client/src/app/+accounts/accounts-routing.module.ts
@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core'
import { RouterModule, Routes } from '@angular/router'
-import { AccountSearchComponent } from './account-search/account-search.component'
import { AccountVideoChannelsComponent } from './account-video-channels/account-video-channels.component'
import { AccountVideosComponent } from './account-videos/account-videos.component'
import { AccountsComponent } from './accounts.component'
@@ -41,14 +40,11 @@ const accountsRoutes: Routes = [
}
}
},
+
+ // Old URL redirection
{
path: 'search',
- component: AccountSearchComponent,
- data: {
- meta: {
- title: $localize`Search videos within account`
- }
- }
+ redirectTo: 'videos'
}
]
}
diff --git a/client/src/app/+accounts/accounts.component.html b/client/src/app/+accounts/accounts.component.html
index 0906992fe..245edfd58 100644
--- a/client/src/app/+accounts/accounts.component.html
+++ b/client/src/app/+accounts/accounts.component.html
@@ -66,7 +66,7 @@