From 52a37760270c522ef34f9e45985d78d19f663011 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Thu, 19 Jan 2023 16:02:15 +1300
Subject: [PATCH] [TLC-249] Addressing review feedback #2

Update WorkspaceitemSectionIdentifiersObject model to include a
display types string array, so identifier types can be included or excluded
from the step as needed.

Update section template to work with the above new data

As per todonohue's feedback on 2022-01-18
---
 ...workspaceitem-section-identifiers.model.ts |  1 +
 .../identifier-data.component.ts              |  4 +-
 .../section-identifiers.component.html        | 40 +++++++++++--------
 3 files changed, 27 insertions(+), 18 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 7d22bf0b61..6a8956dff3 100644
--- a/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts
+++ b/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts
@@ -5,4 +5,5 @@ export interface WorkspaceitemSectionIdentifiersObject {
   doi?: string
   handle?: string
   otherIdentifiers?: string[]
+  displayTypes?: string[]
 }
diff --git a/src/app/shared/object-list/identifier-data/identifier-data.component.ts b/src/app/shared/object-list/identifier-data/identifier-data.component.ts
index 5b495bfa62..cb6d1d97e5 100644
--- a/src/app/shared/object-list/identifier-data/identifier-data.component.ts
+++ b/src/app/shared/object-list/identifier-data/identifier-data.component.ts
@@ -3,8 +3,8 @@ import { map } from 'rxjs/operators';
 import { Observable } from 'rxjs';
 import { hasValue } from '../../empty.util';
 import { Item } from 'src/app/core/shared/item.model';
-import {IdentifierData} from './identifier-data.model';
-import {IdentifierDataService} from '../../../core/data/identifier-data.service';
+import { IdentifierData } from './identifier-data.model';
+import { IdentifierDataService } from '../../../core/data/identifier-data.service';
 
 @Component({
   selector: 'ds-identifier-data',
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.html b/src/app/submission/sections/identifiers/section-identifiers.component.html
index 1c78119931..39645704da 100644
--- a/src/app/submission/sections/identifiers/section-identifiers.component.html
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.html
@@ -9,26 +9,34 @@ Template for the identifiers submission section component
   <span>{{'submission.sections.identifiers.info' | translate}}</span>
   <ul>
     <!-- Handles -->
-    <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 *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.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 *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.otherIdentifiers && identifierData.otherIdentifiers.length > 0)">
-      <li>{{'submission.sections.identifiers.otherIdentifiers_label' | translate}}
-        {{identifierData.otherIdentifiers.join(',')}}
-      </li>
+    <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>
     </ng-container>
   </ul>
  </div>