Version 1.7.4-p2

magento · Aug 9, 2024 · 3368cda · 3368cda
1 parent 8706d60
commit 3368cda
Show file tree

Hide file tree

Showing 13 changed files with 79 additions and 46 deletions.
diff --git a/app/code/Magento/AwsS3PageBuilder/composer.json b/app/code/Magento/AwsS3PageBuilder/composer.json
@@ -1,18 +1,19 @@
 {
     "name": "magento/module-aws-s3-page-builder",
     "description": "Aws S3 Page Builder module",
+    "type": "magento2-module",
+    "license": [
+        "proprietary"
+    ],
+    "version": "1.0.4",
     "require": {
         "magento/framework": "*",
         "php": "~8.1.0||~8.2.0||~8.3.0"
     },
     "suggest": {
-        "magento/module-page-builder": "*",
+        "magento/module-page-builder": "2.2.*",
         "magento/module-aws-s3": "*"
     },
-    "type": "magento2-module",
-    "license": [
-        "proprietary"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -22,3 +23,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CatalogPageBuilderAnalytics/composer.json b/app/code/Magento/CatalogPageBuilderAnalytics/composer.json
@@ -1,19 +1,20 @@
 {
     "name": "magento/module-catalog-page-builder-analytics",
     "description": "Catalog Page Builder Analytics module",
+    "type": "magento2-module",
+    "license": [
+        "proprietary"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "1.6.4",
     "require": {
-        "magento/module-page-builder-analytics": "*",
+        "magento/module-page-builder-analytics": "1.6.*",
         "magento/module-catalog": "*",
         "magento/framework": "*",
         "php": "~8.1.0||~8.2.0||~8.3.0"
     },
-    "type": "magento2-module",
-    "license": [
-        "proprietary"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CmsPageBuilderAnalytics/composer.json b/app/code/Magento/CmsPageBuilderAnalytics/composer.json
@@ -1,19 +1,20 @@
 {
     "name": "magento/module-cms-page-builder-analytics",
     "description": "CMS Page Builder Analytics module",
+    "type": "magento2-module",
+    "license": [
+        "proprietary"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "1.6.4",
     "require": {
-        "magento/module-page-builder-analytics": "*",
+        "magento/module-page-builder-analytics": "1.6.*",
         "magento/module-cms": "*",
         "magento/framework": "*",
         "php": "~8.1.0||~8.2.0||~8.3.0"
     },
-    "type": "magento2-module",
-    "license": [
-        "proprietary"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/.../EditFormActionGroup/validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup.xml b/.../EditFormActionGroup/validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * 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">
+    <actionGroup name="validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup">
+        <arguments>
+            <argument name="property"/>
+        </arguments>
+        <waitForElementVisible time="2" selector="{{EditPanelForm.panelFieldNameWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForPropertyElement"/>
+        <dontSeeElement selector="{{EditPanelForm.panelFieldRequired(property.section, property.fieldName)}}" stepKey="seePropertyIsNotARequiredField"/>
+    </actionGroup>
+</actionGroups>
diff --git a/...Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/EditPanelFormSection.xml b/...Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/EditPanelFormSection.xml
@@ -21,6 +21,7 @@
         <element name="panelSectionGenericError" type="text" selector="div.message.message-error.error"/>
         <element name="panelFieldControl" type="input" selector="//aside//div[@data-index=&quot;{{arg1}}&quot;]/descendant::*[@name=&quot;{{arg2}}&quot;]" parameterized="true"/>
         <element name="panelFieldControlWithUploaderId" type="input" selector="//aside//div[@data-index=&quot;{{arg1}}&quot;]/descendant::*[@upload-area-id=&quot;{{arg2}}&quot;]//div[contains(@class,'uppy-Root')]//input[contains(@class,'uppy-Dashboard-input')]" parameterized="true"/>
+        <element name="panelFieldNameWithUploaderId" type="input" selector="//aside//div[@data-index=&quot;{{propertySection}}&quot;]/descendant::*[@upload-area-id=&quot;{{propertyField}}&quot;]" parameterized="true"/>
         <element name="panelFieldControlCheckbox" type="input" selector="//input[@type='checkbox' and @name='{{arg1}}']" parameterized="true"/>
         <element name="panelFieldControlCheckboxState" type="input" selector="//input[@type='checkbox' and @name='{{arg1}}' and @value='{{arg2}}']" parameterized="true"/>
         <element name="panelFieldControlSwitch" type="input" selector="//*[@name='{{arg1}}']/parent::*/label" parameterized="true"/>

diff --git a/...de/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnNoRequiredTest.xml b/...de/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnNoRequiredTest.xml
@@ -45,7 +45,7 @@
         <actionGroup ref="validateSlideOutPanelField" stepKey="seeBackgroundColorProperty">
             <argument name="property" value="PageBuilderBackgroundColorProperty"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelField" stepKey="seeBackgroundImageProperty">
+        <actionGroup ref="validateSlideOutPanelFieldWithUploaderId" stepKey="seeBackgroundImageProperty">
             <argument name="property" value="PageBuilderBackgroundImage_JPG"/>
         </actionGroup>
         <actionGroup ref="validateSlideOutPanelField" stepKey="seeBackgroundPositionProperty">
@@ -66,7 +66,7 @@
         <actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="seeBackgroundColorNotRequired">
             <argument name="property" value="PageBuilderBackgroundColorProperty"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="seeBackgroundImageIsRequired">
+        <actionGroup ref="validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup" stepKey="seeBackgroundImageIsRequired">
             <argument name="property" value="PageBuilderBackgroundImage_JPG"/>
         </actionGroup>
         <actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="seeBackgroundPositionNotRequired">

diff --git a/...nPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundSectionDefaultValues.xml b/...nPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundSectionDefaultValues.xml
@@ -87,10 +87,10 @@
         <actionGroup ref="seeNoImageUploadedOnSlideOut" stepKey="validateNoFallbackImage">
             <argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelFieldTooltip" stepKey="validateTooltipFallbackImage">
+        <actionGroup ref="validateSlideOutPanelFieldTooltipWithUploaderId" stepKey="validateTooltipFallbackImage">
             <argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelFieldHelperText" stepKey="validateHelperTextFallbackImage">
+        <actionGroup ref="validateSlideOutPanelFieldHelperTextWithUploaderId" stepKey="validateHelperTextFallbackImage">
             <argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
         </actionGroup>
     </test>

diff --git a/...agento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowNoRequiredAttributesTest.xml b/...agento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowNoRequiredAttributesTest.xml
@@ -42,7 +42,7 @@
         <actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="validateBackgroundColor">
             <argument name="property" value="PageBuilderBackgroundColor_Default"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="validateBackgroundImage">
+        <actionGroup ref="validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup" stepKey="validateBackgroundImage">
             <argument name="property" value="PageBuilderBackgroundImage_Default"/>
         </actionGroup>
         <actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="validateBackgroundPosition">

diff --git a/app/code/Magento/PageBuilder/composer.json b/app/code/Magento/PageBuilder/composer.json
@@ -1,6 +1,11 @@
 {
     "name": "magento/module-page-builder",
     "description": "Page Builder module",
+    "type": "magento2-module",
+    "license": [
+        "proprietary"
+    ],
+    "version": "2.2.5-p2",
     "require": {
         "magento/framework": "*",
         "magento/module-eav": "*",
@@ -27,19 +32,16 @@
     "suggest": {
         "magento/module-review": "*"
     },
-    "conflict": {
-        "gene/bluefoot": "*"
-    },
-    "type": "magento2-module",
-    "license": [
-        "proprietary"
-    ],
     "autoload": {
         "files": [
             "registration.php"
         ],
         "psr-4": {
             "Magento\\PageBuilder\\": ""
         }
+    },
+    "conflict": {
+        "gene/bluefoot": "*"
     }
 }
+
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/page-builder.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/page-builder.html
@@ -31,6 +31,7 @@
         <with args="stage">
             <render></render>
         </with>
-        <iframe attr="id: 'render_frame_' + id" sandbox="allow-scripts allow-same-origin" style="position: absolute; width:0; height:0; border: none;"></iframe>
+        <!-- Do not modify the "sandbox" attribute without approval from a security engineer -->
+        <iframe attr="id: 'render_frame_' + id" sandbox="allow-scripts" style="position: absolute; width:0; height:0; border: none;"></iframe>
     </if>
 </div>
diff --git a/app/code/Magento/PageBuilderAdminAnalytics/composer.json b/app/code/Magento/PageBuilderAdminAnalytics/composer.json
@@ -1,21 +1,22 @@
 {
     "name": "magento/module-page-builder-admin-analytics",
     "description": "Page Builder Admin Analytics module",
+    "type": "magento2-module",
+    "license": [
+        "proprietary"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "1.1.4",
     "require": {
         "magento/framework": "*",
         "php": "~8.1.0||~8.2.0||~8.3.0"
     },
     "suggest": {
         "magento/module-admin-analytics": "*",
-        "magento/module-page-builder": "*"
+        "magento/module-page-builder": "2.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "proprietary"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,3 +26,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/PageBuilderAnalytics/composer.json b/app/code/Magento/PageBuilderAnalytics/composer.json
@@ -1,16 +1,17 @@
 {
     "name": "magento/module-page-builder-analytics",
     "description": "Page Builder Analytics module",
+    "type": "magento2-module",
+    "license": [
+        "proprietary"
+    ],
+    "version": "1.6.4",
     "require": {
         "magento/module-analytics": "*",
-        "magento/module-page-builder": "*",
+        "magento/module-page-builder": "2.2.*",
         "magento/framework": "*",
         "php": "~8.1.0||~8.2.0||~8.3.0"
     },
-    "type": "magento2-module",
-    "license": [
-        "proprietary"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -20,3 +21,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/_metapackage/composer.json b/app/code/Magento/_metapackage/composer.json
@@ -1,13 +1,15 @@
 {
     "name": "magento/page-builder",
     "description": "Page Builder metapackage",
+    "type": "metapackage",
+    "version": "1.7.4-p2",
     "require": {
-        "magento/module-page-builder": "*",
-        "magento/module-page-builder-analytics": "*",
-        "magento/module-cms-page-builder-analytics": "*",
-        "magento/module-page-builder-admin-analytics": "*",
-        "magento/module-catalog-page-builder-analytics": "*",
-        "magento/module-aws-s3-page-builder": "*"
-    },
-    "type": "metapackage"
+        "magento/module-page-builder": "2.2.5-p2",
+        "magento/module-page-builder-analytics": "1.6.4",
+        "magento/module-cms-page-builder-analytics": "1.6.4",
+        "magento/module-page-builder-admin-analytics": "1.1.4",
+        "magento/module-catalog-page-builder-analytics": "1.6.4",
+        "magento/module-aws-s3-page-builder": "1.0.4"
+    }
 }
+