]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/blobdiff - client/src/app/+my-library/my-videos/my-videos.component.ts
Bumped to version v5.2.1
[github/Chocobozzz/PeerTube.git] / client / src / app / +my-library / my-videos / my-videos.component.ts
index f5262da86216296d31ac9413057f62740c6209d7..57b8bdf7de26518bb0671d08456dfff7e513ada6 100644 (file)
@@ -1,4 +1,4 @@
-import { uniqBy } from 'lodash'
+import { uniqBy } from 'lodash-es'
 import { concat, Observable } from 'rxjs'
 import { tap, toArray } from 'rxjs/operators'
 import { Component, OnInit, ViewChild } from '@angular/core'
@@ -105,12 +105,14 @@ export class MyVideosComponent implements OnInit, DisableForReuseHook {
       this.user = this.authService.getUser()
       this.userChannels = this.user.videoChannels
 
-      const channelFilters = this.userChannels.map(c => {
-        return {
-          value: 'channel:' + c.name,
-          label: c.name
-        }
-      })
+      const channelFilters = [ ...this.userChannels ]
+        .sort((a, b) => a.displayName.localeCompare(b.displayName))
+        .map(c => {
+          return {
+            value: 'channel:' + c.name,
+            label: c.displayName
+          }
+        })
 
       this.inputFilters = [
         {
@@ -171,15 +173,15 @@ export class MyVideosComponent implements OnInit, DisableForReuseHook {
       .subscribe(result => {
         this.videosContainedInPlaylists = Object.keys(result).reduce((acc, videoId) => ({
           ...acc,
-          [videoId]: uniqBy(result[videoId], (p: VideoExistInPlaylist) => p.playlistId)
+          [videoId]: uniqBy(result[+videoId], (p: VideoExistInPlaylist) => p.playlistId)
         }), this.videosContainedInPlaylists)
       })
   }
 
   async deleteSelectedVideos () {
-    const toDeleteVideosIds = Object.keys(this.selection)
-                                    .filter(k => this.selection[k] === true)
-                                    .map(k => parseInt(k, 10))
+    const toDeleteVideosIds = Object.entries(this.selection)
+                                    .filter(([ _k, v ]) => v === true)
+                                    .map(([ k, _v ]) => parseInt(k, 10))
 
     const res = await this.confirmService.confirm(
       prepareIcu($localize`Do you really want to delete {length, plural, =1 {this video} other {{length} videos}}?`)(