Merge branch 'advanced-search_contribute-7.6' into advanced-search_contribute-main

# Conflicts:
#	src/app/core/shared/search/search-filter.service.ts
#	src/app/core/shared/search/search.service.ts
#	src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
#	src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
#	src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
#	src/app/shared/search/search-filters/search-filter/search-filter.component.ts
#	src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
#	src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
#	src/app/shared/testing/search-service.stub.ts

Author: alexandrevryghem

src/app/core/shared/search/search-filter.service.spec.ts

@@ -160,17 +160,6 @@ describe('SearchFilterService', () => {
     });
   });
 
-  describe('when the getSelectedValuesForFilter method is called', () => {
-    beforeEach(() => {
-      spyOn(routeServiceStub, 'getQueryParameterValues');
-      service.getSelectedValuesForFilter(mockFilterConfig);
-    });
-
-    it('should call getQueryParameterValues on the route service with the same parameters', () => {
-      expect(routeServiceStub.getQueryParameterValues).toHaveBeenCalledWith(mockFilterConfig.paramName);
-    });
-  });
-
   describe('when the getCurrentScope method is called', () => {
     beforeEach(() => {
       spyOn(routeServiceStub, 'getQueryParameterValue');

src/app/core/shared/search/search-filter.service.ts

@@ -154,27 +154,6 @@ export class SearchFilterService {
     return this.routeService.getQueryParameterValue('view');
   }
 
-  /**
-   * Requests the active filter values set for a given filter
-   * @param {SearchFilterConfig} filterConfig The configuration for which the filters are active
-   * @returns {Observable<string[]>} Emits the active filters for the given filter configuration
-   */
-  getSelectedValuesForFilter(filterConfig: SearchFilterConfig): Observable<string[]> {
-    const values$ = this.routeService.getQueryParameterValues(filterConfig.paramName);
-    const prefixValues$ = this.routeService.getQueryParamsWithPrefix(filterConfig.paramName + '.').pipe(
-      map((params: Params) => [].concat(...Object.values(params))),
-    );
-    return observableCombineLatest(values$, prefixValues$).pipe(
-      map(([values, prefixValues]) => {
-        if (isNotEmpty(values)) {
-          return values;
-        }
-        return prefixValues;
-      },
-      ),
-    );
-  }
-
   /**
    * Updates the found facet value suggestions for a given query
    * Transforms the found values into display values

src/app/core/shared/search/search.service.ts

@@ -1,15 +1,13 @@
 /* eslint-disable max-classes-per-file */
-import {
-  Injectable,
-  OnDestroy,
-} from '@angular/core';
+import { Injectable } from '@angular/core';
 import { Angulartics2 } from 'angulartics2';
 import {
   BehaviorSubject,
   combineLatest as observableCombineLatest,
   Observable,
 } from 'rxjs';
 import {
+  distinctUntilChanged,
   map,
   switchMap,
   take,
@@ -81,7 +79,7 @@ class SearchDataService extends BaseDataService<any> {
  * Service that performs all general actions that have to do with the search page
  */
 @Injectable({ providedIn: 'root' })
-export class SearchService implements OnDestroy {
+export class SearchService {
 
   /**
    * Endpoint link path for retrieving general search results
@@ -98,11 +96,6 @@ export class SearchService implements OnDestroy {
    */
   private request: GenericConstructor<RestRequest> = GetRequest;
 
-  /**
-   * Subscription to unsubscribe from
-   */
-  private sub;
-
   /**
    * Instance of SearchDataService to forward data service methods to
    */
@@ -123,6 +116,18 @@ export class SearchService implements OnDestroy {
     this.searchDataService = new SearchDataService();
   }
 
+  /**
+   * Get the currently {@link AppliedFilter}s for the given filter.
+   *
+   * @param filterName The name of the filter
+   */
+  getSelectedValuesForFilter(filterName: string): Observable<AppliedFilter[]> {
+    return this.appliedFilters$.pipe(
+      map((appliedFilters: AppliedFilter[]) => appliedFilters.filter((appliedFilter: AppliedFilter) => appliedFilter.filter === filterName)),
+      distinctUntilChanged((previous: AppliedFilter[], next: AppliedFilter[]) => JSON.stringify(previous) === JSON.stringify(next)),
+    );
+  }
+
   /**
    * Method to set service options
    * @param {GenericConstructor<ResponseParsingService>} parser The ResponseParsingService constructor name
@@ -196,26 +201,11 @@ export class SearchService implements OnDestroy {
     return this.directlyAttachIndexableObjects(sqr$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
-  /**
-   * Method to retrieve request entries for search results from the server
-   * @param {PaginatedSearchOptions} searchOptions The configuration necessary to perform this search
-   * @returns {Observable<RemoteData<SearchObjects<T>>>} Emits a paginated list with all search results found
-   */
-  searchEntries<T extends DSpaceObject>(searchOptions?: PaginatedSearchOptions): Observable<RemoteData<SearchObjects<T>>> {
-    const href$ = this.getEndpoint(searchOptions);
-
-    const sqr$ = href$.pipe(
-      switchMap((href: string) => this.rdb.buildFromHref<SearchObjects<T>>(href)),
-    );
-
-    return this.directlyAttachIndexableObjects(sqr$);
-  }
-
   /**
    * Method to directly attach the indexableObjects to search results, instead of using RemoteData.
    * For compatibility with the way the search was written originally
    *
-   * @param sqr$:                       a SearchObjects RemotaData Observable without its
+   * @param sqr$                        A {@link SearchObjects} {@link RemoteData} Observable without its
    *                                    indexableObjects attached
    * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
    *                                    no valid cached version. Defaults to true
@@ -404,12 +394,4 @@ export class SearchService implements OnDestroy {
     return '/search';
   }
 
-  /**
-   * Unsubscribe from the subscription
-   */
-  ngOnDestroy(): void {
-    if (this.sub !== undefined) {
-      this.sub.unsubscribe();
-    }
-  }
 }

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

@@ -136,6 +136,7 @@ export class AdvancedSearchComponent implements OnInit, OnDestroy {
 
   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()], {
           queryParams: params,

src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts

@@ -11,12 +11,14 @@ import { FormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
 import {
   BehaviorSubject,
   of as observableOf,
 } from 'rxjs';
 
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import { SearchFilterService } from '../../../../../core/shared/search/search-filter.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
@@ -38,34 +40,47 @@ describe('SearchFacetFilterComponent', () => {
   const value1 = 'testvalue1';
   const value2 = 'test2';
   const value3 = 'another value3';
+  const value4 = '52d629dc-7d2f-47b9-aa2d-258b92e45ae1';
   const mockFilterConfig: SearchFilterConfig = Object.assign(new SearchFilterConfig(), {
     name: filterName1,
     filterType: FilterType.text,
     hasFacets: false,
     isOpenByDefault: false,
     pageSize: 2,
   });
+  const appliedFilter1: AppliedFilter = Object.assign(new AppliedFilter(), {
+    filter: filterName1,
+    operator: 'equals',
+    label: value1,
+    value: value1,
+  });
+  const appliedFilter2: AppliedFilter = Object.assign(new AppliedFilter(), {
+    filter: filterName1,
+    operator: 'equals',
+    label: value2,
+    value: value2,
+  });
+  const appliedFilter3: AppliedFilter = Object.assign(new AppliedFilter(), {
+    filter: filterName1,
+    operator: 'equals',
+    label: value3,
+    value: value3,
+  });
+  const appliedFilter4: AppliedFilter = Object.assign(new AppliedFilter(), {
+    filter: filterName1,
+    operator: 'notauthority',
+    label: value4,
+    value: value4,
+  });
   const values: Partial<FacetValues> = {
     appliedFilters: [
-      {
-        filter: filterName1,
-        operator: 'equals',
-        label: value1,
-        value: value1,
-      },
-      {
-        filter: filterName1,
-        operator: 'equals',
-        label: value2,
-        value: value2,
-      },
-      {
-        filter: filterName1,
-        operator: 'equals',
-        label: value3,
-        value: value3,
-      },
+      appliedFilter1,
+      appliedFilter2,
+      appliedFilter3,
     ],
+    pageInfo: Object.assign(new PageInfo(), {
+      currentPage: 0,
+    }),
   };
 
   const searchLink = '/search';
@@ -209,4 +224,26 @@ describe('SearchFacetFilterComponent', () => {
       expect(comp.filter).toEqual('');
     });
   });
+
+  describe('when new values are detected for a filter', () => {
+    let selectedValues$: BehaviorSubject<AppliedFilter[]>;
+
+    beforeEach(() => {
+      selectedValues$ = new BehaviorSubject([appliedFilter1, appliedFilter2, appliedFilter3]);
+      spyOn(searchService, 'getSelectedValuesForFilter').and.returnValue(selectedValues$);
+      comp.ngOnInit();
+    });
+
+    it('should updated the selectedAppliedFilters$ when they are AppliedFilters that should be displayed in the search facets', () => {
+      expect(comp.selectedAppliedFilters$).toBeObservable(cold('a', {
+        a: [appliedFilter1, appliedFilter2, appliedFilter3],
+      }));
+
+      selectedValues$.next([appliedFilter1, appliedFilter2, appliedFilter3, appliedFilter4]);
+
+      expect(comp.selectedAppliedFilters$).toBeObservable(cold('a', {
+        a: [appliedFilter1, appliedFilter2, appliedFilter3],
+      }));
+    });
+  });
 });

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

@@ -24,11 +24,8 @@ import {
   Subscription,
 } from 'rxjs';
 import {
-  debounceTime,
   distinctUntilChanged,
-  filter,
   map,
-  mergeMap,
   switchMap,
   take,
   tap,
@@ -51,7 +48,15 @@ import { FacetValue } from '../../../models/facet-value.model';
 import { FacetValues } from '../../../models/facet-values.model';
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
 import { SearchOptions } from '../../../models/search-options.model';
-import { stripOperatorFromFilterValue } from '../../../search.utils';
+
+/**
+ * The operators the {@link AppliedFilter} should have in order to be shown in the facets
+ */
+export const FACET_OPERATORS: string[] = [
+  'equals',
+  'authority',
+  'range',
+];
 
 @Component({
   selector: 'ds-search-facet-filter',
@@ -157,14 +162,12 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
     );
     this.subs.push(
       this.searchOptions$.subscribe(() => this.updateFilterValueList()),
-      this.refreshFilters.asObservable().pipe(
-        filter((toRefresh: boolean) => toRefresh),
-        // NOTE This is a workaround, otherwise retrieving filter values returns tha old cached response
-        debounceTime((100)),
-        mergeMap(() => this.retrieveFilterValues(false)),
-      ).subscribe(),
+      this.retrieveFilterValues().subscribe(),
+    );
+    this.selectedAppliedFilters$ = this.searchService.getSelectedValuesForFilter(this.filterConfig.name).pipe(
+      map((allAppliedFilters: AppliedFilter[]) => allAppliedFilters.filter((appliedFilter: AppliedFilter) => FACET_OPERATORS.includes(appliedFilter.operator))),
+      distinctUntilChanged((previous: AppliedFilter[], next: AppliedFilter[]) => JSON.stringify(previous) === JSON.stringify(next)),
     );
-    this.retrieveFilterValues().subscribe();
   }
 
   /**
@@ -264,6 +267,7 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
    */
   protected applyFilterValue(data: string): void {
     if (data.match(new RegExp(`^.+,(equals|query|authority)$`))) {
+      this.filterService.minimizeAll();
       const valueParts = data.split(',');
       this.subs.push(this.searchConfigService.selectNewAppliedFilterParams(this.filterConfig.name, valueParts.slice(0, valueParts.length - 1).join(), valueParts[valueParts.length - 1]).pipe(take(1)).subscribe((params: Params) => {
         void this.router.navigate(this.getSearchLinkParts(), {
@@ -275,9 +279,13 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
     }
   }
 
-  protected retrieveFilterValues(useCachedVersionIfAvailable = true): Observable<FacetValues[]> {
+  /**
+   * Retrieves all the filter value suggestion pages that need to be displayed in the facet and combines it into one
+   * list.
+   */
+  protected retrieveFilterValues(): Observable<FacetValues[]> {
     return observableCombineLatest([this.searchOptions$, this.currentPage]).pipe(
-      switchMap(([options, page]: [SearchOptions, number]) => this.searchService.getFacetValuesFor(this.filterConfig, page, options, null, useCachedVersionIfAvailable).pipe(
+      switchMap(([options, page]: [SearchOptions, number]) => this.searchService.getFacetValuesFor(this.filterConfig, page, options).pipe(
         getFirstSucceededRemoteDataPayload(),
         tap((facetValues: FacetValues) => {
           this.isLastPage$.next(hasNoValue(facetValues?.next));
@@ -300,26 +308,12 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
         return filterValues;
       }),
       tap((allFacetValues: FacetValues[]) => {
-        this.setAppliedFilter(allFacetValues);
         this.animationState = 'ready';
         this.facetValues$.next(allFacetValues);
       }),
     );
   }
 
-  setAppliedFilter(allFacetValues: FacetValues[]): void {
-    const allAppliedFilters: AppliedFilter[] = [].concat(...allFacetValues.map((facetValues: FacetValues) => facetValues.appliedFilters))
-      .filter((appliedFilter: AppliedFilter) => hasValue(appliedFilter));
-
-    this.selectedAppliedFilters$ = this.filterService.getSelectedValuesForFilter(this.filterConfig).pipe(
-      map((selectedValues: string[]) => {
-        return selectedValues.map((value: string) => {
-          return allAppliedFilters.find((appliedFilter: AppliedFilter) => appliedFilter.value === stripOperatorFromFilterValue(value));
-        }).filter((appliedFilter: AppliedFilter) => hasValue(appliedFilter));
-      }),
-    );
-  }
-
   /**
    * Prevent unnecessary rerendering
    */