[CMS Team 1] Background Attributes, Hide Content

app/code/Magento/PageBuilder/Model/Stage/Config.php

@@ -85,6 +85,8 @@ class Config
      * @param \Magento\PageBuilder\Model\Wysiwyg\InlineEditingSupportedAdapterList $inlineEditingChecker
      * @param \Magento\PageBuilder\Model\WidgetInitializerConfig $widgetInitializerConfig
      * @param array $data
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\PageBuilder\Model\ConfigInterface $config,
@@ -161,22 +163,24 @@ private function getContentTypes()
     }
 
     /**
-     * Flatten the content type data
+     * Flatten the content type
      *
-     * @param $name
-     * @param $contentType
+     * @param string $name
+     * @param array $contentType
      *
      * @return array
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    private function flattenContentTypeData($name, $contentType)
+    private function flattenContentTypeData(string $name, array $contentType)
     {
         return [
             'name' => $name,
             'label' => $contentType['label'],
             'icon' => $contentType['icon'],
             'form' => $contentType['form'],
+            'is_hideable' =>
+                isset($contentType['is_hideable']) && $contentType['is_hideable'] === 'false' ? false : true,
             'contentType' => '',
             'group' => $contentType['group'] ?? 'general',
             'fields' => $this->uiComponentConfig->getFields($contentType['form']),

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

@@ -63,6 +63,44 @@
         <waitForElementVisible selector="{{section.backgroundRepeat(index, backgroundRepeat.styleValue)}}" stepKey="waitForBackgroundRepeat"/>
         <waitForElementVisible selector="{{section.backgroundAttachment(index, backgroundAttachment.value)}}" stepKey="waitForBackgroundAttachment"/>
     </actionGroup>
+    <actionGroup name="validateBackgroundAttributes">
+        <arguments>
+            <argument name="section"/>
+            <argument name="backgroundImage"/>
+            <argument name="backgroundColor"/>
+            <argument name="backgroundPosition" defaultValue="PageBuilderBackgroundPosition_Default"/>
+            <argument name="backgroundSize" defaultValue="PageBuilderBackgroundSize_Default"/>
+            <argument name="backgroundRepeat" defaultValue="PageBuilderBackgroundRepeat_Default"/>
+            <argument name="backgroundAttachment" defaultValue="PageBuilderBackgroundAttachment_Default"/>
+            <argument name="index" defaultValue="1" type="string"/>
+        </arguments>
+        <comment userInput="validateBackgroundAttributes" stepKey="comment"/>
+        <waitForElementVisible selector="{{section.base(index)}}" stepKey="waitForBaseElement"/>
+        <waitForElementVisible selector="{{section.backgroundColor(index, backgroundColor.rgb)}}" stepKey="waitForBackgroundColor"/>
+        <waitForElementVisible selector="{{section.backgroundImage(index, backgroundImage.fileName)}}" stepKey="waitForBackgroundImage"/>
+        <waitForElementVisible selector="{{section.backgroundPosition(index, backgroundPosition.styleValue)}}" stepKey="waitForBackgroundPosition"/>
+        <waitForElementVisible selector="{{section.backgroundSize(index, backgroundSize.value)}}" stepKey="waitForBackgroundSize"/>
+        <waitForElementVisible selector="{{section.backgroundRepeat(index, backgroundRepeat.styleValue)}}" stepKey="waitForBackgroundRepeat"/>
+        <waitForElementVisible selector="{{section.backgroundAttachment(index, backgroundAttachment.value)}}" stepKey="waitForBackgroundAttachment"/>
+    </actionGroup>
+    <actionGroup name="validateMobileBackgroundAttributesWithNoImageOrColor">
+        <arguments>
+            <argument name="section"/>
+            <argument name="mobileBackgroundPosition" defaultValue="PageBuilderBackgroundPosition_Default"/>
+            <argument name="mobileBackgroundSize" defaultValue="PageBuilderBackgroundSize_Default"/>
+            <argument name="mobileBackgroundRepeat" defaultValue="PageBuilderBackgroundRepeat_Default"/>
+            <argument name="mobileBackgroundAttachment" defaultValue="PageBuilderBackgroundAttachment_Default"/>
+            <argument name="index" defaultValue="1" type="string"/>
+        </arguments>
+        <comment userInput="validateMobileBackgroundAttributesWithNoImageOrColor" stepKey="comment"/>
+        <waitForElementVisible selector="{{section.base(index)}}" stepKey="waitForBaseElement"/>
+        <waitForElementVisible selector="{{section.noMobileBackgroundColor(index)}}" stepKey="waitForBackgroundColor"/>
+        <waitForElementVisible selector="{{section.noMobileBackgroundImage(index)}}" stepKey="waitForBackgroundImage"/>
+        <waitForElementVisible selector="{{section.mobileBackgroundPosition(index, mobileBackgroundPosition.styleValue)}}" stepKey="waitForBackgroundPosition"/>
+        <waitForElementVisible selector="{{section.mobileBackgroundSize(index, mobileBackgroundSize.value)}}" stepKey="waitForBackgroundSize"/>
+        <waitForElementVisible selector="{{section.mobileBackgroundRepeat(index, mobileBackgroundRepeat.styleValue)}}" stepKey="waitForBackgroundRepeat"/>
+        <waitForElementVisible selector="{{section.mobileBackgroundAttachment(index, mobileBackgroundAttachment.value)}}" stepKey="waitForBackgroundAttachment"/>
+    </actionGroup>
     <actionGroup name="validateMobileBackgroundAttributes">
         <arguments>
             <argument name="section"/>

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup.xml

@@ -51,12 +51,9 @@
             <argument name="headingAlignment" defaultValue="PageBuilderHeadingAlignmentProperty_left"/>
         </arguments>
         <comment userInput="Click outside heading editable area" stepKey="commentClickOutside"/>
-        <waitForPageLoad stepKey="waitForAnimation1" time="30"/>
-        <seeElement selector="{{HeadingOnStage.headingTypeToolbar(index, headingType.toolbar)}}" stepKey="seeHeadingTypeToolbar"/>
-        <seeElement selector="{{HeadingOnStage.headingTextAlignToolbar(index, headingAlignment.toolbar)}}" stepKey="seeHeadingAlignmentToolbar"/>
         <moveMouseOver selector="{{PageBuilderPanel.searchPanel}}" stepKey="moveMouseOutsideLiveEdit"/>
         <click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickOutsideLiveEdit"/>
-        <waitForPageLoad stepKey="waitForAnimation2" time="30"/>
+        <waitForPageLoad stepKey="waitForAnimation2"/>
         <dontSeeElement selector="{{HeadingOnStage.headingTypeToolbar(index, headingType.toolbar)}}" stepKey="dontSeeHeadingTypeToolbar"/>
         <dontSeeElement selector="{{HeadingOnStage.headingTextAlignToolbar(index, headingAlignment.toolbar)}}" stepKey="dontSeeHeadingAlignmentToolbar"/>
     </actionGroup>
@@ -111,7 +108,7 @@
             <argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthPropertyDefault"/>
             <argument name="index" defaultValue="1" type="string"/>
         </arguments>
-        <waitForElementVisible selector="{{page.base(headingType.value, index)}}" stepKey="waitForElementVisible"/>
+        <waitForElementVisible selector="{{page.baseByTagName(headingType.value, index)}}" stepKey="waitForElementVisible"/>
         <waitForElementVisible selector="{{page.noAlignment(headingType.value, index)}}" stepKey="waitForAlignmentVisible"/>
         <waitForElementVisible selector="{{page.border(headingType.value, index, border.value)}}" stepKey="waitForBorderVisible"/>
         <waitForElementVisible selector="{{page.noBorderColor(headingType.value, index)}}" stepKey="waitForBorderColorVisible"/>
@@ -135,7 +132,7 @@
             <argument name="padding" defaultValue="PageBuilderPaddingPropertyDefault"/>
             <argument name="index" defaultValue="1" type="string"/>
         </arguments>
-        <waitForElementVisible selector="{{page.base(headingType.value, index)}}" stepKey="waitForElementVisible"/>
+        <waitForElementVisible selector="{{page.baseByTagName(headingType.value, index)}}" stepKey="waitForElementVisible"/>
         <waitForElementVisible selector="{{page.alignment(headingType.value, index, alignment.value)}}" stepKey="waitForAlignmentVisible"/>
         <waitForElementVisible selector="{{page.border(headingType.value, index, border.value)}}" stepKey="waitForBorderVisible"/>
         <waitForElementVisible selector="{{page.borderColor(headingType.value, index, borderColor.rbg)}}" stepKey="waitForBorderColorVisible"/>
@@ -154,8 +151,8 @@
             <argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthPropertyDefault"/>
             <argument name="index" defaultValue="1" type="string"/>
         </arguments>
-        <waitForElement selector="{{page.base(headingType.value, index)}}" stepKey="waitForElement"/>
-        <dontSeeElement selector="{{page.base(headingType.value, index)}}" stepKey="dontSeeElement"/>
+        <waitForElement selector="{{page.baseByTagName(headingType.value, index)}}" stepKey="waitForElement"/>
+        <dontSeeElement selector="{{page.baseByTagName(headingType.value, index)}}" stepKey="dontSeeElement"/>
         <waitForElement selector="{{page.noAlignment(headingType.value, index)}}" stepKey="waitForAlignment"/>
         <dontSeeElement selector="{{page.noAlignment(headingType.value, index)}}" stepKey="dontSeeAlignment"/>
         <waitForElement selector="{{page.border(headingType.value, index, border.value)}}" stepKey="waitForBorder"/>

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup.xml

@@ -37,4 +37,28 @@
         <waitForElementVisible selector="{{ImageOnConfigurationPanel.imageName(property.value)}}" stepKey="seeImageNameOnPreview"/>
         <waitForElementVisible selector="{{ImageOnConfigurationPanel.imageSource(property.fileName)}}" stepKey="seeMainImageSource"/>
     </actionGroup>
+    <actionGroup name="validateImage">
+        <arguments>
+            <argument name="section"/>
+            <argument name="pageNamePrefix" defaultValue="admin" type="string"/>
+            <argument name="image"/>
+            <argument name="index" defaultValue="1" type="string"/>
+        </arguments>
+        <comment userInput="validateImage" stepKey="comment"/>
+        <waitForElementVisible selector="{{section.base(index)}}" stepKey="waitForBaseElement"/>
+        <waitForElementVisible selector="{{section.imageSourceByIndex(index, image.fileName)}}" stepKey="waitForImage"/>
+        <grabAttributeFrom selector="{{section.imageSourceByIndex(index, image.fileName)}}" userInput="src" stepKey="contentTypeSrc"/>
+        <!-- Grab base URL -->
+        <comment userInput="Grab base URL" stepKey="commentGrabBaseUrl"/>
+        <executeJS function="return '{{pageNamePrefix}}'" stepKey="pageNamePrefix"/>
+        <grabFromCurrentUrl regex="/(^.+(?=\/$pageNamePrefix))/" stepKey="baseURL"/>
+        <!-- Convert all characters in string variables to regex friendly strings  -->
+        <comment userInput="Convert all characters in string variables to regex friendly strings" stepKey="commentConvert"/>
+        <executeJS function="return '{$baseURL}'.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\\\^\\$\|]/g, '\\\\$&amp;')" stepKey="regexBaseURL"/>
+        <executeJS function="return '{{image.path}}'.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\\\^\\$\|]/g, '\\\\$&amp;')" stepKey="regexFilePath"/>
+        <assertRegExp stepKey="assertImageContainsFileInformation">
+            <expectedResult type="string">/{$regexBaseURL}\/pub\/media.*{$regexFilePath}.*\/{{image.fileName}}(_\d+)?\.{{image.extension}}/</expectedResult>
+            <actualResult type="variable">$contentTypeSrc</actualResult>
+        </assertRegExp>
+    </actionGroup>
 </actionGroups>

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup.xml

@@ -55,6 +55,22 @@
         <waitForElementVisible time="10" selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeInStage" />
         <waitForPageLoad stepKey="waitForToolbarsToLoad" time="30"/>
     </actionGroup>
+    <actionGroup name="dragContentTypeToHiddenContainer">
+        <arguments>
+            <argument name="contentType"/>
+            <argument name="contentTypeIndex" defaultValue="1" type="string"/>
+            <argument name="containerTargetType"/>
+            <argument name="containerTargetIndex" defaultValue="1" type="string"/>
+            <argument name="offsetXCoordinate" defaultValue="null" type="string"/>
+            <argument name="offsetYCoordinate" defaultValue="null" type="string"/>
+        </arguments>
+        <click selector="{{PageBuilderPanel.searchPanel}}" stepKey="lostFocus"/>
+        <waitForElementVisible time="30" selector="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" stepKey="waitForContentTypeInPanel"/>
+        <dragAndDrop selector1="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderStage.contentTypeContainer(containerTargetType.role, containerTargetIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropContentTypeIntoStage"/>
+        <waitForPageLoad stepKey="waitForAnimation" time="30"/>
+        <waitForElementNotVisible time="10" selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeNotOnStage" />
+        <dontSeeElementInDOM selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="dontSeeElementInContainer" />
+    </actionGroup>
     <actionGroup name="dragContentTypeToContainerAndExpectEditPanel">
         <arguments>
             <argument name="contentType"/>
@@ -126,6 +142,7 @@
             <argument name="containerOffsetXCoordinate" defaultValue="null" type="string"/>
             <argument name="containerOffsetYCoordinate" defaultValue="null" type="string"/>
         </arguments>
+        <comment userInput="moveContentTypeToContainer" stepKey="comment"/>
         <waitForElementVisible time="20" selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeInStageVisible"/>
         <moveMouseOver selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="onMouseOverContentTypeStage"/>
         <waitForPageLoad time="30" stepKey="waitForAnimation"/>
@@ -135,6 +152,13 @@
         <waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
         <waitForElementVisible time="30" selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeInStage"/>
     </actionGroup>
+    <actionGroup name="cannotMoveContentTypeToContainer" extends="moveContentTypeToContainer">
+        <arguments>
+            <argument name="positionInContainer" defaultValue="1" type="string"/>
+        </arguments>
+        <comment userInput="cannotMoveContentTypeToContainer" stepKey="comment"/>
+        <dontSeeElementInDOM selector="{{PageBuilderStage.contentTypeInsideContainerStage(containerTargetType.role, containerTargetIndex, positionInContainer, contentType.role, contentTypeIndex)}}" stepKey="dontSeeContentTypeInContainer" after="waitForContentTypeInStage"/>
+    </actionGroup>
     <actionGroup name="dragContentTypeNextToExistingContentType">
         <arguments>
             <argument name="contentType" defaultValue=""/>

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup.xml

@@ -8,6 +8,16 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="validateLayoutStylesNoHeight">
+        <arguments>
+            <argument name="page"/>
+            <argument name="index" defaultValue="1" type="string"/>
+            <argument name="verticalAlignContainer" defaultValue="PageBuilderVerticalAlignmentPropertyTop"/>
+        </arguments>
+        <waitForElement selector="{{page.container(index)}}" stepKey="waitForVerticalAlignContainer"/>
+        <seeElement selector="{{page.noMinHeight(index)}}" stepKey="dontSeeStyle"/>
+        <seeElement selector="{{page.containerStyle(index, verticalAlignContainer.style)}}" stepKey="seeVerticalAlignmentStyle"/>
+    </actionGroup>
     <!-- Validate All Layout Styles -->
     <actionGroup name="validateLayoutStylesWithAllUpdated">
         <arguments>
@@ -16,7 +26,7 @@
             <argument name="minHeight" defaultValue="PageBuilderMinHeightProperty_Empty"/>
             <argument name="verticalAlignContainer" defaultValue="PageBuilderVerticalAlignmentPropertyCenter"/>
         </arguments>
-        <waitForElementVisible selector="{{page.base(index)}}" stepKey="waitForRow"/>
+        <waitForElementVisible selector="{{page.base(index)}}" stepKey="waitForContentType"/>
         <waitForElementVisible selector="{{page.minHeight(index, minHeight.value)}}" stepKey="waitForMinHeight"/>
         <waitForElementVisible selector="{{page.verticalAlignContainer(index, verticalAlignContainer.value)}}" stepKey="waitForVerticalAlignContainer"/>
     </actionGroup>