Fix filter pastille labels

client/src/app/shared/shared-video-miniature/video-filters-header.component.html

@@ -32,7 +32,7 @@
         <span>
           {{ activeFilter.label }}
 
-          <ng-container *ngIf="activeFilter.value">: {{ activeFilter.value }}</ng-container>
+          <ng-container *ngIf="activeFilter.value">: {{ getFilterValue(activeFilter) }}</ng-container>
         </span>
 
         <button

client/src/app/shared/shared-video-miniature/video-filters-header.component.ts

@@ -1,20 +1,20 @@
-import debug from 'debug'
+import { NgClass, NgFor, NgIf, NgTemplateOutlet } from '@angular/common'
-import { Subscription } from 'rxjs'
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'
 import { FormBuilder, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { RouterLink } from '@angular/router'
 import { AuthService } from '@app/core'
 import { ServerService } from '@app/core/server/server.service'
-import { UserRight } from '@peertube/peertube-models'
+import { NgbCollapse } from '@ng-bootstrap/ng-bootstrap'
-import { VideoFilters } from './video-filters.model'
+import { NgSelectModule } from '@ng-select/ng-select'
+import { UserRight, VideoConstant } from '@peertube/peertube-models'
+import debug from 'debug'
+import { Subscription } from 'rxjs'
 import { PeertubeCheckboxComponent } from '../shared-forms/peertube-checkbox.component'
 import { SelectCategoriesComponent } from '../shared-forms/select/select-categories.component'
 import { SelectLanguagesComponent } from '../shared-forms/select/select-languages.component'
-import { NgbCollapse } from '@ng-bootstrap/ng-bootstrap'
-import { NgSelectModule } from '@ng-select/ng-select'
 import { GlobalIconComponent } from '../shared-icons/global-icon.component'
-import { NgClass, NgIf, NgFor, NgTemplateOutlet } from '@angular/common'
-import { RouterLink } from '@angular/router'
 import { PeertubeModalService } from '../shared-main/peertube-modal/peertube-modal.service'
+import { VideoFilterActive, VideoFilters } from './video-filters.model'
 
 const debugLogger = debug('peertube:videos:VideoFiltersHeaderComponent')
 
@@ -50,6 +50,9 @@ export class VideoFiltersHeaderComponent implements OnInit, OnDestroy {
 
   form: FormGroup
 
+  private videoCategories: VideoConstant<number>[] = []
+  private videoLanguages: VideoConstant<string>[] = []
+
   private routeSub: Subscription
 
   constructor (
@@ -83,6 +86,12 @@ export class VideoFiltersHeaderComponent implements OnInit, OnDestroy {
       this.filters.load(values)
       this.filtersChanged.emit()
     })
+
+    this.serverService.getVideoCategories()
+      .subscribe(categories => this.videoCategories = categories)
+
+    this.serverService.getVideoLanguages()
+      .subscribe(languages => this.videoLanguages = languages)
   }
 
   ngOnDestroy () {
@@ -116,6 +125,30 @@ export class VideoFiltersHeaderComponent implements OnInit, OnDestroy {
     return ''
   }
 
+  getFilterValue (filter: VideoFilterActive) {
+    if ((filter.key === 'categoryOneOf' || filter.key === 'languageOneOf') && Array.isArray(filter.rawValue)) {
+      if (filter.rawValue.length > 2) {
+        return filter.rawValue.length
+      }
+
+      const translated = filter.key === 'categoryOneOf'
+        ? this.videoCategories
+        : this.videoLanguages
+
+      const formatted = filter.rawValue
+        .map(v => {
+          if (v === '_unknown') return $localize`Unknown`
+
+          return translated.find(c => c.id + '' === v)?.label
+        })
+        .join(', ')
+
+      return formatted
+    }
+
+    return filter.value
+  }
+
   onAccountSettingsClick (event: Event) {
     if (this.auth.isLoggedIn()) return
 

client/src/app/shared/shared-video-miniature/video-filters.model.ts

@@ -16,6 +16,14 @@ type VideoFiltersKeys = {
 
 export type VideoFilterScope = 'local' | 'federated'
 
+export type VideoFilterActive = {
+  key: string
+  canRemove: boolean
+  label: string
+  value?: string
+  rawValue?: string[] | number[]
+}
+
 export class VideoFilters {
   sort: VideoSortField
   nsfw: BooleanBothQuery
@@ -40,7 +48,7 @@ export class VideoFilters {
     [ 'live', 'both' ]
   ])
 
-  private activeFilters: { key: string, canRemove: boolean, label: string, value?: string }[] = []
+  private activeFilters: VideoFilterActive[] = []
   private defaultNSFWPolicy: NSFWPolicyType
 
   private onChangeCallbacks: (() => void)[] = []
@@ -165,7 +173,8 @@ export class VideoFilters {
         key: 'languageOneOf',
         canRemove: true,
         label: $localize`Languages`,
-        value: this.languageOneOf.map(l => l.toUpperCase()).join(', ')
+        value: this.languageOneOf.map(l => l.toUpperCase()).join(', '),
+        rawValue: this.languageOneOf
       })
     }
 
@@ -174,7 +183,8 @@ export class VideoFilters {
         key: 'categoryOneOf',
         canRemove: true,
         label: $localize`Categories`,
-        value: this.categoryOneOf.join(', ')
+        value: this.categoryOneOf.join(', '),
+        rawValue: this.categoryOneOf
       })
     }