#635: User Access Column Action Panel with 2+ Level Nesting

- Fixing Failed Tests

Author: bluemwhitew

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnAppearanceBottomAlignedActionGroup.xml

@@ -5,8 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="validateColumnAppearanceBottomAligned" extends="validateColumnAppearanceTopAligned">
         <comment userInput="validateColumnAppearanceBottomAligned" stepKey="comment"/>
         <seeElement selector="{{section.appearance(columnIndex, PageBuilderColumnAppearanceProperty_Bottom.value)}}" stepKey="seeColumnAppearance"/>

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnAppearanceTopAlignedActionGroup.xml

@@ -5,8 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="validateColumnAppearanceTopAligned">
         <arguments>
             <argument name="section" defaultValue="ColumnOnBackend"/>
@@ -22,15 +21,17 @@
         <seeElement selector="{{section.appearance(columnIndex, PageBuilderColumnAppearanceProperty_Top.value)}}" stepKey="seeColumnAppearance"/>
         <executeJS function="return document.querySelectorAll('{{section.baseCSS}}')[{{columnIndex}}-1].clientHeight + {{affordanceValue}}" stepKey="individualColumnHeight"/>
         <executeJS function="return Math.round(Math.abs({$individualColumnHeight}-{{height.value}}))" stepKey="heightDifference"/>
-        <!-- Validate height of column -->
+
+        <!-- Validate Height of Column -->
         <assertLessThanOrEqual stepKey="assertContentHeightAcceptable">
             <expectedResult type="int">{{acceptableOffset}}</expectedResult>
             <actualResult type="variable">heightDifference</actualResult>
         </assertLessThanOrEqual>
         <executeJS function="return document.querySelectorAll('{{section.allColumnGroups}}')[{{columnGroupIndex}}-1].getBoundingClientRect().top" stepKey="topOfColumnGroup"/>
         <executeJS function="return document.querySelectorAll('{{section.baseCSS}}')[{{columnIndex}}-1].getBoundingClientRect().top" stepKey="topOfIndividualColumn"/>
         <executeJS function="return Math.round(Math.abs({$topOfColumnGroup}-{$topOfIndividualColumn}))" stepKey="topOfColumnDifference"/>
-        <!-- Validate position of column -->
+
+        <!-- Validate Position of Column -->
         <assertLessThan stepKey="assertTopOfColumnAcceptable">
             <expectedResult type="int">{{acceptableOffset}}</expectedResult>
             <actualResult type="variable">topOfColumnDifference</actualResult>

app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnBottomAlignmentAppearanceThroughBlockContentTypeTest.xml

@@ -5,8 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ViewportSwitcherMobileColumnBottomAlignmentAppearanceThroughBlockContentTypeTest" extends="ViewportSwitcherMobileColumnFullHeightAppearanceThroughBlockContentTypeTest">
         <annotations>
             <features value="PageBuilder"/>
@@ -33,6 +32,7 @@
 
         <!-- Validate CMS Block Stage Desktop Viewport -->
         <actionGroup ref="validateColumnAppearanceBottomAligned" stepKey="validateColumn1AppearanceCMSBlockStage">
+            <argument name="affordanceValue" value="{{PageBuilderColumnAffordanceHeight.value}}"/>
             <argument name="height" value="PageBuilderMinHeightProperty_200"/>
         </actionGroup>
         <actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">

app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnCenterAlignmentAppearanceThroughBlockContentTypeTest.xml

@@ -5,8 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ViewportSwitcherMobileColumnCenterAlignmentAppearanceThroughBlockContentTypeTest" extends="ViewportSwitcherMobileColumnFullHeightAppearanceThroughBlockContentTypeTest">
         <annotations>
             <features value="PageBuilder"/>
@@ -23,6 +22,7 @@
         <actionGroup ref="chooseVisualSelectOption" stepKey="setAppearanceColumn1">
             <argument name="property" value="PageBuilderColumnAppearanceProperty_Center"/>
         </actionGroup>
+
         <!-- Validate CMS Block Stage Mobile Viewport -->
         <actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStageMobile">
             <argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
@@ -32,6 +32,7 @@
 
         <!-- Validate CMS Block Stage Desktop Viewport -->
         <actionGroup ref="validateColumnAppearanceCenterAligned" stepKey="validateColumn1AppearanceCMSBlockStage">
+            <argument name="affordanceValue" value="{{PageBuilderColumnAffordanceHeight.value}}"/>
             <argument name="height" value="PageBuilderMinHeightProperty_200"/>
         </actionGroup>
         <actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">

app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnFullHeightAppearanceThroughBlockContentTypeTest.xml

@@ -5,8 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ViewportSwitcherMobileColumnFullHeightAppearanceThroughBlockContentTypeTest">
         <annotations>
             <features value="PageBuilder"/>
@@ -56,6 +55,7 @@
         <actionGroup ref="dragContentTypeToStage" stepKey="dragColumnOntoStage">
             <argument name="contentType" value="PageBuilderColumnContentType"/>
         </actionGroup>
+
         <!-- Edit Column 1 -->
         <actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelColumn1">
             <argument name="contentType" value="PageBuilderColumnContentType"/>
@@ -92,6 +92,7 @@
             <argument name="property" value="PageBuilderVerticalAlignmentPropertyCenter"/>
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsColumn1"/>
+
         <!-- Edit Column 2 -->
         <actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelColumn2">
             <argument name="contentType" value="PageBuilderColumnContentType"/>
@@ -104,6 +105,7 @@
             <argument name="property" value="PageBuilderMinHeightProperty_500"/>
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsColumn2"/>
+
         <!-- Add Divider To Column 1 -->
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSectionDivider">
             <argument name="contentType" value="PageBuilderDividerContentType"/>
@@ -113,6 +115,7 @@
             <argument name="containerTargetType" value="PageBuilderColumnContentType"/>
             <argument name="containerTargetIndex" value="1"/>
         </actionGroup>
+
         <!-- Validate CMS Block Stage in Mobile Viewport -->
         <actionGroup ref="validateBackgroundImageContainer" stepKey="validateBackgroundImageCMSBlockStageMobile">
             <argument name="section" value="ColumnOnBackend"/>
@@ -127,12 +130,15 @@
         <actionGroup ref="validateDividerWidthPercentage" stepKey="validateDividerWidthCMSBlockStageMobile">
             <argument name="page" value="DividerOnStage"/>
         </actionGroup>
+
         <!-- Validate CMS Block Stage Desktop Viewport -->
         <actionGroup ref="AdminSwitchPageBuilderViewportActionGroup" stepKey="switchToDesktopViewport">
             <argument name="viewportButton" value="desktop"/>
             <argument name="viewportStage" value="desktop"/>
         </actionGroup>
-        <actionGroup ref="validateColumnAppearanceFullHeight" stepKey="validateColumn1AppearanceCMSBlockStage"/>
+        <actionGroup ref="validateColumnAppearanceFullHeight" stepKey="validateColumn1AppearanceCMSBlockStage">
+            <argument name="affordanceValue" value="{{PageBuilderColumnAffordanceHeight.value}}"/>
+        </actionGroup>
         <actionGroup ref="ValidateAllBackgroundAttributesActionGroup" stepKey="validateBackgroundCMSBlockStage">
             <argument name="section" value="ColumnOnBackend"/>
             <argument name="index" value="1"/>
@@ -162,9 +168,9 @@
         <actionGroup ref="validateDividerWidthPercentage" stepKey="validateDividerWidthCMSBlockStage">
             <argument name="page" value="DividerOnStage"/>
         </actionGroup>
-
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
         <actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
+
         <!-- Add Block to CMS Page -->
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
             <argument name="CMSPage" value="$$createCMSPage$$"/>
@@ -187,6 +193,7 @@
             <argument name="block" value="$$createCMSBlock$$"/>
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsBlock"/>
+
         <!-- Validate CMS Page Stage on Mobile Viewport-->
         <actionGroup ref="validateBackgroundImageContainer" stepKey="validateBackgroundImageCMSPageStageMobile">
             <argument name="section" value="ColumnOnFrontend"/>
@@ -255,6 +262,7 @@
         </actionGroup>
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
         <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
+
         <!-- Validate CMS Page Storefront -->
         <actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront">
             <argument name="page" value="$$createCMSPage.identifier$$"/>
@@ -297,6 +305,7 @@
         <actionGroup ref="validateDividerWidthPercentage" stepKey="validateDividerWidthCMSPageStorefront">
             <argument name="page" value="DividerOnStorefront"/>
         </actionGroup>
+
         <!-- Validate CMS Page Storefront Mobile -->
         <resizeWindow width="767" height="1000" stepKey="resizeWindowToMobileCMSPageStorefront"/>
         <reloadPage stepKey="reloadPage"/>

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_var.less

@@ -55,6 +55,8 @@
 
 @logo-width: 150px;
 @logo-height: 40px;
+@gene-logo-width: 67px; // @deprecated
+@gene-logo-height: 30px; // @deprecated
 @sidebar-width: 650px;
 @option-height: 32px;
 @common-height: 32px;

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column/converter/style/margins.ts

@@ -4,10 +4,10 @@
  */
 
 import _ from "underscore";
+import ConverterInterface from "../../../../converter/converter-interface";
 import {DataObject} from "../../../../data-store";
 import {DataObjectMargins} from "../../../../property/margins";
 import {get} from "../../../../utils/object";
-import ConverterInterface from "../../../../converter/converter-interface";
 
 export default class Margins implements ConverterInterface {
     /**