From 10db166bbe510af27cb20cc0f028537af0df9c41 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 19 Oct 2017 10:22:07 +0200 Subject: Upgrade client dependencies and fix error logs --- .../src/app/shared/rest/rest-extractor.service.ts | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'client/src/app') diff --git a/client/src/app/shared/rest/rest-extractor.service.ts b/client/src/app/shared/rest/rest-extractor.service.ts index b560e2fe4..59dea7880 100644 --- a/client/src/app/shared/rest/rest-extractor.service.ts +++ b/client/src/app/shared/rest/rest-extractor.service.ts @@ -46,15 +46,18 @@ export class RestExtractor { console.error('An error occurred:', errorMessage) } else if (err.status !== undefined) { // A server-side error occurred. - // TODO: remove when angular/angular#19477 (comment) is fixed - let body = JSON.parse(err.error) - if (body) { - if (body.errors) { - const errors = body.errors - const error = errors[Object.keys(errors)[0]] - errorMessage = error.msg // Take the message of the first error - } else if (body.error) { - errorMessage = body.error + if (err.error) { + if (err.error.errors) { + const errors = err.error.errors + const errorsArray: string[] = [] + + Object.keys(errors).forEach(key => { + errorsArray.push(errors[key].msg) + }) + + errorMessage = errorsArray.join('. ') + } else if (err.error.error) { + errorMessage = err.error.error } } errorMessage = errorMessage ? errorMessage : 'Unknown error.' -- cgit v1.2.3