Merge remote-tracking branch 'owls/MC-3428-remove-accordion' into cms-team-2-sprint-14

Author: krissyhiserote

app/code/Magento/PageBuilder/Model/Config/ContentType/Converter.php

@@ -127,12 +127,6 @@ private function convertAppearanceData(\DOMElement $appearanceNode): array
             $appearanceData,
             $this->convertAppearanceStyles($appearanceNode)
         );
-        $readerNode = $appearanceNode->getElementsByTagName('reader')->item(0);
-        if ($readerNode && $readerNode->nodeValue) {
-            $appearanceData['readers'] = [$readerNode->nodeValue];
-        } else {
-            $appearanceData['readers'] = $this->convertAppearanceReaders($appearanceNode);
-        }
         $elementsNode = $appearanceNode->getElementsByTagName('elements')->item(0);
         if ($elementsNode) {
             $appearanceData['elements'] = $this->convertElements($elementsNode);
@@ -165,24 +159,6 @@ private function convertAppearanceStyles(\DOMElement $elementNode): array
         return $data;
     }
 
-    /**
-     * Convert appearance readers
-     *
-     * @param \DOMElement $elementNode
-     * @return array
-     */
-    private function convertAppearanceReaders(\DOMElement $elementNode): array
-    {
-        $readersNode = $elementNode->getElementsByTagName('readers')->item(0);
-        $readers = [];
-        if ($readersNode) {
-            foreach ($readersNode->getElementsByTagName('reader') as $readerNode) {
-                $readers[] = $this->getAttributeValue($readerNode, 'component');
-            }
-        }
-        return $readers;
-    }
-
     /**
      * Validate that configuration appearances has default appearance
      *

app/code/Magento/PageBuilder/Model/Config/ContentType/Reader.php

@@ -34,8 +34,7 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
             => 'source',
         self::TYPE_PATH . '/appearances/appearance/elements/element/css/filter/class' => 'source',
         self::TYPE_PATH . '/appearances/appearance/converters/converter' => 'name',
-        self::TYPE_PATH . '/appearances/appearance/converters/converter/config/item' => 'name',
-        self::TYPE_PATH . '/appearances/appearance/readers/reader' => 'name'
+        self::TYPE_PATH . '/appearances/appearance/converters/converter/config/item' => 'name'
     ];
 
     /**

app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Accordion.php

@@ -60,12 +60,10 @@ public function render(array $itemData, array $additionalData = []) : string
         $eavData = $this->eavAttributeLoader->load($itemData['entityId']);
 
         $rootElementAttributes = [
-            'data-element' => 'main',
-            'data-role' => 'accordion',
-            'data-appearance' => 'default',
             'data-mage-init' => $this->getMageInitValue($itemData),
             'class' => 'pagebuilder-accordion ' . ($eavData['css_classes'] ?? '')
         ];
+
         $rootElementAttributes['class'] = rtrim($rootElementAttributes['class']);
 
         if (isset($itemData['formData'])) {
@@ -75,11 +73,14 @@ public function render(array $itemData, array $additionalData = []) : string
             }
         }
 
-        $rootElementHtml = '<div';
+        $accordionHtml = '<div';
         foreach ($rootElementAttributes as $attributeName => $attributeValue) {
-            $rootElementHtml .= $attributeValue ? " $attributeName=\"$attributeValue\"" : '';
+            $accordionHtml .= $attributeValue ? " $attributeName=\"$attributeValue\"" : '';
         }
-        $rootElementHtml .= '>' . (isset($additionalData['children']) ? $additionalData['children'] : '') . '</div>';
+        $accordionHtml .= '>' . (isset($additionalData['children']) ? $additionalData['children'] : '') . '</div>';
+
+        $rootElementHtml = '<div data-element="main" data-role="html" data-appearance="default">';
+        $rootElementHtml .= $accordionHtml . '</div>';
 
         return $rootElementHtml;
     }

app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/AccordionItem.php

@@ -47,8 +47,7 @@ public function render(array $itemData, array $additionalData = []) : string
         // data-role is not present on the accordion item as it's no longer it's own type
         $rootElementAttributes = [
             'data-collapsible' => 'true',
-            'class' => 'accordion-collapsible',
-            'data-open-on-load' => $eavData['open_on_load'] ? "1" : "0"
+            'class' => 'item title'
         ];
 
         if (isset($itemData['formData'])) {
@@ -62,8 +61,8 @@ public function render(array $itemData, array $additionalData = []) : string
         foreach ($rootElementAttributes as $attributeName => $attributeValue) {
             $rootElementHtml .= $attributeValue !== '' ? " $attributeName=\"$attributeValue\"" : '';
         }
-        $rootElementHtml .= '><div data-role="trigger"><span>' . $eavData['title'] . '</span></div></div>'
-        . '<div data-content="true" class="accordion-content">' . $eavData['textarea'] . '</div>';
+        $rootElementHtml .= '><div class="switch" data-role="trigger"><span>' . $eavData['title'] . '</span></div></div>'
+        . '<div data-content="true" class="item content">' . $eavData['textarea'] . '</div>';
 
         return $rootElementHtml;
     }

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeAccordionActionGroup.xml

@@ -22,12 +22,14 @@
         <click selector="{{PageBuilderPanel.addContentGroup}}" stepKey="clickAddContentGroup"/>
     </actionGroup>
     <actionGroup name="validateGroupsAndContentTypes">
+        <seeNumberOfElements selector="{{PageBuilderPanel.allPanelGroups}}" userInput="4" stepKey="seeNumberOfGroups"/>
+        <seeNumberOfElements selector="{{PageBuilderPanel.allGroupContentTypes('layout')}}" userInput="3" stepKey="seeNumberOfLayoutGroupContentTypes"/>
         <see userInput="Layout" selector="{{PageBuilderPanel.layoutGroup}}" stepKey="seeLayoutGroup"/>
         <see userInput="Row" selector="{{PageBuilderPanel.layoutGroupContentType}}" stepKey="seeLayoutGroupRow"/>
         <see userInput="Column" selector="{{PageBuilderPanel.layoutGroupContentType}}" stepKey="seeLayoutGroupColumn"/>
         <see userInput="Tabs" selector="{{PageBuilderPanel.layoutGroupContentType}}" stepKey="seeLayoutGroupTabs"/>
-        <see userInput="Accordion" selector="{{PageBuilderPanel.layoutGroupContentType}}" stepKey="seeLayoutGroupAccordion"/>
         <click selector="{{PageBuilderPanel.elementsGroup}}" stepKey="clickElementsGroup"/>
+        <seeNumberOfElements selector="{{PageBuilderPanel.allGroupContentTypes('elements')}}" userInput="7" stepKey="seeNumberOfElementsGroupContentTypes"/>
         <see userInput="Elements" selector="{{PageBuilderPanel.elementsGroup}}" stepKey="seeElementsGroup"/>
         <see userInput="Text" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupText"/>
         <see userInput="Heading" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupHeading"/>
@@ -37,13 +39,15 @@
         <see userInput="Anchor" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupAnchor"/>
         <see userInput="HTML Code" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupHtml"/>
         <click selector="{{PageBuilderPanel.mediaGroup}}" stepKey="clickMediaGroup"/>
+        <seeNumberOfElements selector="{{PageBuilderPanel.allGroupContentTypes('media')}}" userInput="5" stepKey="seeNumberOfMediaGroupContentTypes"/>
         <see userInput="Media" selector="{{PageBuilderPanel.mediaGroup}}" stepKey="seeMediaGroup"/>
         <see userInput="Image" selector="{{PageBuilderPanel.mediaGroupContentType}}" stepKey="seeMediaGroupImage"/>
         <see userInput="Video" selector="{{PageBuilderPanel.mediaGroupContentType}}" stepKey="seeMediaGroupVideo"/>
         <see userInput="Banner" selector="{{PageBuilderPanel.mediaGroupContentType}}" stepKey="seeMediaGroupBanner"/>
         <see userInput="Slider" selector="{{PageBuilderPanel.mediaGroupContentType}}" stepKey="seeMediaGroupSlider"/>
         <see userInput="Map" selector="{{PageBuilderPanel.mediaGroupContentType}}" stepKey="seeMediaGroupMap"/>
         <click selector="{{PageBuilderPanel.addContentGroup}}" stepKey="clickAddContentGroup"/>
+        <seeNumberOfElements selector="{{PageBuilderPanel.allGroupContentTypes('add_content')}}" userInput="2" stepKey="seeNumberOfAddContentGroupContentTypes"/>
         <see userInput="Add Content" selector="{{PageBuilderPanel.addContentGroup}}" stepKey="seeAddContentGroup"/>
         <see userInput="Block" selector="{{PageBuilderPanel.addContentGroupContentType}}" stepKey="seeAddContentGroupBlock"/>
         <see userInput="Products" selector="{{PageBuilderPanel.addContentGroupContentType}}" stepKey="seeAddContentGroupProducts"/>

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/PanelActionGroup.xml

@@ -40,12 +40,6 @@
         <data key="role">tab-item</data>
         <data key="pageNamePrefix">tab</data>
     </entity>
-    <entity name="PageBuilderAccordionContentType" type="pagebuilder_content_type">
-        <data key="name">Accordion</data>
-        <data key="section">Layout</data>
-        <data key="role">accordion</data>
-        <data key="pageNamePrefix">accordion</data>
-    </entity>
     <!-- Elements -->
     <entity name="PageBuilderTextContentType" type="pagebuilder_content_type">
         <data key="name">Text</data>

app/code/Magento/PageBuilder/Test/Mftf/Data/AccordionData.xml

@@ -42,6 +42,8 @@
         <element name="panelCollapsed" type="button" selector='(//div[contains(@class, "pagebuilder-stage") and contains(@class, "panel-collapsed")])'/>
         <element name="expandPanel" type="button" selector='//div[contains(@class, "expand")]//a'/>
         <element name="firstSection" type="button" selector='//*[@id="pagebuilder-panel-groups"]/li[1]' timeout="30"/>
+        <element name="allPanelGroups" type="button" selector="#pagebuilder-panel-groups .group-title"/>
+        <element name="allGroupContentTypes" type="button" selector="#pagebuilder-panel-groups #group-{{arg1}} .pagebuilder-draggable-content-type" parameterized="true"/>
         <element name="panelGroup" type="button" selector="//div[@id='pagebuilder-panel']//h4[.='{{arg1}}']" parameterized="true"/>
         <element name="panelGroupActive" type="button" selector="//div[@id='pagebuilder-panel']//li[@class='active']//h4[.='{{arg1}}']" parameterized="true"/>
         <element name="layoutGroup" type="button" selector='//*[@id="group-layout"]' timeout="10"/>