File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -11,7 +11,10 @@ import { DSOBreadcrumbsService } from '../breadcrumbs/dso-breadcrumbs.service';
1111import { getDSORoute } from '../../app-routing-paths' ;
1212import { SubmissionService } from '../../submission/submission.service' ;
1313import { CollectionDataService } from '../data/collection-data.service' ;
14- import { hasValue } from '../../shared/empty.util' ;
14+ import {
15+ hasValue ,
16+ isEmpty ,
17+ } from '../../shared/empty.util' ;
1518
1619/**
1720 * Service to calculate the parent {@link DSpaceObject} breadcrumbs for a {@link SubmissionObject}
@@ -35,6 +38,10 @@ export class SubmissionParentBreadcrumbsService implements BreadcrumbsProviderSe
3538 * @param submissionObject The {@link SubmissionObject} for which the parent breadcrumb structure needs to be created
3639 */
3740 getBreadcrumbs ( submissionObject : SubmissionObject ) : Observable < Breadcrumb [ ] > {
41+ if ( isEmpty ( submissionObject ) ) {
42+ return observableOf ( [ ] ) ;
43+ }
44+
3845 return combineLatest ( [
3946 ( submissionObject . collection as Observable < RemoteData < Collection > > ) . pipe (
4047 getFirstCompletedRemoteData ( ) ,
Original file line number Diff line number Diff line change @@ -19,8 +19,10 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
1919import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service' ;
2020import { getFirstCompletedRemoteData } from '../shared/operators' ;
2121import { URLCombiner } from '../url-combiner/url-combiner' ;
22+ import { ErrorResponse } from '../cache/response.models' ;
2223import { RemoteData } from '../data/remote-data' ;
2324import { SubmissionResponse } from './submission-response.model' ;
25+ import { RequestError } from '../data/request-error.model' ;
2426import { RestRequest } from '../data/rest-request.model' ;
2527
2628/**
@@ -49,7 +51,7 @@ export class SubmissionRestService {
4951 getFirstCompletedRemoteData ( ) ,
5052 map ( ( response : RemoteData < SubmissionResponse > ) => {
5153 if ( response . hasFailed ) {
52- throw new Error ( response . errorMessage ) ;
54+ throw new ErrorResponse ( { statusText : response . errorMessage , statusCode : response . statusCode } as RequestError ) ;
5355 } else {
5456 return hasValue ( response . payload ) ? response . payload . dataDefinition : response . payload ;
5557 }
You can’t perform that action at this time.
0 commit comments