Merge pull request #5675 from atmire/w2p-141526_search-fixes_contribute-8_x

[Port dspace-8_x] Fix hierarchical & advanced search redirecting to global /search

Author: tdonohue

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

@@ -38,6 +38,7 @@ import {
 } from '../../empty.util';
 import { FilterInputSuggestionsComponent } from '../../input-suggestions/filter-suggestions/filter-input-suggestions.component';
 import { InputSuggestion } from '../../input-suggestions/input-suggestions.model';
+import { currentPath } from '../../utils/route.utils';
 import { FilterType } from '../models/filter-type.model';
 import { SearchFilterConfig } from '../models/search-filter-config.model';
 
@@ -71,6 +72,11 @@ export class AdvancedSearchComponent implements OnInit, OnDestroy {
    */
   @Input() filtersConfig: SearchFilterConfig[];
 
+  /**
+   * True when the search component should show results on the current page
+   */
+  @Input() inPlaceSearch: boolean;
+
   /**
    * The current search scope
    */
@@ -136,11 +142,21 @@ export class AdvancedSearchComponent implements OnInit, OnDestroy {
     }
   }
 
+  /**
+   * @returns {string} The base path to the search page, or the current page when inPlaceSearch is true
+   */
+  getSearchLink(): string {
+    if (this.inPlaceSearch) {
+      return currentPath(this.router);
+    }
+    return this.searchService.getSearchLink();
+  }
+
   applyFilter(): void {
     if (isNotEmpty(this.currentValue)) {
       this.searchFilterService.minimizeAll();
       this.subs.push(this.searchConfigurationService.selectNewAppliedFilterParams(this.currentFilter, this.currentValue.trim(), this.currentOperator).pipe(take(1)).subscribe((params: Params) => {
-        void this.router.navigate([this.searchService.getSearchLink()], {
+        void this.router.navigate([this.getSearchLink()], {
           queryParams: params,
         });
         this.currentValue = '';

src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts

@@ -132,7 +132,7 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
       take(1),
     ).subscribe((params: Params) => {
       void this.router.navigate(
-        [this.searchService.getSearchLink()],
+        [this.getSearchLink()],
         {
           queryParams: params,
         },

src/app/shared/search/search-sidebar/search-sidebar.component.html

@@ -27,6 +27,7 @@
             <ds-advanced-search *ngIf="inPlaceSearch && (this.showAdvancedSearch$ | async) === true"
                                 [configuration]="configuration"
                                 [filtersConfig]="(filters | async)?.payload"
+                                [inPlaceSearch]="inPlaceSearch"
                                 [scope]="currentScope">
             </ds-advanced-search>
             <ds-search-settings *ngIf="inPlaceSearch"