hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-15 14:03:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into metadata-and-relationships-combined-in-submission

Browse Source
This commit is contained in:
Art Lowel
2020-04-01 14:06:06 +02:00
parent 2989ca4d96 6850a47d70
commit 987e2d98fd
283 changed files with 11336 additions and 3579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/core/cache/builders/remote-data-build.service.ts vendored
View File

@@ -96,14 +96,15 @@ export class RemoteDataBuildService {
const responsePending = hasValue(reqEntry) && hasValue(reqEntry.responsePending) ? reqEntry.responsePending : false;
let isSuccessful: boolean;
let error: RemoteDataError;
if (hasValue(reqEntry) && hasValue(reqEntry.response)) {
isSuccessful = reqEntry.response.statusCode === 204 ||
reqEntry.response.statusCode >= 200 && reqEntry.response.statusCode < 300 && hasValue(payload);
const errorMessage = isSuccessful === false ? (reqEntry.response as ErrorResponse).errorMessage : undefined;
const response = reqEntry ? reqEntry.response : undefined;
if (hasValue(response)) {
isSuccessful = response.statusCode === 204 ||
response.statusCode >= 200 && response.statusCode < 300 && hasValue(payload);
const errorMessage = isSuccessful === false ? (response as ErrorResponse).errorMessage : undefined;
if (hasValue(errorMessage)) {
error = new RemoteDataError(
(reqEntry.response as ErrorResponse).statusCode,
(reqEntry.response as ErrorResponse).statusText,
response.statusCode,
response.statusText,
errorMessage
);
}
@@ -113,7 +114,9 @@ export class RemoteDataBuildService {
responsePending,
isSuccessful,
error,
payload
payload,
hasValue(response) ? response.statusCode : undefined
);
})
);