Merge branch '559_no-predefined-gutters--column' of github:bluemwhitew/magento2-page-builder into 559_no-predefined-gutters

hannahnida · hannahnida · commit 6cf3c703529f · 2020-11-18T12:37:18.000+01:00
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayAndButtonCollageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayAndButtonCollageActionGroup.xml
@@ -12,7 +12,7 @@
             <argument name="column"/>
             <argument name="columnIndex" defaultValue="1" type="string"/>
             <argument name="columnBorderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
-            <argument name="columnPadding" defaultValue="PageBuilderPaddingProperty10"/>
+            <argument name="columnPadding" defaultValue="PageBuilderPaddingPropertyDefault"/>
             <argument name="element"/>
             <argument name="elementIndex" defaultValue="1" type="string"/>
             <argument name="elementBorderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayAndButtonPosterActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayAndButtonPosterActionGroup.xml
@@ -12,7 +12,7 @@
             <argument name="column"/>
             <argument name="columnIndex" defaultValue="1" type="string"/>
             <argument name="columnBorderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
-            <argument name="columnPadding" defaultValue="PageBuilderPaddingProperty10"/>
+            <argument name="columnPadding" defaultValue="PageBuilderPaddingPropertyDefault"/>
             <argument name="element"/>
             <argument name="elementIndex" defaultValue="1" type="string"/>
             <argument name="elementBorderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/AdvancedData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/AdvancedData.xml
@@ -477,6 +477,16 @@
         <data key="marginLeft">0</data>
     </entity>
     <entity name="PageBuilderMarginsPropertyColumnDefault" type="pagebuilder_margins_property">
+        <data key="name">Margins and Padding</data>
+        <data key="section">advanced</data>
+        <data key="fieldName">margins_and_padding</data>
+        <data key="value">0</data>
+        <data key="marginTop">0</data>
+        <data key="marginRight">0</data>
+        <data key="marginBottom">0</data>
+        <data key="marginLeft">0</data>
+    </entity>
+    <entity name="PageBuilderMarginsPropertyColumnStage" type="pagebuilder_margins_property">
         <data key="name">Margins and Padding</data>
         <data key="section">advanced</data>
         <data key="fieldName">margins_and_padding</data>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/SlideData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/SlideData.xml
@@ -108,6 +108,12 @@
         <data key="fieldName">button_text</data>
         <data key="value">Slide 1 Button Text</data>
     </entity>
+    <entity name="PageBuilderSlideItemButtonText_Slide2" type="pagebuilder_slide_item_button_text_property">
+        <data key="name">Button Text</data>
+        <data key="section">general</data>
+        <data key="fieldName">button_text</data>
+        <data key="value">Slide 2 Button Text Content</data>
+    </entity>
     <entity name="PageBuilderSlideItemButtonText_Common" type="pagebuilder_slide_item_button_text_property">
         <data key="name">Button Text</data>
         <data key="section">general</data>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnDragAndDropMultipleColumnsResizingThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnDragAndDropMultipleColumnsResizingThroughBlockContentTypeTest.xml
@@ -55,6 +55,13 @@
             <argument name="containerTargetIndex" value="2"/>
             <argument name="contentTypeIndex" value="1"/>
         </actionGroup>
+        <actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openColumn1EditMenuOnStage">
+            <argument name="contentType" value="PageBuilderColumnContentType"/>
+        </actionGroup>
+        <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
+            <argument name="property" value="PageBuilderMinHeightProperty_500"/>
+        </actionGroup>
+        <actionGroup ref="saveEditPanelSettings" stepKey="saveColumn1EditPanelSettings"/>
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
         <actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
         <!-- Validate CMS Block Stage -->
@@ -84,7 +91,7 @@
             <actualResult type="variable">columnRatio3CMSBlockStage</actualResult>
         </assertEquals>
         <executeJS function="return Math.round({$columnOneWidthCMSBlockStage}+{$columnTwoWidthCMSBlockStage}+{$columnThreeWidthCMSBlockStage}+{$columnFourWidthCMSBlockStage})" stepKey="totalColumnWidthCMSBlockStage"/>
-        <executeJS function="return Math.round({{RowOnStage.rowWidthJS('1')}}-{{PageBuilderPaddingPropertyRowDefault.paddingLeft}}-{{PageBuilderPaddingPropertyRowDefault.paddingRight}}-{{PageBuilderRowAffordanceWidth.value}} - 4 * {{PageBuilderMarginsPropertyColumnDefault.marginRight}})" stepKey="rowWidthCMSBlockStage"/>
+        <executeJS function="return Math.round({{RowOnStage.rowWidthJS('1')}}-{{PageBuilderPaddingPropertyRowDefault.paddingLeft}}-{{PageBuilderPaddingPropertyRowDefault.paddingRight}}-{{PageBuilderRowAffordanceWidth.value}} - 4 * {{PageBuilderMarginsPropertyColumnStage.marginRight}})" stepKey="rowWidthCMSBlockStage"/>
         <executeJS function="return Math.abs({$totalColumnWidthCMSBlockStage}-{$rowWidthCMSBlockStage})" stepKey="widthDifferenceCMSBlockStage"/>
         <assertLessThanOrEqual stepKey="assertWidthOfAllColumnsCMSBlockStage">
             <expectedResult type="int">2</expectedResult>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnBackgroundAttributeTest/ColumnValidateBackgroundFormTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnBackgroundAttributeTest/ColumnValidateBackgroundFormTest.xml
@@ -53,6 +53,9 @@
         </actionGroup>
         <!-- Update all background fields -->
         <comment userInput="Update all background fields" stepKey="commentFillBackgroundPanel"/>
+        <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
+            <argument name="property" value="PageBuilderMinHeightProperty_500"/>
+        </actionGroup>
         <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBackgroundColor">
             <argument name="property" value="PageBuilderBackgroundColor_Hex_White"/>
         </actionGroup>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/ColumnValidateBackgroundSectionDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/ColumnValidateBackgroundSectionDefaultValuesTest.xml
@@ -36,6 +36,9 @@
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
             <argument name="contentType" value="PageBuilderColumnContentType"/>
         </actionGroup>
+        <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterColumnMinHeightProperty" after="openEditMenuOnStage">
+            <argument name="property" value="PageBuilderMinHeightProperty_500"/>
+        </actionGroup>
         <!-- Validate Default Values -->
         <comment userInput="Validate Default Values" stepKey="CommentValidateDefaultValues"/>
         <actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateBackgroundColor">
@@ -65,7 +68,7 @@
         <actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBackgroundAttachment">
             <argument name="property" value="PageBuilderBackgroundAttachment_Default"/>
         </actionGroup>
-        <actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
+        <actionGroup ref="saveEditPanelSettings" stepKey="closeEditPanelSettings"/>
         <!-- Validate Stage -->
         <comment userInput="Validate Stage" stepKey="commentValidateStage"/>
         <actionGroup ref="ValidateBackgroundConfigurationWithNoImageOrColorActionGroup" stepKey="validateStage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/TabsAddToColumnAndHeightAdjustsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/TabsAddToColumnAndHeightAdjustsTest.xml
@@ -40,7 +40,7 @@
         <comment userInput="Validate Column Height adjusts to Tabs Height" stepKey="commentValidateColumnHeightWithTabs"/>
         <executeJS function="{{PageBuilderStage.computedHeightOnStage(PageBuilderTabsContentType.role,'1')}}" stepKey="actualStageTabsHeight"/>
         <executeJS function="{{PageBuilderStage.computedHeightOnStage(PageBuilderColumnContentType.role,'1')}}" stepKey="actualStageColumnHeightWithTabs"/>
-        <executeJS function="return Math.round({$actualStageTabsHeight}+{{PageBuilderPaddingProperty10.paddingTop}}+{{PageBuilderPaddingProperty10.paddingBottom}}+{{PageBuilderColumnAffordanceHeight.value}})" stepKey="expectedColumnHeightWithTabsAndPadding"/>
+        <executeJS function="return Math.round({$actualStageTabsHeight}+{{PageBuilderColumnAffordanceHeight.value}})" stepKey="expectedColumnHeightWithTabsAndPadding"/>
         <assertEquals stepKey="assertColumnHeightAdjustsToTabsHeight">
             <expectedResult type="variable">expectedColumnHeightWithTabsAndPadding</expectedResult>
             <actualResult type="variable">actualStageColumnHeightWithTabs</actualResult>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnValidateDefaultAndUpdateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnValidateDefaultAndUpdateAdvancedConfigurationDefaultValuesTest.xml
@@ -59,10 +59,10 @@
             <actualResult type="variable">getCssClasses</actualResult>
         </assertEmpty>
         <actionGroup ref="seeInMarginFieldsSlideOutPanel" stepKey="validateMargins">
-            <argument name="property" value="PageBuilderMarginsPropertyDefault"/>
+            <argument name="property" value="PageBuilderMarginsProperty_Empty"/>
         </actionGroup>
         <actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding">
-            <argument name="property" value="PageBuilderPaddingProperty10"/>
+            <argument name="property" value="PageBuilderPaddingProperty_Empty"/>
         </actionGroup>
         <!-- Check for border radius -->
         <actionGroup ref="validateSlideOutPanelField" stepKey="seeAdvancedBorderRadiusProperty">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/ProductsWrapsInsideTinyColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/ProductsWrapsInsideTinyColumnTest.xml
@@ -138,17 +138,17 @@
         <executeJS function="return document.querySelectorAll('{{ProductsOnStorefront.productImageCSS}}')[0].clientWidth" stepKey="productImageWidthFrontend"/>
         <executeJS function="return document.querySelectorAll('{{ProductsOnStorefront.productPriceContainer}}')[0].clientWidth" stepKey="productPriceContainerWidthFrontend"/>
         <executeJS function="return document.querySelectorAll('{{ProductsOnStorefront.productActions}}')[0].clientWidth" stepKey="productActionsWidthFrontend"/>
-        <assertGreaterThan stepKey="assertColumnIsWiderThanProductImageFrontend">
+        <assertGreaterThanOrEqual stepKey="assertColumnIsWiderThanProductImageFrontend">
             <actualResult type="variable">firstColumnWidthFrontend</actualResult>
             <expectedResult type="variable">productImageWidthFrontend</expectedResult>
-        </assertGreaterThan>
-        <assertGreaterThan stepKey="assertColumnIsWiderThanProductPriceContainerFrontend">
+        </assertGreaterThanOrEqual>
+        <assertGreaterThanOrEqual stepKey="assertColumnIsWiderThanProductPriceContainerFrontend">
             <actualResult type="variable">firstColumnWidthFrontend</actualResult>
             <expectedResult type="variable">productPriceContainerWidthFrontend</expectedResult>
-        </assertGreaterThan>
-        <assertGreaterThan stepKey="assertColumnIsWiderThanProductActionsFrontend">
+        </assertGreaterThanOrEqual>
+        <assertGreaterThanOrEqual stepKey="assertColumnIsWiderThanProductActionsFrontend">
             <actualResult type="variable">firstColumnWidthFrontend</actualResult>
             <expectedResult type="variable">productActionsWidthFrontend</expectedResult>
-        </assertGreaterThan>
+        </assertGreaterThanOrEqual>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnPosterAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnPosterAppearanceTest.xml
@@ -70,7 +70,7 @@
             <argument name="property" value="PageBuilderSlideItemShowButton_Always"/>
         </actionGroup>
         <actionGroup ref="fillSlideOutPanelField" stepKey="enterButtonText">
-            <argument name="property" value="PageBuilderSlideItemButtonText_Slide1"/>
+            <argument name="property" value="PageBuilderSlideItemButtonText_Slide2"/>
         </actionGroup>
         <actionGroup ref="selectSlideOutPanelField" stepKey="selectShowOverlay">
             <argument name="property" value="PageBuilderSlideItemShowOverlay_Always"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDuplicateContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDuplicateContentTypesFromOnHoverOptionMenusTest.xml
@@ -46,6 +46,9 @@
         <actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuForRow">
             <argument name="contentType" value="PageBuilderRowContentType"/>
         </actionGroup>
+        <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
+            <argument name="property" value="PageBuilderMinHeightProperty_300px"/>
+        </actionGroup>
         <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBackgroundColorRow">
             <argument name="property" value="PageBuilderBackgroundColor_Hex_Grey"/>
         </actionGroup>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_column_form.xml b/app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_column_form.xml
@@ -119,7 +119,7 @@
         <field name="margins_and_padding">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
-                    <item name="default" xsi:type="string">{"margin":{"bottom":"0","left":"0","right":"0","top":"0"},"padding":{"bottom":"10","left":"10","right":"10","top":"10"}}</item>
+                    <item name="default" xsi:type="null" />
                 </item>
             </argument>
         </field>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column/converter/style/margins.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column/converter/style/margins.js
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/converter/style/width.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/converter/style/width.js
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column/converter/style/margins.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column/converter/style/margins.ts
@@ -48,7 +48,10 @@ export default class Margins implements ConverterInterface {
         if (value && undefined !== value.margin) {
             result.marginLeft = value.margin.left ? value.margin.left + "px" : "";
             result.marginTop = value.margin.top ? value.margin.top + "px" : "";
-            result.marginRight = (parseInt(value.margin.right, 10) !== 0 ? value.margin.right : 1) + "px";
+            result.marginRight = (value.margin.right && parseInt(value.margin.right, 10) !== 0 ?
+                value.margin.right :
+                1
+            ) + "px";
             result.marginBottom = value.margin.bottom ? value.margin.bottom + "px" : "";
         }
         return result;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/width.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/width.ts
@@ -35,8 +35,9 @@ export default class Width implements ConverterInterface {
      * @returns {string | object}
      */
     public toDom(name: string, data: DataObject): string {
-        if (data[name] !== "" && data.margins_and_padding) {
-            const margins = (data.margins_and_padding as any).margin || "";
+        if (data[name] !== "") {
+            const marginsAndPadding = data.margins_and_padding || {};
+            const margins = (marginsAndPadding as any).margin || "";
             const marginLeft = margins.left ? parseInt(margins.left as string, 10) : 0;
             const marginRight = margins.right ? parseInt(margins.right as string, 10) : 0;
 
