[DURACOM-426] add labels, fix facets labels,fix onebox other info template

Author: FrancescoMolinaro

src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html

@@ -7,11 +7,11 @@
 
 <ng-template #hasInfo let-entry="entry">
   <ul class="list-unstyled mb-0">
-    <li class="list-item text-truncate text-primary fw-bold">
+    <li class="list-item d-flex align-items-center">
       @if (entry.source) {
-        <img class="mr-2 source-icon" #imgTag [src]="getAuthoritySourceIcon(entry.source, imgTag)" [attr.alt]="('form.entry.source.' + entry.source) | translate" />
+        <img class="source-icon" #imgTag [src]="getAuthoritySourceIcon(entry.source, imgTag)" [attr.alt]="('form.entry.source.' + entry.source) | translate" />
       }
-      {{entry.value}}
+      <div class="ms-2 text-truncate text-primary fw-bold">{{entry.value}}</div>
     </li>
     @for (item of entry.otherInformation | dsObjNgFor; track item) {
       <li class="list-item text-truncate text-secondary" >
@@ -25,9 +25,9 @@
   <ul class="list-unstyled mb-0">
     <li class="list-item d-flex align-items-center">
       @if(entry.source) {
-        <img class="mr-2 source-icon" #imgTag [src]="getAuthoritySourceIcon(entry.source, imgTag)" [attr.alt]="('form.entry.source.' + entry.source) | translate" />
+        <img class="source-icon" #imgTag [src]="getAuthoritySourceIcon(entry.source, imgTag)" [attr.alt]="('form.entry.source.' + entry.source) | translate" />
       }
-      <div class="text-truncate text-primary font-weight-bold">{{entry.value}}</div>
+      <div class="ms-2 text-truncate text-primary font-weight-bold">{{entry.value}}</div>
       @if(entry.source) {
         <div class="ml-2 text-truncate text-secondary">{{ ('form.entry.source.' + entry.source) | translate}}</div>
       }

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

@@ -13,6 +13,7 @@ import { Router } from '@angular/router';
 import { RemoteDataBuildService } from '@dspace/core/cache/builders/remote-data-build.service';
 import { PageInfo } from '@dspace/core/shared/page-info.model';
 import { AppliedFilter } from '@dspace/core/shared/search/models/applied-filter.model';
+import { FacetValue } from '@dspace/core/shared/search/models/facet-value.model';
 import { FacetValues } from '@dspace/core/shared/search/models/facet-values.model';
 import { FilterType } from '@dspace/core/shared/search/models/filter-type.model';
 import { SearchFilterConfig } from '@dspace/core/shared/search/models/search-filter-config.model';
@@ -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

@@ -27,17 +27,23 @@ import { SearchOptions } from '@dspace/core/shared/search/models/search-options.
 import {
   hasNoValue,
   hasValue,
+  isNotEmpty,
 } from '@dspace/shared/utils/empty.util';
 import {
   BehaviorSubject,
+  combineLatest,
   combineLatest as observableCombineLatest,
+  from,
   Observable,
   of,
   Subscription,
 } from 'rxjs';
 import {
   distinctUntilChanged,
+  filter,
   map,
+  mergeMap,
+  reduce,
   switchMap,
   take,
   tap,
@@ -46,6 +52,10 @@ import {
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
 import { InputSuggestion } from '../../../../input-suggestions/input-suggestions.model';
 import { SearchService } from '../../../search.service';
+import {
+  getFacetValueForType,
+  stripOperatorFromFilterValue,
+} from '../../../search.utils';
 import { SearchConfigurationService } from '../../../search-configuration.service';
 import { SearchFilterService } from '../../search-filter.service';
 
@@ -167,7 +177,29 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
       this.searchOptions$.subscribe(() => this.updateFilterValueList()),
       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]) =>
+        allAppliedFilters.map((appliedValue) => {
+          const fValue = facetValues.find((facetValue: FacetValue) => {
+            const valueForType = getFacetValueForType(facetValue, this.filterConfig);
+            return hasValue(valueForType) &&
+              stripOperatorFromFilterValue(valueForType) === 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)),
     );

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

@@ -1,5 +1,5 @@
 <div class="labels">
-  @for (appliedFilter of appliedFilters$ | async; track appliedFilter) {
+  @for (appliedFilter of appliedFilters$ | async; track appliedFilter.value) {
     <ds-search-label-loader
       [appliedFilter]="appliedFilter"
       [inPlaceSearch]="inPlaceSearch">

src/assets/i18n/en.json5

@@ -2087,6 +2087,44 @@
 
   "form.other-information.orcid": "ORCID",
 
+  "form.other-information.data-person_identifier_orcid": "ORCID",
+
+  "form.other-information.person_identifier_orcid": "ORCID",
+
+  "form.other-information.data-oairecerif_author_affiliation": "Affiliation",
+
+  "form.other-information.oairecerif_author_affiliation": "Affiliation",
+
+  "form.other-information.oairecerif_editor_affiliation": "Affiliation",
+
+  "form.other-information.person_identifier_orcid": "ORCID iD",
+
+  "form.other-information.institution-affiliation-name": "Affiliation(s)",
+
+  "form.other-information.dc_relation_grantno": "Grant Number",
+
+  "form.other-information.not-available": "Not available",
+
+  "form.other-information.ror_orgunit_id": "ROR ID",
+
+  "form.other-information.ror_orgunit_type": "ROR type",
+
+  "form.other-information.ror_orgunit_acronym": "ROR acronym",
+
+  "form.other-information.ror_orgunit_countryName": "ROR country",
+
+  "form.entry.source.local": "",
+
+  "form.entry.source.orcid": "",
+
+  "form.entry.source.ror": "",
+
+  "form.entry.source.openaire": "",
+
+  "form.entry.source.zdb": "",
+
+  "form.entry.source.sherpa": "- Sherpa Romeo",
+
   "form.remove": "Remove",
 
   "form.save": "Save",