[DSC-1669] fixes

Author: davide-negretti

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadataGroup/metadata-group.component.ts

@@ -32,12 +32,12 @@ export abstract class MetadataGroupComponent extends RenderingTypeStructuredMode
   /**
    * The prefix used for box field label's i18n key
    */
-  fieldI18nPrefix = 'layout.field.label.';
+  readonly fieldI18nPrefix = 'layout.field.label';
 
   /**
    * The prefix used for box field label's
    */
-  nestedName = 'nested';
+  readonly nestedMetadataPrefix = 'NESTED';
 
   /**
    * A boolean representing if component is initialized
@@ -85,28 +85,23 @@ export abstract class MetadataGroupComponent extends RenderingTypeStructuredMode
   }
 
   /**
-   * Returns a string representing the label of field if exists
+   * Returns the translated label, if exists, otherwiuse returns a fallback value
    */
   getLabel(field: LayoutField): string {
-    return this.getTranslationIfExists(this.fieldI18nPrefix + this.item.entityType + '.' + this.nestedName + '.[' + field.metadata + ']') ??
-      this.getTranslationIfExists(this.fieldI18nPrefix + this.item.entityType + '.[' + field.metadata + ']') ??
-      this.getTranslationIfExists(this.fieldI18nPrefix + this.item.entityType + '.[' + field.metadata + ']') ??
-      this.getTranslationIfExists(this.fieldI18nPrefix + this.item.entityType + '.' + field.metadata) ??
-      this.getTranslationIfExists(this.fieldI18nPrefix + '[' + field.metadata + ']') ??
-      this.getTranslationIfExists(this.fieldI18nPrefix + field.label) ??
-      field.label ??
-      field.metadata;
+    return this.getTranslationIfExists(`${this.fieldI18nPrefix}.${this.item.entityType}.${this.nestedMetadataPrefix}[${field.metadata}]}`) ??
+      this.getTranslationIfExists(`${this.fieldI18nPrefix}.${this.item.entityType}.[${field.metadata}]`) ??
+      this.getTranslationIfExists(`${this.fieldI18nPrefix}.${this.item.entityType}.${field.metadata}`) ?? // old syntax - do not use
+      this.getTranslationIfExists(`${this.fieldI18nPrefix}.[${field.metadata}]`) ??
+      this.getTranslationIfExists(`${this.fieldI18nPrefix}.${field.label}`) ?? // old syntax - do not use
+      field.label; // the untranslated value from the CRIS layout
   }
 
   /**
-   * If the translation haven't found return null otherwise return translated label
+   * Return the translated label, if exists, otherwise returns null
    */
-  getTranslationIfExists(fieldLabelI18nKey: string): string {
-    const header: string = this.translateService.instant(fieldLabelI18nKey);
-    if (header !== fieldLabelI18nKey) {
-      return header;
-    }
-    return null;
+  getTranslationIfExists(key: string): string {
+    const translation: string = this.translateService.instant(key);
+    return translation !== key ? translation : null;
   }
 
   ngOnDestroy(): void {

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-container.component.html

@@ -1,7 +1,7 @@
 <div *ngIf="metadataFieldRenderOptions" class="{{containerStyle}}">
   <div class="d-flex" [class.flex-column]="field.labelAsHeading">
   <span *ngIf="hasLabel"
-        class="{{labelStyle}}" [innerHTML]="label">
+        class="{{labelStyle}}" [innerHTML]="getLabel()">
   </span>
 
     <div *ngIf="!isStructured" class="d-flex col flex-wrap" [class.flex-column]="!field.valuesInline">

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-container.component.ts

@@ -4,7 +4,7 @@ import { CrisLayoutBox, LayoutField, LayoutFieldType } from '../../../../../../.
 import {
   FieldRenderingType,
   getMetadataBoxFieldRendering,
-  MetadataBoxFieldRenderOptions
+  MetadataBoxFieldRenderOptions,
 } from '../../rendering-types/metadata-box.decorator';
 import { hasValue, isEmpty, isNotEmpty } from '../../../../../../../shared/empty.util';
 import { TranslateService } from '@ngx-translate/core';
@@ -13,12 +13,11 @@ import { MetadataValue } from '../../../../../../../core/shared/metadata.models'
 import { Bitstream } from '../../../../../../../core/shared/bitstream.model';
 import { getFirstCompletedRemoteData } from '../../../../../../../core/shared/operators';
 import { map, take } from 'rxjs/operators';
-import { BitstreamDataService } from '../../../../../../../core/data/bitstream-data.service';
-import { MetadataFilter } from '../../../../../../../core/data/bitstream-data.service';
+import { BitstreamDataService, MetadataFilter } from '../../../../../../../core/data/bitstream-data.service';
 import { RemoteData } from '../../../../../../../core/data/remote-data';
 import { PaginatedList } from '../../../../../../../core/data/paginated-list.model';
 import { Observable } from 'rxjs';
-import { TranslationUtilityService } from '../../../../../../services/translation.service';
+import { inject } from '@angular/core';
 
 @Component({
   selector: 'ds-metadata-container',
@@ -47,7 +46,7 @@ export class MetadataContainerComponent implements OnInit {
   /**
    * The prefix used for box field label's i18n key
    */
-  fieldI18nPrefix = 'layout.field.label.';
+  readonly fieldI18nPrefix = 'layout.field.label';
 
   /**
    * A boolean representing if metadata rendering type is structured or not
@@ -59,13 +58,9 @@ export class MetadataContainerComponent implements OnInit {
    */
   metadataFieldRenderOptions: MetadataBoxFieldRenderOptions;
 
-  constructor(
-    protected bitstreamDataService: BitstreamDataService,
-    protected translateService: TranslateService,
-    protected cd: ChangeDetectorRef,
-    protected translationService: TranslationUtilityService
-  ) {
-  }
+  protected readonly bitstreamDataService = inject(BitstreamDataService);
+  protected readonly translateService = inject(TranslateService);
+  protected readonly cd = inject(ChangeDetectorRef);
 
   /**
    * Returns all metadata values in the item
@@ -84,24 +79,27 @@ export class MetadataContainerComponent implements OnInit {
   /**
    * Returns a string representing the label of field if exists
    */
-  get label(): string {
-    return this.getTranslationIfExists(this.fieldI18nPrefix + this.item.entityType + '.[' + this.field.metadata + ']') ??
-      this.getTranslationIfExists(this.fieldI18nPrefix + this.item.entityType + '.' + this.field.metadata) ??
-      this.getTranslationIfExists(this.fieldI18nPrefix + '[' + this.field.metadata + ']') ??
-      this.getTranslationIfExists(this.fieldI18nPrefix + this.field.label) ??
-      this.field.label ??
-      this.field.metadata;
+  getLabel(): string {
+    if (this.field.fieldType === LayoutFieldType.BITSTREAM) {
+      return (hasValue(this.field.bitstream.metadataValue) ?
+        this.getTranslationIfExists(`${this.fieldI18nPrefix}.${this.item.entityType}.BITSTREAM[${this.field.bitstream.metadataValue}]`) :
+        this.getTranslationIfExists(`${this.fieldI18nPrefix}.${this.item.entityType}.BITSTREAM`)
+      ) ?? this.field.label;
+    } else {
+      return this.getTranslationIfExists(`${this.fieldI18nPrefix}.${this.item.entityType}.[${this.field.metadata}]`) ??
+      this.getTranslationIfExists(`${this.fieldI18nPrefix}.${this.item.entityType}.${this.field.metadata}`) ?? // old syntax - do not use
+      this.getTranslationIfExists(`${this.fieldI18nPrefix}.[${this.field.metadata}]`) ??
+      this.getTranslationIfExists(`${this.fieldI18nPrefix}.${this.field.label}`) ?? // old syntax - do not use
+      this.field.label; // the untranslated value from the CRIS layout
+    }
   }
 
   /**
-   * If the translation haven't found return null otherwise return translated label
+   * Return the translated label, if exists, otherwise returns null
    */
-  getTranslationIfExists(fieldLabelI18nKey: string): string {
-    const header: string = this.translateService.instant(fieldLabelI18nKey);
-    if (header !== fieldLabelI18nKey) {
-      return header;
-    }
-    return null;
+  getTranslationIfExists(key: string): string {
+    const translation: string = this.translateService.instant(key);
+    return translation !== key ? translation : null;
   }
 
   /**

src/app/cris-layout/services/translation.service.ts

@@ -7587,7 +7587,7 @@
   "layout.field.label.Person.[person.affiliation.name]": "Main Affiliation",
   "layout.field.label.Person.[oairecerif.identifier.url]": "Web Site",
   "layout.field.label.Person.[person.email]": "Email",
-  "layout.field.label.Person.[person.identifier.orcid]": "ORCID",
+//  "layout.field.label.Person.[person.identifier.orcid]": "ORCID",
   "layout.field.label.Person.[person.identifier.scopus-author-id]": "Scopus Author ID",
   "layout.field.label.Person.[person.identifier.rid]": "Researcher ID",
   "layout.field.label.Person.[dc.description.abstract]": "Biography",
@@ -7678,4 +7678,5 @@
 
   // Do not add new labels below layout ones
   // All new labels should be placed together with similar ones, or in alphabetical orders
+
 }