[UXP-147] Add test for refactoring external upload

Author: atarix83

src/app/shared/mocks/submission.mock.ts

@@ -3079,6 +3079,21 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         isValid: false,
         removePending: false
       } as any,
+      'external-upload': {
+        header: 'submit.progressbar.external-upload',
+        config: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/external-upload',
+        mandatory: true,
+        sectionType: 'external-upload',
+        collapsed: false,
+        enabled: true,
+        data: {
+          files: []
+        },
+        errorsToShow: [],
+        isLoading: false,
+        isValid: false,
+        removePending: false
+      } as any,
       'upload': {
         header: 'submit.progressbar.upload',
         config: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload',
@@ -3117,7 +3132,6 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
     savePending: false,
     depositPending: false,
     externalUploadPending: false,
-    externalUploadErrors: []
   }
 });
 

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

@@ -9,7 +9,7 @@ import {
   WorkspaceitemSectionDataType,
   WorkspaceitemSectionsObject
 } from '../../core/submission/models/workspaceitem-sections.model';
-import { SubmissionObject, SubmissionObjectError } from '../../core/submission/models/submission-object.model';
+import { SubmissionObject } 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';
@@ -1067,7 +1067,6 @@ export class ExecuteExternalUploadSuccessAction implements Action {
   payload: {
     submissionId: string;
     sectionId: string;
-    sectionsObject: WorkspaceitemSectionsObject;
   };
 
   /**
@@ -1076,11 +1075,9 @@ export class ExecuteExternalUploadSuccessAction implements Action {
    * @param submissionId
    *    the submission's ID
    * @param sectionId
-   *    the section's ID
-   * @param sectionsObject
    */
-  constructor(submissionId: string, sectionId: string, sectionsObject: WorkspaceitemSectionsObject) {
-    this.payload = { submissionId, sectionId, sectionsObject };
+  constructor(submissionId: string, sectionId: string) {
+    this.payload = { submissionId, sectionId };
   }
 }
 
@@ -1089,7 +1086,7 @@ export class ExecuteExternalUploadErrorAction implements Action {
   payload: {
     submissionId: string;
     sectionId: string;
-    errors: SubmissionObjectError[]
+    errors: SubmissionSectionError[]
   };
 
   /**
@@ -1102,7 +1099,7 @@ export class ExecuteExternalUploadErrorAction implements Action {
    * @param errors
    *    the section's ID
    */
-  constructor(submissionId: string,  sectionId: string, errors: SubmissionObjectError[]) {
+  constructor(submissionId: string,  sectionId: string, errors: SubmissionSectionError[]) {
     this.payload = { submissionId, sectionId, errors };
   }
 }

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

@@ -413,7 +413,6 @@ export class SubmissionObjectEffects {
               actions.push(new ExecuteExternalUploadSuccessAction(
                 action.payload.submissionId,
                 action.payload.sectionId,
-                null
               ));
               return actions;
             }

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

@@ -14,6 +14,9 @@ import {
   DiscardSubmissionSuccessAction,
   EditFileDataAction,
   EnableSectionAction,
+  ExecuteExternalUploadAction,
+  ExecuteExternalUploadErrorAction,
+  ExecuteExternalUploadSuccessAction,
   InertSectionErrorsAction,
   InitSectionAction,
   InitSubmissionFormAction,
@@ -88,7 +91,6 @@ describe('submissionReducer test suite', () => {
         savePending: false,
         saveDecisionPending: false,
         externalUploadPending: false,
-        externalUploadErrors: [],
         depositPending: false,
         metadataSecurityConfiguration: metadataSecurityConfiguration as any,
       }
@@ -125,7 +127,6 @@ describe('submissionReducer test suite', () => {
         savePending: false,
         depositPending: false,
         externalUploadPending: false,
-        externalUploadErrors: []
       }
     };
 
@@ -752,4 +753,48 @@ describe('submissionReducer test suite', () => {
     expect(newState[826].saveDecisionPending).toBeFalsy();
   });
 
+  it('should set the externalUploadPending to true', () => {
+    const action: any = new ExecuteExternalUploadAction(submissionId, 'external-upload');
+    let newState;
+
+    newState = submissionObjectReducer(initState, action);
+
+    expect(newState[826].externalUploadPending).toBeTrue();
+  });
+
+  it('should set the errors fo the external Upload section', () => {
+    const errors = [{
+      path: '/sections/external-upload',
+      message: 'error.validation.notfound'
+    }];
+    const action: any = new ExecuteExternalUploadErrorAction(submissionId, 'external-upload', errors);
+
+    const newState = submissionObjectReducer(initState, action);
+
+    expect(newState[826].externalUploadPending).toBeFalse();
+    expect(newState[826].sections['external-upload'].errorsToShow).toEqual(errors);
+    expect(newState[826].sections['external-upload'].serverValidationErrors).toEqual(errors);
+  });
+
+  it('should clean the errors fo the external Upload section', () => {
+    const errors = [{
+      path: '/sections/external-upload',
+      message: 'error.validation.notfound'
+    }];
+    let action: any = new ExecuteExternalUploadErrorAction(submissionId, 'external-upload', errors);
+    let newState = submissionObjectReducer(initState, action);
+
+    expect(newState[826].externalUploadPending).toBeFalse();
+    expect(newState[826].sections['external-upload'].errorsToShow).toEqual(errors);
+    expect(newState[826].sections['external-upload'].serverValidationErrors).toEqual(errors);
+
+    action = new ExecuteExternalUploadSuccessAction(submissionId, 'external-upload');
+
+    newState = submissionObjectReducer(initState, action);
+
+    expect(newState[826].externalUploadPending).toBeFalse();
+    expect(newState[826].sections['external-upload'].errorsToShow).toEqual([]);
+    expect(newState[826].sections['external-upload'].serverValidationErrors).toEqual([]);
+  });
+
 });

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

@@ -54,7 +54,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';
+import { SubmissionSectionError } from './submission-section-error.model';
 
 /**
  * An interface to represent SubmissionSectionObject entry
@@ -1131,7 +1131,7 @@ function startExternalUploadExecution(state: SubmissionObjectState, action: Exec
  * @return SubmissionObjectState
  *    the new state, with the decision flag changed.
  */
-function updateExternalUploadState(state: SubmissionObjectState, submissionId: string, sectionId: string, errors: SubmissionObjectError[]): SubmissionObjectState {
+function updateExternalUploadState(state: SubmissionObjectState, submissionId: string, sectionId: string, errors: SubmissionSectionError[]): SubmissionObjectState {
   if (isNotEmpty(state[ submissionId ])
     && isNotEmpty(state[ submissionId ].sections[ sectionId])) {
     return Object.assign({}, state, {

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

@@ -27,7 +27,6 @@ import { Collection } from '../../../core/shared/collection.model';
 import { SectionExternalUploadComponent } from './section-external-upload.component';
 import { ExternalUploadService } from './external-upload.service';
 import { ExternalServiceStub } from './external-upload-service.mock';
-import { PathableObjectError } from '../../../core/data/response-state.model';
 
 function getMockCollectionDataService(): CollectionDataService {
   return jasmine.createSpyObj('CollectionDataService', {
@@ -49,8 +48,6 @@ const sectionObject: SectionDataObject = {
   sectionVisibility: null
 };
 
-
-
 describe('SectionExternalUploadComponent test suite', () => {
   let comp: SectionExternalUploadComponent;
   let compAsAny: any;
@@ -194,22 +191,6 @@ describe('SectionExternalUploadComponent test suite', () => {
       expect(compAsAny.submitUpload).toHaveBeenCalled();
     });
 
-    it('Should display errors if present', () => {
-      const errorObj = [{message:'Test error message', paths: ['external-upload']} as PathableObjectError];
-      spyOn(compAsAny, 'submitUpload');
-      comp.loading$ = of(false);
-      comp.errors$ = of(errorObj);
-
-      comp.onSectionInit();
-      comp.source = '/path/to/file';
-      comp.submissionId = 'subId';
-
-      fixture.detectChanges();
-
-      const errorElement = fixture.debugElement.query(By.css('.text-danger')).nativeElement;
-      expect(errorElement.innerHTML).toEqual(' ' + errorObj[0].message + ' ');
-
-    });
   });
 
 });