Merge branch 'master' into submission-miscellaneous-fixes

src/app/submission/submission.service.ts

@@ -3,7 +3,15 @@ import { HttpHeaders } from '@angular/common/http';
 import { Router } from '@angular/router';
 
 import { Observable, of as observableOf, Subscription, timer as observableTimer } from 'rxjs';
-import { catchError, distinctUntilChanged, filter, find, first, map, startWith } from 'rxjs/operators';
+import {
+  catchError,
+  distinctUntilChanged,
+  filter,
+  find,
+  first,
+  map,
+  startWith
+} from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
 
@@ -43,6 +51,11 @@ import { WorkspaceitemSectionsObject } from '../core/submission/models/workspace
 import { RemoteData } from '../core/data/remote-data';
 import { ErrorResponse } from '../core/cache/response.models';
 import { RemoteDataError } from '../core/data/remote-data-error';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../shared/testing/utils';
 
 /**
  * A service that provides methods used in submission process.
@@ -499,20 +512,12 @@ export class SubmissionService {
   retrieveSubmission(submissionId): Observable<RemoteData<SubmissionObject>> {
     return this.restService.getDataById(this.getSubmissionObjectLinkName(), submissionId).pipe(
       find((submissionObjects: SubmissionObject[]) => isNotUndefined(submissionObjects)),
-      map((submissionObjects: SubmissionObject[]) => new RemoteData(
-        false,
-        false,
-        true,
-        null,
+      map((submissionObjects: SubmissionObject[]) => createSuccessfulRemoteDataObject(
         submissionObjects[0])),
       catchError((errorResponse: ErrorResponse) => {
-        return observableOf(new RemoteData(
-          false,
-          false,
-          false,
-          new RemoteDataError(errorResponse.statusCode, errorResponse.statusText, errorResponse.errorMessage),
-          null
-        ))
+        return createFailedRemoteDataObject$(null,
+          new RemoteDataError(errorResponse.statusCode, errorResponse.statusText, errorResponse.errorMessage)
+        )
       })
     );
   }