SITES-19799: fix for nested panel containers (#2675)

* SITES-19799: fix for nested panel containers

---------

Co-authored-by: bcenusa <[email protected]>
Co-authored-by: adracea <[email protected]>

Author: 3 people

content/src/content/jcr_root/apps/core/wcm/components/accordion/v1/accordion/clientlibs/editorhook/js/panelcontainer.js

@@ -24,7 +24,8 @@
                 selector: ".cmp-accordion",
                 wrapperSelector: '[data-panelcontainer="accordion"]',
                 itemSelector: "[data-cmp-hook-accordion='panel']",
-                itemActiveSelector: "[data-cmp-hook-accordion='item'][data-cmp-expanded] [data-cmp-hook-accordion='panel']"
+                itemActiveSelector: "[data-cmp-hook-accordion='item'][data-cmp-expanded] [data-cmp-hook-accordion='panel']",
+                itemSelectorWrapper: ".cmp-accordion__item"
             });
         }
     });

content/src/content/jcr_root/apps/core/wcm/components/carousel/v1/carousel/clientlibs/editorhook/js/panelcontainer.js

@@ -24,7 +24,8 @@
                 selector: ".cmp-carousel",
                 wrapperSelector: '[data-panelcontainer="carousel"]',
                 itemSelector: "[data-cmp-hook-carousel='item']",
-                itemActiveSelector: ".cmp-carousel__item--active"
+                itemActiveSelector: ".cmp-carousel__item--active",
+                itemSelectorWrapper: ".cmp-carousel__content"
             });
         }
     });

content/src/content/jcr_root/apps/core/wcm/components/commons/editor/clientlibs/panelcontainer/v1/js/PanelContainer.js

@@ -102,7 +102,8 @@
             var that = this;
             var activeIndex = 0;
             if (that._config.el && that._config.panelContainerType) {
-                var items = $(this._config.el).find(that._config.panelContainerType.itemSelector);
+                var itemsSelectorWrapper = that._config.panelContainerType.itemSelectorWrapper ? that._config.panelContainerType.itemSelectorWrapper + " > " : "";
+                var items = $(this._config.el).find("> " + itemsSelectorWrapper + that._config.panelContainerType.itemSelector);
                 items.each(function(index) {
                     var activeItemSelector = that._config.panelContainerType.itemActiveSelector;
                     if (that._config.el.id) {

testing/it/e2e-selenium/src/test/java/com/adobe/cq/wcm/core/components/it/seljup/tests/accordion/v1/AccordionIT.java

@@ -54,8 +54,7 @@
 import com.codeborne.selenide.SelenideElement;
 import com.codeborne.selenide.WebDriverRunner;
 
-import static com.adobe.cq.wcm.core.components.it.seljup.util.Commons.RT_ACCORDION_V1;
-import static com.adobe.cq.wcm.core.components.it.seljup.util.Commons.RT_TEASER_V1;
+import static com.adobe.cq.wcm.core.components.it.seljup.util.Commons.*;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -737,6 +736,42 @@ public void testNested() throws  InterruptedException, ClientException {
         Commons.switchToDefaultContext();
     }
 
+    /**
+     * Test: Open Config Dialog For Accordion Items
+     *
+     * 1. add a nested accordion and a text
+     * 2. check the config dialog for the accordion
+     * 3. check the config dialog for the text
+     *
+     * @throws InterruptedException
+     * @throws ClientException
+     */
+    @Test
+    @DisplayName("Test: Open Config Dialog For Accordion Items")
+    public void testOpenConfigDialog() throws  InterruptedException, ClientException {
+
+        //1.
+        String textProxy = RT_TEXT_V2;
+        String accordion1Path = addAccordionItem(proxyPath, cmpPath,  "Accordion 1");
+        String textPath = addAccordionItem(textProxy, cmpPath,  "Text 1");
+
+        //2.
+        selectExpandedItem(0);
+        accordion.openEditDialog(accordion1Path);
+        SelenideElement editDialogTitle = Selenide.$(".cq-dialog-header._coral-Dialog-title");
+        assertTrue(editDialogTitle.getText().equals("Accordion"));
+        Commons.saveConfigureDialog();
+
+        //3.
+        selectExpandedItem(1);
+        accordion.openEditDialog(textPath);
+        editDialogTitle = Selenide.$(".cq-dialog-header._coral-Dialog-title");
+        assertTrue(editDialogTitle.getText().equals("Text"));
+        Commons.saveConfigureDialog();
+
+        Commons.switchToDefaultContext();
+    }
+
     /**
      * Test: Allowed components
      */