From 21e78e33e525b95a6ea64040f5b9636abadbf87c Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4Science.it>
Date: Tue, 14 Sep 2021 10:20:29 +0200
Subject: [PATCH] [CST-5065] Admin is unable to reset other user password
 (cherry pick from DSC-215)

---
 .../eperson-form/eperson-form.component.html               | 4 ++++
 .../eperson-form/eperson-form.component.ts                 | 7 ++++++-
 2 files changed, 10 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 45326c1abc..5d80f24990 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
@@ -36,9 +36,13 @@
   </button>
 </ds-form>
 
+<ds-loading [showMessage]="false" *ngIf="!formGroup"></ds-loading>
+
 <div *ngIf="epersonService.getActiveEPerson() | async">
   <h5>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h5>
 
+  <ds-loading [showMessage]="false" *ngIf="!(groups | async)"></ds-loading>
+  
   <ds-pagination
     *ngIf="(groups | async)?.payload?.totalElements > 0"
     [paginationOptions]="config"
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 723939df77..8e248a17d8 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
@@ -121,7 +121,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * Observable whether or not the admin is allowed to reset the EPerson's password
    * TODO: Initialize the observable once the REST API supports this (currently hardcoded to return false)
    */
-  canReset$: Observable<boolean> = observableOf(false);
+  canReset$: Observable<boolean>;
 
   /**
    * Observable whether or not the admin is allowed to delete the EPerson
@@ -310,6 +310,11 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
       this.canDelete$ = activeEPerson$.pipe(
         switchMap((eperson) => this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(eperson) ? eperson.self : undefined))
       );
+      this.canReset$ = activeEPerson$.pipe(
+        switchMap((eperson) => {
+          return observableOf(true);
+        })
+      );
     });
   }