From 310726a3c47256a5376435d81d2a653680cf35e1 Mon Sep 17 00:00:00 2001
From: Ying Jin <yj4@rice.edu>
Date: Thu, 29 Sep 2022 21:01:51 -0500
Subject: [PATCH 1/3] fix DSpace #1766 Display all the fields for a Metadata
 Schema in one page and include IDs

---
 .../metadata-schema/metadata-schema.component.html            | 2 ++
 src/assets/i18n/ar.json5                                      | 4 +++-
 src/assets/i18n/bn.json5                                      | 4 +++-
 src/assets/i18n/cs.json5                                      | 4 +++-
 src/assets/i18n/de.json5                                      | 2 ++
 src/assets/i18n/el.json5                                      | 2 ++
 src/assets/i18n/en.json5                                      | 1 +
 src/assets/i18n/es.json5                                      | 4 +++-
 src/assets/i18n/fi.json5                                      | 2 ++
 src/assets/i18n/fr.json5                                      | 2 ++
 src/assets/i18n/gd.json5                                      | 2 ++
 src/assets/i18n/hu.json5                                      | 4 +++-
 src/assets/i18n/ja.json5                                      | 4 +++-
 src/assets/i18n/kk.json5                                      | 2 ++
 src/assets/i18n/lv.json5                                      | 2 ++
 src/assets/i18n/nl.json5                                      | 4 +++-
 src/assets/i18n/pl.json5                                      | 4 +++-
 src/assets/i18n/pt-BR.json5                                   | 4 +++-
 src/assets/i18n/pt-PT.json5                                   | 2 ++
 src/assets/i18n/sv.json5                                      | 2 ++
 src/assets/i18n/sw.json5                                      | 4 +++-
 src/assets/i18n/tr.json5                                      | 2 ++
 22 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
index 49fed0c847..1a867928f5 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -25,6 +25,7 @@
               <thead>
               <tr>
                 <th></th>
+                <th scope="col">{{'admin.registries.schema.fields.table.id' | translate}}</th>
                 <th scope="col">{{'admin.registries.schema.fields.table.field' | translate}}</th>
                 <th scope="col">{{'admin.registries.schema.fields.table.scopenote' | translate}}</th>
               </tr>
@@ -39,6 +40,7 @@
                            (change)="selectMetadataField(field, $event)">
                   </label>
                 </td>
+                <td class="selectable-row" (click)="editField(field)">{{field.id}}</td>
                 <td class="selectable-row" (click)="editField(field)">{{schema?.prefix}}.{{field.element}}<label *ngIf="field.qualifier">.</label>{{field.qualifier}}</td>
                 <td class="selectable-row" (click)="editField(field)">{{field.scopeNote}}</td>
               </tr>
diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5
index 0d036ff7d3..f390a4b285 100644
--- a/src/assets/i18n/ar.json5
+++ b/src/assets/i18n/ar.json5
@@ -311,6 +311,8 @@
   // "admin.registries.schema.fields.table.field": "Field",
   // TODO New key - Add a translation
   "admin.registries.schema.fields.table.field": "Field",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id" : "ID",
   
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   // TODO New key - Add a translation
@@ -6745,4 +6747,4 @@
   "workflow-item.send-back.button.confirm": "Send back"
   
 
-}
\ No newline at end of file
+}
diff --git a/src/assets/i18n/bn.json5 b/src/assets/i18n/bn.json5
index 1bc26d2da4..c0a1f0a73f 100644
--- a/src/assets/i18n/bn.json5
+++ b/src/assets/i18n/bn.json5
@@ -244,6 +244,8 @@
   
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "ক্ষেত্র",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id" : "ID",
   
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "স্কোপ নোট",
@@ -6126,4 +6128,4 @@
   "idle-modal.extend-session": "সেশন প্রসারিত করুন"
   
 
-}
\ No newline at end of file
+}
diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 0be4403ec9..c6e17c3dd9 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -294,6 +294,8 @@
   
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Pole",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id" : "ID",
   
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Poznámka o rozsahu",
@@ -6612,4 +6614,4 @@
   "workflow-item.send-back.button.confirm": "Send back"
   
 
-}
\ No newline at end of file
+}
diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index c699ee2575..c141ede068 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -256,6 +256,8 @@
   
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Feld",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id" : "ID",
   
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Gültigkeitsbereich",
diff --git a/src/assets/i18n/el.json5 b/src/assets/i18n/el.json5
index 4d3b57897a..37b84e1ebb 100644
--- a/src/assets/i18n/el.json5
+++ b/src/assets/i18n/el.json5
@@ -227,6 +227,8 @@
 	"admin.registries.schema.fields.no-items": "Δεν υπάρχουν πεδία μεταδεδομένων για εμφάνιση.",
 	"admin.registries.schema.fields.table.delete": "Διαγραφή επιλεγμένων",
 	"admin.registries.schema.fields.table.field": "Πεδίο",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id" : "ID",
 	"admin.registries.schema.fields.table.scopenote": "Πεδίο εφαρμογής",
 	"admin.registries.schema.form.create": "Δημιουργία πεδίου μεταδεδομένων",
 	"admin.registries.schema.form.edit": "Επεξεργασία πεδίου μεταδεδομένων",
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 1bdfbedfdc..fd46212064 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -184,6 +184,7 @@
   "admin.registries.schema.fields.table.delete": "Delete selected",
 
   "admin.registries.schema.fields.table.field": "Field",
+  "admin.registries.schema.fields.table.id" : "ID",
 
   "admin.registries.schema.fields.table.scopenote": "Scope Note",
 
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index b738578fc6..f623853ac9 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -272,6 +272,8 @@
 
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Campo",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id" : "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Nota de alcance",
@@ -6988,4 +6990,4 @@
 
 
 
-}
\ No newline at end of file
+}
diff --git a/src/assets/i18n/fi.json5 b/src/assets/i18n/fi.json5
index 5c5f3b6168..9d27a5d9f7 100644
--- a/src/assets/i18n/fi.json5
+++ b/src/assets/i18n/fi.json5
@@ -235,6 +235,8 @@
 
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Kenttä",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id" : "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Soveltamisala",
diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 5cfb7ff099..f39149b27f 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -251,6 +251,8 @@
 
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Champ",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id" : "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Note d'application",
diff --git a/src/assets/i18n/gd.json5 b/src/assets/i18n/gd.json5
index f72c3aa1c8..f67fe6770d 100644
--- a/src/assets/i18n/gd.json5
+++ b/src/assets/i18n/gd.json5
@@ -235,6 +235,8 @@
 
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Raon",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id" : "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Nota Leudachd",
diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5
index a42c36f263..3d70f33304 100644
--- a/src/assets/i18n/hu.json5
+++ b/src/assets/i18n/hu.json5
@@ -236,6 +236,8 @@
   
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Mező",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id" : "ID",
   
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Cél megjegyzés",
@@ -5145,4 +5147,4 @@
   "workflow-item.send-back.button.confirm": "Visszaküld",
   
 
-}
\ No newline at end of file
+}
diff --git a/src/assets/i18n/ja.json5 b/src/assets/i18n/ja.json5
index 0d036ff7d3..f390a4b285 100644
--- a/src/assets/i18n/ja.json5
+++ b/src/assets/i18n/ja.json5
@@ -311,6 +311,8 @@
   // "admin.registries.schema.fields.table.field": "Field",
   // TODO New key - Add a translation
   "admin.registries.schema.fields.table.field": "Field",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id" : "ID",
   
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   // TODO New key - Add a translation
@@ -6745,4 +6747,4 @@
   "workflow-item.send-back.button.confirm": "Send back"
   
 
-}
\ No newline at end of file
+}
diff --git a/src/assets/i18n/kk.json5 b/src/assets/i18n/kk.json5
index 56651ceaae..571e598a13 100644
--- a/src/assets/i18n/kk.json5
+++ b/src/assets/i18n/kk.json5
@@ -275,6 +275,8 @@
 
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Өріс",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id" : "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Қолдану саласы бойынша ескертпе",
diff --git a/src/assets/i18n/lv.json5 b/src/assets/i18n/lv.json5
index d6c409b783..fa8a9b4549 100644
--- a/src/assets/i18n/lv.json5
+++ b/src/assets/i18n/lv.json5
@@ -249,6 +249,8 @@
 
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Lauks",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id" : "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Jomas Piezīme",
diff --git a/src/assets/i18n/nl.json5 b/src/assets/i18n/nl.json5
index bb0b3b121c..3c823fe52a 100644
--- a/src/assets/i18n/nl.json5
+++ b/src/assets/i18n/nl.json5
@@ -250,6 +250,8 @@
   
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Veld",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id" : "ID",
   
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Opmerking over bereik",
@@ -5999,4 +6001,4 @@
   "workflow-item.send-back.button.confirm": "Send back"
   
 
-}
\ No newline at end of file
+}
diff --git a/src/assets/i18n/pl.json5 b/src/assets/i18n/pl.json5
index 0d036ff7d3..f390a4b285 100644
--- a/src/assets/i18n/pl.json5
+++ b/src/assets/i18n/pl.json5
@@ -311,6 +311,8 @@
   // "admin.registries.schema.fields.table.field": "Field",
   // TODO New key - Add a translation
   "admin.registries.schema.fields.table.field": "Field",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id" : "ID",
   
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   // TODO New key - Add a translation
@@ -6745,4 +6747,4 @@
   "workflow-item.send-back.button.confirm": "Send back"
   
 
-}
\ No newline at end of file
+}
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index fbe06877fb..314bf090dc 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -250,6 +250,8 @@
   
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Campo",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id" : "ID",
   
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Nota de escopo",
@@ -5945,4 +5947,4 @@
   "workflow-item.send-back.button.confirm": "Send back"
   
 
-}
\ No newline at end of file
+}
diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index d6bbbd4196..2ae3c76673 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -443,6 +443,8 @@
   
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Campo",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id" : "ID",
   
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Descrição",
diff --git a/src/assets/i18n/sv.json5 b/src/assets/i18n/sv.json5
index c81482d110..a201675586 100644
--- a/src/assets/i18n/sv.json5
+++ b/src/assets/i18n/sv.json5
@@ -245,6 +245,8 @@
 
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Fält",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id" : "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Anmärkning (scope note)",
diff --git a/src/assets/i18n/sw.json5 b/src/assets/i18n/sw.json5
index 0d036ff7d3..f390a4b285 100644
--- a/src/assets/i18n/sw.json5
+++ b/src/assets/i18n/sw.json5
@@ -311,6 +311,8 @@
   // "admin.registries.schema.fields.table.field": "Field",
   // TODO New key - Add a translation
   "admin.registries.schema.fields.table.field": "Field",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id" : "ID",
   
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   // TODO New key - Add a translation
@@ -6745,4 +6747,4 @@
   "workflow-item.send-back.button.confirm": "Send back"
   
 
-}
\ No newline at end of file
+}
diff --git a/src/assets/i18n/tr.json5 b/src/assets/i18n/tr.json5
index d04a6eda2a..b42dd638cf 100644
--- a/src/assets/i18n/tr.json5
+++ b/src/assets/i18n/tr.json5
@@ -235,6 +235,8 @@
   
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Alan",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id" : "ID",
   
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Kapsam Notu",

From 3076f67b700fd3fe2ab1a628257951d559e63b70 Mon Sep 17 00:00:00 2001
From: Ying Jin <yj4@rice.edu>
Date: Mon, 3 Oct 2022 20:37:53 -0500
Subject: [PATCH 2/3] merge

---
 src/assets/i18n/pt-BR.json5 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index 5dd4404d6c..7c0c33833c 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -274,6 +274,9 @@
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Campo",
 
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id": "ID",
+
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Nota de escopo",
 

From 296bf0e4d9782e1cf89c0f6e0fdb3fbfee36197c Mon Sep 17 00:00:00 2001
From: Ying Jin <yj4@rice.edu>
Date: Tue, 25 Oct 2022 21:36:56 -0500
Subject: [PATCH 3/3] update test

---
 .../metadata-schema/metadata-schema.component.spec.ts         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
index c4116dc9e0..d63b4ed84f 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
@@ -169,10 +169,10 @@ describe('MetadataSchemaComponent', () => {
   });
 
   it('should contain the correct fields', () => {
-    const editorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(1) td:nth-child(2)')).nativeElement;
+    const editorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(1) td:nth-child(3)')).nativeElement;
     expect(editorField.textContent).toBe('mock.contributor.editor');
 
-    const illustratorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(2) td:nth-child(2)')).nativeElement;
+    const illustratorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(2) td:nth-child(3)')).nativeElement;
     expect(illustratorField.textContent).toBe('mock.contributor.illustrator');
   });