Skip to content

Commit 9b7d1be

Browse files
davemacaulaydavemacaulay
committed
Merge branch 'develop' into MC-4189-ie-11
# Conflicts: # app/code/Magento/PageBuilder/view/adminhtml/web/ts/.babelrc.js # package.json # yarn.lock
2 parents 732594e + 5da3bf7 commit 9b7d1be

File tree

303 files changed

+6914
-4003
lines changed

Some content is hidden

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

303 files changed

+6914
-4003
lines changed

‎app/code/Magento/PageBuilder/docs/CONTRIBUTING.md renamed to ‎CONTRIBUTING.md

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Contributing to Magento 2 code
22

3+
<!--{% comment %}-->
34
## Navigation
45

56
1. [Introduction]
@@ -13,34 +14,14 @@
1314
5. [Roadmap and known issues]
1415
6. [How to create custom PageBuilder content type container]
1516

16-
[Introduction]: README.md
17-
[Contribution guide]: CONTRIBUTING.md
18-
[Installation guide]: install.md
19-
[Developer documentation]: developer-documentation.md
20-
[Architecture overview]: architecture-overview.md
21-
[BlueFoot to PageBuilder data migration]: bluefoot-data-migration.md
22-
[Third-party content type migration]: new-content-type-example.md
23-
[Iconography]: iconography.md
24-
[Add image uploader to content type]: image-uploader.md
25-
[Module integration]: module-integration.md
26-
[Additional data configuration]: custom-configuration.md
27-
[Content type configuration]: content-type-configuration.md
28-
[How to add a new content type]: how-to-add-new-content-type.md
29-
[Events]: events.md
30-
[Bindings]: bindings.md
31-
[Master format]: master-format.md
32-
[Visual select]: visual-select.md
33-
[Reuse product conditions in content types]: product-conditions.md
34-
[Store component master format as widget directive]: widget-directive.md
35-
[Use the block chooser UI component]: block-chooser-component.md
36-
[Use the inline text editing component]: inline-editing-component.md
37-
[Render a backend content type preview]: content-type-preview.md
38-
[Custom Toolbar]: toolbar.md
39-
[Full width page layouts]: full-width-page-layouts.md
40-
[Add custom logic to content types]: add-custom-logic.md
41-
[Roadmap and Known Issues]: roadmap.md
42-
[How to create custom PageBuilder content type container]: how-to-create-custom-content-type-container.md
17+
[Introduction]: docs/introduction.md
18+
[Installation guide]: docs/install.md
19+
[Developer documentation]: docs/developer-documentation.md
20+
[Roadmap and Known Issues]: docs/roadmap.md
21+
[How to create custom PageBuilder content type container]: docs/how-to-create-custom-content-type-container.md
22+
<!--{% endcomment %}-->
4323

24+
<!-- {% raw %} -->
4425
## Overview
4526

4627
Contributions to the Magento 2 codebase are done using the fork & pull model.
@@ -67,8 +48,8 @@ The Magento 2 development team will review all issues and contributions submitte
6748

6849
If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). By doing that, you will be able to collaborate with the Magento 2 development team, “fork” the Magento 2 project and be able to easily send “pull requests”.
6950

70-
1. Search current [listed issues](https://github.com/magento/magento2-page-builder/issues) on GitHub (open or closed) and [list of known issues](roadmap.md#Known Issues) on our roadmap for similar proposals of intended contribution before starting work on a new contribution.
71-
2. Please contact us in Slack chanel if you want to work on issue from [list of known issues](roadmap.md#Known Issues).
51+
1. Search current [listed issues](https://github.com/magento/magento2-page-builder/issues) on GitHub (open or closed) and [list of known issues](docs/roadmap.md#Known Issues) on our roadmap for similar proposals of intended contribution before starting work on a new contribution.
52+
2. Please contact us in Slack chanel if you want to work on issue from [list of known issues](docs/roadmap.md#Known Issues).
7253
2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
7354
3. Create and test your work.
7455
4. Fork the Magento 2 repository according to [Fork a repository instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow [Create a pull request instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#pull_request). Instructions written for `https://github.com/magento/magento2` repository, but they also apply to `https://github.com/magento/magento2-page-builder`.
@@ -78,3 +59,5 @@ If you are a new GitHub user, we recommend that you create your own [free github
7859

7960
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.
8061
The full text is available in the repository [Wiki](https://github.com/magento/magento2/wiki/Magento-Code-of-Conduct).
62+
63+
<!-- {% endraw %} -->

‎README.md

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# magento2-page-builder
22

3+
<!-- {% raw %} -->
4+
35
## PageBuilder Early Access Program
46

57
The PageBuilder Early Access Program (EAP) gives partners the following perks:
@@ -18,8 +20,8 @@ We offer two methods for installing PageBuilder:
1820
* As a [Composer package] - use this option if you do not plan to contribute to the PageBuilder code repository
1921
* Using the [GitHub repository] - use this option to install PageBuilder from the GitHub repository and contribute to the code
2022

21-
[Composer package]: app/code/Magento/PageBuilder/docs/install.md#composer-installation
22-
[GitHub repository]: app/code/Magento/PageBuilder/docs/install.md#github-installation
23+
[Composer package]: docs/install.md#composer-installation
24+
[GitHub repository]: docs/install.md#github-installation
2325

2426
## Developer documentation
2527

@@ -39,19 +41,19 @@ This project repository contains PageBuilder developer documentation on the foll
3941
1. [Visual select]
4042
1. [Custom Toolbar]
4143

42-
[Architecture overview]: app/code/Magento/PageBuilder/docs/architecture-overview.md
43-
[BlueFoot to PageBuilder data migration]: app/code/Magento/PageBuilder/docs/bluefoot-data-migration.md
44-
[Third-party content type migration]: app/code/Magento/PageBuilder/docs/new-content-type-example.md
45-
[Iconography]: app/code/Magento/PageBuilder/docs/iconography.md
46-
[Module integration]: app/code/Magento/PageBuilder/docs/module-integration.md
47-
[Additional data configuration]: app/code/Magento/PageBuilder/docs/custom-configuration.md
48-
[Content type configuration]: app/code/Magento/PageBuilder/docs/content-type-configuration.md
49-
[How to add a new content type]: app/code/Magento/PageBuilder/docs/how-to-add-new-content-type.md
50-
[Events]: app/code/Magento/PageBuilder/docs/events.md
51-
[Bindings]: app/code/Magento/PageBuilder/docs/bindings.md
52-
[Master format]: app/code/Magento/PageBuilder/docs/master-format.md
53-
[Visual select]: app/code/Magento/PageBuilder/docs/visual-select.md
54-
[Custom Toolbar]: app/code/Magento/PageBuilder/docs/toolbar.md
44+
[Architecture overview]: docs/architecture-overview.md
45+
[BlueFoot to PageBuilder data migration]: docs/bluefoot-data-migration.md
46+
[Third-party content type migration]: docs/new-content-type-example.md
47+
[Iconography]: docs/iconography.md
48+
[Module integration]: docs/module-integration.md
49+
[Additional data configuration]: docs/custom-configuration.md
50+
[Content type configuration]: docs/content-type-configuration.md
51+
[How to add a new content type]: docs/how-to-add-new-content-type.md
52+
[Events]: docs/events.md
53+
[Bindings]: docs/bindings.md
54+
[Master format]: docs/master-format.md
55+
[Visual select]: docs/visual-select.md
56+
[Custom Toolbar]: docs/toolbar.md
5557

5658
## Contribute to PageBuilder
5759

@@ -60,9 +62,9 @@ A good place to start is by looking at our [features roadmap] and list of [known
6062

6163
If you are interested in contributing to this repository, please see our [Contribution Guide].
6264

63-
[Contribution Guide]: app/code/Magento/PageBuilder/docs/CONTRIBUTING.md
64-
[features roadmap]: app/code/Magento/PageBuilder/docs/roadmap.md#planned-features-and-functionality
65-
[known issues]: app/code/Magento/PageBuilder/docs/roadmap.md#known-issues
65+
[Contribution Guide]: CONTRIBUTING.md
66+
[features roadmap]: docs/roadmap.md#planned-features-and-functionality
67+
[known issues]: docs/roadmap.md#known-issues
6668

6769
## PageBuilder updates from the Magento core team
6870

@@ -71,7 +73,7 @@ The PageBuilder team updates the code every 2 weeks.
7173

7274
To help you prepare for these changes, we are publishing a [roadmap] of features and issues that we are going to work on in the following months.
7375

74-
[roadmap]: app/code/Magento/PageBuilder/docs/roadmap.md
76+
[roadmap]: docs/roadmap.md
7577

7678
## Provide feedback
7779

@@ -86,4 +88,6 @@ To participate in technical discussions and ask questions, join us in [Slack].
8688
For all other questions or requests, contact [Olena Tkacheva].
8789

8890
[Slack]: https://magentocommeng.slack.com/
89-
[Olena Tkacheva]: https://magentocommeng.slack.com/messages/@UAFV915FB
91+
[Olena Tkacheva]: https://magentocommeng.slack.com/messages/@UAFV915FB
92+
93+
<!-- {% endraw %} -->

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,23 @@
1919
<fillField selector="{{AdvancedForm.advancedMarginBottom}}" userInput="{{property.marginBottom}}" stepKey="fillMarginBottomField"/>
2020
<click selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="clickOnFieldLabel"/>
2121
</actionGroup>
22+
<actionGroup name="fillSlideOutPanelSingleFieldMarginsOrPadding">
23+
<arguments>
24+
<argument name="field" type="string"/>
25+
<argument name="value" type="string"/>
26+
</arguments>
27+
<waitForElement selector="{{AdvancedForm.advancedMarginsOrPaddingField(field)}}" stepKey="waitForElement"/>
28+
<fillField selector="{{AdvancedForm.advancedMarginsOrPaddingField(field)}}" userInput="{{value}}" stepKey="fillFieldMarginOrPadding"/>
29+
</actionGroup>
30+
<actionGroup name="validateMarginsOrPaddingError">
31+
<arguments>
32+
<argument name="property"/>
33+
<argument name="errorMessage" type="string"/>
34+
</arguments>
35+
<waitForElementVisible selector="{{EditPanelForm.panelSectionError(property.section)}}" stepKey="waitForSectionChangedIcon"/>
36+
<seeElement selector="{{EditPanelForm.panelSectionError(property.section)}}" stepKey="seeElementSectionChangedIcon"/>
37+
<see userInput="{{errorMessage}}" selector="{{AdvancedForm.advancedMarginAndPaddingErrorMessage}}" stepKey="seeErrorMessage"/>
38+
</actionGroup>
2239
<actionGroup name="fillSlideOutPanelFieldPadding">
2340
<arguments>
2441
<argument name="property" defaultValue=""/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup.xml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,6 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="validateBackgroundAttributes">
12-
<arguments>
13-
<argument name="section"/>
14-
<argument name="backgroundColor"/>
15-
<argument name="backgroundImage"/>
16-
<argument name="backgroundPosition" defaultValue="PageBuilderBackgroundPosition_Default"/>
17-
<argument name="backgroundSize" defaultValue="PageBuilderBackgroundSize_Default"/>
18-
<argument name="backgroundRepeat" defaultValue="PageBuilderBackgroundRepeat_Default"/>
19-
<argument name="backgroundAttachment" defaultValue="PageBuilderBackgroundAttachment_Default"/>
20-
<argument name="index" defaultValue="1" type="string"/>
21-
</arguments>
22-
<waitForElementVisible selector="{{section.base(index)}}" stepKey="waitForBaseElement"/>
23-
<waitForElementVisible selector="{{section.backgroundColor(index, backgroundColor.rgb)}}" stepKey="waitForBackgroundColor"/>
24-
<waitForElementVisible selector="{{section.backgroundImage(index, backgroundImage.fileName)}}" stepKey="waitForBackgroundImage"/>
25-
<waitForElementVisible selector="{{section.backgroundPosition(index, backgroundPosition.styleValue)}}" stepKey="waitForBackgroundPosition"/>
26-
<waitForElementVisible selector="{{section.backgroundSize(index, backgroundSize.value)}}" stepKey="waitForBackgroundSize"/>
27-
<waitForElementVisible selector="{{section.backgroundRepeat(index, backgroundRepeat.styleValue)}}" stepKey="waitForBackgroundRepeat"/>
28-
<waitForElementVisible selector="{{section.backgroundAttachment(index, backgroundAttachment.value)}}" stepKey="waitForBackgroundAttachment"/>
29-
</actionGroup>
3011
<actionGroup name="validateBackgroundAttributesWithNoImageOrColor">
3112
<arguments>
3213
<argument name="section"/>

0 commit comments

Comments
 (0)