SITES-19836 Ghost component in container is displayed on publish and …

…preview instances (#2838)
adobe · Aug 13, 2024 · 37aee59 · 37aee59
1 parent 5fe3b41
commit 37aee59
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/...rc/main/java/com/adobe/cq/wcm/core/components/internal/models/v1/LayoutContainerImpl.java b/...rc/main/java/com/adobe/cq/wcm/core/components/internal/models/v1/LayoutContainerImpl.java
@@ -22,6 +22,7 @@
 
 import javax.annotation.PostConstruct;
 
+import com.day.cq.wcm.api.WCMMode;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.models.annotations.Model;
 import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy;
@@ -44,6 +45,7 @@ public class LayoutContainerImpl extends AbstractContainerImpl implements Layout
      * The resource type.
      */
     protected static final String RESOURCE_TYPE_V1 = "core/wcm/components/container/v1/container";
+    protected static final String GHOST_COMPONENT_RESOURCE_TYPE = "wcm/msm/components/ghost";
 
     /**
      * The layout type.
@@ -103,7 +105,10 @@ protected final List<ResourceListItemImpl> readItems() {
     @Override
     public final List<ContainerItem> getChildren() {
         if (this.items == null) {
+            WCMMode wcmMode = WCMMode.fromRequest(this.request);
+            boolean showGhostComponent = wcmMode == WCMMode.EDIT;
             this.items = ComponentUtils.getChildComponents(this.resource, this.request).stream()
+                .filter(item -> showGhostComponent || !GHOST_COMPONENT_RESOURCE_TYPE.equals(item.getResourceType()))
                 .map(ContainerItemImpl::new)
                 .collect(Collectors.toList());
         }

diff --git a/bundles/core/src/test/resources/container/test-content.json b/bundles/core/src/test/resources/container/test-content.json
@@ -31,6 +31,12 @@
                             "jcr:description"   : "Teaser 2 description",
                             "sling:resourceType": "core/wcm/components/teaser/v1/teaser"
                         },
+                        "item_ghost": {
+                            "jcr:primaryType"   : "nt:unstructured",
+                            "jcr:title"         : "Ghost",
+                            "jcr:description"   : "Ghost component",
+                            "sling:resourceType": "wcm/msm/components/ghost"
+                        },
                         "item_3": {}
                     },
                     "container-2"       : {