2 files changed, 19 insertions, 10 deletions

diff --git a/client/src/app/+search/search-filters.component.ts b/client/src/app/+search/search-filters.component.ts
index 59aba22ff..f5f0c87ed 100644
--- a/client/src/app/+search/search-filters.component.ts
+++ b/client/src/app/+search/search-filters.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
 import { ServerService } from '@app/core'
 import { AdvancedSearch } from '@app/shared/shared-search'
-import { ServerConfig, VideoConstant } from '@shared/models'
+import { HTMLServerConfig, VideoConstant } from '@shared/models'
 
 type FormOption = { id: string, label: string }
 
@@ -30,7 +30,7 @@ export class SearchFiltersComponent implements OnInit {
   originallyPublishedStartYear: string
   originallyPublishedEndYear: string
 
-  private serverConfig: ServerConfig
+  private serverConfig: HTMLServerConfig
 
   constructor (
     private serverService: ServerService
@@ -97,9 +97,8 @@ export class SearchFiltersComponent implements OnInit {
   }
 
   ngOnInit () {
-    this.serverConfig = this.serverService.getTmpConfig()
-    this.serverService.getConfig()
-        .subscribe(config => this.serverConfig = config)
+    this.serverConfig = this.serverService.getHTMLConfig()
+
 
     this.serverService.getVideoCategories().subscribe(categories => this.videoCategories = categories)
     this.serverService.getVideoLicences().subscribe(licences => this.videoLicences = licences)
diff --git a/client/src/app/+search/search.component.ts b/client/src/app/+search/search.component.ts
index 4381659e1..a31096bb2 100644
--- a/client/src/app/+search/search.component.ts
+++ b/client/src/app/+search/search.component.ts
@@ -6,7 +6,7 @@ import { immutableAssign } from '@app/helpers'
 import { Video, VideoChannel } from '@app/shared/shared-main'
 import { AdvancedSearch, SearchService } from '@app/shared/shared-search'
 import { MiniatureDisplayOptions, VideoLinkType } from '@app/shared/shared-video-miniature'
-import { SearchTargetType, ServerConfig } from '@shared/models'
+import { HTMLServerConfig, SearchTargetType } from '@shared/models'
 
 @Component({
   selector: 'my-search',
@@ -37,7 +37,6 @@ export class SearchComponent implements OnInit, OnDestroy {
   }
 
   errorMessage: string
-  serverConfig: ServerConfig
 
   userMiniature: User
 
@@ -49,6 +48,8 @@ export class SearchComponent implements OnInit, OnDestroy {
 
   private lastSearchTarget: SearchTargetType
 
+  private serverConfig: HTMLServerConfig
+
   constructor (
     private route: ActivatedRoute,
     private router: Router,
@@ -62,8 +63,7 @@ export class SearchComponent implements OnInit, OnDestroy {
   ) { }
 
   ngOnInit () {
-    this.serverService.getConfig()
-      .subscribe(config => this.serverConfig = config)
+    this.serverConfig = this.serverService.getHTMLConfig()
 
     this.subActivatedRoute = this.route.queryParams.subscribe(
       async queryParams => {
@@ -81,7 +81,7 @@ export class SearchComponent implements OnInit, OnDestroy {
 
         this.advancedSearch = new AdvancedSearch(queryParams)
         if (!this.advancedSearch.searchTarget) {
-          this.advancedSearch.searchTarget = await this.serverService.getDefaultSearchTarget()
+          this.advancedSearch.searchTarget = this.getDefaultSearchTarget()
         }
 
         // Don't hide filters if we have some of them AND the user just came on the webpage
@@ -286,4 +286,14 @@ export class SearchComponent implements OnInit, OnDestroy {
       'filter:api.search.video-channels.list.result'
     )
   }
+
+  private getDefaultSearchTarget(): SearchTargetType {
+    const searchIndexConfig = this.serverConfig.search.searchIndex
+
+    if (searchIndexConfig.enabled && (searchIndexConfig.isDefaultSearch || searchIndexConfig.disableLocalSearch)) {
+      return 'search-index'
+    }
+
+    return 'local'
+  }
 }