Skip to content

Commit 8b1f46c

Browse files
authored
Merge pull request DSpace#2954 from atmire/w2p-104686_Live-import-preview-only-shows-first-mdv-7.6
Live import preview should show all metadata values, not only the first one
2 parents c2e0d68 + 5f89dd2 commit 8b1f46c

3 files changed

Lines changed: 9 additions & 7 deletions

File tree

src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ <h2>{{'submission.import-external.preview.title.' + labelPrefix | translate}}</h
1818
</div>
1919
</div>
2020
<div *ngFor="let metadata of metadataList" class="row">
21-
<div class="col-md-12">
22-
<strong>{{'item.preview.' + metadata.key | translate}}</strong>
23-
<p>{{metadata.value.value}}</p>
24-
</div>
21+
<p class="col-md-12">
22+
<strong class="">{{'item.preview.' + metadata.key | translate}}</strong><br>
23+
<ng-container *ngFor="let metadatum of metadata.values">
24+
<span>{{metadatum.value}}</span><br>
25+
</ng-container>
26+
</p>
2527
</div>
2628
<div class="row">
2729
<div class="col-md-12">

src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => {
113113
it('Should init component properly', () => {
114114
comp.externalSourceEntry = externalEntry;
115115
const expected = [
116-
{ key: 'dc.identifier.uri', value: Metadata.first(comp.externalSourceEntry.metadata, 'dc.identifier.uri') },
116+
{ key: 'dc.identifier.uri', values: Metadata.all(comp.externalSourceEntry.metadata, 'dc.identifier.uri') },
117117
];
118118
fixture.detectChanges();
119119

src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export class SubmissionImportExternalPreviewComponent implements OnInit {
4343
/**
4444
* The entry metadata list
4545
*/
46-
public metadataList: { key: string, value: MetadataValue }[];
46+
public metadataList: { key: string, values: MetadataValue[] }[];
4747
/**
4848
* The label prefix to use to generate the translation label
4949
*/
@@ -78,7 +78,7 @@ export class SubmissionImportExternalPreviewComponent implements OnInit {
7878
metadataKeys.forEach((key) => {
7979
this.metadataList.push({
8080
key: key,
81-
value: Metadata.first(this.externalSourceEntry.metadata, key),
81+
values: Metadata.all(this.externalSourceEntry.metadata, key),
8282
});
8383
});
8484
}

0 commit comments

Comments
 (0)