Skip to content

Commit 6f30611

Browse files
krissyhiserotekrissyhiserote
committed
MC-401: Advanced Attributes Not Removing From Preview
- fix test and row and slide converters
1 parent 6bc526e commit 6f30611

File tree

6 files changed

+53
-72
lines changed

6 files changed

+53
-72
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Data/AdvancedData.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,12 @@
208208
<data key="fieldName">border_width</data>
209209
<data key="value">500</data>
210210
</entity>
211+
<entity name="PageBuilderAdvancedBorderWidthProperty_Empty" type="pagebuilder_advanced_border_width_property">
212+
<data key="name">Border Width</data>
213+
<data key="section">advanced</data>
214+
<data key="fieldName">border_width</data>
215+
<data key="value"/>
216+
</entity>
211217
<entity name="PageBuilderAdvancedBorderWidthPropertyInvalid" type="pagebuilder_advanced_border_width_property">
212218
<data key="name">Border Width</data>
213219
<data key="section">advanced</data>

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

Lines changed: 15 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2487,35 +2487,8 @@
24872487
<argument name="property" value="PageBuilderPaddingPropertyUnique"/>
24882488
</actionGroup>
24892489
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
2490-
<!-- Stage: Check All Attributes -->
2491-
<comment userInput="Stage: Check All Attributes" stepKey="commentStageCheck1"/>
2492-
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateStage1">
2493-
<argument name="page" value="TextOnStage"/>
2494-
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
2495-
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
2496-
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
2497-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
2498-
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty12"/>
2499-
<argument name="cssClasses" value="PageBuilderAdvancedCssClassesPropertyThreeClasses"/>
2500-
<argument name="margin" value="PageBuilderMarginsPropertyUnique"/>
2501-
<argument name="padding" value="PageBuilderPaddingPropertyUnique"/>
2502-
</actionGroup>
2503-
<comment userInput="Validate Stage After Save" stepKey="commentStageAfterSave"/>
25042490
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
25052491
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
2506-
<!-- Stage: Check All Attributes -->
2507-
<comment userInput="Stage: Check All Attributes" stepKey="commentStageCheck2"/>
2508-
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateStage2">
2509-
<argument name="page" value="TextOnStage"/>
2510-
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
2511-
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
2512-
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
2513-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
2514-
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty12"/>
2515-
<argument name="cssClasses" value="PageBuilderAdvancedCssClassesPropertyThreeClasses"/>
2516-
<argument name="margin" value="PageBuilderMarginsPropertyUnique"/>
2517-
<argument name="padding" value="PageBuilderPaddingPropertyUnique"/>
2518-
</actionGroup>
25192492
<!-- Clear Advanced Configuration Section -->
25202493
<comment userInput="Clear Advanced Configuration Section" stepKey="commentClearAdvancedConfigurationSection"/>
25212494
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage2">
@@ -2529,32 +2502,34 @@
25292502
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="selectBorderDefault">
25302503
<argument name="property" value="PageBuilderAdvancedBorderPropertyDefault"/>
25312504
</actionGroup>
2532-
<actionGroup ref="clearSlideOutPanelFieldGeneral" stepKey="clearBorderColor">
2533-
<argument name="property" value="PageBuilderAdvancedBorderColorProperty_green"/>
2505+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBorderColorEmpty">
2506+
<argument name="property" value="PageBuilderAdvancedBorderColorProperty_Empty"/>
25342507
</actionGroup>
2535-
<actionGroup ref="clearSlideOutPanelFieldGeneral" stepKey="clearBorderWidth">
2536-
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty500"/>
2508+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBorderWidthEmpty">
2509+
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty_Empty"/>
25372510
</actionGroup>
2538-
<actionGroup ref="clearSlideOutPanelFieldGeneral" stepKey="clearBorderRadius">
2539-
<argument name="property" value="PageBuilderAdvancedBorderRadiusProperty500"/>
2511+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBorderRadiusEmpty">
2512+
<argument name="property" value="PageBuilderAdvancedBorderRadiusProperty_Empty"/>
25402513
</actionGroup>
2541-
<actionGroup ref="clearSlideOutPanelFieldGeneral" stepKey="clearCSSClasses">
2542-
<argument name="property" value="PageBuilderAdvancedCssClassesPropertyThreeClasses"/>
2514+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterCSSClassesEmpty">
2515+
<argument name="property" value="PageBuilderAdvancedCssClassesProperty_Empty"/>
25432516
</actionGroup>
2544-
<actionGroup ref="clearSlideOutPanelFieldMarginsAndPadding" stepKey="clearMarginsAndPaddings">
2545-
<argument name="property" value="PageBuilderMarginsPropertyUnique"/>
2517+
<actionGroup ref="fillSlideOutPanelFieldMargins" stepKey="enterMarginsEmpty">
2518+
<argument name="property" value="PageBuilderMarginsProperty_Empty"/>
2519+
</actionGroup>
2520+
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="enterPaddingEmpty">
2521+
<argument name="property" value="PageBuilderPaddingProperty_Empty"/>
25462522
</actionGroup>
25472523
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
25482524
<!-- Stage: Check All Attributes -->
2549-
<comment userInput="Stage: Check All Attributes" stepKey="commentStageCheck3"/>
2525+
<comment userInput="Stage: Check All Attributes" stepKey="commentStageCheck2"/>
25502526
<actionGroup ref="validateAdvancedStyleWithNoConfiguration" stepKey="validateStage3">
25512527
<argument name="page" value="TextOnStage"/>
25522528
</actionGroup>
2553-
<comment userInput="Validate Stage After Save" stepKey="commentStageAfterSave2"/>
25542529
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage2"/>
25552530
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage3"/>
25562531
<!-- Stage: Check All Attributes -->
2557-
<comment userInput="Stage: Check All Attributes" stepKey="commentStageCheck4"/>
2532+
<comment userInput="Validate Stage After Save" stepKey="commentStageAfterSave3"/>
25582533
<actionGroup ref="validateAdvancedStyleWithNoConfiguration" stepKey="validateStage4">
25592534
<argument name="page" value="TextOnStage"/>
25602535
</actionGroup>

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/row/converter/style/margins-and-paddings.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slide/converter/style/margins-and-paddings.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/row/converter/style/margins-and-paddings.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ export default class MarginsAndPaddings implements ConverterInterface {
2828
}
2929
const result = {};
3030
if (undefined !== value && undefined !== value.margin) {
31-
result.marginLeft = value.margin.left + "px";
32-
result.marginTop = value.margin.top + "px";
33-
result.marginRight = value.margin.right + "px";
34-
result.marginBottom = (value.margin.bottom !== "0" ? value.margin.bottom : 1) + "px";
31+
result.marginLeft = value.margin.left ? value.margin.left + "px" : "";
32+
result.marginTop = value.margin.top ? value.margin.top + "px" : "";
33+
result.marginRight = value.margin.right ? value.margin.right + "px" : "";
34+
result.marginBottom = (parseInt(value.margin.bottom) > 0 ? value.margin.bottom : 1) + "px";
3535
}
3636
if (undefined !== value && undefined !== value.padding) {
37-
result.paddingLeft = value.padding.left + "px";
38-
result.paddingTop = value.padding.top + "px";
39-
result.paddingRight = value.padding.right + "px";
40-
result.paddingBottom = value.padding.bottom + "px";
37+
result.paddingLeft = value.padding.left ? value.padding.left + "px" : "";
38+
result.paddingTop = value.padding.top ? value.padding.top + "px" : "";
39+
result.paddingRight = value.padding.right ? value.padding.right + "px" : "";
40+
result.paddingBottom = value.padding.bottom ? value.padding.bottom + "px" : "";
4141
}
4242
return result;
4343
}

‎app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/margins-and-paddings.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,16 @@ export default class MarginsAndPaddings implements ConverterInterface {
5454
}
5555
if (value) {
5656
if (undefined !== value.margin) {
57-
result.marginLeft = value.margin.left + "px";
58-
result.marginTop = value.margin.top + "px";
59-
result.marginRight = value.margin.right + "px";
60-
result.marginBottom = value.margin.bottom + "px";
57+
result.marginLeft = value.margin.left ? value.margin.left + "px" : "";
58+
result.marginTop = value.margin.top ? value.margin.top + "px" : "";
59+
result.marginRight = value.margin.right ? value.margin.right + "px" : "";
60+
result.marginBottom = value.margin.bottom ? value.margin.bottom + "px" : "";
6161
}
6262
if (undefined !== value.padding) {
63-
result.paddingLeft = value.padding.left + "px";
64-
result.paddingTop = value.padding.top + "px";
65-
result.paddingRight = value.padding.right + "px";
66-
result.paddingBottom = value.padding.bottom + "px";
63+
result.paddingLeft = value.padding.left ? value.padding.left + "px" : "";
64+
result.paddingTop = value.padding.top ? value.padding.top + "px" : "";
65+
result.paddingRight = value.padding.right ? value.padding.right + "px" : "";
66+
result.paddingBottom = value.padding.bottom ? value.padding.bottom + "px" : "";
6767
}
6868
}
6969
return result;

0 commit comments

Comments
 (0)