Skip to content

Commit 424420f

Browse files
hannahnidahannahnida
committed
Merge branch '635_user-access-column-action-panel' of bluemwhitew/magento2-page-builder into 635_user-access-column-action-panel
2 parents 770ca2a + 5e2f411 commit 424420f

File tree

4 files changed

+125
-20
lines changed

4 files changed

+125
-20
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
9-
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
8+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
119
<!-- Button Text -->
1210
<entity name="PageBuilderButtonItemText_Template" type="pagebuilder_button_item_text_property">
1311
<data key="name">Button Text</data>
@@ -18,7 +16,7 @@
1816
<data key="value"/>
1917
</entity>
2018
<entity name="PageBuilderButtonItemText_Common" type="pagebuilder_button_item_text_property" extends="PageBuilderButtonItemText_Template">
21-
<data key="value">Button text</data>
19+
<data key="value">Button Text</data>
2220
</entity>
2321
<entity name="PageBuilderButtonItemText_Common2" type="pagebuilder_button_item_text_property" extends="PageBuilderButtonItemText_Template">
2422
<data key="value">Editable</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnSection/ColumnOnBackendSection.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
8+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
109
<section name="ColumnOnBackend">
1110
<element name="base" type="button" selector="(//div[@data-content-type=&quot;column&quot;])[{{arg1}}]" parameterized="true"/>
1211
<element name="baseJS" type="text" selector="document.querySelectorAll('.pagebuilder-column-inner')[{{arg1}} - 1]" parameterized="true"/>
@@ -17,6 +16,9 @@
1716
<element name="allColumns" type="text" selector="//div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')]"/>
1817
<element name="default" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-column')])[{{arg1}}][@style='border: {{arg2}}; border-radius: {{arg3}}px; margin: {{arg4}}px; padding: {{arg5}}px; width: {{arg6}}; background-size: {{arg7}}; background-repeat: {{arg8}}; background-attachment: {{arg9}}; align-self: {{arg10}};']" parameterized="true" deprecated="Styles are not inline"/>
1918
<element name="empty" type="button" selector="(//div[contains(@class,'empty-container')]//div[contains(@class,'element-children') and contains(@class,'column-container')])[{{arg1}}]" parameterized="true"/>
19+
<element name="affordance" type="text" selector="(//div[contains(@class,&quot;pagebuilder-affordance-column&quot;) and contains(@class,&quot;pagebuilder-content-type&quot;)])[{{arg1}}]" parameterized="true"/>
20+
<element name="affordanceCSS" type="text" selector="div.pagebuilder-affordance-column.pagebuilder-content-type"/>
21+
<element name="affordanceJS" type="text" selector="document.querySelectorAll('div.pagebuilder-affordance-column.pagebuilder-content-type')[{{arg1}} - 1]" parameterized="true"/>
2022
<element name="columnGroup" type="text" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]" parameterized="true"/>
2123
<element name="columnGroupPath" type="text" selector="(//div[contains(@class, &quot;pagebuilder-column-group&quot;)])[{{arg1}}]" parameterized="true"/>
2224
<element name="allColumnGroups" type="text" selector=".pagebuilder-column-group"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderContainerTest/PageBuilderVerifyContainerAffordanceTest.xml

Lines changed: 118 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,75 @@
3838
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnToStage">
3939
<argument name="contentType" value="PageBuilderColumnContentType"/>
4040
</actionGroup>
41-
<actionGroup ref="duplicateContentType" stepKey="duplicateContentType">
41+
<actionGroup ref="removeEmptyContentTypeFromStage" stepKey="removeEmptyContentTypeFromStage">
42+
<argument name="contentType" value="PageBuilderColumnContentType"/>
43+
</actionGroup>
44+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection2">
45+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
46+
</actionGroup>
47+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragButtonsToColumn">
48+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
49+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
50+
</actionGroup>
51+
<actionGroup ref="inlineEditButton" stepKey="inlineEditButton">
52+
<argument name="text" value="PageBuilderButtonItemText_Common"/>
53+
</actionGroup>
54+
<actionGroup ref="duplicateContentType" stepKey="duplicateColumn">
55+
<argument name="contentType" value="PageBuilderColumnContentType"/>
56+
</actionGroup>
57+
<actionGroup ref="duplicateContentType" stepKey="duplicateColumn2">
58+
<argument name="contentType" value="PageBuilderColumnContentType"/>
59+
</actionGroup>
60+
<actionGroup ref="duplicateContentType" stepKey="duplicateColumn3">
61+
<argument name="contentType" value="PageBuilderColumnContentType"/>
62+
<argument name="targetIndex" value="3"/>
63+
</actionGroup>
64+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelColumn1">
65+
<argument name="contentType" value="PageBuilderColumnContentType"/>
66+
</actionGroup>
67+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
68+
<argument name="property" value="PageBuilderMinHeightProperty_300"/>
69+
</actionGroup>
70+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsColumn1"/>
71+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelColumn2">
72+
<argument name="contentType" value="PageBuilderColumnContentType"/>
73+
<argument name="contentTypeIndex" value="2"/>
74+
</actionGroup>
75+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterPageBuilderColumnAppearanceProperty_Top">
76+
<argument name="property" value="PageBuilderColumnAppearanceProperty_Top"/>
77+
</actionGroup>
78+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsColumn2"/>
79+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelColumn3">
80+
<argument name="contentType" value="PageBuilderColumnContentType"/>
81+
<argument name="contentTypeIndex" value="3"/>
82+
</actionGroup>
83+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterPageBuilderColumnAppearanceProperty_Center">
84+
<argument name="property" value="PageBuilderColumnAppearanceProperty_Center"/>
85+
</actionGroup>
86+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsColumn3"/>
87+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelColumn4">
88+
<argument name="contentType" value="PageBuilderColumnContentType"/>
89+
<argument name="contentTypeIndex" value="4"/>
90+
</actionGroup>
91+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterPageBuilderColumnAppearanceProperty_Bottom">
92+
<argument name="property" value="PageBuilderColumnAppearanceProperty_Bottom"/>
93+
</actionGroup>
94+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsColumn4"/>
95+
<actionGroup ref="duplicateContentType" stepKey="duplicateRow">
4296
<argument name="contentType" value="PageBuilderRowContentType"/>
4397
</actionGroup>
44-
<actionGroup ref="duplicateContentType" stepKey="duplicateContentType2">
98+
<actionGroup ref="duplicateContentType" stepKey="duplicateRow2">
4599
<argument name="contentType" value="PageBuilderRowContentType"/>
46100
</actionGroup>
47-
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage">
101+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelRow2">
48102
<argument name="contentType" value="PageBuilderRowContentType"/>
49103
<argument name="contentTypeIndex" value="2"/>
50104
</actionGroup>
51105
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearance">
52106
<argument name="property" value="PageBuilderRowAppearance_FullWidth"/>
53107
</actionGroup>
54108
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
55-
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage2">
109+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelRow3">
56110
<argument name="contentType" value="PageBuilderRowContentType"/>
57111
<argument name="contentTypeIndex" value="3"/>
58112
</actionGroup>
@@ -61,22 +115,70 @@
61115
</actionGroup>
62116
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
63117
<!-- Validate Stage for CMS Block -->
64-
<actionGroup ref="VerifyAffordanceSizeActionGroup" stepKey="verifyAffordanceSizeActionGroup"/>
65-
<actionGroup ref="VerifyAffordanceSizeActionGroup" stepKey="verifyAffordanceSizeActionGroup2">
118+
<actionGroup ref="VerifyAffordanceSizeActionGroup" stepKey="verifyAffordanceSizeRow1"/>
119+
<actionGroup ref="VerifyAffordanceSizeActionGroup" stepKey="verifyAffordanceSizeRow1Column1">
120+
<argument name="section" value="ColumnOnBackend"/>
121+
</actionGroup>
122+
<actionGroup ref="VerifyAffordanceSizeActionGroup" stepKey="verifyAffordanceSizeRow1Column2">
66123
<argument name="index" value="2"/>
124+
<argument name="section" value="ColumnOnBackend"/>
67125
</actionGroup>
68-
<actionGroup ref="VerifyAffordanceSizeActionGroup" stepKey="verifyAffordanceSizeActionGroup3">
126+
<actionGroup ref="VerifyAffordanceSizeActionGroup" stepKey="verifyAffordanceSizeRow1Column3">
69127
<argument name="index" value="3"/>
128+
<argument name="section" value="ColumnOnBackend"/>
129+
</actionGroup>
130+
<actionGroup ref="VerifyAffordanceSizeActionGroup" stepKey="verifyAffordanceSizeRow1Column4">
131+
<argument name="index" value="4"/>
132+
<argument name="section" value="ColumnOnBackend"/>
133+
</actionGroup>
134+
<actionGroup ref="VerifyAffordanceSizeActionGroup" stepKey="verifyAffordanceSizeRow2">
135+
<argument name="index" value="2"/>
136+
</actionGroup>
137+
<actionGroup ref="VerifyAffordanceSizeActionGroup" stepKey="verifyAffordanceSizeRow2Column1">
138+
<argument name="index" value="5"/>
139+
<argument name="section" value="ColumnOnBackend"/>
140+
</actionGroup>
141+
<actionGroup ref="VerifyAffordanceSizeActionGroup" stepKey="verifyAffordanceSizeRow2Column2">
142+
<argument name="index" value="6"/>
143+
<argument name="section" value="ColumnOnBackend"/>
70144
</actionGroup>
71-
<seeNumberOfElements selector="{{RowOnStage.affordanceCSS}}" userInput="3" stepKey="seeNumberOfAffordance"/>
145+
<actionGroup ref="VerifyAffordanceSizeActionGroup" stepKey="verifyAffordanceSizeRow2Column3">
146+
<argument name="index" value="7"/>
147+
<argument name="section" value="ColumnOnBackend"/>
148+
</actionGroup>
149+
<actionGroup ref="VerifyAffordanceSizeActionGroup" stepKey="verifyAffordanceSizeRow2Column4">
150+
<argument name="index" value="8"/>
151+
<argument name="section" value="ColumnOnBackend"/>
152+
</actionGroup>
153+
<actionGroup ref="VerifyAffordanceSizeActionGroup" stepKey="verifyAffordanceSizeRow3">
154+
<argument name="index" value="3"/>
155+
</actionGroup>
156+
<actionGroup ref="VerifyAffordanceSizeActionGroup" stepKey="verifyAffordanceSizeRow3Column1">
157+
<argument name="index" value="9"/>
158+
<argument name="section" value="ColumnOnBackend"/>
159+
</actionGroup>
160+
<actionGroup ref="VerifyAffordanceSizeActionGroup" stepKey="verifyAffordanceSizeRow3Column2">
161+
<argument name="index" value="10"/>
162+
<argument name="section" value="ColumnOnBackend"/>
163+
</actionGroup>
164+
<actionGroup ref="VerifyAffordanceSizeActionGroup" stepKey="verifyAffordanceSizeRow3Column3">
165+
<argument name="index" value="11"/>
166+
<argument name="section" value="ColumnOnBackend"/>
167+
</actionGroup>
168+
<actionGroup ref="VerifyAffordanceSizeActionGroup" stepKey="verifyAffordanceSizeRow3Column4">
169+
<argument name="index" value="12"/>
170+
<argument name="section" value="ColumnOnBackend"/>
171+
</actionGroup>
172+
<seeNumberOfElements selector="{{RowOnStage.affordanceCSS}}" userInput="3" stepKey="seeNumberOfRowAffordance"/>
173+
<seeNumberOfElements selector="{{ColumnOnBackend.affordanceCSS}}" userInput="12" stepKey="seeNumberOfColumnAffordance"/>
72174
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
73175
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
74176
<!-- Configure CMS Page -->
75177
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
76178
<argument name="CMSPage" value="$$createCMSPage$$"/>
77179
</actionGroup>
78180
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
79-
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage3">
181+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage">
80182
<argument name="contentType" value="PageBuilderRowContentType"/>
81183
</actionGroup>
82184
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearance3">
@@ -86,7 +188,7 @@
86188
<argument name="property" value="PageBuilderAdvancedMarginsAndPaddingPropertyDefault"/>
87189
</actionGroup>
88190
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings3"/>
89-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection2">
191+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection3">
90192
<argument name="contentType" value="PageBuilderBlockContentType"/>
91193
</actionGroup>
92194
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockToStage">
@@ -101,19 +203,22 @@
101203
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings4"/>
102204
<!-- Validate Stage for CMS Page -->
103205
<actionGroup ref="VerifyAffordanceSizeActionGroup" stepKey="verifyAffordanceSizeActionGroup4"/>
104-
<seeNumberOfElements selector="{{RowOnStage.affordanceCSS}}" userInput="1" stepKey="seeNumberOfAffordance2"/>
206+
<seeNumberOfElements selector="{{RowOnStage.affordanceCSS}}" userInput="1" stepKey="seeNumberOfRowAffordance2"/>
207+
<dontSeeElement selector="{{ColumnOnBackend.affordanceCSS}}" stepKey="dontSeeColumnAffordance"/>
105208
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
106209
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
107210
<!-- Validate Storefront -->
108211
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToStorefrontForCreatedPage">
109212
<argument name="page" value="$$createCMSPage.identifier$$"/>
110213
</actionGroup>
111-
<dontSeeElementInDOM selector="{{RowOnStage.affordanceCSS}}" stepKey="dontSeeAffordanceInDOM"/>
214+
<dontSeeElementInDOM selector="{{RowOnStage.affordanceCSS}}" stepKey="dontSeeRowAffordanceInDOM"/>
215+
<dontSeeElementInDOM selector="{{ColumnOnBackend.affordanceCSS}}" stepKey="dontSeeColumnAffordanceInDOM"/>
112216
<executeJS function="return window.innerWidth;" stepKey="viewportWidth"/>
113217
<waitForElementVisible selector="{{RowOnStorefront.appearanceContainedCSS}}" stepKey="waitForRowContainedVisible"/>
114218
<executeJS function="return parseInt(document.querySelector('{{RowOnStorefront.appearanceFullBleedCSS}} {{RowOnStorefront.appearanceContainedCSS}}').getBoundingClientRect().width, 10)" stepKey="actualRowContainedSize"/>
219+
<executeJS function="return (window.innerWidth - window.getComputedStyle(document.querySelector('{{RowOnStorefront.baseCSS}}')).marginLeft.replace(&quot;px&quot;, &quot;&quot;) - window.getComputedStyle(document.querySelector('{{RowOnStorefront.baseCSS}}')).marginRight.replace(&quot;px&quot;, &quot;&quot;) - window.getComputedStyle(document.querySelector('{{RowOnStorefront.appearanceContainedCSS}}')).marginLeft.replace(&quot;px&quot;, &quot;&quot;) - window.getComputedStyle(document.querySelector('{{RowOnStorefront.appearanceContainedCSS}}')).marginRight.replace(&quot;px&quot;, &quot;&quot;))" stepKey="calculatedRowContainedSize"/>
115220
<assertEquals stepKey="assertRowContainedEqualsExpected">
116-
<expectedResult type="variable">actualRowContainedSize</expectedResult>
221+
<expectedResult type="variable">calculatedRowContainedSize</expectedResult>
117222
<actualResult type="variable">actualRowContainedSize</actualResult>
118223
</assertEquals>
119224
<waitForElementVisible selector="{{RowOnStorefront.appearanceFullWidthCSS}}" stepKey="waitForRowFullWidthVisible"/>

‎app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column/full-height/preview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
-->
77

8-
<div class="pagebuilder-content-type type-container pagebuilder-column children-min-height pagebuilder-content-type-affordance"
8+
<div class="pagebuilder-affordance-column pagebuilder-content-type type-container pagebuilder-column children-min-height pagebuilder-content-type-affordance"
99
attr="data.main.attributes"
1010
ko-style="getStyle(data.main, ['marginTop', 'marginBottom', 'marginLeft', 'marginRight', 'width', 'alignSelf', 'minHeight'])"
1111
event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false"

0 commit comments

Comments
 (0)