From 7e7d8e485356402e7652c61c9f004e850b0a1607 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 2 Nov 2021 11:00:40 +0100
Subject: Some fixes for admin videos list

---
 client/src/app/+admin/overview/videos/video-list.component.html | 5 +++--
 client/src/app/+admin/overview/videos/video-list.component.ts   | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'client/src/app/+admin')

diff --git a/client/src/app/+admin/overview/videos/video-list.component.html b/client/src/app/+admin/overview/videos/video-list.component.html
index eedf6f3dc..dd4ab178e 100644
--- a/client/src/app/+admin/overview/videos/video-list.component.html
+++ b/client/src/app/+admin/overview/videos/video-list.component.html
@@ -69,7 +69,7 @@
 
         <span *ngIf="video.nsfw" class="badge badge-red" i18n>NSFW</span>
 
-        <span *ngIf="isUnpublished(video.state.id)" class="badge badge-yellow" i18n>Not published yet</span>
+        <span *ngIf="isUnpublished(video.state.id)" class="badge badge-yellow" i18n>{{ video.state.label }}</span>
 
         <span *ngIf="isAccountBlocked(video)" class="badge badge-red" i18n>Account muted</span>
         <span *ngIf="isServerBlocked(video)" class="badge badge-red" i18n>Server muted</span>
@@ -80,8 +80,9 @@
       <td>
         <span *ngIf="isHLS(video)" class="badge badge-blue">HLS</span>
         <span *ngIf="isWebTorrent(video)" class="badge badge-blue">WebTorrent</span>
+        <span *ngIf="video.isLive" class="badge badge-blue">Live</span>
 
-        <span *ngIf="!video.remote">{{ getFilesSize(video) | bytes: 1 }}</span>
+        <span *ngIf="!video.isLive && video.isLocal">{{ getFilesSize(video) | bytes: 1 }}</span>
       </td>
 
       <td>
diff --git a/client/src/app/+admin/overview/videos/video-list.component.ts b/client/src/app/+admin/overview/videos/video-list.component.ts
index 6885abfc7..8bd171c53 100644
--- a/client/src/app/+admin/overview/videos/video-list.component.ts
+++ b/client/src/app/+admin/overview/videos/video-list.component.ts
@@ -16,7 +16,7 @@ export class VideoListComponent extends RestTable implements OnInit {
   videos: Video[] = []
 
   totalRecords = 0
-  sort: SortMeta = { field: 'publishedAt', order: 1 }
+  sort: SortMeta = { field: 'publishedAt', order: -1 }
   pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
 
   bulkVideoActions: DropdownAction<Video[]>[][] = []
@@ -99,7 +99,7 @@ export class VideoListComponent extends RestTable implements OnInit {
   }
 
   isUnpublished (state: VideoState) {
-    return state !== VideoState.PUBLISHED
+    return state !== VideoState.LIVE_ENDED && state !== VideoState.PUBLISHED
   }
 
   isAccountBlocked (video: Video) {
-- 
cgit v1.2.3