[DURACOM-453] port error parsing in edit mode

Author: FrancescoMolinaro

src/app/core/cache/builders/remote-data-build.service.ts

@@ -339,6 +339,7 @@ export class RemoteDataBuildService {
           response.errorMessage,
           payload,
           response.statusCode,
+          response.errors,
         );
       }),
     );

src/app/core/json-patch/json-patch-operations.service.ts

@@ -112,7 +112,7 @@ export abstract class JsonPatchOperationsService<ResponseDefinitionDomain, Patch
             map((rd: RemoteData<any>) => {
               if (rd.hasFailed) {
                 this.store.dispatch(new RollbacktPatchOperationsAction(resourceType, resourceId));
-                throw new Error(rd.errorMessage);
+                throw rd as unknown as Error;
               } else if (hasValue(rd.payload) && isNotEmpty(rd.payload.dataDefinition)) {
                 this.store.dispatch(new CommitPatchOperationsAction(resourceType, resourceId));
                 return rd.payload.dataDefinition;

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

@@ -1,3 +1,4 @@
+import { PathableObjectError } from '@dspace/core/data/response-state.model';
 import {
   autoserialize,
   deserialize,
@@ -22,10 +23,7 @@ import { SUPERVISION_ORDER } from '../../supervision-order/models/supervision-or
 import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { WorkspaceitemSectionsObject } from './workspaceitem-sections.model';
 
-export interface SubmissionObjectError {
-  message: string;
-  paths: string[];
-}
+export type SubmissionObjectError = PathableObjectError;
 
 /**
  * An abstract model class for a SubmissionObject.

src/app/core/submission/submission-response-parsing.service.ts

@@ -63,6 +63,7 @@ export function normalizeSectionData(obj: any, objIndex?: number) {
         obj.place || objIndex,
         obj.confidence,
         obj.otherInformation,
+        obj.source,
       );
     } else if (Array.isArray(obj)) {
       result = [];

src/app/submission/edit/submission-edit-can-deactivate.service.ts

@@ -1,8 +1,4 @@
 import { Injectable } from '@angular/core';
-import {
-  ActivatedRoute,
-  Router,
-} from '@angular/router';
 import {
   combineLatest,
   Observable,
@@ -21,8 +17,6 @@ interface PendingChangesGuardComponentInterface {
 export class SubmissionEditCanDeactivateService implements PendingChangesGuardComponentInterface {
 
   constructor(
-    private route: ActivatedRoute,
-    private router: Router,
     private submissionService: SubmissionService,
   ) { }
 

src/app/submission/form/collection/submission-form-collection.component.html

@@ -34,6 +34,7 @@
         id="collectionControlsDropdownMenu"
         aria-labelledby="collectionControlsMenuButton">
         <ds-collection-dropdown
+          [entityType]="entityType"
           (selectionChange)="onSelect($event)">
         </ds-collection-dropdown>
       </div>

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

@@ -80,6 +80,12 @@ export class SubmissionFormCollectionComponent implements OnDestroy, OnChanges,
    */
   @Input() collectionModifiable: boolean | null = null;
 
+  /**
+   * The entity type input used to create a new submission
+   * @type {string}
+   */
+  @Input() entityType: string;
+
   /**
    * The submission id
    * @type {string}

src/app/submission/form/footer/submission-form-footer.component.html

@@ -14,6 +14,11 @@
       }
     </div>
     <div class="text-end d-flex justify-content-end align-items-center flex-sm-row flex-column">
+      @if ((hasUnsavedModification | async) !== true && (processingSaveStatus | async) !== true && (processingDepositStatus | async) !== true && (submissionIsInvalid | async)) {
+        <span>
+          <i class="fas fa-warning"></i> {{'submission.general.info.invalid' | translate}}
+        </span>
+      }
       @if ((hasUnsavedModification | async) !== true && (processingSaveStatus | async) !== true && (processingDepositStatus | async) !== true) {
         <span>
           <i class="fas fa-check-circle"></i> {{'submission.general.info.saved' | translate}}
@@ -51,9 +56,9 @@
           class="btn"
           id="saveForLater"
           [attr.data-test]="'save-for-later' | dsBrowserOnly"
-          [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+          [dsBtnDisabled]="((showDepositAndDiscard | async) !== true && (submissionIsInvalid | async)) || (processingSaveStatus | async) || (processingDepositStatus | async)"
           (click)="saveLater($event)">
-          <span><i class="fas fa-save"></i> {{'submission.general.save-later' | translate}}</span>
+        <span><i class="fas fa-save"></i> {{saveForLaterLabel() | translate}}</span>
         </button>
         @if ((showDepositAndDiscard | async)) {
           <button

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

@@ -132,4 +132,15 @@ export class SubmissionFormFooterComponent implements OnChanges {
       },
     );
   }
+
+  /**
+   * Compute the proper label for the save for later button
+   */
+  public saveForLaterLabel(): string {
+    if (this.submissionService.getSubmissionScope() === SubmissionScopeType.EditItem) {
+      return 'submission.general.save-later.edit-item';
+    }
+    return 'submission.general.save-later';
+  }
+
 }

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

@@ -14,6 +14,7 @@
           <ds-submission-form-collection
             [currentCollectionId]="collectionId"
             [currentDefinition]="definitionId"
+            [entityType]="entityType"
             [submissionId]="submissionId"
             [collectionModifiable]="collectionModifiable"
             [isReadonly]="isSectionReadonly"