Revert "[DSC-2149] port fix for upload files issue"

This reverts commit 19ce014.

Author: FrancescoMolinaro

src/app/shared/mocks/section-upload.service.mock.ts

@@ -5,7 +5,6 @@ import { SubmissionFormsConfigDataService } from '../../core/config/submission-f
  */
 export function getMockSectionUploadService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('SectionUploadService', {
-    getUploadedFilesData: jasmine.createSpy('getUploadedFilesData'),
     getUploadedFileList: jasmine.createSpy('getUploadedFileList'),
     getFileData: jasmine.createSpy('getFileData'),
     getDefaultPolicies: jasmine.createSpy('getDefaultPolicies'),

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

@@ -3674,11 +3674,6 @@ export const mockUploadFiles = [
   }
 ];
 
-export const mockUploadFilesData = {
-  primary: null,
-  files: JSON.parse(JSON.stringify(mockUploadFiles)),
-};
-
 export const mockFileFormData = {
   metadata: {
     'dc.title': [

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

@@ -24,7 +24,7 @@ import {
   mockSubmissionState,
   mockUploadConfigResponse,
   mockUploadConfigResponseNotRequired,
-  mockUploadFiles, mockUploadFilesData,
+  mockUploadFiles,
 } from '../../../shared/mocks/submission.mock';
 import { SubmissionUploadsConfigDataService } from '../../../core/config/submission-uploads-config-data.service';
 import { SectionUploadService } from './section-upload.service';
@@ -162,7 +162,6 @@ describe('SubmissionSectionUploadComponent test suite', () => {
       );
 
       bitstreamService.getUploadedFileList.and.returnValue(observableOf([]));
-      bitstreamService.getUploadedFilesData.and.returnValue(observableOf({ primary: null, files: [] }));
     };
 
     TestBed.configureTestingModule({
@@ -233,7 +232,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
     });
 
     it('should init component properly', () => {
-      bitstreamService.getUploadedFilesData.and.returnValue(observableOf({ primary: null, files: [] }));
+
       submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
 
       collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new Collection(), mockCollection, {
@@ -249,6 +248,8 @@ describe('SubmissionSectionUploadComponent test suite', () => {
         createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup))
       );
 
+      bitstreamService.getUploadedFileList.and.returnValue(observableOf([]));
+
       comp.onSectionInit();
 
       const expectedGroupsMap = new Map([
@@ -270,7 +271,6 @@ describe('SubmissionSectionUploadComponent test suite', () => {
     });
 
     it('should init file list properly', () => {
-      bitstreamService.getUploadedFilesData.and.returnValue(observableOf({ primary: null, files: [] }));
 
       submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
 
@@ -285,7 +285,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
         createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup))
       );
 
-      bitstreamService.getUploadedFilesData.and.returnValue(observableOf(mockUploadFilesData));
+      bitstreamService.getUploadedFileList.and.returnValue(observableOf(mockUploadFiles));
 
       comp.onSectionInit();
 
@@ -308,8 +308,6 @@ describe('SubmissionSectionUploadComponent test suite', () => {
     });
 
     it('should properly read the section status when required is true', () => {
-      bitstreamService.getUploadedFilesData.and.returnValue(observableOf({ primary: null, files: [] }));
-
       submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
 
       sectionsServiceStub.getSectionErrors.and.returnValue(observableOf([]));
@@ -327,7 +325,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
 
       bitstreamService.getUploadedFileList.and.returnValue(cold('-a-b', {
         a: [],
-        b: mockUploadFiles,
+        b: mockUploadFiles
       }));
 
       comp.onSectionInit();
@@ -343,8 +341,6 @@ describe('SubmissionSectionUploadComponent test suite', () => {
     it('should properly read the section status when required is false', () => {
       submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
 
-      bitstreamService.getUploadedFilesData.and.returnValue(observableOf({ primary: null, files: [] }));
-
       sectionsServiceStub.getSectionErrors.and.returnValue(observableOf([]));
 
       collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockCollection));

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

@@ -27,7 +27,6 @@ import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { SubmissionVisibility } from '../../utils/visibility.util';
-import { WorkspaceitemSectionUploadObject } from '../../../core/submission/models/workspaceitem-section-upload.model';
 
 export const POLICY_DEFAULT_NO_LIST = 1; // Banner1
 export const POLICY_DEFAULT_WITH_LIST = 2; // Banner2
@@ -198,20 +197,28 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent {
       }),
 
       // retrieve submission's bitstreams from state
-      observableCombineLatest([
-        this.configMetadataForm$,
-        this.bitstreamService.getUploadedFilesData(this.submissionId, this.sectionData.id),
-      ]).pipe(
-        filter(([configMetadataForm, sectionUploadObject]: [SubmissionFormsModel, WorkspaceitemSectionUploadObject]) => {
-          return isNotEmpty(configMetadataForm) && isNotEmpty(sectionUploadObject);
+      observableCombineLatest(this.configMetadataForm$,
+        this.bitstreamService.getUploadedFileList(this.submissionId, this.sectionData.id)).pipe(
+        filter(([configMetadataForm, fileList]: [SubmissionFormsModel, any[]]) => {
+          return isNotEmpty(configMetadataForm) && isNotUndefined(fileList);
         }),
-        distinctUntilChanged(),
-      ).subscribe(([configMetadataForm, { files }]: [SubmissionFormsModel, WorkspaceitemSectionUploadObject]) => {
-        this.fileList = files;
-        this.fileIndexes = this.fileList.map(file => file.uuid);
-        this.fileNames = Array.from(files, file => this.getFileName(configMetadataForm, file));
-        this.changeDetectorRef.detectChanges();
-      }),
+        distinctUntilChanged())
+        .subscribe(([configMetadataForm, fileList]: [SubmissionFormsModel, any[]]) => {
+            this.fileList = [];
+            this.fileIndexes = [];
+            this.fileNames = [];
+            this.changeDetectorRef.detectChanges();
+            if (isNotUndefined(fileList) && fileList.length > 0) {
+              fileList.forEach((file) => {
+                this.fileList.push(file);
+                this.fileIndexes.push(file.uuid);
+                this.fileNames.push(this.getFileName(configMetadataForm, file));
+              });
+            }
+
+            this.changeDetectorRef.detectChanges();
+          }
+        )
     );
   }
 

src/app/submission/sections/upload/section-upload.service.ts

@@ -10,14 +10,9 @@ import {
   EditFileDataAction,
   NewUploadedFileAction
 } from '../../objects/submission-objects.actions';
-import {
-  submissionSectionDataFromIdSelector,
-  submissionUploadedFileFromUuidSelector,
-  submissionUploadedFilesFromIdSelector
-} from '../../selectors';
+import { submissionUploadedFileFromUuidSelector, submissionUploadedFilesFromIdSelector } from '../../selectors';
 import { isUndefined } from '../../../shared/empty.util';
 import { WorkspaceitemSectionUploadFileObject } from '../../../core/submission/models/workspaceitem-section-upload-file.model';
-import { WorkspaceitemSectionUploadObject } from '../../../core/submission/models/workspaceitem-section-upload.model';
 
 /**
  * A service that provides methods to handle submission's bitstream state.
@@ -31,21 +26,7 @@ export class SectionUploadService {
    * @param {Store<SubmissionState>} store
    */
   constructor(private store: Store<SubmissionState>) {}
-  /**
-   * Return submission's bitstream data from state
-   *
-   * @param submissionId
-   *    The submission id
-   * @param sectionId
-   *    The section id
-   * @returns {WorkspaceitemSectionUploadObject}
-   *    Returns submission's bitstream data
-   */
-  public getUploadedFilesData(submissionId: string, sectionId: string): Observable<WorkspaceitemSectionUploadObject> {
-    return this.store.select(submissionSectionDataFromIdSelector(submissionId, sectionId)).pipe(
-      map((state) => state),
-      distinctUntilChanged());
-  }
+
   /**
    * Return submission's bitstream list from state
    *