Skip to content

Commit 7f8e0a1

Browse files
committed
[DURACOM-282] fix issue with submission edit page when providing a not existing workspaceitem
1 parent 4069cf8 commit 7f8e0a1

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

src/app/core/submission/submission-parent-breadcrumb.service.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ import {
88

99
import { getDSORoute } from '../../app-routing-paths';
1010
import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
11-
import { hasValue } from '../../shared/empty.util';
11+
import {
12+
hasValue,
13+
isEmpty,
14+
} from '../../shared/empty.util';
1215
import { SubmissionService } from '../../submission/submission.service';
1316
import { BreadcrumbsProviderService } from '../breadcrumbs/breadcrumbsProviderService';
1417
import { DSOBreadcrumbsService } from '../breadcrumbs/dso-breadcrumbs.service';
@@ -46,6 +49,10 @@ export class SubmissionParentBreadcrumbsService implements BreadcrumbsProviderSe
4649
* @param submissionObject The {@link SubmissionObject} for which the parent breadcrumb structure needs to be created
4750
*/
4851
getBreadcrumbs(submissionObject: SubmissionObject): Observable<Breadcrumb[]> {
52+
if (isEmpty(submissionObject)) {
53+
return observableOf([]);
54+
}
55+
4956
return combineLatest([
5057
(submissionObject.collection as Observable<RemoteData<Collection>>).pipe(
5158
getFirstCompletedRemoteData(),

src/app/core/submission/submission-rest.service.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
isNotEmpty,
1414
} from '../../shared/empty.util';
1515
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
16+
import { ErrorResponse } from '../cache/response.models';
1617
import { RemoteData } from '../data/remote-data';
1718
import {
1819
DeleteRequest,
@@ -23,6 +24,7 @@ import {
2324
SubmissionRequest,
2425
} from '../data/request.models';
2526
import { RequestService } from '../data/request.service';
27+
import { RequestError } from '../data/request-error.model';
2628
import { RestRequest } from '../data/rest-request.model';
2729
import { HttpOptions } from '../dspace-rest/dspace-rest.service';
2830
import { HALEndpointService } from '../shared/hal-endpoint.service';
@@ -57,7 +59,7 @@ export class SubmissionRestService {
5759
getFirstCompletedRemoteData(),
5860
map((response: RemoteData<SubmissionResponse>) => {
5961
if (response.hasFailed) {
60-
throw new Error(response.errorMessage);
62+
throw new ErrorResponse({ statusText: response.errorMessage, statusCode: response.statusCode } as RequestError);
6163
} else {
6264
return hasValue(response.payload) ? response.payload.dataDefinition : response.payload;
6365
}

0 commit comments

Comments
 (0)