Merged in DSC-1367 (pull request DSpace#1574)

DSC-1367

Approved-by: Vincenzo Mecca

Author: Simone-Ramundi

src/app/shared/search/search-labels/search-label/search-label.component.html

@@ -1,9 +1,10 @@
 <a class="badge badge-primary mb-1"
-   [attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.' + key) | translate, value: normalizeFilterValue(getStrippedValue(value)) }"
+   *ngVar="filterValue | async as filter"
+   [attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.' + key) | translate, value: filter }"
    [routerLink]="searchLink"
    [queryParams]="(removeParameters | async)" queryParamsHandling="merge">
-    <span class="d-flex">
-      <span class="flex-grow-1 text-left">{{('search.filters.applied.' + key) | translate}}: {{'search.filters.' + filterName + '.' + value | translate: {default: normalizeFilterValue(getStrippedValue(value))} }}</span>
+    <span class="d-flex" *ngIf="filter">
+      <span class="flex-grow-1 text-left">{{('search.filters.applied.' + key) | translate}}: {{'search.filters.' + filterName + '.' + filter | translate: {default: filter } }}</span>
       <span class="pl-1" aria-hidden="true">×</span>
     </span>
 </a>

src/app/shared/search/search-labels/search-label/search-label.component.spec.ts

@@ -15,21 +15,42 @@ import { PaginationComponentOptions } from '../../../pagination/pagination-compo
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 import { PaginationServiceStub } from '../../../testing/pagination-service.stub';
+import { ItemDataService } from '../../../../core/data/item-data.service';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../core/shared/item.model';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$
+} from '../../../remote-data.utils';
 
 describe('SearchLabelComponent', () => {
+
+  const item = Object.assign(new Item(), {
+    uuid: 'itemUUID',
+  });
+  const name = 'itemName';
+  const mockItemDataService = jasmine.createSpyObj ('ItemDataService', {
+    findById: jasmine.createSpy('findById'),
+  });
+  const mockDSODataService = jasmine.createSpyObj ('DSODataService', {
+    getName: jasmine.createSpy('getName'),
+  });
   let comp: SearchLabelComponent;
   let fixture: ComponentFixture<SearchLabelComponent>;
 
   const searchLink = '/search';
   let searchService;
-
   const key1 = 'author';
   const key2 = 'subject';
   const value1 = 'Test, Author';
   const normValue1 = 'Test, Author';
   const value2 = 'TestSubject';
-  const value3 = 'Test, Authority,authority';
-  const normValue3 = 'Test, Authority';
+  const valueAuthority = 'Test, Authority,authority';
+  const normValueAuthority = 'Test, Authority';
+  const valueEquals = 'Test, Author,equals';
+  const normValueEquals = 'Test, Author';
+  const randomAuthor = 'Test Author';
+  const normValue4 = 'Test, Authority';
   const filter1 = [key1, value1];
   const filter2 = [key2, value2];
   const mockFilters = [
@@ -49,7 +70,9 @@ describe('SearchLabelComponent', () => {
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
         { provide: PaginationService, useValue: paginationService },
-        { provide: Router, useValue: {} }
+        { provide: Router, useValue: {} },
+        { provide: ItemDataService, useValue: mockItemDataService },
+        { provide: DSONameService, useValue: mockDSODataService }
         // { provide: SearchConfigurationService, useValue: {getCurrentFrontendFilters : () =>  observableOf({})} }
       ],
       schemas: [NO_ERRORS_SCHEMA]
@@ -62,17 +85,18 @@ describe('SearchLabelComponent', () => {
     fixture = TestBed.createComponent(SearchLabelComponent);
     comp = fixture.componentInstance;
     searchService = (comp as any).searchService;
-    comp.key = key1;
-    comp.value = value1;
     (comp as any).appliedFilters = observableOf(mockFilters);
-    fixture.detectChanges();
+    mockDSODataService.getName.and.returnValue(name);
   });
 
   describe('when getRemoveParams is called', () => {
     let obs: Observable<Params>;
 
     beforeEach(() => {
       obs = comp.getRemoveParams();
+      comp.key = key1;
+      comp.value = value1;
+      fixture.detectChanges();
     });
 
     it('should return all params but the provided filter', () => {
@@ -84,14 +108,59 @@ describe('SearchLabelComponent', () => {
   });
 
   describe('when normalizeFilterValue is called', () => {
+    beforeEach(() => {
+      comp.key = key1;
+      comp.value = value1;
+      fixture.detectChanges();
+    });
     it('should return properly filter value', () => {
       let result: string;
 
       result = comp.normalizeFilterValue(value1);
       expect(result).toBe(normValue1);
 
-      result = comp.normalizeFilterValue(value3);
-      expect(result).toBe(normValue3);
+      result = comp.normalizeFilterValue(valueAuthority);
+      expect(result).toBe(normValueAuthority);
+    });
+  });
+
+  describe('when value is set as authority', () => {
+    beforeEach(() => {
+      comp.key = key1;
+      comp.value = valueAuthority;
+    });
+    it('should return the value retrieved from Item', () => {
+      mockItemDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(item));
+      fixture.detectChanges();
+      expect(comp.filterValue.getValue()).toBe(name);
+    });
+    it('should return the given value', () => {
+      mockItemDataService.findById.and.returnValue(createFailedRemoteDataObject$());
+      fixture.detectChanges();
+      expect(comp.filterValue.getValue()).toBe(normValueAuthority);
+    });
+  });
+
+  describe('when value is not set as authority', () => {
+    beforeEach(() => {
+      comp.key = key1;
+      comp.value = valueEquals;
+      fixture.detectChanges();
+    });
+    it('should return the given value', () => {
+      expect(comp.filterValue.getValue()).toBe(normValueEquals);
+    });
+  });
+
+  describe('when value is random', () => {
+    beforeEach(() => {
+      comp.key = key1;
+      comp.value = randomAuthor;
+      fixture.detectChanges();
+    });
+    it('should return the value', () => {
+      expect(comp.filterValue.getValue()).toBe(randomAuthor);
     });
   });
+
 });

src/app/shared/search/search-labels/search-label/search-label.component.ts

@@ -1,5 +1,5 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
 import { Params, Router } from '@angular/router';
 import { map } from 'rxjs/operators';
 import { hasValue, isNotEmpty } from '../../../empty.util';
@@ -8,6 +8,9 @@ import { currentPath } from '../../../utils/route.utils';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 import { stripOperatorFromFilterValue } from '../../search.utils';
+import { ItemDataService } from '../../../../core/data/item-data.service';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 
 @Component({
   selector: 'ds-search-label',
@@ -31,20 +34,54 @@ export class SearchLabelComponent implements OnInit {
    */
   filterName: string;
 
+  /**
+   * Represents the name associated with the corresponding ID value.
+   */
+  filterValue: BehaviorSubject<string> = new BehaviorSubject<string>('');
+
   /**
    * Initialize the instance variable
    */
   constructor(
     private searchService: SearchService,
     private paginationService: PaginationService,
     private searchConfigurationService: SearchConfigurationService,
+    private itemDataService: ItemDataService,
+    private dsoNameService: DSONameService,
     private router: Router) {
   }
 
   ngOnInit(): void {
     this.searchLink = this.getSearchLink();
     this.removeParameters = this.getRemoveParams();
     this.filterName = this.getFilterName();
+    this.setFilterValue();
+  }
+
+  /**
+   * Retrieves and sets the appropriate filter value based on the given input, updating the filterValue accordingly.
+   * @returns {void}
+   */
+  setFilterValue(): void{
+    const parts = this.value.split(',');
+    const partTrimmed = parts.pop().trim();
+    if (partTrimmed === 'authority') {
+      const id = parts[0].trim();
+      this.itemDataService.findById(id).pipe(
+        getFirstCompletedRemoteData(),
+        map((rq)=> rq.hasSucceeded ? rq.payload : null),
+      ).subscribe((result)=>{
+        let tmpValue: string;
+        if (isNotEmpty(result)){
+          tmpValue = this.dsoNameService.getName(result);
+        } else {
+          tmpValue = this.value;
+        }
+        this.filterValue.next(this.normalizeFilterValue(this.getStrippedValue(tmpValue)));
+      });
+    } else {
+      this.filterValue.next(this.normalizeFilterValue(this.getStrippedValue(this.value)));
+    }
   }
 
   /**