Merge from 559_no-predefined-gutters--block

Author: bluemwhitew

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockValidateAdvancedConfigurationDefaultValuesTest.xml

@@ -5,14 +5,13 @@
   * 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="BlockValidateAdvancedConfigurationDefaultValuesTest">
         <annotations>
             <features value="PageBuilder"/>
             <stories value="Block"/>
-            <title value="Validate Advanced Configuration Default Values"/>
-            <description value="Validate the default values for every attribute in the Advanced Configuration form and on Stage for Block."/>
+            <title value="Validate Advanced Configuration Default Values for Block"/>
+            <description value="Validates the default values for every attribute in the Advanced form and on Stage for Block."/>
             <severity value="BLOCKER"/>
             <useCaseId value="MAGETWO-83415"/>
             <testCaseId value="MC-2820"/>
@@ -67,10 +66,12 @@
             <actualResult type="variable">getCssClasses</actualResult>
         </assertEmpty>
         <actionGroup ref="seeInMarginFieldsSlideOutPanel" stepKey="validateMargins">
-            <argument name="property" value="PageBuilderMarginsPropertyDefault"/>
+            <!-- @todo: Update `PageBuilderMarginsPropertyDefault` with (Default) Empty Values -->
+            <argument name="property" value="PageBuilderMarginsProperty_Empty"/>
         </actionGroup>
         <actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding">
-            <argument name="property" value="PageBuilderPaddingPropertyDefault"/>
+            <!-- @todo: Update `PageBuilderPaddingPropertyDefault` with (Default) Empty Values -->
+            <argument name="property" value="PageBuilderPaddingProperty_Empty"/>
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
         <!-- Validate Stage -->
@@ -114,10 +115,12 @@
             <actualResult type="variable">getCssClasses2</actualResult>
         </assertEmpty>
         <actionGroup ref="seeInMarginFieldsSlideOutPanel" stepKey="validateMargins2">
-            <argument name="property" value="PageBuilderMarginsPropertyDefault"/>
+            <!-- @todo: Update `PageBuilderMarginsPropertyDefault` with (Default) Empty Values -->
+            <argument name="property" value="PageBuilderMarginsProperty_Empty"/>
         </actionGroup>
         <actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding2">
-            <argument name="property" value="PageBuilderPaddingPropertyDefault"/>
+            <!-- @todo: Update `PageBuilderPaddingPropertyDefault` with (Default) Empty Values -->
+            <argument name="property" value="PageBuilderPaddingProperty_Empty"/>
         </actionGroup>
         <actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
             <argument name="contentType" value="PageBuilderBlockContentType"/>

app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_block_form.xml

@@ -31,6 +31,15 @@
             </settings>
         </dataProvider>
     </dataSource>
+    <fieldset name="advanced">
+        <field name="margins_and_padding">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="default" xsi:type="null" />
+                </item>
+            </argument>
+        </field>
+    </fieldset>
     <fieldset name="appearance_fieldset" sortOrder="10" component="Magento_PageBuilder/js/form/element/dependent-fieldset">
         <settings>
             <label translate="true">Appearance</label>