cloud-ide-element 1.0.75 → 1.0.76

package/fesm2022/cloud-ide-element.mjs

@@ -4106,7 +4106,7 @@ class CideEleGlobalFileUploaderComponent {
             return;
         }
         const newUploads = validFiles.map(file => ({
-            fileId: this.generateFileId(),
+            fileId: this.generateFileId(file),
             fileName: file.name,
             progress: 0,
             status: 'pending',
@@ -4196,6 +4196,7 @@ class CideEleGlobalFileUploaderComponent {
                 permissions: ['read', 'write']
             };
             this.fileService.uploadFile(upload.file, this.convertToFileUploadOptions(uploadRequest), (progress) => {
+                // Use the original fileId for progress updates during upload
                 this.updateUploadProgress(upload.fileId, progress);
             })
                 .pipe(takeUntilDestroyed(this.destroyRef))
@@ -4203,16 +4204,28 @@ class CideEleGlobalFileUploaderComponent {
                 next: (response) => {
                     completedCount++;
                     console.log(`✅ [GlobalFileUploader] File ${index + 1}/${totalFiles} uploaded successfully`);
-                    this.updateUploadStatus(upload.fileId, 'completed', 100, undefined, response);
+                    // Find the upload item by cyfm_temp_unique_id from response
+                    const responseFile = response?.data?.core_file_manager?.[0];
+                    const tempUniqueId = responseFile?.cyfm_temp_unique_id;
+                    console.log('🔍 [GlobalFileUploader] Response tempUniqueId:', tempUniqueId);
+                    console.log('🔍 [GlobalFileUploader] Original upload fileId:', upload.fileId);
+                    // Use the tempUniqueId to find and update the correct upload item
+                    if (tempUniqueId) {
+                        this.updateUploadStatusByTempId(tempUniqueId, 'completed', 100, undefined, response);
+                    }
+                    else {
+                        // Fallback to original fileId
+                        this.updateUploadStatus(upload.fileId, 'completed', 100, undefined, response);
+                    }
                     this.uploadComplete.emit({
-                        fileId: upload.fileId,
+                        fileId: tempUniqueId || upload.fileId,
                         fileName: upload.fileName,
                         progress: 100,
                         status: 'completed',
                         uploadedFile: response
                     });
-                    if (response?.data?.core_file_manager?.[0]) {
-                        uploadedFiles.push(response.data.core_file_manager[0]);
+                    if (responseFile) {
+                        uploadedFiles.push(responseFile);
                     }
                     console.log('🔍 [GlobalFileUploader] Upload response received:', response);
                     console.log('🔍 [GlobalFileUploader] Response data structure:', response?.data);
@@ -4274,9 +4287,21 @@ class CideEleGlobalFileUploaderComponent {
             .subscribe({
             next: (response) => {
                 console.log('✅ [GlobalFileUploader] Single file upload successful:', response);
-                this.updateUploadStatus(pendingUpload.fileId, 'completed', 100, undefined, response);
+                // Find the upload item by cyfm_temp_unique_id from response
+                const responseFile = response?.data?.core_file_manager?.[0];
+                const tempUniqueId = responseFile?.cyfm_temp_unique_id;
+                console.log('🔍 [GlobalFileUploader] Single upload - Response tempUniqueId:', tempUniqueId);
+                console.log('🔍 [GlobalFileUploader] Single upload - Original upload fileId:', pendingUpload.fileId);
+                // Use the tempUniqueId to find and update the correct upload item
+                if (tempUniqueId) {
+                    this.updateUploadStatusByTempId(tempUniqueId, 'completed', 100, undefined, response);
+                }
+                else {
+                    // Fallback to original fileId
+                    this.updateUploadStatus(pendingUpload.fileId, 'completed', 100, undefined, response);
+                }
                 this.uploadComplete.emit({
-                    fileId: pendingUpload.fileId,
+                    fileId: tempUniqueId || pendingUpload.fileId,
                     fileName: pendingUpload.fileName,
                     progress: 100,
                     status: 'completed',
@@ -4322,6 +4347,24 @@ class CideEleGlobalFileUploaderComponent {
             return updatedQueue;
         });
     }
+    /**
+     * Update upload status by cyfm_temp_unique_id
+     */
+    updateUploadStatusByTempId(tempUniqueId, status, progress, error, uploadedFile) {
+        console.log('🔄 [GlobalFileUploader] Updating upload status by tempId:', { tempUniqueId, status, progress, error: !!error, uploadedFile: !!uploadedFile });
+        this.uploadQueue.update(queue => {
+            const updatedQueue = queue.map(upload => {
+                // Check if this upload's fileId matches the tempUniqueId
+                if (upload.fileId === tempUniqueId) {
+                    console.log('🔄 [GlobalFileUploader] Found upload by tempId to update:', upload.fileName, 'from', upload.status, 'to', status);
+                    return { ...upload, status, progress, error, uploadedFile };
+                }
+                return upload;
+            });
+            console.log('🔄 [GlobalFileUploader] Updated queue by tempId:', updatedQueue.map(u => ({ fileName: u.fileName, status: u.status, fileId: u.fileId })));
+            return updatedQueue;
+        });
+    }
     /**
      * Handle upload error
      */
@@ -4408,10 +4451,11 @@ class CideEleGlobalFileUploaderComponent {
         return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
     }
     /**
-     * Generate unique file ID
+     * Generate unique file ID - this should match the service's generateFileId method
+     * The service uses: ${file.name}_${file.size}_${Date.now()}
      */
-    generateFileId() {
-        return `upload_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
+    generateFileId(file) {
+        return `${file.name}_${file.size}_${Date.now()}`;
     }
     /**
      * Convert IFileUploadRequest to FileUploadOptions