[UXP-147] fix sections update, add tests

Author: FrancescoMolinaro

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

@@ -3115,7 +3115,9 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
     isLoading: false,
     isDiscarding: false,
     savePending: false,
-    depositPending: false
+    depositPending: false,
+    externalUploadPending: false,
+    externalUploadErrors: []
   }
 });
 

src/app/shared/testing/submission-service.stub.ts

@@ -22,6 +22,7 @@ export class SubmissionServiceStub {
   getSubmissionSaveProcessingStatus = jasmine.createSpy('getSubmissionSaveProcessingStatus');
   getSubmissionDepositProcessingStatus = jasmine.createSpy('getSubmissionDepositProcessingStatus');
   getExternalUplodaProcessingStatus = jasmine.createSpy('getExternalUplodaProcessingStatus');
+  getExternalUplodaErorrs = jasmine.createSpy('getExternalUplodaErorrs');
   hasUnsavedModification = jasmine.createSpy('hasUnsavedModification');
   isSectionHidden = jasmine.createSpy('isSectionHidden');
   isSectionReadOnly = jasmine.createSpy('isSectionReadOnly');

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

@@ -1067,7 +1067,7 @@ export class ExecuteExternalUploadSuccessAction implements Action {
   payload: {
     submissionId: string;
     sectionId: string;
-    submissionObject: SubmissionObject[];
+    sectionsObject: WorkspaceitemSectionsObject;
   };
 
   /**
@@ -1077,10 +1077,10 @@ export class ExecuteExternalUploadSuccessAction implements Action {
    *    the submission's ID
    * @param sectionId
    *    the section's ID
-   * @param submissionObject
+   * @param sectionsObject
    */
-  constructor(submissionId: string, sectionId: string, submissionObject: SubmissionObject[]) {
-    this.payload = { submissionId, sectionId, submissionObject };
+  constructor(submissionId: string, sectionId: string, sectionsObject: WorkspaceitemSectionsObject) {
+    this.payload = { submissionId, sectionId, sectionsObject };
   }
 }
 

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

@@ -452,9 +452,7 @@ describe('SubmissionObjectEffects test suite', () => {
         },
         forms: {
           '2_traditionalpageone': {
-            touched: {
-              'dc.title': true
-            }
+            touched: {}
           }
         }
       } as any);
@@ -481,7 +479,7 @@ describe('SubmissionObjectEffects test suite', () => {
           submissionId,
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
-          errorsToShowList.traditionalpageone,
+          [],
           serverValidationErrorsList.traditionalpageone
         ),
         c: new UpdateSectionDataAction(

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

@@ -393,7 +393,8 @@ export class SubmissionObjectEffects {
 
   executeExternalUpload$ = createEffect(() => this.actions$.pipe(
     ofType(SubmissionObjectActionTypes.EXECUTE_EXTERNAL_UPLOAD),
-    switchMap((action: SetDuplicateDecisionAction) => {
+    withLatestFrom(this.store$),
+    switchMap(([action, currentState]: [SetDuplicateDecisionAction, any]) => {
       return this.operationsService.jsonPatchByResourceID(
         this.submissionService.getSubmissionObjectLinkName(),
         action.payload.submissionId,
@@ -407,10 +408,18 @@ export class SubmissionObjectEffects {
             if (sectionErrors.length > 0) {
               return new ExecuteExternalUploadErrorAction(action.payload.submissionId, sectionErrors);
             } else {
+              const index: any = parseInt(action.payload.submissionId, 10);
+              const sections = currentState.submission.objects[index]?.sections;
+              const newSectionsState = Object.assign({}, sections);
+
+              //Update upload section with received files
+              newSectionsState[SectionsType.Upload] = Object.assign({}, newSectionsState[SectionsType.Upload], {
+                data: Object.assign({files: (response[0].sections[SectionsType.Upload] as any).files})
+              });
               return new ExecuteExternalUploadSuccessAction(
                 action.payload.submissionId,
                 action.payload.sectionId,
-                response
+                newSectionsState
               );
             }
           }),

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

@@ -123,7 +123,9 @@ describe('submissionReducer test suite', () => {
         isLoading: true,
         isDiscarding: false,
         savePending: false,
-        depositPending: false
+        depositPending: false,
+        externalUploadPending: false,
+        externalUploadErrors: []
       }
     };
 

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

@@ -1155,30 +1155,24 @@ function endExternalUploadExecution(state: SubmissionObjectState, action: Execut
  */
 
 function updateSubmissionFromExternalUploadEvent(state: SubmissionObjectState, action: ExecuteExternalUploadSuccessAction) {
-  const index: any = findKey(action.payload.submissionObject, {id: parseInt(action.payload.submissionId, 10) as any});
-  const sectionData = action
-    .payload
-    .submissionObject[index]
-    .sections;
+  const sectionsData = action.payload.sectionsObject;
 
+  let currentSection = {};
+  const currentSectionId = action.payload.sectionId;
+  currentSection[currentSectionId] = state[ action.payload.submissionId ].sections[currentSectionId];
 
-  const sectionsKeys = Object.keys(sectionData);
-  const tempSections = {};
-
-  for (let key of sectionsKeys) {
-    tempSections[key] = Object.assign({}, state[action.payload.submissionId].sections[key], {
-      data: sectionData[key]
-    });
-  }
-
-  if (hasValue(state[ action.payload.submissionId ].sections[ action.payload.sectionId ])) {
+  if (hasValue(sectionsData[ action.payload.sectionId ])) {
     return Object.assign({}, state, {
       [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
-        sections: tempSections,
+        sections: Object.assign({}, sectionsData, currentSection),
         externalUploadPending: false
       })
     });
   } else {
-    return state;
+    return Object.assign({}, state, {
+      [action.payload.submissionId]: Object.assign({}, state[action.payload.submissionId], {
+        externalUploadPending: false
+      })
+    });
   }
 }

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

@@ -27,6 +27,7 @@ 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', {
@@ -148,6 +149,7 @@ describe('SectionExternalUploadComponent test suite', () => {
       collectionDataService = TestBed.inject(CollectionDataService);
       externalUploadService = TestBed.inject(ExternalUploadService);
       compAsAny.pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionObject.id);
+      compAsAny.errors$ = observableOf([]);
     });
 
     afterEach(() => {
@@ -175,7 +177,7 @@ describe('SectionExternalUploadComponent test suite', () => {
       expect(fixture.debugElement.query(By.css('button')).nativeElement.disabled).toBeTruthy();
     });
 
-    it('Should execute upload is source is present', () => {
+    it('Should execute upload if source is present', () => {
       spyOn(compAsAny, 'submitUpload');
       comp.loading$ = of(false);
 
@@ -191,6 +193,23 @@ describe('SectionExternalUploadComponent test suite', () => {
       expect(fixture.debugElement.query(By.css('button')).nativeElement.disabled).toBeFalsy();
       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 + ' ');
+
+    });
   });
 
 });

src/app/submission/utils/parseSectionErrorPaths.ts

@@ -36,8 +36,7 @@ const regexShort = /\/sections\/(.*)/;
  * @returns {SectionErrorPath[]}
  */
 const parseSectionErrorPaths = (path: string | string[]): SectionErrorPath[] => {
-  const paths = typeof path === 'string' ? [path] : path;
-
+  const paths = typeof path === 'string' ? [path] : hasValue(path) ? path : [];
   return paths.map((item) => {
       if (item.match(regex) && item.match(regex).length > 2) {
         return {