From fbe6ec61de995c52843a1a695978456188865bc7 Mon Sep 17 00:00:00 2001
From: Raf Ponsaerts <raf.ponsaerts@atmire.com>
Date: Fri, 2 Oct 2020 16:38:19 +0200
Subject: [PATCH] [Task 72956] applied feedback to the delete eperson error
 message

---
 .../epeople-registry/epeople-registry.component.ts          | 5 +++--
 src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts       | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts
index e473b7484d..2f989490a7 100644
--- a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts
+++ b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts
@@ -16,7 +16,7 @@ import { EpersonDtoModel } from '../../../core/eperson/models/eperson-dto.model'
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators';
-import { RestResponse } from '../../../core/cache/response.models';
+import { ErrorResponse, RestResponse } from '../../../core/cache/response.models';
 import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { RequestService } from '../../../core/data/request.service';
@@ -219,7 +219,8 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
                 this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.deleted.success', { name: ePerson.name }));
                 this.reset();
               } else {
-                this.notificationsService.error('Error occured when trying to delete EPerson with id: ' + ePerson.id + ' with code: ' + restResponse.statusCode + ' and message: ' + restResponse.statusText);
+                const errorResponse = restResponse as ErrorResponse;
+                this.notificationsService.error('Error occured when trying to delete EPerson with id: ' + ePerson.id + ' with code: ' + errorResponse.statusCode + ' and message: ' + errorResponse.errorMessage);
               }
             })
           }}
diff --git a/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts b/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts
index 8cb730c358..5394b6d83f 100644
--- a/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts
+++ b/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts
@@ -5,7 +5,7 @@ import { HttpClient, HttpHeaders, HttpParams, HttpResponse } from '@angular/comm
 
 import { DSpaceRESTV2Response } from './dspace-rest-v2-response.model';
 import { RestRequestMethod } from '../data/rest-request-method';
-import { hasNoValue, isNotEmpty } from '../../shared/empty.util';
+import { hasNoValue, hasValue, isNotEmpty } from '../../shared/empty.util';
 import { DSpaceObject } from '../shared/dspace-object.model';
 
 export const DEFAULT_CONTENT_TYPE = 'application/json; charset=utf-8';
@@ -53,7 +53,7 @@ export class DSpaceRESTv2Service {
         return observableThrowError({
           statusCode: err.status,
           statusText: err.statusText,
-          message: err.message
+          message: (hasValue(err.error) && isNotEmpty(err.error.message)) ? err.error.message : err.message
         });
       }));
   }
@@ -116,7 +116,7 @@ export class DSpaceRESTv2Service {
         return observableThrowError({
           statusCode: err.status,
           statusText: err.statusText,
-          message: err.message
+          message: (hasValue(err.error) && isNotEmpty(err.error.message)) ? err.error.message : err.message
         });
       }));
   }