import { catchError, map, concatMap, toArray } from 'rxjs/operators'
import { HttpClient, HttpParams } from '@angular/common/http'
import { Injectable } from '@angular/core'
-import { SortMeta } from 'primeng/components/common/sortmeta'
+import { SortMeta } from 'primeng/api'
import { from as observableFrom, Observable } from 'rxjs'
import { VideoBlacklist, VideoBlacklistType, ResultList } from '../../../../../shared'
import { Video } from '../video/video.model'
import { environment } from '../../../environments/environment'
import { RestExtractor, RestPagination, RestService } from '../rest'
-import { ComponentPagination } from '../rest/component-pagination.model'
+import { ComponentPaginationLight } from '../rest/component-pagination.model'
@Injectable()
export class VideoBlacklistService {
private restExtractor: RestExtractor
) {}
- listBlacklist (pagination: RestPagination, sort: SortMeta, type?: VideoBlacklistType): Observable<ResultList<VideoBlacklist>> {
+ listBlacklist (options: {
+ pagination: RestPagination,
+ sort: SortMeta,
+ search?: string
+ type?: VideoBlacklistType
+ }): Observable<ResultList<VideoBlacklist>> {
+ const { pagination, sort, search, type } = options
+
let params = new HttpParams()
params = this.restService.addRestGetParams(params, pagination, sort)
- if (type) {
- params = params.set('type', type.toString())
- }
+ if (search) params = params.append('search', search)
+ if (type) params = params.append('type', type.toString())
return this.authHttp.get<ResultList<VideoBlacklist>>(VideoBlacklistService.BASE_VIDEOS_URL + 'blacklist', { params })
.pipe(
)
}
- getAutoBlacklistedAsVideoList (videoPagination: ComponentPagination): Observable<{ videos: Video[], totalVideos: number}> {
+ getAutoBlacklistedAsVideoList (videoPagination: ComponentPaginationLight): Observable<ResultList<Video>> {
const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
// prioritize first created since waiting longest
return this.authHttp.get<ResultList<VideoBlacklist>>(VideoBlacklistService.BASE_VIDEOS_URL + 'blacklist', { params })
.pipe(
map(res => {
- const videos = res.data.map(videoBlacklist => new Video(videoBlacklist.video))
- const totalVideos = res.total
- return { videos, totalVideos }
+ return {
+ total: res.total,
+ data: res.data.map(videoBlacklist => new Video(videoBlacklist.video))
+ }
}),
catchError(res => this.restExtractor.handleError(res))
)