Skip to content

Commit c8d2df5

Browse files
tjwiebelltjwiebell
authored
Merge pull request #135 from magento-obsessive-owls/cms-team-2-sprint-15-bugs
[CMS Team 2 - Sprint 15] Bug Fixes
2 parents d6b3016 + 16b6e62 commit c8d2df5

File tree

41 files changed

+424
-141
lines changed

Some content is hidden

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

41 files changed

+424
-141
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
</arguments>
1515
<comment userInput="Adding Button" stepKey="comment"/>
1616
<executeJS function="return Math.round(document.getElementsByClassName('pagebuilder-button-item').length+1)" stepKey="initialNumberOfButtonsPlusOne"/>
17+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusButtonLiveEdit1"/>
1718
<moveMouseOver selector="{{PageBuilderStage.contentTypeInStageByIndex(PageBuilderButtonsContentType.role, buttonGroupIndex)}}" stepKey="mouseOverButtonsGroup"/>
1819
<waitForPageLoad stepKey="waitForPageLoad"/>
1920
<waitForElementVisible time="10" selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenu(PageBuilderButtonsContentType.role)}}" stepKey="waitForOptionsMenu"/>
@@ -25,7 +26,7 @@
2526
<expectedResult type="variable">initialNumberOfButtonsPlusOne</expectedResult>
2627
<actualResult type="variable">numberOfButtonsAfterAdd</actualResult>
2728
</assertEquals>
28-
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusButtonLiveEdit"/>
29+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusButtonLiveEdit2"/>
2930
</actionGroup>
3031
<actionGroup name="validateButtonItemContent">
3132
<arguments>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTests.xml

Lines changed: 116 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1905,7 +1905,6 @@
19051905
<group value="pagebuilder"/>
19061906
<group value="pagebuilder-buttons"/>
19071907
<group value="pagebuilder-buttonGroup"/>
1908-
<group value="ButtonGroupValidateSameSizeWithinTab"/>
19091908
<group value="pagebuilder-tabs-content"/>
19101909
</annotations>
19111910
<before>
@@ -1995,4 +1994,120 @@
19951994
</assertLessThan>
19961995
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop1"/>
19971996
</test>
1997+
<test name="ButtonGroupValidateSameSizeWhenSwitchingActiveTab">
1998+
<annotations>
1999+
<features value="PageBuilder"/>
2000+
<stories value="Buttons"/>
2001+
<title value="Button Group - Validate Same Size Works When Switching Between Active Tabs"/>
2002+
<description value="Validate that when buttons are added to Tabs and same size is enabled, buttons resize when switching between Tabs"/>
2003+
<severity value="MAJOR"/>
2004+
<useCaseId value="MC-3847"/>
2005+
<testCaseId value="MC-3909"/>
2006+
<group value="pagebuilder"/>
2007+
<group value="pagebuilder-buttons"/>
2008+
<group value="pagebuilder-buttonGroup"/>
2009+
<group value="pagebuilder-tabs-content"/>
2010+
</annotations>
2011+
<before>
2012+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2013+
<createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
2014+
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToContentCreatedCMSPage">
2015+
<argument name="CMSPage" value="$$createCMSPage$$"/>
2016+
</actionGroup>
2017+
</before>
2018+
<after>
2019+
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
2020+
<actionGroup ref="logout" stepKey="logout"/>
2021+
</after>
2022+
<!-- Add Button Group To Tab -->
2023+
<comment userInput="Add Button Group To Tab" stepKey="commentAddButtonGroup"/>
2024+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
2025+
<argument name="contentType" value="PageBuilderTabsContentType"/>
2026+
</actionGroup>
2027+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
2028+
<argument name="group" value="PageBuilderButtonsContentType"/>
2029+
</actionGroup>
2030+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragButtonsToTab">
2031+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
2032+
<argument name="containerTargetType" value="PageBuilderTabContentType"/>
2033+
<argument name="containerTargetIndex" value="1"/>
2034+
</actionGroup>
2035+
<!-- Enable Same Size -->
2036+
<comment userInput="Enable Same Size" stepKey="commentEditPanel1"/>
2037+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
2038+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
2039+
</actionGroup>
2040+
<actionGroup ref="conditionalClickSlideOutPanelFieldGeneral" stepKey="enableSameSize">
2041+
<argument name="property" value="PageBuilderButtonGroupSameSize_Enabled"/>
2042+
</actionGroup>
2043+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
2044+
<!-- Edit Buttons -->
2045+
<comment userInput="Edit Buttons" stepKey="commentEditButtons"/>
2046+
<actionGroup ref="addButton" stepKey="addButton1"/>
2047+
<actionGroup ref="inlineEditButton" stepKey="inlineEditButton1">
2048+
<argument name="text" value="PageBuilderButtonItemText_First"/>
2049+
<argument name="index" value="1"/>
2050+
</actionGroup>
2051+
<actionGroup ref="inlineEditButton" stepKey="inlineEditButton2">
2052+
<argument name="text" value="PageBuilderButtonItemText_CommonCharacters"/>
2053+
<argument name="index" value="2"/>
2054+
</actionGroup>
2055+
<!-- Duplicate Tab -->
2056+
<actionGroup ref="duplicateSmallContentType" stepKey="duplicateSmallContentType">
2057+
<argument name="section" value="TabOnStage"/>
2058+
</actionGroup>
2059+
<!-- Validate Tab 2 Buttons On Stage -->
2060+
<comment userInput="Validate Stage: Tab 2 Buttons" stepKey="commentValidateStage1"/>
2061+
<actionGroup ref="validateButtonItemsSameSize" stepKey="validateButtonsSameSizeStage1">
2062+
<argument name="buttonGroupPage" value="ButtonGroupOnStage"/>
2063+
<argument name="buttonItemPage" value="ButtonItemOnStage"/>
2064+
<argument name="buttonGroupIndex" value="2"/>
2065+
<argument name="firstButtonIndex" value="3"/>
2066+
<argument name="secondButtonIndex" value="4"/>
2067+
</actionGroup>
2068+
<!-- Validate Tab 1 Buttons On Stage -->
2069+
<comment userInput="Validate Stage: Tab 1 Buttons" stepKey="commentValidateStage2"/>
2070+
<click selector="{{TabOnStage.tabHeader('1')}}" stepKey="clickActiveTab2"/>
2071+
<waitForElementVisible time="30" selector="{{TabOnStage.tabHeaderItemActive('1')}}" stepKey="seeNewTabActive2"/>
2072+
<actionGroup ref="validateButtonItemsSameSize" stepKey="validateButtonsSameSizeStage2">
2073+
<argument name="buttonGroupPage" value="ButtonGroupOnStage"/>
2074+
<argument name="buttonItemPage" value="ButtonItemOnStage"/>
2075+
</actionGroup>
2076+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage1"/>
2077+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2078+
<!-- Validate Tab 1 Buttons On Stage After Save -->
2079+
<comment userInput="Validate Stage After Save: Tab 1 Buttons" stepKey="commentValidateStage3"/>
2080+
<actionGroup ref="validateButtonItemsSameSize" stepKey="validateButtonsSameSizeStage3">
2081+
<argument name="buttonGroupPage" value="ButtonGroupOnStage"/>
2082+
<argument name="buttonItemPage" value="ButtonItemOnStage"/>
2083+
</actionGroup>
2084+
<!-- Validate Tab 2 Buttons On Stage After Save -->
2085+
<comment userInput="Validate Stage After Save: Tab 2 Buttons" stepKey="commentValidateStage4"/>
2086+
<click selector="{{TabOnStage.tabHeader('2')}}" stepKey="clickActiveTab3"/>
2087+
<waitForElementVisible time="30" selector="{{TabOnStage.tabHeaderItemActive('2')}}" stepKey="seeNewTabActive3"/>
2088+
<actionGroup ref="validateButtonItemsSameSize" stepKey="validateButtonsSameSizeStage4">
2089+
<argument name="buttonGroupPage" value="ButtonGroupOnStage"/>
2090+
<argument name="buttonItemPage" value="ButtonItemOnStage"/>
2091+
<argument name="buttonGroupIndex" value="2"/>
2092+
<argument name="firstButtonIndex" value="3"/>
2093+
<argument name="secondButtonIndex" value="4"/>
2094+
</actionGroup>
2095+
<!-- Validate Storefront -->
2096+
<comment userInput="Validate Storefront: Initial" stepKey="commentValidateStorefront1"/>
2097+
<amOnPage url="$$createCMSPage.identifier$$" stepKey="goToStorefront1"/>
2098+
<waitForPageLoad stepKey="waitForPageLoad1"/>
2099+
<actionGroup ref="validateButtonItemsSameSize" stepKey="validateButtonsSameSizeStorefront1">
2100+
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
2101+
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
2102+
</actionGroup>
2103+
<click selector="{{TabOnStorefront.tabHeader('2')}}" stepKey="clickActiveTabStorefront"/>
2104+
<waitForElementVisible time="30" selector="{{TabOnStorefront.tabHeaderItemActive('2')}}" stepKey="seeNewTabActiveStorefront"/>
2105+
<actionGroup ref="validateButtonItemsSameSize" stepKey="validateButtonsSameSizeStorefront2">
2106+
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
2107+
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
2108+
<argument name="buttonGroupIndex" value="2"/>
2109+
<argument name="firstButtonIndex" value="3"/>
2110+
<argument name="secondButtonIndex" value="4"/>
2111+
</actionGroup>
2112+
</test>
19982113
</tests>

‎app/code/Magento/PageBuilder/docs/events.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ This document contains reference information for events dispatched in Page Build
7373
* [contentType:duplicateAfter](#contenttypeduplicateafter)
7474
* [contentType:moveBefore](#contenttypemovebefore)
7575
* [contentType:moveAfter](#contenttypemoveafter)
76+
* [contentType:redrawAfter](#contenttyperedrawafter)
7677
* [column:dragStart](#columdragstart)
7778
* [column:dragStop](#columndragstop)
7879
* [column:initializeAfter](#columninitializeafter)
@@ -268,6 +269,39 @@ All events starting with `contentType:` can also be called for specific content
268269

269270
[Back to top]
270271

272+
### `contentType:redrawAfter`
273+
274+
#### Backend
275+
276+
**Triggers**
277+
278+
* `Tabs.Preview::onTabClick`
279+
280+
**Params**
281+
282+
``` js
283+
{
284+
id: string,
285+
contentType: ContentTypeInterface & ContentTypeCollectionInterface
286+
}
287+
```
288+
289+
#### Frontend
290+
291+
**Triggers**
292+
293+
* `Tabs.widget.ui.tabs::activate`
294+
295+
**Params**
296+
297+
``` js
298+
{
299+
element: HTMLElement
300+
}
301+
```
302+
303+
[Back to top]
304+
271305
### `column:dragStart`
272306

273307
**Triggers**

‎app/code/Magento/PageBuilder/etc/content_type.xsd

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,22 +87,13 @@
8787
<xs:complexType name="elements">
8888
<xs:sequence>
8989
<xs:element type="element" name="element" minOccurs="1" maxOccurs="unbounded">
90-
<xs:unique name="uniqueStyleName">
90+
<xs:unique name="uniqueNames">
9191
<xs:annotation>
9292
<xs:documentation>
93-
Style name must be unique
93+
Attribute and Style names must be unique
9494
</xs:documentation>
9595
</xs:annotation>
96-
<xs:selector xpath="style"/>
97-
<xs:field xpath="@name"/>
98-
</xs:unique>
99-
<xs:unique name="uniqueAttributeName">
100-
<xs:annotation>
101-
<xs:documentation>
102-
Attribute name must be unique
103-
</xs:documentation>
104-
</xs:annotation>
105-
<xs:selector xpath="attribute"/>
96+
<xs:selector xpath="attribute|style"/>
10697
<xs:field xpath="@name"/>
10798
</xs:unique>
10899
</xs:element>

‎app/code/Magento/PageBuilder/etc/content_type_merged.xsd

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,22 +87,13 @@
8787
<xs:complexType name="elements">
8888
<xs:sequence>
8989
<xs:element type="element" name="element" minOccurs="1" maxOccurs="unbounded">
90-
<xs:unique name="uniqueStyleName">
90+
<xs:unique name="uniqueName">
9191
<xs:annotation>
9292
<xs:documentation>
93-
Style name must be unique
93+
Attribute and Style names must be unique
9494
</xs:documentation>
9595
</xs:annotation>
96-
<xs:selector xpath="style"/>
97-
<xs:field xpath="@name"/>
98-
</xs:unique>
99-
<xs:unique name="uniqueAttributeName">
100-
<xs:annotation>
101-
<xs:documentation>
102-
Attribute name must be unique
103-
</xs:documentation>
104-
</xs:annotation>
105-
<xs:selector xpath="attribute"/>
96+
<xs:selector xpath="attribute|style"/>
10697
<xs:field xpath="@name"/>
10798
</xs:unique>
10899
</xs:element>

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_config.less

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,30 @@
1414
margin-bottom: 15px;
1515
margin-top: 15px;
1616
}
17+
18+
.admin__field {
19+
&._error {
20+
.admin__field-control > .admin__field-design-options > .layout-onion {
21+
border: 1px solid @field-error-control__border-color;
22+
overflow: hidden;
23+
}
24+
}
25+
}
26+
27+
._required {
28+
> .admin__field-label {
29+
> label:after {
30+
color: @color-tomato-brick;
31+
content: '*';
32+
display: inline-block;
33+
font-size: 1.6rem;
34+
font-weight: 500;
35+
line-height: 1;
36+
margin-left: 10px;
37+
margin-top: .2rem;
38+
position: absolute;
39+
z-index: 1;
40+
}
41+
}
42+
}
1743
}

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/button-item/_default.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
}
2929
a[data-element='link'] {
3030
max-width: 100%;
31+
min-width: 0;
3132
position: relative;
33+
transition: min-width 200ms ease;
3234
word-wrap: break-word;
3335
[data-element='link_text'] {
3436
max-width: 100%;

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/button-item/preview.js

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

0 commit comments

Comments
 (0)