Skip to content

Commit 67cbe29

Browse files
omiroshnichenkoomiroshnichenko
authored
Merge pull request #396 from magento-obsessive-owls/PB-422
[Owls] Extensions utilizing Page Builder as their content creation tool will break with upgrade
2 parents 1e1f7f9 + 2f5776f commit 67cbe29

File tree

8 files changed

+8
-244
lines changed

8 files changed

+8
-244
lines changed

‎app/code/Magento/PageBuilder/Setup/Converters/FixFullWidthRowPadding.php

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎app/code/Magento/PageBuilder/Setup/Patch/Data/UpgradeFullWidthPadding.php

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection.xml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,6 @@
8383
<element name="base" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}]//div[@data-element='inner']" parameterized="true"/>
8484
<element name="baseJS" type="text" selector="(document.querySelectorAll('[data-content-type=row]')[{{arg1}} - 1]).querySelector('[data-element=inner]')" parameterized="true"/>
8585
</section>
86-
<section name="RowOnStage_FullWidth">
87-
<element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}]" parameterized="true"/>
88-
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
89-
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
90-
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
91-
<element name="borderWidth" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
92-
<element name="borderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
93-
<element name="cssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
94-
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
95-
<element name="padding" type="text" selector="(//div[contains(@class, 'pagebuilder-row')])[{{arg1}}]//div[contains(@class, 'element-children') and contains(@class, 'row-container')][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
96-
</section>
9786
<section name="RowOnStage_Contained_Invalid">
9887
<element name="border" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
9988
<element name="borderColor" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
@@ -158,17 +147,6 @@
158147
<element name="margins" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}]/div[contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
159148
<element name="padding" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}]/div[contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
160149
</section>
161-
<section name="RowOnStorefront_FullWidth">
162-
<element name="base" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}]" parameterized="true"/>
163-
<element name="alignment" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
164-
<element name="border" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
165-
<element name="borderColor" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
166-
<element name="borderWidth" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
167-
<element name="borderRadius" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
168-
<element name="cssClasses" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
169-
<element name="margins" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
170-
<element name="padding" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}]//div[contains(@class, 'row-full-width-inner')][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
171-
</section>
172150
<section name="RowOnStorefront_FullWidth_FullBleed">
173151
<element name="base" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}]" parameterized="true"/>
174152
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-content-type=row]')[{{arg1}} - 1]" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTests.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,7 @@
606606
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateRowHeightCMSBlockStage">
607607
<argument name="content" value="{{RowOnStage.baseCSS}}"/>
608608
<argument name="height" value="PageBuilderMinHeightProperty_500"/>
609+
<argument name="padding" value="PageBuilderPaddingProperty10"/>
609610
</actionGroup>
610611
<actionGroup ref="validateRowParallaxBackgroundAttributes" stepKey="validateRowParallaxBackgroundCMSPageStage">
611612
<argument name="page" value="RowOnStorefront_FullWidth_FullBleed"/>
@@ -867,6 +868,7 @@
867868
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateRowHeightCMSBlockStage">
868869
<argument name="content" value="{{RowOnStage.baseCSS}}"/>
869870
<argument name="height" value="PageBuilderMinHeightProperty_500"/>
871+
<argument name="padding" value="PageBuilderPaddingProperty10"/>
870872
</actionGroup>
871873
<comment userInput="---merging to remove step---" stepKey="validateParallaxBackgroundCMSBlockStage"/>
872874
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateBackgroundImageCMSBlockStage">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,7 @@
933933
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
934934
</actionGroup>
935935
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage">
936-
<argument name="page" value="RowOnStage_FullWidth"/>
936+
<argument name="page" value="RowOnStage"/>
937937
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
938938
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
939939
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
@@ -1043,7 +1043,7 @@
10431043
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
10441044
</actionGroup>
10451045
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage2">
1046-
<argument name="page" value="RowOnStage_FullWidth"/>
1046+
<argument name="page" value="RowOnStage"/>
10471047
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
10481048
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
10491049
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
@@ -1153,7 +1153,7 @@
11531153
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
11541154
</actionGroup>
11551155
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStorefront">
1156-
<argument name="page" value="RowOnStorefront_FullWidth"/>
1156+
<argument name="page" value="RowOnStorefront_FullWidth_FullBleed"/>
11571157
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
11581158
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
11591159
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>

‎app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/row.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@
112112
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/min-height"/>
113113
<style name="display" source="display" converter="Magento_PageBuilder/js/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>
114114
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/converter/style/margins" preview_converter="Magento_PageBuilder/js/content-type/row/converter/style/margins"/>
115+
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings" preview_converter="Magento_PageBuilder/js/content-type/row/converter/style/paddings"/>
115116
<attribute name="name" source="data-content-type"/>
116117
<attribute name="appearance" source="data-appearance"/>
117118
<attribute name="enable_parallax" source="data-enable-parallax"/>
@@ -125,9 +126,7 @@
125126
<attribute name="video_fallback_image" source="data-video-fallback-src" converter="Magento_PageBuilder/js/converter/attribute/src" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/src"/>
126127
<css name="css_classes"/>
127128
</element>
128-
<element name="inner">
129-
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings" preview_converter="Magento_PageBuilder/js/content-type/row/converter/style/paddings"/>
130-
</element>
129+
<element name="inner"/>
131130
<element name="container">
132131
<style name="justify_content" source="justify_content"/>
133132
<static_style source="display" value="flex"/>

‎app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-width/preview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
attr="data.video_overlay.attributes"
2020
ko-style="data.video_overlay.style" />
2121
<render args="getOptions().template"/>
22-
<div class="element-children content-type-container" each="contentType.getChildren()" ko-style="Object.assign({}, data.container.style(), data.inner.style())" css="getChildrenCss()" attr="{id: contentType.id + '-children'}" data-bind="sortable: getSortableOptions()" afterRender="function (element) { if (typeof afterChildrenRender === 'function') { afterChildrenRender(element); } }">
22+
<div class="element-children content-type-container" each="contentType.getChildren()" ko-style="data.container.style" css="getChildrenCss()" attr="{id: contentType.id + '-children'}" data-bind="sortable: getSortableOptions()" afterRender="function (element) { if (typeof afterChildrenRender === 'function') { afterChildrenRender(element); } }">
2323
<if args="$parent.isContainer()">
2424
<div class="pagebuilder-drop-indicator"></div>
2525
</if>

0 commit comments

Comments
 (0)