Skip to content

Commit fa6dc7b

Browse files
sivaschenkosivaschenko
committed
Merge branch 'develop' of github.com:magento-commerce/magento2-page-builder into api-changes-develop
2 parents a02c77c + cb03d4c commit fa6dc7b

File tree

795 files changed

+5169
-3985
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

795 files changed

+5169
-3985
lines changed

‎.github/.metadata.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"templateVersion": "0.1",
3+
"product": {
4+
"name": "Magento 2 Page Builder",
5+
"description": "Page Builder introduces an intuitive, drag-and-drop interface for creating digital content, powered by content types like images, videos, banners, etc. with instant preview capabilities that enable non-technical users to take control of their content."
6+
},
7+
"contacts": {
8+
"team": {
9+
"name": "Amigos",
10+
"DL": "Grp-amigos",
11+
"slackChannel": "team-amigos"
12+
}
13+
},
14+
"ticketTracker": {
15+
"functionalJiraQueue": {
16+
"projectKey": "PB",
17+
"component": ""
18+
},
19+
"securityJiraQueue": {
20+
"projectKey": "MAGREQ",
21+
"component": "PageBuilder"
22+
}
23+
},
24+
"staticScan": {
25+
"enable": true,
26+
"frequency": "weekly",
27+
"customName": "",
28+
"branchesToScan": []
29+
}
30+
}

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,5 @@ https://github.com/magento/magento2ce/pull/<related_pr>
6666
- [ ] Pull request has a meaningful description of its purpose
6767
- [ ] All commits are accompanied by meaningful commit messages
6868
- [ ] All new or changed code is covered with unit/integration tests (if applicable)
69+
- [ ] README.md files for modified modules are updated and included in the pull request if any [README.md predefined sections](https://github.com/magento/devdocs/wiki/Magento-module-README.md) require an update
6970
- [ ] All automated tests passed successfully (all builds are green)

‎README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,18 @@ https://github.com/magento/magento2-page-builder-docs/wiki.
1414

1515
The wiki provides more information on the Page Builder project, such as:
1616

17+
- [Installation Guide](https://github.com/magento/magento2-page-builder-docs/wiki/Installation-Guide)
18+
- [Community Projects](https://github.com/magento/magento2-page-builder/projects)
1719
- [Links to User Guide tutorials](https://github.com/magento/magento2-page-builder-docs/wiki#page-builder-tutorials)
1820
- [Page Builder roadmaps](https://github.com/magento/magento2-page-builder-docs/wiki#roadmap)
1921
- [MFTF best practices](https://github.com/magento/magento2-page-builder-docs/wiki/%5BRough-Draft%5D-MFTF-Best-Practices)
20-
- [Partners Acceleration Program](https://github.com/magento/magento2-page-builder-docs/wiki/Partners-Acceleration-Program-Team)
2122

2223
## Documentation
23-
Complete documentation located on the [Magento DevDocs](https://devdocs.magento.com/page-builder/docs/), including what you need to know to start local development as described in the [installation guide](https://devdocs.magento.com/page-builder/docs/getting-started/install-pagebuilder.html).
24+
Complete documentation located on the [Magento DevDocs](https://devdocs.magento.com/page-builder/docs/), including what you need to know to start local development as described in the [installation guide](https://github.com/magento/magento2-page-builder-docs/wiki/Installation-Guide).
2425

2526
## Community Engineering Slack
2627

2728
To connect with Magento team and the Community, join us on the [Magento Community Engineering Slack](https://magentocommeng.slack.com).
2829
If you are interested in joining Slack, or a specific channel, use our [self signup](https://opensource.magento.com/slack) link.
2930

30-
Magento 2 Page Builder project slack channel: [#pagebuilder](https://magentocommeng.slack.com/archives/CHB455HPF)
31+
Magento 2 Page Builder project slack channel: [#pagebuilder](https://magentocommeng.slack.com/archives/CHB455HPF)

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Suite/RemoteStorageAwsS3EnabledPageBuilderSuite.xml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
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="RemoteStorageAwsS3EnabledPageBuilderSuite">
10+
<before>
11+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage"/>
12+
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
13+
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
14+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
15+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
16+
</actionGroup>
17+
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
18+
<magentoCLI command="config:set web/default_layouts/default_cms_layout cms-full-width" stepKey="setPageBuilderDefaultCmsLayout"/>
19+
<magentoCLI command="config:set web/default_layouts/default_category_layout category-full-width" stepKey="setPageBuilderDefaultCategoryLayout"/>
20+
<magentoCLI command="config:set web/default_layouts/default_product_layout product-full-width" stepKey="setPageBuilderDefaultProductLayout"/>
21+
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
22+
</before>
23+
<after>
24+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage"/>
25+
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
26+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
27+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
28+
</actionGroup>
29+
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
30+
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
31+
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
32+
</after>
33+
<include>
34+
<group name="remote_storage_aws_s3_pagebuilder"/>
35+
</include>
36+
</suite>
37+
</suites>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageContentTypeToCMSPageTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-image"/>
2121
<group value="remote_storage_aws_s3"/>
22+
<group value="remote_storage_aws_s3_pagebuilder"/>
2223
</annotations>
2324
<before>
24-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
25+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
2526
</before>
2627
<after>
27-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
28+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
2829
</after>
2930
</test>
3031
</tests>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageIntoPageBuilderStageTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-image"/>
2121
<group value="remote_storage_aws_s3"/>
22+
<group value="remote_storage_aws_s3_pagebuilder"/>
2223
</annotations>
2324
<before>
24-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
25+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
2526
</before>
2627
<after>
27-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
28+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
2829
</after>
2930
</test>
3031
</tests>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageInvalidFileTypeValidationTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@
1717
<group value="pagebuilder"/>
1818
<group value="pagebuilder-image"/>
1919
<group value="remote_storage_aws_s3"/>
20+
<group value="remote_storage_aws_s3_pagebuilder"/>
2021
</annotations>
2122
<before>
22-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
23+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
2324
</before>
2425
<after>
25-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
26+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
2627
</after>
2728
</test>
2829
</tests>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageRemoveImageFromStageTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-image"/>
2121
<group value="remote_storage_aws_s3"/>
22+
<group value="remote_storage_aws_s3_pagebuilder"/>
2223
</annotations>
2324
<before>
24-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
25+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
2526
</before>
2627
<after>
27-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
28+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
2829
</after>
2930
</test>
3031
</tests>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@
2121
<group value="pagebuilder-cms-block"/>
2222
<group value="pagebuilder-cms-category"/>
2323
<group value="remote_storage_aws_s3"/>
24+
<group value="remote_storage_aws_s3_pagebuilder"/>
2425
</annotations>
2526
<before>
26-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
27+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
2728
</before>
2829
<after>
29-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
30+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
3031
</after>
3132
</test>
3233
</tests>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderDeleteTemplate.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-templates"/>
2121
<group value="remote_storage_aws_s3"/>
22+
<group value="remote_storage_aws_s3_pagebuilder"/>
2223
</annotations>
2324
<before>
24-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
25+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
2526
</before>
2627
<after>
27-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
28+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
2829
</after>
2930
</test>
3031
</tests>

0 commit comments

Comments
 (0)