From 00d7b8322d38fe007e3f7b19db6716ff206113cb Mon Sep 17 00:00:00 2001
From: Marie Verdonck <maria.verdonck@atmire.com>
Date: Thu, 18 Apr 2024 02:08:20 +0200
Subject: [PATCH 1/2] 104686: Live Import preview only shows first metadata
 value per field

---
 .../submission-import-external-preview.component.html  | 10 ++++++----
 .../submission-import-external-preview.component.ts    |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
index bbb0dbcc94..beecd68d70 100644
--- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
@@ -18,10 +18,12 @@
       </div>
     </div>
     <div *ngFor="let metadata of metadataList" class="row">
-      <div class="col-md-12">
-        <strong>{{'item.preview.' + metadata.key | translate}}</strong>
-        <p>{{metadata.value.value}}</p>
-      </div>
+      <p class="col-md-12">
+        <strong class="">{{'item.preview.' + metadata.key | translate}}</strong><br>
+        <ng-container *ngFor="let metadatum of metadata.values">
+          <span>{{metadatum.value}}</span><br>
+        </ng-container>
+      </p>
     </div>
     <div class="row">
       <div class="col-md-12">
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
index ccc9ede142..2c7b3a66be 100644
--- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
@@ -27,7 +27,7 @@ export class SubmissionImportExternalPreviewComponent implements OnInit {
   /**
    * The entry metadata list
    */
-  public metadataList: { key: string, value: MetadataValue }[];
+  public metadataList: { key: string, values: MetadataValue[] }[];
   /**
    * The label prefix to use to generate the translation label
    */
@@ -62,7 +62,7 @@ export class SubmissionImportExternalPreviewComponent implements OnInit {
     metadataKeys.forEach((key) => {
       this.metadataList.push({
         key: key,
-        value: Metadata.first(this.externalSourceEntry.metadata, key)
+        values: Metadata.all(this.externalSourceEntry.metadata, key)
       });
     });
   }

From 5f89dd27fbd3ce11d48b0b9ec0d693e42727d909 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Thu, 18 Apr 2024 11:59:12 +0200
Subject: [PATCH 2/2] 114440: fix test

---
 .../submission-import-external-preview.component.spec.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts
index f53a5d812c..06a048709a 100644
--- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts
@@ -113,7 +113,7 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => {
     it('Should init component properly', () => {
       comp.externalSourceEntry = externalEntry;
       const expected = [
-        { key: 'dc.identifier.uri', value: Metadata.first(comp.externalSourceEntry.metadata, 'dc.identifier.uri') },
+        { key: 'dc.identifier.uri', values: Metadata.all(comp.externalSourceEntry.metadata, 'dc.identifier.uri') },
       ];
       fixture.detectChanges();