Skip to content

Commit 69645da

Browse files
davemacaulaydavemacaulay
committed
Merge branch 'MC-15093' into cms-team-1-delivery
2 parents 1f103b3 + ca28c33 commit 69645da

File tree

5 files changed

+188
-12
lines changed

5 files changed

+188
-12
lines changed

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

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1984,4 +1984,107 @@
19841984
</actionGroup>
19851985
<seeNumberOfElements selector="{{ProductsOnStorefront.product('1')}}" userInput="1" stepKey="seeOneProduct" />
19861986
</test>
1987+
<test name="ButtonGroupInBlockOnDifferentLineWhenInFullWidthRow">
1988+
<annotations>
1989+
<features value="PageBuilder"/>
1990+
<stories value="Block"/>
1991+
<title value="Buttons In Block From Different Button Groups On Different Line When in Full-Width Row"/>
1992+
<description value="Button groups in block should be on different lines when in full-width row"/>
1993+
<severity value="CRITICAL"/>
1994+
<useCaseId value="MC-15093"/>
1995+
<testCaseId value="MC-15105"/>
1996+
<group value="pagebuilder"/>
1997+
<group value="pagebuilder-buttons"/>
1998+
<group value="pagebuilder-buttonGroup"/>
1999+
<group value="pagebuilder-block"/>
2000+
<group value="pagebuilder-row"/>
2001+
</annotations>
2002+
<before>
2003+
<createData entity="_emptyCmsBlock" stepKey="createPreReqBlock"/>
2004+
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
2005+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2006+
<actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlock">
2007+
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
2008+
</actionGroup>
2009+
</before>
2010+
<after>
2011+
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock"/>
2012+
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory"/>
2013+
<actionGroup ref="logout" stepKey="logout"/>
2014+
</after>
2015+
<!-- Change row appearance to full-width -->
2016+
<comment userInput="Change row appearance to full-width" stepKey="commentChangeRowAppearanceBlock"/>
2017+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openRowEditMenuOnStageBlock">
2018+
<argument name="contentType" value="PageBuilderRowContentType"/>
2019+
</actionGroup>
2020+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceRowBlock">
2021+
<argument name="property" value="PageBuilderRowAppearance_FullWidth"/>
2022+
</actionGroup>
2023+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsRowBlock"/>
2024+
<!-- Add button groups to block -->
2025+
<comment userInput="Add button groups to block" stepKey="commentAddButtonGroupsToBlock"/>
2026+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSectionBlock">
2027+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
2028+
</actionGroup>
2029+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStageBlock">
2030+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
2031+
</actionGroup>
2032+
<actionGroup ref="unFocusOptionMenu" stepKey="unFocusOptionMenuBlock">
2033+
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
2034+
</actionGroup>
2035+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage2Block">
2036+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
2037+
</actionGroup>
2038+
<actionGroup ref="unFocusOptionMenu" stepKey="unFocusOptionMenu2Block">
2039+
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
2040+
</actionGroup>
2041+
<!-- Validate Block -->
2042+
<comment userInput="Validate Block" stepKey="commentValidateBlock"/>
2043+
<executeJS function="return {{ButtonItemOnStage.jsButtonSelector('1')}}.getBoundingClientRect().y" stepKey="yCoordinate1Block"/>
2044+
<executeJS function="return {{ButtonItemOnStage.jsButtonSelector('2')}}.getBoundingClientRect().y" stepKey="yCoordinate2Block"/>
2045+
<assertNotEquals stepKey="checkYCoordinatesBlock">
2046+
<expectedResult type="variable">yCoordinate1Block</expectedResult>
2047+
<actualResult type="variable">yCoordinate2Block</actualResult>
2048+
</assertNotEquals>
2049+
<actionGroup ref="saveAndCloseCMSBlockWithSplitButton" stepKey="saveCMSBlock"/>
2050+
<!-- Go to CMS Page and choose Block -->
2051+
<comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage"/>
2052+
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
2053+
<argument name="CMSPage" value="$$createCMSPage$$"/>
2054+
</actionGroup>
2055+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStagePage"/>
2056+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContentPage">
2057+
<argument name="contentType" value="PageBuilderBlockContentType"/>
2058+
</actionGroup>
2059+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStagePage">
2060+
<argument name="contentType" value="PageBuilderBlockContentType"/>
2061+
</actionGroup>
2062+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDropPage">
2063+
<argument name="contentType" value="PageBuilderBlockContentType"/>
2064+
</actionGroup>
2065+
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGridPage">
2066+
<argument name="block" value="$$createPreReqBlock$$"/>
2067+
</actionGroup>
2068+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsPage"/>
2069+
<!-- Validate Page -->
2070+
<comment userInput="Validate Page" stepKey="commentValidatePage"/>
2071+
<executeJS function="return {{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}.getBoundingClientRect().y" stepKey="yCoordinate1Page"/>
2072+
<executeJS function="return {{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('2')}}.getBoundingClientRect().y" stepKey="yCoordinate2Page"/>
2073+
<assertNotEquals stepKey="checkYCoordinatesPage">
2074+
<expectedResult type="variable">yCoordinate1Page</expectedResult>
2075+
<actualResult type="variable">yCoordinate2Page</actualResult>
2076+
</assertNotEquals>
2077+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
2078+
<!-- Validate CMS Page Storefront -->
2079+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
2080+
<actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToProductStorefront">
2081+
<argument name="page" value="$$createCMSPage.identifier$$"/>
2082+
</actionGroup>
2083+
<executeJS function="return {{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}.getBoundingClientRect().y" stepKey="yCoordinate1Storefront"/>
2084+
<executeJS function="return {{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('2')}}.getBoundingClientRect().y" stepKey="yCoordinate2Storefront"/>
2085+
<assertNotEquals stepKey="checkYCoordinatesStorefront">
2086+
<expectedResult type="variable">yCoordinate1Storefront</expectedResult>
2087+
<actualResult type="variable">yCoordinate2Storefront</actualResult>
2088+
</assertNotEquals>
2089+
</test>
19872090
</tests>

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

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,4 +1132,77 @@
11321132
</actionGroup>
11331133
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1" after="enterAppearance"/>
11341134
</test>
1135+
<test name="ButtonGroupOnDifferentLineWhenInFullWidthRow">
1136+
<annotations>
1137+
<features value="PageBuilder"/>
1138+
<stories value="Buttons"/>
1139+
<title value="Button Group - Buttons From Different Button Groups On Different Line When in Full-Width Row"/>
1140+
<description value="Button groups should be on different lines when in full-width row"/>
1141+
<severity value="CRITICAL"/>
1142+
<useCaseId value="MC-15093"/>
1143+
<testCaseId value="MC-15104"/>
1144+
<group value="pagebuilder"/>
1145+
<group value="pagebuilder-buttons"/>
1146+
<group value="pagebuilder-buttonGroup"/>
1147+
<group value="pagebuilder-row"/>
1148+
</annotations>
1149+
<before>
1150+
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
1151+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1152+
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
1153+
<argument name="CMSPage" value="$$createCMSPage$$"/>
1154+
</actionGroup>
1155+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStagePage"/>
1156+
</before>
1157+
<after>
1158+
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory"/>
1159+
<actionGroup ref="logout" stepKey="logout"/>
1160+
</after>
1161+
<!-- Change row appearance to full-width -->
1162+
<comment userInput="Change row appearance to full-width" stepKey="commentChangeRowAppearance"/>
1163+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openRowEditMenuOnStage">
1164+
<argument name="contentType" value="PageBuilderRowContentType"/>
1165+
</actionGroup>
1166+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceRow">
1167+
<argument name="property" value="PageBuilderRowAppearance_FullWidth"/>
1168+
</actionGroup>
1169+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsRow"/>
1170+
<!-- Add button groups to row -->
1171+
<comment userInput="Add button groups to row" stepKey="commentAddButtonGroupsToRow"/>
1172+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSectionButtons">
1173+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1174+
</actionGroup>
1175+
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsContentTypeToStage">
1176+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1177+
</actionGroup>
1178+
<actionGroup ref="unFocusOptionMenu" stepKey="unFocusOptionMenuButtons">
1179+
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
1180+
</actionGroup>
1181+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage2Buttons">
1182+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1183+
</actionGroup>
1184+
<actionGroup ref="unFocusOptionMenu" stepKey="unFocusOptionMenu2Buttons">
1185+
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
1186+
</actionGroup>
1187+
<!-- Validate Stage -->
1188+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
1189+
<executeJS function="return {{ButtonItemOnStage.jsButtonSelector('1')}}.getBoundingClientRect().y" stepKey="yCoordinate1Stage"/>
1190+
<executeJS function="return {{ButtonItemOnStage.jsButtonSelector('2')}}.getBoundingClientRect().y" stepKey="yCoordinate2Stage"/>
1191+
<assertNotEquals stepKey="checkYCoordinatesStage">
1192+
<expectedResult type="variable">yCoordinate1Stage</expectedResult>
1193+
<actualResult type="variable">yCoordinate2Stage</actualResult>
1194+
</assertNotEquals>
1195+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsStage"/>
1196+
<!-- Validate CMS Page Storefront -->
1197+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1198+
<actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToProductStorefront">
1199+
<argument name="page" value="$$createCMSPage.identifier$$"/>
1200+
</actionGroup>
1201+
<executeJS function="return {{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}.getBoundingClientRect().y" stepKey="yCoordinate1Storefront"/>
1202+
<executeJS function="return {{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('2')}}.getBoundingClientRect().y" stepKey="yCoordinate2Storefront"/>
1203+
<assertNotEquals stepKey="checkYCoordinatesStorefront">
1204+
<expectedResult type="variable">yCoordinate1Storefront</expectedResult>
1205+
<actualResult type="variable">yCoordinate2Storefront</actualResult>
1206+
</assertNotEquals>
1207+
</test>
11351208
</tests>

‎app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/buttons.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<style name="border_color" source="border_color"/>
3333
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
3434
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
35-
<style name="display" source="display" converter="Magento_PageBuilder/js/content-type/buttons/converter/style/display/inline-block" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>
35+
<style name="display" source="display" converter="Magento_PageBuilder/js/content-type/buttons/converter/style/display/boolean" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>
3636
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/converter/style/margins"/>
3737
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings"/>
3838
<attribute name="name" source="data-content-type"/>

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/buttons/converter/style/display/inline-block.js renamed to ‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/buttons/converter/style/display/boolean.js

Lines changed: 8 additions & 8 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/converter/style/display/inline-block.ts renamed to ‎app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/buttons/converter/style/display/boolean.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {get} from "../../../../../utils/object";
1111
/**
1212
* @api
1313
*/
14-
export default class InlineBlock implements ConverterInterface {
14+
export default class Boolean implements ConverterInterface {
1515
/**
1616
* Convert value to internal format
1717
*
@@ -23,7 +23,7 @@ export default class InlineBlock implements ConverterInterface {
2323
}
2424

2525
/**
26-
* Convert value to knockout format, if buttons are displayed they should be inline block
26+
* Convert value to knockout format, if buttons are displayed they should be reset to default
2727
*
2828
* @param {string} name
2929
* @param {DataObject} data
@@ -34,6 +34,6 @@ export default class InlineBlock implements ConverterInterface {
3434
if (!_.isUndefined(value) && value === false) {
3535
return "none";
3636
}
37-
return "inline-block";
37+
return "";
3838
}
3939
}

0 commit comments

Comments
 (0)