Merged in task/dspace-cris-2023_02_x/DSC-1629-authority-source-porting (pull request DSpace#1618)

Task/dspace cris 2023 02 x/DSC-1629 authority source porting

Approved-by: Stefano Maffei

Author: FrancescoMolinaro

src/app/core/submission/submission-response-parsing.service.ts

@@ -51,7 +51,8 @@ export function normalizeSectionData(obj: any, objIndex?: number) {
         (obj.display || obj.value),
         obj.place || objIndex,
         obj.confidence,
-        obj.otherInformation
+        obj.otherInformation,
+        obj.source
       );
     } else if (Array.isArray(obj)) {
       result = [];

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

@@ -7,7 +7,11 @@
 
 <ng-template #hasInfo let-entry="entry">
   <ul class="list-unstyled mb-0">
-    <li class="list-item text-truncate text-primary font-weight-bold">{{entry.value}}</li>
+    <li class="list-item d-flex align-items-center">
+      <img *ngIf="entry.source" class="mr-2" #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 *ngIf="entry.source" class="ml-2 text-truncate text-secondary">{{ ('form.entry.source.' + entry.source) | translate}}</div>
+    </li>
     <ng-container *ngFor="let item of entry.otherInformation | dsObjNgFor">
       <li *ngIf="!item.key.startsWith('data-')" class="list-item text-truncate text-secondary"  >
         {{ 'form.other-information.' + item.key | translate }} : {{item.value !== '' ? getOtherInfoValue(item.value, item.key) : ('form.other-information.not-available' | translate)}}
@@ -18,7 +22,11 @@
 
 <ng-template #noInfo let-entry="entry">
   <ul class="list-unstyled mb-0">
-    <li class="list-item text-truncate text-primary font-weight-bold">{{entry.value}}</li>
+    <li class="list-item d-flex align-items-center">
+      <img  *ngIf="entry.source" class="mr-2" #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 *ngIf="entry.source" class="ml-2 text-truncate text-secondary">{{ ('form.entry.source.' + entry.source) | translate}}</div>
+    </li>
   </ul>
 </ng-template>
 

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

@@ -57,3 +57,7 @@
     background-color: var(--bs-dropdown-link-hover-bg);
   }
 }
+
+.list-item img {
+  height: 20px
+}

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

@@ -44,6 +44,7 @@ import {
 } from '../../../../vocabulary-treeview-modal/vocabulary-treeview-modal.component';
 import { FormBuilderService } from '../../../form-builder.service';
 import { SubmissionService } from '../../../../../../submission/submission.service';
+import { environment } from '../../../../../../../environments/environment';
 
 /**
  * Component representing a onebox input field.
@@ -77,6 +78,7 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
   preloadLevel: number;
   additionalInfoSelectIsOpen = false;
   alternativeNamesKey = 'alternative-names';
+  authorithyIcons = environment.submission.icons.authority.sourceIcons;
 
 
   private isHierarchicalVocabulary$: Observable<boolean>;
@@ -413,4 +415,33 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
       type: 'vocabularyEntry'
     });
   }
+
+
+  /**
+   * Hide image on error
+   * @param image
+   */
+  handleImgError(image: HTMLElement): void {
+    image.style.display = 'none';
+  }
+
+  /**
+   * Get configured icon for each authority source
+   * @param source
+   */
+  getAuthoritySourceIcon(source: string, image: HTMLElement): string {
+    if (hasValue(this.authorithyIcons)) {
+      const iconPath = this.authorithyIcons.find(icon => icon.source === source)?.path;
+
+      if (!hasValue(iconPath)) {
+        this.handleImgError(image);
+      }
+
+      return iconPath;
+    } else {
+      this.handleImgError(image);
+    }
+
+    return '';
+  }
 }

src/app/shared/form/builder/form-builder.service.ts

@@ -263,6 +263,7 @@ export class FormBuilderService extends DynamicFormService {
                   (controlModel as any).metadataValue.place,
                   (controlModel as any).metadataValue.confidence,
                   (controlModel as any).metadataValue.otherInformation,
+                  (controlModel as any).metadataValue.source,
                   (controlModel as any).metadataValue.metadata);
               }
 
@@ -277,6 +278,7 @@ export class FormBuilderService extends DynamicFormService {
                   (controlModel as any).value.place,
                   (controlModel as any).value.confidence,
                   (controlModel as any).value.otherInformation,
+                  (controlModel as any).value.source,
                   (controlModel as any).value.metadata);
               }
             }

src/app/shared/form/builder/models/form-field-metadata-value.model.ts

@@ -25,6 +25,7 @@ export class FormFieldMetadataValueObject implements MetadataValueInterface {
   place: number;
   label: string;
   securityLevel: number;
+  source: string;
   otherInformation: OtherInformation;
 
   constructor(value: any = null,
@@ -35,7 +36,9 @@ export class FormFieldMetadataValueObject implements MetadataValueInterface {
               place: number = 0,
               confidence: number = null,
               otherInformation: any = null,
-              metadata: string = null) {
+              source: string = null,
+              metadata: string = null
+              ) {
     this.value = isNotNull(value) ? ((typeof value === 'string') ? value.trim() : value) : null;
     this.language = language;
     this.authority = authority;
@@ -54,7 +57,7 @@ export class FormFieldMetadataValueObject implements MetadataValueInterface {
     if (isNotEmpty(metadata)) {
       this.metadata = metadata;
     }
-
+    this.source = source;
     this.otherInformation = otherInformation;
   }
 

src/assets/i18n/en.json5

@@ -2477,6 +2477,18 @@
 
   "form.other-information.ror_orgunit_acronym": "ROR acronym",
 
+  "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",