[DSC-2624] fix issue with search query being applied even when it has been cleared

(cherry picked from commit 1875c61c3c878f379aead7c399fca3ad1fe01370)

Author: Andrea Barbasso

src/app/shared/search/search.component.ts

@@ -17,7 +17,7 @@ import {
 import { NavigationStart, Router } from '@angular/router';
 
 import { BehaviorSubject, combineLatest, Observable, Subscription, of } from 'rxjs';
-import { debounceTime, distinctUntilChanged, filter, map, switchMap, tap } from 'rxjs/operators';
+import { distinctUntilChanged, filter, map, switchMap, tap } from 'rxjs/operators';
 import {
   NavigationStart,
   Router,
@@ -550,15 +550,16 @@ export class SearchComponent implements OnDestroy, OnInit {
       distinctUntilChanged(),
     );
     const searchOptions$: Observable<PaginatedSearchOptions> = this.getSearchOptions().pipe(distinctUntilChanged());
+    const queryFromQueryParam$: Observable<string> = this.routeService.getQueryParameterValue('query').pipe(distinctUntilChanged());
 
-    this.subs.push(combineLatest([configuration$, searchSortOptions$, searchOptions$, sortOption$, this.currentScope$]).pipe(
-      filter(([configuration, searchSortOptions, searchOptions, sortOption, scope]: [string, SortOptions[], PaginatedSearchOptions, SortOptions, string]) => {
+    this.subs.push(combineLatest([configuration$, searchSortOptions$, searchOptions$, sortOption$, this.currentScope$, queryFromQueryParam$]).pipe(
+      filter(([configuration, searchSortOptions, searchOptions, sortOption, scope, queryFromQueryParam]: [string, SortOptions[], PaginatedSearchOptions, SortOptions, string, string]) => {
         // filter for search options related to instanced paginated id
         return searchOptions.pagination.id === this.paginationId;
       }),
-      debounceTime(100),
-    ).subscribe(([configuration, searchSortOptions, searchOptions, sortOption, scope]:
-                 [string, SortOptions[], PaginatedSearchOptions, SortOptions, string]) => {
+      // debounceTime(100),
+    ).subscribe(([configuration, searchSortOptions, searchOptions, sortOption, scope, queryFromQueryParam]:
+                 [string, SortOptions[], PaginatedSearchOptions, SortOptions, string, string]) => {
       // Always apply the freshly resolved configuration (do NOT keep stale one)
       const combinedOptions = Object.assign({}, searchOptions, {
         configuration,
@@ -568,6 +569,14 @@ export class SearchComponent implements OnDestroy, OnInit {
       if (combinedOptions.query === '') {
         combinedOptions.query = this.query;
       }
+      if (this.searchOptions$.value) {
+        const currentOptions = this.searchOptions$.value;
+        const query = currentOptions.query;
+        if (isNotEmpty(query) && (isEmpty(combinedOptions.query) || isEmpty(queryFromQueryParam))) {
+          combinedOptions.query = '';
+          this.query = '';
+        }
+      }
       if (isEmpty(combinedOptions.scope)) {
         combinedOptions.scope = scope;
       }