Merged in task/main-cris/DSC-2337 (pull request DSpace#3162)

Task/main cris/DSC-2337

Approved-by: Vincenzo Mecca

Author: atarix83

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

@@ -22,6 +22,7 @@ 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';
+import { FacetValue } from '../../../../../shared/search/models/facet-value.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { RouterStub } from '../../../../testing/router.stub';
 import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
@@ -41,6 +42,8 @@ describe('SearchFacetFilterComponent', () => {
   const value2 = 'test2';
   const value3 = 'another value3';
   const value4 = '52d629dc-7d2f-47b9-aa2d-258b92e45ae1';
+  const value5 = 'test authority';
+  const authority = '52d629dc-7d2f-47b9-aa2d-258b92e45ae1';
   const mockFilterConfig: SearchFilterConfig = Object.assign(new SearchFilterConfig(), {
     name: filterName1,
     filterType: FilterType.text,
@@ -72,12 +75,40 @@ describe('SearchFacetFilterComponent', () => {
     label: value4,
     value: value4,
   });
+  const appliedFilter5: AppliedFilter = Object.assign(new AppliedFilter(), {
+    filter: filterName1,
+    operator: 'authority',
+    label: authority,
+    value: authority,
+  });
+  const facetValue1: FacetValue = Object.assign(new FacetValue(), {
+    label: value1,
+    value: value1,
+  });
+  const facetValue2: FacetValue = Object.assign(new FacetValue(), {
+    label: value2,
+    value: value2,
+  });
+  const facetValue3: FacetValue = Object.assign(new FacetValue(), {
+    label: value3,
+    value: value3,
+  });
+  const facetValue4: FacetValue = Object.assign(new FacetValue(), {
+    label: value5,
+    value: authority,
+  });
   const values: Partial<FacetValues> = {
     appliedFilters: [
       appliedFilter1,
       appliedFilter2,
       appliedFilter3,
     ],
+    page: [
+      facetValue1,
+      facetValue2,
+      facetValue3,
+      facetValue4,
+    ],
     pageInfo: Object.assign(new PageInfo(), {
       currentPage: 0,
     }),
@@ -246,4 +277,23 @@ describe('SearchFacetFilterComponent', () => {
       }));
     });
   });
+
+  describe('when selected value has an authority', () => {
+    let selectedValues$: BehaviorSubject<AppliedFilter[]>;
+
+    beforeEach(() => {
+      selectedValues$ = new BehaviorSubject([appliedFilter5]);
+      spyOn(searchService, 'getSelectedValuesForFilter').and.returnValue(selectedValues$);
+      comp.ngOnInit();
+    });
+
+    it('should updated the label with the one of the related FacetValue', () => {
+      const expectedValue = Object.assign(appliedFilter5, {
+        label: facetValue4.label,
+      });
+      expect(comp.selectedAppliedFilters$).toBeObservable(cold('a', {
+        a: [expectedValue],
+      }));
+    });
+  });
 });

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

@@ -18,18 +18,27 @@ import {
 } from '@angular/router';
 import {
   BehaviorSubject,
-  combineLatest as observableCombineLatest,
+  combineLatest,
+  from,
   Observable,
   of as observableOf,
   Subscription,
 } from 'rxjs';
 import {
+  debounceTime,
   distinctUntilChanged,
+  filter,
   map,
+  mergeMap,
+  reduce,
   switchMap,
   take,
   tap,
 } from 'rxjs/operators';
+import {
+  getFacetValueForType,
+  stripOperatorFromFilterValue,
+} from 'src/app/shared/search/search.utils';
 
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { getFirstSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
@@ -40,6 +49,7 @@ import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-c
 import {
   hasNoValue,
   hasValue,
+  isNotEmpty,
 } from '../../../../empty.util';
 import { InputSuggestion } from '../../../../input-suggestions/input-suggestions.model';
 import { currentPath } from '../../../../utils/route.utils';
@@ -166,9 +176,33 @@ 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(
+
+    this.selectedAppliedFilters$ = combineLatest([
+      this.searchService.getSelectedValuesForFilter(this.filterConfig.name),
+      this.facetValues$.asObservable().pipe(
+        mergeMap((values: FacetValues[]) => from(values).pipe(
+          reduce((acc: FacetValue[], value: FacetValues) => acc.concat(value.page), []),
+        )),
+      ),
+    ]).pipe(
+      filter(([allAppliedFilters, facetValues]: [AppliedFilter[], FacetValue[]]) => isNotEmpty(facetValues)),
+      map(([allAppliedFilters, facetValues]: [AppliedFilter[], FacetValue[]]) => {
+        return allAppliedFilters.map((appliedValue) => {
+          const fValue = facetValues
+            .find((facetValue: FacetValue) => stripOperatorFromFilterValue(getFacetValueForType(facetValue, this.filterConfig)) === appliedValue.value);
+          return (hasValue(fValue)) ? Object.assign(appliedValue, {
+            label: fValue.label,
+          }) : appliedValue;
+        });
+      }),
       map((allAppliedFilters: AppliedFilter[]) => allAppliedFilters.filter((appliedFilter: AppliedFilter) => FACET_OPERATORS.includes(appliedFilter.operator))),
       distinctUntilChanged((previous: AppliedFilter[], next: AppliedFilter[]) => JSON.stringify(previous) === JSON.stringify(next)),
     );
@@ -287,9 +321,9 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
    * 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).pipe(
+  protected retrieveFilterValues(useCachedVersionIfAvailable = true): Observable<FacetValues[]> {
+    return combineLatest([this.searchOptions$, this.currentPage]).pipe(
+      switchMap(([options, page]: [SearchOptions, number]) => this.searchService.getFacetValuesFor(this.filterConfig, page, options, null, useCachedVersionIfAvailable).pipe(
         getFirstSucceededRemoteDataPayload(),
         tap((facetValues: FacetValues) => {
           this.isLastPage$.next(hasNoValue(facetValues?.next));

src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts

@@ -79,7 +79,7 @@ export class SystemWideAlertBannerComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
-    this.subscriptions.push(this.systemWideAlertDataService.searchBy('active').pipe(
+    this.subscriptions.push(this.systemWideAlertDataService.searchBy('active', {}, false).pipe(
       getAllSucceededRemoteDataPayload(),
       map((payload: PaginatedList<SystemWideAlert>) => payload.page),
       filter((page) => isNotEmpty(page)),