Merge pull request #2542 from 4Science/DURACOM-190

Fix i18n labels and alignment in vocabulary-treeview
DSpace · Oct 26, 2023 · 6828fa3 · 6828fa3
2 parents 81e3b36 + feb2b2b
commit 6828fa3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -1,4 +1,4 @@
-<ds-alert *ngIf="description | async" [content]="description | async" [type]="'alert-info'"></ds-alert>
+<ds-alert [content]="'vocabulary-treeview.info' | translate" [type]="'alert-info'"></ds-alert>
 <div class="treeview-header row">
   <div class="col-12">
     <div class="input-group">
@@ -23,7 +23,7 @@ <h4 *ngIf="!(loading | async) && dataSource.data.length === 0" class="text-cente
     <!-- Leaf node -->
     <cdk-tree-node *cdkTreeNodeDef="let node" cdkTreeNodePadding class="d-flex">
         <button type="button" class="btn btn-default" cdkTreeNodeToggle>
-          <span class="fas fa-angle-right invisible" aria-hidden="true"></span>
+          <span class="fas fa-fw fa-angle-right invisible" aria-hidden="true"></span>
         </button>
           <label *ngIf="multiSelect" class="d-flex align-items-center m-0 p-0 form-check"
                  [class.text-success]="node.isSelected"
@@ -55,7 +55,7 @@ <h4 *ngIf="!(loading | async) && dataSource.data.length === 0" class="text-cente
         <button type="button" class="btn btn-default" cdkTreeNodeToggle
                 [attr.aria-label]="'toggle ' + node.name"
                 (click)="loadChildren(node)">
-          <span class="fas {{treeControl.isExpanded(node) ? 'fa-angle-down' : 'fa-angle-right'}}"
+          <span class="fas fa-fw {{treeControl.isExpanded(node) ? 'fa-angle-down' : 'fa-angle-right'}}"
                 aria-hidden="true"></span>
         </button>
 

diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -1,7 +1,6 @@
 import { FlatTreeControl } from '@angular/cdk/tree';
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, OnChanges, SimpleChanges } from '@angular/core';
 
-import { map } from 'rxjs/operators';
 import { Observable, Subscription } from 'rxjs';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
@@ -16,7 +15,6 @@ import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vo
 import { VocabularyTreeFlattener } from './vocabulary-tree-flattener';
 import { VocabularyTreeFlatDataSource } from './vocabulary-tree-flat-data-source';
 import { CoreState } from '../../../core/core-state.model';
-import { lowerCase } from 'lodash/string';
 import { VocabularyService } from '../../../core/submission/vocabularies/vocabulary.service';
 import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
 
@@ -50,11 +48,6 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges
    */
   @Input() multiSelect = false;
 
-  /**
-   * Contain a descriptive message for this vocabulary retrieved from i18n files
-   */
-  description: Observable<string>;
-
   /**
    * A map containing the current node showed by the tree
    */
@@ -216,12 +209,6 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges
       })
     );
 
-    this.translate.get(`search.filters.filter.${this.vocabularyOptions.name}.head`).pipe(
-      map((type) => lowerCase(type)),
-    ).subscribe(
-      (type) => this.description = this.translate.get('vocabulary-treeview.info', { type })
-    );
-
     this.loading = this.vocabularyTreeviewService.isLoading();
 
     this.vocabularyTreeviewService.initialize(this.vocabularyOptions, new PageInfo(), this.selectedItems, null);