From 1b20624552501e8c2968853c6d139af568e1eb95 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 30 Aug 2021 09:37:00 +0200 Subject: [PATCH] Don't display scope fitler on account/channel pages --- .../account-videos/account-videos.component.html | 2 ++ .../video-channel-videos.component.html | 2 ++ .../video-list/video-user-subscriptions.component.html | 2 ++ .../video-list/video-user-subscriptions.component.ts | 2 +- .../video-filters-header.component.html | 2 +- .../video-filters-header.component.ts | 2 ++ .../shared/shared-video-miniature/video-filters.model.ts | 9 ++++++++- .../shared-video-miniature/videos-list.component.html | 2 +- .../shared-video-miniature/videos-list.component.scss | 7 ++++++- .../shared-video-miniature/videos-list.component.ts | 8 +++++++- 10 files changed, 32 insertions(+), 6 deletions(-) diff --git a/client/src/app/+accounts/account-videos/account-videos.component.html b/client/src/app/+accounts/account-videos/account-videos.component.html index 5b4b0937f..f88d141c2 100644 --- a/client/src/app/+accounts/account-videos/account-videos.component.html +++ b/client/src/app/+accounts/account-videos/account-videos.component.html @@ -13,6 +13,8 @@ [displayModerationBlock]="true" [displayAsRow]="displayAsRow()" + [hideScopeFilter]="true" + [loadUserVideoPreferences]="true" [disabled]="disabled" diff --git a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.html b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.html index 1b6b72f1e..0a6c5fcb2 100644 --- a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.html +++ b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.html @@ -14,6 +14,8 @@ [displayOptions]="displayOptions" [displayAsRow]="displayAsRow()" + [hideScopeFilter]="true" + [loadUserVideoPreferences]="true" [disabled]="disabled" diff --git a/client/src/app/+videos/video-list/video-user-subscriptions.component.html b/client/src/app/+videos/video-list/video-user-subscriptions.component.html index 2675b58bf..5536bb945 100644 --- a/client/src/app/+videos/video-list/video-user-subscriptions.component.html +++ b/client/src/app/+videos/video-list/video-user-subscriptions.component.html @@ -13,5 +13,7 @@ [groupByDate]="true" [disabled]="disabled" + + [headerActions]="actions" > diff --git a/client/src/app/+videos/video-list/video-user-subscriptions.component.ts b/client/src/app/+videos/video-list/video-user-subscriptions.component.ts index 43cbab9f6..04f02c138 100644 --- a/client/src/app/+videos/video-list/video-user-subscriptions.component.ts +++ b/client/src/app/+videos/video-list/video-user-subscriptions.component.ts @@ -23,7 +23,7 @@ export class VideoUserSubscriptionsComponent implements DisableForReuseHook { { routerLink: '/my-library/subscriptions', label: $localize`Subscriptions`, - iconName: 'cog' + iconName: 'cog' as 'cog' } ] diff --git a/client/src/app/shared/shared-video-miniature/video-filters-header.component.html b/client/src/app/shared/shared-video-miniature/video-filters-header.component.html index 44c21c089..604746897 100644 --- a/client/src/app/shared/shared-video-miniature/video-filters-header.component.html +++ b/client/src/app/shared/shared-video-miniature/video-filters-header.component.html @@ -77,7 +77,7 @@ -
+
diff --git a/client/src/app/shared/shared-video-miniature/video-filters-header.component.ts b/client/src/app/shared/shared-video-miniature/video-filters-header.component.ts index 99f133e54..54a7c5dab 100644 --- a/client/src/app/shared/shared-video-miniature/video-filters-header.component.ts +++ b/client/src/app/shared/shared-video-miniature/video-filters-header.component.ts @@ -24,6 +24,8 @@ export class VideoFiltersHeaderComponent implements OnInit, OnDestroy { @Input() defaultSort = '-publishedAt' @Input() nsfwPolicy: NSFWPolicyType + @Input() hideScope = false + @Output() filtersChanged = new EventEmitter() areFiltersCollapsed = true diff --git a/client/src/app/shared/shared-video-miniature/video-filters.model.ts b/client/src/app/shared/shared-video-miniature/video-filters.model.ts index a3b8129f0..920dc826c 100644 --- a/client/src/app/shared/shared-video-miniature/video-filters.model.ts +++ b/client/src/app/shared/shared-video-miniature/video-filters.model.ts @@ -38,10 +38,14 @@ export class VideoFilters { private onChangeCallbacks: Array<() => void> = [] private oldFormObjectString: string - constructor (defaultSort: string, defaultScope: VideoFilterScope) { + private readonly hiddenFields: string[] = [] + + constructor (defaultSort: string, defaultScope: VideoFilterScope, hiddenFields: string[] = []) { this.setDefaultSort(defaultSort) this.setDefaultScope(defaultScope) + this.hiddenFields = hiddenFields + this.reset() } @@ -160,6 +164,9 @@ export class VideoFilters { label: $localize`VOD videos` }) } + + this.activeFilters = this.activeFilters + .filter(a => this.hiddenFields.includes(a.key) === false) } getActiveFilters () { diff --git a/client/src/app/shared/shared-video-miniature/videos-list.component.html b/client/src/app/shared/shared-video-miniature/videos-list.component.html index 4ccb4092c..08ed7b94c 100644 --- a/client/src/app/shared/shared-video-miniature/videos-list.component.html +++ b/client/src/app/shared/shared-video-miniature/videos-list.component.html @@ -33,7 +33,7 @@
diff --git a/client/src/app/shared/shared-video-miniature/videos-list.component.scss b/client/src/app/shared/shared-video-miniature/videos-list.component.scss index e82ef05ba..209201a5c 100644 --- a/client/src/app/shared/shared-video-miniature/videos-list.component.scss +++ b/client/src/app/shared/shared-video-miniature/videos-list.component.scss @@ -3,6 +3,9 @@ @use '_mixins' as *; @use '_miniature' as *; +// Cannot set margin top to videos-header because of the main header fixed position +$margin-top: 30px; + .videos-header { display: grid; grid-template-columns: auto 1fr auto; @@ -19,7 +22,7 @@ display: inline-block; font-weight: $font-semibold; - margin-top: 30px; + margin-top: $margin-top; margin-bottom: 0; } @@ -35,6 +38,8 @@ .action-block { grid-column: 3; + grid-row: 1/3; + margin-top: $margin-top; } my-feed { diff --git a/client/src/app/shared/shared-video-miniature/videos-list.component.ts b/client/src/app/shared/shared-video-miniature/videos-list.component.ts index 10de97298..3db835257 100644 --- a/client/src/app/shared/shared-video-miniature/videos-list.component.ts +++ b/client/src/app/shared/shared-video-miniature/videos-list.component.ts @@ -59,6 +59,8 @@ export class VideosListComponent implements OnInit, OnChanges, OnDestroy { @Input() headerActions: HeaderAction[] = [] + @Input() hideScopeFilter = false + @Input() displayOptions: MiniatureDisplayOptions = { date: true, views: true, @@ -109,7 +111,11 @@ export class VideosListComponent implements OnInit, OnChanges, OnDestroy { } ngOnInit () { - this.filters = new VideoFilters(this.defaultSort, this.defaultScope) + const hiddenFilters = this.hideScopeFilter + ? [ 'scope' ] + : [] + + this.filters = new VideoFilters(this.defaultSort, this.defaultScope, hiddenFilters) this.filters.load({ ...this.route.snapshot.queryParams, scope: this.defaultScope }) this.groupedDateLabels = { -- 2.41.0