From 0090088cb3d038b36e3fdf79f4731fa03c731c9c Mon Sep 17 00:00:00 2001
From: Aman Budgujar <amanbudgujar@gmail.com>
Date: Thu, 2 Mar 2023 18:20:14 +0530
Subject: [PATCH] Changes associated with #2026

While creating a new EPerson -
* Reset password button is not displayed.
* Submit button label changed from 'Save' to 'Create'.
---
 .../eperson-form/eperson-form.component.html         |  3 ++-
 .../eperson-form/eperson-form.component.ts           | 12 ++++++++++++
 .../eperson-group-list.component.html                |  7 +++++++
 src/assets/i18n/en.json5                             | 10 ++++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
index e9cc48aee3..7386177ea0 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -13,12 +13,13 @@
          [formGroup]="formGroup"
          [formLayout]="formLayout"
          [displayCancel]="false"
+         [submitLabel]="submitLabel"
          (submitForm)="onSubmit()">
   <div before class="btn-group">
     <button (click)="onCancel()"
             class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
   </div>
-  <div between class="btn-group">
+  <div *ngIf="displayResetPassword" between class="btn-group">
     <button class="btn btn-primary" [disabled]="!(canReset$ | async)" (click)="resetPassword()">
       <i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}}
     </button>
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
index c5c9f8f954..6c2a850846 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -164,6 +164,16 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * Whether or not this EPerson is currently being impersonated
    */
   isImpersonated = false;
+  
+  /**
+   * A boolean that indicate if to display EPersonForm's Rest password button
+   */
+  displayResetPassword = false;
+  
+  /**
+   * A string that indicate the label of Submit button
+   */
+  submitLabel = 'form.create';
 
   /**
    * Subscription to email field value change
@@ -188,6 +198,8 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
       this.epersonInitial = eperson;
       if (hasValue(eperson)) {
         this.isImpersonated = this.authService.isImpersonatingUser(eperson.id);
+        this.displayResetPassword = true;
+        this.submitLabel = 'form.submit';
       }
     }));
   }
diff --git a/src/app/shared/eperson-group-list/eperson-group-list.component.html b/src/app/shared/eperson-group-list/eperson-group-list.component.html
index 6ee5aad943..e5bed22480 100644
--- a/src/app/shared/eperson-group-list/eperson-group-list.component.html
+++ b/src/app/shared/eperson-group-list/eperson-group-list.component.html
@@ -14,6 +14,8 @@
         <tr class="text-center">
           <th>{{'resource-policies.form.eperson-group-list.table.headers.id' | translate}}</th>
           <th>{{'resource-policies.form.eperson-group-list.table.headers.name' | translate}}</th>
+          <th *ngIf="isListOfEPerson">{{'resource-policies.form.eperson-group-list.table.headers.identity' | translate}}</th>
+          <th *ngIf="!isListOfEPerson">{{'resource-policies.form.eperson-group-list.table.headers.collcomm' | translate}}</th>
           <th>{{'resource-policies.form.eperson-group-list.table.headers.action' | translate}}</th>
         </tr>
         </thead>
@@ -22,6 +24,11 @@
             [class.table-primary]="isSelected(entry) | async">
           <td>{{entry.id}}</td>
           <td>{{dsoNameService.getName(entry)}}</td>
+          <td *ngIf="isListOfEPerson">
+            {{'resource-policies.form.eperson-group-list.cell.email' | translate}} {{entry.email}}<br/>
+            {{'resource-policies.form.eperson-group-list.cell.netid' | translate}} {{entry.netid}}
+          </td>
+          <td *ngIf="!isListOfEPerson">{{(entry.object | async)?.payload?.name}}</td>
           <td class="text-center">
             <button class="btn btn-sm btn-outline-primary" (click)="emitSelect(entry)">
               {{'resource-policies.form.eperson-group-list.select.btn' | translate}}
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index a8fc1b1177..26e7a680f2 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1751,6 +1751,8 @@
 
   "form.submit": "Save",
 
+  "form.create": "Create",
+
   "form.repeatable.sort.tip": "Drop the item in the new position",
 
 
@@ -3659,6 +3661,10 @@
 
   "resource-policies.form.eperson-group-list.table.headers.name": "Name",
 
+  "resource-policies.form.eperson-group-list.table.headers.collcomm": "Collection/Community",
+
+  "resource-policies.form.eperson-group-list.table.headers.identity": "Identity",
+
   "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
 
   "resource-policies.form.eperson-group-list.modal.text1.toGroup": "It is not possible to replace an ePerson with a group.",
@@ -3669,6 +3675,10 @@
 
   "resource-policies.form.eperson-group-list.modal.close": "Ok",
 
+  "resource-policies.form.eperson-group-list.cell.email": "Email: ",
+
+  "resource-policies.form.eperson-group-list.cell.netid": "NetID: ",
+
   "resource-policies.form.date.end.label": "End Date",
 
   "resource-policies.form.date.start.label": "Start Date",