From 56a8b56d688ed4db2057870e9be5cbd18a2be31c Mon Sep 17 00:00:00 2001 From: Salim Terres Date: Tue, 4 Feb 2025 09:47:27 +0100 Subject: [PATCH] Bug #14235: [BUG/Regression] [Collection] Missing ZIP name when creating a project on Collect. --- .../projects/create-project/create-project.component.ts | 5 ++++- .../src/lib/models/zip/zip-file-status.interface.ts | 2 +- .../vitamui-library/src/lib/models/zip/zip-file.class.ts | 8 ++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ui/ui-frontend/projects/collect/src/app/collect/projects/create-project/create-project.component.ts b/ui/ui-frontend/projects/collect/src/app/collect/projects/create-project/create-project.component.ts index d184cb75491..86e4fb132d0 100644 --- a/ui/ui-frontend/projects/collect/src/app/collect/projects/create-project/create-project.component.ts +++ b/ui/ui-frontend/projects/collect/src/app/collect/projects/create-project/create-project.component.ts @@ -355,7 +355,10 @@ export class CreateProjectComponent implements OnInit, AfterViewChecked { }) as Transaction, ), switchMap((transaction) => this.transactionsService.create(transaction)), - tap((createdTransactionResponse) => (transactionId = createdTransactionResponse.id)), + tap((createdTransactionResponse) => { + transactionId = createdTransactionResponse.id; + zipFile.setZipName(transactionId + '.zip'); + }), switchMap(() => zipFile.addFiles(this.filesToUpload).generateZip()), switchMap((content) => this.archiveCollectService.uploadZip(content, transactionId)), tap((httpEvent) => zipFile.updateUploadingZipFileStatus(httpEvent)), diff --git a/ui/ui-frontend/projects/vitamui-library/src/lib/models/zip/zip-file-status.interface.ts b/ui/ui-frontend/projects/vitamui-library/src/lib/models/zip/zip-file-status.interface.ts index 82624fe2f38..46bf6937656 100644 --- a/ui/ui-frontend/projects/vitamui-library/src/lib/models/zip/zip-file-status.interface.ts +++ b/ui/ui-frontend/projects/vitamui-library/src/lib/models/zip/zip-file-status.interface.ts @@ -36,7 +36,7 @@ */ export interface ZipFileStatus { - transactionId: string; + name: string; size: number; uploadedSize: number; currentFile?: string; diff --git a/ui/ui-frontend/projects/vitamui-library/src/lib/models/zip/zip-file.class.ts b/ui/ui-frontend/projects/vitamui-library/src/lib/models/zip/zip-file.class.ts index bbf52ad6d0f..29a0f71d526 100644 --- a/ui/ui-frontend/projects/vitamui-library/src/lib/models/zip/zip-file.class.ts +++ b/ui/ui-frontend/projects/vitamui-library/src/lib/models/zip/zip-file.class.ts @@ -45,17 +45,17 @@ export class ZipFile { zipFileStatus: ZipFileStatus = null; zipFileStatus$: BehaviorSubject = new BehaviorSubject(null); - constructor(transactionId?: string) { + constructor(zipName?: string) { this.zipFile = new JSZip(); this.zipFileStatus = { - transactionId: transactionId, + name: zipName, size: 0, uploadedSize: 0, }; } - setTransactionId(transactionId: string): ZipFile { - this.zipFileStatus.transactionId = transactionId; + setZipName(zipName: string): ZipFile { + this.zipFileStatus.name = zipName; return this; }