Skip to content

Commit b1dbfbf

Browse files
irenelagnoirenelagno
committed
Merge branch '2.3-develop' into MC-1405
# Conflicts: # app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest.xml # app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/preview.js # app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview.ts # app/code/Magento/PageBuilder/view/frontend/layout/default.xml
2 parents f4b68bb + f4528ed commit b1dbfbf

File tree

273 files changed

+4518
-6885
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

273 files changed

+4518
-6885
lines changed

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

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,6 @@ private function convertAppearanceData(\DOMElement $appearanceNode): array
127127
$appearanceData,
128128
$this->convertAppearanceStyles($appearanceNode)
129129
);
130-
$readerNode = $appearanceNode->getElementsByTagName('reader')->item(0);
131-
if ($readerNode && $readerNode->nodeValue) {
132-
$appearanceData['readers'] = [$readerNode->nodeValue];
133-
} else {
134-
$appearanceData['readers'] = $this->convertAppearanceReaders($appearanceNode);
135-
}
136130
$elementsNode = $appearanceNode->getElementsByTagName('elements')->item(0);
137131
if ($elementsNode) {
138132
$appearanceData['elements'] = $this->convertElements($elementsNode);
@@ -165,24 +159,6 @@ private function convertAppearanceStyles(\DOMElement $elementNode): array
165159
return $data;
166160
}
167161

168-
/**
169-
* Convert appearance readers
170-
*
171-
* @param \DOMElement $elementNode
172-
* @return array
173-
*/
174-
private function convertAppearanceReaders(\DOMElement $elementNode): array
175-
{
176-
$readersNode = $elementNode->getElementsByTagName('readers')->item(0);
177-
$readers = [];
178-
if ($readersNode) {
179-
foreach ($readersNode->getElementsByTagName('reader') as $readerNode) {
180-
$readers[] = $this->getAttributeValue($readerNode, 'component');
181-
}
182-
}
183-
return $readers;
184-
}
185-
186162
/**
187163
* Validate that configuration appearances has default appearance
188164
*
@@ -351,7 +327,6 @@ private function convertCss(\DOMElement $elementNode): array
351327
$cssNode = $elementNode->getElementsByTagName('css')->item(0);
352328
if ($cssNode) {
353329
$cssData['var'] = $this->getAttributeValue($cssNode, 'name');
354-
$cssData['converter'] = $this->getAttributeValue($cssNode, 'converter');
355330
$filterClasses = [];
356331
$filterNode = $cssNode->getElementsByTagName('filter')->item(0);
357332
if ($filterNode) {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
3434
=> 'source',
3535
self::TYPE_PATH . '/appearances/appearance/elements/element/css/filter/class' => 'source',
3636
self::TYPE_PATH . '/appearances/appearance/converters/converter' => 'name',
37-
self::TYPE_PATH . '/appearances/appearance/converters/converter/config/item' => 'name',
38-
self::TYPE_PATH . '/appearances/appearance/readers/reader' => 'name'
37+
self::TYPE_PATH . '/appearances/appearance/converters/converter/config/item' => 'name'
3938
];
4039

4140
/**

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,10 @@ public function render(array $itemData, array $additionalData = []) : string
6060
$eavData = $this->eavAttributeLoader->load($itemData['entityId']);
6161

6262
$rootElementAttributes = [
63-
'data-element' => 'main',
64-
'data-role' => 'accordion',
65-
'data-appearance' => 'default',
6663
'data-mage-init' => $this->getMageInitValue($itemData),
6764
'class' => 'pagebuilder-accordion ' . ($eavData['css_classes'] ?? '')
6865
];
66+
6967
$rootElementAttributes['class'] = rtrim($rootElementAttributes['class']);
7068

7169
if (isset($itemData['formData'])) {
@@ -75,11 +73,14 @@ public function render(array $itemData, array $additionalData = []) : string
7573
}
7674
}
7775

78-
$rootElementHtml = '<div';
76+
$accordionHtml = '<div';
7977
foreach ($rootElementAttributes as $attributeName => $attributeValue) {
80-
$rootElementHtml .= $attributeValue ? " $attributeName=\"$attributeValue\"" : '';
78+
$accordionHtml .= $attributeValue ? " $attributeName=\"$attributeValue\"" : '';
8179
}
82-
$rootElementHtml .= '>' . (isset($additionalData['children']) ? $additionalData['children'] : '') . '</div>';
80+
$accordionHtml .= '>' . (isset($additionalData['children']) ? $additionalData['children'] : '') . '</div>';
81+
82+
$rootElementHtml = '<div data-element="main" data-role="html" data-appearance="default">';
83+
$rootElementHtml .= $accordionHtml . '</div>';
8384

8485
return $rootElementHtml;
8586
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ public function render(array $itemData, array $additionalData = []) : string
4747
// data-role is not present on the accordion item as it's no longer it's own type
4848
$rootElementAttributes = [
4949
'data-collapsible' => 'true',
50-
'class' => 'accordion-collapsible',
51-
'data-open-on-load' => $eavData['open_on_load'] ? "1" : "0"
50+
'class' => 'item title'
5251
];
5352

5453
if (isset($itemData['formData'])) {
@@ -62,8 +61,8 @@ public function render(array $itemData, array $additionalData = []) : string
6261
foreach ($rootElementAttributes as $attributeName => $attributeValue) {
6362
$rootElementHtml .= $attributeValue !== '' ? " $attributeName=\"$attributeValue\"" : '';
6463
}
65-
$rootElementHtml .= '><div data-role="trigger"><span>' . $eavData['title'] . '</span></div></div>'
66-
. '<div data-content="true" class="accordion-content">' . $eavData['textarea'] . '</div>';
64+
$rootElementHtml .= '><div class="switch" data-role="trigger"><span>' . $eavData['title']
65+
. '</span></div></div><div data-content="true" class="item content">' . $eavData['textarea'] . '</div>';
6766

6867
return $rootElementHtml;
6968
}

‎app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Anchor.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ public function render(array $itemData, array $additionalData = []) : string
4545
$eavData = $this->eavAttributeLoader->load($itemData['entityId']);
4646

4747
$rootElementAttributes = [
48-
'data-element' => 'main',
49-
'data-role' => 'anchor',
50-
'data-appearance' => 'default',
5148
'class' => $eavData['css_classes'] ?? '',
5249
'id' => $eavData['anchor_id']
5350
];
@@ -59,11 +56,14 @@ public function render(array $itemData, array $additionalData = []) : string
5956
}
6057
}
6158

62-
$rootElementHtml = '<div';
59+
$anchorHtml = '<div';
6360
foreach ($rootElementAttributes as $attributeName => $attributeValue) {
64-
$rootElementHtml .= $attributeValue ? " $attributeName=\"$attributeValue\"" : '';
61+
$anchorHtml .= $attributeValue ? " $attributeName=\"$attributeValue\"" : '';
6562
}
66-
$rootElementHtml .= '></div>';
63+
$anchorHtml .= '></div>';
64+
65+
$rootElementHtml = '<div data-element="main" data-role="html" data-appearance="default">';
66+
$rootElementHtml .= $anchorHtml . '</div>';
6767

6868
return $rootElementHtml;
6969
}

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="navigateToAPageWithPageBuilder">
1212
<waitForPageLoad stepKey="waitForDashboardPageLoad"/>
1313
<amOnPage url="{{PageBuilderCmsPage.url}}" stepKey="amOnPageBuilderPage"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="fillSlideOutPanelFieldMargins">
1212
<arguments>
1313
<argument name="property" defaultValue=""/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="validateBackgroundAttributesWithNoImageOrColor">
1212
<arguments>
1313
<argument name="section"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/CatalogProductActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="openPageBuilderForAttribute">
1212
<arguments>
1313
<argument name="attributeCode" type="string"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/CmsBlockActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="addCmsBlock">
1212
<amOnPage url="{{CmsNewBlock.page}}" stepKey="amOnNewBlockPage"/>
1313
<waitForPageLoad stepKey="waitForPageLoad"/>

0 commit comments

Comments
 (0)