Skip to content

Commit acd84b8

Browse files
Merge branch 'magento-commerce:develop' into L3-PR-20211001
2 parents 3da64e6 + 79a78a4 commit acd84b8

File tree

13 files changed

+56
-22
lines changed

13 files changed

+56
-22
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+
}

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/RemoveEmptyContentTypeFromStageActionGroup.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
<argument name="offsetYCoordinate" defaultValue="5" type="string"/>
1616
</arguments>
1717
<waitForElementVisible time="10" selector="{{PageBuilderStage.contentTypeInStage(contentType.role)}}" stepKey="waitForContentTypeInStageVisible"/>
18-
<moveMouseOver selector="{{PageBuilderStage.contentTypeInStage(contentType.role)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="onMouseOverContentTypeStage"/>
18+
<moveMouseOver stepKey="moveMouseOverSearch" selector="{{PageBuilderPanel.searchPanel}}" />
19+
<executeJS function="return ['row', 'column'].include('{{contentType.role}}') ? '//div[contains(@class, &quot;pagebuilder-display-label&quot;) and contains(.,&quot;'+'{{contentType.role}}'.toUpperCase()+'&quot;)]' : ['tabs'].include('{{contentType.role}}') ? '//ul[@data-element=&quot;navigation&quot;]' : '';" stepKey="contentTypeLabelSelector" />
20+
<executeJS function="return ['row'].include('{{contentType.role}}') ? '(//div[contains(@class, &quot;pagebuilder-content-type-affordance&quot;) and contains(@class, &quot;pagebuilder-affordance-{{contentType.role}}&quot;)])' : '(//div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(@class, &quot;pagebuilder-{{contentType.role}}&quot;)])';" stepKey="contentTypeSelector" />
21+
<moveMouseOver selector="{$contentTypeSelector}{$contentTypeLabelSelector}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="onMouseOverContentTypeStage"/>
1922
<waitForPageLoad stepKey="waitForOptionsAnimation"/>
2023
<waitForElementVisible time="10" selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenuByIndex(contentType.role, '1')}}" stepKey="waitForOptions"/>
2124
<click selector="{{PageBuilderContentTypeOptionsMenu.contentTypeRemove(contentType.role)}}" stepKey="clickRemoveContentType"/>

app/code/Magento/PageBuilder/Test/Mftf/Data/BackgroundFormData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<data key="value"/>
1515
<data key="rgba">rgba(0, 0, 0, 0)</data>
1616
<data key="rgb">rgba(0, 0, 0, 0)</data>
17-
<data key="colorSwatchColor">rgba(0, 0, 0, 0)</data>
17+
<data key="colorSwatchColor">transparent</data>
1818
<data key="colorWheelDefault">rgb(255, 0, 0)</data>
1919
<data key="placeholderText">No Color</data>
2020
</entity>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection/TabOnStageSection.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-content-type=tab-item]')[{{arg1}} - 1]" parameterized="true"/>
1313
<element name="elementChildren" type="text" selector="(//*[@role=&quot;tabpanel&quot;])[{{arg1}}]//div[contains(@class, &quot;pagebuilder-tab-item&quot;)]//div[contains(@class, &quot;tab-item-container&quot;)]" parameterized="true"/>
1414
<element name="all" type="button" selector=".pagebuilder-tab-item"/>
15-
<element name="moveHandle" type="button" selector="(//div[@data-content-type='tabs'])[{{arg1}}]//li[@role='tab'][{{arg2}}]//span[@class='tab-drag-handle']" parameterized="true"/>
15+
<element name="moveHandle" type="button" selector="(//div[@data-content-type='tabs'])[{{arg1}}]//li[@role='tab'][{{arg2}}]//span[contains(@class, 'tab-drag-handle')]" parameterized="true"/>
1616
<element name="tabHeader" type="button" selector="(//ul[contains(@class, 'tabs-navigation')]//a[contains(@class, 'tab-title')])[{{arg1}}]" parameterized="true"/>
1717
<element name="tabHeaderCSS" type="button" selector="[data-content-type=tabs] [role=presentation]"/>
1818
<element name="tabHeaderEditableTitle" type="button" selector="(//ul[contains(@class, 'tabs-navigation')]//a[contains(@class, 'tab-title')])[{{arg1}}]//span[contains(@contenteditable, 'true')]" parameterized="true"/>
@@ -30,6 +30,7 @@
3030
<element name="optionsMenuButtonDisabled" type="button" selector="(//ul[contains(@class,'tabs-navigation')]//div[contains(@class,'pagebuilder-options-wrapper')])[{{arg1}}]//a[contains(@class,'{{arg2}}') and contains(@class,'disabled')]" parameterized="true"/>
3131
<element name="default" type="button" selector="(//div[contains(@class,'pagebuilder-tabs') and contains(@class,'ui-tabs')]//div[@role='tabpanel'])[{{arg1}}][not(contains(@style,'border:'))]" parameterized="true"/>
3232
<element name="tabTitle" type="button" selector="//*[@name='tabs[{{arg1}}][title]']" parameterized="true"/>
33+
<element name="tab" type="button" selector="//*[@role='tab'][{{arg1}}]" parameterized="true"/>
3334
<element name="tabPanel" type="button" selector="//*[@role='tabpanel'][{{arg1}}]" parameterized="true"/>
3435
<element name="tabContent" type="button" selector="//*[@role=&quot;tabpanel&quot;][{{arg1}}]//div[contains(@class, &quot;pagebuilder-tab-item&quot;)]" parameterized="true"/>
3536
<element name="cssClasses" type="button" selector="//*[@role=&quot;tabpanel&quot;][{{arg1}}]//div[contains(@class, &quot;pagebuilder-tab-item&quot;)][contains(@class,'{{arg2}}')]" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/DefaultTabItemStateOnAddingNewTabTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<!-- User sees the first tab to be active and focused. -->
5454
<comment userInput="User sees the first tab to be active and focused." stepKey="AC4"/>
5555
<assertElementContainsAttribute stepKey="assertTab1ContentFocused">
56-
<expectedResult selector="{{TabOnStage.tabPanel('1')}}" attribute="aria-expanded" type="string">true</expectedResult>
56+
<expectedResult selector="{{TabOnStage.tab('1')}}" attribute="aria-expanded" type="string">true</expectedResult>
5757
</assertElementContainsAttribute>
5858
<assertElementContainsAttribute stepKey="assertTab1ContentVisible">
5959
<expectedResult selector="{{TabOnStage.tabPanel('1')}}" attribute="aria-hidden" type="string">false</expectedResult>

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/buttons/preview.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-group/preview.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slider/preview.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/panel.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/buttons/preview.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export default class Preview extends PreviewCollection {
5252
// Keeps track of number of button item to disable sortable if there is only 1.
5353
this.contentType.children.subscribe(() => {
5454
const sortableElement = $(this.wrapperElement).find(".buttons-container");
55-
if (!sortableElement.data("sortable")) {
55+
if (!sortableElement.data("ui-sortable")) {
5656
return;
5757
}
5858
if (this.contentType.children().length <= 1) {

0 commit comments

Comments
 (0)