Merged in task/dspace-cris-2024_02_x/DSC-2624 (pull request DSpace#4217)

Task/dspace cris 2024 02 x/DSC-2624

Approved-by: Francesco Molinaro

Author: Mattia Vianelli

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

@@ -11,7 +11,7 @@
 }
 
 <div class="d-flex justify-content-between">
-    <h1 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h1>
+    <h1 *ngIf="!disableHeader">{{ ((configuration$ | async) ? (configuration$ | async) + '.search.results.head' : 'search.results.head') | translate }}</h1>
     <ds-search-export-csv *ngIf="showCsvExport" [total]="searchResults?.payload?.totalElements"
                           [searchConfig]="searchConfig"></ds-search-export-csv>
 </div>

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

@@ -83,6 +83,8 @@ export class SearchResultsComponent {
    */
   activeFilters$: Observable<SearchFilter[]>;
 
+  filters$: Observable<SearchFilter[]>;
+
   /**
    * Filter applied to show labels, once populated the activeFilters$ will be loaded
    */
@@ -205,10 +207,14 @@ export class SearchResultsComponent {
    */
   @Input() customData: any;
 
+  configuration$: Observable<string>;
+
   constructor(
     protected searchConfigService: SearchConfigurationService,
     protected searchService: SearchService,
   ) {
+    this.filters$ = this.searchConfigService.getCurrentFilters();
+    this.configuration$ = this.searchConfigService.getCurrentConfiguration(this.configuration);
     this.activeFilters$ = this.searchConfigService.getCurrentFilters();
     this.appliedFilters$ = this.searchService.appliedFilters$;
   }

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

@@ -205,9 +205,7 @@ const routeServiceStub = {
   getQueryParamsWithPrefix: () => {
     return observableOf(null);
   },
-  setParameter: (key: any, value: any) => {
-    return;
-  },
+  setParameter: jasmine.createSpy('setParameter'),
 };
 
 let searchConfigurationServiceStub;
@@ -319,6 +317,17 @@ describe('SearchComponent', () => {
     comp = null;
   });
 
+  it('should set the "configuration" and "fixedFilterQuery" parameters in the route service', () => {
+    spyOn(routeServiceStub, 'setParameter');
+    comp.configuration = 'test-configuration';
+    comp.fixedFilterQuery = 'test-fixed-filter-query';
+
+    fixture.detectChanges();
+
+    expect(routeServiceStub.setParameter).toHaveBeenCalledWith('configuration', 'test-configuration');
+    expect(routeServiceStub.setParameter).toHaveBeenCalledWith('fixedFilterQuery', 'test-fixed-filter-query');
+  });
+
   it('should init search parameters properly and call retrieveSearchResults', fakeAsync(() => {
     spyOn((comp as any), 'retrieveSearchResults').and.callThrough();
     fixture.detectChanges();

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

@@ -26,10 +26,10 @@ import {
   BehaviorSubject,
   combineLatest,
   Observable,
+  of,
   Subscription,
 } from 'rxjs';
 import {
-  debounceTime,
   distinctUntilChanged,
   filter,
   map,
@@ -515,9 +515,27 @@ export class SearchComponent implements OnDestroy, OnInit {
     this.searchLink = this.getSearchLink();
     this.currentContext$.next(this.context);
 
+    // Raw query param observable for configuration
+    const configurationParam$: Observable<string> =
+      this.routeService.getQueryParameterValue('configuration').pipe(distinctUntilChanged());
+
+
     // Determinate PaginatedSearchOptions and listen to any update on it
-    const configuration$: Observable<string> = this.searchConfigService
+    const configurationFromService$: Observable<string> = this.searchConfigService
       .getCurrentConfiguration(this.configuration).pipe(distinctUntilChanged());
+
+    // Effective configuration: param value OR input @Input() configuration OR 'default'
+    const configuration$: Observable<string> = combineLatest([
+      configurationParam$,
+      configurationFromService$,
+      of(this.configuration),
+    ]).pipe(
+      map(([paramValue, serviceValue, inputValue]) =>
+        hasValue(paramValue) ? paramValue : (hasValue(inputValue) ? inputValue : hasValue(serviceValue) ? serviceValue : 'default'),
+      ),
+      distinctUntilChanged(),
+    );
+
     const searchSortOptions$: Observable<SortOptions[]> = combineLatest([configuration$, this.currentScope$]).pipe(
       switchMap(([configuration, scope]: [string, string]) => this.searchConfigService.getConfigurationSearchConfig(configuration, scope)),
       map((searchConfig: SearchConfig) => this.searchConfigService.getConfigurationSortOptions(searchConfig)),
@@ -531,25 +549,33 @@ 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]) => {
-      // Build the PaginatedSearchOptions object
-      const searchOptionsConfiguration = searchOptions.configuration || configuration;
-      const combinedOptions = Object.assign({}, searchOptions,
-        {
-          configuration: searchOptionsConfiguration,
-          sort: sortOption || searchOptions.sort,
-          forcedEmbeddedKeys: this.forcedEmbeddedKeys.get(searchOptionsConfiguration) || this.forcedEmbeddedKeys.get('default'),
-        });
+      // 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,
+        sort: sortOption || searchOptions.sort,
+        forcedEmbeddedKeys: this.forcedEmbeddedKeys.get(configuration) || this.forcedEmbeddedKeys.get('default'),
+      });
       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;
       }