[DURACOM-282] fix issue with submission edit page when providing a not existing workspaceitem

This commit is contained in:
Giuseppe Digilio
2024-06-19 15:53:47 +02:00
parent 4069cf8168
commit 7f8e0a1d1c
2 changed files with 11 additions and 2 deletions

View File

@@ -8,7 +8,10 @@ import {
import { getDSORoute } from '../../app-routing-paths';
import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
import { hasValue } from '../../shared/empty.util';
import {
hasValue,
isEmpty,
} from '../../shared/empty.util';
import { SubmissionService } from '../../submission/submission.service';
import { BreadcrumbsProviderService } from '../breadcrumbs/breadcrumbsProviderService';
import { DSOBreadcrumbsService } from '../breadcrumbs/dso-breadcrumbs.service';
@@ -46,6 +49,10 @@ export class SubmissionParentBreadcrumbsService implements BreadcrumbsProviderSe
* @param submissionObject The {@link SubmissionObject} for which the parent breadcrumb structure needs to be created
*/
getBreadcrumbs(submissionObject: SubmissionObject): Observable<Breadcrumb[]> {
if (isEmpty(submissionObject)) {
return observableOf([]);
}
return combineLatest([
(submissionObject.collection as Observable<RemoteData<Collection>>).pipe(
getFirstCompletedRemoteData(),

View File

@@ -13,6 +13,7 @@ import {
isNotEmpty,
} from '../../shared/empty.util';
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
import { ErrorResponse } from '../cache/response.models';
import { RemoteData } from '../data/remote-data';
import {
DeleteRequest,
@@ -23,6 +24,7 @@ import {
SubmissionRequest,
} from '../data/request.models';
import { RequestService } from '../data/request.service';
import { RequestError } from '../data/request-error.model';
import { RestRequest } from '../data/rest-request.model';
import { HttpOptions } from '../dspace-rest/dspace-rest.service';
import { HALEndpointService } from '../shared/hal-endpoint.service';
@@ -57,7 +59,7 @@ export class SubmissionRestService {
getFirstCompletedRemoteData(),
map((response: RemoteData<SubmissionResponse>) => {
if (response.hasFailed) {
throw new Error(response.errorMessage);
throw new ErrorResponse({ statusText: response.errorMessage, statusCode: response.statusCode } as RequestError);
} else {
return hasValue(response.payload) ? response.payload.dataDefinition : response.payload;
}