From 7c87746e4b336e547b1917f274c9a0bdc4d1d3df Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 9 Jun 2020 16:08:09 +0200
Subject: Fix search query when updating from typeahead

---
 client/src/app/search/search.component.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'client/src/app')

diff --git a/client/src/app/search/search.component.ts b/client/src/app/search/search.component.ts
index d3c0761d7..7ab0ed9d6 100644
--- a/client/src/app/search/search.component.ts
+++ b/client/src/app/search/search.component.ts
@@ -13,6 +13,7 @@ import { MetaService } from '@ngx-meta/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { ServerConfig } from '@shared/models'
 import { UserService } from '@app/shared'
+import { SearchTargetType } from '@shared/models/search/search-target-query.model'
 
 @Component({
   selector: 'my-search',
@@ -40,6 +41,8 @@ export class SearchComponent implements OnInit, OnDestroy {
 
   private channelsPerPage = 2
 
+  private lastSearchTarget: SearchTargetType
+
   constructor (
     private i18n: I18n,
     private route: ActivatedRoute,
@@ -63,9 +66,10 @@ export class SearchComponent implements OnInit, OnDestroy {
     this.subActivatedRoute = this.route.queryParams.subscribe(
       async queryParams => {
         const querySearch = queryParams['search']
+        const searchTarget = queryParams['searchTarget']
 
         // Search updated, reset filters
-        if (this.currentSearch !== querySearch) {
+        if (this.currentSearch !== querySearch || searchTarget !== this.advancedSearch.searchTarget) {
           this.resetPagination()
           this.advancedSearch.reset()
 
@@ -118,6 +122,7 @@ export class SearchComponent implements OnInit, OnDestroy {
           .concat(videosResult.data)
 
         this.pagination.totalItems = videosResult.total + videoChannelsResult.total
+        this.lastSearchTarget = this.advancedSearch.searchTarget
 
         // Focus on channels if there are no enough videos
         if (this.firstSearch === true && videosResult.data.length < this.pagination.itemsPerPage) {
@@ -182,7 +187,7 @@ export class SearchComponent implements OnInit, OnDestroy {
   }
 
   hideActions () {
-    return this.advancedSearch.searchTarget === 'search-index'
+    return this.lastSearchTarget === 'search-index'
   }
 
   private resetPagination () {
-- 
cgit v1.2.3