Take account FileContainer when calculate the Changes on the newLayout (

#28350)
dotCMS · Apr 26, 2024 · c1fbb01 · c1fbb01
1 parent 8285ef7
commit c1fbb01
Show file tree

Hide file tree

Showing 2 changed files with 1,204 additions and 3 deletions.
diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/design/bean/LayoutChanges.java b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/design/bean/LayoutChanges.java
@@ -1,6 +1,11 @@
 package com.dotmarketing.portlets.templates.design.bean;
 
 import com.dotcms.rest.api.v1.workflow.SchemesAndSchemesContentTypeView;
+import com.dotmarketing.business.APILocator;
+import com.dotmarketing.exception.DotDataException;
+import com.dotmarketing.exception.DotSecurityException;
+import com.dotmarketing.portlets.containers.business.FileAssetContainerUtil;
+import com.dotmarketing.portlets.containers.model.Container;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -36,7 +41,7 @@ public static class Builder {
          * @param newIntanceId New UUID
          */
         public Builder change(final String containerId, final String oldIntanceId, final String newIntanceId) {
-            changes.add(new ContainerChanged(containerId, oldIntanceId, newIntanceId));
+            changes.add(new ContainerChanged(getContainerId(containerId), oldIntanceId, newIntanceId));
             return this;
         }
 
@@ -48,7 +53,7 @@ public Builder change(final String containerId, final String oldIntanceId, final
          * @param oldIntanceId Old UUID
          */
         public Builder remove(final String containerId, final String oldIntanceId) {
-            changes.add(new ContainerChanged(containerId, oldIntanceId, ContainerUUID.UUID_DEFAULT_VALUE));
+            changes.add(new ContainerChanged(getContainerId(containerId), oldIntanceId, ContainerUUID.UUID_DEFAULT_VALUE));
             return this;
         }
 
@@ -59,9 +64,26 @@ public Builder remove(final String containerId, final String oldIntanceId) {
          * @param newIntanceId
          */
         public Builder include(final String containerId, final String newIntanceId) {
-            changes.add(new ContainerChanged(containerId, ContainerUUID.UUID_DEFAULT_VALUE, newIntanceId));
+            changes.add(new ContainerChanged(getContainerId(containerId), ContainerUUID.UUID_DEFAULT_VALUE, newIntanceId));
             return this;
         }
+
+        private String getContainerId(String containerId) {
+
+            if (FileAssetContainerUtil.getInstance().isFolderAssetContainerId(containerId)) {
+                try {
+                    return APILocator.getContainerAPI().findContainer(containerId, APILocator.systemUser(),
+                                    false, false)
+                            .map(Container::getIdentifier)
+                            .orElse(containerId);
+                } catch (DotDataException | DotSecurityException e) {
+                    return containerId;
+                }
+            }
+
+            return containerId;
+        }
+
         public LayoutChanges build() {
             return new LayoutChanges(this);
         }