From d6f458863f40f6ac0c102f9a0b888e58cae857f2 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Wed, 25 Jan 2023 13:01:57 +1300
Subject: [PATCH] [TLC-249] Improve model of identifier data in workspace
 section

---
 ...workspaceitem-section-identifiers.model.ts |  6 +--
 .../section-identifiers.component.html        | 37 ++++---------------
 2 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts b/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts
index 6a8956dff3..f6bfb1ae04 100644
--- a/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts
+++ b/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts
@@ -1,9 +1,9 @@
 /*
  * Object model for the data returned by the REST API to present minted identifiers in a submission section
  */
+import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model';
+
 export interface WorkspaceitemSectionIdentifiersObject {
-  doi?: string
-  handle?: string
-  otherIdentifiers?: string[]
+  identifiers?: Identifier[]
   displayTypes?: string[]
 }
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.html b/src/app/submission/sections/identifiers/section-identifiers.component.html
index 39645704da..dd0b5d2930 100644
--- a/src/app/submission/sections/identifiers/section-identifiers.component.html
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.html
@@ -3,41 +3,18 @@ Template for the identifiers submission section component
 @author Kim Shepherd
 -->
 <!-- Main identifier data -->
-<!--<ng-container *ngVar="(getIdentifierData() | async) as identifierData">-->
 <ng-container *ngVar="(getIdentifierData() | async) as identifierData">
-<div>
+  <ng-container *ngIf="identifierData && identifierData.identifiers">
+  <div>
   <span>{{'submission.sections.identifiers.info' | translate}}</span>
   <ul>
-    <!-- Handles -->
-    <ng-container *ngIf="(!identifierData || identifierData.displayTypes.includes('handle'))">
-      <ng-container *ngIf="!(identifierData && identifierData.handle)">
-        <li>{{'submission.sections.identifiers.no_handle' | translate}}</li>
-      </ng-container>
-      <ng-container *ngIf="(identifierData && identifierData.handle)">
-        <li>{{'submission.sections.identifiers.handle_label' | translate}}{{identifierData.handle}}</li>
-      </ng-container>
-    </ng-container>
-
-    <!-- DOIs -->
-    <ng-container *ngIf="(!identifierData || identifierData.displayTypes.includes('doi'))">
-      <ng-container *ngIf="!(identifierData && identifierData.doi)">
-        <li>{{'submission.sections.identifiers.no_doi' | translate}}</li>
-      </ng-container>
-      <ng-container *ngIf="(identifierData && identifierData.doi)">
-        <li>{{'submission.sections.identifiers.doi_label' | translate}}
-          {{identifierData.doi}}
-        </li>
-      </ng-container>
-    </ng-container>
-
-    <!-- Other identifiers -->
-    <ng-container *ngIf="(!identifierData || identifierData.displayTypes.includes('other'))">
-      <ng-container *ngIf="(identifierData && identifierData.otherIdentifiers && identifierData.otherIdentifiers.length > 0)">
-        <li>{{'submission.sections.identifiers.otherIdentifiers_label' | translate}}
-          {{identifierData.otherIdentifiers.join(',')}}
-        </li>
+    <ng-container *ngFor="let identifier of identifierData.identifiers">
+      <ng-container *ngIf="identifierData.displayTypes.includes(identifier.identifierType) && identifier.value">
+        <li>{{'submission.sections.identifiers.' + identifier.identifierType + '_label' | translate}}
+          {{identifier.value}}</li>
       </ng-container>
     </ng-container>
   </ul>
  </div>
  </ng-container>
+</ng-container>