Contents of a layout region get duplicated after save #9753

(cherry picked from commit 56d7a3a)
enonic · Oct 3, 2022 · ed75e46 · ed75e46
1 parent 2d573aa
commit ed75e46
Show file tree

Hide file tree

Showing 2 changed files with 109 additions and 4 deletions.
diff --git a/...ontent/src/main/java/com/enonic/xp/core/impl/content/serializer/RegionDataSerializer.java b/...ontent/src/main/java/com/enonic/xp/core/impl/content/serializer/RegionDataSerializer.java
@@ -75,7 +75,7 @@ private boolean isItemChildOf( final PropertySet item, final String parentPath )
     {
         final String itemPath = item.getString( PATH );
 
-        return itemPath.startsWith( parentPath ) && ( getLevel( itemPath ) - getLevel( parentPath ) == 1 );
+        return isItemPathStartsWith( itemPath, parentPath ) && ( getLevel( itemPath ) - getLevel( parentPath ) == 1 );
     }
 
     private int getLevel( final String path )
@@ -101,14 +101,20 @@ private List<PropertySet> getDescendantsOf( final PropertySet item, final List<P
     {
         final String parentPath = item.getString( PATH );
 
-        return componentsAsData.stream().filter( componentAsData -> isItemDescendantOf( componentAsData, parentPath ) ).collect(
-            Collectors.toList() );
+        return componentsAsData.stream()
+            .filter( componentAsData -> isItemDescendantOf( componentAsData, parentPath ) )
+            .collect( Collectors.toList() );
     }
 
     private boolean isItemDescendantOf( final PropertySet item, final String parentPath )
     {
         final String itemPath = item.getString( PATH );
 
-        return itemPath.startsWith( parentPath );
+        return isItemPathStartsWith( itemPath, parentPath );
+    }
+
+    private boolean isItemPathStartsWith( final String itemPath, final String parentPath )
+    {
+        return parentPath == ComponentPath.DIVIDER || itemPath.startsWith( parentPath + ComponentPath.DIVIDER );
     }
 }
diff --git a/...nt/src/test/java/com/enonic/xp/core/impl/content/serializer/LayoutDataSerializerTest.java b/...nt/src/test/java/com/enonic/xp/core/impl/content/serializer/LayoutDataSerializerTest.java
@@ -0,0 +1,99 @@
+package com.enonic.xp.core.impl.content.serializer;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import com.enonic.xp.core.impl.content.page.AbstractDataSerializerTest;
+import com.enonic.xp.data.Property;
+import com.enonic.xp.data.PropertySet;
+import com.enonic.xp.data.PropertyTree;
+import com.enonic.xp.form.Form;
+import com.enonic.xp.page.DescriptorKey;
+import com.enonic.xp.region.LayoutComponent;
+import com.enonic.xp.region.LayoutDescriptor;
+import com.enonic.xp.region.LayoutRegions;
+import com.enonic.xp.region.Region;
+import com.enonic.xp.region.RegionDescriptor;
+import com.enonic.xp.region.RegionDescriptors;
+import com.enonic.xp.region.TextComponent;
+
+import static com.enonic.xp.core.impl.content.serializer.ComponentDataSerializer.COMPONENTS;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class LayoutDataSerializerTest extends AbstractDataSerializerTest
+{
+    private LayoutComponentDataSerializer layoutDataSerializer;
+
+    @BeforeEach
+    public void setUp()
+    {
+        final RegionDataSerializer regionSerializer = new RegionDataSerializer( ComponentDataSerializerProvider.create().
+            layoutDescriptorService( layoutDescriptorService ).
+            partDescriptorService( partDescriptorService ).
+            build() );
+
+        this.layoutDataSerializer = new LayoutComponentDataSerializer( this.layoutDescriptorService, regionSerializer );
+    }
+
+    @Test
+    public void testLayoutWithTwoRegions()
+    {
+        genAndCheckLayout( "left", "right");
+    }
+
+    @Test
+    public void testLayoutWithRegionsWithSimilarNames()
+    {
+        genAndCheckLayout( "left", "left2");
+    }
+
+    private void genAndCheckLayout( final String regionName1, final String regionName2 )
+    {
+        final LayoutComponent layoutComponent = createLayoutComponent( regionName1, regionName2 );
+
+        final PropertyTree layoutAsData = new PropertyTree();
+        layoutDataSerializer.toData( layoutComponent, layoutAsData.getRoot() );
+        final List<PropertySet> componentsAsData = layoutAsData.getProperties( COMPONENTS ).stream().filter( Property::hasNotNullValue ).
+            map( Property::getSet ).collect( Collectors.toList() );
+        final LayoutComponent parsedLayout = layoutDataSerializer.fromData( layoutAsData.getSet( COMPONENTS ), componentsAsData );
+
+        assertEquals( layoutComponent, parsedLayout );
+    }
+
+    private LayoutComponent createLayoutComponent( final String regionName1, final String regionName2)
+    {
+        final String layoutName = "MyLayout";
+        final DescriptorKey layoutDescriptorKey = DescriptorKey.from( "layoutDescriptor:name" );
+
+        final Region region1 = Region.create().
+            name( regionName1 ).
+            build();
+
+        final Region region2 = Region.create().
+            name( regionName2 ).
+            add( TextComponent.create().build() ).
+            build();
+
+        final LayoutRegions layoutRegions = LayoutRegions.create().add( region1 ).add( region2 ).build();
+
+        Mockito.when( layoutDescriptorService.getByKey( layoutDescriptorKey ) ).thenReturn( LayoutDescriptor.create().
+            key( layoutDescriptorKey ).
+            displayName( layoutName ).
+            config( Form.create().build() ).
+            regions( RegionDescriptors.create().
+            add( RegionDescriptor.create().
+            name( regionName1 ).
+            build() ).
+            add( RegionDescriptor.create().
+            name( regionName2 ).
+            build() ).
+            build() ).
+            build() );
+
+        return LayoutComponent.create().descriptor( layoutDescriptorKey ).regions( layoutRegions ).build();
+    }
+}