cat-documents-ng 0.2.68 → 0.2.70

package/fesm2022/cat-documents-ng.mjs

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { Injectable, EventEmitter, Output, ViewChild, Input, ViewEncapsulation, Component, ChangeDetectionStrategy, Directive, NgModule, APP_INITIALIZER } from '@angular/core';
 import * as i2$1 from '@angular/common';
 import { CommonModule } from '@angular/common';
-import { firstValueFrom, tap, EMPTY, catchError, throwError, of, combineLatest, Subject, Observable, takeUntil, Subscription, debounceTime as debounceTime$1, distinctUntilChanged as distinctUntilChanged$1 } from 'rxjs';
+import { firstValueFrom, tap, EMPTY, catchError, throwError, of, combineLatest, Subject, Observable, from, concatMap, takeUntil, Subscription, debounceTime as debounceTime$1, distinctUntilChanged as distinctUntilChanged$1 } from 'rxjs';
 import { __decorate } from 'tslib';
 import { EntityStore, StoreConfig, QueryEntity } from '@datorama/akita';
 import * as i2 from '@angular/common/http';
@@ -2369,12 +2369,14 @@ class DocumentUploadService {
      */
     handleCreateFormData(uploadedFile, contextId) {
         if (uploadedFile) {
+            console.log("formData 1", uploadedFile);
             let formData = new FormData();
             formData.append(SHARED.FILE, uploadedFile, uploadedFile.name);
             formData.append(SHARED.CONTEXT_ID, this.contextId);
             return formData;
         }
         else {
+            console.log("formData 2", uploadedFile);
             return null;
         }
     }
@@ -2939,10 +2941,15 @@ class DocumentUploadComponent {
      * @param event - Event containing the selected files
      */
     onSelectedFiles(event) {
-        event.currentFiles.forEach((file, index) => {
-            this.handleTemplatedUpload(file);
+        from(event.currentFiles).pipe(concatMap(file => this.uploadFile$(file)) // Upload one file at a time
+        ).subscribe({
+            complete: () => {
+                console.log('✅ All files uploaded sequentially.');
+                this.fileUploader.clear();
+                this.cdr.detectChanges();
+                this.onFormValidationChange.emit();
+            }
         });
-        this.fileUploader.clear();
     }
     /**
      * Loads the list of applicants for the current context.
@@ -2997,34 +3004,74 @@ class DocumentUploadComponent {
      * Sets up progress tracking and upload listener for the file.
      * @param file - The file to be uploaded
      */
-    handleTemplatedUpload(file) {
-        if (!this.formService.validateContextId(this.contextId, 'Context ID is required for upload.'))
-            return;
+    // handleTemplatedUpload(file: File): void {
+    //   if (!this.formService.validateContextId(this.contextId, 'Context ID is required for upload.')) return;
+    //   const formsData = this.documentService.handleCreateFormData(file, this.contextId);
+    //   console.log("1",formsData);
+    //   if (!formsData) {
+    //     this.messageService.add({severity: SHARED.SEVERITY,summary: SHARED.UPLOAD_ERROR_SUMMERY,detail: SHARED.UPLOAD_ERROR_DETAILS});
+    //     return;
+    //   }
+    //   this.fileProgress.set(file, SHARED.UPLOAD_PROGRESS_10);
+    //   const formattedSize = this.businessService.formatFileSize(file.size, this.config);
+    //   const uploadedFile = this.businessService.createUploadedFile(file, formattedSize);
+    //   uploadedFile.progress = SHARED.UPLOAD_PROGRESS_10;
+    //   console.log("2",uploadedFile);
+    //   this.uploadService.create(formsData).subscribe({
+    //     next: (event) => {
+    //       console.log("3",event);
+    //       uploadedFile.uploadResponse = event;
+    //       uploadedFile.progress = SHARED.UPLOAD_PROGRESS_100;
+    //       uploadedFile.url = event?.url;
+    //       uploadedFile.contentType = event?.contentType;
+    //       this.uploadedFiles.push(event);
+    //       this.fileProgress.set(file, SHARED.UPLOAD_PROGRESS_100);
+    //       // this.uploadCompleted.emit({ file, response: event });
+    //       this.cdr.detectChanges();
+    //       this.onFormValidationChange.emit();
+    //       console.log("4 uploadedFiles",this.uploadedFiles);
+    //     },
+    //     error: (error) => {
+    //       this.messageService.add({severity: SHARED.SEVERITY,summary: SHARED.UPLOAD_SUMMERY,detail: error?.message});
+    //     }
+    //   });
+    // }
+    uploadFile$(file) {
+        if (!this.formService.validateContextId(this.contextId, 'Context ID is required for upload.')) {
+            return of(null);
+        }
         const formsData = this.documentService.handleCreateFormData(file, this.contextId);
+        console.log("3 formsData", formsData);
         if (!formsData) {
-            this.messageService.add({ severity: SHARED.SEVERITY, summary: SHARED.UPLOAD_ERROR_SUMMERY, detail: SHARED.UPLOAD_ERROR_DETAILS });
-            return;
+            this.messageService.add({
+                severity: SHARED.SEVERITY,
+                summary: SHARED.UPLOAD_ERROR_SUMMERY,
+                detail: SHARED.UPLOAD_ERROR_DETAILS
+            });
+            return of(null);
         }
+        // const formattedSize = this.businessService.formatFileSize(file.size, this.config);
+        // const uploadedFile = this.businessService.createUploadedFile(file, formattedSize);
+        // uploadedFile.progress = SHARED.UPLOAD_PROGRESS_10;
+        // this.uploadedFiles.push(uploadedFile);
         this.fileProgress.set(file, SHARED.UPLOAD_PROGRESS_10);
-        const formattedSize = this.businessService.formatFileSize(file.size, this.config);
-        const uploadedFile = this.businessService.createUploadedFile(file, formattedSize);
-        uploadedFile.progress = SHARED.UPLOAD_PROGRESS_10;
-        this.uploadedFiles.push(uploadedFile);
-        this.uploadService.create(formsData).subscribe({
-            next: (event) => {
-                uploadedFile.uploadResponse = event;
-                uploadedFile.progress = SHARED.UPLOAD_PROGRESS_100;
-                uploadedFile.url = event?.url;
-                uploadedFile.contentType = event?.contentType;
-                this.fileProgress.set(file, SHARED.UPLOAD_PROGRESS_100);
-                // this.uploadCompleted.emit({ file, response: event });
-                this.cdr.detectChanges();
-                this.onFormValidationChange.emit();
-            },
-            error: (error) => {
-                this.messageService.add({ severity: SHARED.SEVERITY, summary: SHARED.UPLOAD_SUMMERY, detail: error?.message });
-            }
-        });
+        console.log("4 formData", formsData);
+        return this.uploadService.create(formsData).pipe(tap((event) => {
+            console.log("5 event", event);
+            // uploadedFile.uploadResponse = event;
+            // uploadedFile.progress = SHARED.UPLOAD_PROGRESS_100;
+            // uploadedFile.url = event?.url;
+            // uploadedFile.contentType = event?.contentType;
+            this.uploadedFiles.push(event);
+            this.fileProgress.set(file, SHARED.UPLOAD_PROGRESS_100);
+        }), catchError((error) => {
+            this.messageService.add({
+                severity: SHARED.SEVERITY,
+                summary: SHARED.UPLOAD_SUMMERY,
+                detail: error?.message || 'Upload failed'
+            });
+            return of(null); // Continue with next file
+        }));
     }
     /**
      * Removes a document from the uploaded files list.