Skip to content

Commit c504572

Browse files
anthoulaanthoula
committed
Merge branch 'MC-3162-panel-regroup' into cms-team-1-delivery
# Conflicts: # app/code/Magento/PageBuilder/i18n/en_US.csv # app/code/Magento/PageBuilder/view/adminhtml/web/js/stage.js
2 parents 129f179 + 633957d commit c504572

File tree

94 files changed

+1789
-683
lines changed

Some content is hidden

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

94 files changed

+1789
-683
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,17 @@
5959
<see userInput="You saved the page." selector="{{CmsPagesPageActionsSection.savePageSuccessMessage}}" stepKey="assertSavePageSuccessMessage"/>
6060
</actionGroup>
6161
<actionGroup name="verifyPageBuilderVisibleOnPage">
62-
<waitForElementVisible selector="{{PageBuilderPanel.generalGroup}}" stepKey="seePageBuilderVisible"/>
62+
<waitForElementVisible selector="{{PageBuilderPanel.layoutGroup}}" stepKey="seePageBuilderVisible"/>
6363
<dontSee userInput="Enable Advanced CMS" stepKey="dontSeeEnableAdvancedCMSBtn"/>
6464
</actionGroup>
6565
<actionGroup name="verifyPageBuilderVisibleOnStaging">
66-
<scrollTo selector="{{PageBuilderPanel.generalGroup}}" stepKey="scrollToIdentifyPageBuilder"/>
67-
<waitForElementVisible selector="{{PageBuilderPanel.generalGroup}}" stepKey="seePageBuilderVisible"/>
66+
<scrollTo selector="{{PageBuilderPanel.layoutGroup}}" stepKey="scrollToIdentifyPageBuilder"/>
67+
<waitForElementVisible selector="{{PageBuilderPanel.layoutGroup}}" stepKey="seePageBuilderVisible"/>
6868
<dontSee userInput="Enable Advanced CMS" stepKey="dontSeeEnableAdvancedCMSBtn"/>
6969
</actionGroup>
7070
<actionGroup name="verifyPageBuilderNotVisibleOnPage">
7171
<dontSee userInput="Enable Advanced CMS" stepKey="dontSeeEnableAdvancedCMSBtn"/>
72-
<dontSee selector="{{PageBuilderPanel.generalGroup}}" stepKey="seePageBuilderVisible"/>
72+
<dontSee selector="{{PageBuilderPanel.layoutGroup}}" stepKey="seePageBuilderVisible"/>
7373
</actionGroup>
7474
<actionGroup name="setLayout">
7575
<arguments>
@@ -101,7 +101,7 @@
101101
<click selector="{{PageBuilderCatalog.openPageBuilder}}" stepKey="clickOnPageBuilderBtn" />
102102
<!--See PageBuilder fullsize-->
103103
<comment userInput="See PageBuilder fullsize" stepKey="commentSeePageBuilderFullsize"/>
104-
<waitForElementVisible selector="{{PageBuilderPanel.generalGroup}}" stepKey="waiForPageBuilderVisible" />
104+
<waitForElementVisible selector="{{PageBuilderPanel.layoutGroup}}" stepKey="waiForPageBuilderVisible" />
105105
<seeElement selector="{{PageBuilderStage.stageWrapperFullScreen}}" stepKey="seePageBuilderFullSizeScreen" />
106106
</actionGroup>
107107
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<argument name="offsetXCoordinate" defaultValue="null" type="string"/>
4949
<argument name="offsetYCoordinate" defaultValue="null" type="string"/>
5050
</arguments>
51-
<scrollTo selector="{{CmsNewPagePageActionsSection.contentSectionName}}" stepKey="scrollToTopOfStage"/>
51+
<waitForElementVisible time="30" selector="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" stepKey="waitForContentTypeInPanel"/>
5252
<dragAndDrop selector1="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderStage.contentTypeContainer(containerTargetType.role, containerTargetIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropContentTypeIntoStage"/>
5353
<waitForPageLoad stepKey="waitForAnimation" time="30"/>
5454
<waitForElementVisible time="10" selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeInStage" />

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

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -17,39 +17,35 @@
1717
<waitForElementVisible selector="{{PageBuilderPanel.panelGroupActive(group.section)}}" stepKey="waitForGroupExpanded"/>
1818
</actionGroup>
1919
<actionGroup name="closePageBuilderPanelGroups">
20+
<click selector="{{PageBuilderPanel.elementsGroup}}" stepKey="clickElementsGroup"/>
2021
<click selector="{{PageBuilderPanel.mediaGroup}}" stepKey="clickMediaGroup"/>
21-
<click selector="{{PageBuilderPanel.interactiveGroup}}" stepKey="clickInteractiveGroup"/>
22-
<click selector="{{PageBuilderPanel.magentoGroup}}" stepKey="clickMagentoGroup"/>
23-
<click selector="{{PageBuilderPanel.otherGroup}}" stepKey="clickOtherGroup"/>
22+
<click selector="{{PageBuilderPanel.addContentGroup}}" stepKey="clickAddContentGroup"/>
2423
</actionGroup>
2524
<actionGroup name="validateGroupsAndContentTypes">
26-
<see userInput="General" selector="{{PageBuilderPanel.generalGroup}}" stepKey="seeGeneralGroup"/>
27-
<see userInput="Row" selector="{{PageBuilderPanel.generalGroupContentType}}" stepKey="seeGeneralGroupRow"/>
28-
<see userInput="Column" selector="{{PageBuilderPanel.generalGroupContentType}}" stepKey="seeGeneralGroupColumn"/>
29-
<see userInput="Text" selector="{{PageBuilderPanel.generalGroupContentType}}" stepKey="seeGeneralGroupText"/>
30-
<see userInput="Heading" selector="{{PageBuilderPanel.generalGroupContentType}}" stepKey="seeGeneralGroupHeading"/>
31-
<see userInput="Buttons" selector="{{PageBuilderPanel.generalGroupContentType}}" stepKey="seeGeneralGroupButtons"/>
32-
<see userInput="Divider" selector="{{PageBuilderPanel.generalGroupContentType}}" stepKey="seeGeneralGroupDivider"/>
25+
<see userInput="Layout" selector="{{PageBuilderPanel.layoutGroup}}" stepKey="seeLayoutGroup"/>
26+
<see userInput="Row" selector="{{PageBuilderPanel.layoutGroupContentType}}" stepKey="seeLayoutGroupRow"/>
27+
<see userInput="Column" selector="{{PageBuilderPanel.layoutGroupContentType}}" stepKey="seeLayoutGroupColumn"/>
28+
<see userInput="Tabs" selector="{{PageBuilderPanel.layoutGroupContentType}}" stepKey="seeLayoutGroupTabs"/>
29+
<see userInput="Accordion" selector="{{PageBuilderPanel.layoutGroupContentType}}" stepKey="seeLayoutGroupAccordion"/>
30+
<click selector="{{PageBuilderPanel.elementsGroup}}" stepKey="clickElementsGroup"/>
31+
<see userInput="Elements" selector="{{PageBuilderPanel.elementsGroup}}" stepKey="seeElementsGroup"/>
32+
<see userInput="Text" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupText"/>
33+
<see userInput="Heading" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupHeading"/>
34+
<see userInput="Buttons" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupButtons"/>
35+
<see userInput="Divider" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupDivider"/>
36+
<see userInput="Newsletter" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupNewsletter"/>
37+
<see userInput="Anchor" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupAnchor"/>
38+
<see userInput="HTML Code" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupHtml"/>
3339
<click selector="{{PageBuilderPanel.mediaGroup}}" stepKey="clickMediaGroup"/>
3440
<see userInput="Media" selector="{{PageBuilderPanel.mediaGroup}}" stepKey="seeMediaGroup"/>
3541
<see userInput="Image" selector="{{PageBuilderPanel.mediaGroupContentType}}" stepKey="seeMediaGroupImage"/>
36-
<see userInput="Banner" selector="{{PageBuilderPanel.mediaGroupContentType}}" stepKey="seeMediaGroupBanner"/>
3742
<see userInput="Video" selector="{{PageBuilderPanel.mediaGroupContentType}}" stepKey="seeMediaGroupVideo"/>
43+
<see userInput="Banner" selector="{{PageBuilderPanel.mediaGroupContentType}}" stepKey="seeMediaGroupBanner"/>
3844
<see userInput="Slider" selector="{{PageBuilderPanel.mediaGroupContentType}}" stepKey="seeMediaGroupSlider"/>
39-
<click selector="{{PageBuilderPanel.interactiveGroup}}" stepKey="clickInteractiveGroup"/>
40-
<see userInput="Interactive" selector="{{PageBuilderPanel.interactiveGroup}}" stepKey="seeInteractiveGroup"/>
41-
<see userInput="Tabs" selector="{{PageBuilderPanel.interactiveGroupContentType}}" stepKey="seeInteractiveGroupTabs"/>
42-
<see userInput="Accordion" selector="{{PageBuilderPanel.interactiveGroupContentType}}" stepKey="seeInteractiveGroupAccordion"/>
43-
<see userInput="Map" selector="{{PageBuilderPanel.interactiveGroupContentType}}" stepKey="seeInteractiveGroupMap"/>
44-
<see userInput="Newsletter" selector="{{PageBuilderPanel.interactiveGroupContentType}}" stepKey="seeInteractiveGroupNewsletter"/>
45-
<click selector="{{PageBuilderPanel.magentoGroup}}" stepKey="clickMagentoGroup"/>
46-
<see userInput="Magento" selector="{{PageBuilderPanel.magentoGroup}}" stepKey="seeMagentoGroup"/>
47-
<see userInput="Block" selector="{{PageBuilderPanel.magentoGroupContentType}}" stepKey="seeMagentoGroupBlock"/>
48-
<see userInput="Product" selector="{{PageBuilderPanel.magentoGroupContentType}}" stepKey="seeMagentoGroupProduct"/>
49-
<click selector="{{PageBuilderPanel.otherGroup}}" stepKey="clickOtherGroup"/>
50-
<see userInput="Anchor" selector="{{PageBuilderPanel.otherGroupContentType}}" stepKey="seeOtherGroupAnchor"/>
51-
<dontSee selector="{{PageBuilderPanel.codeContentType}}" stepKey="dontSeeOtherGroupCode"/>
52-
<see userInput="Html" selector="{{PageBuilderPanel.otherGroupContentType}}" stepKey="seeOtherGroupHtml"/>
53-
<dontSee userInput="Search" selector="{{PageBuilderPanel.otherGroupContentType}}" stepKey="dontSeeOtherGroupSearch"/>
45+
<see userInput="Map" selector="{{PageBuilderPanel.mediaGroupContentType}}" stepKey="seeMediaGroupMap"/>
46+
<click selector="{{PageBuilderPanel.addContentGroup}}" stepKey="clickAddContentGroup"/>
47+
<see userInput="Add Content" selector="{{PageBuilderPanel.addContentGroup}}" stepKey="seeAddContentGroup"/>
48+
<see userInput="Block" selector="{{PageBuilderPanel.addContentGroupContentType}}" stepKey="seeAddContentGroupBlock"/>
49+
<see userInput="Products" selector="{{PageBuilderPanel.addContentGroupContentType}}" stepKey="seeAddContentGroupProducts"/>
5450
</actionGroup>
5551
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/ContentTypeData.xml

Lines changed: 56 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -15,66 +15,105 @@
1515
<entity name="PageBuilderStage" type="pagebuilder_content_type">
1616
<data key="role">stage</data>
1717
</entity>
18+
<!-- Layout -->
1819
<entity name="PageBuilderRowContentType" type="pagebuilder_content_type">
1920
<data key="name">Row</data>
20-
<data key="section">General</data>
21+
<data key="section">Layout</data>
2122
<data key="role">row</data>
2223
<data key="pageNamePrefix">row</data>
2324
</entity>
2425
<entity name="PageBuilderColumnContentType" type="pagebuilder_content_type">
2526
<data key="name">Column</data>
26-
<data key="section">General</data>
27+
<data key="section">Layout</data>
2728
<data key="role">column</data>
2829
<data key="pageNamePrefix">column</data>
2930
</entity>
31+
<entity name="PageBuilderTabsContentType" type="pagebuilder_content_type">
32+
<data key="name">Tabs</data>
33+
<data key="section">Layout</data>
34+
<data key="role">tabs</data>
35+
<data key="pageNamePrefix">tabs</data>
36+
</entity>
37+
<entity name="PageBuilderTabContentType" type="pagebuilder_content_type">
38+
<data key="name">Tab</data>
39+
<data key="section">Layout</data>
40+
<data key="role">tab-item</data>
41+
<data key="pageNamePrefix">tab</data>
42+
</entity>
43+
<entity name="PageBuilderAccordionContentType" type="pagebuilder_content_type">
44+
<data key="name">Accordion</data>
45+
<data key="section">Layout</data>
46+
<data key="role">accordion</data>
47+
<data key="pageNamePrefix">accordion</data>
48+
</entity>
49+
<!-- Elements -->
3050
<entity name="PageBuilderTextContentType" type="pagebuilder_content_type">
3151
<data key="name">Text</data>
32-
<data key="section">General</data>
52+
<data key="section">Elements</data>
3353
<data key="role">text</data>
3454
<data key="pageNamePrefix">text</data>
3555
</entity>
3656
<entity name="PageBuilderHeadingContentType" type="pagebuilder_content_type">
3757
<data key="name">Heading</data>
38-
<data key="section">General</data>
58+
<data key="section">Elements</data>
3959
<data key="role">heading</data>
4060
<data key="pageNamePrefix">heading</data>
4161
</entity>
4262
<entity name="PageBuilderButtonsContentType" type="pagebuilder_content_type">
4363
<data key="name">Buttons</data>
44-
<data key="section">General</data>
64+
<data key="section">Elements</data>
4565
<data key="role">buttons</data>
4666
<data key="pageNamePrefix">buttons</data>
4767
</entity>
4868
<entity name="PageBuilderButtonItemContentType" type="pagebuilder_content_type">
4969
<data key="name">Button</data>
50-
<data key="section">General</data>
70+
<data key="section">Elements</data>
5171
<data key="role">button-item</data>
5272
<data key="pageNamePrefix">button</data>
5373
</entity>
5474
<entity name="PageBuilderDividerContentType" type="pagebuilder_content_type">
5575
<data key="name">Divider</data>
56-
<data key="section">General</data>
76+
<data key="section">Elements</data>
5777
<data key="role">divider</data>
5878
<data key="pageNamePrefix">divider</data>
5979
</entity>
80+
<entity name="PageBuilderNewsletterContentType" type="pagebuilder_content_type">
81+
<data key="name">Newsletter</data>
82+
<data key="section">Elements</data>
83+
<data key="role">newsletter</data>
84+
<data key="pageNamePrefix">newsletter</data>
85+
</entity>
86+
<entity name="PageBuilderAnchorContentType" type="pagebuilder_content_type">
87+
<data key="name">Anchor</data>
88+
<data key="section">Elements</data>
89+
<data key="role">anchor</data>
90+
<data key="pageNamePrefix">anchor</data>
91+
</entity>
92+
<entity name="PageBuilderHtmlContentType" type="pagebuilder_content_type">
93+
<data key="name">HTML Code</data>
94+
<data key="section">Elements</data>
95+
<data key="role">html</data>
96+
<data key="pageNamePrefix">html-code</data>
97+
</entity>
98+
<!-- Media -->
6099
<entity name="PageBuilderImageContentType" type="pagebuilder_content_type">
61100
<data key="name">Image</data>
62101
<data key="section">Media</data>
63102
<data key="role">image</data>
64103
<data key="pageNamePrefix">image</data>
65104
</entity>
66-
<entity name="PageBuilderBannerContentType" type="pagebuilder_content_type">
67-
<data key="name">Banner</data>
68-
<data key="section">Media</data>
69-
<data key="role">banner</data>
70-
<data key="pageNamePrefix">banner</data>
71-
</entity>
72105
<entity name="PageBuilderVideoContentType" type="pagebuilder_content_type">
73106
<data key="name">Video</data>
74107
<data key="section">Media</data>
75108
<data key="role">video</data>
76109
<data key="pageNamePrefix">video</data>
77110
</entity>
111+
<entity name="PageBuilderBannerContentType" type="pagebuilder_content_type">
112+
<data key="name">Banner</data>
113+
<data key="section">Media</data>
114+
<data key="role">banner</data>
115+
<data key="pageNamePrefix">banner</data>
116+
</entity>
78117
<entity name="PageBuilderSliderContentType" type="pagebuilder_content_type">
79118
<data key="name">Slider</data>
80119
<data key="section">Media</data>
@@ -88,60 +127,25 @@
88127
<data key="role">slide</data>
89128
<data key="pageNamePrefix">slide</data>
90129
</entity>
91-
<entity name="PageBuilderTabsContentType" type="pagebuilder_content_type">
92-
<data key="name">Tabs</data>
93-
<data key="section">Interactive</data>
94-
<data key="role">tabs</data>
95-
<data key="pageNamePrefix">tabs</data>
96-
</entity>
97-
<entity name="PageBuilderTabContentType" type="pagebuilder_content_type">
98-
<data key="name">Tab</data>
99-
<data key="section">Interactive</data>
100-
<data key="role">tab-item</data>
101-
<data key="pageNamePrefix">tab</data>
102-
</entity>
103-
<entity name="PageBuilderAccordionContentType" type="pagebuilder_content_type">
104-
<data key="name">Accordion</data>
105-
<data key="section">Interactive</data>
106-
<data key="role">accordion</data>
107-
<data key="pageNamePrefix">accordion</data>
108-
</entity>
109130
<entity name="PageBuilderMapContentType" type="pagebuilder_content_type">
110131
<data key="name">Map</data>
111-
<data key="section">Interactive</data>
132+
<data key="section">Media</data>
112133
<data key="role">map</data>
113134
<data key="editPanelName">Map</data>
114135
<data key="pageNamePrefix">map</data>
115136
</entity>
116-
<entity name="PageBuilderNewsletterContentType" type="pagebuilder_content_type">
117-
<data key="name">Newsletter</data>
118-
<data key="section">Interactive</data>
119-
<data key="role">newsletter</data>
120-
<data key="pageNamePrefix">newsletter</data>
121-
</entity>
137+
<!-- Add Content -->
122138
<entity name="PageBuilderBlockContentType" type="pagebuilder_content_type">
123139
<data key="name">Block</data>
124-
<data key="section">Magento</data>
140+
<data key="section">Add Content</data>
125141
<data key="role">block</data>
126142
<data key="editPanelName">Block</data>
127143
<data key="pageNamePrefix">block</data>
128144
</entity>
129145
<entity name="PageBuilderProductsContentType" type="pagebuilder_content_type">
130146
<data key="name">Products</data>
131-
<data key="section">Magento</data>
147+
<data key="section">Add Content</data>
132148
<data key="role">products</data>
133149
<data key="pageNamePrefix">products</data>
134150
</entity>
135-
<entity name="PageBuilderAnchorContentType" type="pagebuilder_content_type">
136-
<data key="name">Anchor</data>
137-
<data key="section">Other</data>
138-
<data key="role">anchor</data>
139-
<data key="pageNamePrefix">anchor</data>
140-
</entity>
141-
<entity name="PageBuilderHtmlContentType" type="pagebuilder_content_type">
142-
<data key="name">HTML Code</data>
143-
<data key="section">Other</data>
144-
<data key="role">html</data>
145-
<data key="pageNamePrefix">html-code</data>
146-
</entity>
147151
</entities>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/TextData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
1111
<!-- Text -->
12-
<entity name="PageBuilderTextContentType" type="pagebuilder_text_property">
12+
<entity name="PageBuilderTextProperty" type="pagebuilder_text_property">
1313
<data key="name">Text</data>
1414
<data key="section">General</data>
1515
<data key="fieldName">text</data>

0 commit comments

Comments
 (0)