Fix homepage

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / shared-search / search.service.ts

diff --git a/client/src/app/shared/shared-search/search.service.ts b/client/src/app/shared/shared-search/search.service.ts
index ad258f5e5b89c19579ad462619598f6d47ffd633..61acfb466cdcce52dfb5977c83a278d6a20278ab 100644 (file)
--- a/client/src/app/shared/shared-search/search.service.ts
+++ b/client/src/app/shared/shared-search/search.service.ts
@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs'
+import { Observable, of } from 'rxjs'
 import { catchError, map, switchMap } from 'rxjs/operators'
 import { HttpClient, HttpParams } from '@angular/common/http'
 import { Injectable } from '@angular/core'
@@ -7,7 +7,6 @@ import { Video, VideoChannel, VideoChannelService, VideoService } from '@app/sha
 import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
 import {
   ResultList,
-  SearchTargetType,
   Video as VideoServerModel,
   VideoChannel as VideoChannelServerModel,
   VideoPlaylist as VideoPlaylistServerModel
@@ -33,26 +32,32 @@ export class SearchService {
   }
 
   searchVideos (parameters: {
-    search: string,
-    componentPagination?: ComponentPaginationLight,
+    search?: string
+    componentPagination?: ComponentPaginationLight
     advancedSearch?: AdvancedSearch
+    uuids?: string[]
   }): Observable<ResultList<Video>> {
-    const { search, componentPagination, advancedSearch } = parameters
+    const { search, uuids, componentPagination, advancedSearch } = parameters
+
+    if (advancedSearch?.resultType !== undefined && advancedSearch.resultType !== 'videos') {
+      return of({ total: 0, data: [] })
+    }
 
     const url = SearchService.BASE_SEARCH_URL + 'videos'
     let pagination: RestPagination
 
     if (componentPagination) {
-      pagination = this.restService.componentPaginationToRestPagination(componentPagination)
+      pagination = this.restService.componentToRestPagination(componentPagination)
     }
 
     let params = new HttpParams()
     params = this.restService.addRestGetParams(params, pagination)
 
     if (search) params = params.append('search', search)
+    if (uuids) params = this.restService.addArrayParams(params, 'uuids', uuids)
 
     if (advancedSearch) {
-      const advancedSearchObject = advancedSearch.toAPIObject()
+      const advancedSearchObject = advancedSearch.toVideosAPIObject()
       params = this.restService.addObjectParams(params, advancedSearchObject)
     }
 
@@ -65,25 +70,33 @@ export class SearchService {
   }
 
   searchVideoChannels (parameters: {
-    search: string,
-    searchTarget?: SearchTargetType,
+    search?: string
+    advancedSearch?: AdvancedSearch
     componentPagination?: ComponentPaginationLight
+    handles?: string[]
   }): Observable<ResultList<VideoChannel>> {
-    const { search, componentPagination, searchTarget } = parameters
+    const { search, advancedSearch, componentPagination, handles } = parameters
+
+    if (advancedSearch?.resultType !== undefined && advancedSearch.resultType !== 'channels') {
+      return of({ total: 0, data: [] })
+    }
 
     const url = SearchService.BASE_SEARCH_URL + 'video-channels'
 
     let pagination: RestPagination
     if (componentPagination) {
-      pagination = this.restService.componentPaginationToRestPagination(componentPagination)
+      pagination = this.restService.componentToRestPagination(componentPagination)
     }
 
     let params = new HttpParams()
     params = this.restService.addRestGetParams(params, pagination)
-    params = params.append('search', search)
 
-    if (searchTarget) {
-      params = params.append('searchTarget', searchTarget as string)
+    if (search) params = params.append('search', search)
+    if (handles) params = this.restService.addArrayParams(params, 'handles', handles)
+
+    if (advancedSearch) {
+      const advancedSearchObject = advancedSearch.toChannelAPIObject()
+      params = this.restService.addObjectParams(params, advancedSearchObject)
     }
 
     return this.authHttp
@@ -95,25 +108,33 @@ export class SearchService {
   }
 
   searchVideoPlaylists (parameters: {
-    search: string,
-    searchTarget?: SearchTargetType,
+    search?: string
+    advancedSearch?: AdvancedSearch
     componentPagination?: ComponentPaginationLight
+    uuids?: string[]
   }): Observable<ResultList<VideoPlaylist>> {
-    const { search, componentPagination, searchTarget } = parameters
+    const { search, advancedSearch, componentPagination, uuids } = parameters
+
+    if (advancedSearch?.resultType !== undefined && advancedSearch.resultType !== 'playlists') {
+      return of({ total: 0, data: [] })
+    }
 
     const url = SearchService.BASE_SEARCH_URL + 'video-playlists'
 
     let pagination: RestPagination
     if (componentPagination) {
-      pagination = this.restService.componentPaginationToRestPagination(componentPagination)
+      pagination = this.restService.componentToRestPagination(componentPagination)
     }
 
     let params = new HttpParams()
     params = this.restService.addRestGetParams(params, pagination)
-    params = params.append('search', search)
 
-    if (searchTarget) {
-      params = params.append('searchTarget', searchTarget as string)
+    if (search) params = params.append('search', search)
+    if (uuids) params = this.restService.addArrayParams(params, 'uuids', uuids)
+
+    if (advancedSearch) {
+      const advancedSearchObject = advancedSearch.toPlaylistAPIObject()
+      params = this.restService.addObjectParams(params, advancedSearchObject)
     }
 
     return this.authHttp