fix: [BUG] Process :Document+parent Folder lost in case of Upload fro…

…m existing document (new process/new request) - EXO-74485 (#2409) Prior to this fix, there is no way to know if the attached file is from eXo internal drives, this information is needs for process application, this commit add this information to attachments.
exoplatform · Oct 10, 2024 · 1507ed3 · 1507ed3
1 parent 9d87428
commit 1507ed3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/...e-app/attachment/components/attachments-drive-explorer/AttachmentsDriveExplorerDrawer.vue b/...e-app/attachment/components/attachments-drive-explorer/AttachmentsDriveExplorerDrawer.vue
@@ -753,7 +753,7 @@ export default {
         file.isSelectedFromDrives = true;
         const alreadyAttachedFile = this.attachedFiles.find(f => f.id === file.id);
         if (!alreadyAttachedFile) {
-          this.selectedFiles.push({...file, space: this.fromSpace});
+          this.selectedFiles.push({...file, space: this.fromSpace , eXoDrive: true});
         }
         const alreadyRemovedFileIndex = this.removedFiles.findIndex(f => f.id === file.id);
         if (alreadyRemovedFileIndex !== -1) {

diff --git a/core/services/src/main/java/org/exoplatform/services/attachments/model/Attachment.java b/core/services/src/main/java/org/exoplatform/services/attachments/model/Attachment.java
@@ -58,6 +58,8 @@ public class Attachment implements Cloneable {
 
   private boolean                       cloudDrive;
 
+  private boolean                       eXoDrive;
+
   @Override
   public Attachment clone() { // NOSONAR
     return new Attachment(id,
@@ -75,6 +77,7 @@ public Attachment clone() { // NOSONAR
                           openUrl,
                           previewBreadcrumb,
                           version,
-                          cloudDrive);
+                          cloudDrive,
+                          eXoDrive);
   }
 }
diff --git a/...vices/src/main/java/org/exoplatform/services/attachments/rest/model/AttachmentEntity.java b/...vices/src/main/java/org/exoplatform/services/attachments/rest/model/AttachmentEntity.java
@@ -60,6 +60,8 @@ public class AttachmentEntity {
 
   private boolean                       cloudDrive;
 
+  private boolean                       eXoDrive;
+
   @Override
   public AttachmentEntity clone() { // NOSONAR
     return new AttachmentEntity(id,
@@ -77,7 +79,8 @@ public AttachmentEntity clone() { // NOSONAR
                                 openUrl,
                                 previewBreadcrumb,
                                 version,
-                                cloudDrive);
+                                cloudDrive,
+                                eXoDrive);
   }
 
 }
diff --git a/core/services/src/main/java/org/exoplatform/services/attachments/utils/EntityBuilder.java b/core/services/src/main/java/org/exoplatform/services/attachments/utils/EntityBuilder.java
@@ -62,7 +62,8 @@ public static final AttachmentEntity fromAttachment(IdentityManager identityMana
                                 attachment.getOpenUrl(),
                                 attachment.getPreviewBreadcrumb(),
                                 attachment.getVersion(),
-                                attachment.isCloudDrive()
+                                attachment.isCloudDrive(),
+                                attachment.isEXoDrive()
 
     );
   }