Skip to content

Commit 6b0b245

Browse files
davemacaulaydavemacaulay
committed
MC-3392: Hide Content block/ container from the stage
- Disable hiding of individual button item
1 parent ab5211e commit 6b0b245

File tree

2 files changed

+2
-101
lines changed

2 files changed

+2
-101
lines changed

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

Lines changed: 0 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -405,31 +405,12 @@
405405
<argument name="property" value="PageBuilderPaddingPropertyUnique"/>
406406
</actionGroup>
407407
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
408-
<actionGroup ref="hideSmallContentType" stepKey="hideContentType">
409-
<argument name="section" value="ButtonItemOnStage"/>
410-
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
411-
</actionGroup>
412408
<!-- Duplicate and Validate Stage -->
413409
<comment userInput="Duplicate" stepKey="commentDuplicate"/>
414410
<actionGroup ref="duplicateSmallContentType" stepKey="duplicateSmallContentType">
415411
<argument name="section" value="ButtonItemOnStage"/>
416412
<argument name="targetIndex" value="1"/>
417413
</actionGroup>
418-
<!-- Validate content type is disabled -->
419-
<comment userInput="Validate content type is disabled" stepKey="commentValidateHiddenStage"/>
420-
<waitForElementVisible selector="{{ButtonItemOnStage.hidden('1')}}" stepKey="waitForContentTypeHidden1"/>
421-
<waitForElementVisible selector="{{ButtonItemOnStage.hidden('2')}}" stepKey="waitForContentTypeHidden2"/>
422-
<!-- Show duplicated content type -->
423-
<comment userInput="Show duplicate content type" stepKey="commentShowContentType"/>
424-
<actionGroup ref="showContentType" stepKey="showContentType">
425-
<argument name="section" value="ButtonItemOnStage"/>
426-
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
427-
</actionGroup>
428-
<actionGroup ref="showContentType" stepKey="showContentType2">
429-
<argument name="section" value="ButtonItemOnStage"/>
430-
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
431-
<argument name="targetIndex" value="2"/>
432-
</actionGroup>
433414
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
434415
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage">
435416
<argument name="page" value="ButtonItemOnStage"/>
@@ -498,10 +479,6 @@
498479
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
499480
<!-- Validate Stage After Save -->
500481
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
501-
<!-- Validate content type is enabled after save -->
502-
<comment userInput="Validate content type is enabled after save" stepKey="commentValidateShownOnStage"/>
503-
<waitForElementVisible selector="{{ButtonItemOnStage.notHidden('1')}}" stepKey="waitForContentTypeShown1"/>
504-
<waitForElementVisible selector="{{ButtonItemOnStage.notHidden('2')}}" stepKey="waitForContentTypeShown2"/>
505482
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage2">
506483
<argument name="page" value="ButtonItemOnStage"/>
507484
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
@@ -570,10 +547,6 @@
570547
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
571548
<argument name="contentType" value="PageBuilderButtonsContentType"/>
572549
</actionGroup>
573-
<!-- Validate content type is enabled in Storefront -->
574-
<comment userInput="Validate content type is enabled in Storefront" stepKey="commentValidateShownStorefront"/>
575-
<waitForElementVisible selector="{{ButtonItemOnStorefront.notHidden('1')}}" stepKey="waitForContentTypeShownStorefront1"/>
576-
<waitForElementVisible selector="{{ButtonItemOnStorefront.notHidden('2')}}" stepKey="waitForContentTypeShownStorefront2"/>
577550
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStorefront">
578551
<argument name="page" value="ButtonItemOnStorefront"/>
579552
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
@@ -1273,77 +1246,4 @@
12731246
</actionGroup>
12741247
<seeElement selector="{{ButtonItemOnStorefront.notHidden('1')}}" stepKey="seeContentTypeNotHiddenStorefront"/>
12751248
</test>
1276-
<test name="ValidateShowHideOnButtonItem">
1277-
<annotations>
1278-
<features value="PageBuilder"/>
1279-
<stories value="Buttons"/>
1280-
<title value="Button has hide show capabilities"/>
1281-
<description value="A user is able to hide and show the button successfully"/>
1282-
<severity value="CRITICAL"/>
1283-
<useCaseId value="MC-965"/>
1284-
<testCaseId value="MC-3516"/>
1285-
<group value="pagebuilder"/>
1286-
<group value="pagebuilder-buttons"/>
1287-
<group value="pagebuilder-buttonItem"/>
1288-
<group value="pagebuilder-hideShow"/>
1289-
</annotations>
1290-
<before>
1291-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1292-
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1293-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1294-
</before>
1295-
<after>
1296-
<closeTab stepKey="closeOpenedTab" />
1297-
<actionGroup ref="logout" stepKey="logout"/>
1298-
</after>
1299-
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1300-
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
1301-
</actionGroup>
1302-
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupAddContent">
1303-
<argument name="group" value="PageBuilderButtonsContentType"/>
1304-
</actionGroup>
1305-
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonItemIntoStage">
1306-
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1307-
</actionGroup>
1308-
<actionGroup ref="inlineEditButton" stepKey="inlineEditButton1">
1309-
<argument name="text" value="PageBuilderButtonItemText_First"/>
1310-
<argument name="index" value="1"/>
1311-
</actionGroup>
1312-
<actionGroup ref="hideSmallContentType" stepKey="hideContentType">
1313-
<argument name="section" value="ButtonItemOnStage"/>
1314-
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
1315-
</actionGroup>
1316-
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1317-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage1"/>
1318-
<!-- Validate content type remains disabled after save -->
1319-
<comment userInput="Validate content type remains disabled after save" stepKey="commentValidateHiddenStage"/>
1320-
<seeElement selector="{{ButtonItemOnStage.hidden('1')}}" stepKey="waitForContentTypeHidden" />
1321-
<!-- Validate store front -->
1322-
<comment userInput="Validate content type is disabled on storefront" stepKey="commentValidateHiddenStorefront"/>
1323-
<openNewTab stepKey="openNewTab" />
1324-
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1325-
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
1326-
</actionGroup>
1327-
<waitForElement selector="{{ButtonItemOnStorefront.base('1')}}" stepKey="waitForContentTypeNotVisible" />
1328-
<dontSeeElement selector="{{ButtonItemOnStorefront.base('1')}}" stepKey="dontSeeContentType" />
1329-
<seeElementInDOM selector="{{ButtonItemOnStorefront.hidden('1')}}" stepKey="waitForHiddenElement" />
1330-
<!-- Set content to visible in admin -->
1331-
<comment userInput="Set content to visible in admin" stepKey="commentSetContentToVisibleAdmin"/>
1332-
<switchToNextTab stepKey="switchBackToAdmin" />
1333-
<reloadPage stepKey="reloadPage" />
1334-
<waitForPageLoad stepKey="waitForAdminReload" />
1335-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1336-
<actionGroup ref="showSmallContentType" stepKey="showContentType">
1337-
<argument name="section" value="ButtonItemOnStage"/>
1338-
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
1339-
</actionGroup>
1340-
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage1"/>
1341-
<!-- Validate Content Is Shown Storefront -->
1342-
<comment userInput="Validate Content Is Shown Storefront" stepKey="commentValidateContentIsShownStorefront"/>
1343-
<switchToNextTab stepKey="switchBackToStorefront" />
1344-
<reloadPage stepKey="reloadStorefront" />
1345-
<waitForPageLoad stepKey="waitForStorefrontReload" />
1346-
<dontSeeElementInDOM selector="{{ButtonItemOnStorefront.hidden('1')}}" stepKey="dontSeeHiddenElement"/>
1347-
<seeElement selector="{{ButtonItemOnStorefront.base('1')}}" stepKey="waitForContentTypeVisible" />
1348-
</test>
13491249
</tests>

‎app/code/Magento/PageBuilder/view/base/pagebuilder/content_type/button_item.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
form="pagebuilder_button_item_form"
1515
group="elements"
1616
icon="icon-pagebuilder-button"
17-
translate="label">
17+
translate="label"
18+
is_hideable="false">
1819
<parents default_policy="deny">
1920
<parent name="buttons" policy="allow"/>
2021
</parents>

0 commit comments

Comments
 (0)