LPD-44292 Uses the util class to get the proper parent layout structu…

…re item
rotty3000 · Dec 17, 2024 · 486aaec · 486aaec
1 parent 6181859
commit 486aaec
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 10 deletions.
diff --git a/...source/util/layout/structure/item/importer/CollectionItemLayoutStructureItemImporter.java b/...source/util/layout/structure/item/importer/CollectionItemLayoutStructureItemImporter.java
@@ -6,6 +6,7 @@
 package com.liferay.headless.admin.site.internal.resource.util.layout.structure.item.importer;
 
 import com.liferay.headless.admin.site.dto.v1_0.PageElement;
+import com.liferay.headless.admin.site.internal.resource.util.layout.structure.LayoutStructureUtil;
 import com.liferay.headless.admin.site.internal.resource.util.layout.structure.item.importer.context.LayoutStructureItemImporterContext;
 import com.liferay.layout.util.structure.LayoutStructure;
 import com.liferay.layout.util.structure.LayoutStructureItem;
@@ -26,7 +27,8 @@ public LayoutStructureItem addLayoutStructureItem(
 
 		return layoutStructure.addCollectionItemLayoutStructureItem(
 			pageElement.getExternalReferenceCode(),
-			pageElement.getParentExternalReferenceCode(),
+			LayoutStructureUtil.getParentExternalReferenceCode(
+				pageElement, layoutStructure),
 			pageElement.getPosition());
 	}
 

diff --git a/...l/resource/util/layout/structure/item/importer/CollectionLayoutStructureItemImporter.java b/...l/resource/util/layout/structure/item/importer/CollectionLayoutStructureItemImporter.java
@@ -8,6 +8,7 @@
 import com.liferay.headless.admin.site.dto.v1_0.EmptyCollectionConfig;
 import com.liferay.headless.admin.site.dto.v1_0.PageCollectionDefinition;
 import com.liferay.headless.admin.site.dto.v1_0.PageElement;
+import com.liferay.headless.admin.site.internal.resource.util.layout.structure.LayoutStructureUtil;
 import com.liferay.headless.admin.site.internal.resource.util.layout.structure.item.importer.context.LayoutStructureItemImporterContext;
 import com.liferay.layout.util.CollectionPaginationUtil;
 import com.liferay.layout.util.structure.CollectionStyledLayoutStructureItem;
@@ -36,7 +37,8 @@ public LayoutStructureItem addLayoutStructureItem(
 				(CollectionStyledLayoutStructureItem)
 					layoutStructure.addCollectionStyledLayoutStructureItem(
 						pageElement.getExternalReferenceCode(),
-						pageElement.getParentExternalReferenceCode(),
+						LayoutStructureUtil.getParentExternalReferenceCode(
+							pageElement, layoutStructure),
 						pageElement.getPosition());
 
 		PageCollectionDefinition pageCollectionDefinition =

diff --git a/...ernal/resource/util/layout/structure/item/importer/ColumnLayoutStructureItemImporter.java b/...ernal/resource/util/layout/structure/item/importer/ColumnLayoutStructureItemImporter.java
@@ -7,6 +7,7 @@
 
 import com.liferay.headless.admin.site.dto.v1_0.PageColumnDefinition;
 import com.liferay.headless.admin.site.dto.v1_0.PageElement;
+import com.liferay.headless.admin.site.internal.resource.util.layout.structure.LayoutStructureUtil;
 import com.liferay.headless.admin.site.internal.resource.util.layout.structure.item.importer.context.LayoutStructureItemImporterContext;
 import com.liferay.layout.util.structure.ColumnLayoutStructureItem;
 import com.liferay.layout.util.structure.LayoutStructure;
@@ -30,7 +31,8 @@ public LayoutStructureItem addLayoutStructureItem(
 			(ColumnLayoutStructureItem)
 				layoutStructure.addColumnLayoutStructureItem(
 					pageElement.getExternalReferenceCode(),
-					pageElement.getParentExternalReferenceCode(),
+					LayoutStructureUtil.getParentExternalReferenceCode(
+						pageElement, layoutStructure),
 					pageElement.getPosition());
 
 		PageColumnDefinition pageColumnDefinition =

diff --git a/...al/resource/util/layout/structure/item/importer/ContainerLayoutStructureItemImporter.java b/...al/resource/util/layout/structure/item/importer/ContainerLayoutStructureItemImporter.java
@@ -7,6 +7,7 @@
 
 import com.liferay.headless.admin.site.dto.v1_0.PageContainerDefinition;
 import com.liferay.headless.admin.site.dto.v1_0.PageElement;
+import com.liferay.headless.admin.site.internal.resource.util.layout.structure.LayoutStructureUtil;
 import com.liferay.headless.admin.site.internal.resource.util.layout.structure.item.importer.context.LayoutStructureItemImporterContext;
 import com.liferay.layout.util.structure.ContainerStyledLayoutStructureItem;
 import com.liferay.layout.util.structure.LayoutStructure;
@@ -30,7 +31,8 @@ public LayoutStructureItem addLayoutStructureItem(
 			(ContainerStyledLayoutStructureItem)
 				layoutStructure.addContainerStyledLayoutStructureItem(
 					pageElement.getExternalReferenceCode(),
-					pageElement.getParentExternalReferenceCode(),
+					LayoutStructureUtil.getParentExternalReferenceCode(
+						pageElement, layoutStructure),
 					pageElement.getPosition());
 
 		PageContainerDefinition pageContainerDefinition =

diff --git a/...nal/resource/util/layout/structure/item/importer/DropZoneLayoutStructureItemImporter.java b/...nal/resource/util/layout/structure/item/importer/DropZoneLayoutStructureItemImporter.java
@@ -6,6 +6,7 @@
 package com.liferay.headless.admin.site.internal.resource.util.layout.structure.item.importer;
 
 import com.liferay.headless.admin.site.dto.v1_0.PageElement;
+import com.liferay.headless.admin.site.internal.resource.util.layout.structure.LayoutStructureUtil;
 import com.liferay.headless.admin.site.internal.resource.util.layout.structure.item.importer.context.LayoutStructureItemImporterContext;
 import com.liferay.layout.util.structure.LayoutStructure;
 import com.liferay.layout.util.structure.LayoutStructureItem;
@@ -26,7 +27,8 @@ public LayoutStructureItem addLayoutStructureItem(
 
 		return layoutStructure.addDropZoneLayoutStructureItem(
 			pageElement.getExternalReferenceCode(),
-			pageElement.getParentExternalReferenceCode(),
+			LayoutStructureUtil.getParentExternalReferenceCode(
+				pageElement, layoutStructure),
 			pageElement.getPosition());
 	}
 

diff --git a/...nternal/resource/util/layout/structure/item/importer/FormLayoutStructureItemImporter.java b/...nternal/resource/util/layout/structure/item/importer/FormLayoutStructureItemImporter.java
@@ -8,6 +8,7 @@
 import com.liferay.headless.admin.site.dto.v1_0.FormConfig;
 import com.liferay.headless.admin.site.dto.v1_0.PageElement;
 import com.liferay.headless.admin.site.dto.v1_0.PageFormDefinition;
+import com.liferay.headless.admin.site.internal.resource.util.layout.structure.LayoutStructureUtil;
 import com.liferay.headless.admin.site.internal.resource.util.layout.structure.item.importer.context.LayoutStructureItemImporterContext;
 import com.liferay.headless.delivery.dto.v1_0.ClassTypeReference;
 import com.liferay.headless.delivery.dto.v1_0.ContextReference;
@@ -37,7 +38,8 @@ public LayoutStructureItem addLayoutStructureItem(
 			(FormStyledLayoutStructureItem)
 				layoutStructure.addFormStyledLayoutStructureItem(
 					pageElement.getExternalReferenceCode(),
-					pageElement.getParentExternalReferenceCode(),
+					LayoutStructureUtil.getParentExternalReferenceCode(
+						pageElement, layoutStructure),
 					pageElement.getPosition());
 
 		PageFormDefinition pageFormDefinition =

diff --git a/...rce/util/layout/structure/item/importer/FormStepContainerLayoutStructureItemImporter.java b/...rce/util/layout/structure/item/importer/FormStepContainerLayoutStructureItemImporter.java
@@ -6,6 +6,7 @@
 package com.liferay.headless.admin.site.internal.resource.util.layout.structure.item.importer;
 
 import com.liferay.headless.admin.site.dto.v1_0.PageElement;
+import com.liferay.headless.admin.site.internal.resource.util.layout.structure.LayoutStructureUtil;
 import com.liferay.headless.admin.site.internal.resource.util.layout.structure.item.importer.context.LayoutStructureItemImporterContext;
 import com.liferay.layout.util.structure.LayoutStructure;
 import com.liferay.layout.util.structure.LayoutStructureItem;
@@ -26,7 +27,8 @@ public LayoutStructureItem addLayoutStructureItem(
 
 		return layoutStructure.addFormStepContainerStyledLayoutStructureItem(
 			pageElement.getExternalReferenceCode(),
-			pageElement.getParentExternalReferenceCode(),
+			LayoutStructureUtil.getParentExternalReferenceCode(
+				pageElement, layoutStructure),
 			pageElement.getPosition());
 	}
 

diff --git a/...resource/util/layout/structure/item/importer/FormStepItemLayoutStructureItemImporter.java b/...resource/util/layout/structure/item/importer/FormStepItemLayoutStructureItemImporter.java
@@ -6,6 +6,7 @@
 package com.liferay.headless.admin.site.internal.resource.util.layout.structure.item.importer;
 
 import com.liferay.headless.admin.site.dto.v1_0.PageElement;
+import com.liferay.headless.admin.site.internal.resource.util.layout.structure.LayoutStructureUtil;
 import com.liferay.headless.admin.site.internal.resource.util.layout.structure.item.importer.context.LayoutStructureItemImporterContext;
 import com.liferay.layout.util.structure.LayoutStructure;
 import com.liferay.layout.util.structure.LayoutStructureItem;
@@ -26,7 +27,8 @@ public LayoutStructureItem addLayoutStructureItem(
 
 		return layoutStructure.addFormStepLayoutStructureItem(
 			pageElement.getExternalReferenceCode(),
-			pageElement.getParentExternalReferenceCode(),
+			LayoutStructureUtil.getParentExternalReferenceCode(
+				pageElement, layoutStructure),
 			pageElement.getPosition());
 	}
 

diff --git a/...urce/util/layout/structure/item/importer/FragmentDropZoneLayoutStructureItemImporter.java b/...urce/util/layout/structure/item/importer/FragmentDropZoneLayoutStructureItemImporter.java
@@ -7,6 +7,7 @@
 
 import com.liferay.headless.admin.site.dto.v1_0.PageElement;
 import com.liferay.headless.admin.site.dto.v1_0.PageFragmentDropZoneDefinition;
+import com.liferay.headless.admin.site.internal.resource.util.layout.structure.LayoutStructureUtil;
 import com.liferay.headless.admin.site.internal.resource.util.layout.structure.item.importer.context.LayoutStructureItemImporterContext;
 import com.liferay.layout.util.structure.FragmentDropZoneLayoutStructureItem;
 import com.liferay.layout.util.structure.LayoutStructure;
@@ -31,7 +32,8 @@ public LayoutStructureItem addLayoutStructureItem(
 				(FragmentDropZoneLayoutStructureItem)
 					layoutStructure.addFragmentDropZoneLayoutStructureItem(
 						pageElement.getExternalReferenceCode(),
-						pageElement.getParentExternalReferenceCode(),
+						LayoutStructureUtil.getParentExternalReferenceCode(
+							pageElement, layoutStructure),
 						pageElement.getPosition());
 
 		PageFragmentDropZoneDefinition pageFragmentDropZoneDefinition =

diff --git a/...internal/resource/util/layout/structure/item/importer/RowLayoutStructureItemImporter.java b/...internal/resource/util/layout/structure/item/importer/RowLayoutStructureItemImporter.java
@@ -7,6 +7,7 @@
 
 import com.liferay.headless.admin.site.dto.v1_0.PageElement;
 import com.liferay.headless.admin.site.dto.v1_0.PageRowDefinition;
+import com.liferay.headless.admin.site.internal.resource.util.layout.structure.LayoutStructureUtil;
 import com.liferay.headless.admin.site.internal.resource.util.layout.structure.item.importer.context.LayoutStructureItemImporterContext;
 import com.liferay.layout.util.constants.LayoutDataItemTypeConstants;
 import com.liferay.layout.util.structure.LayoutStructure;
@@ -33,7 +34,8 @@ public LayoutStructureItem addLayoutStructureItem(
 				layoutStructure.addLayoutStructureItem(
 					pageElement.getExternalReferenceCode(),
 					LayoutDataItemTypeConstants.TYPE_ROW,
-					pageElement.getParentExternalReferenceCode(),
+					LayoutStructureUtil.getParentExternalReferenceCode(
+						pageElement, layoutStructure),
 					pageElement.getPosition());
 
 		PageRowDefinition pageRowDefinition =