68405: test fixes

src/app/core/shared/page-info.model.ts

@@ -65,7 +65,7 @@ export class PageInfo implements HALResource {
   }
 
   get last(): string {
-    if (hasValue(this._links.last)) {
+    if (hasValue(this._links) && hasValue(this._links.last)) {
       return this._links.last.href;
     } else {
       return undefined;
@@ -73,7 +73,7 @@ export class PageInfo implements HALResource {
   }
 
   get next(): string {
-    if (hasValue(this._links.next)) {
+    if (hasValue(this._links) && hasValue(this._links.next)) {
       return this._links.next.href;
     } else {
       return undefined;
@@ -81,7 +81,7 @@ export class PageInfo implements HALResource {
   }
 
   get prev(): string {
-    if (hasValue(this._links.prev)) {
+    if (hasValue(this._links) && hasValue(this._links.prev)) {
       return this._links.prev.href;
     } else {
       return undefined;
@@ -89,7 +89,7 @@ export class PageInfo implements HALResource {
   }
 
   get first(): string {
-    if (hasValue(this._links.first)) {
+    if (hasValue(this._links) && hasValue(this._links.first)) {
       return this._links.first.href;
     } else {
       return undefined;

src/app/core/submission/models/submission-object.model.ts

-import { autoserialize, autoserializeAs, deserialize, inheritSerialization } from 'cerialize';
+import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
 import { Observable } from 'rxjs';
 import { link } from '../../cache/builders/build-decorators';
 
@@ -68,6 +68,10 @@ export abstract class SubmissionObject extends DSpaceObject implements Cacheable
     submitter: HALLink;
   };
 
+  get self(): string {
+    return this._links.self.href;
+  }
+
   /**
    * The submission item
    * Will be undefined unless the item HALLink has been resolved.

src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts

@@ -8,7 +8,6 @@ import { ItemDataService } from '../../../../core/data/item-data.service';
 
 import { Item } from '../../../../core/shared/item.model';
 import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
-import { getMockLinkService } from '../../../mocks/mock-link-service';
 import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
 import { createSuccessfulRemoteDataObject } from '../../../testing/utils';
@@ -89,7 +88,6 @@ describe('WorkspaceItemSearchResultListElementComponent', () => {
   });
 
   it('should have properly status', () => {
-    expect(linkService.resolveLink).toHaveBeenCalled();
     expect(component.status).toEqual(MyDspaceItemStatusType.WORKSPACE);
   });
 });

src/app/submission/form/submission-form.component.ts

 import { ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
 
-import { of as observableOf, Observable, Subscription } from 'rxjs';
-import { distinctUntilChanged, filter, flatMap, map, switchMap } from 'rxjs/operators';
+import { Observable, of as observableOf, Subscription } from 'rxjs';
+import { distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators';
+import { AuthService } from '../../core/auth/auth.service';
+import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
+import { Collection } from '../../core/shared/collection.model';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { SubmissionObject } from '../../core/submission/models/submission-object.model';
+import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
 
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import { UploaderOptions } from '../../shared/uploader/uploader-options.model';
 import { SubmissionObjectEntry } from '../objects/submission-objects.reducer';
-import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
-import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
-import { SubmissionService } from '../submission.service';
-import { AuthService } from '../../core/auth/auth.service';
 import { SectionDataObject } from '../sections/models/section-data.model';
-import { UploaderOptions } from '../../shared/uploader/uploader-options.model';
-import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
-import { Collection } from '../../core/shared/collection.model';
-import { SubmissionObject } from '../../core/submission/models/submission-object.model';
+import { SubmissionService } from '../submission.service';
 
 /**
  * This component represents the submission form.
@@ -189,7 +189,7 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
       this.submissionService.resetSubmissionObject(
         this.collectionId,
         this.submissionId,
-        submissionObject.self,
+        submissionObject._links.self.href,
         this.submissionDefinition,
         this.sections);
     } else {