Skip to content

Commit 3368cda

Browse files
author
magento packaging service
committed
Version 1.7.4-p2
1 parent 8706d60 commit 3368cda

File tree

13 files changed

+79
-46
lines changed

13 files changed

+79
-46
lines changed

Diff for: ‎app/code/Magento/AwsS3PageBuilder/composer.json

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
{
22
"name": "magento/module-aws-s3-page-builder",
33
"description": "Aws S3 Page Builder module",
4+
"type": "magento2-module",
5+
"license": [
6+
"proprietary"
7+
],
8+
"version": "1.0.4",
49
"require": {
510
"magento/framework": "*",
611
"php": "~8.1.0||~8.2.0||~8.3.0"
712
},
813
"suggest": {
9-
"magento/module-page-builder": "*",
14+
"magento/module-page-builder": "2.2.*",
1015
"magento/module-aws-s3": "*"
1116
},
12-
"type": "magento2-module",
13-
"license": [
14-
"proprietary"
15-
],
1617
"autoload": {
1718
"files": [
1819
"registration.php"
@@ -22,3 +23,4 @@
2223
}
2324
}
2425
}
26+

Diff for: ‎app/code/Magento/CatalogPageBuilderAnalytics/composer.json

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
{
22
"name": "magento/module-catalog-page-builder-analytics",
33
"description": "Catalog Page Builder Analytics module",
4+
"type": "magento2-module",
5+
"license": [
6+
"proprietary"
7+
],
48
"config": {
59
"sort-packages": true
610
},
11+
"version": "1.6.4",
712
"require": {
8-
"magento/module-page-builder-analytics": "*",
13+
"magento/module-page-builder-analytics": "1.6.*",
914
"magento/module-catalog": "*",
1015
"magento/framework": "*",
1116
"php": "~8.1.0||~8.2.0||~8.3.0"
1217
},
13-
"type": "magento2-module",
14-
"license": [
15-
"proprietary"
16-
],
1718
"autoload": {
1819
"files": [
1920
"registration.php"
@@ -23,3 +24,4 @@
2324
}
2425
}
2526
}
27+

Diff for: ‎app/code/Magento/CmsPageBuilderAnalytics/composer.json

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
{
22
"name": "magento/module-cms-page-builder-analytics",
33
"description": "CMS Page Builder Analytics module",
4+
"type": "magento2-module",
5+
"license": [
6+
"proprietary"
7+
],
48
"config": {
59
"sort-packages": true
610
},
11+
"version": "1.6.4",
712
"require": {
8-
"magento/module-page-builder-analytics": "*",
13+
"magento/module-page-builder-analytics": "1.6.*",
914
"magento/module-cms": "*",
1015
"magento/framework": "*",
1116
"php": "~8.1.0||~8.2.0||~8.3.0"
1217
},
13-
"type": "magento2-module",
14-
"license": [
15-
"proprietary"
16-
],
1718
"autoload": {
1819
"files": [
1920
"registration.php"
@@ -23,3 +24,4 @@
2324
}
2425
}
2526
}
27+

Diff for: ‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup.xml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup">
11+
<arguments>
12+
<argument name="property"/>
13+
</arguments>
14+
<waitForElementVisible time="2" selector="{{EditPanelForm.panelFieldNameWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForPropertyElement"/>
15+
<dontSeeElement selector="{{EditPanelForm.panelFieldRequired(property.section, property.fieldName)}}" stepKey="seePropertyIsNotARequiredField"/>
16+
</actionGroup>
17+
</actionGroups>

Diff for: ‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/EditPanelFormSection.xml

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<element name="panelSectionGenericError" type="text" selector="div.message.message-error.error"/>
2222
<element name="panelFieldControl" type="input" selector="//aside//div[@data-index=&quot;{{arg1}}&quot;]/descendant::*[@name=&quot;{{arg2}}&quot;]" parameterized="true"/>
2323
<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"/>
24+
<element name="panelFieldNameWithUploaderId" type="input" selector="//aside//div[@data-index=&quot;{{propertySection}}&quot;]/descendant::*[@upload-area-id=&quot;{{propertyField}}&quot;]" parameterized="true"/>
2425
<element name="panelFieldControlCheckbox" type="input" selector="//input[@type='checkbox' and @name='{{arg1}}']" parameterized="true"/>
2526
<element name="panelFieldControlCheckboxState" type="input" selector="//input[@type='checkbox' and @name='{{arg1}}' and @value='{{arg2}}']" parameterized="true"/>
2627
<element name="panelFieldControlSwitch" type="input" selector="//*[@name='{{arg1}}']/parent::*/label" parameterized="true"/>

Diff for: ‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnNoRequiredTest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<actionGroup ref="validateSlideOutPanelField" stepKey="seeBackgroundColorProperty">
4646
<argument name="property" value="PageBuilderBackgroundColorProperty"/>
4747
</actionGroup>
48-
<actionGroup ref="validateSlideOutPanelField" stepKey="seeBackgroundImageProperty">
48+
<actionGroup ref="validateSlideOutPanelFieldWithUploaderId" stepKey="seeBackgroundImageProperty">
4949
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
5050
</actionGroup>
5151
<actionGroup ref="validateSlideOutPanelField" stepKey="seeBackgroundPositionProperty">
@@ -66,7 +66,7 @@
6666
<actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="seeBackgroundColorNotRequired">
6767
<argument name="property" value="PageBuilderBackgroundColorProperty"/>
6868
</actionGroup>
69-
<actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="seeBackgroundImageIsRequired">
69+
<actionGroup ref="validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup" stepKey="seeBackgroundImageIsRequired">
7070
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
7171
</actionGroup>
7272
<actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="seeBackgroundPositionNotRequired">

Diff for: ‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundSectionDefaultValues.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@
8787
<actionGroup ref="seeNoImageUploadedOnSlideOut" stepKey="validateNoFallbackImage">
8888
<argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
8989
</actionGroup>
90-
<actionGroup ref="validateSlideOutPanelFieldTooltip" stepKey="validateTooltipFallbackImage">
90+
<actionGroup ref="validateSlideOutPanelFieldTooltipWithUploaderId" stepKey="validateTooltipFallbackImage">
9191
<argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
9292
</actionGroup>
93-
<actionGroup ref="validateSlideOutPanelFieldHelperText" stepKey="validateHelperTextFallbackImage">
93+
<actionGroup ref="validateSlideOutPanelFieldHelperTextWithUploaderId" stepKey="validateHelperTextFallbackImage">
9494
<argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
9595
</actionGroup>
9696
</test>

Diff for: ‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowNoRequiredAttributesTest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="validateBackgroundColor">
4343
<argument name="property" value="PageBuilderBackgroundColor_Default"/>
4444
</actionGroup>
45-
<actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="validateBackgroundImage">
45+
<actionGroup ref="validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup" stepKey="validateBackgroundImage">
4646
<argument name="property" value="PageBuilderBackgroundImage_Default"/>
4747
</actionGroup>
4848
<actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="validateBackgroundPosition">

Diff for: ‎app/code/Magento/PageBuilder/composer.json

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{
22
"name": "magento/module-page-builder",
33
"description": "Page Builder module",
4+
"type": "magento2-module",
5+
"license": [
6+
"proprietary"
7+
],
8+
"version": "2.2.5-p2",
49
"require": {
510
"magento/framework": "*",
611
"magento/module-eav": "*",
@@ -27,19 +32,16 @@
2732
"suggest": {
2833
"magento/module-review": "*"
2934
},
30-
"conflict": {
31-
"gene/bluefoot": "*"
32-
},
33-
"type": "magento2-module",
34-
"license": [
35-
"proprietary"
36-
],
3735
"autoload": {
3836
"files": [
3937
"registration.php"
4038
],
4139
"psr-4": {
4240
"Magento\\PageBuilder\\": ""
4341
}
42+
},
43+
"conflict": {
44+
"gene/bluefoot": "*"
4445
}
4546
}
47+

Diff for: ‎app/code/Magento/PageBuilder/view/adminhtml/web/template/page-builder.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<with args="stage">
3232
<render></render>
3333
</with>
34-
<iframe attr="id: 'render_frame_' + id" sandbox="allow-scripts allow-same-origin" style="position: absolute; width:0; height:0; border: none;"></iframe>
34+
<!-- Do not modify the "sandbox" attribute without approval from a security engineer -->
35+
<iframe attr="id: 'render_frame_' + id" sandbox="allow-scripts" style="position: absolute; width:0; height:0; border: none;"></iframe>
3536
</if>
3637
</div>

Diff for: ‎app/code/Magento/PageBuilderAdminAnalytics/composer.json

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
{
22
"name": "magento/module-page-builder-admin-analytics",
33
"description": "Page Builder Admin Analytics module",
4+
"type": "magento2-module",
5+
"license": [
6+
"proprietary"
7+
],
48
"config": {
59
"sort-packages": true
610
},
11+
"version": "1.1.4",
712
"require": {
813
"magento/framework": "*",
914
"php": "~8.1.0||~8.2.0||~8.3.0"
1015
},
1116
"suggest": {
1217
"magento/module-admin-analytics": "*",
13-
"magento/module-page-builder": "*"
18+
"magento/module-page-builder": "2.2.*"
1419
},
15-
"type": "magento2-module",
16-
"license": [
17-
"proprietary"
18-
],
1920
"autoload": {
2021
"files": [
2122
"registration.php"
@@ -25,3 +26,4 @@
2526
}
2627
}
2728
}
29+

Diff for: ‎app/code/Magento/PageBuilderAnalytics/composer.json

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
{
22
"name": "magento/module-page-builder-analytics",
33
"description": "Page Builder Analytics module",
4+
"type": "magento2-module",
5+
"license": [
6+
"proprietary"
7+
],
8+
"version": "1.6.4",
49
"require": {
510
"magento/module-analytics": "*",
6-
"magento/module-page-builder": "*",
11+
"magento/module-page-builder": "2.2.*",
712
"magento/framework": "*",
813
"php": "~8.1.0||~8.2.0||~8.3.0"
914
},
10-
"type": "magento2-module",
11-
"license": [
12-
"proprietary"
13-
],
1415
"autoload": {
1516
"files": [
1617
"registration.php"
@@ -20,3 +21,4 @@
2021
}
2122
}
2223
}
24+

Diff for: ‎app/code/Magento/_metapackage/composer.json

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
{
22
"name": "magento/page-builder",
33
"description": "Page Builder metapackage",
4+
"type": "metapackage",
5+
"version": "1.7.4-p2",
46
"require": {
5-
"magento/module-page-builder": "*",
6-
"magento/module-page-builder-analytics": "*",
7-
"magento/module-cms-page-builder-analytics": "*",
8-
"magento/module-page-builder-admin-analytics": "*",
9-
"magento/module-catalog-page-builder-analytics": "*",
10-
"magento/module-aws-s3-page-builder": "*"
11-
},
12-
"type": "metapackage"
7+
"magento/module-page-builder": "2.2.5-p2",
8+
"magento/module-page-builder-analytics": "1.6.4",
9+
"magento/module-cms-page-builder-analytics": "1.6.4",
10+
"magento/module-page-builder-admin-analytics": "1.1.4",
11+
"magento/module-catalog-page-builder-analytics": "1.6.4",
12+
"magento/module-aws-s3-page-builder": "1.0.4"
13+
}
1314
}
15+

0 commit comments

Comments
 (0)