Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Improve playlist column UX

Chocobozzz2e824a29cff4
diff --git a/client/src/app/+my-library/my-videos/my-videos.component.html b/client/src/app/+my-library/my-videos/my-videos.component.html
index b3aad72738..dafee48a6f 100644
--- a/client/src/app/+my-library/my-videos/my-videos.component.html
+++ b/client/src/app/+my-library/my-videos/my-videos.component.html
@@ -149,7 +149,7 @@
</td>
<td *ngIf="isSelected('playlists')">
- <div class="badges">
+ <div class="badges playlists">
<a *ngFor="let playlist of (videosContainedInPlaylists[video.id] || [])" class="pt-badge badge-secondary" [routerLink]="['/w/p/', playlist.playlistShortUUID]">
{{ playlist.playlistDisplayName }}
</a>
@@ -187,7 +187,7 @@
<my-video-actions-dropdown
placement="bottom auto" buttonDirection="horizontal" buttonStyled="true" [video]="video" [displayOptions]="videoActionsOptions"
[moreActions]="moreVideoActions"
- (videoRemoved)="reloadData()" (videoFilesRemoved)="reloadData()" (transcodingCreated)="reloadData()"
+ (videoRemoved)="reloadData()" (videoFilesRemoved)="reloadData()" (transcodingCreated)="reloadData()" (videoExistsInPlaylistChange)="fetchVideosContainedInPlaylists([ video ])"
></my-video-actions-dropdown>
</div>
</td>
diff --git a/client/src/app/+my-library/my-videos/my-videos.component.scss b/client/src/app/+my-library/my-videos/my-videos.component.scss
index ea9eff46a6..c3602635f4 100644
--- a/client/src/app/+my-library/my-videos/my-videos.component.scss
+++ b/client/src/app/+my-library/my-videos/my-videos.component.scss
@@ -1,5 +1,5 @@
-@use '_variables' as *;
-@use '_mixins' as *;
+@use "_variables" as *;
+@use "_mixins" as *;
my-select-checkbox {
min-width: 250px;
@@ -9,6 +9,14 @@ my-select-checkbox {
@include margin-right(5px);
}
+.playlists {
+ .pt-badge {
+ max-width: 200px;
+
+ @include ellipsis;
+ }
+}
+
.video-info > div {
display: flex;
@@ -41,7 +49,7 @@ td {
gap: 1rem;
overflow: hidden;
- &:hover {
+ &:hover {
overflow: auto;
}
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 9d87f1cd25..879eee289e 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
@@ -407,7 +407,7 @@ export class MyVideosComponent extends RestTable<Video> implements OnInit, OnDes
})
}
- private fetchVideosContainedInPlaylists (videos: Video[]) {
+ fetchVideosContainedInPlaylists (videos: Video[]) {
this.playlistService.doVideosExistInPlaylist(videos.map(v => v.id))
.subscribe(result => {
this.videosContainedInPlaylists = Object.keys(result).reduce((acc, videoId) => ({
diff --git a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.html b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.html
index a1c8a56c5c..3006bd8781 100644
--- a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.html
+++ b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.html
@@ -10,7 +10,7 @@
<div ngbDropdownMenu>
@defer (when dropdownOpened) {
- <my-video-add-to-playlist #playlistAdd [video]="video()"></my-video-add-to-playlist>
+ <my-video-add-to-playlist #playlistAdd [video]="video()" (videoExistsInPlaylistChange)="videoExistsInPlaylistChange.emit()"></my-video-add-to-playlist>
}
</div>
</div>
diff --git a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
index b568c8cfb5..d10a561167 100644
--- a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
+++ b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
@@ -113,6 +113,7 @@ export class VideoActionsDropdownComponent implements OnChanges {
readonly videoAccountMuted = output()
readonly transcodingCreated = output()
readonly modalOpened = output()
+ readonly videoExistsInPlaylistChange = output()
readonly showTranscriptionWidget = output()
readonly hideTranscriptionWidget = output()
diff --git a/client/src/app/shared/shared-video-playlist/video-add-to-playlist.component.ts b/client/src/app/shared/shared-video-playlist/video-add-to-playlist.component.ts
index 72695025c0..410ed4098f 100644
--- a/client/src/app/shared/shared-video-playlist/video-add-to-playlist.component.ts
+++ b/client/src/app/shared/shared-video-playlist/video-add-to-playlist.component.ts
@@ -10,7 +10,8 @@ import {
OnInit,
SimpleChanges,
inject,
- input
+ input,
+ output
} from '@angular/core'
import { AuthService, DisableForReuseHook, Notifier } from '@app/core'
import { secondsToTime } from '@peertube/peertube-core-utils'
@@ -75,6 +76,8 @@ export class VideoAddToPlaylistComponent extends FormReactive implements OnInit,
readonly video = input<Video>(undefined)
readonly currentVideoTimestamp = input<number>(undefined)
+ readonly videoExistsInPlaylistChange = output()
+
isNewPlaylistBlockOpened = false
videoPlaylistSearch: string
@@ -288,6 +291,8 @@ export class VideoAddToPlaylistComponent extends FormReactive implements OnInit,
.subscribe({
next: () => {
this.notifier.success($localize`Timestamps updated`)
+
+ this.videoExistsInPlaylistChange.emit()
},
error: err => this.notifier.error(err.message),
@@ -320,6 +325,8 @@ export class VideoAddToPlaylistComponent extends FormReactive implements OnInit,
.subscribe({
next: () => {
this.notifier.success($localize`Video removed from ${playlist.displayName}`)
+
+ this.videoExistsInPlaylistChange.emit()
},
error: err => this.notifier.error(err.message),
@@ -396,6 +403,8 @@ export class VideoAddToPlaylistComponent extends FormReactive implements OnInit,
this.notifier.success(message)
if (element) element.playlistElementId = res.videoPlaylistElement.id
+
+ this.videoExistsInPlaylistChange.emit()
},
error: err => {