From 606fd8925e254bf86b7a3deed7e5ed53cb918a43 Mon Sep 17 00:00:00 2001 From: kontrollanten <6680299+kontrollanten@users.noreply.github.com> Date: Tue, 9 Aug 2022 14:49:27 +0200 Subject: [PATCH] fixes after code review --- client/src/app/+my-library/my-videos/my-videos.component.ts | 3 +-- .../shared-video-miniature/video-miniature.component.html | 4 ++-- .../shared-video-miniature/video-miniature.component.ts | 2 -- .../shared/shared-video-playlist/video-playlist.service.ts | 6 +----- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/client/src/app/+my-library/my-videos/my-videos.component.ts b/client/src/app/+my-library/my-videos/my-videos.component.ts index bde4d40c1..40650029c 100644 --- a/client/src/app/+my-library/my-videos/my-videos.component.ts +++ b/client/src/app/+my-library/my-videos/my-videos.component.ts @@ -37,7 +37,6 @@ export class MyVideosComponent implements OnInit, DisableForReuseHook { totalItems: null } miniatureDisplayOptions: MiniatureDisplayOptions = { - containedInPlaylists: true, date: true, views: true, by: true, @@ -102,7 +101,7 @@ export class MyVideosComponent implements OnInit, DisableForReuseHook { } this.getVideosObservable(this.pagination.currentPage) - .pipe(switchMap(({ data }) => this.playlistService.listPlaylistsForVideos(data.map(v => v.id)))) + .pipe(switchMap(({ data }) => this.playlistService.doVideosExistInPlaylist(data.map(v => v.id)))) .subscribe(result => { this.videosContainedInPlaylists = Object.keys(result).reduce((acc, videoId) => ({ ...acc, diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.html b/client/src/app/shared/shared-video-miniature/video-miniature.component.html index 052fdb4cd..6fdf24b2d 100644 --- a/client/src/app/shared/shared-video-miniature/video-miniature.component.html +++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.html @@ -53,8 +53,8 @@ {{ getStateLabel(video) }} -
- +
+ {{ playlist.playlistDisplayName }}
diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts index 632422e1e..ce2788c12 100644 --- a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts +++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts @@ -19,7 +19,6 @@ import { VideoPlaylistService } from '../shared-video-playlist' import { VideoActionsDisplayType } from './video-actions-dropdown.component' export type MiniatureDisplayOptions = { - containedInPlaylists?: boolean date?: boolean views?: boolean by?: boolean @@ -42,7 +41,6 @@ export class VideoMiniatureComponent implements OnInit { @Input() containedInPlaylists: VideoExistInPlaylist[] @Input() displayOptions: MiniatureDisplayOptions = { - containedInPlaylists: false, date: true, views: true, by: true, diff --git a/client/src/app/shared/shared-video-playlist/video-playlist.service.ts b/client/src/app/shared/shared-video-playlist/video-playlist.service.ts index df0876dd7..880890580 100644 --- a/client/src/app/shared/shared-video-playlist/video-playlist.service.ts +++ b/client/src/app/shared/shared-video-playlist/video-playlist.service.ts @@ -83,10 +83,6 @@ export class VideoPlaylistService { ) } - listPlaylistsForVideos (videoIds: number[]) { - return this.doVideosExistInPlaylist(videoIds) - } - listMyPlaylistWithCache (user: AuthUser, search?: string) { if (!search) { if (this.myAccountPlaylistCacheRunning) return this.myAccountPlaylistCacheRunning @@ -342,7 +338,7 @@ export class VideoPlaylistService { ) } - private doVideosExistInPlaylist (videoIds: number[]): Observable { + doVideosExistInPlaylist (videoIds: number[]): Observable { const url = VideoPlaylistService.MY_VIDEO_PLAYLIST_URL + 'videos-exist' let params = new HttpParams()