[UXP-147] add section errors visualization, minor refactor, add labels

Author: FrancescoMolinaro

src/app/submission/objects/submission-objects.actions.ts

@@ -9,7 +9,7 @@ import {
   WorkspaceitemSectionDataType,
   WorkspaceitemSectionsObject
 } from '../../core/submission/models/workspaceitem-sections.model';
-import { SubmissionObject } from '../../core/submission/models/submission-object.model';
+import { SubmissionObject, SubmissionObjectError } from '../../core/submission/models/submission-object.model';
 import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
 import { SectionsType } from '../sections/sections-type';
 import { Item } from '../../core/shared/item.model';
@@ -1088,18 +1088,19 @@ export class ExecuteExternalUploadErrorAction implements Action {
   type = SubmissionObjectActionTypes.EXECUTE_EXTERNAL_UPLOAD_ERROR;
   payload: {
     submissionId: string;
+    errors: SubmissionObjectError[]
   };
 
   /**
    * Create a new ExecuteExternalUploadActionError
    *
    * @param submissionId
    *    the submission's ID
-   * @param sectionId
+   * @param errors
    *    the section's ID
    */
-  constructor(submissionId: string) {
-    this.payload = { submissionId };
+  constructor(submissionId: string, errors: SubmissionObjectError[]) {
+    this.payload = { submissionId, errors };
   }
 }
 

src/app/submission/objects/submission-objects.effects.ts

@@ -68,6 +68,8 @@ import { NotificationOptions } from '../../shared/notifications/models/notificat
 import {
   WorkspaceitemSectionDetectDuplicateObject
 } from '../../core/submission/models/workspaceitem-section-deduplication.model';
+import { Simulate } from 'react-dom/test-utils';
+import error = Simulate.error;
 
 @Injectable()
 export class SubmissionObjectEffects {
@@ -308,7 +310,7 @@ export class SubmissionObjectEffects {
     switchMap(([action, state]: [DepositSubmissionAction, any]) => {
       return this.submissionService.depositSubmission(state.submission.objects[action.payload.submissionId].selfUrl).pipe(
         map(() => new DepositSubmissionSuccessAction(action.payload.submissionId)),
-        catchError((error) => observableOf(new DepositSubmissionErrorAction(action.payload.submissionId))));
+        catchError(() => observableOf(new DepositSubmissionErrorAction(action.payload.submissionId))));
     })));
 
   /**
@@ -397,12 +399,25 @@ export class SubmissionObjectEffects {
         action.payload.submissionId,
         'sections',
         action.payload.sectionId).pipe(
-        map((response: SubmissionObject[]) => new ExecuteExternalUploadSuccessAction(
-          action.payload.submissionId,
-          action.payload.sectionId,
-          response
-        )),
-        catchError(() => observableOf(new ExecuteExternalUploadErrorAction(action.payload.submissionId))));
+          map((response: SubmissionObject[]) => {
+            const errors = [].concat.apply([], response.map(sub => sub.errors));
+            const sectionErrors = errors.filter((errorObject: SubmissionObjectError) => errorObject.paths.length > 0)
+              .filter(err => err.paths.includes('/sections/' + action.payload.sectionId));
+
+            if (sectionErrors.length > 0) {
+              return new ExecuteExternalUploadErrorAction(action.payload.submissionId, sectionErrors);
+            } else {
+              return new ExecuteExternalUploadSuccessAction(
+                action.payload.submissionId,
+                action.payload.sectionId,
+                response
+              );
+            }
+          }),
+          catchError((rd: RemoteData<any>) => observableFrom(
+            this.parseErrorResponse(false, rd.errors, action.payload.submissionId, rd.statusCode, rd.errorMessage)
+          ))
+      );
     }))
   );
 
@@ -415,6 +430,15 @@ export class SubmissionObjectEffects {
     { dispatch: false }
   );
 
+  /**
+   * Show external update errors
+   */
+  executeExternalUploadError$ = createEffect(() => this.actions$.pipe(
+      ofType(SubmissionObjectActionTypes.EXECUTE_EXTERNAL_UPLOAD_ERROR),
+      tap(() => this.notificationsService.error(null, this.translate.get('submission.sections.external-upload.upload-error-notice')))),
+    { dispatch: false }
+  );
+
   /**
    * Show a notification on success and redirect to MyDSpace page
    */
@@ -635,11 +659,11 @@ function filterErrors(sectionForm: FormState, sectionErrors: SubmissionSectionEr
     return [];
   }
   const filteredErrors = [];
-  sectionErrors.forEach((error: SubmissionSectionError) => {
+  sectionErrors.forEach((err: SubmissionSectionError) => {
     const errorPaths: SectionErrorPath[] = parseSectionErrorPaths(error.path);
     errorPaths.forEach((path: SectionErrorPath) => {
       if (path.fieldId && sectionForm.touched[path.fieldId]) {
-        filteredErrors.push(error);
+        filteredErrors.push(err);
       }
     });
   });

src/app/submission/objects/submission-objects.reducer.spec.ts

@@ -88,6 +88,7 @@ describe('submissionReducer test suite', () => {
         savePending: false,
         saveDecisionPending: false,
         externalUploadPending: false,
+        externalUploadErrors: [],
         depositPending: false,
         metadataSecurityConfiguration: metadataSecurityConfiguration as any,
       }

src/app/submission/objects/submission-objects.reducer.ts

@@ -55,6 +55,7 @@ import {
 } from '../../core/submission/models/workspaceitem-section-deduplication.model';
 import { SubmissionSectionObject } from './submission-section-object.model';
 import { MetadataSecurityConfiguration } from '../../core/submission/models/metadata-security-configuration';
+import { SubmissionObjectError } from '../../core/submission/models/submission-object.model';
 
 /**
  * An interface to represent SubmissionSectionObject entry
@@ -112,6 +113,10 @@ export interface SubmissionObjectEntry {
    */
   externalUploadPending?: boolean;
 
+  /**
+   * Errors from external upload
+   */
+  externalUploadErrors?: SubmissionObjectError[];
   /**
    * A boolean representing if a submission deposit operation is pending
    */
@@ -411,6 +416,7 @@ function initSubmission(state: SubmissionObjectState, action: InitSubmissionForm
     savePending: false,
     saveDecisionPending: false,
     externalUploadPending: false,
+    externalUploadErrors: [],
     depositPending: false,
     metadataSecurityConfiguration: action.payload.metadataSecurityConfiguration,
     isDiscarding: false
@@ -1110,6 +1116,7 @@ function startExternalUploadExecution(state: SubmissionObjectState, action: Exec
     return Object.assign({}, state, {
       [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
         externalUploadPending: true,
+        externalUploadErrors: [],
       })
     });
   } else {
@@ -1132,6 +1139,7 @@ function endExternalUploadExecution(state: SubmissionObjectState, action: Execut
     return Object.assign({}, state, {
       [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
         externalUploadPending: false,
+        externalUploadErrors: action.payload.errors
       })
     });
   } else {

src/app/submission/sections/external-upload/section-external-upload.component.html

@@ -11,6 +11,11 @@
         <label for="externalUploadSource">{{'submission.sections.external-upload.source' | translate}}</label>
         <input [(ngModel)]="source" class="form-control w-100" id="externalUploadSource" [placeholder]="'submission.sections.external-upload.placeholder' | translate" />
       </div>
+      <div class="d-flex flex-column" *ngIf="(errors$ | async).length > 0">
+          <div class="text-danger mt-1" *ngFor="let error of (errors$ | async)">
+            {{error.message | translate}}
+          </div>
+      </div>
       <div class="w-100 d-flex justify-content-center">
         <button [disabled]="!source" (click)="submitUpload()" class="btn btn-success mt-4">{{'submission.sections.external-upload.import' | translate}}</button>
       </div>

src/app/submission/sections/external-upload/section-external-upload.component.ts

@@ -27,6 +27,8 @@ export class SectionExternalUploadComponent extends SectionModelComponent implem
 
   public loading$ = this.submissionService.getExternalUplodaProcessingStatus(this.injectedSubmissionId);
 
+  public errors$ = this.submissionService.getExternalUplodaErorrs(this.injectedSubmissionId);
+
   public AlertType = AlertType;
 
   /**
@@ -90,7 +92,6 @@ export class SectionExternalUploadComponent extends SectionModelComponent implem
       .subscribe(() => {
         this.operationsBuilder.add(this.pathCombiner.getPath(this.patchOperationPath), this.source, false, true);
         this.externalUploadService.executeExternalUpload(this.submissionId, this.injectedSectionData.id);
-        this.source = '';
       });
   }
 }

src/app/submission/submission.service.ts

@@ -30,7 +30,7 @@ import { HttpOptions } from '../core/dspace-rest/dspace-rest.service';
 import { SubmissionRestService } from '../core/submission/submission-rest.service';
 import { SectionDataObject } from './sections/models/section-data.model';
 import { SubmissionScopeType } from '../core/submission/submission-scope-type';
-import { SubmissionObject } from '../core/submission/models/submission-object.model';
+import { SubmissionObject, SubmissionObjectError } from '../core/submission/models/submission-object.model';
 import { RouteService } from '../core/services/route.service';
 import { SectionsType } from './sections/sections-type';
 import { NotificationsService } from '../shared/notifications/notifications.service';
@@ -554,6 +554,21 @@ export class SubmissionService {
       startWith(false));
   }
 
+  /**
+   * Return the external upload status of the submission
+   *
+   * @param submissionId
+   *    The submission id
+   * @return Observable<boolean>
+   *    observable with submission save-decision status
+   */
+  getExternalUplodaErorrs(submissionId: string): Observable<SubmissionObjectError[]> {
+    return this.getSubmissionObject(submissionId).pipe(
+      map((state: SubmissionObjectEntry) => state.externalUploadErrors),
+      distinctUntilChanged(),
+      startWith([]));
+  }
+
   /**
    * Return whether submission unsaved modification are present
    *