From 4069cf8168706da20424bd226e9dbcde010d14a3 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 19 Jun 2024 13:32:58 +0200 Subject: [PATCH] [DURACOM-282] fix error when discarding submission with no uploaded files --- .../upload/section-upload.component.ts | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/app/submission/sections/upload/section-upload.component.ts b/src/app/submission/sections/upload/section-upload.component.ts index 5e7388902e..58008c9dfb 100644 --- a/src/app/submission/sections/upload/section-upload.component.ts +++ b/src/app/submission/sections/upload/section-upload.component.ts @@ -227,20 +227,21 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent { this.changeDetectorRef.detectChanges(); }), - // retrieve submission's bitstream data from state - combineLatest([this.configMetadataForm$, - this.bitstreamService.getUploadedFilesData(this.submissionId, this.sectionData.id)]).pipe( - filter(([configMetadataForm, { files }]: [SubmissionFormsModel, WorkspaceitemSectionUploadObject]) => { - return isNotEmpty(configMetadataForm) && isNotEmpty(files); + combineLatest([ + this.configMetadataForm$, + this.bitstreamService.getUploadedFilesData(this.submissionId, this.sectionData.id), + ]).pipe( + filter(([configMetadataForm, sectionUploadObject]: [SubmissionFormsModel, WorkspaceitemSectionUploadObject]) => { + return isNotEmpty(configMetadataForm) && isNotEmpty(sectionUploadObject); }), - distinctUntilChanged()) - .subscribe(([configMetadataForm, { primary, files }]: [SubmissionFormsModel, WorkspaceitemSectionUploadObject]) => { - this.primaryBitstreamUUID = primary; - this.fileList = files; - this.fileNames = Array.from(files, file => this.getFileName(configMetadataForm, file)); - }, - ), + distinctUntilChanged(), + ).subscribe(([configMetadataForm, { primary, files }]: [SubmissionFormsModel, WorkspaceitemSectionUploadObject]) => { + this.primaryBitstreamUUID = primary; + this.fileList = files; + this.fileNames = Array.from(files, file => this.getFileName(configMetadataForm, file)); + this.changeDetectorRef.detectChanges(); + }), ); }