Skip to content

Commit 93dd88d

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'mainline/release' into MC-40439
2 parents 1f642af + db55524 commit 93dd88d

File tree

20 files changed

+190
-33
lines changed

20 files changed

+190
-33
lines changed

‎.github/CONTRIBUTING.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ For more detailed information on contribution please read our [beginners guide](
1515

1616
## Contribution requirements
1717

18-
1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.3/coding-standards/bk-coding-standards.html).
19-
2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests.
20-
3. Commits must be accompanied by meaningful commit messages. Please see the [Magento 2 Page Builder Pull Request Template](PULL_REQUEST_TEMPLATE.md) for more information.
21-
4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
22-
3. PRs which include new logic or new features must be submitted along with:
23-
* Unit/integration test coverage
24-
* Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
25-
4. For larger features or changes, please [open an issue](https://github.com/magento/magento2-page-builder/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
18+
1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.4/coding-standards/bk-coding-standards.html).
19+
1. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests.
20+
1. Commits must be accompanied by meaningful commit messages. Please see the [Magento 2 Page Builder Pull Request Template](PULL_REQUEST_TEMPLATE.md) for more information.
21+
1. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
22+
1. PRs which include new logic or new features must be submitted along with:
23+
* Unit/integration test coverage
24+
* Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
25+
1. For larger features or changes, please [open an issue](https://github.com/magento/magento2-page-builder/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
2626

2727
## Contribution process
2828

@@ -33,16 +33,16 @@ This will allow you to collaborate with the Magento 2 Page Builder development t
3333
1. Search current [listed issues](https://github.com/magento/magento2-page-builder/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
3434
2. Review the [Contributor License Agreement](https://opensource.adobe.com/cla.html) if this is your first time contributing.
3535
3. Create and test your work.
36-
4. Fork the Magento 2 Page Builder repository according to the [Fork A Repository instructions](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#pull_request).
36+
4. Fork the Magento 2 Page Builder repository according to the [Fork A Repository instructions](https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#pull_request).
3737
5. Once your contribution is received the Magento 2 Page Builder development team will review the contribution and collaborate with you as needed.
3838

3939
## Code of Conduct
4040

4141
Please note that this project is released with a Contributor Code of Conduct. We expect you to agree to its terms when participating in this project.
4242
The full text is available in the repository [Wiki](https://github.com/magento/magento2/wiki/Magento-Code-of-Conduct).
4343

44-
## Connecting with Community!
44+
## Connecting with Community
4545

4646
If you have any questions, join us in [#pagebuilder](https://magentocommeng.slack.com/archives/CHB455HPF) Slack chat. If you are not on our slack, [click here](https://opensource.magento.com/slack) to join.
4747

48-
Need to find a project? Check out the [Slack Channels](https://github.com/magento/magento2/wiki/Slack-Channels) (with listed project info) and the [Magento Community Portal](https://opensource.magento.com/).
48+
Need to find a project? Check out the [Slack Channels](https://github.com/magento/magento2/wiki/Slack-Channels) (with listed project info) and the [Magento Community Portal](https://opensource.magento.com/).

‎app/code/Magento/CatalogPageBuilderAnalytics/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Magento_CatalogPageBuilderAnalytics module
22

3-
The Magento_CatalogPageBuilderAnalytics module configures data definitions for a data collection related to the PageBuilder module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
3+
The Magento_CatalogPageBuilderAnalytics module configures data definitions for a data collection related to the PageBuilder module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.4/advanced-reporting/modules.html).

‎app/code/Magento/CmsPageBuilderAnalytics/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Magento_CmsPageBuilderAnalytics module
22

3-
The Magento_CmsPageBuilderAnalytics module configures data definitions for a data collection related to the PageBuilder module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
3+
The Magento_CmsPageBuilderAnalytics module configures data definitions for a data collection related to the PageBuilder module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.4/advanced-reporting/modules.html).

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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="AdminOpenSelectImageFromGalleryActionGroup">
11+
<annotations>
12+
<description>Open selected Image from Gallery.</description>
13+
</annotations>
14+
15+
<waitForElementVisible selector="{{ImageOnStageWithoutImageUploaded.selectFromGalleryBtn}}" stepKey="seeSelectFromGalleryBtn"/>
16+
<click selector="{{ImageOnStageWithoutImageUploaded.selectFromGalleryBtn}}" stepKey="clickSelectFromGalleryBtn"/>
17+
<waitForElementVisible selector="{{AdminEnhancedMediaGalleryMassActionSection.deleteImages}}" stepKey="waitForAnimation"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderStageSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
<element name="contentTypeContainer" type="button" selector="(//div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(@class, &quot;pagebuilder-{{arg1}}&quot;)])[{{arg2}}]/descendant::div[contains(@class, &quot;element-children&quot;)]" parameterized="true"/>
4444
<element name="contentTypeInsideContainerStage" type="button" selector="(//div[contains(@class, &quot;{{arg1}}-container&quot;)])[{{arg2}}]//div[contains(@class,&quot;pagebuilder-content-type-wrapper&quot;)][{{arg3}}]//div[contains(@class,&quot;pagebuilder-{{arg4}}&quot;)][{{arg5}}]" parameterized="true"/>
4545
<element name="contentTypePreviewInStage" type="button" selector="div.pagebuilder-{{arg1}}.pagebuilder-content-type" parameterized="true"/>
46-
<element name="computedHeightOnStage" type="text" selector="return parseInt(window.getComputedStyle(document.querySelector('.pagebuilder-{{arg1}}:nth-of-type({{arg2}})')).height)" parameterized="true"/>
47-
<element name="computedWidthOnStage" type="text" selector="return parseInt(window.getComputedStyle(document.querySelector('.pagebuilder-{{arg1}}:nth-of-type({{arg2}})')).width)" parameterized="true"/>
46+
<element name="computedHeightOnStage" type="text" selector="return parseInt(window.getComputedStyle(document.querySelectorAll('.pagebuilder-{{arg1}}')[{{arg2}}-1]).height)" parameterized="true"/>
47+
<element name="computedWidthOnStage" type="text" selector="return parseInt(window.getComputedStyle(document.querySelectorAll('.pagebuilder-{{arg1}}')[{{arg2}}-1]).width)" parameterized="true"/>
4848
<element name="uploadImageInput" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//input[@name='background_image']"/>
4949
<element name="onHoverUploadImageButton" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-{{arg1}}')])[{{arg2}}]//label[text()='Upload Image']" parameterized="true"/>
5050
<element name="onHoverSelectFromGalleryButton" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-{{arg1}}')])[{{arg2}}]//ul[contains(@class,'pagebuilder-options-links')]//label[text()='Select from Gallery']" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderNewMediaGalleryRenditionsSuite.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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+
<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
9+
<suite name="PageBuilderNewMediaGalleryRenditionsSuite">
10+
<before>
11+
<actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="disableWYSIWYG" />
12+
<magentoCLI command="config:set {{MediaGalleryConfigDataEnabled.path}} {{MediaGalleryConfigDataEnabled.value}}" stepKey="enableEnhancedMediaGallery"/>
13+
<magentoCLI command="config:set {{MediaGalleryRenditionsDataEnabled.path}} {{MediaGalleryRenditionsDataEnabled.value}}" stepKey="enableMediaGalleryRenditions"/>
14+
</before>
15+
<after>
16+
<magentoCLI command="config:set {{MediaGalleryRenditionsDataDisabled.path}} {{MediaGalleryRenditionsDataDisabled.value}}" stepKey="disableMediaGalleryRenditions"/>
17+
<magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="disableEnhancedMediaGallery"/>
18+
<actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSIWYG" />
19+
</after>
20+
<include>
21+
<group name="page_builder_new_media_gallery_renditions"/>
22+
</include>
23+
</suite>
24+
</suites>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageWithImageTest.xml

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="PageBuilderCMSPageCreatePageWithImageTest">
11+
<annotations>
12+
<features value="PageBuilder"/>
13+
<stories value="CMS Page"/>
14+
<title value="Create CMS Page with Image"/>
15+
<description value="Create CMS Page with Image and verify Page is counted in Image 'used in' section"/>
16+
<severity value="MAJOR"/>
17+
<group value="page_builder_new_media_gallery_renditions"/>
18+
</annotations>
19+
<before>
20+
<createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
21+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
22+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGalleryBefore"/>
23+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridBefore"/>
24+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
25+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder">
26+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
27+
</actionGroup>
28+
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
29+
<argument name="image" value="ImageUpload3"/>
30+
</actionGroup>
31+
</before>
32+
<after>
33+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryAfter"/>
34+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultViewAfter"/>
35+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolderAfter">
36+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
37+
</actionGroup>
38+
<actionGroup ref="AdminEnhancedMediaGalleryImageDeleteActionGroup" stepKey="deleteImage"/>
39+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
40+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
41+
<deleteData createDataKey="createCMSPage" stepKey="deleteCmsPage"/>
42+
</after>
43+
44+
<!-- Open CMS Page on admin-->
45+
<actionGroup ref="AdminOpenCmsPageActionGroup" stepKey="openEditPage">
46+
<argument name="page_id" value="$$createCMSPage.id$$"/>
47+
</actionGroup>
48+
49+
<!-- Add the Image to CMS Page -->
50+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
51+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
52+
<argument name="contentType" value="PageBuilderRowContentType"/>
53+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
54+
</actionGroup>
55+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
56+
<argument name="contentType" value="PageBuilderImageContentType"/>
57+
</actionGroup>
58+
<actionGroup ref="dragContentTypeToStage" stepKey="dragImageIntoStage">
59+
<argument name="contentType" value="PageBuilderImageContentType"/>
60+
</actionGroup>
61+
<actionGroup ref="AdminOpenSelectImageFromGalleryActionGroup" stepKey="openMediaGallery"/>
62+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGrid"/>
63+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectMediaGalleryFolder">
64+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
65+
</actionGroup>
66+
<actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectFirstImage">
67+
<argument name="imageName" value="{{ImageMetadata.title}}"/>
68+
</actionGroup>
69+
<actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedCategoryImage"/>
70+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
71+
72+
<!-- Save CMS Page -->
73+
<actionGroup ref="AdminSaveAndContinueEditCmsPageActionGroup" stepKey="saveCmsPageAndContinue"/>
74+
75+
<!-- Check if Image have "used in" data section -->
76+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
77+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
78+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectMediaGalleryFolderToCheck">
79+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
80+
</actionGroup>
81+
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
82+
<actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionDisplayedActionGroup"
83+
stepKey="assertUsedInSectionDisplayed"/>
84+
</test>
85+
</tests>

‎app/code/Magento/PageBuilder/etc/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<system>
3535
<media_storage_configuration>
3636
<allowed_resources>
37-
<sitemap_folder>.template-manager</sitemap_folder>
37+
<template_manager_folder>.template-manager</template_manager_folder>
3838
</allowed_resources>
3939
</media_storage_configuration>
4040
</system>

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/block/_mobile.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
.pagebuilder-content-type.pagebuilder-block {
1010
.rendered-content {
1111
.pagebuilder-column-group {
12-
display: block !important;
12+
flex-wrap: wrap;
1313
.pagebuilder-column {
14-
width: 100% !important;
14+
flex-basis: 100%;
1515
}
1616
}
1717
}

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-group/_mobile.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
.pagebuilder-content-type {
1111
.pagebuilder-column-group {
1212
> .element-children {
13-
display: block;
13+
flex-wrap: wrap;
1414
}
1515
}
1616

0 commit comments

Comments
 (0)