Merge branch 'dspace-cris-7' into ux-plus

Author: atarix83

src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html

@@ -4,17 +4,17 @@
     <div class="input-group">
       <input type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()">
       <div class="input-group-append" id="button-addon4">
-        <button class="btn btn-outline-primary" type="button" (click)="search()" [disabled]="!isSearchEnabled()">
+        <button class="btn btn-primary" type="button" (click)="search()" [disabled]="!isSearchEnabled()">
           <span><i class="fas fa-search"></i> {{'vocabulary-treeview.search.form.search' | translate}}</span>
         </button>
-        <button class="btn btn-outline-secondary ml-3 flex-shrink-0" type="button" (click)="reset()">
-          <span><i class="fas fa-eraser"></i> {{'vocabulary-treeview.search.form.reset' | translate}}</span>
-        </button>
-        <button *ngIf="showAdd && this.vocabularyOptions.closed" class="btn btn-outline-primary" type="button" (click)="add()">
-          {{'vocabulary-treeview.search.form.add' | translate}}
-        </button>
       </div>
     </div>
+    <button class="btn btn-secondary ml-3 flex-shrink-0" type="button" (click)="reset()">
+      <span><i class="fas fa-eraser"></i> {{'vocabulary-treeview.search.form.reset' | translate}}</span>
+    </button>
+    <button *ngIf="showAdd " class="btn btn-secondary ml-3 flex-shrink-0" type="button" (click)="add()">
+        <span><i class="fas fa-plus"></i> {{'vocabulary-treeview.search.form.add' | translate}}</span>
+    </button>
   </div>
 </div>
 <div class="treeview-container">

src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts

@@ -343,7 +343,8 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges
    * Return an id for a given {@link VocabularyTreeItemType}
    */
   private getEntryId(entry: VocabularyTreeItemType): string {
-    return entry?.authority || entry?.otherInformation?.id || (entry as any)?.id || undefined;
+    const entryId: string = entry?.authority || entry?.otherInformation?.id || (entry as any)?.id || undefined;
+    return entryId?.startsWith(this.vocabularyOptions.name) ? entryId.replace(`${this.vocabularyOptions.name}:`, '') : entryId;
   }
 
   /**

src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html

@@ -3,10 +3,10 @@
    [routerLink]="[searchLink]"
    [queryParams]="addQueryParams" queryParamsHandling="merge">
   <label class="mb-0 d-flex w-100">
-    <input type="checkbox" [checked]="false" class="my-1 align-self-stretch filter-checkbox"/>
+    <input type="checkbox" [checked]="false" class="my-1 align-self-stretch"/>
     <span class="w-100 pl-1 break-facet">
-      <span class="float-right badge badge-secondary badge-pill mt-1 ml-1">{{filterValue.count | dsShortNumber}}</span>
-      {{ 'search.filters.' + filterConfig.name + '.' + filterValue.value | translate: {default: filterValue.value} }}
+      {{ labelTranslation | dsCapitalize}}
+      ({{filterValue.count}})
     </span>
   </label>
 

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

@@ -3,7 +3,7 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
@@ -19,6 +19,8 @@ import { PaginationComponentOptions } from '../../../../../pagination/pagination
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
 import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
+import { MockActivatedRoute } from '../../../../../mocks/active-router.mock';
+import { CapitalizePipe } from '../../../../../utils/capitalize.pipe';
 
 describe('SearchFacetOptionComponent', () => {
   let comp: SearchFacetOptionComponent;
@@ -90,9 +92,10 @@ describe('SearchFacetOptionComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
-      declarations: [SearchFacetOptionComponent, ShortNumberPipe],
+      declarations: [SearchFacetOptionComponent, ShortNumberPipe, CapitalizePipe],
       providers: [
         { provide: SearchService, useValue: new SearchServiceStub(searchLink) },
+        { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
         { provide: Router, useValue: new RouterStub() },
         { provide: PaginationService, useValue: paginationService },
         {

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

@@ -1,7 +1,7 @@
 import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { FacetValue } from '../../../../models/facet-value.model';
 import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
 import { SearchService } from '../../../../../../core/shared/search/search.service';
@@ -11,6 +11,7 @@ import { hasValue } from '../../../../../empty.util';
 import { currentPath } from '../../../../../utils/route.utils';
 import { getFacetValueForType } from '../../../../search.utils';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'ds-search-facet-option',
@@ -63,18 +64,27 @@ export class SearchFacetOptionComponent implements OnInit, OnDestroy {
 
   paginationId: string;
 
+  configuration: string;
+  labelTranslation: string;
+
   constructor(protected searchService: SearchService,
               protected filterService: SearchFilterService,
               protected searchConfigService: SearchConfigurationService,
               protected router: Router,
-              protected paginationService: PaginationService
+              protected activatedRoute: ActivatedRoute,
+              protected paginationService: PaginationService,
+              protected translateService: TranslateService
   ) {
   }
 
   /**
    * Initializes all observable instance variables and starts listening to them
    */
   ngOnInit(): void {
+    this.configuration = this.activatedRoute?.snapshot?.queryParams?.configuration;
+
+    this.handleTranslation();
+
     this.paginationId = this.searchConfigService.paginationID;
     this.searchLink = this.getSearchLink();
     this.isVisible = this.isChecked().pipe(map((checked: boolean) => !checked));
@@ -84,6 +94,27 @@ export class SearchFacetOptionComponent implements OnInit, OnDestroy {
       });
   }
 
+  /**
+   * Handles translation of the label
+   */
+  handleTranslation() {
+    let translation = '';
+    const labelWithConfiguration = `search.filters.${this.configuration}.${this.filterConfig.name}.${this.filterValue.value}`;
+
+    translation = this.translateService.instant(labelWithConfiguration);
+    if (translation !== labelWithConfiguration) {
+      this.labelTranslation = translation;
+    } else {
+      const labelWithoutConfiguration = `search.filters.${this.filterConfig.name}.${this.filterValue.value}`;
+      translation = this.translateService.instant(labelWithoutConfiguration);
+      if (translation !== labelWithoutConfiguration) {
+        this.labelTranslation = translation;
+      } else {
+        this.labelTranslation = this.filterValue.value;
+      }
+    }
+  }
+
   /**
    * Checks if a value for this filter is currently active
    */

src/assets/i18n/en.json5

@@ -6801,6 +6801,8 @@
 
   "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
 
+  "vocabulary-treeview.tree.description.publication-coar-types": "Publication types",
+
   "vocabulary-treeview.info": "Select a subject to add as search filter",
 
   "uploader.browse": "browse",